Update, simplify, and sort .gitignore files

5 files changed, 427 insertions, 534 deletions

diff --git a/.gitignore b/.gitignore
index c022751..0a4e55d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,15 @@
 *.a
 *.exe
-*.o
-*/.deps/
-**~
-+*
 *.gcda
 *.gcno
+*.gz
+*.o
+*.sig
+*.xz
+*~
++*
+.deps/
 .dirstamp
-/gnulib-tests/*
-!/gnulib-tests/Makefile.am
 /.version
 /ABOUT-NLS
 /ChangeLog
@@ -18,25 +19,13 @@
 /THANKS
 /aclocal.m4
 /autom4te.cache
-/build-aux/ar-lib
-/build-aux/compile
-/build-aux/config.guess
-/build-aux/config.sub
-/build-aux/depcomp
-/build-aux/git-version-gen
-/build-aux/mdate-sh
-/build-aux/missing
-/build-aux/test-driver
 /config.cache
 /config.h
 /config.log
-/config.rpath
 /config.status
 /config_h.in
 /configure
-/doc/.dirstamp
 /doc/.gitignore
-/doc/Makefile
 /doc/coverage/
 /doc/sed.1
 /doc/sed.aux
@@ -55,63 +44,19 @@
 /doc/sed.vr
 /doc/stamp-vti
 /doc/version.texi
-/lib/.dirstamp
-/lib/Makefile
-/lib/arg-nonnull.h
-/lib/c++defs.h
-/lib/charset.alias
-/lib/configmake.h
-/lib/glthread/
-/lib/selinux/
-/lib/unused-parameter.h
-/lib/warn-on-use.h
-/lib/alloca.h
-/lib/ctype.h
-/lib/errno.h
-/lib/fcntl.h
-/lib/getopt-cdefs.h
-/lib/getopt.h
-/lib/inttypes.h
-/lib/langinfo.h
-/lib/limits.h
-/lib/locale.h
-/lib/se-context.h
-/lib/se-label.h
-/lib/se-selinux.h
-/lib/stdalign.h
-/lib/stdarg.h
-/lib/stdbool.h
-/lib/stddef.h
-/lib/stdint.h
-/lib/stdio.h
-/lib/stdlib.h
-/lib/string.h
-/lib/time.h
-/lib/unistd.h
-/lib/wchar.h
-/lib/wctype.h
-/m4
+/gnulib-tests/
+!/gnulib-tests/Makefile.am
 /maint.mk
-/po/Makefile
-/po/Makevars
-/po/POTFILES
-/po/sed.pot
-/po/stamp-po
-/sed-*.tar.xz
-/sed-*.tar.xz.sig
 /sed-[4-9]*
-/sed/.dirstamp
-/sed/Makefile
 /sed/sed
 /sed/version.[ch]
 /stamp-h1
 /testsuite/*.log
+/testsuite/*.out
 /testsuite/*.trs
-/testsuite/Makefile
 /testsuite/eval.in2
 /testsuite/get-mb-cur-max
 /testsuite/test-mbrtowc
-/testsuite/utf8-[1-4].out
 Makefile
 Makefile.in
 test-suite.log
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index f6fd46d..a73f648 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -1,22 +1,20 @@
-/config.rpath
-/*~
-arg-nonnull.h
-c++defs.h
-config.rpath
-gitlog-to-changelog
-install-sh
-link-warning.h
-snippet
-texinfo.tex
-unused-parameter.h
-warn-on-use.h
 /announce-gen
+/compile
+/config.guess
+/config.rpath
+/config.sub
+/depcomp
 /do-release-commit-and-tag
 /gendocs.sh
+/git-version-gen
+/gitlog-to-changelog
 /gnu-web-doc-update
 /gnupload
+/install-sh
+/mdate-sh
+/missing
+/test-driver
+/texinfo.tex
+/update-copyright
 /useless-if-before-free
 /vc-list-files
-/update-copyright
-/prefix-gnulib-mk
-/git-version-gen
diff --git a/lib/.gitignore b/lib/.gitignore
index 76970db..e97275e 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -1,259 +1,235 @@
-acl-errno-valid.c
-acl-internal.h
-acl.h
-acl_entries.c
-alloca.c
-alloca.h
-alloca.in.h
-basename-lgpl.c
-basename.c
-btowc.c
-c-ctype.c
-c-ctype.h
-c-strcase.h
-c-strcasecmp.c
-c-strcaseeq.h
-c-strncasecmp.c
-canonicalize-lgpl.c
-config.charset
-copy-acl.c
-dirname-lgpl.c
-dirname.c
-dirname.h
-dosname.h
-errno.h
-errno.in.h
-error.c
-error.h
-exitfail.c
-exitfail.h
-fcntl.h
-fcntl.in.h
-file-has-acl.c
-fstat.c
-fwriting.c
-fwriting.h
-getdelim.c
-getfilecon.c
-getline.c
-getopt.c
-getopt.h
-getopt.in.h
-getopt1.c
-getopt_int.h
-getpagesize.c
-gettext.h
-gettimeofday.c
-gnulib.mk
-iconv.h
-iconv.in.h
-iconv_open-aix.gperf
-iconv_open-aix.h
-iconv_open-hpux.gperf
-iconv_open-hpux.h
-iconv_open-irix.gperf
-iconv_open-irix.h
-iconv_open-osf.gperf
-iconv_open-osf.h
-iconv_open-solaris.gperf
-iconv_open-solaris.h
-iconv_open.c
-intprops.h
-langinfo.h
-langinfo.in.h
-localcharset.c
-localcharset.h
-locale.h
-locale.in.h
-localeconv.c
-lstat.c
-malloc.c
-malloca.c
-malloca.h
-malloca.valgrind
-mbchar.c
-mbchar.h
-mbiter.h
-mbrlen.c
-mbrtowc.c
-mbsinit.c
-mbslen.c
-mbsstr.c
-mbtowc-impl.h
-mbtowc.c
-mbuiter.h
-memchr.c
-memchr.valgrind
-memcmp.c
-memmove.c
-mkostemp.c
-msvc-inval.c
-msvc-inval.h
-msvc-nothrow.c
-msvc-nothrow.h
-nl_langinfo.c
-obstack.c
-obstack.h
-pathmax.h
-propername.c
-propername.h
-qcopy-acl.c
-qset-acl.c
-quote.c
-quote.h
-quotearg.c
-quotearg.h
-readlink.c
-realloc.c
-ref-add.sed
-ref-add.sin
-ref-del.sed
-ref-del.sin
-regcomp.c
-regex.c
-regex.h
-regex_internal.c
-regex_internal.h
-regexec.c
-rename.c
-rmdir.c
-same-inode.h
-se-context.c
-se-context.h
-se-context.in.h
-se-selinux.c
-se-selinux.h
-se-selinux.in.h
-secure_getenv.c
-set-acl.c
-set-mode-acl.c
-stat-macros.h
-stat.c
-stdarg.h
-stdarg.in.h
-stdbool.h
-stdbool.in.h
-stddef.h
-stddef.in.h
-stdint.h
-stdint.in.h
-stdio-impl.h
-stdio-write.c
-stdio.c
-stdio.h
-stdio.in.h
-stdlib.h
-stdlib.in.h
-str-kmp.h
-strcasecmp.c
-streq.h
-strerror-override.c
-strerror-override.h
-strerror.c
-striconv.c
-striconv.h
-string.h
-string.in.h
-strings.h
-strings.in.h
-stripslash.c
-strncasecmp.c
-strndup.c
-strnlen.c
-strnlen1.c
-strnlen1.h
-strverscmp.c
-sys
-sys_stat.h
-sys_stat.in.h
-sys_time.h
-sys_time.in.h
-sys_types.h
-sys_types.in.h
-tempname.c
-tempname.h
-time.h
-time.in.h
-trim.c
-trim.h
-unistd.c
-unistd.h
-unistd.in.h
-unitypes.h
-unitypes.in.h
-uniwidth.h
-uniwidth.in.h
-unlocked-io.h
-verify.h
-version-etc-fsf.c
-version-etc.c
-version-etc.h
-wchar.h
-wchar.in.h
-wcrtomb.c
-wctob.c
-wctomb-impl.h
-wctomb.c
-wctype-h.c
-wctype.h
-wctype.in.h
-wcwidth.c
-xalloc-die.c
-xalloc-oversized.h
-xalloc.h
-xmalloc.c
-xstriconv.c
-xstriconv.h
-xstrndup.c
-xstrndup.h
+*.bak
+/_Noreturn.h
+/acl-errno-valid.c
 /acl-internal.c
+/acl-internal.h
+/acl.h
+/acl_entries.c
 /alignof.h
-/closeout.c
-/closeout.h
+/alloca.c
+/alloca.h
+/alloca.in.h
+/arg-nonnull.h
+/attribute.h
+/basename-lgpl.c
+/basename-lgpl.h
+/binary-io.c
+/binary-io.h
+/btowc.c
+/c++defs.h
+/c-ctype.c
+/c-ctype.h
+/c-strcase.h
+/c-strcasecmp.c
+/c-strcaseeq.h
+/c-strncasecmp.c
+/calloc.c
+/canonicalize-lgpl.c
+/cdefs.h
+/cloexec.c
+/cloexec.h
 /close-stream.c
 /close-stream.h
+/close.c
+/closeout.c
+/closeout.h
+/copy-acl.c
 /ctype.h
 /ctype.in.h
 /dfa.c
 /dfa.h
+/dirname-lgpl.c
+/dirname.h
+/dup2.c
+/dynarray.h
+/eloop-threshold.h
+/errno.h
+/errno.in.h
+/error.c
+/error.h
+/exitfail.c
+/exitfail.h
+/fcntl.c
+/fcntl.h
+/fcntl.in.h
+/fd-hook.c
+/fd-hook.h
 /filename.h
+/flexmember.h
 /fpending.c
 /fpending.h
-/getopt-cdefs.in.h
-/getopt-core.h
-/getopt-ext.h
-/getopt-pfx-core.h
-/getopt-pfx-ext.h
+/free.c
+/fstat.c
+/fwriting.c
+/fwriting.h
 /get-permissions.c
+/getdelim.c
+/getdtablesize.c
+/getfilecon.c
 /getprogname.c
 /getprogname.h
-/gnulib.mk.bak
+/getrandom.c
+/gettext.h
+/glthread/
+/gnulib.mk
 /hard-locale.c
 /hard-locale.h
+/ialloc.c
+/ialloc.h
+/idx.h
 /ignore-value.h
-/isblank.c
+/intprops.h
+/inttypes.h
+/inttypes.in.h
+/langinfo.h
+/langinfo.in.h
+/lc-charset-dispatch.c
+/lc-charset-dispatch.h
+/libc-config.h
 /limits.h
 /limits.in.h
+/localcharset.c
+/localcharset.h
+/locale.h
+/locale.in.h
+/localeconv.c
 /localeinfo.c
 /localeinfo.h
-/localtime-buffer.c
-/localtime-buffer.h
+/lstat.c
+/malloc.c
+/malloc/
+/malloca.c
+/malloca.h
+/mbrlen.c
+/mbrtowc-impl-utf8.h
+/mbrtowc-impl.h
+/mbrtowc.c
+/mbsinit.c
+/mbtowc-impl.h
+/mbtowc-lock.c
+/mbtowc-lock.h
+/mbtowc.c
+/memchr.c
+/memchr.valgrind
+/mempcpy.c
 /memrchr.c
 /minmax.h
-/_Noreturn.h
+/mkdir.c
+/mkostemp.c
+/msvc-inval.c
+/msvc-inval.h
+/msvc-nothrow.c
+/msvc-nothrow.h
+/nl_langinfo-lock.c
+/nl_langinfo.c
+/obstack.c
+/obstack.h
+/open.c
+/pathmax.h
 /progname.c
 /progname.h
+/qcopy-acl.c
+/qset-acl.c
+/quote.h
+/quotearg.c
+/quotearg.h
+/rawmemchr.c
+/rawmemchr.valgrind
+/readlink.c
+/realloc.c
+/reallocarray.c
+/regcomp.c
+/regex.c
+/regex.h
+/regex_internal.c
+/regex_internal.h
+/regexec.c
+/rename.c
+/rmdir.c
+/same-inode.h
+/scratch_buffer.h
+/se-context.c
+/se-context.h
+/se-context.in.h
+/se-label.c
+/se-label.h
+/se-label.in.h
+/se-selinux.c
+/se-selinux.h
+/se-selinux.in.h
+/selinux/
+/set-acl.c
 /set-permissions.c
+/setlocale-lock.c
+/setlocale_null.c
+/setlocale_null.h
+/stat-macros.h
 /stat-time.c
 /stat-time.h
 /stat-w32.c
 /stat-w32.h
+/stat.c
+/stdalign.h
 /stdalign.in.h
-/cdefs.h
-/libc-config.h
-/mkdir.c
-/calloc.c
-/dynarray.h
-/ialloc.c
-/ialloc.h
-/reallocarray.c
+/stdarg.h
+/stdarg.in.h
+/stdbool.h
+/stdbool.in.h
+/stddef.h
+/stddef.in.h
+/stdint.h
+/stdint.in.h
+/stdio-impl.h
+/stdio-read.c
+/stdio-write.c
+/stdio.h
+/stdio.in.h
+/stdlib.h
+/stdlib.in.h
+/streq.h
+/strerror-override.c
+/strerror-override.h
+/strerror.c
+/string.h
+/string.in.h
+/stripslash.c
+/strverscmp.c
+/sys/
+/sys_random.in.h
+/sys_stat.in.h
+/sys_types.in.h
+/tempname.c
+/tempname.h
+/time.h
+/time.in.h
+/unistd.c
+/unistd.h
+/unistd.in.h
+/unlocked-io.h
+/verify.h
+/version-etc-fsf.c
+/version-etc.c
+/version-etc.h
+/warn-on-use.h
+/wchar.h
+/wchar.in.h
+/wcrtomb.c
+/wctob.c
+/wctomb-impl.h
+/wctomb.c
+/wctype-h.c
+/wctype.h
+/wctype.in.h
+/windows-initguard.h
+/windows-mutex.c
+/windows-mutex.h
+/windows-once.c
+/windows-once.h
+/windows-recmutex.c
+/windows-recmutex.h
+/windows-rwlock.c
+/windows-rwlock.h
+/xalloc-die.c
+/xalloc-oversized.h
+/xalloc.h
+/xmalloc.c
diff --git a/m4/.gitignore b/m4/.gitignore
index a95b9a1..dcd6f8d 100644
--- a/m4/.gitignore
+++ b/m4/.gitignore
@@ -1,237 +1,217 @@
-/glibc21.m4
-/xsize.m4
-/wint_t.m4
-/wchar_t.m4
-/visibility.m4
-/uintmax_t.m4
-/threadlib.m4
-/stdint_h.m4
-/size_max.m4
-/progtest.m4
-/printf-posix.m4
-/po.m4
-/nls.m4
-/longlong.m4
-/lock.m4
-/lib-prefix.m4
-/lib-link.m4
-/lib-ld.m4
-/lcmessage.m4
-/inttypes_h.m4
-/inttypes-pri.m4
-/intmax.m4
-/intlmacosx.m4
-/intldir.m4
-/intl.m4
-/intdiv0.m4
-/iconv.m4
-/glibc2.m4
-/gettext.m4
-/fcntl-o.m4
-/extern-inline.m4
-/codeset.m4
-/*~
-/multiarch.m4
-00gnulib.m4
-absolute-header.m4
-acl.m4
-alloca.m4
-btowc.m4
-canonicalize.m4
-codeset.m4
-configmake.m4
-dirname.m4
-dos.m4
-double-slash-root.m4
-eealloc.m4
-errno_h.m4
-error.m4
-exitfail.m4
-extensions.m4
-extern-inline.m4
-fcntl-o.m4
-fcntl_h.m4
-fstat.m4
-fwriting.m4
-getdelim.m4
-getline.m4
-getopt.m4
-getpagesize.m4
-gettext.m4
-gettimeofday.m4
-glibc2.m4
-gnulib-cache.m4
-gnulib-common.m4
-gnulib-comp.m4
-gnulib-tool.m4
-iconv.m4
-iconv_h.m4
-iconv_open.m4
-include_next.m4
-inline.m4
-intdiv0.m4
-intl.m4
-intldir.m4
-intlmacosx.m4
-intmax.m4
-inttypes-h.m4
-inttypes-pri.m4
-inttypes_h.m4
-langinfo_h.m4
-largefile.m4
-lcmessage.m4
-lib-ld.m4
-lib-link.m4
-lib-prefix.m4
-libunistring-base.m4
-localcharset.m4
-locale-fr.m4
-locale-ja.m4
-locale-zh.m4
-locale_h.m4
-localeconv.m4
-lock.m4
-longdouble.m4
-longlong.m4
-lstat.m4
-malloc.m4
-malloca.m4
-mbchar.m4
-mbiter.m4
-mbrlen.m4
-mbrtowc.m4
-mbsinit.m4
-mbslen.m4
-mbstate_t.m4
-mbtowc.m4
-memchr.m4
-memcmp.m4
-memmove.m4
-mkostemp.m4
-mkstemp.m4
-mmap-anon.m4
-msvc-inval.m4
-msvc-nothrow.m4
-multiarch.m4
-nl_langinfo.m4
-nls.m4
-nocrash.m4
-off_t.m4
-pathmax.m4
-po.m4
-printf-posix.m4
-progtest.m4
-quote.m4
-quotearg.m4
-readlink.m4
-realloc.m4
-regex.m4
-rename.m4
-rmdir.m4
-secure_getenv.m4
-selinux-context-h.m4
-selinux-selinux-h.m4
-signed.m4
-size_max.m4
-ssize_t.m4
-stat.m4
-stdarg.m4
-stdbool.m4
-stddef_h.m4
-stdint.m4
-stdint_h.m4
-stdio_h.m4
-stdlib_h.m4
-strcase.m4
-strerror.m4
-string_h.m4
-strings_h.m4
-strndup.m4
-strnlen.m4
-strverscmp.m4
-sys_socket_h.m4
-sys_stat_h.m4
-sys_time_h.m4
-sys_types_h.m4
-tempname.m4
-threadlib.m4
-time_h.m4
-uintmax_t.m4
-ulonglong.m4
-unistd_h.m4
-unlocked-io.m4
-version-etc.m4
-visibility.m4
-warn-on-use.m4
-wchar.m4
-wchar_h.m4
-wchar_t.m4
-wcrtomb.m4
-wctob.m4
-wctomb.m4
-wctype.m4
-wctype_h.m4
-wcwidth.m4
-wint_t.m4
-xalloc.m4
-xsize.m4
-xstrndup.m4
+/00gnulib.m4
+/__inline.m4
+/absolute-header.m4
+/acl.m4
+/alloca.m4
+/arpa_inet_h.m4
+/assert.m4
+/btowc.m4
+/builtin-expect.m4
+/calloc.m4
+/canonicalize.m4
+/clock_time.m4
 /close.m4
 /closedir.m4
+/codeset.m4
+/ctype_h.m4
 /dirent_h.m4
+/dirfd.m4
+/double-slash-root.m4
 /dup2.m4
+/eealloc.m4
 /environ.m4
+/errno_h.m4
+/error.m4
+/explicit_bzero.m4
+/extensions.m4
+/extern-inline.m4
+/fcntl-o.m4
+/fcntl.m4
+/fcntl_h.m4
 /fdopen.m4
 /fflush.m4
+/flexmember.m4
+/fopen.m4
+/fpending.m4
 /fpurge.m4
 /freading.m4
+/free.m4
 /fseek.m4
 /fseeko.m4
+/fstat.m4
 /ftell.m4
 /ftello.m4
+/ftruncate.m4
+/fwriting.m4
 /getcwd.m4
+/getdelim.m4
 /getdtablesize.m4
+/getpagesize.m4
+/getprogname.m4
+/getrandom.m4
+/gettext.m4
+/gettimeofday.m4
+/glibc2.m4
+/glibc21.m4
+/gnulib-cache.m4
+/gnulib-common.m4
+/gnulib-comp.m4
+/gnulib-tool.m4
+/iconv.m4
+/include_next.m4
+/inet_pton.m4
+/intdiv0.m4
+/intl-thread-locale.m4
+/intl.m4
+/intldir.m4
+/intlmacosx.m4
+/intmax.m4
+/inttypes-pri.m4
 /inttypes.m4
+/inttypes_h.m4
+/ioctl.m4
+/isblank.m4
+/langinfo_h.m4
+/largefile.m4
+/lcmessage.m4
+/lib-ld.m4
+/lib-link.m4
+/lib-prefix.m4
+/limits-h.m4
 /link.m4
+/localcharset.m4
+/locale-fr.m4
+/locale-ja.m4
 /locale-tr.m4
+/locale-zh.m4
+/locale_h.m4
+/localeconv.m4
 /localename.m4
+/lock.m4
+/longlong.m4
 /lseek.m4
+/lstat.m4
+/malloc.m4
+/malloca.m4
+/manywarnings-c++.m4
+/manywarnings.m4
+/mbrlen.m4
+/mbrtowc.m4
+/mbsinit.m4
+/mbstate_t.m4
+/mbtowc.m4
+/memchr.m4
+/mempcpy.m4
+/memrchr.m4
+/minmax.m4
+/mkdir.m4
+/mkostemp.m4
+/mmap-anon.m4
 /mode_t.m4
+/msvc-inval.m4
+/msvc-nothrow.m4
+/multiarch.m4
+/musl.m4
+/nanosleep.m4
+/netinet_in_h.m4
+/nl_langinfo.m4
+/nls.m4
+/nocrash.m4
+/obstack.m4
+/off_t.m4
+/open-cloexec.m4
+/open-slash.m4
 /open.m4
 /opendir.m4
+/pathmax.m4
+/perl.m4
+/perror.m4
+/pid_t.m4
+/pipe.m4
+/po.m4
+/printf-posix.m4
+/progtest.m4
+/pselect.m4
+/pthread-thread.m4
+/pthread_h.m4
+/pthread_rwlock_rdlock.m4
+/pthread_sigmask.m4
 /putenv.m4
+/quote.m4
+/quotearg.m4
+/raise.m4
+/rawmemchr.m4
 /read-file.m4
 /readdir.m4
+/readlink.m4
+/realloc.m4
+/reallocarray.m4
+/regex.m4
+/rename.m4
+/rmdir.m4
+/sched_h.m4
+/select.m4
+/selinux-context-h.m4
+/selinux-label-h.m4
+/selinux-selinux-h.m4
 /setenv.m4
 /setlocale.m4
+/setlocale_null.m4
+/signal_h.m4
+/signalblocking.m4
+/size_max.m4
+/sleep.m4
+/socketlib.m4
+/sockets.m4
+/socklen.m4
+/sockpfaf.m4
+/ssize_t.m4
+/stat-time.m4
+/stat.m4
+/std-gnu11.m4
+/stdalign.m4
+/stdarg.m4
+/stdbool.m4
+/stddef_h.m4
+/stdint.m4
+/stdint_h.m4
+/stdio_h.m4
+/stdlib_h.m4
 /strdup.m4
+/strerror.m4
+/strerror_r.m4
+/string_h.m4
+/strverscmp.m4
 /symlink.m4
+/sys_ioctl_h.m4
+/sys_random_h.m4
+/sys_select_h.m4
+/sys_socket_h.m4
+/sys_stat_h.m4
+/sys_time_h.m4
+/sys_types_h.m4
+/sys_uio_h.m4
+/tempname.m4
+/thread.m4
+/threadlib.m4
+/time_h.m4
+/uintmax_t.m4
 /ungetc.m4
-/manywarnings.m4
+/unistd_h.m4
+/unlocked-io.m4
+/vararrays.m4
+/version-etc.m4
+/visibility.m4
+/warn-on-use.m4
 /warnings.m4
-/obstack.m4
-/stdalign.m4
-/close-stream.m4
-/closeout.m4
-/fpending.m4
-/non-recursive-gnulib-prefix-hack.m4
-/assert.m4
-/flexmember.m4
-/getprogname.m4
-/isblank.m4
-/limits-h.m4
-/memrchr.m4
-/builtin-expect.m4
-/minmax.m4
-/dirfd.m4
-/hard-locale.m4
-/pthread_rwlock_rdlock.m4
-/std-gnu11.m4
-/__inline.m4
-/intl-thread-locale.m4
-/mkdir.m4
-/perl.m4
-/calloc.m4
-/ctype_h.m4
-/reallocarray.m4
+/wchar_h.m4
+/wchar_t.m4
+/wcrtomb.m4
+/wctob.m4
+/wctomb.m4
+/wctype_h.m4
+/wint_t.m4
+/xalloc.m4
+/xsize.m4
 /year2038.m4
+/zzgnulib.m4
diff --git a/po/.gitignore b/po/.gitignore
index 1f54771..a838cc1 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -1,24 +1,18 @@
-/remove-potcdate.sin
-/quot.sed
-/insert-header.sin
-/en@quot.header
-/en@boldquot.header
-/boldquot.sed
-/Rules-quot
-/Makevars.template
-/Makefile.in.in
 *.gmo
 *.po
-.reference
-LINGUAS
-Makefile.in.in
-Makevars.template
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sed
-insert-header.sin
-quot.sed
-remove-potcdate.sed
-remove-potcdate.sin
+/.reference/
+/LINGUAS
+/Makefile.in.in
+/Makevars
+/Makevars.template
+/POTFILES
+/Rules-quot
+/boldquot.sed
+/en@boldquot.header
+/en@quot.header
+/insert-header.sin
+/quot.sed
+/remove-potcdate.sed
+/remove-potcdate.sin
+/sed.pot
+/stamp-po