diff --git a/ChangeLog b/ChangeLog index 44700737e2..8d319e3c4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2006-06-27 Sven Neumann + + * app/core/gimpchannel-select.c + * app/core/gimpdrawable-bucket-fill.c + * app/core/gimpdrawable-transform.c + * app/core/gimpimage-crop.c + * app/dialogs/image-scale-dialog.c + * app/tools/gimpforegroundselecttool.c + * app/tools/gimpfreeselecttool.c + * app/tools/gimpfuzzyselecttool.c + * app/tools/gimpmovetool.c + * plug-ins/gfig/gfig-dialog.c: applied patch from Zbigniew Chyla + that adds translation context to some problematic strings + (bug #345982). + 2006-06-27 Sven Neumann * plug-ins/pygimp/gimpui.py: applied patch from Joao S. O. Bueno diff --git a/README.i18n b/README.i18n index b191bc9307..fd1c6cdffc 100644 --- a/README.i18n +++ b/README.i18n @@ -6,7 +6,7 @@ sections, but you definitely want to read sections 5 - 9. Table of Contents 1. Why localisation? - 2. How + 2. Ho 3. Deep inside ... 4. Some magic ... 5. Tools and how to use them diff --git a/app/core/gimp-transform-region.c b/app/core/gimp-transform-region.c index 0ee7a8b70a..6629360f61 100644 --- a/app/core/gimp-transform-region.c +++ b/app/core/gimp-transform-region.c @@ -969,7 +969,7 @@ gimp_drawable_transform_flip (GimpDrawable *drawable, image = gimp_item_get_image (GIMP_ITEM (drawable)); /* Start a transform undo group */ - gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, _("Flip")); + gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, Q_("command|Flip")); /* Cut/Copy from the specified drawable */ orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); @@ -1053,7 +1053,7 @@ gimp_drawable_transform_rotate (GimpDrawable *drawable, image = gimp_item_get_image (GIMP_ITEM (drawable)); /* Start a transform undo group */ - gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, _("Rotate")); + gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, Q_("command|Rotate")); /* Cut/Copy from the specified drawable */ orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); diff --git a/app/core/gimpchannel-select.c b/app/core/gimpchannel-select.c index 5af0bf5760..0ca02ac21b 100644 --- a/app/core/gimpchannel-select.c +++ b/app/core/gimpchannel-select.c @@ -52,7 +52,7 @@ gimp_channel_select_rectangle (GimpChannel *channel, g_return_if_fail (GIMP_IS_CHANNEL (channel)); g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); - gimp_channel_push_undo (channel, _("Rectangle Select")); + gimp_channel_push_undo (channel, Q_("command|Rectangle Select")); /* if applicable, replace the current selection */ if (op == GIMP_CHANNEL_OP_REPLACE) @@ -101,7 +101,7 @@ gimp_channel_select_ellipse (GimpChannel *channel, g_return_if_fail (GIMP_IS_CHANNEL (channel)); g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); - gimp_channel_push_undo (channel, _("Ellipse Select")); + gimp_channel_push_undo (channel, Q_("command|Ellipse Select")); /* if applicable, replace the current selection */ if (op == GIMP_CHANNEL_OP_REPLACE) @@ -445,7 +445,7 @@ gimp_channel_select_fuzzy (GimpChannel *channel, if (! sample_merged) gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); - gimp_channel_select_channel (channel, _("Fuzzy Select"), + gimp_channel_select_channel (channel, Q_("command|Fuzzy Select"), add_on, add_on_x, add_on_y, op, feather, @@ -490,7 +490,7 @@ gimp_channel_select_by_color (GimpChannel *channel, if (! sample_merged) gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); - gimp_channel_select_channel (channel, _("Select by Color"), + gimp_channel_select_channel (channel, Q_("command|Select by Color"), add_on, add_on_x, add_on_y, op, feather, diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c index 6f3ae07e52..9e791353d5 100644 --- a/app/core/gimpdrawable-bucket-fill.c +++ b/app/core/gimpdrawable-bucket-fill.c @@ -271,7 +271,7 @@ gimp_drawable_bucket_fill_full (GimpDrawable *drawable, /* Apply it to the image */ pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE); gimp_drawable_apply_region (drawable, &bufPR, - TRUE, _("Bucket Fill"), + TRUE, Q_("command|Bucket Fill"), opacity, paint_mode, NULL, x1, y1); tile_manager_unref (buf_tiles); diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c index 0ee7a8b70a..6629360f61 100644 --- a/app/core/gimpdrawable-transform.c +++ b/app/core/gimpdrawable-transform.c @@ -969,7 +969,7 @@ gimp_drawable_transform_flip (GimpDrawable *drawable, image = gimp_item_get_image (GIMP_ITEM (drawable)); /* Start a transform undo group */ - gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, _("Flip")); + gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, Q_("command|Flip")); /* Cut/Copy from the specified drawable */ orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); @@ -1053,7 +1053,7 @@ gimp_drawable_transform_rotate (GimpDrawable *drawable, image = gimp_item_get_image (GIMP_ITEM (drawable)); /* Start a transform undo group */ - gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, _("Rotate")); + gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM, Q_("command|Rotate")); /* Cut/Copy from the specified drawable */ orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer); diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c index e24c0c4203..4ec4934d8f 100644 --- a/app/core/gimpimage-crop.c +++ b/app/core/gimpimage-crop.c @@ -122,7 +122,7 @@ gimp_image_crop (GimpImage *image, if (crop_layers) gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CROP, - _("Crop Image")); + Q_("command|Crop Image")); else gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE, _("Resize Image")); diff --git a/app/dialogs/image-scale-dialog.c b/app/dialogs/image-scale-dialog.c index 42188cf54e..2b2194cf55 100644 --- a/app/dialogs/image-scale-dialog.c +++ b/app/dialogs/image-scale-dialog.c @@ -94,7 +94,7 @@ image_scale_dialog_new (GimpImage *image, dialog->display = display; dialog->context = context; dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (display->image), - _("Scale Image"), "gimp-image-scale", + Q_("dialog-title|Scale Image"), "gimp-image-scale", parent, gimp_standard_help_func, GIMP_HELP_IMAGE_SCALE, diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c index e08586c5a9..a6e3f01f73 100644 --- a/app/tools/gimpforegroundselecttool.c +++ b/app/tools/gimpforegroundselecttool.c @@ -750,7 +750,7 @@ gimp_foreground_select_tool_apply (GimpForegroundSelectTool *fg_select, options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options); gimp_channel_select_channel (gimp_image_get_mask (display->image), - tool->tool_info->blurb, + Q_("command|Foreground Select"), fg_select->mask, 0, 0, op, options->feather, diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index bfc3b50b9b..a5134c2ece 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -316,7 +316,7 @@ gimp_free_select_tool_real_select (GimpFreeSelectTool *free_sel, options = GIMP_SELECTION_OPTIONS (tool->tool_info->tool_options); gimp_channel_select_polygon (gimp_image_get_mask (display->image), - tool->tool_info->blurb, + Q_("command|Free Select"), free_sel->num_points, free_sel->points, GIMP_SELECTION_TOOL (tool)->op, diff --git a/app/tools/gimpfuzzyselecttool.c b/app/tools/gimpfuzzyselecttool.c index 9df0fec2d8..8c58b18fa0 100644 --- a/app/tools/gimpfuzzyselecttool.c +++ b/app/tools/gimpfuzzyselecttool.c @@ -247,7 +247,7 @@ gimp_fuzzy_select_tool_button_release (GimpTool *tool, } gimp_channel_select_channel (gimp_image_get_mask (display->image), - tool->tool_info->blurb, + Q_("command|Fuzzy Select"), fuzzy_sel->fuzzy_mask, off_x, off_y, diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c index 39b3a52fc1..3dfb935db1 100644 --- a/app/tools/gimpmovetool.c +++ b/app/tools/gimpmovetool.c @@ -114,7 +114,7 @@ gimp_move_tool_register (GimpToolRegisterCallback callback, gimp_move_options_gui, 0, "gimp-move-tool", - _("Move"), + Q_("tool|Move"), _("Move layers & selections"), N_("_Move"), "M", NULL, GIMP_HELP_TOOL_MOVE, diff --git a/app/tools/gimpregionselecttool.c b/app/tools/gimpregionselecttool.c index 9df0fec2d8..8c58b18fa0 100644 --- a/app/tools/gimpregionselecttool.c +++ b/app/tools/gimpregionselecttool.c @@ -247,7 +247,7 @@ gimp_fuzzy_select_tool_button_release (GimpTool *tool, } gimp_channel_select_channel (gimp_image_get_mask (display->image), - tool->tool_info->blurb, + Q_("command|Fuzzy Select"), fuzzy_sel->fuzzy_mask, off_x, off_y, diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c index ca32a98b0c..8861667a0d 100644 --- a/plug-ins/gfig/gfig-dialog.c +++ b/plug-ins/gfig/gfig-dialog.c @@ -502,7 +502,7 @@ gfig_dialog (void) gtk_widget_show (toggle); /* "snap to grid" checkbutton at bottom of style frame */ - toggle = gtk_check_button_new_with_label (_("Snap to grid")); + toggle = gtk_check_button_new_with_label (Q_("checkbutton|Snap to grid")); gtk_box_pack_end (GTK_BOX (vbox), toggle, FALSE, FALSE, 0); g_signal_connect (toggle, "toggled", G_CALLBACK (gimp_toggle_button_update),