mirror of
https://git.zap.org.au/git/trader.git
synced 2024-09-01 17:14:15 -04:00
Update to GNU Gettext 0.18.3
This commit is contained in:
parent
4216b21324
commit
cec51ded7d
@ -8,13 +8,14 @@
|
|||||||
# Please note that the actual code of GNU gettext is covered by the GNU
|
# Please note that the actual code of GNU gettext is covered by the GNU
|
||||||
# General Public License and is *not* in the public domain.
|
# General Public License and is *not* in the public domain.
|
||||||
#
|
#
|
||||||
# Origin: gettext-0.18
|
# Origin: gettext-0.18.3
|
||||||
GETTEXT_MACRO_VERSION = 0.18
|
GETTEXT_MACRO_VERSION = 0.18
|
||||||
|
|
||||||
PACKAGE = @PACKAGE@
|
PACKAGE = @PACKAGE@
|
||||||
VERSION = @VERSION@
|
VERSION = @VERSION@
|
||||||
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
|
||||||
|
|
||||||
|
SED = @SED@
|
||||||
SHELL = /bin/sh
|
SHELL = /bin/sh
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
|
|
||||||
@ -96,14 +97,14 @@ CATALOGS = @CATALOGS@
|
|||||||
mv t-$@ $@
|
mv t-$@ $@
|
||||||
|
|
||||||
|
|
||||||
all: check-macro-version all-@USE_NLS@
|
all: all-@USE_NLS@
|
||||||
|
|
||||||
all-yes: stamp-po
|
all-yes: stamp-po
|
||||||
all-no:
|
all-no:
|
||||||
|
|
||||||
# Ensure that the gettext macros and this Makefile.in.in are in sync.
|
# Ensure that the gettext macros and this Makefile.in.in are in sync.
|
||||||
check-macro-version:
|
CHECK_MACRO_VERSION = \
|
||||||
@test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
|
test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
|
||||||
|| { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
|
|| { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
|
||||||
exit 1; \
|
exit 1; \
|
||||||
}
|
}
|
||||||
@ -123,6 +124,7 @@ check-macro-version:
|
|||||||
# $(POFILES) has been designed to not touch files that don't need to be
|
# $(POFILES) has been designed to not touch files that don't need to be
|
||||||
# changed.
|
# changed.
|
||||||
stamp-po: $(srcdir)/$(DOMAIN).pot
|
stamp-po: $(srcdir)/$(DOMAIN).pot
|
||||||
|
@$(CHECK_MACRO_VERSION)
|
||||||
test ! -f $(srcdir)/$(DOMAIN).pot || \
|
test ! -f $(srcdir)/$(DOMAIN).pot || \
|
||||||
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
|
test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
|
||||||
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
|
@test ! -f $(srcdir)/$(DOMAIN).pot || { \
|
||||||
@ -137,8 +139,16 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
|
|||||||
|
|
||||||
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
|
# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
|
||||||
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
|
# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
|
||||||
|
# The determination of whether the package xyz is a GNU one is based on the
|
||||||
|
# heuristic whether some file in the top level directory mentions "GNU xyz".
|
||||||
|
# If GNU 'find' is available, we avoid grepping through monster files.
|
||||||
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
|
||||||
if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \
|
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; \
|
||||||
|
else \
|
||||||
|
LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
|
||||||
|
fi; \
|
||||||
|
} | grep -v 'libtool:' >/dev/null; then \
|
||||||
package_gnu='GNU '; \
|
package_gnu='GNU '; \
|
||||||
else \
|
else \
|
||||||
package_gnu=''; \
|
package_gnu=''; \
|
||||||
|
30
po/Makevars
30
po/Makevars
@ -26,14 +26,14 @@
|
|||||||
# along with this program. If not, see http://www.gnu.org/licenses/.
|
# along with this program. If not, see http://www.gnu.org/licenses/.
|
||||||
|
|
||||||
|
|
||||||
# The message domain is the same as the package name
|
# The message domain is the same as the package name.
|
||||||
DOMAIN = $(PACKAGE)
|
DOMAIN = $(PACKAGE)
|
||||||
|
|
||||||
# These two variables depend on the location of this directory
|
# These two variables depend on the location of this directory.
|
||||||
subdir = po
|
subdir = po
|
||||||
top_builddir = ..
|
top_builddir = ..
|
||||||
|
|
||||||
# These options get passed to xgettext
|
# These options get passed to xgettext.
|
||||||
XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --width=132 \
|
XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --width=132 \
|
||||||
--flag='err_exit:1:c-format' --flag='errno_exit:1:c-format' \
|
--flag='err_exit:1:c-format' --flag='errno_exit:1:c-format' \
|
||||||
--flag='txdlgbox:11:c-format' --flag='txdlgbox:12:c-format' \
|
--flag='txdlgbox:11:c-format' --flag='txdlgbox:12:c-format' \
|
||||||
@ -42,20 +42,26 @@ XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --width=132 \
|
|||||||
--flag='center:8:c-format' \
|
--flag='center:8:c-format' \
|
||||||
--flag='right:8:c-format'
|
--flag='right:8:c-format'
|
||||||
|
|
||||||
# These options get passed to msgmerge
|
# This is the copyright holder that gets inserted into the header of the
|
||||||
MSGMERGE_OPTIONS = --width=132
|
|
||||||
|
|
||||||
# Copyright holder that gets inserted into the header of the
|
|
||||||
# $(DOMAIN).pot file.
|
# $(DOMAIN).pot file.
|
||||||
COPYRIGHT_HOLDER = John Zaitseff
|
COPYRIGHT_HOLDER = John Zaitseff
|
||||||
|
|
||||||
# E-mail address or URL used by translators to report bugs in the
|
# This is the email address or URL to which the translators shall report
|
||||||
# untranslated (original) strings
|
# bugs in the untranslated strings.
|
||||||
MSGID_BUGS_ADDRESS = J.Zaitseff@zap.org.au
|
MSGID_BUGS_ADDRESS = J.Zaitseff@zap.org.au
|
||||||
|
|
||||||
# List of locale categories, beyond LC_MESSAGES, for which the message
|
# This is the list of locale categories, beyond LC_MESSAGES, for which the
|
||||||
# catalogs shall be used. It is usually empty.
|
# message catalogs shall be used. It is usually empty.
|
||||||
EXTRA_LOCALE_CATEGORIES =
|
EXTRA_LOCALE_CATEGORIES =
|
||||||
|
|
||||||
# Additional files to distribute
|
# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
|
||||||
|
# context. Possible values are "yes" and "no". Set this to yes if the
|
||||||
|
# package uses functions taking also a message context, like pgettext(), or
|
||||||
|
# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
|
||||||
|
USE_MSGCTXT = yes
|
||||||
|
|
||||||
|
# These options get passed to msgmerge.
|
||||||
|
MSGMERGE_OPTIONS = --width=132
|
||||||
|
|
||||||
|
# Additional files to distribute.
|
||||||
DISTFILES += README
|
DISTFILES += README
|
||||||
|
@ -14,13 +14,13 @@ en@boldquot.po-update: en@boldquot.po-update-en
|
|||||||
|
|
||||||
.insert-header.po-update-en:
|
.insert-header.po-update-en:
|
||||||
@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
|
@lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \
|
||||||
if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
|
if test "$(PACKAGE)" = "gettext-tools"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \
|
||||||
tmpdir=`pwd`; \
|
tmpdir=`pwd`; \
|
||||||
echo "$$lang:"; \
|
echo "$$lang:"; \
|
||||||
ll=`echo $$lang | sed -e 's/@.*//'`; \
|
ll=`echo $$lang | sed -e 's/@.*//'`; \
|
||||||
LC_ALL=C; export LC_ALL; \
|
LC_ALL=C; export LC_ALL; \
|
||||||
cd $(srcdir); \
|
cd $(srcdir); \
|
||||||
if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
|
if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) $(SED) -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \
|
||||||
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
|
||||||
rm -f $$tmpdir/$$lang.new.po; \
|
rm -f $$tmpdir/$$lang.new.po; \
|
||||||
else \
|
else \
|
||||||
|
Loading…
Reference in New Issue
Block a user