[gimp/soc-2010-cage] app: add context to all undo descriptions
- From: Michael Muré <mmure src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2010-cage] app: add context to all undo descriptions
- Date: Wed, 30 Jun 2010 22:07:27 +0000 (UTC)
commit aa72bdcec9979fa3f33ff80ea4ccb853097ff10d
Author: Barak Itkin <lightningismyname gmail com>
Date: Tue Jun 8 14:24:11 2010 +0300
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
app/core/gimp-edit.c | 16 ++++----
app/core/gimpchannel-select.c | 14 ++++----
app/core/gimpchannel.c | 36 ++++++++++----------
app/core/gimpdrawable-blend.c | 2 +-
app/core/gimpdrawable-brightness-contrast.c | 4 +-
app/core/gimpdrawable-bucket-fill.c | 2 +-
app/core/gimpdrawable-color-balance.c | 4 +-
app/core/gimpdrawable-colorize.c | 4 +-
app/core/gimpdrawable-curves.c | 4 +-
app/core/gimpdrawable-equalize.c | 2 +-
app/core/gimpdrawable-offset.c | 2 +-
app/core/gimpdrawable-stroke.c | 2 +-
app/core/gimpdrawable-transform.c | 10 +++---
app/core/gimpdrawable.c | 2 +-
app/core/gimpgrouplayer.c | 14 ++++----
app/core/gimpimage-arrange.c | 2 +-
app/core/gimpimage-colormap.c | 6 ++--
app/core/gimpimage-convert.c | 6 ++--
app/core/gimpimage-crop.c | 4 +-
app/core/gimpimage-grid.c | 2 +-
app/core/gimpimage-guides.c | 8 ++--
app/core/gimpimage-item-list.c | 8 ++--
app/core/gimpimage-merge.c | 12 +++---
app/core/gimpimage-quick-mask.c | 4 +-
app/core/gimpimage-resize.c | 2 +-
app/core/gimpimage-sample-points.c | 6 ++--
app/core/gimpimage-scale.c | 2 +-
app/core/gimpimage.c | 50 +++++++++++++-------------
app/core/gimpitem.c | 9 +++--
app/core/gimplayer-floating-sel.c | 4 +-
app/core/gimplayer.c | 28 +++++++-------
app/core/gimplayermask.c | 6 ++--
app/core/gimpselection.c | 24 ++++++------
33 files changed, 151 insertions(+), 150 deletions(-)
---
diff --git a/app/core/gimp-edit.c b/app/core/gimp-edit.c
index 6d451ec..6995d3f 100644
--- a/app/core/gimp-edit.c
+++ b/app/core/gimp-edit.c
@@ -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)),
diff --git a/app/core/gimpchannel-select.c b/app/core/gimpchannel-select.c
index b7af13b..9f669e1 100644
--- a/app/core/gimpchannel-select.c
+++ b/app/core/gimpchannel-select.c
@@ -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,
diff --git a/app/core/gimpchannel.c b/app/core/gimpchannel.c
index ca7fd76..1edd468 100644
--- a/app/core/gimpchannel.c
+++ b/app/core/gimpchannel.c
@@ -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);
}
diff --git a/app/core/gimpdrawable-blend.c b/app/core/gimpdrawable-blend.c
index c1a62a5..9840d84 100644
--- a/app/core/gimpdrawable-blend.c
+++ b/app/core/gimpdrawable-blend.c
@@ -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);
diff --git a/app/core/gimpdrawable-brightness-contrast.c b/app/core/gimpdrawable-brightness-contrast.c
index 510942c..20f54f4 100644
--- a/app/core/gimpdrawable-brightness-contrast.c
+++ b/app/core/gimpdrawable-brightness-contrast.c
@@ -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);
}
diff --git a/app/core/gimpdrawable-bucket-fill.c b/app/core/gimpdrawable-bucket-fill.c
index 2bda476..4b8333e 100644
--- a/app/core/gimpdrawable-bucket-fill.c
+++ b/app/core/gimpdrawable-bucket-fill.c
@@ -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);
diff --git a/app/core/gimpdrawable-color-balance.c b/app/core/gimpdrawable-color-balance.c
index d21a977..c459373 100644
--- a/app/core/gimpdrawable-color-balance.c
+++ b/app/core/gimpdrawable-color-balance.c
@@ -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);
}
diff --git a/app/core/gimpdrawable-colorize.c b/app/core/gimpdrawable-colorize.c
index de1e07c..148d605 100644
--- a/app/core/gimpdrawable-colorize.c
+++ b/app/core/gimpdrawable-colorize.c
@@ -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);
}
diff --git a/app/core/gimpdrawable-curves.c b/app/core/gimpdrawable-curves.c
index d4e900d..73bb990 100644
--- a/app/core/gimpdrawable-curves.c
+++ b/app/core/gimpdrawable-curves.c
@@ -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);
}
}
diff --git a/app/core/gimpdrawable-equalize.c b/app/core/gimpdrawable-equalize.c
index aa9a5e1..dff164a 100644
--- a/app/core/gimpdrawable-equalize.c
+++ b/app/core/gimpdrawable-equalize.c
@@ -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);
}
diff --git a/app/core/gimpdrawable-offset.c b/app/core/gimpdrawable-offset.c
index 550340d..f531af9 100644
--- a/app/core/gimpdrawable-offset.c
+++ b/app/core/gimpdrawable-offset.c
@@ -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);
}
diff --git a/app/core/gimpdrawable-stroke.c b/app/core/gimpdrawable-stroke.c
index d46b345..4c530a1 100644
--- a/app/core/gimpdrawable-stroke.c
+++ b/app/core/gimpdrawable-stroke.c
@@ -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);
diff --git a/app/core/gimpdrawable-transform.c b/app/core/gimpdrawable-transform.c
index a0f38c3..398c22f 100644
--- a/app/core/gimpdrawable-transform.c
+++ b/app/core/gimpdrawable-transform.c
@@ -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;
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 63dc019..cbf7ac0 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -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);
}
diff --git a/app/core/gimpgrouplayer.c b/app/core/gimpgrouplayer.c
index e979fb2..33c0fd7 100644
--- a/app/core/gimpgrouplayer.c
+++ b/app/core/gimpgrouplayer.c
@@ -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;
diff --git a/app/core/gimpimage-arrange.c b/app/core/gimpimage-arrange.c
index 0b2358d..e3194ce 100644
--- a/app/core/gimpimage-arrange.c
+++ b/app/core/gimpimage-arrange.c
@@ -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++)
{
diff --git a/app/core/gimpimage-colormap.c b/app/core/gimpimage-colormap.c
index edbc592..06873e7 100644
--- a/app/core/gimpimage-colormap.c
+++ b/app/core/gimpimage-colormap.c
@@ -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],
diff --git a/app/core/gimpimage-convert.c b/app/core/gimpimage-convert.c
index 1671c4c..3a3181c 100644
--- a/app/core/gimpimage-convert.c
+++ b/app/core/gimpimage-convert.c
@@ -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;
}
diff --git a/app/core/gimpimage-crop.c b/app/core/gimpimage-crop.c
index 948bf3e..db47b73 100644
--- a/app/core/gimpimage-crop.c
+++ b/app/core/gimpimage-crop.c
@@ -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,
diff --git a/app/core/gimpimage-grid.c b/app/core/gimpimage-grid.c
index fdfbd57..a40981a 100644
--- a/app/core/gimpimage-grid.c
+++ b/app/core/gimpimage-grid.c
@@ -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);
}
diff --git a/app/core/gimpimage-guides.c b/app/core/gimpimage-guides.c
index 47825c2..1272a36 100644
--- a/app/core/gimpimage-guides.c
+++ b/app/core/gimpimage-guides.c
@@ -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);
diff --git a/app/core/gimpimage-item-list.c b/app/core/gimpimage-item-list.c
index d588533..0083954 100644
--- a/app/core/gimpimage-item-list.c
+++ b/app/core/gimpimage-item-list.c
@@ -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,
diff --git a/app/core/gimpimage-merge.c b/app/core/gimpimage-merge.c
index 5b318d2..43ecb18 100644
--- a/app/core/gimpimage-merge.c
+++ b/app/core/gimpimage-merge.c
@@ -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);
diff --git a/app/core/gimpimage-quick-mask.c b/app/core/gimpimage-quick-mask.c
index 46db050..0a6630c 100644
--- a/app/core/gimpimage-quick-mask.c
+++ b/app/core/gimpimage-quick-mask.c
@@ -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);
diff --git a/app/core/gimpimage-resize.c b/app/core/gimpimage-resize.c
index a34b28d..2ed9df7 100644
--- a/app/core/gimpimage-resize.c
+++ b/app/core/gimpimage-resize.c
@@ -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,
diff --git a/app/core/gimpimage-sample-points.c b/app/core/gimpimage-sample-points.c
index ee8b798..4095ebf 100644
--- a/app/core/gimpimage-sample-points.c
+++ b/app/core/gimpimage-sample-points.c
@@ -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);
diff --git a/app/core/gimpimage-scale.c b/app/core/gimpimage-scale.c
index eda5c20..9bf4db3 100644
--- a/app/core/gimpimage-scale.c
+++ b/app/core/gimpimage-scale.c
@@ -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);
diff --git a/app/core/gimpimage.c b/app/core/gimpimage.c
index 1517b2f..bf114ba 100644
--- a/app/core/gimpimage.c
+++ b/app/core/gimpimage.c
@@ -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 (©))
gimp_image_undo_push_image_parasite (image,
- _("Attach Parasite to Image"),
+ C_("undo-type", "Attach Parasite to Image"),
©);
/* 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"));
}
gboolean
@@ -3518,7 +3518,7 @@ gimp_image_raise_layer_to_top (GimpImage *image,
return gimp_image_reorder_layer (image, layer,
gimp_layer_get_parent (layer), 0,
- TRUE, _("Raise Layer to Top"));
+ TRUE, C_("undo-type", "Raise Layer to Top"));
}
gboolean
@@ -3546,7 +3546,7 @@ gimp_image_lower_layer (GimpImage *image,
return gimp_image_reorder_layer (image, layer,
gimp_layer_get_parent (layer), index + 1,
- TRUE, _("Lower Layer"));
+ TRUE, C_("undo-type", "Lower Layer"));
}
gboolean
@@ -3565,7 +3565,7 @@ gimp_image_lower_layer_to_bottom (GimpImage *image,
return gimp_image_reorder_layer (image, layer,
gimp_layer_get_parent (layer), length - 1,
- TRUE, _("Lower Layer to Bottom"));
+ TRUE, C_("undo-type", "Lower Layer to Bottom"));
}
gboolean
@@ -3612,7 +3612,7 @@ gimp_image_add_channel (GimpImage *image,
return FALSE;
if (push_undo)
- gimp_image_undo_push_channel_add (image, _("Add Channel"),
+ gimp_image_undo_push_channel_add (image, C_("undo-type", "Add Channel"),
channel,
gimp_image_get_active_channel (image));
@@ -3650,7 +3650,7 @@ gimp_image_remove_channel (GimpImage *image,
}
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_ITEM_REMOVE,
- _("Remove Channel"));
+ C_("undo-type", "Remove Channel"));
undo_group = TRUE;
gimp_image_remove_layer (image, gimp_image_get_floating_selection (image),
@@ -3662,7 +3662,7 @@ gimp_image_remove_channel (GimpImage *image,
active_channel = gimp_image_get_active_channel (image);
if (push_undo)
- gimp_image_undo_push_channel_remove (image, _("Remove Channel"), channel,
+ gimp_image_undo_push_channel_remove (image, C_("undo-type", "Remove Channel"), channel,
gimp_channel_get_parent (channel),
gimp_item_get_index (GIMP_ITEM (channel)),
active_channel);
@@ -3706,7 +3706,7 @@ gimp_image_raise_channel (GimpImage *image,
return gimp_image_reorder_channel (image, channel,
gimp_channel_get_parent (channel), index - 1,
- TRUE, _("Raise Channel"));
+ TRUE, C_("undo-type", "Raise Channel"));
}
gboolean
@@ -3718,7 +3718,7 @@ gimp_image_raise_channel_to_top (GimpImage *image,
return gimp_image_reorder_channel (image, channel,
gimp_channel_get_parent (channel), 0,
- TRUE, _("Raise Channel to Top"));
+ TRUE, C_("undo-type", "Raise Channel to Top"));
}
@@ -3747,7 +3747,7 @@ gimp_image_lower_channel (GimpImage *image,
return gimp_image_reorder_channel (image, channel,
gimp_channel_get_parent (channel), index + 1,
- TRUE, _("Lower Channel"));
+ TRUE, C_("undo-type", "Lower Channel"));
}
gboolean
@@ -3766,7 +3766,7 @@ gimp_image_lower_channel_to_bottom (GimpImage *image,
return gimp_image_reorder_channel (image, channel,
gimp_channel_get_parent (channel), length - 1,
- TRUE, _("Lower Channel to Bottom"));
+ TRUE, C_("undo-type", "Lower Channel to Bottom"));
}
gboolean
@@ -3813,7 +3813,7 @@ gimp_image_add_vectors (GimpImage *image,
return FALSE;
if (push_undo)
- gimp_image_undo_push_vectors_add (image, _("Add Path"),
+ gimp_image_undo_push_vectors_add (image, C_("undo-type", "Add Path"),
vectors,
gimp_image_get_active_vectors (image));
@@ -3844,7 +3844,7 @@ gimp_image_remove_vectors (GimpImage *image,
active_vectors = gimp_image_get_active_vectors (image);
if (push_undo)
- gimp_image_undo_push_vectors_remove (image, _("Remove Path"), vectors,
+ gimp_image_undo_push_vectors_remove (image, C_("undo-type", "Remove Path"), vectors,
gimp_vectors_get_parent (vectors),
gimp_item_get_index (GIMP_ITEM (vectors)),
active_vectors);
@@ -3880,7 +3880,7 @@ gimp_image_raise_vectors (GimpImage *image,
return gimp_image_reorder_vectors (image, vectors,
gimp_vectors_get_parent (vectors), index - 1,
- TRUE, _("Raise Path"));
+ TRUE, C_("undo-type", "Raise Path"));
}
gboolean
@@ -3892,7 +3892,7 @@ gimp_image_raise_vectors_to_top (GimpImage *image,
return gimp_image_reorder_vectors (image, vectors,
gimp_vectors_get_parent (vectors), 0,
- TRUE, _("Raise Path to Top"));
+ TRUE, C_("undo-type", "Raise Path to Top"));
}
gboolean
@@ -3920,7 +3920,7 @@ gimp_image_lower_vectors (GimpImage *image,
return gimp_image_reorder_vectors (image, vectors,
gimp_vectors_get_parent (vectors), index + 1,
- TRUE, _("Lower Path"));
+ TRUE, C_("undo-type", "Lower Path"));
}
gboolean
@@ -3939,7 +3939,7 @@ gimp_image_lower_vectors_to_bottom (GimpImage *image,
return gimp_image_reorder_vectors (image, vectors,
gimp_vectors_get_parent (vectors), length - 1,
- TRUE, _("Lower Path to Bottom"));
+ TRUE, C_("undo-type", "Lower Path to Bottom"));
}
gboolean
diff --git a/app/core/gimpitem.c b/app/core/gimpitem.c
index de679cb..4855e52 100644
--- a/app/core/gimpitem.c
+++ b/app/core/gimpitem.c
@@ -419,6 +419,7 @@ gimp_item_real_duplicate (GimpItem *item,
g_return_val_if_fail (name != NULL, NULL);
+
ext = strrchr (name, '#');
len = strlen (_("copy"));
@@ -1539,7 +1540,7 @@ gimp_item_parasite_attach (GimpItem *item,
/* do a group in case we have attach_parent set */
gimp_image_undo_group_start (item->image,
GIMP_UNDO_GROUP_PARASITE_ATTACH,
- _("Attach Parasite"));
+ C_("undo-type", "Attach Parasite"));
gimp_image_undo_push_item_parasite (item->image, NULL, item, ©);
}
@@ -1549,7 +1550,7 @@ gimp_item_parasite_attach (GimpItem *item,
(item, gimp_parasite_name (©))))
{
gimp_image_undo_push_cantundo (item->image,
- _("Attach Parasite to Item"));
+ C_("undo-type", "Attach Parasite to Item"));
}
}
@@ -1591,14 +1592,14 @@ gimp_item_parasite_detach (GimpItem *item,
if (gimp_parasite_is_undoable (parasite))
{
gimp_image_undo_push_item_parasite_remove (item->image,
- _("Remove Parasite from Item"),
+ C_("undo-type", "Remove Parasite from Item"),
item,
gimp_parasite_name (parasite));
}
else if (gimp_parasite_is_persistent (parasite))
{
gimp_image_undo_push_cantundo (item->image,
- _("Remove Parasite from Item"));
+ C_("undo-type", "Remove Parasite from Item"));
}
gimp_parasite_list_remove (item->parasites, name);
diff --git a/app/core/gimplayer-floating-sel.c b/app/core/gimplayer-floating-sel.c
index 1a087a1..0a9901e 100644
--- a/app/core/gimplayer-floating-sel.c
+++ b/app/core/gimplayer-floating-sel.c
@@ -92,7 +92,7 @@ floating_sel_anchor (GimpLayer *layer)
image = gimp_item_get_image (GIMP_ITEM (layer));
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_FS_ANCHOR,
- _("Anchor Floating Selection"));
+ C_("undo-type", "Anchor Floating Selection"));
/* Composite the floating selection contents */
floating_sel_composite (layer);
@@ -130,7 +130,7 @@ floating_sel_to_layer (GimpLayer *layer,
}
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_FS_TO_LAYER,
- _("Floating Selection to Layer"));
+ C_("undo-type", "Floating Selection to Layer"));
gimp_image_undo_push_fs_to_layer (image, NULL, layer);
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index a99416f..25f464d 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -255,13 +255,13 @@ gimp_layer_class_init (GimpLayerClass *klass)
item_class->transform = gimp_layer_transform;
item_class->get_node = gimp_layer_get_node;
item_class->default_name = _("Layer");
- item_class->rename_desc = _("Rename Layer");
- item_class->translate_desc = _("Move Layer");
- item_class->scale_desc = _("Scale Layer");
- item_class->resize_desc = _("Resize Layer");
- item_class->flip_desc = _("Flip Layer");
- item_class->rotate_desc = _("Rotate Layer");
- item_class->transform_desc = _("Transform Layer");
+ item_class->rename_desc = C_("undo-type", "Rename Layer");
+ item_class->translate_desc = C_("undo-type", "Move Layer");
+ item_class->scale_desc = C_("undo-type", "Scale Layer");
+ item_class->resize_desc = C_("undo-type", "Resize Layer");
+ item_class->flip_desc = C_("undo-type", "Flip Layer");
+ item_class->rotate_desc = C_("undo-type", "Rotate Layer");
+ item_class->transform_desc = C_("undo-type", "Transform Layer");
drawable_class->estimate_memsize = gimp_layer_estimate_memsize;
drawable_class->invalidate_boundary = gimp_layer_invalidate_boundary;
@@ -1396,7 +1396,7 @@ gimp_layer_add_mask (GimpLayer *layer,
}
if (push_undo)
- gimp_image_undo_push_layer_mask_add (image, _("Add Layer Mask"),
+ gimp_image_undo_push_layer_mask_add (image, C_("undo-type", "Add Layer Mask"),
layer, mask);
layer->mask = g_object_ref_sink (mask);
@@ -1510,7 +1510,7 @@ gimp_layer_create_mask (const GimpLayer *layer,
guchar *alpha_ptr;
gimp_drawable_push_undo (drawable,
- _("Transfer Alpha to Mask"),
+ C_("undo-type", "Transfer Alpha to Mask"),
0, 0,
gimp_item_get_width (item),
gimp_item_get_height (item),
@@ -1680,8 +1680,8 @@ gimp_layer_apply_mask (GimpLayer *layer,
{
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_LAYER_APPLY_MASK,
(mode == GIMP_MASK_APPLY) ?
- _("Apply Layer Mask") :
- _("Delete Layer Mask"));
+ C_("undo-type", "Apply Layer Mask") :
+ C_("undo-type", "Delete Layer Mask"));
gimp_image_undo_push_layer_mask_remove (image, NULL, layer, mask);
@@ -1800,7 +1800,7 @@ gimp_layer_add_alpha (GimpLayer *layer)
/* Set the new tiles */
gimp_drawable_set_tiles (GIMP_DRAWABLE (layer),
gimp_item_is_attached (GIMP_ITEM (layer)),
- _("Add Alpha Channel"),
+ C_("undo-type", "Add Alpha Channel"),
new_tiles, new_type);
tile_manager_unref (new_tiles);
}
@@ -1854,7 +1854,7 @@ gimp_layer_flatten (GimpLayer *layer,
/* Set the new tiles */
gimp_drawable_set_tiles (GIMP_DRAWABLE (layer),
gimp_item_is_attached (GIMP_ITEM (layer)),
- _("Remove Alpha Channel"),
+ C_("undo-type", "Remove Alpha Channel"),
new_tiles, new_type);
tile_manager_unref (new_tiles);
}
@@ -1874,7 +1874,7 @@ gimp_layer_resize_to_image (GimpLayer *layer,
image = gimp_item_get_image (GIMP_ITEM (layer));
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_ITEM_RESIZE,
- _("Layer to Image Size"));
+ C_("undo-type", "Layer to Image Size"));
gimp_item_get_offset (GIMP_ITEM (layer), &offset_x, &offset_y);
gimp_item_resize (GIMP_ITEM (layer), context,
diff --git a/app/core/gimplayermask.c b/app/core/gimplayermask.c
index afc3ad9..bcacc47 100644
--- a/app/core/gimplayermask.c
+++ b/app/core/gimplayermask.c
@@ -107,7 +107,7 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
item_class->get_tree = gimp_layer_mask_get_tree;
item_class->duplicate = gimp_layer_mask_duplicate;
item_class->rename = gimp_layer_mask_rename;
- item_class->translate_desc = _("Move Layer Mask");
+ item_class->translate_desc = C_("undo-type", "Move Layer Mask");
}
static void
@@ -257,7 +257,7 @@ gimp_layer_mask_set_apply (GimpLayerMask *layer_mask,
GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer_mask));
if (push_undo)
- gimp_image_undo_push_layer_mask_apply (image, _("Apply Layer Mask"),
+ gimp_image_undo_push_layer_mask_apply (image, C_("undo-type", "Apply Layer Mask"),
layer_mask);
layer_mask->apply_mask = apply ? TRUE : FALSE;
@@ -325,7 +325,7 @@ gimp_layer_mask_set_show (GimpLayerMask *layer_mask,
GimpImage *image = gimp_item_get_image (GIMP_ITEM (layer_mask));
if (push_undo)
- gimp_image_undo_push_layer_mask_show (image, _("Show Layer Mask"),
+ gimp_image_undo_push_layer_mask_show (image, C_("undo-type", "Show Layer Mask"),
layer_mask);
layer_mask->show_mask = show ? TRUE : FALSE;
diff --git a/app/core/gimpselection.c b/app/core/gimpselection.c
index ca492c5..4191dbd 100644
--- a/app/core/gimpselection.c
+++ b/app/core/gimpselection.c
@@ -151,8 +151,8 @@ gimp_selection_class_init (GimpSelectionClass *klass)
item_class->flip = gimp_selection_flip;
item_class->rotate = gimp_selection_rotate;
item_class->stroke = gimp_selection_stroke;
- item_class->translate_desc = _("Move Selection");
- item_class->stroke_desc = _("Stroke Selection");
+ item_class->translate_desc = C_("undo-type", "Move Selection");
+ item_class->stroke_desc = C_("undo-type", "Stroke Selection");
drawable_class->invalidate_boundary = gimp_selection_invalidate_boundary;
@@ -168,14 +168,14 @@ gimp_selection_class_init (GimpSelectionClass *klass)
channel_class->grow = gimp_selection_grow;
channel_class->shrink = gimp_selection_shrink;
- channel_class->feather_desc = _("Feather Selection");
- channel_class->sharpen_desc = _("Sharpen Selection");
- channel_class->clear_desc = _("Select None");
- channel_class->all_desc = _("Select All");
- channel_class->invert_desc = _("Invert Selection");
- channel_class->border_desc = _("Border Selection");
- channel_class->grow_desc = _("Grow Selection");
- channel_class->shrink_desc = _("Shrink Selection");
+ channel_class->feather_desc = C_("undo-type", "Feather Selection");
+ channel_class->sharpen_desc = C_("undo-type", "Sharpen Selection");
+ channel_class->clear_desc = C_("undo-type", "Select None");
+ channel_class->all_desc = C_("undo-type", "Select All");
+ channel_class->invert_desc = C_("undo-type", "Invert Selection");
+ channel_class->border_desc = C_("undo-type", "Border Selection");
+ channel_class->grow_desc = C_("undo-type", "Grow Selection");
+ channel_class->shrink_desc = C_("undo-type", "Shrink Selection");
}
static void
@@ -580,7 +580,7 @@ gimp_selection_load (GimpSelection *selection,
g_return_if_fail (height == gimp_item_get_height (GIMP_ITEM (channel)));
gimp_channel_push_undo (GIMP_CHANNEL (selection),
- _("Channel to Selection"));
+ C_("undo-type", "Channel to Selection"));
/* copy the channel to the mask */
pixel_region_init (&srcPR,
@@ -848,7 +848,7 @@ gimp_selection_float (GimpSelection *selection,
/* Start an undo group */
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_FS_FLOAT,
- _("Float Selection"));
+ C_("undo-type", "Float Selection"));
/* Cut or copy the selected region */
tiles = gimp_selection_extract (selection, GIMP_PICKABLE (drawable), context,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
