xgettext: PHP: Fix parsing of strings and heredocs with embedded expressions.

Reported by Gert Jan Schoneveld <gertjan@facilityapps.com> in
<https://lists.gnu.org/archive/html/bug-gettext/2025-08/msg00007.html>
and by Benoit Waldmann <benoit.waldmann@siagilus.fr>
at <https://savannah.gnu.org/bugs/index.php?item_id=67948>.

* gettext-tools/src/x-php.c (enum token_type_ty): New enum values
token_type_lbrace, token_type_rbrace.
(struct php_extractor): New field brace_nesting_depth.
(php_extractor_init_rest): Initialize it.
(extract_balanced): Forward-declare.
(process_dquote_or_heredoc): Change handling of embedded expressions.
(phase4_get): Recognize token_type_lbrace, token_type_rbrace.
(extract_balanced): Recurse also for token_type_lbrace.
(extract_php_input): Remove function.
(extract_php): Inline it here.
* gettext-tools/tests/xgettext-php-1: Add more tests of embedded expressions.

.gitignore

@@ -15,7 +15,7 @@
 /gettext-runtime/doc/Admin/jdom-1.0.jar
 /gettext-runtime/doc/Admin/Matrix*.class
 /gettext-runtime/doc/Admin/matrix.xml
-/gettext-tools/misc/archive.dir.tar
+/gettext-tools/machine-translation/prototype/OllamaSpit.class
 
 # Files brought in by autopull.sh:
 /gettext-tools/tree-sitter-*
@@ -69,7 +69,6 @@
 /gettext-tools/libgettextpo/uniwidth/
 /gettext-tools/libgettextpo/Makefile.gnulib
 /gettext-tools/libgettextpo/_Noreturn.h
-/gettext-tools/libgettextpo/alignof.h
 /gettext-tools/libgettextpo/alloca.in.h
 /gettext-tools/libgettextpo/arg-nonnull.h
 /gettext-tools/libgettextpo/asnprintf.c
@@ -105,15 +104,13 @@
 /gettext-tools/libgettextpo/c32tolower.c
 /gettext-tools/libgettextpo/c32width.c
 /gettext-tools/libgettextpo/calloc.c
+/gettext-tools/libgettextpo/cdefs.h
 /gettext-tools/libgettextpo/cloexec.c
 /gettext-tools/libgettextpo/cloexec.h
 /gettext-tools/libgettextpo/close.c
 /gettext-tools/libgettextpo/concat-filename.c
 /gettext-tools/libgettextpo/concat-filename.h
 /gettext-tools/libgettextpo/diffseq.h
-/gettext-tools/libgettextpo/dirname-lgpl.c
-/gettext-tools/libgettextpo/dirname.h
-/gettext-tools/libgettextpo/dosname.h
 /gettext-tools/libgettextpo/dup2.c
 /gettext-tools/libgettextpo/errno.in.h
 /gettext-tools/libgettextpo/error.c
@@ -126,6 +123,7 @@
 /gettext-tools/libgettextpo/fd-hook.h
 /gettext-tools/libgettextpo/fdopen.c
 /gettext-tools/libgettextpo/filename.h
+/gettext-tools/libgettextpo/flexmember.h
 /gettext-tools/libgettextpo/float+.h
 /gettext-tools/libgettextpo/float.c
 /gettext-tools/libgettextpo/float.in.h
@@ -134,6 +132,8 @@
 /gettext-tools/libgettextpo/free.c
 /gettext-tools/libgettextpo/frexp.c
 /gettext-tools/libgettextpo/frexpl.c
+/gettext-tools/libgettextpo/fseterr.c
+/gettext-tools/libgettextpo/fseterr.h
 /gettext-tools/libgettextpo/fstat.c
 /gettext-tools/libgettextpo/fstrcmp.c
 /gettext-tools/libgettextpo/fstrcmp.h
@@ -191,12 +191,14 @@
 /gettext-tools/libgettextpo/itold.c
 /gettext-tools/libgettextpo/lc-charset-dispatch.c
 /gettext-tools/libgettextpo/lc-charset-dispatch.h
+/gettext-tools/libgettextpo/libc-config.h
 /gettext-tools/libgettextpo/libunistring.valgrind
 /gettext-tools/libgettextpo/limits.in.h
 /gettext-tools/libgettextpo/localcharset.c
 /gettext-tools/libgettextpo/localcharset.h
 /gettext-tools/libgettextpo/locale.in.h
 /gettext-tools/libgettextpo/localeconv.c
+/gettext-tools/libgettextpo/lstat.c
 /gettext-tools/libgettextpo/malloc.c
 /gettext-tools/libgettextpo/malloca.c
 /gettext-tools/libgettextpo/malloca.h
@@ -214,8 +216,6 @@
 /gettext-tools/libgettextpo/mbrtowc-impl-utf8.h
 /gettext-tools/libgettextpo/mbsinit.c
 /gettext-tools/libgettextpo/mbsnlen.c
-/gettext-tools/libgettextpo/mbswidth.c
-/gettext-tools/libgettextpo/mbswidth.h
 /gettext-tools/libgettextpo/mbszero.c
 /gettext-tools/libgettextpo/mbtowc-lock.c
 /gettext-tools/libgettextpo/mbtowc-lock.h
@@ -277,6 +277,8 @@
 /gettext-tools/libgettextpo/stdckdint.in.h
 /gettext-tools/libgettextpo/stddef.in.h
 /gettext-tools/libgettextpo/stdint.in.h
+/gettext-tools/libgettextpo/stdio-consolesafe.c
+/gettext-tools/libgettextpo/stdio-impl.h
 /gettext-tools/libgettextpo/stdio-read.c
 /gettext-tools/libgettextpo/stdio-write.c
 /gettext-tools/libgettextpo/stdio.in.h
@@ -302,6 +304,7 @@
 /gettext-tools/libgettextpo/string-desc-contains.c
 /gettext-tools/libgettextpo/string-desc.c
 /gettext-tools/libgettextpo/string-desc.h
+/gettext-tools/libgettextpo/string.c
 /gettext-tools/libgettextpo/string.in.h
 /gettext-tools/libgettextpo/strnlen.c
 /gettext-tools/libgettextpo/strstr.c
@@ -360,65 +363,9 @@
 /gettext-tools/libgettextpo/xstriconv.h
 /gettext-tools/libgettextpo/xvasprintf.c
 /gettext-tools/libgettextpo/xvasprintf.h
-/gettext-tools/libgrep/glthread/
 /gettext-tools/libgrep/gnulib-m4/
-/gettext-tools/libgrep/malloc/
-/gettext-tools/libgrep/Makefile.gnulib
-/gettext-tools/libgrep/_Noreturn.h
-/gettext-tools/libgrep/arg-nonnull.h
-/gettext-tools/libgrep/attribute.h
-/gettext-tools/libgrep/btowc.c
-/gettext-tools/libgrep/c++defs.h
-/gettext-tools/libgrep/cdefs.h
-/gettext-tools/libgrep/dynarray.h
-/gettext-tools/libgrep/fcntl.in.h
-/gettext-tools/libgrep/intprops-internal.h
-/gettext-tools/libgrep/intprops.h
-/gettext-tools/libgrep/inttypes.in.h
-/gettext-tools/libgrep/iswblank.c
-/gettext-tools/libgrep/iswctype-impl.h
-/gettext-tools/libgrep/iswctype.c
-/gettext-tools/libgrep/iswdigit.c
-/gettext-tools/libgrep/iswpunct.c
-/gettext-tools/libgrep/iswxdigit.c
-/gettext-tools/libgrep/langinfo.in.h
-/gettext-tools/libgrep/libc-config.h
-/gettext-tools/libgrep/limits.in.h
-/gettext-tools/libgrep/locale.in.h
-/gettext-tools/libgrep/localeconv.c
-/gettext-tools/libgrep/malloc.c
-/gettext-tools/libgrep/mbrlen.c
-/gettext-tools/libgrep/mbszero.c
-/gettext-tools/libgrep/mbtowc-impl.h
-/gettext-tools/libgrep/mbtowc.c
-/gettext-tools/libgrep/nl_langinfo.c
-/gettext-tools/libgrep/nl_langinfo-lock.c
-/gettext-tools/libgrep/pthread.in.h
-/gettext-tools/libgrep/pthread-once.c
-/gettext-tools/libgrep/regcomp.c
-/gettext-tools/libgrep/regex.c
-/gettext-tools/libgrep/regex.h
-/gettext-tools/libgrep/regex_internal.c
-/gettext-tools/libgrep/regex_internal.h
-/gettext-tools/libgrep/regexec.c
-/gettext-tools/libgrep/sched.in.h
-/gettext-tools/libgrep/stdckdint.in.h
-/gettext-tools/libgrep/stddef.in.h
-/gettext-tools/libgrep/stdint.in.h
-/gettext-tools/libgrep/stdlib.c
-/gettext-tools/libgrep/stdlib.in.h
-/gettext-tools/libgrep/sys_types.in.h
-/gettext-tools/libgrep/time.in.h
-/gettext-tools/libgrep/unistd.c
-/gettext-tools/libgrep/unistd.in.h
-/gettext-tools/libgrep/warn-on-use.h
-/gettext-tools/libgrep/wchar.in.h
-/gettext-tools/libgrep/wcrtomb.c
-/gettext-tools/libgrep/wctype-h.c
-/gettext-tools/libgrep/wctype-impl.h
-/gettext-tools/libgrep/wctype.c
-/gettext-tools/libgrep/wctype.in.h
-/gettext-tools/libgrep/windows-initguard.h
+/gettext-tools/libgrep/gnulib-lib/
+!/gettext-tools/libgrep/gnulib-lib/Makefile.am
 /gettext-tools/man/x-to-1.in
 /gettext-tools/tests/gnulib-m4/
 /gettext-tools/tests/gnulib-lib/
@@ -446,7 +393,15 @@
 /gettext-runtime/libasprintf/ChangeLog
 /gettext-tools/ChangeLog
 /gettext-tools/examples/ChangeLog
-# Files copied from gettext-runtime:
+# Files copied:
+/gettext-runtime/po/Makefile.in.in
+/gettext-runtime/po/Rules-quot
+/gettext-runtime/po/boldquot.sed
+/gettext-runtime/po/en@boldquot.header
+/gettext-runtime/po/en@quot.header
+/gettext-runtime/po/insert-header.sed
+/gettext-runtime/po/quot.sed
+/gettext-runtime/po/remove-potcdate.sed
 /gettext-tools/ABOUT-NLS
 /gettext-tools/po/Makefile.in.in
 /gettext-tools/po/Rules-quot
@@ -456,6 +411,7 @@
 /gettext-tools/po/insert-header.sed
 /gettext-tools/po/quot.sed
 /gettext-tools/po/remove-potcdate.sed
+/gettext-tools/examples/po/remove-potcdate.sed
 
 # Files generated by the autotools:
 /aclocal.m4
@@ -482,10 +438,12 @@
 /gettext-runtime/man/Makefile.in
 /gettext-runtime/src/Makefile.in
 /gettext-runtime/tests/Makefile.in
+/gettext-runtime/install-tests/Makefile.in
 /gettext-tools/aclocal.m4
 /gettext-tools/configure
 /gettext-tools/config.h.in
 /gettext-tools/Makefile.in
+/gettext-tools/autotools/Makefile.in
 /gettext-tools/doc/Makefile.in
 /gettext-tools/emacs/Makefile.in
 /gettext-tools/examples/aclocal.m4
@@ -503,6 +461,8 @@
 /gettext-tools/styles/Makefile.in
 /gettext-tools/system-tests/Makefile.in
 /gettext-tools/tests/Makefile.in
+/gettext-tools/wizard/Makefile.in
+/gettext-tools/install-tests/Makefile.in
 /gnulib-local/Makefile.in
 
 # Files generated by "make" and even kept by "make maintainer-clean":
@@ -529,6 +489,10 @@
 /gettext-runtime/man/gettext.1.html.in
 /gettext-runtime/man/ngettext.1.in
 /gettext-runtime/man/ngettext.1.html.in
+/gettext-runtime/man/printf_gettext.1.in
+/gettext-runtime/man/printf_gettext.1.html.in
+/gettext-runtime/man/printf_ngettext.1.in
+/gettext-runtime/man/printf_ngettext.1.html.in
 /gettext-runtime/man/bind_textdomain_codeset.3
 /gettext-runtime/man/bind_textdomain_codeset.3.html
 /gettext-runtime/man/bindtextdomain.3
@@ -541,6 +505,7 @@
 /gettext-runtime/man/textdomain.3.html
 /gettext-runtime/po/gettext-runtime.pot
 /gettext-runtime/po/stamp-po
+/gettext-tools/autotools/archive.*.tar.*
 /gettext-tools/doc/version.texi
 /gettext-tools/doc/stamp-vti
 /gettext-tools/doc/gettext.info
@@ -580,15 +545,20 @@
 /gettext-tools/man/msginit.1.html
 /gettext-tools/man/msgmerge.1
 /gettext-tools/man/msgmerge.1.html
+/gettext-tools/man/msgpre.1
+/gettext-tools/man/msgpre.1.html
 /gettext-tools/man/msgunfmt.1
 /gettext-tools/man/msgunfmt.1.html
 /gettext-tools/man/msguniq.1
 /gettext-tools/man/msguniq.1.html
+/gettext-tools/man/po-fetch.1
+/gettext-tools/man/po-fetch.1.html
 /gettext-tools/man/recode-sr-latin.1
 /gettext-tools/man/recode-sr-latin.1.html
+/gettext-tools/man/spit.1
+/gettext-tools/man/spit.1.html
 /gettext-tools/man/xgettext.1
 /gettext-tools/man/xgettext.1.html
-/gettext-tools/misc/archive.*.tar.*
 /gettext-tools/po/gettext-tools.pot
 /gettext-tools/po/stamp-po
 # Files generated by "make", using gperf:
@@ -682,6 +652,7 @@ autom4te.cache/
 # (see DISTCLEANFILES in Makefile.am):
 /gettext-runtime/src/gettext.sh
 /gettext-runtime/tests/Makefile
+/gettext-runtime/install-tests/Makefile
 /gettext-tools/Makefile
 /gettext-tools/config.h
 /gettext-tools/csharpcomp.sh
@@ -692,6 +663,10 @@ autom4te.cache/
 /gettext-tools/javaexec.sh
 /gettext-tools/libtool
 /gettext-tools/stamp-h1
+/gettext-tools/autotools/Makefile
+# (see DISTCLEANFILES in Makefile.am):
+/gettext-tools/autotools/autopoint
+/gettext-tools/autotools/convert-archive
 /gettext-tools/build-aux/xml-validate-10
 /gettext-tools/build-aux/xml-validate-11
 /gettext-tools/doc/Makefile
@@ -707,19 +682,20 @@ autom4te.cache/
 /gettext-tools/man/Makefile
 /gettext-tools/man/x-to-1
 /gettext-tools/misc/Makefile
-# (see DISTCLEANFILES in Makefile.am):
-/gettext-tools/misc/autopoint
-/gettext-tools/misc/convert-archive
-/gettext-tools/misc/gettextize
+/gettext-tools/misc/po-fetch
 /gettext-tools/po/Makefile.in
 /gettext-tools/po/Makefile
 /gettext-tools/projects/Makefile
 /gettext-tools/src/Makefile
+/gettext-tools/src/spit.py
 /gettext-tools/src/user-email
 /gettext-tools/styles/Makefile
 /gettext-tools/system-tests/Makefile
 /gettext-tools/tests/Makefile
 /gettext-tools/tests/init-env
+/gettext-tools/wizard/Makefile
+/gettext-tools/wizard/gettextize
+/gettext-tools/install-tests/Makefile
 /gnulib-local/Makefile
 
 # Directories generated by "make" and not distributed
@@ -755,16 +731,30 @@ autom4te.cache/
 /gettext-runtime/man/gettext.1.html
 /gettext-runtime/man/ngettext.1
 /gettext-runtime/man/ngettext.1.html
+/gettext-runtime/man/printf_gettext.1
+/gettext-runtime/man/printf_gettext.1.html
+/gettext-runtime/man/printf_ngettext.1
+/gettext-runtime/man/printf_ngettext.1.html
+/gettext-runtime/src/libgrtsrc.a
 /gettext-tools/libgrep/libgrep.a
 /gettext-tools/src/**/*.class
 /gettext-tools/src/gettext.jar
 /gettext-tools/src/libgettextsrc.la
+/gettext-tools/src/libxgettextts1.a
+/gettext-tools/src/libxgettextts2.a
+/gettext-tools/src/libxgettextts3.a
+/gettext-tools/src/libxgettextts4.a
+/gettext-tools/src/libxgettextts5.a
+/gettext-tools/src/libxgettextx.a
 /gettext-tools/src/msgfmt.net.exe
 /gettext-tools/src/msgfmt.net.exe.mdb
 /gettext-tools/src/msgfmt.net.pdb
 /gettext-tools/src/msgunfmt.net.exe
 /gettext-tools/src/msgunfmt.net.exe.mdb
 /gettext-tools/src/msgunfmt.net.pdb
+/gettext-tools/libgettextpo/gettext-po.h
+/gettext-tools/libgettextpo/libgnu.la
+/gettext-tools/libgettextpo/libgettextpo.la
 # Executables generated by "make":
 /gettext-runtime/src/envsubst
 /gettext-runtime/src/envsubst.exe
@@ -772,11 +762,10 @@ autom4te.cache/
 /gettext-runtime/src/gettext.exe
 /gettext-runtime/src/ngettext
 /gettext-runtime/src/ngettext.exe
-/gettext-runtime/tests/test-lock
-/gettext-runtime/tests/test-lock.exe
-/gettext-tools/libgettextpo/gettext-po.h
-/gettext-tools/libgettextpo/libgnu.la
-/gettext-tools/libgettextpo/libgettextpo.la
+/gettext-runtime/src/printf_gettext
+/gettext-runtime/src/printf_gettext.exe
+/gettext-runtime/src/printf_ngettext
+/gettext-runtime/src/printf_ngettext.exe
 /gettext-tools/src/cldr-plurals
 /gettext-tools/src/cldr-plurals.exe
 /gettext-tools/src/hostname
@@ -805,12 +794,16 @@ autom4te.cache/
 /gettext-tools/src/msginit.exe
 /gettext-tools/src/msgmerge
 /gettext-tools/src/msgmerge.exe
+/gettext-tools/src/msgpre
+/gettext-tools/src/msgpre.exe
 /gettext-tools/src/msgunfmt
 /gettext-tools/src/msgunfmt.exe
 /gettext-tools/src/msguniq
 /gettext-tools/src/msguniq.exe
 /gettext-tools/src/recode-sr-latin
 /gettext-tools/src/recode-sr-latin.exe
