texinfo-commits
[Top][All Lists]
Advanced

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

branch master updated: * po_document/Makevars (XGETTEXT_OPTIONS): add -c


From: Patrice Dumas
Subject: branch master updated: * po_document/Makevars (XGETTEXT_OPTIONS): add -cTRANSLATORS
Date: Tue, 08 Nov 2022 18:01:50 -0500

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 1d82393e52 * po_document/Makevars (XGETTEXT_OPTIONS): add -cTRANSLATORS
1d82393e52 is described below

commit 1d82393e52f56a346f6444d04a76fe19509f9116
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Wed Nov 9 00:01:38 2022 +0100

    * po_document/Makevars (XGETTEXT_OPTIONS): add -cTRANSLATORS
    
    * tp/Texinfo/Common.pm (%def_map): add either a # TRANSLATORS:
    comment, or use pgdt to give context.  Use pgdt when the same string
    is used for different @-commands.
    Update test results as some translations are missing after getting
    a context.
---
 ChangeLog                                          | 10 +++
 po/ca.po                                           |  6 +-
 po/cs.po                                           |  6 +-
 po/da.po                                           |  6 +-
 po/de.po                                           |  6 +-
 po/el.po                                           |  6 +-
 po/eo.po                                           |  6 +-
 po/es.po                                           |  6 +-
 po/fi.po                                           |  6 +-
 po/fr.po                                           |  6 +-
 po/he.po                                           |  6 +-
 po/hr.po                                           |  6 +-
 po/hu.po                                           |  6 +-
 po/id.po                                           |  6 +-
 po/it.po                                           |  6 +-
 po/ja.po                                           |  6 +-
 po/nb.po                                           |  6 +-
 po/nl.po                                           |  6 +-
 po/pl.po                                           |  6 +-
 po/pt.po                                           |  6 +-
 po/pt_BR.po                                        |  6 +-
 po/ro.po                                           |  6 +-
 po/ru.po                                           |  6 +-
 po/rw.po                                           |  6 +-
 po/sl.po                                           |  6 +-
 po/sr.po                                           |  6 +-
 po/sv.po                                           |  6 +-
 po/tr.po                                           |  6 +-
 po/uk.po                                           |  6 +-
 po/vi.po                                           |  6 +-
 po/zh_CN.po                                        |  6 +-
 po/zh_TW.po                                        |  6 +-
 po_document/Makevars                               |  3 +-
 po_document/ca.po                                  | 74 ++++++++++++++-----
 po_document/ca.us-ascii.po                         | 74 ++++++++++++++-----
 po_document/cs.po                                  | 74 ++++++++++++++-----
 po_document/de.po                                  | 74 ++++++++++++++-----
 po_document/de.us-ascii.po                         | 74 ++++++++++++++-----
 po_document/eo.po                                  | 74 ++++++++++++++-----
 po_document/es.po                                  | 74 ++++++++++++++-----
 po_document/fi.po                                  | 74 ++++++++++++++-----
 po_document/fr.po                                  | 74 ++++++++++++++-----
 po_document/hr.po                                  | 74 ++++++++++++++-----
 po_document/hu.po                                  | 74 ++++++++++++++-----
 po_document/it.po                                  | 74 ++++++++++++++-----
 po_document/nl.po                                  | 74 ++++++++++++++-----
 po_document/no.us-ascii.po                         | 54 ++++++++++----
 po_document/pl.po                                  | 74 ++++++++++++++-----
 po_document/pt.po                                  | 74 ++++++++++++++-----
 po_document/pt.us-ascii.po                         | 61 ++++++++++++----
 po_document/pt_BR.po                               | 74 ++++++++++++++-----
 po_document/pt_BR.us-ascii.po                      | 76 +++++++++++++++-----
 po_document/ro.po                                  | 74 ++++++++++++++-----
 po_document/sr.po                                  | 74 ++++++++++++++-----
 po_document/sv.po                                  | 74 ++++++++++++++-----
 po_document/texinfo_document.pot                   | 54 ++++++++++----
 po_document/uk.po                                  | 74 ++++++++++++++-----
 tp/TODO                                            |  6 +-
 tp/Texinfo/Common.pm                               | 33 ++++++---
 tp/t/results/languages/multiple.pl                 | 32 ++++-----
 tp/t/results/languages/multiple_in_preamble.pl     | 16 ++---
 .../languages/multiple_in_preamble_before_node.pl  | 10 +--
 .../res_html/multiple_lang_chapters.html           |  2 +-
 .../res_info/multiple_lang_chapters.info           |  6 +-
 .../res_latex/multiple_lang_chapters.tex           |  2 +-
 .../res_html/multiple_lang_chapters.html           |  2 +-
 .../res_info/multiple_lang_chapters.info           |  6 +-
 tp/t/results/languages/simple.pl                   |  2 +-
 tp/t/results/languages/unknown_region.pl           |  6 +-
 .../documentlanguage_cmdline/documentlanguage.html |  2 +-
 .../res_parser/formatting_fr_icons/formatting.html | 84 +++++++++++-----------
 71 files changed, 1567 insertions(+), 566 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ca140bd341..4b8b1bd565 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2022-11-08  Patrice Dumas  <pertusus@free.fr>
+
+       * po_document/Makevars (XGETTEXT_OPTIONS): add -cTRANSLATORS
+
+       * tp/Texinfo/Common.pm (%def_map): add either a # TRANSLATORS:
+       comment, or use pgdt to give context.  Use pgdt when the same string
+       is used for different @-commands.
+       Update test results as some translations are missing after getting
+       a context.
+
 2022-11-08  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Report.pm (line_warn, document_warn), tp/texi2any.pl
diff --git a/po/ca.po b/po/ca.po
index b4276aa1de..f64404d3ea 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2303,13 +2303,13 @@ msgstr "no s'ha pogut obrir %s per escriure: %s"
 msgid "error on closing %s: %s"
 msgstr "error en tancar %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s no és un codi vàlid"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s no es un codi vàlid de regió"
diff --git a/po/cs.po b/po/cs.po
index 2ce6cf825a..9e8441e3fd 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-29 13:27+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -2187,13 +2187,13 @@ msgstr "%s nebylo možno otevřít pro zápis: %s"
 msgid "error on closing %s: %s"
 msgstr "chyba při zavírání %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s není platný kód jazyka"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s není platný kód oblasti"
diff --git a/po/da.po b/po/da.po
index 683b239597..129f1b3f65 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2152,13 +2152,13 @@ msgstr "kunne ikke åbne %s for skrivning: %s"
 msgid "error on closing %s: %s"
 msgstr "der opstod en fejl under lukning af %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig sprogkode"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s er ikke en gyldig regionskode"
diff --git a/po/de.po b/po/de.po
index e01443cbcd..e8cdb61139 100644
--- a/po/de.po
+++ b/po/de.po
@@ -32,7 +32,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.7.92\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-12-10 15:10+0100\n"
 "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -2240,13 +2240,13 @@ msgstr "%s konnte nicht zum Schreiben geöffnet werden: 
%s"
 msgid "error on closing %s: %s"
 msgstr "Fehler beim Schließen von %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ist kein gültiges Sprachkürzel"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s ist kein gültiges Regionskürzel"
diff --git a/po/el.po b/po/el.po
index 47c99292aa..c7168ecb9a 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2017,13 +2017,13 @@ msgstr ""
 msgid "error on closing %s: %s"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index b11cc17a98..9f629f8f81 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2157,13 +2157,13 @@ msgstr "ne eblas malfermi %s por skribi: %s"
 msgid "error on closing %s: %s"
 msgstr "eraro dum fermo de %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ne estas valida lingvokodo"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s ne estas valida regiona kodo"
diff --git a/po/es.po b/po/es.po
index 1c5acca7a1..ef3dc9594a 100644
--- a/po/es.po
+++ b/po/es.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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-07-03 11:51+0200\n"
 "Last-Translator: Antonio Ceballos <aceballos@gmail.com>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -2289,13 +2289,13 @@ msgstr "no se pudo abrir %s para escribir: %s"
 msgid "error on closing %s: %s"
 msgstr "error cerrando %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "'%s' no es válido como código de región"
