Skip to content
GitLab
Commit 1c4122c5 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann
Browse files

Switch to a more standard way of treating the translations for the startup 

2005-06-10  Sven Neumann  <sven@gimp.org>

	Switch to a more standard way of treating the translations for the
	startup tips (bug #171846):

	* Makefile.am
	* configure.in: removed tips directory; added data/tips and po-tips
	directories instead.

	* data/Makefile.am
	* data/AUTHORS
	* data/ChangeLog
	* data/README: removed these three outdated files.

	* data/tips: gimp.tips.xml and related files live here now.

	* po-tips: translations of the tips are found here now.

	* README.i18n: changed accordingly.
parent ef4b2456
Hide whitespace changes
Inline Side-by-side
ChangeLog
View file @ 1c4122c5
2005-06-10 Sven Neumann <sven@gimp.org>
Switch to a more standard way of treating the translations for the
startup tips (bug #171846):
* Makefile.am
* configure.in: removed tips directory; added data/tips and po-tips
directories instead.
* data/Makefile.am
* data/AUTHORS
* data/ChangeLog
* data/README: removed these three outdated files.
* data/tips: gimp.tips.xml and related files live here now.
* po-tips: translations of the tips are found here now.
* README.i18n: changed accordingly.
2005-06-10 Michael Natterer <mitch@gimp.org>
Fix bug #134304, as far as it's fixable:
......
Makefile.am
View file @ 1c4122c5
......@@ -12,7 +12,6 @@ SUBDIRS = \
po-script-fu \
data \
menus \
tips \
libgimpbase \
libgimpcolor \
libgimpmath \
......
README.i18n
View file @ 1c4122c5
......@@ -165,7 +165,7 @@ this one may not necessarily fit.
po-libgimp/gimp20-libgimp.pot -- the libgimp library
po-plugins/gimp20-std-plugins.pot -- most of the plug-ins
po-script-fu/gimp20-script-fu.pot -- the script-fu scripts
tips/gimp-tips20.pot -- the startup tips
po-tips/gimp20-tips.pot -- the startup tips
If you are looking for the translations of gimp-perl, please note that
gimp-perl has been moved into it's own CVS module called gimp-perl.
......
configure.in
View file @ 1c4122c5
......@@ -1718,23 +1718,25 @@ themes/Default/images/Makefile
themes/Default/images/preferences/Makefile
themes/Small/Makefile
data/Makefile
data/interpreters/Makefile
data/brushes/Makefile
data/environ/Makefile
data/gradients/Makefile
data/images/Makefile
data/interpreters/Makefile
data/misc/Makefile
data/misc/gimp.applications
data/misc/gimp.desktop.in
data/misc/gimp.keys
data/misc/gimp.applications
data/images/Makefile
data/brushes/Makefile
data/gradients/Makefile
data/palettes/Makefile
data/patterns/Makefile
data/tips/Makefile
etc/Makefile
m4macros/Makefile
po/Makefile.in
po-libgimp/Makefile.in
po-plug-ins/Makefile.in
po-script-fu/Makefile.in
po-tips/Makefile.in
gimp-zip
Makefile
])
......@@ -1757,6 +1759,7 @@ AC_CONFIG_COMMANDS([chmod-scripts],
AC_CONFIG_COMMANDS([sed-po-makefiles],
[sed -e "/POTFILES =/r po-libgimp/POTFILES" po-libgimp/Makefile.in > po-libgimp/Makefile
sed -e "/POTFILES =/r po-plug-ins/POTFILES" po-plug-ins/Makefile.in > po-plug-ins/Makefile
sed -e "/POTFILES =/r po-script-fu/POTFILES" po-script-fu/Makefile.in > po-script-fu/Makefile])
sed -e "/POTFILES =/r po-script-fu/POTFILES" po-script-fu/Makefile.in > po-script-fu/Makefile
sed -e "/POTFILES =/r po-tips/POTFILES" po-tips/Makefile.in > po-tips/Makefile])
AC_OUTPUT
data/AUTHORS deleted 100644 → 0
View file @ ef4b2456
This distribution of gimp-data is based on Frederico Mena's
gimp-data-0.99.11, which was based on Matt Hawkins
gimp-data-0.99.pre11-3.5, which was based on gimp-data-0.99.9 by Spencer
Kimball and Peter Mattis.
Adrian Likins
9/23/97
data/ChangeLog deleted 100644 → 0
View file @ ef4b2456
2002-07-16 Christophe Merlet <christophe@merlet.net>
* misc/Makefile.am: added $(DESTDIR) variable.
2001-04-06 Simon Budig <simon@gimp.org>
* brushes/Makefile.am: added feltpen.gih
2000-12-29 Sven Neumann <sven@gimp.org>
* brushes/Makefile.am: added confetti.gih and hsparks.gih
Fri Dec 29 18:14:46 CET 2000 Simon Budig <simon@gimp.org>
* brushes/confetti.gih: New brushpipe: basically the
components of confetti.gbr. Works great with the "size"-pressure
option.
Thu Nov 9 16:52:49 CET 2000 Marc Lehmann <pcg@goof.com>
* brushes/hsparks.gih: This small gem(?), (before you cry, it's
<20k gzipped) is from http://bart.northnet.com.au/~robrow/tubes/.
Thu Aug 12 20:57:02 MEST 1999 Sven Neumann <sven@gimp.org>
* palettes/Makefile.am
* palettes/Visibone
* palettes/Visibone2: added Visibone palettes with the kind
permission of Bob Stein <stein@visibone.com>.
1999-01-20 Raja R Harinath <harinath@cs.umn.edu>
* brushes/Makefile.am (EXTRA_DATA): Remove spurious variable.
* gradients/Makefile.am (EXTRA_DATA): Likewise.
* palettes/Makefile.am (EXTRA_DATA): Likewise.
* patterns/Makefile.am (EXTRA_DATA): Likewise.
Mon Sep 22 17:34:53 1997 Federico Mena <federico@bananoid.nuclecu.unam.mx>
* Made 0.99.11 release.
Tue Sep 23 20:25:49 EDT 1997 Adrian Likins <adrian@gimp.org>
* Split gimp-data into gimp-data and gimp-extra, which gimp-data
being the essentials adn gimp-extras being all the cool stuff.
Wed Oct 22 18:12:52 CDT 1997 Adrian Likins <adrian@gimp.org>
* Move a few patterns needed for scripts from extras to min
Thu Nov 6 10:16:28 EST 1997 Adrian Likins <adrian@gimp.org>
* made data-* versionless
Tue Dec 16 14:57:34 EST 1997 Adrian Likins <adrian@gimp.org>
* added some gradients from Marcelo Malheiros
* added a few brushes from Daniel Dunbar
Wed Jan 14 15:01:09 EST 1998 Adrian Likins <adrian@gimp.org>
* added a few nice brushes from Tuomas Kuosmanen
* new verison of paper.pat that actually tiles
Sat Feb 28 22:41:01 EST 1998 Adrian Likins <adrian@gimp.org>
* added some palettes
data/Makefile.am
View file @ 1c4122c5
## Makefile.am for gimp/data
SUBDIRS = interpreters environ misc images brushes gradients palettes patterns
EXTRA_DIST = \
AUTHORS \
ChangeLog \
README
SUBDIRS = \
brushes \
environ \
gradients \
images \
interpreters \
misc \
palettes \
patterns \
tips
fontdir = $(gimpdatadir)/fonts
......
data/README deleted 100644 → 0
View file @ ef4b2456
This is the archive of data files for the Gimp.
Contains the latest brushes, gradients, palettes and patterns
by various authors around the internet.
Special thanks to Adrian Likins and #gimp on GimpNet for
helping me get off my butt and put this stuff together.
GimpNet is a great place to chat about the Gimp, learn new
tricks, etc. irc.mint.net and irc.canweb.net on port 6666
-- Matt
matt@blitzen.canberra.edu.au
==========================================================
As of sometime between .11 and .12, gimp-data was split into
gimp-data for essential stuff, and gimp-extras for cool stuff.
Adrian Likins
adrian@gimp.org
9/22/97
data/tips/.cvsignore 0 → 100644
View file @ 1c4122c5
Makefile.in
Makefile
gimp-tips.xml
fortunes
data/tips/Makefile.am 0 → 100644
View file @ 1c4122c5
## Makefile.am for gimp/data/tips
tipsdatadir = $(gimpdatadir)/tips
tipsdata_in_files = gimp-tips.xml.in
tipsdata_data_files = $(tipsdata_in_files:.xml.in=.xml)
tipsdata_DATA = $(tipsdata_data_files)
EXTRA_DIST = \
$(tipsdata_in_files) \
gimp-tips.dtd \
fortunes.xsl
DISTCLEANFILES = $(tipsdata_data_files)
gimp-tips.xml: gimp-tips.xml.in $(wildcard $(top_srcdir)/po-tips/*.po)
$(INTLTOOL_MERGE) $(top_srcdir)/po-tips $< $(@) -x -u -c $(top_builddir)/po-tips/.intltool-merge-cachemake
validate: gimp-tips.xml
if HAVE_XMLLINT
@cd $(srcdir); \
$(XMLLINT) --noout --valid gimp-tips.xml || \
( echo "* gimp-tips.xml INVALID *"; exit 1; )
endif
fortunes: gimp-tips.xml.in fortunes.xsl
if HAVE_XSLTPROC
$(XSLTPROC) fortunes.xsl $< > $(@) || rm -f $(@)
else
@echo "xsltproc is needed to build fortunes"; exit 1;
endif
dist-hook: validate
po-tips/.cvsignore 0 → 100644
View file @ 1c4122c5
*.gmo
*.mo
Makefile
Makefile.in
POTFILES
*.pot
stamp-cat-id
messages
missing
.intltool-merge-cachemake
po-tips/ChangeLog 0 → 100644
View file @ 1c4122c5
2005-06-10 Sven Neumann <sven@gimp.org>
Added new directory po-tips and imported translations that used
to live in the tips directory. Added stubs for missing po files.
po-tips/Makefile.in.in 0 → 100644
View file @ 1c4122c5
# Makefile for program source directory in GNU NLS utilities package.
# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
#
# This file file be copied and used freely without restrictions. It can
# be used in projects which are not available under the GNU Public License
# but which still want to provide support for the GNU gettext functionality.
# Please note that the actual code is *not* freely available.
#
# - Modified by Owen Taylor <otaylor@redhat.com> to use GETTEXT_PACKAGE
# instead of PACKAGE and to look for po2tbl in ./ not in intl/
#
# - Modified by jacob berkman <jacob@ximian.com> to install
# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@-tips
PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ..
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
datadir = @datadir@
libdir = @libdir@
localedir = $(libdir)/locale
gnulocaledir = $(datadir)/locale
gettextsrcdir = $(datadir)/glib-2.0/gettext/po
subdir = po
install_sh = @install_sh@
mkdir_p = @mkdir_p@
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
DEFS = @DEFS@
CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@
INCLUDES = -I.. -I$(top_srcdir)/intl
COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
SOURCES =
POFILES = @POFILES@
GMOFILES = @GMOFILES@
DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
$(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
.c.o:
$(COMPILE) $<
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
$(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox
.po.mo:
$(MSGFMT) -o $@ $<
.po.gmo:
file=`echo $* | sed 's,.*/,,'`.gmo \
&& rm -f $$file && $(GMSGFMT) -o $$file $<
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@
all-yes: $(CATALOGS)
all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
install: install-exec install-data
install-exec:
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
fi
@catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
*.gmo) destdir=$(gnulocaledir);; \
*) destdir=$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $$dir; \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
fi; \
done
if test "$(PACKAGE)" = "glib"; then \
if test -n "$(MKINSTALLDIRS)"; then \
$(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
else \
$(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
fi; \
$(INSTALL_DATA) $(srcdir)/Makefile.in.in \
$(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
else \
: ; \
fi
# Define this as empty until I found a useful application.
installcheck:
uninstall:
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done
if test "$(PACKAGE)" = "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
fi
check: all
dvi info tags TAGS ID:
mostlyclean:
rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -fr *.o
rm -f .intltool-merge-cache
clean: mostlyclean
distclean: clean
rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
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 $(GMOFILES)
distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot
dists="$(DISTFILES)"; \
for file in $$dists; do \
ln $(srcdir)/$$file $(distdir) 2> /dev/null \
|| cp -p $(srcdir)/$$file $(distdir); \
done
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
catalogs='$(CATALOGS)'; \
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if $$result; then \
if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
:; \
else \
echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
rm -f $$tmpdir/$$lang.new.po; \
exit 1; \
fi; \
fi; \
else \
echo "msgmerge for $$cat failed!"; \
rm -f $$tmpdir/$$lang.new.po; \
fi; \
done
# POTFILES is created from POTFILES.in by stripping comments, empty lines
# and Intltool tags (enclosed in square brackets), and appending a full
# relative path to them
POTFILES: POTFILES.in
( if test 'x$(srcdir)' != 'x.'; then \
posrcprefix='$(top_srcdir)/'; \
else \
posrcprefix="../"; \
fi; \
rm -f $@-t $@ \
&& (sed -e '/^#/d' \
-e "s/^\[.*\] +//" \
-e '/^[ ]*$$/d' \
-e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \
| sed -e '$$s/\\$$//') > $@-t \
&& chmod a-w $@-t \
&& mv $@-t $@ )
Makefile: Makefile.in.in ../config.status POTFILES
cd .. \
&& CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
$(SHELL) ./config.status
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
po-tips/POTFILES.in 0 → 100644
View file @ 1c4122c5
# Files from the Gimp distribution which have already been
# marked to allow runtime translation of messages
data/tips/gimp-tips.xml.in
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment