Commit 5930b130 authored by Barak Itkin's avatar Barak Itkin Committed by Michael Natterer

app: add context to all undo descriptions

Description of undo actions should be marked as action descriptions,
and not as commands. This is required for translation for some
language (like Hebrew) that require a different grammatical tense for
describing actions
parent 5dd9e4bb
......@@ -258,7 +258,7 @@ gimp_edit_paste (GimpImage *image,
/* Start a group undo */
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_PASTE,
_("Paste"));
C_("undo-type", "Paste"));
/* If there is a selection mask clear it--
* this might not always be desired, but in general,
......@@ -385,7 +385,7 @@ gimp_edit_clear (GimpImage *image,
return gimp_edit_fill_internal (image, drawable, context,
GIMP_TRANSPARENT_FILL,
GIMP_OPACITY_OPAQUE, GIMP_ERASE_MODE,
_("Clear"));
C_("undo-type", "Clear"));
}
gboolean
......@@ -404,23 +404,23 @@ gimp_edit_fill (GimpImage *image,
switch (fill_type)
{
case GIMP_FOREGROUND_FILL:
undo_desc = _("Fill with Foreground Color");
undo_desc = C_("undo-type", "Fill with Foreground Color");
break;
case GIMP_BACKGROUND_FILL:
undo_desc = _("Fill with Background Color");
undo_desc = C_("undo-type", "Fill with Background Color");
break;
case GIMP_WHITE_FILL:
undo_desc = _("Fill with White");
undo_desc = C_("undo-type", "Fill with White");
break;
case GIMP_TRANSPARENT_FILL:
undo_desc = _("Fill with Transparency");
undo_desc = C_("undo-type", "Fill with Transparency");
break;
case GIMP_PATTERN_FILL:
undo_desc = _("Fill with Pattern");
undo_desc = C_("undo-type", "Fill with Pattern");
break;
case GIMP_NO_FILL:
......@@ -497,7 +497,7 @@ gimp_edit_extract (GimpImage *image,
TileManager *tiles;
if (cut_pixels)
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_CUT, _("Cut"));
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_EDIT_CUT, C_("undo-type", "Cut"));
/* Cut/copy the mask portion from the image */
tiles = gimp_selection_extract (GIMP_SELECTION (gimp_image_get_mask (image)),
......
......@@ -56,7 +56,7 @@ gimp_channel_select_rectangle (GimpChannel *channel,
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
if (push_undo)
gimp_channel_push_undo (channel, C_("command", "Rectangle Select"));
gimp_channel_push_undo (channel, C_("undo-type", "Rectangle Select"));
/* if applicable, replace the current selection */
if (op == GIMP_CHANNEL_OP_REPLACE)
......@@ -107,7 +107,7 @@ gimp_channel_select_ellipse (GimpChannel *channel,
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
if (push_undo)
gimp_channel_push_undo (channel, C_("command", "Ellipse Select"));
gimp_channel_push_undo (channel, C_("undo-type", "Ellipse Select"));
/* if applicable, replace the current selection */
if (op == GIMP_CHANNEL_OP_REPLACE)
......@@ -161,7 +161,7 @@ gimp_channel_select_round_rect (GimpChannel *channel,
g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
if (push_undo)
gimp_channel_push_undo (channel, C_("command", "Rounded Rectangle Select"));
gimp_channel_push_undo (channel, C_("undo-type", "Rounded Rectangle Select"));
/* if applicable, replace the current selection */
if (op == GIMP_CHANNEL_OP_REPLACE)
......@@ -430,7 +430,7 @@ gimp_channel_select_alpha (GimpChannel *channel,
gimp_item_get_offset (GIMP_ITEM (drawable), &off_x, &off_y);
gimp_channel_select_channel (channel, _("Alpha to Selection"), add_on,
gimp_channel_select_channel (channel, C_("undo-type", "Alpha to Selection"), add_on,
off_x, off_y,
op, feather,
feather_radius_x,
......@@ -468,7 +468,7 @@ gimp_channel_select_component (GimpChannel *channel,
gimp_enum_get_value (GIMP_TYPE_CHANNEL_TYPE, component,
NULL, NULL, &desc, NULL);
undo_desc = g_strdup_printf (_("%s Channel to Selection"), desc);
undo_desc = g_strdup_printf (C_("undo-type", "%s Channel to Selection"), desc);
gimp_channel_select_channel (channel, undo_desc, add_on,
0, 0, op,
......@@ -516,7 +516,7 @@ gimp_channel_select_fuzzy (GimpChannel *channel,
if (! sample_merged)
gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_channel_select_channel (channel, C_("command", "Fuzzy Select"),
gimp_channel_select_channel (channel, C_("undo-type", "Fuzzy Select"),
add_on, add_on_x, add_on_y,
op,
feather,
......@@ -563,7 +563,7 @@ gimp_channel_select_by_color (GimpChannel *channel,
if (! sample_merged)
gimp_item_get_offset (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
gimp_channel_select_channel (channel, C_("command", "Select by Color"),
gimp_channel_select_channel (channel, C_("undo-type", "Select by Color"),
add_on, add_on_x, add_on_y,
op,
feather,
......
......@@ -261,14 +261,14 @@ gimp_channel_class_init (GimpChannelClass *klass)
item_class->stroke = gimp_channel_stroke;
item_class->get_node = gimp_channel_get_node;
item_class->default_name = _("Channel");
item_class->rename_desc = _("Rename Channel");
item_class->translate_desc = _("Move Channel");
item_class->scale_desc = _("Scale Channel");
item_class->resize_desc = _("Resize Channel");
item_class->flip_desc = _("Flip Channel");
item_class->rotate_desc = _("Rotate Channel");
item_class->transform_desc = _("Transform Channel");
item_class->stroke_desc = _("Stroke Channel");
item_class->rename_desc = C_("undo-type", "Rename Channel");
item_class->translate_desc = C_("undo-type", "Move Channel");
item_class->scale_desc = C_("undo-type", "Scale Channel");
item_class->resize_desc = C_("undo-type", "Resize Channel");
item_class->flip_desc = C_("undo-type", "Flip Channel");
item_class->rotate_desc = C_("undo-type", "Rotate Channel");
item_class->transform_desc = C_("undo-type", "Transform Channel");
item_class->stroke_desc = C_("undo-type", "Stroke Channel");
drawable_class->invalidate_boundary = gimp_channel_invalidate_boundary;
drawable_class->get_active_components = gimp_channel_get_active_components;
......@@ -290,14 +290,14 @@ gimp_channel_class_init (GimpChannelClass *klass)
klass->grow = gimp_channel_real_grow;
klass->shrink = gimp_channel_real_shrink;
klass->feather_desc = _("Feather Channel");
klass->sharpen_desc = _("Sharpen Channel");
klass->clear_desc = _("Clear Channel");
klass->all_desc = _("Fill Channel");
klass->invert_desc = _("Invert Channel");
klass->border_desc = _("Border Channel");
klass->grow_desc = _("Grow Channel");
klass->shrink_desc = _("Shrink Channel");
klass->feather_desc = C_("undo-type", "Feather Channel");
klass->sharpen_desc = C_("undo-type", "Sharpen Channel");
klass->clear_desc = C_("undo-type", "Clear Channel");
klass->all_desc = C_("undo-type", "Fill Channel");
klass->invert_desc = C_("undo-type", "Invert Channel");
klass->border_desc = C_("undo-type", "Border Channel");
klass->grow_desc = C_("undo-type", "Grow Channel");
klass->shrink_desc = C_("undo-type", "Shrink Channel");
}
static void
......@@ -1712,7 +1712,7 @@ gimp_channel_set_color (GimpChannel *channel,
{
GimpImage *image = gimp_item_get_image (GIMP_ITEM (channel));
gimp_image_undo_push_channel_color (image, _("Set Channel Color"),
gimp_image_undo_push_channel_color (image, C_("undo-type", "Set Channel Color"),
channel);
}
......@@ -1778,7 +1778,7 @@ gimp_channel_set_opacity (GimpChannel *channel,
{
GimpImage *image = gimp_item_get_image (GIMP_ITEM (channel));
gimp_image_undo_push_channel_color (image, _("Set Channel Opacity"),
gimp_image_undo_push_channel_color (image, C_("undo-type", "Set Channel Opacity"),
channel);
}
......
......@@ -241,7 +241,7 @@ gimp_drawable_blend (GimpDrawable *drawable,
pixel_region_init (&bufPR, buf_tiles, 0, 0, width, height, FALSE);
gimp_drawable_apply_region (drawable, &bufPR,
TRUE, _("Blend"),
TRUE, C_("undo-type", "Blend"),
opacity, paint_mode,
NULL, NULL, x, y);
......
......@@ -67,7 +67,7 @@ gimp_drawable_brightness_contrast (GimpDrawable *drawable,
gimp_brightness_contrast_config_set_node (config, node);
gimp_drawable_apply_operation (drawable, progress,
_("Brightness_Contrast"), node, TRUE);
C_("undo-type", "Brightness_Contrast"), node, TRUE);
g_object_unref (node);
}
else
......@@ -78,7 +78,7 @@ gimp_drawable_brightness_contrast (GimpDrawable *drawable,
config->contrast,
gimp_drawable_bytes (drawable));
gimp_drawable_process_lut (drawable, progress, _("Brightness-Contrast"),
gimp_drawable_process_lut (drawable, progress, C_("undo-type", "Brightness-Contrast"),
lut);
gimp_lut_free (lut);
}
......
......@@ -283,7 +283,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, C_("command", "Bucket Fill"),
TRUE, C_("undo-type", "Bucket Fill"),
opacity, paint_mode,
NULL, NULL, x1, y1);
tile_manager_unref (buf_tiles);
......
......@@ -76,7 +76,7 @@ gimp_drawable_color_balance (GimpDrawable *drawable,
"config", config,
NULL);
gimp_drawable_apply_operation (drawable, progress, _("Color Balance"),
gimp_drawable_apply_operation (drawable, progress, C_("undo-type", "Color Balance"),
node, TRUE);
g_object_unref (node);
}
......@@ -86,7 +86,7 @@ gimp_drawable_color_balance (GimpDrawable *drawable,
gimp_color_balance_config_to_cruft (config, &cruft);
gimp_drawable_process (drawable, progress, _("Color Balance"),
gimp_drawable_process (drawable, progress, C_("undo-type", "Color Balance"),
(PixelProcessorFunc) color_balance, &cruft);
}
......
......@@ -69,7 +69,7 @@ gimp_drawable_colorize (GimpDrawable *drawable,
"config", config,
NULL);
gimp_drawable_apply_operation (drawable, progress, _("Colorize"),
gimp_drawable_apply_operation (drawable, progress, C_("undo-type", "Colorize"),
node, TRUE);
g_object_unref (node);
}
......@@ -81,7 +81,7 @@ gimp_drawable_colorize (GimpDrawable *drawable,
gimp_colorize_config_to_cruft (config, &cruft);
gimp_drawable_process (drawable, progress, _("Colorize"),
gimp_drawable_process (drawable, progress, C_("undo-type", "Colorize"),
(PixelProcessorFunc) colorize, &cruft);
}
......
......@@ -159,7 +159,7 @@ gimp_drawable_curves (GimpDrawable *drawable,
"config", config,
NULL);
gimp_drawable_apply_operation (drawable, progress, _("Curves"),
gimp_drawable_apply_operation (drawable, progress, C_("undo-type", "Curves"),
node, TRUE);
g_object_unref (node);
}
......@@ -176,7 +176,7 @@ gimp_drawable_curves (GimpDrawable *drawable,
&cruft,
gimp_drawable_bytes (drawable));
gimp_drawable_process_lut (drawable, progress, _("Curves"), lut);
gimp_drawable_process_lut (drawable, progress, C_("undo-type", "Curves"), lut);
gimp_lut_free (lut);
}
}
......@@ -49,6 +49,6 @@ gimp_drawable_equalize (GimpDrawable *drawable,
lut = equalize_lut_new (hist, gimp_drawable_bytes (drawable));
gimp_histogram_unref (hist);
gimp_drawable_process_lut (drawable, NULL, _("Equalize"), lut);
gimp_drawable_process_lut (drawable, NULL, C_("undo-type", "Equalize"), lut);
gimp_lut_free (lut);
}
......@@ -312,7 +312,7 @@ gimp_drawable_offset (GimpDrawable *drawable,
}
gimp_drawable_set_tiles (drawable, gimp_item_is_attached (item),
_("Offset Drawable"), new_tiles,
C_("undo-type", "Offset Drawable"), new_tiles,
gimp_drawable_type (drawable));
tile_manager_unref (new_tiles);
}
......@@ -432,7 +432,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
/* Apply to drawable */
pixel_region_init (&basePR, base, 0, 0, w, h, FALSE);
gimp_drawable_apply_region (drawable, &basePR,
push_undo, _("Render Stroke"),
push_undo, C_("undo-type", "Render Stroke"),
gimp_context_get_opacity (context),
gimp_context_get_paint_mode (context),
NULL, NULL, x, y);
......
......@@ -563,7 +563,7 @@ gimp_drawable_transform_affine (GimpDrawable *drawable,
/* Start a transform undo group */
gimp_image_undo_group_start (image,
GIMP_UNDO_GROUP_TRANSFORM, _("Transform"));
GIMP_UNDO_GROUP_TRANSFORM, C_("undo-type", "Transform"));
/* Cut/Copy from the specified drawable */
orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer);
......@@ -641,7 +641,7 @@ gimp_drawable_transform_flip (GimpDrawable *drawable,
/* Start a transform undo group */
gimp_image_undo_group_start (image,
GIMP_UNDO_GROUP_TRANSFORM,
C_("command", "Flip"));
C_("undo-type", "Flip"));
/* Cut/Copy from the specified drawable */
orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer);
......@@ -741,7 +741,7 @@ gimp_drawable_transform_rotate (GimpDrawable *drawable,
/* Start a transform undo group */
gimp_image_undo_group_start (image,
GIMP_UNDO_GROUP_TRANSFORM,
C_("command", "Rotate"));
C_("undo-type", "Rotate"));
/* Cut/Copy from the specified drawable */
orig_tiles = gimp_drawable_transform_cut (drawable, context, &new_layer);
......@@ -880,9 +880,9 @@ gimp_drawable_transform_paste (GimpDrawable *drawable,
image = gimp_item_get_image (GIMP_ITEM (drawable));
if (GIMP_IS_LAYER (drawable))
undo_desc = _("Transform Layer");
undo_desc = C_("undo-type", "Transform Layer");
else if (GIMP_IS_CHANNEL (drawable))
undo_desc = _("Transform Channel");
undo_desc = C_("undo-type", "Transform Channel");
else
return FALSE;
......
......@@ -483,7 +483,7 @@ gimp_drawable_scale (GimpItem *item,
gimp_item_get_height (item)),
NULL);
gimp_drawable_apply_operation_to_tiles (drawable, progress, _("Scale"),
gimp_drawable_apply_operation_to_tiles (drawable, progress, C_("undo-type", "Scale"),
scale, TRUE, new_tiles);
g_object_unref (scale);
}
......
......@@ -176,13 +176,13 @@ gimp_group_layer_class_init (GimpGroupLayerClass *klass)
item_class->transform = gimp_group_layer_transform;
item_class->default_name = _("Layer Group");
item_class->rename_desc = _("Rename Layer Group");
item_class->translate_desc = _("Move Layer Group");
item_class->scale_desc = _("Scale Layer Group");
item_class->resize_desc = _("Resize Layer Group");
item_class->flip_desc = _("Flip Layer Group");
item_class->rotate_desc = _("Rotate Layer Group");
item_class->transform_desc = _("Transform Layer Group");
item_class->rename_desc = C_("undo-type", "Rename Layer Group");
item_class->translate_desc = C_("undo-type", "Move Layer Group");
item_class->scale_desc = C_("undo-type", "Scale Layer Group");
item_class->resize_desc = C_("undo-type", "Resize Layer Group");
item_class->flip_desc = C_("undo-type", "Flip Layer Group");
item_class->rotate_desc = C_("undo-type", "Rotate Layer Group");
item_class->transform_desc = C_("undo-type", "Transform Layer Group");
drawable_class->estimate_memsize = gimp_group_layer_estimate_memsize;
drawable_class->convert_type = gimp_group_layer_convert_type;
......
......@@ -139,7 +139,7 @@ gimp_image_arrange_objects (GimpImage *image,
/* FIXME: undo group type is wrong */
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_DISPLACE,
_("Arrange Objects"));
C_("undo-type", "Arrange Objects"));
for (l = object_list, n = 1; l; l = g_list_next (l), n++)
{
......
......@@ -64,7 +64,7 @@ gimp_image_set_colormap (GimpImage *image,
private = GIMP_IMAGE_GET_PRIVATE (image);
if (push_undo)
gimp_image_undo_push_image_colormap (image, _("Set Colormap"));
gimp_image_undo_push_image_colormap (image, C_("undo-type", "Set Colormap"));
if (private->colormap)
memset (private->colormap, 0, GIMP_IMAGE_COLORMAP_SIZE);
......@@ -129,7 +129,7 @@ gimp_image_set_colormap_entry (GimpImage *image,
if (push_undo)
gimp_image_undo_push_image_colormap (image,
_("Change Colormap entry"));
C_("undo-type", "Change Colormap entry"));
gimp_rgb_get_uchar (color,
&private->colormap[color_index * 3],
......@@ -154,7 +154,7 @@ gimp_image_add_colormap_entry (GimpImage *image,
g_return_if_fail (color != NULL);
gimp_image_undo_push_image_colormap (image,
_("Add Color to Colormap"));
C_("undo-type", "Add Color to Colormap"));
gimp_rgb_get_uchar (color,
&private->colormap[private->n_colors * 3],
......
......@@ -804,15 +804,15 @@ gimp_image_convert (GimpImage *image,
switch (new_type)
{
case GIMP_RGB:
undo_desc = _("Convert Image to RGB");
undo_desc = C_("undo-type", "Convert Image to RGB");
break;
case GIMP_GRAY:
undo_desc = _("Convert Image to Grayscale");
undo_desc = C_("undo-type", "Convert Image to Grayscale");
break;
case GIMP_INDEXED:
undo_desc = _("Convert Image to Indexed");
undo_desc = C_("undo-type", "Convert Image to Indexed");
break;
}
......
......@@ -126,10 +126,10 @@ gimp_image_crop (GimpImage *image,
if (crop_layers)
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_CROP,
C_("command", "Crop Image"));
C_("undo-type", "Crop Image"));
else
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE,
_("Resize Image"));
C_("undo-type", "Resize Image"));
/* Push the image size to the stack */
gimp_image_undo_push_image_size (image,
......
......@@ -59,7 +59,7 @@ gimp_image_set_grid (GimpImage *image,
return;
if (push_undo)
gimp_image_undo_push_image_grid (image, _("Grid"), private->grid);
gimp_image_undo_push_image_grid (image, C_("undo-type", "Grid"), private->grid);
gimp_config_sync (G_OBJECT (grid), G_OBJECT (private->grid), 0);
}
......@@ -48,7 +48,7 @@ gimp_image_add_hguide (GimpImage *image,
image->gimp->next_guide_ID++);
if (push_undo)
gimp_image_undo_push_guide (image, _("Add Horizontal Guide"), guide);
gimp_image_undo_push_guide (image, C_("undo-type", "Add Horizontal Guide"), guide);
gimp_image_add_guide (image, guide, position);
g_object_unref (G_OBJECT (guide));
......@@ -71,7 +71,7 @@ gimp_image_add_vguide (GimpImage *image,
image->gimp->next_guide_ID++);
if (push_undo)
gimp_image_undo_push_guide (image, _("Add Vertical Guide"), guide);
gimp_image_undo_push_guide (image, C_("undo-type", "Add Vertical Guide"), guide);
gimp_image_add_guide (image, guide, position);
g_object_unref (G_OBJECT (guide));
......@@ -114,7 +114,7 @@ gimp_image_remove_guide (GimpImage *image,
gimp_image_update_guide (image, guide);
if (push_undo)
gimp_image_undo_push_guide (image, _("Remove Guide"), guide);
gimp_image_undo_push_guide (image, C_("undo-type", "Remove Guide"), guide);
private->guides = g_list_remove (private->guides, guide);
gimp_guide_removed (guide);
......@@ -139,7 +139,7 @@ gimp_image_move_guide (GimpImage *image,
g_return_if_fail (position <= gimp_image_get_width (image));
if (push_undo)
gimp_image_undo_push_guide (image, _("Move Guide"), guide);
gimp_image_undo_push_guide (image, C_("undo-type", "Move Guide"), guide);
gimp_image_update_guide (image, guide);
gimp_guide_set_position (guide, position);
......
......@@ -48,7 +48,7 @@ gimp_image_item_list_translate (GimpImage *image,
if (push_undo)
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_DISPLACE,
_("Translate Items"));
C_("undo-type", "Translate Items"));
for (l = list; l; l = g_list_next (l))
gimp_item_translate (GIMP_ITEM (l->data),
......@@ -75,7 +75,7 @@ gimp_image_item_list_flip (GimpImage *image,
GList *l;
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
_("Flip Items"));
C_("undo-type", "Flip Items"));
for (l = list; l; l = g_list_next (l))
gimp_item_flip (GIMP_ITEM (l->data), context,
......@@ -102,7 +102,7 @@ gimp_image_item_list_rotate (GimpImage *image,
GList *l;
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
_("Rotate Items"));
C_("undo-type", "Rotate Items"));
for (l = list; l; l = g_list_next (l))
gimp_item_rotate (GIMP_ITEM (l->data), context,
......@@ -132,7 +132,7 @@ gimp_image_item_list_transform (GimpImage *image,
GList *l;
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_TRANSFORM,
_("Transform Items"));
C_("undo-type", "Transform Items"));
for (l = list; l; l = g_list_next (l))
gimp_item_transform (GIMP_ITEM (l->data), context,
......
......@@ -105,7 +105,7 @@ gimp_image_merge_visible_layers (GimpImage *image,
if (merge_list)
{
const gchar *undo_desc = _("Merge Visible Layers");
const gchar *undo_desc = C_("undo-type", "Merge Visible Layers");
gimp_set_busy (image->gimp);
......@@ -119,7 +119,7 @@ gimp_image_merge_visible_layers (GimpImage *image,
layer = gimp_image_merge_layers (image,
container,
merge_list, context, merge_type,
_("Merge Visible Layers"));
C_("undo-type", "Merge Visible Layers"));
g_slist_free (merge_list);
if (invisible_list)
......@@ -173,7 +173,7 @@ gimp_image_flatten (GimpImage *image,
layer = gimp_image_merge_layers (image,
gimp_image_get_layers (image),
merge_list, context,
GIMP_FLATTEN_IMAGE, _("Flatten Image"));
GIMP_FLATTEN_IMAGE, C_("undo-type", "Flatten Image"));
g_slist_free (merge_list);
gimp_image_alpha_changed (image);
......@@ -252,7 +252,7 @@ gimp_image_merge_down (GimpImage *image,
layer = gimp_image_merge_layers (image,
gimp_item_get_container (GIMP_ITEM (current_layer)),
merge_list, context, merge_type,
_("Merge Down"));
C_("undo-type", "Merge Down"));
g_slist_free (merge_list);
gimp_unset_busy (image->gimp);
......@@ -274,7 +274,7 @@ gimp_image_merge_group_layer (GimpImage *image,
g_return_val_if_fail (gimp_item_get_image (GIMP_ITEM (group)) == image, NULL);
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
_("Merge Layer Group"));
C_("undo-type", "Merge Layer Group"));
parent = gimp_layer_get_parent (GIMP_LAYER (group));
index = gimp_item_get_index (GIMP_ITEM (group));
......@@ -327,7 +327,7 @@ gimp_image_merge_visible_vectors (GimpImage *image,
gimp_set_busy (image->gimp);
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE,
_("Merge Visible Paths"));
C_("undo-type", "Merge Visible Paths"));
vectors = GIMP_VECTORS (merge_list->data);
......
......@@ -82,7 +82,7 @@ gimp_image_set_quick_mask_state (GimpImage *image,
if (! mask)
{
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,
_("Enable Quick Mask"));
C_("undo-type", "Enable Quick Mask"));
if (gimp_channel_is_empty (selection))
{
......@@ -132,7 +132,7 @@ gimp_image_set_quick_mask_state (GimpImage *image,
GimpLayer *floating_sel = gimp_image_get_floating_selection (image);
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_QUICK_MASK,
_("Disable Quick Mask"));
C_("undo-type", "Disable Quick Mask"));
if (private->quick_mask_inverted)
gimp_channel_invert (mask, TRUE);
......
......@@ -83,7 +83,7 @@ gimp_image_resize_with_layers (GimpImage *image,
g_object_freeze_notify (G_OBJECT (image));
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_RESIZE,
_("Resize Image"));
C_("undo-type", "Resize Image"));
resize_layers = gimp_image_item_list_get_list (image, NULL,
GIMP_ITEM_TYPE_LAYERS,
......
......@@ -50,7 +50,7 @@ gimp_image_add_sample_point_at_pos (GimpImage *image,
sample_point = gimp_sample_point_new (image->gimp->next_sample_point_ID++);
if (push_undo)
gimp_image_undo_push_sample_point (image, _("Add Sample Point"),
gimp_image_undo_push_sample_point (image, C_("undo-type", "Add Sample Point"),
sample_point);
gimp_image_add_sample_point (image, sample_point, x, y);
......@@ -98,7 +98,7 @@ gimp_image_remove_sample_point (GimpImage *image,
gimp_image_update_sample_point (image, sample_point);
if (push_undo)
gimp_image_undo_push_sample_point (image, _("Remove Sample Point"),
gimp_image_undo_push_sample_point (image, C_("undo-type", "Remove Sample Point"),
sample_point);
list = g_list_find (private->sample_points, sample_point);
......@@ -135,7 +135,7 @@ gimp_image_move_sample_point (GimpImage *image,
g_return_if_fail (y < gimp_image_get_height (image));
if (push_undo)
gimp_image_undo_push_sample_point (image, _("Move Sample Point"),
gimp_image_undo_push_sample_point (image, C_("undo-type", "Move Sample Point"),
sample_point);
gimp_image_update_sample_point (image, sample_point);
......
......@@ -84,7 +84,7 @@ gimp_image_scale (GimpImage *image,
g_object_freeze_notify (G_OBJECT (image));
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE,
_("Scale Image"));
C_("undo-type", "Scale Image"));
old_width = gimp_image_get_width (image);
old_height = gimp_image_get_height (image);
......
......@@ -1629,7 +1629,7 @@ gimp_image_set_resolution (GimpImage *image,
(ABS (private->yresolution - yresolution) >= 1e-5))
{
gimp_image_undo_push_image_resolution (image,
_("Change Image Resolution"));
C_("undo-type", "Change Image Resolution"));
private->xresolution = xresolution;
private->yresolution = yresolution;
......@@ -1681,7 +1681,7 @@ gimp_image_set_unit (GimpImage *image,
if (private->resolution_unit != unit)
{
gimp_image_undo_push_image_resolution (image,
_("Change Image Unit"));
C_("undo-type", "Change Image Unit"));
private->resolution_unit = unit;
gimp_image_unit_changed (image);
......@@ -2651,7 +2651,7 @@ gimp_image_parasite_attach (GimpImage *image,
*/
if (gimp_parasite_is_undoable (&copy))
gimp_image_undo_push_image_parasite (image,
_("Attach Parasite to Image"),
C_("undo-type", "Attach Parasite to Image"),
&copy);
/* We used to push an cantundo on te stack here. This made the undo stack
......@@ -2692,7 +2692,7 @@ gimp_image_parasite_detach (GimpImage *image,
if (gimp_parasite_is_undoable (parasite))
gimp_image_undo_push_image_parasite_remove (image,
_("Remove Parasite from Image"),
C_("undo-type", "Remove Parasite from Image"),
name);
gimp_parasite_list_remove (private->parasites, name);
......@@ -3280,7 +3280,7 @@ gimp_image_add_layer (GimpImage *image,
old_has_alpha = gimp_image_has_alpha (image);
if (push_undo)
gimp_image_undo_push_layer_add (image, _("Add Layer"),
gimp_image_undo_push_layer_add (image, C_("undo-type", "Add Layer"),
layer,
gimp_image_get_active_layer (image));
......@@ -3330,7 +3330,7 @@ gimp_image_remove_layer (GimpImage *image,
}
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE,
_("Remove Layer"));
C_("undo-type", "Remove Layer"));
undo_group = TRUE;
gimp_image_remove_layer (image, gimp_image_get_floating_selection (image),
......@@ -3343,14 +3343,14 @@ gimp_image_remove_layer (GimpImage *image,
if (gimp_layer_is_floating_sel (layer))
{
undo_desc = _("Remove Floating Selection");
undo_desc = C_("undo-type", "Remove Floating Selection");
gimp_drawable_detach_floating_sel (gimp_layer_get_floating_sel_drawable (layer),
layer);
}
else
{
undo_desc = _("Remove Layer");
undo_desc = C_("undo-type", "Remove Layer");
}
if (push_undo)
......@@ -3506,7 +3506,7 @@ gimp_image_raise_layer (GimpImage *image,
return gimp_image_reorder_layer (image, layer,
gimp_layer_get_parent (layer), index - 1,
TRUE, _("Raise Layer"));
TRUE, C_("undo-type", "Raise Layer"));
}