mirror of
https://github.com/moparisthebest/wget
synced 2024-07-03 16:38:41 -04:00
Automated merge with file:/home/micah/devel/wget/mainline
This commit is contained in:
commit
b8f07eab3b
@ -9,6 +9,7 @@ config.log
|
||||
**Makefile
|
||||
**Makefile.in
|
||||
config.status
|
||||
config.status.lineno
|
||||
autom4te.cache
|
||||
tests/WgetTest.pm
|
||||
tests/unit-tests
|
||||
@ -48,5 +49,7 @@ po/*.gmo
|
||||
po/wget.pot
|
||||
po/remove-potcdate.sed
|
||||
po/stamp-po
|
||||
po/en@boldquot.insert-header
|
||||
po/en@quot.insert-header
|
||||
**~
|
||||
**.*.swp
|
||||
|
@ -2,10 +2,13 @@
|
||||
|
||||
* configure.in: Renamed to configure.ac
|
||||
* configure.ac: Renamed from configure.in. Added invocations of
|
||||
AM_GNU_GETTEXT, etc.
|
||||
AM_GNU_GETTEXT, etc. Added en@quot and en@boldquot pseudo-LINGUA
|
||||
support.
|
||||
* ABOUT-NLS: Added back in (required by autoreconf :\).
|
||||
* Makefile.am: Added ABOUT-NLS and msdos/Makefile.WC to EXTRA_DIST.
|
||||
* m4/wget.m4: Removed no-longer-used NLS stuff.
|
||||
* Makefile.in.in: Restore previous policy of not updating .po's
|
||||
unless explicitly asked (via update-po).
|
||||
|
||||
2007-10-09 gettextize <bug-gnu-gettext@gnu.org>
|
||||
|
||||
|
@ -429,7 +429,7 @@ dnl ALL_LINGUAS="cs de hr it ..."
|
||||
dnl The downside was that configure needed to be rebuilt whenever a
|
||||
dnl new language was added.
|
||||
dnl
|
||||
ALL_LINGUAS=`(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')`
|
||||
ALL_LINGUAS="en@quot en@boldquot $(cd ${srcdir}/po && ls *.po | sed -e 's/\.po$//' | tr '\012' ' ')"
|
||||
|
||||
dnl
|
||||
dnl Find makeinfo. We used to provide support for Emacs processing
|
||||
|
@ -97,7 +97,7 @@ CATALOGS = @CATALOGS@
|
||||
|
||||
all: all-@USE_NLS@
|
||||
|
||||
all-yes: stamp-po
|
||||
all-yes: $(CATALOGS)
|
||||
all-no:
|
||||
|
||||
# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
|
||||
@ -163,15 +163,15 @@ $(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): $(srcdir)/$(DOMAIN).pot
|
||||
@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
|
||||
if test -f "$(srcdir)/$${lang}.po"; then \
|
||||
test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||
echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
|
||||
cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
|
||||
else \
|
||||
$(MAKE) $${lang}.po-create; \
|
||||
fi
|
||||
#$(POFILES): $(srcdir)/$(DOMAIN).pot
|
||||
# @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
|
||||
# if test -f "$(srcdir)/$${lang}.po"; then \
|
||||
# test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
|
||||
# echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \
|
||||
# cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \
|
||||
# else \
|
||||
# $(MAKE) $${lang}.po-create; \
|
||||
# fi
|
||||
|
||||
|
||||
install: install-exec install-data
|
||||
|
1829
po/en@boldquot.po
Normal file
1829
po/en@boldquot.po
Normal file
File diff suppressed because it is too large
Load Diff
1822
po/en@quot.po
Normal file
1822
po/en@quot.po
Normal file
File diff suppressed because it is too large
Load Diff
@ -5,6 +5,9 @@
|
||||
* wget.h: Remove logic for handling lack of NLS (now in
|
||||
gettext.h).
|
||||
* main.c: Use gettext's ENABLE_NLS rather than HAVE_NLS.
|
||||
* Makefile.am: added @LIBINTL@ to LIBS (though it probably
|
||||
belongs in LDADD, along with everything else currently assigned
|
||||
to LIBS).
|
||||
|
||||
2007-10-08 Micah Cowan <micah@cowan.name>
|
||||
|
||||
|
@ -31,7 +31,7 @@
|
||||
|
||||
# The following line is losing on some versions of make!
|
||||
DEFS = @DEFS@ -DSYSTEM_WGETRC=\"$(sysconfdir)/wgetrc\" -DLOCALEDIR=\"$(localedir)\"
|
||||
LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@
|
||||
LIBS = @LIBS@ @LIBSSL@ @LIBGNUTLS@ @LIBINTL@
|
||||
|
||||
bin_PROGRAMS = wget
|
||||
wget_SOURCES = cmpt.c connect.c convert.c cookies.c ftp.c ftp-basic.c \
|
||||
|
Loading…
Reference in New Issue
Block a user