branch master updated: Partial po/POTFILES.in update

[Gavin D. Smith]

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

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 07f2a97155 Partial po/POTFILES.in update
07f2a97155 is described below

commit 07f2a97155d40f5409345dbf1e6a4bafcdbb30aa
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Tue Jun 4 19:39:45 2024 +0100

    Partial po/POTFILES.in update
    
    * po/POTFILES.in: add/remove some files
    
    * Makefile.am (po-check): Remove code checking for strings in
    .twjr files as it led to false positives for C files containing
    simply the string constant "__".  This code was not doing anything
    anyway as it was not enabled for "*.twjr" files.
    
    * TODO: mention that texindex strings don't seem to be
    translated.
---
 ChangeLog      | 14 ++++++++++++++
 Makefile.am    |  8 ++------
 TODO           |  4 ++++
 po/POTFILES.in |  8 +++-----
 4 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c9d04daf9..e5e19c60fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2024-06-04  Gavin Smith <gavinsmith0123@gmail.com>
+
+       Partial po/POTFILES.in update
+
+       * po/POTFILES.in: add/remove some files
+
+       * Makefile.am (po-check): Remove code checking for strings in
+       .twjr files as it led to false positives for C files containing
+       simply the string constant "__".  This code was not doing anything
+       anyway as it was not enabled for "*.twjr" files.
+
+       * TODO: mention that texindex strings don't seem to be
+       translated.
+
 2024-06-04  Gavin Smith <gavinsmith0123@gmail.com>
 
        * tp/Texinfo/XS/convert/ConvertXS.xs,
diff --git a/Makefile.am b/Makefile.am
index eb27d027fd..215a10c110 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,8 +100,7 @@ po-check:
            | grep -v '^src/false\.c$$' | sort > $@-1;                  \
          files=;                                                       \
          for file in `find [a-zA-Z]* -name '*.[ch]'                    \
-                                  -o -name '*.p[lm]'                   \
-                                  -o -name '*.notyettwjr'`; do         \
+                                  -o -name '*.p[lm]'` ; do             \
            # don't look at sources from some subdirs.                  \
            case $$file in                                              \
              contrib/* ) continue;;                                    \
@@ -118,11 +117,8 @@ po-check:
            esac;                                                       \
            files="$$files $$file";                                     \
          done;                                                         \
-         # the first alternative is for twjr/gawk, which just uses _"  \
-         # with no space or lparen; the other alternative matches the  \
-         # usual function calls, e.g., _("..."), with or without space.\
          grep -E -l                                                    \
-           
'\b[^$$]N?__?"|\b(N?__?p?|gettext|line_error|line_error_ext|line_warn|command_error|command_warn)
 *\([^)"]*("|$$)'  \
+           
'\b(N?__?p?|gettext|line_error|line_error_ext|line_warn|command_error|command_warn)
 *\([^)"]*("|$$)'        \
            $$files | sort -u > $@-2;                                   \
          diff -u $@-1 $@-2 || exit 1;                                  \
          rm -f $@-1 $@-2;                                              \
diff --git a/TODO b/TODO
index 424351cc80..2df13ca15a 100644
--- a/TODO
+++ b/TODO
@@ -73,6 +73,10 @@ If you are interested in working on any of these, email 
bug-texinfo@gnu.org.
   - clear out support for \ as the index file escape character (instead
     of @).
 
+* texindex:
+  - check if messages are translated via po/POTFILES.in.  check if twjr
+    format can be supported in po/Makevars and "make po-check" target.
+
 * Doc:
   - Verify/proofread Documentation of the HTML customization.
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 94093eece5..1728ea4b72 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-# Copyright 2005-2023 Free Software Foundation, Inc.
+# Copyright 2005-2024 Free Software Foundation, Inc.
 # 
 # Copying and distribution of this file, with or without modification,
 # are permitted in any medium without royalty provided the copyright
@@ -6,7 +6,6 @@
 #  
 # List of source files containing translatable strings.
 
-gnulib/lib/cdefs.h
 gnulib/lib/error.c
 gnulib/lib/getopt.c
 gnulib/lib/regcomp.c
@@ -42,11 +41,10 @@ tp/Texinfo/Convert/HTML.pm
 tp/Texinfo/Convert/IXIN.pm
 tp/Texinfo/Convert/Info.pm
 tp/Texinfo/Convert/LaTeX.pm
-tp/Texinfo/Convert/NodeNameNormalization.pm
 tp/Texinfo/Convert/Plaintext.pm
 tp/Texinfo/Convert/Text.pm
-tp/Texinfo/Convert/TexinfoMarkup.pm
 tp/Texinfo/Convert/Utils.pm
+tp/Texinfo/Indices.pm
 tp/Texinfo/ParserNonXS.pm
 tp/Texinfo/Report.pm
 tp/Texinfo/Structuring.pm
@@ -60,7 +58,7 @@ tp/texi2any.pl
 tp/Texinfo/XS/gnulib/lib/obstack.c
 tp/Texinfo/XS/main/errors.c
 tp/Texinfo/XS/main/errors.h
-tp/Texinfo/XS/parsetexi/Parsetexi.pm
+tp/Texinfo/XS/main/targets.c
 tp/Texinfo/XS/parsetexi/close.c
 tp/Texinfo/XS/parsetexi/end_line.c
 tp/Texinfo/XS/parsetexi/handle_commands.c