Use new approach for gnulib localizations.

* gettext-runtime/po/POTFILES.in: Remove files that come from gnulib.
* gettext-tools/po/POTFILES.in: Likewise.
* gettext-runtime/src/envsubst.c (main): Invoke bindtextdomain for the domain
'gnulib'.
* gettext-runtime/src/gettext.c (main): Likewise.
* gettext-runtime/src/ngettext.c (main): Likewise.
* gettext-tools/src/cldr-plurals.c (main): Likewise.
* gettext-tools/src/hostname.c (main): Likewise.
* gettext-tools/src/msgattrib.c (main): Likewise.
* gettext-tools/src/msgcat.c (main): Likewise.
* gettext-tools/src/msgcmp.c (main): Likewise.
* gettext-tools/src/msgcomm.c (main): Likewise.
* gettext-tools/src/msgconv.c (main): Likewise.
* gettext-tools/src/msgen.c (main): Likewise.
* gettext-tools/src/msgexec.c (main): Likewise.
* gettext-tools/src/msgfilter.c (main): Likewise.
* gettext-tools/src/msgfmt.c (main): Likewise.
* gettext-tools/src/msggrep.c (main): Likewise.
* gettext-tools/src/msginit.c (main): Likewise.
* gettext-tools/src/msgmerge.c (main): Likewise.
* gettext-tools/src/msgunfmt.c (main): Likewise.
* gettext-tools/src/msguniq.c (main): Likewise.
* gettext-tools/src/recode-sr-latin.c (main): Likewise.
* gettext-tools/src/urlget.c (main): Likewise.
* gettext-tools/src/xgettext.c (main): Likewise.

diff --git a/gettext-runtime/po/POTFILES.in b/gettext-runtime/po/POTFILES.in
index 13cfe96a5a168d0e59f5654cb6ba0256697ac8a0..791de449af5b218c0ed1c6de0d963de1a8f151ff 100644 (file)
--- a/gettext-runtime/po/POTFILES.in
+++ b/gettext-runtime/po/POTFILES.in
@@ -1,15 +1,9 @@
 # List of files which contain translatable strings.
-# Copyright (C) 1995, 1998, 2001-2003, 2005-2006, 2023 Free Software Foundation, Inc.
+# Copyright (C) 1995-2024 Free Software Foundation, Inc.
 # This file is free software, distributed under GNU GPL v3+.
 
 # For updating this file, look at the result of:
-#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src}/*.[chly]
-
-# Files from the portability library
-gnulib-lib/closeout.c
-gnulib-lib/error.c
-gnulib-lib/getopt.c
-gnulib-lib/xalloc-die.c
+#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' src/*.[chly]
 
 # Package source files
 src/envsubst.c

diff --git a/gettext-runtime/src/envsubst.c b/gettext-runtime/src/envsubst.c
index 303c03c6b82630a68732d5d26871aa31eab06b3b..e5d1f070d89913dfb4867036b101855197f96dd7 100644 (file)
--- a/gettext-runtime/src/envsubst.c
+++ b/gettext-runtime/src/envsubst.c
@@ -79,6 +79,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   textdomain (PACKAGE);
 
   /* Ensure that write errors on stdout are detected.  */

diff --git a/gettext-runtime/src/gettext.c b/gettext-runtime/src/gettext.c
index cedfc4c8bf15a92c3ae65be993f0dea2ebc7008a..dc598ea8b46c13cefc573d7efc1491e2df8ed1e6 100644 (file)
--- a/gettext-runtime/src/gettext.c
+++ b/gettext-runtime/src/gettext.c
@@ -86,6 +86,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   textdomain (PACKAGE);
 
   /* Ensure that write errors on stdout are detected.  */

diff --git a/gettext-runtime/src/ngettext.c b/gettext-runtime/src/ngettext.c
index 432de1ec23d0a16c897efad170bdc0955ca6409b..b467cc2dd87647e5b6efe4397d05f9e9c714ecf4 100644 (file)
--- a/gettext-runtime/src/ngettext.c
+++ b/gettext-runtime/src/ngettext.c
@@ -82,6 +82,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   textdomain (PACKAGE);
 
   /* Ensure that write errors on stdout are detected.  */

diff --git a/gettext-tools/po/POTFILES.in b/gettext-tools/po/POTFILES.in
index e528d821f87b836f46e8fde4472393d246c4a603..b09c673c8dcde2d8c677ec8f30993b862cc773bd 100644 (file)
--- a/gettext-tools/po/POTFILES.in
+++ b/gettext-tools/po/POTFILES.in
@@ -3,33 +3,7 @@
 # This file is free software, distributed under GNU GPL v3+.
 
 # For updating this file, look at the result of:
-#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {gnulib-lib,src,libgettextpo}/*.[chly]
-
-# Files from the portability library
-gnulib-lib/argmatch.c
-gnulib-lib/clean-temp.c
-gnulib-lib/clean-temp-simple.c
-gnulib-lib/closeout.c
-gnulib-lib/copy-file.c
-gnulib-lib/csharpcomp.c
-gnulib-lib/csharpexec.c
-gnulib-lib/error.c
-gnulib-lib/execute.c
-gnulib-lib/gai_strerror.c
-gnulib-lib/getaddrinfo.c
-gnulib-lib/getopt.c
-gnulib-lib/javacomp.c
-gnulib-lib/javaexec.c
-gnulib-lib/javaversion.c
-gnulib-lib/obstack.c
-gnulib-lib/openat-die.c
-gnulib-lib/os2-spawn.c
-gnulib-lib/pipe-filter-ii.c
-gnulib-lib/quotearg.c
-gnulib-lib/spawn-pipe.c
-gnulib-lib/wait-process.c
-gnulib-lib/xalloc-die.c
-gnulib-lib/xsetenv.c
+#   $ LC_ALL=C grep -l '[^A-Za-z_]_(' {src,libgettextpo}/*.[chly]
 
 # Package source files
 src/cldr-plurals.c
@@ -143,8 +117,5 @@ src/x-tcl.c
 src/x-vala.c
 src/x-ycp.c
 src/user-email.sh.in
-libgettextpo/error.c
 libgettextpo/gettext-po.c
 libgettextpo/markup.c
-libgettextpo/obstack.c
-libgettextpo/xalloc-die.c

diff --git a/gettext-tools/src/cldr-plurals.c b/gettext-tools/src/cldr-plurals.c
index 13a63b8d8131022b12d1772d31da62823cfe0e70..e137b9ccb00c7cb6a991e8a2a7364b036893bd02 100644 (file)
--- a/gettext-tools/src/cldr-plurals.c
+++ b/gettext-tools/src/cldr-plurals.c
@@ -236,6 +236,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/hostname.c b/gettext-tools/src/hostname.c
index d17a065b66453598d481af27078fb25741ebdb80..259701fe8cbe34a9ae60ee68fa9cea2d9aefe6e0 100644 (file)
--- a/gettext-tools/src/hostname.c
+++ b/gettext-tools/src/hostname.c
@@ -145,6 +145,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   textdomain (PACKAGE);
 
   /* Ensure that write errors on stdout are detected.  */