diff --git a/po/fi.po b/po/fi.po
index c0f98eb26f..419577a63f 100644
--- a/po/fi.po
+++ b/po/fi.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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-07-08 14:19+0300\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -2121,13 +2121,13 @@ msgstr "%s: ei voitu avata tiedostoa %s 
kirjoitettavaksi: %s\n"
 msgid "error on closing %s: %s"
 msgstr "virhe suljettaessa: %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s ei ole kelvollinen kielikoodi"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s ei ole kelvollinen aluekoodi"
diff --git a/po/fr.po b/po/fr.po
index 3ed4f2262f..34d5312d03 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-29 14:00+0200\n"
 "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -2195,13 +2195,13 @@ msgstr "impossible d'ouvrir %s en écriture : %s"
 msgid "error on closing %s: %s"
 msgstr "erreur lors de la fermeture de %s : %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s n'est pas un code de zone géographique"
diff --git a/po/he.po b/po/he.po
index d19b55942e..dadeec3922 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2275,14 +2275,14 @@ msgstr ""
 msgid "error on closing %s: %s"
 msgstr "`%s' ��� ���� ������ ����"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
diff --git a/po/hr.po b/po/hr.po
index 01acfedbbb..5f172befba 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo-6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-11-06 17:19-0800\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -2187,13 +2187,13 @@ msgstr "nije (bilo) moguće otvoriti %s za pisanje: %s"
 msgid "error on closing %s: %s"
 msgstr "greška pri zatvaranju %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s nije ispravan jezični kȏd"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s nije ispravan kȏd regije"
diff --git a/po/hu.po b/po/hu.po
index c12403476a..9265c94300 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2342,14 +2342,14 @@ msgstr "%s: A CSS fájl nem nyitható meg: %s"
 msgid "error on closing %s: %s"
 msgstr "hiba a(z) „%s“ output fájl bezárásakor"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
diff --git a/po/id.po b/po/id.po
index 80b6a4f764..273ed1831e 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2379,13 +2379,13 @@ msgstr "tidak dapat membuka %s --css-file: %s"
 msgid "error on closing %s: %s"
 msgstr "error menutup berkas keluaran `%s': %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
diff --git a/po/it.po b/po/it.po
index e2c5a9859b..1ad233f7eb 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2181,13 +2181,13 @@ msgstr "impossibile aprire %s per la scrittura: %s"
 msgid "error on closing %s: %s"
 msgstr "errore durante la chiusura di %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s non è un codice di lingua valido"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s non è un codice di regione valido"
diff --git a/po/ja.po b/po/ja.po
index 041d9c24b1..2d17320926 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2322,13 +2322,13 @@ msgstr "%s: --css-file %s を開くことができません"
 msgid "error on closing %s: %s"
 msgstr "%(service)s on %(device)s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s は有効な言語コードではありません"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s は有効な地域コードではありません"
diff --git a/po/nb.po b/po/nb.po
index ed0d979ca8..65e8d465ba 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2172,13 +2172,13 @@ msgstr "kunne ikke åpne %s for skriving: %s"
 msgid "error on closing %s: %s"
 msgstr "Feil ved lukking av  %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s er ikke en gyldig språkkode"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s er ikke en gyldig språkkode"
diff --git a/po/nl.po b/po/nl.po
index b7c37eb86d..597c221990 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2205,13 +2205,13 @@ msgstr "kan %s niet openen om te schrijven: %s"
 msgid "error on closing %s: %s"
 msgstr "fout bij sluiten van %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s is geen geldige taalcode"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s is geen geldige regiocode"
diff --git a/po/pl.po b/po/pl.po
index 6e21488247..750a973054 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-22 11:30+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -2180,13 +2180,13 @@ msgstr "nie można otworzyć %s do zapisu: %s"
 msgid "error on closing %s: %s"
 msgstr "błąd podczas zamykania %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s nie jest poprawnym kodem języka"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s nie jest poprawnym kodem regionu"
diff --git a/po/pt.po b/po/pt.po
index 954bf32af1..8e739d4fb8 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2197,13 +2197,13 @@ msgstr "impossível abrir %s para escrita: %s"
 msgid "error on closing %s: %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s não é um código de região válido"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7028f0ab13..4fe04c3002 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-10-13 21:15-0300\n"
 "Last-Translator: Jorge Barros de Abreu <ficmatin10@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge."
@@ -2217,13 +2217,13 @@ msgstr "não posso abrir %s para escrita: %s"
 msgid "error on closing %s: %s"
 msgstr "erro ao fechar %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s é um código de região inválido"
diff --git a/po/ro.po b/po/ro.po
index f4fce0825c..e27da953f3 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -23,7 +23,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-21 16:22+0200\n"
 "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -2342,13 +2342,13 @@ msgstr "nu s-a putut deschide %s pentru scriere: %s"
 msgid "error on closing %s: %s"
 msgstr "eroare la închiderea %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s nu este un cod de limbă valid"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s nu este un cod de regiune valid"
diff --git a/po/ru.po b/po/ru.po
index b032bd5bef..b83eee0c82 100644
--- a/po/ru.po
+++ b/po/ru.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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-07-08 08:20+0300\n"
 "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
 "Language-Team: Russian <gnu@d07.ru>\n"
@@ -2188,13 +2188,13 @@ msgstr "невозможно открыть %s на запись: %s"
 msgid "error on closing %s: %s"
 msgstr "ошибка при закрытии %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s не является допустимым кодом языка"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s не является допустимым кодом области"
diff --git a/po/rw.po b/po/rw.po
index 2e70ef8c22..71011869a7 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2240,13 +2240,13 @@ msgstr "%s:OYA Gufungura IDOSIYE"
 msgid "error on closing %s: %s"
 msgstr "Ikosa Kuri"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, fuzzy, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, fuzzy, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
diff --git a/po/sl.po b/po/sl.po
index a87eb3a3a5..ff39331f1e 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2381,14 +2381,14 @@ msgstr "%s: ni mogoče odpreti --css-file: %s"
 msgid "error on closing %s: %s"
 msgstr "napaka med končanjem datoteke vnosa `%s'"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
diff --git a/po/sr.po b/po/sr.po
index c0d51f9837..df1e9716ac 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-12-16 20:33+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -2188,13 +2188,13 @@ msgstr "не могу да отворим „%s“ ради уписа: %s"
 msgid "error on closing %s: %s"
 msgstr "грешка при затварању „%s“: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "„%s“ није исправан код језика"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "„%s“ није исправан код регије"
diff --git a/po/sv.po b/po/sv.po
index 454c272256..a023e3d785 100644
--- a/po/sv.po
+++ b/po/sv.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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-02-15 11:20+0100\n"
 "Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -2221,13 +2221,13 @@ msgstr "kunde inte öppna %s för skrivning: %s"
 msgid "error on closing %s: %s"
 msgstr "fel vid stängning av %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s är inte en giltig landskod"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s är inte en giltig regionkod"
diff --git a/po/tr.po b/po/tr.po
index 979c49d003..fe27ac2e75 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2186,13 +2186,13 @@ msgstr "%s yazmak için açılamıyor: %s"
 msgid "error on closing %s: %s"
 msgstr "%s'i kapatmada hata: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s geçerli bir bölge kodu değildir"
diff --git a/po/uk.po b/po/uk.po
index 6fa67cd84f..60965c345d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-20 19:30+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -2193,13 +2193,13 @@ msgstr "не вдалося відкрити %s для запису: %s"
 msgid "error on closing %s: %s"
 msgstr "помилка під час спроби закрити %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, c-format, perl-format
 msgid "%s is not a valid language code"
 msgstr "%s не є коректним кодом мови"
 
-#: tp/Texinfo/Common.pm:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s не є коректним кодом регіону"
diff --git a/po/vi.po b/po/vi.po
index 158094ef33..726b5f434e 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2166,13 +2166,13 @@ msgstr "không thể mở “%s” để ghi: %s"
 msgid "error on closing %s: %s"
 msgstr "gặp lỗi khi đóng %s: %s"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, c-format, perl-format
 msgid "%s is not a valid region code"
 msgstr "%s không phải mã vùng hợp lệ"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4b8973f528..4077865794 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2393,14 +2393,14 @@ msgstr "%s: 无法打开 --css-file: %s"
 msgid "error on closing %s: %s"
 msgstr "关闭输出文件“%s”时出错"
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7862cedc72..b755984ca4 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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"
@@ -2217,14 +2217,14 @@ msgstr ""
 msgid "error on closing %s: %s"
 msgstr "�L�k�إ߿�X�ɮ� `%s'."
 