+/gettext-tools/src/spit
+/gettext-tools/src/spit.exe
 /gettext-tools/src/urlget
 /gettext-tools/src/urlget.exe
 /gettext-tools/src/xgettext
@@ -909,7 +902,6 @@ core
 /gettext-tools/tests/*.trs
 # Other.
 /gettext-runtime/intl/libgnuintl.h
-/gettext-runtime/intl/localename-table.h
 /gettext-runtime/libasprintf/autosprintf.h
 /gettext-runtime/po/??@*.insert-header
 /gettext-runtime/src/gettext.res
@@ -933,6 +925,7 @@ core
 /gettext-tools/doc/gettext.pgs
 /gettext-tools/doc/gettext.vr
 /gettext-tools/doc/gettext.vrs
+/gettext-tools/examples/po/*.gpo
 /gettext-tools/libgettextpo/config.h
 /gettext-tools/libgettextpo/alloca.h
 /gettext-tools/libgettextpo/assert.h
@@ -950,7 +943,6 @@ core
 /gettext-tools/libgettextpo/sched.h
 /gettext-tools/libgettextpo/signal.h
 /gettext-tools/libgettextpo/stdarg.h
-/gettext-tools/libgettextpo/stdbool.h
 /gettext-tools/libgettextpo/stdckdint.h
 /gettext-tools/libgettextpo/stddef.h
 /gettext-tools/libgettextpo/stdint.h
@@ -958,46 +950,24 @@ core
 /gettext-tools/libgettextpo/stdlib.h
 /gettext-tools/libgettextpo/string.h
 /gettext-tools/libgettextpo/sys/stat.h
-/gettext-tools/libgettextpo/sys/time.h
 /gettext-tools/libgettextpo/sys/types.h
 /gettext-tools/libgettextpo/textstyle.h
 /gettext-tools/libgettextpo/time.h
 /gettext-tools/libgettextpo/uchar.h
+/gettext-tools/libgettextpo/unicase.h
 /gettext-tools/libgettextpo/uniconv.h
 /gettext-tools/libgettextpo/unictype.h
 /gettext-tools/libgettextpo/unilbrk.h
+/gettext-tools/libgettextpo/uninorm.h
 /gettext-tools/libgettextpo/unistd.h
 /gettext-tools/libgettextpo/unistr.h
 /gettext-tools/libgettextpo/unitypes.h
 /gettext-tools/libgettextpo/uniwidth.h
 /gettext-tools/libgettextpo/wchar.h
 /gettext-tools/libgettextpo/wctype.h
-/gettext-tools/libgrep/fcntl.h
-/gettext-tools/libgrep/inttypes.h
-/gettext-tools/libgrep/langinfo.h
-/gettext-tools/libgrep/limits.h
-/gettext-tools/libgrep/locale.h
-/gettext-tools/libgrep/pthread.h
-/gettext-tools/libgrep/sched.h
-/gettext-tools/libgrep/stdbool.h
-/gettext-tools/libgrep/stdckdint.h
-/gettext-tools/libgrep/stddef.h
-/gettext-tools/libgrep/stdint.h
-/gettext-tools/libgrep/stdlib.h
-/gettext-tools/libgrep/time.h
-/gettext-tools/libgrep/unistd.h
-/gettext-tools/libgrep/wchar.h
-/gettext-tools/libgrep/wctype.h
-/gettext-tools/libgrep/sys/types.h
 /gettext-tools/po/??@*.insert-header
 /gettext-tools/src/gettext.res
-/gettext-tools/src/libxgettextts1.a
-/gettext-tools/src/libxgettextts2.a
-/gettext-tools/src/libxgettextts3.a
-/gettext-tools/src/libxgettextts4.a
-/gettext-tools/src/libxgettextx.a
 /gettext-tools/src/textstyle.h
-/gettext-tools/src/textstyle/stdbool.h
 /gettext-tools/src/textstyle/version.h
 /gettext-tools/src/textstyle/woe32dll.h
 

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "gnulib"]
 	path = gnulib
-	url = git://git.sv.gnu.org/gnulib.git
+	url = git://git.savannah.gnu.org/gnulib.git

AUTHORS

@@ -91,3 +91,6 @@ Assigns past and future changes.
 GETTEXT         John Darrington
 Assigns past and future changes.
 (No contributions so far.)
+
+GETTEXT         Michele Locati
+Assigns past and future changes.

Admin/release-steps

@@ -121,9 +121,11 @@ We assume that the following environment variables are set:
     gettext-runtime/src/gettext.c
     gettext-runtime/src/gettext.sh.in
     gettext-runtime/src/ngettext.c
-    gettext-tools/misc/autopoint.in
-    gettext-tools/misc/convert-archive.in
-    gettext-tools/misc/gettextize.in
+    gettext-runtime/src/printf_gettext.c
+    gettext-runtime/src/printf_ngettext.c
+    gettext-tools/wizard/gettextize.in
+    gettext-tools/autotools/autopoint.in
+    gettext-tools/autotools/convert-archive.in
     gettext-tools/src/cldr-plurals.c
     gettext-tools/src/hostname.c
     gettext-tools/src/msgattrib.c
@@ -138,9 +140,12 @@ We assume that the following environment variables are set:
     gettext-tools/src/msggrep.c
     gettext-tools/src/msginit.c
     gettext-tools/src/msgmerge.c
+    gettext-tools/src/msgpre.c
     gettext-tools/src/msgunfmt.c
     gettext-tools/src/msguniq.c
     gettext-tools/src/recode-sr-latin.c
+    gettext-tools/src/spit.c
+    gettext-tools/src/spit.py.in
     gettext-tools/src/urlget.c
     gettext-tools/src/xgettext.c
 
@@ -159,44 +164,17 @@ We assume that the following environment variables are set:
 
     Update ARCHIVE_VERSION.
 
-  - gettext-tools/misc/autopoint.in
+  - gettext-tools/autotools/autopoint.in
 
     Update the 'case' statement around line 395 to include the latest release.
 
 ** If you got any translation updates, update translations:
 
-    wget --mirror --level=1 -nd -nv -A.po -P gettext-runtime/po/new \
-         https://translationproject.org/latest/gettext-runtime/
-  Optionally merge:
-    cd gettext-runtime/po
-    make update-po
-    cd new
-    for f in *.po; do msgmerge --update --lang=${f%.po} --previous --width=80 $f ../gettext-runtime.pot; done
-    mv *.po ../
-    cd ..; rm -rf new
+    (cd gettext-runtime/po && ./fetch-po)
+    (cd gettext-tools/po && ./fetch-po)
+    (cd gettext-tools/examples/po && ./fetch-po)
 
-    wget --mirror --level=1 -nd -nv -A.po -P gettext-tools/po/new \
-         https://translationproject.org/latest/gettext-tools/
-  Optionally merge:
-    cd gettext-tools/po
-    make update-po
-    cd new
-    for f in *.po; do msgmerge --update --lang=${f%.po} --previous --width=80 $f ../gettext-tools.pot; done
-    mv *.po ../
-    cd ..; rm -rf new
-
-    wget --mirror --level=1 -nd -nv -A.po -P gettext-tools/examples/po/new \
-         https://translationproject.org/latest/gettext-examples/
-  Optionally merge:
-    cd gettext-tools/examples/po
-    make update-po
-    cd new
-    for f in *.po; do msgmerge --update --lang=${f%.po} --previous --width=80 $f ../gettext-examples.pot; done
-    mv *.po ../
-    cd ..; rm -rf new
-
-  Adjust LINGUAS files if any of the languages has been added or
-  removed since the last release.  Commit the changes.
+    Commit the changes.
 
 ** Create a release:
 
@@ -217,7 +195,7 @@ We assume that the following environment variables are set:
 
   Make 'autopoint' work in the new release:
 
-    (cd gettext-tools/misc
+    (cd gettext-tools/autotools
      ./add-to-archive ../../gettext-$CURRENT_VERSION.tar.gz)
 
   Update the examples:
@@ -256,6 +234,8 @@ We assume that the following environment variables are set:
     Then check the build infrastructure of the examples by running
       $ cd gettext-tools/examples
       $ ./check-examples
+    (This currently does not work with GCC 15 for the hello-go* examples,
+    due to <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119098>.)
 
   Finally really make the release tarball:
 
@@ -276,16 +256,6 @@ We assume that the following environment variables are set:
     gnulib/build-aux/gnupload --to ftp.gnu.org:gettext \
                               gettext-$CURRENT_VERSION.tar.{gz,xz,lz}
 
-** Upload autopoint archive to alpha.gnu.org:
-
-  This is needed to compile git master after the release (as
-  autopull.sh fetches the archive).
-
-    xz -c -e < gettext-tools/misc/archive.dir.tar > archive.dir-$CURRENT_VERSION.tar.xz
-    gnulib/build-aux/gnupload \
-      --to alpha.gnu.org:gettext \
-      --symlink-regex archive.dir-$CURRENT_VERSION.tar.xz
-
 ** Finally:
 
     rm -f .tarball-version

DEPENDENCIES

@@ -37,15 +37,14 @@ The following packages should be installed before GNU gettext is installed
 
 * libxml2
   + Recommended.
-    Needed for 'xgettext' and 'msgfmt', so that it can parse XML
-    files.  Also needed for the --color option of the various
-    programs.
+    Needed for 'xgettext' and 'msgfmt', so that it can parse XML files.
+    Also needed for the --color option of the various programs.
     If not present, a subset of libxml2 (included in this package) will be
     compiled into libgettextlib.
   + Homepage:
-    http://xmlsoft.org/
+    https://gitlab.gnome.org/GNOME/libxml2/-/wikis/home
   + Download:
-    ftp://xmlsoft.org/libxml2/
+    https://download.gnome.org/sources/libxml2/
   + Pre-built package name:
     - On Debian and Debian-based systems: libxml2-dev,
     - On Red Hat distributions: libxml2-devel.
@@ -53,6 +52,36 @@ The following packages should be installed before GNU gettext is installed
   + If it is installed in a nonstandard directory, pass the option
     --with-libxml2-prefix=DIR to 'configure'.
 
+* libjson-c 0.13 or newer
+  + Recommended.
+    Needed for machine translation.
+    If not present, 'spit' will be a Python script instead of an executable.
+  + Homepage:
+    https://github.com/json-c/json-c/wiki
+  + Download:
+    https://s3.amazonaws.com/json-c_releases/releases/index.html
+  + Pre-built package name:
+    - On Debian and Debian-based systems: libjson-c-dev,
+    - On Red Hat distributions: json-c-devel.
+    - Other: https://repology.org/project/json-c/versions
+  + When building with the MS Visual C/C++ tool chain, version 0.19 or newer
+    is required.
+
+* libcurl
+  + Recommended.
+    Needed for machine translation.
+    If not present, 'spit' will be a Python script instead of an executable.
+  + Homepage:
+    https://curl.se/libcurl/
+  + Download:
+    https://curl.se/download.html
+  + Pre-built package name:
+    - On Debian and Debian-based systems: libcurl4-gnutls-dev or libcurl4-openssl-dev,
+    - On Red Hat distributions: libcurl-devel.
+    - Other: https://repology.org/project/curl/versions
+  + When building against a static libcurl on Windows, you need to include
+    "-DCURL_STATICLIB" in the CPPFLAGS.
+
 * libacl
   + Recommended on Linux systems.
     Needed so that the creation of backup files respects the access control
@@ -66,18 +95,18 @@ The following packages should be installed before GNU gettext is installed
     - On Red Hat distributions: acl, libacl-devel.
     - Other: https://repology.org/project/acl/versions
 
-  * libattr
-    + Recommended on Linux systems.
-      Needed so that the creation of backup files respects the access control
-      lists (ACLs) set on the original files, with fewer system calls.
-    + Homepage:
-      https://savannah.nongnu.org/projects/attr/
-    + Download:
-      https://download.savannah.nongnu.org/releases/attr/
-    + Pre-built package name:
-      - On Debian and Debian-based systems: libattr1-dev,
-      - On Red Hat distributions: libattr-devel.
-      - Other: https://repology.org/project/attr/versions
+* libattr
+  + Recommended on Linux systems.
+    Needed so that the creation of backup files respects the access control
+    lists (ACLs) set on the original files, with fewer system calls.
+  + Homepage:
+    https://savannah.nongnu.org/projects/attr/
+  + Download:
+    https://download.savannah.nongnu.org/releases/attr/
+  + Pre-built package name:
+    - On Debian and Debian-based systems: libattr1-dev,
+    - On Red Hat distributions: libattr-devel.
+    - Other: https://repology.org/project/attr/versions
 
 * A Java runtime and compiler (e.g. OpenJDK, AdoptOpenJDK, or kaffe).
   + Recommended.
@@ -266,6 +295,29 @@ The following packages should be installed when GNU gettext is installed
   + Download:
     https://ftp.gnu.org/gnu/gnulib/gnulib-l10n-*
 
+* Python 3.7 or newer.
+  + Recommended if GNU Gettext was built without libjson-c or without libcurl.
+    Needed for machine translation.
+  + Homepage:
+    https://www.python.org/
+  + Download:
+    https://www.python.org/downloads/
+  + Pre-built package name:
+    - On Debian and Debian-based systems: python3,
+    - On Red Hat distributions: python3.
+    - Other: https://repology.org/project/python/versions
+* The Python module 'requests'.
+  + Recommended if GNU Gettext was built without libjson-c or without libcurl.
+    Needed for machine translation.
+  + Homepage:
+    https://pypi.org/project/requests/
+  + Download:
+    https://pypi.org/project/requests/#files
+  + Pre-built package name:
+    - On Debian and Debian-based systems: python3-requests,
+    - On Red Hat distributions: python-requests.
+    - Other: https://repology.org/project/python%3Arequests/versions
+
 
 The following should be installed when GNU gettext is built, but are not
 needed later, once it is installed (build dependencies, but not runtime

HACKING

@@ -163,6 +163,12 @@ are skipped. To this effect, you need to install also:
       - On Debian and Debian-based systems: gobjc,
       - On Red Hat distributions: gcc-objc.
       - Other: https://repology.org/project/gcc/versions
+  * The Boost C++ library
+    + Homepage: https://www.boost.org/
+    + Pre-built package name:
+      - On Debian and Debian-based systems: libboost1.83-dev,
+      - On Red Hat distributions: boost.
+      - Other: https://repology.org/project/boost/versions
 
   * Python
     + Homepage: https://www.python.org/
@@ -310,6 +316,19 @@ are skipped. To this effect, you need to install also:
       - On Red Hat distributions: --.
       - Other: https://repology.org/project/fpc/versions
 
+  * OCaml
+    + Homepage: https://ocaml.org/
+    + Pre-built package name:
+      - On Debian and Debian-based systems: ocaml,
+      - On Red Hat distributions: ocaml.
+      - Other: https://repology.org/project/ocaml/versions
+  * The OCaml package manager
+    + Homepage: https://opam.ocaml.org/
+    + Pre-built package name:
+      - On Debian and Debian-based systems: opam,
+      - On Red Hat distributions: --.
+      - Other: https://repology.org/project/opam/versions
+
   * GNU smalltalk
     + Homepage: http://smalltalk.gnu.org/
     + Pre-built package name:
@@ -442,6 +461,63 @@ build results here:
   https://gitlab.com/gnu-gettext/ci-distcheck/-/jobs?scope=finished
 
 
+Coding Style
+============
+
+For C source code:
+
+* Follow the portability guidelines
+  https://www.gnu.org/software/gnulib/manual/html_node/Portability-guidelines.html
+
+* Use mixed declarations and statements, as appropriate. (This is supported
+  since C99.)
+
+* Note: You can't put a label before a declaration, such as in
+    retry:
+      int foo = ...;
+  This is supported only in C23 or newer. Instead, add an empty statement:
+    retry: ;
+      int foo = ...;
+  Similarly, you can't put a declaration immediately after a case label, such
+  as in
+    case 1:
+      int foo = ...;
+      ...
+      break;
+  Again, this is supported only in C23 or newer. Instead, use a sub-block:
+    case 1:
+      {
+        int foo = ...;
+        ...
+      }
+      break;
+
+* In function definitions and blocks, the pre-C99 style "declare all variables
+  upfront" is discouraged.
+  Instead, the following style elements are encouraged (for local non-static
+  variables):
+    - Move the declaration of a variable to its initialization.
+    - Reduce the scope of variables:
+      . If a variable is only used in a sub-block, declare it in that sub-block.
+      . If a variable is only used in several sub-blocks and has a separate
+        initialization in each of the sub-blocks, declare it in each of these
+        sub-blocks. It's actually several independent variables.
+      . If a variable is only used in a small part of a function definition or
+        block (say, 1/3 of it or less), you may surround that part (including
+        the variable's initialization) with braces, so that it becomes clear
+        that the variable is not used in the rest of the function / block.
+    - Usually, try to declare and initialize variables right when they are
+      needed for the first time, not several computation steps before.
+  The rationale is:
+    - It follows the general principle "Put related things close together."
+    - A function with 3 blocks that each has 4 variables is easier to
+      understand than a function that has 12 variables, and where the
+      reader has to find out which variable is used where.
+    - Variables may represent state, and it is the state and the control flow
+      that contribute to the complexity of a function.
+  Only static variables are better kept declared upfront in a function or block.
+
+
 Submitting patches
 ==================
 
@@ -450,8 +526,8 @@ list.  You can subscribe to the mailing list, or see the list
 archives, by following links from
 https://savannah.gnu.org/mail/?group=gettext .
 
-To email a patch you can use a shell command like 'git format-patch
--1' to create a file, and then attach the file to your email.  
+To email a patch you can use a shell command like 'git format-patch -1'
+to create a file, and then attach the file to your email.
 
 GNU gettext development no longer stores descriptions of new changes
 in ChangeLog files.  Instead, a single ChangeLog file is generated

INSTALL

@@ -26,7 +26,7 @@ Here, you can give as arguments to 'configure'
     described in the INSTALL.generic file.
 
 If you are in a 64-bit multilib system with support for building 32-bit
-binaries, you can build a 32-bit poke configuring like this:
+binaries, you can build 32-bit binaries by configuring like this:
 
   $ ../configure CC="gcc -m32"
 

INSTALL.windows

@@ -78,10 +78,6 @@ There are three ways to create binaries of this package for Microsoft Windows:
    (api-ms-win*.dll) through the Windows Update mechanism, see
    https://support.microsoft.com/en-us/kb/2999226 .
 
-   Another constraint is that shared libraries built as part of this package
-   may not work (at least with MSVC 14.0).  Therefore, you will need to pass
-   the configure option '--disable-shared' when building this package.
-
    This recipe requires MS Visual C/C++ 9.0 or newer.
    You don't need the Visual Studio IDE, just the C/C++ tool chain.
    As of 2016, you can install the MS Visual C/C++ 14.0 tool chain from
@@ -176,6 +172,7 @@ There are three ways to create binaries of this package for Microsoft Windows:
       win32_target=_WIN32_WINNT_WIN8    # possibly for MSVC >= 10.0
 
       ./configure --host=i686-w64-mingw32 --prefix=/usr/local/msvc32 \
+            --with-included-libunistring \
             CC="$HOME/msvc/compile cl -nologo" \
             CFLAGS="-MD" \
             CXX="$HOME/msvc/compile cl -nologo" \
@@ -202,6 +199,7 @@ There are three ways to create binaries of this package for Microsoft Windows:
       win32_target=_WIN32_WINNT_WIN8    # possibly for MSVC >= 10.0
 
       ./configure --host=x86_64-w64-mingw32 --prefix=/usr/local/msvc64 \
+            --with-included-libunistring \
             CC="$HOME/msvc/compile cl -nologo" \
             CFLAGS="-MD" \
             CXX="$HOME/msvc/compile cl -nologo" \

Makefile.am

@@ -66,15 +66,23 @@ $(srcdir)/configure: $(srcdir)/gettext-runtime/configure.ac $(srcdir)/gettext-to
 
 distcheck-hook:
 # Verify that some files are the same.
-	cmp -s $(srcdir)/gettext-runtime/po/Makefile.in.in $(srcdir)/gettext-tools/po/Makefile.in.in
-	cmp -s $(srcdir)/gettext-runtime/po/Rules-quot $(srcdir)/gettext-tools/po/Rules-quot
-	cmp -s $(srcdir)/gettext-runtime/po/boldquot.sed $(srcdir)/gettext-tools/po/boldquot.sed
-	cmp -s $(srcdir)/gettext-runtime/po/quot.sed $(srcdir)/gettext-tools/po/quot.sed
-	cmp -s $(srcdir)/gettext-runtime/po/en@quot.header $(srcdir)/gettext-tools/po/en@quot.header
-	cmp -s $(srcdir)/gettext-runtime/po/en@boldquot.header $(srcdir)/gettext-tools/po/en@boldquot.header
-	cmp -s $(srcdir)/gettext-runtime/po/insert-header.sed $(srcdir)/gettext-tools/po/insert-header.sed
-	cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sed $(srcdir)/gettext-tools/po/remove-potcdate.sed
-	cmp -s $(srcdir)/gettext-runtime/po/remove-potcdate.sed $(srcdir)/gettext-tools/examples/po/remove-potcdate.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Makefile.in.in $(srcdir)/gettext-runtime/po/Makefile.in.in
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Rules-quot $(srcdir)/gettext-runtime/po/Rules-quot
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/boldquot.sed $(srcdir)/gettext-runtime/po/boldquot.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/quot.sed $(srcdir)/gettext-runtime/po/quot.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@quot.header $(srcdir)/gettext-runtime/po/en@quot.header
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@boldquot.header $(srcdir)/gettext-runtime/po/en@boldquot.header
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/insert-header.sed $(srcdir)/gettext-runtime/po/insert-header.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed $(srcdir)/gettext-runtime/po/remove-potcdate.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Makefile.in.in $(srcdir)/gettext-tools/po/Makefile.in.in
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/Rules-quot $(srcdir)/gettext-tools/po/Rules-quot
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/boldquot.sed $(srcdir)/gettext-tools/po/boldquot.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/quot.sed $(srcdir)/gettext-tools/po/quot.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@quot.header $(srcdir)/gettext-tools/po/en@quot.header
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/en@boldquot.header $(srcdir)/gettext-tools/po/en@boldquot.header
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/insert-header.sed $(srcdir)/gettext-tools/po/insert-header.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed $(srcdir)/gettext-tools/po/remove-potcdate.sed
+	cmp -s $(srcdir)/gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed $(srcdir)/gettext-tools/examples/po/remove-potcdate.sed
 	cmp -s $(srcdir)/gettext-runtime/m4/build-to-host.m4 $(srcdir)/gettext-tools/gnulib-m4/build-to-host.m4
 	cmp -s $(srcdir)/gettext-runtime/m4/gettext.m4 $(srcdir)/gettext-tools/gnulib-m4/gettext.m4
 	cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man

NEWS

@@ -1,3 +1,141 @@
+Version 1.0 - January 2026
+
+# Improvements for maintainers and distributors:
+  * In a po/ directory, the PO files are now exactly those that the
+    translators submitted or committed in version control, or a
+    translation project's daemon committed on behalf of the translators.
+    They are no longer regularly updated with respect to the POT file
+    in the same directory.
+
+    The advantage for maintainers is that the maintainer may commit the
+    PO files in version control, without getting
+      - lots of modified files shown by "git status",
+      - frequent merge conflicts when merging between branches,
+      - a voluminous version control history.
+
+    The advantage for distributors is that the role of files in a
+    release tarball are clearer: The PO files are source code, whereas
+    the POT file and the *.gmo files are generated files.
+
+    ATTENTION translators!
+    Translators who work directly on a package's source code (without
+    going through a translation project) now need to run "msginit"
+    before starting work on a PO file.
+
+  * A new program 'po-fetch' is provided, that fetches the translated
+    PO files from a translation project's site on the internet, and
+    updates the LINGUAS file accordingly.
+
+  * In a po/ directory, a new script 'fetch-po' is now added by 'gettextize'.
+    It provides the standard interface for fetching the translated PO files.
+    It typically either invokes the 'po-fetch' program or does nothing.
+
+# Improvements for translators:
+  * msginit:
+    - When the PO file already exists, 'msginit' now updates it w.r.t. the
+      POT file, like 'msgmerge' would do. Previously, 'msginit' failed with
+      an error message in this situation.
+
+  * Pretranslation:
+    - Two new programs, 'msgpre' and 'spit', are provided, that implement
+      machine translation through a locally installed Large Language Model
+      (LLM).  'msgpre' applies to an entire PO file, 'spit' to a single
+      message.
+    - The documentation has a new chapter "Pretranslation".
+
+# Improvements for maintainers:
+  * xgettext:
+    - The refactoring suggestion when a translatable string contains an URL
+      or email address can now be inhibited through a command-line option
+      '--no-check=url' or '--no-check=email', or through a comment in the
+      source code of the form
+          /* xgettext: no-url-check */
+      or
+          /* xgettext: no-email-check */
+
+# Programming languages support:
+  * OCaml:
+    - xgettext now supports OCaml.
+    - 'msgfmt -c' now verifies the syntax of translations of OCaml format
+      strings.
+    - A new example 'hello-ocaml' has been added.
+  * Rust:
+    - xgettext now recognizes 'gettextrs::gettext' invocations, like 'gettext'
+      invocations.
+
+# libgettextpo library:
+  * The function 'po_message_get_format' now supports distinguishing whether
+    a negative format string mark, such as 'no-c-format', is set or not.
+  * The new functions
+      po_message_has_workflow_flag
+      po_message_set_workflow_flag
+      po_message_workflow_flags_iterator, po_flag_next, po_flag_iterator_free
+    can be used to manipulate or inspect the workflow flags of a message.
+  * The new functions
+      po_message_has_sticky_flag
+      po_message_set_sticky_flag
+      po_message_sticky_flags_iterator, po_flag_next, po_flag_iterator_free
+    can be used to manipulate or inspect the sticky flags of a messsage.
+
+# Emacs PO mode:
+  Restore syntax highlighting in Emacs version 30 or newer.
+
+Version 0.26 - July 2025
+
+# Programming languages support:
+  * JavaScript:
+    - xgettext now parses regular expressions with character classes
+      correctly.
+  * C, C++, Python, JavaScript, EmacsLisp, librep, Go, Ruby, awk, D, Tcl,
+    Perl, PHP:
+    - xgettext's heuristic recognition of format strings has been improved:
+      strings like "100% complete" (with a space flag in a format directive)
+      are no longer flagged as format strings by default, unless they occur
+      in a context that requires a format string.  You can override this
+      heuristic by using a comment of the form /* xgettext: c-format */.
+  * Shell:
+    - The documentation now mentions two other approaches for
+      internationalizing messages with parameters in shell scripts.
+    - xgettext now recognizes format strings in the 'printf' command syntax.
+      They are marked as 'sh-printf-format' in POT and PO files.
+    - Two new programs 'printf_gettext' and 'printf_ngettext' are provided,
+      that do formatted output with a localized format string in a more
+      efficient way (without spawning a subshell).
+    - xgettext now recognizes the \c, \u, and \U escape sequences in dollar-
+      single-quoted strings $'...'.
+
+# Improvements for maintainers:
+  * xgettext:
+    - When extracting a message with plural that is some format string,
+      xgettext now verifies that the msgid and msgid_plural are compatible
+      as format strings.  For most format string types, this still allows
+      omitting from msgid a placeholder that is used in msgid_plural.  But
+      when a placeholder is used in both msgid and msgid_plural, its type
+      must be the same in both.
+    - xgettext now suggests a refactoring when a translatable string
+      contains an URL or email address.
+
+# Improvements for translators:
+  * msggrep:
+    - msggrep accepts two new options -W/--workflow-flags and -S/--sticky-flags
+      that allow to select only messages that have a specified flag.
+
+# Bug fixes:
+  - The AM_GNU_GETTEXT macro now rejects the dysfunctional gettext() function
+    in libc of Solaris 11.[0-3], Solaris OpenIndiana, and Solaris OmniOS.
+  - The AM_GNU_GETTEXT macro now recognizes, on MSVC, the GNU libintl built
+    as a shared library.
+
+Version 0.25.1 - July 2025
+
+# Bug fixes:
+  - autopoint no longer fails if configure.ac contains no
+    AM_GNU_GETTEXT_VERSION or AM_GNU_GETTEXT_REQUIRE_VERSION invocation.
+  - nls.m4 is installed again under $PREFIX/share/aclocal/.
+
+# Portability:
+  - Building on native Windows with MSVC and --enable-shared is now supported.
+
 Version 0.25 - May 2025
 
 # Programming languages support:
