callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

various minor fixes and updates to the german translation

Browse Source 
--Sven
This commit is contained in:
Sven Neumann
2000-04-11 16:34:42 +00:00
parent 111e7bc99c
commit 31df3ca344
17 changed files with 820 additions and 833 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2000-04-11 Sven Neumann <sven@gimp.org>
* app/measure.c: the arc displaying the angle was drawn incorrect
in the case of 90 degrees
* app/tips_dialog.c: cosmetics
* plug-ins/script-fu/scripts/3dTruchet.scm
* plug-ins/script-fu/scripts/comic-logo.scm
* plug-ins/script-fu/scripts/gimp-headers.scm
* plug-ins/script-fu/scripts/rendermap.scm
* plug-ins/script-fu/scripts/spinning_globe.scm
* plug-ins/script-fu/scripts/truchet.scm: fixed typos and unified
messages
2000-04-11 Michael Natterer <mitch@gimp.org>
* app/plug_in.c: if attaching to the newly created shared memory

10
app/dialogs/tips-dialog.c
View File

@ -49,6 +49,7 @@ void
tips_dialog_create (void)
{
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *hbox;
GtkWidget *bbox;
GtkWidget *frame;
@ -93,7 +94,7 @@ tips_dialog_create (void)
gtk_quit_add_destroy (1, GTK_OBJECT (tips_dialog));
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (tips_dialog), vbox);
gtk_container_add (GTK_CONTAINER (tips_dialog), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 5);
@ -104,12 +105,14 @@ tips_dialog_create (void)
tips_label = gtk_label_new (tips_text[last_tip]);
gtk_label_set_justify (GTK_LABEL (tips_label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (tips_label), 0.5, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), tips_label, TRUE, FALSE, 3);
gtk_box_pack_start (GTK_BOX (hbox), tips_label, TRUE, TRUE, 3);
gtk_widget_show (tips_label);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, FALSE, 0);
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (preview), wilber_width, wilber_height);
@ -129,6 +132,7 @@ tips_dialog_create (void)
gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview);
gtk_widget_show (frame);
gtk_widget_show (vbox2);
hbox = gtk_hbox_new (FALSE, 15);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);

10
app/gui/tips-dialog.c
View File

@ -49,6 +49,7 @@ void
tips_dialog_create (void)
{
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *hbox;
GtkWidget *bbox;
GtkWidget *frame;
@ -93,7 +94,7 @@ tips_dialog_create (void)
gtk_quit_add_destroy (1, GTK_OBJECT (tips_dialog));
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (tips_dialog), vbox);
gtk_container_add (GTK_CONTAINER (tips_dialog), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 5);
@ -104,12 +105,14 @@ tips_dialog_create (void)
tips_label = gtk_label_new (tips_text[last_tip]);
gtk_label_set_justify (GTK_LABEL (tips_label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (tips_label), 0.5, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), tips_label, TRUE, FALSE, 3);
gtk_box_pack_start (GTK_BOX (hbox), tips_label, TRUE, TRUE, 3);
gtk_widget_show (tips_label);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, FALSE, 0);
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (preview), wilber_width, wilber_height);
@ -129,6 +132,7 @@ tips_dialog_create (void)
gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview);
gtk_widget_show (frame);
gtk_widget_show (vbox2);
hbox = gtk_hbox_new (FALSE, 15);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);

2
app/measure.c
View File

@ -622,7 +622,7 @@ measure_tool_draw (Tool *tool)
if (measure_tool->num_points == 2)
gdk_draw_line (measure_tool->core->win, measure_tool->core->gc,
x[0], y[0],
x[1] - x[0] < 0 ? x[0] - ARC_RADIUS - 4 : x[0] + ARC_RADIUS + 4,
x[1] - x[0] <= 0 ? x[0] - ARC_RADIUS - 4 : x[0] + ARC_RADIUS + 4,
y[0]);
}
}

10
app/tips_dialog.c
View File

