Commit ff3e8be7 authored by Sven Neumann's avatar Sven Neumann

*** empty log message ***

parent f367374e
2002-03-26 Sven Neumann <sven@gimp.org>
* tools/gimp-mkenums:`merged glib-mkenums changes (#74431).
2002-03-25 Sven Neumann <sven@gimp.org>
* app/widgets/gimptoolbox.c: use gtk_widget_add_events() instead
......
......@@ -10,18 +10,18 @@ dubbed GIMP 1.4.
Overview of Changes in GIMP 1.3.5
=================================
- Improved tool options and made them dockable [Mitch]
- Added a DTD for gimp-tips.xml [Sven]
- Cleanup of brush, gradient, pattern and palette PDB functions [Mitch]
- Autogenerate libgimp/gimp_pdb.h [Yosh]
- Converted the toolbox to a dock [Mitch]
- Resurrected display filter modules [Mitch]
- Plug-in code cleanup (colorify) [Maurits Rijk]
- New menu icons [Jimmac, Mitch]
- New GimpEnumMenu widget [Sven]
- New widgets to choose from enum values [Sven]
- Enum cleanup [Yosh, Sven]
- Resizeable docks [Mitch]
Other Contributors:
Rebecca Walter, Tuomas Kuosmanen
Rebecca Walter, Tuomas Kuosmanen, Marcel Telka
Overview of Changes in GIMP 1.3.4
......
2002-03-26 Sven Neumann <sven@gimp.org>
* Makefile.in.in
* POTFILES.in
* update.sh: use intltool to extract translatable strings from the
scripts. Based on a patch from Marcel Telka <marcel@telka.sk>.
* script-fu-xgettext: removed, not needed any longer.
* de.po: Updated german translation.
2002-03-20 Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>
* sk.po: Updated Slovak translation by Zdenko Podobny <zdpo@mailbox.sk>.
......
......@@ -42,11 +42,10 @@ GENCAT = @GENCAT@
GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
SXGETTEXT = $(srcdir)/script-fu-xgettext
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot && $(SXGETTEXT) $(POTSCRIPTS) >> $(GETTEXT_PACKAGE).pot
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
DEFS = @DEFS@
CFLAGS = @CFLAGS@
......@@ -64,10 +63,6 @@ $(POFILES) $(GMOFILES) $(SOURCES)
POTFILES = \
POTSCRIPTS = \
$(top_srcdir)/plug-ins/script-fu/scripts/*.scm \
$(top_srcdir)/plug-ins/webbrowser/web-browser.scm
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
......@@ -99,8 +94,7 @@ all: all-@USE_NLS@
all-yes: $(CATALOGS)
all-no:
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(POTSCRIPTS)
$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
install: install-exec install-data
......
......@@ -6,3 +6,98 @@ plug-ins/script-fu/script-fu-scripts.c
plug-ins/script-fu/script-fu-server.c
plug-ins/script-fu/script-fu.c
plug-ins/dbbrowser/dbbrowser_utils.c
plug-ins/gap/sel-to-anim-img.scm
plug-ins/script-fu/scripts/3d-outline.scm
plug-ins/script-fu/scripts/3dTruchet.scm
plug-ins/script-fu/scripts/add-bevel.scm
plug-ins/script-fu/scripts/addborder.scm
plug-ins/script-fu/scripts/alien-glow-arrow.scm
plug-ins/script-fu/scripts/alien-glow-bar.scm
plug-ins/script-fu/scripts/alien-glow-bullet.scm
plug-ins/script-fu/scripts/alien-glow-button.scm
plug-ins/script-fu/scripts/alien-glow-logo.scm
plug-ins/script-fu/scripts/alien-neon-logo.scm
plug-ins/script-fu/scripts/asc2img.scm
plug-ins/script-fu/scripts/basic1-logo.scm
plug-ins/script-fu/scripts/basic2-logo.scm
plug-ins/script-fu/scripts/beveled-button.scm
plug-ins/script-fu/scripts/beveled-pattern-arrow.scm
plug-ins/script-fu/scripts/beveled-pattern-bullet.scm
plug-ins/script-fu/scripts/beveled-pattern-button.scm
plug-ins/script-fu/scripts/beveled-pattern-heading.scm
plug-ins/script-fu/scripts/beveled-pattern-hrule.scm
plug-ins/script-fu/scripts/blend-anim.scm
plug-ins/script-fu/scripts/blended-logo.scm
plug-ins/script-fu/scripts/bovinated-logo.scm
plug-ins/script-fu/scripts/burn-in-anim.scm
plug-ins/script-fu/scripts/camo.scm
plug-ins/script-fu/scripts/carve-it.scm
plug-ins/script-fu/scripts/carved-logo.scm
plug-ins/script-fu/scripts/chalk.scm
plug-ins/script-fu/scripts/chip-away.scm
plug-ins/script-fu/scripts/chrome-it.scm
plug-ins/script-fu/scripts/chrome-logo.scm
plug-ins/script-fu/scripts/circuit.scm
plug-ins/script-fu/scripts/clothify.scm
plug-ins/script-fu/scripts/coffee.scm
plug-ins/script-fu/scripts/comic-logo.scm
plug-ins/script-fu/scripts/coolmetal-logo.scm
plug-ins/script-fu/scripts/copy-visible.scm
plug-ins/script-fu/scripts/crystal-logo.scm
plug-ins/script-fu/scripts/distress_selection.scm
plug-ins/script-fu/scripts/drop-shadow.scm
plug-ins/script-fu/scripts/erase-rows.scm
plug-ins/script-fu/scripts/fade-outline.scm
plug-ins/script-fu/scripts/flatland.scm
plug-ins/script-fu/scripts/font-map.scm
plug-ins/script-fu/scripts/frosty-logo.scm
plug-ins/script-fu/scripts/fuzzyborder.scm
plug-ins/script-fu/scripts/gimp-headers.scm
plug-ins/script-fu/scripts/gimp-labels.scm
plug-ins/script-fu/scripts/glossy.scm
plug-ins/script-fu/scripts/glowing-logo.scm
plug-ins/script-fu/scripts/gradient-bevel-logo.scm
plug-ins/script-fu/scripts/gradient-example.scm
plug-ins/script-fu/scripts/grid-system.scm
plug-ins/script-fu/scripts/hsv-graph.scm
plug-ins/script-fu/scripts/i26-gunya2.scm
plug-ins/script-fu/scripts/image-structure.scm
plug-ins/script-fu/scripts/land.scm
plug-ins/script-fu/scripts/lava.scm
plug-ins/script-fu/scripts/line-nova.scm
plug-ins/script-fu/scripts/mkbrush.scm
plug-ins/script-fu/scripts/neon-logo.scm
plug-ins/script-fu/scripts/news-text.scm
plug-ins/script-fu/scripts/old_photo.scm
plug-ins/script-fu/scripts/perspective-shadow.scm
plug-ins/script-fu/scripts/predator.scm
plug-ins/script-fu/scripts/pupi-button.scm
plug-ins/script-fu/scripts/rendermap.scm
plug-ins/script-fu/scripts/ripply-anim.scm
plug-ins/script-fu/scripts/round-corners.scm
plug-ins/script-fu/scripts/select_to_brush.scm
plug-ins/script-fu/scripts/select_to_image.scm
plug-ins/script-fu/scripts/selection-round.scm
plug-ins/script-fu/scripts/slide.scm
plug-ins/script-fu/scripts/sota-chrome-logo.scm
plug-ins/script-fu/scripts/speed-text.scm
plug-ins/script-fu/scripts/sphere.scm
plug-ins/script-fu/scripts/spinning_globe.scm
plug-ins/script-fu/scripts/starburst-logo.scm
plug-ins/script-fu/scripts/starscape-logo.scm
plug-ins/script-fu/scripts/swirltile.scm
plug-ins/script-fu/scripts/swirly-pattern.scm
plug-ins/script-fu/scripts/t-o-p-logo.scm
plug-ins/script-fu/scripts/test-sphere.scm
plug-ins/script-fu/scripts/text-circle.scm
plug-ins/script-fu/scripts/textured-logo.scm
plug-ins/script-fu/scripts/tileblur.scm
plug-ins/script-fu/scripts/title-header.scm
plug-ins/script-fu/scripts/trochoid.scm
plug-ins/script-fu/scripts/truchet.scm
plug-ins/script-fu/scripts/unsharp-mask.scm
plug-ins/script-fu/scripts/waves-anim.scm
plug-ins/script-fu/scripts/weave.scm
plug-ins/script-fu/scripts/xach-effect.scm
plug-ins/webbrowser/web-browser.scm
This diff is collapsed.
#!/usr/bin/perl
# a lame attempt at xgettext for scheme
# adapted from pxgettext as found in the plug-ins/perl directory
# TODO:
# proper linenumbers
# There are rumors that perl version 5.005_02 has a bug
# resulting in an endless loop and a memory leak in the
# regex machinery.
#
# It seems to work however. I'll leave this check commented out until
# people report problems.
#
# die ("Your version of Perl (5.005_02) is broken!\nCan't extract the strings from the scripts.\nA lot of messages will be missing from your gimp-script-fu.pot file.\n\n") if $] eq 5.005_02;
undef $/;
my $file;
my $fileposition;
my $e;
my $s;
while (<>) {
$file = $ARGV;
$file =~ s/\.\.\///;
while (/_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) {
my $s = $1;
if ($s =~ /\n/) {
$e = "msgid \"\"\n";
for (split /\n/, $s) {
$e .= "\"$_\\n\"\n";
}
} else {
$e = "msgid \"$s\"\n";
}
$e .= "msgstr \"\"\n";
$fileposition = "#: $file:0\n";
push @{$entry{$e}}, $fileposition;
}
}
foreach $e (sort keys %entry) {
print @{$entry{$e}};
print $e;
print "\n";
}
......@@ -3,35 +3,5 @@
PACKAGE="gimp14-script-fu"
PATH="$PATH:.."
if [ "x$1" = "x--help" ]; then
echo Usage: ./update.sh langcode
echo --help display this help and exit
echo
echo Examples of use:
echo ./update.sh ----- just creates a new pot file from the source
echo ./update.sh da -- created new pot file and updated the da.po file
elif [ "x$1" = "x" ]; then
echo "Building the $PACKAGE.pot ..."
intltool-update --gettext-package $PACKAGE --pot \
&& ./script-fu-xgettext \
../plug-ins/script-fu/scripts/*.scm \
../plug-ins/gap/sel-to-anim-img.scm \
../plug-ins/webbrowser/web-browser.scm >> $PACKAGE.pot
else
echo "Building the $PACKAGE.pot ..."
intltool-update --gettext-package $PACKAGE --pot \
&& ./script-fu-xgettext \
../plug-ins/script-fu/scripts/*.scm \
../plug-ins/gap/sel-to-anim-img.scm \
../plug-ins/webbrowser/web-browser.scm >> $PACKAGE.pot
echo "Now merging $1.po with $PACKAGE.pot, and creating an updated $1.po ..."
mv $1.po $1.po.old && msgmerge $1.po.old $PACKAGE.pot -o $1.po && rm $1.po.old;
msgfmt --statistics $1.po -o /dev/null
fi;
echo "Calling intltool-update for you ..."
intltool-update --gettext-package $PACKAGE $*
......@@ -38,24 +38,23 @@ sub parse_entries {
my $looking_for_name = 0;
while (<$file>) {
# read lines until comment end is matched
while (m@/\*([^*]|\*[^/*])*\**$@x) {
# read lines until we have no open comments
while (m@/\*([^*]|\*(?!/))*$@) {
my $new;
defined ($new = <>) || die "Unmatched comment in $ARGV";
defined ($new = <$file>) || die "Unmatched comment in $ARGV";
$_ .= $new;
}
# strip comments w/o options
s@/\*[^<]([^*]|\*[^/*])*\**\*/@@gx;
s@/\*(?!<)
([^*]+|\*(?!/))*
\*/@@gx;
# strip newlines
s/\n//;
s@\n@ @;
# skip empty lines
next if m@^\s*$@;
# print STDERR "xxx $_\n";
if ($looking_for_name) {
if (/^\s*(\w+)/) {
$enumname = $1;
......@@ -68,15 +67,6 @@ sub parse_entries {
my $file= "../$1";
open NEWFILE, $file or die "Cannot open include file $file: $!\n";
# read lines until comment end is matched
while (m@/\*([^*]|\*[^/*])*\**$@x) {
my $new;
defined ($new = <>) || die "Unmatched comment in $file_name";
$_ .= $new;
}
# strip comments w/o options
s@/\*[^<]([^*]|\*[^/*])*\**\*/@@gx;
if (parse_entries (\*NEWFILE, $NEWFILE)) {
return 1;
} else {
......@@ -108,8 +98,6 @@ sub parse_entries {
@x) {
my ($name, $value, $options) = ($1,$2,$3);
# print STDERR "xxx \"$name\" \"$value\" \"$otions\"\n";
if (!defined $flags && defined $value && $value =~ /<</) {
$seenbitshift = 1;
}
......@@ -220,17 +208,17 @@ while (<>) {
$firstenum = 1; # Flag to print filename at next enum
}
# read lines until comment end is matched
while (m@/\*([^*]|\*[^/*])*\**$@x) {
# read lines until we have no open comments
while (m@/\*([^*]|\*(?!/))*$@) {
my $new;
defined ($new = <>) || die "Unmatched comment in $ARGV";
$_ .= $new;
}
# strip comments w/o options
s@/\*[^<]([^*]|\*[^/*])*\**\*/@@gx;
# print STDERR "xxx $_\n";
s@/\*(?!<)
([^*]+|\*(?!/))*
\*/@@gx;
if (m@^\s*typedef\s+enum\s*
({)?\s*
(?:/\*<
......
Markdown is supported
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