@@ -676,7 +814,7 @@ Version 0.18.3 - July 2013
     set of formatting methods nor translation functions, the
     implementation supports only a limited set of formatting methods
     and translation functions commonly used in Gjs and other popular
-    JavaScript implemenations and libraries.
+    JavaScript implementations and libraries.
 
   - Lua:
     xgettext now supports Lua, using Ľubomír Remák's lua-gettext.
@@ -792,7 +930,7 @@ Version 0.18 - May 2010
   version 0.12.
 
 * msgfilter now sets environment variables during the invocation of the
-  filter, indicating the msgid and location of the messge being processed.
+  filter, indicating the msgid and location of the message being processed.
 
 * xgettext now can extract plural forms from Qt 4 programs. The recommended
   xgettext command-line options for this case are:

PACKAGING

@@ -76,13 +76,19 @@ the following file list.
 
       $prefix/bin/gettext
       $prefix/bin/ngettext
+      $prefix/bin/printf_gettext
+      $prefix/bin/printf_ngettext
       $prefix/bin/envsubst
       $prefix/bin/gettext.sh
       $prefix/share/man/man1/gettext.1
       $prefix/share/man/man1/ngettext.1
+      $prefix/share/man/man1/printf_gettext.1
+      $prefix/share/man/man1/printf_ngettext.1
       $prefix/share/man/man1/envsubst.1
       $prefix/share/doc/gettext/gettext.1.html
       $prefix/share/doc/gettext/ngettext.1.html