-#: tp/Texinfo/Common.pm:993 tp/Texinfo/XS/parsetexi/end_line.c:1609
+#: tp/Texinfo/Common.pm:1010 tp/Texinfo/XS/parsetexi/end_line.c:1609
 #: tp/Texinfo/XS/parsetexi/end_line.c:1619
 #, 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:998 tp/Texinfo/XS/parsetexi/end_line.c:1636
+#: tp/Texinfo/Common.pm:1015 tp/Texinfo/XS/parsetexi/end_line.c:1636
 #, fuzzy, c-format, perl-format
 #| msgid "%s is not a valid ISO 639 language code"
 msgid "%s is not a valid region code"
diff --git a/po_document/Makevars b/po_document/Makevars
index d2151a9991..f05e88487f 100644
--- a/po_document/Makevars
+++ b/po_document/Makevars
@@ -8,7 +8,8 @@ subdir = po_document
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --language=Perl --keyword=gdt --keyword=pgdt:1,2c
+XGETTEXT_OPTIONS = -cTRANSLATORS --language=Perl \
+  --keyword=gdt --keyword=pgdt:1,2c
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
diff --git a/po_document/ca.po b/po_document/ca.po
index eb0beb9946..a32456b5a5 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +18,63 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funci@'o"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forma especial"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opci@'o d'usuari"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variable d'inst@`ancia"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "M@'etode"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -970,6 +1000,18 @@ msgstr "{category} sobre {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Funci@'o"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variable d'inst@`ancia"
+
+#~ msgid "Method"
+#~ msgstr "M@'etode"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Vegreu fitxer Info @file{{myfile}}, node @samp{{mynode}}"
diff --git a/po_document/ca.us-ascii.po b/po_document/ca.us-ascii.po
index b2b58d5732..2edde23fe8 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +17,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funci@'o"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forma especial"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opci@'o d'usuari"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variable d'inst@`ancia"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "M@'etode"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -952,6 +982,18 @@ msgstr "{category} sobre {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Funci@'o"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variable d'inst@`ancia"
+
+#~ msgid "Method"
+#~ msgstr "M@'etode"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Vegreu fitxer Info @file{{myfile}}, node @samp{{mynode}}"
diff --git a/po_document/cs.po b/po_document/cs.po
index 989b9a235c..4c77c4cd18 100644
--- a/po_document/cs.po
+++ b/po_document/cs.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-22 23:04+02:00\n"
 "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -29,33 +29,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funkce"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Speciální forma"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Proměnná"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Uživatelská volba"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Proměnná instance"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metoda"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -938,6 +968,18 @@ msgstr "{category} na třídě @code{{class}}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} třídy @code{{class}}"
 
+#~ msgid "Variable"
+#~ msgstr "Proměnná"
+
+#~ msgid "Function"
+#~ msgstr "Funkce"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Proměnná instance"
+
+#~ msgid "Method"
+#~ msgstr "Metoda"
+
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Vizte uzel @samp{{mynode}} v info souboru @file{{myfile}}"
 
