This patch makes the gnulib source code use the translation domain "gnulib",
instead of the translation domain of the package that imports gnulib modules.
This patch also makes it clear that the approach documented in 2008 never
actually worked: All _() calls used
gettext (msgid)
not
dgettext (PACKAGE "-gnulib", msgid)
2024-12-08 Bruno Haible <br...@clisp.org>
Use the translation domain "gnulib".
* lib/argmatch.c (_): Use translation domain "gnulib".
* lib/bitset/stats.c (_): Likewise.
* lib/c-stack.c (_): Likewise.
* lib/clean-temp.c (_): Likewise.
* lib/clean-temp-simple.c (_): Likewise.
* lib/closein.c (_): Likewise.
* lib/closeout.c (_): Likewise.
* lib/copy-acl.c (_): Likewise.
* lib/copy-file.c (_): Likewise.
* lib/csharpcomp.c (_): Likewise.
* lib/csharpexec.c (_): Likewise.
* lib/cygpath.c (_): Likewise.
* lib/dfa.c (_): Likewise.
* lib/error.c (_): Likewise.
* lib/execute.c (_): Likewise.
* lib/gai_strerror.c (_): Likewise.
* lib/getaddrinfo.c (_): Likewise.
* lib/getopt.c (_): Likewise.
* lib/javacomp.c (_): Likewise.
* lib/javaexec.c (_): Likewise.
* lib/javaversion.c (_): Likewise.
* lib/mkdir-p.c (_): Likewise.
* lib/obstack.c (_) [!_LIBC]: Likewise.
* lib/openat-die.c (_): Likewise.
* lib/os2-spawn.c (_): Likewise.
* lib/pagealign_alloc.c (_): Likewise.
* lib/parse-datetime.y (_): Likewise.
* lib/pipe-filter-gi.c (_): Likewise.
* lib/pipe-filter-ii.c (_): Likewise.
* lib/quotearg.c (_): Likewise.
* lib/regex_internal.h (_): Likewise.
* lib/rpmatch.c (_): Likewise.
* lib/set-acl.c (_): Likewise.
* lib/sigpipe-die.c (_): Likewise.
* lib/spawn-pipe.c (_): Likewise.
* lib/strsignal.c (_) [!_LIBC]: Likewise.
* lib/timevar.c (_): Likewise.
* lib/unicodeio.c (_): Likewise.
* lib/userspec.c (_): Likewise.
* lib/version-etc.c (_): Likewise.
* lib/wait-process.c (_): Likewise.
* lib/xalloc-die.c (_): Likewise.
* lib/xbinary-io.c (_): Likewise.
* lib/xfreopen.c (_): Likewise.
* lib/xmemcoll.c (_): Likewise.
* lib/xsetenv.c (_): Likewise.
* lib/xstdopen.c (_): Likewise.
* lib/xstrerror.c (_): Likewise.
* modules/acl (Depends-on): Add gnulib-i18n.
* modules/argmatch (Depends-on): Likewise.
* modules/bitset (Depends-on): Likewise.
* modules/c-stack (Depends-on): Likewise.
* modules/clean-temp (Depends-on): Likewise.
* modules/clean-temp-simple (Depends-on): Likewise.
* modules/closein (Depends-on): Likewise.
* modules/closeout (Depends-on): Likewise.
* modules/copy-file (Depends-on): Likewise.
* modules/csharpcomp (Depends-on): Likewise.
* modules/csharpexec (Depends-on): Likewise.
* modules/cygpath (Depends-on): Likewise.
* modules/dfa (Depends-on): Likewise.
* modules/error (Depends-on): Likewise.
* modules/execute (Depends-on): Likewise.
* modules/getaddrinfo (Depends-on): Likewise.
* modules/getopt-posix (Depends-on): Likewise.
* modules/javacomp (Depends-on): Likewise.
* modules/javaexec (Depends-on): Likewise.
* modules/javaversion (Depends-on): Likewise.
* modules/mkdir-p (Depends-on): Likewise.
* modules/obstack (Depends-on): Likewise.
* modules/openat-die (Depends-on): Likewise.
* modules/pagealign_alloc (Depends-on): Likewise.
* modules/parse-datetime (Depends-on): Likewise.
* modules/pipe-filter-gi (Depends-on): Likewise.
* modules/pipe-filter-ii (Depends-on): Likewise.
* modules/quotearg (Depends-on): Likewise.
* modules/regex (Depends-on): Likewise.
* modules/rpmatch (Depends-on): Likewise.
* modules/sigpipe-die (Depends-on): Likewise.
* modules/spawn-pipe (Depends-on): Likewise.
* modules/strsignal (Depends-on): Likewise.
* modules/timevar (Depends-on): Likewise.
* modules/unicodeio (Depends-on): Likewise.
* modules/userspec (Depends-on): Likewise.
* modules/version-etc (Depends-on): Likewise.
* modules/wait-process (Depends-on): Likewise.
* modules/xalloc-die (Depends-on): Likewise.
* modules/xbinary-io (Depends-on): Likewise.
* modules/xfreopen (Depends-on): Likewise.
* modules/xmemcoll (Depends-on): Likewise.
* modules/xsetenv (Depends-on): Likewise.
* modules/xstdopen (Depends-on): Likewise.
* modules/xstrerror (Depends-on): Likewise.
diff --git a/lib/argmatch.c b/lib/argmatch.c
index c9d727c8e6..2f972a1a33 100644
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -28,7 +28,7 @@
#include <stdlib.h>
#include <string.h>
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include <error.h>
#include "quotearg.h"
diff --git a/lib/bitset/stats.c b/lib/bitset/stats.c
index 3eabf4e4cb..d0c6260263 100644
--- a/lib/bitset/stats.c
+++ b/lib/bitset/stats.c
@@ -33,7 +33,7 @@
#include <string.h>
#include "gettext.h"
-#define _(Msgid) gettext (Msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "bitset/array.h"
#include "bitset/base.h"
diff --git a/lib/c-stack.c b/lib/c-stack.c
index 8db2417ab1..7d2c08a632 100644
--- a/lib/c-stack.c
+++ b/lib/c-stack.c
@@ -56,7 +56,7 @@
#include "ignore-value.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Here we need the original abort() function. (Printing a stack trace
from within a signal handler is not going to work in most cases anyway.) */
diff --git a/lib/clean-temp-simple.c b/lib/clean-temp-simple.c
index b394878813..27b3660ab2 100644
--- a/lib/clean-temp-simple.c
+++ b/lib/clean-temp-simple.c
@@ -38,7 +38,7 @@
#include "gl_linkedhash_list.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Lock that protects the file_cleanup_list from concurrent modification in
diff --git a/lib/clean-temp.c b/lib/clean-temp.c
index 382de1aa75..7fc0c923b1 100644
--- a/lib/clean-temp.c
+++ b/lib/clean-temp.c
@@ -65,7 +65,7 @@
# include "stdio--.h"
#endif
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* GNU Hurd doesn't have PATH_MAX. Use a fallback.
Temporary directory names are usually not that long. */
diff --git a/lib/closein.c b/lib/closein.c
index 74675f6c2b..34fbedba19 100644
--- a/lib/closein.c
+++ b/lib/closein.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "close-stream.h"
#include "closeout.h"
diff --git a/lib/closeout.c b/lib/closeout.c
index 2ffdecb825..3a2008ac8c 100644
--- a/lib/closeout.c
+++ b/lib/closeout.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "close-stream.h"
#include <error.h>
diff --git a/lib/copy-acl.c b/lib/copy-acl.c
index b4aa920ed5..69009510eb 100644
--- a/lib/copy-acl.c
+++ b/lib/copy-acl.c
@@ -26,7 +26,7 @@
#include "quote.h"
#include <error.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Copy access control lists from one file to another. If SOURCE_DESC is
diff --git a/lib/copy-file.c b/lib/copy-file.c
index 60d913e181..8197533cc5 100644
--- a/lib/copy-file.c
+++ b/lib/copy-file.c
@@ -39,7 +39,7 @@
#include "quote.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
enum { IO_SIZE = 32 * 1024 };
diff --git a/lib/csharpcomp.c b/lib/csharpcomp.c
index f0a941fd26..0c69b38f1a 100644
--- a/lib/csharpcomp.c
+++ b/lib/csharpcomp.c
@@ -39,7 +39,7 @@
#include "xvasprintf.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Survey of C# compilers.
diff --git a/lib/csharpexec.c b/lib/csharpexec.c
index c0658da5a8..f3d82a0e5a 100644
--- a/lib/csharpexec.c
+++ b/lib/csharpexec.c
@@ -76,7 +76,7 @@
#undef new_classpath
#undef CLASSPATHVAR
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Survey of CIL interpreters.
diff --git a/lib/cygpath.c b/lib/cygpath.c
index 90caacde42..329f35c32a 100644
--- a/lib/cygpath.c
+++ b/lib/cygpath.c
@@ -26,7 +26,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
#ifdef __CYGWIN__
diff --git a/lib/dfa.c b/lib/dfa.c
index 9bddc777bc..9fabf67c7d 100644
--- a/lib/dfa.c
+++ b/lib/dfa.c
@@ -39,7 +39,7 @@
#include "localeinfo.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
#if GAWK
/* Use ISO C 99 API. */
diff --git a/lib/error.c b/lib/error.c
index abb64faf2e..1f263f1ea5 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -38,7 +38,7 @@
#if !_LIBC && ENABLE_NLS
# include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
#endif
#ifdef _LIBC
diff --git a/lib/execute.c b/lib/execute.c
index c5ebf29690..b8169ad395 100644
--- a/lib/execute.c
+++ b/lib/execute.c
@@ -40,7 +40,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Choice of implementation for native Windows.
diff --git a/lib/gai_strerror.c b/lib/gai_strerror.c
index 37092e295c..8aadeb1f50 100644
--- a/lib/gai_strerror.c
+++ b/lib/gai_strerror.c
@@ -27,8 +27,8 @@
# include <libintl.h>
#else
# include "gettext.h"
-# define _(String) gettext (String)
-# define N_(String) String
+# define _(msgid) dgettext ("gnulib", msgid)
+# define N_(msgid) msgid
#endif
#if HAVE_DECL_GAI_STRERROR
diff --git a/lib/getaddrinfo.c b/lib/getaddrinfo.c
index bf5d61f387..c9c147fb16 100644
--- a/lib/getaddrinfo.c
+++ b/lib/getaddrinfo.c
@@ -40,8 +40,8 @@
#include <stdio.h>
#include "gettext.h"
-#define _(String) gettext (String)
-#define N_(String) String
+#define _(msgid) dgettext ("gnulib", msgid)
+#define N_(msgid) msgid
/* BeOS has AF_INET, but not PF_INET. */
#ifndef PF_INET
diff --git a/lib/getopt.c b/lib/getopt.c
index 6d789326f2..47800c1b35 100644
--- a/lib/getopt.c
+++ b/lib/getopt.c
@@ -42,7 +42,7 @@
# define funlockfile(fp) _IO_funlockfile (fp)
#else
# include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
/* When used standalone, flockfile and funlockfile might not be
available. */
# if (!defined _POSIX_THREAD_SAFE_FUNCTIONS \
diff --git a/lib/javacomp.c b/lib/javacomp.c
index c5b90147ca..4c37c21004 100644
--- a/lib/javacomp.c
+++ b/lib/javacomp.c
@@ -50,7 +50,7 @@
#include "c-strstr.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Survey of Java compilers.
diff --git a/lib/javaexec.c b/lib/javaexec.c
index 7df0a28f76..e8c126ead6 100644
--- a/lib/javaexec.c
+++ b/lib/javaexec.c
@@ -35,7 +35,7 @@
#include <error.h>
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Survey of Java virtual machines.
diff --git a/lib/javaversion.c b/lib/javaversion.c
index fb3ce70751..edf0949486 100644
--- a/lib/javaversion.c
+++ b/lib/javaversion.c
@@ -37,7 +37,7 @@
#include <error.h>
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Get PKGDATADIR. */
#include "configmake.h"
diff --git a/lib/mkdir-p.c b/lib/mkdir-p.c
index f8f3611dda..d0c96149ab 100644
--- a/lib/mkdir-p.c
+++ b/lib/mkdir-p.c
@@ -27,7 +27,7 @@
#include <unistd.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "dirchownmod.h"
#include "dirname.h"
diff --git a/lib/obstack.c b/lib/obstack.c
index 9b3a698e00..ad45c11cdd 100644
--- a/lib/obstack.c
+++ b/lib/obstack.c
@@ -294,11 +294,14 @@ int obstack_exit_failure = EXIT_FAILURE;
# ifdef _LIBC
# include <libintl.h>
+# ifndef _
+# define _(msgid) gettext (msgid)
+# endif
# else
# include "gettext.h"
-# endif
-# ifndef _
-# define _(msgid) gettext (msgid)
+# ifndef _
+# define _(msgid) dgettext ("gnulib", msgid)
+# endif
# endif
# ifdef _LIBC
diff --git a/lib/openat-die.c b/lib/openat-die.c
index 959c77d0a0..403ca4ff7c 100644
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -28,7 +28,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
_Noreturn void
openat_save_fail (int errnum)
diff --git a/lib/os2-spawn.c b/lib/os2-spawn.c
index 42b2454908..a47f6fc283 100644
--- a/lib/os2-spawn.c
+++ b/lib/os2-spawn.c
@@ -38,7 +38,7 @@
#include <error.h>
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Duplicates a file handle, making the copy uninheritable.
diff --git a/lib/pagealign_alloc.c b/lib/pagealign_alloc.c
index d1a18bdf04..7a0a163e9c 100644
--- a/lib/pagealign_alloc.c
+++ b/lib/pagealign_alloc.c
@@ -35,7 +35,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
#if HAVE_MMAP
/* Define MAP_FILE when it isn't otherwise. */
diff --git a/lib/parse-datetime.y b/lib/parse-datetime.y
index c27ab60a84..96c08ee4ec 100644
--- a/lib/parse-datetime.y
+++ b/lib/parse-datetime.y
@@ -60,7 +60,7 @@
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Bison's skeleton tests _STDLIB_H, while some stdlib.h headers
use _STDLIB_H_ as witness. Map the latter to the one bison uses. */
diff --git a/lib/pipe-filter-gi.c b/lib/pipe-filter-gi.c
index ab26fc4774..7997950071 100644
--- a/lib/pipe-filter-gi.c
+++ b/lib/pipe-filter-gi.c
@@ -39,7 +39,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "pipe-filter-aux.h"
diff --git a/lib/pipe-filter-ii.c b/lib/pipe-filter-ii.c
index 0084528898..0354c5a4ce 100644
--- a/lib/pipe-filter-ii.c
+++ b/lib/pipe-filter-ii.c
@@ -158,7 +158,7 @@ WaitForMultipleObjects (DWORD nCount, const HANDLE
*pHandles, BOOL bWaitAll,
#include "wait-process.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "pipe-filter-aux.h"
diff --git a/lib/quotearg.c b/lib/quotearg.c
index 00977f5714..28994d783c 100644
--- a/lib/quotearg.c
+++ b/lib/quotearg.c
@@ -45,7 +45,7 @@
#include <wchar.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#define N_(msgid) msgid
#ifndef SIZE_MAX
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index dfc5d34cba..02c2ca6896 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -100,10 +100,12 @@
/* This is for other GNU distributions with internationalized messages. */
#if (HAVE_LIBINTL_H && ENABLE_NLS) || defined _LIBC
# include <libintl.h>
+# undef gettext
# ifdef _LIBC
-# undef gettext
# define gettext(msgid) \
__dcgettext (_libc_intl_domainname, msgid, LC_MESSAGES)
+# else
+# define gettext(msgid) dgettext ("gnulib", msgid)
# endif
#else
# undef gettext
diff --git a/lib/rpmatch.c b/lib/rpmatch.c
index ac16fbf0ca..92fd4484b4 100644
--- a/lib/rpmatch.c
+++ b/lib/rpmatch.c
@@ -33,7 +33,7 @@
# endif
# include <regex.h>
# include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
# define N_(msgid) gettext_noop (msgid)
# if HAVE_LANGINFO_YESEXPR
diff --git a/lib/set-acl.c b/lib/set-acl.c
index 08ce8b80db..d163ba86d3 100644
--- a/lib/set-acl.c
+++ b/lib/set-acl.c
@@ -26,7 +26,7 @@
#include "quote.h"
#include <error.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Set the access control lists of a file to match *exactly* MODE (this might
remove inherited ACLs). Note chmod() tends to honor inherited/default
diff --git a/lib/sigpipe-die.c b/lib/sigpipe-die.c
index 3a22d2f977..7b24060006 100644
--- a/lib/sigpipe-die.c
+++ b/lib/sigpipe-die.c
@@ -28,7 +28,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
void
sigpipe_die (void)
diff --git a/lib/spawn-pipe.c b/lib/spawn-pipe.c
index fe60646c43..cb111f825c 100644
--- a/lib/spawn-pipe.c
+++ b/lib/spawn-pipe.c
@@ -43,7 +43,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Choice of implementation for native Windows.
diff --git a/lib/strsignal.c b/lib/strsignal.c
index 6f4085dd4b..17f43a5796 100644
--- a/lib/strsignal.c
+++ b/lib/strsignal.c
@@ -30,7 +30,7 @@
# include <libintl.h>
#else /* !_LIBC */
# include "gettext.h"
-# define _(msgid) gettext (msgid)
+# define _(msgid) dgettext ("gnulib", msgid)
# define N_(msgid) gettext_noop (msgid)
#endif /* _LIBC */
diff --git a/lib/timevar.c b/lib/timevar.c
index 02e06dc838..1ec76d6b6c 100644
--- a/lib/timevar.c
+++ b/lib/timevar.c
@@ -32,7 +32,7 @@
#include "gethrxtime.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include "xalloc.h"
/* See timevar.h for an explanation of timing variables. */
diff --git a/lib/unicodeio.c b/lib/unicodeio.c
index 47e6e2b907..1c7503ad58 100644
--- a/lib/unicodeio.c
+++ b/lib/unicodeio.c
@@ -33,7 +33,7 @@
#include <error.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#define N_(msgid) msgid
#include "localcharset.h"
diff --git a/lib/userspec.c b/lib/userspec.c
index 833f7f58d7..2ae9b10485 100644
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -43,7 +43,7 @@
#include "xstrtol.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#define N_(msgid) msgid
#ifndef HAVE_ENDGRENT
diff --git a/lib/version-etc.c b/lib/version-etc.c
index 45d0c93cf1..a555921586 100644
--- a/lib/version-etc.c
+++ b/lib/version-etc.c
@@ -29,7 +29,7 @@
#endif
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
/* If you use AM_INIT_AUTOMAKE's no-define option,
PACKAGE is not defined. Use PACKAGE_TARNAME instead. */
diff --git a/lib/wait-process.c b/lib/wait-process.c
index f424e1bc74..a0399128c1 100644
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -34,7 +34,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
#define SIZEOF(a) (sizeof(a) / sizeof(a[0]))
diff --git a/lib/xalloc-die.c b/lib/xalloc-die.c
index c053c7a8db..b9b7cfd7a6 100644
--- a/lib/xalloc-die.c
+++ b/lib/xalloc-die.c
@@ -26,7 +26,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
void
xalloc_die (void)
diff --git a/lib/xbinary-io.c b/lib/xbinary-io.c
index 85e50cd7f8..9969c06fec 100644
--- a/lib/xbinary-io.c
+++ b/lib/xbinary-io.c
@@ -25,7 +25,7 @@
#include "verify.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#if O_BINARY
diff --git a/lib/xfreopen.c b/lib/xfreopen.c
index 8289d34c2a..60b08e4a2c 100644
--- a/lib/xfreopen.c
+++ b/lib/xfreopen.c
@@ -23,7 +23,7 @@
#include "quote.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
void
xfreopen (char const *filename, char const *mode, FILE *fp)
diff --git a/lib/xmemcoll.c b/lib/xmemcoll.c
index 52a1b9149e..12f69eff77 100644
--- a/lib/xmemcoll.c
+++ b/lib/xmemcoll.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
#include <error.h>
#include "exitfail.h"
diff --git a/lib/xsetenv.c b/lib/xsetenv.c
index 7cf1fece7e..fc68926e8e 100644
--- a/lib/xsetenv.c
+++ b/lib/xsetenv.c
@@ -24,7 +24,7 @@
#include <error.h>
#include "gettext.h"
-#define _(str) gettext (str)
+#define _(msgid) dgettext ("gnulib", msgid)
/* Set NAME to VALUE in the environment.
diff --git a/lib/xstdopen.c b/lib/xstdopen.c
index 3d15c261c5..678c2a9d9f 100644
--- a/lib/xstdopen.c
+++ b/lib/xstdopen.c
@@ -24,7 +24,7 @@
#include "exitfail.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
void
xstdopen (void)
diff --git a/lib/xstrerror.c b/lib/xstrerror.c
index 39ec37c1ee..3556fc70ac 100644
--- a/lib/xstrerror.c
+++ b/lib/xstrerror.c
@@ -25,7 +25,7 @@
#include "xalloc.h"
#include "gettext.h"
-#define _(msgid) gettext (msgid)
+#define _(msgid) dgettext ("gnulib", msgid)
char *
xstrerror (const char *message, int errnum)
diff --git a/modules/acl b/modules/acl
index 2e410fbe6a..911f463140 100644
--- a/modules/acl
+++ b/modules/acl
@@ -8,6 +8,7 @@ lib/set-acl.c
Depends-on:
error
gettext-h
+gnulib-i18n
qcopy-acl
qset-acl
quote
diff --git a/modules/argmatch b/modules/argmatch
index 8b02b10b9d..4f4d039b90 100644
--- a/modules/argmatch
+++ b/modules/argmatch
@@ -12,6 +12,7 @@ error
exitfail
getprogname
gettext-h
+gnulib-i18n
memcmp
quote
quotearg
diff --git a/modules/bitset b/modules/bitset
index 1f2a232512..c264fb684b 100644
--- a/modules/bitset
+++ b/modules/bitset
@@ -22,6 +22,7 @@ c99
ffsl
fopen-gnu
gettext-h
+gnulib-i18n
integer_length_l
obstack
stdbool
diff --git a/modules/c-stack b/modules/c-stack
index 812e3efca9..e351e39095 100644
--- a/modules/c-stack
+++ b/modules/c-stack
@@ -12,6 +12,7 @@ errno
exitfail
getprogname
gettext-h
+gnulib-i18n
idx
ignore-value
inttypes
diff --git a/modules/clean-temp b/modules/clean-temp
index 5cf087dcb0..81b2dcff71 100644
--- a/modules/clean-temp
+++ b/modules/clean-temp
@@ -28,6 +28,7 @@ linkedhash-list
linked-list
xlist
gettext-h
+gnulib-i18n
configure.ac:
diff --git a/modules/clean-temp-simple b/modules/clean-temp-simple
index fa66211753..f7885a7786 100644
--- a/modules/clean-temp-simple
+++ b/modules/clean-temp-simple
@@ -20,6 +20,7 @@ fatal-signal
rmdir
linkedhash-list
gettext-h
+gnulib-i18n
configure.ac:
AC_DEFINE([SIGNAL_SAFE_LIST], [1], [Define if lists must be signal-safe.])
diff --git a/modules/closein b/modules/closein
index c3da265724..06a4467047 100644
--- a/modules/closein
+++ b/modules/closein
@@ -10,6 +10,7 @@ closeout
freadahead
fflush
gettext-h
+gnulib-i18n
stdbool
unistd
diff --git a/modules/closeout b/modules/closeout
index b4ccefe443..0e9216920e 100644
--- a/modules/closeout
+++ b/modules/closeout
@@ -8,6 +8,7 @@ lib/closeout.c
Depends-on:
close-stream
gettext-h
+gnulib-i18n
error
quotearg
exitfail
diff --git a/modules/copy-file b/modules/copy-file
index 231f31c8ed..49469f1d28 100644
--- a/modules/copy-file
+++ b/modules/copy-file
@@ -16,6 +16,7 @@ error
fstat
full-write
gettext-h
+gnulib-i18n
ignore-value
open
qcopy-acl
diff --git a/modules/csharpcomp b/modules/csharpcomp
index 4b0a177fbb..43df979dd2 100644
--- a/modules/csharpcomp
+++ b/modules/csharpcomp
@@ -21,6 +21,7 @@ safe-read
xmalloca
xvasprintf
gettext-h
+gnulib-i18n
memcmp
csharpcomp-script
diff --git a/modules/csharpexec b/modules/csharpexec
index 6559c0e195..fdfa96d89b 100644
--- a/modules/csharpexec
+++ b/modules/csharpexec
@@ -28,6 +28,7 @@ copy-file
clean-temp-simple
clean-temp
gettext-h
+gnulib-i18n
csharpexec-script
configure.ac:
diff --git a/modules/cygpath b/modules/cygpath
index dc48848a98..07b4c0326d 100644
--- a/modules/cygpath
+++ b/modules/cygpath
@@ -9,6 +9,7 @@ Depends-on:
xalloc
free-posix
gettext-h
+gnulib-i18n
configure.ac:
diff --git a/modules/dfa b/modules/dfa
index dd394d05ee..e9461ded98 100644
--- a/modules/dfa
+++ b/modules/dfa
@@ -19,6 +19,7 @@ c99
ctype
flexmember
gettext-h
+gnulib-i18n
idx
locale
mbrtoc32-regular
diff --git a/modules/error b/modules/error
index e568fe6b44..3f8a226933 100644
--- a/modules/error
+++ b/modules/error
@@ -11,6 +11,7 @@ stddef
stdio
getprogname [test $COMPILE_ERROR_C = 1]
gettext-h [test $COMPILE_ERROR_C = 1]
+gnulib-i18n [test $COMPILE_ERROR_C = 1]
strerror [test $COMPILE_ERROR_C = 1]
unistd [test $COMPILE_ERROR_C = 1]
msvc-nothrow [test $COMPILE_ERROR_C = 1]
diff --git a/modules/execute b/modules/execute
index fc90554ea4..2b302deeda 100644
--- a/modules/execute
+++ b/modules/execute
@@ -17,6 +17,7 @@ findprog-in
free-posix
msvc-nothrow
gettext-h
+gnulib-i18n
spawn
posix_spawn
posix_spawnp
diff --git a/modules/getaddrinfo b/modules/getaddrinfo
index 5dadc9d20c..31b648734e 100644
--- a/modules/getaddrinfo
+++ b/modules/getaddrinfo
@@ -11,6 +11,7 @@ netdb
sys_socket
extensions
gettext-h [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1
|| test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1]
+gnulib-i18n [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1
|| test $HAVE_DECL_GAI_STRERROR = 0 || test $REPLACE_GAI_STRERROR = 1]
inet_ntop [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1]
snprintf [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1]
stdbool [test $HAVE_GETADDRINFO = 0 || test $REPLACE_GETADDRINFO = 1]
diff --git a/modules/getopt-posix b/modules/getopt-posix
index 0b50620c4b..d8d628ab56 100644
--- a/modules/getopt-posix
+++ b/modules/getopt-posix
@@ -20,6 +20,7 @@ extensions
include_next
gen-header
gettext-h [test $REPLACE_GETOPT = 1]
+gnulib-i18n [test $REPLACE_GETOPT = 1]
snippet/arg-nonnull
configure.ac:
diff --git a/modules/javacomp b/modules/javacomp
index d93cde52e3..85d2d2b35d 100644
--- a/modules/javacomp
+++ b/modules/javacomp
@@ -31,6 +31,7 @@ xvasprintf
verify
c-strstr
gettext-h
+gnulib-i18n
javacomp-script
sh-filename
diff --git a/modules/javaexec b/modules/javaexec
index e54dcffd22..da8f4a4912 100644
--- a/modules/javaexec
+++ b/modules/javaexec
@@ -16,6 +16,7 @@ xalloc
xmalloca
error
gettext-h
+gnulib-i18n
javaexec-script
sh-filename
diff --git a/modules/javaversion b/modules/javaversion
index e12fe0b2e9..aba879f281 100644
--- a/modules/javaversion
+++ b/modules/javaversion
@@ -14,6 +14,7 @@ spawn-pipe
wait-process
getline
gettext-h
+gnulib-i18n
configmake
configure.ac:
diff --git a/modules/mkdir-p b/modules/mkdir-p
index ca13e0b6ff..1e60c249da 100644
--- a/modules/mkdir-p
+++ b/modules/mkdir-p
@@ -13,6 +13,7 @@ error
fcntl-h
fstat
gettext-h
+gnulib-i18n
lchmod
lchown
mkancesdirs
diff --git a/modules/obstack b/modules/obstack
index 5c94894e8c..4db26bc145 100644
--- a/modules/obstack
+++ b/modules/obstack
@@ -10,6 +10,7 @@ Depends-on:
gen-header
alignof [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
gettext-h [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
+gnulib-i18n [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
exitfail [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
stdint [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
stdlib [test $HAVE_OBSTACK = 0 || test $REPLACE_OBSTACK = 1]
diff --git a/modules/openat-die b/modules/openat-die
index c5f9af2d75..5cef137c91 100644
--- a/modules/openat-die
+++ b/modules/openat-die
@@ -9,6 +9,7 @@ openat-h
error
exitfail
gettext-h
+gnulib-i18n
snippet/_Noreturn
configure.ac:
diff --git a/modules/pagealign_alloc b/modules/pagealign_alloc
index b97f9bb2fd..f448adb86d 100644
--- a/modules/pagealign_alloc
+++ b/modules/pagealign_alloc
@@ -12,6 +12,7 @@ error
extensions
getpagesize
gettext-h
+gnulib-i18n
open
stdlib
xalloc
diff --git a/modules/parse-datetime b/modules/parse-datetime
index fc26391aa9..9669c2400f 100644
--- a/modules/parse-datetime
+++ b/modules/parse-datetime
@@ -16,6 +16,7 @@ c-ctype
stdbool
gettime
gettext-h
+gnulib-i18n
idx
intprops
inttypes
diff --git a/modules/pipe-filter-gi b/modules/pipe-filter-gi
index 42c85ffdeb..2c8ddfb0f4 100644
--- a/modules/pipe-filter-gi
+++ b/modules/pipe-filter-gi
@@ -15,6 +15,7 @@ extern-inline
fcntl-h
free-posix
gettext-h
+gnulib-i18n
stdbool
stdint
stdlib
diff --git a/modules/pipe-filter-ii b/modules/pipe-filter-ii
index 65a0a02547..0363db84ba 100644
--- a/modules/pipe-filter-ii
+++ b/modules/pipe-filter-ii
@@ -14,6 +14,7 @@ error
extern-inline
fcntl-h
gettext-h
+gnulib-i18n
stdbool
stdint
stdlib
diff --git a/modules/quotearg b/modules/quotearg
index 89f81fd55f..e449b75728 100644
--- a/modules/quotearg
+++ b/modules/quotearg
@@ -13,6 +13,7 @@ c-strcaseeq
c32isprint
extensions
gettext-h
+gnulib-i18n
mbszero
mbrtoc32
mbsinit
diff --git a/modules/regex b/modules/regex
index c2264a52bd..325df23e2e 100644
--- a/modules/regex
+++ b/modules/regex
@@ -23,6 +23,7 @@ attribute [test $ac_use_included_regex = yes]
btowc [test $ac_use_included_regex = yes]
builtin-expect [test $ac_use_included_regex = yes]
glibc-internal/dynarray [test $ac_use_included_regex = yes]
+gnulib-i18n [test $ac_use_included_regex = yes]
intprops [test $ac_use_included_regex = yes]
iswctype [test $ac_use_included_regex = yes]
langinfo [test $ac_use_included_regex = yes]
diff --git a/modules/rpmatch b/modules/rpmatch
index c11296b985..2b9f51a772 100644
--- a/modules/rpmatch
+++ b/modules/rpmatch
@@ -10,6 +10,7 @@ stdlib
extensions
stdbool [test $HAVE_RPMATCH = 0]
gettext-h [test $HAVE_RPMATCH = 0]
+gnulib-i18n [test $HAVE_RPMATCH = 0]
regex [test $HAVE_RPMATCH = 0]
strdup [test $HAVE_RPMATCH = 0]
diff --git a/modules/sigpipe-die b/modules/sigpipe-die
index 42000c01a7..a840cdcc98 100644
--- a/modules/sigpipe-die
+++ b/modules/sigpipe-die
@@ -8,6 +8,7 @@ lib/sigpipe-die.c
Depends-on:
error
gettext-h
+gnulib-i18n
exitfail
sigpipe
sigprocmask
diff --git a/modules/spawn-pipe b/modules/spawn-pipe
index b2b343c093..fc10461128 100644
--- a/modules/spawn-pipe
+++ b/modules/spawn-pipe
@@ -18,6 +18,7 @@ filename
findprog-in
free-posix
gettext-h
+gnulib-i18n
msvc-nothrow
open
pipe2
diff --git a/modules/strsignal b/modules/strsignal
index a11f853086..2e8c6ad759 100644
--- a/modules/strsignal
+++ b/modules/strsignal
@@ -10,6 +10,7 @@ Depends-on:
string
extensions
gettext-h [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
+gnulib-i18n [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
once [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
tls [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
snprintf [test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1]
diff --git a/modules/timevar b/modules/timevar
index 5f911cd27b..2809566cc8 100644
--- a/modules/timevar
+++ b/modules/timevar
@@ -14,6 +14,7 @@ c99
gethrxtime
getrusage
gettext-h
+gnulib-i18n
stdlib
sys_time
sys_times
diff --git a/modules/unicodeio b/modules/unicodeio
index b1b077d76b..ccf1f5f88d 100644
--- a/modules/unicodeio
+++ b/modules/unicodeio
@@ -12,6 +12,7 @@ unistr/u8-uctomb
iconv
iconv_open
gettext-h
+gnulib-i18n
localcharset
error
stdio
diff --git a/modules/userspec b/modules/userspec
index ce1ee1792a..eff67dfb89 100644
--- a/modules/userspec
+++ b/modules/userspec
@@ -12,6 +12,7 @@ xalloc
xstrtol
strdup
gettext-h
+gnulib-i18n
intprops
inttostr
stdbool
diff --git a/modules/version-etc b/modules/version-etc
index d4cea5ad98..5357d37a87 100644
--- a/modules/version-etc
+++ b/modules/version-etc
@@ -8,6 +8,7 @@ m4/version-etc.m4
Depends-on:
gettext-h
+gnulib-i18n
stdarg
configure.ac:
diff --git a/modules/wait-process b/modules/wait-process
index f7271111e7..7c5af55f2e 100644
--- a/modules/wait-process
+++ b/modules/wait-process
@@ -13,6 +13,7 @@ error
xalloc
xalloc-die
gettext-h
+gnulib-i18n
stdbool
stdlib
sys_wait
diff --git a/modules/xalloc-die b/modules/xalloc-die
index 177b68eb2e..7636fa1929 100644
--- a/modules/xalloc-die
+++ b/modules/xalloc-die
@@ -9,6 +9,7 @@ Depends-on:
error
extern-inline
gettext-h
+gnulib-i18n
exitfail
configure.ac:
diff --git a/modules/xbinary-io b/modules/xbinary-io
index 7618e375cf..e322ac4020 100644
--- a/modules/xbinary-io
+++ b/modules/xbinary-io
@@ -11,6 +11,7 @@ error
exitfail
extern-inline
gettext-h
+gnulib-i18n
stdbool
verify
diff --git a/modules/xfreopen b/modules/xfreopen
index e753f46052..c4e87979d5 100644
--- a/modules/xfreopen
+++ b/modules/xfreopen
@@ -10,6 +10,7 @@ error
exitfail
freopen
gettext-h
+gnulib-i18n
quote
configure.ac:
diff --git a/modules/xmemcoll b/modules/xmemcoll
index a8ff50bee6..1bb96f7887 100644
--- a/modules/xmemcoll
+++ b/modules/xmemcoll
@@ -8,6 +8,7 @@ lib/xmemcoll.c
Depends-on:
memcoll
gettext-h
+gnulib-i18n
error
quotearg
exitfail
diff --git a/modules/xsetenv b/modules/xsetenv
index a6950f75e2..25a1c741b1 100644
--- a/modules/xsetenv
+++ b/modules/xsetenv
@@ -11,6 +11,7 @@ setenv
unsetenv
error
gettext-h
+gnulib-i18n
stdlib
configure.ac:
diff --git a/modules/xstdopen b/modules/xstdopen
index 64da7b9240..90880cb5a6 100644
--- a/modules/xstdopen
+++ b/modules/xstdopen
@@ -9,6 +9,7 @@ Depends-on:
stdopen
error
gettext-h
+gnulib-i18n
exitfail
configure.ac:
diff --git a/modules/xstrerror b/modules/xstrerror
index 7d77715003..edf72efc60 100644
--- a/modules/xstrerror
+++ b/modules/xstrerror
@@ -8,6 +8,7 @@ lib/xstrerror.c
Depends-on:
gettext-h
+gnulib-i18n
strerror_r-posix
xalloc
xvasprintf