+      $prefix/share/doc/gettext/printf_gettext.1.html
+      $prefix/share/doc/gettext/printf_ngettext.1.html
       $prefix/share/doc/gettext/envsubst.1.html
       $prefix/share/locale/*/LC_MESSAGES/gettext-runtime.mo
 
@@ -131,17 +137,23 @@ the following file list.
       $prefix/bin/xgettext
       $prefix/bin/gettextize
       $prefix/bin/autopoint
+      $prefix/bin/po-fetch
       $prefix/bin/recode*
+      $prefix/bin/spit
       $prefix/share/man/man1/msg*.1
       $prefix/share/man/man1/xgettext.1
       $prefix/share/man/man1/gettextize.1
       $prefix/share/man/man1/autopoint.1
+      $prefix/share/man/man1/po-fetch.1
       $prefix/share/man/man1/recode*.1
+      $prefix/share/man/man1/spit.1
       $prefix/share/doc/gettext/msg*.1.html
       $prefix/share/doc/gettext/xgettext.1.html
       $prefix/share/doc/gettext/gettextize.1.html
       $prefix/share/doc/gettext/autopoint.1.html
+      $prefix/share/doc/gettext/po-fetch.1.html
       $prefix/share/doc/gettext/recode*.1.html
+      $prefix/share/doc/gettext/spit.1.html
       $prefix/share/doc/gettext/gettext_*.html
       $prefix/share/doc/gettext/FAQ.html
       $prefix/share/doc/gettext/tutorial.html
@@ -181,6 +193,7 @@ the following file list.
       $prefix/share/gettext/archive.cvs.tar.*   (only installed if --with-cvs specified)
       $prefix/share/gettext/disclaim-translations.txt
       $prefix/share/gettext-$VERSION/its/*
+      $prefix/share/aclocal/nls.m4
       $prefix/share/emacs/site-lisp/po-compat.el
       $prefix/share/emacs/site-lisp/po-compat.elc
       $prefix/share/emacs/site-lisp/po-mode.el

autogen.sh

@@ -4,7 +4,7 @@
 # also regenerates all aclocal.m4, config.h.in, Makefile.in, configure files
 # with new versions of autoconf or automake.
 #
-# This script requires autoconf-2.64..2.72 and automake-1.13..1.17 in the PATH.
+# This script requires autoconf-2.64..2.72 and automake-1.13..1.18 in the PATH.
 
 # Copyright (C) 2003-2025 Free Software Foundation, Inc.
 #
@@ -21,9 +21,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# Prerequisite (if not used from a released tarball): either
-#   - the GNULIB_SRCDIR environment variable pointing to a gnulib checkout, or
-#   - a preceding invocation of './autopull.sh'.
+# Prerequisite (if not used from a released tarball):
+#   - A preceding invocation of './autopull.sh'.
+#   - If the GNULIB_SRCDIR environment variable was set during the
+#     './autopull.sh' invocation, pointing to a gnulib checkout, it should
+#     still be set now, during the './autogen.sh' invocation.
 #
 # Usage: ./autogen.sh [--skip-gnulib]
 #
@@ -99,25 +101,36 @@ if ! $skip_gnulib; then
     basename-lgpl
     binary-io
     bool
+    c-ctype
+    c-strtold
     closeout
     error
-    getopt-gnu
+    fzprintf-posix
     gettext-h
     havelib
+    mbrtoc32
+    mbszero
     memmove
     noreturn
+    options
     progname
     propername
+    quote
     relocatable-prog
     setlocale
     sigpipe
+    stdint-h
     stdio-h
     stdlib-h
+    strtoimax
+    strtold
     strtoul
+    strtoumax
     unistd-h
     unlocked-io
     xalloc
     xstring-buffer
+    xstrtold
   '
   GNULIB_MODULES_RUNTIME_OTHER='
     gettext-runtime-misc
@@ -205,7 +218,6 @@ if ! $skip_gnulib; then
     gcd
     getaddrinfo
     getline
-    getopt-gnu
     getrusage
     gettext-h
     gocomp-script
@@ -234,6 +246,7 @@ if ! $skip_gnulib; then
     open
     opendir
     openmp-init
+    options
     pipe-filter-ii
     progname
     propername
@@ -313,34 +326,118 @@ if ! $skip_gnulib; then
   '
   # Common dependencies of GNULIB_MODULES_TOOLS_FOR_SRC and GNULIB_MODULES_TOOLS_FOR_LIBGREP.
   GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES='
+    absolute-header
+    alignasof
     alloca-opt
+    assert-h
+    attribute
+    basename-lgpl
     bool
+    btowc
+    builtin-expect
+    c99
+    calloc-gnu
+    calloc-posix
+    cloexec
+    close
+    double-slash-root
+    dup2
+    errno-h
+    error
+    error-h
+    exitfail
     extensions
+    extensions-aix
+    extern-inline
+    fcntl
+    fcntl-h
+    fd-hook
+    filename
+    flexmember
+    fstat
+    gen-header
+    getdtablesize
+    getprogname
     gettext-h
+    gnulib-i18n
+    hard-locale
+    ialloc
+    idx
     include_next
-    locale-h
+    intprops
+    inttypes-h-incomplete
+    iswblank
+    iswctype
+    iswdigit
+    iswpunct
+    iswxdigit
+    largefile
+    libc-config
+    limits-h
     localcharset
+    localeconv
+    locale-h
+    lock
+    lstat
+    malloca
+    malloc-gnu
     malloc-posix
     mbrtowc
     mbsinit
+    mbszero
+    mbtowc
+    memchr
+    memcmp
+    memmove
+    minmax
+    msvc-inval
+    msvc-nothrow
     multiarch
+    obstack
+    once
+    open
+    pathmax
+    pthread-h
+    pthread-once
+    reallocarray
+    realloc-posix
+    sched-h
     setlocale-null
+    setlocale-null-unlocked
     snippet/arg-nonnull
     snippet/c++defs
+    snippet/_Noreturn
     snippet/warn-on-use
     ssize_t
+    stat
+    stat-time
+    stdckdint-h
     stddef-h
+    std-gnu11
     stdint-h
+    stdio-h
     stdlib-h
     streq
+    strerror
+    strerror-override
+    string-h
+    sys_stat-h
+    sys_types-h
+    threadlib
+    time-h
     unistd-h
+    vararrays
     verify
     wchar-h
+    wctype
     wctype-h
     windows-mutex
     windows-once
     windows-recmutex
     windows-rwlock
+    xalloc
+    xalloc-die
+    xalloc-oversized
   '
   GNULIB_MODULES_TOOLS_OTHER='
     gettext-tools-misc
@@ -368,18 +465,21 @@ if ! $skip_gnulib; then
   GNULIB_MODULES_LIBGETTEXTLIB="$GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES $GNULIB_MODULES_TOOLS_OTHER"
   $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --tests-base=gnulib-tests --makefile-name=Makefile.gnulib --libtool --with-tests --local-dir=gnulib-local --local-symlink \
     --import \
+    --avoid=float-h-tests \
     --avoid=hashcode-string1 \
     --avoid=fdutimensat-tests --avoid=futimens-tests --avoid=utime-tests --avoid=utimens-tests --avoid=utimensat-tests \
-    --avoid=array-list-tests --avoid=linked-list-tests --avoid=linkedhash-list-tests \
+    --avoid=array-list-tests --avoid=array-map-tests --avoid=array-oset-tests --avoid=carray-list-tests --avoid=linked-list-tests --avoid=linkedhash-list-tests \
+    --avoid=uninorm/decomposing-form-tests \
     `for m in $GNULIB_MODULES_TOOLS_LIBUNISTRING_TESTS; do echo --avoid=$m; done` \
     $GNULIB_MODULES_LIBGETTEXTLIB || exit $?
   $GNULIB_TOOL --copy-file m4/libtextstyle.m4 gettext-tools/gnulib-m4/libtextstyle.m4 || exit $?
   # In gettext-tools/libgrep:
   GNULIB_MODULES_TOOLS_FOR_LIBGREP='
+    kwset
     mbrlen
     regex
   '
-  $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --lib=libgrep --source-base=libgrep --m4-base=libgrep/gnulib-m4 --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP --makefile-name=Makefile.gnulib --local-dir=gnulib-local --local-symlink \
+  $GNULIB_TOOL --dir=gettext-tools --macro-prefix=grgl --source-base=libgrep/gnulib-lib --m4-base=libgrep/gnulib-m4 --makefile-name=Makefile.gnulib --witness-c-macro=IN_GETTEXT_TOOLS_LIBGREP --local-dir=gnulib-local --local-symlink \
     --import \
     `for m in $GNULIB_MODULES_TOOLS_FOR_SRC_COMMON_DEPENDENCIES; do \
        if test \`$GNULIB_TOOL --extract-applicability $m\` != all; then \
@@ -512,7 +612,7 @@ if ! $skip_gnulib; then
   done
 
   # Fetch INSTALL.generic.
-  $GNULIB_TOOL --copy-file doc/INSTALL.UTF-8 INSTALL.generic
+  $GNULIB_TOOL --copy-file doc/INSTALL.UTF-8 INSTALL.generic || exit $?
 fi
 
 # Make sure we get new versions of files brought in by automake.
@@ -546,6 +646,16 @@ aclocal -I ../../m4 -I ../m4 -I gnulib-m4 \
   || exit $?
 cd "$dir0"
 
+echo "$0: copying common files to gettext-runtime..."
+cp -p gettext-tools/wizard/po-templates/traditional/Makefile.in.in gettext-runtime/po/Makefile.in.in
+cp -p gettext-tools/wizard/po-templates/traditional/Rules-quot gettext-runtime/po/Rules-quot
+cp -p gettext-tools/wizard/po-templates/traditional/boldquot.sed gettext-runtime/po/boldquot.sed
+cp -p gettext-tools/wizard/po-templates/traditional/quot.sed gettext-runtime/po/quot.sed
+cp -p gettext-tools/wizard/po-templates/traditional/en@quot.header gettext-runtime/po/en@quot.header
+cp -p gettext-tools/wizard/po-templates/traditional/en@boldquot.header gettext-runtime/po/en@boldquot.header
+cp -p gettext-tools/wizard/po-templates/traditional/insert-header.sed gettext-runtime/po/insert-header.sed
+cp -p gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed gettext-runtime/po/remove-potcdate.sed
+
 echo "$0: generating configure in gettext-runtime..."
 cd gettext-runtime
 aclocal -I m4 -I ../m4 -I gnulib-m4 \
@@ -574,16 +684,17 @@ aclocal -I ../../gettext-runtime/m4 -I ../../m4 \
   || exit $?
 cd "$dir0"
 
-echo "$0: copying common files from gettext-runtime to gettext-tools..."
+echo "$0: copying common files to gettext-tools..."
 cp -p gettext-runtime/ABOUT-NLS gettext-tools/ABOUT-NLS
-cp -p gettext-runtime/po/Makefile.in.in gettext-tools/po/Makefile.in.in
-cp -p gettext-runtime/po/Rules-quot gettext-tools/po/Rules-quot
-cp -p gettext-runtime/po/boldquot.sed gettext-tools/po/boldquot.sed
-cp -p gettext-runtime/po/quot.sed gettext-tools/po/quot.sed
-cp -p gettext-runtime/po/en@quot.header gettext-tools/po/en@quot.header
-cp -p gettext-runtime/po/en@boldquot.header gettext-tools/po/en@boldquot.header
-cp -p gettext-runtime/po/insert-header.sed gettext-tools/po/insert-header.sed
-cp -p gettext-runtime/po/remove-potcdate.sed gettext-tools/po/remove-potcdate.sed
+cp -p gettext-tools/wizard/po-templates/traditional/Makefile.in.in gettext-tools/po/Makefile.in.in
+cp -p gettext-tools/wizard/po-templates/traditional/Rules-quot gettext-tools/po/Rules-quot
+cp -p gettext-tools/wizard/po-templates/traditional/boldquot.sed gettext-tools/po/boldquot.sed
+cp -p gettext-tools/wizard/po-templates/traditional/quot.sed gettext-tools/po/quot.sed
+cp -p gettext-tools/wizard/po-templates/traditional/en@quot.header gettext-tools/po/en@quot.header
+cp -p gettext-tools/wizard/po-templates/traditional/en@boldquot.header gettext-tools/po/en@boldquot.header
+cp -p gettext-tools/wizard/po-templates/traditional/insert-header.sed gettext-tools/po/insert-header.sed
+cp -p gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed gettext-tools/po/remove-potcdate.sed
+cp -p gettext-tools/wizard/po-templates/traditional/remove-potcdate.sed gettext-tools/examples/po/remove-potcdate.sed
 
 echo "$0: generating configure in gettext-tools..."
 cd gettext-tools

autopull.sh

@@ -20,10 +20,6 @@
 # This script requires:
 #   - Wget
 #   - XZ Utils
-#
-# In addition, it fetches the archive.dir.tar.gz file, which contains
-# data files used by the autopoint program.  If you already have the
-# file, place it under gettext-tools/misc, before running this script.
 
 # Usage: ./autopull.sh
 
@@ -32,23 +28,6 @@
 
 ./gitsub.sh pull || exit 1
 
-# Fetch gettext-tools/misc/archive.dir.tar.
-if ! test -f gettext-tools/misc/archive.dir.tar; then
-  if ! test -f gettext-tools/misc/archive.dir.tar.xz; then
-    echo "$0: getting gettext-tools/misc/archive.dir.tar..."
-    wget -q --timeout=5 -O gettext-tools/misc/archive.dir.tar.xz-t "https://alpha.gnu.org/gnu/gettext/archive.dir-latest.tar.xz" \
-      && mv gettext-tools/misc/archive.dir.tar.xz-t gettext-tools/misc/archive.dir.tar.xz
-    retval=$?
-    rm -f gettext-tools/misc/archive.dir.tar.xz-t
-    test $retval -eq 0 || exit $retval
-  fi
-  xz -d -c < gettext-tools/misc/archive.dir.tar.xz > gettext-tools/misc/archive.dir.tar-t \
-    && mv gettext-tools/misc/archive.dir.tar-t gettext-tools/misc/archive.dir.tar
-  retval=$?
-  rm -f gettext-tools/misc/archive.dir.tar-t
-  test $retval -eq 0 || exit $retval
-fi
-
 # func_git_clone_shallow SUBDIR URL REVISION
 func_git_clone_shallow ()
 {
@@ -89,6 +68,7 @@ TREE_SITTER_VERSION=0.23.2
 TREE_SITTER_GO_VERSION=0.23.4
 TREE_SITTER_RUST_VERSION=0.23.2
 TREE_SITTER_TYPESCRIPT_VERSION=0.23.2
+TREE_SITTER_OCAML_VERSION=0.23.2
 TREE_SITTER_D_VERSION=0.8.2
 # Cache the relevant source code. Erase the rest of the tree-sitter projects.
 test -d gettext-tools/tree-sitter-$TREE_SITTER_VERSION || {
@@ -135,6 +115,20 @@ test -d gettext-tools/tree-sitter-typescript-$TREE_SITTER_TYPESCRIPT_VERSION ||
   mv gettext-tools/tree-sitter-typescript-$TREE_SITTER_TYPESCRIPT_VERSION/tsx/src/scanner.c gettext-tools/tree-sitter-typescript-$TREE_SITTER_TYPESCRIPT_VERSION/tsx/src/tsx-scanner.c
   rm -rf tree-sitter-typescript
 }
+test -d gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION || {
+  func_git_clone_shallow tree-sitter-ocaml https://github.com/tree-sitter/tree-sitter-ocaml.git v$TREE_SITTER_OCAML_VERSION
+  (cd tree-sitter-ocaml && patch -p1) < gettext-tools/build-aux/tree-sitter-ocaml-portability.diff
+  mkdir gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION
+  mkdir gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/common
+  mkdir gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars
+  mkdir gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars/ocaml
+  mv tree-sitter-ocaml/LICENSE gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/LICENSE
+  mv tree-sitter-ocaml/common/scanner.h gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/common/scanner.h
+  mv tree-sitter-ocaml/grammars/ocaml/src gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars/ocaml/src
+  mv gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars/ocaml/src/parser.c gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars/ocaml/src/ocaml-parser.c
+  mv gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars/ocaml/src/scanner.c gettext-tools/tree-sitter-ocaml-$TREE_SITTER_OCAML_VERSION/grammars/ocaml/src/ocaml-scanner.c
+  rm -rf tree-sitter-ocaml
+}
 test -d gettext-tools/tree-sitter-d-$TREE_SITTER_D_VERSION || {
   func_git_clone_shallow tree-sitter-d https://github.com/gdamore/tree-sitter-d.git v$TREE_SITTER_D_VERSION
   (cd tree-sitter-d && patch -p1) < gettext-tools/build-aux/tree-sitter-d-portability.diff
@@ -151,6 +145,7 @@ TREE_SITTER_VERSION=$TREE_SITTER_VERSION
 TREE_SITTER_GO_VERSION=$TREE_SITTER_GO_VERSION
 TREE_SITTER_RUST_VERSION=$TREE_SITTER_RUST_VERSION
 TREE_SITTER_TYPESCRIPT_VERSION=$TREE_SITTER_TYPESCRIPT_VERSION
+TREE_SITTER_OCAML_VERSION=$TREE_SITTER_OCAML_VERSION
 TREE_SITTER_D_VERSION=$TREE_SITTER_D_VERSION
 EOF
 

build-aux/ac-help.sed

@@ -1,5 +1,5 @@
 # Sed script for post-processing the trace output of subordinate configures.
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,6 +13,8 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
+#
+# Written by Bruno Haible.
 
 # Replace invocations of some libtool macros.
 s|.AC_ENABLE_SHARED_DEFAULT.|yes|g

build-aux/jar-cf

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Creating a Java archive (.jar).
 
-# Copyright (C) 2024 Free Software Foundation, Inc.
+# Copyright (C) 2024-2026 Free Software Foundation, Inc.
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-# Written by Bruno Haible <bruno@clisp.org>, 2024.
+# Written by Bruno Haible.
 
 # func_usage
 # outputs to stdout the --help usage message.
@@ -40,7 +40,7 @@ Send patches and bug reports to <bug-gettext@gnu.org>."
 func_version ()
 {
   echo "jar-cf (GNU gettext)"
-  echo "Copyright (C) 2024 Free Software Foundation, Inc.
+  echo "Copyright (C) 2026 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>
 This is free software: you are free to change and redistribute it.
 There is NO WARRANTY, to the extent permitted by law."
@@ -94,13 +94,16 @@ top_srcdir="$2"
 shift
 shift
 
+# Unset CDPATH.  Otherwise, output from 'cd dir' can surprise callers.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
 if $jar_program --help 2>&1 | grep '\--date=' >/dev/null; then
   # The JAR_PROGRAM supports the --date option. Its effect is to set the given
   # date as time stamp on all the ELEMENTs and also the META-INF/MANIFEST.MF.
   # Use it, for reproducibility (cf. <https://reproducible-builds.org/>).
   if test -d "$top_srcdir/.git"; then
     # We are in a git checkout. Use the date of the latest commit.
-    date=`git log -n 1 --date=iso --format=fuller | sed -n -e 's/^CommitDate: //p' | sed -e 's/ /T/' -e 's/ \(...\)\(..\)$/\1:\2/'`
+    date=`cd "$top_srcdir" && git log -n 1 --date=iso --format=fuller | sed -n -e 's/^CommitDate: //p' | sed -e 's/ /T/' -e 's/ \(...\)\(..\)$/\1:\2/'`
   else
     # We are building from a tarball.
     # Use the date of the first entry of the ChangeLog file.

build-aux/ltmain.sh

@@ -2,11 +2,11 @@
 ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
 ##               by inline-source v2019-02-19.15
 
-# libtool (GNU libtool) 2.5.4
+# libtool (GNU libtool) 2.6.0
 # Provide generalized library-building support services.
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996-2019, 2021-2024 Free Software Foundation, Inc.
+# Copyright (C) 1996-2019, 2021-2025 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -31,8 +31,8 @@
 
 PROGRAM=libtool
 PACKAGE=libtool
-VERSION=2.5.4
-package_revision=2.5.4
+VERSION=2.6.0
+package_revision=2.6.0
 
 
 ## ------ ##
@@ -2215,7 +2215,7 @@ func_version ()
 # End:
 
 # Set a version string.
-scriptversion='(GNU libtool) 2.5.4'
+scriptversion='(GNU libtool) 2.6.0'
 
 # func_version
 # ------------
@@ -2299,6 +2299,22 @@ func_help ()
     func_usage_message
     $ECHO "$long_help_message
 
+If a TAG is supplied, it must use one of the tag names below:
+
+    Tag Name        Language Name
+       CC              C
+       CXX             C++
+       OBJC            Objective-C
+       OBJCXX          Objective-C++
+       GCJ             Java
+       F77             Fortran 77
+       FC              Fortran
+       GO              Go
+       RC              Windows Resource
+
+If you do not see a tag name associated with your programming language, then
+you are using a compiler that $progname does not support.
+
 MODE must be one of the following:
 
        clean           remove files from the build directory
@@ -2326,7 +2342,7 @@ include the following information:
        autoconf:       `($AUTOCONF --version) 2>/dev/null |$SED 1q`
 
 Report bugs to <bug-libtool@gnu.org>.
-GNU libtool home page: <https://www.gnu.org/software/libtool/>.
+GNU libtool home page: <https://www.gnu.org/s/libtool/>.
 General help using GNU software: <https://www.gnu.org/gethelp/>."
     exit 0
 }
@@ -2723,7 +2739,7 @@ libtool_validate_options ()
     case $host_os in
       # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
       # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
-      cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2*)
+      cygwin* | mingw* | windows* | pw32* | cegcc* | solaris2* | os2* | *linux*)
         # don't eliminate duplications in $postdeps and $predeps
         opt_duplicate_compiler_generated_deps=:
         ;;
@@ -2999,8 +3015,9 @@ func_infer_tag ()
 	# was found and let the user know that the "--tag" command
 	# line option must be used.
 	if test -z "$tagname"; then
-	  func_echo "unable to infer tagged configuration"
-	  func_fatal_error "specify a tag with '--tag'"
+	  func_echo "unable to infer tagged configuration with compiler."
+	  func_echo "Possible use of unsupported compiler."
+	  func_fatal_error "specify a tag with '--tag'. For more information, try '$progname --help'."
 #	else
 #	  func_verbose "using $tagname tagged configuration"
 	fi
@@ -3162,13 +3179,41 @@ func_convert_core_msys_to_w32 ()
 {
   $debug_cmd
 
-  # awkward: cmd appends spaces to result
+  # Compatibility for original MSYS
+  if test "Xone" = "X$lt_cv_cmd_slashes"; then
+  func_convert_core_msys_to_w32_result=`( cmd /c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+  else # Assume 'lt_cv_cmd_slashes = "two"'
   func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
     $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+  fi
+  if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_convert_core_msys_to_w32_result=
+  fi
 }
 #end: func_convert_core_msys_to_w32
 
 
+# func_convert_core_msys_to_w32_with_cygpath ARG
+# Convert file name or path ARG with cygpath from MSYS format to w32
+# format. Return result in func_convert_core_msys_to_w32_with_cygpath_result.
+func_convert_core_msys_to_w32_with_cygpath ()
+{
+  $debug_cmd
+
+  # Since MSYS2 is packaged with cygpath, call cygpath in $PATH; no need
+  # to use LT_CYGPATH in this case.
+  func_convert_core_msys_to_w32_result=`cygpath "$@" 2>/dev/null |
+	$SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
+  if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_convert_core_msys_to_w32_result=
+  fi
+}
+#end: func_convert_core_msys_to_w32_with_cygpath
+
+
 # func_convert_file_check ARG1 ARG2
 # Verify that ARG1 (a file name in $build format) was converted to $host
 # format in ARG2. Otherwise, emit an error message, but continue (resetting
@@ -3303,8 +3348,13 @@ func_convert_file_msys_to_w32 ()
 
   func_to_host_file_result=$1
   if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_to_host_file_result=$func_convert_core_msys_to_w32_result
+    if test "Xyes" = "X$cygpath_installed"; then
+      func_convert_core_msys_to_w32_with_cygpath -w "$1"
+      func_to_host_file_result=$func_convert_core_msys_to_w32_with_cygpath_result
+    else
+      func_convert_core_msys_to_w32 "$1"
+      func_to_host_file_result=$func_convert_core_msys_to_w32_result
+    fi
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
 }
@@ -3355,8 +3405,13 @@ func_convert_file_msys_to_cygwin ()
 
   func_to_host_file_result=$1
   if test -n "$1"; then
-    func_convert_core_msys_to_w32 "$1"
-    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    if test "Xyes" = "X$cygpath_installed"; then
+      func_convert_core_msys_to_w32_with_cygpath -w "$1"
+      func_cygpath -u "$func_convert_core_msys_to_w32_with_cygpath_result"
+    else
+      func_convert_core_msys_to_w32 "$1"
+      func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    fi
     func_to_host_file_result=$func_cygpath_result
   fi
   func_convert_file_check "$1" "$func_to_host_file_result"
@@ -3457,8 +3512,13 @@ func_convert_path_msys_to_w32 ()
     # and winepath ignores them completely.
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    if test "Xyes" = "X$cygpath_installed"; then
+      func_convert_core_msys_to_w32_with_cygpath -w -p "$func_to_host_path_tmp1"
+      func_to_host_path_result=$func_convert_core_msys_to_w32_with_cygpath_result
+    else
+      func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+      func_to_host_path_result=$func_convert_core_msys_to_w32_result
+    fi
     func_convert_path_check : ";" \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
     func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -3522,8 +3582,13 @@ func_convert_path_msys_to_cygwin ()
     # See func_convert_path_msys_to_w32:
     func_stripname : : "$1"
     func_to_host_path_tmp1=$func_stripname_result
-    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
-    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    if test "Xyes" = "X$cygpath_installed"; then
+      func_convert_core_msys_to_w32_with_cygpath -w -p "$func_to_host_path_tmp1"
+      func_cygpath -u -p "$func_convert_core_msys_to_w32_with_cygpath_result"
+    else
+      func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+      func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    fi
     func_to_host_path_result=$func_cygpath_result
     func_convert_path_check : : \
       "$func_to_host_path_tmp1" "$func_to_host_path_result"
@@ -4455,6 +4520,14 @@ func_mode_finish ()
       fi
       echo
 
+      echo "After a 'make install' for many GNU/Linux systems, 'ldconfig LIBDIR'"
+      echo "may need to be executed to help locate newly installed libraries,"
+      echo "but you should consult with a system administrator before updating"
+      echo "the shared library cache as this should be done with great care"
+      echo "and consideration. (See the 'Platform-specific configuration notes'"
+      echo "section of the documentation for more information.)"
+      echo
+
       echo "See any operating system documentation about shared libraries for"
       case $host in
 	solaris2.[6789]|solaris2.1[0-9])
@@ -4529,7 +4602,7 @@ func_mode_install ()
 	  prev=$arg
 	fi
 	;;
-      -g | -m | -o)
+      -g | -m | -o | -S | -t)
 	prev=$arg
 	;;
       -s)
@@ -5045,7 +5118,7 @@ extern \"C\" {
 
 	  # Prepare the list of exported symbols
 	  if test -z "$export_symbols"; then
-	    export_symbols=$output_objdir/$outputname.exp
+	    export_symbols=$output_objdir/$outputname.expsym
 	    $opt_dry_run || {
 	      $RM $export_symbols
 	      eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
@@ -5058,8 +5131,8 @@ extern \"C\" {
 	    }
 	  else
 	    $opt_dry_run || {
-	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
-	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+	      eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.expsym"'
+	      eval '$GREP -f "$output_objdir/$outputname.expsym" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
 	        *cygwin* | *mingw* | *windows* | *cegcc* )
@@ -5979,6 +6052,7 @@ int setenv (const char *, const char *, int);
 # define getcwd  _getcwd
 # define putenv  _putenv
 # define S_IXUSR _S_IEXEC
+# define MSVC_ISDIR(m)(((m) & S_IFMT) == S_IFDIR)
 #elif defined __MINGW32__
 # define setmode _setmode
 # define stat    _stat
@@ -6374,8 +6448,13 @@ check_executable (const char *path)
   if ((!path) || (!*path))
     return 0;
 
-  if ((stat (path, &st) >= 0)
+#ifdef _MSC_VER
+  if ((stat (path, &st) >= 0) && !MSVC_ISDIR (st.st_mode)
       && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+#else
+  if ((stat (path, &st) >= 0) && !S_ISDIR (st.st_mode)
+      && (st.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)))
+#endif
     return 1;
   else
     return 0;
@@ -7280,8 +7359,13 @@ func_mode_link ()
 	  continue
 	  ;;
 	xlinker)
-	  func_append linker_flags " $qarg"
-	  func_append compiler_flags " $wl$qarg"
+	  func_append linker_flags "$qarg,"
+	  # Args in the var 'compiler_flags' causes warnings in MSVC
+	  func_cc_basename "$CC"
+	  case $func_cc_basename_result in
+	    cl|cl.exe) ;;
+	    *) func_append compiler_flags " $wl$qarg" ;;
+	  esac
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -7525,8 +7609,6 @@ func_mode_link ()
 	*-*-cygwin* | *-*-mingw* | *-*-windows* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
 	  # The PATH hackery in wrapper scripts is required on Windows
 	  # and Darwin in order for the loader to find any dlls it needs.
-	  func_warning "'-no-install' is ignored for $host"
-	  func_warning "assuming '-no-fast-install' instead"
 	  fast_install=no
 	  ;;
 	*) no_install=yes ;;
@@ -7648,6 +7730,11 @@ func_mode_link ()
 	arg=$func_stripname_result
 	;;
 
+	-Wl,--as-needed|-Wl,--no-as-needed)
+	deplibs="$deplibs $arg"
+	continue
+	;;
+
       -Wl,*)
 	func_stripname '-Wl,' '' "$arg"
 	args=$func_stripname_result
@@ -7657,8 +7744,13 @@ func_mode_link ()
 	  IFS=$save_ifs
           func_quote_arg pretty "$flag"
 	  func_append arg " $wl$func_quote_arg_result"
-	  func_append compiler_flags " $wl$func_quote_arg_result"
-	  func_append linker_flags " $func_quote_arg_result"
+	  # Args in the var 'compiler_flags' causes warnings in MSVC
+	  func_cc_basename "$CC"
+	  case $func_cc_basename_result in
+	     cl|cl.exe) ;;
+	     *) func_append compiler_flags " $wl$func_quote_arg_result" ;;
+	  esac
+	  func_append linker_flags "$func_quote_arg_result,"
 	done
 	IFS=$save_ifs
 	func_stripname ' ' '' "$arg"
@@ -7704,6 +7796,7 @@ func_mode_link ()
       # @file                GCC response files
       # -tp=*                Portland pgcc target processor selection
       # --sysroot=*          for sysroot support
+      # --target=*           for target architecture support
       # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       # -specs=*             GCC specs files
       # -stdlib=*            select c++ std lib with clang
@@ -7721,15 +7814,15 @@ func_mode_link ()
       # --unwindlib=*        select unwinder library with clang
       # -f{file|debug|macro|profile}-prefix-map=* needed for lto linking
       # -Wa,*                Pass flags directly to the assembler
-      # -Werror, -Werror=*   Report (specified) warnings as errors
+      # -W*                  Warnings, needed for lto
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*|--target=*| \
       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-no-canonical-prefixes| \
       -stdlib=*|-rtlib=*|--unwindlib=*| \
       -specs=*|-fsanitize=*|-fno-sanitize*|-shared-libsan|-static-libsan| \
       -ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*| \
       -fdiagnostics-color*|-frecord-gcc-switches| \
-      -fuse-ld=*|-static-*|-fcilkplus|-Wa,*|-Werror|-Werror=*)
+      -fuse-ld=*|-static-*|-fcilkplus|-W*)
         func_quote_arg pretty "$arg"
 	arg=$func_quote_arg_result
         func_append compile_command " $arg"
@@ -8070,6 +8163,15 @@ func_mode_link ()
 	lib=
 	found=false
 	case $deplib in
+	-Wl,--as-needed|-Wl,--no-as-needed)
+	   if test prog,link = "$linkmode,$pass"; then
+         compile_deplibs="$deplib $compile_deplibs"
+         finalize_deplibs="$deplib $finalize_deplibs"
+       else
+         deplibs="$deplib $deplibs"
+       fi
+       continue
+       ;;
 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
         |-threads|-fopenmp|-fopenmp=*|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test prog,link = "$linkmode,$pass"; then
@@ -8228,8 +8330,15 @@ func_mode_link ()
 	  fi
 	  case $linkmode in
 	  lib)
-	    # Linking convenience modules into shared libraries is allowed,
-	    # but linking other static libraries is non-portable.
+	    # Linking convenience modules and compiler provided static libraries
+	    # into shared libraries is allowed, but linking other static
+	    # libraries is non-portable.
+	    case $deplib in
+	      */libgcc*.$libext | */libclang_rt*.$libext)
+		deplibs="$deplib $deplibs"
+		continue
+	      ;;
+	    esac
 	    case " $dlpreconveniencelibs " in
 	    *" $deplib "*) ;;
 	    *)