diff --git a/po_document/de.po b/po_document/de.po
index 6fc1a6548d..96e86f960f 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +20,63 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funktion"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Spezielle Form"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Benutzeroption"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Instanzvariable"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Method"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -974,6 +1004,18 @@ msgstr "{category} in {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} von {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instanzvariable"
+
+#~ msgid "Method"
+#~ msgstr "Method"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Siehe Info-Datei @file{{myfile}}, Absatz @samp{{mynode}}"
diff --git a/po_document/de.us-ascii.po b/po_document/de.us-ascii.po
index fb7e5f22f4..ce4bb48814 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +19,63 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funktion"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Spezielle Form"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Benutzeroption"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Instanzvariable"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Method"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -956,6 +986,18 @@ msgstr "{category} in {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} von {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instanzvariable"
+
+#~ msgid "Method"
+#~ msgstr "Method"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Siehe Info-Datei @file{{myfile}}, Absatz @samp{{mynode}}"
diff --git a/po_document/eo.po b/po_document/eo.po
index 44e8cb36a3..fb431ab8bd 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +18,63 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.5.4\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funkcio"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makroo"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Speciala Formo"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variablo"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opcio de Uzanto"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Ekzemplera Variablo"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metodo"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -952,6 +982,18 @@ msgstr "{category} en {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variablo"
+
+#~ msgid "Function"
+#~ msgstr "Funkcio"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Ekzemplera Variablo"
+
+#~ msgid "Method"
+#~ msgstr "Metodo"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Konsultu la Info-dosieron @file{{myfile}}, nodo @samp{{mynode}}"
diff --git a/po_document/es.po b/po_document/es.po
index 52c04ab7e3..1fbcda8785 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Función"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forma especial"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opción del usuario"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variable de instancia"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Método"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -952,6 +982,18 @@ msgstr "{category} en {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} de {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Función"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variable de instancia"
+
+#~ msgid "Method"
+#~ msgstr "Método"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Véase el fichero Info @file{{myfile}}, nodo @samp{{mynode}}"
diff --git a/po_document/fi.po b/po_document/fi.po
index aff672462a..a5fa92c0ba 100644
--- a/po_document/fi.po
+++ b/po_document/fi.po
@@ -7,7 +7,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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-07-07 18:24+0300\n"
 "Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -19,33 +19,63 @@ msgstr ""
 "X-Generator: Poedit 2.4.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funktio"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Erityismuoto"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Muuttuja"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Valitsin"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Instanssimuuttuja"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metodi"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -945,6 +975,18 @@ msgstr "luokka puuttuu: @%s"
 msgid "{category} of @code{{class}}"
 msgstr "luokka puuttuu: @%s"
 
+#~ msgid "Variable"
+#~ msgstr "Muuttuja"
+
+#~ msgid "Function"
+#~ msgstr "Funktio"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instanssimuuttuja"
+
+#~ msgid "Method"
+#~ msgstr "Metodi"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Ks. Info-tiedoston @file{{myfile}} solmua @samp{{mynode}}"
diff --git a/po_document/fr.po b/po_document/fr.po
index 1473f5a40c..7615511342 100644
--- a/po_document/fr.po
+++ b/po_document/fr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-29 14:00+0200\n"
 "Last-Translator: Jean-Charles Malahieude <lilyfan@orange.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -18,33 +18,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Fonction"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forme Sp@'eciale"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Option de l'utilisateur"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variable d'instance"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "M@'ethode"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -926,3 +956,15 @@ msgstr "{category} de @code{{class}}"
 #, perl-brace-format
 msgid "{category} of @code{{class}}"
 msgstr "{category} de @code{{class}}"
+
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Fonction"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variable d'instance"
+
+#~ msgid "Method"
+#~ msgstr "M@'ethode"
diff --git a/po_document/hr.po b/po_document/hr.po
index 96294dca50..8e0c1faeb5 100644
--- a/po_document/hr.po
+++ b/po_document/hr.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-11-06 17:20-0800\n"
 "Last-Translator: Božidar Putanec <bozidarp@yahoo.com>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -22,33 +22,63 @@ msgstr ""
 "X-Generator: Poedit 3.2\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funkcija"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Specijalna forma"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Varijabla"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Korisnička opcija"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Primjer varijable"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metoda"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -930,6 +960,18 @@ msgstr "{category} na @code{{class}}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} od @code{{class}}"
 
+#~ msgid "Variable"
+#~ msgstr "Varijabla"
+
+#~ msgid "Function"
+#~ msgstr "Funkcija"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Primjer varijable"
+
+#~ msgid "Method"
+#~ msgstr "Metoda"
+
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Pogledajte Info-datoteku @file{{myfile}}, čvor @samp{{mynode}}"
 
diff --git a/po_document/hu.po b/po_document/hu.po
index 03b2c5ff90..6692b12938 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +20,63 @@ msgstr ""
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Függvény"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makró"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Speciális űrlap"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Változó"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Felhasználói beállítás"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Példányváltozó"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metódus"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -954,6 +984,18 @@ msgstr "{category} ezen: {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} - {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Változó"
+
+#~ msgid "Function"
+#~ msgstr "Függvény"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Példányváltozó"
+
+#~ msgid "Method"
+#~ msgstr "Metódus"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Lásd: @file{{myfile}} információs fájl, @samp{{mynode}} csomópont"
diff --git a/po_document/it.po b/po_document/it.po
index 06177733e0..9a6f19ea02 100644
--- a/po_document/it.po
+++ b/po_document/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-30 21:50+0100\n"
 "Last-Translator: Federico Bruni <fede@inventati.org>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,33 +19,63 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: Gtranslator 42.0\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funzione"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forma speciale"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variabile"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opzione utente"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variabile dell'istanza"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metodo"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -928,3 +958,15 @@ msgstr "{category} su @code{{class}}"
 #, perl-brace-format
 msgid "{category} of @code{{class}}"
 msgstr "{category} di @code{{class}}"
+
+#~ msgid "Variable"
+#~ msgstr "Variabile"
+
+#~ msgid "Function"
+#~ msgstr "Funzione"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variabile dell'istanza"
+
+#~ msgid "Method"
+#~ msgstr "Metodo"
diff --git a/po_document/nl.po b/po_document/nl.po
index f51753d18e..33ad5d5906 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +21,63 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Functie"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Speciale vorm"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variabele"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Gebruikeroptie"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Instantiatievariabele"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Methode"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -955,6 +985,18 @@ msgstr "{category} over {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} van {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variabele"
+
+#~ msgid "Function"
+#~ msgstr "Functie"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instantiatievariabele"
+
+#~ msgid "Method"
+#~ msgstr "Methode"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Zie Info-bestand @file{{myfile}}, pagina @samp{{mynode}}"
diff --git a/po_document/no.us-ascii.po b/po_document/no.us-ascii.po
index 42beb3eb1e..51dc45d1e8 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2001-01-01\n"
 "Last-Translator: Unknown\n"
 "Language-Team: Unknown\n"
@@ -16,32 +16,62 @@ msgstr ""
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
 msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
diff --git a/po_document/pl.po b/po_document/pl.po
index ba6666df1f..a0bd1e5d56 100644
--- a/po_document/pl.po
+++ b/po_document/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-20 17:23+0200\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -17,33 +17,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funkcja"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Postać specjalna"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Zmienna"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opcja użytkownika"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Przykład zmiennej"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metoda"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -925,3 +955,15 @@ msgstr "{category} dla klasy @code{{class}}"
 #, perl-brace-format
 msgid "{category} of @code{{class}}"
 msgstr "{category} klasy @code{{class}}"
+
+#~ msgid "Variable"
+#~ msgstr "Zmienna"
+
+#~ msgid "Function"
+#~ msgstr "Funkcja"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Przykład zmiennej"
+
+#~ msgid "Method"
+#~ msgstr "Metoda"
diff --git a/po_document/pt.po b/po_document/pt.po
index 18f7587939..c34ed4459b 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +19,63 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\\n;\n"
 "X-Generator: Poedit 2.3\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Função"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Formulário especial"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variável"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opção do utilizador"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variável de instância"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Método"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -951,6 +981,18 @@ msgstr "{category} na {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} da {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Variável"
+
+#~ msgid "Function"
+#~ msgstr "Função"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variável de instância"
+
+#~ msgid "Method"
+#~ msgstr "Método"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Veja o ficheiro @file{{myfile}}, nó @samp{{mynode}}"
diff --git a/po_document/pt.us-ascii.po b/po_document/pt.us-ascii.po
index d83b2e331f..27d8702a9e 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2006-01-09\n"
 "Last-Translator: Jorge Barros de Abreu <ficmatin01@solar.com.br>\n"
 "Language-Team: Unknown\n"
@@ -16,34 +16,63 @@ msgstr ""
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-#, fuzzy
-msgid "Function"
-msgstr "Se@,{c}@~ao"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 #, fuzzy
 msgid "User Option"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
 msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
@@ -955,6 +984,10 @@ msgstr "{category} na {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} da {class}"
 
+#, fuzzy
+#~ msgid "Function"
+#~ msgstr "Se@,{c}@~ao"
+
 #, perl-brace-format
 #~ msgid "@tie{}-- {category} of {class}:@*{type}@*{name} {arguments}"
 #~ msgstr "@tie{ }-- {category} da {class}: {type} {name} {arguments}"
diff --git a/po_document/pt_BR.po b/po_document/pt_BR.po
index d9c49aaf83..3fe4dfbebb 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,33 +20,63 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 1.6.10\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Fun@,{c}@~{a}o"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forma Especial"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Vari@'{a}vel"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Op@,{c}@~{a}o de Usu@'ario"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Vari@'{a}vel de inst@^{a}ncia"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "M@'{e}todo"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -957,6 +987,18 @@ msgstr "{category} na {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} da {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Vari@'{a}vel"
+
+#~ msgid "Function"
+#~ msgstr "Fun@,{c}@~{a}o"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Vari@'{a}vel de inst@^{a}ncia"
+
+#~ msgid "Method"
+#~ msgstr "M@'{e}todo"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Veja arquivo Info @file{{myfile}}, nodo @samp{{mynode}}"
diff --git a/po_document/pt_BR.us-ascii.po b/po_document/pt_BR.us-ascii.po
index e0c98db38b..57513a7a35 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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,35 +18,64 @@ msgstr ""
 "Content-Type: text/plain; charset=us-ascii\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-#, fuzzy
-msgid "Function"
-msgstr "Se@,{c}@~ao"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Forma Especial"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Vari@'{a}vel"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 #, fuzzy
 msgid "User Option"
 msgstr "Se@,{c}@~ao acima"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Vari@'{a}vel de inst@^{a}ncia"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "M@'{e}todo"
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -946,6 +975,19 @@ msgstr "{name} na {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{name} da {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Vari@'{a}vel"
+
+#, fuzzy
+#~ msgid "Function"
+#~ msgstr "Se@,{c}@~ao"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Vari@'{a}vel de inst@^{a}ncia"
+
+#~ msgid "Method"
+#~ msgstr "M@'{e}todo"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Veja arquivo Info @file{{myfile}}, nodo @samp{{mynode}}"
diff --git a/po_document/ro.po b/po_document/ro.po
index 2b960db4ac..bb820fe2f2 100644
--- a/po_document/ro.po
+++ b/po_document/ro.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-21 16:49+0200\n"
 "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n"
 "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n"
@@ -25,33 +25,63 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 3.1.1\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funcție"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Macro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Formă specială"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variabilă"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Opțiunea utilizatorului"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Variabilă de instanță"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metodă"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -939,6 +969,18 @@ msgstr "{category} în @code{{class}}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} de @code{{class}}"
 
+#~ msgid "Variable"
+#~ msgstr "Variabilă"
+
+#~ msgid "Function"
+#~ msgstr "Funcție"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Variabilă de instanță"
+
+#~ msgid "Method"
+#~ msgstr "Metodă"
+
 # R-GC, scrie:
 # după revizarea fișierului, DȘ, spune:
 # «→ poți înlocui „Vedeți” cu „Consultați”»
diff --git a/po_document/sr.po b/po_document/sr.po
index 11afd1aaa6..c3c23f9ffd 100644
--- a/po_document/sr.po
+++ b/po_document/sr.po
@@ -6,7 +6,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-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2021-12-17 11:12+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <(nothing)>\n"
@@ -18,33 +18,63 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Функција"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Макро"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Специјални облик"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Променљива"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Корисничка опција"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Променљива примерка"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Метода"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -950,6 +980,18 @@ msgstr "{category} на {class}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} од {class}"
 
+#~ msgid "Variable"
+#~ msgstr "Променљива"
+
+#~ msgid "Function"
+#~ msgstr "Функција"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Променљива примерка"
+
+#~ msgid "Method"
+#~ msgstr "Метода"
+
 #, perl-brace-format
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Видите Инфо датотеку „@file{{myfile}}“, чвор „@samp{{mynode}}“"
diff --git a/po_document/sv.po b/po_document/sv.po
index bce1f9eea6..f2fff45825 100644
--- a/po_document/sv.po
+++ b/po_document/sv.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-20 15:17+0200\n"
 "Last-Translator: Luna Jernberg <droidbittin@gmail.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -20,33 +20,63 @@ msgstr ""
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Generator: Poedit 3.0.1\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Funktion"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Makro"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Specialform"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Användarinställning"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Instantsvariabel"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Metod"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -929,6 +959,18 @@ msgstr "{category} på @code{{class}}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} av @code{{class}}"
 
+#~ msgid "Variable"
+#~ msgstr "Variable"
+
+#~ msgid "Function"
+#~ msgstr "Funktion"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Instantsvariabel"
+
+#~ msgid "Method"
+#~ msgstr "Metod"
+
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Se Info-fil @file{{myfile}}, nod @samp{{mynode}}"
 
diff --git a/po_document/texinfo_document.pot b/po_document/texinfo_document.pot
index ee5467d324..50811ada6c 100644
--- a/po_document/texinfo_document.pot
+++ b/po_document/texinfo_document.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU texinfo 7.0\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\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,32 +17,62 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
 msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
 msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
diff --git a/po_document/uk.po b/po_document/uk.po
index f95a548ab0..425e3dd03b 100644
--- a/po_document/uk.po
+++ b/po_document/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: texinfo_document 6.8.90\n"
 "Report-Msgid-Bugs-To: bug-texinfo@gnu.org\n"
-"POT-Creation-Date: 2022-11-08 23:19+0100\n"
+"POT-Creation-Date: 2022-11-08 23:53+0100\n"
 "PO-Revision-Date: 2022-10-20 18:42+0300\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
 "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n"
@@ -20,33 +20,63 @@ msgstr ""
 "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 20.12.0\n"
 
-#: tp/Texinfo/Common.pm:604 tp/Texinfo/Common.pm:609
-msgid "Function"
-msgstr "Функція"
+#: tp/Texinfo/Common.pm:604
+msgctxt "Function"
+msgid "category of functions for @defun"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:605
+#. TRANSLATORS: category of macros for @defmac
+#: tp/Texinfo/Common.pm:607
 msgid "Macro"
 msgstr "Макрос"
 
-#: tp/Texinfo/Common.pm:606
+#. TRANSLATORS: category of special forms for @defspec
+#: tp/Texinfo/Common.pm:609
 msgid "Special Form"
 msgstr "Спеціальна форма"
 
-#: tp/Texinfo/Common.pm:607 tp/Texinfo/Common.pm:610
-msgid "Variable"
-msgstr "Змінна"
+#: tp/Texinfo/Common.pm:610
+msgctxt "Variable"
+msgid "category of variables for @defvar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:608
+#. TRANSLATORS: category of users modifiable options for @defopt
+#: tp/Texinfo/Common.pm:613
 msgid "User Option"
 msgstr "Вибір користувача"
 
-#: tp/Texinfo/Common.pm:611 tp/Texinfo/Common.pm:612
-msgid "Instance Variable"
-msgstr "Змінна екземпляра"
+#: tp/Texinfo/Common.pm:615
+msgctxt "Function"
+msgid "category of general definition for functions for @deftypefun"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:618
+msgctxt "Variable"
+msgid "category of variables in typed languages for @deftypevar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:621
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables in object-oriented programming for @defivar"
+msgstr ""
 
-#: tp/Texinfo/Common.pm:613 tp/Texinfo/Common.pm:614
-msgid "Method"
-msgstr "Метод"
+#: tp/Texinfo/Common.pm:624
+msgctxt "Instance Variable"
+msgid ""
+"category of instance variables with data type in object-oriented programming "
+"for @deftypeivar"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:627
+msgid "category of methods in object-oriented programming for @defmethod"
+msgstr ""
+
+#: tp/Texinfo/Common.pm:630
+msgid ""
+"category of methods with data type in object-oriented programming for "
+"@deftypemethod"
+msgstr ""
 
 #: tp/Texinfo/Transformations.pm:597
 msgid " --- The Detailed Node Listing ---"
@@ -928,6 +958,18 @@ msgstr "{category} щодо @code{{class}}"
 msgid "{category} of @code{{class}}"
 msgstr "{category} @code{{class}}"
 
+#~ msgid "Variable"
+#~ msgstr "Змінна"
+
+#~ msgid "Function"
+#~ msgstr "Функція"
+
+#~ msgid "Instance Variable"
+#~ msgstr "Змінна екземпляра"
+
+#~ msgid "Method"
+#~ msgstr "Метод"
+
 #~ msgid "See Info file @file{{myfile}}, node @samp{{mynode}}"
 #~ msgstr "Див. файл Info @file{{myfile}}, вузол @samp{{mynode}}"
 
diff --git a/tp/TODO b/tp/TODO
index 40cb16eac1..c65471cea7 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -10,10 +10,8 @@ This is the todo list for texi2any
 Before next release
 ===================
 
-Check uses of __p and determine if a context is better or a comment
-using the -c option of xgettext.  Same for in string documents, determine
-if a context is better or add a comment if the string would benefit
-from additional information
+Check in string documents, determine if a context is better or a comment
+using the -c option of xgettext.
 
 Bugs
 ====
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 9a24c93242..4943af27d2 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -601,17 +601,34 @@ our %def_map = (
     # shortcuts
     # The strings are marked to be translated in the parsers with type
     # 'untranslated'.
-    'defun',         {'deffn'     => gdt('Function')},
+    'defun',         {'deffn'     => pgdt('category of functions for @defun',
+                                         'Function')},
+    # TRANSLATORS: category of macros for @defmac
     'defmac',        {'deffn'     => gdt('Macro')},
+    # TRANSLATORS: category of special forms for @defspec
     'defspec',       {'deffn'     => gdt('Special Form')},
-    'defvar',        {'defvr'     => gdt('Variable')},
+    'defvar',        {'defvr'     => pgdt('category of variables for @defvar',
+                                          'Variable')},
+    # TRANSLATORS: category of users modifiable options for @defopt
     'defopt',        {'defvr'     => gdt('User Option')},
-    'deftypefun',    {'deftypefn' => gdt('Function')},
-    'deftypevar',    {'deftypevr' => gdt('Variable')},
-    'defivar',       {'defcv'     => gdt('Instance Variable')},
-    'deftypeivar',   {'deftypecv' => gdt('Instance Variable')},
-    'defmethod',     {'defop'     => gdt('Method')},
-    'deftypemethod', {'deftypeop' => gdt('Method')},
+    'deftypefun',    {'deftypefn' => pgdt(
+     'category of general definition for functions for @deftypefun',
+                                         'Function')},
+    'deftypevar',    {'deftypevr' => pgdt(
+                     'category of variables in typed languages for 
@deftypevar',
+                                         'Variable')},
+    'defivar',       {'defcv'     => pgdt(
+      'category of instance variables in object-oriented programming for 
@defivar',
+                                          'Instance Variable')},
+    'deftypeivar',   {'deftypecv' => pgdt(
+      'category of instance variables with data type in object-oriented 
programming for @deftypeivar',
+                                          'Instance Variable')},
+    'defmethod',     {'defop'     => pgdt(
+       'category of methods in object-oriented programming for @defmethod',
+                                         'Method')},
+    'deftypemethod', {'deftypeop' => pgdt(
+        'category of methods with data type in object-oriented programming for 
@deftypemethod',
+                                         'Method')},
 );
 
 # Argument not metasyntactic variables only.
diff --git a/tp/t/results/languages/multiple.pl 
b/tp/t/results/languages/multiple.pl
index 034b739eef..bbef6130dd 100644
--- a/tp/t/results/languages/multiple.pl
+++ b/tp/t/results/languages/multiple.pl
@@ -1111,16 +1111,16 @@ $result_converted{'plaintext'}->{'multiple'} = 'top
 1 Chap
 ******
 
- -- Variable d\'instance de fr : BBB CCC
+ -- Instance Variable de fr : BBB CCC
      erreur→
 
- -- Instanzvariable von copying: a b
+ -- Instance Variable von copying: a b
      error→
 
- -- Primjer varijable od hr: BBB CCC
+ -- Instance Variable od hr: BBB CCC
      greška→
 
- -- Primjer varijable od copying: a b
+ -- Instance Variable od copying: a b
      greška→
 
 * Menu:
@@ -1134,7 +1134,7 @@ $result_converted{'plaintext'}->{'multiple'} = 'top
 
 $result_converted{'info'}->{'multiple'} = 'This is , produced from .
 
- -- Variable d\'instance de copying : a b
+ -- Instance Variable de copying : a b
      erreur→
 
 
@@ -1153,16 +1153,16 @@ File: ,  Node: chap,  Prev: Top,  Up: Top
 1 Chap
 ******
 
- -- Variable d\'instance de fr : BBB CCC
+ -- Instance Variable de fr : BBB CCC
      erreur→
 
- -- Instanzvariable von copying: a b
+ -- Instance Variable von copying: a b
      error→
 
- -- Primjer varijable od hr: BBB CCC
+ -- Instance Variable od hr: BBB CCC
      greška→
 
- -- Primjer varijable od copying: a b
+ -- Instance Variable od copying: a b
      greška→
 
 [index]
@@ -1175,8 +1175,8 @@ File: ,  Node: chap,  Prev: Top,  Up: Top
 
 
 Tag Table:
-Node: Top84
-Node: chap159
+Node: Top82
+Node: chap157
 
 End Tag Table
 
@@ -1192,7 +1192,7 @@ $result_converted{'html'}->{'multiple'} = '<!DOCTYPE html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Variable d\'instance de copying: a b
+<!-- Instance Variable de copying: a b
 erreur→ -->
 <title>top</title>
 
@@ -1242,24 +1242,24 @@ Pr&eacute;c&eacute;dent: <a href="#Top" accesskey="p" 
rel="prev">top</a>, Monter
 <h2 class="chapter" id="Chap">1 Chap</h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-fr"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">fr</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href=\'#index-BBB-of-fr\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-fr"><span 
class="category-def">Instance Variable de <code class="code">fr</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-fr\'> &para;</a></span></dt>
 <dd><p>erreur&rarr;
 </p></dd></dl>
 
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-copying-a-of-copying"><span 
class="category-def">Instanzvariable of <code class="code">copying</code>: 
</span><span><strong class="def-name">a</strong> <var 
class="def-var-arguments">b</var><a class="copiable-link" 
href=\'#index-copying-a-of-copying\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-copying-a-of-copying"><span 
class="category-def">Instance Variable of <code class="code">copying</code>: 
</span><span><strong class="def-name">a</strong> <var 
class="def-var-arguments">b</var><a class="copiable-link" 
href=\'#index-copying-a-of-copying\'> &para;</a></span></dt>
 <dd><p>error&rarr;
 </p></dd></dl>
 
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Primjer varijable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-hr\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Instance Variable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-hr\'> &para;</a></span></dt>
 <dd><p>greška&rarr;
 </p></dd></dl>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-copying-a-of-copying"><span 
class="category-def">Primjer varijable od <code class="code">copying</code>: 
</span><span><strong class="def-name">a</strong> <var 
class="def-var-arguments">b</var><a class="copiable-link" 
href=\'#index-copying-a-of-copying\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-copying-a-of-copying"><span 
class="category-def">Instance Variable od <code class="code">copying</code>: 
</span><span><strong class="def-name">a</strong> <var 
class="def-var-arguments">b</var><a class="copiable-link" 
href=\'#index-copying-a-of-copying\'> &para;</a></span></dt>
 <dd><p>greška&rarr;
 </p></dd></dl>
 
diff --git a/tp/t/results/languages/multiple_in_preamble.pl 
b/tp/t/results/languages/multiple_in_preamble.pl
index 9872d01ad3..6639e48541 100644
--- a/tp/t/results/languages/multiple_in_preamble.pl
+++ b/tp/t/results/languages/multiple_in_preamble.pl
@@ -997,16 +997,16 @@ $result_converted{'plaintext'}->{'multiple_in_preamble'} 
= 'top section
 1 chap
 ******
 
- -- Primjer varijable od hr: BBB CCC
+ -- Instance Variable od hr: BBB CCC
      greška→
 
- -- Instanzvariable von de: FFF GGG
+ -- Instance Variable von de: FFF GGG
 ';
 
 
 $result_converted{'info'}->{'multiple_in_preamble'} = 'This is , produced from 
.
 
- -- Primjer varijable od copying: a b
+ -- Instance Variable od copying: a b
      greška→
 
 
@@ -1025,10 +1025,10 @@ File: ,  Node: chapter,  Prev: Top,  Up: Top
 1 chap
 ******
 
- -- Primjer varijable od hr: BBB CCC
+ -- Instance Variable od hr: BBB CCC
      greška→
 
- -- Instanzvariable von de: FFF GGG
+ -- Instance Variable von de: FFF GGG
 
 
 Tag Table:
@@ -1049,7 +1049,7 @@ $result_converted{'html'}->{'multiple_in_preamble'} = 
'<!DOCTYPE html>
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Primjer varijable od copying: a b
+<!-- Instance Variable od copying: a b
 greška→ -->
 <title>top section</title>
 
@@ -1094,13 +1094,13 @@ Prethodno: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Gore: <a hre
 <h2 class="chapter" id="chap">1 chap</h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Primjer varijable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-hr\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-hr"><span 
class="category-def">Instance Variable od <code class="code">hr</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-hr\'> &para;</a></span></dt>
 <dd><p>greška&rarr;
 </p></dd></dl>
 
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-FFF-of-de"><span 
class="category-def">Instanzvariable of <code class="code">de</code>: 
</span><span><strong class="def-name">FFF</strong> <var 
class="def-var-arguments">GGG</var><a class="copiable-link" 
href=\'#index-FFF-of-de\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-FFF-of-de"><span 
class="category-def">Instance Variable of <code class="code">de</code>: 
</span><span><strong class="def-name">FFF</strong> <var 
class="def-var-arguments">GGG</var><a class="copiable-link" 
href=\'#index-FFF-of-de\'> &para;</a></span></dt>
 </dl>
 </div>
 </div>
diff --git a/tp/t/results/languages/multiple_in_preamble_before_node.pl 
b/tp/t/results/languages/multiple_in_preamble_before_node.pl
index f313c0726d..50c02275a1 100644
--- a/tp/t/results/languages/multiple_in_preamble_before_node.pl
+++ b/tp/t/results/languages/multiple_in_preamble_before_node.pl
@@ -847,14 +847,14 @@ top section
 1 chap
 ******
 
- -- Instanzvariable von c: BBB CCC
+ -- Instance Variable von c: BBB CCC
      error→
 ';
 
 
 $result_converted{'info'}->{'multiple_in_preamble_before_node'} = 'This is , 
produced from .
 
- -- Primjer varijable od copying: a b
+ -- Instance Variable od copying: a b
      greška→
 
    Text ending the preamble
@@ -875,7 +875,7 @@ File: ,  Node: chapter,  Prev: Top,  Up: Top
 1 chap
 ******
 
- -- Instanzvariable von c: BBB CCC
+ -- Instance Variable von c: BBB CCC
      error→
 
 
@@ -897,7 +897,7 @@ 
$result_converted{'html'}->{'multiple_in_preamble_before_node'} = '<!DOCTYPE htm
 <!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<!-- Primjer varijable od copying: a b
+<!-- Instance Variable od copying: a b
 greška→ -->
 <title>top section</title>
 
@@ -945,7 +945,7 @@ Vorige: <a href="#Top" accesskey="p" rel="prev">top 
section</a>, Nach oben: <a h
 <h2 class="chapter" id="chap">1 chap</h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-c"><span 
class="category-def">Instanzvariable of <code class="code">c</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-c\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-c"><span 
class="category-def">Instance Variable of <code class="code">c</code>: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-c\'> &para;</a></span></dt>
 <dd><p>error&rarr;
 </p></dd></dl>
 </div>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
 
b/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
index d9579c6e0c..983072b1a0 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
+++ 
b/tp/t/results/languages/multiple_lang_chapters/res_html/multiple_lang_chapters.html
@@ -79,7 +79,7 @@ Suivant: <a href="#chapter-de" accesskey="n" 
rel="next">de</a>, Pr&eacute;c&eacu
 <h2 class="chapter" id="fr_005fFR">3 fr_FR</h2>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">AAA</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href='#index-BBB-of-AAA-2'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Instance Variable de <code class="code">AAA</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href='#index-BBB-of-AAA-2'> &para;</a></span></dt>
 </dl>
 
 <hr>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
 
b/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
index 3c6286bd08..71954d994a 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
+++ 
b/tp/t/results/languages/multiple_lang_chapters/res_info/multiple_lang_chapters.info
@@ -38,7 +38,7 @@ File: multiple_lang_chapters.info,  Node: chapter fr_FR,  
Next: chapter de,  Pre
 3 fr_FR
 *******
 
- -- Variable d'instance de AAA : BBB CCC
+ -- Instance Variable de AAA : BBB CCC
 
 
 File: multiple_lang_chapters.info,  Node: chapter de,  Next: chapter pt_BR,  
Prev: chapter fr_FR,  Up: Top
@@ -60,8 +60,8 @@ Node: Top54
 Node: chapter ja266
 Node: chapter en447
 Node: chapter fr_FR637
-Node: chapter de803
-Node: chapter pt_BR924
+Node: chapter de801
+Node: chapter pt_BR922
 
 End Tag Table
 
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
index e50be0a898..35ed789a5d 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
+++ 
b/tp/t/results/languages/multiple_lang_chapters_latex/res_latex/multiple_lang_chapters.tex
@@ -99,7 +99,7 @@ In english. See 
\hyperref[anchor:chapter-ja]{\chaptername~\ref*{anchor:chapter-j
 
 \noindent\begin{tabularx}{\linewidth}{@{}Xr}
 \rightskip=5em plus 1 fill \hangindent=2em \hyphenpenalty=10000
-\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& [Variable 
d'instance de \texttt{AAA}]
+\texttt{BBB \EmbracOn{}\textnormal{\textsl{CCC}}\EmbracOff{}}& [Instance 
Variable de \texttt{AAA}]
 \end{tabularx}
 
 \index[vr]{BBB of AAA@\texttt{BBB\ of AAA}}%
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
index d11f037610..cef303b8aa 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
+++ 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_html/multiple_lang_chapters.html
@@ -124,7 +124,7 @@ td.name-direction-about {text-align:center}
 <h1 class="chapter" id="fr_005fFR">3 fr_FR</h1>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">AAA</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href='#index-BBB-of-AAA-2'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA-2"><span 
class="category-def">Instance Variable de <code class="code">AAA</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href='#index-BBB-of-AAA-2'> &para;</a></span></dt>
 </dl>
 
 <hr>
diff --git 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
index 2bd7e80469..572dbf383f 100644
--- 
a/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
+++ 
b/tp/t/results/languages/multiple_lang_chapters_texi2html/res_info/multiple_lang_chapters.info
@@ -39,7 +39,7 @@ File: multiple_lang_chapters.info,  Node: chapter fr_FR,  
Next: chapter de,  Pre
 3 fr_FR
 *******
 
- -- Variable d'instance de AAA : BBB CCC
+ -- Instance Variable de AAA : BBB CCC
 
 
 File: multiple_lang_chapters.info,  Node: chapter de,  Next: chapter pt_BR,  
Prev: chapter fr_FR,  Up: Top
@@ -61,8 +61,8 @@ Node: Top81
 Node: chapter ja293
 Node: chapter en474
 Node: chapter fr_FR664
-Node: chapter de830
-Node: chapter pt_BR951
+Node: chapter de828
+Node: chapter pt_BR949
 
 End Tag Table
 
diff --git a/tp/t/results/languages/simple.pl b/tp/t/results/languages/simple.pl
index 1831dc51a1..17c3b0e9b7 100644
--- a/tp/t/results/languages/simple.pl
+++ b/tp/t/results/languages/simple.pl
@@ -299,7 +299,7 @@ $result_indices_sort_strings{'simple'} = {
 
 
 
-$result_converted{'plaintext'}->{'simple'} = ' -- Variable d\'instance de AAA 
: BBB CCC
+$result_converted{'plaintext'}->{'simple'} = ' -- Instance Variable de AAA : 
BBB CCC
 ';
 
 1;
diff --git a/tp/t/results/languages/unknown_region.pl 
b/tp/t/results/languages/unknown_region.pl
index 54064b2bab..32282349c0 100644
--- a/tp/t/results/languages/unknown_region.pl
+++ b/tp/t/results/languages/unknown_region.pl
@@ -309,7 +309,7 @@ $result_indices_sort_strings{'unknown_region'} = {
 
 
 
-$result_converted{'plaintext'}->{'unknown_region'} = ' -- Variable d\'instance 
de AAA : BBB CCC
+$result_converted{'plaintext'}->{'unknown_region'} = ' -- Instance Variable de 
AAA : BBB CCC
 ';
 
 
@@ -318,7 +318,7 @@ $result_converted{'info'}->{'unknown_region'} = 'This is , 
produced from .
 
 File: ,  Node: Top,  Up: (dir)
 
- -- Variable d\'instance de AAA : BBB CCC
+ -- Instance Variable de AAA : BBB CCC
 
 
 Tag Table:
@@ -363,7 +363,7 @@ strong.def-name {font-family: monospace; font-weight: bold; 
font-size: larger}
 <h1 class="node" id="Top">Top</h1>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">AAA</code>&nbsp;: </span><span><strong 
class="def-name">BBB</strong> <var class="def-var-arguments">CCC</var><a 
class="copiable-link" href=\'#index-BBB-of-AAA\'> &para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" id="index-BBB-of-AAA"><span 
class="category-def">Instance Variable de <code class="code">AAA</code>&nbsp;: 
</span><span><strong class="def-name">BBB</strong> <var 
class="def-var-arguments">CCC</var><a class="copiable-link" 
href=\'#index-BBB-of-AAA\'> &para;</a></span></dt>
 </dl>
 
 
diff --git 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
index 81f1949a8b..79b46aa3c0 100644
--- 
a/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
+++ 
b/tp/tests/formatting/res_parser/documentlanguage_cmdline/documentlanguage.html
@@ -67,7 +67,7 @@ th.sections-header-printindex {text-align:left}
 <p>Voir <a class="xref" href="#chapter">Chapter</a>.
 </p>
 <dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-name-on-class"><span class="category-def">M&eacute;thode de <code 
class="code">class</code>&nbsp;: </span><span><code 
class="def-type">data-type</code> <strong class="def-name">name</strong> <code 
class="def-code-arguments">arguments</code><a class="copiable-link" 
href='#index-name-on-class'> &para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-name-on-class"><span class="category-def">Method de <code 
class="code">class</code>&nbsp;: </span><span><code 
class="def-type">data-type</code> <strong class="def-name">name</strong> <code 
class="def-code-arguments">arguments</code><a class="copiable-link" 
href='#index-name-on-class'> &para;</a></span></dt>
 <dd><p>Some text.
 </p></dd></dl>
 
diff --git a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html 
b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
index 13b21cd63c..6f8b2ba005 100644
--- a/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
+++ b/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
@@ -497,7 +497,7 @@ d-efop no arg
 c-ategory: d-eftp_name a-ttributes...
 d-eftp
 
-Fonction: d-efun_name a-rguments...
+Function: d-efun_name a-rguments...
 d-efun
 
 Macro: d-efmac_name a-rguments...
@@ -515,26 +515,26 @@ d-efvar with args
 Option de l'utilisateur: d-efopt_name
 d-efopt
 
-Fonction: t-ype d-eftypefun_name a-rguments...
+Function: t-ype d-eftypefun_name a-rguments...
 d-eftypefun
 
 Variable: t-ype d-eftypevar_name
 d-eftypevar
 
-Variable d'instance de c-lass: d-efivar_name
+Instance Variable de c-lass: d-efivar_name
 d-efivar
 
-Variable d'instance de c-lass: t-ype d-eftypeivar_name
+Instance Variable de c-lass: t-ype d-eftypeivar_name
 d-eftypeivar
 
-Méthode de c-lass: d-efmethod_name a-rguments...
+Method de c-lass: d-efmethod_name a-rguments...
 d-efmethod
 
-Méthode de c-lass: t-ype d-eftypemethod_name a-rguments...
+Method de c-lass: t-ype d-eftypemethod_name a-rguments...
 d-eftypemethod
 
 
-Fonction: data-type2 name2 arguments2...
+Function: data-type2 name2 arguments2...
 aaa2
 
 c-ategory2: t-ype2 d-eftypefn_name2
@@ -1558,7 +1558,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" 
id="index-titlepage-d_002d_002defun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-titlepage-d_002d_002defun_005fname'> &para;</a></span></dt>
+<dt class="deffn defun-alias-deffn" 
id="index-titlepage-d_002d_002defun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-titlepage-d_002d_002defun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;efun
 </p></dd></dl>
 
@@ -1588,7 +1588,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-d_002d_002deftypefun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-d_002d_002deftypefun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;eftypefun
 </p></dd></dl>
 
@@ -1598,28 +1598,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" 
id="index-titlepage-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-titlepage-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" 
id="index-titlepage-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-titlepage-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efivar
 </p></dd></dl>
 
 <dl class="first-deftypecv first-deftypeivar-alias-first-deftypecv">
-<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-titlepage-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-titlepage-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeivar
 </p></dd></dl>
 
 <dl class="first-defop first-defmethod-alias-first-defop">
-<dt class="defop defmethod-alias-defop" 
id="index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defop defmethod-alias-defop" 
id="index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-titlepage-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efmethod
 </p></dd></dl>
 
 <dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-titlepage-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Fonction&nbsp;:<br> 
</span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-titlepage-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-titlepage-name2"><span class="category-def">Function&nbsp;:<br> 
</span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-titlepage-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
@@ -2636,7 +2636,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" 
id="index-copying-d_002d_002defun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defun_005fname'> &para;</a></span></dt>
+<dt class="deffn defun-alias-deffn" 
id="index-copying-d_002d_002defun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;efun
 </p></dd></dl>
 
@@ -2666,7 +2666,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-d_002d_002deftypefun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-d_002d_002deftypefun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;eftypefun
 </p></dd></dl>
 
@@ -2676,28 +2676,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efivar
 </p></dd></dl>
 
 <dl class="first-deftypecv first-deftypeivar-alias-first-deftypecv">
-<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeivar
 </p></dd></dl>
 
 <dl class="first-defop first-defmethod-alias-first-defop">
-<dt class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efmethod
 </p></dd></dl>
 
 <dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Fonction&nbsp;:<br> 
</span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-copying-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function&nbsp;:<br> 
</span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-copying-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
@@ -3770,7 +3770,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" 
id="index-copying-d_002d_002defun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defun_005fname'> &para;</a></span></dt>
+<dt class="deffn defun-alias-deffn" 
id="index-copying-d_002d_002defun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;efun
 </p></dd></dl>
 
@@ -3800,7 +3800,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-d_002d_002deftypefun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-d_002d_002deftypefun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;eftypefun
 </p></dd></dl>
 
@@ -3810,28 +3810,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" 
id="index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efivar
 </p></dd></dl>
 
 <dl class="first-deftypecv first-deftypeivar-alias-first-deftypecv">
-<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-copying-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeivar
 </p></dd></dl>
 
 <dl class="first-defop first-defmethod-alias-first-defop">
-<dt class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defop defmethod-alias-defop" 
id="index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-copying-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efmethod
 </p></dd></dl>
 
 <dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-copying-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Fonction&nbsp;:<br> 
</span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-copying-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-copying-name2"><span class="category-def">Function&nbsp;:<br> 
</span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-copying-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
@@ -4846,7 +4846,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" id="index-d_002d_002defun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defun_005fname'> &para;</a></span></dt>
+<dt class="deffn defun-alias-deffn" id="index-d_002d_002defun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;efun
 </p></dd></dl>
 
@@ -4876,7 +4876,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname"><span 
class="category-def">Fonction&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname"><span 
class="category-def">Function&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypefun_005fname'> &para;</a></span></dt>
 <dd><p>d&ndash;eftypefun
 </p></dd></dl>
 
@@ -4886,28 +4886,28 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 </p></dd></dl>
 
 <dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002defivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efivar
 </p></dd></dl>
 
 <dl class="first-deftypecv first-deftypeivar-alias-first-deftypecv">
-<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Variable d&rsquo;instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypeivar
 </p></dd></dl>
 
 <dl class="first-defop first-defmethod-alias-first-defop">
-<dt class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defmethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;efmethod
 </p></dd></dl>
 
 <dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass'> 
&para;</a></span></dt>
 <dd><p>d&ndash;eftypemethod
 </p></dd></dl>
 
 
 <dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Fonction&nbsp;:<br> </span><span><code 
class="def-type">data-type2</code><br> <strong class="def-name">name2</strong> 
<code class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-name2'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2"><span 
class="category-def">Function&nbsp;:<br> </span><span><code 
class="def-type">data-type2</code><br> <strong class="def-name">name2</strong> 
<code class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-name2'> &para;</a></span></dt>
 <dd><p>aaa2
 </p></dd></dl>
 
@@ -6021,7 +6021,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><dl class="first-deffn first-defun-alias-first-deffn">
-<dt class="deffn defun-alias-deffn" 
id="index-d_002d_002defun_005fname-1"><span 
class="category-def">Fonction&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defun_005fname-1'> &para;</a></span></dt>
+<dt class="deffn defun-alias-deffn" 
id="index-d_002d_002defun_005fname-1"><span 
class="category-def">Function&nbsp;:</span><span><strong 
class="def-name">d--efun_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defun_005fname-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--efun
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6057,7 +6057,7 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname-1"><span 
class="category-def">Fonction&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypefun_005fname-1'> &para;</a></span></dt>
+<dt class="deftypefn deftypefun-alias-deftypefn" 
id="index-d_002d_002deftypefun_005fname-1"><span 
class="category-def">Function&nbsp;:</span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypefun_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypefun_005fname-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypefun
 </pre></dd></dl>
 <pre class="example-preformatted">
@@ -6069,32 +6069,32 @@ $ wget 
'http://savannah.gnu.org/cgi-bin/viewcvs/config/config/config.sub?rev=HEA
 <pre class="example-preformatted">
 
 </pre><dl class="first-defcv first-defivar-alias-first-defcv">
-<dt class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><span 
class="category-def">Variable d'instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002defivar_005fname-of-c_002d_002dlass-1'> 
&para;</a></span></dt>
+<dt class="defcv defivar-alias-defcv" 
id="index-d_002d_002defivar_005fname-of-c_002d_002dlass-1"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><strong 
class="def-name">d--efivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002defivar_005fname-of-c_002d_002dlass-1'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--efivar
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypecv first-deftypeivar-alias-first-deftypecv">
-<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><span 
class="category-def">Variable d'instance de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1'> 
&para;</a></span></dt>
+<dt class="deftypecv deftypeivar-alias-deftypecv" 
id="index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1"><span 
class="category-def">Instance Variable de <code 
class="code">c--lass</code>&nbsp;: </span><span><code 
class="def-type">t--ype</code> <strong 
class="def-name">d--eftypeivar_name</strong><a class="copiable-link" 
href='#index-d_002d_002deftypeivar_005fname-of-c_002d_002dlass-1'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypeivar
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-defop first-defmethod-alias-first-defop">
-<dt class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1'> 
&para;</a></span></dt>
+<dt class="defop defmethod-alias-defop" 
id="index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><strong class="def-name">d--efmethod_name</strong> <var 
class="def-var-arguments">a&ndash;rguments...</var><a class="copiable-link" 
href='#index-d_002d_002defmethod_005fname-on-c_002d_002dlass-1'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--efmethod
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 </pre><dl class="first-deftypeop first-deftypemethod-alias-first-deftypeop">
-<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><span 
class="category-def">M&eacute;thode de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1'> 
&para;</a></span></dt>
+<dt class="deftypeop deftypemethod-alias-deftypeop" 
id="index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1"><span 
class="category-def">Method de <code class="code">c--lass</code>&nbsp;: 
</span><span><code class="def-type">t--ype</code> <strong 
class="def-name">d--eftypemethod_name</strong> <code 
class="def-code-arguments">a--rguments...</code><a class="copiable-link" 
href='#index-d_002d_002deftypemethod_005fname-on-c_002d_002dlass-1'> 
&para;</a></span></dt>
 <dd><pre class="example-preformatted">d--eftypemethod
 </pre></dd></dl>
 <pre class="example-preformatted">
 
 
 </pre><dl class="first-deftypefn first-deftypefun-alias-first-deftypefn">
-<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Fonction&nbsp;:
+<dt class="deftypefn deftypefun-alias-deftypefn" id="index-name2-1"><span 
class="category-def">Function&nbsp;:
  </span><span><code class="def-type">data-type2</code><br> <strong 
class="def-name">name2</strong> <code 
class="def-code-arguments">arguments2...</code><a class="copiable-link" 
href='#index-name2-1'> &para;</a></span></dt>
 <dd><pre class="example-preformatted">aaa2
 </pre></dd></dl>



reply via email to

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