From 05d66c98f9b2d5aba28cfdac68fa8c3d8862494c Mon Sep 17 00:00:00 2001 From: Shirasaki Yasuhiro Date: Fri, 17 Dec 1999 21:24:24 +0000 Subject: [PATCH] Fixed typo. 1999-12-18 Shirasaki Yasuhiro * app/transform_tool.c: Fixed typo. * plug-ins/common/CEL.c * plug-ins/common/aa.c * plug-ins/common/align_layers.c * po-plug-ins/POTFILES.in: Added gettext support. -- yasuhiro --- ChangeLog | 9 +++++ app/tools/transform_tool.c | 2 +- app/transform_tool.c | 2 +- plug-ins/common/CEL.c | 34 ++++++++++------ plug-ins/common/aa.c | 20 ++++++--- plug-ins/common/align_layers.c | 74 ++++++++++++++++++---------------- po-plug-ins/POTFILES.in | 3 ++ 7 files changed, 89 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index c81600a1e4..bda0076d64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +1999-12-18 Shirasaki Yasuhiro + + * app/transform_tool.c: Fixed typo. + + * plug-ins/common/CEL.c + * plug-ins/common/aa.c + * plug-ins/common/align_layers.c + * po-plug-ins/POTFILES.in: Added gettext support. + Fri Dec 17 20:29:12 GMT 1999 Adam D. Moss * app/edit_selection.c: Fixed a couple of bugs with translating diff --git a/app/tools/transform_tool.c b/app/tools/transform_tool.c index ffea6bde4c..be9605071b 100644 --- a/app/tools/transform_tool.c +++ b/app/tools/transform_tool.c @@ -209,7 +209,7 @@ transform_options_new (void) /* the transform type radio buttons */ frame = gimp_radio_group_new (TRUE, _("Transform"), - _("Roatation"), transform_type_callback, + _("Rotation"), transform_type_callback, ROTATE, NULL, &options->type_w[0], TRUE, _("Scaling"), transform_type_callback, SCALE, NULL, &options->type_w[1], FALSE, diff --git a/app/transform_tool.c b/app/transform_tool.c index ffea6bde4c..be9605071b 100644 --- a/app/transform_tool.c +++ b/app/transform_tool.c @@ -209,7 +209,7 @@ transform_options_new (void) /* the transform type radio buttons */ frame = gimp_radio_group_new (TRUE, _("Transform"), - _("Roatation"), transform_type_callback, + _("Rotation"), transform_type_callback, ROTATE, NULL, &options->type_w[0], TRUE, _("Scaling"), transform_type_callback, SCALE, NULL, &options->type_w[1], FALSE, diff --git a/plug-ins/common/CEL.c b/plug-ins/common/CEL.c index 92371c09a3..e1d4780924 100644 --- a/plug-ins/common/CEL.c +++ b/plug-ins/common/CEL.c @@ -34,6 +34,7 @@ #include #include +#include "libgimp/stdplugins-intl.h" static void query(void); static void run(char *name, int nparams, GParam *param, @@ -89,10 +90,11 @@ static void query(void) { }; static int nsave_args = sizeof (save_args) / sizeof (save_args[0]); + INIT_I18N(); gimp_install_procedure("file_cel_load", - "Loads files in KISS CEL file format", - "This plug-in loads individual KISS cell files.", + _("Loads files in KISS CEL file format"), + _("This plug-in loads individual KISS cell files."), "Nick Lamb", "Nick Lamb ", "May 1998", "/CEL", NULL, PROC_PLUG_IN, nload_args, nload_return_vals, load_args, load_return_vals); @@ -101,8 +103,8 @@ static void query(void) { "", "0,string,KiSS\040"); gimp_install_procedure("file_cel_save", - "Saves files in KISS CEL file format", - "This plug-in saves individual KISS cell files.", + _("Saves files in KISS CEL file format"), + _("This plug-in saves individual KISS cell files."), "Nick Lamb", "Nick Lamb ", "May 1998", "/CEL", "INDEXEDA", PROC_PLUG_IN, nsave_args, 0, save_args, NULL); @@ -127,6 +129,12 @@ static void run(char *name, int nparams, GParam *param, values[0].data.d_status = STATUS_SUCCESS; *return_vals = values; + if (run_mode == RUN_INTERACTIVE) { + INIT_I18N_UI(); + } else { + INIT_I18N(); + } + if (strcmp(name, "file_cel_load") == 0) { if (run_mode != RUN_NONINTERACTIVE) { gimp_get_data ("file_cel_save:length", &data_length); @@ -145,7 +153,7 @@ static void run(char *name, int nparams, GParam *param, } else if (run_mode == RUN_INTERACTIVE) { /* Let user choose KCF palette (cancel ignores) */ - palette_dialog("Load KISS Palette"); + palette_dialog( _("Load KISS Palette")); gimp_set_data ("file_cel_save:length", &data_length, sizeof (size_t)); gimp_set_data ("file_cel_save:data", palette_file, data_length); } @@ -200,12 +208,12 @@ static gint32 load_image(char *file, char *brief) { fp = fopen(file, "r"); if (fp == NULL) { - g_message("%s\nis not present or is unreadable", file); + g_message( _("%s\nis not present or is unreadable"), file); gimp_quit(); } progress= g_malloc(strlen(brief) + 10); - sprintf(progress, "Loading %s:", brief); + sprintf(progress, _("Loading %s:"), brief); gimp_progress_init(progress); /* Get the image dimensions and create the image... */ @@ -230,7 +238,7 @@ static gint32 load_image(char *file, char *brief) { image = gimp_image_new(width + offx, height + offy, INDEXED); if (image == -1) { - g_message("CEL Can't create a new image"); + g_message( _("CEL Can't create a new image")); gimp_quit(); } @@ -238,7 +246,7 @@ static gint32 load_image(char *file, char *brief) { /* Create an indexed-alpha layer to hold the image... */ - layer = gimp_layer_new(image, "Background", width, height, + layer = gimp_layer_new(image, _("Background"), width, height, INDEXEDA_IMAGE, 100, NORMAL_MODE); gimp_image_add_layer(image, layer, 0); gimp_layer_set_offsets(layer, offx, offy); @@ -290,7 +298,7 @@ static gint32 load_image(char *file, char *brief) { } break; default: - g_message("Unsupported number of colours (%d)", colours); + g_message( _("Unsupported number of colours (%d)"), colours); gimp_quit(); } @@ -388,7 +396,7 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) { /* Check that this is an indexed image, fail otherwise */ type= gimp_drawable_type(layer); if (type != INDEXEDA_IMAGE) { - g_message("Only an indexed-alpha image can be saved in CEL format"); + g_message( _("Only an indexed-alpha image can be saved in CEL format")); gimp_quit(); } @@ -401,12 +409,12 @@ static gint save_image(char *file, char *brief, gint32 image, gint32 layer) { fp = fopen(file, "w"); if (fp == NULL) { - g_message("CEL Couldn't write image to\n%s", file); + g_message( _("CEL Couldn't write image to\n%s"), file); gimp_quit(); } progress= g_malloc(strlen(brief) + 9); - sprintf(progress, "Saving %s:", brief); + sprintf(progress, _("Saving %s:"), brief); gimp_progress_init(progress); /* Headers */ diff --git a/plug-ins/common/aa.c b/plug-ins/common/aa.c index fe93ffc7a9..d7e564b908 100644 --- a/plug-ins/common/aa.c +++ b/plug-ins/common/aa.c @@ -8,6 +8,8 @@ * Tim Newsome */ +#include "config.h" + #include #include #include @@ -16,6 +18,8 @@ #include #include +#include "libgimp/stdplugins-intl.h" + /* * Declare some local functions. */ @@ -81,9 +85,11 @@ query() }; static int nsave_args = sizeof(save_args) / sizeof(save_args[0]); + INIT_I18N(); + gimp_install_procedure("file_aa_save", - "Saves files in various text formats", - "Saves files in various text formats", + _("Saves files in various text formats"), + _("Saves files in various text formats"), "Tim Newsome ", "Tim Newsome ", "1997", @@ -153,6 +159,7 @@ run (char *name, { case RUN_INTERACTIVE: case RUN_WITH_LAST_VALS: + INIT_I18N_UI(); init_gtk (); export = gimp_export_image (&image_ID, &drawable_ID, "AA", (CAN_HANDLE_GRAY | CAN_HANDLE_ALPHA)); @@ -163,6 +170,7 @@ run (char *name, } break; default: + INIT_I18N(); break; } @@ -345,7 +353,7 @@ type_dialog (int selected) /* Create the actual window. */ dlg = gtk_dialog_new(); - gtk_window_set_title(GTK_WINDOW(dlg), "Save as text"); + gtk_window_set_title(GTK_WINDOW(dlg), _("Save as text")); gtk_window_position(GTK_WINDOW(dlg), GTK_WIN_POS_MOUSE); gtk_signal_connect(GTK_OBJECT(dlg), "destroy", (GtkSignalFunc) type_dialog_close_callback, NULL); @@ -358,7 +366,7 @@ type_dialog (int selected) gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0); gtk_widget_show (hbbox); - button = gtk_button_new_with_label ("OK"); + button = gtk_button_new_with_label ( _("OK")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) type_dialog_ok_callback, @@ -367,7 +375,7 @@ type_dialog (int selected) gtk_widget_grab_default (button); gtk_widget_show (button); - button = gtk_button_new_with_label ("Cancel"); + button = gtk_button_new_with_label ( _("Cancel")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) type_dialog_cancel_callback, @@ -376,7 +384,7 @@ type_dialog (int selected) gtk_widget_show (button); /* file save type */ - frame = gtk_frame_new ("Data Formatting"); + frame = gtk_frame_new ( _("Data Formatting")); gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN); gtk_container_border_width(GTK_CONTAINER(frame), 10); gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dlg)->vbox), frame, FALSE, TRUE, 0); diff --git a/plug-ins/common/align_layers.c b/plug-ins/common/align_layers.c index e67fd0b719..a5ad2fca5c 100644 --- a/plug-ins/common/align_layers.c +++ b/plug-ins/common/align_layers.c @@ -1,6 +1,6 @@ /* align_layers.c -- This is a plug-in for the GIMP (1.0's API) * Author: Shuji Narazaki - * Time-stamp: <1998/01/17 00:32:23 narazaki@InetQ.or.jp> + * Time-stamp: <1999-12-18 05:48:38 yasuhiro> * Version: 0.26 * * Copyright (C) 1997-1998 Shuji Narazaki @@ -20,8 +20,10 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "config.h" #include "libgimp/gimp.h" #include "gtk/gtk.h" +#include "libgimp/stdplugins-intl.h" #include #include #include @@ -30,7 +32,6 @@ #define PLUG_IN_NAME "plug_in_align_layers" #define SHORT_NAME "align_layers" #define PROGRESS_NAME "align_layers" -#define MENU_POSITION "/Layers/Align Visible Layers..." #define MAIN_FUNCTION main_function #define INTERFACE align_layers_interface #define DIALOG align_layers_dialog @@ -130,49 +131,49 @@ GPlugInInfo PLUG_IN_INFO = gtkW_menu_item h_style_menu [] = { #define H_NONE 0 - { "None", NULL }, + { N_("None"), NULL }, #define H_COLLECT 1 - { "Collect", NULL }, + { N_("Collect"), NULL }, #define LEFT2RIGHT 2 - { "Fill (left to right)", NULL }, + { N_("Fill (left to right)"), NULL }, #define RIGHT2LEFT 3 - { "Fill (right to left)", NULL }, + { N_("Fill (right to left)"), NULL }, #define SNAP2HGRID 4 - { "Snap to grid", NULL } + { N_("Snap to grid"), NULL } }; gtkW_menu_item h_base_menu [] = { #define H_BASE_LEFT 0 - { "Left edge", NULL }, + { N_("Left edge"), NULL }, #define H_BASE_CENTER 1 - { "Center", NULL }, + { N_("Center"), NULL }, #define H_BASE_RIGHT 2 - { "Right edge", NULL } + { N_("Right edge"), NULL } }; gtkW_menu_item v_style_menu [] = { #define V_NONE 0 - { "None", NULL }, + { N_("None"), NULL }, #define V_COLLECT 1 - { "Collect", NULL }, + { N_("Collect"), NULL }, #define TOP2BOTTOM 2 - { "Fill (top to bottom)", NULL }, + { N_("Fill (top to bottom)"), NULL }, #define BOTTOM2TOP 3 - { "Fill (bottom to top)", NULL }, + { N_("Fill (bottom to top)"), NULL }, #define SNAP2VGRID 4 - { "Snap to grid", NULL } + { N_("Snap to grid"), NULL } }; gtkW_menu_item v_base_menu [] = { #define V_BASE_TOP 0 - { "Top edge", NULL }, + { N_("Top edge"), NULL }, #define V_BASE_CENTER 1 - { "Center", NULL }, + { N_("Center"), NULL }, #define V_BASE_BOTTOM 2 - { "Bottom edge", NULL } + { N_("Bottom edge"), NULL } }; typedef struct @@ -216,14 +217,16 @@ query () static GParamDef *return_vals = NULL; static int nargs = sizeof (args) / sizeof (args[0]); static int nreturn_vals = 0; + + INIT_I18N(); gimp_install_procedure (PLUG_IN_NAME, - "Align visible layers", - "align visible layers", + _("Align visible layers"), + _("align visible layers"), "Shuji Narazaki ", "Shuji Narazaki", "1997", - MENU_POSITION, + N_("/Layers/Align Visible Layers..."), "RGB*,GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, @@ -254,10 +257,11 @@ run (char *name, switch ( run_mode ) { case RUN_INTERACTIVE: + INIT_I18N_UI(); gimp_image_get_layers (image_id, &layer_num); if (layer_num < 2) { - gtkW_message_dialog (0, "Error: there are too few layers."); + gtkW_message_dialog (0, _("Error: there are too few layers.")); return; } gimp_get_data (PLUG_IN_NAME, &VALS); @@ -265,8 +269,10 @@ run (char *name, return; break; case RUN_NONINTERACTIVE: + INIT_I18N(); break; case RUN_WITH_LAST_VALS: + INIT_I18N(); gimp_get_data (PLUG_IN_NAME, &VALS); break; } @@ -573,39 +579,39 @@ DIALOG () gtk_widget_show (frame); gtk_widget_show (hbox); #else - frame = gtkW_frame_new (GTK_DIALOG (dlg)->vbox, "Parameter settings"); + frame = gtkW_frame_new (GTK_DIALOG (dlg)->vbox, _("Parameter settings")); table = gtkW_table_new (frame, 7, 2); - gtkW_table_add_menu (table, "Horizontal style", 0, index++, + gtkW_table_add_menu (table, _("Horizontal style"), 0, index++, (GtkSignalFunc) gtkW_menu_update, &VALS.h_style, h_style_menu, sizeof (h_style_menu) / sizeof (h_style_menu[0])); - gtkW_table_add_menu (table, "Horizontal base", 0, index++, + gtkW_table_add_menu (table, _("Horizontal base"), 0, index++, (GtkSignalFunc) gtkW_menu_update, &VALS.h_base, h_base_menu, sizeof (h_base_menu) / sizeof (h_base_menu[0])); - gtkW_table_add_menu (table, "Vertical style", 0, index++, + gtkW_table_add_menu (table, _("Vertical style"), 0, index++, (GtkSignalFunc) gtkW_menu_update, &VALS.v_style, v_style_menu, sizeof (v_style_menu) / sizeof (v_style_menu[0])); - gtkW_table_add_menu (table, "Vertical base", 0, index++, + gtkW_table_add_menu (table, _("Vertical base"), 0, index++, (GtkSignalFunc) gtkW_menu_update, &VALS.v_base, v_base_menu, sizeof (v_base_menu) / sizeof (v_base_menu[0])); #endif - gtkW_table_add_toggle (table, "Ignore the bottom layer even if visible", + gtkW_table_add_toggle (table, _("Ignore the bottom layer even if visible"), 0, index++, (GtkSignalFunc) gtkW_toggle_update, &VALS.ignore_bottom); - gtkW_table_add_toggle (table, "Use the (invisible) bottom layer as the base", + gtkW_table_add_toggle (table, _("Use the (invisible) bottom layer as the base"), 0, index++, (GtkSignalFunc) gtkW_toggle_update, &VALS.base_is_bottom_layer); - gtkW_table_add_iscale_entry (table, "Grid size", + gtkW_table_add_iscale_entry (table, _("Grid size"), 0, index++, (GtkSignalFunc) gtkW_iscale_update, (GtkSignalFunc) gtkW_ientry_update, @@ -711,7 +717,7 @@ gtkW_dialog_new (char * name, (GtkSignalFunc) close_callback, NULL); /* Action Area */ - button = gtk_button_new_with_label ("OK"); + button = gtk_button_new_with_label ( _("OK")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) ok_callback, dlg); @@ -720,7 +726,7 @@ gtkW_dialog_new (char * name, gtk_widget_grab_default (button); gtk_widget_show (button); - button = gtk_button_new_with_label ("Cancel"); + button = gtk_button_new_with_label ( _("Cancel")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", (GtkSignalFunc) gtk_widget_destroy, @@ -779,7 +785,7 @@ gtkW_message_dialog_new (char * name) (GtkSignalFunc) gtkW_close_callback, NULL); /* Action Area */ - button = gtk_button_new_with_label ("OK"); + button = gtk_button_new_with_label ( _("OK")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", (GtkSignalFunc) gtk_widget_destroy, @@ -1031,7 +1037,7 @@ gtkW_table_add_menu (GtkWidget *table, for (i = 0; i < item_num; i++) { - sprintf (buf, item[i].name); + sprintf (buf, gettext(item[i].name)); menuitem = gtk_menu_item_new_with_label (buf); gtk_menu_append (GTK_MENU (menu), menuitem); gtk_signal_connect (GTK_OBJECT (menuitem), "activate", diff --git a/po-plug-ins/POTFILES.in b/po-plug-ins/POTFILES.in index a9e95ce99c..dbfba7ceed 100644 --- a/po-plug-ins/POTFILES.in +++ b/po-plug-ins/POTFILES.in @@ -9,7 +9,10 @@ plug-ins/bmp/bmp.c plug-ins/bmp/bmpread.c plug-ins/bmp/bmpwrite.c plug-ins/borderaverage/borderaverage.c +plug-ins/common/CEL.c plug-ins/common/CML_explorer.c +plug-ins/common/aa.c +plug-ins/common/align_layers.c plug-ins/common/animationplay.c plug-ins/common/animoptimize.c plug-ins/common/apply_lens.c