dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

app/gui/convert-dialog.c app/gui/dialogs-constructors.c 

2001-11-26  Rebecca Walter  <rjp@mail.tele.dk>

	* app/gui/convert-dialog.c
	* app/gui/dialogs-constructors.c
	* app/gui/error-console-dialog.c
	* app/gui/file-commands.c
	* app/gui/file-new-dialog.c
	* app/gui/file-open-dialog.c
	* app/gui/file-save-dialog.c: More of my extensive proofing.
	Someone needs to check bex comments and do some hacking.
This commit is contained in:
Rebecca Walter 2001-11-26 17:12:29 +00:00 committed by Rebecca Jean Pedersen
parent a27598100b
commit 5fcd04f0e8
14 changed files with 99 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2001-11-26 Rebecca Walter <rjp@mail.tele.dk>
* app/gui/convert-dialog.c
* app/gui/dialogs-constructors.c
* app/gui/error-console-dialog.c
* app/gui/file-commands.c
* app/gui/file-new-dialog.c
* app/gui/file-open-dialog.c
* app/gui/file-save-dialog.c: More of my extensive proofing.
Someone needs to check bex comments and do some hacking.
2001-11-26 Michael Natterer <mitch@gimp.org>
* app/core/gimpimage.c: gimp_image_construct_layers/channels():

21
app/actions/file-commands.c
View File