@@ -9312,29 +9421,21 @@ func_mode_link ()
 	esac
 
 	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "CURRENT '$current' must be a nonnegative integer"
+	if echo "$current" | $EGREP -v '(^0$)|(^[1-9]$)|(^[1-9][0-9]{1,4}$)' > /dev/null; then
+	  func_error "CURRENT '$current' must be a nonnegative integer and <= 5 digits"
 	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
+	fi
 
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "REVISION '$revision' must be a nonnegative integer"
+	# Currently limiting revision length by Unix epoch time in nanoseconds.
+	if echo "$revision" | $EGREP -v '(^0$)|(^[1-9]$)|(^[1-9][0-9]{1,18}$)' > /dev/null; then
+	  func_error "REVISION '$revision' must be a nonnegative integer and <= 19 digits"
 	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
+	fi
 
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  func_error "AGE '$age' must be a nonnegative integer"
+	if echo "$age" | $EGREP -v '(^0$)|(^[1-9]$)|(^[1-9][0-9]{1,4}$)' > /dev/null; then
+	  func_error "AGE '$age' must be a nonnegative integer and <= 5 digits"
 	  func_fatal_error "'$vinfo' is not valid version information"
-	  ;;
-	esac
+	fi
 
 	if test "$age" -gt "$current"; then
 	  func_error "AGE '$age' is greater than the current interface number '$current'"
@@ -10022,7 +10123,7 @@ func_mode_link ()
 	if test -z "$export_symbols"; then
 	  if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
 	    func_verbose "generating symbol list for '$libname.la'"
-	    export_symbols=$output_objdir/$libname.exp
+	    export_symbols=$output_objdir/$libname.expsym
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs=$IFS; IFS='~'
@@ -10288,7 +10389,7 @@ func_mode_link ()
 
 	    ${skipped_export-false} && {
 	      func_verbose "generating symbol list for '$libname.la'"
-	      export_symbols=$output_objdir/$libname.exp
+	      export_symbols=$output_objdir/$libname.expsym
 	      $opt_dry_run || $RM $export_symbols
 	      libobjs=$output
 	      # Append the command to create the export file.

check-copyright-headers

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2019-2025 Free Software Foundation, Inc.
+# Copyright (C) 2019-2026 Free Software Foundation, Inc.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,6 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #
+# Written by Bruno Haible.
 
 # This script checks whether the files in the GNU gettext package
 # have the required copyright headers resp. license notices.
@@ -111,6 +112,11 @@ func_check_file ()
       # These are a mostly data.  They don't have much programmer expression.
       return 0 ;;
 
+    */LINGUAS )
+      # These are generated files that contain only data.
+      # They don't have any programmer expression.
+      return 0 ;;
+
     */ChangeLog* )
       # ChangeLog files are convenience information, not worth sueing for.
       return 0 ;;
@@ -161,7 +167,7 @@ func_check_file ()
       # This is a form, used for communication with the FSF.
       return 0 ;;
 
-    /gettext-tools/misc/archive.dir.tar )
+    /gettext-tools/autotools/archive.dir.tar )
       # This is an archive of files that were part of earlier gettext releases.
       # As a binary file, it cannot have a copyright header.
       return 0 ;;

gettext-runtime/AUTHORS

@@ -1,2 +1,3 @@
 Ulrich Drepper wrote the intl subdirectory.
-Bruno Haible added the intl-java and libasprintf subdirectories.
+Bruno Haible added the intl-java, intl-csharp, intl-d, intl-modula2, and
+libasprintf subdirectories.

gettext-runtime/Makefile.am

@@ -26,7 +26,7 @@ SUBDIR_libasprintf = libasprintf
 else
 SUBDIR_libasprintf =
 endif
-SUBDIRS = doc intl intl-java intl-csharp intl-d intl-modula2 gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests
+SUBDIRS = doc intl intl-java intl-csharp intl-d intl-modula2 gnulib-lib $(SUBDIR_libasprintf) src po man m4 tests install-tests
 
 EXTRA_DIST = BUGS
 
@@ -52,15 +52,17 @@ EXTRA_DIST += INSTALL.windows
 # Hidden from automake, but really activated. Works around an automake bug.
 #distdir: distdir1
 .PHONY: distdir1
-distdir1: man/gettext.1 man/ngettext.1 man/envsubst.1
-man/gettext.1 man/ngettext.1 man/envsubst.1: gen-man1
+distdir1: man/gettext.1 man/ngettext.1 man/printf_gettext.1 man/printf_ngettext.1 man/envsubst.1
+man/gettext.1 man/ngettext.1 man/printf_gettext.1 man/printf_ngettext.1 man/envsubst.1: gen-man1
 .PHONY: gen-man1
 gen-man1: src/gettext.c man/gettext.x \
           src/ngettext.c man/ngettext.x \
+          src/printf_gettext.c man/printf_gettext.x \
+          src/printf_ngettext.c man/printf_ngettext.x \
           src/envsubst.c man/envsubst.x
 	cd gnulib-lib && $(MAKE) $(AM_MAKEFLAGS)
-	cd src && $(MAKE) $(AM_MAKEFLAGS) gettext$(EXEEXT) ngettext$(EXEEXT) envsubst$(EXEEXT)
-	cd man && $(MAKE) $(AM_MAKEFLAGS) gettext.1 ngettext.1 envsubst.1
+	cd src && $(MAKE) $(AM_MAKEFLAGS) gettext$(EXEEXT) ngettext$(EXEEXT) printf_gettext$(EXEEXT) printf_ngettext$(EXEEXT) envsubst$(EXEEXT)
+	cd man && $(MAKE) $(AM_MAKEFLAGS) gettext.1 ngettext.1 printf_gettext.1 printf_ngettext.1 envsubst.1
 
 
 maintainer-update-po: $(top_builddir)/config.status

gettext-runtime/NEWS

@@ -1,3 +1,9 @@
+Version 0.26 - July 2025
+
+* Two new programs 'printf_gettext' and 'printf_ngettext' are provided,
+  that do formatted output with a localized format string in a more
+  efficient way (without spawning a subshell).
+
 Version 0.25 - April 2025
 
 * New library: libintl_d.a contains the runtime for using GNU gettext

gettext-runtime/configure.ac

@@ -1,5 +1,5 @@
 dnl Configuration for the gettext-runtime directory of GNU gettext
-dnl Copyright (C) 1995-2025 Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2026 Free Software Foundation, Inc.
 dnl
 dnl This program is free software: you can redistribute it and/or modify
 dnl it under the terms of the GNU General Public License as published by
@@ -149,6 +149,10 @@ else
   is_woe32dll=no
 fi
 AM_CONDITIONAL([WOE32DLL], [test $is_woe32dll = yes])