diff --git a/gettext-tools/src/msgattrib.c b/gettext-tools/src/msgattrib.c
index d3e939ac7963902fd0e31a98748ab753bf6ce59d..8851d9772dfc15d1530ecc752d81814c33d5738f 100644 (file)
--- a/gettext-tools/src/msgattrib.c
+++ b/gettext-tools/src/msgattrib.c
@@ -161,6 +161,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgcat.c b/gettext-tools/src/msgcat.c
index 74566ed6bf5db6468c296341e728c05b3494a917..ff8ac523f53ed721895c58dd82429478e0b83106 100644 (file)
--- a/gettext-tools/src/msgcat.c
+++ b/gettext-tools/src/msgcat.c
@@ -129,6 +129,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgcmp.c b/gettext-tools/src/msgcmp.c
index 536b12986e0824b56f9efff82305fd2096405e60..8313800566a14b697072107e869fec37e3669bd4 100644 (file)
--- a/gettext-tools/src/msgcmp.c
+++ b/gettext-tools/src/msgcmp.c
@@ -106,6 +106,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgcomm.c b/gettext-tools/src/msgcomm.c
index 3bca7caae41b0aaf660284cd9364f420c613127f..f0f02730ace75b1399074ac73ecddc3fdd02746a 100644 (file)
--- a/gettext-tools/src/msgcomm.c
+++ b/gettext-tools/src/msgcomm.c
@@ -128,6 +128,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgconv.c b/gettext-tools/src/msgconv.c
index cd23e93bd3c0a55cd3c1118ecc8fcf80b2a912dd..c9b9b488c5eeacb549a863b76521f8e16c5b38e4 100644 (file)
--- a/gettext-tools/src/msgconv.c
+++ b/gettext-tools/src/msgconv.c
@@ -117,6 +117,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgen.c b/gettext-tools/src/msgen.c
index 64bc434e37c665138306e29823547d2236e75d43..f65b872816e2fcac19237027dbb9061a83e079c8 100644 (file)
--- a/gettext-tools/src/msgen.c
+++ b/gettext-tools/src/msgen.c
@@ -119,6 +119,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgexec.c b/gettext-tools/src/msgexec.c
index 783daa4b5f09efd9e5ee8aeabc1029d84c76b6c9..cb69c34e751cb03811284fe7ef65ec748994ade4 100644 (file)
--- a/gettext-tools/src/msgexec.c
+++ b/gettext-tools/src/msgexec.c
@@ -117,6 +117,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgfilter.c b/gettext-tools/src/msgfilter.c
index ba0a940f182c4493ba374748e8b1ee37278c8dc2..461519b741610e274ec939a7754dcfd8ab565664 100644 (file)
--- a/gettext-tools/src/msgfilter.c
+++ b/gettext-tools/src/msgfilter.c
@@ -151,6 +151,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgfmt.c b/gettext-tools/src/msgfmt.c
index 108a373d84dc588367a9ffe18de4103740e3042f..d215fce451e2ccd780d1c6a404ab6ae6ca1cd75e 100644 (file)
--- a/gettext-tools/src/msgfmt.c
+++ b/gettext-tools/src/msgfmt.c
@@ -267,6 +267,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msggrep.c b/gettext-tools/src/msggrep.c
index d063542f193675909c3287827495e41ad3503907..1098bf5ad98e5ee636860f8fe7f9b7e0a554cecd 100644 (file)
--- a/gettext-tools/src/msggrep.c
+++ b/gettext-tools/src/msggrep.c
@@ -164,6 +164,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msginit.c b/gettext-tools/src/msginit.c
index e63d9d0a3ce3ef97ef2ef9f9c3bfed1045dc67a0..b76ebeb6b0f9077853ff1c4137af4e7b946ebafd 100644 (file)
--- a/gettext-tools/src/msginit.c
+++ b/gettext-tools/src/msginit.c
@@ -158,6 +158,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgmerge.c b/gettext-tools/src/msgmerge.c
index c344f05b9ed1f919a3e60a89599c952aa52a08ff..91d48afb46ae339c9d17271acb2beb56bc6e3d0f 100644 (file)
--- a/gettext-tools/src/msgmerge.c
+++ b/gettext-tools/src/msgmerge.c
@@ -205,6 +205,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msgunfmt.c b/gettext-tools/src/msgunfmt.c
index 2666eeffa333312518f095364a429027fdf830c6..8d4abfe1ad7357de3936ab6658b7d867dfbc0303 100644 (file)
--- a/gettext-tools/src/msgunfmt.c
+++ b/gettext-tools/src/msgunfmt.c
@@ -132,6 +132,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/msguniq.c b/gettext-tools/src/msguniq.c
index dda868643e7cebbc009c288c788fa9350ab38a0f..9511d657f6864e90ac9e893efd5de7b3ad6d0ee5 100644 (file)
--- a/gettext-tools/src/msguniq.c
+++ b/gettext-tools/src/msguniq.c
@@ -121,6 +121,7 @@ main (int argc, char **argv)
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);
 

diff --git a/gettext-tools/src/recode-sr-latin.c b/gettext-tools/src/recode-sr-latin.c
index 348eb8711204cc1d79458cbf6449edbfbebcf73d..bf4673de3c7c0890557d492ec691d3ba92587ce2 100644 (file)
--- a/gettext-tools/src/recode-sr-latin.c
+++ b/gettext-tools/src/recode-sr-latin.c
@@ -76,6 +76,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   textdomain (PACKAGE);
 
   /* Ensure that write errors on stdout are detected.  */

diff --git a/gettext-tools/src/urlget.c b/gettext-tools/src/urlget.c
index bd961295ba7c2baba4a97b00be58b617ce5fe1cc..f1dc7da7261ef70287dbbc951516454414c36088 100644 (file)
--- a/gettext-tools/src/urlget.c
+++ b/gettext-tools/src/urlget.c
@@ -101,6 +101,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   textdomain (PACKAGE);
 
   /* Ensure that write errors on stdout are detected.  */

diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c
index 61ec96bc72e5bc8b5409a14849b82cf62e2daf8b..fa8acf3053c6a18fbd7db67b9a296eeb338b9384 100644 (file)
--- a/gettext-tools/src/xgettext.c
+++ b/gettext-tools/src/xgettext.c
@@ -359,6 +359,7 @@ main (int argc, char *argv[])
 
   /* Set the text message domain.  */
   bindtextdomain (PACKAGE, relocate (LOCALEDIR));
+  bindtextdomain ("gnulib", relocate (GNULIB_LOCALEDIR));
   bindtextdomain ("bison-runtime", relocate (BISON_LOCALEDIR));
   textdomain (PACKAGE);