@ -126,7 +126,10 @@ file_last_opened_cmd_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Error opening file: %s\n"),
/* This string needs to be fixed. Mitch is supposed to do it. Needs a :
added at the end followed by the error. Also something about the GIMP_OBJECT
needs to be changed. --bex */
g_message (_("Error opening file '%s'"),
GIMP_OBJECT (imagefile)->name);
}
}
@ -179,7 +182,8 @@ file_save_cmd_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Save failed.\n%s"), filename);
/* Error message should be added. --bex */
g_message (_("Saving '%s' failed."), filename);
}
}
@ -224,7 +228,7 @@ file_revert_cmd_callback (GtkWidget *widget,
if (! filename)
{
g_message (_("Revert failed.\n"
"No filename associated with this image."));
"No file name associated with this image."));
}
else if (query_box)
{
@ -237,15 +241,15 @@ file_revert_cmd_callback (GtkWidget *widget,
basename = g_path_get_basename (filename);
text = g_strdup_printf (_("Reverting %s to\n"
"%s\n\n"
"(You will lose all your changes\n"
text = g_strdup_printf (_("Revert '%s' to\n"
"'%s'?"
"(You will lose all your changes,\n"
"including all undo information)"),
basename, filename);
g_free (basename);
query_box = gimp_query_boolean_box (_("Revert Image?"),
query_box = gimp_query_boolean_box (_("Revert Image"),
gimp_standard_help_func,
"file/revert.html",
FALSE,
@ -324,7 +328,8 @@ file_revert_confirm_callback (GtkWidget *widget,
}
else if (status != GIMP_PDB_CANCEL)
{
g_message (_("Revert failed.\n%s"), filename);
/* Needs error information. --bex */
g_message (_("Reverting '%s' failed."), filename);
}
}
}

12
app/dialogs/convert-dialog.c
View File

@ -178,7 +178,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle =
gtk_radio_button_new_with_label (NULL, _("Generate Optimal Palette:"));
gtk_radio_button_new_with_label (NULL, _("Generate Optimum Palette:"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
@ -206,7 +206,7 @@ convert_to_indexed (GimpImage *gimage)
G_CALLBACK (gimp_int_adjustment_update),
&dialog->num_cols);
label = gtk_label_new (_("# of Colors:"));
label = gtk_label_new (_("Number of Colors:"));
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -294,7 +294,7 @@ convert_to_indexed (GimpImage *gimage)
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle =
gtk_radio_button_new_with_label (group, _("Use Black/White (1-Bit) Palette"));
gtk_radio_button_new_with_label (group, _("Use Black and White (1-Bit) Palette"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
@ -305,7 +305,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_widget_show (toggle);
gtk_widget_show (hbox);
frame = gtk_frame_new (_("Dither Options"));
frame = gtk_frame_new (_("Dithering Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
@ -406,8 +406,8 @@ convert_to_indexed (GimpImage *gimage)
gtk_widget_show (vbox);
label = gtk_label_new
(_("You are attempting to convert an image with alpha/layers "
"from RGB/GRAY to INDEXED.\nYou should not generate a "
(_("You are attempting to convert an image with an alpha channel or layers "
"from RGB or GRAY to INDEXED.\nDo not generate a "
"palette of more than 255 colors if you intend to create "
"a transparent or animated GIF file from this image."));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);

2
app/dialogs/dialogs-constructors.c
View File

@ -838,7 +838,7 @@ dialogs_edit_brush_func (GimpData *data)
}
else
{
g_message (_("Sorry, this brush can't be edited."));
g_message (_("This brush cannot be edited."));
}
}

24
app/dialogs/file-open-dialog.c
View File

@ -318,7 +318,7 @@ file_open_dialog_create (Gimp *gimp)
}
gtk_frame_set_label (GTK_FRAME (open_options_frame), _("Preview"));
gtk_label_set_text (GTK_LABEL (open_options_label), _("No Selection."));
gtk_label_set_text (GTK_LABEL (open_options_label), _("No Selection"));
gtk_widget_show (GTK_WIDGET (open_options_genbuttonlabel));
gtk_widget_hide (GTK_WIDGET (open_options_preview));
@ -403,7 +403,7 @@ make_RGBbuf_from_tempbuf (TempBuf *tempbuf,
break;
default:
g_warning("UNKNOWN TempBuf width in make_RGBbuf_from_tempbuf()");
g_warning ("%s: Unknown TempBuf width.", G_STRLOC);
}
return (rtn);
@ -501,8 +501,8 @@ set_preview (Gimp *gimp,
{
gtk_label_set_text (GTK_LABEL (open_options_label),
thumb_may_be_outdated ?
_("(This thumbnail may be out of date)") :
(imginfo ? imginfo : _("(No Information)")));
_("This thumbnail may be out of date") :
(imginfo ? imginfo : _("No Information")));
if (imginfo)
g_free (imginfo);
}
@ -512,15 +512,15 @@ set_preview (Gimp *gimp,
{
case 0:
gtk_label_set_text (GTK_LABEL(open_options_label),
_("(Thumbnail saving is disabled)"));
_("Thumbnail saving is disabled."));
break;
case 1:
gtk_label_set_text (GTK_LABEL(open_options_label),
_("(Could not write thumbnail file)"));
_("Could not write thumbnail file."));
break;
default:
gtk_label_set_text (GTK_LABEL(open_options_label),
_("(Thumbnail file not written)"));
_("Thumbnail file not written."));
}
}
@ -599,7 +599,7 @@ file_open_genbutton_callback (GtkWidget *widget,
if (! preview_fullname)
{
g_warning ("Tried to generate thumbnail for NULL filename.");
g_warning ("%s: Tried to generate thumbnail for NULL file name.", G_STRLOC);
return;
}
@ -657,7 +657,7 @@ file_open_genbutton_callback (GtkWidget *widget,
else
{
gtk_label_set_text (GTK_LABEL (open_options_label),
_("(could not make preview)"));
_("Failed to generate preview."));
}
}
}
@ -734,7 +734,8 @@ file_open_ok_callback (GtkWidget *widget,
}
else if (status != GIMP_PDB_CANCEL)
{
g_message (_("Open failed.\n%s"), full_filename);
/* Hackery required. Please add error message. --bex */
g_message (_("Opening '%s' failed."), full_filename);
}
@ -775,7 +776,8 @@ file_open_ok_callback (GtkWidget *widget,
}
else if (status != GIMP_PDB_CANCEL)
{
g_message (_("Open failed.\n%s"), full_filename);
/* same as previous. --bex */
g_message (_("Opening '%s' failed."), full_filename);
}
}
}

8
app/dialogs/file-save-dialog.c
View File

@ -430,7 +430,8 @@ file_save_ok_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Save failed:\n%s"), filename);
/* Please add error. (: %s) --bex */
g_message (_("Saving %s failed."), filename);
}
else
{
@ -454,7 +455,7 @@ file_overwrite (const gchar *filename,
overwrite_data->full_filename = g_strdup (filename);
overwrite_data->raw_filename = g_strdup (raw_filename);
overwrite_text = g_strdup_printf (_("%s exists, overwrite?"), filename);
overwrite_text = g_strdup_printf (_("%s exists. Overwrite?"), filename);
query_box = gimp_query_boolean_box (_("File Exists!"),
gimp_standard_help_func,
@ -494,7 +495,8 @@ file_overwrite_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Save failed:\n%s"), overwrite_data->full_filename);
/* Another error required. --bex */
g_message (_("Saving '%s' failed."), overwrite_data->full_filename);
}
else
{

8
app/dialogs/image-new-dialog.c
View File

@ -575,15 +575,15 @@ file_new_confirm_dialog (NewImageInfo *info)
/* xgettext:no-c-format */
text = g_strdup_printf (_("You are trying to create an image which\n"
"has an initial size of %s.\n\n"
text = g_strdup_printf (_("You are trying to create an image with\n"
"an initial size of %s.\n\n"
"Choose OK to create this image anyway.\n"
"Choose Cancel if you didn't mean to\n"
"Choose Cancel if you did not intend to\n"
"create such a large image.\n\n"
"To prevent this dialog from appearing,\n"
"increase the \"Maximum Image Size\"\n"
"setting (currently %s) in the\n"
"preferences dialog."),
"Preferences dialog."),
size, max_size);
info->confirm_dialog =

12
app/gui/convert-dialog.c
View File

@ -178,7 +178,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle =
gtk_radio_button_new_with_label (NULL, _("Generate Optimal Palette:"));
gtk_radio_button_new_with_label (NULL, _("Generate Optimum Palette:"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
@ -206,7 +206,7 @@ convert_to_indexed (GimpImage *gimage)
G_CALLBACK (gimp_int_adjustment_update),
&dialog->num_cols);
label = gtk_label_new (_("# of Colors:"));
label = gtk_label_new (_("Number of Colors:"));
gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0);
gtk_widget_show (label);
@ -294,7 +294,7 @@ convert_to_indexed (GimpImage *gimage)
hbox = gtk_hbox_new (FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
toggle =
gtk_radio_button_new_with_label (group, _("Use Black/White (1-Bit) Palette"));
gtk_radio_button_new_with_label (group, _("Use Black and White (1-Bit) Palette"));
group = gtk_radio_button_group (GTK_RADIO_BUTTON (toggle));
gtk_box_pack_start (GTK_BOX (hbox), toggle, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (toggle), "toggled",
@ -305,7 +305,7 @@ convert_to_indexed (GimpImage *gimage)
gtk_widget_show (toggle);
gtk_widget_show (hbox);
frame = gtk_frame_new (_("Dither Options"));
frame = gtk_frame_new (_("Dithering Options"));
gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
gtk_widget_show (frame);
@ -406,8 +406,8 @@ convert_to_indexed (GimpImage *gimage)
gtk_widget_show (vbox);
label = gtk_label_new
(_("You are attempting to convert an image with alpha/layers "
"from RGB/GRAY to INDEXED.\nYou should not generate a "
(_("You are attempting to convert an image with an alpha channel or layers "
"from RGB or GRAY to INDEXED.\nDo not generate a "
"palette of more than 255 colors if you intend to create "
"a transparent or animated GIF file from this image."));
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);

2
app/gui/dialogs-constructors.c
View File

@ -838,7 +838,7 @@ dialogs_edit_brush_func (GimpData *data)
}
else
{
g_message (_("Sorry, this brush can't be edited."));
g_message (_("This brush cannot be edited."));
}
}

6
app/gui/error-console-dialog.c
View File

@ -175,7 +175,7 @@ error_console_add (const gchar *errormsg)
{
if (! error_console)
{
g_warning ("error_console_add(): error_console widget is NULL");
g_warning ("%s: error_console widget is NULL", G_STRLOC);
message_handler = MESSAGE_BOX;
g_message (errormsg);
@ -268,7 +268,7 @@ error_console_create_file_dialog (GtkTextBuffer *buffer,
if (! gtk_text_buffer_get_selection_bounds (buffer, NULL, NULL) &&
textscope == ERRORS_SELECTION)
{
g_message (_("Can't save, nothing selected!"));
g_message (_("Cannot save. Nothing is selected."));
return;
}
@ -327,7 +327,7 @@ error_console_file_ok_callback (GtkWidget *widget,
if (! error_console_write_file (buffer, filename, textscope))
{
g_message (_("Error opening file \"%s\":\n%s"),
g_message (_("Error opening file '%s':\n%s"),
filename, g_strerror (errno));
}
else

21
app/gui/file-commands.c
View File

@ -126,7 +126,10 @@ file_last_opened_cmd_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Error opening file: %s\n"),
/* This string needs to be fixed. Mitch is supposed to do it. Needs a :
added at the end followed by the error. Also something about the GIMP_OBJECT
needs to be changed. --bex */
g_message (_("Error opening file '%s'"),
GIMP_OBJECT (imagefile)->name);
}
}
@ -179,7 +182,8 @@ file_save_cmd_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Save failed.\n%s"), filename);
/* Error message should be added. --bex */
g_message (_("Saving '%s' failed."), filename);
}
}
@ -224,7 +228,7 @@ file_revert_cmd_callback (GtkWidget *widget,
if (! filename)
{
g_message (_("Revert failed.\n"
"No filename associated with this image."));
"No file name associated with this image."));
}
else if (query_box)
{
@ -237,15 +241,15 @@ file_revert_cmd_callback (GtkWidget *widget,
basename = g_path_get_basename (filename);
text = g_strdup_printf (_("Reverting %s to\n"
"%s\n\n"
"(You will lose all your changes\n"
text = g_strdup_printf (_("Revert '%s' to\n"
"'%s'?"
"(You will lose all your changes,\n"
"including all undo information)"),
basename, filename);
g_free (basename);
query_box = gimp_query_boolean_box (_("Revert Image?"),
query_box = gimp_query_boolean_box (_("Revert Image"),
gimp_standard_help_func,
"file/revert.html",
FALSE,
@ -324,7 +328,8 @@ file_revert_confirm_callback (GtkWidget *widget,
}
else if (status != GIMP_PDB_CANCEL)
{
g_message (_("Revert failed.\n%s"), filename);
/* Needs error information. --bex */
g_message (_("Reverting '%s' failed."), filename);
}
}
}

8
app/gui/file-new-dialog.c
View File

@ -575,15 +575,15 @@ file_new_confirm_dialog (NewImageInfo *info)
/* xgettext:no-c-format */
text = g_strdup_printf (_("You are trying to create an image which\n"
"has an initial size of %s.\n\n"
text = g_strdup_printf (_("You are trying to create an image with\n"
"an initial size of %s.\n\n"
"Choose OK to create this image anyway.\n"
"Choose Cancel if you didn't mean to\n"
"Choose Cancel if you did not intend to\n"
"create such a large image.\n\n"
"To prevent this dialog from appearing,\n"
"increase the \"Maximum Image Size\"\n"
"setting (currently %s) in the\n"
"preferences dialog."),
"Preferences dialog."),
size, max_size);
info->confirm_dialog =

24
app/gui/file-open-dialog.c
View File

@ -318,7 +318,7 @@ file_open_dialog_create (Gimp *gimp)
}
gtk_frame_set_label (GTK_FRAME (open_options_frame), _("Preview"));
gtk_label_set_text (GTK_LABEL (open_options_label), _("No Selection."));
gtk_label_set_text (GTK_LABEL (open_options_label), _("No Selection"));
gtk_widget_show (GTK_WIDGET (open_options_genbuttonlabel));
gtk_widget_hide (GTK_WIDGET (open_options_preview));
@ -403,7 +403,7 @@ make_RGBbuf_from_tempbuf (TempBuf *tempbuf,
break;
default:
g_warning("UNKNOWN TempBuf width in make_RGBbuf_from_tempbuf()");
g_warning ("%s: Unknown TempBuf width.", G_STRLOC);
}
return (rtn);
@ -501,8 +501,8 @@ set_preview (Gimp *gimp,
{
gtk_label_set_text (GTK_LABEL (open_options_label),
thumb_may_be_outdated ?
_("(This thumbnail may be out of date)") :
(imginfo ? imginfo : _("(No Information)")));
_("This thumbnail may be out of date") :
(imginfo ? imginfo : _("No Information")));
if (imginfo)
g_free (imginfo);
}
@ -512,15 +512,15 @@ set_preview (Gimp *gimp,
{
case 0:
gtk_label_set_text (GTK_LABEL(open_options_label),
_("(Thumbnail saving is disabled)"));
_("Thumbnail saving is disabled."));
break;
case 1:
gtk_label_set_text (GTK_LABEL(open_options_label),
_("(Could not write thumbnail file)"));
_("Could not write thumbnail file."));
break;
default:
gtk_label_set_text (GTK_LABEL(open_options_label),
_("(Thumbnail file not written)"));
_("Thumbnail file not written."));
}
}
@ -599,7 +599,7 @@ file_open_genbutton_callback (GtkWidget *widget,
if (! preview_fullname)
{
g_warning ("Tried to generate thumbnail for NULL filename.");
g_warning ("%s: Tried to generate thumbnail for NULL file name.", G_STRLOC);
return;
}
@ -657,7 +657,7 @@ file_open_genbutton_callback (GtkWidget *widget,
else
{
gtk_label_set_text (GTK_LABEL (open_options_label),
_("(could not make preview)"));
_("Failed to generate preview."));
}
}
}
@ -734,7 +734,8 @@ file_open_ok_callback (GtkWidget *widget,
}
else if (status != GIMP_PDB_CANCEL)
{
g_message (_("Open failed.\n%s"), full_filename);
/* Hackery required. Please add error message. --bex */
g_message (_("Opening '%s' failed."), full_filename);
}
@ -775,7 +776,8 @@ file_open_ok_callback (GtkWidget *widget,
}
else if (status != GIMP_PDB_CANCEL)
{
g_message (_("Open failed.\n%s"), full_filename);
/* same as previous. --bex */
g_message (_("Opening '%s' failed."), full_filename);
}
}
}

8
app/gui/file-save-dialog.c
View File

@ -430,7 +430,8 @@ file_save_ok_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Save failed:\n%s"), filename);
/* Please add error. (: %s) --bex */
g_message (_("Saving %s failed."), filename);
}
else
{
@ -454,7 +455,7 @@ file_overwrite (const gchar *filename,
overwrite_data->full_filename = g_strdup (filename);
overwrite_data->raw_filename = g_strdup (raw_filename);
overwrite_text = g_strdup_printf (_("%s exists, overwrite?"), filename);
overwrite_text = g_strdup_printf (_("%s exists. Overwrite?"), filename);
query_box = gimp_query_boolean_box (_("File Exists!"),
gimp_standard_help_func,
@ -494,7 +495,8 @@ file_overwrite_callback (GtkWidget *widget,
if (status != GIMP_PDB_SUCCESS &&
status != GIMP_PDB_CANCEL)
{
g_message (_("Save failed:\n%s"), overwrite_data->full_filename);
/* Another error required. --bex */
g_message (_("Saving '%s' failed."), overwrite_data->full_filename);
}
else
{