+if test $is_woe32dll = yes; then
+  AC_DEFINE([WOE32DLL], [1],
+    [Define when --enable-shared is used on Windows.])
+fi
 
 dnl Put some default definitions into config.h.
 AH_BOTTOM([
@@ -158,11 +162,9 @@ AH_BOTTOM([
    the C macro DLL_EXPORT (together with PIC) when compiling for a shared
    library (called DLL under Windows) and does not define it when compiling
    an object file meant to be linked statically into some executable.  */
-#if (defined _WIN32 || defined __CYGWIN__) && defined DLL_EXPORT && !defined IN_RELOCWRAPPER
-# define DLL_VARIABLE __declspec (dllimport)
-#else
-# define DLL_VARIABLE
-#endif
+/* But in the scope of this configure file (gettext-runtime/ without intl and
+   libasprintf), there is no shared library.  So it's simple.  */
+#define DLL_VARIABLE
 
 /* Extra OS/2 (emx+gcc) defines.  */
 #if defined __EMX__ && !defined __KLIBC__
@@ -218,17 +220,6 @@ AC_SUBST([CROSS_COMPILING])
 dnl Checks for optional programs for the tests/lang-* tests.
 gl_PROG_ANSI_CXX([CXX], [ANSICXX])
 
-dnl Checks for special libraries for the tests/test-lock test.
-dnl On some systems, sched_yield is in librt, rather than in libpthread.
-LIBSCHED=
-if test $gl_threads_api = posix; then
-  dnl Solaris has sched_yield in librt, not in libpthread or libc.
-  AC_CHECK_LIB([rt], [sched_yield], [LIBSCHED=-lrt],
-    [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt.
-     AC_CHECK_LIB([posix4], [sched_yield], [LIBSCHED=-lposix4])])
-fi
-AC_SUBST([LIBSCHED])
-
 dnl Determine whether to build libasprintf.
 AC_ARG_ENABLE([libasprintf],
   [  --disable-libasprintf   do not build libasprintf],
@@ -247,6 +238,26 @@ dnl Determine variables used by uninstalled-config.sh.
 ENABLE_SHARED="$enable_shared"
 AC_SUBST([ENABLE_SHARED])
 
+dnl Test for features used in install-tests.
+dnl shlibpath_var and PATH_SEPARATOR are set by LT_INIT.
+if test $USE_INCLUDED_LIBINTL = yes; then
+  INSTALLED_LIBINTL="-lintl $LIBICONV $INTL_MACOSX_LIBS $INTL_WINDOWS_LIBS"
+else
+  INSTALLED_LIBINTL=
+fi
+AC_SUBST([INSTALLED_LIBINTL])
+AC_SUBST([PATH_SEPARATOR])
+if test -n "${shlibpath_var}"; then
+  if test "${shlibpath_var}" = PATH; then
+    AUGMENT_SHLIBPATH="PATH='\$(bindir)'${PATH_SEPARATOR}\"\$\$PATH\";"
+  else
+    AUGMENT_SHLIBPATH="${shlibpath_var}='\$(libdir)':\"\$\$${shlibpath_var}\"; export ${shlibpath_var};"
+  fi
+else
+  AUGMENT_SHLIBPATH=
+fi
+AC_SUBST([AUGMENT_SHLIBPATH])
+
 AC_CONFIG_SUBDIRS([intl])
 
 AC_CONFIG_SUBDIRS([libasprintf])
@@ -280,4 +291,6 @@ AC_CONFIG_FILES([m4/Makefile])
 
 AC_CONFIG_FILES([tests/Makefile])
 
+AC_CONFIG_FILES([install-tests/Makefile])
+
 AC_OUTPUT

gettext-runtime/doc/Makefile.am

@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/doc subdirectory of GNU gettext
-## Copyright (C) 1995-1997, 2001-2003, 2006 Free Software Foundation, Inc.
+## Copyright (C) 1995-2025 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -21,4 +21,9 @@ EXTRA_DIST =
 
 EXTRA_DIST += nls.texi matrix.texi
 
-EXTRA_DIST += rt-gettext.texi rt-ngettext.texi rt-envsubst.texi
+EXTRA_DIST += \
+  rt-gettext.texi \
+  rt-ngettext.texi \
+  rt-printf_gettext.texi \
+  rt-printf_ngettext.texi \
+  rt-envsubst.texi

gettext-runtime/doc/nls.texi

@@ -12,7 +12,7 @@ as a file named @code{ABOUT-NLS}.
 @strong{ NOTE: } This documentation section is outdated.  It it included
 here for historical purposes only.
 
-@set STATUS May 2025
+@set STATUS July 2025
 
 Free software is going international!  The Free Translation Project is
 a way to get maintainers of free software, translators, and users all

gettext-runtime/doc/rt-gettext.texi

@@ -1,5 +1,5 @@
 @c This file is part of the GNU gettext manual.
-@c Copyright (C) 1995-2019 Free Software Foundation, Inc.
+@c Copyright (C) 1995-2025 Free Software Foundation, Inc.
 @c See the file gettext.texi for copying conditions.
 
 @pindex gettext
@@ -13,7 +13,7 @@ gettext [@var{option}] -s [@var{msgid}]...
 The @code{gettext} program displays the native language translation of a
 textual message.
 
-@noindent @strong{Arguments}
+@noindent @strong{Options and arguments}
 
 @table @samp
 @item -c @var{context}
@@ -43,26 +43,31 @@ interpreted like the System V @samp{echo} program did.
 This option is only for compatibility with the @samp{echo} program or shell
 built-in.  It has no effect.
 
+@item -n
+@opindex -n@r{, @code{gettext} option}
+This option has only an effect if the @code{-s} option is given.  It
+suppresses the additional newline at the end.
+
+@item [@var{textdomain}] @var{msgid}
+Retrieve translated message corresponding to @var{msgid} from @var{textdomain}.
+
+@end table
+
+@noindent @strong{Informative output}
+
+@table @samp
 @item -h
 @itemx --help
 @opindex -h@r{, @code{gettext} option}
 @opindex --help@r{, @code{gettext} option}
 Display this help and exit.
 
-@item -n
-@opindex -n@r{, @code{gettext} option}
-This option has only an effect if the @code{-s} option is given.  It
-suppresses the additional newline at the end.
-
 @item -V
 @itemx --version
 @opindex -V@r{, @code{gettext} option}
 @opindex --version@r{, @code{gettext} option}
 Output version information and exit.
 
-@item [@var{textdomain}] @var{msgid}
-Retrieve translated message corresponding to @var{msgid} from @var{textdomain}.
-
 @end table
 
 If the @var{textdomain} parameter is not given, the domain is determined from

gettext-runtime/doc/rt-ngettext.texi

@@ -1,5 +1,5 @@
 @c This file is part of the GNU gettext manual.
-@c Copyright (C) 1995-2019 Free Software Foundation, Inc.
+@c Copyright (C) 1995-2025 Free Software Foundation, Inc.
 @c See the file gettext.texi for copying conditions.
 
 @pindex ngettext
@@ -12,7 +12,7 @@ ngettext [@var{option}] [@var{textdomain}] @var{msgid} @var{msgid-plural} @var{c
 The @code{ngettext} program displays the native language translation of a
 textual message whose grammatical form depends on a number.
 
-@noindent @strong{Arguments}
+@noindent @strong{Options and arguments}
 
 @table @samp
 @item -c @var{context}
@@ -42,6 +42,20 @@ interpreted like the System V @samp{echo} program did.
 This option is only for compatibility with the @samp{gettext} program.  It has
 no effect.
 
+@item @var{textdomain}
+Retrieve translated message from @var{textdomain}.
+
+@item @var{msgid} @var{msgid-plural}
+Translate @var{msgid} (English singular) / @var{msgid-plural} (English plural).
+
+@item @var{count}
+Choose singular/plural form based on this value.
+
+@end table
+
+@noindent @strong{Informative output}
+
+@table @samp
 @item -h
 @itemx --help
 @opindex -h@r{, @code{ngettext} option}
@@ -54,15 +68,6 @@ Display this help and exit.
 @opindex --version@r{, @code{ngettext} option}
 Output version information and exit.
 
-@item @var{textdomain}
-Retrieve translated message from @var{textdomain}.
-
-@item @var{msgid} @var{msgid-plural}
-Translate @var{msgid} (English singular) / @var{msgid-plural} (English plural).
-
-@item @var{count}
-Choose singular/plural form based on this value.
-
 @end table
 
 If the @var{textdomain} parameter is not given, the domain is determined from

gettext-runtime/doc/rt-printf_gettext.texi

@@ -0,0 +1,141 @@
+@c This file is part of the GNU gettext manual.
+@c Copyright (C) 2025 Free Software Foundation, Inc.
+@c See the file gettext.texi for copying conditions.
+
+@pindex printf_gettext
+@cindex @code{printf_gettext} program, usage
+@example
+printf_gettext [@var{option}] @var{format} [@var{argument}]...
+@end example
+
+@cindex lookup format string translation
+@cindex formatted output in Shell
+The @code{printf_gettext} program produces formatted output,
+applying the native language translation of @var{format}
+to the @var{argument}s.
+
+@noindent @strong{Options and arguments}
+
+@table @samp
+@item -c @var{context}
+@itemx --context=@var{context}
+@opindex -c@r{, @code{printf_gettext} option}
+@opindex --context@r{, @code{printf_gettext} option}
+Specify the context for the format string to be translated.
+See @ref{Contexts} for details.
+
+@item @var{format}
+The format string.
+
+@item @var{argument}
+A string or numeric argument.
+
+@end table
+
+@noindent @strong{Informative output}
+
+@table @samp
+@item -h
+@itemx --help
+@opindex -h@r{, @code{printf_gettext} option}
+@opindex --help@r{, @code{printf_gettext} option}
+Display this help and exit.
+
+@item -V
+@itemx --version
+@opindex -V@r{, @code{printf_gettext} option}
+@opindex --version@r{, @code{printf_gettext} option}
+Output version information and exit.
+
+@end table
+
+The format string consists of
+@itemize @bullet
+@item
+plain text,
+@item
+directives, that start with @samp{%},
+@item
+escape sequences, that start with a backslash.
+@end itemize
+
+A directive that consumes an argument
+@itemize @bullet
+@item
+starts with @samp{%} or @samp{%@var{m}$} where @var{m} is a positive integer,
+@item
+is optionally followed by any of the characters
+@samp{#}, @samp{0}, @samp{-}, @samp{ }, @samp{+},
+each of which acts as a flag,
+@item
+is optionally followed by a width specification (a nonnegative integer),
+@item
+is optionally followed by @samp{.} and a precision specification
+(an optional nonnegative integer),
+@item
+is finished by a specifier
+@itemize @bullet
+@item
+@samp{c}, that prints a character,
+@item
+@samp{s}, that prints a string,
+@item
+@samp{i}, @samp{d}, that print an integer,
+@item
+@samp{u}, @samp{o}, @samp{x}, @samp{X},
+that print an unsigned (nonnegative) integer,
+@item
+@samp{e}, @samp{E}, that print a floating-point number in scientific notation,
+@item
+@samp{f}, @samp{F}, that print a floating-point number without an exponent,
+@item
+@samp{g}, @samp{G}, that print a floating-point number in general notation,
+@item
+@samp{a}, @samp{A}, that print a floating-point number in hexadecimal notation.
+@end itemize
+@end itemize
+
+Some flag+specifier combinations are invalid:
+@itemize @bullet
+@item
+The @samp{#} flag with the specifiers
+@samp{c}, @samp{s}, @samp{i}, @samp{d}, @samp{u}.
+@item
+The @samp{0} flag with the specifiers
+@samp{c}, @samp{s}.
+@end itemize
+
+Additionally there is the directive @samp{%%}, that prints a single @code{%}.
+
+If a directive specifies the argument by its number (@samp{%@var{m}$} notation),
+all directives that consume an argument must do so.
+
+The escape sequences are:
+@table @code
+@item \\
+backslash
+@item \a
+alert (BEL)
+@item \b
+backspace (BS)
+@item \f
+form feed (FF)
+@item \n
+new line (LF)
+@item \r
+carriage return (CR)
+@item \t
+horizontal tab (HT)
+@item \v
+vertical tab (VT)
+@item \@var{nnn}
+octal number with 1 to 3 octal digits
+@end table
+
+@noindent @strong{Environment Variables}
+
+The translation of the format string is looked up in the translation domain
+given by the environment variable @code{TEXTDOMAIN}.
+
+It is looked up in the catalogs directory given by the environment variable
+@code{TEXTDOMAINDIR} or, if not present, in the default catalogs directory.

gettext-runtime/doc/rt-printf_ngettext.texi

@@ -0,0 +1,149 @@
+@c This file is part of the GNU gettext manual.
+@c Copyright (C) 2025 Free Software Foundation, Inc.
+@c See the file gettext.texi for copying conditions.
+
+@pindex printf_ngettext
+@cindex @code{printf_ngettext} program, usage
+@example
+printf_ngettext [@var{option}] @var{format} @var{format-plural} @var{count} [@var{argument}]...
+@end example
+
+@cindex lookup format string translation with plural
+@cindex formatted output in Shell
+The @code{printf_ngettext} program produces formatted output,
+applying the native language translation of
+@var{format} and @var{format-plural}, depending on @var{count},
+to the @var{argument}s.
+
+@noindent @strong{Options and arguments}
+
+@table @samp
+@item -c @var{context}
+@itemx --context=@var{context}
+@opindex -c@r{, @code{printf_ngettext} option}
+@opindex --context@r{, @code{printf_ngettext} option}
+Specify the context for the format string to be translated.
+See @ref{Contexts} for details.
+
+@item @var{format}
+English singular form of format string.
+
+@item @var{format-plural}
+English plural form of format string.
+
+@item @var{count}
+A cardinal number.
+The singular/plural form is chosen based on this value.
+
+@item @var{argument}
+A string or numeric argument.
+
+@end table
+
+@noindent @strong{Informative output}
+
+@table @samp
+@item -h
+@itemx --help
+@opindex -h@r{, @code{printf_ngettext} option}
+@opindex --help@r{, @code{printf_ngettext} option}
+Display this help and exit.
+
+@item -V
+@itemx --version
+@opindex -V@r{, @code{printf_ngettext} option}
+@opindex --version@r{, @code{printf_ngettext} option}
+Output version information and exit.
+
+@end table
+
+Each format string consists of
+@itemize @bullet
+@item
+plain text,
+@item
+directives, that start with @samp{%},
+@item
+escape sequences, that start with a backslash.
+@end itemize
+
+A directive that consumes an argument
+@itemize @bullet
+@item
+starts with @samp{%} or @samp{%@var{m}$} where @var{m} is a positive integer,
+@item
+is optionally followed by any of the characters
+@samp{#}, @samp{0}, @samp{-}, @samp{ }, @samp{+},
+each of which acts as a flag,
+@item
+is optionally followed by a width specification (a nonnegative integer),
+@item
+is optionally followed by @samp{.} and a precision specification
+(an optional nonnegative integer),
+@item
+is finished by a specifier
+@itemize @bullet
+@item
+@samp{c}, that prints a character,
+@item
+@samp{s}, that prints a string,
+@item
+@samp{i}, @samp{d}, that print an integer,
+@item
+@samp{u}, @samp{o}, @samp{x}, @samp{X},
+that print an unsigned (nonnegative) integer,
+@item
+@samp{e}, @samp{E}, that print a floating-point number in scientific notation,
+@item
+@samp{f}, @samp{F}, that print a floating-point number without an exponent,
+@item
+@samp{g}, @samp{G}, that print a floating-point number in general notation,
+@item
+@samp{a}, @samp{A}, that print a floating-point number in hexadecimal notation.
+@end itemize
+@end itemize
+
+Some flag+specifier combinations are invalid:
+@itemize @bullet
+@item
+The @samp{#} flag with the specifiers
+@samp{c}, @samp{s}, @samp{i}, @samp{d}, @samp{u}.
+@item
+The @samp{0} flag with the specifiers
+@samp{c}, @samp{s}.
+@end itemize
+
+Additionally there is the directive @samp{%%}, that prints a single @code{%}.
+
+If a directive specifies the argument by its number (@samp{%@var{m}$} notation),
+all directives that consume an argument must do so.
+
+The escape sequences are:
+@table @code
+@item \\
+backslash
+@item \a
+alert (BEL)
+@item \b
+backspace (BS)
+@item \f
+form feed (FF)
+@item \n
+new line (LF)
+@item \r
+carriage return (CR)
+@item \t
+horizontal tab (HT)
+@item \v
+vertical tab (VT)
+@item \@var{nnn}
+octal number with 1 to 3 octal digits
+@end table
+
+@noindent @strong{Environment Variables}
+
+The translation of the format string is looked up in the translation domain
+given by the environment variable @code{TEXTDOMAIN}.
+
+It is looked up in the catalogs directory given by the environment variable
+@code{TEXTDOMAINDIR} or, if not present, in the default catalogs directory.

gettext-runtime/install-tests/Makefile.am

@@ -0,0 +1,40 @@
+## Makefile for gettext-runtime/install-tests.
+## Copyright (C) 2025 Free Software Foundation, Inc.
+##
+## This program is free software: you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 3 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+## Process this file with automake to produce Makefile.in.
+
+installcheck-local:
+	$(CC) -I$(includedir) -L$(libdir) \
+	      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	      $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	      -o test-version $(srcdir)/test-version.c $(INSTALLED_LIBINTL)
+	@AUGMENT_SHLIBPATH@ ./test-version
+	rm -rf test-version test-version$(EXEEXT)
+	$(CC) -I$(includedir) -L$(libdir) \
+	      $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	      -DSRCDIR=\"$(srcdir)/\" \
+	      $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
+	      -o test-api $(srcdir)/test-api.c $(INSTALLED_LIBINTL)
+	@AUGMENT_SHLIBPATH@ ./test-api
+	rm -rf test-api test-api$(EXEEXT)
+	PATH='$(bindir)'@PATH_SEPARATOR@"$$PATH"; gettext --version | grep 'GNU gettext' > /dev/null
+
+EXTRA_DIST = \
+  test-version.c \
+  test-api.c itest.pot locale/en_US/LC_MESSAGES/itest.mo
+CLEANFILES = \
+  test-version test-version$(EXEEXT) \
+  test-api test-api$(EXEEXT)

gettext-runtime/install-tests/itest.pot

@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the GNU gettext package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: GNU gettext 0.25\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-06-18 20:12+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: test-api.c:68
+msgid "She is the doppelganger of my fiancee."
+msgstr ""

gettext-runtime/install-tests/test-api.c

@@ -0,0 +1,78 @@
+/* Test parts of the API.
+   Copyright (C) 2025-2026 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible.  */
+
+#include <libintl.h>
+
+#include <locale.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#if defined _WIN32 && !defined __CYGWIN__
+
+# define ENGLISH  "English_United States"
+# define ENCODING ".1252"
+
+# define LOCALE1 ENGLISH ENCODING
+
+#else
+
+# define LOCALE1 "en_US.UTF-8"
+
+#endif
+
+int
+main ()
+{
+  /* Clean up environment.  */
+#if defined _WIN32 && !defined __CYGWIN__
+  _putenv ("LANGUAGE=");
+  _putenv ("OUTPUT_CHARSET=");
+#else
+  unsetenv ("LANGUAGE");
+  unsetenv ("OUTPUT_CHARSET");
+#endif
+
+  textdomain ("itest");
+
+#if defined _WIN32 && !defined __CYGWIN__
+  _putenv ("LC_ALL=" LOCALE1);
+#else
+  setenv ("LC_ALL", LOCALE1, 1);
+#endif
+  if (setlocale (LC_ALL, "") == NULL)
+    {
+      fprintf (stderr, "Skipping test: Locale %s is not installed.\n", LOCALE1);
+      return 0;
+    }
+
+  bindtextdomain ("itest", SRCDIR "locale");
+
+  bind_textdomain_codeset ("itest", "UTF-8");
+
+  const char *s = gettext ("She is the doppelganger of my fiancee.");
+  const char *expected = "She is the doppelgänger of my fiancée.";
+  if (strcmp (s, expected) != 0)
+    {
+      fprintf (stderr, "gettext() => %s\n", s);
+      fprintf (stderr, "Expected:    %s\n", expected);
+      return 1;
+    }
+
+  return 0;
+}

gettext-runtime/install-tests/test-version.c

@@ -0,0 +1,36 @@
+/* Test the version information.
+   Copyright (C) 2025-2026 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible.  */
+
+#include <libintl.h>
+
+#include <stdio.h>
+
+int
+main ()
+{
+#if defined LIBINTL_VERSION /* GNU libintl, not GNU libc */
+  if (!(libintl_version == LIBINTL_VERSION))
+    {
+      fprintf (stderr, "Installation problem: include file says version 0x%x, whereas library says version 0x%x\n",
+               LIBINTL_VERSION, libintl_version);
+      return 1;
+    }
+#endif
+
+  return 0;
+}

gettext-runtime/intl-csharp/intl.cs

@@ -1,6 +1,5 @@
 /* GNU gettext for C#
- * Copyright (C) 2003-2024 Free Software Foundation, Inc.
- * Written by Bruno Haible <bruno@clisp.org>, 2003.
+ * Copyright (C) 2003-2026 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -16,6 +15,8 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
+/* Written by Bruno Haible.  */
+
 /*
  * Using the GNU gettext approach, compiled message catalogs are assemblies
  * containing just one class, a subclass of GettextResourceSet. They are thus

gettext-runtime/intl-d/gnu/libintl/internal/low.d

@@ -1,5 +1,5 @@
 /+ D bindings to the GNU gettext runtime library.
-   Copyright © 2025 Free Software Foundation, Inc.
+   Copyright © 2025-2026 Free Software Foundation, Inc.
 
    Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -26,7 +26,7 @@
    DEALINGS IN THE SOFTWARE.
  +/
 
-/* Written by Bruno Haible <bruno@clisp.org>, 2025.  */
+/* Written by Bruno Haible.  */
 
 module gnu.libintl.internal.low;
 

gettext-runtime/intl-d/gnu/libintl/libintl.d

@@ -1,5 +1,5 @@
 /+ D bindings to the GNU gettext runtime library.
-   Copyright © 2025 Free Software Foundation, Inc.
+   Copyright © 2025-2026 Free Software Foundation, Inc.
 
    Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -26,7 +26,7 @@
    DEALINGS IN THE SOFTWARE.
  +/
 
-/* Written by Bruno Haible <bruno@clisp.org>, 2025.  */
+/* Written by Bruno Haible.  */
 
 module gnu.libintl.libintl;
 

gettext-runtime/intl-d/gnu/libintl/package.d

@@ -1,5 +1,5 @@
 /+ D bindings to the GNU gettext runtime library.
-   Copyright © 2025 Free Software Foundation, Inc.
+   Copyright © 2025-2026 Free Software Foundation, Inc.
 
    Boost Software License - Version 1.0 - August 17th, 2003
 
@@ -26,7 +26,7 @@
    DEALINGS IN THE SOFTWARE.
  +/
 
-/* Written by Bruno Haible <bruno@clisp.org>, 2025.  */
+/* Written by Bruno Haible.  */
 
 module gnu.libintl;
 

gettext-runtime/intl-java/gnu/gettext/GettextResource.java

@@ -1,5 +1,5 @@
 /* GNU gettext for Java
- * Copyright (C) 2001-2024 Free Software Foundation, Inc.
+ * Copyright (C) 2001-2025 Free Software Foundation, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -99,7 +99,6 @@ public abstract class GettextResource extends ResourceBundle {
     // is that we want the generated ResourceBundles to be completely
     // standalone, so that migration from the Sun approach to the GNU gettext
     // approach (without use of plurals) is as straightforward as possible.
-    ResourceBundle origCatalog = catalog;
     do {
       // Try catalog itself.
       if (verbose)

gettext-runtime/intl-modula2/Libintl.def.in

@@ -1,5 +1,5 @@
 (* High-level Modula-2 binding to the GNU libintl library.
-   Copyright (C) 2025 Free Software Foundation, Inc.
+   Copyright (C) 2025-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *)
 
-(* Written by Bruno Haible <bruno@clisp.org>, 2025.  *)
+(* Written by Bruno Haible.  *)
 
 DEFINITION MODULE Libintl;
 

gettext-runtime/intl-modula2/Libintl.mod

@@ -1,5 +1,5 @@
 (* High-level Modula-2 binding to the GNU libintl library.
-   Copyright (C) 2025 Free Software Foundation, Inc.
+   Copyright (C) 2025-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *)
 
-(* Written by Bruno Haible <bruno@clisp.org>, 2025.  *)
+(* Written by Bruno Haible.  *)
 
 IMPLEMENTATION MODULE Libintl;
 

gettext-runtime/intl-modula2/LibintlFromC.def

@@ -1,5 +1,5 @@
 (* Low-level Modula-2 binding to the GNU libintl library.
-   Copyright (C) 2025 Free Software Foundation, Inc.
+   Copyright (C) 2025-2026 Free Software Foundation, Inc.
 
    This file is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  *)
 
-(* Written by Bruno Haible <bruno@clisp.org>, 2025.  *)
+(* Written by Bruno Haible.  *)
 
 DEFINITION MODULE FOR "C" LibintlFromC;
 

gettext-runtime/intl/Makefile.am

@@ -250,7 +250,13 @@ libintl.h: $(srcdir)/libgnuintl.in.h
 	    -e 's,@''HAVE_WPRINTF''@,@HAVE_WPRINTF@,g' \
 	    -e 's,@''HAVE_NEWLOCALE''@,@HAVE_NEWLOCALE@,g' \
 	    -e 's,@''ENHANCE_LOCALE_FUNCS''@,@ENHANCE_LOCALE_FUNCS@,g' \
-	  < $(srcdir)/libgnuintl.in.h > libintl.h
+	  < $(srcdir)/libgnuintl.in.h \
+	| if test '@WOE32DLL@' = 1; then \
+	    sed -e 's/extern \([^()]*\);/extern __declspec (dllimport) \1;/'; \
+	  else \
+	    cat; \
+	  fi \
+	| cat > libintl.h
 MOSTLYCLEANFILES += libintl.h
 
 # The Automake generated .y.c rule is broken: When executed in a VPATH build,
@@ -441,7 +447,7 @@ endif
 # Before making a gettext release, you must change this according to the
 # libtool documentation, section "Library interface versions".
 LTV_CURRENT=12
-LTV_REVISION=4
+LTV_REVISION=5
 LTV_AGE=4
 
 # How to build libintl.la and libgnuintl.la.
@@ -464,7 +470,7 @@ install-exec-local: install-exec-libintl
 install-exec-libintl: libintl.la
 	$(mkdir_p) $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=install \
-	  $(INSTALL_DATA) libintl.la $(DESTDIR)$(libdir)/libintl.la; \
+	  $(INSTALL) libintl.la $(DESTDIR)$(libdir)/libintl.la; \
 	if test "@RELOCATABLE@" = yes; then \
 	  dependencies=`sed -n -e 's,^dependency_libs=\(.*\),\1,p' < $(DESTDIR)$(libdir)/libintl.la | sed -e "s,^',," -e "s,'\$$,,"`; \
 	  if test -n "$$dependencies"; then \

gettext-runtime/intl/bindtextdom.c

@@ -1,5 +1,5 @@
 /* Implementation of the bindtextdomain(3) function
-   Copyright (C) 1995-2024 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/compat.c

@@ -1,5 +1,5 @@
 /* Symbols for backward compatibility.
-   Copyright (C) 2023 Free Software Foundation, Inc.
+   Copyright (C) 2023-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #include <config.h>
 
 /* Specification.  */

gettext-runtime/intl/dcgettext.c

@@ -1,5 +1,5 @@
 /* Implementation of the dcgettext(3) function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/dcigettext.c

@@ -1,5 +1,5 @@
 /* Implementation of the internal dcigettext function.
-   Copyright (C) 1995-2025 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */

gettext-runtime/intl/dcngettext.c

@@ -1,5 +1,5 @@
 /* Implementation of the dcngettext(3) function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/dgettext.c

@@ -1,5 +1,5 @@
 /* Implementation of the dgettext(3) function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/dngettext.c

@@ -1,5 +1,5 @@
 /* Implementation of the dngettext(3) function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/eval-plural.h

@@ -1,5 +1,5 @@
 /* Plural expression evaluation.
-   Copyright (C) 2000-2023 Free Software Foundation, Inc.
+   Copyright (C) 2000-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifndef STATIC
 #define STATIC static
 #endif

gettext-runtime/intl/explodename.c

@@ -1,5 +1,4 @@
-/* Copyright (C) 1995-2016, 2020 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +13,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/export.h

@@ -1,5 +1,5 @@
 /* Control of exported symbols from libintl.
-   Copyright (C) 2005-2023 Free Software Foundation, Inc.
+   Copyright (C) 2005-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #if @HAVE_VISIBILITY@ && BUILDING_LIBINTL
 # define LIBINTL_SHLIB_EXPORTED __attribute__((__visibility__("default")))
 #elif (defined _WIN32 && !defined __CYGWIN__) && @WOE32DLL@ && BUILDING_LIBINTL

gettext-runtime/intl/finddomain.c

@@ -1,6 +1,5 @@
 /* Handle list of needed message catalogs
-   Copyright (C) 1995-2024 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@gnu.org>, 1995.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/gettext.c

@@ -1,5 +1,5 @@
 /* Implementation of gettext(3) function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/gettextP.h

@@ -1,6 +1,5 @@
 /* Header describing internals of libintl library.
-   Copyright (C) 1995-2024 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 1995.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifndef _GETTEXTP_H
 #define _GETTEXTP_H
 

gettext-runtime/intl/gmo.h

@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: general file layout.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifndef _GETTEXT_H
 #define _GETTEXT_H 1
 

gettext-runtime/intl/hash-string.c

@@ -1,5 +1,5 @@
 /* Implements a string hashing function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,6 +16,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/hash-string.h

@@ -1,5 +1,5 @@
 /* Description of GNU message catalog format: string hashing function.
-   Copyright (C) 1995-2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 /* @@ end of prolog @@ */
 
 #ifndef attribute_hidden

gettext-runtime/intl/intl-compat.c

@@ -1,5 +1,5 @@
 /* Redirections from public function names to GNU libintl functions.
-   Copyright (C) 1995, 2000-2003, 2005, 2023 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/intl-exports.c

@@ -1,6 +1,5 @@
 /* List of exported symbols of libintl on Cygwin.
-   Copyright (C) 2006, 2012-2020 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2006.
+   Copyright (C) 2006-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
  /* IMP(x) is a symbol that contains the address of x.  */
 #if defined _WIN64 || defined _LP64
 # define IMP(x) __imp_##x

gettext-runtime/intl/l10nflist.c

@@ -1,5 +1,4 @@
-/* Copyright (C) 1995-2023 Free Software Foundation, Inc.
-   Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+/* Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +13,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 /* Tell glibc's <string.h> to provide a prototype for stpcpy().
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */

gettext-runtime/intl/langprefs.c

@@ -1,5 +1,5 @@
 /* Determine the user's language preferences.
-   Copyright (C) 2004-2007, 2018-2024 Free Software Foundation, Inc.
+   Copyright (C) 2004-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-/* Written by Bruno Haible <bruno@clisp.org>.
-   Win32 code originally by Michele Cicciotti <hackbunny@reactos.com>.  */
+/* Written by Bruno Haible.
+   Win32 code originally by Michele Cicciotti.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

gettext-runtime/intl/libgnuintl.in.h

@@ -1,5 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-2025 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifndef _LIBINTL_H
 #define _LIBINTL_H 1
 
@@ -54,7 +56,7 @@ extern "C" {
 
 
 /* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001900
+#define LIBINTL_VERSION 0x001A00
 extern int libintl_version;
 
 
@@ -120,7 +122,7 @@ extern int libintl_version;
 /* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
    If he doesn't, we choose the method.  */
 #if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
+# if ((defined __GNUC__ && __GNUC__ >= 2) || defined __clang__) && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
 #  define _INTL_REDIRECT_ASM
 # else
 #  if defined __cplusplus && defined _INTL_HAS_FORCE_INLINE

gettext-runtime/intl/libintl.glibc

@@ -1,5 +1,5 @@
 /* Message catalogs for internationalization.
-   Copyright (C) 1995-2002, 2004-2005 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    This file is derived from the file libgettext.h in the GNU gettext package.
 
@@ -17,6 +17,8 @@
    License along with the GNU C Library; if not, see
    <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper.  */
+
 #ifndef _LIBINTL_H
 #define _LIBINTL_H	1
 

gettext-runtime/intl/loadinfo.h

@@ -1,6 +1,5 @@
-/* Copyright (C) 1996-2023 Free Software Foundation, Inc.
+/* Copyright (C) 1996-2026 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifndef _LOADINFO_H
 #define _LOADINFO_H	1
 

gettext-runtime/intl/loadmsgcat.c

@@ -1,5 +1,5 @@
 /* Load needed message catalogs.
-   Copyright (C) 1995-2024 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 /* Tell glibc's <string.h> to provide a prototype for mempcpy().
    This must come before <config.h> because <config.h> may include
    <features.h>, and once <features.h> has been included, it's too late.  */
@@ -1018,7 +1020,10 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
 		    /* Allocate additional memory.  */
 		    mem = (char *) malloc (memneed);
 		    if (mem == NULL)
-		      goto invalid;
+		      {
+			free (sysdep_segment_values);
+			goto invalid;
+		      }
 
 		    domain->malloced = mem;
 		    inmem_orig_sysdep_tab = (struct sysdep_string_desc *) mem;

gettext-runtime/intl/localealias.c

@@ -1,5 +1,5 @@
 /* Handle aliases for locale names.
-   Copyright (C) 1995-2024 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 /* Locale aliases can be specified in the file $(localedir)/locale.alias.
    It consists of lines of the form
      <alias> <real-locale-name>

gettext-runtime/intl/log.c

@@ -1,5 +1,5 @@
 /* Log file output.
-   Copyright (C) 2003-2023 Free Software Foundation, Inc.
+   Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,7 +14,7 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-/* Written by Bruno Haible <bruno@clisp.org>.  */
+/* Written by Bruno Haible.  */
 
 #ifdef HAVE_CONFIG_H
 # include <config.h>

gettext-runtime/intl/ngettext.c

@@ -1,5 +1,5 @@
 /* Implementation of ngettext(3) function.
-   Copyright (C) 1995-2016 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/os2compat.c

@@ -1,5 +1,5 @@
 /* OS/2 compatibility functions.
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #define OS2_AWARE
 #ifdef HAVE_CONFIG_H
 #include <config.h>

gettext-runtime/intl/os2compat.h

@@ -1,6 +1,6 @@
 /* OS/2 compatibility defines.
    This file is intended to be included from config.h
-   Copyright (C) 2001-2002 Free Software Foundation, Inc.
+   Copyright (C) 2001-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +15,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 /* When included from os2compat.h we need all the original definitions */
 #ifndef OS2_AWARE
 

gettext-runtime/intl/osdep.c

@@ -1,5 +1,5 @@
 /* OS dependent parts of libintl.
-   Copyright (C) 2001-2002, 2006, 2012, 2015 Free Software Foundation, Inc.
+   Copyright (C) 2001-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #if defined __CYGWIN__ || defined __MINGW32__
 # include "intl-exports.c"
 #elif defined __EMX__ && !defined __KLIBC__

gettext-runtime/intl/plural-exp.c

@@ -1,6 +1,5 @@
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2023 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+   Copyright (C) 2000-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/plural-exp.h

@@ -1,6 +1,5 @@
 /* Expression parsing and evaluation for plural form selection.
-   Copyright (C) 2000-2024 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+   Copyright (C) 2000-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper, Bruno Haible, and Daiki Ueno.  */
+
 #ifndef _PLURAL_EXP_H
 #define _PLURAL_EXP_H
 

gettext-runtime/intl/plural.y

@@ -1,7 +1,6 @@
 %{
 /* Expression parsing for plural form selection.
-   Copyright (C) 2000-2023 Free Software Foundation, Inc.
-   Written by Ulrich Drepper <drepper@cygnus.com>, 2000.
+   Copyright (C) 2000-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -16,6 +15,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper, Bruno Haible, and Daiki Ueno.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/printf.c

@@ -1,6 +1,5 @@
 /* Formatted output to strings, using POSIX/XSI format strings with positions.
-   Copyright (C) 2003, 2006-2007, 2009-2011, 2018, 2020-2023 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2003.
+   Copyright (C) 2003-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/setlocale.c

@@ -1,6 +1,5 @@
 /* setlocale() function that respects the locale chosen by the user.
-   Copyright (C) 2009, 2011-2025 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2009.
+   Copyright (C) 2009-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/textdomain.c

@@ -1,5 +1,5 @@
 /* Implementation of the textdomain(3) function.
-   Copyright (C) 1995-2024 Free Software Foundation, Inc.
+   Copyright (C) 1995-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Ulrich Drepper and Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/intl/version.c

@@ -1,5 +1,5 @@
 /* libintl library version.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif

gettext-runtime/libasprintf/Makefile.am

@@ -1,5 +1,5 @@
 ## Makefile for the gettext-runtime/libasprintf subdirectory of GNU gettext
-## Copyright (C) 2002-2024 Free Software Foundation, Inc.
+## Copyright (C) 2002-2025 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU Lesser General Public License as published by
@@ -24,6 +24,7 @@ SUBDIRS = gnulib-lib
 EXTRA_DIST =
 BUILT_SOURCES =
 MOSTLYCLEANFILES =
+MAINTAINERCLEANFILES =
 
 RM = rm -f
 
@@ -225,6 +226,7 @@ uninstall-html:
 	$(RM) $(DESTDIR)$(htmldir)/autosprintf.html
 
 EXTRA_DIST += autosprintf_all.html
+MAINTAINERCLEANFILES += autosprintf_all.html
 
 
 # Windows support.

gettext-runtime/libasprintf/asnprintf.c

@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #include <config.h>
 
 /* Specification.  */

gettext-runtime/libasprintf/asprintf.c

@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #include <config.h>
 
 /* Specification.  */

gettext-runtime/libasprintf/autosprintf.cc

@@ -1,6 +1,5 @@
 /* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2013, 2015, 2018, 2021 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2002.
+   Copyright (C) 2002-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #include <config.h>
 
 /* Specification.  */

gettext-runtime/libasprintf/autosprintf.in.h

@@ -1,5 +1,5 @@
 /* Class autosprintf - formatted output to an ostream.
-   Copyright (C) 2002, 2012-2016 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2012-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,16 +14,18 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #ifndef _AUTOSPRINTF_H
 #define _AUTOSPRINTF_H
 
-/* This feature is available in gcc versions 2.5 and later.  */
-#if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+/* This feature is available in gcc versions 2.5 and later and in clang.  */
+#if !((__GNUC__ >= 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || defined __clang__) && !__STRICT_ANSI__)
 # define _AUTOSPRINTF_ATTRIBUTE_FORMAT() /* empty */
 #else
-/* The __-protected variants of 'format' and 'printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+/* The __-protected variants of 'format' and 'printf' attributes are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later and in clang.  */
+# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || defined __clang__
 #  define _AUTOSPRINTF_ATTRIBUTE_FORMAT() \
   __attribute__ ((__format__ (__printf__, 2, 3)))
 # else

gettext-runtime/libasprintf/autosprintf.texi

@@ -36,7 +36,7 @@
 This file provides documentation for GNU @code{autosprintf} library.
 
 @copying
-Copyright (C) 2002-2003, 2006-2007, 2018-2019 Free Software Foundation, Inc.
+Copyright (C) 2002-2003, 2006-2007, 2018-2019, 2025 Free Software Foundation, Inc.
 
 This manual is free documentation.  It is dually licensed under the
 GNU FDL and the GNU GPL.  This means that you can redistribute this
@@ -172,21 +172,46 @@ given @code{ostream}.
 @node Using autosprintf
 @chapter Using @code{autosprintf} in own programs
 
-To use the @code{autosprintf} class in your programs, you need to add
+To use the @code{autosprintf} class in your programs, you need to make
+changes in the source code and in the build system.
+
+@node Source code changes
+@section Source code changes
+
+In source code files that shall use @code{autosprintf}, add
 
 @smallexample
 #include "autosprintf.h"
 using gnu::autosprintf;
 @end smallexample
 
-@noindent
-to your source code.
 The include file defines the class @code{autosprintf}, in a namespace called
 @code{gnu}. The @samp{using} statement makes it possible to use the class
 without the (otherwise natural) @code{gnu::} prefix.
 
+@node Build system changes
+@section Build system changes
+
+When compiling your program with @code{g++}, use the warning option @code{-Wall}.
+@c g++ does not warn by default,
+@c see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64867
+This is needed so that you get a compiler warning when attempting to pass
+an @code{std::string} as argument.
+For example, if you accidentally write
+@smallexample
+std::string s = ...;
+cout << autosprintf ("Look at %s\n", s);
+@end smallexample
+@noindent
+you want to get a compiler warning about passing an @code{std::string} through
+a variadic argument list, so that you can correct your code to
+@smallexample
+std::string s = ...;
+cout << autosprintf ("Look at %s\n", s.c_str ());
+@end smallexample
+
 When linking your program, you need to link with @code{libasprintf}, because
-that's where the class is defined. In projects using GNU @code{autoconf},
+that's where the class is defined.  In projects that use GNU @code{autoconf},
 this means adding @samp{AC_LIB_LINKFLAGS([asprintf])} to @code{configure.in}
 or @code{configure.ac}, and using the @@LIBASPRINTF@@ Makefile variable that
 it provides.

gettext-runtime/libasprintf/lib-asprintf.c

@@ -1,6 +1,5 @@
 /* Library functions for class autosprintf.
-   Copyright (C) 2002-2003, 2006, 2018-2019, 2021 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2002.
+   Copyright (C) 2002-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #include <config.h>
 
 #if !(HAVE_VASPRINTF && HAVE_POSIX_PRINTF)

gettext-runtime/libasprintf/lib-asprintf.h

@@ -1,6 +1,5 @@
 /* Library functions for class autosprintf.
-   Copyright (C) 2002-2003, 2018 Free Software Foundation, Inc.
-   Written by Bruno Haible <bruno@clisp.org>, 2002.
+   Copyright (C) 2002-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -15,9 +14,9 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+/* Written by Bruno Haible.  */
+
+#include <config.h>
 
 #if HAVE_VASPRINTF && HAVE_POSIX_PRINTF
 

gettext-runtime/libasprintf/vasprintf.c

@@ -1,5 +1,5 @@
 /* Formatted output to strings.
-   Copyright (C) 1999, 2002, 2006-2007 Free Software Foundation, Inc.
+   Copyright (C) 1999-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #include <config.h>
 
 /* Specification.  */

gettext-runtime/libasprintf/vasprintf.h

@@ -1,5 +1,5 @@
 /* vsprintf with automatic memory allocation.
-   Copyright (C) 2002-2003, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2002-2003, 2012-2026 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU Lesser General Public License as published by
@@ -14,6 +14,8 @@
    You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
+/* Written by Bruno Haible.  */
+
 #ifndef _VASPRINTF_H
 #define _VASPRINTF_H
 
@@ -21,13 +23,13 @@
 #include <stdarg.h>
 
 #ifndef __attribute__
-/* This feature is available in gcc versions 2.5 and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 5) || __STRICT_ANSI__
+/* This feature is available in gcc versions 2.5 and later and in clang.  */
+# if !((__GNUC__ >= 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 5) || defined __clang__) && !__STRICT_ANSI__)
 #  define __attribute__(Spec) /* empty */
 # endif
-/* The __-protected variants of 'format' and 'printf' attributes
-   are accepted by gcc versions 2.6.4 (effectively 2.7) and later.  */
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+/* The __-protected variants of 'format' and 'printf' attributes are
+   accepted by gcc versions 2.6.4 (effectively 2.7) and later and in clang.  */
+# if !(__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7) || defined __clang__)
 #  define __format__ format
 #  define __printf__ printf
 # endif

gettext-runtime/m4/gettext.m4

@@ -1,6 +1,6 @@
 # gettext.m4
-# serial 81 (gettext-0.24)
-dnl Copyright (C) 1995-2025 Free Software Foundation, Inc.
+# serial 86 (gettext-1.0)
+dnl Copyright (C) 1995-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,9 +15,7 @@ dnl by the GNU Lesser General Public License, and the rest of the GNU
 dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <bruno@clisp.org>, 2000-2024.
+dnl From Ulrich Drepper, Bruno Haible, Daiku Ueno.
 
 dnl Macro to add for using GNU gettext.
 
@@ -93,9 +91,18 @@ AC_DEFUN([AM_GNU_GETTEXT],
     AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
   ])
 
-  dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
+  dnl On Mac OS X, libintl requires linking with CoreFoundation.
   gt_INTL_MACOSX
 
+  dnl On native Windows, libintl requires linking with advapi32,
+  dnl because langprefs.c (_nl_language_preferences_win32_95) uses functions
+  dnl from advapi32.dll.
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  INTL_WINDOWS_LIBS=
+  case "$host_os" in
+    mingw* | windows*) INTL_WINDOWS_LIBS='-ladvapi32' ;;
+  esac
+
   dnl Set USE_NLS.
   AC_REQUIRE([AM_NLS])
 
@@ -119,15 +126,15 @@ AC_DEFUN([AM_GNU_GETTEXT],
   if test "$USE_NLS" = "yes"; then
     gt_use_preinstalled_gnugettext=no
     m4_if(gt_building_libintl_in_same_build_tree, yes, [
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH([included-gettext],
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
+      AC_MSG_CHECKING([whether included libintl is requested])
+      AC_ARG_WITH([included-libintl],
+        [  --with-included-libintl use the GNU libintl library included here],
+        gt_cv_force_use_gnu_libintl=$withval,
+        gt_cv_force_use_gnu_libintl=no)
+      AC_MSG_RESULT([$gt_cv_force_use_gnu_libintl])
 
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
+      gt_cv_use_gnu_libintl="$gt_cv_force_use_gnu_libintl"
+      if test "$gt_cv_force_use_gnu_libintl" != "yes"; then
     ])
         dnl User does not insist on using GNU NLS library.  Figure out what
         dnl to use.  If GNU gettext is available we use this.  Else we have
@@ -151,13 +158,37 @@ changequote([,])dnl
           gt_expression_test_code=
         fi
 
+        dnl In the test code below:
+        dnl * We test for the presence of _nl_msg_cat_cntr because GNU libc and
+        dnl   libintl define this variable, whereas Solaris 10 libc/libintl
+        dnl   (which we don't want to use, as it does not support GNU .mo files)
+        dnl   does not define it.
+        dnl * We don't test for _nl_msg_cat_cntr on MSVC, because the use of a
+        dnl   variable under MSVC depends on whether it is exported by a shared
+        dnl   library or a static library: If libintl is a shared library, we
+        dnl   would have to declare it with __declspec(dllimport), whereas if it
+        dnl   is a static library, we would have to declare it without such a
+        dnl   __declspec. But libintl comes with just one header file,
+        dnl   <libintl.h>, that does not declare _nl_msg_cat_cntr and that does
+        dnl   not tell us whether the library was built shared or static.
+        dnl * We test for the presence of _nl_domain_bindings because GNU libc
+        dnl   defines this variable, whereas NetBSD libc (which we don't want to
+        dnl   use, as it was broken at least in 2002) does not define it.
+        dnl * We test for the presence of _nl_expand_alias because GNU libintl
+        dnl   defines this function, whereas NetBSD libintl (which we don't want
+        dnl   to use, as it was broken at least in 2002) does not define it.
+
         AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
          [AC_LINK_IFELSE(
             [AC_LANG_PROGRAM(
                [[
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
 extern int _nl_msg_cat_cntr;
+#endif
 extern int *_nl_domain_bindings;
 #define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
 #else
@@ -169,7 +200,28 @@ $gt_revision_test_code
 bindtextdomain ("", "");
 return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                ]])],
-            [eval "$gt_func_gnugettext_libc=yes"],
+            [dnl Solaris 11.[0-3] doesn't strip the CODESET part from the locale name,
+             dnl when looking for a message catalog. E.g. when the locale is fr_FR.UTF-8,
+             dnl on Solaris 11.[0-3] it looks for
+             dnl   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl Similarly, on Solaris 11 OpenIndiana and Solaris 11 OmniOS it looks only for
+             dnl   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl Reported at <https://www.illumos.org/issues/13423>.
+             dnl On Solaris 11.4 this is fixed: it looks for
+             dnl   <LOCALEDIR>/fr_FR.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr.UTF-8/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr_FR/LC_MESSAGES/<domain>.mo
+             dnl   <LOCALEDIR>/fr/LC_MESSAGES/<domain>.mo
+             if test "`uname -sr`" = 'SunOS 5.11'; then
+               case `uname -v` in
+                 11.4 | 11.4.*) eval "$gt_func_gnugettext_libc=yes" ;;
+                 *)             eval "$gt_func_gnugettext_libc=no" ;;
+               esac
+             else
+               eval "$gt_func_gnugettext_libc=yes"
+             fi
+            ],
             [eval "$gt_func_gnugettext_libc=no"])])
 
         if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
@@ -194,7 +246,11 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                  [[
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
 extern int _nl_msg_cat_cntr;
+#endif
 extern
 #ifdef __cplusplus
 "C"
@@ -213,11 +269,13 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
               [eval "$gt_func_gnugettext_libintl=yes"],
               [eval "$gt_func_gnugettext_libintl=no"])
             dnl Now see whether libintl exists and depends on libiconv or other
-            dnl OS dependent libraries, specifically on macOS and AIX.
-            gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
-            AC_REQUIRE([AC_CANONICAL_HOST])
+            dnl OS dependent libraries, specifically on macOS, AIX, and native
+            dnl Windows.
+            gt_LIBINTL_EXTRA=
             case "$host_os" in
-              aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+              darwin*)           gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS" ;;
+              aix*)              gt_LIBINTL_EXTRA="-lpthread" ;;
+              mingw* | windows*) gt_LIBINTL_EXTRA="$INTL_WINDOWS_LIBS" ;;
             esac
             if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
                && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
@@ -227,7 +285,11 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
                    [[
 #include <libintl.h>
 #ifndef __GNU_GETTEXT_SUPPORTED_REVISION
+#if defined _MSC_VER
+#define _nl_msg_cat_cntr 0
+#else
 extern int _nl_msg_cat_cntr;
+#endif
 extern
 #ifdef __cplusplus
 "C"
@@ -273,11 +335,15 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
         if test "$gt_use_preinstalled_gnugettext" != "yes"; then
           dnl GNU gettext is not found in the C library.
           dnl Fall back on included GNU gettext library.
-          nls_cv_use_gnu_gettext=yes
+          gt_cv_use_gnu_libintl=yes
         fi
       fi
 
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
+      AC_REQUIRE([AC_CANONICAL_HOST])
+      if test "$gt_cv_use_gnu_libintl" = "yes" \
+         || case "$host_os" in cygwin*) true;; *) false;; esac; then
+        dnl GNU gettext is not found in the C library or is,
+        dnl like on Cygwin, a component of the C library.
         dnl Mark actions used to generate GNU NLS library.
         USE_INCLUDED_LIBINTL=yes
         LIBINTL="m4_if([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
@@ -287,7 +353,7 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
       CATOBJEXT=
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
         dnl Mark actions to use GNU gettext tools.
         CATOBJEXT=.gmo
       fi
@@ -295,15 +361,24 @@ return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
     if test -n "$INTL_MACOSX_LIBS"; then
       if test "$gt_use_preinstalled_gnugettext" = "yes" \
-         || test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Some extra flags are needed during linking.
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
+        dnl Some extra options are needed during linking.
         LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
         LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
       fi
     fi
 
+    if test -n "$INTL_WINDOWS_LIBS"; then
+      if test "$gt_use_preinstalled_gnugettext" = "yes" \
+         || test "$gt_cv_use_gnu_libintl" = "yes"; then
+        dnl Some extra options are needed during linking.
+        LIBINTL="$LIBINTL $INTL_WINDOWS_LIBS"
+        LTLIBINTL="$LTLIBINTL $INTL_WINDOWS_LIBS"
+      fi
+    fi
+
     if test "$gt_use_preinstalled_gnugettext" = "yes" \
-       || test "$nls_cv_use_gnu_gettext" = "yes"; then
+       || test "$gt_cv_use_gnu_libintl" = "yes"; then
       AC_DEFINE([ENABLE_NLS], [1],
         [Define to 1 if translation of program messages to the user's native language
    is requested.])

gettext-runtime/m4/glibc2.m4

@@ -1,14 +1,14 @@
 # glibc2.m4
-# serial 3
-dnl Copyright (C) 2000-2024 Free Software Foundation, Inc.
+# serial 4
+dnl Copyright (C) 2000-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 dnl This file is offered as-is, without any warranty.
 
-# Test for the GNU C Library, version 2.0 or newer.
-# From Bruno Haible.
+dnl From Bruno Haible.
 
+dnl Test for the GNU C Library, version 2.0 or newer.
 AC_DEFUN([gt_GLIBC2],
   [
     AC_CACHE_CHECK([whether we are using the GNU C Library 2 or newer],

gettext-runtime/m4/nls.m4

@@ -1,6 +1,6 @@
 # nls.m4
-# serial 6 (gettext-0.24)
-dnl Copyright (C) 1995-2025 Free Software Foundation, Inc.
+# serial 7 (gettext-1.0)
+dnl Copyright (C) 1995-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,9 +15,7 @@ dnl by the GNU Lesser General Public License, and the rest of the GNU
 dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <haible@clisp.cons.org>, 2000-2003.
+dnl From Ulrich Drepper, Bruno Haible.
 
 AC_PREREQ([2.50])
 

gettext-runtime/m4/po.m4

@@ -1,6 +1,6 @@
 # po.m4
-# serial 34 (gettext-0.24)
-dnl Copyright (C) 1995-2024 Free Software Foundation, Inc.
+# serial 35 (gettext-1.0)
+dnl Copyright (C) 1995-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,9 +15,7 @@ dnl by the GNU Lesser General Public License, and the rest of the GNU
 dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
-dnl   Bruno Haible <bruno@clisp.org>, 2000-2024.
+dnl From Ulrich Drepper, Bruno Haible.
 
 AC_PREREQ([2.60])
 

gettext-runtime/m4/progtest.m4

@@ -1,6 +1,6 @@
 # progtest.m4
-# serial 10 (gettext-0.24)
-dnl Copyright (C) 1996-2025 Free Software Foundation, Inc.
+# serial 12 (gettext-1.0)
+dnl Copyright (C) 1996-2026 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -15,8 +15,7 @@ dnl by the GNU Lesser General Public License, and the rest of the GNU
 dnl gettext package is covered by the GNU General Public License.
 dnl They are *not* in the public domain.
 
-dnl Authors:
-dnl   Ulrich Drepper <drepper@cygnus.com>, 1996.
+dnl From Ulrich Drepper, Bruno Haible.
 
 AC_PREREQ([2.53])
 
@@ -68,7 +67,7 @@ AC_CACHE_VAL([ac_cv_path_$1],
       test -z "$ac_dir" && ac_dir=.
       for ac_exec_ext in '' $ac_executable_extensions; do
         if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
-          echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
+          echo "$as_me:${as_lineno-$LINENO}: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
           if [$3]; then
             ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
             break 2

gettext-runtime/man/Makefile.am

@@ -1,6 +1,5 @@
 ## Makefile for the gettext-runtime/man subdirectory of GNU gettext
-## Copyright (C) 2001-2003, 2006, 2009, 2013-2014, 2018-2019 Free Software Foundation,
-## Inc.
+## Copyright (C) 2001-2025 Free Software Foundation, Inc.
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -24,12 +23,12 @@ EXTRA_DIST =
 
 # A manual page for each of the bin_PROGRAMS in src/Makefile.am.
 
-man_aux = gettext.x ngettext.x envsubst.x
+man_aux = gettext.x ngettext.x printf_gettext.x printf_ngettext.x envsubst.x
 
 # Likewise, plus additional manual pages for the libintl functions.
 
-man_MAN1GEN = gettext.1 ngettext.1
-man_MAN1IN = gettext.1.in ngettext.1.in
+man_MAN1GEN = gettext.1 ngettext.1 printf_gettext.1 printf_ngettext.1
+man_MAN1IN = gettext.1.in ngettext.1.in printf_gettext.1.in printf_ngettext.1.in
 man_MAN1OTHER = envsubst.1
 man_MAN1 = $(man_MAN1GEN) $(man_MAN1OTHER)
 man_MAN3 = gettext.3 ngettext.3 \
@@ -40,8 +39,8 @@ man_MAN3LINK = dgettext.3 dcgettext.3 dngettext.3 dcngettext.3
 man_MANS = $(man_MAN1)
 notrans_man_MANS = $(man_MAN3) $(man_MAN3LINK)
 
-man_HTML1GEN = gettext.1.html ngettext.1.html
-man_HTML1IN = gettext.1.html.in ngettext.1.html.in
+man_HTML1GEN = gettext.1.html ngettext.1.html printf_gettext.1.html printf_ngettext.1.html
+man_HTML1IN = gettext.1.html.in ngettext.1.html.in printf_gettext.1.html.in printf_ngettext.1.html.in
 man_HTML1OTHER = envsubst.1.html
 man_HTML1 = $(man_HTML1GEN) $(man_HTML1OTHER)
 man_HTML3 = gettext.3.html ngettext.3.html \
@@ -108,6 +107,8 @@ $(man_MAN1GEN): Makefile
 
 gettext.1: gettext.1.in
 ngettext.1: ngettext.1.in
+printf_gettext.1: printf_gettext.1.in
+printf_ngettext.1: printf_ngettext.1.in
 
 $(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
 	progname=`echo $@ | sed -e 's/\.in$$//' -e 's/\.1$$//'`; \
@@ -116,6 +117,8 @@ $(man_MAN1IN) $(man_MAN1OTHER): help2man $(top_srcdir)/../.version
 
 gettext.1.in: gettext.x ../src/gettext.c
 ngettext.1.in: ngettext.x ../src/ngettext.c
+printf_gettext.1.in: printf_gettext.x ../src/printf_gettext.c
+printf_ngettext.1.in: printf_ngettext.x ../src/printf_ngettext.c
 envsubst.1: envsubst.x ../src/envsubst.c
 
 $(man_MAN3): $(top_srcdir)/../.version
@@ -143,6 +146,8 @@ $(man_HTML1GEN): Makefile
 
 gettext.1.html: gettext.1.html.in
 ngettext.1.html: ngettext.1.html.in
+printf_gettext.1.html: printf_gettext.1.html.in
+printf_ngettext.1.html: printf_ngettext.1.html.in
 
 $(man_HTML1IN):
 	srcdir=''; \
@@ -153,6 +158,8 @@ $(man_HTML1IN):
 
 gettext.1.html.in: gettext.1.in
 ngettext.1.html.in: ngettext.1.in
+printf_gettext.1.html.in: printf_gettext.1.in
+printf_ngettext.1.html.in: printf_ngettext.1.in
 
 $(man_HTML1OTHER):
 	srcdir=''; \

gettext-runtime/man/bind_textdomain_codeset.3.in

@@ -1,4 +1,4 @@
-.\" Copyright (c) Bruno Haible <haible@clisp.cons.org>
+.\" Copyright (c) Bruno Haible <bruno@clisp.org>
 .\"
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as

gettext-runtime/man/bindtextdomain.3.in

@@ -1,4 +1,4 @@
-.\" Copyright (c) Bruno Haible <haible@clisp.cons.org>
+.\" Copyright (c) Bruno Haible <bruno@clisp.org>
 .\"
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as

gettext-runtime/man/envsubst.x

@@ -1,3 +1,12 @@
+.\" Copyright (c) Free Software Foundation, Inc.
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" Written by Bruno Haible.
+.\"
 [NAME]
 envsubst \- substitutes environment variables in shell format strings
 [DESCRIPTION]

gettext-runtime/man/gettext.3.in

@@ -1,4 +1,4 @@
-.\" Copyright (c) Bruno Haible <haible@clisp.cons.org>
+.\" Copyright (c) Bruno Haible <bruno@clisp.org>
 .\"
 .\" This is free documentation; you can redistribute it and/or
 .\" modify it under the terms of the GNU General Public License as

gettext-runtime/man/gettext.x

@@ -1,3 +1,12 @@
+.\" Copyright (c) Free Software Foundation, Inc.
+.\"
+.\" This is free documentation; you can redistribute it and/or
+.\" modify it under the terms of the GNU General Public License as
+.\" published by the Free Software Foundation; either version 2 of
+.\" the License, or (at your option) any later version.
+.\"
+.\" Written by Bruno Haible.
+.\"
 [NAME]
 gettext \- translate message
 [DESCRIPTION]