From d9aa84db3d9f31944cc4ca24bed1aef5d9ebd81c Mon Sep 17 00:00:00 2001 From: SHIRASAKI Yasuhiro Date: Tue, 28 Dec 1999 18:30:01 +0000 Subject: [PATCH] plug-ins/common/animationplay.c plug-ins/common/bz2.c * plug-ins/common/animationplay.c * plug-ins/common/bz2.c * plug-ins/common/c_astretch.c * plug-ins/common/color_enhance.c * plug-ins/common/compose.c * plug-ins/common/decompose.c * plug-ins/common/depthmerge.c: unmarked unnecessary translation tag. * app/gimpui.c: #include "config.h" * po/POTFILES.in: included missing app/gimpui.c -- yasuhiro --- ChangeLog | 13 +++++++++++++ app/gimpui.c | 1 + app/widgets/gimpwidgets-utils.c | 1 + plug-ins/common/animationplay.c | 2 +- plug-ins/common/bz2.c | 20 ++++++++++---------- plug-ins/common/c_astretch.c | 2 +- plug-ins/common/color_enhance.c | 2 +- plug-ins/common/compose.c | 8 ++++---- plug-ins/common/decompose.c | 8 ++++---- plug-ins/common/depthmerge.c | 2 +- po/POTFILES.in | 1 + 11 files changed, 38 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6be3ad233..92c70d5629 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +1999-12-29 Shirasaki Yasuhiro + + * plug-ins/common/animationplay.c + * plug-ins/common/bz2.c + * plug-ins/common/c_astretch.c + * plug-ins/common/color_enhance.c + * plug-ins/common/compose.c + * plug-ins/common/decompose.c + * plug-ins/common/depthmerge.c: unmarked unnecessary translation tag. + + * app/gimpui.c: #include "config.h" + * po/POTFILES.in: included missing app/gimpui.c + Tue Dec 28 15:32:19 CET 1999 Sven Neumann * plug-ins/common/gz.c diff --git a/app/gimpui.c b/app/gimpui.c index cdc8244e08..578e48b488 100644 --- a/app/gimpui.c +++ b/app/gimpui.c @@ -18,6 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gimpui.h" #include "libgimp/gimpsizeentry.h" diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c index cdc8244e08..578e48b488 100644 --- a/app/widgets/gimpwidgets-utils.c +++ b/app/widgets/gimpwidgets-utils.c @@ -18,6 +18,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include "gimpui.h" #include "libgimp/gimpsizeentry.h" diff --git a/plug-ins/common/animationplay.c b/plug-ins/common/animationplay.c index 0987b66974..9c33125417 100644 --- a/plug-ins/common/animationplay.c +++ b/plug-ins/common/animationplay.c @@ -1001,7 +1001,7 @@ render_frame (gint32 whichframe) if (whichframe >= total_frames) { - printf( _("playback: Asked for frame number %d in a %d-frame animation!\n"), + printf( "playback: Asked for frame number %d in a %d-frame animation!\n", (int) (whichframe+1), (int) total_frames); exit(-1); } diff --git a/plug-ins/common/bz2.c b/plug-ins/common/bz2.c index 8a64b3940b..8553a992ca 100644 --- a/plug-ins/common/bz2.c +++ b/plug-ins/common/bz2.c @@ -291,7 +291,7 @@ save_image (char *filename, /* fork off a bzip2 process */ if ((pid = fork()) < 0) { - g_message (_("bz2: fork failed: %s\n"), g_strerror(errno)); + g_message ("bz2: fork failed: %s\n", g_strerror(errno)); g_free (tmpname); return -1; } @@ -299,18 +299,18 @@ save_image (char *filename, { if (!(f = fopen(filename,"w"))){ - g_message(_("bz2: fopen failed: %s\n"), g_strerror(errno)); + g_message("bz2: fopen failed: %s\n", g_strerror(errno)); g_free (tmpname); _exit(127); } /* make stdout for this process be the output file */ if (-1 == dup2(fileno(f),fileno(stdout))) - g_message (_("bz2: dup2 failed: %s\n"), g_strerror(errno)); + g_message ("bz2: dup2 failed: %s\n", g_strerror(errno)); /* and bzip2 into it */ execlp ("bzip2", "bzip2", "-cf", tmpname, NULL); - g_message (_("bz2: exec failed: bzip2: %s\n"), g_strerror(errno)); + g_message ("bz2: exec failed: bzip2: %s\n", g_strerror(errno)); g_free (tmpname); _exit(127); } @@ -328,7 +328,7 @@ save_image (char *filename, if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { - g_message (_("bz2: bzip2 exited abnormally on file %s\n"), tmpname); + g_message ("bz2: bzip2 exited abnormally on file %s\n", tmpname); g_free (tmpname); return 0; } @@ -365,7 +365,7 @@ load_image (char *filename, gint32 run_mode) /* fork off a g(un)zip and wait for it */ if ((pid = fork()) < 0) { - g_message (_("bz2: fork failed: %s\n"), g_strerror(errno)); + g_message ("bz2: fork failed: %s\n", g_strerror(errno)); g_free (tmpname); return -1; } @@ -373,18 +373,18 @@ load_image (char *filename, gint32 run_mode) { FILE* f; if (!(f = fopen(tmpname,"w"))){ - g_message(_("bz2: fopen failed: %s\n"), g_strerror(errno)); + g_message("bz2: fopen failed: %s\n", g_strerror(errno)); g_free (tmpname); _exit(127); } /* make stdout for this child process be the temp file */ if (-1 == dup2(fileno(f),fileno(stdout))) - g_message (_("bz2: dup2 failed: %s\n"), g_strerror(errno)); + g_message ("bz2: dup2 failed: %s\n", g_strerror(errno)); /* and unzip into it */ execlp ("bzip2", "bzip2", "-cfd", filename, NULL); - g_message (_("bz2: exec failed: bunzip2: %s\n"), g_strerror(errno)); + g_message ("bz2: exec failed: bunzip2: %s\n", g_strerror(errno)); g_free (tmpname); _exit(127); } @@ -402,7 +402,7 @@ load_image (char *filename, gint32 run_mode) if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { - g_message (_("bz2: bzip2 exited abnormally on file %s\n"), filename); + g_message ("bz2: bzip2 exited abnormally on file %s\n", filename); g_free (tmpname); return -1; } diff --git a/plug-ins/common/c_astretch.c b/plug-ins/common/c_astretch.c index 9901af3257..279b6509a0 100644 --- a/plug-ins/common/c_astretch.c +++ b/plug-ins/common/c_astretch.c @@ -153,7 +153,7 @@ indexed_c_astretch(gint32 image_ID) /* a.d.m. */ if (cmap==NULL) { - printf(_("c_astretch: cmap was NULL! Quitting...\n")); + printf("c_astretch: cmap was NULL! Quitting...\n"); gimp_quit(); } diff --git a/plug-ins/common/color_enhance.c b/plug-ins/common/color_enhance.c index 5eabf340eb..325839cf6e 100644 --- a/plug-ins/common/color_enhance.c +++ b/plug-ins/common/color_enhance.c @@ -161,7 +161,7 @@ indexed_Color_Enhance(gint32 image_ID) /* a.d.m. */ if (cmap==NULL) { - printf(_("Color_Enhance: cmap was NULL! Quitting...\n")); + printf("Color_Enhance: cmap was NULL! Quitting...\n"); gimp_quit(); } diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index 86629021d0..1a639a1153 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -302,7 +302,7 @@ run (char *name, layer_list = gimp_image_get_layers (param[1].data.d_int32, &nlayers); if ((layer_list == NULL) || (nlayers <= 0)) { - sprintf (msg, _("compose: Could not get layers for image %d"), + sprintf (msg, "compose: Could not get layers for image %d", (int)param[1].data.d_int32); show_message (msg); return; @@ -418,7 +418,7 @@ compose (char *compose_type, if ( (width != (int)gimp_drawable_width (compose_ID[j])) || (height != (int)gimp_drawable_height (compose_ID[j]))) { - show_message (_("compose: drawables have different size")); + show_message ("compose: drawables have different size"); return -1; } } @@ -435,7 +435,7 @@ compose (char *compose_type, if ( (width != (int)gimp_image_width (compose_ID[j])) || (height != (int)gimp_image_height (compose_ID[j]))) { - show_message (_("compose: images have different size")); + show_message ("compose: images have different size"); return -1; } } @@ -448,7 +448,7 @@ compose (char *compose_type, g32 = gimp_image_get_layers (compose_ID[j], &num_layers); if ((g32 == NULL) || (num_layers <= 0)) { - show_message (_("compose: error in getting layer IDs")); + show_message ("compose: error in getting layer IDs"); return (-1); } diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index 2103e0532d..417ce7e5a9 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -300,7 +300,7 @@ run (char *name, drawable_type = gimp_drawable_type (param[2].data.d_drawable); if ((drawable_type != RGB_IMAGE) && (drawable_type != RGBA_IMAGE)) { - show_message (_("plug_in_decompose: Can only work on RGB*_IMAGE")); + show_message ("plug_in_decompose: Can only work on RGB*_IMAGE"); status = STATUS_CALLING_ERROR; } if (status == STATUS_SUCCESS) @@ -370,13 +370,13 @@ decompose (gint32 image_ID, drawable_src = gimp_drawable_get (drawable_ID); if (drawable_src->bpp < 3) { - show_message (_("decompose: not an RGB image")); + show_message ("decompose: not an RGB image"); return (-1); } if ((extract[extract_idx].extract_fun == extract_alpha) && (!gimp_drawable_has_alpha (drawable_ID))) { - show_message (_("decompose: No alpha channel available")); + show_message ("decompose: No alpha channel available"); return (-1); } @@ -406,7 +406,7 @@ decompose (gint32 image_ID, } if (dst[num_images-1] == NULL) { - show_message (_("decompose: out of memory")); + show_message ("decompose: out of memory"); for (j = 0; j < num_images; j++) { if (dst[j] != NULL) g_free (dst[j]); diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index 04b31f285e..ae910eaffe 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -1182,7 +1182,7 @@ void util_convertColorspace(guchar *dest, if (((sourceColorBPP != 1) && (sourceColorBPP != 3)) || ((destColorBPP != 1) && (destColorBPP != 3))) - fprintf(stderr, _("Warning: I don't _like_ this color space. This is a suggestion, not a threat.\n")); + fprintf(stderr, "Warning: I don't _like_ this color space. This is a suggestion, not a threat.\n"); if ((sourceColorBPP == destColorBPP) && (sourceBPP == destBPP )) { diff --git a/po/POTFILES.in b/po/POTFILES.in index 45a86598de..9efcf5e106 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -56,6 +56,7 @@ app/gimpimage.c app/gimpparasite.c app/gimpprogress.c app/gimprc.c +app/gimpui.c app/gimpunit.c app/global_edit.c app/gradient.c