[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libmicrohttpd] branch master updated: Updated gettext files
|
From: |
gnunet |
|
Subject: |
[libmicrohttpd] branch master updated: Updated gettext files |
|
Date: |
Tue, 19 Jan 2021 12:09:09 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
The following commit(s) were added to refs/heads/master by this push:
new a611d6df Updated gettext files
a611d6df is described below
commit a611d6dfac9e1c984dca5a6767ac8a4f21216d8e
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
AuthorDate: Tue Jan 19 14:06:01 2021 +0300
Updated gettext files
---
m4/intdiv0.m4 | 9 +-
m4/intl.m4 | 87 ++++-----
po/ChangeLog | 481 +++++++++++++++++++++++++++++++++++++++++++++++--
po/Makefile.in.in | 133 ++++++++------
po/Makevars | 4 +
po/Rules-quot | 6 +-
po/en@boldquot.header | 2 +-
po/en@quot.header | 2 +-
po/insert-header.sin | 5 +
po/remove-potcdate.sin | 8 +-
10 files changed, 613 insertions(+), 124 deletions(-)
diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4
index 744b99ea..c1034c76 100644
--- a/m4/intdiv0.m4
+++ b/m4/intdiv0.m4
@@ -1,5 +1,5 @@
-# intdiv0.m4 serial 6 (gettext-0.18.2)
-dnl Copyright (C) 2002, 2007-2008, 2010-2016 Free Software Foundation, Inc.
+# intdiv0.m4 serial 7 (gettext-0.20.2)
+dnl Copyright (C) 2002, 2007-2008, 2010-2020 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.
@@ -31,8 +31,11 @@ changequote([,])dnl
if test -z "$gt_cv_int_divbyzero_sigfpe"; then
AC_RUN_IFELSE(
[AC_LANG_SOURCE([[
-#include <stdlib.h>
+#include <stdlib.h> /* for exit() */
#include <signal.h>
+#if !(defined _WIN32 && !defined __CYGWIN__)
+#include <unistd.h> /* for _exit() */
+#endif
static void
sigfpe_handler (int sig)
diff --git a/m4/intl.m4 b/m4/intl.m4
index 42fac953..043176d0 100644
--- a/m4/intl.m4
+++ b/m4/intl.m4
@@ -1,15 +1,15 @@
-# intl.m4 serial 29 (gettext-0.19)
-dnl Copyright (C) 1995-2014, 2016 Free Software Foundation, Inc.
+# intl.m4 serial 44 (gettext-0.21)
+dnl Copyright (C) 1995-2014, 2016-2020 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
dnl This file can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
+dnl the GNU General Public License or the GNU Lesser General Public
dnl License but which still want to provide support for the GNU gettext
dnl functionality.
dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
+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.
@@ -20,8 +20,7 @@ dnl Bruno Haible <haible@clisp.cons.org>, 2000-2009.
AC_PREREQ([2.60])
dnl Checks for all prerequisites of the intl subdirectory,
-dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS,
-dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
+dnl except for LIBTOOL, USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL.
AC_DEFUN([AM_INTL_SUBDIR],
[
AC_REQUIRE([AC_PROG_INSTALL])dnl
@@ -29,7 +28,6 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_REQUIRE([AC_PROG_CC])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
AC_REQUIRE([gt_GLIBC2])dnl
- AC_REQUIRE([AC_PROG_RANLIB])dnl
AC_REQUIRE([gl_VISIBILITY])dnl
AC_REQUIRE([gt_INTL_SUBDIR_CORE])dnl
AC_REQUIRE([AC_TYPE_LONG_LONG_INT])dnl
@@ -41,9 +39,26 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_REQUIRE([gl_GLIBC21])dnl
AC_REQUIRE([gl_XSIZE])dnl
AC_REQUIRE([gl_FCNTL_O_FLAGS])dnl
+ AC_REQUIRE([gt_INTL_THREAD_LOCALE_NAME])
AC_REQUIRE([gt_INTL_MACOSX])dnl
AC_REQUIRE([gl_EXTERN_INLINE])dnl
AC_REQUIRE([gt_GL_ATTRIBUTE])dnl
+ AC_REQUIRE([AC_C_FLEXIBLE_ARRAY_MEMBER])dnl
+
+ dnl In projects that use gnulib, use gl_PROG_AR_RANLIB.
+ dnl The '][' hides this use from 'aclocal'.
+ m4_ifdef([g][l_PROG_AR_RANLIB],
+ [AC_REQUIRE([g][l_PROG_AR_RANLIB])],
+ [AC_REQUIRE([AC_PROG_RANLIB])
+ dnl Use Automake-documented default values for AR and ARFLAGS, but prefer
+ dnl ${host}-ar over ar (useful for cross-compiling).
+ AC_CHECK_TOOL([AR], [ar], [ar])
+ if test -z "$ARFLAGS"; then
+ ARFLAGS='cr'
+ fi
+ AC_SUBST([AR])
+ AC_SUBST([ARFLAGS])
+ ])
dnl Support for automake's --enable-silent-rules.
case "$enable_silent_rules" in
@@ -58,8 +73,8 @@ AC_DEFUN([AM_INTL_SUBDIR],
[Define as the type of the result of subtracting two pointers, if the
system doesn't define it.])
])
AC_CHECK_HEADERS([features.h stddef.h stdlib.h string.h])
- AC_CHECK_FUNCS([asprintf fwprintf newlocale putenv setenv setlocale \
- snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb])
+ AC_CHECK_FUNCS([asprintf wprintf newlocale putenv setenv \
+ snprintf strnlen uselocale wcslen wcsnlen mbrtowc wcrtomb])
dnl Use the _snprintf function only if it is declared (because on NetBSD it
dnl is defined as a weak alias of snprintf; we prefer to use the latter).
@@ -104,6 +119,13 @@ AC_DEFUN([AM_INTL_SUBDIR],
AM_LANGINFO_CODESET
gt_LC_MESSAGES
+ if test $gt_nameless_locales = yes; then
+ HAVE_NAMELESS_LOCALES=1
+ else
+ HAVE_NAMELESS_LOCALES=0
+ fi
+ AC_SUBST([HAVE_NAMELESS_LOCALES])
+
dnl Compilation on mingw and Cygwin needs special Makefile rules, because
dnl 1. when we install a shared library, we must arrange to export
dnl auxiliary pointer variables for every exported variable,
@@ -135,18 +157,6 @@ AC_DEFUN([AM_INTL_SUBDIR],
AC_CHECK_TOOL([WINDRES], [windres])
fi
- dnl Determine whether when creating a library, "-lc" should be passed to
- dnl libtool or not. On many platforms, it is required for the libtool option
- dnl -no-undefined to work. On HP-UX, however, the -lc - stored by libtool
- dnl in the *.la files - makes it impossible to create multithreaded programs,
- dnl because libtool also reorders the -lc to come before the -pthread, and
- dnl this disables pthread_create()
<http://docs.hp.com/en/1896/pthreads.html>.
- case "$host_os" in
- hpux*) LTLIBC="" ;;
- *) LTLIBC="-lc" ;;
- esac
- AC_SUBST([LTLIBC])
-
dnl Rename some macros and functions used for locking.
AH_BOTTOM([
#define __libc_lock_t gl_lock_t
@@ -217,7 +227,6 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
AC_REQUIRE([AC_FUNC_MMAP])dnl
AC_REQUIRE([gt_INTDIV0])dnl
AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])dnl
- AC_REQUIRE([gt_INTTYPES_PRI])dnl
AC_REQUIRE([gl_LOCK])dnl
AC_LINK_IFELSE(
@@ -227,16 +236,9 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
[AC_DEFINE([HAVE_BUILTIN_EXPECT], [1],
[Define to 1 if the compiler understands __builtin_expect.])])
- AC_CHECK_HEADERS([argz.h inttypes.h limits.h unistd.h sys/param.h])
+ AC_CHECK_HEADERS([inttypes.h limits.h unistd.h sys/param.h])
AC_CHECK_FUNCS([getcwd getegid geteuid getgid getuid mempcpy munmap \
- stpcpy strcasecmp strdup strtoul tsearch uselocale argz_count \
- argz_stringify argz_next __fsetlocking])
-
- dnl Solaris 12 provides getlocalename_l, while Illumos doesn't have
- dnl it nor the equivalent.
- if test $ac_cv_func_uselocale = yes; then
- AC_CHECK_FUNCS([getlocalename_l])
- fi
+ stpcpy strcasecmp strdup strtoul tsearch __fsetlocking])
dnl Use the *_unlocked functions only if they are declared.
dnl (because some of them were defined without being declared in Solaris
@@ -248,33 +250,14 @@ AC_DEFUN([gt_INTL_SUBDIR_CORE],
dnl intl/plural.c is generated from intl/plural.y. It requires bison,
dnl because plural.y uses bison specific features. It requires at least
- dnl bison-2.7 for %define api.pure.
+ dnl bison-3.0 for %precedence.
dnl bison is only needed for the maintainer (who touches plural.y). But in
dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put
dnl the rule in general Makefile. Now, some people carelessly touch the
dnl files or have a broken "make" program, hence the plural.c rule will
dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not
dnl present or too old.
- AC_CHECK_PROGS([INTLBISON], [bison])
- if test -z "$INTLBISON"; then
- ac_verc_fail=yes
- else
- dnl Found it, now check the version.
- AC_MSG_CHECKING([version of bison])
-changequote(<<,>>)dnl
- ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.*
\([0-9]*\.[0-9.]*\).*$/\1/p'`
- case $ac_prog_version in
- '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
- 2.[7-9]* | [3-9].*)
-changequote([,])dnl
- ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
- *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
- esac
- AC_MSG_RESULT([$ac_prog_version])
- fi
- if test $ac_verc_fail = yes; then
- INTLBISON=:
- fi
+ gl_PROG_BISON([INTLBISON], [3.0])
])
dnl Copies _GL_UNUSED and _GL_ATTRIBUTE_PURE definitions from
diff --git a/po/ChangeLog b/po/ChangeLog
index b56a1bd7..323900e5 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,16 +1,473 @@
-2018-11-06 gettextize <bug-gnu-gettext@gnu.org>
+2020-07-26 Bruno Haible <bruno@clisp.org>
- * Makefile.in.in: Upgrade to gettext-0.19.8.1.
- * Rules-quot: Upgrade to gettext-0.19.8.1.
+ Update translations (from the TP).
+ * gettext-runtime/po/*.po: Update.
+ * gettext-tools/po/*.po: Update.
+ * gettext-tools/examples/po/*.po: Update.
+ * gettext-tools/examples/po/LINGUAS: Add 'nn'.
+ * gettext-tools/examples/hello-*/po/LINGUAS: Likewise.
+ * gettext-tools/examples/Makefile.am (EXAMPLESPOFILES): Add nn.po.
-2018-03-10 gettextize <bug-gnu-gettext@gnu.org>
+ Prepare for 0.21 release.
+ * gettext-runtime/doc/matrix.texi: Update from TP.
+ * gettext-runtime/doc/nls.texi (STATUS): Update.
+ * gettext-runtime/intl/libgnuintl.in.h (LIBINTL_VERSION): Bump.
+ * gettext-tools/libgettextpo/gettext-po.in.h (LIBGETTEXTPO_VERSION):
Bump.
+ * libtextstyle/version.sh: Update VERSION_NUMBER, RELEASE_DATE.
+ * gettext-runtime/po/Makefile.in.in: Bump Origin version.
+ * NEWS, libtextstyle/NEWS, gettext-runtime/NEWS: Update.
+ * libtextstyle/lib/Makefile.am (LTV_*): Bump to 1:1:1.
+ * gettext-runtime/intl/Makefile.am (LTV_*): Bump to 10:0:2.
+ * gettext-tools/libgettextpo/Makefile.am (LTV_*): Bump to 5:7:5.
+ * gettext-tools/configure.ac (ARCHIVE_VERSION): Bump to 0.21.
+ * gettext-tools/misc/autopoint.in: Allow version 0.21.
- * Makefile.in.in: New file, from gettext-0.19.8.1.
- * Rules-quot: New file, from gettext-0.19.8.1.
- * boldquot.sed: New file, from gettext-0.19.8.1.
- * en@boldquot.header: New file, from gettext-0.19.8.1.
- * en@quot.header: New file, from gettext-0.19.8.1.
- * insert-header.sin: New file, from gettext-0.19.8.1.
- * quot.sed: New file, from gettext-0.19.8.1.
- * remove-potcdate.sin: New file, from gettext-0.19.8.1.
+2020-04-14 Bruno Haible <bruno@clisp.org>
+ Merge from 0.20.x branch: Update translations (from the TP).
+ * gettext-runtime/po/*.po: Update.
+ * gettext-tools/po/*.po: Update.
+ * gettext-tools/examples/po/*.po: Update.
+ * gettext-tools/examples/po/LINGUAS: Add 'sq'.
+ * gettext-tools/examples/hello-*/po/LINGUAS: Likewise.
+ * gettext-tools/examples/Makefile.am (EXAMPLESPOFILES): Add sq.po.
+
+2020-04-11 Bruno Haible <bruno@clisp.org>
+
+ po: Emit a warning when creating a tarball without POT file.
+ * gettext-runtime/po/Makefile.in.in (dist2): Emit a warning when the
POT file
+ does not exist.
+ * gettext-tools/examples/hello-*/po/Makefile.am (distdir1): Likewise.
+
+2020-04-05 Bruno Haible <bruno@clisp.org>
+
+ po, examples: In the .po -> .gmo rules, really consider the newest
changes to the POT file.
+ Reported by Petr Ovtchenkov <ptr@void-ptr.info> in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2020-04/msg00000.html>.
+ Helped by Paul Smith.
+
+ * gettext-runtime/po/Makefile.in.in (.po.gmo): Write dependency on the
POT file
+ as a target rule, since inference rules don't support prerequisites.
+ * gettext-tools/examples/hello-*/po/Makefile.am: Likewise, also for the
.po.qm
+ rule.
+ * NEWS: Mention the fix.
+
+2019-05-12 Bruno Haible <bruno@clisp.org>
+
+ Update translations (from the TP).
+
+ Update bug reporting instructions.
+ * README: Tell users to report bugs in the bug tracker or by email. Use
the
+ mailing list address, not the alias.
+ * gettext-runtime/libasprintf/README: Likewise.
+ * gettext-tools/doc/gettext.texi (Introduction): Likewise.
+ (Plural forms): Use the mailing list address, not the alias.
+ * configure.ac (AC_INIT): Use the mailing list address, not the alias.
+ * gettext-runtime/configure.ac (AC_INIT): Likewise.
+ * gettext-tools/configure.ac (AC_INIT): Likewise.
+ * gettext-tools/examples/configure.ac (AC_INIT): Likewise.
+ * gettext-runtime/po/Makevars (MSGID_BUGS_ADDRESS): Use the mailing list
+ address, not the alias.
+ * gettext-tools/po/Makevars (MSGID_BUGS_ADDRESS): Likewise.
+ * gettext-tools/examples/po/Makefile.am (MSGID_BUGS_ADDRESS): Likewise.
+ * gettext-tools/examples/hello-*/po/Makevars (MSGID_BUGS_ADDRESS):
Likewise.
+ * gettext-tools/examples/hello-*/po/Makefile.am (MSGID_BUGS_ADDRESS):
Likewise.
+ * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
(MSGID_BUGS_ADDRESS):
+ Likewise.
+ * gettext-tools/examples/hello-c++-kde/hello.cc (main): Likewise.
+ * gettext-runtime/src/envsubst.c (main): Move URL out of translatable
string.
+ (usage): Tell users to report bugs in the bug tracker or by email. Use
the
+ mailing list address, not the alias.
+ * gettext-runtime/src/gettext.c: Likewise.
+ * gettext-runtime/src/ngettext.c: Likewise.
+ * gettext-tools/src/cldr-plurals.c: Likewise.
+ * gettext-tools/src/hostname.c: Likewise.
+ * gettext-tools/src/msgattrib.c: Likewise.
+ * gettext-tools/src/msgcat.c: Likewise.
+ * gettext-tools/src/msgcmp.c: Likewise.
+ * gettext-tools/src/msgcomm.c: Likewise.
+ * gettext-tools/src/msgconv.c: Likewise.
+ * gettext-tools/src/msgen.c: Likewise.
+ * gettext-tools/src/msgexec.c: Likewise.
+ * gettext-tools/src/msgfilter.c: Likewise.
+ * gettext-tools/src/msgfmt.c: Likewise.
+ * gettext-tools/src/msggrep.c: Likewise.
+ * gettext-tools/src/msginit.c: Likewise.
+ * gettext-tools/src/msgmerge.c: Likewise.
+ * gettext-tools/src/msgunfmt.c: Likewise.
+ * gettext-tools/src/msguniq.c: Likewise.
+ * gettext-tools/src/recode-sr-latin.c: Likewise.
+ * gettext-tools/src/urlget.c: Likewise.
+ * gettext-tools/src/xgettext.c: Likewise.
+ * gettext-tools/tests/tstgettext.c: Likewise.
+ * gettext-tools/tests/tstngettext.c: Likewise.
+ * gettext-tools/misc/autopoint.in (func_usage): Tell users to report
bugs in the
+ bug tracker or by email. Use the mailing list address, not the alias.
+ * gettext-tools/misc/convert-archive.in (func_usage): Likewise.
+ * gettext-tools/misc/gettextize.in (func_usage): Likewise.
+
+2019-05-08 Bruno Haible <bruno@clisp.org>
+
+ Update translations (from the TP).
+
+2019-04-28 Bruno Haible <bruno@clisp.org>
+
+ In the POT files, talk about the "GNU gettext package".
+ Reported by Benno Schulenberg <coordinator@translationproject.org>.
+
+ * gettext-runtime/po/Makevars (XGETTEXT_OPTIONS): Add --package-name
option.
+ * gettext-tools/po/Makevars (XGETTEXT_OPTIONS): Likewise.
+ * gettext-tools/examples/po/Makefile.am (XGETTEXT_OPTIONS): New
variable.
+
+2019-04-28 Bruno Haible <bruno@clisp.org>
+
+ po: Make it possible to override xgettext options from Makefile.in.in.
+ * gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): List the
+ XGETTEXT_OPTIONS and the XGETTEXT_EXTRA_OPTIONS after all other options.
+ * gettext-tools/examples/po/Makefile.am ($(DOMAIN).pot-update):
Likewise.
+ * gettext-tools/examples/hello-*/po/Makefile.am ($(DOMAIN).pot-update):
+ Likewise.
+ * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+ ($(DOMAIN).pot-update): Likewise.
+ * NEWS: Mention the change.
+ * gettext-tools/doc/gettext.texi (po/Makevars): Fix typo.
+
+2019-04-14 Bruno Haible <bruno@clisp.org>
+
+ Update translations (from the TP).
+ * gettext-runtime/po/*.po: Update.
+ * gettext-runtime/po/LINGUAS: Add 'ast'.
+ * gettext-tools/po/*.po: Update.
+ * gettext-tools/examples/po/*.po: Update.
+ * gettext-tools/examples/po/LINGUAS: Add 'ta'.
+ * gettext-tools/examples/hello-*/po/LINGUAS: Likewise.
+ * gettext-tools/examples/Makefile.am (EXAMPLESPOFILES): Add ta.po.
+
+ Prepare for 0.20 release.
+ * gettext-runtime/intl/libgnuintl.in.h (LIBINTL_VERSION): Update.
+ * gettext-tools/libgettextpo/gettext-po.in.h (LIBGETTEXTPO_VERSION):
Update.
+ * gettext-runtime/m4/gettext.m4: Bump version number in comment.
+ * gettext-runtime/m4/intl.m4: Likewise.
+ * gettext-runtime/m4/intlmacosx.m4: Likewise.
+ * gettext-runtime/m4/po.m4: Likewise.
+ (GETTEXT_MACRO_VERSION): Bump to 0.20.
+ * gettext-runtime/po/Makefile.in.in (GETTEXT_MACRO_VERSION): Likewise.
+ * gettext-runtime/intl/Makefile.am (LTV_*): Bump to 9:6:2.
+ * gettext-tools/libgettextpo/Makefile.am (LTV_*): Bump to 5:5:5.
+ * gettext-tools/configure.ac (ARCHIVE_VERSION): Set to 0.20.
+ * gettext-tools/misc/autopoint.in: Accept version 0.20.
+ * gettext-runtime/doc/matrix.texi: Update from TP.
+ * gettext-runtime/doc/nls.texi (STATUS): Update.
+ * gettext-runtime/src/envsubst.c (main): Update copyright year in
--version
+ output.
+ * gettext-runtime/src/gettext.c (main): Likewise.
+ * gettext-runtime/src/ngettext.c (main): Likewise.
+ * gettext-tools/src/cldr-plurals.c (main): Likewise.
+ * gettext-tools/src/hostname.c (main): Likewise.
+ * gettext-tools/src/msgattrib.c (main): Likewise.
+ * gettext-tools/src/msgcat.c (main): Likewise.
+ * gettext-tools/src/msgcmp.c (main): Likewise.
+ * gettext-tools/src/msgcomm.c (main): Likewise.
+ * gettext-tools/src/msgconv.c (main): Likewise.
+ * gettext-tools/src/msgen.c (main): Likewise.
+ * gettext-tools/src/msgexec.c (main): Likewise.
+ * gettext-tools/src/msgfilter.c (main): Likewise.
+ * gettext-tools/src/msgfmt.c (main): Likewise.
+ * gettext-tools/src/msggrep.c (main): Likewise.
+ * gettext-tools/src/msginit.c (main): Likewise.
+ * gettext-tools/src/msgmerge.c (main): Likewise.
+ * gettext-tools/src/msgunfmt.c (main): Likewise.
+ * gettext-tools/src/msguniq.c (main): Likewise.
+ * gettext-tools/src/recode-sr-latin.c (main): Likewise.
+ * gettext-tools/src/urlget.c (main): Likewise.
+ * gettext-tools/src/xgettext.c (main): Likewise.
+ * gettext-runtime/src/gettext.sh.in (func_version): Update copyright
year.
+ * gettext-tools/misc/convert-archive.in (func_version): Likewise.
+ * gettext-tools/misc/gettextize.in (func_version): Likewise.
+ * libtextstyle/version.sh: Use version number 0.20 here as well.
+ * gettext-runtime/NEWS: Mention changes (from main NEWS).
+ * libtextstyle/NEWS: Mention changes.
+
+2019-04-04 Bruno Haible <bruno@clisp.org>
+
+ Add copyright notices in several files.
+ Reported by <ineiev@gnu.org> in <https://savannah.gnu.org/bugs/?54809>.
+
+ * gettext-runtime/m4/Makefile.am: Add GPL copyright notice.
+ * gettext-tools/m4/Makefile.am: Likewise.
+ * gettext-tools/doc/iso-639.sed: Likewise.
+ * gettext-tools/doc/iso-639-2.sed: Likewise.
+ * gettext-tools/doc/iso-3166.sed: Likewise.
+ * gettext-tools/its/glade1.its: Likewise.
+ * gettext-tools/its/glade2.its: Likewise.
+ * gettext-tools/its/gsettings.its: Likewise.
+ * gettext-tools/its/gtkbuilder.its: Likewise.
+ * gettext-tools/misc/cvsuser.c: Likewise.
+ * gettext-tools/projects/team-address: Likewise.
+ * gettext-tools/projects/GNOME/team-address: Likewise.
+ * gettext-tools/projects/GNOME/trigger: Likewise.
+ * gettext-tools/projects/KDE/team-address: Likewise.
+ * gettext-tools/projects/KDE/trigger: Likewise.
+ * gettext-tools/projects/TP/team-address: Likewise.
+ * windows/windres-options: Likewise.
+ * gettext-runtime/po/insert-header.sin: Add copyright notice, based on
the one
+ in Rules-quot.
+ * gettext-tools/doc/FAQ.html: Add copyright notice, suitable for
documentation.
+
+2018-11-25 Bruno Haible <bruno@clisp.org>
+
+ build: Remove generated files from version control.
+ This creates a bootstrapping issue, but it can be mitigated:
+ If a user wants to build GNU gettext on a platform which does not have
the
+ GNU gettext programs installed, they first need to build and install a
tarball
+ of GNU gettext; then only they can build GNU gettext from the git
repository.
+
+ * gettext-runtime/po/gettext-runtime.pot: Remove file.
+ * gettext-tools/po/gettext-tools.pot: Remove file.
+ * gettext-tools/examples/po/gettext-examples.pot: Remove file.
+
+2018-10-25 Bruno Haible <bruno@clisp.org>
+
+ po, examples: Change .po -> .gmo rules to consider the newest changes
to the POT file.
+ Reported by Claude Paroz <claude@2xlibre.net>
+ in <https://savannah.gnu.org/bugs/?50910>.
+
+ * gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Set
MSGMERGE_FOR_MSGFMT_OPTION.
+ * gettext-runtime/po/Makefile.in.in (MSGMERGE): Use GNU msgmerge, even
if not
+ first in $PATH.
+ (MSGMERGE_FOR_MSGFMT_OPTION): New variable.
+ (.po.gmo): Depend on the POT file. Use msgmerge on the fly, to take into
+ account the most recent POT file changes.
+ * gettext-tools/examples/hello-*/po/Makefile.am: Likewise, also for the
.po.qm,
+ update-properties, update-classes targets.
+ * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+ (MSGMERGE_FOR_MSGFMT_OPTION): New variable.
+ ($(STRINGSFILES)): Depend on the POT file. Use msgmerge on the fly, to
take
+ into account the most recent POT file changes.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po, examples: Put stamp-po in the source directory.
+ Rationale:
<https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>.
+
+ * gettext-runtime/po/Makefile.in.in: Use $(srcdir)/stamp-po instead of
stamp-po.
+ Talk about "version control system", not CVS.
+ * gettext-tools/examples/hello-*/po/Makefile.am: Likewise.
+ * gettext-tools/examples/po/Makefile.am: Likewise.
+ * gettext-tools/examples/check-examples (func_check_dist_vpath): Verify
the
+ stamp-po file does not exist in the build dir, except when using the
older
+ Makefile.in.in infrastructure.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po: Make "make maintainer-clean" erase the .pot file.
+ Rationale:
+ <https://www.gnu.org/prep/standards/html_node/Standard-Targets.html>
+ <https://www.gnu.org/software/automake/manual/html_node/Clean.html>
+
+ * NEWS: Mention the change.
+ * gettext-runtime/po/Makefile.in.in (maintainer-clean): Remove the .pot
file.
+ * gettext-tools/examples/hello-*/po/Makefile.am (MAINTAINERCLEANFILES):
Add
+ the .pot file.
+ * gettext-tools/examples/po/Makefile.am (MAINTAINERCLEANFILES):
Likewise.
+ * gettext-tools/examples/check-examples (func_check_maintainerclean,
+ func_check_maintainerclean_vpath): Verify the .pot file is removed after
+ 'make maintainer-clean', except when using the older Makefile.in.in
+ infrastructure.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po, examples: Use case-insensitive search for "GNU <PACKAGE_NAME>".
+ Reported by Akim Demaille <akim@lrde.epita.fr> in
+ <https://lists.gnu.org/archive/html/bug-gettext/2018-10/msg00020.html>.
+
+ * gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): Use a
+ case-insensitive search for "GNU <PACKAGE_NAME>".
+ * gettext-tools/examples/hello-*/po/Makefile.am ($(DOMAIN).pot-update):
+ Likewise.
+ * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile
+ ($(DOMAIN).pot-update): Likewise.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po: Remove obsolete Makefile rules for .mo files.
+ * gettext-runtime/po/Makefile.in.in (MSGFMT*): Remove variables.
+ (.SUFFIXES): Remove .mo.
+ (.po.mo): Remove rule.
+ (distclean): Don't remove *.mo files.
+ * gettext-tools/examples/hello-*/po/Makefile.am (.SUFFIXES): Remove .mo.
+ (.po.mo): Remove rule.
+ (DISTCLEANFILES): Remove *.mo.
+ * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile (.SUFFIXES):
+ Remove .mo.
+ * gettext-runtime/m4/po.m4 (AM_PO_SUBDIRS): Don't set MSGFMT_015.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ examples: Add an option to claim the package as GNU/non-GNU.
+ This mirrors the Makefile.in.in and Makevars change from 2014-05-01.
+
+ Reported by David Shea at <https://savannah.gnu.org/bugs/?40520>.
+
+ * gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): Tweak
whitespace.
+ * gettext-tools/examples/hello-*/po/Makefile.am (PACKAGE_GNU): New
variable.
+ ($(DOMAIN).pot-update): Don't search for "GNU packagename" if
$(PACKAGE_GNU) is
+ set.
+ * gettext-tools/examples/hello-objc-gnustep/po/GNUmakefile: Likewise.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po: Make the insertion of the .pot-header file more robust.
+ This improves on the 2015-09-01 patch.
+
+ * gettext-runtime/po/Makefile.in.in ($(DOMAIN).pot-update): Fail if the
'cat'
+ command fails.
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po: When doing msgmerge --version, use the correct msgmerge program.
+ This reverts the patch from
+ <https://lists.gnu.org/archive/html/bug-gettext/2015-06/msg00000.html>.
+ Rationale:
+ <https://lists.gnu.org/archive/html/bug-gettext/2018-10/msg00000.html>.
+
+ * gettext-runtime/po/Makefile.in.in ($(POFILES)): Use
$(MSGMERGE_UPDATE),
+ not $(MSGMERGE).
+
+2018-10-24 Bruno Haible <bruno@clisp.org>
+
+ po: Make $(POFILES) target more robust.
+ It was introduced on 2014-05-01.
+
+ * gettext-runtime/po/Makefile.in.in ($(POFILES)): Create POT file also
when the
+ PO file does not yet exist. Fail if creation of the POT file fails.
+
+2018-05-05 Bruno Haible <bruno@clisp.org>
+
+ all: Replace more http and ftp URLs by https URLs.
+ * autogen.sh: Use https: URLs.
+ * gettext-runtime/doc/nls.texi (Translating Teams, Available Packages):
Likewise.
+ * gettext-tools/doc/gettext.texi: Likewise.
+ * gettext-tools/doc/FAQ.html: Likewise.
+ * gettext-tools/doc/tutorial.html: Likewise.
+ * gettext-tools/misc/gettextize.in: Likewise.
+ * gettext-tools/projects/GNOME/team-address: Likewise.
+ * gettext-tools/projects/GNOME/teams.url: Likewise.
+ * gettext-tools/projects/KDE/team-address: Likewise.
+ * gettext-tools/projects/KDE/teams.url: Likewise.
+ * gettext-tools/projects/TP/teams.url: Likewise.
+ * gettext-tools/src/x-python.c: Likewise.
+ * gettext-tools/tests/xgettext-its-1: Likewise.
+
+2017-10-15 Bruno Haible <bruno@clisp.org>
+
+ Clarify copyright and license of some files.
+ Reported by Joël Krähemann at <https://savannah.gnu.org/bugs/?52227>.
+
+ * gettext-runtime/po/Makefile.in.in: Correct copyright holder.
+ * gettext-runtime/po/remove-potcdate.sin: Use the same licensing terms
as Makefile.in.in.
+ * gettext-runtime/po/Rules-quot: Use an all-permissive license.
+ * gettext-tools/po/Makevars.template: Likewise.
+ * gettext-runtime/po/Makevars: Likewise.
+ * gettext-tools/po/Makevars: Likewise.
+ * gettext-runtime/po/POTFILES.in: Use GPLv3+.
+ * gettext-tools/po/POTFILES.in: Likewise.
+
+2017-02-16 Bruno Haible <bruno@clisp.org>
+
+ Support for Automake targets install-{dvi,ps,pdf,html}.
+ Reported by Eric Blake at
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=25690
+ via Assaf Gordon.
+
+ * gettext-runtime/po/Makefile.in.in (install-dvi, install-ps,
install-pdf,
+ install-html): New empty targets.
+
+2016-12-11 Bruno Haible <bruno@clisp.org>
+
+ Merge all .gitignore files into a single .gitignore file.
+
+ Update and organize the .gitignore files.
+
+2016-07-09 Stanislav Brabec <sbrabec@suse.com>
+
+ Add support for msgmerge --previous
+ msgmerge --previous is a very useful feature that makes adjusting of
+ translation much easier when small changes in the source code are done.
+ msgmerge supports it for 10 years, but it is not used by most projects,
+ as Makefile.in.in never added support for it.
+
+ Use msgmerge --previous as default on all systems with gettext >= 0.16.
+
+2016-06-09 Daiki Ueno <ueno@gnu.org>
+
+ Update translations
+ * gettext-runtime/po/eo.po: Update from Felipe Castro <fefcas@gmail.com>
+ * gettext-runtime/po/hr.po: Update from Božidar Putanec
<bozidarp@yahoo.com>
+ * gettext-runtime/po/sv.po: Update from Göran Uddeborg
<goeran@uddeborg.se>
+ * gettext-tools/examples/po/eo.po: Update from Felipe Castro
<fefcas@gmail.com>
+ * gettext-tools/examples/po/hr.po: Update from Božidar Putanec
<bozidarp@yahoo.com>
+ * gettext-tools/examples/po/sv.po: Update from Göran Uddeborg
<goeran@uddeborg.se>
+ * gettext-tools/po/bg.po: Update from Roumen Petrov
<transl@roumenpetrov.info>
+ * gettext-tools/po/es.po: Update from Antonio Ceballos
<aceballos@gmail.com>
+ * gettext-tools/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>
+ * gettext-tools/po/ja.po: Update from Masahito Yamaga <ma@yama-ga.com>
+ * gettext-tools/po/ko.po: Update from Changwoo Ryu <cwryu@debian.org>
+ * gettext-tools/po/nl.po: Update from Benno Schulenberg
<benno@vertaalt.nl>
+ * gettext-tools/po/pl.po: Update from Rafał Maszkowski <rzm@icm.edu.pl>
+ * gettext-tools/po/sk.po: Update from Marcel Telka <marcel@telka.sk>
+ * gettext-tools/po/sr.po: Update from Мирослав Николић
<miroslavnikolic@rocketmail.com>
+ * gettext-tools/po/sv.po: Update from Göran Uddeborg
<goeran@uddeborg.se>
+ * gettext-tools/po/tr.po: Update from Nilgün Belma Bugüner
<nilgun@buguner.name.tr>
+ * gettext-tools/po/uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>
+ * gettext-tools/po/vi.po: Update from Trần Ngọc Quân
<vnwildman@gmail.com>
+
+ Prepare for 0.19.8
+
+2016-01-02 Daiki Ueno <ueno@gnu.org>
+
+ maint: Update copyright year
+
+2015-12-27 Daiki Ueno <ueno@gnu.org>
+
+ Update translations
+ * gettext-runtime/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>.
+ * gettext-runtime/po/nb.po: Update from Johnny A. Solbu
<johnny@solbu.net>.
+ * gettext-runtime/po/pt_BR.po: Update from Rafael Ferreira
<rffontenelle@gmail.com>.
+ * gettext-runtime/po/sr.po: Update from Мирослав Николић
<miroslavnikolic@rocketmail.com>.
+ * gettext-runtime/po/zh_TW.po: Update from Wei-Lun Chao
<bluebat@member.fsf.org>.
+ * gettext-tools/examples/po/fr.po: Update from Stéphane Aulery
<lkppo@free.fr>.
+ * gettext-tools/examples/po/nb.po: Update from Johnny A. Solbu
<johnny@solbu.net>.
+ * gettext-tools/examples/po/pt_BR.po: Update from Rafael Ferreira
<rffontenelle@gmail.com>.
+ * gettext-tools/examples/po/sr.po: Update from Мирослав Николић
<miroslavnikolic@rocketmail.com>.
+ * gettext-tools/examples/po/zh_TW.po: Update from Wei-Lun Chao
<bluebat@member.fsf.org>.
+ * gettext-tools/po/bg.po: Update from Roumen Petrov
<transl@roumenpetrov.info>.
+ * gettext-tools/po/es.po: Update from Antonio Ceballos
<aceballos@gmail.com>.
+ * gettext-tools/po/fr.po: Update from Stéphane Aulery <lkppo@free.fr>.
+ * gettext-tools/po/ja.po: Update from Masahito Yamaga <ma@yama-ga.com>.
+ * gettext-tools/po/nl.po: Update from Benno Schulenberg
<benno@vertaalt.nl>.
+ * gettext-tools/po/pt_BR.po: Update from Rafael Fontenelle
<rffontenelle@gmail.com>.
+ * gettext-tools/po/sk.po: Update from Marcel Telka <marcel@telka.sk>.
+ * gettext-tools/po/sl.po: Update from Primoz PETERLIN
<primozz.peterlin@gmail.com>.
+ * gettext-tools/po/sr.po: Update from Мирослав Николић
<miroslavnikolic@rocketmail.com>.
+ * gettext-tools/po/uk.po: Update from Yuri Chornoivan <yurchor@ukr.net>.
+ * gettext-tools/po/vi.po: Update from Trần Ngọc Quân
<vnwildman@gmail.com>.
+
+ Prepare for 0.19.7
+
+2015-12-17 Daiki Ueno <ueno@gnu.org>
+
+ po: Prefer to use host tools when cross compiling
+ * gettext-runtime/po/Makefile.in.in (CROSS_COMPILING): New substitute
+ variable.
+ (.nop.po-update): Don't prepend ../src to $PATH when cross compiling.
+ * gettext-runtime/po/Rules-quot (.insert-header.po-update-en): Likewise.
+
+2015-10-15 Daiki Ueno <ueno@gnu.org>
+
+ build: Generate ChangeLogs for intl and po
+ * autogen.sh: Create empty ChangeLog files under intl and po.
+ * Makefile.am (gen-ChangeLogs): Rename from gen-ChangeLog. Generate
+ ChangeLog files for */intl and */po as well as top-level.
+ * gettext-runtime/intl/ChangeLog.0: Rename from ChangeLog.
+ * gettext-runtime/po/ChangeLog.0: Rename from ChangeLog.
+ * gettext-tools/po/ChangeLog.1: Rename from ChangeLog.
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 38c293d2..6b25f0d9 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -1,13 +1,14 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper
<drepper@gnu.ai.mit.edu>
+# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
+# Copyright (C) 2000-2020 Free Software Foundation, Inc.
#
# Copying and distribution of this file, with or without modification,
# are permitted in any medium without royalty provided the copyright
# notice and this notice are preserved. This file is offered as-is,
# without any warranty.
#
-# Origin: gettext-0.19.8
-GETTEXT_MACRO_VERSION = 0.19
+# Origin: gettext-0.21
+GETTEXT_MACRO_VERSION = 0.20
PACKAGE = @PACKAGE@
VERSION = @VERSION@
@@ -52,16 +53,13 @@ GMSGFMT_ = @GMSGFMT@
GMSGFMT_no = @GMSGFMT@
GMSGFMT_yes = @GMSGFMT_015@
GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
-MSGFMT_ = @MSGFMT@
-MSGFMT_no = @MSGFMT@
-MSGFMT_yes = @MSGFMT_015@
-MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
XGETTEXT_ = @XGETTEXT@
XGETTEXT_no = @XGETTEXT@
XGETTEXT_yes = @XGETTEXT_015@
XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
-MSGMERGE = msgmerge
+MSGMERGE = @MSGMERGE@
MSGMERGE_UPDATE = @MSGMERGE@ --update
+MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
MSGINIT = msginit
MSGCONV = msgconv
MSGFILTER = msgfilter
@@ -92,27 +90,44 @@ DISTFILESDEPS =
$(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
# Makevars gets inserted here. (Don't remove this line!)
-.SUFFIXES:
-.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update
+all: all-@USE_NLS@
-.po.mo:
- @echo "$(MSGFMT) -c -o $@ $<"; \
- $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@
+.SUFFIXES:
+.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
+
+# The .pot file, stamp-po, .po files, and .gmo files appear in release
tarballs.
+# The GNU Coding Standards say in
+# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
+# "GNU distributions usually contain some files which are not source files
+# ... . Since these files normally appear in the source directory, they
+# should always appear in the source directory, not in the build directory.
+# So Makefile rules to update them should put the updated files in the
+# source directory."
+# Therefore we put these files in the source directory, not the build
directory.
+
+# During .po -> .gmo conversion, take into account the most recent changes to
+# the .pot file. This eliminates the need to update the .po files when the
+# .pot file has changed, which would be troublesome if the .po files are put
+# under version control.
+$(GMOFILES): $(srcdir)/$(DOMAIN).pot
.po.gmo:
@lang=`echo $* | sed -e 's,.*/,,'`; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics
--verbose -o $${lang}.gmo $${lang}.po"; \
- cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics
--verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo
+ echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE)
$(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot &&
$(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f
$${lang}.1po"; \
+ cd $(srcdir) && \
+ rm -f $${lang}.gmo && \
+ $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po
$(DOMAIN).pot && \
+ $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
+ mv t-$${lang}.gmo $${lang}.gmo && \
+ rm -f $${lang}.1po
.sin.sed:
sed -e '/^#/d' $< > t-$@
mv t-$@ $@
-all: all-@USE_NLS@
-
-all-yes: stamp-po
+all-yes: $(srcdir)/stamp-po
all-no:
# Ensure that the gettext macros and this Makefile.in.in are in sync.
@@ -126,24 +141,24 @@ CHECK_MACRO_VERSION = \
# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
# we don't want to bother translators with empty POT files). We assume that
# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
-# In this case, stamp-po is a nop (i.e. a phony target).
-
-# stamp-po is a timestamp denoting the last time at which the CATALOGS have
-# been loosely updated. Its purpose is that when a developer or translator
-# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS,
-# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent
-# invocations of "make" will do nothing. This timestamp would not be necessary
-# if updating the $(CATALOGS) would always touch them; however, the rule for
-# $(POFILES) has been designed to not touch files that don't need to be
-# changed.
-stamp-po: $(srcdir)/$(DOMAIN).pot
+# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
+
+# $(srcdir)/stamp-po is a timestamp denoting the last time at which the
CATALOGS
+# have been loosely updated. Its purpose is that when a developer or translator
+# checks out the package from a version control system, and the $(DOMAIN).pot
+# file is not under version control, "make" will update the $(DOMAIN).pot and
+# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
+# timestamp would not be necessary if updating the $(CATALOGS) would always
+# touch them; however, the rule for $(POFILES) has been designed to not touch
+# files that don't need to be changed.
+$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
@$(CHECK_MACRO_VERSION)
test ! -f $(srcdir)/$(DOMAIN).pot || \
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
- echo "touch stamp-po" && \
- echo timestamp > stamp-poT && \
- mv stamp-poT stamp-po; \
+ echo "touch $(srcdir)/stamp-po" && \
+ echo timestamp > $(srcdir)/stamp-poT && \
+ mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
}
# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
@@ -159,11 +174,9 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
remove-potcdate.sed
package_gnu="$(PACKAGE_GNU)"; \
test -n "$$package_gnu" || { \
if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null;
then \
- LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \
- -size -10000000c -exec grep 'GNU @PACKAGE@' \
- /dev/null '{}' ';' 2>/dev/null; \
+ LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size
-10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
else \
- LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
+ LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
fi; \
} | grep -v 'libtool:' >/dev/null; then \
package_gnu=yes; \
@@ -184,26 +197,29 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
remove-potcdate.sed
case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
'' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 |
0.16.[0-1]*) \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)
@XGETTEXT_EXTRA_OPTIONS@ \
+ --add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--msgid-bugs-address="$$msgid_bugs_address" \
+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
*) \
$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
- --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS)
@XGETTEXT_EXTRA_OPTIONS@ \
+ --add-comments=TRANSLATORS: \
--files-from=$(srcdir)/POTFILES.in \
--copyright-holder='$(COPYRIGHT_HOLDER)' \
--package-name="$${package_prefix}@PACKAGE@" \
--package-version='@VERSION@' \
--msgid-bugs-address="$$msgid_bugs_address" \
+ $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
;; \
esac
test ! -f $(DOMAIN).po || { \
if test -f $(srcdir)/$(DOMAIN).pot-header; then \
sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
- cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \
- rm -f $(DOMAIN).1po; \
+ cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
+ rm -f $(DOMAIN).1po \
+ || exit 1; \
fi; \
if test -f $(srcdir)/$(DOMAIN).pot; then \
sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot >
$(DOMAIN).1po && \
@@ -228,17 +244,19 @@ $(srcdir)/$(DOMAIN).pot:
# This target rebuilds a PO file if $(DOMAIN).pot has changed.
# Note that a PO file is not touched if it doesn't need to be changed.
$(POFILES): $(POFILESDEPS)
+ @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
if test -f "$(srcdir)/$${lang}.po"; then \
- test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang}
$${lang}.po $(DOMAIN).pot"; \
+ echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang}
--previous $${lang}.po $(DOMAIN).pot"; \
cd $(srcdir) \
- && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'`
in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e
's,^[^0-9]*,,'` in \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po
$(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous
$${lang}.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang}
$${lang}.po $(DOMAIN).pot;; \
+ $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang}
--previous $${lang}.po $(DOMAIN).pot;; \
esac; \
}; \
else \
@@ -373,34 +391,41 @@ check: all
info dvi ps pdf html tags TAGS ctags CTAGS ID:
+install-dvi install-ps install-pdf install-html:
+
mostlyclean:
rm -f remove-potcdate.sed
- rm -f stamp-poT
+ rm -f $(srcdir)/stamp-poT
rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
rm -fr *.o
clean: mostlyclean
distclean: clean
- rm -f Makefile Makefile.in POTFILES *.mo
+ rm -f Makefile Makefile.in POTFILES
maintainer-clean: distclean
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
- rm -f stamp-po $(GMOFILES)
+ rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir:
test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
@$(MAKE) dist2
# This is a separate target because 'update-po' must be executed before.
-dist2: stamp-po $(DISTFILES)
- dists="$(DISTFILES)"; \
+dist2: $(srcdir)/stamp-po $(DISTFILES)
+ @dists="$(DISTFILES)"; \
if test "$(PACKAGE)" = "gettext-tools"; then \
dists="$$dists Makevars.template"; \
fi; \
if test -f $(srcdir)/$(DOMAIN).pot; then \
dists="$$dists $(DOMAIN).pot stamp-po"; \
+ else \
+ case $(XGETTEXT) in \
+ :) echo "Warning: Creating a tarball without '$(DOMAIN).pot',
because a suitable 'xgettext' program was not found in PATH." 1>&2;; \
+ *) echo "Warning: Creating a tarball without '$(DOMAIN).pot',
because 'xgettext' found no strings to extract. Check the contents of the
POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \
+ esac; \
fi; \
if test -f $(srcdir)/ChangeLog; then \
dists="$$dists ChangeLog"; \
@@ -439,13 +464,15 @@ update-po: Makefile
tmpdir=`pwd`; \
echo "$$lang:"; \
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
- echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po
$(DOMAIN).pot -o $$lang.new.po"; \
+ echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous
$$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
cd $(srcdir); \
if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
- '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \
+ '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
$(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po
$$lang.po $(DOMAIN).pot;; \
+ 0.1[6-7] | 0.1[6-7].*) \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o
$$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
*) \
- $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o
$$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
+ $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o
$$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
esac; \
}; then \
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
diff --git a/po/Makevars b/po/Makevars
index 060cd6b8..5b2468e3 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,4 +1,8 @@
# Makefile variables for PO directory in any package using GNU gettext.
+#
+# Copyright (C) 2003-2019 Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to use, copy, distribute, and modify it.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
diff --git a/po/Rules-quot b/po/Rules-quot
index baf65285..18c024bf 100644
--- a/po/Rules-quot
+++ b/po/Rules-quot
@@ -1,5 +1,9 @@
-# This file, Rules-quot, can be copied and used freely without restrictions.
# Special Makefile rules for English message catalogs with quotation marks.
+#
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
+# This file, Rules-quot, and its auxiliary files (listed under
+# DISTFILES.common.extra1) are free software; the Free Software Foundation
+# gives unlimited permission to use, copy, distribute, and modify them.
DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header
en@boldquot.header insert-header.sin Rules-quot
diff --git a/po/en@boldquot.header b/po/en@boldquot.header
index fedb6a06..506ca9e9 100644
--- a/po/en@boldquot.header
+++ b/po/en@boldquot.header
@@ -2,7 +2,7 @@
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/po/en@quot.header b/po/en@quot.header
index a9647fc3..6522f0ce 100644
--- a/po/en@quot.header
+++ b/po/en@quot.header
@@ -2,7 +2,7 @@
# The msgids must be ASCII and therefore cannot contain real quotation
# characters, only substitutes like grave accent (0x60), apostrophe (0x27)
# and double quote (0x22). These substitutes look strange; see
-# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
+# https://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html
#
# This catalog translates grave accent (0x60) and apostrophe (0x27) to
# left single quotation mark (U+2018) and right single quotation mark (U+2019).
diff --git a/po/insert-header.sin b/po/insert-header.sin
index b26de01f..ceeebb93 100644
--- a/po/insert-header.sin
+++ b/po/insert-header.sin
@@ -1,5 +1,10 @@
# Sed script that inserts the file called HEADER before the header entry.
#
+# Copyright (C) 2001 Free Software Foundation, Inc.
+# Written by Bruno Haible <bruno@clisp.org>, 2001.
+# This file is free software; the Free Software Foundation gives
+# unlimited permission to use, copy, distribute, and modify it.
+#
# At each occurrence of a line starting with "msgid ", we execute the following
# commands. At the first occurrence, insert the file. At the following
# occurrences, do nothing. The distinction between the first and the following
diff --git a/po/remove-potcdate.sin b/po/remove-potcdate.sin
index 2436c49e..8c70dfbf 100644
--- a/po/remove-potcdate.sin
+++ b/po/remove-potcdate.sin
@@ -1,6 +1,12 @@
-# Sed script that remove the POT-Creation-Date line in the header entry
+# Sed script that removes the POT-Creation-Date line in the header entry
# from a POT file.
#
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without any warranty.
+#
# The distinction between the first and the following occurrences of the
# pattern is achieved by looking at the hold space.
/^"POT-Creation-Date: .*"$/{
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libmicrohttpd] branch master updated: Updated gettext files,
gnunet <=