texinfo-commits
[Top][All Lists]
Advanced

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

[no subject]


From: Patrice Dumas
Date: Mon, 1 Aug 2022 11:13:47 -0400 (EDT)

branch: master
commit 880a52fdbe41d65b6779b5f339085f8686667074
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 1 17:13:28 2022 +0200

    Update po files
---
 po/ca.po                         | 330 +++++++++++++--------------
 po/cs.po                         | 330 +++++++++++++--------------
 po/da.po                         | 330 +++++++++++++--------------
 po/de.po                         | 330 +++++++++++++--------------
 po/el.po                         | 329 +++++++++++++--------------
 po/eo.po                         | 330 +++++++++++++--------------
 po/es.po                         | 330 +++++++++++++--------------
 po/fi.po                         | 330 +++++++++++++--------------
 po/fr.po                         | 330 +++++++++++++--------------
 po/he.po                         | 330 +++++++++++++--------------
 po/hr.po                         | 330 +++++++++++++--------------
 po/hu.po                         | 330 +++++++++++++--------------
 po/id.po                         | 330 +++++++++++++--------------
 po/it.po                         | 330 +++++++++++++--------------
 po/ja.po                         | 329 +++++++++++++--------------
 po/nb.po                         | 330 +++++++++++++--------------
 po/nl.po                         | 330 +++++++++++++--------------
 po/pl.po                         | 330 +++++++++++++--------------
 po/pt.po                         | 330 +++++++++++++--------------
 po/pt_BR.po                      | 330 +++++++++++++--------------
 po/ro.po                         | 330 +++++++++++++--------------
 po/ru.po                         | 330 +++++++++++++--------------
 po/rw.po                         | 329 +++++++++++++--------------
 po/sl.po                         | 330 +++++++++++++--------------
 po/sv.po                         | 330 +++++++++++++--------------
 po/tr.po                         | 330 +++++++++++++--------------
 po/uk.po                         | 330 +++++++++++++--------------
 po/vi.po                         | 330 +++++++++++++--------------
 po/zh_CN.po                      | 330 +++++++++++++--------------
 po/zh_TW.po                      | 330 +++++++++++++--------------
 po_document/ca.po                | 460 +++++++++++++++++++-------------------
 po_document/ca.us-ascii.po       | 456 +++++++++++++++++++-------------------
 po_document/cs.po                | 459 +++++++++++++++++++-------------------
 po_document/de.po                | 462 +++++++++++++++++++-------------------
 po_document/de.us-ascii.po       | 458 +++++++++++++++++++-------------------
 po_document/eo.po                | 458 +++++++++++++++++++-------------------
 po_document/es.po                | 456 +++++++++++++++++++-------------------
 po_document/fr.po                | 456 +++++++++++++++++++-------------------
 po_document/hr.po                | 456 +++++++++++++++++++-------------------
 po_document/hu.po                | 457 +++++++++++++++++++-------------------
 po_document/it.po                | 458 +++++++++++++++++++-------------------
 po_document/nl.po                | 456 +++++++++++++++++++-------------------
 po_document/no.us-ascii.po       | 325 ++++++++++-----------------
 po_document/pl.po                | 460 +++++++++++++++++++-------------------
 po_document/pt.po                | 456 +++++++++++++++++++-------------------
 po_document/pt.us-ascii.po       | 448 +++++++++++++++++++------------------
 po_document/pt_BR.po             | 465 +++++++++++++++++++--------------------
 po_document/pt_BR.us-ascii.po    | 429 ++++++++++++++++++------------------
 po_document/sv.po                | 456 +++++++++++++++++++-------------------
 po_document/texinfo_document.pot | 325 ++++++++++-----------------
 po_document/uk.po                | 454 +++++++++++++++++++-------------------
 51 files changed, 9605 insertions(+), 9602 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 6d3bb6da86..96b99fac67 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.1.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2016-12-30 07:10+0100\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -428,7 +428,7 @@ msgid "Try --help for more information.\n"
 msgstr "Proveu --help per a més informació.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -608,7 +608,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2230,7 +2230,7 @@ msgstr "no s'ha pogut crear el directory `%s': %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: falta l'argument de fitxer.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Proveu `%s --help' per a més informació.\n"
@@ -2241,7 +2241,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: no s'ha pogut obrir %s per a escriptura: %s\n"
@@ -2253,7 +2253,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: no s'ha pogut obrir %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: error en tancar %s: %s\n"
@@ -2275,93 +2275,93 @@ msgstr "reanomena %s ha fallat: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: error en tancar %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "no s'ha pogut obrir %s per escriure: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "error en tancar %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no és un codi vàlid"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s no es un codi vàlid de regió"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s no és una possibilitat vàlida de divisió"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "error en carregar %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "variable obsoleta %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: variable desconeguda %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: variable desconeguda %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: variable desconeguda %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: la sortida és incompatible amb la divisió"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "no s'ha pogut crear el directory `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "error en tancar el fitxer de text d'imatge %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "fitxer @image `%s' no llegible: %s"
@@ -2376,124 +2376,124 @@ msgstr "no s'ha trobar el fitxer @image  `%s', 
s'usarà `%s'"
 msgid "no argument specified for @U"
 msgstr "no s'ha especificat un argument per a @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "no s'ha trobat el fitxer @image `%s' (for HTML), s'usarà `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "el format en cru %s no es convertirà"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 "no s'ha pogut obrir el fitxer de configuració de referències html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "tipus que falta"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "tipus no reconegut: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "error en tancar el fitxer de configuració de referències html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "acció desconeguda `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "acció desconeguda `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "la cadena de caràcters no està tancada al fitxer css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include ha finalitzat en un comentari"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import no ha acabat a un fitxer css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "No s'ha trobat el fitxer CSS %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "no s'ha pogut obrir --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "error en tancar el fitxer CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "no s'ha trobat una entrada htmlxref.cnf per a `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s no té sentit dins d'un bloc `@%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "error en tancar el fitxer marc %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "error en tancar el fitxer marc taula de continguts %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "ha fallat el gestor %s de l'etapa %s amb prioritat %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "heu d'especificar un títol amb una ordre de títol o @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "error en tancar %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "error en tancar el fitxer de node de redirecció %s: %s"
@@ -2596,30 +2596,30 @@ msgstr "`.' o `,' ha de seguir a @xref, no %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' or `,' ha de seguir a @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "el nom de node d'entrada de menú no hauria de contenir `%s'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "el nom de node d'entrada de menú no hauria de contenir `:'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "el nom d'entrada de menú no hauria de contenir `:'"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "no s'ha pogut llegir %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "error en tancar fitxer @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: no s'ha pogut trobar %s"
@@ -3359,135 +3359,135 @@ msgstr "chm.pm: no es pot obrir %s per a escripture: 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: error en tancar %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "fitxer @image `%s' no llegible: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "no s'ha pogut crear el directory `%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "no s'ha pogut crear els directoris `%s' o `%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "error quan s'estava escrivint a %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "error en tancar %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "error quan s'estava escrivint a %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "error en tancar el fitxer de node de redirecció %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "no s'ha pogut crear el directory `%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: no es pot obrir %s per a escripture: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: error en tancar %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: ha fallat chdir %s: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "error en escriure a `%s'"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: no s'ha pogut obrir el fitxer latex %s per a escriptura: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: el directori L2H_TMP conté un punt"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: el directori actual conté un punt"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: l'ordre no ha tingut èxit: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: l'ordre no ha tingut èxit: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: la imatge té una extensió no vàlida: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: reanomenar %s com %s ha fallat: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: no s'ha pogut obrir %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 "latex2html.pm: no s'ha trobat el final de l'element @%s no s'ha trobat %d"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3496,12 +3496,12 @@ msgstr ""
 "latex2html.pm: el processament va produir %d elements en HTML; s'esperava "
 "%d, el nombre d'elements trobat al document"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: no s'ha pogut determinar el fragment %d per a @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3510,54 +3510,54 @@ msgstr ""
 "l2h: no s'ha pogut extraure el fragment %d per a @%s amb comptador de "
 "sortida %d de HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: no s'ha pogut carregar %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: no s'ha pogut obrir %s per a escriptura: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: no s'ha pogut obrir %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: ha fallat chdir %s: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: no s'ha pogut retornar al directori inicial: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: falta el fitxer de sortida: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: ha fallat l'ordre: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: ha fallat l'ordre: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: no s'ha trobat el final de %s element %d"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3569,12 +3569,12 @@ msgstr ""
 "tex4ht.pm: el processament va produir %d element en HTML; s'esperava %d, el "
 "nombre d'element trobats al document per a @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: la sortida no té element HTML per a @%s: %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3586,12 +3586,12 @@ msgstr ""
 "tex4ht.pm: el processament va produir %d element en HTML; s'esperava %d, el "
 "nombre d'element trobats al document per a @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3660,22 +3660,28 @@ msgstr "tex4ht.pm: la sortida no té element HTML per a 
@%s: %s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: la sortida no té element HTML per a @%s: %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "no s'ha pogut llegir el fitxer d'inicialització %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "no s'ha pogut llegir el fitxer d'inicialització %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "s'ignorarà l'ordre no reconeguda TEXINFO_OUTPUT_FORMAT valor `%s'\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Ús: %s [OPCIÓ]... FITXER-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3691,7 +3697,7 @@ msgstr ""
 "el comportament és idèntic, i no depèn del nom instal·lat.\n"
 "\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3731,61 +3737,61 @@ msgstr ""
 "  -v, --verbose               explica el que es fa.\n"
 "      --version               mostra la informació de versió i surt.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr " -h, --help   mostra aquesta ajuda i surt"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --html                  output HTML."
 msgstr " -h, --help   mostra aquesta ajuda i surt"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr " -h, --help   mostra aquesta ajuda i surt"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr " -h, --help   mostra aquesta ajuda i surt"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr " -h, --help   mostra aquesta ajuda i surt"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3797,19 +3803,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3821,13 +3827,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3835,17 +3841,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3854,7 +3860,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3863,13 +3869,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3896,7 +3902,7 @@ msgstr ""
 "      --node-files            produeix fitxers de redirecció per a nodes i "
 "àncores; de forma predeterminada està activat sols si hi ha divisió.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3904,7 +3910,7 @@ msgstr ""
 "Opcions per a XML i Docbook:\n"
 "      --output-indent=VAL     no fa res, es manté per compatibilitat.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3912,7 +3918,7 @@ msgstr ""
 "Opcions per a DVI/PS/PDF:\n"
 "      --Xopt=OPT              passa OPT a texi2dvi: es pot repetir.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3933,75 +3939,75 @@ msgstr ""
 "  -U VAR                        anul·la la definició de la variable VAR, "
 "igual que amb @clear\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4034,7 +4040,7 @@ msgstr ""
 "  si s'està generant XML, --ifxml està activat i els altres estan "
 "desactivats\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -4065,61 +4071,61 @@ msgstr ""
 "  makeinfo --no-split foo.texi           escriu un sol fitxer Info, no "
 "importa la mida\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: l'argument --footnote-style ha de ser  `separate' o `end', no `%s'.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: l'argument --paragraph-indent arg ha de ser numeric/`none'/`asis', no "
 "`%s'.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: quan s'estigui generant %s, sols es pot especificar un FITXER amb -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opció --Xopt sense sortida impresa"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "transformació d'arbre desconeguda %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "s'ignorarà la divisió per al format %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: falta l'argument de fitxer.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "la transformació fill_gaps_in_sectioning no ha retornat cap resultat. No hi "
 "ha cap secció?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "error en tancar el fitxer d'expansió de macros %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no s'ha pogut obrir %s per a escriptura: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4127,7 +4133,7 @@ msgstr ""
 "la transformació insert_nodes_for_sectioning_commands no ha retornat cap "
 "resultat. No hi ha cap secció?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: error en tancar els fitxers d'enllaços interns %s: %s\n"
diff --git a/po/cs.po b/po/cs.po
index dc29301187..755f52da40 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-01 19:22+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -425,7 +425,7 @@ 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:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -568,7 +568,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2127,7 +2127,7 @@ msgstr "%s: adresář %s nebylo možno vytvořit: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: chybí argument se jménem souboru\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Více informací získáte příkazem „%s --help“.\n"
@@ -2138,7 +2138,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: ignoruje se %s bez obsahu\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: %s nebylo možné otevřít pro zápis: %s\n"
@@ -2149,7 +2149,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: nebylo možné otevřít %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: chyba při zavírání %s: %s\n"
@@ -2169,93 +2169,93 @@ msgstr "%s: přejmenování %s selhalo: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: chyba při zavírání standardního výstupu: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "%s nebylo možno otevřít pro zápis: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "chyba při zavírání %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platný kód jazyka"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s není platný kód oblasti"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s není platná možnost dělení"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "chyba při zavádění %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "zastaralá proměnná %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: neznámá proměnná %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: neznámá proměnná %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: neznámá proměnná %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: výstup není kompatibilní s dělením"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "adresář „%s“ nebylo možno vytvořit: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "chyba při zavírání textového souboru obrazu %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "soubor „%s“ v příkazu @image je nečitelný: %s"
@@ -2270,85 +2270,85 @@ msgstr "@image soubor „%s“ nenalezen, použije se „%s“"
 msgid "no argument specified for @U"
 msgstr "pro @U nebyl zadán žádný argument"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image soubor „%s“ (pro HTML) nenalezen, použije se „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "syrový formát %s není převeden"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "nebylo možné otevřít konfigurační soubor s HTML odkazy %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "chybí typ"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "nerozpoznaný typ: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "chyba při zavírání konfiguračního souboru s HTML odkazy %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "neznámý úkon „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "neznámý úkon „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "řetězec nebí uzavřen v souboru CSS"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include končil v komentáři"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import nebyl dokončen v souboru CSS"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS soubor %s nenalezen"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "nebylo možné otevřít --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "chyba při zavírání CSS souboru %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "pro „%s“ nenalezena žádná položka htmlxref.cnf"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s nemá smysl pro nedělený výstup"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2357,36 +2357,36 @@ msgstr ""
 "když se vytváří soubor s webovými jmenovkami, absolutní cestu nebo URL „%s“ "
 "nelze pro JS_WEBLABELS_FILE použít"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "chyba při zavírání rámcového souboru %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "chyba při zavírání rámcového souboru s obsahem %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "deskriptor %s úrovně %s priority %s selhal"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "je třeba určit název pomocí příkazu title nebo @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s již existuje, ale nejedná se o adresář"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "chyba při kopírování %s do %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "chyba při zavírání souboru s uzly přesměrování %s: %s"
@@ -2487,30 +2487,30 @@ msgstr "„.“ nebo „,“ musí následovat za @xref, ne za %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "„.“ nebo „,“ musí následovat za @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "název uzlu položky nabídky by neměl obsahovat „%s“"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "název uzlu položky nabídky by neměl obsahovat „:“"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "název položky nabídky by neměl obsahovat „:“"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "%s nebylo možné přečíst: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "chyba při zavírání @verbatiminclude souboru %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: nebylo možné nalézt %s"
@@ -3238,134 +3238,134 @@ msgstr "chm.pm: %s nebylo možné otevřít pro zápis: 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: chyba při zavírání %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "soubor „%s“ v příkazu @image je nečitelný: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "adresář „%s“ nebylo možno vytvořit: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "adresáře „%s“ nebo „%s„ nebylo možné vytvořit: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "chyba při zápisu od %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "chyba při zavírání %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "chyba při zápisu od %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "chyba při zavírání souboru s uzly přesměrování %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "adresář „%s“ nebylo možno vytvořit: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: %s nebylo možné otevřít pro zápis: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: chyba při zavírání %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: změna pracovního adresáře do %s selhala: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "chyba při zápisu do „%s“"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: latexový soubor %s nebylo možné otevřít pro zápis: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: adresář L2H_TMP obsahuje tečku"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: současný adresář obsahuje tečku"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: příkaz neuspěl: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: příkaz neuspěl: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: obrázek má neplatnou příponu: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: přejmenování %s na %s selhalo: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: %s nebylo možné otevřít: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: konec @%s položky %d nebyl nalezen"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3374,12 +3374,12 @@ msgstr ""
 "latex2html.pm: zpracování vyrobilo %d položek v HTML; očekáváno %d, počet "
 "položek nalezených v dokumentu"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: nebylo možné určit fragment %d pro @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3387,53 +3387,53 @@ msgid ""
 msgstr ""
 "l2h: z HTML nebylo možné získat fragment %d pro @%s s výstupním počítadlem %d"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: %s nebylo možné zavést: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: %s nebylo možné otevřít pro zápis: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: %s nebylo možné otevřít: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: změna pracovního adresáře do %s selhala: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: nelze se vrátit do původního adresáře: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: výstupní soubor chybí: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: příkaz selhal: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: uzavření komunikace selhalo: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: konec @%s položky %d nenalezen"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3445,12 +3445,12 @@ msgstr ""
 "tex4ht.pm: zpracování vyrobilo %d položek v HTML; očekáváno %d, počet "
 "položek nalezených v dokumentu pro @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: výstup nemá žádnou HTML položku pro @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3462,12 +3462,12 @@ msgstr ""
 "tex4ht.pm: zpracování vyrobilo %d položek v HTML; očekáváno %d, počet "
 "položek nalezených v dokumentu pro @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3529,22 +3529,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: výstup nemá žádnou HTML položku pro @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "inicializační soubor %s nebylo možné přečíst"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "inicializační soubor %s nebylo možné přečíst"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "nerozpoznaná hodnota TEXINFO_OUTPUT_FORMAT „%s“ se ignoruje\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Použití: %s [PŘEPÍNAČ]… SOUBOR_TEXINFA…\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3560,7 +3566,7 @@ msgstr ""
 "Tento program je obvykle nainstalován i pod názvy „makeinfo“ a „texi2any“.\n"
 "Jejich chování je shodné a nezávisí na názvu.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3594,61 +3600,61 @@ msgstr ""
 "  -v, --verbose               vysvětlí, co právě provádí.\n"
 "      --version               zobrazí údaje o verzi a skončí.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   vrcholový uzel hlavního manuálu"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   vrcholový uzel hlavního manuálu"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   vrcholový uzel hlavního manuálu"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   vrcholový uzel hlavního manuálu"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   vrcholový uzel hlavního manuálu"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3660,7 +3666,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3673,13 +3679,13 @@ msgstr ""
 "namísto\n"
 "                            na standardní výstup"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3691,13 +3697,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3705,17 +3711,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3724,7 +3730,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3733,13 +3739,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3767,7 +3773,7 @@ msgstr ""
 "kotvy;\n"
 "                              standardně je zapnuto jen při dělení.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3775,7 +3781,7 @@ msgstr ""
 "Přepínače pro XML a DocBook:\n"
 "      --output-indent=HODNOTA nic nedělá, zachováno pro kompatibilitu.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3784,7 +3790,7 @@ msgstr ""
 "      --Xopt=PŘEPÍNAČ         předá PŘEPÍNAČ programu texi2dvi; lze "
 "opakovat.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3808,75 +3814,75 @@ msgstr ""
 "  -U PROMĚNNÁ                   zruší proměnnou PROMĚNNÁ jako příkaz "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3901,7 +3907,7 @@ msgstr ""
 "  vytváří-li se prostý text, --ifplaintext se zapne a ostatní se vypnou;\n"
 "  vytváří-li se XML, --ifxml se zapne a ostatní se vypnou.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3932,59 +3938,59 @@ msgstr ""
 "  makeinfo --number-sections foo.texi    zapíše Info číslovanými oddíly\n"
 "  makeinfo --no-split foo.texi           zapíše jeden velký soubor Info\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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“ nebo „end“, ne „%s“.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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“ nebo „asis“, ne "
 "„%s“.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr "%s: při vytváření %s lze pomocí -o zadat pouze jeden vstupní SOUBOR\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "přepínač --Xopt bez tisknutelného výstupu"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "neznámá transformace stromu %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "dělení u formátu %s se ignoruje"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: chybí argument jména souboru.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "Transformace fill_gaps_in_sectioning nevrátila žádný výsledek. Nechybí oddíl?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "chyba při zavírání makrem expandovaného souboru %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s nebylo možné otevřít pro zápis: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3992,7 +3998,7 @@ msgstr ""
 "Transformace insert_nodes_for_sectioning_commands nevrátila žádný výsledek. "
 "Nechybí oddíl?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: chyba při zavírání souboru %s s vnitřními odkazy: %s\n"
diff --git a/po/da.po b/po/da.po
index c28b223888..d24b0d2d21 100644
--- a/po/da.po
+++ b/po/da.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.5.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2019-02-14 10:09+0100\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -426,7 +426,7 @@ msgid "Try --help for more information.\n"
 msgstr "Prøv --help for yderligere information.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -569,7 +569,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2079,7 +2079,7 @@ msgstr "kunne ikke oprette mappe »%s«: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: mangler filparameter.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv »%s --help« for yderligere information.\n"
@@ -2090,7 +2090,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: kunne ikke åbne %s for skrivning: %s\n"
@@ -2102,7 +2102,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: kunne ikke åbne %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: der opstod en fejl under lukning af %s: %s\n"
@@ -2124,94 +2124,94 @@ msgstr "omdøbning af %s mislykkedes: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: der opstod en fejl under lukning af %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "kunne ikke åbne %s for skrivning: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "der opstod en fejl under lukning af %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s er ikke en gyldig regionskode"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s er ikke en gyldig opdelingsmulighed"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "fejl under indlæsning af %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "forældet variabel %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: ukendt variabel %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: ukendt variabel %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: ukendt variabel %s\n"
 
 # split er nok programmet split
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: uddata er ikke kompatible med split"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "kunne ikke oprette mappe »%s«: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "der opstod en fejl under lukning af billedtekstfilen %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-filen »%s« er ikke læsbar: %s"
@@ -2226,125 +2226,125 @@ msgstr "@image-filen »%s« blev ikke fundet, anvender 
»%s«"
 msgid "no argument specified for @U"
 msgstr "Ingen parameter angivet for @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image-filen »%s« (for HTML) blev ikke fundet, anvender »%s«"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "rå format %s er ikke konverteret"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "kunne ikke åbne html-referencekonfigurationsfilen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "manglende type"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "typen blev ikke genkendt: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr ""
 "der opstod en fejl under lukning af html-referencekonfigurationsfilen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "ukendt handling »%s«"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "ukendt handling »%s«"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "streng ikke lukket i css-fil"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include afsluttet i kommentar"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import er ikke færdig i css-fil"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS-filen %s blev ikke fundet"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "kunne ikke åbne --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "der opstod en fejl under lukning af CSS-filen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "ingen htmlxref.cnf-poster blev fundet for »%s«"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s giver ingen mening i en »@%s«-blok"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "der opstod en fejl under lukning af frame-filen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr ""
 "der opstod en fejl under lukning af indholdsfortegnelsens frame-fil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "håndtering %s for trin %s prioritet %s mislykkedes"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "skal angive en titel med en titelkommando eller @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "der opstod en fejl under lukning af %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "der opstod en fejl under lukning af videresendelsesemnefilen %s: %s"
@@ -2448,30 +2448,30 @@ msgstr "en @xref skal efterfølges af ».« eller »,«, 
ikke %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "en @xref skal efterfølges af ».« eller »,«"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "emnenavn for menupunkt må ikke indeholde »%s«"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "menupostens emnenavn må ikke indeholde »:«"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "menupostens navn må ikke indeholde »:«"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "kunne ikke læse %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "fejl under lukning af @verbatiminclude-filen %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: kunne ikke finde: %s"
@@ -3201,133 +3201,133 @@ msgstr "chm.pm: kunne ikke åbne %s for skrivning: 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: der opstod en fejl under lukning af %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image-filen »%s« er ikke læsbar: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "kunne ikke oprette mappe »%s«: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "kunne ikke oprette mapper »%s« eller »%s«: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "fejl under skrivning til %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "der opstod en fejl under lukning af %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "fejl under skrivning til %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "der opstod en fejl under lukning af videresendelsesemnefilen %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "kunne ikke oprette mappe »%s«: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: kunne ikke åbne %s for skrivning: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: der opstod en fejl under lukning af %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir %s mislykkedes: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: kunne ikke åbne latex-filen %s for skrivning: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: L2H_TMP-mappe indeholder et punktum"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: nuværende mappe indeholder et punktum"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: kommando lykkedes ikke: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: kommando lykkedes ikke: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: billede har ugyldig filendelse: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: omdøb %s som %s mislykkedes: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: kunne ikke åbne %s; %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: slutningen på @%s post %d ikke fundet"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3336,12 +3336,12 @@ msgstr ""
 "latex2html.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
 "antallet af elementer fundet i dokumentet"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: kunne ikke bestemme fragmentet %d for @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3349,54 +3349,54 @@ msgid ""
 msgstr ""
 "l2h: kunne ikke udtrække fragmentet %d for @%s med uddatatælleren %d fra HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: kunne ikke indlæse %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: kunne ikke åbne %s for skrivning: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: kunne ikke åbne %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir %s mislykkedes: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: kunne ikke returnere til oprindelig mappe: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: uddatafil mangler: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: kommando mislykkedes: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: kommando mislykkedes: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: slutningen på @%s-elementet %d blev ikke fundet"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3408,12 +3408,12 @@ msgstr ""
 "tex4ht.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
 "antallet af elementer fundet i dokumentet for @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: uddata har intet HTML-element for @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3425,12 +3425,12 @@ msgstr ""
 "tex4ht.pm: behandling fremstillede %d elementer i HTML; forventede %d, "
 "antallet af elementer fundet i dokumentet for @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3499,22 +3499,28 @@ msgstr "tex4ht.pm: uddata har intet HTML-element for 
@%s %s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: uddata har intet HTML-element for @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "kunne ikke læse init-filen %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "kunne ikke læse init-filen %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignorerer ej genkendt TEXINFO_OUTPUT_FORMAT-værdi »%s«\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Brug: %s [TILVALG] ... TEXINFO-FIL ...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3530,7 +3536,7 @@ msgstr ""
 "Programmet installeres ofte som både »makeinfo« og »texi2any«;\n"
 "opførslen er identisk, og afhænger ikke af det installerede navn.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3565,51 +3571,51 @@ msgstr ""
 "  -v, --verbose               forklar, hvad der sker.\n"
 "      --version               vis versionsoplysninger og afslut.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 msgid "      --docbook               output Docbook XML."
 msgstr ""
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 msgid "      --html                  output HTML."
 msgstr ""
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 msgid "      --epub3                 output EPUB3."
 msgstr ""
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 msgid "      --latex                 output LaTeX."
 msgstr ""
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 msgid "      --xml                   output Texinfo XML."
 msgstr ""
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3621,19 +3627,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3645,13 +3651,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3659,17 +3665,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3678,7 +3684,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3687,13 +3693,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3720,7 +3726,7 @@ msgstr ""
 "                              ankre; som standard indstilles kun hvis "
 "opdelt.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3728,7 +3734,7 @@ msgstr ""
 "Tilvalg for XML og Docbook:\n"
 "      --output-indent=VÆRDI   gør intet, bevaret for kompatibilitet.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3736,7 +3742,7 @@ msgstr ""
 "Tilvalg for DVI/PS/PDF:\n"
 "      --Xopt=OPT              send OPT til texi2dvi; kan gentages.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3755,75 +3761,75 @@ msgstr ""
 "  -U VAR                        fjern definitionen af variablen VAR, som\n"
 "                                med @clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3851,7 +3857,7 @@ msgstr ""
 "deaktiverede.\n"
 "  hvis der laves XML, er --ifxml aktiveret, mens de andre er deaktiverede.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3882,58 +3888,58 @@ msgstr ""
 "  makeinfo --no-split xxx.texi           skriv en Info-fil, uanset "
 "størrelsen\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr "%s: under oprettelse af %s, kan kun en inddata-FIL angivet med -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "tilvalget --Xopt uden udskrevne uddata"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "ukendt trætransformation %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "ignorerer opdeling for format %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filparameter.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "fill_gaps_in_sectioning-transformering gav intet resultat. Ingen sektion?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "der opstod en fejl under lukning af makro udvid-filen %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunne ikke åbne %s for skrivning: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3941,7 +3947,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commands-transformation returnerer intet "
 "resultat. Manglende afsnit?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: der opstod en fejl under lukning af intern henvisningsfil %s: %s\n"
diff --git a/po/de.po b/po/de.po
index c91c5fe877..cd45b6f386 100644
--- a/po/de.po
+++ b/po/de.po
@@ -35,7 +35,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.6.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-01-27 18:12+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -443,7 +443,7 @@ msgid "Try --help for more information.\n"
 msgstr "„--help“ gibt weitere Informationen.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -585,7 +585,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2136,7 +2136,7 @@ msgstr "Verzeichnis „%s“ konnte nicht angelegt werden: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: Datei-Angabe fehlt.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "„%s --help“ gibt weitere Informationen.\n"
@@ -2147,7 +2147,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: %s konnte nicht zum Schreiben geöffnet werden: %s\n"
@@ -2159,7 +2159,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: %s konnte nicht geöffnet werden: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: Fehler beim Schließen von %s: %s\n"
@@ -2181,93 +2181,93 @@ msgstr "Umbenennen von %s fehlgeschlagen: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: Fehler beim Schließen von %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "%s konnte nicht zum Schreiben geöffnet werden: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "Fehler beim Schließen von %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist kein gültiges Sprachkürzel"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s ist kein gültiges Regionskürzel"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s is keine gültige Aufspaltmöglichkeit"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "Fehler beim Laden von %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "veraltete Variable %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: unbekannte Variable %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: unbekannte Variable %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: unbekannte Variable %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: die Ausgabe ist ungeeignet für Split"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "Verzeichnis „%s“ konnte nicht angelegt werden: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "Fehler beim Schließen der Textdatei %s für das Bild: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-Datei „%s“ nicht lesbar: %s"
@@ -2282,123 +2282,123 @@ msgstr "@image-Datei „%s“ nicht gefunden, „%s“ wird 
benutzt"
 msgid "no argument specified for @U"
 msgstr "es wurde kein Argument für @U angegeben"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image-Datei „%s“ (für HTML) nicht gefunden, „%s“ wird benutzt"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "rohes Format %s wird nicht konvertiert"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "HTML-Refs-Konfigurationsdatei %s konnte nicht gefunden werden: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "fehlender Typ"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "nicht erkannter Typ: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "Fehler beim Schließen derHTML-Refs-Konfigurationsdatei %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "Unbekannter Befehl „%s“."
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "Unbekannter Befehl „%s“."
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "Zeichenkette in CSS-Datei nicht geschlossen"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include endete inmitten eines Kommentars"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import in CSS-Datei nicht abgeschlossen"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS-Datei %s nicht gefunden"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "--include-file %s konnte nicht geöffnet werden: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "Fehler beim Schließen der CSS-Datei %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "kein Eintrag htmlxref.cnf für „%s“ gefunden"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside @%s block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s nicht sinnvoll innerhalb eines @%s-Blocks"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "Fehler beim Schließen der Rahmendatei %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "Fehler beim Schließen der Inhaltsverzeichnis-Rahmendatei %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "Verarbeitung %s der Stufe %s %s-Pritorität ist fehlgeschlagen"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "Titel muss mit dem Titelbefehl oder @top angegeben werden"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "Fehler beim Schließen von %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "Fehler beim Schließen der umbenannten Knotendatei %s: %s"
@@ -2501,30 +2501,30 @@ msgstr "„.“ oder „,“ muss @xref folgen, nicht %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "„.“ oder „,“ muss @xref folgen"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "Menüeintrag-Knotenname sollte kein „%s“ enthalten"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "Menüeintrag-Knotenname sollte keinen „:“ enthalten"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "Menüeintrag-Name sollte keinen „:“ enthalten"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "%s konnte nicht gelesen werden: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "Fehler beim Schließen von @verbatiminclude-Datei %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: %s konnte nicht gefunden werden"
@@ -3275,133 +3275,133 @@ msgstr "chm.pm: %s konnte nicht zum Schreiben 
geöffnet werden: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: Fehler beim Schließen von %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image-Datei „%s“ nicht lesbar: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "Verzeichnis „%s“ konnte nicht angelegt werden: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "Verzeichnisse „%s“ oder „%s“ konnten nicht angelegt werden: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "Fehler beim Schreiben nach %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "Fehler beim Schließen von %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "Fehler beim Schreiben nach %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "Fehler beim Schließen der umbenannten Knotendatei %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "Verzeichnis „%s“ konnte nicht angelegt werden: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: %s konnte nicht zum Schreiben geöffnet werden: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: Fehler beim Schließen von %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir %s fehlgeschlagen: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: Latex-Datei %s konnte nicht zum Schreiben geöffnet werden: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: L2H_TMP-Verzeichnis enthält einen Punkt"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: aktuelles Verzeichnis enthält einen Punkt"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: Befehl war nicht erfolgreich: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: Befehl war nicht erfolgreich: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: Bild hat eine ungültige Erweiterung: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: Umbenennen von %s in %s fehlgeschlagen: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: %s konnte nicht geöffnet werden: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: Ende des @%s-Eintrags %d nicht gefunden"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3410,12 +3410,12 @@ msgstr ""
 "latex2html.pm: erzeugte %d Einträge in HTML werden verarbeitet; %d wurden "
 "erwartet, die Anzahl der im Dokument gefundenen Einträge"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: Fragment %d für @%s konnte nicht ermittelt werden"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3424,54 +3424,54 @@ msgstr ""
 "l2h: Fragment %d für @%s mit Ausgabezähler %d von HTML konnte nicht "
 "extrahiert werden"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: %s konnte nicht geladen werden: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: %s konnte nicht zum Schreiben geöffnet werden: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: %s konnte nicht geöffnet werden: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir %s fehlgeschlagen: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: Rückkehr zum ursprünglichen Verzeichnis nicht möglich: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: Ausgabedatei fehlt: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: Befehl fehlgeschlagen: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: Befehl fehlgeschlagen: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: Ende des @%s-Eintrags %d nicht gefunden"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3483,12 +3483,12 @@ msgstr ""
 "tex4ht.pm: erzeugte %d Einträge in HTML werden verarbeitet; %d wurden "
 "erwartet, die Anzahl der im Dokument für @%s gefundenen Einträge"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: Ausgabe hat keinen HTML-Eintrag für @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3500,12 +3500,12 @@ msgstr ""
 "tex4ht.pm: erzeugte %d Einträge in HTML werden verarbeitet; %d wurden "
 "erwartet, die Anzahl der im Dokument für @%s gefundenen Einträge"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3574,22 +3574,28 @@ msgstr "tex4ht.pm: Ausgabe hat keinen HTML-Eintrag für 
@%s %s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: Ausgabe hat keinen HTML-Eintrag für @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "Initialisierungsdatei %s konnte nicht gelesen werden."
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "Initialisierungsdatei %s konnte nicht gelesen werden."
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "nicht erkannter Wert „%s“ für TEXINFO_OUTPUT_FORMAT wird ignoriert\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3601,7 +3607,7 @@ msgstr ""
 "standardmäßig in Info-Dateien, die online mit einem Info-Leser wie\n"
 "GNU Info (oder auch Emacs, TkInfo, etc.) gelesen werden können.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3637,51 +3643,51 @@ msgstr ""
 "  -v, --verbose               ausführlich die Bearbeitungschritte anzeigen\n"
 "      --version               Programmversion anzeigen und beenden\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 msgid "      --docbook               output Docbook XML."
 msgstr ""
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 msgid "      --html                  output HTML."
 msgstr ""
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 msgid "      --epub3                 output EPUB3."
 msgstr ""
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 msgid "      --latex                 output LaTeX."
 msgstr ""
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 msgid "      --xml                   output Texinfo XML."
 msgstr ""
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3693,19 +3699,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3717,13 +3723,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3731,17 +3737,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3750,7 +3756,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3759,13 +3765,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3791,7 +3797,7 @@ msgstr ""
 "erstellen\n"
 "                                (ist Standard bei Aufteilung)\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3800,7 +3806,7 @@ msgstr ""
 "      --output-indent=WERT    macht nichts, wird zwecks Kompatibilität "
 "erhalten.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3809,7 +3815,7 @@ msgstr ""
 "      --Xopt=OPTION           gibt OPTION an texi2dvi weiter; kann widerholt "
 "werden.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3829,75 +3835,75 @@ msgstr ""
 "  -P VERZ                       VERZ dem Suchpfad für @include voranstellen\n"
 "  -U VAR                        eine Variable aufheben (wie mit @clear)\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3923,7 +3929,7 @@ msgstr ""
 "  wird reiner Text erzeugt, ist --ifplaintext an und die anderen sind aus;\n"
 "  wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3956,61 +3962,61 @@ msgstr ""
 "  makeinfo --no-split foo.texi           nur eine Info-Datei (kann groß "
 "sein)\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: beim Erzeugen von %s kann nur eine Ausgabedatei mit -o angegeben werden\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "Option --Xopt ohne gedruckte Ausgabe"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "unbekannte Baumumformung %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "Splitten für Format %s wird ignoriert"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: Datei-Angabe fehlt.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "fill_gaps_in_sectioning-Umwandlung liefert kein Ergebnis. Kein Abschnitt?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "Fehler beim Schließen der Makro-Erweiterungsdatei %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s konnte nicht zum Schreiben geöffnet werden: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4018,7 +4024,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commands-Umwandlung liefert kein Ergebnis. Kein "
 "Abschnitt?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: Fehler beim Schließen der internen Verknüpfungsdatei %s: %s\n"
diff --git a/po/el.po b/po/el.po
index a648ba5476..a46a073756 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 6.0.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2015-12-28 00:59+0200\n"
 "Last-Translator: Tsiolkas Michail <cs112152@cs.uoi.gr>\n"
 "Language-Team: Greek <team@lists.gnome.gr>\n"
@@ -411,7 +411,7 @@ msgid "Try --help for more information.\n"
 msgstr ""
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -519,7 +519,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -1947,7 +1947,7 @@ msgstr ""
 msgid "%s: missing file argument\n"
 msgstr ""
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
@@ -1958,7 +1958,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr ""
@@ -1969,7 +1969,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -1989,89 +1989,89 @@ msgstr ""
 msgid "%s: error on closing stdout: %s\n"
 msgstr ""
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr ""
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, perl-format
 msgid "error loading %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, perl-format
 msgid "unknown variable from command line: %s\n"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, perl-format
 msgid "%s: unknown formatting context %s\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
@@ -2086,119 +2086,119 @@ msgstr ""
 msgid "no argument specified for @U"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, perl-format
 msgid "Unknown file and id setting function: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, perl-format
 msgid "Unknown formatting function: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr ""
@@ -2298,30 +2298,30 @@ msgstr ""
 msgid "`.' or `,' must follow @xref"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr ""
@@ -3040,208 +3040,208 @@ msgstr ""
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, perl-format
 msgid "@image file `%s' can not be copied"
 msgstr ""
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, perl-format
 msgid "could not create images directory `%s': %s"
 msgstr ""
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, perl-format
 msgid "could not copy `%s' to `%s': %s"
 msgstr ""
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, perl-format
 msgid "error removing directory: %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, perl-format
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, perl-format
 msgid "error creating directory: %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, perl-format
 msgid "error creating directory: %s: creating %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, perl-format
 msgid "could not create meta informations directory `%s': %s"
 msgstr ""
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, perl-format
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr ""
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, perl-format
 msgid "epub3.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 msgid "l2h: command not set"
 msgstr ""
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3297,22 +3297,27 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr ""
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, perl-format
+msgid "could not read extension file %s"
+msgstr ""
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr ""
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3321,7 +3326,7 @@ msgid ""
 "the behavior is identical, and does not depend on the installed name.\n"
 msgstr ""
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3340,51 +3345,51 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 msgid "      --docbook               output Docbook XML."
 msgstr ""
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 msgid "      --html                  output HTML."
 msgstr ""
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 msgid "      --epub3                 output EPUB3."
 msgstr ""
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 msgid "      --latex                 output LaTeX."
 msgstr ""
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 msgid "      --xml                   output Texinfo XML."
 msgstr ""
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3396,19 +3401,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3420,13 +3425,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3434,17 +3439,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3453,7 +3458,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3462,13 +3467,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3482,19 +3487,19 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr ""
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3505,75 +3510,75 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3584,7 +3589,7 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off."
 msgstr ""
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3601,61 +3606,61 @@ msgid ""
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr ""
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr ""
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index 1637322c08..879839b1c6 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.6.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-03-17 15:12-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -414,7 +414,7 @@ msgid "Try --help for more information.\n"
 msgstr "Por ricevi pli da informoj uzu la opcion “--help”.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -555,7 +555,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2084,7 +2084,7 @@ msgstr "ne eblas krei dosierujon '%s': %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: mankas dosiera argumento.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Por pluaj detaloj tajpu “%s --help”.\n"
@@ -2095,7 +2095,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: ne eblas malfermi %s por skribi: %s\n"
@@ -2107,7 +2107,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: ne eblas malfermi %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: eraro dum fermo de %s: %s\n"
@@ -2129,93 +2129,93 @@ msgstr "fiaskis alinomo de %s: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: eraro dum fermo de %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "ne eblas malfermi %s por skribi: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "eraro dum fermo de %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ne estas valida lingvokodo"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s ne estas valida regiona kodo"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s ne estas valida fenda elekto"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "eraro dum ŝargo de %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "arkaika variablo %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: nekonata variablo %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: nekonata variablo %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: nekonata variablo %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: eligo malkongruas kun fendo"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "ne eblas krei dosierujon '%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "eraro dum fermo de %s (dosiero kun 'image'-teksto): %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Dosiero '%s' en komando '@image' ne legeblas: %s"
@@ -2230,123 +2230,123 @@ msgstr "'@image'-dosiero '%s' ne troviĝas; '%s' 
uziĝas"
 msgid "no argument specified for @U"
 msgstr "mankas argumento je @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "'@image'-dosiero '%s' (por HTML) ne troviĝas; '%s' uziĝas"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "kruda aranĝo %s ne konvertiĝas"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "ne eblas malfermi %s (dosiero de HTML-referencaj agordoj): %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "mankas tipo"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "nerekonata tipo: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "eraro dum fermo de %s (dosiero de HTML-referencaj agordoj): %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "nekonata ago '%s'."
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "nekonata ago '%s'."
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "nefermita signoĉeno en CSS-dosiero"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "'--css-include' finiĝas en komento"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "nefinita komando '@import' en CSS-dosiero"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS-dosiero %s ne troviĝas"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "ne eblas malfermi '--include-file' %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "eraro dum fermo de CSS-dosiero %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "ne troviĝas ero en 'htmlxref.cnf' por '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside @%s block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s estas sensenca ene de bloko @%s"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "eraro dum fermo de %s (dosiero de kadro): %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "eraro dum fermo de %s (dosiero de enhavtabela kadro): %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "fiaskis traktilo %s de fazo %s prioritato %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "necesas indiki titolon je komando '@title' aŭ '@top'"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "eraro dum fermo de %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "eraro dum fermo de %s (dosiero de aldirektigoj): %s"
@@ -2449,30 +2449,30 @@ msgstr "Post '@xref' sekvendas '.' aŭ ',', ne '%s'"
 msgid "`.' or `,' must follow @xref"
 msgstr "Post '@xref' sekvendas '.' aŭ ','"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "nodnomo en menuero ne devus enteni '%s'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "nodnomo en menuero ne devus enteni ':'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "menuernomo ne devus enteni ':'"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "ne eblas legi %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "eraro dum fermo de '@verbatiminclude'-dosiero %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: ne eblas trovi %s"
@@ -3206,134 +3206,134 @@ msgstr "chm.pm: ne eblas malfermi %s por skribi: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: eraro dum fermo de %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "Dosiero '%s' en komando '@image' ne legeblas: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "ne eblas krei dosierujon '%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "ne eblas krei dosierujojn '%s' aŭ '%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "eraro dum skribo en '%s': %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "eraro dum fermo de %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "eraro dum skribo en '%s': %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "eraro dum fermo de %s (dosiero de aldirektigoj): %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "ne eblas krei dosierujon '%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: ne eblas malfermi %s por skribi: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: eraro dum fermo de %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: fiaskis ŝanĝi dosierujon al %s: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "eraro dum skribo en '%s'"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: ne eblas malfermi %s por skribi: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: dosierujo 'L2H_TMP' enhavas punkton"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: nuna dosierujo enhavas punkton"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: komando ne sukcesis: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: komando ne sukcesis: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: bildo havas nevalidan sufikson: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: fiaskis alinomo de %s al %s: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: ne eblas malfermi %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: fino de @%s-ero %d ne troviĝas"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3342,12 +3342,12 @@ msgstr ""
 "latex2html.pm: traktado produktis %d erojn en HTML; sed atendatas %d, la "
 "nombro de elementoj en la dokumento"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: ne eblas determini fragmenton %d por @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3355,54 +3355,54 @@ msgid ""
 msgstr ""
 "l2h: ne eblas eltiri fragmenton %d por @%s kun eliga nombrilo %d el HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: ne eblas ŝargi %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: ne eblas malfermi %s por skribi: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: ne eblas malfermi %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: fiaskis ŝanĝi dosierujon al %s: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: ne eblas reiri al komenca dosierujo: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: mankas eligdosiero: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: komando fiaskis: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: komando fiaskis: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: fino de @%s-ero %d ne troviĝas"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3414,12 +3414,12 @@ msgstr ""
 "tex4ht.pm: traktado produktis %d erojn en HTML; sed atendatas %d, la nombro "
 "de elementoj en la dokumento por @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: eligo ne enhavas HTML-an eron por '@%s %s'"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3431,12 +3431,12 @@ msgstr ""
 "tex4ht.pm: traktado produktis %d erojn en HTML; sed atendatas %d, la nombro "
 "de elementoj en la dokumento por @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3505,22 +3505,28 @@ msgstr "tex4ht.pm: eligo ne enhavas HTML-an eron por 
'@%s %s'"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: eligo ne enhavas HTML-an eron por '@%s %s'"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "ne eblas legi agordan dosieron %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "ne eblas legi agordan dosieron %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignoriĝas nekonata valoro de TEXINFO_OUTPUT_FORMAT: '%s'\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uzmaniero:  %s [OPCIO...] TEXINFO-DOSIERO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3534,7 +3540,7 @@ msgstr ""
 "Ĉi tiu programo kutime instaliĝis kiel ambaŭ 'makeinfo' kaj 'texi2any';\n"
 "ilia konduto tute samas kaj ne dependas je la nomo.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3568,61 +3574,61 @@ msgstr ""
 "  -v, --verbose               rakonti kio estas farata\n"
 "      --version               montri informon pri versio kaj fini\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "  -h, --help        montri ĉi tiun helpon kaj eliri"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "  -h, --help        montri ĉi tiun helpon kaj eliri"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "  -h, --help        montri ĉi tiun helpon kaj eliri"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "  -h, --help        montri ĉi tiun helpon kaj eliri"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "  -h, --help        montri ĉi tiun helpon kaj eliri"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3634,19 +3640,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3658,13 +3664,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3672,17 +3678,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3691,7 +3697,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3700,13 +3706,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3734,7 +3740,7 @@ msgstr ""
 "                                    ankroj; estas defaŭlta nur dum "
 "disfendado\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3742,7 +3748,7 @@ msgstr ""
 "Opcioj por XML kaj Docbook:\n"
 "      --output-indent=VALORO  (faras nenion; rekoniĝas por kongruo)\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3750,7 +3756,7 @@ msgstr ""
 "Opcioj por DVI/PS/PDF:\n"
 "      --Xopt=OPCIO            doni tiu OPCIO al 'texi2dvi'; ripeteblas\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3768,75 +3774,75 @@ msgstr ""
 "  -P UJO        antaŭmeti dosierUJOn al la serĉvojo de @include\n"
 "  -U VAR        maldifini la variablon VAR, kiel per @clear\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3862,7 +3868,7 @@ msgstr ""
 "malaktivas;\n"
 "  kiam XML generiĝas, --ifxml aktivas kaj la ceteraj malaktivas.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3895,58 +3901,58 @@ msgstr ""
 "  makeinfo --no-split UM.texi           Kreas unu Info-dosieron, kiom ajn "
 "grandan.\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: dum generado de %s, eblas indiki nur unu enigan DOSIEROn kun opcio '-o'\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opcio '--Xopt' indikatas sed ne fariĝas preseligo"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "nekonata arbotransformo %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "ignoriĝas disfendo por aranĝo %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mankas dosiera argumento.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "Transformo 'fill_gaps_in_sectioning()' ne donis rezulton. Neniu sekcio?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "eraro dum fermo de %s (dosiero de makroaj etendoj): %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "ne eblas malfermi %s por skribi: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3954,7 +3960,7 @@ msgstr ""
 "transformo 'insert_nodes_for_sectioning_commands()' ne donis rezulton.  "
 "Neniu sekcio?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: eraro dum fermo de %s (dosiero de internaj ligoj): %s\n"
diff --git a/po/es.po b/po/es.po
index ee103e5775..4de29d09e2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo-6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-26 10:53+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -425,7 +425,7 @@ msgid "Try --help for more information.\n"
 msgstr "Pruebe la opción `--help' para obtener más información.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -581,7 +581,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2220,7 +2220,7 @@ msgstr "%s: no se pudo crear el directorio %s: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: se necesita nombre de fichero que procesar;\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pruebe `%s --help' para obtener más información.\n"
@@ -2231,7 +2231,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: se hace caso omiso de %s sin contenido\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: no se pudo abrir %s para escritura: %s\n"
@@ -2242,7 +2242,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: no se pudo abrir %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: error cerrando %s: %s\n"
@@ -2262,94 +2262,94 @@ msgstr "%s: fallo al cambiar el nombre de %s: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: error al cerrar la salida estándar (stdout): %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "no se pudo abrir %s para escribir: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "error cerrando %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "'%s' no es válido como código de lenguaje"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "'%s' no es válido como código de región"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "'%s' no es una posibilidad de división válida"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "error al cargar %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "variable obsoleta %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: variable desconocida %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: variable desconocida %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: variable desconocida %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: salida incompatible con división"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "no se pudo crear el directorio '%s': %s"
 
 #  TODO ASK
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "error al cerrar el fichero de texto imagen %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "El fichero de imagen '%s' no es accesible: %s"
@@ -2364,87 +2364,87 @@ msgstr "El fichero @image '%s' no se ha encontrado; se 
utilizará '%s'"
 msgid "no argument specified for @U"
 msgstr "no se ha especificado argumento alguno para @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr ""
 "El fichero @image '%s' (para HTML) no se ha encontrado; se utilizará '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "el formato en bruto %s no se ha convertido"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 "no se pudo abrir el fichero de configuración de referencias html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "tipo ausente"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "tipo desconocido: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "error cerrando el fichero de configuración de referencias html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "acción desconocida '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "acción desconocida '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "cadena de texto sin cerrar en el fichero css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "'--css-include' finaliza con un comentario"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import no finalizado en el fichero css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "No se ha encontrado el fichero CSS %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "no se pudo abrir '--include-file' %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "error cerrando el fichero CSS '%s': %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "no se encontraron entradas htmlxref.cnf para `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s carece de sentido para salida indivisa"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2453,37 +2453,37 @@ msgstr ""
 "no se puede utilizar la ruta absoluta o URL «%s» para JS_WEBLABELS_FILE "
 "cuando se está generando el fichero de etiquetas web"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "error al cerrar el fichero marco %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "error al cerrar el fichero de tabla de contenidos %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "el manejador %s de la etapa %s con prioridad %s ha fallado"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 "hay que especificar un título mediante una orden de título o mediante @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s ya existe pero no es un directorio"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "error al copiar %s en %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "error al cerrar el fichero de redirección de nodos %s: %s"
@@ -2587,30 +2587,30 @@ msgstr "`.' o `,' tiene que ir precedido de @xref, no 
de %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' o `,' tiene que ir precedido de @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "el nombre de nodo de una entrada de menú no debe contener '%s'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "el nombre de nodo de una entrada de menú no debe contener ':'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "el nombre de una entrada de menú no debe contener ':'"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "no se pudo leer %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "error cerrando el fichero @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: no se pudo encontrar %s"
@@ -3354,134 +3354,134 @@ msgstr "chm.pm: no se ha podido abrir %s para 
escritura: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: error al cerrar %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "El fichero de imagen '%s' no es accesible: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "no se pudo crear el directorio '%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "no se pudieron crear los directorios '%s' o '%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "error mientras se escribía al fichero '%s': %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "error cerrando %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "error mientras se escribía al fichero '%s': %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "error al cerrar el fichero de redirección de nodos %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "no se pudo crear el directorio '%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: no se ha podido abrir %s para escritura: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: error al cerrar %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: fallo al cambiar al directorio %s: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "error mientras se escribía al fichero '%s'"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: no se ha podido abrir para escritura el fichero de latex %s: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: el directorio L2H_TMP contiene un punto"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: el directorio actual contiene un punto"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: la orden no terminó con éxito: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: la orden no terminó con éxito: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: la extensión de la imagen no es válida: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: el cambio de nombre de %s por %s ha fallado: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: no se ha podido abrir %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: final del elemento @%s %d no encontrado"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3490,12 +3490,12 @@ msgstr ""
 "latex2html.pm: el procesamiento ha producido %d elementos en HTML; se "
 "esperaban %d, el número de elementos que se han encontrado en el documento"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: no se ha podido determinar el fragmento %d para @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3504,53 +3504,53 @@ msgstr ""
 "l2h: no se ha podido extraer el fragmento %d para @%s con el contador de\n"
 "salida %d del HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: no se ha podido cargar %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: no se ha podido abrir %s para escritura: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: no se ha podido abrir %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: fallo al cambiar al directorio %s: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: no se ha podido volver al directorio inicial: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: falta el fichero de salida: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: la orden ha fallado: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: fallo al cerrar la comunicación: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: final de elemento @%s %d no encontrado"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3562,12 +3562,12 @@ msgstr ""
 "tex4ht.pm: el procesamiento ha producido %d elementos en HTML; se esperaban "
 "%d, el número de elementos que se han encontrado en el documento para %s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: la salida no tiene ningún elemento HTML para @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3579,12 +3579,12 @@ msgstr ""
 "tex4ht.pm: el procesamiento ha producido %d elementos en HTML; se esperaban "
 "%d, el número de elementos que se han encontrado en el documento para %s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3649,22 +3649,28 @@ msgid "highlight_syntax.pm: output has no HTML item for 
@%s %s %s"
 msgstr ""
 "highlight_syntax.pm: la salida no tiene ningún elemento HTML para @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "no se ha podido leer el fichero de inicialización %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "no se ha podido leer el fichero de inicialización %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignorando valor desconocido de TEXINFO_OUTPUT_FORMAT ('%s').\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Modo de empleo: %s [OPCIÓN]... FICHERO-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3682,7 +3688,7 @@ msgstr ""
 "el comportamiento es idéntico, y no depende del nombre que se haya "
 "instalado.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3730,61 +3736,61 @@ msgstr ""
 "      --version               mostrar información sobre la versión de esta\n"
 "                                aplicación informática.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   parte superior del manual principal"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   parte superior del manual principal"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   parte superior del manual principal"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   parte superior del manual principal"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   parte superior del manual principal"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3796,7 +3802,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3810,13 +3816,13 @@ msgstr ""
 "                            primero o principal, en lugar de a la salida "
 "estándar"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3828,13 +3834,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3842,17 +3848,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3861,7 +3867,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3870,13 +3876,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3906,7 +3912,7 @@ msgstr ""
 "solo\n"
 "                                si hay división.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3914,7 +3920,7 @@ msgstr ""
 "opciones para XML y Docbook:\n"
 "      --output-indent=VAL     no hace nada; se mantiene por compatibilidad.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3923,7 +3929,7 @@ msgstr ""
 "      --Xopt=OPC              pasa OPC a text2dvi; puede repetirse.\n"
 
 # TODO review shell
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3958,75 +3964,75 @@ msgstr ""
 "                                  propio documento mediante el uso de\n"
 "                                  `@clear VARIABLE'.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4053,7 +4059,7 @@ msgstr ""
 "no;\n"
 "  si este es XML, --ifxml estará activo, mientras que el resto no;\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -4130,61 +4136,61 @@ msgstr ""
 "cuán\n"
 "                                         grande sea.\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: al generar %s, solo puede especificarse un FICHERO de entrada con -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opción --Xopt sin salida impresa"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "transformación de árbol desconocida '%s'"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "no se realiza división para el formato %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: se necesita nombre de fichero que procesar.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "La transformación fill_gaps_in_sectioning no da ningún resultado.\n"
 "¿No hay ninguna sección?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "error al cerrar el fichero de expansión de macros '%s': %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "no se pudo abrir %s para escriturea: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4193,7 +4199,7 @@ msgstr ""
 "resultado.\n"
 "¿No hay ninguna sección?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: error al cerrar el fichero de enlaces internos %s: %s\n"
diff --git a/po/fi.po b/po/fi.po
index 77b41404ac..316099a2af 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 6.5.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2019-03-05 09:35+0200\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -410,7 +410,7 @@ msgid "Try --help for more information.\n"
 msgstr "Lisätietoa voi saada valitsimella --help\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -541,7 +541,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -1968,7 +1968,7 @@ msgstr "ei voida lukea: %s: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: tiedostoparametri puuttuu\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Lisätietoa komennolla ”%s --help”.\n"
@@ -1979,7 +1979,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: ei voitu avata tiedostoa %s kirjoitettavaksi: %s\n"
@@ -1991,7 +1991,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: ei voitu avata tiedostoa %s kirjoitettavaksi: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2013,93 +2013,93 @@ msgstr "%s: vanhentunut muuttuja %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr ""
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ei ole kelvollinen kielikoodi"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s ei ole kelvollinen aluekoodi"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error loading %s: %s"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "vanhentunut muuttuja %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: tuntematon muuttuja %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: tuntematon muuttuja %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: tuntematon muuttuja %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
@@ -2114,122 +2114,122 @@ msgstr ""
 msgid "no argument specified for @U"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "raakamuotoa %s ei muunneta"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "tyyppi puuttuu"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "tuntematon tyyppi: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "tuntematon toiminto \"%s\""
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "tuntematon toiminto \"%s\""
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "merkkijonoa ei päätetty CSS-tiedostossa"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include päättyi kommenttiin"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "CSS-tiedoston @import ei pääty"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS-tiedostoa %s ei löytynyt"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr ""
@@ -2332,30 +2332,30 @@ msgstr "@xrefiä tulee seurata \".\" tai \",\", ei %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "@xrefiä tulee seurata ”.” tai ”,”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "valikkotietueen solmun nimessä ei saa olla ”%s”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "valikkotietueen solmun nimessä ei saa olla ”:”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "valikkotietueen nimessä ei saa olla ”:”"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "ei voida lukea: %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr ""
@@ -3076,194 +3076,194 @@ msgstr ""
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, perl-format
 msgid "@image file `%s' can not be copied"
 msgstr ""
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not read %s: %s"
 msgid "could not create images directory `%s': %s"
 msgstr "ei voida lukea: %s: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "%s: could not open %s for writing: %s\n"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "%s: ei voitu avata tiedostoa %s kirjoitettavaksi: %s\n"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "virhe kirjoitettaessa kohteeseen %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "virhe kirjoitettaessa kohteeseen %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "virhe kirjoitettaessa kohteeseen %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not read %s: %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "ei voida lukea: %s: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: ei voitu avata tiedostoa %s kirjoitettavaksi: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 msgid "l2h: command not set"
 msgstr ""
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: ei voitu avata tiedostoa %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: ei voi palauttaa alkukansiota: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: could not open %s: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: ei voitu avata tiedostoa %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number "
@@ -3275,12 +3275,12 @@ msgstr ""
 "tex4ht.pm: käsittely palautti %d HTML-tietuetta. Odotettiin %d, mikä on "
 "tietueiden määrä tiedostossa kohteelle @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number "
@@ -3292,12 +3292,12 @@ msgstr ""
 "tex4ht.pm: käsittely palautti %d HTML-tietuetta. Odotettiin %d, mikä on "
 "tietueiden määrä tiedostossa kohteelle @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3361,22 +3361,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "alustustiedostoa %s ei voitu lukea"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "alustustiedostoa %s ei voitu lukea"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr ""
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Käyttö: %s [VALITSIN]... TEXINFOTSTO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3390,7 +3396,7 @@ msgstr ""
 "Ohjelma asennetaan tavallisesti sekä nimellä ”makeinfo” että ”texi2any”.\n"
 "Ohjelmat toimivat asennusnimistään riippumatta samoin.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3409,51 +3415,51 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 msgid "      --docbook               output Docbook XML."
 msgstr ""
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 msgid "      --html                  output HTML."
 msgstr ""
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 msgid "      --epub3                 output EPUB3."
 msgstr ""
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 msgid "      --latex                 output LaTeX."
 msgstr ""
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 msgid "      --xml                   output Texinfo XML."
 msgstr ""
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3465,19 +3471,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3489,13 +3495,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3503,17 +3509,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3522,7 +3528,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3531,13 +3537,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3551,13 +3557,13 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr ""
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3565,7 +3571,7 @@ msgstr ""
 "Valitsimet DVI/PS/PDF-muodolle:\n"
 "      --Xopt=VAL              välitä VAL texi2dvi:lle; voi toistaa.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3576,75 +3582,75 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3655,7 +3661,7 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off."
 msgstr ""
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3672,61 +3678,61 @@ msgid ""
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "tuntematon puumuunnos %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: tiedostoparametri puuttuu\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr ""
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 959cf5dc2d..2c0e1eb26b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-02 18:48+0200\n"
 "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -420,7 +420,7 @@ msgid "Try --help for more information.\n"
 msgstr "Utilisez --help pour plus d'informations.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -567,7 +567,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2132,7 +2132,7 @@ msgstr "%s : impossible de créer les répertoires « %s » : 
%s"
 msgid "%s: missing file argument\n"
 msgstr "%s : argument fichier absent\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Consultez « %s --help » pour plus d'informations.\n"
@@ -2143,7 +2143,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s : %s est vide, et ignoré\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s : impossible d'ouvrir %s en écriture : %s\n"
@@ -2154,7 +2154,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s : impossible d'ouvrir %s : %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s : erreur de fermeture de %s : %s\n"
@@ -2174,92 +2174,92 @@ msgstr "%s : échec du renommage de %s : %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s : erreur de fermeture de stdout : %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "impossible d'ouvrir %s en écriture : %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "erreur lors de la fermeture de %s : %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s n'est pas un code de langue"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s n'est pas un code de zone géographique"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s n'est pas une division valable"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "erreur de chargement de %s : %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s : variable %s inconnue"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s : variable %s inconnue\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s : variable %s inconnue\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s : sotie incompatible avec des divisions"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "impossible de créer les répertoires « %s » : %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "erreur de fermeture du fichier texte image %s : %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "fichier @image « %s » illisible : %s"
@@ -2274,86 +2274,86 @@ msgstr "fichier @image « %s » non trouvé ; utilisation 
de « %s »"
 msgid "no argument specified for @U"
 msgstr "aucun argument spécifié à @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr ""
 "fichier @image « %s » (pour le HTML) non trouvé ; utilisation de « %s »"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "le format brut %s n'est pas converti"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "impossible d'ouvrir le fichier de param. des réf. html %s : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "type manquant"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "type inconnu : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "erreur de fermeture du fichier de param. des réf. html %s : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "action « %s » inconnue"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "action « %s » inconnue"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "chaîne non terminée dans le fichier css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include s'est terminé dans un commentaire"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import non terminé dans le fichier css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "fichier CSS %s non trouvé"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "impossible d'ouvrir --include-file %s : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "erreur de fermeture du fichier CSS %s : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "aucune entrée htmlxref.cnf trouvée pour « %s »"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s n'a aucun sens pour une sortie monolithique"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2362,37 +2362,37 @@ msgstr ""
 "impossible d'utiliser un chemin absolu ou l'URL « %s » pour "
 "JS_WEBLABELS_FILE dans la génération du fichier de libellés web"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "erreur de fermeture du fichier-cadre HTML %s : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr ""
 "erreur de fermeture du fichier-cadre de table des matières (TOC) %s : %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "échec du gestionnaire %s de l'étape %s priorité %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "vous devez indiquer un titre avec @top ou une commande de titrage"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s déjà présent mais pas un dossier"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "erreur lors de la copie de %s en %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "erreur de fermeture du fichier de redirection des nœuds %s : %s"
@@ -2495,30 +2495,30 @@ msgstr "« . » ou « , » doit suivre @xref, pas %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "« . » ou « , » doit suivre @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "un nom de nœud en entrée de menu ne devrait contenir de « %s »"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "un nom de nœud en entrée de menu ne devrait contenir de « : »"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "une entrée de menu ne devrait pas contenir de « : »"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "impossible de lire %s : %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "erreur de fermeture du fichier @verbatiminclude %s : %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s : impossible de trouver %s"
@@ -3265,133 +3265,133 @@ msgstr "chm.pm : impossible d'ouvrir %s en écriture : 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm : erreur lors de la fermeture de %s : %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "fichier @image « %s » illisible : %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "impossible de créer les répertoires « %s » : %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "impossible de créer les répertoires « %s » ou « %s » : %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "erreur d'écriture dans %s : %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "erreur lors de la fermeture de %s : %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "erreur d'écriture dans %s : %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "erreur de fermeture du fichier de redirection des nœuds %s : %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "impossible de créer les répertoires « %s » : %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm : impossible d'ouvrir %s en écriture : %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm : erreur lors de la fermeture de %s : %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm : impossible de passer dans le répertoire %s : %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h : impossible d'ouvrir %s en écriture : %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h : le répertoire L2H_TMP contient un point"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h : le répertoire courant contient un point"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h : commande en échec : %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h : commande en échec : %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h : extension d'image invalide : %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h : échec du renommage de %s en %s : %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h : impossible d'ouvrir %s : %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm : fin de @%s élément %d non trouvé"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3400,12 +3400,12 @@ msgstr ""
 "latex2html.pm : le traitement a produit %d éléments HTML ; %d étaient "
 "attendus, correspondant au nombre d'éléments du document"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h : impossible de déterminer le fragment %d pour @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3414,53 +3414,53 @@ msgstr ""
 "l2h : impossible d'extraire le fragment %d pour @%s avec un compteur HTML de "
 "sortie %d"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h : impossible de charger %s : %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h : impossible d'ouvrir %s en écriture : %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm : impossible d'ouvrir %s : %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm : impossible de passer dans le répertoire %s : %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm : impossible de retourner au répertoire initial : %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm : fichier de sortie absent : %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm : commande en échec : %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm : fermeture de communication en échec : %s : %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm : fin de @%s, élément %d non trouvé"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3472,12 +3472,12 @@ msgstr ""
 "tex4ht.pm : le traitement a produit %d éléments HTML ; %d étaient attendus, "
 "correspondant au nombre d'éléments du document pour @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm : sortie sans élément HTML pour @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3489,12 +3489,12 @@ msgstr ""
 "tex4ht.pm : le traitement a produit %d éléments HTML ; %d étaient attendus, "
 "correspondant au nombre d'éléments du document pour @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3559,22 +3559,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm : sortie sans élément HTML pour @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "impossible de lire le fichier init %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "impossible de lire le fichier init %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "valeur « %s » de TEXINFO_OUTPUT_FORMAT non reconnue, ignorée.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Utilisation : %s [OPTION]... FICHIER-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3589,7 +3595,7 @@ msgstr ""
 "Ce programme s'installe sous les noms de « makeinfo » et « texi2any » ;\n"
 "le comportement est identique et ne dépend pas du nom de l'installation.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3626,61 +3632,61 @@ msgstr ""
 "  -v, --verbose               Explique ce qui est fait.\n"
 "      --version               Affiche la version du logiciel et s'arrête.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   « top » du document principal"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   « top » du document principal"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   « top » du document principal"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   « top » du document principal"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   « top » du document principal"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3692,7 +3698,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3705,13 +3711,13 @@ msgstr ""
 "principal\n"
 "                            au lieu de la sortie standard"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3723,13 +3729,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3737,17 +3743,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3756,7 +3762,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3765,13 +3771,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3800,7 +3806,7 @@ msgstr ""
 "                                nœuds et ancres ; défini par défaut\n"
 "                                uniquement avec l'option « split ».\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3808,7 +3814,7 @@ msgstr ""
 "Options des formats XML et Docbook :\n"
 "      --output-indent=VAL     sans objet (conservé pour compatibilité).\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3816,7 +3822,7 @@ msgstr ""
 "Options des formats DVI, PS et PDF :\n"
 "      --Xopt=OPTION           Passe OPTION à texi2dvi ; peut être répété.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3838,75 +3844,75 @@ msgstr ""
 "  -U VAR                        Supprime la variable VAR, comme avec "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3933,7 +3939,7 @@ msgstr ""
 "  Si on produit du texte, --ifplaintext est « on » et les autres « off ».\n"
 "  Si on produit du format XML, --ifxml est « on » et les autres « off ».\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3968,58 +3974,58 @@ msgstr ""
 "  makeinfo --no-split foo.texi           Écrit un seul fichier Info\n"
 "                                           quelque soit sa taille\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s: --footnote-style est « separate » ou « end », pas « %s ».\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s : --paragraph-indent est numérique, « none » ou « asis », pas « %s ».\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s : pour produire %s, un seul fichier d'entrée peut être spécifié par -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "option --Xopt sans sortie imprimée"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "transformation d'arbre inconnue %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "découpage sans objet pour le format %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s : argument fichier absent.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "la transformation fill_gaps_in_sectioning ne renvoie rien. Pas de section ?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "erreur de fermeture du fichier d'expansion de macros %s : %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "impossible d'ouvrir %s en écriture : %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4027,7 +4033,7 @@ msgstr ""
 "la transformation insert_nodes_for_sectioning_commands ne renvoie rien. Pas "
 "de section ?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s : erreur de fermeture du fichiers de liens internes %s : %s\n"
diff --git a/po/he.po b/po/he.po
index 6ec96ebca5..5c12869494 100644
--- a/po/he.po
+++ b/po/he.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2002-04-03 12:31+0300\n"
 "Last-Translator: Eli Zaretskii <eliz@gnu.org>\n"
 "Language-Team: Hebrew <eliz@gnu.org>\n"
@@ -455,7 +455,7 @@ msgid "Try --help for more information.\n"
 msgstr ".���� �� ���� ����� --help ���\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -567,7 +567,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -2202,7 +2202,7 @@ msgstr "`%s' 
 msgid "%s: missing file argument\n"
 msgstr ".���� �� ��� %s ������\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ".`%s --help' ��� ��� �����\n"
@@ -2213,7 +2213,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 #| msgid "%s: could not read (%s) and could not create (%s)\n"
 msgid "%s: could not open %s for writing: %s\n"
@@ -2225,7 +2225,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2246,98 +2246,98 @@ msgstr ""
 msgid "%s: error on closing stdout: %s\n"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr ""
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid language code"
 msgstr "ISO 639 �\"� ������� ����� ������ ��� ���� %s"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
 msgstr "ISO 639 �\"� ������� ����� ������ ��� ���� %s"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error loading %s: %s"
 msgstr "`%s'-� ������ ����"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown variable %s"
 msgstr "����� ����� `%s' �����"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown variable from command line: %s\n"
 msgstr "����� ����� `%s' �����"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown formatting context %s\n"
 msgstr "����� ����� `%s' �����"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create directory `%s': %s"
 msgstr "`%s' ����� ������ (%s) ����"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing image text file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ���� `%s' ���� ������ (%s) ����"
@@ -2355,134 +2355,134 @@ msgstr "@image 
 msgid "no argument specified for @U"
 msgstr "����� �� ��� `%c%s' �����"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 #| msgid "@image file `%s' (for HTML) not readable: %s"
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "(HTML ���� ����) @image ���� `%s' ���� ������ (%s) ����"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 #| msgid "missing action name"
 msgid "missing type"
 msgstr "����� �� ���"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 #| msgid "%s: unrecognized option `--%s'\n"
 msgid "unrecognized type: %s"
 msgstr "%s ����� ���� `--%s' �����-���� ������\n"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing html refs config file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "����� ����� `%s' �����"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "����� ����� `%s' �����"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 #| msgid "cannot open input file `%s'"
 msgid "could not open --include-file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing CSS file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 #| msgid "no index entries found for `%s'\n"
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "`%s' ������ ������� ������ ����� ���\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "`@%s' ���� @%s-� ������ ���"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing frame file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing TOC frame file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, fuzzy, perl-format
 #| msgid "File exists, but is not a directory"
 msgid "%s already exists but is not a directory"
 msgstr "����� ������ ���� ���� ����"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error on copying %s into %s"
 msgstr "`%s'-� ������ ����"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing redirection node file %s: %s"
@@ -2594,31 +2594,31 @@ msgstr "%c 
 msgid "`.' or `,' must follow @xref"
 msgstr "%c ��� `,' �� `.' ���� ���� ����� ����"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr ""
@@ -3405,218 +3405,218 @@ msgstr ""
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image ���� `%s' ���� ������ (%s) ����"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "`%s' ����� ������ (%s) ����"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "`%s' ����� ������ (%s) ����"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error removing directory: %s: %s"
 msgstr "`%s'-� ������ ����"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error creating directory: %s: %s"
 msgstr "`%s'-� ������ ����"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "`%s' ����� ������ (%s) ����"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not read (%s) and could not create (%s)\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s ���� �� (%s) ������ ��� (%s) ������ �� ����\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 msgid "l2h: command not set"
 msgstr ""
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3672,23 +3672,29 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not read init file %s"
 msgstr ".`%s' ��� ���� ������ ����"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
+msgid "could not read extension file %s"
+msgstr ".`%s' ��� ���� ������ ����"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr ""
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "%s [��������]... TEXINFO-����... :������ ����\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 #| msgid ""
 #| "Translate Texinfo source documentation to various other formats, by "
@@ -3705,7 +3711,7 @@ msgstr ""
 " ���� ������ ,����� ����� �������� Texinfo ���� ���� ����� ����\n"
 ".GNU Info  ����� �� Emacs ����� ������ �������� Info ���� ����� \n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 #| msgid ""
 #| "General options:\n"
@@ -3744,61 +3750,61 @@ msgstr ""
 "                    .������ ����� �� ���� ���  -v, --verbose\n"
 "               .��� ����� ����� ���� ���� ���      --version\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "������� ��� �� ���� ��� ���"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "������� ��� �� ���� ��� ���"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "������� ��� �� ���� ��� ���"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "������� ��� �� ���� ��� ���"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "������� ��� �� ���� ��� ���"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3810,19 +3816,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3834,13 +3840,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3848,17 +3854,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3867,7 +3873,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3876,13 +3882,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3896,19 +3902,19 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr ""
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 #| msgid ""
 #| "Input file options:\n"
@@ -3935,75 +3941,75 @@ msgstr ""
 "       .@include �� ����� ����� ���� DIR ����  -P DIR\n"
 "      .@clear ������ ��� ,VAR ����� ����� ���  -U VAR\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4024,7 +4030,7 @@ msgstr ""
 "        .������� ���� ���� ��� ����� --ifinfo  ,���� �� Info ��� ���� ��\n"
 "           .������� ���� ���� ��� ����� --ifplaintext  ,���� ��� ���� ��\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 #| msgid ""
 #| "Examples:\n"
@@ -4067,65 +4073,65 @@ msgstr ""
 "             ������� ����� �� Info ���  makeinfo --number-sections foo.texi\n"
 "   ����� ��� ���� ,���� ����� Info ���  makeinfo --no-split foo.texi\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: `%s' �� ,`end' �� `separate' ����� --footnote-style �� ������� ��\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: `%s' �� ,`asis'/`none'/����� ����� --paragraph-indent �� ������� ��\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown tree transformation %s"
 msgstr "����� ����� `%s' �����"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr ".���� �� ��� %s ������\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index e6a031d30e..8a320d88d2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo-6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-02 17:01+0200\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -417,7 +417,7 @@ msgid "Try --help for more information.\n"
 msgstr "Pokušajte --help za više informacija.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -561,7 +561,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2120,7 +2120,7 @@ msgstr "%s: nije (bilo) moguće napraviti direktorij %s: 
%s"
 msgid "%s: missing file argument\n"
 msgstr "%s: nedostaje datotečni argument\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Pokušajte s „%s --help“ za više informacija.\n"
@@ -2131,7 +2131,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: ignoriramo besadržajni %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: nije (bilo) moguće otvoriti %s za pisanje: %s\n"
@@ -2142,7 +2142,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: nije (bilo) moguće otvoriti %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: greška pri zatvaranju %s: %s\n"
@@ -2162,94 +2162,94 @@ msgstr "%s: nije uspjelo preimenovati %s: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: greška pri zatvaranju stdout: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "nije (bilo) moguće otvoriti %s za pisanje: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "greška pri zatvaranju %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s nije ispravan jezični kȏd"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s nije ispravan kȏd regije"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s nije valjana mogućnost cijepanja"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "greška pri učitavanju %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "zastarjela varijabla %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: nepoznata varijabla %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: nepoznata varijabla %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: nepoznata varijabla %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: izlaz nije kompatibilan s razdiobom"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "nije (bilo) moguće napraviti direktorij „%s“: %s"
 
 # tekstualna datoteka slike ili datoteka teksta slike? (TK)
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "greška pri zatvaranju %s (datoteka s tekstualnim opisom slike): %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "nije moguće pročitati @image datoteku „%s“: %s"
@@ -2264,89 +2264,89 @@ msgstr "@image datoteka „%s“ nije pronađena, koristimo 
„%s“"
 msgid "no argument specified for @U"
 msgstr "nijedan argument nije specificiran za @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image datoteka „%s“ (za HTML) nije pronađena, koristimo „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "neobrađeni format %s nije pretvoren"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 "nije moguće otvoriti konfiguracijsku datoteku unakrsnih poveznica HTML-a %s: "
 "%s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "nema vrste"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "neprepoznata vrsta: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr ""
 "greška pri zatvaranju konfiguracijske datoteke unakrsnih poveznica HTML-a "
 "%s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "nepoznata akcija „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "nepoznata akcija „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "string nije zatvoren u CSS datoteci"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include završava u komentaru"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import nije završen u CSS datoteci"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS datoteka %s nije pronađena"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "nije (bilo) moguće otvoriti --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "greška pri zatvaranju CSS datoteke %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "nije pronađena stavka htmlxref.cnf za „%s“"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s nema smisla za nerazdijeljeni izlaz"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2355,36 +2355,36 @@ msgstr ""
 "nije moguće koristiti apsolutnu stazu ili URL „%s“ za JS_WEBLABELS_FILE pri "
 "generiranju oznaka WWW (web) datoteke"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "greška pri zatvaranju datoteke okvira %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "greška pri zatvaranju datoteke TOC okvira %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "greška manipulatora %s faze %s prioriteta %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "morate navesti naslov naredbom naslova ili @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s već postoji ali nije direktorij"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "greška pri kopiranju %s u %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "greška pri zatvaranju %s (datoteka s preusmjernicama za čvorove): %s"
@@ -2487,30 +2487,30 @@ msgstr "„.“ ili „,“ mora slijediti @xref, a ne %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "„.“ ili „,“ mora slijediti @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "ime čvora u stavki menīja ne smije sadržavati „%s“"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "ime čvora u stavki menīja ne smije sadržavati „:“"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "ime stavke u menīju ne smije sadržavati „:“"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "nije (bilo) moguće čitati %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "greška pri zatvaranju @verbatiminclude datoteke %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: nije (bilo) moguće pronaći %s"
@@ -3243,133 +3243,133 @@ msgstr "chm.pm: nije (bilo) moguće otvoriti %s za 
pisanje: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: greška pri zatvaranju %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "nije moguće pročitati @image datoteku „%s“: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "nije (bilo) moguće napraviti direktorij „%s“: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "nije (bilo) moguće napraviti direktorije „%s“ ili „%s“: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "greška pri pisanju u %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "greška pri zatvaranju %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "greška pri pisanju u %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "greška pri zatvaranju %s (datoteka s preusmjernicama za čvorove): %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "nije (bilo) moguće napraviti direktorij „%s“: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: nije (bilo) moguće otvoriti %s za pisanje: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: greška pri zatvaranju %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: promjena direktorija na %s nije uspjela: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: nije (bilo) moguće otvoriti latex datoteku %s za pisanje: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: L2H_TMP direktorij sadrži točku"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: aktualni direktorij sadrži točku"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: naredba nije uspjela: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: naredba nije uspjela: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: slika ima nevaljani sufiks: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: preimenovanje %s u %s nije uspjelo: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: nije (bilo) moguće otvoriti %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: završetak @%s stavke %d nije pronađen"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3378,12 +3378,12 @@ msgstr ""
 "latex2html.pm: obrada je napravila %d elemenata u HTML-u; očekivano je %d, "
 "koliko ih je pronađeno u dokumentu"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: nije (bilo) moguće odrediti fragment %d za @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3392,53 +3392,53 @@ msgstr ""
 "l2h: nije (bilo) moguće izdvojiti fragment %d za @%s izlaznim brojilom %d iz "
 "HTML-a"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: nije (bilo) moguće učitati %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: nije (bilo) moguće otvoriti %s za pisanje: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: nije (bilo) moguće otvoriti %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: promjena direktorija na %s nije uspjela: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: nije moguće vratiti se u početni direktorij: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: nema izlazne datoteke: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: naredba nije uspjela: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: nije uspjelo završiti razmjenu podataka: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: završetak @%s stavke %d nije pronađen"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3450,12 +3450,12 @@ msgstr ""
 "tex4ht.pm: obrada je napravila %d elemenata u HTML-u; očekivano je %d, "
 "koliko ih je pronađeno u dokumentu za @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: izlaz nema element HTML za @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3467,12 +3467,12 @@ msgstr ""
 "tex4ht.pm: obrada je napravila %d elemenata u HTML-u; očekivano je %d, "
 "koliko ih je pronađeno u dokumentu za @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3534,22 +3534,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: izlaz nema element HTML-a za @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "nije (bilo) moguće čitati inicijalizacijsku datoteku %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "nije (bilo) moguće čitati inicijalizacijsku datoteku %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignorira se neprepoznata vrijednost „%s“ za TEXINFO_OUTPUT_FORMAT\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uporaba: %s [OPCIJA]... TEXINFO-DATOTEKA...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3564,7 +3570,7 @@ msgstr ""
 "Taj program se normalno instalira kao „makeinfo“ i „texi2any“;\n"
 "ponašanje im je identično i ne ovisi o instaliranom imenu.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3602,61 +3608,61 @@ msgstr ""
 "  -v, --verbose               objašnjava što se izvršava\n"
 "      --version               informacije o inačici ovog programa\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   vrh glavnog priručnika"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   vrh glavnog priručnika"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   vrh glavnog priručnika"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   vrh glavnog priručnika"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   vrh glavnog priručnika"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3668,7 +3674,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3681,13 +3687,13 @@ msgstr ""
 "priručnik\n"
 "                            umjesto na standardni izlaz"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3699,13 +3705,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3713,17 +3719,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3732,7 +3738,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3741,13 +3747,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3773,7 +3779,7 @@ msgstr ""
 "      --node-files            napravi datoteke preusmjeravanja za čvorove i\n"
 "                                sidra; zadano samo pri cijepanju\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3781,7 +3787,7 @@ msgstr ""
 "Opcije za XML i Docbook:\n"
 "      --output-indent=VAL     nema efekta, zadržano zbog kompatibilnosti\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3790,7 +3796,7 @@ msgstr ""
 "      --Xopt=OPCIJA           proslijedi OPCIJU na texi2dvi; može se "
 "ponoviti\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3811,75 +3817,75 @@ msgstr ""
 "                                pretraživanja\n"
 "  -U VAR                      briše definiciju varijable VAR, kao s @clear\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3905,7 +3911,7 @@ msgstr ""
 "isključeni;\n"
 "  ako stvaramo XML, --ifxml je uključen, a ostali su isključeni.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3938,61 +3944,61 @@ msgstr ""
 "  makeinfo --no-split foo.texi       jedna Info-datoteka bez obzira na "
 "veličinu\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style argument mora biti: „separate“ ili „end“, a ne „%s“\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent argument mora biti: broj, „none“ ili „asis“, a ne "
 "„%s“\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: pri stvaranju %s, opcijom -o smije se navesti samo jedna ulazna "
 "DATOTEKA\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "--Xopt opcija bez ispisanog izlaza"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "nepoznata transformacija stabla %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "cijepanje za format %s se ignorira"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: nema datotečnog argumenta.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "fill_gaps_in_sectioning transformacija ne vraća rezultat. Nema odlomka?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "greška pri zatvaranju %s, datoteke s makro širenjem: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nije (bilo) moguće otvoriti %s za pisanje: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4000,7 +4006,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commands transformacija ne vraća rezultat. Nema "
 "odlomka?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: greška pri zatvaranju datoteke internih poveznica %s: %s\n"
diff --git a/po/hu.po b/po/hu.po
index ca3d6e6ed2..10a34d9546 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.7.x\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2006-02-18 16:00+0100\n"
 "Last-Translator: Máté LABÁDI <labadimate@freemail.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -453,7 +453,7 @@ msgid "Try --help for more information.\n"
 msgstr "A --help több információt ad.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -562,7 +562,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -2266,7 +2266,7 @@ msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: hiányzó fájl argumentum.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, 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"
@@ -2277,7 +2277,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "%s: could not open %s for writing: %s\n"
@@ -2290,7 +2290,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2312,64 +2312,64 @@ msgstr "%s: már van dir fájl: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid language code"
 msgstr "%s nem egy ISO 639 szabvány szerinti nyelvkód"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
 msgstr "%s nem egy ISO 639 szabvány szerinti nyelvkód"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error loading %s: %s"
 msgstr "hiba „%s“ írásakor."
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown variable %s"
@@ -2377,7 +2377,7 @@ msgstr "ismeretlen művelet: „%s“."
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown variable from command line: %s\n"
@@ -2385,32 +2385,32 @@ msgstr "ismeretlen művelet: „%s“."
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown formatting context %s\n"
 msgstr "ismeretlen művelet: „%s“."
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create directory `%s': %s"
 msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing image text file %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
@@ -2428,18 +2428,18 @@ msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
 msgid "no argument specified for @U"
 msgstr "A(z) „%c%s“ parancshoz nem lett oldalnév rendelve"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 #| msgid "@image file `%s' (for HTML) not readable: %s"
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image a(z) „%s“ fájl (HTML) nem olvasható: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open html refs config file %s: %s"
@@ -2447,19 +2447,19 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 #| msgid "missing action name"
 msgid "missing type"
 msgstr "hiányzó műveletnév"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 #| msgid "%s: unrecognized option `--%s'\n"
 msgid "unrecognized type: %s"
 msgstr "%s: ismeretlen opció „--%s“\n"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing html refs config file %s: %s"
@@ -2467,7 +2467,7 @@ msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
@@ -2475,95 +2475,95 @@ msgstr "ismeretlen művelet: „%s“."
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "ismeretlen művelet: „%s“."
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 #, fuzzy
 #| msgid "%s:%d: --css-file ended in comment"
 msgid "--css-include ended in comment"
 msgstr "%s:%d: --css-file kommenttel végződik"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open --include-file %s: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing CSS file %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 #| msgid "no index entries found for `%s'\n"
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "Nincs tárgymutató ehhez: %s\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s -nek nincs jelentése a(z) „@%s“ blokkon belül"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing frame file %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing TOC frame file %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error on copying %s into %s"
 msgstr "hiba „%s“ írásakor."
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing redirection node file %s: %s"
@@ -2675,32 +2675,32 @@ msgstr ""
 msgid "`.' or `,' must follow @xref"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not read %s: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "@%s: could not find %s"
@@ -3509,225 +3509,225 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error removing directory: %s: %s"
 msgstr "hiba „%s“ írásakor."
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error creating directory: %s: %s"
 msgstr "hiba „%s“ írásakor."
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: command not set"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not load %s: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s for writing: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3784,13 +3784,19 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not read init file %s"
 msgstr "A kimeneti fájl („%s“) nem hozható létre."
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
+msgid "could not read extension file %s"
+msgstr "A kimeneti fájl („%s“) nem hozható létre."
+
+#: tp/texi2any.pl:654
 #, fuzzy, perl-format
 #| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
@@ -3798,12 +3804,12 @@ msgstr ""
 "%s: Figyelmen kívül hagyom a fel nem ismert TEXINFO_OUTPUT_FORMAT értéket "
 "(„%s“).\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Használat: %s [OPCIÓK] ... TEXINFO-FÁJL...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3812,7 +3818,7 @@ msgid ""
 "the behavior is identical, and does not depend on the installed name.\n"
 msgstr ""
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3831,61 +3837,61 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "kiírja e súgót és kilép"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "kiírja e súgót és kilép"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "kiírja e súgót és kilép"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "kiírja e súgót és kilép"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "kiírja e súgót és kilép"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3897,19 +3903,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3921,13 +3927,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3935,17 +3941,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3954,7 +3960,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3963,13 +3969,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3983,19 +3989,19 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr ""
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -4006,75 +4012,75 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -4085,7 +4091,7 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off."
 msgstr ""
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -4102,70 +4108,70 @@ msgid ""
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
 # action=művelet ? LM
 # általában az - sas
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown tree transformation %s"
 msgstr "ismeretlen művelet: „%s“."
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: hiányzó fájl argumentum.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s\n"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po/id.po b/po/id.po
index 348e5cb117..7bb68ab4f6 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 5.1.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2014-08-11 17:30+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -438,7 +438,7 @@ msgid "Try --help for more information.\n"
 msgstr "Coba --help untuk informasi lebih lanjut.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -628,7 +628,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2306,7 +2306,7 @@ msgstr "Tidak dapat membuat direktori `%s': %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: hilang argumen berkas.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
@@ -2317,7 +2317,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: tidak dapat membuka %s --css-file: %s\n"
@@ -2329,7 +2329,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: tidak dapat membuka --css-file: %s %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: error on closing %s: %s\n"
@@ -2351,93 +2351,93 @@ msgstr "rename %s failed: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: error on closing %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "tidak dapat membuka %s --css-file: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s is not a valid split possibility"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "error menulis ke `%s': %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "Set variabel: %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "aksi `%s' tidak dikenal %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "aksi `%s' tidak dikenal %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "aksi `%s' tidak dikenal %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "Tidak dapat membuat direktori `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image berkas `%s' tidak dapat dibaca: %s"
@@ -2454,123 +2454,123 @@ msgstr "@image berkas `%s' tidak dapat dibaca: %s"
 msgid "no argument specified for @U"
 msgstr "Tidak nama titik dispesifikasikan untuk perintah `%c%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image berkas `%s' (untuk HTML) tidak dapat dibaca: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "raw format %s is not converted"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "tidak dapat membuka --css-file: %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "hilang nama aksi"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "opsi tidak dikenal %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "aksi `%s' tidak dikenal"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "aksi `%s' tidak dikenal"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "string not closed in css file"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-file berakhir dalam komentar"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import not finished in css file"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS file %s not found"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "tidak dapat membuka --css-file: %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "tidak ada masukan indeks ditemukan untuk `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s tidak berarti didalam blok `@%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "handler %s of stage %s priority %s failed"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "must specify a title with a title command or @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
@@ -2672,30 +2672,30 @@ msgstr "`.' atau `,' harus mengikuti, bukan `%s'"
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' atau `,' harus mengikuti"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "menu entry node name should not contain `%s'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "menu entry node name should not contain `:'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "menu entry name should not contain `:'"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "%s: tidak dapat membuka --css-file: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "error menutup berkas keluaran `%s' : %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "%s: tidak dapat membuka --css-file: %s"
@@ -3436,134 +3436,134 @@ msgstr "tidak dapat membuka %s: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: error on closing %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image berkas `%s' tidak dapat dibaca: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "Tidak dapat membuat direktori `%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "Tidak dapat membuat direktori `%s' atau `%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "error menulis ke `%s': %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "error menulis ke `%s': %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "Tidak dapat membuat direktori `%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "tidak dapat membuka %s: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: error on closing %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir %s failed: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "error menulis ke `%s'"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "tidak dapat membuka --css-file: %s %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: L2H_TMP directory contains a dot"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: current directory contains a dot"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: command did not succeed: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: command did not succeed: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: image has invalid extension: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: rename %s as %s failed: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "tidak dapat membuka --css-file: %s %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: end of @%s item %d not found"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3572,12 +3572,12 @@ msgstr ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: could not determine the fragment %d for @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3586,54 +3586,54 @@ msgstr ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "tidak dapat membuka --css-file: %s %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "tidak dapat membuka --css-file: %s %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tidak dapat membuka --css-file: %s %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir %s failed: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: unable to return to initial directory: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: output file missing: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: command failed: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: command failed: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: end of @%s item %d not found"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3645,12 +3645,12 @@ msgstr ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: output has no HTML item for @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3662,12 +3662,12 @@ msgstr ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3736,23 +3736,29 @@ msgstr "tex4ht.pm: output has no HTML item for @%s %s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: output has no HTML item for @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "Tidak dapat membuat berkas keluaran `%s'."
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "Tidak dapat membuat berkas keluaran `%s'."
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "Mengabaikan nilai TEXINFO_OUTPUT_FORMAT tidak dikenal `%s'.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, fuzzy, perl-format
 #| msgid "Usage: %s [OPTION]... FILE...\n"
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Penggunaan: %s [OPSI]... BERKAS...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 #| msgid ""
 #| "Translate Texinfo source documentation to various other formats, by "
@@ -3770,7 +3776,7 @@ msgstr ""
 "Berkas info yang sesuai untuk pembacaan online dengan Emacs atau standalone "
 "GNU Info.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 #| msgid ""
 #| "General options:\n"
@@ -3818,61 +3824,61 @@ msgstr ""
 "  -v, --verbose               jelaskan apa yang sedang dilakukan.\n"
 "      --version               tampilkan informasi versi dan keluar.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "tampilkan bantuan ini dan keluar"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "tampilkan bantuan ini dan keluar"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "tampilkan bantuan ini dan keluar"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "tampilkan bantuan ini dan keluar"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "tampilkan bantuan ini dan keluar"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3884,19 +3890,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3908,13 +3914,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3922,17 +3928,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3941,7 +3947,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3950,13 +3956,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3979,7 +3985,7 @@ msgstr ""
 "                              hasilkan nama berkas dalam transliterasi "
 "ASCII.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3987,7 +3993,7 @@ msgstr ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3995,7 +4001,7 @@ msgstr ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 #| msgid ""
 #| "Input file options:\n"
@@ -4023,75 +4029,75 @@ msgstr ""
 "  -U VAR                        tidak definisikan variabel VAR, sama dengan "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4116,7 +4122,7 @@ msgstr ""
 "off;\n"
 "  jika menghasilkan XML, --ifxml adalah on dan yang lain adalah off.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -4145,57 +4151,57 @@ msgstr ""
 "  makeinfo --no-split foo.texi            tulis satu berkas Info walaupun "
 "besar\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr "%s: when generating %s, only one input FILE may be specified with -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "--Xopt option without printed output"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "aksi `%s' tidak dikenal"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "ignoring splitting for format %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: hilang argumen berkas.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr "fill_gaps_in_sectioning transformation return no result. No section?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "error menutup berkas keluaran `%s': %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s: tidak dapat membuka --css-file: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4203,7 +4209,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: mengabaikan keluaran link internal kedua `%s'. %s\n"
diff --git a/po/it.po b/po/it.po
index bde2153be3..7b00890d94 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.6.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2020-10-22 14:08+0200\n"
 "Last-Translator: Francesco Groccia <f.g@disroot.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -410,7 +410,7 @@ msgid "Try --help for more information.\n"
 msgstr "Usare «--help» per maggiori informazioni.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -556,7 +556,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2108,7 +2108,7 @@ msgstr "impossibile creare le directory «%s»: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: nome file mancante.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Usare «%s --help» per maggiori informazioni.\n"
@@ -2119,7 +2119,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: impossibile aprire %s per la scrittura: %s\n"
@@ -2131,7 +2131,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: impossibile aprire %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: errore durante la chiusura %s: %s\n"
@@ -2153,92 +2153,92 @@ msgstr "rinomina di %s fallita: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: errore durante la chiusura %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "impossibile aprire %s per la scrittura: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "errore durante la chiusura di %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è un codice di lingua valido"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s non è un codice di regione valido"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s non è una valida possibilità di divisione"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "errore durante il caricamento di %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: variabile %s sconosciuta"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: variabile %s sconosciuta\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: variabile %s sconosciuta\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: output incompatibile con la divisione"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "impossibile creare le directory «%s»: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "errore durante la chiusura del file testo dell'immagine %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "file @image «%s» non leggibile: %s"
@@ -2253,126 +2253,126 @@ msgstr "file @image «%s» non trovato, verrà usato 
«%s»"
 msgid "no argument specified for @U"
 msgstr "nessun argomento specificato per @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "file immagine «%s» (per il formato HTML) non trovato, verrà usato «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "il formato grezzo %s non è convertito"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 "impossibile aprire il file di configurazione dei riferimenti HTML %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "tipo mancante"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "tipo non riconosciuto: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr ""
 "errore durante la chiusura del file di configurazione dei riferimenti HTML "
 "%s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "azione «%s» sconosciuta"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "azione «%s» sconosciuta"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "stringa non chiusa nel file CSS"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "l'opzione «--css-include» termina con un commento"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import non terminato nel file CSS"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "file CSS %s non trovato"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "impossibile aprire --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "errore durante la chiusura del file CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "nessuna voce htmlxref.cnf trovata per «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside @%s block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s è privo di significato all'interno del blocco @%s"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "errore durante la chiusura del file frame %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "errore durante la chiusura del file TOC frame %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "gestore %s dello stage %s con priorità %s fallito"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "è necessario specificare un titolo con un comando «title» o @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "errore durante la chiusura di %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "errore durante la chiusura del file del nodo di redirezione %s: %s"
@@ -2475,30 +2475,30 @@ msgstr "«.» o «,» devono seguire @xref, non %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "«.» o «,» devono seguire @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "il nome del nodo della voce del menù non dovrebbe contenere «%s»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "il nome del nodo della voce del menù non dovrebbe contenere «:»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "il nome della voce del menù non dovrebbe contenere «:»"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "impossibile leggere %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "errore durante la chiusura del file @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: impossibile trovare %s"
@@ -3244,133 +3244,133 @@ msgstr "chm.pm: impossibile aprire %s per la 
scrittura: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: errore durante la chiusura di %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "file @image «%s» non leggibile: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "impossibile creare le directory «%s»: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "impossibile creare le directory «%s» o «%s»: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "errore durante la scrittura del file %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "errore durante la chiusura di %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "errore durante la scrittura del file %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "errore durante la chiusura del file del nodo di redirezione %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "impossibile creare le directory «%s»: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: impossibile aprire %s per la scrittura: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: errore durante la chiusura di %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir di %s fallita: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: impossibile aprire il file latex %s per la scrittura: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: la directory L2H_TMP contiene un punto"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: la directory corrente contiene un punto"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: comando non riuscito: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: comando non riuscito: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: l'immagine ha un'estensione non valida: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: rinomina di %s come %s fallita: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: impossibile aprire %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: fine dell'elemento @%s %d non trovata"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3379,12 +3379,12 @@ msgstr ""
 "latex2html.pm: l'elaborazione ha prodotto %d voci in HTML; si aspettava %d, "
 "il numero di voci trovate nel documento"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: impossibile determinare il frammento %d per @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3393,54 +3393,54 @@ msgstr ""
 "l2h: impossibile estrarre il frammento %d per @%s con il contatore "
 "dell'output %d dall'HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: impossibile caricare %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: impossibile aprire %s per la scrittura: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: impossibile aprire %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir di %s fallita: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: impossibile ritornare alla directory iniziale: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: file output mancante: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: comando fallito: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: comando fallito: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: fine dell'elemento @%s %d non trovata"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3452,12 +3452,12 @@ msgstr ""
 "tex4ht.pm: l'elaborazione ha prodotto %d voci in HTML; si aspettava %d, il "
 "numero di voci trovate nel documento per @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: l'output non ha nessuna voce HTML per @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3469,12 +3469,12 @@ msgstr ""
 "tex4ht.pm: l'elaborazione ha prodotto %d voci in HTML; si aspettava %d, il "
 "numero di voci trovate nel documento per @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3543,22 +3543,28 @@ msgstr "tex4ht.pm: l'output non ha nessuna voce HTML 
per @%s %s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: l'output non ha nessuna voce HTML per @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "impossibile leggere il file di inizializzazione %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "impossibile leggere il file di inizializzazione %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignora il valore sconosciuto di TEXINFO_OUTPUT_FORMAT «%s»\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uso: %s [OPZIONE]... FILE-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3574,7 +3580,7 @@ msgstr ""
 "Questo programma è solitamente installato come «makeinfo» e «texi2any»;\n"
 "il comportamento è identico, e non dipende dal nome installato.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3614,51 +3620,51 @@ msgstr ""
 "  -v, --verbose               spiega cosa sta facendo.\n"
 "      --version               mostra le informazioni di versione ed esce.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 msgid "      --docbook               output Docbook XML."
 msgstr ""
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 msgid "      --html                  output HTML."
 msgstr ""
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 msgid "      --epub3                 output EPUB3."
 msgstr ""
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 msgid "      --latex                 output LaTeX."
 msgstr ""
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 msgid "      --xml                   output Texinfo XML."
 msgstr ""
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3670,19 +3676,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3694,13 +3700,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3708,17 +3714,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3727,7 +3733,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3736,13 +3742,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3770,7 +3776,7 @@ msgstr ""
 "                                ancore; in modo predefinito\n"
 "                                è abilitato solo con l'opzione «--split».\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3778,7 +3784,7 @@ msgstr ""
 "Opzioni per XML e Docbook:\n"
 "      --output-indent=VAL     non fare nulla, mantenuto per compatibilità.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3786,7 +3792,7 @@ msgstr ""
 "Opzioni per DVI/PS/PDF:\n"
 "      --Xopt=OPZ              passa OPZ a texi2dvi; può essere ripetuto.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3808,75 +3814,75 @@ msgstr ""
 "  -U VAR                        rimuovi la definizione della variabile VAR, "
 "simile a @clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3902,7 +3908,7 @@ msgstr ""
 "  se è testo semplice, --ifplaintext è attiva e tutte le altre no;\n"
 "  se è XML, --ifxml è attiva e tutte le altre no;\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3938,62 +3944,62 @@ msgstr ""
 "sezioni numerate\n"
 "  makeinfo --no-split foo.texi           scrive in un solo file Info\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: quando si produce %s, può essere specificato con l'opzione «-o» un solo "
 "FILE di input\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opzione «--Xopt» senza stampa dell'output"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "trasformazione albero %s sconosciuta"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "scrittura multipagina per il formato %s ignorata"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: nome file mancante.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "La trasformazione fill_gaps_in_sectioning non ha restituito alcun risultato. "
 "Nessuna sezione?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "errore durante la chiusura del file di espansione della macro %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "Impossibile aprire %s per la scrittura: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4001,7 +4007,7 @@ msgstr ""
 "La trasformazione insert_nodes_for_sectioning_commands non ha restituito "
 "alcun risultato. Nessuna sezione?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 9f0334d9c2..fd34e2d57c 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 5.1.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2014-11-07 08:03+0000\n"
 "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -437,7 +437,7 @@ msgid "Try --help for more information.\n"
 msgstr "詳しくは --help オプションを試してみてください。\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -622,7 +622,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2252,7 +2252,7 @@ msgstr "%s/linux シンボリックリンクを作成できませんでした!"
 msgid "%s: missing file argument\n"
 msgstr "%s: ファイル引数を忘れていますよ\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "詳しくは `%s --help' を実行してください。\n"
@@ -2263,7 +2263,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: --css-file %s を開くことができません"
@@ -2274,7 +2274,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: %s を開くことができません: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, fuzzy, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%(service)s on %(device)s"
@@ -2294,90 +2294,90 @@ msgstr "%s: `%s' のアンマウントに失敗\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%(service)s on %(device)s"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, fuzzy, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 msgid "error on closing %s: %s"
 msgstr "%(service)s on %(device)s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s は有効な言語コードではありません"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s は有効な地域コードではありません"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, fuzzy, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%u は妥当な通知 ID ではありません"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "%sの読込み中にエラーが発生しました: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 msgid "obsolete option: %s"
 msgstr "変数を設定: "
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 msgid "%s: unknown variable %s"
 msgstr "不明なシグナル %d"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 msgid "unknown variable from command line: %s\n"
 msgstr "不明なシグナル %d"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 msgid "%s: unknown formatting context %s\n"
 msgstr "不明なシグナル %d"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "%s/linux シンボリックリンクを作成できませんでした!"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ファイル `%s' が読めません: %s"
@@ -2392,125 +2392,125 @@ msgstr "@image ファイル `%s' が読めません: %s"
 msgid "no argument specified for @U"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image ファイル `%s' (HTML 用) が読めません: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, fuzzy, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "ファイル `%s' を削除できません: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 msgid "missing type"
 msgstr "設定ファイルの欠落。"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 msgid "unrecognized type: %s"
 msgstr "認識できない型です: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "ファイル `%s' を削除できません: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "不明なアクション `%s' です"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "不明なアクション `%s' です"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 #, fuzzy
 msgid "string not closed in css file"
 msgstr "文字列の比較に失敗しました"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 #, fuzzy
 msgid "--css-include ended in comment"
 msgstr "%s:%d: --css-include がコメント内で終了しています"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, fuzzy, perl-format
 msgid "CSS file %s not found"
 msgstr "css ファイル %s が見つかりません"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "ファイルクローズエラー"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "`%s' に対する項目が見つかりません\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "`@%2$s' ブロックの内側では `@%1$s' は意味がありません"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 msgid "error on copying %s into %s"
 msgstr "%(service)s on %(device)s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
@@ -2615,31 +2615,31 @@ msgstr "`.' または `,' には `%2$c' では無く @%1$s が続かなければ
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' または `,' には `%2$c' では無く @%1$s が続かなければいけません。"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, fuzzy, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "ノード `%s' にメニューがありません。"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 #, fuzzy
 msgid "menu entry name should not contain `:'"
 msgstr "ノード `%s' にメニューがありません。"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, fuzzy, perl-format
 msgid "could not read %s: %s"
 msgstr "  @FILE                   オプションを FILE から読み込む\n"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, fuzzy, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: `%s' が見つかりません"
@@ -3383,213 +3383,213 @@ msgstr "%s: --css-file %s を開くことができません"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "%(service)s on %(device)s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image ファイル `%s' が読めません: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 msgid "could not create images directory `%s': %s"
 msgstr "%s/linux シンボリックリンクを作成できませんでした!"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 msgid "could not copy `%s' to `%s': %s"
 msgstr "ディレクトリ `%s' または `%s'を作成できません: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "%s への書き込み中にエラーが発生しました: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "%(service)s on %(device)s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "%s への書き込み中にエラーが発生しました: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 msgid "could not create meta informations directory `%s': %s"
 msgstr "%s/linux シンボリックリンクを作成できませんでした!"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "%(service)s on %(device)s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "%s: `%s' のアンマウントに失敗\n"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "`%s' への書き込み中にエラーが発生しました"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, fuzzy, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 msgid "l2h: command not set"
 msgstr "@%s: %s を開くことができません: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, fuzzy, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "%s: `%s' のアンマウントに失敗\n"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, fuzzy, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "@%s: %s を開くことができません: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, fuzzy, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, fuzzy, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, fuzzy, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "libnotify の初期化に失敗しました"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, fuzzy, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "%s: `%s' のアンマウントに失敗\n"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, fuzzy, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "初期作業ディレクトリに戻るのに失敗しました"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, fuzzy, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "設定ファイルの欠落。"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "%s: `%s' のアンマウントに失敗\n"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3645,23 +3645,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 msgid "could not read init file %s"
 msgstr "  @FILE                   オプションを FILE から読み込む\n"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+msgid "could not read extension file %s"
+msgstr "  @FILE                   オプションを FILE から読み込む\n"
+
+#: tp/texi2any.pl:654
 #, fuzzy, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "%s: 認識できない TEXINFO_OUTPUT_FORMAT の値 `%s' を無視しています。\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, fuzzy, perl-format
 #| msgid "Usage: %s [OPTION]... FILE...\n"
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "使用法: %s [OPTION]... FILE...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 #| msgid ""
 #| "Translate Texinfo source documentation to various other formats, by "
@@ -3678,7 +3683,7 @@ msgstr ""
 "Texinfo ソース文書を様々な形式で読めるように変換します。デフォルトでは\n"
 "オンラインで Emacs や単独の GNU Info で読むのに適した Info ファイルです。\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 msgid ""
 "General options:\n"
@@ -3713,61 +3718,61 @@ msgstr ""
 "  -v, --verbose               行なわれる事を説明する。\n"
 "      --version               バージョン情報を表示して終了する。\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "このヘルプを表示して終了する"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "このヘルプを表示して終了する"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "このヘルプを表示して終了する"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "このヘルプを表示して終了する"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "このヘルプを表示して終了する"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3779,19 +3784,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3803,13 +3808,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3817,17 +3822,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3836,7 +3841,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3845,13 +3850,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3878,19 +3883,19 @@ msgstr ""
 "成する;\n"
 "                                デフォルトでは分割時にのみ設定される。\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 #| msgid ""
 #| "Input file options:\n"
@@ -3917,75 +3922,75 @@ msgstr ""
 "  -P DIR                         @include 探索パスの先頭に DIR を挿入する。\n"
 "  -U VAR                         変数 VAR を未定義にする。@clear と同じ。\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4010,7 +4015,7 @@ msgstr ""
 "  平文テキストを生成する場合、--ifplaintext が有効で、他は無効になります。\n"
 "  XML を生成する場合、--ifxml が有効で、他は無効になります。\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -4046,65 +4051,65 @@ msgstr ""
 "  makeinfo --no-split foo.texi           大きさにかかわらず一つの Info ファイ"
 "ルに書き込む\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style 引数は `%s' ではなく、`separate' 又は `end' でなければ\n"
 "    なりません。\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent 引数は `%s' ではなく、数値/`none'/`asis' でなければ\n"
 "    なりません。\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, fuzzy, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr "%s を生成するときに、-o には入力ファイルを1つだけ指定します。"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 msgid "unknown tree transformation %s"
 msgstr "不明なエスケープ '\\%c' が文字列内にあります。無視されました"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ファイル引数を忘れていますよ\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, fuzzy, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s: --css-file %s を開くことができません"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, fuzzy, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "出力ファイル `%s' を閉じる際にエラーが発生しました"
diff --git a/po/nb.po b/po/nb.po
index a16447ab63..ba6a0b682d 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-01 15:36+0200\n"
 "Last-Translator: Johnny A. Solbu <johnny@solbu.net>\n"
 "Language-Team: Norwegian Bokmaal <l10n-no@lister.huftis.org>\n"
@@ -411,7 +411,7 @@ msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mer informasjon.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -585,7 +585,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2100,7 +2100,7 @@ msgstr "%s: kan ikke opprette katalogen «%s»: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: mangler filargument\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
@@ -2111,7 +2111,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: kunne ikke åpne %s for skriving: %s\n"
@@ -2122,7 +2122,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: kunne ikke åpne %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: feil ved lukking av  %s: %s\n"
@@ -2142,93 +2142,93 @@ msgstr "%s: endre navn %s mislyktes: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: feil ved lukking av standard-utdata: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "kunne ikke åpne %s for skriving: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "Feil ved lukking av  %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig språkkode"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s er ikke en gyldig språkkode"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "feil ved lasting %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "foreldet variabel %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: ukjent variabel %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: ukjent variabel %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: ukjent variabel %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "kan ikke opprette katalogen «%s»: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "feil ved lukking av bildetekstfile %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil «%s» er uleselig: %s"
@@ -2243,121 +2243,121 @@ msgstr "@image-fil «%s» ikke funnet, bruker «%s»"
 msgid "no argument specified for @U"
 msgstr "ingen argument spesifisert for @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image-fil «%s» (for HTML) ikke funnet, bruker «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "kunne ikke åpne html-referansefilen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "manglende type"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "ukjent type: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "feil ved lukking av html-referansefilen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "Ukjent handling «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "Ukjent handling «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-file endte i en kommentar"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "kunne ikke åpne --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "Feil ved lukking av CSS-filen %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "ingen htmlxref.cnf-oppføring funnet for «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "@%s er meningsløs for ikke-splittutgang"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "Feil ved lukking av rammefil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "Feil ved lukking av TOC-rammefil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "Feil ved kopiering av %s til %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "Feil ved lukking av omdirigeringsnodenfilen %s: %s"
@@ -2460,30 +2460,30 @@ msgstr "«.» eller «,» må følge @xref, ikke %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "«.» eller «,» må følge @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "Kunne ikke lese %s: %s."
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "Feil ved lukking av @verbatiminclude-fil %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: kan ikke finne %s"
@@ -3206,220 +3206,220 @@ msgstr "chm.pm: kunne ikke åpne %s for skriving: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image-fil «%s» er uleselig: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "kan ikke opprette katalogen «%s»: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "kan ikke opprette katalogene «%s» eller «%s»: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "feil ved skriving til %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "Feil ved lukking av  %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "feil ved skriving til %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "Feil ved lukking av omdirigeringsnodenfilen %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "kan ikke opprette katalogen «%s»: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: kunne ikke åpne %s for skriving: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "Feil ved lukking av  %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "I2h: kunne ikke åpne latex-fil %s for skriving : %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: could not open %s: %s"
 msgid "l2h: command not set"
 msgstr "l2h: kunne ikke åpne %s: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: kunne ikke åpne %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: kunne ikke åpne %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: kunne ikke åpne %s for skriving: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: kunne ikke åpne %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: kommunikasjonsavslutning mislyktes %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3475,22 +3475,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "Kunne ikke lese init-fil %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "Kunne ikke lese init-fil %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignorerer ugjenkjennelig TEXINFO_OUTPUT_FORMAT-verdi «%s».\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3506,7 +3512,7 @@ msgstr ""
 "Dette programmet er ofte installert som både «makeinfo» og «texi2any»; \\ n\n"
 "virkemåten er identisk og er ikke avhengig av det installerte navnet.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3540,61 +3546,61 @@ msgstr ""
 "  -v, --verbose               forklar hva som blir gjort.\n"
 "      --version               vis programversjon og avslutt.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --help                  display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --help                  vise denne hjelpen og avslutte"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --help                  display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "    --help                  vise denne hjelpen og avslutte"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --help                  display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --help                  vise denne hjelpen og avslutte"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --help                  display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "    --help                  vise denne hjelpen og avslutte"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --help                  display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --help                  vise denne hjelpen og avslutte"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3606,19 +3612,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3630,13 +3636,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3644,17 +3650,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3663,7 +3669,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3672,13 +3678,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3704,19 +3710,19 @@ msgstr ""
 "       --node-files           lag omdirigeringsfiler for noder og\n"
 "                                 ankre; som standard kun hvis splitt.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3738,75 +3744,75 @@ msgstr ""
 "  -U VAR                         udefiner variabelen VAR, som om @clear "
 "brukes.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3831,7 +3837,7 @@ msgstr ""
 "  dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n"
 "  dersom XML genereres er --ifxml påslått og de andre av.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3860,58 +3866,58 @@ msgstr ""
 "  makeinfo --number-sections foo.texi   skriv Info med nummererte avsnitt\n"
 "  makeinfo --no-split foo.texi          skriv en Infofil uansett størrelse\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr "%s: ved generering av %s, kun én inndata-FIL kan spesifiseres med -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "alternativet --Xopt uten utdata-utskrifter"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "Ukjent tre-transformasjon «%s»"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "ignorerer splitting for format %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filargument.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "fill_gaps_in_sectioning-transformasjon returnerte ingen resultater. Ingen "
 "seksjon?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "Feil ved lukking av makroutvidelsesfil %s: «%s»\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunne ikke åpne %s for skriving: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3919,7 +3925,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commands-transformasjon returnerte ingen "
 "resultater. Ingen seksjon?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: feil ved lukking av intern lenkefil %s: %s\n"
diff --git a/po/nl.po b/po/nl.po
index 297db7f492..0393201909 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo-6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-02 11:05+0200\n"
 "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -419,7 +419,7 @@ msgid "Try --help for more information.\n"
 msgstr "Gebruik '--help' voor meer informatie.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -563,7 +563,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2133,7 +2133,7 @@ msgstr "%s: kan map '%s' niet aanmaken: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: ontbrekend bestandsargument\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Typ '%s --help' voor meer informatie.\n"
@@ -2144,7 +2144,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: '%s' zonder inhoud wordt genegeerd\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: kan %s niet openen om te schrijven: %s\n"
@@ -2155,7 +2155,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: kan %s niet openen: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: fout bij sluiten van %s: %s\n"
@@ -2175,93 +2175,93 @@ msgstr "%s: hernoemen van %s is mislukt: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: fout bij sluiten van standaarduitvoer: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "kan %s niet openen om te schrijven: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "fout bij sluiten van %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s is geen geldige taalcode"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s is geen geldige regiocode"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s is geen geldige splitsmogelijkheid"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "fout bij laden van %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "verouderde variabele %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: onbekende variabele %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: onbekende variabele %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: onbekende variabele %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: uitvoer is incompatibel met splitsing"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "kan map '%s' niet aanmaken: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "fout bij sluiten van %s, bestand met 'image'-tekst: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-bestand '%s' is onleesbaar: %s"
@@ -2276,86 +2276,86 @@ msgstr "@image-bestand '%s' is niet gevonden; '%s' 
wordt gebruikt"
 msgid "no argument specified for @U"
 msgstr "geen argument opgegeven voor @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image-bestand '%s' (voor HTML) is niet gevonden; '%s' wordt gebruikt"
 
 # XXX Zet ook elders "ruw" om naar "rauw".
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "rauwe opmaak %s is niet omgezet"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "kan instellingenbestand %s voor HTML-referenties niet openen: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "ontbrekend type"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "onbekend type: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "fout bij sluiten van instellingenbestand %s voor HTML-referenties: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "onbekende actie '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "onbekende actie '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "tekenreeks niet afgesloten in CSS-bestand"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "'--css-include' eindigt in commentaar"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "'@import' is niet afgesloten in CSS-bestand"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS-bestand %s is niet gevonden"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "kan '--include-file'-bestand %s niet openen: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "fout bij sluiten van CSS-bestand %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "geen 'htmlxref.cnf'-item gevonden voor '%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s is zinloos voor ongesplitste uitvoer"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2364,36 +2364,36 @@ msgstr ""
 "kan absoluut pad of URL '%s' niet gebruiken voor JS_WEBLABELS_FILE bij het "
 "genereren van een web-labels-bestand"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "fout bij sluiten van frames-bestand %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "fout bij sluiten van TOC-frames-bestand %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "verwerker %s van fase %s, prioriteit %s, is gestruikeld"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "een 'title'-commando en '@top' vereisen een titel"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s bestaat al maar is geen map"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "fout bij kopiëren van %s naar %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "fout bij sluiten van %s, bestand met doorverwijzende pagina's: %s"
@@ -2495,30 +2495,30 @@ msgstr "'.' of ',' moet volgen op @xref, niet '%s'"
 msgid "`.' or `,' must follow @xref"
 msgstr "'.' of ',' moet volgen op '@xref'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "paginanaam in menu-item hoort geen '%s' te bevatten"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "paginanaam in menu-item hoort geen ':' te bevatten"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "menu-itemnaam hoort geen ':' te bevatten"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "kan %s niet lezen: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "fout bij sluiten van '@verbatiminclude'-bestand %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: kan %s niet vinden"
@@ -3264,134 +3264,134 @@ msgstr "chm.pm: kan %s niet openen om te schrijven: 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: fout bij sluiten van %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image-bestand '%s' is onleesbaar: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "kan map '%s' niet aanmaken: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "kan mappen '%s' en '%s' niet aanmaken: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "fout bij het schrijven naar '%s': %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "fout bij sluiten van %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "fout bij het schrijven naar '%s': %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "fout bij sluiten van %s, bestand met doorverwijzende pagina's: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "kan map '%s' niet aanmaken: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: kan %s niet openen om te schrijven: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: fout bij sluiten van %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: wijzigen van map naar %s is mislukt: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "fout bij het schrijven naar '%s'"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: kan '%s' niet openen om te schrijven: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: de map L2H_TMP bevat een dot"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: de huidge map bevat een dot"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: opdracht is niet gelukt: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: opdracht is niet gelukt: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: afbeelding heeft ongeldige extensie: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: hernoemen van %s naar %s is mislukt: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: kan %s niet openen: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: einde van @%s-item %d niet gevonden"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3400,12 +3400,12 @@ msgstr ""
 "latex2html.pm: bewerking produceerde %d items in HTML;\n"
 "verwacht werden %d, het aantal items in het document"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: kan fragment %d voor @%s niet bepalen"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3413,53 +3413,53 @@ msgid ""
 msgstr ""
 "l2h: kan fragment %d voor @%s niet extraheren met uitvoerteller %d uit HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: kan %s niet laden: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: kan %s niet openen om te schrijven: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: kan %s niet openen: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: wijzigen van map naar %s is mislukt: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: kan niet terugkeren naar de oorspronkelijke werkmap: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: uitvoerbestand ontbreekt: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: opdracht is mislukt: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: afsluiten van communicatie is mislukt: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: einde van @%s-item %d niet gevonden"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3471,12 +3471,12 @@ msgstr ""
 "tex4ht.pm: bewerking produceerde %d items in HTML;\n"
 "verwacht werden %d, het aantal items in het document voor @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: uitvoer bevat geen HTML-item voor @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3488,12 +3488,12 @@ msgstr ""
 "tex4ht.pm: bewerking produceerde %d items in HTML;\n"
 "verwacht werden %d, het aantal items in het document voor @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3556,22 +3556,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: uitvoer bevat geen HTML-item voor @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "kan initialisatiebestand %s niet lezen"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "kan initialisatiebestand %s niet lezen"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "onbekende waarde '%s' van TEXINFO_OUTPUT_FORMAT wordt genegeerd\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Gebruik:  %s [OPTIE...] TEXINFO-BESTAND...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3586,7 +3592,7 @@ msgstr ""
 "Dit programma wordt gewoonlijk geïnstalleerd zowel als 'makeinfo'\n"
 "als als 'texi2any'; hun gedrag is identiek.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3624,61 +3630,61 @@ msgstr ""
 "  -v, --verbose               tonen wat er gedaan wordt\n"
 "      --version               versie-informatie tonen en stoppen\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   de top voor de hoofdhandleiding"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   de top voor de hoofdhandleiding"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   de top voor de hoofdhandleiding"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   de top voor de hoofdhandleiding"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   de top voor de hoofdhandleiding"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3690,7 +3696,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3702,13 +3708,13 @@ msgstr ""
 "    --output=NAAM           uitvoer naar NAAM sturen voor de eerste of de\n"
 "                            hoofdhandleiding i.p.v. naar standaarduitvoer"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3720,13 +3726,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3734,17 +3740,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3753,7 +3759,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3762,13 +3768,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3798,7 +3804,7 @@ msgstr ""
 "                                en ankers; is standaard alleen bij "
 "opsplitsen\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3806,7 +3812,7 @@ msgstr ""
 "Opties voor XML en DocBook:\n"
 "      --output-indent=WAARDE  (doet niets; herkend voor compatibilteit)\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3815,7 +3821,7 @@ msgstr ""
 "      --Xopt=OPTIE            te gebruiken optie voor 'texi2dvi'; mag "
 "herhaald\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3834,75 +3840,75 @@ msgstr ""
 "  -P MAP                      MAP vooraantoevoegen aan @include-zoekpad\n"
 "  -U VAR                      variabele VAR wissen (als met '@clear')\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3929,7 +3935,7 @@ msgstr ""
 "niet;\n"
 "  als XML gemaakt wordt, staat '--ifxml' aan en de anderen niet.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3964,62 +3970,62 @@ msgstr ""
 "  makeinfo --no-split foo.texi           één Info-bestand ongeacht de "
 "grootte\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: bij het genereren van %s kan met optie '-o' slechts één invoerbestand "
 "gegeven worden\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "Optie '--Xopt' gegeven zonder dat er afdrukuitvoer gemaakt wordt"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "onbekende boomtransformatie %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "het splitsen voor opmaak %s wordt genegeerd"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: Ontbrekend bestandsargument.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "Transformatie 'fill_gaps_in_sectioning()' leverde geen resultaat af. Geen "
 "sectie?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "fout bij sluiten van %s, bestand met macro-expansies: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kan %s niet openen om te schrijven: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4027,7 +4033,7 @@ msgstr ""
 "Transformatie 'insert_nodes_for_sectioning_commands()' leverde geen "
 "resultaat af. Geen sectie?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: fout bij sluiten van %s, bestand met interne koppelingen: %s\n"
diff --git a/po/pl.po b/po/pl.po
index 14fc48ff0e..83487bc0fe 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-01 17:15+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -412,7 +412,7 @@ msgid "Try --help for more information.\n"
 msgstr "Więcej informacji można uzyskać przez --help.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -559,7 +559,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2114,7 +2114,7 @@ msgstr "%s: nie można utworzyć katalogu %s: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: brakujący argument plikowy\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Polecenie `%s --help' poda więcej informacji.\n"
@@ -2125,7 +2125,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: ignorowanie %s bez treści\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: nie można otworzyć pliku %s do zapisu: %s\n"
@@ -2136,7 +2136,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: nie można otworzyć %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: błąd podczas zamykania %s: %s\n"
@@ -2156,92 +2156,92 @@ msgstr "%s: zmiana nazwy %s nie powiodła się: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: błąd podczas zamykania standardowego wyjścia: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "nie można otworzyć %s do zapisu: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "błąd podczas zamykania %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s nie jest poprawnym kodem języka"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s nie jest poprawnym kodem regionu"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s nie jest poprawną opcją podziału"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "błąd podczas wczytywania %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: nieznana zmienna %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: nieznana zmienna %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: nieznana zmienna %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: wyjście niezgodne z podziałem na pliki"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "nie można utworzyć katalogu `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "błąd podczas zamykania pliku tekstowego obrazu %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Plik @image `%s' nieczytelny: %s"
@@ -2256,85 +2256,85 @@ msgstr "Plik @image `%s' nie znaleziony, użyto `%s'"
 msgid "no argument specified for @U"
 msgstr "nie podano argumentu dla @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "Plik @image `%s' (dla HTML) nie znaleziony, użyto `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "format surowy %s nie jest przekonwertowany"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "nie można otworzyć pliku konfiguracyjnego html refs %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "brak typu"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "nieznany typ: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "błąd podczas zamykania pliku konfiguracyjnego html refs %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "nieznana akcja `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "nieznana akcja `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "niedomknięty łańcuch w pliku css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "plik --css-include zakończył się wewnątrz komentarza"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import nie zakończony w pliku css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "nie znaleziono pliku css %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "nie można otworzyć pliku --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "błąd podczas zamykania pliku CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "brak wpisu htmlxref.cnf dla `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s nic nie znaczy dla wyjścia bez podziału"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2343,36 +2343,36 @@ msgstr ""
 "nie można użyć ścieżki bezwzględnej ani URL-a `%s' jako JS_WEBLABELS_FILE "
 "przy generoaniu pliku etykiet WWW"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "błąd podczas zamykania pliku ramki %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "błąd podczas zamykania pliku ramki TOC %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "obsługa %s, etapu %s, priorytet %s nie powiodła się"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "trzeba określić tytuł poleceniem title lub @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s już istnieje, ale nie jest katalogiem"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "błąd podczas kopiowania %s do %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "błąd podczas zamykania pliku przekierowania węzłów %s: %s"
@@ -2474,30 +2474,30 @@ msgstr "Po @xref musi wystąpić `.' lub `,', a nie %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "Po @xref musi wystąpić `.' lub `,'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "nazwa węzła wpisu menu nie powinna zawierać `%s'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "nazwa węzła wpisu menu nie powinna zawierać `:'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "nazwa wpisu menu nie powinna zawierać `:'"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "nie można odczytać %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "błąd podczas zamykania pliku @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: nie można znaleźć %s"
@@ -3233,133 +3233,133 @@ msgstr "chm.pm: nie można otworzyć pliku %s do 
zapisu: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: błąd podczas zamykania %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "Plik @image `%s' nieczytelny: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "nie można utworzyć katalogu `%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "nie można utworzyć katalogu `%s' ani `%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "błąd podczas zapisu do %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "błąd podczas zamykania %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "błąd podczas zapisu do %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "błąd podczas zamykania pliku przekierowania węzłów %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "nie można utworzyć katalogu `%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: nie można otworzyć pliku %s do zapisu: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: błąd podczas zamykania %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: przejście do katalogu %s nie powiodła się: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: nie można otworzyć pliku LaTeXowego %s do zapisu: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: katalog L2H_TMP zawiera kropkę"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: katalog bieżący zawiera kropkę"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: polecenie nie powiodło się: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: polecenie nie powiodło się: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: obrazek ma błędne rozszerzenie: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: zmiana nazwy %s na %s nie powiodła się: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: nie można otworzyć %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: nie znaleziono końca elementu @%s %d"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3368,12 +3368,12 @@ msgstr ""
 "latex2html.pm: przetwarzanie wytworzyło elementów w HTML-u: %d; oczekiwano "
 "%d, czyli liczby elementów znalezionych w dokumencie"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: nie udało się ustawić fragmentu %d dla @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3382,53 +3382,53 @@ msgstr ""
 "l2h: nie udało się wydobyć fragmentu %d dla @%s z licznikiem wyjścia %d z "
 "HTML-a"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: nie można załadować %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: nie można otworzyć %s do zapisu: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: nie można otworzyć %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: przejście do katalogu %s nie powiodła się: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: nie udało się powrócić do katalogu początkowego: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: brak pliku wyjściowego: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: polecenie nie powiodło się: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: zamykanie połączenia nie powiodło się: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: nie znaleziono końca elementu @%s %d"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3440,12 +3440,12 @@ msgstr ""
 "tex4ht.pm: przetwarzanie wytworzyło elementów w HTML-u: %d; oczekiwano %d, "
 "czyli liczby elementów znalezionych w dokumencie dla @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: wyjście nie ma elementu HTML dla @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3457,12 +3457,12 @@ msgstr ""
 "tex4ht.pm: przetwarzanie wytworzyło elementów w HTML-u: %d; oczekiwano %d, "
 "czyli liczby elementów znalezionych w dokumencie dla @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3525,22 +3525,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: wyjście nie ma elementu HTML dla @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "nie można odczytać pliku init %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "nie można odczytać pliku init %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "zignorowano nierozpoznaną wartość TEXINFO_OUTPUT_FORMAT `%s'.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Składnia: %s [OPCJA]... PLIK-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3556,7 +3562,7 @@ msgstr ""
 "Ten program jest zainstalowany wspólnie jako `makeinfo' oraz `texi2any';\n"
 "zachowanie jest identycznie i nie zależy od nazwy programu.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3594,61 +3600,61 @@ msgstr ""
 "      --version               wyświetlenie informacji o wersji i "
 "zakończenie.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   główny plik dla głównego podręcznika"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   główny plik dla głównego podręcznika"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   główny plik dla głównego podręcznika"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   główny plik dla głównego podręcznika"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   główny plik dla głównego podręcznika"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3660,7 +3666,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3672,13 +3678,13 @@ msgstr ""
 "    --output=NAZWA          zapis pod NAZWĄ dla pierwszego lub głównego\n"
 "                            podręcznika zamiast standardowego wyjścia"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3690,13 +3696,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3704,17 +3710,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3723,7 +3729,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3732,13 +3738,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3763,7 +3769,7 @@ msgstr ""
 "      --node-files            tworzenie plików przekierowań dla węzłów\n"
 "                                i znaczników; domyśnie tylko przy podziale.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3771,7 +3777,7 @@ msgstr ""
 "Opcje dla XML-a i Docbooka:\n"
 "      --output-indent=ILE     nic, zachowane dla kompatybilności.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3780,7 +3786,7 @@ msgstr ""
 "      --Xopt=OPCJA            przekazanie OPCJI do texi2dvi; można "
 "powtarzać.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3802,75 +3808,75 @@ msgstr ""
 "  -U ZMIENNA                    usunięcie definicji ZMIENNEJ, tak jak "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3897,7 +3903,7 @@ msgstr ""
 "wyłączone;\n"
 "  jeśli generowany jest XML, --ifxml jest włączone, a reszta wyłączona.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3932,59 +3938,59 @@ msgstr ""
 "  makeinfo --no-split foo.texi           zapisanie jednego wielkiego pliku "
 "Info\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: przy generowaniu %s, opcją -o można podać tylko jeden PLIK wejściowy\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opcja --Xopt bez drukowanego wyjścia"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "nieznane przekształcenie drzewa %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "zignorowano podział dla formatu %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: brakujący argument plikowy.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "Przekształcenie fill_gaps_in_sectioning zwróciło pusty wynik. Brak sekcji?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "błąd podczas zamykania pliku rozwinięć makr %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "nie można otworzyć pliku %s do zapisu: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3992,7 +3998,7 @@ msgstr ""
 "Przekształcenie insert_nodes_for_sectioning_commands zwróciło pusty wynik. "
 "Brak sekcji?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: błąd podczas zamykania pliku odnośników wewnętrznych %s: %s\n"
diff --git a/po/pt.po b/po/pt.po
index 9b065cf943..8554893d65 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-02 05:53+0100\n"
 "Last-Translator: Pedro Albuquerque <pmra@protonmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -414,7 +414,7 @@ msgid "Try --help for more information.\n"
 msgstr "Tente --help para mais informação.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -558,7 +558,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2125,7 +2125,7 @@ msgstr "%s: impossível criar pasta %s: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: argumento de ficheiro em falta\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente \"%s --help\" para mais informação.\n"
@@ -2136,7 +2136,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: a ignorar %s sem conteúdo\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: impossível abrir %s para escrita: %s\n"
@@ -2147,7 +2147,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: impossível abrir %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: erro ao fechar %s: %s\n"
@@ -2167,93 +2167,93 @@ msgstr "%s: renomeação %s falhou: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: erro ao fechar stdout: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "impossível abrir %s para escrita: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s não é um código de idioma válido"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s não é um código de região válido"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s não é uma possibilidade de divisão válida"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "erro ao carregar %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "variável %s obsoleta\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: variável %s desconhecida"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: variável %s desconhecida\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: variável %s desconhecida\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: saída incompatível com a divisão"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "impossível criar pasta \"%s\": %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "erro ao fechar ficheiro de texto de imagem %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "ficheiro @image \"%s\" ilegível: %s"
@@ -2268,85 +2268,85 @@ msgstr "ficheiro @image \"%s\" não encontrado, a usar 
\"%s\""
 msgid "no argument specified for @U"
 msgstr "sem argumento especificado para @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "ficheiro @image \"%s\" (para HTML) não encontrado, a usar \"%s\""
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "formato raw %s não está convertido"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "impossível abrir o ficheiro html refs config %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "tipo em falta"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "tipo não reconhecido: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "erro ao fechar o ficheiro html refs config %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "acção \"%s\" desconhecida"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "acção \"%s\" desconhecida"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "cadeia não fechada no ficheiro css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include terminou em comentário"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import não terminada em ficheiro css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "Ficheiro css %s não encontrado"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "impossível abrir --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "erro ao fechar o ficheiro css %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "sem entrada htmlxref.cnf para \"%s\""
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s sem significado para saída não dividida"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2355,36 +2355,36 @@ msgstr ""
 "impossível usar caminho absoluto ou URL \"%s\" para JS_WEBLABELS_FILE ao "
 "gerar ficheiro de etiquetas web"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "erro ao fechar ficheiro frame %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "erro ao fechar ficheiro TOC frame %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "gestor %s de estágio %s, prioridade %s falhou"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "tem de especificar um título com um comando de título ou @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s já existe, mas não é uma pasta"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "erro ao copiar %s para %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "erro ao fechar ficheiro de redireccionamento do nó %s: %s"
@@ -2487,30 +2487,30 @@ msgstr "\".\" ou \",\" têm de seguir @xref, não %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "\".\" ou \",\" têm de seguir @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "nome de nó de entrada de menu não deve conter \"%s\""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "nome de nó de entrada de menu não deve conter \":\""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "nome de entrada de menu não deve conter \":\""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "impossível ler %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "erro ao fechar o ficheiro @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: impossível localizar %s"
@@ -3244,133 +3244,133 @@ msgstr "chm.pm: impossível abrir %s para escrita: 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: erro ao fechar %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "ficheiro @image \"%s\" ilegível: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "impossível criar pasta \"%s\": %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "impossível criar pastas \"%s\" or \"%s\": %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "erro ao escrever em %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "erro ao escrever em %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "erro ao fechar ficheiro de redireccionamento do nó %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "impossível criar pasta \"%s\": %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: impossível abrir %s para escrita: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: erro ao fechar %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir %s falhou: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: impossível abrir ficheiro latex %s para escrita: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: a pasta L2H_TMP contém um ponto"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: a pasta actual contém um ponto"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: comando sem sucesso: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: comando sem sucesso: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: imagem com extensão inválida: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: renomear %s como %s falhou: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: impossível abrir %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: fim de @%s item %d não encontrado"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3379,12 +3379,12 @@ msgstr ""
 "latex2html.pm: o processamento produziu %d itens em HTML; esperados %d, o "
 "número de itens encontrados no documento"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: impossível determinar o fragmento %d para @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3393,53 +3393,53 @@ msgstr ""
 "l2h: impossível extrair o fragmento %d para @%s com contador de saída %d de "
 "HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: impossível carregar %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: impossível abrir %s para escrita: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: impossível abrir %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir %s falhou: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: impossível regressar à pasta inicial: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: ficheiro de saída em falta: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: o comando falhou: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: fecho das comunicações falhou: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: fim de @%s item %d não encontrado"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3451,12 +3451,12 @@ msgstr ""
 "tex4ht.pm: o processamento produziu %d itens em HTML; esperados %d, o número "
 "de itens encontrados no documento @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: a saída não tem item HTML para @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3468,12 +3468,12 @@ msgstr ""
 "tex4ht.pm: o processamento produziu %d itens em HTML; esperados %d, o número "
 "de itens encontrados no documento @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3537,22 +3537,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: a saída não tem nenhum item HTML para @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "impossível ler o ficheiro init %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "impossível ler o ficheiro init %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "a ignorar o valor TEXINFO_OUTPUT_FORMAT \"%s\" desconhecido\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uso: %s [OPÇÃO]... FICH-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3567,7 +3573,7 @@ msgstr ""
 "Este programa é habitualmente instalado como \"makeinfo\" e \"texi2any\";\n"
 "o comportamento é idêntico e não depende do nome instalado.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3605,61 +3611,61 @@ msgstr ""
 "  -v, --verbose               explica o que se está a passar.\n"
 "      --version               mostra informação da versão e sai.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   topo para o manual pricipal"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   topo para o manual pricipal"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   topo para o manual pricipal"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   topo para o manual pricipal"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   topo para o manual pricipal"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3671,7 +3677,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3684,13 +3690,13 @@ msgstr ""
 "manual\n"
 "                            en vez da saída padrão"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3702,13 +3708,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3716,17 +3722,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3735,7 +3741,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3744,13 +3750,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3779,7 +3785,7 @@ msgstr ""
 "                                    âncoras; a predefinição só existe se "
 "dividido.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3787,7 +3793,7 @@ msgstr ""
 "Opções para XML e Docbook:\n"
 "      --output-indent=VAL     não faz nada, retida para compatibilidade.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3795,7 +3801,7 @@ msgstr ""
 "Opções para DVI/PS/PDF:\n"
 "      --Xopt=OPÇÃO            passa OPÇÃO a texi2dvi; pode ser repetida.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3816,75 +3822,75 @@ msgstr ""
 "  -U VAR                        reMover a definição de VAR, tal como "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3909,7 +3915,7 @@ msgstr ""
 "  se gerar texto simples, --ifplaintext está activa e as outras inactivas;\n"
 "  se gerar XML, --ifxml está activa e as outras inactivas.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3942,61 +3948,61 @@ msgstr ""
 "  makeinfo --number-sections foo.texi    write Info with numbered sections\n"
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: o argumento --footnote-style tem de ser \"separate\" ou \"end\", não "
 "\"%s\".\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: o argumento --paragraph-indent tem de ser numérico/\"none\"/\"asis\", "
 "não \"%s\".\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: ao gerar %s, só um ficheiro de entrada FICHEIRO pode ser especificado "
 "com -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opção --Xopt sem saída impressa"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "transformação de árvore %s desconhecida"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "a ignorar divisão para formato %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: argumento de ficheiro em falta.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr "transformação fill_gaps_in_sectioning sem resultados. Não há secção?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "erro ao fechar o ficheiro de expansão de macro %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "impossível abrir %s para escrita: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4004,7 +4010,7 @@ msgstr ""
 "transformação insert_nodes_for_sectioning_commands sem resultados. Não há "
 "secção?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: erro ao fechar ficheiro de ligações internas %s: %s\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1a9f96a461..787cb72184 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-01 07:19-0300\n"
 "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -415,7 +415,7 @@ msgid "Try --help for more information.\n"
 msgstr "Tente --help para mais informação.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -561,7 +561,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2142,7 +2142,7 @@ msgstr "não posso criar diretório `%s': %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: faltando argumento arquivo.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Tente `%s --help' para mais informação.\n"
@@ -2153,7 +2153,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: ignorando %s vazio\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: não posso abrir %s para escrita: %s\n"
@@ -2165,7 +2165,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: não posso abrir %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: erro ao fechar %s: %s\n"
@@ -2187,92 +2187,92 @@ msgstr "a tentativa de renomear %s falhou: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: erro ao fechar %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "não posso abrir %s para escrita: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s é um código inválido de linguagem"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s é um código de região inválido"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s é uma possibilidade de particionamento inválida"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "erro ao chamar %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: variável desconhecida %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: variável desconhecida %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: variável desconhecida %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: saída incompatível com quebra"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "não posso criar diretório `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "erro ao fechar o arquivo de texto de imagem %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "arquivo @image `%s' ilegível: %s"
@@ -2287,86 +2287,86 @@ msgstr "arquivo @image `%s' não encontrado, usando `%s'"
 msgid "no argument specified for @U"
 msgstr "nenhum argumento especificado para @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "arquivo @image `%s' (para o HTML) não encontrado, usando `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "formato raw %s não convertido"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "impossível abrir arquivo html de configuração de referência %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "tipo omitido"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "tipo desconhecido: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "erro ao fechar o arquivo html de configuração de referência %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "ação desconhecida `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "ação desconhecida `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "sequência de caracteres aberta no arquivo css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include terminou em comentário"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import não terminado no arquivo css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "Arquivo CSS %s não encontrado"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "Não posso abrir --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "erro ao fechar arquivo CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "nenhuma entrada htmlxref.cnf encontrada para `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside @%s block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s sem significado dentro de bloco @%s"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2375,37 +2375,37 @@ msgstr ""
 "caminho absoluto ou URL inadequado `%s' para JS_WEBLABELS_FILE ao gerar "
 "arquivo de rótulos web"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "erro ao fechar o arquivo de moldura %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "erro ao fechar o arquivo de moldura TOC %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "controlador %s de estágio %s prioridade %s falhou"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "deve especificar um comando de título ou @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s existe mas não é um diretório"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "erro ao fechar o arquivo de nodo de redirecionamento %s: %s"
@@ -2508,30 +2508,30 @@ msgstr "`.' ou `,' deve seguir @xref, não %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' ou `,' deve seguir @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "entrada de menu com nome de nodo não deve conter `%s'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "entrada de menu com nome de nodo não deve conter `:'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "nome de entrada de menu não deve conter `:'"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "não posso ler %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "erro ao fechar o arquivo @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: não encontrado %s"
@@ -3259,133 +3259,133 @@ msgstr "chm.pm: não pode abrir %s para gravação: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: erro ao fechar %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "arquivo @image `%s' ilegível: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "não posso criar diretório `%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "não posso criar diretórios `%s' ou `%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "erro ao gravar em %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "erro ao gravar em %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "erro ao fechar o arquivo de nodo de redirecionamento %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "não posso criar diretório `%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: não pode abrir %s para gravação: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: erro ao fechar %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: mover para %s falhou: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: não posso abrir o arquivo latex %s para gravação: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: o diretório L2H_TMP contém um ponto"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: o diretório atual contém um ponto"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: o comando falhou: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: o comando falhou: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: a imagem tem uma extensão inválida: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: renomear %s para %s falhou: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: não posso abrir %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: fim de item @%s que é %d não foi encontrado"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3394,12 +3394,12 @@ msgstr ""
 "latex2html.pm: processando os %d itens produzidos em HTML; esperado %d, o "
 "número de itens encontrado no documento"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: não posso determinar o fragmento %d para @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3408,54 +3408,54 @@ msgstr ""
 "l2h: não posso extrair o fragmento %d para @%s com contador de saída %d a "
 "partir do HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: não posso chamar %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: não posso abrir %s para escrita: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: não posso abrir %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: mover para %s falhou: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: incapaz de retornar ao diretório inicial: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: arquivo de saída omitido: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: o comando falhou: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: o comando falhou: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: fim de @%s item %d não encontrado"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3467,12 +3467,12 @@ msgstr ""
 "tex4ht.pm: processando %d itens produzidos em HTML; esperado %d, o número de "
 "itens encontrados no documento para @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: a saída não tem nenhum item HTML para @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3484,12 +3484,12 @@ msgstr ""
 "tex4ht.pm: processando %d itens produzidos em HTML; esperado %d, o número de "
 "itens encontrados no documento para @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3559,22 +3559,28 @@ msgstr "tex4ht.pm: a saída não tem nenhum item HTML 
para @%s %s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: a saída não tem nenhum item HTML para @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "não posso ler o arquivo de inicialização %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "não posso ler o arquivo de inicialização %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignorando valor desconhecido da TEXINFO_OUTPUT_FORMAT variável `%s'\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uso: %s [OPÇÃO]... ARQUIVO-TEXI...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3590,7 +3596,7 @@ msgstr ""
 "Esse programa está instalado ou como `makeinfo' ou como `texi2any';\n"
 "o comportamento é idêntico, e não do nome de instalação.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3629,61 +3635,61 @@ msgstr ""
 "  -v, --verbose               mostra o que está sendo feito.\n"
 "      --version               mostra informação de versão e sai.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   topo do manual principal"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   topo do manual principal"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   topo do manual principal"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   topo do manual principal"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   topo do manual principal"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3695,7 +3701,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3708,13 +3714,13 @@ msgstr ""
 "manual\n"
 "                            ao invés da saída padrão"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3726,13 +3732,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3740,17 +3746,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3759,7 +3765,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3768,13 +3774,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3803,7 +3809,7 @@ msgstr ""
 "                                ancoras; o padrão é ajustar somente se hover "
 "QUEBRA.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3811,7 +3817,7 @@ msgstr ""
 "Opções para XML e para Docbook:\n"
 "      --output-indent=VAL     não faz nada, mantida para compatibilidade.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3819,7 +3825,7 @@ msgstr ""
 "Opções para DVI/PS/PDF:\n"
 "      --Xopt=OPÇÃO            informa OPÇÃO ao texi2dvi; pode ser repetido.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3841,75 +3847,75 @@ msgstr ""
 "@include.\n"
 "  -U VAR                        remove a variável VAR, semelhante a @clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3934,7 +3940,7 @@ msgstr ""
 "  se gerando texto puro, --ifplaintext é on e os outros são off;\n"
 "  se gerando XML, --ifxml é on e os outros são off.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3969,61 +3975,61 @@ msgstr ""
 "  makeinfo --no-split algumacoisa.texi   grava um único arquivo Info mesmo "
 "grande\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: o argumento de --footnote-style deve ser `separate' ou `end', não `%s'.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: o argumento de --paragraph-indent deve ser numeric/`none'/`asis', não "
 "`%s'.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: ao gerar %s, somente um único ARQUIVO de entrada pode ser especificado "
 "com -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "opção --Xopt sem saída mostrada"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "árvore de transformação %s desconhecida"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "ignorando quebra para o formato %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: faltando argumento arquivo.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "a transformação fill_gaps_in_sectioning não retorna nada. Nenhuma seção?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "erro ao fechar o arquivo expandido de macro %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "não posso abrir %s para escrita: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4031,7 +4037,7 @@ msgstr ""
 "a transformação insert_nodes_for_sectioning_commands não retorna nada. "
 "Nenhuma seção?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: erro ao fechar o arquivo de links internos %s: %s\n"
diff --git a/po/ro.po b/po/ro.po
index 5f77475cf4..6ecad91b69 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2005-05-03 12:00+05\n"
 "Last-Translator: Laurentiu Buzdugan <lbuz@rolix.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -453,7 +453,7 @@ msgid "Try --help for more information.\n"
 msgstr "�ncerca�i --help pentru informa�ii suplimentare.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -566,7 +566,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -2222,7 +2222,7 @@ msgstr "Nu pot crea directorul `%s': %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: lipse�te fi�ierul argument.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "�ncerca�i `%s --help' pentru informa�ii suplimentare.\n"
@@ -2233,7 +2233,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "%s: could not open %s for writing: %s\n"
@@ -2246,7 +2246,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2268,99 +2268,99 @@ msgstr "%s: are deja fi
 msgid "%s: error on closing stdout: %s\n"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid language code"
 msgstr "%s nu este un cod de limb� valid conform ISO 639"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
 msgstr "%s nu este un cod de limb� valid conform ISO 639"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error loading %s: %s"
 msgstr "eroare la scrierea �n `%s'"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown variable %s"
 msgstr "ac�iune necunoscut� `%s'"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown variable from command line: %s\n"
 msgstr "ac�iune necunoscut� `%s'"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown formatting context %s\n"
 msgstr "ac�iune necunoscut� `%s'"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create directory `%s': %s"
 msgstr "Nu pot crea directorul `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing image text file %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Fi�ierul @image `%s' nu poate fi citit: %s"
@@ -2378,136 +2378,136 @@ msgstr "Fi
 msgid "no argument specified for @U"
 msgstr "Nici un nume specificat pentru comanda `%c%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 #| msgid "@image file `%s' (for HTML) not readable: %s"
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "Fi�ierul @image `%s' (pentru HTML) nu poate fi citit: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open html refs config file %s: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 #| msgid "missing action name"
 msgid "missing type"
 msgstr "nume de ac�iune inexistent"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 #| msgid "%s: unrecognized option `--%s'\n"
 msgid "unrecognized type: %s"
 msgstr "%s: op�iune nerecunoscut� `--%s'\n"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing html refs config file %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "ac�iune necunoscut� `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "ac�iune necunoscut� `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 #, fuzzy
 #| msgid "%s:%d: --css-file ended in comment"
 msgid "--css-include ended in comment"
 msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open --include-file %s: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing CSS file %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 #| msgid "no index entries found for `%s'\n"
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "nici o intrare de index a fost g�sit� pentru `%s'\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s nu are sens �n interiorul blocului `@%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing frame file %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing TOC frame file %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error on copying %s into %s"
 msgstr "eroare la scrierea �n `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing redirection node file %s: %s"
@@ -2619,32 +2619,32 @@ msgstr ""
 msgid "`.' or `,' must follow @xref"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not read %s: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "@%s: could not find %s"
@@ -3439,225 +3439,225 @@ msgstr "%s: nu am putut deschide --css-file: %s"
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "Fi�ierul @image `%s' nu poate fi citit: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "Nu pot crea directorul `%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "Nu pot crea directorul `%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error removing directory: %s: %s"
 msgstr "eroare la scrierea �n `%s'"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error creating directory: %s: %s"
 msgstr "eroare la scrierea �n `%s'"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "Nu pot crea directorul `%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: command not set"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not load %s: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s for writing: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3714,24 +3714,30 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not read init file %s"
 msgstr "Nu am putut crea fi�ier ie�ire `%s'."
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
+msgid "could not read extension file %s"
+msgstr "Nu am putut crea fi�ier ie�ire `%s'."
+
+#: tp/texi2any.pl:654
 #, fuzzy, perl-format
 #| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "%s: Ignor valoare nerecunoscut� TEXINFO_OUTPUT_FORMAT `%s'.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Folosire: %s [OP�IUNE]... FI�IER-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 #| msgid ""
 #| "Translate Texinfo source documentation to various other formats, by "
@@ -3748,7 +3754,7 @@ msgstr ""
 "Translateaz� documenta�ia surs� Texinfo �n diferite alte formate, implicit\n"
 "fi�iere Info potrivite pentru citit online cu Emacs sau GNU Info.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 #| msgid ""
 #| "General options:\n"
@@ -3789,61 +3795,61 @@ msgstr ""
 "      --version               afi�eaz� informa�ii despre versiune �i "
 "termin�.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "afi�eaz� acest mesaj �i termin�"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "afi�eaz� acest mesaj �i termin�"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "afi�eaz� acest mesaj �i termin�"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "afi�eaz� acest mesaj �i termin�"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "afi�eaz� acest mesaj �i termin�"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3855,19 +3861,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3879,13 +3885,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3893,17 +3899,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3912,7 +3918,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3921,13 +3927,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3941,19 +3947,19 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr ""
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 #| msgid ""
 #| "Input file options:\n"
@@ -3979,75 +3985,75 @@ msgstr ""
 "  -P DIR                        prepend DIR la calea de c�utare @include.\n"
 "  -U VAR                        nedefine�te variabila VAR, ca �i @clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4071,7 +4077,7 @@ msgstr ""
 "  dac� genera�i text simplu, --ifplaintext este selectat iar restul sunt "
 "deselectate;\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 #| msgid ""
 #| "Examples:\n"
@@ -4119,66 +4125,66 @@ msgstr ""
 "  makeinfo --no-split foo.texi          scrie un singur fi�ier Info "
 "indiferent c�t de mare\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown tree transformation %s"
 msgstr "ac�iune necunoscut� `%s'"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: lipse�te fi�ierul argument.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "eroare la �nchiderea fi�ierului de ie�ire `%s'"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s\n"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index fc3e21eea3..cd223566f3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.6.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2019-09-09 19:58+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@d07.ru>\n"
@@ -418,7 +418,7 @@ msgid "Try --help for more information.\n"
 msgstr "Попробуйте --help для получения более подробного описания.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -559,7 +559,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2088,7 +2088,7 @@ msgstr "невозможно создать каталог «%s»: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: пропущен аргумент, задающий файл.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Попробуйте «%s --help» для получения более подробного описания.\n"
@@ -2099,7 +2099,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: невозможно открыть %s для записи: %s\n"
@@ -2111,7 +2111,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: невозможно открыть %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: ошибка при закрытии %s: %s\n"
@@ -2133,93 +2133,93 @@ msgstr "ошибка переименования %s: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: ошибка при закрытии %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "невозможно открыть %s на запись: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "ошибка при закрытии %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s не является допустимым кодом языка"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s не является допустимым кодом области"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s не является допустимой возможностью разделения"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "ошибка загрузки %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "устаревшая переменная %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: неизвестная переменная %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: неизвестная переменная %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: неизвестная переменная %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: вывод несовместим с разделением"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "невозможно создать каталог «%s»: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "ошибка при закрытии файла текста изображения %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "невозможно прочитать файл @image «%s»: %s"
@@ -2234,123 +2234,123 @@ msgstr "файл @image «%s» не найден, используется «%s
 msgid "no argument specified for @U"
 msgstr "не задан аргумент для @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "файл @image «%s» (для HTML) не найден, используется «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "неструктурированный формат %s не преобразован"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "невозможно открыть файл настроек ссылок html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "отсутствует тип"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "нераспознанный тип: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "ошибка при закрытии файла настроек ссылок html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "неизвестное действие «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "неизвестное действие «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "незакрытая строка в файле css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include обрывается в комментарии"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import не завершена в файле css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "Файл CSS %s не найден"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "невозможно открыть --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "ошибка при закрытии файла CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "элемент htmlxref.cnf не найден в «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside @%s block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s не имеет смысла внутри блока @%s"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "ошибка при закрытии файла frame %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "ошибка при закрытии файла TOC frame %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "ошибка обработчика %s на стадии %s с приоритетом %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "должен быть задан заголовок командой заголовка или @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "ошибка при закрытии %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "ошибка при закрытии файла ноды перенаправления %s: %s"
@@ -2452,30 +2452,30 @@ msgstr "после «.» или «,» должен следовать @xref, а
 msgid "`.' or `,' must follow @xref"
 msgstr "после «.» или «,» должен следовать @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "имя ноды элемента меню не должно содержать «%s»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "имя ноды элемента меню не должно содержать «:»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "имя элемента меню не должно содержать «:»"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "невозможно прочитать %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "ошибка при закрытии файла @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: невозможно найти %s"
@@ -3212,134 +3212,134 @@ msgstr "chm.pm: невозможно открыть %s для записи: %s\n
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: ошибка при закрытии %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "невозможно прочитать файл @image «%s»: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "невозможно создать каталог «%s»: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "невозможно создать каталог «%s» или «%s»: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "ошибка записи в %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "ошибка при закрытии %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "ошибка записи в %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "ошибка при закрытии файла ноды перенаправления %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "невозможно создать каталог «%s»: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: невозможно открыть %s для записи: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: ошибка при закрытии %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: ошибка при выполнении chdir %s: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "ошибка записи в «%s»"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: невозможно открыть файл latex %s для записи: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: имя каталога L2H_TMP содержит точку"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: имя текущего каталога содержит точку"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: ошибка выполнения команды: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: ошибка выполнения команды: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: изображение имеет некорректное расширение: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: ошибка при переименовании %s в %s: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: невозможно открыть %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: не найден конец @%s элемента %d"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3348,12 +3348,12 @@ msgstr ""
 "latex2html.pm: результатом работы стало %d элементов в HTML; ожидалось %d, "
 "число элементов, найденных в документе"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: невозможно определить фрагмент %d для @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3361,54 +3361,54 @@ msgid ""
 msgstr ""
 "l2h: невозможно извлечь фрагмент %d для @%s с выходным количеством %d из HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: невозможно загрузить %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: невозможно открыть %s для записи: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: невозможно открыть %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: ошибка при выполнении chdir %s: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: невозможно вернуться в начальный каталог: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: отсутствует имя выходного файла: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: ошибка при выполнении команды: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: ошибка при выполнении команды: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: не найден конец @%s элемента %d"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3420,12 +3420,12 @@ msgstr ""
 "tex4ht.pm: результатом работы стало %d элементов в HTML; ожидалось %d, число "
 "элементов, найденных в документе для @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: в выводе нет элемента HTML для @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3437,12 +3437,12 @@ msgstr ""
 "tex4ht.pm: результатом работы стало %d элементов в HTML; ожидалось %d, число "
 "элементов, найденных в документе для @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3511,22 +3511,28 @@ msgstr "tex4ht.pm: в выводе нет элемента HTML для @%s 
%s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: в выводе нет элемента HTML для @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "невозможно причитать файл инициализации %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "невозможно причитать файл инициализации %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "игнорируется неизвестное значение TEXINFO_OUTPUT_FORMAT «%s»\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Использование: %s [ПАРАМЕТР]… ФАЙЛ-TEXINFO…\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3541,7 +3547,7 @@ msgstr ""
 "Эта программа, обычно, устанавливается по именами «makeinfo» и «texi2any»;\n"
 "её поведение одинаково и не зависит от названия.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3575,61 +3581,61 @@ msgstr ""
 "  -v, --verbose               пояснять действия\n"
 "      --version               показать информацию о версии и выйти\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "показать эту справку и выйти"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "показать эту справку и выйти"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "показать эту справку и выйти"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "показать эту справку и выйти"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "показать эту справку и выйти"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3641,19 +3647,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3665,13 +3671,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3679,17 +3685,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3698,7 +3704,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3707,13 +3713,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3739,7 +3745,7 @@ msgstr ""
 "                                якорей; по умолчанию, если задано "
 "разделение\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3747,7 +3753,7 @@ msgstr ""
 "Параметры для XML и Docbook:\n"
 "      --output-indent=ЧИСЛО   ничего не делает, для совместимости\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3755,7 +3761,7 @@ msgstr ""
 "Параметры для DVI/PS/PDF:\n"
 "      --Xopt=ПАР              передать ПАР в texi2dvi; может повторяться\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3774,75 +3780,75 @@ msgstr ""
 " -P КАТАЛОГ              добавить КАТАЛОГ в начало списка поиска @include\n"
 " -U ПЕРЕМЕННАЯ           удалить ПЕРЕМЕННУЮ, аналогично @clear\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3867,7 +3873,7 @@ msgstr ""
 "  при выводе простого текста включён --ifplaintext, а остальные выключены;\n"
 "  при выводе XML включён --ifxml, а остальные выключены.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3897,60 +3903,60 @@ msgstr ""
 "разделами\n"
 "  makeinfo --no-split foo.texi          записать один большой Info-файл\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: аргумент --footnote-style должен быть «separate» или «end», а не «%s».\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: аргумент --paragraph-indent должен быть числовым/«none»/«asis», а не "
 "«%s».\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: при генерации %s, можно указать только один входной ФАЙЛ с помощью -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "параметр --Xopt без печатного вывода"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "неизвестное преобразование дерева %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "игнорируется разделение для формата %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: пропущен аргумент, задающий файл.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "Преобразование fill_gaps_in_sectioning не дало результата. Нет раздела?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "ошибка при закрытии расширяющего макрос файла %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "невозможно открыть %s для записи: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3958,7 +3964,7 @@ msgstr ""
 "Преобразование insert_nodes_for_sectioning_commands не дало результата. Нет "
 "раздела?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: ошибка при закрытии файла внутренних ссылок %s: %s\n"
diff --git a/po/rw.po b/po/rw.po
index f6665bc92c..cf7234d055 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n"
 "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n"
@@ -462,7 +462,7 @@ msgid "Try --help for more information.\n"
 msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -571,7 +571,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 #, fuzzy
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
@@ -2169,7 +2169,7 @@ msgstr "Kurema bushyinguro"
 msgid "%s: missing file argument\n"
 msgstr "%s:Ibuze IDOSIYE"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, fuzzy, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "kugirango Birenzeho Ibisobanuro"
@@ -2180,7 +2180,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s:OYA Gufungura IDOSIYE"
@@ -2191,7 +2191,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "Gushaka"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, fuzzy, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "Ikosa Kuri"
@@ -2211,90 +2211,90 @@ msgstr "Gushaka"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "Ikosa Kuri"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, fuzzy, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 msgid "error on closing %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, fuzzy, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 msgid "error loading %s: %s"
 msgstr "Ikosa Kuri"
 
 # sw/source\ui\fldui\fldui.src:STR_SETFLD.text
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 msgid "obsolete option: %s"
 msgstr "Gushyiraho igihinduka"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 msgid "%s: unknown variable %s"
 msgstr "Komandi:"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 msgid "unknown variable from command line: %s\n"
 msgstr "Komandi:"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 msgid "%s: unknown formatting context %s\n"
 msgstr "Komandi:"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "Kurema bushyinguro"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, fuzzy, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@Ishusho IDOSIYE"
@@ -2310,121 +2310,121 @@ msgstr "@Ishusho IDOSIYE"
 msgid "no argument specified for @U"
 msgstr "Izina: kugirango Komandi:"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@Ishusho IDOSIYE kugirango OYA"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, fuzzy, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "Gukuraho... IDOSIYE"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 msgid "missing type"
 msgstr "Ibuze Igikorwa Izina:"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 msgid "unrecognized type: %s"
 msgstr "%s:Ihitamo"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "Gukuraho... IDOSIYE"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 msgid "Unknown file and id setting function: %s"
 msgstr "Kitazwi Igikorwa"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 msgid "Unknown formatting function: %s"
 msgstr "Kitazwi Igikorwa"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 #, fuzzy
 msgid "--css-include ended in comment"
 msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, fuzzy, perl-format
 msgid "CSS file %s not found"
 msgstr "%cendMakoro OYA Byabonetse"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "@%sOYA Mo Imbere Funga"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 msgid "error on copying %s into %s"
 msgstr "Ikosa Kuri"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
@@ -2527,32 +2527,32 @@ msgstr ""
 msgid "`.' or `,' must follow @xref"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, fuzzy, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "Kuri"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 #, fuzzy
 msgid "menu entry node name should not contain `:'"
 msgstr "Kuri"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 #, fuzzy
 msgid "menu entry name should not contain `:'"
 msgstr "Kuri"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, fuzzy, perl-format
 msgid "could not read %s: %s"
 msgstr "Kurema bushyinguro"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, fuzzy, perl-format
 msgid "@%s: could not find %s"
 msgstr "Gushaka"
@@ -3280,209 +3280,209 @@ msgstr "%s:OYA Gufungura IDOSIYE"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 msgid "@image file `%s' can not be copied"
 msgstr "@Ishusho IDOSIYE"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 msgid "could not create images directory `%s': %s"
 msgstr "Kurema bushyinguro"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 msgid "could not copy `%s' to `%s': %s"
 msgstr "Kurema bushyinguro"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 msgid "error removing directory: %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 msgid "error creating directory: %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 msgid "could not create meta informations directory `%s': %s"
 msgstr "Kurema bushyinguro"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "Gushaka"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr "Ikosa Kuri"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, fuzzy, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 msgid "l2h: command not set"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, fuzzy, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, fuzzy, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, fuzzy, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, fuzzy, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, fuzzy, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, fuzzy, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "Gushaka"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, fuzzy, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "Gushaka"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, fuzzy, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "Kurema Ibisohoka IDOSIYE"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, fuzzy, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "Gushaka"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "Gushaka"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "Gushaka"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, fuzzy, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "Kurema Ibisohoka IDOSIYE"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3538,22 +3538,27 @@ msgstr "Kurema Ibisohoka IDOSIYE"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "Kurema Ibisohoka IDOSIYE"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 msgid "could not read init file %s"
 msgstr "Gufungura Iyinjiza IDOSIYE"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+msgid "could not read extension file %s"
+msgstr "Gufungura Iyinjiza IDOSIYE"
+
+#: tp/texi2any.pl:654
 #, fuzzy, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "%s:Kwirengagiza Agaciro"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
@@ -3565,7 +3570,7 @@ msgstr ""
 "Inkomoko Kuri Ikindi Imiterere ku Idosiye kugirango kiri kuri interineti Na: "
 "Cyangwa"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 msgid ""
 "General options:\n"
@@ -3589,56 +3594,56 @@ msgstr ""
 "Indango Mburabuzi v ni Byakozwe Verisiyo Kugaragaza Verisiyo Ibisobanuro Na "
 "Gusohoka"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 msgid "      --docbook               output Docbook XML."
 msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 msgid "      --html                  output HTML."
 msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 msgid "      --epub3                 output EPUB3."
 msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 msgid "      --latex                 output LaTeX."
 msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 msgid "      --xml                   output Texinfo XML."
 msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 #, fuzzy
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
@@ -3656,19 +3661,19 @@ msgstr ""
 "Cyangwa Ibisohoka Ibisohoka IDOSIYE Umubare Ibyatoranyijwe Ibisohoka Umutwe "
 "Na Imibare o Ibisohoka Ibisohoka Kuri bushyinguro NIBA Gutandukanya"
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3680,13 +3685,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3694,17 +3699,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3713,7 +3718,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3722,13 +3727,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -3743,19 +3748,19 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr "kugirango Gushyiramo Gushyiramo in IMISUSIRE Ibisohoka Gusoma NIBA ni"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -3771,75 +3776,75 @@ msgstr ""
 "Gushyiramo Gushaka Inzira Kuri i Gushyiramo Gushaka Inzira U i "
 "IMPINDURAGACIRO Nka Na: Gusiba"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3854,7 +3859,7 @@ msgstr ""
 "NIBA ni ku Na i Ibindi Bidakora NIBA Byuzuye Umwandiko ni ku Na i Ibindi "
 "Bidakora NIBA ni ku Na i Ibindi Bidakora"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -3876,61 +3881,61 @@ msgstr ""
 "Kwandika HTML Imirongo Umubare Ibyatoranyijwe Kwandika Na: Iriho Imibare Oya "
 "Gutandukanya Kwandika IDOSIYE"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, fuzzy, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, fuzzy, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 msgid "unknown tree transformation %s"
 msgstr "Komandi:"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, fuzzy, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s:Ibuze IDOSIYE"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, fuzzy, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, fuzzy, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "Ikosa Ibisohoka IDOSIYE"
diff --git a/po/sl.po b/po/sl.po
index a7973b8184..4677be6f97 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.13\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2012-08-10 18:31+0100\n"
 "Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -457,7 +457,7 @@ msgid "Try --help for more information.\n"
 msgstr "Za več podrobnosti poskusite --help.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -632,7 +632,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2305,7 +2305,7 @@ msgstr "Ni mogoče ustvariti mape `%s': %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: manjka argument datoteke.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Za več podrobnosti poskusite `%s --help'.\n"
@@ -2316,7 +2316,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "%s: could not open %s for writing: %s\n"
@@ -2329,7 +2329,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2351,99 +2351,99 @@ msgstr "%s: datoteka map že obstaja: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "napaka fflush na stdout\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid language code"
 msgstr "%s ni veljavna koda jezika ISO 639"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
 msgstr "%s ni veljavna koda jezika ISO 639"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error loading %s: %s"
 msgstr "napaka med branjem v `%s'"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown variable %s"
 msgstr "neznano dejanje `%s'"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown variable from command line: %s\n"
 msgstr "neznano dejanje `%s'"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown formatting context %s\n"
 msgstr "neznano dejanje `%s'"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create directory `%s': %s"
 msgstr "Ni mogoče ustvariti mape `%s': %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing image text file %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "datoteka @image `%s' je neberljiva: %s"
@@ -2461,136 +2461,136 @@ msgstr "datoteka @image `%s' je neberljiva: %s"
 msgid "no argument specified for @U"
 msgstr "Za ukaz `%c%s' ni navedenega nobenega imena vozlišča"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 #| msgid "@image file `%s' (for HTML) not readable: %s"
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image datoteka `%s' (za HTML) ni berljiva: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open html refs config file %s: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 #| msgid "missing action name"
 msgid "missing type"
 msgstr "manjka ime dejanja"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 #| msgid "%s: unrecognized option `--%s'\n"
 msgid "unrecognized type: %s"
 msgstr "%s: neprepoznana možnost `--%s'\n"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing html refs config file %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "neznano dejanje `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "neznano dejanje `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 #, fuzzy
 #| msgid "%s:%d: --css-file ended in comment"
 msgid "--css-include ended in comment"
 msgstr "%s:%d: --css-file se je končala v komentarju"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open --include-file %s: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing CSS file %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 #| msgid "no index entries found for `%s'\n"
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "Za `%s' ni najdenih nobenih vnosov kazal\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s ni smiselno znotraj bloka `@%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing frame file %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing TOC frame file %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error on copying %s into %s"
 msgstr "napaka med branjem v `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing redirection node file %s: %s"
@@ -2705,32 +2705,32 @@ msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' ali `,' morata slediti @%s, ne `%c'"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not read %s: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "@%s: could not find %s"
@@ -3529,225 +3529,225 @@ msgstr "%s: ni mogoče odpreti --css-file: %s"
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "datoteka @image `%s' je neberljiva: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "Ni mogoče ustvariti mape `%s': %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "Ni mogoče ustvariti mape `%s': %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error removing directory: %s: %s"
 msgstr "napaka med branjem v `%s'"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error creating directory: %s: %s"
 msgstr "napaka med branjem v `%s'"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "Ni mogoče ustvariti mape `%s': %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: command not set"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not load %s: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s for writing: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3804,24 +3804,30 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not read init file %s"
 msgstr "Ni bilo mogoče ustvariti izhodne datoteke `%s'."
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
+msgid "could not read extension file %s"
+msgstr "Ni bilo mogoče ustvariti izhodne datoteke `%s'."
+
+#: tp/texi2any.pl:654
 #, fuzzy, perl-format
 #| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "%s: Prezrtje neprepoznane vrednosti TEXINFO_OUTPUT_FORMAT `%s'.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uporaba: %s [MOŽNOST] ... DATOTEKA-TEXINFO ...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 #| msgid ""
 #| "Translate Texinfo source documentation to various other formats, by "
@@ -3839,7 +3845,7 @@ msgstr ""
 "datoteke Info, ki so primerne za branje na spletu z Emacs ali samostojnim "
 "GNU Info.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 #| msgid ""
 #| "General options:\n"
@@ -3881,61 +3887,61 @@ msgstr ""
 "  -v, --verbose pojasnitev, kaj se dogaja.\n"
 "      --version prikaži podrobnosti različice in končaj.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "prikaži to besedilo pomoči in končaj"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "prikaži to besedilo pomoči in končaj"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "prikaži to besedilo pomoči in končaj"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "prikaži to besedilo pomoči in končaj"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "prikaži to besedilo pomoči in končaj"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3947,19 +3953,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3971,13 +3977,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3985,17 +3991,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -4004,7 +4010,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -4013,13 +4019,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 #, fuzzy
 #| msgid ""
 #| "Options for HTML:\n"
@@ -4052,19 +4058,19 @@ msgstr ""
 "                              izdelaj imena datotek v transliteraciji "
 "ASCII.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 #| msgid ""
 #| "Input file options:\n"
@@ -4090,75 +4096,75 @@ msgstr ""
 "  -P MAPA pripni MAPO na začetek poti iskanja @include.\n"
 "  -U SPR razveljavi določitev spremenljivke SPR, tako kot @clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4182,7 +4188,7 @@ msgstr ""
 "izključeni;\n"
 "  če se ustvarja XML, je --ifxml vključen in vsi ostali izključeni;\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 #| msgid ""
 #| "Examples:\n"
@@ -4229,66 +4235,66 @@ msgstr ""
 "  makeinfo --no-split foo.texi zapiši eno datoteko Info, ne glede na "
 "velikost\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style argument mora biti `separate' ali `end', ne `%s'.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent argument mora biti številski/`none'/`asis', ne `%s'.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown tree transformation %s"
 msgstr "neznano dejanje `%s'"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: manjka argument datoteke.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s\n"
 msgstr "%s: ni mogoče odpreti --css-file: %s"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, fuzzy, perl-format
 #| msgid "%s: ignoring second internal links output `%s'.\n"
 msgid "%s: error on closing internal links file %s: %s\n"
diff --git a/po/sv.po b/po/sv.po
index 9c4cca95d0..369819a5da 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.6.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2019-08-20 15:18+0200\n"
 "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -448,7 +448,7 @@ msgid "Try --help for more information.\n"
 msgstr "Prova --help för mer information.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -590,7 +590,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2154,7 +2154,7 @@ msgstr "kunde inte skapa katalogen ”%s”: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: filargument saknas.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prova ”%s --help” för mer information.\n"
@@ -2165,7 +2165,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: kunde inte öppna %s för skrivning: %s\n"
@@ -2177,7 +2177,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: kunde inte öppna %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: fel vid stängning %s: %s\n"
@@ -2199,93 +2199,93 @@ msgstr "misslyckades med att byta namn på %s: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: fel vid stängning %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "kunde inte öppna %s för skrivning: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "fel vid stängning av %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s är inte en giltig landskod"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s är inte en giltig regionkod"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s är inte en giltig delningsmöjlighet"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "fel vid inläsning av %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "föråldrad variabel %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: okänd variabel %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: okänd variabel %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: okänd variabel %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: utmatning inkompatibel med delning"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "kunde inte skapa katalogen ”%s”: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "fel vid stängning av bildtextfil %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-filen ”%s” är oläslig: %s"
@@ -2300,124 +2300,124 @@ msgstr "@image-filen ”%s” hittades inte, använder 
”%s”"
 msgid "no argument specified for @U"
 msgstr "inget argument angivet för @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image-filen ”%s” (för HTML) hittades inte, använder ”%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "rått format %s konverterades inte"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "kunde inte öppna konfigurationsfil för html-refs %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "saknar typ"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "okänd typ: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "fel vid stängning av html-referenskonfigurationsfil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "okänd åtgärd ”%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "okänd åtgärd ”%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "sträng stängs inte i css-fil"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include slutade med kommentar"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import avslutades inte i css-fil"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS-fil %s hittades inte"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "kunde inte öppna --include-fil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "fel vid stängning av CSS-fil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "ingen htmlxref.cnf-post hittad för ”%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside @%s block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s är inte meningsfullt inuti ”@%s”-block"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "fel vid stängning av ramfil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "fel vid stängning av TOC-ramfil %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "hanterare %s för steg %s prioritet %s misslyckades"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "måste ange en titel med ett titelkommando eller @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, fuzzy, perl-format
 #| msgid "File exists, but is not a directory"
 msgid "%s already exists but is not a directory"
 msgstr "Filen finns men är ingen katalog"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "fel vid stängning av %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "fel vid stängning av omdirigeringsnodsfil %s: %s"
@@ -2529,30 +2529,30 @@ msgstr "”.” eller ”,” måste följa på @xref, inte %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "”.” eller ”,” måste följa på @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "nodnamn för menyobjekt borde inte innehålla ”%s”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "nodnamn för menyobjekt borde inte innehålla ”:”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "namn för menyobjekt borde inte innehålla ”:”"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "kunde inte läsa %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "fel vid stängning av @verbatiminclude-fil %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "%s: kunde inte hitta %s"
@@ -3285,133 +3285,133 @@ msgstr "chm.pm: kunde inte öppna %s för skrivning: 
%s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: fel vid stängning %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image-filen ”%s” är oläslig: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "kunde inte skapa katalogen ”%s”: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "kunde inte skapa kataloger ”%s” eller ”%s”: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "fel vid skrivning till %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "fel vid stängning av %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "fel vid skrivning till %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "fel vid stängning av omdirigeringsnodsfil %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "kunde inte skapa katalogen ”%s”: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: kunde inte öppna %s för skrivning: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: fel vid stängning %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir %s misslyckades: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: kunde inte öppna latexfil %s för skrivning: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: L2H_TMP-katalog innehåller en punkt"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: aktuell katalog innehåller en punkt"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: kommando misslyckades: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: kommando misslyckades: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: bild har ogiltig utökning: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: att byta namn på %s till %s misslyckades: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: kunde inte öppna %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: slut på @%s-objekt %d hittades inte"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3420,12 +3420,12 @@ msgstr ""
 "latex2html.pm: behandling producerade %d HTML-objekt; förväntade %d, antalet "
 "objekt som hittats i dokumentet"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: kunde inte avgöra fragment %d för @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3434,54 +3434,54 @@ msgstr ""
 "l2h: kunde inte extrahera fragment %d för @%s med utmatningsräknare %d från "
 "HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: kunde inte läsa in %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: kunde inte öppna %s för skrivning: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: kunde inte öppna %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir %s misslyckades: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: kan inte återgå till tidigare katalog: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: utdatafil saknas: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: kommando misslyckades: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: kommando misslyckades: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: slut på @%s-objekt %d hittades inte"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3493,12 +3493,12 @@ msgstr ""
 "latex2html.pm: behandling producerade %d HTML-objekt; förväntade %d, antalet "
 "objekt som hittats i dokumentet för @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: utdata har inget HTML-objekt för @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3510,12 +3510,12 @@ msgstr ""
 "latex2html.pm: behandling producerade %d HTML-objekt; förväntade %d, antalet "
 "objekt som hittats i dokumentet för @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3584,22 +3584,28 @@ msgstr "tex4ht.pm: utdata har inget HTML-objekt för @%s 
%s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: utdata har inget HTML-objekt för @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "kunde inte läsa initfil %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "kunde inte läsa initfil %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde ”%s”.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3614,7 +3620,7 @@ msgstr ""
 "beteende är identiskt och beror inte på namnet det installeras under.\n"
 "\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3648,61 +3654,61 @@ msgstr ""
 "  -v, --verbose               förklara vad som görs.\n"
 "      --version               visa versionsinformation och avsluta.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "visa denna hjälptext och avsluta"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "visa denna hjälptext och avsluta"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "visa denna hjälptext och avsluta"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "visa denna hjälptext och avsluta"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "visa denna hjälptext och avsluta"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3714,19 +3720,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3738,13 +3744,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3752,17 +3758,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3771,7 +3777,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3780,13 +3786,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3813,7 +3819,7 @@ msgstr ""
 "                              ankare; standard sätts endast vid delning.\n"
 "\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3822,7 +3828,7 @@ msgstr ""
 "      --output-indent=VÄR     gör ingenting, behålls på grund av "
 "kompatibilitet.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3830,7 +3836,7 @@ msgstr ""
 "Flaggor för DVI/PS/PDF:\n"
 "      --Xopt=FLG              skicka FLG till texi2dvi; får repeteras.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3852,75 +3858,75 @@ msgstr ""
 "  -U VARIABEL                    odefiniera variabeln VARIABEL, som med "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3945,7 +3951,7 @@ msgstr ""
 "  om vanlig text genereras är --ifplaintext på och de andra av;\n"
 "  om XML genereras är --ifxml på och de andra av.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3977,61 +3983,61 @@ msgstr ""
 "  makeinfo --no-split apa.texi           skriv en Info-fil hur stor den än "
 "är\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, 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"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, 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"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr "%s: vid generering av %s får endast en indata-FIL anges med -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "--Xopt flagga utan utskrift"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "okänd trädtransformation %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "hoppar över uppdelning för format %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: filargument saknas.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "fill_gaps_in_sectioning-transformation returnerade inget resultat. Inget "
 "avsnitt?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "fel vid stängning av makroexpansionsfil %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "kunde inte öppna %s för skrivning: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4039,7 +4045,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commans-transformering returnerade inget "
 "resultat. Inget avsnitt?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: fel vid stängning av intern länkfil %s: %s\n"
diff --git a/po/tr.po b/po/tr.po
index 9c03b42fc1..3df744b8d8 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-22 12:11+0300\n"
 "Last-Translator: Mehmet Kececi <mkececi@mehmetkececi.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
@@ -414,7 +414,7 @@ msgid "Try --help for more information.\n"
 msgstr "Daha fazla bilgi için --help seçeneğini kullanın.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -556,7 +556,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2114,7 +2114,7 @@ msgstr "%s: %s dizin oluşturulamadı: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: dosya argümanı eksik;\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazın.\n"
@@ -2125,7 +2125,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: içerik olmadan %s yoksayılıyor\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: %s yazmak için açılamıyorı: %s\n"
@@ -2136,7 +2136,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: %s açılamadı: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: %s'i kapatmada hata: %s\n"
@@ -2156,93 +2156,93 @@ msgstr "%s: %s'in yeniden adlandırması başarısız: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: stdout'u kapatmada hata: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "%s yazmak için açılamıyor: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "%s'i kapatmada hata: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s geçerli bir dil kodu değildir"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s geçerli bir bölge kodu değildir"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s geçerli bir bölme olasılığı değildir"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "%s yüklenirken hata: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "kullanım dışı değişken %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: bilinmeyen değişken %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%sŞ bilinmeyen değişken %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%sŞ bilinmeyen değişken %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: çıktı bölmeyle uyumsuz"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "`%s' dizini oluşturulamıyor: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "imge metin dosyası %s'i kapatmada hata: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image dosyası `%s' okunamıyor: %s"
@@ -2257,85 +2257,85 @@ msgstr "@image dosyası `%s' bulunamıyor, `%s' 
kullanılacak"
 msgid "no argument specified for @U"
 msgstr "@U için argüman belirtlimedi"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image dosyası `%s' (HTML için) bulunamadı, `%s' kullanılacak"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "ham biçem %s dönüştürülmedi"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "%s html başvuru ayar dosyası açılamıyor: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "kayıp tür"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "bilinmeyen tür: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "%s html başvuru ayar dosyasını kapatmada hata: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "bilinmeyen eylem `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "bilinmeyen eylem `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "css dosyasında dizge kapatılmadı"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include yorum içinde sonlandı"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "css dosyasında @import bitmedi"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "CSS dosyası %s bulunamadı"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "--include-file %s açılamadı: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "dosya CSS %s'i kapatmada hata: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "`%s' için htmlxref.cnf girdisi bulunamadı"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s bölünmemiş çıktı için anlamlı değil"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2344,36 +2344,36 @@ msgstr ""
 "web etiketleri dosyası oluşturulurkenJS_WEBLABELS_FILE için mutlak yol veya "
 "`%s' URL'si kullanılamaz"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "çerçeve dosyası %s'i kapatmada hata: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "çerçeve dosyası TOC %s'i kapatmada hata: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "evre %s öncelik %3$s'in kotarıcısı %s başarısız"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "başlık komutu ya da @top ile bir başlık belirlemelisiniz"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s zaten var fakat bir dizin değil"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "%s içinde %s kopyalama hatası"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "yeniden yönlendirme düğüm dosyası %s'i kapatmada hata: %s"
@@ -2475,30 +2475,30 @@ msgstr "`.' ya da `,' @xref'i izlemelidir, `%s'i değil"
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' ya da `,' @xref'i izlemelidir"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "menü girdisi düğüm adı `%s' içermemeli"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "menü girdisi düğüm adı `:' içermemeli"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "menü girdi adı `:' içermemeli"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "%s okunamıyor: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "%s @verbatiminclude dosyasını kapatmada hata: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: %s bulunamıyor"
@@ -3228,133 +3228,133 @@ msgstr "chm.pm %s'i yazmak için açamıyor: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: %s'i kapatmada hata: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image dosyası `%s' okunamıyor: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "`%s' dizini oluşturulamıyor: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "`%s' ya da `%s' dizinleri oluşturulamıyor: %3$s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "%s'e yazma hatası:%s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "%s'i kapatmada hata: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "%s'e yazma hatası:%s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "yeniden yönlendirme düğüm dosyası %s'i kapatmada hata: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "`%s' dizini oluşturulamıyor: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm %s'i yazmak için açamıyor: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: %s'i kapatmada hata: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: %s dizinine geçme başarısız: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: latex dosyası %s yazmak için açılamıyor: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: L2H_TMP dizini bir nokta içeriyor"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: mevcut dizin bir nokta içeriyor"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: komut başarılı omadı: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: komut başarılı omadı: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: resmin geçersiz uzantısı var: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: %s'in %s olarak yeniden adlandırılması başarısız: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: %s açılamıyor: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: @%s ögesinin sonu %d bulunamadı"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3363,65 +3363,65 @@ msgstr ""
 "latex2html.pm: işleme HTML'de %d öğe üretti; %d bekleniyordu, belgede "
 "bulunan öğe sayısı"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: %d parçası @%s için belirlenemedi"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr "l2h: %d parçası, @%s için HTML'den çıktı sayacı %d ile  çıkarılamadı"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: %s yüklenemedi: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: %s yazmak için açılamıyor: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: %s açılamadı: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: %s dizinine geçme başarısız: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: başlangıç dizinine dönülemedi: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: çıktı dosyası kayıp: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: komut başarısız: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: kapanış iletişimi başarısız oldu: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: @%s sonu %d ögesi bulunamadı"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3433,12 +3433,12 @@ msgstr ""
 "tex4ht.pm: işleme HTML'de %d öge üretti; %d bekleniyordu, @%s için belgede "
 "bulunan öge sayısı"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: çıktıda @%s %s için hiç HTML ögesi yok"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3450,12 +3450,12 @@ msgstr ""
 "tex4ht.pm: işleme HTML'de %d öge üretti; %d bekleniyordu, @%s için belgede "
 "bulunan öge sayısı"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3515,22 +3515,28 @@ msgstr "highlight_syntax.pm: çıktıda @%s için HTML 
öğesi var fakat %s dili
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: çıktı için HTML öğesi yok @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "init dosyası %s okunamıyor"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "init dosyası %s okunamıyor"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "tanınamayan TEXINFO_OUTPUT_FORMAT değeri `%s' yok sayılıyor.\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Kullanım: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3545,7 +3551,7 @@ msgstr ""
 "Bu program genellikle hem `makeinfo', hem de `texi2any' şeklinde kurulur;\n"
 "davranış, kurulum adından bağımsız olarak, özdeştir.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3581,61 +3587,61 @@ msgstr ""
 "  -v, --verbose               ne yapılıyor olduğunu açıklar.\n"
 "      --version               sürüm bilgisini görüntüler ve çıkar.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   ana kullanım kılavuzu için top"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   ana kullanım kılavuzu için top"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   ana kullanım kılavuzu için top"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   ana kullanım kılavuzu için top"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   ana kullanım kılavuzu için top"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3647,7 +3653,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3659,13 +3665,13 @@ msgstr ""
 "    --output=NAME           ilk veya ana kılavuzun ADINA çıktı\n"
 "                            standart çıktı yerine"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3677,13 +3683,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3691,17 +3697,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3710,7 +3716,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3719,13 +3725,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3751,7 +3757,7 @@ msgstr ""
 "dosyaları üretir;\n"
 "                                öntanımlısı yalnızca bölünmüşse atanır.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3760,7 +3766,7 @@ msgstr ""
 "      --output-indent=DEĞ     hiçbir şey yapmaz, uyumluluk için "
 "korunmuştur.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3768,7 +3774,7 @@ msgstr ""
 "DVI/PS/PDF için Seçenekler:\n"
 "      --Xopt=OPT              OPT'i texi2dvi'e aktar; yinelenebilir.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3788,75 +3794,75 @@ msgstr ""
 "  -P DIR              \t\tDIR'ı @include arama yolu başına ekler.\n"
 "  -U VAR             \t\tVAR değişkeni tanımsız, @clear ile olduğu gibi.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3881,7 +3887,7 @@ msgstr ""
 "  eğer salt metin oluşturuluyorsa, --ifplaintext açık, diğerleri kapalıdır;\n"
 "  eğer XML oluşturuluyorsa, --ifxml açık, deiğerleri kapalıdır.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3911,58 +3917,58 @@ msgstr ""
 "  makeinfo --no-split foo.texi      ne büyüklükte olursa olsun tek Info "
 "dosyası yazar\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: --footnote-style arg. `separate' ya da `end' olmalıdır, `%s' değil.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: --paragraph-indent arg. sayısal/`none'/`asis' olmalıdır, `%s' değil.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: %s oluşturulurken -o ile yalnızca bir girdi DOSYAsı belirtilebilir\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "yazdırılmış çıktı olmadan--Xopt seçeneği"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "bilinmeyen ağaç dönüşümü %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "%s biçemi için bölme yok sayılıyor"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: dosya argümanı eksik.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr "fill_gaps_in_sectioning dönüşümü sonuç geri döndürmedi. Bölüm yok mu?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "%s makro genişletme dosyasını kapatmada hata: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "%s yazmak için açılamıyorı: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -3970,7 +3976,7 @@ msgstr ""
 "insert_nodes_for_sectioning_commands dönüşümü sonuç geri döndürmüyor. Bölüm "
 "yok mu?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: %s dahili bağlantı dosyasını kapatmada hata: %s\n"
diff --git a/po/uk.po b/po/uk.po
index 84f94bffca..f6634c0299 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-01 10:42+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -417,7 +417,7 @@ msgid "Try --help for more information.\n"
 msgstr "Спробуйте --help, щоб отримати більше інформації.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -562,7 +562,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2128,7 +2128,7 @@ msgstr "%s: не вдалося створити каталог %s: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: не вказано аргумент назви файла\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Спробуйте `%s --help', щоб отримати більше інформації.\n"
@@ -2139,7 +2139,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr "%s: ігноруємо %s без вмісту\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: не вдалося відкрити %s для запису даних: %s\n"
@@ -2150,7 +2150,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: не вдалося відкрити %s: %s\n"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: помилка під час спроби закрити %s: %s\n"
@@ -2171,93 +2171,93 @@ msgstr "%s: не вдалося перейменувати %s: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: помилка під час спроби закрити stdout: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "не вдалося відкрити %s для запису: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "помилка під час спроби закрити %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s не є коректним кодом мови"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s не є коректним кодом регіону"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "%s не є коректною можливістю поділу"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "помилка під час спроби завантаження %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "застаріла змінна %s\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: невідома змінна %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: невідома змінна %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: невідома змінна %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: виведені дані несумісні із поділом"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "не вдалося створити каталог «%s»: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "помилка під час спроби закрити файл тексту зображення %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Неможливо прочитати файл @image `%s': %s"
@@ -2272,85 +2272,85 @@ msgstr "не знайдено файл @image «%s», використовуєм
 msgid "no argument specified for @U"
 msgstr "не вказано аргументу @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "не знайдено файл @image «%s» (для HTML), використовуємо «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "формат необроблених даних %s не перетворено"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "не вдалося відкрити файл налаштувань посилань html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "пропущено тип"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "нерозпізнаний тип: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "помилка під час закриття файла налаштувань посилань html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "невідома дія `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "невідома дія `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "незавершений рядок у файлі css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "--css-include завершується коментарем"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "незавершений запис @import у файлі css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "Файл CSS %s не знайдено"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "не вдалося відкрити --include-файл %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "помилка під час спроби закрити файл CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "не знайдено запису htmlxref.cnf для «%s»"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, perl-format
 msgid "%s not meaningful for non-split output"
 msgstr "%s не є змістовним для неподіленого виведення"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
@@ -2359,36 +2359,36 @@ msgstr ""
 "не вдалося скористатися абсолютним шляхом або адресою «%s» для "
 "JS_WEBLABELS_FILE під час створення файла вебміток"
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "помилка під час спроби закрити файл фрейма %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "помилка під час спроби закрити файл фрейма змісту %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "помилка обробника %s на етапі %s, пріоритетність %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "слід вказати заголовок за допомогою команди title або @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr "%s вже існує, але не є каталогом"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr "помилка під час спроби копіювання %s до %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "помилка під час спроби закрити файл переспрямовування вузла %s: %s"
@@ -2490,30 +2490,30 @@ msgstr "після @xref має бути «.» або «,», але не %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "після @xref має бути «.» або «,»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "у назві вузла пункту меню не повинно бути «%s»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "у назві вузла пункту меню не повинно бути «:»"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "у назві пункту меню не повинно бути «:»"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "не вдалося прочитати %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "помилка під час закриття файла @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: не вдалося знайти %s"
@@ -3253,134 +3253,134 @@ msgstr "chm.pm: не вдалося відкрити %s для запису: %s\
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: помилка під час спроби закрити %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "Неможливо прочитати файл @image `%s': %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "не вдалося створити каталог «%s»: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "не вдалося створити каталок «%s» або «%s»: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "помилка під час запису до %s: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "помилка під час спроби закрити %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "помилка під час запису до %s: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "помилка під час спроби закрити файл переспрямовування вузла %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "не вдалося створити каталог «%s»: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: не вдалося відкрити %s для запису: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: помилка під час спроби закрити %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: помилка під час спроби змінити каталог на %s: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "помилка запису до `%s'"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: не вдалося відкрити файл latex %s для запису даних: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: назва каталогу L2H_TMP містить крапку"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: назва поточного каталогу містить крапку"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: не вдалося успішно виконати команду: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: не вдалося успішно виконати команду: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: суфікс назви файла зображення є некоректним: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: спроба перейменування %s на %s завершилася невдало: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: не вдалося відкрити %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: не знайдено завершення запису @%s з номером %d"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3389,12 +3389,12 @@ msgstr ""
 "latex2html.pm: обробляємо створені %d записів у HTML; мало бути %d, "
 "кількість записів, знайдених у документі"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: не вдалося визначити фрагмент %d для @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3403,53 +3403,53 @@ msgstr ""
 "l2h: не вдалося видобути фрагмент %d для @%s з лічильником виведення %d з "
 "HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: не вдалося завантажити %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: не вдалося відкрити %s для запису даних: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: не вдалося відкрити %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: помилка під час спроби змінити каталог на %s: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: не вдалося повернутися до початкового каталогу: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: не вказано файла для виведення даних: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: помилка команди: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: не вдалося завершити обмін даними: %s: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: не знайдено завершення запису @%s з номером %d"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3461,12 +3461,12 @@ msgstr ""
 "tex4ht.pm: обробляємо створені %d записів у HTML; мало бути %d, кількість "
 "записів, знайдених у документі для @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: у виведених даних немає запису HTML для @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3478,12 +3478,12 @@ msgstr ""
 "tex4ht.pm: обробляємо створені %d записів у HTML; мало бути %d, кількість "
 "записів, знайдених у документі для @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3547,22 +3547,28 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "highlight_syntax.pm: у виведених даних немає запису HTML для @%s %s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "не вдалося прочитати файл ініціалізації %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "не вдалося прочитати файл ініціалізації %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "пропускаємо невідоме значення TEXINFO_OUTPUT_FORMAT «%s».\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Usage: %s [ПАРАМЕТР]... ФАЙЛ-TEXINFO...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3578,7 +3584,7 @@ msgstr ""
 "«texi2any»;\n"
 "поведінка цих компонентів є однаковою і не залежить від назви програми.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3615,61 +3621,61 @@ msgstr ""
 "  -v, --verbose               описувати, що буде робитися.\n"
 "      --version               показати інформацію про версію й вийти.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --docbook               output Docbook XML."
 msgstr "    --top                   верхній рівень основного підручника"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --html                  output HTML."
 msgstr "    --top                   верхній рівень основного підручника"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --epub3                 output EPUB3."
 msgstr "    --top                   верхній рівень основного підручника"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --latex                 output LaTeX."
 msgstr "    --top                   верхній рівень основного підручника"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "    --top                   top for the main manual"
 msgid "      --xml                   output Texinfo XML."
 msgstr "    --top                   верхній рівень основного підручника"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3681,7 +3687,7 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 #, fuzzy
 #| msgid ""
 #| "    --output=NAME           output to NAME for the first or main manual\n"
@@ -3694,13 +3700,13 @@ msgstr ""
 "основного\n"
 "                            підручника, замість стандартного виведення"
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3712,13 +3718,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3726,17 +3732,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3745,7 +3751,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3754,13 +3760,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3788,7 +3794,7 @@ msgstr ""
 "                                типово встановлюється лише для поділених "
 "документів.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3797,7 +3803,7 @@ msgstr ""
 "      --output-indent=VAL     нічого не робити, збережено для зворотної "
 "сумісності.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3806,7 +3812,7 @@ msgstr ""
 "      --Xopt=ПАРАМЕТР         передати ПАРАМЕТР texi2dvi; можна "
 "використовувати декілька разів.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3829,75 +3835,75 @@ msgstr ""
 "  -U ЗМІННА                     скинути значення ЗМІННОЇ, те ж саме, що "
 "@clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3922,7 +3928,7 @@ msgstr ""
 "  якщо створюємо простий текст - --ifplaintext ввімкнено, а інші вимкнено;\n"
 "  якщо створюємо XML - --ifxml ввімкнено, а інші вимкнено.\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3957,63 +3963,63 @@ msgstr ""
 "  makeinfo --no-split foo.texi           записати все в один файл Info (він "
 "буде великим)\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 "%s: аргумент до --footnote-style має бути `separate' чи `end', а не `%s'.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 "%s: аргумент до --paragraph-indent має бути числом, `none' чи `asis', а не "
 "`%s'.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: створення %s, за допомогою -o можна вказувати лише один файл вхідних "
 "даних\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "використано параметр --Xopt без визначення друкованого виведення"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "невідоме перетворення ієрархії %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "ігноруємо поділ для формату %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: не вказано аргумент назви файлу.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "Перетворення fill_gaps_in_sectioning не дало ніяких результатів. Немає "
 "розділу?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr ""
 "помилка під час спроби закрити файл розгортання макровизначень %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "не вдалося відкрити %s для запису: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4021,7 +4027,7 @@ msgstr ""
 "Перетворення insert_nodes_for_sectioning_commands не дало ніяких "
 "результатів. Немає розділу?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: помилка під час спроби закрити файл внутрішніх посилань %s: %s\n"
diff --git a/po/vi.po b/po/vi.po
index 4cbdaa5045..a8acc6f78e 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.3.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2017-07-11 14:12+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
 "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
@@ -418,7 +418,7 @@ 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:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -559,7 +559,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2093,7 +2093,7 @@ msgstr "không thể tạo thư mục “%s”: %s"
 msgid "%s: missing file argument\n"
 msgstr "%s: thiếu đối số tập tin.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, 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"
@@ -2104,7 +2104,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, perl-format
 msgid "%s: could not open %s for writing: %s\n"
 msgstr "%s: không thể mở “%s” để ghi: %s\n"
@@ -2116,7 +2116,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "@%s: không thể mở %s: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr "%s: lỗi đóng tập tin %s: %s\n"
@@ -2138,93 +2138,93 @@ msgstr "đổi tên %s gặp lỗi: %s"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "%s: lỗi đóng tập tin %s: %s\n"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr "không thể mở “%s” để ghi: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, perl-format
 msgid "error on closing %s: %s"
 msgstr "gặp lỗi khi đóng %s: %s"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s không phải mã ngôn ngữ hợp lệ"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s không phải mã vùng hợp lệ"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr "“%s” không phải là khả năng chia tách (split) hợp lệ"
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error loading %s: %s\n"
 msgid "error loading %s: %s"
 msgstr "lỗi tải %s: %s\n"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "obsolete variable %s\n"
 msgid "obsolete option: %s"
 msgstr "biến %s đã lạc hậu\n"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, perl-format
 msgid "%s: unknown variable %s"
 msgstr "%s: không hiểu biến %s"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "unknown variable from command line: %s\n"
 msgstr "%s: không hiểu biến %s\n"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "%s: unknown variable %s\n"
 msgid "%s: unknown formatting context %s\n"
 msgstr "%s: không hiểu biến %s\n"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr "%s: kết xuất không tương thích với split (chia tách)"
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, perl-format
 msgid "could not create directory `%s': %s"
 msgstr "không thể tạo thư mục “%s”: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin ảnh dạng text %s: %s"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Không thể đọc tập tin @image “%s”: %s"
@@ -2239,123 +2239,123 @@ msgstr "không tìm thấy tập tin @image “%s”, đang dùng 
“%s”"
 msgid "no argument specified for @U"
 msgstr "chưa chỉ định đối số cho @U"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "Tập tin @image “%s” (cho HTML) không đọc được, dùng “%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr "định dạng thô %s không được chuyển đổi"
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr "không thể mở tập tin cấu hình dùng để tham chiếu html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 msgid "missing type"
 msgstr "thiếu kiểu"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, perl-format
 msgid "unrecognized type: %s"
 msgstr "không nhận ra kiểu: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin cấu hình tham chiếu cho html %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "hành động lạ “%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "hành động lạ “%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr "chuỗi chưa được đóng trong tập tin css"
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr "“--css-include” kết thúc tại phần ghi chú"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr "@import chưa hoàn thiện trong tập tin css"
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr "không tìm thấy tập tin CSS %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "không thể mở --include-file %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin CSS %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, perl-format
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "không tìm thấy mục htmlxref.cnf dành cho “%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s không có nghĩa bên trong khối “@%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin khung (frame) %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin khung (frame) TOC %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr "bộ tiếp hợp %s của trạng thái %s mức ưu tiên %s gặp lỗi"
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr "phải chỉ định một tiêu đề cùng với lệnh title hay @top"
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error on copying %s into %s"
 msgstr "gặp lỗi khi đóng %s: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin nút chuyển hướng %s: %s"
@@ -2458,30 +2458,30 @@ msgstr "“.” hay “,” phải theo sau @xref, không phải %s"
 msgid "`.' or `,' must follow @xref"
 msgstr "“.” hay “,” phải theo sau @xref"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr "tên mục trình đơn không được chứa “%s”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr "tên nút mục trình đơn không được chứa dấu hai chấm “:”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr "tên mục trình đơn không được chứa dấu hai chấm “:”"
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr "không thể đọc %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "gặp lỗi khi đóng tập tin @verbatiminclude %s: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr "@%s: không tìm thấy %s"
@@ -3246,134 +3246,134 @@ msgstr "chm.pm: không thể mở %s để ghi: %s\n"
 msgid "chm.pm: error on closing %s: %s"
 msgstr "chm.pm: gặp lỗi khi đang đóng %s: %s"
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "Không thể đọc tập tin @image “%s”: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "không thể tạo thư mục “%s”: %s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "could not create directories `%s' or `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "không thể tạo các thư mục “%s” hay “%s”: %s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error removing directory: %s: %s"
 msgstr "gặp lỗi khi ghi vào “%s”: %s"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error on closing %s: %s"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "gặp lỗi khi đóng %s: %s"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to %s: %s"
 msgid "error creating directory: %s: %s"
 msgstr "gặp lỗi khi ghi vào “%s”: %s"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error on closing redirection node file %s: %s"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "gặp lỗi khi đóng tập tin nút chuyển hướng %s: %s"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "could not create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "không thể tạo thư mục “%s”: %s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "chm.pm: could not open %s for writing: %s\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "chm.pm: không thể mở %s để ghi: %s\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "chm.pm: error on closing %s: %s"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "chm.pm: gặp lỗi khi đang đóng %s: %s"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: chdir %s failed: %s"
 msgid "epub3.pm: readdir %s error: %s"
 msgstr "tex4ht.pm: chdir %s gặp lỗi: %s"
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "epub3.pm: error writing archive %s"
 msgstr "gặp lỗi khi ghi vào “%s”"
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "l2h: không thể mở tập tin latex “%s” để ghi: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr "l2h: thư mục L2H_TMP chứa dấu chấm"
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr "l2h: thư mục hiện tại có chứa dấu chấm"
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "l2h: command did not succeed: %s"
 msgid "l2h: command not set"
 msgstr "l2h: lệnh thực hiện không thành công: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr "l2h: lệnh thực hiện không thành công: %s"
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr "l2h: ảnh có phần đuôi mở rộng không hợp lệ: %s"
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr "l2h: đổi tên %s thành %s gặp lỗi: %s"
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr "l2h: không thể mở %s: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr "latex2html.pm: không tìm thấy kết của @%s mục %d"
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3382,12 +3382,12 @@ msgstr ""
 "latex2html.pm: xử lý thủ tục %d mục trong HTML; cần %d, ; là số mục được tìm "
 "thấy trong tài liệu"
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr "l2h: không thể xác định mảnh %d cho @%s"
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
@@ -3395,54 +3395,54 @@ msgid ""
 msgstr ""
 "l2h: không thể trích xuất mảnh %d cho @%s với con đếm kết xuất %d từ HTML"
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr "l2h: không thể tải %s: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr "l2h: không thể mở %s để ghi: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "tex4ht.pm: không thể mở %s: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr "tex4ht.pm: chdir %s gặp lỗi: %s"
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr "tex4ht.pm: không thể trả về thư mục khởi tạo: %s"
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr "tex4ht.pm: thiếu tập tin đầu ra: %s"
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr "tex4ht.pm: lệnh gặp lỗi: %s"
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: command failed: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "tex4ht.pm: lệnh gặp lỗi: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, fuzzy, perl-format
 #| msgid "tex4ht.pm: end of @%s item %d not found"
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr "tex4ht.pm: không tìm thấy cuối của @%s mục %d"
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3454,12 +3454,12 @@ msgstr ""
 "tex4ht.pm: xử lý thủ tục %d mục trong HTML; cần %d, con số được tìm thấy "
 "trong tài liệu dành cho @%s"
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr "tex4ht.pm: kết xuất không có mục HTML cho @%s %s"
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, fuzzy, perl-format
 #| msgid ""
 #| "tex4ht.pm: processing produced %d items in HTML; expected %d, the number "
@@ -3471,12 +3471,12 @@ msgstr ""
 "tex4ht.pm: xử lý thủ tục %d mục trong HTML; cần %d, con số được tìm thấy "
 "trong tài liệu dành cho @%s"
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3545,24 +3545,30 @@ msgstr "tex4ht.pm: kết xuất không có mục HTML cho @%s 
%s"
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr "tex4ht.pm: kết xuất không có mục HTML cho @%s %s"
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, perl-format
 msgid "could not read init file %s"
 msgstr "không thể đọc tập tin khởi tạo %s"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "could not read init file %s"
+msgid "could not read extension file %s"
+msgstr "không thể đọc tập tin khởi tạo %s"
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr ""
 "bỏ qua giá trị không chấp nhận được “TEXINFO_OUTPUT_FORMAT” (định dạng xuất "
 "Texinfo) “%s”\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Cách dùng: %s [TÙY-CHỌN]… TẬP-TIN-TEXTINFO…\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3577,7 +3583,7 @@ msgstr ""
 "Chương trình này thường được cài cùng cả “makeinfo” và “texi2any”;\n"
 "chúng làm cùng nhiệm vụ, không phụ thuộc vào tên được cài đặt.\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3616,61 +3622,61 @@ msgstr ""
 "  -v, --verbose               diễn tả việc đang được làm \n"
 "      --version               hiển thị thông tin phiên bản rồi thoát.\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr " -h, --help   hiển thị trợ giúp này rồi thoát"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --html                  output HTML."
 msgstr " -h, --help   hiển thị trợ giúp này rồi thoát"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr " -h, --help   hiển thị trợ giúp này rồi thoát"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr " -h, --help   hiển thị trợ giúp này rồi thoát"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid " -h, --help   display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr " -h, --help   hiển thị trợ giúp này rồi thoát"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3682,19 +3688,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3706,13 +3712,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3720,17 +3726,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3739,7 +3745,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3748,13 +3754,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3780,7 +3786,7 @@ msgstr ""
 "      --node-files            tạo ra các tập tin chuyển hướng cho các nút\n"
 "                               và điểm neo; mặc định chỉ được đặt nếu tách.\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
@@ -3788,7 +3794,7 @@ msgstr ""
 "Các tùy chọn cho XML và Docbook:\n"
 "      --output-indent=VAL     chẳng làm gì, giữ lại để tương thích.\n"
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
@@ -3796,7 +3802,7 @@ msgstr ""
 "Tùy chọn cho DVI/PS/PDF:\n"
 "      --Xopt=OPT              chuyển TÙY-CHỌN cho texi2dvi; có thể lặp lại.\n"
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3818,75 +3824,75 @@ msgstr ""
 "kiếm @include.\n"
 "  -U BIẾN                       hủy định nghĩa biến này, giống như @clear.\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -3911,7 +3917,7 @@ msgstr ""
 "  nếu tạo chữ dạng thô thì bật “--ifplaintext” và các cái khác bị tắt;\n"
 "  nếu tạo XML thì bật “--ifxml” và các cái khác bị tắt;\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -3942,7 +3948,7 @@ msgstr ""
 "  makeinfo --no-split phu.texi           ghi một tập tin Info, bất chấp kích "
 "cỡ tối đa\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
@@ -3951,7 +3957,7 @@ msgstr ""
 " * end        cuối\n"
 "không phải “%s”.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
@@ -3961,49 +3967,49 @@ msgstr ""
 " * asis       như thế\n"
 "không phải “%s”.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 "%s: khi đang tạo %s, chỉ một TẬP-TIN đầu vào có thể được chỉ ra cùng với tùy "
 "chọn -o\n"
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr "tùy chọn --Xopt không in ra kết xuất"
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, perl-format
 msgid "unknown tree transformation %s"
 msgstr "không hiểu sự biến đổi cây %s"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr "bỏ qua việc chia cắt cho định dạng %s"
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: thiếu đối số tập tin.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 "chuyển đổi dạng fill_gaps_in_sectioning không trả về kết quả nào. Không có "
 "chương nào à?"
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "gặp lỗi khi đóng tập tin vĩ lệnh mở rộng %s: %s\n"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr "không thể mở “%s” để ghi: %s\n"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
@@ -4011,7 +4017,7 @@ msgstr ""
 "sự biến đổi insert_nodes_for_sectioning_commands không trả về kết quả. Không "
 "có chương nào à?"
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr "%s: gặp lỗi khi đóng tập tin liên kết nội tại %s: %s\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cfb21c3985..8ccff6190a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.3.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2018-01-23 10:13+0800\n"
 "Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -460,7 +460,7 @@ msgid "Try --help for more information.\n"
 msgstr "尝试 --更多的求助信息。\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -632,7 +632,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 msgid ""
 "Email bug reports to bug-texinfo@gnu.org,\n"
 "general questions and discussion to help-texinfo@gnu.org.\n"
@@ -2317,7 +2317,7 @@ msgstr "无法创建目录“%s”:%s"
 msgid "%s: missing file argument\n"
 msgstr "%s:遗漏文件参数。\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "试用“%s --help”以获取更多信息。\n"
@@ -2328,7 +2328,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "%s: could not open %s for writing: %s\n"
@@ -2341,7 +2341,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr "%s: 无法打开 --css-file: %s"
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2363,100 +2363,100 @@ msgstr "%s: 已经存在了 dir 文件: %s\n"
 msgid "%s: error on closing stdout: %s\n"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid language code"
 msgstr "%s 在 ISO 639 语言编码中是无效的"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
 msgstr "%s 在 ISO 639 语言编码中是无效的"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error loading %s: %s"
 msgstr "写入“%s”时出错"
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, fuzzy, perl-format
 #| msgid "Set variable: "
 msgid "obsolete option: %s"
 msgstr "设定变量:"
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown variable %s"
 msgstr "未知的动作“%s”"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown variable from command line: %s\n"
 msgstr "未知的动作“%s”"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "%s: unknown formatting context %s\n"
 msgstr "未知的动作“%s”"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create directory `%s': %s"
 msgstr "无法创建目录“%s”:%s"
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing image text file %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image 文件“%s”不可读:%s"
@@ -2474,137 +2474,137 @@ msgstr "@image 文件“%s”不可读:%s"
 msgid "no argument specified for @U"
 msgstr "没有为“%c%s”命令指定节名称"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 #| msgid "@image file `%s' (for HTML) not readable: %s"
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image 文件“%s”(对 HTML)不可读:%s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open html refs config file %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 #| msgid "missing action name"
 msgid "missing type"
 msgstr "遗漏动作名称"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 #| msgid "%s: unrecognized option `--%s'\n"
 msgid "unrecognized type: %s"
 msgstr "%s:不能识别的选项“--%s”\n"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing html refs config file %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown file and id setting function: %s"
 msgstr "未知的动作“%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "Unknown formatting function: %s"
 msgstr "未知的动作“%s”"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 #, fuzzy
 #| msgid "%s:%d: --css-file ended in comment"
 msgid "--css-include ended in comment"
 msgstr "%s:%d: --css-file 以注释结尾"
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open --include-file %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing CSS file %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 #| msgid "no index entries found for `%s'\n"
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "找不到含有“%s”的索引\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "在“@%2$s”块中“@%1$s”是没有意义的"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing frame file %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing TOC frame file %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, fuzzy, perl-format
 #| msgid "File exists, but is not a directory"
 msgid "%s already exists but is not a directory"
 msgstr "文件存在,但不是目录"
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on copying %s into %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing redirection node file %s: %s"
@@ -2717,32 +2717,32 @@ msgstr "“.”或“,”之后必须为 @%s,而不是“%c”"
 msgid "`.' or `,' must follow @xref"
 msgstr "“.”或“,”之后必须为 @%s,而不是“%c”"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not read %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "@%s: could not find %s"
@@ -3532,226 +3532,226 @@ msgstr "%s: 无法打开 --css-file: %s"
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image 文件“%s”不可读:%s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create images directory `%s': %s"
 msgstr "无法创建目录“%s”:%s"
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not copy `%s' to `%s': %s"
 msgstr "无法创建目录“%s”:%s"
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error removing directory: %s: %s"
 msgstr "写入“%s”时出错"
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "error writing to `%s'"
 msgid "error creating directory: %s: %s"
 msgstr "写入“%s”时出错"
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "Can't create directory `%s': %s"
 msgid "could not create meta informations directory `%s': %s"
 msgstr "无法创建目录“%s”:%s"
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 #, fuzzy
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: command not set"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not load %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "l2h: could not open %s for writing: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3808,24 +3808,30 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not read init file %s"
 msgstr "无法创建输出文件“%s”。"
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
+msgid "could not read extension file %s"
+msgstr "无法创建输出文件“%s”。"
+
+#: tp/texi2any.pl:654
 #, fuzzy, perl-format
 #| msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr "%s: 忽略不可辨认的 TEXINFO_OUTPUT_FORMAT 值“%s”。\n"
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "用法:%s [选项]... TEXINFO-文件...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 #, fuzzy
 #| msgid ""
 #| "Translate Texinfo source documentation to various other formats, by "
@@ -3842,7 +3848,7 @@ msgstr ""
 "将 Texinfo 源文件转换为其它各种格式,默认转换为适于\n"
 "由 Emacs 或独立 GNU Info 在线浏览的 Info 文件。\n"
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, fuzzy, perl-format
 #| msgid ""
 #| "General options:\n"
@@ -3883,61 +3889,61 @@ msgstr ""
 "  -v, --verbose               解释都做了些什么。\n"
 "      --version               显示版本信息并退出。\n"
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "显示该求助信息并退出"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "显示该求助信息并退出"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "显示该求助信息并退出"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "显示该求助信息并退出"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "显示该求助信息并退出"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3949,19 +3955,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3973,13 +3979,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3987,17 +3993,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -4006,7 +4012,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -4015,13 +4021,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 #, fuzzy
 #| msgid ""
 #| "Options for HTML:\n"
@@ -4052,19 +4058,19 @@ msgstr ""
 "      --transliterate-file-names\n"
 "                              以 ASCII 字义生成文件名。\n"
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 #, fuzzy
 #| msgid ""
 #| "Input file options:\n"
@@ -4090,75 +4096,75 @@ msgstr ""
 "  -P DIR                         将 DIR 追加到 @include 搜索路径之前。\n"
 "  -U VAR                         取消变量 VAR 的定义,就象 @clear。\n"
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 #, fuzzy
 #| msgid ""
 #| "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -4181,7 +4187,7 @@ msgstr ""
 "  如果生成普通文本,则 --ifplaintext 默认开启而其它默认关闭;\n"
 "  如果生成 XML,则 --ifxml 默认开启而其它默认关闭。\n"
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 #| msgid ""
 #| "Examples:\n"
@@ -4226,64 +4232,64 @@ msgstr ""
 "  makeinfo --number-sections foo.texi   输出带有编号的节的 Info\n"
 "  makeinfo --no-split foo.texi          输出单个 Info 文件而不论大小\n"
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s:--footnote-style 的参数必须为“separate”或“end”,而不是“%s”。\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr "%s:--paragraph-indent 的参数必须为数值/“none”/“asis”,而不是“%s”。\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 #| msgid "unknown action `%s'"
 msgid "unknown tree transformation %s"
 msgstr "未知的动作“%s”"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s:遗漏文件参数。\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 #| msgid "error closing output file `%s'"
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, fuzzy, perl-format
 #| msgid "%s: could not open --css-file: %s"
 msgid "could not open %s for writing: %s\n"
 msgstr "%s: 无法打开 --css-file: %s"
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, fuzzy, perl-format
 #| msgid "%s: ignoring second internal links output `%s'.\n"
 msgid "%s: error on closing internal links file %s: %s\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f74c64e159..1458bc86ac 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 4.1\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2002-03-08 04:56+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -443,7 +443,7 @@ msgid "Try --help for more information.\n"
 msgstr "�ո� --help �H���o��h����T.\n"
 
 #: info/info.c:860 install-info/install-info.c:2195
-#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:896
+#: Pod-Simple-Texinfo/pod2texi.pl:155 tp/texi2any.pl:933
 #, c-format, perl-format
 msgid ""
 "Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -552,7 +552,7 @@ msgid "  info -f ./foo.info           show file ./foo.info, 
not searching dir"
 msgstr ""
 
 #: info/info.c:1157 install-info/install-info.c:571
-#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:879
+#: Pod-Simple-Texinfo/pod2texi.pl:133 tp/texi2any.pl:916
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -2146,7 +2146,7 @@ msgstr ""
 msgid "%s: missing file argument\n"
 msgstr "%s: ��|�ɮפ޼�.\n"
 
-#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1259
+#: Pod-Simple-Texinfo/pod2texi.pl:204 tp/texi2any.pl:1301
 #, perl-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "�ո� `%s --help' �H���o��h����T.\n"
@@ -2157,7 +2157,7 @@ msgid "%s: ignoring %s without content\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:378 Pod-Simple-Texinfo/pod2texi.pl:465
-#: tp/texi2any.pl:1588 tp/texi2any.pl:1641
+#: tp/texi2any.pl:1632 tp/texi2any.pl:1687
 #, fuzzy, perl-format
 #| msgid "%s: could not read (%s) and could not create (%s)\n"
 msgid "%s: could not open %s for writing: %s\n"
@@ -2169,7 +2169,7 @@ msgid "%s: could not open %s: %s\n"
 msgstr ""
 
 #: Pod-Simple-Texinfo/pod2texi.pl:426 Pod-Simple-Texinfo/pod2texi.pl:515
-#: tp/texi2any.pl:1554 tp/texi2any.pl:1661
+#: tp/texi2any.pl:1598 tp/texi2any.pl:1707
 #, perl-format
 msgid "%s: error on closing %s: %s\n"
 msgstr ""
@@ -2189,92 +2189,92 @@ msgstr ""
 msgid "%s: error on closing stdout: %s\n"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:373
-#: tp/Texinfo/Convert/Converter.pm:427 tp/Texinfo/Convert/DocBook.pm:335
-#: tp/Texinfo/Convert/HTML.pm:9101 tp/Texinfo/Convert/HTML.pm:9167
-#: tp/Texinfo/Convert/HTML.pm:9203 tp/Texinfo/Convert/HTML.pm:9716
-#: tp/Texinfo/Convert/HTML.pm:9816 tp/Texinfo/Convert/HTML.pm:9927
+#: tp/DebugTexinfo/DebugTree.pm:103 tp/Texinfo/Convert/Converter.pm:376
+#: tp/Texinfo/Convert/Converter.pm:430 tp/Texinfo/Convert/DocBook.pm:335
+#: tp/Texinfo/Convert/HTML.pm:8974 tp/Texinfo/Convert/HTML.pm:9040
+#: tp/Texinfo/Convert/HTML.pm:9076 tp/Texinfo/Convert/HTML.pm:9589
+#: tp/Texinfo/Convert/HTML.pm:9689 tp/Texinfo/Convert/HTML.pm:9800
 #: tp/Texinfo/Convert/IXIN.pm:290 tp/Texinfo/Convert/Info.pm:311
-#: tp/Texinfo/Convert/LaTeX.pm:1020 tp/Texinfo/Convert/Text.pm:800
+#: tp/Texinfo/Convert/LaTeX.pm:1023 tp/Texinfo/Convert/Text.pm:800
 #: tp/Texinfo/Convert/TexinfoXML.pm:450
 #, perl-format
 msgid "could not open %s for writing: %s"
 msgstr ""
 
-#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:405
-#: tp/Texinfo/Convert/Converter.pm:445 tp/Texinfo/Convert/DocBook.pm:504
-#: tp/Texinfo/Convert/HTML.pm:9096 tp/Texinfo/Convert/HTML.pm:9755
-#: tp/Texinfo/Convert/HTML.pm:9835 tp/Texinfo/Convert/IXIN.pm:918
+#: tp/DebugTexinfo/DebugTree.pm:115 tp/Texinfo/Convert/Converter.pm:408
+#: tp/Texinfo/Convert/Converter.pm:448 tp/Texinfo/Convert/DocBook.pm:504
+#: tp/Texinfo/Convert/HTML.pm:8969 tp/Texinfo/Convert/HTML.pm:9628
+#: tp/Texinfo/Convert/HTML.pm:9708 tp/Texinfo/Convert/IXIN.pm:918
 #: tp/Texinfo/Convert/Info.pm:165 tp/Texinfo/Convert/Info.pm:192
 #: tp/Texinfo/Convert/Info.pm:221 tp/Texinfo/Convert/Info.pm:285
-#: tp/Texinfo/Convert/LaTeX.pm:1088 tp/Texinfo/Convert/TexinfoXML.pm:470
+#: tp/Texinfo/Convert/LaTeX.pm:1091 tp/Texinfo/Convert/TexinfoXML.pm:470
 #: tp/Texinfo/ParserNonXS.pm:2124
 #, fuzzy, perl-format
 msgid "error on closing %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Common.pm:1360 tp/Texinfo/XS/parsetexi/end_line.c:1620
+#: tp/Texinfo/Common.pm:1364 tp/Texinfo/XS/parsetexi/end_line.c:1620
 #: tp/Texinfo/XS/parsetexi/end_line.c:1630
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid language code"
 msgstr "%s ���O�@�ӦX�k�� ISO 639 �y���X"
 
-#: tp/Texinfo/Common.pm:1365 tp/Texinfo/XS/parsetexi/end_line.c:1647
+#: tp/Texinfo/Common.pm:1369 tp/Texinfo/XS/parsetexi/end_line.c:1647
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
 msgstr "%s ���O�@�ӦX�k�� ISO 639 �y���X"
 
-#: tp/Texinfo/Common.pm:1383
+#: tp/Texinfo/Common.pm:1387
 #, perl-format
 msgid "%s is not a valid split possibility"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:132
+#: tp/Texinfo/Config.pm:133
 #, fuzzy, perl-format
 msgid "error loading %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Config.pm:148
+#: tp/Texinfo/Config.pm:149
 #, perl-format
 msgid "obsolete option: %s"
 msgstr ""
 
-#: tp/Texinfo/Config.pm:173
+#: tp/Texinfo/Config.pm:174
 #, fuzzy, perl-format
 msgid "%s: unknown variable %s"
 msgstr "�������R�O `%s'"
 
-#: tp/Texinfo/Config.pm:198
+#: tp/Texinfo/Config.pm:199
 #, fuzzy, perl-format
 msgid "unknown variable from command line: %s\n"
 msgstr "�������R�O `%s'"
 
-#: tp/Texinfo/Config.pm:471 tp/Texinfo/Config.pm:498 tp/Texinfo/Config.pm:519
-#: tp/Texinfo/Config.pm:542
+#: tp/Texinfo/Config.pm:478 tp/Texinfo/Config.pm:505 tp/Texinfo/Config.pm:526
+#: tp/Texinfo/Config.pm:549
 #, fuzzy, perl-format
 msgid "%s: unknown formatting context %s\n"
 msgstr "�������R�O `%s'"
 
-#: tp/Texinfo/Convert/Converter.pm:310
+#: tp/Texinfo/Convert/Converter.pm:313
 #, perl-format
 msgid "%s: output incompatible with split"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:922 tp/Texinfo/Convert/Text.pm:765
+#: tp/Texinfo/Convert/Converter.pm:925 tp/Texinfo/Convert/Text.pm:765
 #: tp/Texinfo/Convert/Text.pm:784
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not create directory `%s': %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/Converter.pm:1092
+#: tp/Texinfo/Convert/Converter.pm:1095
 #, fuzzy, perl-format
 msgid "error on closing image text file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/Converter.pm:1098
+#: tp/Texinfo/Convert/Converter.pm:1101
 #, perl-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image �ɮ� `%s' �L�kŪ��: %s"
@@ -2292,123 +2292,123 @@ msgstr "@image 
 msgid "no argument specified for @U"
 msgstr "`%c%s' �R�O�������w�`�I�W��"
 
-#: tp/Texinfo/Convert/HTML.pm:2878
+#: tp/Texinfo/Convert/HTML.pm:2879
 #, fuzzy, perl-format
 msgid "@image file `%s' (for HTML) not found, using `%s'"
 msgstr "@image �ɮ� `%s' �L�kŪ��: %s"
 
-#: tp/Texinfo/Convert/HTML.pm:3812
+#: tp/Texinfo/Convert/HTML.pm:3813
 #, perl-format
 msgid "raw format %s is not converted"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6689
+#: tp/Texinfo/Convert/HTML.pm:6562
 #, perl-format
 msgid "could not open html refs config file %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:6717
+#: tp/Texinfo/Convert/HTML.pm:6590
 #, fuzzy
 msgid "missing type"
 msgstr "%c%s ��|�k�j�A��"
 
-#: tp/Texinfo/Convert/HTML.pm:6721
+#: tp/Texinfo/Convert/HTML.pm:6594
 #, fuzzy, perl-format
 #| msgid "%s: unrecognized option `--%s'\n"
 msgid "unrecognized type: %s"
 msgstr "%s: �������ﶵ `--%s'\n"
 
-#: tp/Texinfo/Convert/HTML.pm:6739
+#: tp/Texinfo/Convert/HTML.pm:6612
 #, fuzzy, perl-format
 msgid "error on closing html refs config file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/HTML.pm:7116
+#: tp/Texinfo/Convert/HTML.pm:6989
 #, fuzzy, perl-format
 msgid "Unknown file and id setting function: %s"
 msgstr "�������R�O `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7130
+#: tp/Texinfo/Convert/HTML.pm:7003
 #, fuzzy, perl-format
 msgid "Unknown formatting function: %s"
 msgstr "�������R�O `%s'"
 
-#: tp/Texinfo/Convert/HTML.pm:7327
+#: tp/Texinfo/Convert/HTML.pm:7200
 msgid "string not closed in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7329
+#: tp/Texinfo/Convert/HTML.pm:7202
 msgid "--css-include ended in comment"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7331
+#: tp/Texinfo/Convert/HTML.pm:7204
 msgid "@import not finished in css file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7362
+#: tp/Texinfo/Convert/HTML.pm:7235
 #, perl-format
 msgid "CSS file %s not found"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:7372
+#: tp/Texinfo/Convert/HTML.pm:7245
 #, fuzzy, perl-format
 msgid "could not open --include-file %s: %s"
 msgstr "�L�k�}�Ҧ� `%s' ���޹D."
 
-#: tp/Texinfo/Convert/HTML.pm:7388
+#: tp/Texinfo/Convert/HTML.pm:7261
 #, fuzzy, perl-format
 msgid "error on closing CSS file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/HTML.pm:8275 tp/Texinfo/Convert/HTML.pm:8279
+#: tp/Texinfo/Convert/HTML.pm:8148 tp/Texinfo/Convert/HTML.pm:8152
 #, fuzzy, perl-format
 #| msgid "no index entries found for `%s'\n"
 msgid "no htmlxref.cnf entry found for `%s'"
 msgstr "�䤣��]�t `%s' �����޶���\n"
 
-#: tp/Texinfo/Convert/HTML.pm:8692
+#: tp/Texinfo/Convert/HTML.pm:8565
 #, fuzzy, perl-format
 #| msgid "@%s not meaningful inside `@%s' block"
 msgid "%s not meaningful for non-split output"
 msgstr "@%s �b `@%s' �϶���, �ä��㦳�N�q"
 
-#: tp/Texinfo/Convert/HTML.pm:9079
+#: tp/Texinfo/Convert/HTML.pm:8952
 #, perl-format
 msgid ""
 "cannot use absolute path or URL `%s' for JS_WEBLABELS_FILE when generating "
 "web labels file"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9161
+#: tp/Texinfo/Convert/HTML.pm:9034
 #, fuzzy, perl-format
 msgid "error on closing frame file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/HTML.pm:9197
+#: tp/Texinfo/Convert/HTML.pm:9070
 #, fuzzy, perl-format
 msgid "error on closing TOC frame file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/HTML.pm:9346
+#: tp/Texinfo/Convert/HTML.pm:9219
 #, perl-format
 msgid "handler %s of stage %s priority %s failed"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9612
+#: tp/Texinfo/Convert/HTML.pm:9485
 msgid "must specify a title with a title command or @top"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9849
+#: tp/Texinfo/Convert/HTML.pm:9722
 #, perl-format
 msgid "%s already exists but is not a directory"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9868
+#: tp/Texinfo/Convert/HTML.pm:9741
 #, perl-format
 msgid "error on copying %s into %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9935
+#: tp/Texinfo/Convert/HTML.pm:9808
 #, fuzzy, perl-format
 msgid "error on closing redirection node file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
@@ -2519,30 +2519,30 @@ msgstr "`.' 
 msgid "`.' or `,' must follow @xref"
 msgstr "`.' �� `,' ������ۥ椬�ѷ�, �Ӥ��O %c"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2979
+#: tp/Texinfo/Convert/Plaintext.pm:2971
 #, perl-format
 msgid "menu entry node name should not contain `%s'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2990
+#: tp/Texinfo/Convert/Plaintext.pm:2982
 msgid "menu entry node name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:3010
+#: tp/Texinfo/Convert/Plaintext.pm:3002
 msgid "menu entry name should not contain `:'"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:235
+#: tp/Texinfo/Convert/Utils.pm:241
 #, perl-format
 msgid "could not read %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:258
+#: tp/Texinfo/Convert/Utils.pm:264
 #, fuzzy, perl-format
 msgid "error on closing @verbatiminclude file %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Convert/Utils.pm:265 tp/Texinfo/ParserNonXS.pm:3322
+#: tp/Texinfo/Convert/Utils.pm:271 tp/Texinfo/ParserNonXS.pm:3322
 #, perl-format
 msgid "@%s: could not find %s"
 msgstr ""
@@ -3313,214 +3313,214 @@ msgstr ""
 msgid "chm.pm: error on closing %s: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:183
+#: tp/ext/epub3.pm:182
 #, fuzzy, perl-format
 #| msgid "@image file `%s' unreadable: %s"
 msgid "@image file `%s' can not be copied"
 msgstr "@image �ɮ� `%s' �L�kŪ��: %s"
 
-#: tp/init/epub3.pm:194
+#: tp/ext/epub3.pm:193
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not create images directory `%s': %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:212
+#: tp/ext/epub3.pm:211
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not copy `%s' to `%s': %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:325
+#: tp/ext/epub3.pm:324
 #, fuzzy, perl-format
 msgid "error removing directory: %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:330
+#: tp/ext/epub3.pm:329
 #, fuzzy, perl-format
 msgid "error removing directory: %s: unlinking %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:346
+#: tp/ext/epub3.pm:345
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "error creating directory: %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:351
+#: tp/ext/epub3.pm:350
 #, fuzzy, perl-format
 msgid "error creating directory: %s: creating %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:373
+#: tp/ext/epub3.pm:372
 msgid "epub: no filename output"
 msgstr ""
 
-#: tp/init/epub3.pm:384
+#: tp/ext/epub3.pm:383
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not create meta informations directory `%s': %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:397 tp/init/epub3.pm:432 tp/init/epub3.pm:459
-#: tp/init/epub3.pm:560
+#: tp/ext/epub3.pm:396 tp/ext/epub3.pm:431 tp/ext/epub3.pm:458
+#: tp/ext/epub3.pm:559
 #, fuzzy, perl-format
 #| msgid "%s: could not read (%s) and could not create (%s)\n"
 msgid "epub3.pm: could not open %s for writing: %s\n"
 msgstr "%s: �L�kŪ�� (%s), �ӥB�L�k�إ� (%s)\n"
 
-#: tp/init/epub3.pm:417 tp/init/epub3.pm:442 tp/init/epub3.pm:538
-#: tp/init/epub3.pm:709
+#: tp/ext/epub3.pm:416 tp/ext/epub3.pm:441 tp/ext/epub3.pm:537
+#: tp/ext/epub3.pm:708
 #, fuzzy, perl-format
 msgid "epub3.pm: error on closing %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/init/epub3.pm:657
+#: tp/ext/epub3.pm:656
 #, perl-format
 msgid "epub3.pm: readdir %s error: %s"
 msgstr ""
 
-#: tp/init/epub3.pm:728 tp/init/epub3.pm:737 tp/init/epub3.pm:750
+#: tp/ext/epub3.pm:727 tp/ext/epub3.pm:736 tp/ext/epub3.pm:749
 #, perl-format
 msgid "epub3.pm: error adding %s to archive"
 msgstr ""
 
-#: tp/init/epub3.pm:759
+#: tp/ext/epub3.pm:758
 #, perl-format
 msgid "epub3.pm: error writing archive %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:217
+#: tp/ext/latex2html.pm:217
 #, perl-format
 msgid "l2h: could not open latex file %s for writing: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:364
+#: tp/ext/latex2html.pm:364
 msgid "l2h: L2H_TMP directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:370
+#: tp/ext/latex2html.pm:370
 msgid "l2h: current directory contains a dot"
 msgstr ""
 
-#: tp/init/latex2html.pm:378
+#: tp/ext/latex2html.pm:378
 msgid "l2h: command not set"
 msgstr ""
 
-#: tp/init/latex2html.pm:429
+#: tp/ext/latex2html.pm:429
 #, perl-format
 msgid "l2h: command did not succeed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:476
+#: tp/ext/latex2html.pm:476
 #, perl-format
 msgid "l2h: image has invalid extension: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:507
+#: tp/ext/latex2html.pm:507
 #, perl-format
 msgid "l2h: rename %s as %s failed: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:530
+#: tp/ext/latex2html.pm:530
 #, perl-format
 msgid "l2h: could not open %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:566
+#: tp/ext/latex2html.pm:566
 #, perl-format
 msgid "latex2html.pm: end of @%s item %d not found"
 msgstr ""
 
-#: tp/init/latex2html.pm:577
+#: tp/ext/latex2html.pm:577
 #, perl-format
 msgid ""
 "latex2html.pm: processing produced %d items in HTML; expected %d, the number "
 "of items found in the document"
 msgstr ""
 
-#: tp/init/latex2html.pm:608
+#: tp/ext/latex2html.pm:608
 #, perl-format
 msgid "l2h: could not determine the fragment %d for @%s"
 msgstr ""
 
-#: tp/init/latex2html.pm:634
+#: tp/ext/latex2html.pm:634
 #, perl-format
 msgid ""
 "l2h: could not extract the fragment %d for @%s with output counter %d from "
 "HTML"
 msgstr ""
 
-#: tp/init/latex2html.pm:702
+#: tp/ext/latex2html.pm:702
 #, perl-format
 msgid "l2h: could not load %s: %s"
 msgstr ""
 
-#: tp/init/latex2html.pm:718
+#: tp/ext/latex2html.pm:718
 #, perl-format
 msgid "l2h: could not open %s for writing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:162 tp/init/tex4ht.pm:338
+#: tp/ext/tex4ht.pm:162 tp/ext/tex4ht.pm:338
 #, perl-format
 msgid "tex4ht.pm: could not open %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:263
+#: tp/ext/tex4ht.pm:263
 #, perl-format
 msgid "tex4ht.pm: chdir %s failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:276
+#: tp/ext/tex4ht.pm:276
 #, perl-format
 msgid "tex4ht.pm: unable to return to initial directory: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:289
+#: tp/ext/tex4ht.pm:289
 #, perl-format
 msgid "tex4ht.pm: output file missing: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:323
+#: tp/ext/tex4ht.pm:323
 #, perl-format
 msgid "tex4ht.pm: command failed: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:328
+#: tp/ext/tex4ht.pm:328
 #, perl-format
 msgid "tex4ht.pm: closing communication failed: %s: %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:366
+#: tp/ext/tex4ht.pm:366
 #, perl-format
 msgid "tex4ht.pm: end of %s item %d not found"
 msgstr ""
 
-#: tp/init/tex4ht.pm:373
+#: tp/ext/tex4ht.pm:373
 #, perl-format
 msgid ""
 "tex4ht.pm: processing produced %d items in HTML; expected %d, the number of "
 "items found in the document for %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:394
+#: tp/ext/tex4ht.pm:394
 #, perl-format
 msgid "tex4ht.pm: output has no HTML item for @%s %s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:410
+#: tp/ext/tex4ht.pm:410
 #, perl-format
 msgid ""
 "tex4ht.pm: output counter UNDEF; expected %d, the number of items found in "
 "the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:414
+#: tp/ext/tex4ht.pm:414
 #, perl-format
 msgid "tex4ht.pm: UNDEF expected items in the document for @%s"
 msgstr ""
 
-#: tp/init/tex4ht.pm:421
+#: tp/ext/tex4ht.pm:421
 #, perl-format
 msgid ""
 "tex4ht.pm: processing retrieved %d items in HTML; expected %d, the number of "
@@ -3576,23 +3576,29 @@ msgstr ""
 msgid "highlight_syntax.pm: output has no HTML item for @%s %s %s"
 msgstr ""
 
-#: tp/texi2any.pl:410
+#: tp/texi2any.pl:423
 #, fuzzy, perl-format
 #| msgid "Could not create output file `%s'."
 msgid "could not read init file %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/texi2any.pl:619
+#: tp/texi2any.pl:441
+#, fuzzy, perl-format
+#| msgid "Could not create output file `%s'."
+msgid "could not read extension file %s"
+msgstr "�L�k�إ߿�X�ɮ� `%s'."
+
+#: tp/texi2any.pl:654
 #, perl-format
 msgid "ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'\n"
 msgstr ""
 
-#: tp/texi2any.pl:716
+#: tp/texi2any.pl:753
 #, fuzzy, perl-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "�Ϊk: %s [OPTION]... FILE...\n"
 
-#: tp/texi2any.pl:719
+#: tp/texi2any.pl:756
 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"
@@ -3601,7 +3607,7 @@ msgid ""
 "the behavior is identical, and does not depend on the installed name.\n"
 msgstr ""
 
-#: tp/texi2any.pl:727
+#: tp/texi2any.pl:764
 #, perl-format
 msgid ""
 "General options:\n"
@@ -3620,61 +3626,61 @@ msgid ""
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: tp/texi2any.pl:743
+#: tp/texi2any.pl:780
 msgid "Output format selection (default is to produce Info):"
 msgstr ""
 
-#: tp/texi2any.pl:744
+#: tp/texi2any.pl:781
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --docbook               output Docbook XML."
 msgstr "��ܨD�U��T, �M�����}"
 
-#: tp/texi2any.pl:745
+#: tp/texi2any.pl:782
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --html                  output HTML."
 msgstr "��ܨD�U��T, �M�����}"
 
-#: tp/texi2any.pl:746
+#: tp/texi2any.pl:783
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --epub3                 output EPUB3."
 msgstr "��ܨD�U��T, �M�����}"
 
-#: tp/texi2any.pl:747
+#: tp/texi2any.pl:784
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --latex                 output LaTeX."
 msgstr "��ܨD�U��T, �M�����}"
 
-#: tp/texi2any.pl:748
+#: tp/texi2any.pl:785
 msgid "      --plaintext             output plain text rather than Info."
 msgstr ""
 
-#: tp/texi2any.pl:749
+#: tp/texi2any.pl:786
 #, fuzzy
 #| msgid "display this help and exit"
 msgid "      --xml                   output Texinfo XML."
 msgstr "��ܨD�U��T, �M�����}"
 
-#: tp/texi2any.pl:750
+#: tp/texi2any.pl:787
 msgid ""
 "      --dvi, --dvipdf, --ps, --pdf  call texi2dvi to generate given output,\n"
 "                                after checking validity of TEXINFO-FILE."
 msgstr ""
 
-#: tp/texi2any.pl:754
+#: tp/texi2any.pl:791
 msgid "General output options:"
 msgstr ""
 
-#: tp/texi2any.pl:756
+#: tp/texi2any.pl:793
 msgid ""
 "  -E, --macro-expand=FILE     output macro-expanded source to FILE,\n"
 "                                ignoring any @setfilename."
 msgstr ""
 
-#: tp/texi2any.pl:759
+#: tp/texi2any.pl:796
 msgid ""
 "      --no-headers            suppress node separators, Node: lines, and "
 "menus\n"
@@ -3686,19 +3692,19 @@ msgid ""
 "                                standard output by default."
 msgstr ""
 
-#: tp/texi2any.pl:765
+#: tp/texi2any.pl:802
 msgid ""
 "      --no-split              suppress any splitting of the output;\n"
 "                                generate only one output file."
 msgstr ""
 
-#: tp/texi2any.pl:768
+#: tp/texi2any.pl:805
 msgid ""
 "      --[no-]number-sections  output chapter and sectioning numbers;\n"
 "                                default is on."
 msgstr ""
 
-#: tp/texi2any.pl:771
+#: tp/texi2any.pl:808
 msgid ""
 "  -o, --output=DEST           output to DEST.\n"
 "                                With split output, create DEST as a "
@@ -3710,13 +3716,13 @@ msgid ""
 "                                Otherwise, DEST names the output file."
 msgstr ""
 
-#: tp/texi2any.pl:779
+#: tp/texi2any.pl:816
 msgid ""
 "      --disable-encoding      do not output accented and special characters\n"
 "                                in Info output based on document encoding."
 msgstr ""
 
-#: tp/texi2any.pl:782
+#: tp/texi2any.pl:819
 msgid ""
 "      --enable-encoding       based on document encoding, output accented\n"
 "                                characters in XML-based output as well as\n"
@@ -3724,17 +3730,17 @@ msgid ""
 "                                entities."
 msgstr ""
 
-#: tp/texi2any.pl:787
+#: tp/texi2any.pl:824
 msgid "Options for Info and plain text:"
 msgstr ""
 
-#: tp/texi2any.pl:789
+#: tp/texi2any.pl:826
 #, perl-format
 msgid ""
 "      --fill-column=NUM       break Info lines at NUM columns (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:791
+#: tp/texi2any.pl:828
 msgid ""
 "      --footnote-style=STYLE  output footnotes in Info according to STYLE:\n"
 "                                `separate' to put them in their own node;\n"
@@ -3743,7 +3749,7 @@ msgid ""
 "                                which they are defined (this is the default)."
 msgstr ""
 
-#: tp/texi2any.pl:796
+#: tp/texi2any.pl:833
 #, perl-format
 msgid ""
 "      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default "
@@ -3752,13 +3758,13 @@ msgid ""
 "                                `asis', preserve existing indentation."
 msgstr ""
 
-#: tp/texi2any.pl:800
+#: tp/texi2any.pl:837
 #, perl-format
 msgid ""
 "      --split-size=NUM        split Info files at size NUM (default %d)."
 msgstr ""
 
-#: tp/texi2any.pl:808
+#: tp/texi2any.pl:845
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -3772,19 +3778,19 @@ msgid ""
 "                                anchors; default is set only if split.\n"
 msgstr ""
 
-#: tp/texi2any.pl:820
+#: tp/texi2any.pl:857
 msgid ""
 "Options for XML and Docbook:\n"
 "      --output-indent=VAL     does nothing, retained for compatibility.\n"
 msgstr ""
 
-#: tp/texi2any.pl:823
+#: tp/texi2any.pl:860
 msgid ""
 "Options for DVI/PS/PDF:\n"
 "      --Xopt=OPT              pass OPT to texi2dvi; can be repeated.\n"
 msgstr ""
 
-#: tp/texi2any.pl:828
+#: tp/texi2any.pl:865
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  does nothing, retained for compatibility.\n"
@@ -3795,75 +3801,75 @@ msgid ""
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: tp/texi2any.pl:836
+#: tp/texi2any.pl:873
 msgid "Conditional processing in input:"
 msgstr ""
 
-#: tp/texi2any.pl:837
+#: tp/texi2any.pl:874
 msgid ""
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
 "                      not generating Docbook."
 msgstr ""
 
-#: tp/texi2any.pl:839
+#: tp/texi2any.pl:876
 msgid ""
 "  --ifhtml          process @ifhtml and @html even if not generating HTML."
 msgstr ""
 
-#: tp/texi2any.pl:840
+#: tp/texi2any.pl:877
 msgid "  --ifinfo          process @ifinfo even if not generating Info."
 msgstr ""
 
-#: tp/texi2any.pl:841
+#: tp/texi2any.pl:878
 msgid "  --iflatex         process @iflatex and @latex."
 msgstr ""
 
-#: tp/texi2any.pl:842
+#: tp/texi2any.pl:879
 msgid ""
 "  --ifplaintext     process @ifplaintext even if not generating plain text."
 msgstr ""
 
-#: tp/texi2any.pl:843
+#: tp/texi2any.pl:880
 msgid "  --iftex           process @iftex and @tex."
 msgstr ""
 
-#: tp/texi2any.pl:844
+#: tp/texi2any.pl:881
 msgid "  --ifxml           process @ifxml and @xml."
 msgstr ""
 
-#: tp/texi2any.pl:845
+#: tp/texi2any.pl:882
 msgid "  --no-ifdocbook    do not process @ifdocbook and @docbook text."
 msgstr ""
 
-#: tp/texi2any.pl:846
+#: tp/texi2any.pl:883
 msgid "  --no-ifhtml       do not process @ifhtml and @html text."
 msgstr ""
 
-#: tp/texi2any.pl:847
+#: tp/texi2any.pl:884
 msgid "  --no-ifinfo       do not process @ifinfo text."
 msgstr ""
 
-#: tp/texi2any.pl:848
+#: tp/texi2any.pl:885
 msgid "  --no-iflatex      do not process @iflatex and @latex text."
 msgstr ""
 
-#: tp/texi2any.pl:849
+#: tp/texi2any.pl:886
 msgid "  --no-ifplaintext  do not process @ifplaintext text."
 msgstr ""
 
-#: tp/texi2any.pl:850
+#: tp/texi2any.pl:887
 msgid "  --no-iftex        do not process @iftex and @tex text."
 msgstr ""
 
-#: tp/texi2any.pl:851
+#: tp/texi2any.pl:888
 msgid "  --no-ifxml        do not process @ifxml and @xml text."
 msgstr ""
 
-#: tp/texi2any.pl:853
+#: tp/texi2any.pl:890
 msgid "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text."
 msgstr ""
 
-#: tp/texi2any.pl:857
+#: tp/texi2any.pl:894
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
 "  if generating Docbook, --ifdocbook is on and the others are off;\n"
@@ -3874,7 +3880,7 @@ msgid ""
 "  if generating XML, --ifxml is on and the others are off."
 msgstr ""
 
-#: tp/texi2any.pl:867
+#: tp/texi2any.pl:904
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -3906,61 +3912,61 @@ msgstr ""
 "�{������, �ХH�q�l�l�� (�^��) �^���� bug-texinfo@gnu.org,\n"
 "�@����D�P�Q��, �ХH�q�l�l�� (�^��) �H�� help-texinfo@gnu.org."
 
-#: tp/texi2any.pl:921
+#: tp/texi2any.pl:958
 #, perl-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s: --footnote-style ���޼ƥ����� `separate' �� `end', �Ӥ��O `%s'.\n"
 
-#: tp/texi2any.pl:1018
+#: tp/texi2any.pl:1055
 #, perl-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr "%s: --paragraph-indent ���޼ƥ����� �ƭ�/`none'/`asis', �Ӥ��O `%s'.\n"
 
-#: tp/texi2any.pl:1143
+#: tp/texi2any.pl:1175
 #, perl-format
 msgid "%s: when generating %s, only one input FILE may be specified with -o\n"
 msgstr ""
 
-#: tp/texi2any.pl:1147
+#: tp/texi2any.pl:1179
 msgid "--Xopt option without printed output"
 msgstr ""
 
-#: tp/texi2any.pl:1163
+#: tp/texi2any.pl:1195
 #, fuzzy, perl-format
 msgid "unknown tree transformation %s"
 msgstr "�������R�O `%s'"
 
-#: tp/texi2any.pl:1170
+#: tp/texi2any.pl:1212
 #, perl-format
 msgid "ignoring splitting for format %s"
 msgstr ""
 
-#: tp/texi2any.pl:1258
+#: tp/texi2any.pl:1300
 #, perl-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ��|�ɮפ޼�.\n"
 
-#: tp/texi2any.pl:1329
+#: tp/texi2any.pl:1371
 msgid "fill_gaps_in_sectioning transformation return no result. No section?"
 msgstr ""
 
-#: tp/texi2any.pl:1381
+#: tp/texi2any.pl:1423
 #, fuzzy, perl-format
 msgid "error on closing macro expand file %s: %s\n"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/texi2any.pl:1386
+#: tp/texi2any.pl:1428
 #, perl-format
 msgid "could not open %s for writing: %s\n"
 msgstr ""
 
-#: tp/texi2any.pl:1426
+#: tp/texi2any.pl:1468
 msgid ""
 "insert_nodes_for_sectioning_commands transformation return no result. No "
 "section?"
 msgstr ""
 
-#: tp/texi2any.pl:1581 tp/texi2any.pl:1634
+#: tp/texi2any.pl:1625 tp/texi2any.pl:1680
 #, perl-format
 msgid "%s: error on closing internal links file %s: %s\n"
 msgstr ""
diff --git a/po_document/ca.po b/po_document/ca.po
index 6bd9c29446..ccdd836b24 100644
--- a/po_document/ca.po
+++ b/po_document/ca.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 5.9.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2015-06-08 17:08+0200\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funci@'o"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forma especial"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opci@'o d'usuari"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Variable d'inst@`ancia"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "M@'etode"
 
@@ -60,99 +60,99 @@ msgstr "{name} a {class}"
 msgid "{name} of {class}"
 msgstr "{name} de {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Gener"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Febrer"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Mar@,{c}"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maig"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Juny"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Juliol"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agost"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Setembre"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Octubre"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembre"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Desembre"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -187,17 +187,17 @@ msgstr "Vegeu secci@'o ``{section_name}'' a @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "vegeu secci@'o ``{section_name}'' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Vegeu @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "vegeu @cite{{book}}"
@@ -217,55 +217,43 @@ msgstr "Vegeu {title_ref}"
 msgid "see {title_ref}"
 msgstr "vegeu {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{No hi ha cap valor per a `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} de {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} sobre {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Annex {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -301,97 +289,85 @@ msgstr "@tie{ }-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}: {type} {name} {arguments}"
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}:@*{type}@*{name}"
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}: {type} {name}"
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {name}"
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} de {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {name}"
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} a {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {type} {name}"
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} a {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, fuzzy, perl-brace-format
-#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, fuzzy, perl-brace-format
-#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {type} {name}"
 msgid "@tie{}-- {category} of {class}: {type} {name}"
@@ -615,227 +591,144 @@ msgstr "Taula breu de continguts"
 msgid "Footnotes"
 msgstr "Notes a peu de p@`agina"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "vegeu {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Vegeu {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "vegeu {reference} a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "vegeu @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "vegeu `{section}' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "vegeu {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "vegeu `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Vegeu {reference} a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Vegeu @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Vegeu `{section}' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Vegeu {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Vegeu `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Salta a"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada d'@'@dotless{i}ndex"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Secci@'o"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} de {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} a {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category} a {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -844,46 +737,46 @@ msgstr ""
 "Aquest document va ser generat el @emph{@today{}} usant "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Aquest document va ser generat el @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, fuzzy, perl-brace-format
 #| msgid "{text} ({url})"
 msgid "{element_text} ({title})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "El node que esteu buscant @'es a {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  El botons als plafons de navegaci@'o tenen el seg@\"uent significat:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Bot@'o"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nom"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Ves a"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Des de 1.2.3 ves a"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -893,47 +786,47 @@ msgstr ""
 "@strong{ Subsubsecci@'o U-Dos-Tres } d'un document de l'estructura "
 "seg@\"uent:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Secci@'o U"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subsecci@'o U-U"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subsecci@'o U-Dos"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subsubsecci@'o U-Dos_U"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subsubsecci@'o U-Dos-Dos"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subsubsecci@'o U-Dos-Tres"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posici@'o actual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subsubsecci@'o U-Dos-Quatre"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subsecci@'o U-Tres"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subsecci@'o U-Quatre"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Document sense t@'@dotless{i}tol"
 
@@ -942,16 +835,125 @@ msgstr "Document sense t@'@dotless{i}tol"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month}, {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#, fuzzy, perl-brace-format
+#~| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} a {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} a {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} sobre {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} de {class}"
+
 #, perl-brace-format
 #~ msgid "see section {reference_name}"
 #~ msgstr "vegeu secci@'o {reference_name}"
diff --git a/po_document/ca.us-ascii.po b/po_document/ca.us-ascii.po
index 1a963387c6..d074c5a63f 100644
--- a/po_document/ca.us-ascii.po
+++ b/po_document/ca.us-ascii.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 5.9.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2015-06-08 17:08+0200\n"
 "Last-Translator: Walter Garcia-Fontes <walter.garcia@upf.edu>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funci@'o"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forma especial"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opci@'o d'usuari"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Variable d'inst@`ancia"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "M@'etode"
 
@@ -59,99 +59,99 @@ msgstr "{name} a {class}"
 msgid "{name} of {class}"
 msgstr "{name} de {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Gener"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Febrer"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Mar@,{c}"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maig"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Juny"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Juliol"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agost"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Setembre"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Octubre"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembre"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Desembre"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -186,17 +186,17 @@ msgstr "Vegeu secci@'o ``{section_name}'' a @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "vegeu secci@'o ``{section_name}'' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Vegeu @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "vegeu @cite{{book}}"
@@ -216,55 +216,43 @@ msgstr "Vegeu {title_ref}"
 msgid "see {title_ref}"
 msgstr "vegeu {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{No hi ha cap valor per a `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} de {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} sobre {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Annex {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -298,82 +286,72 @@ msgstr "@tie{ }-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} de {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} a {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} a {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} a {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} a {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} a {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{ }-- {category} de {class}: {type} {name}"
@@ -596,227 +574,144 @@ msgstr "Taula breu de continguts"
 msgid "Footnotes"
 msgstr "Notes a peu de p@`agina"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "vegeu {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Vegeu {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "vegeu {reference} a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "vegeu @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "vegeu `{section}' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "vegeu {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "vegeu `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Vegeu {reference} a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Vegeu @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Vegeu `{section}' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Vegeu {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Vegeu `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' a @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Salta a"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada d'@'@dotless{i}ndex"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Secci@'o"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} de {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} a {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category} a {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -825,45 +720,45 @@ msgstr ""
 "Aquest document va ser generat el @emph{@today{}} usant "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Aquest document va ser generat el @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, fuzzy, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "El node que esteu buscant @'es a {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  El botons als plafons de navegaci@'o tenen el seg@\"uent significat:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Bot@'o"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nom"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Ves a"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Des de 1.2.3 ves a"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -873,47 +768,47 @@ msgstr ""
 "@strong{ Subsubsecci@'o U-Dos-Tres } d'un document de l'estructura "
 "seg@\"uent:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Secci@'o U"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subsecci@'o U-U"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subsecci@'o U-Dos"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subsubsecci@'o U-Dos_U"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subsubsecci@'o U-Dos-Dos"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subsubsecci@'o U-Dos-Tres"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posici@'o actual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subsubsecci@'o U-Dos-Quatre"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subsecci@'o U-Tres"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subsecci@'o U-Quatre"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Document sense t@'@dotless{i}tol"
 
@@ -922,16 +817,123 @@ msgstr "Document sense t@'@dotless{i}tol"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month}, {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} sobre {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} de {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} a {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} a {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} a {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} a {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} a {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} a {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} sobre {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} de {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "vegeu secci@'o {reference_name}"
 
diff --git a/po_document/cs.po b/po_document/cs.po
index 1d4cc2ee0d..5c51901a17 100644
--- a/po_document/cs.po
+++ b/po_document/cs.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-22 21:03+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -29,31 +29,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funkce"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Speciální forma"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Proměnná"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Uživatelská volba"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Proměnná instance"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metoda"
 
@@ -71,99 +71,99 @@ msgstr "{name} na třídě {class}"
 msgid "{name} of {class}"
 msgstr "{name} třídy {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "leden"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "únor"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "březen"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "duben"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "květen"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "červen"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "červenec"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "srpen"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "září"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "říjen"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "listopad"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "prosinec"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -198,17 +198,17 @@ msgstr "Vizte oddíl „{section_name}“ v @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "vizte oddíl „{section_name}“ v @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Vizte @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "vizte @cite{{book}}"
@@ -228,55 +228,43 @@ msgstr "Vizte {title_ref}"
 msgid "see {title_ref}"
 msgstr "vizte {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Žádná hodnota pro „{value}“@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} třídy {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} na třídě {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Příloha {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -310,82 +298,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} třídy {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} třídy {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} na třídě {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} na třídě {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} na třídě {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} na třídě {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} na třídě {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} na třídě {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} třídy {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} třídy {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} třídy {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} třídy {class}: {type} {name}"
@@ -608,223 +586,142 @@ msgstr "Stručný obsah"
 msgid "Footnotes"
 msgstr "Poznámky pod čarou"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "vizte {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Vizte {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "vizte {reference} v @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "vizte @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "vizte „{section}“ v @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "vizte {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "vizte „{section}“"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Vizte {reference} v @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Vizte @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Vizte „{section}“ v @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Vizte {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Vizte „{section}“"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} v @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "„{section}“ v @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "„{section}“"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Přejít na"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Položka rejstříku"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Oddíl"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} na třídě {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} na třídě {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} třídy {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} třídy {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} třídy {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} na třídě {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} na třídě {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na třídě {class}:@* @emph{{type}}@* @strong{{name}} "
-"@emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na třídě {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} na třídě {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} na třídě {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} třídy {class}:@* @emph{{type}}@* @strong{{name}} "
-"@emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} třídy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} třídy {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} třídy {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -833,45 +730,45 @@ msgstr ""
 "Tento dokument byl vytvořen @emph{@today{}} pomocí @uref{{program_homepage}, "
 "@emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Tento dokument byl vytvořen @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Údaje o licenci JavaScriptu"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Uzel, který hledáte, se nachází na {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  Tlačítka v navigačním panelu mají následující význam:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Tlačítko"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Název"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Přejít kam"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Z 1.2.3 přejít kam"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -880,47 +777,47 @@ msgstr ""
 "  kde @strong{ příklad } předpokládá, že současná poloha je "
 "@strong{ Podpododdíl Jedna-dva-tři } dokumentu s následující strukturou:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Oddíl Jedna"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Pododdíl Jedna-jedna"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Pododdíl Jedna-dva"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Podpododdíl Jedna-dva-jedna"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Podpododdíl Jedna-dva-dva"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Podpododdíl Jedna-dva-tři"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Současná poloha"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Podpododdíl Jedna-dva-čtyři"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Pododdíl Jedna-tři"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Pododdíl Jedna-čtyři"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Nepojmenovaný dokument"
 
@@ -930,16 +827,120 @@ msgstr "Nepojmenovaný dokument"
 msgid "{month} {day}, {year}"
 msgstr "{day}. {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} na třídě {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} třídy {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} třídy {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} třídy {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} třídy {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} třídy {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} na třídě {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} na třídě {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na třídě {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na třídě {class}: @emph{{type}} @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} na třídě {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} na třídě {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} třídy {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} třídy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} třídy {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} třídy {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} na třídě {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} třídy {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "vizte oddíl {reference_name}"
 
diff --git a/po_document/de.po b/po_document/de.po
index dc3535d47e..d1592b04b4 100644
--- a/po_document/de.po
+++ b/po_document/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 5.0\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2014-04-11 22:11+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -20,31 +20,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funktion"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Spezielle Form"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Benutzeroption"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Instanzvariable"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Method"
 
@@ -62,99 +62,99 @@ msgstr "{name} in {class}"
 msgid "{name} of {class}"
 msgstr "{name} von {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Januar"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Februar"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "März"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "April"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Mai"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Juni"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Juli"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "August"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "September"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Oktober"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "November"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dezember"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -189,17 +189,17 @@ msgstr "Siehe Abschnitt »{section_name}« in @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "siehe Abschnitt »{section_name}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Siehe @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "siehe @cite{{book}}"
@@ -219,55 +219,43 @@ msgstr "Siehe {title_ref}"
 msgid "see {title_ref}"
 msgstr "siehe {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{kein Wert für »{value}«@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} von {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} in {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Anhang {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -303,97 +291,85 @@ msgstr "@tie{ }-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}: {type} {name} {arguments}"
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}:@*{type}@*{name}"
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category}: {type} {name}"
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {name} {arguments}"
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {name}"
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} von {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {name} {arguments}"
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {name}"
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} in {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {type} {name} {arguments}"
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}:@*{type}@*{name}"
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} on {class}: {type} {name}"
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} in {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, fuzzy, perl-brace-format
-#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {type} {name} {arguments}"
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, fuzzy, perl-brace-format
-#| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, fuzzy, perl-brace-format
 #| msgid "@tie{ }-- {category} of {class}: {type} {name}"
 msgid "@tie{}-- {category} of {class}: {type} {name}"
@@ -617,228 +593,144 @@ msgstr "Kurzes Inhaltsverzeichnis"
 msgid "Footnotes"
 msgstr "Fußnoten"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "siehe {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Siehe {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "siehe {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "siehe @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "siehe »{section}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "siehe {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "siehe »{section}«"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Siehe {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Siehe @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Siehe »{section}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Siehe {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Siehe »{section}«"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "»{section}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "»{section}«"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Springe zu"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Indexeintrag"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Abschnitt"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} von {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} von {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} in {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} in {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} von {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -847,48 +739,48 @@ msgstr ""
 "Dieses Dokument wurde am @emph{@today{}} mittels @uref{{program_homepage}, "
 "@emph{{program}}} erstellt."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr ""
 "Dieses Dokument wurde mittels @uref{{program_homepage}, @emph{{program}}} "
 "erstellt."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, fuzzy, perl-brace-format
 #| msgid "{text} ({url})"
 msgid "{element_text} ({title})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Der Absatz, nach dem Sie suchen, befindet sich bei {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr " Die Links in der Navigationsleiste haben die folgende Bedeutung: "
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Knopf"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Name"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Von 1.2.3 gehe zu"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -898,47 +790,47 @@ msgstr ""
 "@strong{ Unterabschnitt 1-2-3 } in einem Dokument mit folgender Struktur "
 "liegt:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Abschnitt 1"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Unterabschnitt 1-1"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Unterabschnitt 1-2"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Unterabschnitt 1-2-1"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Unterabschnitt 1-2-2"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Unterabschnitt 1-2-3"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Aktuelle Position"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Unterabschnitt 1-2-4"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Unterabschnitt 1-3"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Unterabschnitt 1-4"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Unbenanntes Dokument"
 
@@ -947,16 +839,126 @@ msgstr "Unbenanntes Dokument"
 msgid "{month} {day}, {year}"
 msgstr "{day}. {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} von {class}"
 
+#, fuzzy, perl-brace-format
+#~| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@tie{ }-- {category} of {class}:@*{type}@*{name}"
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} von {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} in {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} in {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} von {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} in {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} von {class}"
+
 #, perl-brace-format
 #~ msgid "see section {reference_name}"
 #~ msgstr "siehe Abschnitt {reference_name}"
diff --git a/po_document/de.us-ascii.po b/po_document/de.us-ascii.po
index bd466cdea9..f8f0211724 100644
--- a/po_document/de.us-ascii.po
+++ b/po_document/de.us-ascii.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 5.0\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2014-04-11 22:11+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -19,31 +19,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funktion"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Spezielle Form"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Benutzeroption"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Instanzvariable"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Method"
 
@@ -61,99 +61,99 @@ msgstr "{name} in {class}"
 msgid "{name} of {class}"
 msgstr "{name} von {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Januar"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Februar"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "März"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "April"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Mai"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Juni"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Juli"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "August"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "September"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Oktober"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "November"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dezember"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -188,17 +188,17 @@ msgstr "Siehe Abschnitt »{section_name}« in @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "siehe Abschnitt »{section_name}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Siehe @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "siehe @cite{{book}}"
@@ -218,55 +218,43 @@ msgstr "Siehe {title_ref}"
 msgid "see {title_ref}"
 msgstr "siehe {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{kein Wert für »{value}«@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} von {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} in {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Anhang {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -300,82 +288,72 @@ msgstr "@tie{ }-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} von {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} von {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} in {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} in {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} in {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} in {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} in {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} von {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{ }-- {category} von {class}: {type} {name}"
@@ -598,228 +576,144 @@ msgstr "Kurzes Inhaltsverzeichnis"
 msgid "Footnotes"
 msgstr "Fußnoten"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "siehe {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Siehe {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "siehe {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "siehe @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "siehe »{section}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "siehe {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "siehe »{section}«"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Siehe {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Siehe @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Siehe »{section}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Siehe {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Siehe »{section}«"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "»{section}« in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "»{section}«"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Springe zu"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Indexeintrag"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Abschnitt"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} von {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} von {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} in {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} in {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} von {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -828,47 +722,47 @@ msgstr ""
 "Dieses Dokument wurde am @emph{@today{}} mittels @uref{{program_homepage}, "
 "@emph{{program}}} erstellt."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr ""
 "Dieses Dokument wurde mittels @uref{{program_homepage}, @emph{{program}}} "
 "erstellt."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, fuzzy, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Der Absatz, nach dem Sie suchen, befindet sich bei {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr " Die Links in der Navigationsleiste haben die folgende Bedeutung: "
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Knopf"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Name"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Gehe zu"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Von 1.2.3 gehe zu"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -878,47 +772,47 @@ msgstr ""
 "@strong{ Unterabschnitt 1-2-3 } in einem Dokument mit folgender Struktur "
 "liegt:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Abschnitt 1"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Unterabschnitt 1-1"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Unterabschnitt 1-2"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Unterabschnitt 1-2-1"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Unterabschnitt 1-2-2"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Unterabschnitt 1-2-3"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Aktuelle Position"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Unterabschnitt 1-2-4"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Unterabschnitt 1-3"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Unterabschnitt 1-4"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Unbenanntes Dokument"
 
@@ -927,16 +821,124 @@ msgstr "Unbenanntes Dokument"
 msgid "{month} {day}, {year}"
 msgstr "{day}. {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} in {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} von {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} von {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} von {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} von {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} in {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} in {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} in {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} in {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} in {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} in {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} von {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} von {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} von {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} von {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} in {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} von {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "siehe Abschnitt {reference_name}"
 
diff --git a/po_document/eo.po b/po_document/eo.po
index 38118e8f7b..86c49481c3 100644
--- a/po_document/eo.po
+++ b/po_document/eo.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.4.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2018-05-24 21:45-0300\n"
 "Last-Translator: Felipe Castro <fefcas@gmail.com>\n"
 "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funkcio"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makroo"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Speciala Formo"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variablo"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opcio de Uzanto"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Ekzemplera Variablo"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metodo"
 
@@ -60,99 +60,99 @@ msgstr "{name} en {class}"
 msgid "{name} of {class}"
 msgstr "{name} de {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "januaro"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "februaro"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "marto"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "aprilo"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "majo"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "junio"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "julio"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "augusto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "septembro"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "oktobro"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "novembro"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "decembro"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -187,17 +187,17 @@ msgstr "Konsultu la sekcion ``{section_name}'' en 
@cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "konsultu la sekcion ``{section_name}'' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Konsultu @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "konsultu @cite{{book}}"
@@ -217,55 +217,43 @@ msgstr "Konsultu {title_ref}"
 msgid "see {title_ref}"
 msgstr "konsultu {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Neniu valoro por `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} de {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} en {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Aldono {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -299,82 +287,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} de {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} de {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} en {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} en {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} en {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} en {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} en {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} en {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} de {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} de {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} de {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} de {class}: {type} {name}"
@@ -597,228 +575,144 @@ msgstr "Malgranda Enhavtabelo"
 msgid "Footnotes"
 msgstr "Piednotoj"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "konsultu {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Konsultu {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "konsultu {reference} en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "konsultu @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "konsultu `{section}' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "konsultu {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "konsultu `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Konsultu {reference} en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Konsultu @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Konsultu `{section}' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Konsultu {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Konsultu `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Salti al"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Indeksa Ero"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Sekcio"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} de {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} en {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -827,45 +721,45 @@ msgstr ""
 "Tiu @^{c}i dokumento estis generata en @emph{@today{}} uzante "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Tiu @^{c}i dokumento estis generata en @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "La nodo kiun vi ser@^{c}as estas @^{c}e {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  La butonoj en la krozpaneloj havas la jenajn signifojn:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Butono"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nomo"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Iri al"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "De 1.2.3 iru al"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -874,47 +768,47 @@ msgstr ""
 "  kie la @strong{ Ekzemplo } agnoskas ke la nuna pozicio estas @^{c}e "
 "@strong{ Subsubsekcio Unu-Du-Tri } de dokumento kun la jena strukturo:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Sekcio Unu"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subsekcio Unu-Unu"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subsekcio Unu-Du"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subsubsekcio Unu-Du-Unu"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subsubsekcio Unu-Du-Du"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subsubsekcio Unu-Du-Tri"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Nuna Pozicio"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subsubsekcio Unu-Du-Kvar"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subsekcio Unu-Tri"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subsekcio Unu-Kvar"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Sentitola Dokumento"
 
@@ -923,16 +817,124 @@ msgstr "Sentitola Dokumento"
 msgid "{month} {day}, {year}"
 msgstr "{year} {month} {day}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} de {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} de {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} en {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} en {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} en {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} de {class}"
+
 #, perl-brace-format
 #~ msgid "see section {reference_name}"
 #~ msgstr "konsultu la sekcion {reference_name}"
diff --git a/po_document/es.po b/po_document/es.po
index 93a526c456..eba50bdc2c 100644
--- a/po_document/es.po
+++ b/po_document/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document-6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-26 10:58+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Función"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forma especial"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opción del usuario"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Variable de instancia"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Método"
 
@@ -60,99 +60,99 @@ msgstr "{name} en {class}"
 msgid "{name} of {class}"
 msgstr "{name} de {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "enero"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "febrero"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "marzo"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "mayo"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "junio"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "julio"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "agosto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "septiembre"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "octubre"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "noviembre"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "diciembre"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -187,17 +187,17 @@ msgstr "Véase la sección ``{section_name}'' en 
@cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "véase la sección ``{section_name}'' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Véase @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "véase @cite{{book}}"
@@ -217,55 +217,43 @@ msgstr "Véase {title_ref}"
 msgid "see {title_ref}"
 msgstr "véase {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{No hay valor para `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} de {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} en {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Apéndice {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -299,82 +287,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} de {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} de {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} en {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} en {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} en {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} en {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} en {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} en {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} de {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} de {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} de {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} de {class}: {type} {name}"
@@ -597,221 +575,142 @@ msgstr "Resumen del contenido"
 msgid "Footnotes"
 msgstr "Notas al pie"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "véase {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Véase {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "véase {reference} en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "véase @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "véase `{section}' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "véase {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "véase `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Véase {reference} en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Véase @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Véase `{section}' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Véase {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Véase `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' en @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Saltar a"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada de índice"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Sección"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} de {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} en {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} en {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -820,46 +719,46 @@ msgstr ""
 "Este documento se generó el @emph{@today{}} utilizando "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Este documento se generó el @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Información de licencia de JavaScript"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "El nodo que busca se encuentra en {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 "  Los botones de los paneles de navegación tienen el significado siguiente:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Botón"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nombre"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Ir a"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Desde 1.2.3 ir a"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -869,47 +768,47 @@ msgstr ""
 "@strong{ Sub-subsección uno-dos-tres } de un documento de la estructura "
 "siguiente:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Sección Uno"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subsección uno-uno"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subsección uno-dos"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Sub-subsección uno-dos-uno"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Sub-subsección uno-dos-dos"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Sub-subsección uno-dos-tres"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posición actual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Sub-subsección uno-dos-cuatro"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subsección uno-tres"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subsección uno-cuatro"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Documento sin título"
 
@@ -918,16 +817,119 @@ msgstr "Documento sin título"
 msgid "{month} {day}, {year}"
 msgstr "el {day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} en {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} de {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} de {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} en {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} en {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} en {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} en {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} en {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} en {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} de {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} de {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} en {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} de {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "véase la sección {reference_name}"
 
diff --git a/po_document/fr.po b/po_document/fr.po
index 73c6f0aea3..4a6f5ca2ac 100644
--- a/po_document/fr.po
+++ b/po_document/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-18 10:10+0200\n"
 "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,31 +18,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Fonction"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forme Sp@'eciale"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Option de l'utilisateur"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Variable d'instance"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "M@'ethode"
 
@@ -60,99 +60,99 @@ msgstr "{name} de {class}"
 msgid "{name} of {class}"
 msgstr "{name} de {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "erreur@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "janvier"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "f@'evrier"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "mars"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "avril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "mai"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "juin"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "juillet"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "ao@^ut"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "septembre"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "octobre"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "novembre"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "d@'ecembre"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}@ : "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}@ : "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}@ : "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -187,17 +187,17 @@ msgstr "voir la section `{section_name}' dans 
@cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "voir la section `{section_name}' dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Voir @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "voir @cite{{book}}"
@@ -217,55 +217,43 @@ msgstr "Voir {title_ref}"
 msgid "see {title_ref}"
 msgstr "voir {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}@ :} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Aucune valeur pour `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} de {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} de {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Annexe {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -299,82 +287,72 @@ msgstr "@tie{ }-- {category}@ : {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category}@ : {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category}@ :@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category}@ : {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category}@ :@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category}@ : {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} de {class}@ : {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}@ : {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} de {class}@ : {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} de {class}@ : {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{ }-- {category} de {class}@ : {type} {name}"
@@ -597,221 +575,142 @@ msgstr "R@'esum@'e du contenu"
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "voir {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Voir {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "voir {reference} dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "voir @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "voir `{section}' dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "voir {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "voir `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Voir {reference} dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Voir @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Voir `{section}' dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Voir {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Voir `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' dans @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Aller @`a"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entr@'ee d'index"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Section"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}@ :"
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}@ :@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} de {class}@ : @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} de {class}@ : @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}@ :"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -820,46 +719,46 @@ msgstr ""
 "Ce document a @'et@'e g@'en@'er@'e @emph{@today{}} en utilisant "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Ce document a @'et@'e g@'en@'er@'e le @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Information de licence de JavaScript"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Le n@oe{}ud que vous recherchez est ici@ : {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 "  Les boutons du panneau de navigation ont la signification suivante@ :"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Bouton"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nom"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Aller @`a"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Depuis 1.2.3 aller @`a"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -868,47 +767,47 @@ msgstr ""
 "  Dans cet exemple on est @`a @strong{ Sous-sous-section un-deux-trois } "
 "dans un document dont la structure est@ :"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Section un"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Sous-section un-un"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Sous-section un-deux"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Sous-sous-section un-deux-un"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Sous-sous-section un-deux-deux"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Sous-sous-section un-deux-trois"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Position actuelle"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Sous-sous-section un-deux-quatre"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Sous-section un-trois"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Sous-section un-quatre"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Document sans titre"
 
@@ -917,12 +816,115 @@ msgstr "Document sans titre"
 msgid "{month} {day}, {year}"
 msgstr "le {day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} de {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} de {class}@ :@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}@ : @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}@ : @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}@ : @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}@ : @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} de {class}@ :@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} de {class}@ : @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} de {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} de {class}"
diff --git a/po_document/hr.po b/po_document/hr.po
index c66af2848a..5caa12b17a 100644
--- a/po_document/hr.po
+++ b/po_document/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-16 21:38-0700\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -22,31 +22,31 @@ msgstr ""
 "X-Generator: Poedit 3.0\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funkcija"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Specijalna forma"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Varijabla"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Korisnička opcija"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Primjer varijable"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metoda"
 
@@ -64,99 +64,99 @@ msgstr "{name} na {class}"
 msgid "{name} of {class}"
 msgstr "{name} od {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "greška@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "siječanj"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "veljača"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "ožujak"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "travanj"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "svibanj"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "lipanj"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "srpanj"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "kolovoz"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "rujan"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "listopad"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "studeni"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "prosinac"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -191,17 +191,17 @@ msgstr "Pogledajte odlomak „{section_name}“ u 
@cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "pogledajte odlomak „{section_name}“ u @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Pogledajte @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "pogledajte @cite{{book}}"
@@ -221,55 +221,43 @@ msgstr "Pogledajte {title_ref}"
 msgid "see {title_ref}"
 msgstr "pogledajte {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{nema vrijednosti za „{value}“@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} od {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} na {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Privitak {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -303,82 +291,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} od {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} od {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} na {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} na {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} na {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} na {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} od {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} od {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} od {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} od {class}: {type} {name}"
@@ -601,221 +579,142 @@ msgstr "Kratki sadržaj"
 msgid "Footnotes"
 msgstr "Fusnote"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "pogledajte {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Pogledajte {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "pogledajte {reference} u @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "pogledajte @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "pogledajte „{section}“ u @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "pogledajte {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "pogledajte „{section}“"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Pogledajte {reference} u @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Pogledajte @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Pogledajte „{section}“ u @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Pogledajte {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Pogledajte „{section}“"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} u @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "„{section}“ u @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "„{section}“"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Preskoči na"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Stavka indeksa"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Odlomak"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} od {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} od {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} od {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} na {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} na {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} od {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} od {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} od {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} od {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -824,45 +723,45 @@ msgstr ""
 "Ovaj dokument je generiran na @emph{@today{}} rabeći "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Ovaj dokument je generiran na @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Podaci o licenci za JavaScript"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Čvor koji tražite nalazi se pri {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  Gumbi u navigacijskom panelu imaju sljedeća značenja:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Gumb"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Ime"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Idi na/u"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Od 1.2.3 idi na/u"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -871,47 +770,47 @@ msgstr ""
 "  gdje @strong{ primjer } pretpostavlja da je trenutna pozicija na/u "
 "@strong{ Pododlomak jedan-dva-tri } dokumenta sljedeće strukture:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Odlomak jedan"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Pododlomak jedan-jedan"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Pododlomak jedan-dva"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Pododlomak jedan-dva-jedan"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Pododlomak jedan-dva-dva"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Pododlomak jedan-dva-tri"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "trenutna pozicija"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Pododlomak jedan-dva-četri"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Pododlomak jedan-tri"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Pododlomak jedan-četri"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Dokument bez naslova"
 
@@ -920,16 +819,119 @@ msgstr "Dokument bez naslova"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} od {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} od {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} od {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} od {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} od {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} na {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} na {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} od {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} od {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} od {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} od {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} na {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} od {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "pogledajte odlomak {reference_name}"
 
diff --git a/po_document/hu.po b/po_document/hu.po
index c6ed2b2d7c..2a5c16d82d 100644
--- a/po_document/hu.po
+++ b/po_document/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.4.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2018-01-20 14:27+0100\n"
 "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -20,31 +20,31 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Függvény"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makró"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Speciális űrlap"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Változó"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Felhasználói beállítás"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Példányváltozó"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metódus"
 
@@ -62,99 +62,99 @@ msgstr "{name} ezen: {class}"
 msgid "{name} of {class}"
 msgstr "{name} típusa: {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "január"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "február"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "március"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "április"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "május"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "június"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "július"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "augusztus"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "szeptember"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "október"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "november"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "december"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -189,17 +189,17 @@ msgstr "Lásd a(z) „{section_name}” szakaszt ebben: 
@cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "lásd a(z) „{section_name}” szakaszt ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Lásd: @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "lásd: @cite{{book}}"
@@ -219,55 +219,43 @@ msgstr "Lásd: {title_ref}"
 msgid "see {title_ref}"
 msgstr "lásd: {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Nincs érték ehhez: „{value}”@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} - {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} ezen: {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Függelék {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -301,82 +289,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} - {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} - {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} ezen: {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} ezen: {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} ezen: {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} ezen: {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} ezen: {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} ezen: {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} - {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} - {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} - {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} - {class}: {type} {name}"
@@ -599,228 +577,144 @@ msgstr "Rövid tartalomjegyzék"
 msgid "Footnotes"
 msgstr "Lábjegyzet"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "lásd: {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Lásd: {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "lásd: {reference} ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "lásd: @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "lásd ezt a szakaszt: „{section}” ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "lásd: {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "lásd: „{section}”"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Lásd: {reference} ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Lásd: @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Lásd ezt a szakaszt: „{section}” ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Lásd: {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Lásd: „{section}”"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "„{section}” szakasz ebben: @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "„{section}”"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Ugrás ide"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Tárgymutató-bejegyzés"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Szakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} ezen: {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} ezen: {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} - {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} ezen: {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} - {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} - {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} ezen: {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} ezen: {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}} "
-"@emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} ezen: {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} ezen: {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} - {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category} - {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} - {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} - {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} ezen: {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -829,45 +723,45 @@ msgstr ""
 "Ezt a dokumentumot @emph{@today{}} napon állította elő a(z) "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Ezt a dokumentumot @emph{@today{}} napon állították elő."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "A keresett csomópont itt található: {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  A navigációs panelen levő gombok jelentése a következő:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Gomb"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Név"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Cél"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "1.2.3-ból ide jutunk"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -876,47 +770,47 @@ msgstr ""
 "  ahol a @strong{ Példa } azt feltételezi, hogy a jelenlegi pozíció a "
 "következő szerkezetű dokumentum @strong{ 1.2.3. alalszakasza }:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "1. szakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "1.1 alszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "1.2. alszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "1.2.3. alalszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "1.2.2. alalszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "1.2.3. alalszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Jelenlegi pozíció"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "1.2.4. alalszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "1.3. alszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "1.4. alszakasz"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Névtelen dokumentum"
 
@@ -925,16 +819,123 @@ msgstr "Névtelen dokumentum"
 msgid "{month} {day}, {year}"
 msgstr "{year}. {month} {day}."
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} ezen: {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} - {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} - {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} - {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} - {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} - {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} ezen: {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} ezen: {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} ezen: {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} ezen: {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} ezen: {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} - {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} - {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} - {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} - {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} ezen: {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} - {class}"
+
 #, perl-brace-format
 #~ msgid "see section {reference_name}"
 #~ msgstr "lásd ezt a szakaszt: {reference_name}"
diff --git a/po_document/it.po b/po_document/it.po
index b8c57bf5a7..845c9bb942 100644
--- a/po_document/it.po
+++ b/po_document/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.4.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2017-07-11 10:52+0200\n"
 "Last-Translator: Federico Bruni <fede@inventati.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,31 +19,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Gtranslator 2.91.7\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funzione"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forma speciale"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variabile"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opzione utente"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Variabile dell'istanza"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metodo"
 
@@ -61,99 +61,99 @@ msgstr "{name} in {class}"
 msgid "{name} of {class}"
 msgstr "{name} di {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Gennaio"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Febbraio"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Marzo"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Aprile"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maggio"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Giugno"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Luglio"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agosto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Settembre"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Ottobre"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembre"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dicembre"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -188,17 +188,17 @@ msgstr "Vedi la sezione «{section_name}» in @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "vedi la sezione «{section_name}» in @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Vedi @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "vedi @cite{{book}}"
@@ -218,55 +218,43 @@ msgstr "Vedi {title_ref}"
 msgid "see {title_ref}"
 msgstr "vedi {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Nessun valore per \\\"{value}\\\"@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} di {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} su {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Appendice {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -300,82 +288,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} of {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} of {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} su {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} su {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} su {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} su {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} su {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} su {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} di {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} di {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} di {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} di {class}: {type} {name}"
@@ -598,228 +576,144 @@ msgstr "Indice breve"
 msgid "Footnotes"
 msgstr "Note a piè di pagina"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "vedi {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Vedi {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "vedi {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "vedi @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "vedi \\\"{section}\\\" in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "vedi {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "vedi \\\"{section}\\\""
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Vedi {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Vedi @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Vedi \\\"{section}\\\" in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Vedi {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Vedi \\\"{section}\\\""
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "\\\"{section}\\\" in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "\\\"{section}\\\""
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Salta a"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Voce dell'indice"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Sezione"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} su {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} su {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid "{category}: @strong{{name}}"
-msgid "@strong{{name}}"
-msgstr "{category}: @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} di {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
 msgid "{category}:@* "
 msgstr "{category} su {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} di {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} di {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} su {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} su {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} su {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} su {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} su {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} su {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} di {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} di {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} di {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} di {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} su {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -828,46 +722,46 @@ msgstr ""
 "Questo documento è stato generato il @emph{@today{}} con "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Questo documento è stato generato il @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Il nodo cercato è {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 "  I pulsanti nei pannelli di navigazione hanno il seguente significato:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Pulsante"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nome"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Vai a"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Da 1.2.3 vai a"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -877,47 +771,47 @@ msgstr ""
 "@strong{ Sottosottosezione Uno-Due-Tre } di un documento che ha la seguente "
 "struttura:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Sezione uno"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Sottosezione Uno-Uno"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Sottosezione Uno-Due"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Sottosottosezione Uno-Due-Uno"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Sottosottosezione Uno-Due-Due"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Sottosottosezione Uno-Due-Tre"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posizione Attuale"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Sottosottosezione Uno-Due-Quattro"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Sottosezione Uno-Tre"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Sottosezione Uno-Quattro"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Documento senza titolo"
 
@@ -926,16 +820,124 @@ msgstr "Documento senza titolo"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} su {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} di {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} di {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} di {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @strong{{name}}"
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} di {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} di {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} su {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} su {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} su {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} su {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} su {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} su {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} di {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} di {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} di {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} di {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} su {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} di {class}"
+
 #, perl-brace-format
 #~ msgid "see section {reference_name}"
 #~ msgstr "vedi la sezione {reference_name}"
diff --git a/po_document/nl.po b/po_document/nl.po
index 82a968b1d7..7805dc6a79 100644
--- a/po_document/nl.po
+++ b/po_document/nl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document-6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-07-02 11:15+0200\n"
 "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -21,31 +21,31 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Functie"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Speciale vorm"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variabele"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Gebruikeroptie"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Instantiatievariabele"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Methode"
 
@@ -63,99 +63,99 @@ msgstr "{name} over {class}"
 msgid "{name} of {class}"
 msgstr "{name} van {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Januari"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Februari"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Maart"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "April"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Mei"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Juni"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Juli"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Augustus"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "September"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Oktober"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "November"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "December"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -190,17 +190,17 @@ msgstr "Zie sectie “{section_name}” in @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "zie sectie “{section_name}” in @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Zie @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "zie @cite{{book}}"
@@ -220,55 +220,43 @@ msgstr "Zie {title_ref}"
 msgid "see {title_ref}"
 msgstr "zie {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Geen waarde voor '{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} van {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} over {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Appendix {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -302,82 +290,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} van {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} van {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} over {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} over {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} over {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} over {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} over {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} over {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} van {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} van {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} van {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{ }-- {category} van {class}: {type} {name}"
@@ -601,221 +579,142 @@ msgstr "Korte inhoudsopgave"
 msgid "Footnotes"
 msgstr "Voetnoten"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "zie {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Zie {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "zie {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "zie @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "zie ‘{section}’ in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "zie {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "zie ‘{section}’"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Zie {reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Zie @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Zie ‘{section}’ in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Zie {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Zie ‘{section}’"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "‘{section}’ in @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "‘{section}’"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Spring naar"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Index-item"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Sectie"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} over {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} over {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} van {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} van {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} van {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} over {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} over {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} over {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} over {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} over {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} over {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} van {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} van {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} van {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} van {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -824,45 +723,45 @@ msgstr ""
 "Dit document werd gegenereerd op @emph{@today{}} met behulp van "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Dit document werd gegenereerd op @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Informatie over JavaScript-licentie"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "De pagina die u zoekt bevindt zich op {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  De knoppen in de navigatiepanelen hebben de volgende functies:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Knop"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Naam"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Gaat naar"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Gaat van 1.2.3 naar"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -872,47 +771,47 @@ msgstr ""
 "@strong{ subsubsectie één-twee-drie } is in een document met de volgende "
 "structuur:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Sectie één"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subsectie één-één"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subsectie één-twee"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subsectie één-twee-één"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subsectie één-twee-twee"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subsectie één-twee-drie"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Huidige positie"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subsectie één-twee-vier"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subsectie één-drie"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subsectie één-vier"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Naamloos document"
 
@@ -921,16 +820,119 @@ msgstr "Naamloos document"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} over {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} van {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} van {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} van {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} van {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} van {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} over {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} over {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} over {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} over {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} over {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} over {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} van {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} van {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} van {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} van {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} over {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} van {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "zie sectie {reference_name}"
 
diff --git a/po_document/no.us-ascii.po b/po_document/no.us-ascii.po
index 3524ae6d40..62cd2011da 100644
--- a/po_document/no.us-ascii.po
+++ b/po_document/no.us-ascii.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 5.0\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2001-01-01\n"
 "Last-Translator: Unknown\n"
 "Language-Team: Unknown\n"
@@ -16,31 +16,31 @@ msgstr ""
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr ""
 
@@ -58,99 +58,99 @@ msgstr ""
 msgid "{name} of {class}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "januar"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "februar"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "mars"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "april"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "mai"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "juni"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "juli"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "august"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "september"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "oktober"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "november"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "desember"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr ""
@@ -185,17 +185,17 @@ msgstr ""
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr ""
@@ -215,53 +215,43 @@ msgstr ""
 msgid "see {title_ref}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, perl-brace-format
-msgid "{category} of @code{{class}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, perl-brace-format
-msgid "{category} on @code{{class}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr ""
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr ""
@@ -295,82 +285,72 @@ msgstr ""
 msgid "@tie{}-- {category}: {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr ""
@@ -593,308 +573,231 @@ msgstr "Kort innholdsfortegnelse"
 msgid "Footnotes"
 msgstr "No translation available!"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, perl-brace-format
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
+msgid "{category} on @code{{class}}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, perl-brace-format
-msgid "@strong{{name}}"
+msgid "{category} of @code{{class}}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
 "@uref{{program_homepage}, @emph{{program}}}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 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 ""
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr ""
 
@@ -903,12 +806,12 @@ msgstr ""
 msgid "{month} {day}, {year}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:124
+#: tp/Texinfo/Convert/Utils.pm:130
 #, perl-brace-format
-msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:131
+#: tp/Texinfo/Convert/Utils.pm:137
 #, perl-brace-format
-msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr ""
diff --git a/po_document/pl.po b/po_document/pl.po
index f21f7d218b..e92b9ebeb3 100644
--- a/po_document/pl.po
+++ b/po_document/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-16 21:01+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funkcja"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Postać specjalna"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Zmienna"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opcja użytkownika"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Przykład zmiennej"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metoda"
 
@@ -59,99 +59,99 @@ msgstr "{name} dla klasy {class}"
 msgid "{name} of {class}"
 msgstr "{name} klasy {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "błąd@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "styczeń"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "luty"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "marzec"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "kwiecień"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "maj"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "czerwiec"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "lipiec"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "sierpień"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "wrzesień"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "październik"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "listopad"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "grudzień"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -186,17 +186,17 @@ msgstr "P. sekcja ``{section_name}'' w @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "p. sekcja ``{section_name}'' w @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "P. @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "p. @cite{{book}}"
@@ -216,55 +216,43 @@ msgstr "P. {title_ref}"
 msgid "see {title_ref}"
 msgstr "p. {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Brak wartości dla `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} klasy {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} dla klasy {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center - @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Załącznik {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -298,82 +286,72 @@ msgstr "@tie{}- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}- {category} klasy {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}- {category} klasy {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}- {category} dla klasy {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}- {category} dla klasy {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}- {category} dla klasy {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}- {category} dla klasy {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}- {category} dla klasy {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}- {category} dla klasy {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}- {category} klasy {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}- {category} klasy {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}- {category} klasy {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}- {category} klasy {class}: {type} {name}"
@@ -596,224 +574,142 @@ msgstr "Skrócony spis treści"
 msgid "Footnotes"
 msgstr "Przypisy"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "p. {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "P. {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "p. {reference} w @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "p. @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "p. `{section}' w @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "p. {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "p. `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "P. {reference} w @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "P. @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "P. `{section}' w @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "P. {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "P. `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} w @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' w @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Skok do"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Wpis indeksu"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Sekcja"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} dla klasy {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} dla klasy {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} klasy {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} klasy {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} klasy {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} dla klasy {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} dla klasy {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} dla klasy {class}:@* @emph{{type}}@* @strong{{name}} "
-"@emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} dla klasy {class}: @emph{{type}} @strong{{name}} "
-"@emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} dla klasy {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} dla klasy {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} klasy {class}:@* @emph{{type}}@* @strong{{name}} "
-"@emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} klasy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} klasy {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} klasy {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -822,45 +718,45 @@ msgstr ""
 "Ten dokument został wygenerowany @emph{@today{}} przy użyciu programu "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Ten dokument został wygenerowany @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Informacje o licencji JavaScriptu"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Poszukiwany węzeł jest pod {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  Przyciski w panelach nawigacyjnych mają następujące znaczenie:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Przycisk"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nazwa"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Przechodzi do"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Z 1.2.3 przechodzi do"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -870,47 +766,47 @@ msgstr ""
 "@strong{ Podpodsekcja Jeden-Dwa-Trzy } w dokumencie o następującej "
 "strukturze:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Sekcja Jeden"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Podsekcja Jeden-Jeden"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Podsekcja Jeden-Dwa"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Podpodsekcja Jeden-Dwa-Jeden"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Podpodsekcja Jeden-Dwa-Dwa"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Podpodsekcja Jeden-Dwa-Trzy"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Bieżąca pozycja"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Podpodsekcja Jeden-Dwa-Cztery"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Podsekcja Jeden-Trzy"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Podsekcja Jeden-Cztery"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Dokument bez tytułu"
 
@@ -919,12 +815,116 @@ msgstr "Dokument bez tytułu"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} dla klasy {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} klasy {class}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}- {category} klasy {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}- {category} klasy {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} klasy {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} klasy {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} dla klasy {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} dla klasy {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} dla klasy {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} dla klasy {class}: @emph{{type}} @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} dla klasy {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} dla klasy {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} klasy {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} klasy {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} klasy {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} klasy {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} dla klasy {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} klasy {class}"
diff --git a/po_document/pt.po b/po_document/pt.po
index 30d85a9f00..7c231687af 100644
--- a/po_document/pt.po
+++ b/po_document/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-17 06:32+0100\n"
 "Last-Translator: Pedro Albuquerque <pmra@protonmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -19,31 +19,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\\n;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Função"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Formulário especial"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variável"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Opção do utilizador"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Variável de instância"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Método"
 
@@ -61,99 +61,99 @@ msgstr "{name} na {class}"
 msgid "{name} of {class}"
 msgstr "{name} da {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Janeiro"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Fevereiro"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Março"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maio"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Junho"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Julho"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agosto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Setembro"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Outubro"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembro"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dezembro"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -188,17 +188,17 @@ msgstr "Veja a secção ``{section_name}'' em @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "veja a secção ``{section_name}'' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "veja @cite{{book}}"
@@ -218,55 +218,43 @@ msgstr "Veja {title_ref}"
 msgid "see {title_ref}"
 msgstr "veja {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Sem valor para `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} da {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} na {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Apêndice {number}, {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number}, {section_title}"
@@ -300,82 +288,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} da {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} da {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} na {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} na {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} na {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} na {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} da {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} da {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} da {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} da {class}: {type} {name}"
@@ -598,221 +576,142 @@ msgstr "Índice breve"
 msgid "Footnotes"
 msgstr "Notas de rodapé"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "veja {reference} em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "veja @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "veja `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "veja {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "veja `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Veja {reference} em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Veja @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Veja `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Veja {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Veja `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Ir para"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada de índice"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Secção"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} da {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} da {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} na {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} na {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} da {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -821,45 +720,45 @@ msgstr ""
 "Este documento foi gerado em @emph{@today{}}, usando o "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Este documento foi gerado em @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Informação da licença Javascript"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "O nó que procura está em {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  Os botões nos painéis de navegação têm o seguinte significado:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Botão"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nome"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Ir para"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "De 1.2.3 ir para"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -868,47 +767,47 @@ msgstr ""
 "  onde o @strong{ Exemplo } assume que a posição actual é a @strong{ Sub-sub-"
 "secção Um-Dois-TrÊs } de um documento com a seguinte estrutura:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Secção um"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Sub-secção um-um"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Sub-secção um-dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Sub-sub-secção um-dois-um"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Sub-sub-secção um-dois-dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Sub-sub-secção um-dois-três"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posição actual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Sub-sub-secção um-dois-quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Sub-secção um-três"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Sub-secção um-quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Documento sem nome"
 
@@ -917,16 +816,119 @@ msgstr "Documento sem nome"
 msgid "{month} {day}, {year}"
 msgstr "{day} de {month} de {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} da {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} da {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} da {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} da {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} na {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} na {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} da {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} na {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} da {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "veja a secção {reference_name}"
 
diff --git a/po_document/pt.us-ascii.po b/po_document/pt.us-ascii.po
index d1b5f2b438..43638363cb 100644
--- a/po_document/pt.us-ascii.po
+++ b/po_document/pt.us-ascii.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 5.0\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2006-01-09\n"
 "Last-Translator: Jorge Barros de Abreu <ficmatin01@solar.com.br>\n"
 "Language-Team: Unknown\n"
@@ -16,33 +16,33 @@ msgstr ""
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 #, fuzzy
 msgid "Function"
 msgstr "Se@,{c}@~ao"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 #, fuzzy
 msgid "User Option"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr ""
 
@@ -60,99 +60,99 @@ msgstr "{name} na {class}"
 msgid "{name} of {class}"
 msgstr "{name} da {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Janeiro"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Fevereiro"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Mar@,{c}o"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maio"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Junho"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Julho"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agosto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Setembro"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Outubro"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembro"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dezembro"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr ""
@@ -187,17 +187,17 @@ msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "veja se@,{c}@~ao `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "veja @cite{{book}}"
@@ -217,55 +217,43 @@ msgstr ""
 msgid "see {title_ref}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} da {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} na {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr ""
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr ""
@@ -299,82 +287,72 @@ msgstr "@tie{ }-- {category} da {class}: {name} 
{arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category} da {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} da {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} na {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} da {class}: {type} {name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{ }-- {category} da {class}: {type} {name}"
@@ -603,225 +581,144 @@ msgstr "Breve Sum@'ario"
 msgid "Footnotes"
 msgstr "Notas de Rodap@'e"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, fuzzy, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "veja {node_file_href} @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, fuzzy, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, fuzzy, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, fuzzy, perl-brace-format
 msgid "see {reference}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, fuzzy, perl-brace-format
 msgid "see `{section}'"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, fuzzy, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Veja {node_file_href} @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, fuzzy, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, fuzzy, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Veja se@,{c}@~ao `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, fuzzy, perl-brace-format
 msgid "See {reference}"
 msgstr "Veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, fuzzy, perl-brace-format
 msgid "See `{section}'"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, fuzzy, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, fuzzy, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, fuzzy, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "se@,{c}@~ao `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, fuzzy, perl-brace-format
 msgid "{reference}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, fuzzy, perl-brace-format
 msgid "`{section}'"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Pular para"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada de @'Indice"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Se@,{c}@~ao"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}:@* "
+msgid "{category} on @code{{class}}: "
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} da {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} na {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, fuzzy, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, fuzzy, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} da {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:6044
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} on {class}"
+msgid "{category}:@* "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:6059
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, fuzzy, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -830,49 +727,49 @@ msgstr ""
 "Esse documento foi gerado em @i{{date}} usando @uref{{program_homepage}, "
 "@i{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 #, fuzzy
 msgid "This document was generated on @emph{@today{}}."
 msgstr ""
 "Esse documento foi gerado usando @uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "O nodo que vo@^e est@'a olhando est@'a em {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 "  Os bot@~oes nos pain@'eis de navega@,{c}@~ao possuem os seguintes "
 "significados:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Bot@~ao"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nome"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "V@'a para"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "De 1.2.3 v@'a para"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -882,47 +779,47 @@ msgstr ""
 "@strong{ Subsub@,{c}@~ao Um-Dois-Tr@^es } de um documento com a seguinte "
 "estrutura:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Se@,{c}@~ao Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subse@,{c}@~ao Um-Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subse@,{c}@~ao Um-Dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subse@,{c}@~ao Um-Dois-Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subse@,{c}@~ao Um-Dois-Dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posi@,{c}@~ao Atual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subse@,{c}@~ao Um-Tr@^es"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subse@,{c}@~ao Um-Quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Documento Sem Nome"
 
@@ -931,16 +828,115 @@ msgstr "Documento Sem Nome"
 msgid "{month} {day}, {year}"
 msgstr "{day} de {month} de {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} da {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} da {class}: {type} {name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} da {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} da {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} na {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} na {class}: @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} na {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} na {class}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} na {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} da {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "veja se@,{c}@~ao {reference_name}"
 
diff --git a/po_document/pt_BR.po b/po_document/pt_BR.po
index a9268ce730..642f2f504d 100644
--- a/po_document/pt_BR.po
+++ b/po_document/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-16 11:08-0300\n"
 "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -20,31 +20,31 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Fun@,{c}@~{a}o"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forma Especial"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Vari@'{a}vel"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Op@,{c}@~{a}o de Usu@'ario"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Vari@'{a}vel de inst@^{a}ncia"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "M@'{e}todo"
 
@@ -62,99 +62,99 @@ msgstr "{name} na {class}"
 msgid "{name} of {class}"
 msgstr "{name} da {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Janeiro"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Fevereiro"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Mar@,{c}o"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maio"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Junho"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Julho"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agosto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Setembro"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Outubro"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembro"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dezembro"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -189,17 +189,17 @@ msgstr "Veja se@,{c}@~{a}o ``{section_name}'' em 
@cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "veja se@,{c}@~{a}o ``{section_name}'' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "veja @cite{{book}}"
@@ -219,55 +219,43 @@ msgstr "Veja {title_ref}"
 msgid "see {title_ref}"
 msgstr "veja {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Nenhum valor para `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} da {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} na {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Ap@^{e}ndice {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -301,82 +289,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} of {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} of {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} on {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} on {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} on {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} on {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} of {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} of {class}: {type} {name}"
@@ -599,232 +577,144 @@ msgstr "Breve Sum@'{a}rio"
 msgid "Footnotes"
 msgstr "Notas de Rodap@'{e}"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "veja {reference} em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "veja @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "veja `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "veja {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "veja `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Veja {reference} em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Veja @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Veja `{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Veja {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Veja `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' em @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Pular para"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada de @'{i}ndice"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Se@,{c}@~{a}o"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
 #| msgid "{category} on {class}"
-msgid "{category}:@* "
+msgid "{category} on @code{{class}}: "
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-#| msgid ""
-#| "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
-#| "@emph{{arguments}}"
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} em {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-#| msgid ""
-#| "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} em {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} da {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5960
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
-#| msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}:@* "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5963
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-#| msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} de {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} em {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} em {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} em {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} em {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} em {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} de {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+#| msgid "{category} on {class}"
+msgid "{category}: "
+msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -833,47 +723,47 @@ msgstr ""
 "Esse documento foi gerado em @emph{@today{}} usando "
 "@uref{{program_homepage}, @emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Esse documento foi gerado em @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Infoma@,{c}ao de licenciamento JavaScript"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "O nodo atualmente visto encontra-se em {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 "  Os bot@~{o}es nos pain@'{e}is de navega@,{c}@~{a}o possuem os seguintes "
 "significados:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Bot@~{a}o"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nome"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "V@'{a} para"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "De 1.2.3 v@'{a} para"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -883,47 +773,47 @@ msgstr ""
 "em @strong{ Subsub@,{c}@~{a}o Um-Dois-Tr@^es } de um documento com a "
 "seguinte estrutura:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Se@,{c}@~{a}o Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subse@,{c}@~{a}o Um-Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subse@,{c}@~{a}o Um-Dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subse@,{c}@~{a}o Um-Dois-Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subse@,{c}@~{a}o Um-Dois-Dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subse@,{c}@~{a}o Um-Dois-Tr@^es"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posi@,{c}@~{a}o Atual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subse@,{c}@~{a}o Um-Dois-Quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subse@,{c}@~{a}o Um-Tr@^es"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subse@,{c}@~{a}o Um-Quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Documento Sem Nome"
 
@@ -932,12 +822,121 @@ msgstr "Documento Sem Nome"
 msgid "{month} {day}, {year}"
 msgstr "{day} de {month} de {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} na {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} da {class}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} of {class}:@*{type}@*{name}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid ""
+#~| "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~| "@emph{{arguments}}"
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} em {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid ""
+#~| "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} em {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} de {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} de {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} em {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} em {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} em {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} em {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} em {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} em {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} de {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} da {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} da {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} da {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} na {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} da {class}"
diff --git a/po_document/pt_BR.us-ascii.po b/po_document/pt_BR.us-ascii.po
index 9ae3506b90..968ddf9111 100644
--- a/po_document/pt_BR.us-ascii.po
+++ b/po_document/pt_BR.us-ascii.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 5.9.93\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2015-06-07 06:25-0300\n"
 "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -18,33 +18,33 @@ msgstr ""
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 #, fuzzy
 msgid "Function"
 msgstr "Se@,{c}@~ao"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Forma Especial"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Vari@'{a}vel"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 #, fuzzy
 msgid "User Option"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Vari@'{a}vel de inst@^{a}ncia"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "M@'{e}todo"
 
@@ -62,99 +62,99 @@ msgstr "{name} na {class}"
 msgid "{name} of {class}"
 msgstr "{name} da {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Janeiro"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Fevereiro"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Mar@,{c}o"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "Abril"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maio"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Junho"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Julho"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Agosto"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "Setembro"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Outubro"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "Novembro"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "Dezembro"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, fuzzy, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, fuzzy, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, fuzzy, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, fuzzy, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -189,17 +189,17 @@ msgstr ""
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "veja @cite{{book}}"
@@ -219,53 +219,43 @@ msgstr "Veja {title_ref}"
 msgid "see {title_ref}"
 msgstr "veja {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Nenhum valor para `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-msgid "{category} of @code{{class}}"
-msgstr "{name} da {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-msgid "{category} on @code{{class}}"
-msgstr "{name} na {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Ap@^{e}ndice {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, fuzzy, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "Ap@^{e}ndice {number} {section_title}"
@@ -299,82 +289,72 @@ msgstr "@tie{ }-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{ }-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{ }-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{ }-- {category} da {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{ }-- {category} na {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{ }-- {category} na {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{ }-- {category} da {class}: {type} {name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{ }-- {category} da {class}: {type} {name}"
@@ -603,265 +583,186 @@ msgstr "Breve Sum@'ario"
 msgid "Footnotes"
 msgstr "Notas de Rodap@'e"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, fuzzy, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, fuzzy, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, fuzzy, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, fuzzy, perl-brace-format
 msgid "see {reference}"
 msgstr "veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, fuzzy, perl-brace-format
 msgid "see `{section}'"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, fuzzy, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, fuzzy, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, fuzzy, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, fuzzy, perl-brace-format
 msgid "See {reference}"
 msgstr "Veja {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, fuzzy, perl-brace-format
 msgid "See `{section}'"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, fuzzy, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "Veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, fuzzy, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, fuzzy, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "veja @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, fuzzy, perl-brace-format
 msgid "{reference}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, fuzzy, perl-brace-format
 msgid "`{section}'"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Pular para"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Entrada de @'Indice"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Se@,{c}@~ao"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, fuzzy, perl-brace-format
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr "{name} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, fuzzy, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category}: {name} {arguments}"
+msgid "{category} on @code{{class}}: "
+msgstr "{name} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, fuzzy, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
+msgid "{category} of @code{{class}}: "
+msgstr "{name} da {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, fuzzy, perl-brace-format
 msgid "{category}:@* "
 msgstr "{name} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, fuzzy, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, fuzzy, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, fuzzy, perl-brace-format
-#| msgid "{category}: @emph{{type}} @strong{{name}}"
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, fuzzy, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, fuzzy, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "@tie{ }-- {category} da {class}: {name}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, fuzzy, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, fuzzy, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "@tie{ }-- {category} na {class}: {name}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, fuzzy, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, fuzzy, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, fuzzy, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, fuzzy, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, fuzzy, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, fuzzy, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, fuzzy, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, fuzzy, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{name} na {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
 "@uref{{program_homepage}, @emph{{program}}}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, fuzzy, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "O nodo que vo@^e est@'a olhando est@'a em {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 "  Os bot@~oes nos pain@'eis de navega@,{c}@~ao possuem os seguintes "
 "significados:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Bot@~ao"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Nome"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "V@'a para"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "De 1.2.3 v@'a para"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -871,47 +772,47 @@ msgstr ""
 "@strong{ Subsub@,{c}@~ao Um-Dois-Tr@^es } de um documento com a seguinte "
 "estrutura:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Se@,{c}@~ao Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Subse@,{c}@~ao Um-Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Subse@,{c}@~ao Um-Dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Subse@,{c}@~ao Um-Dois-Um"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Subse@,{c}@~ao Um-Dois-Dois"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Subse@,{c}@~ao Um-Dois-Tr@^es"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Posi@,{c}@~ao Atual"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Subse@,{c}@~ao Um-Dois-Quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Subse@,{c}@~ao Um-Tr@^es"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Subse@,{c}@~ao Um-Quatro"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Documento Sem Nome"
 
@@ -920,16 +821,112 @@ msgstr "Documento Sem Nome"
 msgid "{month} {day}, {year}"
 msgstr "{day} de {month} de {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
+#: tp/Texinfo/Convert/Utils.pm:130
 #, fuzzy, perl-brace-format
-msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{name} na {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
+#: tp/Texinfo/Convert/Utils.pm:137
 #, fuzzy, perl-brace-format
-msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{name} da {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{ }-- {category} da {class}: {type} {name}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category}: {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "{category}: @emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category} da {class}: {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "@tie{ }-- {category} da {class}: {name}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category} na {class}: {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "@tie{ }-- {category} na {class}: {name}"
+
+#, fuzzy, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category} na {class}: {type} {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category}: @emph{{type}} @strong{{name}}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{name} na {class}"
+
+#, fuzzy, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{name} da {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "veja se@,{c}@~ao {reference_name}"
 
diff --git a/po_document/sv.po b/po_document/sv.po
index 7ebaf9ea25..52de2f22cb 100644
--- a/po_document/sv.po
+++ b/po_document/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-16 11:51+0200\n"
 "Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -20,31 +20,31 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.0\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Funktion"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Specialform"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Variable"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Användarinställning"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Instantsvariabel"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Metod"
 
@@ -62,99 +62,99 @@ msgstr "{name} på {class}"
 msgid "{name} of {class}"
 msgstr "{name} av {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "Januari"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "Februari"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "Mars"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "April"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "Maj"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "Juni"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "Juli"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "Augusti"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "September"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "Oktober"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "November"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "December"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -189,17 +189,17 @@ msgstr "Se avsnitt ``{section_name}'' i @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "se avsnitt ``{section_name}'' i @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Se @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "se @cite{{book}}"
@@ -219,55 +219,43 @@ msgstr "Se {title_ref}"
 msgid "see {title_ref}"
 msgstr "se {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Inget värdet för `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} av {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} på {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Appendix {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -301,82 +289,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} av {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} av {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} på {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} på {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} på {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} på {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} på {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} på {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} av {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} av {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} av {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} av {class}: {type} {name}"
@@ -599,221 +577,142 @@ msgstr "Kort innehållsförteckning"
 msgid "Footnotes"
 msgstr "Fotnoter"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "se {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Se {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "se {reference} i @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "se @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "se `{section}' i @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "se {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "se `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Se {reference} i @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Se @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Se `{section}' i @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Se {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Se `{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} i @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "`{section}' i @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "`{section}'"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Hoppa till"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Indexpost"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Avsnitt"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} på {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}} "
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} på {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}} "
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} av {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@*  "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}} "
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}} "
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}} "
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}} "
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} av {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} av {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} på {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} på {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} på {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} på {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} på {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} på {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} av {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} av {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} av {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} av {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -822,45 +721,45 @@ msgstr ""
 "Detta dokument genererades @emph{@today{}} av @uref{{program_homepage}, "
 "@emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Detta dokument genererades @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "JavaScript-licensinformation"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Noden du letar efter finns vid {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  Knapparna i navigationspanelerna har följande innebörd:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Knapp"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Namn"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Gå till"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "Från 1.2.3 gå till"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -870,47 +769,47 @@ msgstr ""
 "@strong{ Underunderavsnitt Ett-Två-Tree } för ett dokument med följande "
 "struktur:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Avsnitt ett"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Underavsnitt Ett-Ett"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Underavsnitt Ett-Två"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Underunderavsnitt Ett-Två-Ett"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Underunderavsnitt Ett-Två-Två"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Underunderavsnitt Ett-Två-Tre"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Aktuell position"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Underunderavsnitt Ett-Två-Fyra"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Underavsnitt Ett-Tre"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Underavsnitt Ett-Fyra"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Namnlöst dokument"
 
@@ -919,16 +818,119 @@ msgstr "Namnlöst dokument"
 msgid "{month} {day}, {year}"
 msgstr "{month} {day}, {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} på {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} av {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} av {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} av {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}} "
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}} "
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}} "
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}} "
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}} "
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}} "
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} av {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} av {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} på {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} på {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} på {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} på {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} på {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} på {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} av {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} av {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} av {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} av {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} på {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} av {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "se avsnitt {reference_name}"
 
diff --git a/po_document/texinfo_document.pot b/po_document/texinfo_document.pot
index 92755bca7a..e814df96a4 100644
--- a/po_document/texinfo_document.pot
+++ b/po_document/texinfo_document.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 6.8dev\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,31 +17,31 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr ""
 
@@ -59,99 +59,99 @@ msgstr ""
 msgid "{name} of {class}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr ""
@@ -186,17 +186,17 @@ msgstr ""
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr ""
@@ -216,53 +216,43 @@ msgstr ""
 msgid "see {title_ref}"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr ""
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, perl-brace-format
-msgid "{category} of @code{{class}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, perl-brace-format
-msgid "{category} on @code{{class}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr ""
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr ""
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr ""
@@ -296,82 +286,72 @@ msgstr ""
 msgid "@tie{}-- {category}: {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr ""
@@ -594,308 +574,231 @@ msgstr ""
 msgid "Footnotes"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5890
+#: tp/Texinfo/Convert/HTML.pm:5941
 #, perl-brace-format
-msgid "{category}: "
+msgid "{category} on @code{{class}}:@* "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5913
+#: tp/Texinfo/Convert/HTML.pm:5945
 #, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
+msgid "{category} on @code{{class}}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5917
+#: tp/Texinfo/Convert/HTML.pm:5949
 #, perl-brace-format
-msgid "@strong{{name}}"
+msgid "{category} of @code{{class}}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:5943
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6015
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr ""
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
 "@uref{{program_homepage}, @emph{{program}}}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 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 ""
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr ""
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr ""
 
@@ -904,12 +807,12 @@ msgstr ""
 msgid "{month} {day}, {year}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:124
+#: tp/Texinfo/Convert/Utils.pm:130
 #, perl-brace-format
-msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr ""
 
-#: tp/Texinfo/Convert/Utils.pm:131
+#: tp/Texinfo/Convert/Utils.pm:137
 #, perl-brace-format
-msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr ""
diff --git a/po_document/uk.po b/po_document/uk.po
index 650e6d91bd..773940c684 100644
--- a/po_document/uk.po
+++ b/po_document/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.7.91\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-07-30 14:05+0200\n"
+"POT-Creation-Date: 2022-08-01 17:04+0200\n"
 "PO-Revision-Date: 2021-06-16 16:10+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -20,31 +20,31 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 20.12.0\n"
 
-#: tp/Texinfo/Common.pm:844 tp/Texinfo/Common.pm:849
+#: tp/Texinfo/Common.pm:845 tp/Texinfo/Common.pm:850
 msgid "Function"
 msgstr "Функція"
 
-#: tp/Texinfo/Common.pm:845
+#: tp/Texinfo/Common.pm:846
 msgid "Macro"
 msgstr "Макрос"
 
-#: tp/Texinfo/Common.pm:846
+#: tp/Texinfo/Common.pm:847
 msgid "Special Form"
 msgstr "Спеціальна форма"
 
-#: tp/Texinfo/Common.pm:847 tp/Texinfo/Common.pm:850
+#: tp/Texinfo/Common.pm:848 tp/Texinfo/Common.pm:851
 msgid "Variable"
 msgstr "Змінна"
 
-#: tp/Texinfo/Common.pm:848
+#: tp/Texinfo/Common.pm:849
 msgid "User Option"
 msgstr "Вибір користувача"
 
-#: tp/Texinfo/Common.pm:851 tp/Texinfo/Common.pm:852
+#: tp/Texinfo/Common.pm:852 tp/Texinfo/Common.pm:853
 msgid "Instance Variable"
 msgstr "Змінна екземпляра"
 
-#: tp/Texinfo/Common.pm:853 tp/Texinfo/Common.pm:854
+#: tp/Texinfo/Common.pm:854 tp/Texinfo/Common.pm:855
 msgid "Method"
 msgstr "Метод"
 
@@ -62,99 +62,99 @@ msgstr "{name} щодо {class}"
 msgid "{name} of {class}"
 msgstr "{name} {class}"
 
-#: tp/Texinfo/Convert/Converter.pm:94
+#: tp/Texinfo/Convert/Converter.pm:97
 msgid "error@arrow{}"
 msgstr "error@arrow{}"
 
-#: tp/Texinfo/Convert/Converter.pm:102
+#: tp/Texinfo/Convert/Converter.pm:105
 msgid "January"
 msgstr "січня"
 
-#: tp/Texinfo/Convert/Converter.pm:103
+#: tp/Texinfo/Convert/Converter.pm:106
 msgid "February"
 msgstr "лютого"
 
-#: tp/Texinfo/Convert/Converter.pm:104
+#: tp/Texinfo/Convert/Converter.pm:107
 msgid "March"
 msgstr "березня"
 
-#: tp/Texinfo/Convert/Converter.pm:105
+#: tp/Texinfo/Convert/Converter.pm:108
 msgid "April"
 msgstr "квітня"
 
-#: tp/Texinfo/Convert/Converter.pm:106
+#: tp/Texinfo/Convert/Converter.pm:109
 msgid "May"
 msgstr "травня"
 
-#: tp/Texinfo/Convert/Converter.pm:107
+#: tp/Texinfo/Convert/Converter.pm:110
 msgid "June"
 msgstr "червня"
 
-#: tp/Texinfo/Convert/Converter.pm:108
+#: tp/Texinfo/Convert/Converter.pm:111
 msgid "July"
 msgstr "липня"
 
-#: tp/Texinfo/Convert/Converter.pm:109
+#: tp/Texinfo/Convert/Converter.pm:112
 msgid "August"
 msgstr "серпня"
 
-#: tp/Texinfo/Convert/Converter.pm:110
+#: tp/Texinfo/Convert/Converter.pm:113
 msgid "September"
 msgstr "вересня"
 
-#: tp/Texinfo/Convert/Converter.pm:111
+#: tp/Texinfo/Convert/Converter.pm:114
 msgid "October"
 msgstr "жовтня"
 
-#: tp/Texinfo/Convert/Converter.pm:112
+#: tp/Texinfo/Convert/Converter.pm:115
 msgid "November"
 msgstr "листопада"
 
-#: tp/Texinfo/Convert/Converter.pm:113
+#: tp/Texinfo/Convert/Converter.pm:116
 msgid "December"
 msgstr "грудня"
 
-#: tp/Texinfo/Convert/Converter.pm:1120
+#: tp/Texinfo/Convert/Converter.pm:1123
 #, perl-brace-format
 msgid "{float_type} {float_number}"
 msgstr "{float_type} {float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1124
+#: tp/Texinfo/Convert/Converter.pm:1127
 #, perl-brace-format
 msgid "{float_type}"
 msgstr "{float_type}"
 
-#: tp/Texinfo/Convert/Converter.pm:1128
+#: tp/Texinfo/Convert/Converter.pm:1131
 #, perl-brace-format
 msgid "{float_number}"
 msgstr "{float_number}"
 
-#: tp/Texinfo/Convert/Converter.pm:1159
+#: tp/Texinfo/Convert/Converter.pm:1162
 #, perl-brace-format
 msgid "{float_type} {float_number}: "
 msgstr "{float_type} {float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1163
+#: tp/Texinfo/Convert/Converter.pm:1166
 #, perl-brace-format
 msgid "{float_type}: "
 msgstr "{float_type}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1168
+#: tp/Texinfo/Convert/Converter.pm:1171
 #, perl-brace-format
 msgid "{float_type} {float_number}\n"
 msgstr "{float_type} {float_number}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1172
+#: tp/Texinfo/Convert/Converter.pm:1175
 #, perl-brace-format
 msgid "{float_type}\n"
 msgstr "{float_type}\n"
 
-#: tp/Texinfo/Convert/Converter.pm:1178
+#: tp/Texinfo/Convert/Converter.pm:1181
 #, perl-brace-format
 msgid "{float_number}: "
 msgstr "{float_number}: "
 
-#: tp/Texinfo/Convert/Converter.pm:1181
+#: tp/Texinfo/Convert/Converter.pm:1184
 #, perl-brace-format
 msgid "{float_number}\n"
 msgstr "{float_number}\n"
@@ -189,17 +189,17 @@ msgstr "Див. розділ «{section_name}» у @cite{{book}}"
 msgid "see section ``{section_name}'' in @cite{{book}}"
 msgstr "див. розділ «{section_name}» у @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4897
+#: tp/Texinfo/Convert/DocBook.pm:1130 tp/Texinfo/Convert/HTML.pm:4898
 #, perl-brace-format
 msgid "@cite{{book}}"
 msgstr "@cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4874
+#: tp/Texinfo/Convert/DocBook.pm:1134 tp/Texinfo/Convert/HTML.pm:4875
 #, perl-brace-format
 msgid "See @cite{{book}}"
 msgstr "Див. @cite{{book}}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4851
+#: tp/Texinfo/Convert/DocBook.pm:1138 tp/Texinfo/Convert/HTML.pm:4852
 #, perl-brace-format
 msgid "see @cite{{book}}"
 msgstr "див. @cite{{book}}"
@@ -219,55 +219,43 @@ msgstr "Див. {title_ref}"
 msgid "see {title_ref}"
 msgstr "див. {title_ref}"
 
-#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2920
+#: tp/Texinfo/Convert/DocBook.pm:1304 tp/Texinfo/Convert/LaTeX.pm:2940
 #: tp/Texinfo/Convert/Plaintext.pm:2232
 #, perl-brace-format
 msgid "{abbr_or_acronym} ({explanation})"
 msgstr "{abbr_or_acronym} ({explanation})"
 
-#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3095
-#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5251
+#: tp/Texinfo/Convert/DocBook.pm:1484 tp/Texinfo/Convert/LaTeX.pm:3115
+#: tp/Texinfo/Convert/Plaintext.pm:2401 tp/Texinfo/Convert/HTML.pm:5252
 #, perl-brace-format
 msgid "@b{{quotation_arg}:} "
 msgstr "@b{{quotation_arg}:} "
 
-#: tp/Texinfo/Convert/LaTeX.pm:2629 tp/Texinfo/Convert/Plaintext.pm:1926
+#: tp/Texinfo/Convert/LaTeX.pm:2638 tp/Texinfo/Convert/Plaintext.pm:1926
 #, perl-brace-format
 msgid "{text} ({url})"
 msgstr "{text} ({url})"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3048 tp/Texinfo/Convert/Plaintext.pm:2326
-#: tp/Texinfo/Convert/HTML.pm:2614
+#: tp/Texinfo/Convert/LaTeX.pm:3068 tp/Texinfo/Convert/Plaintext.pm:2326
+#: tp/Texinfo/Convert/HTML.pm:2615
 #, perl-brace-format
 msgid "@{No value for `{value}'@}"
 msgstr "@{Немає значення для `{value}'@}"
 
-#: tp/Texinfo/Convert/LaTeX.pm:3573
-#, fuzzy, perl-brace-format
-#| msgid "{category} of {class}"
-msgid "{category} of @code{{class}}"
-msgstr "{category} {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3580
-#, fuzzy, perl-brace-format
-#| msgid "{category} on {class}"
-msgid "{category} on @code{{class}}"
-msgstr "{category} щодо {class}"
-
-#: tp/Texinfo/Convert/LaTeX.pm:3734 tp/Texinfo/Convert/Plaintext.pm:3246
-#: tp/Texinfo/Convert/HTML.pm:4398
+#: tp/Texinfo/Convert/LaTeX.pm:3744 tp/Texinfo/Convert/Plaintext.pm:3238
+#: tp/Texinfo/Convert/HTML.pm:4399
 #, perl-brace-format
 msgid "@center --- @emph{{author}}\n"
 msgstr "@center --- @emph{{author}}\n"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1101 tp/Texinfo/Convert/HTML.pm:1043
-#: tp/Texinfo/Convert/Utils.pm:290
+#: tp/Texinfo/Convert/Utils.pm:296
 #, perl-brace-format
 msgid "Appendix {number} {section_title}"
 msgstr "Додаток {number} {section_title}"
 
 #: tp/Texinfo/Convert/Plaintext.pm:1106 tp/Texinfo/Convert/HTML.pm:1050
-#: tp/Texinfo/Convert/Utils.pm:294
+#: tp/Texinfo/Convert/Utils.pm:300
 #, perl-brace-format
 msgid "{number} {section_title}"
 msgstr "{number} {section_title}"
@@ -301,82 +289,72 @@ msgstr "@tie{}-- {category}: {name} {arguments}"
 msgid "@tie{}-- {category}: {name}"
 msgstr "@tie{}-- {category}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2825
+#: tp/Texinfo/Convert/Plaintext.pm:2826
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2828
+#: tp/Texinfo/Convert/Plaintext.pm:2829
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2837
+#: tp/Texinfo/Convert/Plaintext.pm:2839
 #, perl-brace-format
 msgid "@tie{}-- {category}:@*{type}@*{name}"
 msgstr "@tie{}-- {category}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2840
+#: tp/Texinfo/Convert/Plaintext.pm:2842
 #, perl-brace-format
 msgid "@tie{}-- {category}: {type} {name}"
 msgstr "@tie{}-- {category}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2848
+#: tp/Texinfo/Convert/Plaintext.pm:2850
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2854
+#: tp/Texinfo/Convert/Plaintext.pm:2856
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {name}"
 msgstr "@tie{}-- {category} {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2863
+#: tp/Texinfo/Convert/Plaintext.pm:2865
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name} {arguments}"
 msgstr "@tie{}-- {category} щодо {class}: {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2869
+#: tp/Texinfo/Convert/Plaintext.pm:2871
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {name}"
 msgstr "@tie{}-- {category} щодо {class}: {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2884
+#: tp/Texinfo/Convert/Plaintext.pm:2886
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name} {arguments}"
 msgstr "@tie{}-- {category} щодо {class}:@*{type}@*{name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2888
+#: tp/Texinfo/Convert/Plaintext.pm:2890
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} щодо {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2899
+#: tp/Texinfo/Convert/Plaintext.pm:2901
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}:@*{type}@*{name}"
 msgstr "@tie{}-- {category} щодо {class}:@*{type}@*{name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2903
+#: tp/Texinfo/Convert/Plaintext.pm:2905
 #, perl-brace-format
 msgid "@tie{}-- {category} on {class}: {type} {name}"
 msgstr "@tie{}-- {category} щодо {class}: {type} {name}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2917
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
-msgstr "@tie{}-- {category} {class}:@*{type}@*{name} {arguments}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2921
+#: tp/Texinfo/Convert/Plaintext.pm:2918
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name} {arguments}"
 msgstr "@tie{}-- {category} {class}: {type} {name} {arguments}"
 
-#: tp/Texinfo/Convert/Plaintext.pm:2932
-#, perl-brace-format
-msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
-msgstr "@tie{}-- {category} {class}:@*{type}@*{name}"
-
-#: tp/Texinfo/Convert/Plaintext.pm:2936
+#: tp/Texinfo/Convert/Plaintext.pm:2927
 #, perl-brace-format
 msgid "@tie{}-- {category} of {class}: {type} {name}"
 msgstr "@tie{}-- {category} {class}: {type} {name}"
@@ -599,220 +577,142 @@ msgstr "Скорочений зміст"
 msgid "Footnotes"
 msgstr "Виноски"
 
-#: tp/Texinfo/Convert/HTML.pm:2724
+#: tp/Texinfo/Convert/HTML.pm:2725
 #, perl-brace-format
 msgid "{explained_string} ({explanation})"
 msgstr "{explained_string} ({explanation})"
 
-#: tp/Texinfo/Convert/HTML.pm:4758
+#: tp/Texinfo/Convert/HTML.pm:4759
 #, perl-brace-format
 msgid "see {reference_name}"
 msgstr "див. {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4761
+#: tp/Texinfo/Convert/HTML.pm:4762
 #, perl-brace-format
 msgid "See {reference_name}"
 msgstr "Див. {reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4764
+#: tp/Texinfo/Convert/HTML.pm:4765
 #, perl-brace-format
 msgid "{reference_name}"
 msgstr "{reference_name}"
 
-#: tp/Texinfo/Convert/HTML.pm:4839
+#: tp/Texinfo/Convert/HTML.pm:4840
 #, perl-brace-format
 msgid "see {reference} in @cite{{book}}"
 msgstr "див. {reference} у @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4843
+#: tp/Texinfo/Convert/HTML.pm:4844
 #, perl-brace-format
 msgid "see @cite{{book_reference}}"
 msgstr "див. @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4847
+#: tp/Texinfo/Convert/HTML.pm:4848
 #, perl-brace-format
 msgid "see `{section}' in @cite{{book}}"
 msgstr "див. «{section}» у @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4854
+#: tp/Texinfo/Convert/HTML.pm:4855
 #, perl-brace-format
 msgid "see {reference}"
 msgstr "див. {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4857
+#: tp/Texinfo/Convert/HTML.pm:4858
 #, perl-brace-format
 msgid "see `{section}'"
 msgstr "див. «{section}»"
 
-#: tp/Texinfo/Convert/HTML.pm:4862
+#: tp/Texinfo/Convert/HTML.pm:4863
 #, perl-brace-format
 msgid "See {reference} in @cite{{book}}"
 msgstr "Див. {reference} у @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4866
+#: tp/Texinfo/Convert/HTML.pm:4867
 #, perl-brace-format
 msgid "See @cite{{book_reference}}"
 msgstr "Див. @cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4870
+#: tp/Texinfo/Convert/HTML.pm:4871
 #, perl-brace-format
 msgid "See `{section}' in @cite{{book}}"
 msgstr "Див. «{section}» у @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4877
+#: tp/Texinfo/Convert/HTML.pm:4878
 #, perl-brace-format
 msgid "See {reference}"
 msgstr "Див. {reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4880
+#: tp/Texinfo/Convert/HTML.pm:4881
 #, perl-brace-format
 msgid "See `{section}'"
 msgstr "Див. «{section}»"
 
-#: tp/Texinfo/Convert/HTML.pm:4885
+#: tp/Texinfo/Convert/HTML.pm:4886
 #, perl-brace-format
 msgid "{reference} in @cite{{book}}"
 msgstr "{reference} у @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4889
+#: tp/Texinfo/Convert/HTML.pm:4890
 #, perl-brace-format
 msgid "@cite{{book_reference}}"
 msgstr "@cite{{book_reference}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4893
+#: tp/Texinfo/Convert/HTML.pm:4894
 #, perl-brace-format
 msgid "`{section}' in @cite{{book}}"
 msgstr "«{section}» у @cite{{book}}"
 
-#: tp/Texinfo/Convert/HTML.pm:4900
+#: tp/Texinfo/Convert/HTML.pm:4901
 #, perl-brace-format
 msgid "{reference}"
 msgstr "{reference}"
 
-#: tp/Texinfo/Convert/HTML.pm:4903
+#: tp/Texinfo/Convert/HTML.pm:4904
 #, perl-brace-format
 msgid "`{section}'"
 msgstr "«{section}»"
 
-#: tp/Texinfo/Convert/HTML.pm:5120 tp/Texinfo/Convert/HTML.pm:5141
+#: tp/Texinfo/Convert/HTML.pm:5121 tp/Texinfo/Convert/HTML.pm:5142
 msgid "Jump to"
 msgstr "Перейти до"
 
-#: tp/Texinfo/Convert/HTML.pm:5129
+#: tp/Texinfo/Convert/HTML.pm:5130
 msgid "Index Entry"
 msgstr "Запис покажчика"
 
-#: tp/Texinfo/Convert/HTML.pm:5131
+#: tp/Texinfo/Convert/HTML.pm:5132
 msgid "Section"
 msgstr "Розділ"
 
-#: tp/Texinfo/Convert/HTML.pm:5890
-#, perl-brace-format
-msgid "{category}: "
-msgstr "{category}: "
+#: tp/Texinfo/Convert/HTML.pm:5941
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}:@* "
+msgstr "{category} щодо {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5913
-#, perl-brace-format
-msgid "@strong{{name}} @emph{{arguments}}"
-msgstr "@strong{{name}} @emph{{arguments}}"
+#: tp/Texinfo/Convert/HTML.pm:5945
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}: "
+msgstr "{category} щодо {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5917
-#, perl-brace-format
-msgid "@strong{{name}}"
-msgstr "@strong{{name}}"
+#: tp/Texinfo/Convert/HTML.pm:5949
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}: "
+msgstr "{category} {class}"
 
-#: tp/Texinfo/Convert/HTML.pm:5940 tp/Texinfo/Convert/HTML.pm:5958
+#: tp/Texinfo/Convert/HTML.pm:5962
 #, perl-brace-format
 msgid "{category}:@* "
 msgstr "{category}:@* "
 
-#: tp/Texinfo/Convert/HTML.pm:5943
-#, perl-brace-format
-msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5947
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5960
-#, fuzzy, perl-brace-format
-#| msgid "@emph{{type}} @strong{{name}}"
-msgid "@emph{{type}}@* @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5963
-#, perl-brace-format
-msgid "@emph{{type}} @strong{{name}}"
-msgstr "@emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5974
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5980
-#, perl-brace-format
-msgid "{category} of {class}: @strong{{name}}"
-msgstr "{category} {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5989
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
-msgstr "{category} щодо {class}: @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:5995
-#, perl-brace-format
-msgid "{category} on {class}: @strong{{name}}"
-msgstr "{category} щодо {class}: @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6011
-#, perl-brace-format
-msgid ""
-"{category} on {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} щодо {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6015
+#: tp/Texinfo/Convert/HTML.pm:5964
 #, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} щодо {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6026
-#, perl-brace-format
-msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} щодо {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6030
-#, perl-brace-format
-msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} щодо {class}: @emph{{type}} @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6044
-#, perl-brace-format
-msgid ""
-"{category} of {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-msgstr ""
-"{category} {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6048
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-msgstr "{category} {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6059
-#, perl-brace-format
-msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
-msgstr "{category} {class}:@* @emph{{type}}@* @strong{{name}}"
-
-#: tp/Texinfo/Convert/HTML.pm:6063
-#, perl-brace-format
-msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
-msgstr "{category} {class}: @emph{{type}} @strong{{name}}"
+msgid "{category}: "
+msgstr "{category}: "
 
-#: tp/Texinfo/Convert/HTML.pm:8538
+#: tp/Texinfo/Convert/HTML.pm:8411
 #, perl-brace-format
 msgid ""
 "This document was generated on @emph{@today{}} using "
@@ -821,45 +721,45 @@ msgstr ""
 "Цей документ створено @emph{@today{}} за допомогою @uref{{program_homepage}, "
 "@emph{{program}}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8543
+#: tp/Texinfo/Convert/HTML.pm:8416
 msgid "This document was generated on @emph{@today{}}."
 msgstr "Цей документ створено @emph{@today{}}."
 
-#: tp/Texinfo/Convert/HTML.pm:8580
+#: tp/Texinfo/Convert/HTML.pm:8453
 msgid "JavaScript license information"
 msgstr "Відомості щодо ліцензування JavaScript"
 
-#: tp/Texinfo/Convert/HTML.pm:8627
+#: tp/Texinfo/Convert/HTML.pm:8500
 #, perl-brace-format
 msgid "{element_text} ({title})"
 msgstr "{element_text} ({title})"
 
-#: tp/Texinfo/Convert/HTML.pm:8826
+#: tp/Texinfo/Convert/HTML.pm:8699
 #, perl-brace-format
 msgid "The node you are looking for is at {href}."
 msgstr "Потрібний вам вузол тут: {href}."
 
-#: tp/Texinfo/Convert/HTML.pm:8931
+#: tp/Texinfo/Convert/HTML.pm:8804
 msgid "  The buttons in the navigation panels have the following meaning:"
 msgstr "  Кнопки на панелях навігації мають таке призначення:"
 
-#: tp/Texinfo/Convert/HTML.pm:8937
+#: tp/Texinfo/Convert/HTML.pm:8810
 msgid "Button"
 msgstr "Кнопка"
 
-#: tp/Texinfo/Convert/HTML.pm:8938
+#: tp/Texinfo/Convert/HTML.pm:8811
 msgid "Name"
 msgstr "Назва"
 
-#: tp/Texinfo/Convert/HTML.pm:8939
+#: tp/Texinfo/Convert/HTML.pm:8812
 msgid "Go to"
 msgstr "Перейти до"
 
-#: tp/Texinfo/Convert/HTML.pm:8940
+#: tp/Texinfo/Convert/HTML.pm:8813
 msgid "From 1.2.3 go to"
 msgstr "З 1.2.3 перейти до"
 
-#: tp/Texinfo/Convert/HTML.pm:8967
+#: tp/Texinfo/Convert/HTML.pm:8840
 msgid ""
 "  where the @strong{ Example } assumes that the current position is at "
 "@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -868,47 +768,47 @@ msgstr ""
 "  де у @strong{ прикладі } припускається, що поточну позицію розташовано у "
 "@strong{ підрозділі один-два-три } документа із такою структурою:"
 
-#: tp/Texinfo/Convert/HTML.pm:8978
+#: tp/Texinfo/Convert/HTML.pm:8851
 msgid "Section One"
 msgstr "Перший розділ"
 
-#: tp/Texinfo/Convert/HTML.pm:8980
+#: tp/Texinfo/Convert/HTML.pm:8853
 msgid "Subsection One-One"
 msgstr "Підрозділ один-один"
 
-#: tp/Texinfo/Convert/HTML.pm:8987
+#: tp/Texinfo/Convert/HTML.pm:8860
 msgid "Subsection One-Two"
 msgstr "Підрозділ один-два"
 
-#: tp/Texinfo/Convert/HTML.pm:8989
+#: tp/Texinfo/Convert/HTML.pm:8862
 msgid "Subsubsection One-Two-One"
 msgstr "Підпідрозділ один-два-один"
 
-#: tp/Texinfo/Convert/HTML.pm:8990
+#: tp/Texinfo/Convert/HTML.pm:8863
 msgid "Subsubsection One-Two-Two"
 msgstr "Підпідрозділ один-два-два"
 
-#: tp/Texinfo/Convert/HTML.pm:8991
+#: tp/Texinfo/Convert/HTML.pm:8864
 msgid "Subsubsection One-Two-Three"
 msgstr "Підпідрозділ один-два-три"
 
-#: tp/Texinfo/Convert/HTML.pm:8994
+#: tp/Texinfo/Convert/HTML.pm:8867
 msgid "Current Position"
 msgstr "Поточна позиція"
 
-#: tp/Texinfo/Convert/HTML.pm:8995
+#: tp/Texinfo/Convert/HTML.pm:8868
 msgid "Subsubsection One-Two-Four"
 msgstr "Підпідрозділ один-два-чотири"
 
-#: tp/Texinfo/Convert/HTML.pm:8998
+#: tp/Texinfo/Convert/HTML.pm:8871
 msgid "Subsection One-Three"
 msgstr "Підрозділ один-три"
 
-#: tp/Texinfo/Convert/HTML.pm:9005
+#: tp/Texinfo/Convert/HTML.pm:8878
 msgid "Subsection One-Four"
 msgstr "Підрозділ один-чотири"
 
-#: tp/Texinfo/Convert/HTML.pm:9606
+#: tp/Texinfo/Convert/HTML.pm:9479
 msgid "Untitled Document"
 msgstr "Документ без назви"
 
@@ -917,16 +817,118 @@ msgstr "Документ без назви"
 msgid "{month} {day}, {year}"
 msgstr "{day} {month} {year}"
 
-#: tp/Texinfo/Convert/Utils.pm:124
-#, perl-brace-format
-msgid "{category} on {class}"
+#: tp/Texinfo/Convert/Utils.pm:130
+#, fuzzy, perl-brace-format
+#| msgid "{category} on {class}"
+msgid "{category} on @code{{class}}"
 msgstr "{category} щодо {class}"
 
-#: tp/Texinfo/Convert/Utils.pm:131
-#, perl-brace-format
-msgid "{category} of {class}"
+#: tp/Texinfo/Convert/Utils.pm:137
+#, fuzzy, perl-brace-format
+#| msgid "{category} of {class}"
+msgid "{category} of @code{{class}}"
 msgstr "{category} {class}"
 
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
+#~ msgstr "@tie{}-- {category} {class}:@*{type}@*{name} {arguments}"
+
+#, perl-brace-format
+#~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name}"
+#~ msgstr "@tie{}-- {category} {class}:@*{type}@*{name}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}} @emph{{arguments}}"
+#~ msgstr "@strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@strong{{name}}"
+#~ msgstr "@strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr "@emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, fuzzy, perl-brace-format
+#~| msgid "@emph{{type}} @strong{{name}}"
+#~ msgid "@emph{{type}}@* @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "@emph{{type}} @strong{{name}}"
+#~ msgstr "@emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @strong{{name}}"
+#~ msgstr "{category} {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}} @emph{{arguments}}"
+#~ msgstr "{category} щодо {class}: @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @strong{{name}}"
+#~ msgstr "{category} щодо {class}: @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} щодо {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} on {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} щодо {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} щодо {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} щодо {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}:@* @emph{{type}}@* @strong{{name}} "
+#~ "@emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} {class}:@* @emph{{type}}@* @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid ""
+#~ "{category} of {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+#~ msgstr ""
+#~ "{category} {class}: @emph{{type}} @strong{{name}} @emph{{arguments}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}:@* @emph{{type}}@* @strong{{name}}"
+#~ msgstr "{category} {class}:@* @emph{{type}}@* @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}: @emph{{type}} @strong{{name}}"
+#~ msgstr "{category} {class}: @emph{{type}} @strong{{name}}"
+
+#, perl-brace-format
+#~ msgid "{category} on {class}"
+#~ msgstr "{category} щодо {class}"
+
+#, perl-brace-format
+#~ msgid "{category} of {class}"
+#~ msgstr "{category} {class}"
+
 #~ msgid "see section {reference_name}"
 #~ msgstr "див. розділ {reference_name}"
 



reply via email to

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