@ -49,6 +49,7 @@ void
tips_dialog_create (void)
{
GtkWidget *vbox;
GtkWidget *vbox2;
GtkWidget *hbox;
GtkWidget *bbox;
GtkWidget *frame;
@ -93,7 +94,7 @@ tips_dialog_create (void)
gtk_quit_add_destroy (1, GTK_OBJECT (tips_dialog));
vbox = gtk_vbox_new (FALSE, 0);
gtk_container_add (GTK_CONTAINER (tips_dialog), vbox);
gtk_container_add (GTK_CONTAINER (tips_dialog), vbox);
gtk_widget_show (vbox);
hbox = gtk_hbox_new (FALSE, 5);
@ -104,12 +105,14 @@ tips_dialog_create (void)
tips_label = gtk_label_new (tips_text[last_tip]);
gtk_label_set_justify (GTK_LABEL (tips_label), GTK_JUSTIFY_LEFT);
gtk_misc_set_alignment (GTK_MISC (tips_label), 0.5, 0.5);
gtk_box_pack_start (GTK_BOX (hbox), tips_label, TRUE, FALSE, 3);
gtk_box_pack_start (GTK_BOX (hbox), tips_label, TRUE, TRUE, 3);
gtk_widget_show (tips_label);
vbox2 = gtk_vbox_new (FALSE, 0);
gtk_box_pack_end (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
gtk_box_pack_end (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, FALSE, 0);
preview = gtk_preview_new (GTK_PREVIEW_COLOR);
gtk_preview_size (GTK_PREVIEW (preview), wilber_width, wilber_height);
@ -129,6 +132,7 @@ tips_dialog_create (void)
gtk_container_add (GTK_CONTAINER (frame), preview);
gtk_widget_show (preview);
gtk_widget_show (frame);
gtk_widget_show (vbox2);
hbox = gtk_hbox_new (FALSE, 15);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);

2
app/tools/gimpmeasuretool.c
View File

@ -622,7 +622,7 @@ measure_tool_draw (Tool *tool)
if (measure_tool->num_points == 2)
gdk_draw_line (measure_tool->core->win, measure_tool->core->gc,
x[0], y[0],
x[1] - x[0] < 0 ? x[0] - ARC_RADIUS - 4 : x[0] + ARC_RADIUS + 4,
x[1] - x[0] <= 0 ? x[0] - ARC_RADIUS - 4 : x[0] + ARC_RADIUS + 4,
y[0]);
}
}

2
app/tools/measure.c
View File

@ -622,7 +622,7 @@ measure_tool_draw (Tool *tool)
if (measure_tool->num_points == 2)
gdk_draw_line (measure_tool->core->win, measure_tool->core->gc,
x[0], y[0],
x[1] - x[0] < 0 ? x[0] - ARC_RADIUS - 4 : x[0] + ARC_RADIUS + 4,
x[1] - x[0] <= 0 ? x[0] - ARC_RADIUS - 4 : x[0] + ARC_RADIUS + 4,
y[0]);
}
}

4
plug-ins/script-fu/scripts/3dTruchet.scm
View File

@ -169,6 +169,6 @@
SF-COLOR _"Start Blend" '(0 0 0)
SF-COLOR _"End Blend" '(255 255 255)
SF-TOGGLE _"Supersample" TRUE
SF-VALUE _"Number of Xtiles" "5"
SF-VALUE _"Number of Ytiles" "5"
SF-VALUE _"Number of X Tiles" "5"
SF-VALUE _"Number of Y Tiles" "5"
)

2
plug-ins/script-fu/scripts/comic-logo.scm
View File

@ -92,6 +92,6 @@
SF-ADJUSTMENT _"Font Size (pixels)" '(85 2 1000 1 10 0 1)
SF-FONT _"Font" "-*-tribeca-*-i-*-*-24-*-*-*-p-*-*-*"
SF-GRADIENT _"Gradient" "Incandescent"
SF-VALUE _"Outline Width" "5"
SF-VALUE _"Outline Size" "5"
SF-COLOR _"Outline Color" '(255 255 255)
SF-COLOR _"Background Color" '(255 255 255))

6
plug-ins/script-fu/scripts/gimp-headers.scm
View File

@ -144,13 +144,13 @@
SF-FONT _"Font" "-*-times-*-r-*-*-24-*-*-*-p-*-*-*"
SF-ADJUSTMENT _"Font Size (pixels)" '(50 2 1000 1 10 0 1)
SF-COLOR _"Text Color" '(82 108 159)
SF-COLOR _"Higlight Color" '(190 220 250)
SF-COLOR _"Highlight Color" '(190 220 250)
SF-COLOR _"Dark Color" '(46 74 92)
SF-COLOR _"Shadow Color" '(0 0 0)
SF-TOGGLE _"AutoCrop" TRUE
SF-TOGGLE _"Remove Background" TRUE
SF-TOGGLE _"Index Image" TRUE
SF-VALUE "Number of Colors" "15")
SF-VALUE _"Number of Colors" "15")
(script-fu-register "script-fu-small-header-gimp-org"
_"<Toolbox>/Xtns/Script-Fu/Web Page Themes/Gimp.Org/Small Header..."
@ -163,7 +163,7 @@
SF-FONT _"Font" "-*-helvetica-*-r-*-*-24-*-*-*-p-*-*-*"
SF-ADJUSTMENT _"Font Size (pixels)" '(24 2 1000 1 10 0 1)
SF-COLOR _"Text Color" '(135 220 220)
SF-COLOR _"Higlight Color" '(210 240 245)
SF-COLOR _"Highlight Color" '(210 240 245)
SF-COLOR _"Dark Color" '(46 74 92)
SF-COLOR _"Shadow Color" '(0 0 0)
SF-TOGGLE _"AutoCrop" TRUE

2
plug-ins/script-fu/scripts/rendermap.scm
View File

@ -75,6 +75,6 @@
SF-ADJUSTMENT _"Image Size" '(256 0 2048 1 10 0 0)
SF-ADJUSTMENT _"Granularity" '(4 0 15 1 1 0 0)
SF-GRADIENT _"Gradient" "Land_and_Sea"
SF-TOGGLE _"TRUE = Detail in middle, FALSE = tile" FALSE
SF-TOGGLE _"TRUE = Detail in Middle, FALSE = Tile" FALSE
)

