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

app: fix some layer mask strings 

Not all layer mask menu commands and help texts were updated to reflect
that they work on multiple masks.
Updates
- Apply Layer Mask -> Apply Layer Masks
- Delete Layer Mask -> Delete Layer Masks
- Their text hints and the one for Disable Layer Masks

Updates the undo strings, even though these don't seem to be used
anymore? Looks like undo always picks the menu command now.
This commit is contained in:
Jacob Boerema 2024-06-22 14:20:02 -04:00
parent 3842efd524
commit a3ecca3487
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/actions/layers-actions.c
View File

@ -275,7 +275,7 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
{ "layers-mask-disable", NULL,
NC_("layers-action", "_Disable Layer Masks"), NULL, { NULL },
NC_("layers-action", "Dismiss the effect of the layer mask"),
NC_("layers-action", "Dismiss the effect of the layer masks"),
layers_mask_disable_cmd_callback,
FALSE,
GIMP_HELP_LAYER_MASK_DISABLE },
@ -442,13 +442,13 @@ static const GimpEnumActionEntry layers_color_tag_actions[] =
static const GimpEnumActionEntry layers_mask_apply_actions[] =
{
{ "layers-mask-apply", NULL,
NC_("layers-action", "Apply Layer _Mask"), NULL, { NULL },
NC_("layers-action", "Apply the effect of the layer mask and remove it"),
NC_("layers-action", "Apply Layer _Masks"), NULL, { NULL },
NC_("layers-action", "Apply the effect of the layer masks and remove them"),
GIMP_MASK_APPLY, FALSE,
GIMP_HELP_LAYER_MASK_APPLY },
{ "layers-mask-delete", GIMP_ICON_EDIT_DELETE,
NC_("layers-action", "Delete Layer Mas_k"), NULL, { NULL },
NC_("layers-action", "Delete Layer Mas_ks"), NULL, { NULL },
NC_("layers-action", "Remove layer masks and their effect"),
GIMP_MASK_DISCARD, FALSE,
GIMP_HELP_LAYER_MASK_DELETE }

12
app/core/core-enums.c
View File

@ -1323,8 +1323,8 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_GROUP_ITEM_RESIZE, NC_("undo-type", "Resize item"), NULL },
{ GIMP_UNDO_GROUP_LAYER_ADD, NC_("undo-type", "Add layer"), NULL },
{ GIMP_UNDO_GROUP_LAYER_ADD_ALPHA, NC_("undo-type", "Add alpha channel"), NULL },
{ GIMP_UNDO_GROUP_LAYER_ADD_MASK, NC_("undo-type", "Add layer mask"), NULL },
{ GIMP_UNDO_GROUP_LAYER_APPLY_MASK, NC_("undo-type", "Apply layer mask"), NULL },
{ GIMP_UNDO_GROUP_LAYER_ADD_MASK, NC_("undo-type", "Add layer masks"), NULL },
{ GIMP_UNDO_GROUP_LAYER_APPLY_MASK, NC_("undo-type", "Apply layer masks"), NULL },
{ GIMP_UNDO_GROUP_LAYER_REMOVE_ALPHA, NC_("undo-type", "Remove alpha channel"), NULL },
{ GIMP_UNDO_GROUP_LAYER_LOCK_ALPHA, NC_("undo-type", "Lock/Unlock alpha channels"), NULL },
{ GIMP_UNDO_GROUP_LAYER_OPACITY, NC_("undo-type", "Set layers opacity"), NULL },
@ -1379,10 +1379,10 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_TEXT_LAYER, NC_("undo-type", "Text layer"), NULL },
{ GIMP_UNDO_TEXT_LAYER_MODIFIED, NC_("undo-type", "Text layer modification"), NULL },
{ GIMP_UNDO_TEXT_LAYER_CONVERT, NC_("undo-type", "Convert text layer"), NULL },
{ GIMP_UNDO_LAYER_MASK_ADD, NC_("undo-type", "Add layer mask"), NULL },
{ GIMP_UNDO_LAYER_MASK_REMOVE, NC_("undo-type", "Delete layer mask"), NULL },
{ GIMP_UNDO_LAYER_MASK_APPLY, NC_("undo-type", "Apply layer mask"), NULL },
{ GIMP_UNDO_LAYER_MASK_SHOW, NC_("undo-type", "Show layer mask"), NULL },
{ GIMP_UNDO_LAYER_MASK_ADD, NC_("undo-type", "Add layer masks"), NULL },
{ GIMP_UNDO_LAYER_MASK_REMOVE, NC_("undo-type", "Delete layer masks"), NULL },
{ GIMP_UNDO_LAYER_MASK_APPLY, NC_("undo-type", "Apply layer masks"), NULL },
{ GIMP_UNDO_LAYER_MASK_SHOW, NC_("undo-type", "Show layer masks"), NULL },
{ GIMP_UNDO_CHANNEL_ADD, NC_("undo-type", "New channel"), NULL },
{ GIMP_UNDO_CHANNEL_REMOVE, NC_("undo-type", "Delete channel"), NULL },
{ GIMP_UNDO_CHANNEL_COLOR, NC_("undo-type", "Channel color"), NULL },

12
app/core/gimplayer.c
View File

@ -1920,7 +1920,7 @@ gimp_layer_add_mask (GimpLayer *layer,
}
if (push_undo)
gimp_image_undo_push_layer_mask_add (image, C_("undo-type", "Add Layer Mask"),
gimp_image_undo_push_layer_mask_add (image, C_("undo-type", "Add Layer Masks"),
layer, mask);
layer->mask = g_object_ref_sink (mask);
@ -2207,8 +2207,8 @@ gimp_layer_apply_mask (GimpLayer *layer,
{
gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_LAYER_APPLY_MASK,
(mode == GIMP_MASK_APPLY) ?
C_("undo-type", "Apply Layer Mask") :
C_("undo-type", "Delete Layer Mask"));
C_("undo-type", "Apply Layer Masks") :
C_("undo-type", "Delete Layer Masks"));
gimp_image_undo_push_layer_mask_show (image, NULL, layer);
gimp_image_undo_push_layer_mask_apply (image, NULL, layer);
@ -2315,8 +2315,8 @@ gimp_layer_set_apply_mask (GimpLayer *layer,
if (push_undo && gimp_item_is_attached (GIMP_ITEM (layer)))
gimp_image_undo_push_layer_mask_apply (image,
apply ?
C_("undo-type", "Enable Layer Mask") :
C_("undo-type", "Disable Layer Mask"),
C_("undo-type", "Enable Layer Masks") :
C_("undo-type", "Disable Layer Masks"),
layer);
layer->apply_mask = apply ? TRUE : FALSE;
@ -2397,7 +2397,7 @@ gimp_layer_set_show_mask (GimpLayer *layer,
if (push_undo)
gimp_image_undo_push_layer_mask_show (image,
C_("undo-type", "Show Layer Mask"),
C_("undo-type", "Show Layer Masks"),
layer);
layer->show_mask = show ? TRUE : FALSE;