From 13dcc471cd9b2f8fad3b42e5b5e8731f16ced32a Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Wed, 10 Aug 2005 00:55:52 +0000 Subject: [PATCH] Made 2.3.3, the "What The Hack" release. 2005-08-10 Sven Neumann * Made 2.3.3, the "What The Hack" release. * data/images/gimp-splash.png: What The Splash, photo by antenne. --- ChangeLog | 2 + .../libgimp/tmpl/gimpprocbrowserdialog.sgml | 11 +++-- docs/gimprc.5.in | 16 ++++---- etc/gimprc | 14 +++---- po/Makefile.in.in | 41 ++++++++----------- 5 files changed, 41 insertions(+), 43 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d5c11bfa5..707abf1174 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-08-10 Sven Neumann + * Made 2.3.3, the "What The Hack" release. + * data/images/gimp-splash.png: What The Splash, photo by antenne. 2005-08-10 Michael Natterer diff --git a/devel-docs/libgimp/tmpl/gimpprocbrowserdialog.sgml b/devel-docs/libgimp/tmpl/gimpprocbrowserdialog.sgml index 12a33c2886..de287e2493 100644 --- a/devel-docs/libgimp/tmpl/gimpprocbrowserdialog.sgml +++ b/devel-docs/libgimp/tmpl/gimpprocbrowserdialog.sgml @@ -22,10 +22,13 @@ GimpProcBrowserDialog -@parent_instance: -@browser: -@store: -@tree_view: + + + + + + +@gimpprocbrowserdialog: the object which received the signal. diff --git a/docs/gimprc.5.in b/docs/gimprc.5.in index 0f6d19010f..9ade7527fc 100644 --- a/docs/gimprc.5.in +++ b/docs/gimprc.5.in @@ -6,7 +6,7 @@ gimprc \- gimp configuration file .SH DESCRIPTION The .B gimprc -file is a configuation file read by the GIMP when it starts up. There +file is a configuration file read by the GIMP when it starts up. There are two of these: one system-wide one stored in @gimpsysconfdir@/gimprc and a per-user \fB$HOME\fP/@gimpdir@/gimprc which may override system settings. @@ -46,7 +46,7 @@ shared by other users. This is a single folder. .TP (swap-path "${gimp_dir}") -Sets the swap file location. The gimp uses a tile based memory allocation +Sets the swap file location. The GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if the GIMP is used with large images. Also, things can get horribly slow if the swap file is @@ -347,13 +347,13 @@ milliseconds (less time indicates faster marching). This is an integer value. .TP (resize-windows-on-zoom no) -When enabled, the image window will automatically resize itself, when zooming +When enabled, the image window will automatically resize itself when zooming into and out of images. Possible values are yes and no. .TP (resize-windows-on-resize no) -When enabled, the image window will automatically resize itself, whenever the +When enabled, the image window will automatically resize itself whenever the physical image size changes. Possible values are yes and no. .TP @@ -613,8 +613,8 @@ path is being picked. This used to be the default behaviour in older versions. .TP (trust-dirty-flag no) -When enabled, the GIMP will not save if the image is unchanged since opening -it. Possible values are yes and no. +When enabled, the GIMP will not save an image if it has not been changed since +it was opened. Possible values are yes and no. .TP (save-device-status no) @@ -642,13 +642,13 @@ Save the tool options when the GIMP exits. Possible values are yes and no. .TP (show-tips yes) -Enable to display a handy GIMP tip on startup. Possible values are yes and +Enable displaying a handy GIMP tip on startup. Possible values are yes and no. .TP (show-tool-tips yes) -Enable to display tooltips. Possible values are yes and no. +Enable tooltips display. Possible values are yes and no. .TP (tearoff-menus yes) diff --git a/etc/gimprc b/etc/gimprc index 3460a8a3e4..ba4ffdac43 100644 --- a/etc/gimprc +++ b/etc/gimprc @@ -19,7 +19,7 @@ # # (temp-path "${gimp_dir}/tmp") -# Sets the swap file location. The gimp uses a tile based memory allocation +# Sets the swap file location. The GIMP uses a tile based memory allocation # scheme. The swap file is used to quickly and easily swap tiles out to disk # and back in. Be aware that the swap file can easily get very large if the # GIMP is used with large images. Also, things can get horribly slow if the @@ -280,12 +280,12 @@ # # (marching-ants-speed 300) -# When enabled, the image window will automatically resize itself, when +# When enabled, the image window will automatically resize itself when # zooming into and out of images. Possible values are yes and no. # # (resize-windows-on-zoom no) -# When enabled, the image window will automatically resize itself, whenever +# When enabled, the image window will automatically resize itself whenever # the physical image size changes. Possible values are yes and no. # # (resize-windows-on-resize no) @@ -472,8 +472,8 @@ # # (move-tool-changes-active no) -# When enabled, the GIMP will not save if the image is unchanged since -# opening it. Possible values are yes and no. +# When enabled, the GIMP will not save an image if it has not been changed +# since it was opened. Possible values are yes and no. # # (trust-dirty-flag no) @@ -496,12 +496,12 @@ # # (save-tool-options no) -# Enable to display a handy GIMP tip on startup. Possible values are yes and +# Enable displaying a handy GIMP tip on startup. Possible values are yes and # no. # # (show-tips yes) -# Enable to display tooltips. Possible values are yes and no. +# Enable tooltips display. Possible values are yes and no. # # (show-tool-tips yes) diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 1a6961e7c1..22cadc6545 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -11,11 +11,6 @@ # # - Modified by jacob berkman to install # Makefile.in.in and po2tbl.sed.in for use with glib-gettextize -# -# - Modified by Rodney Dawes for use with intltool -# -# We have the following line for use by intltoolize: -# INTLTOOL_MAKEFILE GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ @@ -32,13 +27,13 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = @datadir@ -datarootdir = @datarootdir@ 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@ @@ -66,8 +61,7 @@ SOURCES = POFILES = @POFILES@ GMOFILES = @GMOFILES@ DISTFILES = ChangeLog Makefile.in.in POTFILES.in \ -$(POFILES) $(SOURCES) -EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS +$(POFILES) $(GMOFILES) $(SOURCES) POTFILES = \ @@ -83,7 +77,7 @@ INSTOBJEXT = @INSTOBJEXT@ .po.pox: $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + $(MSGMERGE) $< $(top_builddir)/po/$(GETTEXT_PACKAGE).pot -o $*pox .po.mo: $(MSGFMT) -o $@ $< @@ -180,7 +174,7 @@ uninstall: rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ fi -check: all $(GETTEXT_PACKAGE).pot +check: all dvi info tags TAGS ID: @@ -192,21 +186,16 @@ mostlyclean: clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES - rm -f *.mo *.msg *.cat *.cat.m $(GMOFILES) + 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 Makefile.in.in + rm -f $(GMOFILES) distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) -dist distdir: $(DISTFILES) +dist distdir: $(DISTFILES) $(GETTEXT_PACKAGE).pot dists="$(DISTFILES)"; \ - extra_dists="$(EXTRA_DISTFILES)"; \ - for file in $$extra_dists; do \ - test -f $$file && dists="$$dists $$file"; \ - done; \ for file in $$dists; do \ ln $(srcdir)/$$file $(distdir) 2> /dev/null \ || cp -p $(srcdir)/$$file $(distdir); \ @@ -243,13 +232,17 @@ update-po: Makefile # and Intltool tags (enclosed in square brackets), and appending a full # relative path to them POTFILES: POTFILES.in - ( posrcprefix='$(top_srcdir)/'; \ + ( 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 \ + && (sed -e '/^#/d' \ + -e "s/^\[.*\] +//" \ + -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + | sed -e '$$s/\\$$//') > $@-t \ && chmod a-w $@-t \ && mv $@-t $@ )