14
plug-ins/script-fu/scripts/spinning-globe.scm
View File

@ -107,13 +107,11 @@
"1998, Chris Gutteridge / ECS dept, University of Southampton, England."
"16th April 1998"
"RGB* GRAY*"
SF-IMAGE "The Image" 0
SF-IMAGE "The Image" 0
SF-DRAWABLE "The Layer" 0
; SF-VALUE _"Frames" "10"
SF-ADJUSTMENT "Frames:" '(10 1 360 1 10 0 1)
SF-TOGGLE _"Turn from Left to Right" FALSE
SF-TOGGLE _"Transparent Background" TRUE
; SF-VALUE _"Index to n Colors (0 = Remain RGB):" "63"
SF-ADJUSTMENT "Index of n Colors (0 = Remain RGB):" '(63 0 256 1 10 0 1)
SF-TOGGLE _"Work on Copy" TRUE
SF-ADJUSTMENT _"Frames" '(10 1 360 1 10 0 1)
SF-TOGGLE _"Turn from Left to Right" FALSE
SF-TOGGLE _"Transparent Background" TRUE
SF-ADJUSTMENT _"Index to n Colors (0 = Remain RGB)" '(63 0 256 1 10 0 1)
SF-TOGGLE _"Work on Copy" TRUE
)

14
plug-ins/script-fu/scripts/spinning_globe.scm
View File

@ -107,13 +107,11 @@
"1998, Chris Gutteridge / ECS dept, University of Southampton, England."
"16th April 1998"
"RGB* GRAY*"
SF-IMAGE "The Image" 0
SF-IMAGE "The Image" 0
SF-DRAWABLE "The Layer" 0
; SF-VALUE _"Frames" "10"
SF-ADJUSTMENT "Frames:" '(10 1 360 1 10 0 1)
SF-TOGGLE _"Turn from Left to Right" FALSE
SF-TOGGLE _"Transparent Background" TRUE
; SF-VALUE _"Index to n Colors (0 = Remain RGB):" "63"
SF-ADJUSTMENT "Index of n Colors (0 = Remain RGB):" '(63 0 256 1 10 0 1)
SF-TOGGLE _"Work on Copy" TRUE
SF-ADJUSTMENT _"Frames" '(10 1 360 1 10 0 1)
SF-TOGGLE _"Turn from Left to Right" FALSE
SF-TOGGLE _"Transparent Background" TRUE
SF-ADJUSTMENT _"Index to n Colors (0 = Remain RGB)" '(63 0 256 1 10 0 1)
SF-TOGGLE _"Work on Copy" TRUE
)

8
plug-ins/script-fu/scripts/truchet.scm
View File

@ -153,8 +153,8 @@
SF-ADJUSTMENT _"Block Size" '(32 2 512 1 10 1 1)
SF-ADJUSTMENT _"Thickness" '(2 1 512 1 10 1 1)
SF-COLOR _"Background Color" '(255 255 255)
SF-COLOR _"Foreground Color" '(0 0 0)
SF-ADJUSTMENT _"Number of Xtiles" '(5 1 512 1 10 1 1)
SF-ADJUSTMENT _"Number of Ytile" '(5 1 512 1 10 1 1)
SF-COLOR _"Background Color" '(255 255 255)
SF-COLOR _"Foreground Color" '(0 0 0)
SF-ADJUSTMENT _"Number of X Tiles" '(5 1 512 1 10 1 1)
SF-ADJUSTMENT _"Number of Y Tiles" '(5 1 512 1 10 1 1)
)

7
po-script-fu/ChangeLog
View File

@ -1,3 +1,10 @@
2000-04-11 Sven Neumann <sven@gimp.org>
* script-fu-xgettext: set all linenumbers to 0 since they
were bogus anyway
* de.po: updated german translation
2000-04-04 Kjartan Maraas <kmaraas@online.no>
* ru.po: Updated Russian translation from Valek Filippov

1512
po-script-fu/de.po
View File

File diff suppressed because it is too large Load Diff

33
po-script-fu/script-fu-xgettext
View File

@ -1,9 +1,11 @@
#!/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.
@ -15,8 +17,7 @@
undef $/;
my $line;
my $file = "";
my $file;
my $fileposition;
my $e;
my $s;
@ -24,24 +25,22 @@ my $s;
while (<>) {
$file = $ARGV;
$file =~ s/\.\.\///;
$line = 0;
while (/_\(?"((?:[^"\\]+|\\.)*)"\)?/sg) {
$line++;
my $s = $1;
if ($s =~ /\n/) {
$e = "msgid \"\"\n";
for (split /\n/, $s) {
$e .= "\"$_\\n\"\n";
}
} else {
$e = "msgid \"$s\"\n";
}
$e .= "msgstr \"\"\n";
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:$line\n";
$fileposition = "#: $file:0\n";
push @{$entry{$e}}, $fileposition;
push @{$entry{$e}}, $fileposition;
}
}