Attachment #55390 for bug #87553




  { "debug", N_("Debug"), NULL,
    debug_actions_setup,
    debug_actions_update },
  { "dialogs", N_("Window"), NULL,
    dialogs_actions_setup,
    dialogs_actions_update },
  { "dockable", N_("Dockable"), NULL,

  { "layers", N_("Layers"), GIMP_STOCK_LAYER,
    layers_actions_setup,
    layers_actions_update },
  { "palette-editor", N_("Swatches Editor"), GIMP_STOCK_PALETTE,
    palette_editor_actions_setup,
    palette_editor_actions_update },
  { "palettes", N_("Swatches"), GIMP_STOCK_PALETTE,
    palettes_actions_setup,
    palettes_actions_update },
  { "patterns", N_("Patterns"), GIMP_STOCK_PATTERN,

  { "plug-in", N_("Plug-Ins"), GIMP_STOCK_PLUGIN,
    plug_in_actions_setup,
    plug_in_actions_update },
  { "qmask", N_("Quick Mask Mode"), GIMP_STOCK_QMASK_ON,
    qmask_actions_setup,
    qmask_actions_update },
  { "select", N_("Select"), GIMP_STOCK_SELECTION,
    select_actions_setup,
    select_actions_update },
  { "templates", N_("Presets"), GIMP_STOCK_TEMPLATE,
    templates_actions_setup,
    templates_actions_update },
  { "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT,

Lines 44-50 Link Here

(-)gimp-2.2.4/app/actions/context-actions.c (-1 / +1 lines)
44	static GimpActionEntry context_actions[] =	44	static GimpActionEntry context_actions[] =
45	{	45	{
46	{ "context-menu", NULL, N_("_Context") },	46	{ "context-menu", NULL, N_("_Context") },
47	{ "context-colors-menu", GIMP_STOCK_DEFAULT_COLORS, N_("_Colors") },	47	{ "context-colors-menu", GIMP_STOCK_DEFAULT_COLORS, N_("Adjustments") },
48	{ "context-opacity-menu", GIMP_STOCK_TRANSPARENCY, N_("_Opacity") },	48	{ "context-opacity-menu", GIMP_STOCK_TRANSPARENCY, N_("_Opacity") },
49	{ "context-paint-mode-menu", GIMP_STOCK_TOOL_PENCIL, N_("Paint _Mode") },	49	{ "context-paint-mode-menu", GIMP_STOCK_TOOL_PENCIL, N_("Paint _Mode") },
50	{ "context-tool-menu", GIMP_STOCK_TOOLS, N_("_Tool") },	50	{ "context-tool-menu", GIMP_STOCK_TOOLS, N_("_Tool") },





static GimpActionEntry dialogs_actions[] =
{
  { "dialogs-menu",          NULL, N_("Window")         },
  { "dialogs-new-dock-menu", NULL, N_("Create New Doc_k") },

  { "dialogs-new-dock-lcp", NULL,

    GIMP_HELP_DOCK },

  { "dialogs-toolbox", NULL,
    N_("Tools"), NULL, NULL,
    G_CALLBACK (dialogs_show_toolbox_cmd_callback),
    GIMP_HELP_TOOLBOX }
};

GimpStringActionEntry dialogs_dockable_actions[] =
{
  { "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS,
    N_("_Options"), "<control><shift>T", NULL,
    "gimp-tool-options",
    GIMP_HELP_TOOL_OPTIONS_DIALOG },


    GIMP_HELP_SELECTION_DIALOG },

  { "dialogs-navigation", GIMP_STOCK_NAVIGATION,
    N_("Na_vigator"), NULL, NULL,
    "gimp-navigation-view",
    GIMP_HELP_NAVIGATION_DIALOG },


    GIMP_HELP_UNDO_DIALOG },

  { "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS,
    N_("Colo_r"), NULL, NULL,
    "gimp-color-editor",
    GIMP_HELP_COLOR_DIALOG },


    GIMP_HELP_GRADIENT_DIALOG },

  { "dialogs-palettes", GIMP_STOCK_PALETTE,
    N_("Swatches"), "<control>P", NULL,
    "gimp-palette-list|gimp-palette-list",
    GIMP_HELP_PALETTE_DIALOG },


    GIMP_HELP_DOCUMENT_DIALOG },

  { "dialogs-templates", GIMP_STOCK_TEMPLATE,
    N_("Presets"), "", NULL,
    "gimp-template-list|gimp-template-grid",
    GIMP_HELP_TEMPLATE_DIALOG },





static GimpEnumActionEntry drawable_flip_actions[] =
{
  { "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
    N_("Flip _Horizontal"), NULL, NULL,
    GIMP_ORIENTATION_HORIZONTAL, FALSE,
    GIMP_HELP_LAYER_FLIP_HORIZONTAL },

  { "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
    N_("Flip _Vertical"), NULL, NULL,
    GIMP_ORIENTATION_VERTICAL, FALSE,
    GIMP_HELP_LAYER_FLIP_VERTICAL }
};

static GimpEnumActionEntry drawable_rotate_actions[] =
{
  { "drawable-rotate-90", GIMP_STOCK_ROTATE_90,
    N_("Rotate 90* _CW"), NULL, NULL,
    GIMP_ROTATE_90, FALSE,
    GIMP_HELP_LAYER_ROTATE_90 },

  { "drawable-rotate-180", GIMP_STOCK_ROTATE_180,
    N_("Rotate _180*"), NULL, NULL,
    GIMP_ROTATE_180, FALSE,
    GIMP_HELP_LAYER_ROTATE_180 },

  { "drawable-rotate-270", GIMP_STOCK_ROTATE_270,
    N_("Rotate 90* CC_W"), NULL, NULL,
    GIMP_ROTATE_270, FALSE,
    GIMP_HELP_LAYER_ROTATE_270 }
};

Lines 90-96 Link Here

(-)gimp-2.2.4/app/actions/edit-actions.c (-1 / +1 lines)
90	GIMP_HELP_EDIT_COPY },	90	GIMP_HELP_EDIT_COPY },
91		91
92	{ "edit-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */	92	{ "edit-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
93	N_("Copy _Visible"), "", NULL,	93	N_("Copy Merged"), "", NULL,
94	G_CALLBACK (edit_copy_visible_cmd_callback),	94	G_CALLBACK (edit_copy_visible_cmd_callback),
95	GIMP_HELP_EDIT_COPY_VISIBLE },	95	GIMP_HELP_EDIT_COPY_VISIBLE },
96		96

Lines 98-104 Link Here

(-)gimp-2.2.4/app/actions/file-actions.c (-1 / +1 lines)
98	GIMP_HELP_FILE_SAVE_A_COPY },	98	GIMP_HELP_FILE_SAVE_A_COPY },
99		99
100	{ "file-save-as-template", NULL,	100	{ "file-save-as-template", NULL,
101	N_("Save as _Template..."), NULL, NULL,	101	N_("Save as Preset..."), NULL, NULL,
102	G_CALLBACK (file_save_template_cmd_callback),	102	G_CALLBACK (file_save_template_cmd_callback),
103	GIMP_HELP_FILE_SAVE_AS_TEMPLATE },	103	GIMP_HELP_FILE_SAVE_AS_TEMPLATE },
104		104




    GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE },

  { "gradient-editor-blend-color", NULL,
    N_("Gradient Endpoints' Colors"), NULL, NULL,
    G_CALLBACK (gradient_editor_blend_color_cmd_callback),
    GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR },

  { "gradient-editor-blend-opacity", NULL,
    N_("Gradient Endpoints' Opacit_y"), NULL, NULL,
    G_CALLBACK (gradient_editor_blend_opacity_cmd_callback),
    GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY }
};




  { "extensions-menu",      NULL, N_("_Xtns")      },
  { "image-menu",           NULL, N_("_Image")     },
  { "image-mode-menu",      NULL, N_("_Mode")      },
  { "image-transform-menu", NULL, N_("Rotate Canvas") },
  { "image-guides-menu",    NULL, N_("_Guides")    },

  { "image-new", GTK_STOCK_NEW,

    GIMP_HELP_IMAGE_PRINT_SIZE },

  { "image-scale", GIMP_STOCK_SCALE,
    N_("Image _Size..."), NULL, NULL,
    G_CALLBACK (image_scale_cmd_callback),
    GIMP_HELP_IMAGE_SCALE },


    GIMP_HELP_IMAGE_DUPLICATE },

  { "image-merge-layers", NULL,
    N_("Merge Visible..."), "<control>M", NULL,
    G_CALLBACK (image_merge_layers_cmd_callback),
    GIMP_HELP_IMAGE_MERGE_LAYERS },


    GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },

  { "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED,
    N_("_Indexed Color..."), NULL, NULL,
    GIMP_INDEXED, FALSE,
    GIMP_HELP_IMAGE_CONVERT_INDEXED }
};

static GimpEnumActionEntry image_flip_actions[] =
{
  { "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
    N_("Flip _Horizontal"), NULL, NULL,
    GIMP_ORIENTATION_HORIZONTAL, FALSE,
    GIMP_HELP_IMAGE_FLIP_HORIZONTAL },

  { "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
    N_("Flip _Vertical"), NULL, NULL,
    GIMP_ORIENTATION_VERTICAL, FALSE,
    GIMP_HELP_IMAGE_FLIP_VERTICAL }
};

{
  { "image-rotate-90", GIMP_STOCK_ROTATE_90,
    /*  please use the degree symbol in the translation  */
    N_("Rotate 90* _CW"), NULL, NULL,
    GIMP_ROTATE_90, FALSE,
    GIMP_HELP_IMAGE_ROTATE_90 },

  { "image-rotate-180", GIMP_STOCK_ROTATE_180,
    N_("Rotate _180*"), NULL, NULL,
    GIMP_ROTATE_180, FALSE,
    GIMP_HELP_IMAGE_ROTATE_180 },

  { "image-rotate-270", GIMP_STOCK_ROTATE_270,
    N_("Rotate 90* CC_W"), NULL, NULL,
    GIMP_ROTATE_270, FALSE,
    GIMP_HELP_IMAGE_ROTATE_270 }
};

Lines 189-195 Link Here

(-)gimp-2.2.4/app/actions/image-commands.c (-2 / +2 lines)
189	options->context = action_data_get_context (data);	189	options->context = action_data_get_context (data);
190		190
191	dialog = resize_dialog_new (GIMP_VIEWABLE (gimage),	191	dialog = resize_dialog_new (GIMP_VIEWABLE (gimage),
192	_("Set Image Canvas Size"), "gimp-image-resize",	192	_("Canvas Size"), "gimp-image-resize",
193	widget,	193	widget,
194	gimp_standard_help_func, GIMP_HELP_IMAGE_RESIZE,	194	gimp_standard_help_func, GIMP_HELP_IMAGE_RESIZE,
195	GIMP_DISPLAY_SHELL (gdisp->shell)->unit,	195	GIMP_DISPLAY_SHELL (gdisp->shell)->unit,
Lines 505-511 Link Here
505	return;	505	return;
506		506
507	gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE,	507	gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE,
508	_("Scale Image"));	508	_("Image Size"));
509		509
510	gimp_image_set_resolution (image,	510	gimp_image_set_resolution (image,
511	dialog->xresolution, dialog->yresolution);	511	dialog->xresolution, dialog->yresolution);




    GIMP_HELP_LAYER_DIALOG },

  { "layers-menu",              NULL,                    N_("_Layer")        },
  { "layers-stack-menu",        NULL,                    N_("Arrange")       },
  { "layers-colors-menu",       NULL,                    N_("Adjustments")   },
  { "layers-colors-auto-menu",  NULL,                    N_("_Auto")         },
  { "layers-mask-menu",         NULL,                    N_("_Mask")         },
  { "layers-transparency-menu", NULL,                    N_("Tr_ansparency") },

    GIMP_HELP_LAYER_DELETE },

  { "layers-raise", GTK_STOCK_GO_UP,
    N_("Bring Forward"), "",
    N_("Bring Forward"),
    G_CALLBACK (layers_raise_cmd_callback),
    GIMP_HELP_LAYER_RAISE },

  { "layers-raise-to-top", GTK_STOCK_GOTO_TOP,
    N_("Bring to Front"), "",
    N_("Bring layer to front"),
    G_CALLBACK (layers_raise_to_top_cmd_callback),
    GIMP_HELP_LAYER_RAISE_TO_TOP },

  { "layers-lower", GTK_STOCK_GO_DOWN,
    N_("Send Backward"), "",
    N_("Send Backward"),
    G_CALLBACK (layers_lower_cmd_callback),
    GIMP_HELP_LAYER_LOWER },

  { "layers-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
    N_("Send to _Back"), "",
    N_("Send layer to back"),
    G_CALLBACK (layers_lower_to_bottom_cmd_callback),
    GIMP_HELP_LAYER_LOWER_TO_BOTTOM },


    GIMP_HELP_LAYER_MERGE_DOWN },

  { "layers-merge-layers", NULL,
    N_("Merge _Visible..."), NULL, NULL,
    G_CALLBACK (image_merge_layers_cmd_callback),
    GIMP_HELP_IMAGE_MERGE_LAYERS },


static GimpToggleActionEntry layers_toggle_actions[] =
{
  { "layers-preserve-transparency", GIMP_STOCK_TRANSPARENCY,
    N_("Lock transparent pixels"), NULL, NULL,
    G_CALLBACK (layers_preserve_trans_cmd_callback),
    FALSE,
    GIMP_HELP_LAYER_KEEP_TRANSPARENCY },

Lines 680-686 Link Here

(-)gimp-2.2.4/app/actions/layers-commands.c (-1 / +1 lines)
680	gimp_item_offsets (GIMP_ITEM (mask), &off_x, &off_y);	680	gimp_item_offsets (GIMP_ITEM (mask), &off_x, &off_y);
681		681
682	gimp_channel_select_channel (gimp_image_get_mask (gimage),	682	gimp_channel_select_channel (gimp_image_get_mask (gimage),
683	_("Layer Mask to Selection"),	683	_("Set Selection to Layer Mask"),
684	GIMP_CHANNEL (mask),	684	GIMP_CHANNEL (mask),
685	off_x, off_y,	685	off_x, off_y,
686	op, FALSE, 0.0, 0.0);	686	op, FALSE, 0.0, 0.0);

Lines 40-46 Link Here

(-)gimp-2.2.4/app/actions/palette-editor-actions.c (-1 / +1 lines)
40	static GimpActionEntry palette_editor_actions[] =	40	static GimpActionEntry palette_editor_actions[] =
41	{	41	{
42	{ "palette-editor-popup", GIMP_STOCK_PALETTE,	42	{ "palette-editor-popup", GIMP_STOCK_PALETTE,
43	N_("Palette Editor Menu"), NULL, NULL, NULL,	43	N_("Swatches Editor Menu"), NULL, NULL, NULL,
44	GIMP_HELP_PALETTE_EDITOR_DIALOG },	44	GIMP_HELP_PALETTE_EDITOR_DIALOG },
45		45
46	{ "palette-editor-edit-color", GIMP_STOCK_EDIT,	46	{ "palette-editor-edit-color", GIMP_STOCK_EDIT,

Lines 65-73 Link Here

(-)gimp-2.2.4/app/actions/palette-editor-commands.c (-2 / +2 lines)
65	{	65	{
66	editor->color_dialog =	66	editor->color_dialog =
67	gimp_color_dialog_new (GIMP_VIEWABLE (palette),	67	gimp_color_dialog_new (GIMP_VIEWABLE (palette),
68	_("Edit Palette Color"),	68	_("Edit Swatch Color"),
69	GIMP_STOCK_PALETTE,	69	GIMP_STOCK_PALETTE,
70	_("Edit Color Palette Entry"),	70	_("Edit Swatch Color Entry"),
71	GTK_WIDGET (editor),	71	GTK_WIDGET (editor),
72	gimp_dialog_factory_from_name ("toplevel"),	72	gimp_dialog_factory_from_name ("toplevel"),
73	"gimp-palette-editor-color-dialog",	73	"gimp-palette-editor-color-dialog",




static GimpActionEntry palettes_actions[] =
{
  { "palettes-popup", GIMP_STOCK_PALETTE,
    N_("Swatches Menu"), NULL, NULL, NULL,
    GIMP_HELP_PALETTE_DIALOG },

  { "palettes-new", GTK_STOCK_NEW,
    N_("_New Swatch"), "",
    N_("New swatch"),
    G_CALLBACK (data_new_data_cmd_callback),
    GIMP_HELP_PALETTE_NEW },

  { "palettes-import", GTK_STOCK_CONVERT,
    N_("Load Swatches..."), "",
    N_("Load swatches"),
    G_CALLBACK (palettes_import_palette_cmd_callback),
    GIMP_HELP_PALETTE_IMPORT },

  { "palettes-duplicate", GIMP_STOCK_DUPLICATE,
    N_("D_uplicate Swatches"), NULL,
    N_("Duplicate swatches"),
    G_CALLBACK (data_duplicate_data_cmd_callback),
    GIMP_HELP_PALETTE_DUPLICATE },

  { "palettes-merge", NULL,
    N_("_Merge Swatches..."), NULL,
    N_("Merge swatches"),
    G_CALLBACK (palettes_merge_palettes_cmd_callback),
    GIMP_HELP_PALETTE_MERGE },

  { "palettes-delete", GTK_STOCK_DELETE,
    N_("_Delete Swatches"), "",
    N_("Delete swatches"),
    G_CALLBACK (data_delete_data_cmd_callback),
    GIMP_HELP_PALETTE_DELETE },

  { "palettes-refresh", GTK_STOCK_REFRESH,
    N_("_Refresh Swatches"), "",
    N_("Refresh swatches"),
    G_CALLBACK (data_refresh_data_cmd_callback),
    GIMP_HELP_PALETTE_REFRESH }
};

static GimpStringActionEntry palettes_edit_actions[] =
{
  { "palettes-edit", GIMP_STOCK_EDIT,
    N_("_Edit Swatch..."), NULL,
    N_("Edit swatch"),
    "gimp-palette-editor",
    GIMP_HELP_PALETTE_EDIT }
};

Lines 69-79 Link Here

(-)gimp-2.2.4/app/actions/palettes-commands.c (-2 / +2 lines)
69	GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);	69	GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data);
70	GtkWidget *dialog;	70	GtkWidget *dialog;
71		71
72	dialog = gimp_query_string_box (_("Merge Palette"),	72	dialog = gimp_query_string_box (_("Merge Swatches"),
73	GTK_WIDGET (editor),	73	GTK_WIDGET (editor),
74	gimp_standard_help_func,	74	gimp_standard_help_func,
75	GIMP_HELP_PALETTE_MERGE,	75	GIMP_HELP_PALETTE_MERGE,
76	_("Enter a name for the merged palette"),	76	_("Enter a name for the merged swatches"),
77	NULL,	77	NULL,
78	G_OBJECT (editor), "destroy",	78	G_OBJECT (editor), "destroy",
79	palettes_merge_palettes_callback,	79	palettes_merge_palettes_callback,





static GimpActionEntry plug_in_actions[] =
{
  { "plug-in-menu",                NULL, N_("Filter")       },
  { "plug-in-blur-menu",           NULL, N_("_Blur")          },
  { "plug-in-colors-menu",         NULL, N_("_Colors")    },
  { "plug-in-colors-map-menu",     NULL, N_("Ma_p")           },
  { "plug-in-noise-menu",          NULL, N_("_Noise")         },
  { "plug-in-edge-detect-menu",    NULL, N_("Edge-De_tect")   },
  { "plug-in-enhance-menu",        NULL, N_("En_hance")       },
  { "plug-in-generic-menu",        NULL, N_("Sharpen")       },
  { "plug-in-glass-effects-menu",  NULL, N_("Gla_ss Effects") },
  { "plug-in-light-effects-menu",  NULL, N_("_Light Effects") },
  { "plug-in-distorts-menu",       NULL, N_("_Distort")      },
  { "plug-in-artistic-menu",       NULL, N_("_Artistic")      },
  { "plug-in-map-menu",            NULL, N_("_Map")           },
  { "plug-in-render-menu",         NULL, N_("_Render")        },
  { "plug-in-render-clouds-menu",  NULL, N_("_Clouds")        },
  { "plug-in-render-nature-menu",  NULL, N_("_Nature")        },
  { "plug-in-render-pattern-menu", NULL, N_("_Pattern")       },
  { "plug-in-web-menu",            NULL, N_("Sharpen")           },
  { "plug-in-animation-menu",      NULL, N_("An_imation")     },
  { "plug-in-combine-menu",        NULL, N_("C_ombine")       },
  { "plug-in-toys-menu",           NULL, N_("To_ys")          },




static GimpActionEntry qmask_actions[] =
{
  { "qmask-popup", NULL,
    N_("Quick Mask Mode Menu"), NULL, NULL, NULL,
    GIMP_HELP_QMASK },

  { "qmask-configure", NULL,

static GimpToggleActionEntry qmask_toggle_actions[] =
{
  { "qmask-active", NULL,
    N_("_Quick Mask Mode Active"), NULL, NULL,
    G_CALLBACK (qmask_toggle_cmd_callback),
    FALSE,
    GIMP_HELP_QMASK_TOGGLE },

  { "qmask-toggle", GIMP_STOCK_QMASK_ON,
    N_("Toggle _Quick Mask Mode"), "<shift>Q", NULL,
    G_CALLBACK (qmask_toggle_cmd_callback),
    FALSE,
    GIMP_HELP_QMASK_TOGGLE }




    GIMP_HELP_SELECTION_ALL },

  { "select-none", GIMP_STOCK_SELECTION_NONE,
    N_("Deselect"), "<control><shift>A",
    N_("Deselect"),
    G_CALLBACK (select_none_cmd_callback),
    GIMP_HELP_SELECTION_NONE },

  { "select-invert", GIMP_STOCK_INVERT,
    N_("_Inverse"), "<control>I",
    N_("Invert selection"),
    G_CALLBACK (select_invert_cmd_callback),
    GIMP_HELP_SELECTION_INVERT },

    GIMP_HELP_SELECTION_SHARPEN },

  { "select-shrink", GIMP_STOCK_SELECTION_SHRINK,
    N_("Contract..."), NULL, NULL,
    G_CALLBACK (select_shrink_cmd_callback),
    GIMP_HELP_SELECTION_SHRINK },

  { "select-grow", GIMP_STOCK_SELECTION_GROW,
    N_("Expand..."), NULL, NULL,
    G_CALLBACK (select_grow_cmd_callback),
    GIMP_HELP_SELECTION_GROW },


    GIMP_HELP_SELECTION_BORDER },

  { "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,
    N_("Save Selection"), NULL,
    N_("Save selection to channel"),
    G_CALLBACK (select_save_cmd_callback),
    GIMP_HELP_SELECTION_TO_CHANNEL },




  GtkWidget   *edge_lock;
  return_if_no_display (gdisp, data);

  dialog = gimp_query_size_box (_("Contract Selection"),
                                gdisp->shell,
                                gimp_standard_help_func,
                                GIMP_HELP_SELECTION_SHRINK,
                                _("Contract selection by"),
                                select_shrink_pixels, 1, 32767, 0,
                                GIMP_DISPLAY_SHELL (gdisp->shell)->unit,
                                MIN (gdisp->gimage->xresolution,

                                G_OBJECT (gdisp->gimage), "disconnect",
                                select_shrink_callback, gdisp->gimage);

  edge_lock = gtk_check_button_new_with_label (_("Contract from image border"));

  gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), edge_lock,
                      FALSE, FALSE, 0);

  GtkWidget   *dialog;
  return_if_no_display (gdisp, data);

  dialog = gimp_query_size_box (_("Expand Selection"),
                                gdisp->shell,
                                gimp_standard_help_func,
                                GIMP_HELP_SELECTION_GROW,
                                _("Expand selection by"),
                                select_grow_pixels, 1, 32767, 0,
                                GIMP_DISPLAY_SHELL (gdisp->shell)->unit,
                                MIN (gdisp->gimage->xresolution,




static GimpActionEntry templates_actions[] =
{
  { "templates-popup", GIMP_STOCK_TEMPLATE,
    N_("Preset Menu"), NULL, NULL, NULL,
    GIMP_HELP_TEMPLATE_DIALOG },

  { "templates-create-image", GIMP_STOCK_IMAGE,
    N_("_Create Image from Preset..."), "",
    N_("Create a new image from the selected preset"),
    G_CALLBACK (templates_create_image_cmd_callback),
    GIMP_HELP_TEMPLATE_IMAGE_NEW },

  { "templates-new", GTK_STOCK_NEW,
    N_("_New Preset..."), "",
    N_("Create a new template"),
    G_CALLBACK (templates_new_template_cmd_callback),
    GIMP_HELP_TEMPLATE_NEW },

  { "templates-duplicate", GIMP_STOCK_DUPLICATE,
    N_("D_uplicate Preset..."), "",
    N_("Duplicate the selected preset"),
    G_CALLBACK (templates_duplicate_template_cmd_callback),
    GIMP_HELP_TEMPLATE_DUPLICATE },

  { "templates-edit", GIMP_STOCK_EDIT,
    N_("_Edit Preset..."), "",
    N_("Edit the selected preset"),
    G_CALLBACK (templates_edit_template_cmd_callback),
    GIMP_HELP_TEMPLATE_EDIT },

  { "templates-delete", GTK_STOCK_DELETE,
    N_("_Delete Preset"), "",
    N_("Delete the selected template"),
    G_CALLBACK (templates_delete_template_cmd_callback),
    GIMP_HELP_TEMPLATE_DELETE }





  options = template_options_dialog_new (context->gimp, NULL,
                                         GTK_WIDGET (editor),
                                         _("New Preset"),
                                         "gimp-template-new",
                                         GIMP_STOCK_TEMPLATE,
                                         _("Create a New Preset"),
                                         GIMP_HELP_TEMPLATE_NEW);

  g_signal_connect (options->dialog, "response",


      options = template_options_dialog_new (context->gimp, template,
                                             GTK_WIDGET (editor),
                                             _("Edit Preset"),
                                             "gimp-template-edit",
                                             GIMP_STOCK_EDIT,
                                             _("Edit Preset"),
                                             GIMP_HELP_TEMPLATE_EDIT);

      g_signal_connect (options->dialog, "response",

      delete_data->template  = template;

      dialog =
        gimp_message_dialog_new (_("Delete Preset"), GIMP_STOCK_QUESTION,
                                 GTK_WIDGET (editor), 0,
                                 gimp_standard_help_func, NULL,



      gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
                                         _("Are you sure you want to delete "
                                           "preset '%s' from the list and "
                                           "from disk?"),
                                         GIMP_OBJECT (template)->name);
      gtk_widget_show (dialog);

Lines 50-56 Link Here

(-)gimp-2.2.4/app/actions/tools-actions.c (-1 / +1 lines)
50	{ "tools-menu", NULL, N_("_Tools") },	50	{ "tools-menu", NULL, N_("_Tools") },
51	{ "tools-select-menu", NULL, N_("_Selection Tools") },	51	{ "tools-select-menu", NULL, N_("_Selection Tools") },
52	{ "tools-paint-menu", NULL, N_("_Paint Tools") },	52	{ "tools-paint-menu", NULL, N_("_Paint Tools") },
53	{ "tools-transform-menu", NULL, N_("_Transform Tools") },	53	{ "tools-transform-menu", NULL, N_("_Transform") },
54	{ "tools-color-menu", NULL, N_("_Color Tools") },	54	{ "tools-color-menu", NULL, N_("_Color Tools") },
55		55
56	{ "tools-reset", GIMP_STOCK_RESET,	56	{ "tools-reset", GIMP_STOCK_RESET,




    GIMP_HELP_PATH_DIALOG },

  { "vectors-path-tool", GIMP_STOCK_TOOL_PATH,
    N_("Pen _Tool"), NULL, NULL,
    G_CALLBACK (vectors_vectors_tool_cmd_callback),
    GIMP_HELP_TOOL_VECTORS },


    GIMP_HELP_PATH_MERGE_VISIBLE },

  { "vectors-raise", GTK_STOCK_GO_UP,
    N_("Bring Path Forward"), "",
    N_("Bring path forward"),
    G_CALLBACK (vectors_raise_cmd_callback),
    GIMP_HELP_PATH_RAISE },

  { "vectors-raise-to-top", GTK_STOCK_GOTO_TOP,
    N_("Bring Path to Front"), "",
    N_("Bring path to front"),
    G_CALLBACK (vectors_raise_to_top_cmd_callback),
    GIMP_HELP_PATH_RAISE_TO_TOP },

  { "vectors-lower", GTK_STOCK_GO_DOWN,
    N_("Send Path Backward"), "",
    N_("Send path backward"),
    G_CALLBACK (vectors_lower_cmd_callback),
    GIMP_HELP_PATH_LOWER },

  { "vectors-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
    N_("Send Path to _Back"), "",
    N_("Send path to back"),
    G_CALLBACK (vectors_lower_to_bottom_cmd_callback),
    GIMP_HELP_PATH_LOWER_TO_BOTTOM },


Lines 92-98 Link Here

(-)gimp-2.2.4/app/actions/view-actions.c (-2 / +2 lines)
92	GIMP_HELP_INFO_DIALOG },	92	GIMP_HELP_INFO_DIALOG },
93		93
94	{ "view-navigation-window", GIMP_STOCK_NAVIGATION,	94	{ "view-navigation-window", GIMP_STOCK_NAVIGATION,
95	N_("Na_vigation Window"), "<control><shift>N", NULL,	95	N_("Na_vigator"), "<control><shift>N", NULL,
96	G_CALLBACK (view_navigation_window_cmd_callback),	96	G_CALLBACK (view_navigation_window_cmd_callback),
97	GIMP_HELP_NAVIGATION_DIALOG },	97	GIMP_HELP_NAVIGATION_DIALOG },
98		98
Lines 122-128 Link Here
122	GIMP_HELP_VIEW_DOT_FOR_DOT },	122	GIMP_HELP_VIEW_DOT_FOR_DOT },
123		123
124	{ "view-show-selection", NULL,	124	{ "view-show-selection", NULL,
125	N_("Show _Selection"), "<control>T", NULL,	125	N_("Show _Selection Edges"), "<control>T", NULL,
126	G_CALLBACK (view_toggle_selection_cmd_callback),	126	G_CALLBACK (view_toggle_selection_cmd_callback),
127	TRUE,	127	TRUE,
128	GIMP_HELP_VIEW_SHOW_SELECTION },	128	GIMP_HELP_VIEW_SHOW_SELECTION },




    { GIMP_UNDO_GROUP_IMAGE_CONVERT, N_("Convert image"), NULL },
    { GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, N_("Merge layers"), NULL },
    { GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, N_("Merge vectors"), NULL },
    { GIMP_UNDO_GROUP_IMAGE_QMASK, N_("Quick Mask Mode"), NULL },
    { GIMP_UNDO_GROUP_IMAGE_GRID, N_("Grid"), NULL },
    { GIMP_UNDO_GROUP_IMAGE_GUIDE, N_("Guide"), NULL },
    { GIMP_UNDO_GROUP_DRAWABLE, N_("Drawable"), NULL },

    { GIMP_UNDO_GROUP_FS_REMOVE, N_("Remove floating selection"), NULL },
    { GIMP_UNDO_GROUP_EDIT_PASTE, N_("Paste"), NULL },
    { GIMP_UNDO_GROUP_EDIT_CUT, N_("Cut"), NULL },
    { GIMP_UNDO_GROUP_TEXT, N_("Type Tool"), NULL },
    { GIMP_UNDO_GROUP_TRANSFORM, N_("Transform"), NULL },
    { GIMP_UNDO_GROUP_PAINT, N_("Paint"), NULL },
    { GIMP_UNDO_GROUP_PARASITE_ATTACH, N_("Attach parasite"), NULL },

    { GIMP_UNDO_LAYER_MODE, N_("Set layer mode"), NULL },
    { GIMP_UNDO_LAYER_OPACITY, N_("Set layer opacity"), NULL },
    { GIMP_UNDO_LAYER_PRESERVE_TRANS, N_("Set preserve trans"), NULL },
    { GIMP_UNDO_TEXT_LAYER, N_("Type Tool"), NULL },
    { GIMP_UNDO_TEXT_LAYER_MODIFIED, N_("Text modified"), NULL },
    { GIMP_UNDO_CHANNEL_ADD, N_("New channel"), NULL },
    { GIMP_UNDO_CHANNEL_REMOVE, N_("Delete channel"), NULL },

Lines 861-867 Link Here

(-)gimp-2.2.4/app/core/gimp.c (-2 / +2 lines)
861	gimp_data_factory_data_init (gimp->pattern_factory, gimp->no_data);	861	gimp_data_factory_data_init (gimp->pattern_factory, gimp->no_data);
862		862
863	/* initialize the list of gimp palettes */	863	/* initialize the list of gimp palettes */
864	(* status_callback) (NULL, _("Palettes"), 0.3);	864	(* status_callback) (NULL, _("Swatches"), 0.3);
865	gimp_data_factory_data_init (gimp->palette_factory, gimp->no_data);	865	gimp_data_factory_data_init (gimp->palette_factory, gimp->no_data);
866		866
867	/* initialize the list of gimp gradients */	867	/* initialize the list of gimp gradients */
Lines 877-883 Link Here
877	gimp_documents_load (gimp);	877	gimp_documents_load (gimp);
878		878
879	/* initialize the template list */	879	/* initialize the template list */
880	(* status_callback) (NULL, _("Templates"), 0.7);	880	(* status_callback) (NULL, _("Presets"), 0.7);
881	gimp_templates_load (gimp);	881	gimp_templates_load (gimp);
882		882
883	/* initialize the module list */	883	/* initialize the module list */




  g_return_if_fail (GIMP_IS_CHANNEL (channel));
  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));

  gimp_channel_push_undo (channel, _("Rectangular Marquee Tool"));

  /*  if applicable, replace the current selection  */
  if (op == GIMP_CHANNEL_OP_REPLACE)

  g_return_if_fail (GIMP_IS_CHANNEL (channel));
  g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));

  gimp_channel_push_undo (channel, _("Elliptical Marquee Tool"));

  /*  if applicable, replace the current selection  */
  if (op == GIMP_CHANNEL_OP_REPLACE)

  if (! sample_merged)
    gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);

  gimp_channel_select_channel (channel, _("Magic Wand Tool"),
                               add_on, add_on_x, add_on_y,
                               op,
                               feather,

Lines 380-386 Link Here

(-)gimp-2.2.4/app/core/gimpchannel.c (-1 / +1 lines)
380	if (tooltip)	380	if (tooltip)
381	*tooltip = NULL;	381	*tooltip = NULL;
382		382
383	return g_strdup (_("Quick Mask"));	383	return g_strdup (_("Quick Mask Mode"));
384	}	384	}
385		385
386	return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable,	386	return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable,

Lines 235-241 Link Here

(-)gimp-2.2.4/app/core/gimpdrawable-blend.c (-1 / +1 lines)
235		235
236	pixel_region_init (&bufPR, buf_tiles, 0, 0, width, height, FALSE);	236	pixel_region_init (&bufPR, buf_tiles, 0, 0, width, height, FALSE);
237	gimp_drawable_apply_region (drawable, &bufPR,	237	gimp_drawable_apply_region (drawable, &bufPR,
238	TRUE, _("Blend"),	238	TRUE, _("Gradient Tool"),
239	opacity, paint_mode,	239	opacity, paint_mode,
240	NULL, x, y);	240	NULL, x, y);
241		241

Lines 269-275 Link Here

(-)gimp-2.2.4/app/core/gimpdrawable-bucket-fill.c (-1 / +1 lines)
269	/* Apply it to the image */	269	/* Apply it to the image */
270	pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);	270	pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE);
271	gimp_drawable_apply_region (drawable, &bufPR,	271	gimp_drawable_apply_region (drawable, &bufPR,
272	TRUE, _("Bucket Fill"),	272	TRUE, _("Paint Bucket Tool"),
273	opacity, paint_mode,	273	opacity, paint_mode,
274	NULL, x1, y1);	274	NULL, x1, y1);
275	tile_manager_unref (buf_tiles);	275	tile_manager_unref (buf_tiles);

Lines 794-800 Link Here

(-)gimp-2.2.4/app/core/gimpimage-convert.c (-1 / +1 lines)
794	break;	794	break;
795		795
796	case GIMP_INDEXED:	796	case GIMP_INDEXED:
797	undo_desc = _("Convert Image to Indexed");	797	undo_desc = _("Convert Image to Indexed Color");
798	break;	798	break;
799	}	799	}
800		800

Lines 64-70 Link Here

(-)gimp-2.2.4/app/core/gimpimage-qmask.c (-2 / +2 lines)
64	if (! mask)	64	if (! mask)
65	{	65	{
66	gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_QMASK,	66	gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_QMASK,
67	_("Enable Quick Mask"));	67	_("Enable Quick Mask Mode"));
68		68
69	if (gimp_channel_is_empty (selection))	69	if (gimp_channel_is_empty (selection))
70	{	70	{
Lines 114-120 Link Here
114	GimpLayer *floating_sel = gimp_image_floating_sel (gimage);	114	GimpLayer *floating_sel = gimp_image_floating_sel (gimage);
115		115
116	gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_QMASK,	116	gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_QMASK,
117	_("Disable Quick Mask"));	117	_("Disable Quick Mask Mode"));
118		118
119	if (gimage->qmask_inverted)	119	if (gimage->qmask_inverted)
120	gimp_channel_invert (mask, TRUE);	120	gimp_channel_invert (mask, TRUE);

Lines 68-74 Link Here

(-)gimp-2.2.4/app/core/gimpimage-scale.c (-1 / +1 lines)
68	g_object_freeze_notify (G_OBJECT (gimage));	68	g_object_freeze_notify (G_OBJECT (gimage));
69		69
70	gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_SCALE,	70	gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_SCALE,
71	_("Scale Image"));	71	_("Image Size"));
72		72
73	/* Push the image size to the stack */	73	/* Push the image size to the stack */
74	gimp_image_undo_push_image_size (gimage, NULL);	74	gimp_image_undo_push_image_size (gimage, NULL);





  old_has_alpha = gimp_image_has_alpha (gimage);

  gimp_image_undo_push_layer_remove (gimage, _("Delete Layer"),
                                     layer, index, active_layer);

  g_object_ref (layer);

    }

  return gimp_image_position_layer (gimage, layer, index - 1,
                                    TRUE, _("Bring Forward"));
}

gboolean

    }

  return gimp_image_position_layer (gimage, layer, index + 1,
                                    TRUE, _("Send Backward"));
}

gboolean

    }

  return gimp_image_position_layer (gimage, layer, 0,
                                    TRUE, _("Bring to Front"));
}

gboolean

    }

  return gimp_image_position_layer (gimage, layer, length - 1,
                                    TRUE, _("Send to Back"));
}

gboolean

  index = gimp_container_get_child_index (gimage->channels,
                                          GIMP_OBJECT (channel));

  gimp_image_undo_push_channel_remove (gimage, _("Delete Channel"),
                                       channel, index, active_channel);

  g_object_ref (channel);

    }

  return gimp_image_position_channel (gimage, channel, index - 1,
                                      TRUE, _("Bring Channel Forward"));
}

gboolean

    }

  return gimp_image_position_channel (gimage, channel, 0,
                                      TRUE, _("Bring Channel to Front"));
}

gboolean

    }

  return gimp_image_position_channel (gimage, channel, index + 1,
                                      TRUE, _("Send Channel Backward"));
}

gboolean

    }

  return gimp_image_position_channel (gimage, channel, length - 1,
                                      TRUE, _("Send Channel to Back"));
}

gboolean

  index = gimp_container_get_child_index (gimage->vectors,
                                          GIMP_OBJECT (vectors));

  gimp_image_undo_push_vectors_remove (gimage, _("Delete Path"),
                                       vectors, index, active_vectors);

  g_object_ref (vectors);

    }

  return gimp_image_position_vectors (gimage, vectors, index - 1,
                                      TRUE, _("Bring Path Forward"));
}

gboolean

    }

  return gimp_image_position_vectors (gimage, vectors, 0,
                                      TRUE, _("Bring Path to Front"));
}

gboolean

    }

  return gimp_image_position_vectors (gimage, vectors, index + 1,
                                      TRUE, _("Send Path Backward"));
}

gboolean

    }

  return gimp_image_position_vectors (gimage, vectors, length - 1,
                                      TRUE, _("Send Path to Back"));
}

gboolean




      /* bad magic, but maybe it has \r\n at the end of lines? */
      if (!strcmp (str, "GIMP Palette\r"))
        g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
                     _("Fatal parse error in swatch file '%s': "
                       "Missing magic header.\n"
                       "Does this file need converting from DOS?"),
                     gimp_filename_to_utf8 (filename));
      else
        g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
                     _("Fatal parse error in swatch file '%s': "
                       "Missing magic header."),
                     gimp_filename_to_utf8 (filename));


  if (! fgets (str, sizeof (str), file))
    {
      g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
                   _("Fatal parse error in swatch file '%s': "
                     "Read error in line %d."),
                   gimp_filename_to_utf8 (filename), linenum);
      fclose (file);

      gchar *utf8;

      utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1,
                               _("Invalid UTF-8 string in swatch file '%s'"),
                               gimp_filename_to_utf8 (filename));
      g_strstrip (utf8);


      if (! fgets (str, sizeof (str), file))
        {
          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
                       _("Fatal parse error in swatch file '%s': "
                         "Read error in line %d."),
                       gimp_filename_to_utf8 (filename), linenum);
          fclose (file);


          if (columns < 0 || columns > 256)
            {
              g_message (_("Reading swatch file '%s': "
                           "Invalid number of columns in line %d. "
                           "Using default value."),
                         gimp_filename_to_utf8 (filename), linenum);

          if (! fgets (str, sizeof (str), file))
            {
              g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
                           _("Fatal parse error in swatch file '%s': "
                             "Read error in line %d."),
                           gimp_filename_to_utf8 (filename), linenum);
              fclose (file);

            r = atoi (tok);
          else
            /* maybe we should just abort? */
            g_message (_("Reading swatch file '%s': "
                         "Missing RED component in line %d."),
                       gimp_filename_to_utf8 (filename), linenum);


          if (tok)
            g = atoi (tok);
          else
            g_message (_("Reading swatch '%s': "
                         "Missing GREEN component in line %d."),
                       gimp_filename_to_utf8 (filename), linenum);


          if (tok)
            b = atoi (tok);
          else
            g_message (_("Reading swatch file '%s': "
                         "Missing BLUE component in line %d."),
                       gimp_filename_to_utf8 (filename), linenum);


          if (r < 0 || r > 255 ||
              g < 0 || g > 255 ||
              b < 0 || b > 255)
            g_message (_("Reading swatch file '%s': "
                         "RGB value out of range in line %d."),
                       gimp_filename_to_utf8 (filename), linenum);


            break;

          g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
                       _("Fatal parse error in swatch file '%s': "
                         "Read error in line %d."),
                       gimp_filename_to_utf8 (filename), linenum);
          fclose (file);

Lines 200-206 Link Here

(-)gimp-2.2.4/app/core/gimpselection.c (-1 / +1 lines)
200		200
201	channel_class->feather_desc = _("Feather Selection");	201	channel_class->feather_desc = _("Feather Selection");
202	channel_class->sharpen_desc = _("Sharpen Selection");	202	channel_class->sharpen_desc = _("Sharpen Selection");
203	channel_class->clear_desc = _("Select None");	203	channel_class->clear_desc = _("Deselect");
204	channel_class->all_desc = _("Select All");	204	channel_class->all_desc = _("Select All");
205	channel_class->invert_desc = _("Invert Selection");	205	channel_class->invert_desc = _("Invert Selection");
206	channel_class->border_desc = _("Border Selection");	206	channel_class->border_desc = _("Border Selection");




            GIMP_HELP_PATTERN_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
  LISTGRID (gradient, N_("Gradients"), NULL, GIMP_STOCK_GRADIENT,
            GIMP_HELP_GRADIENT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
  LISTGRID (palette, N_("Swatches"), NULL, GIMP_STOCK_PALETTE,
            GIMP_HELP_PALETTE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
  LISTGRID (font, N_("Fonts"), NULL, GIMP_STOCK_FONT,
            GIMP_HELP_FONT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),

            GIMP_HELP_TOOLS_DIALOG, GIMP_VIEW_SIZE_SMALL),
  LISTGRID (buffer, N_("Buffers"), NULL, GIMP_STOCK_BUFFER,
            GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
  LISTGRID (document, N_("History"), N_("History"), GTK_STOCK_OPEN,
            GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE),
  LISTGRID (template, N_("Presets"), N_("Image Presets"), GIMP_STOCK_TEMPLATE,
            GIMP_HELP_TEMPLATE_DIALOG, GIMP_VIEW_SIZE_SMALL),

  /*  image related  */


  /*  display related  */
  DOCKABLE ("gimp-navigation-view",
            N_("Navigator"), N_("Display Navigator"), GIMP_STOCK_NAVIGATION,
            GIMP_HELP_NAVIGATION_DIALOG,
            dialogs_navigation_editor_new, 0, FALSE),


            GIMP_HELP_GRADIENT_EDITOR_DIALOG,
            dialogs_gradient_editor_get, 0, TRUE),
  DOCKABLE ("gimp-palette-editor",
            N_("Swatches Editor"), NULL, GIMP_STOCK_PALETTE,
            GIMP_HELP_PALETTE_EDITOR_DIALOG,
            dialogs_palette_editor_get, 0, TRUE)
};

Lines 127-133 Link Here

(-)gimp-2.2.4/app/dialogs/image-new-dialog.c (-1 / +1 lines)
127	dialog->combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0);	127	dialog->combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0);
128		128
129	gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,	129	gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
130	_("_Template:"), 0.0, 0.5,	130	_("Preset:"), 0.0, 0.5,
131	dialog->combo, 1, FALSE);	131	dialog->combo, 1, FALSE);
132		132
133	g_signal_connect (dialog->combo, "select_item",	133	g_signal_connect (dialog->combo, "select_item",

Lines 88-94 Link Here

(-)gimp-2.2.4/app/dialogs/image-scale-dialog.c (-1 / +1 lines)
88	dialog->gdisp = display;	88	dialog->gdisp = display;
89	dialog->context = context;	89	dialog->context = context;
90	dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (display->gimage),	90	dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (display->gimage),
91	_("Scale Image"), "gimp-image-scale",	91	_("Image Size"), "gimp-image-scale",
92	parent,	92	parent,
93	gimp_standard_help_func,	93	gimp_standard_help_func,
94	GIMP_HELP_IMAGE_SCALE,	94	GIMP_HELP_IMAGE_SCALE,




                                                 gimp_get_user_context (gimp));

  import_dialog->dialog =
    gimp_viewable_dialog_new (NULL, _("Import Color Table"), "gimp-palette-import",
                              GTK_STOCK_CONVERT,
                              _("Import a New Color Table"),
                              NULL,
                              gimp_standard_help_func,
                              GIMP_HELP_PALETTE_IMPORT,

  group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (import_dialog->image_radio));

  import_dialog->palettefile_radio =
    gtk_radio_button_new_with_mnemonic (group, _("Color Table _file"));
  gtk_table_attach_defaults (GTK_TABLE (table),
                             import_dialog->palettefile_radio,
                             0, 1, 2, 3);


  /*  Palette file name entry  */
  import_dialog->filename_entry =
    gimp_file_entry_new (_("Select color table file"), NULL, FALSE, FALSE);
  gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
                             NULL, 0.0, 0.5,
                             import_dialog->filename_entry, 1, FALSE);

  gtk_entry_set_text (GTK_ENTRY (import_dialog->entry),
                      gradient ? GIMP_OBJECT (gradient)->name : _("New import"));
  gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
                             _("Color Table _Name:"), 0.0, 0.5,
                             import_dialog->entry, 2, FALSE);

  /*  The # of colors  */




  gtk_widget_show (checks_vbox);

  prefs_check_button_add (object, "show-selection",
                          _("Show s_election edges"),
                          GTK_BOX (checks_vbox));
  prefs_check_button_add (object, "show-layer-boundary",
                          _("Show _layer boundary"),


    combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0);
    gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
                               _("Preset:"),  0.0, 0.5,
                               combo, 1, FALSE);

    gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL);

                            _("Default _layer & channel preview size:"),
                            GTK_TABLE (table), 0, size_group);
  prefs_enum_combo_box_add (object, "navigation-preview-size", 0, 0,
                            _("Na_vigator preview size:"),
                            GTK_TABLE (table), 1, size_group);

  /* Keyboard Shortcuts */

	GIMP_HELP_PREFS_FOLDERS_PATTERNS,
	N_("Select Pattern Folders"),
	"pattern-path", "pattern-path-writable" },
      { N_("Swatches"), N_("Swatch Folders"), "folders-palettes.png",
	GIMP_HELP_PREFS_FOLDERS_PALETTES,
	N_("Select Swatch Folders"),
        "palette-path", "palette-path-writable" },
      { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png",
	GIMP_HELP_PREFS_FOLDERS_GRADIENTS,




    FALSE, "gimprc",
    N_("The gimprc is used to store personal preferences "
       "that affect GIMP's default behavior.  "
       "Paths to search for brushes, swatches, gradients, "
       "patterns, plug-ins and modules can also configured "
       "here."),
    TREE_ITEM_DO_NOTHING

  {
    FALSE, "templaterc",
    N_("This file holds a collection of standard media sizes that "
       "serve as image presets."),
    TREE_ITEM_DO_NOTHING
  },
  {

  },
  {
    TRUE, "palettes",
    N_("This folder is used to store user defined color tables.  "
       "The GIMP checks this folder in addition to the system-wide "
       "GIMP swatches installation when searching for color tables."),
    TREE_ITEM_MKDIR
  },
  {

Lines 86-92 Link Here

(-)gimp-2.2.4/app/paint/gimpclone.c (-1 / +1 lines)
86	(* callback) (gimp,	86	(* callback) (gimp,
87	GIMP_TYPE_CLONE,	87	GIMP_TYPE_CLONE,
88	GIMP_TYPE_CLONE_OPTIONS,	88	GIMP_TYPE_CLONE_OPTIONS,
89	_("Clone"));	89	_("Clone Stamp Tool"));
90	}	90	}
91		91
92	GType	92	GType

Lines 118-124 Link Here

(-)gimp-2.2.4/app/paint/gimpconvolve.c (-1 / +1 lines)
118	(* callback) (gimp,	118	(* callback) (gimp,
119	GIMP_TYPE_CONVOLVE,	119	GIMP_TYPE_CONVOLVE,
120	GIMP_TYPE_CONVOLVE_OPTIONS,	120	GIMP_TYPE_CONVOLVE_OPTIONS,
121	_("Convolve"));	121	_("Blur/Sharpen"));
122	}	122	}
123		123
124	GType	124	GType

Lines 84-90 Link Here

(-)gimp-2.2.4/app/paint/gimpdodgeburn.c (-1 / +1 lines)
84	(* callback) (gimp,	84	(* callback) (gimp,
85	GIMP_TYPE_DODGE_BURN,	85	GIMP_TYPE_DODGE_BURN,
86	GIMP_TYPE_DODGE_BURN_OPTIONS,	86	GIMP_TYPE_DODGE_BURN_OPTIONS,
87	_("Dodge/Burn"));	87	_("Dodge/Burn Tool"));
88	}	88	}
89		89
90	GType	90	GType

Lines 61-67 Link Here

(-)gimp-2.2.4/app/paint/gimperaser.c (-1 / +1 lines)
61	(* callback) (gimp,	61	(* callback) (gimp,
62	GIMP_TYPE_ERASER,	62	GIMP_TYPE_ERASER,
63	GIMP_TYPE_ERASER_OPTIONS,	63	GIMP_TYPE_ERASER_OPTIONS,
64	_("Eraser"));	64	_("Eraser Tool"));
65	}	65	}
66		66
67	GType	67	GType

Lines 62-68 Link Here

(-)gimp-2.2.4/app/paint/gimppaintbrush.c (-1 / +1 lines)
62	(* callback) (gimp,	62	(* callback) (gimp,
63	GIMP_TYPE_PAINTBRUSH,	63	GIMP_TYPE_PAINTBRUSH,
64	GIMP_TYPE_PAINT_OPTIONS,	64	GIMP_TYPE_PAINT_OPTIONS,
65	_("Paintbrush"));	65	_("Brush Tool"));
66	}	66	}
67		67
68	GType	68	GType

Lines 35-41 Link Here

(-)gimp-2.2.4/app/paint/gimppencil.c (-1 / +1 lines)
35	(* callback) (gimp,	35	(* callback) (gimp,
36	GIMP_TYPE_PENCIL,	36	GIMP_TYPE_PENCIL,
37	GIMP_TYPE_PENCIL_OPTIONS,	37	GIMP_TYPE_PENCIL_OPTIONS,
38	_("Pencil"));	38	_("Pencil Tool"));
39	}	39	}
40		40
41	GType	41	GType

Lines 75-81 Link Here

(-)gimp-2.2.4/app/paint/gimpsmudge.c (-1 / +1 lines)
75	(* callback) (gimp,	75	(* callback) (gimp,
76	GIMP_TYPE_SMUDGE,	76	GIMP_TYPE_SMUDGE,
77	GIMP_TYPE_SMUDGE_OPTIONS,	77	GIMP_TYPE_SMUDGE_OPTIONS,
78	_("Smudge"));	78	_("Smudge Tool"));
79	}	79	}
80		80
81	GType	81	GType




  (* status_callback) (NULL, _("Palette UI"), 0.739);
  register_palette_select_procs (gimp);

  (* status_callback) (NULL, _("Swatches"), 0.746);
  register_palettes_procs (gimp);

  (* status_callback) (NULL, _("Parasite procedures"), 0.755);
  register_parasite_procs (gimp);

  (* status_callback) (NULL, _("Pen Tool"), 0.783);
  register_paths_procs (gimp);

  (* status_callback) (NULL, _("Pattern"), 0.818);

Lines 329-335 Link Here

(-)gimp-2.2.4/app/pdb/selection_tools_cmds.c (-1 / +1 lines)
329		329
330	if (success)	330	if (success)
331	gimp_channel_select_polygon (gimp_image_get_mask (gimage),	331	gimp_channel_select_polygon (gimp_image_get_mask (gimage),
332	_("Free Select"),	332	_("Lasso Tool"),
333	num_segs,	333	num_segs,
334	(GimpVector2 *) segs,	334	(GimpVector2 *) segs,
335	operation,	335	operation,




                GIMP_CONTEXT_PAINT_MODE_MASK |
                GIMP_CONTEXT_GRADIENT_MASK,
                "gimp-blend-tool",
                _("Gradient Tool"),
                _("Fill with a color gradient"),
                N_("Gradient Tool"), "L",
                NULL, GIMP_HELP_TOOL_BLEND,
                GIMP_STOCK_TOOL_BLEND,
                data);

  switch (gimp_drawable_type (drawable))
    {
    case GIMP_INDEXED_IMAGE: case GIMP_INDEXEDA_IMAGE:
      g_message (_("Gradient Tool: Invalid for indexed images."));
      return;

      break;

  gimp_tool_control_activate (tool->control);

  /* initialize the statusbar display */
  gimp_tool_push_status_coords (tool, _("Gradient: "), 0, ", ", 0);

  /*  Start drawing the blend tool  */
  gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);

      GimpProgress *progress;

      progress = gimp_progress_start (GIMP_PROGRESS (gdisp),
                                      _("Drawing Gradient..."), FALSE);

      gimp_drawable_blend (gimp_image_active_drawable (gimage),
                           context,

  gimp_tool_pop_status (tool);

  gimp_tool_push_status_coords (tool,
                                _("Gradient: "),
                                blend_tool->endx - blend_tool->startx,
                                ", ",
                                blend_tool->endy - blend_tool->starty);

Lines 88-96 Link Here

(-)gimp-2.2.4/app/tools/gimpbucketfilltool.c (-2 / +2 lines)
88	GIMP_CONTEXT_PAINT_MODE_MASK \|	88	GIMP_CONTEXT_PAINT_MODE_MASK \|
89	GIMP_CONTEXT_PATTERN_MASK,	89	GIMP_CONTEXT_PATTERN_MASK,
90	"gimp-bucket-fill-tool",	90	"gimp-bucket-fill-tool",
91	_("Bucket Fill"),	91	_("Paint Bucket Tool"),
92	_("Fill with a color or pattern"),	92	_("Fill with a color or pattern"),
93	N_("_Bucket Fill"), "<shift>B",	93	N_("Paint _Bucket Tool"), "<shift>B",
94	NULL, GIMP_HELP_TOOL_BUCKET_FILL,	94	NULL, GIMP_HELP_TOOL_BUCKET_FILL,
95	GIMP_STOCK_TOOL_BUCKET_FILL,	95	GIMP_STOCK_TOOL_BUCKET_FILL,
96	data);	96	data);

Lines 86-94 Link Here

(-)gimp-2.2.4/app/tools/gimpclonetool.c (-2 / +2 lines)
86	GIMP_PAINT_OPTIONS_CONTEXT_MASK \|	86	GIMP_PAINT_OPTIONS_CONTEXT_MASK \|
87	GIMP_CONTEXT_PATTERN_MASK,	87	GIMP_CONTEXT_PATTERN_MASK,
88	"gimp-clone-tool",	88	"gimp-clone-tool",
89	_("Clone"),	89	_("Clone Stamp Tool"),
90	_("Paint using Patterns or Image Regions"),	90	_("Paint using Patterns or Image Regions"),
91	N_("_Clone"), "C",	91	N_("_Clone Stamp Tool"), "C",
92	NULL, GIMP_HELP_TOOL_CLONE,	92	NULL, GIMP_HELP_TOOL_CLONE,
93	GIMP_STOCK_TOOL_CLONE,	93	GIMP_STOCK_TOOL_CLONE,
94	data);	94	data);

Lines 96-104 Link Here

(-)gimp-2.2.4/app/tools/gimpcolorpickertool.c (-2 / +2 lines)
96	gimp_color_picker_options_gui,	96	gimp_color_picker_options_gui,
97	0,	97	0,
98	"gimp-color-picker-tool",	98	"gimp-color-picker-tool",
99	_("Color Picker"),	99	_("Eyedropper Tool"),
100	_("Pick colors from the image"),	100	_("Pick colors from the image"),
101	N_("C_olor Picker"), "O",	101	N_("Eyedropper Tool"), "O",
102	NULL, GIMP_HELP_TOOL_COLOR_PICKER,	102	NULL, GIMP_HELP_TOOL_COLOR_PICKER,
103	GIMP_STOCK_TOOL_COLOR_PICKER,	103	GIMP_STOCK_TOOL_COLOR_PICKER,
104	data);	104	data);




                gimp_convolve_options_gui,
                GIMP_PAINT_OPTIONS_CONTEXT_MASK,
                "gimp-convolve-tool",
                _("Blur/Sharpen"),
                _("Blur or Sharpen"),
                N_("Blur/Sharpen"), "V",
                NULL, GIMP_HELP_TOOL_CONVOLVE,
                GIMP_STOCK_TOOL_BLUR,
                data);

  vbox = gimp_paint_options_gui (tool_options);

  /*  the type radio box  */
  str = g_strdup_printf (_("Mode  %s"),
                         gimp_get_mod_string (GDK_CONTROL_MASK));

  frame = gimp_prop_enum_radio_frame_new (config, "type",

Lines 67-75 Link Here

(-)gimp-2.2.4/app/tools/gimpdodgeburntool.c (-2 / +2 lines)
67	gimp_dodge_burn_options_gui,	67	gimp_dodge_burn_options_gui,
68	GIMP_PAINT_OPTIONS_CONTEXT_MASK,	68	GIMP_PAINT_OPTIONS_CONTEXT_MASK,
69	"gimp-dodge-burn-tool",	69	"gimp-dodge-burn-tool",
70	_("Dodge/Burn"),	70	_("Dodge/Burn Tool"),
71	_("Dodge or Burn strokes"),	71	_("Dodge or Burn strokes"),
72	N_("Dod_geBurn"), "<shift>D",	72	N_("Dodge/Burn Tool"), "<shift>D",
73	NULL, GIMP_HELP_TOOL_DODGE_BURN,	73	NULL, GIMP_HELP_TOOL_DODGE_BURN,
74	GIMP_STOCK_TOOL_DODGE,	74	GIMP_STOCK_TOOL_DODGE,
75	data);	75	data);

Lines 68-76 Link Here

(-)gimp-2.2.4/app/tools/gimpellipseselecttool.c (-2 / +2 lines)
68	gimp_selection_options_gui,	68	gimp_selection_options_gui,
69	0,	69	0,
70	"gimp-ellipse-select-tool",	70	"gimp-ellipse-select-tool",
71	_("Ellipse Select"),	71	_("Elliptical Marquee Tool"),
72	_("Select elliptical regions"),	72	_("Select elliptical regions"),
73	N_("_Ellipse Select"), "E",	73	N_("_Elliptical Marquee Tool"), "E",
74	NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT,	74	NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT,
75	GIMP_STOCK_TOOL_ELLIPSE_SELECT,	75	GIMP_STOCK_TOOL_ELLIPSE_SELECT,
76	data);	76	data);

Lines 67-75 Link Here

(-)gimp-2.2.4/app/tools/gimperasertool.c (-2 / +2 lines)
67	gimp_eraser_options_gui,	67	gimp_eraser_options_gui,
68	GIMP_PAINT_OPTIONS_CONTEXT_MASK,	68	GIMP_PAINT_OPTIONS_CONTEXT_MASK,
69	"gimp-eraser-tool",	69	"gimp-eraser-tool",
70	_("Eraser"),	70	_("Eraser Tool"),
71	_("Erase to background or transparency"),	71	_("Erase to background or transparency"),
72	N_("_Eraser"), "<shift>E",	72	N_("Eraser Tool"), "<shift>E",
73	NULL, GIMP_HELP_TOOL_ERASER,	73	NULL, GIMP_HELP_TOOL_ERASER,
74	GIMP_STOCK_TOOL_ERASER,	74	GIMP_STOCK_TOOL_ERASER,
75	data);	75	data);

Lines 93-101 Link Here

(-)gimp-2.2.4/app/tools/gimpfreeselecttool.c (-2 / +2 lines)
93	gimp_selection_options_gui,	93	gimp_selection_options_gui,
94	0,	94	0,
95	"gimp-free-select-tool",	95	"gimp-free-select-tool",
96	_("Free Select"),	96	_("Lasso Tool"),
97	_("Select hand-drawn regions"),	97	_("Select hand-drawn regions"),
98	N_("_Free Select"), "F",	98	N_("Lasso Tool"), "F",
99	NULL, GIMP_HELP_TOOL_FREE_SELECT,	99	NULL, GIMP_HELP_TOOL_FREE_SELECT,
100	GIMP_STOCK_TOOL_FREE_SELECT,	100	GIMP_STOCK_TOOL_FREE_SELECT,
101	data);	101	data);

Lines 94-102 Link Here

(-)gimp-2.2.4/app/tools/gimpfuzzyselecttool.c (-2 / +2 lines)
94	gimp_selection_options_gui,	94	gimp_selection_options_gui,
95	0,	95	0,
96	"gimp-fuzzy-select-tool",	96	"gimp-fuzzy-select-tool",
97	_("Fuzzy Select"),	97	_("Magic Wand Tool"),
98	_("Select contiguous regions"),	98	_("Select contiguous regions"),
99	N_("Fu_zzy Select"), "Z",	99	N_("Magic Wand Tool"), "Z",
100	NULL, GIMP_HELP_TOOL_FUZZY_SELECT,	100	NULL, GIMP_HELP_TOOL_FUZZY_SELECT,
101	GIMP_STOCK_TOOL_FUZZY_SELECT,	101	GIMP_STOCK_TOOL_FUZZY_SELECT,
102	data);	102	data);

Lines 274-282 Link Here

(-)gimp-2.2.4/app/tools/gimpiscissorstool.c (-2 / +2 lines)
274	gimp_selection_options_gui,	274	gimp_selection_options_gui,
275	0,	275	0,
276	"gimp-iscissors-tool",	276	"gimp-iscissors-tool",
277	_("Scissors"),	277	_("Magnetic Lasso Tool"),
278	_("Select shapes from image"),	278	_("Select shapes from image"),
279	N_("Intelligent _Scissors"),	279	N_("Magnetic Lasso Tool"),
280	"I",	280	"I",
281	NULL, GIMP_HELP_TOOL_ISCISSORS,	281	NULL, GIMP_HELP_TOOL_ISCISSORS,
282	GIMP_STOCK_TOOL_ISCISSORS,	282	GIMP_STOCK_TOOL_ISCISSORS,

Lines 92-100 Link Here

(-)gimp-2.2.4/app/tools/gimpmagnifytool.c (-2 / +2 lines)
92	gimp_magnify_options_gui,	92	gimp_magnify_options_gui,
93	0,	93	0,
94	"gimp-magnify-tool",	94	"gimp-magnify-tool",
95	_("Magnify"),	95	_("Zoom Tool"),
96	_("Zoom in & out"),	96	_("Zoom in & out"),
97	N_("M_agnify"), NULL,	97	N_("Zoom Tool"), NULL,
98	NULL, GIMP_HELP_TOOL_ZOOM,	98	NULL, GIMP_HELP_TOOL_ZOOM,
99	GIMP_STOCK_TOOL_ZOOM,	99	GIMP_STOCK_TOOL_ZOOM,
100	data);	100	data);

Lines 115-123 Link Here

(-)gimp-2.2.4/app/tools/gimpmeasuretool.c (-2 / +2 lines)
115	gimp_measure_options_gui,	115	gimp_measure_options_gui,
116	0,	116	0,
117	"gimp-measure-tool",	117	"gimp-measure-tool",
118	_("Measure"),	118	_("Measure Tool"),
119	_("Measure distances and angles"),	119	_("Measure distances and angles"),
120	N_("_Measure"), NULL,	120	N_("_Measure Tool"), NULL,
121	NULL, GIMP_HELP_TOOL_MEASURE,	121	NULL, GIMP_HELP_TOOL_MEASURE,
122	GIMP_STOCK_TOOL_MEASURE,	122	GIMP_STOCK_TOOL_MEASURE,
123	data);	123	data);

Lines 168-174 Link Here

(-)gimp-2.2.4/app/tools/gimpmoveoptions.c (-1 / +1 lines)
168	switch (move_options->move_type)	168	switch (move_options->move_type)
169	{	169	{
170	case GIMP_TRANSFORM_TYPE_LAYER:	170	case GIMP_TRANSFORM_TYPE_LAYER:
171	false_label = _("Pick a layer or guide");	171	false_label = _("Auto Select Layer");
172	true_label = _("Move the current layer");	172	true_label = _("Move the current layer");
173	break;	173	break;
174		174

Lines 113-121 Link Here

(-)gimp-2.2.4/app/tools/gimpmovetool.c (-2 / +2 lines)
113	gimp_move_options_gui,	113	gimp_move_options_gui,
114	0,	114	0,
115	"gimp-move-tool",	115	"gimp-move-tool",
116	_("Move"),	116	_("Move Tool"),
117	_("Move layers & selections"),	117	_("Move layers & selections"),
118	N_("_Move"), "M",	118	N_("_Move Tool"), "M",
119	NULL, GIMP_HELP_TOOL_MOVE,	119	NULL, GIMP_HELP_TOOL_MOVE,
120	GIMP_STOCK_TOOL_MOVE,	120	GIMP_STOCK_TOOL_MOVE,
121	data);	121	data);

Lines 48-56 Link Here

(-)gimp-2.2.4/app/tools/gimppaintbrushtool.c (-2 / +2 lines)
48	GIMP_PAINT_OPTIONS_CONTEXT_MASK \|	48	GIMP_PAINT_OPTIONS_CONTEXT_MASK \|
49	GIMP_CONTEXT_GRADIENT_MASK,	49	GIMP_CONTEXT_GRADIENT_MASK,
50	"gimp-paintbrush-tool",	50	"gimp-paintbrush-tool",
51	_("Paintbrush"),	51	_("Brush Tool"),
52	_("Paint fuzzy brush strokes"),	52	_("Paint fuzzy brush strokes"),
53	N_("_Paintbrush"), "P",	53	N_("Brush Tool"), "P",
54	NULL, GIMP_HELP_TOOL_PAINTBRUSH,	54	NULL, GIMP_HELP_TOOL_PAINTBRUSH,
55	GIMP_STOCK_TOOL_PAINTBRUSH,	55	GIMP_STOCK_TOOL_PAINTBRUSH,
56	data);	56	data);

Lines 48-56 Link Here

(-)gimp-2.2.4/app/tools/gimppenciltool.c (-2 / +2 lines)
48	GIMP_PAINT_OPTIONS_CONTEXT_MASK \|	48	GIMP_PAINT_OPTIONS_CONTEXT_MASK \|
49	GIMP_CONTEXT_GRADIENT_MASK,	49	GIMP_CONTEXT_GRADIENT_MASK,
50	"gimp-pencil-tool",	50	"gimp-pencil-tool",
51	_("Pencil"),	51	_("Pencil Tool"),
52	_("Paint hard edged pixels"),	52	_("Paint hard edged pixels"),
53	N_("Pe_ncil"), "N",	53	N_("Pencil Tool"), "N",
54	NULL, GIMP_HELP_TOOL_PENCIL,	54	NULL, GIMP_HELP_TOOL_PENCIL,
55	GIMP_STOCK_TOOL_PENCIL,	55	GIMP_STOCK_TOOL_PENCIL,
56	data);	56	data);

Lines 93-101 Link Here

(-)gimp-2.2.4/app/tools/gimprectselecttool.c (-2 / +2 lines)
93	gimp_selection_options_gui,	93	gimp_selection_options_gui,
94	0,	94	0,
95	"gimp-rect-select-tool",	95	"gimp-rect-select-tool",
96	_("Rect Select"),	96	_("Rectangular Marquee Tool"),
97	_("Select rectangular regions"),	97	_("Select rectangular regions"),
98	N_("_Rect Select"), "R",	98	N_("_Rectangular Marquee Tool"), "R",
99	NULL, GIMP_HELP_TOOL_RECT_SELECT,	99	NULL, GIMP_HELP_TOOL_RECT_SELECT,
100	GIMP_STOCK_TOOL_RECT_SELECT,	100	GIMP_STOCK_TOOL_RECT_SELECT,
101	data);	101	data);

Lines 51-59 Link Here

(-)gimp-2.2.4/app/tools/gimpsmudgetool.c (-2 / +2 lines)
51	gimp_smudge_options_gui,	51	gimp_smudge_options_gui,
52	GIMP_PAINT_OPTIONS_CONTEXT_MASK,	52	GIMP_PAINT_OPTIONS_CONTEXT_MASK,
53	"gimp-smudge-tool",	53	"gimp-smudge-tool",
54	_("Smudge"),	54	_("Smudge Tool"),
55	_("Smudge image"),	55	_("Smudge image"),
56	N_("_Smudge"), "S",	56	N_("_Smudge Tool"), "S",
57	NULL, GIMP_HELP_TOOL_SMUDGE,	57	NULL, GIMP_HELP_TOOL_SMUDGE,
58	GIMP_STOCK_TOOL_SMUDGE,	58	GIMP_STOCK_TOOL_SMUDGE,
59	data);	59	data);

Lines 141-149 Link Here

(-)gimp-2.2.4/app/tools/gimptexttool.c (-2 / +2 lines)
141	gimp_text_options_gui,	141	gimp_text_options_gui,
142	GIMP_CONTEXT_FOREGROUND_MASK \| GIMP_CONTEXT_FONT_MASK,	142	GIMP_CONTEXT_FOREGROUND_MASK \| GIMP_CONTEXT_FONT_MASK,
143	"gimp-text-tool",	143	"gimp-text-tool",
144	_("Text"),	144	_("Type Tool"),
145	_("Add text to the image"),	145	_("Add text to the image"),
146	N_("Te_xt"), "T",	146	N_("Type Tool"), "T",
147	NULL, GIMP_HELP_TOOL_TEXT,	147	NULL, GIMP_HELP_TOOL_TEXT,
148	GIMP_STOCK_TOOL_TEXT,	148	GIMP_STOCK_TOOL_TEXT,
149	data);	149	data);

Lines 157-163 Link Here

(-)gimp-2.2.4/app/tools/gimpvectortool.c (-1 / +1 lines)
157	gimp_vector_options_gui,	157	gimp_vector_options_gui,
158	0,	158	0,
159	"gimp-vector-tool",	159	"gimp-vector-tool",
160	_("Paths"),	160	_("Pen Tool"),
161	_("Create and edit paths"),	161	_("Create and edit paths"),
162	N_("_Paths"), "b",	162	N_("_Paths"), "b",
163	NULL, GIMP_HELP_TOOL_PATH,	163	NULL, GIMP_HELP_TOOL_PATH,




         _("Difference"),    GIMP_DIFFERENCE_MODE,    NULL,
         _("Addition"),      GIMP_ADDITION_MODE,      NULL,
         _("Subtract"),      GIMP_SUBTRACT_MODE,      NULL,
         _("Darken"),   GIMP_DARKEN_ONLY_MODE,   NULL,
         _("Lighten"),  GIMP_LIGHTEN_ONLY_MODE,  NULL,
	 "---",              0,                       NULL,
         _("Hue"),           GIMP_HUE_MODE,           NULL,
         _("Saturation"),    GIMP_SATURATION_MODE,    NULL,

         _("Difference"),    GIMP_DIFFERENCE_MODE,    NULL,
         _("Addition"),      GIMP_ADDITION_MODE,      NULL,
         _("Subtract"),      GIMP_SUBTRACT_MODE,      NULL,
         _("Darken"),   GIMP_DARKEN_ONLY_MODE,   NULL,
         _("Lighten"),  GIMP_LIGHTEN_ONLY_MODE,  NULL,
	 "---",              0,                       NULL,
         _("Hue"),           GIMP_HUE_MODE,           NULL,
         _("Saturation"),    GIMP_SATURATION_MODE,    NULL,




	<menuitem action="edit-named-copy"/>
	<menuitem action="edit-named-paste"/>
      </menu>
      <separator/>             <menu action="layers-transform-menu" name="Transform">
       <placeholder name="Rotate">
        <menuitem action="tools-scale"/>
        	<menuitem action="tools-rotate"/>
	<menuitem action="tools-shear"/>
	<menuitem action="tools-perspective"/>
	<separator/>
          <menuitem action="drawable-rotate-90"/>
          <menuitem action="drawable-rotate-270"/>
          <menuitem action="drawable-rotate-180"/>
          <menuitem action="tools-rotate-arbitrary"/>
        </placeholder>
	<separator/> <placeholder name="Flip">
          <menuitem action="drawable-flip-horizontal"/>
          <menuitem action="drawable-flip-vertical"/>
        </placeholder>
        
	<separator/>
        <menuitem action="drawable-offset"/>
      </menu>
      <placeholder name="Clear">
        <menuitem action="edit-clear"/>
      </placeholder>

        <menuitem action="vectors-stroke"/>
      </placeholder>
      <separator/>
    </menu>

    <menu action="select-menu" name="Select">
      <menuitem action="select-all"/>
      <menuitem action="select-none"/>
      <menuitem action="select-invert"/>
      <menuitem action="select-float"/>
      <menuitem action="tools-by-color-select-short"/>
      <menuitem action="vectors-selection-from-vectors"/>
      <menuitem action="dialogs-selection-editor"/>
      <separator/>
      <placeholder name="Modify">
        <menuitem action="select-feather"/>
        <menuitem action="select-sharpen"/>
        <menuitem action="select-shrink"/>
        <menuitem action="select-grow"/>
        <menuitem action="select-border"/>
      </placeholder>
      <separator/>
      <menuitem action="qmask-toggle"/>
      <menuitem action="select-save"/>
      <menuitem action="vectors-selection-to-vectors-short"/>
      <separator/>
    </menu>

<menu action="image-menu" name="Image">
      <menuitem action="view-new"/>
      <menuitem action="view-dot-for-dot"/>
      <menu action="view-zoom-menu" name="Zoom">
        <menuitem action="view-zoom-out"/>
        <menuitem action="view-zoom-in"/>
        <menuitem action="view-zoom-fit-in"/>
        <menuitem action="view-zoom-fit-to"/>
	<separator/>
        <menuitem action="view-zoom-16-1"/>
        <menuitem action="view-zoom-8-1"/>
        <menuitem action="view-zoom-4-1"/>
        <menuitem action="view-zoom-2-1"/>
        <menuitem action="view-zoom-1-1"/>
        <menuitem action="view-zoom-1-2"/>
        <menuitem action="view-zoom-1-4"/>
        <menuitem action="view-zoom-1-8"/>
        <menuitem action="view-zoom-1-16"/>
	<separator/>
        <menuitem action="view-zoom-other"/>
      </menu>
      <separator/>
      <menuitem action="view-shrink-wrap"/>
      <menuitem action="view-fullscreen"/>
      <menuitem action="view-move-to-screen"/>
      <separator/>
      <menuitem action="view-info-window"/>
      <menuitem action="view-navigation-window"/>
      <menuitem action="view-display-filters"/>
      <separator/>
      <menuitem action="view-show-selection"/>
      <menuitem action="view-show-layer-boundary"/>
      <menuitem action="view-show-guides"/>
      <menuitem action="view-snap-to-guides"/>
      <menuitem action="view-show-grid"/>
      <menuitem action="view-snap-to-grid"/>
      <menu action="view-padding-color-menu" name="Padding color">
        <menuitem action="view-padding-color-theme"/>
        <menuitem action="view-padding-color-light-check"/>
        <menuitem action="view-padding-color-dark-check"/>
        <menuitem action="view-padding-color-custom"/>
        <separator/>
        <menuitem action="view-padding-color-prefs"/>
      </menu>
      <separator/>
      <menuitem action="view-show-menubar"/>
      <menuitem action="view-show-rulers"/>
      <menuitem action="view-show-scrollbars"/>
      <menuitem action="view-show-statusbar"/>
      <separator/>
    </menu>

    <menu action="image-menu" name="Image">
      <placeholder name="New">
        <menuitem action="image-duplicate"/>
      </placeholder>
      <menu action="image-mode-menu" name="Mode">
        <menuitem action="image-convert-rgb"/>
        <menuitem action="image-convert-grayscale"/>
        <menuitem action="image-convert-indexed"/>
	<separator/>
      </menu>
      <menu action="layers-colors-menu" name="Colors">
        <menuitem action="tools-levels"/>
        <placeholder name="Levelplace"></placeholder>
        <placeholder name="Contrastplace"></placeholder>
        <menuitem action="tools-curves"/>
        <menuitem action="tools-color-balance"/>
        <menuitem action="tools-brightness-contrast"/>
        <separator/>
        <menuitem action="tools-hue-saturation"/>
        <menuitem action="drawable-desaturate"/>
        <menuitem action="tools-colorize"/>
        <placeholder name="Gradmapplace"></placeholder>
        <separator/>
        <menuitem action="drawable-invert"/>
        <menuitem action="drawable-equalize"/>
        <menuitem action="tools-threshold"/>
        <menuitem action="tools-posterize"/>
        <menuitem action="drawable-levels-stretch"/>
      
      </menu>      
      <placeholder name="New">
        <menuitem action="image-duplicate"/>
      </placeholder>
      <separator/>
      <placeholder name="Scale">
        <menuitem action="image-scale"/>
      </placeholder>
      <placeholder name="Resize">
        <menuitem action="image-resize"/>
        <menuitem action="image-resize-to-layers"/>
        <menuitem action="image-print-size"/>
      </placeholder>
      <menu action="image-transform-menu" name="Transform">
                <placeholder name="Rotate">
        <menuitem action="image-rotate-180"/>
          <menuitem action="image-flip-vertical"/>
        </placeholder>
	<separator/>
        <placeholder name="Rotate">
          <menuitem action="image-rotate-90"/>
          <menuitem action="image-rotate-270"/>
          <menuitem action="image-rotate-180"/>
        </placeholder>
	<separator/>
<placeholder name="Flip">
          <menuitem action="image-flip-horizontal"/>
          <menuitem action="image-flip-vertical"/>
        </placeholder>
      <separator/>
      </menu>
      

      <separator/>
      <placeholder name="Resize">
        <menuitem action="image-resize"/>
        <menuitem action="image-resize-to-layers"/>
        <menuitem action="image-print-size"/>
      </placeholder>
      <placeholder name="Scale">
        <menuitem action="image-scale"/>
      </placeholder>
      <placeholder name="Crop">
        <menuitem action="image-crop"/>
      </placeholder>

      <placeholder name="Structure">
        <menuitem action="image-merge-layers"/>
        <menuitem action="image-flatten"/>
      </placeholder>
      <separator/>
      <menu action="image-guides-menu" name="Guides">
      </menu>
      <menuitem action="image-configure-grid"/>
      <separator/>
    </menu>

<menu action="layers-menu" name="Layer">
      <placeholder name="New">
        <menuitem action="layers-new"/>
        <menuitem action="layers-duplicate"/>
      </placeholder>
      <placeholder name="Structure">
        <menuitem action="layers-anchor"/>
        <menuitem action="layers-merge-down"/>
        <menuitem action="layers-delete"/>
        <menuitem action="layers-text-discard"/>
      </placeholder>
      <separator/>
      <menu action="layers-stack-menu" name="Stack">
<placeholder name="Position">
          <menuitem action="layers-raise-to-top"/>
          <menuitem action="layers-select-next"/>
          <menuitem action="layers-select-top"/>
          <menuitem action="layers-select-bottom"/>
        </placeholder>
	<separator/>
        <placeholder name="Position">
          <menuitem action="layers-raise"/>
          <menuitem action="layers-lower"/>
          <menuitem action="layers-raise-to-top"/>
          <menuitem action="layers-lower-to-bottom"/>
        </placeholder>
        <separator/>
      </menu>
      <menu action="layers-colors-menu" name="Colors">
        <menuitem action="tools-color-balance"/>
        <menuitem action="tools-hue-saturation"/>
        <menuitem action="tools-colorize"/>
        <menuitem action="tools-brightness-contrast"/>
        <menuitem action="tools-threshold"/>
        <menuitem action="tools-levels"/>
        <menuitem action="tools-curves"/>
        <menuitem action="tools-posterize"/>
	<separator/>
        <menuitem action="drawable-desaturate"/>
        <menuitem action="drawable-invert"/>
	<menu action="layers-colors-auto-menu" name="Auto">
	  <menuitem action="drawable-equalize"/>
	  <menuitem action="drawable-levels-stretch"/>
	</menu>
	<separator/>
                <placeholder name="Select">
          <menuitem action="layers-select-previous"/>
          <menuitem action="layers-select-next"/>
          <menuitem action="layers-select-top"/>
          <menuitem action="layers-select-bottom"/>
        </placeholder>
        <separator/>
      </menu>
      <menu action="layers-mask-menu" name="Mask">
        <placeholder name="Modify">

        </placeholder>
	<separator/>
      </menu>
      <menu action="layers-transform-menu" name="Transform">
        <placeholder name="Flip">
          <menuitem action="drawable-flip-horizontal"/>
          <menuitem action="drawable-flip-vertical"/>
        </placeholder>
	<separator/>
        <placeholder name="Rotate">
          <menuitem action="drawable-rotate-90"/>
          <menuitem action="drawable-rotate-270"/>
          <menuitem action="drawable-rotate-180"/>
          <menuitem action="tools-rotate-arbitrary"/>
        </placeholder>
	<separator/>
        <menuitem action="drawable-offset"/>
      </menu>

<!-- Layer Properties


      </menu>

-->

      <separator/>
      <placeholder name="Resize">
        <menuitem action="layers-resize"/>
        <menuitem action="layers-resize-to-image"/>

        <menuitem action="layers-crop"/>
      </placeholder>
      <separator/>
      	      <placeholder name="Structuremerge">
	    <menuitem action="layers-merge-down"/>
        <menuitem action="image-merge-layers"/>
        <menuitem action="image-flatten"/>
      </placeholder>
    </menu>

    <menu action="select-menu" name="Select">
      <menuitem action="select-all"/>
      <menuitem action="select-none"/>
      <menuitem action="select-invert"/>
      <menuitem action="select-float"/>
      <menuitem action="tools-by-color-select-short"/>
      <menuitem action="vectors-selection-from-vectors"/>
      <menuitem action="dialogs-selection-editor"/>
      <separator/>
      <placeholder name="Modify">
        <menuitem action="select-feather"/>
        <menuitem action="select-border"/>
	    <menuitem action="select-grow"/>
	    <menuitem action="select-shrink"/> 
	    <menuitem action="select-sharpen"/>

      </placeholder>
      <separator/>
      <menuitem action="qmask-toggle"/>
      <menuitem action="select-save"/>
      <menuitem action="vectors-selection-to-vectors-short"/>
      <separator/>
    </menu>

<menu action="plug-in-menu" name="Filters">
      <menuitem action="plug-in-repeat"/>
      <menuitem action="plug-in-reshow"/>
      <menuitem action="plug-in-reset-all"/>
      <separator/>
      <menu action="plug-in-blur-menu" name="Blur"/>
      <menu action="plug-in-colors-menu" name="Colors">
	<menu action="plug-in-colors-map-menu" name="Map"/>
      </menu>
      <menu action="plug-in-noise-menu" name="Noise"/>
      <menu action="plug-in-edge-detect-menu" name="Edge-Detect"/>
      <menu action="plug-in-enhance-menu" name="Enhance"/>
      <menu action="plug-in-generic-menu" name="Generic"/>
      <separator/>
      <placeholder name="Shadowplug"></placeholder>
      <menu action="plug-in-glass-effects-menu" name="Glass Effects"/>
      <menu action="plug-in-light-effects-menu" name="Light Effects"/>
      <menu action="plug-in-distorts-menu" name="Distorts"/>
      <menu action="plug-in-artistic-menu" name="Artistic"/>
      <menu action="plug-in-map-menu" name="Map"/>
      <menu action="plug-in-render-menu" name="Render">
	<menu action="plug-in-render-clouds-menu" name="Clouds"/>
	<menu action="plug-in-render-nature-menu" name="Nature"/>
	<menu action="plug-in-render-pattern-menu" name="Pattern"/>
	<separator/>
      </menu>
      <menu action="plug-in-web-menu" name="Web"/>
      <separator/>
      <menu action="plug-in-animation-menu" name="Animation"/>
      <menu action="plug-in-combine-menu" name="Combine"/>
      <separator/>
      <menu action="plug-in-toys-menu" name="Toys"/>
    </menu>

    <menu action="view-menu" name="View">
      <menuitem action="view-new"/>
      <menuitem action="view-dot-for-dot"/>
      <menu action="view-zoom-menu" name="Zoom">
        <menuitem action="view-zoom-out"/>
        <menuitem action="view-zoom-in"/>
        <menuitem action="view-zoom-fit-in"/>
        <menuitem action="view-zoom-fit-to"/>
	<separator/>
        <menuitem action="view-zoom-16-1"/>
        <menuitem action="view-zoom-8-1"/>
        <menuitem action="view-zoom-4-1"/>
        <menuitem action="view-zoom-2-1"/>
        <menuitem action="view-zoom-1-1"/>
        <menuitem action="view-zoom-1-2"/>
        <menuitem action="view-zoom-1-4"/>
        <menuitem action="view-zoom-1-8"/>
        <menuitem action="view-zoom-1-16"/>
	<separator/>
        <menuitem action="view-zoom-other"/>
      </menu>
      <separator/>
      <menuitem action="view-shrink-wrap"/>
      <menuitem action="view-fullscreen"/>
      <menuitem action="view-move-to-screen"/>
      <separator/>
      <menuitem action="view-info-window"/>
      <menuitem action="view-navigation-window"/>
      <menuitem action="view-display-filters"/>
      <separator/>
      <menuitem action="view-show-selection"/>
      <menuitem action="view-show-layer-boundary"/>
      <menu action="image-guides-menu" name="Guides">
      <menuitem action="view-show-guides"/>
      </menu>
      
      <menuitem action="view-snap-to-guides"/>
      <menuitem action="view-show-grid"/>
      <menuitem action="view-snap-to-grid"/>
	  <menuitem action="image-configure-grid"/>
      <menu action="view-padding-color-menu" name="Padding color">
        <menuitem action="view-padding-color-theme"/>
        <menuitem action="view-padding-color-light-check"/>
        <menuitem action="view-padding-color-dark-check"/>
        <menuitem action="view-padding-color-custom"/>
        <separator/>
        <menuitem action="view-padding-color-prefs"/>
      </menu>
      <separator/>
      <menuitem action="view-show-menubar"/>
      <menuitem action="view-show-rulers"/>
      <menuitem action="view-show-scrollbars"/>
      <menuitem action="view-show-statusbar"/>
      <separator/>
    </menu> 


    <menu action="dialogs-menu" name="Dialogs">
      <menu action="dialogs-new-dock-menu" name="Create New Dock">

  <menuitem action="dialogs-error-console"/>

    </menu>
  
    <menu action="plug-in-menu" name="Filters">
      <menuitem action="plug-in-repeat"/>
      <menuitem action="plug-in-reshow"/>
      <menuitem action="plug-in-reset-all"/>
      <separator/>
      <menu action="plug-in-blur-menu" name="Blur"/>
      <menu action="plug-in-colors-menu" name="Colors">
	<menu action="plug-in-colors-map-menu" name="Map"/>
      </menu>
      <menu action="plug-in-noise-menu" name="Noise"/>
      <menu action="plug-in-edge-detect-menu" name="Edge-Detect"/>
      <menu action="plug-in-enhance-menu" name="Enhance"/>
      <menu action="plug-in-generic-menu" name="Generic"/>
      <separator/>
      <menu action="plug-in-glass-effects-menu" name="Glass Effects"/>
      <menu action="plug-in-light-effects-menu" name="Light Effects"/>
      <menu action="plug-in-distorts-menu" name="Distorts"/>
      <menu action="plug-in-artistic-menu" name="Artistic"/>
      <menu action="plug-in-map-menu" name="Map"/>
      <menu action="plug-in-render-menu" name="Render">
	<menu action="plug-in-render-clouds-menu" name="Clouds"/>
	<menu action="plug-in-render-nature-menu" name="Nature"/>
	<menu action="plug-in-render-pattern-menu" name="Pattern"/>
	<separator/>
      </menu>
      <menu action="plug-in-web-menu" name="Web"/>
      <separator/>
      <menu action="plug-in-animation-menu" name="Animation"/>
      <menu action="plug-in-combine-menu" name="Combine"/>
      <separator/>
      <menu action="plug-in-toys-menu" name="Toys"/>
    </menu>

  </menubar><menubar name="dummy-menubar"><menu action="image-popup">

   <menu action="file-menu" name="File">
      <placeholder name="New">
        <menuitem action="image-new-from-image"/>
      </placeholder>

	<menuitem action="edit-named-copy"/>
	<menuitem action="edit-named-paste"/>
      </menu>
      <separator/>             <menu action="layers-transform-menu" name="Transform">
       <placeholder name="Rotate">
        <menuitem action="tools-scale"/>
        	<menuitem action="tools-rotate"/>
	<menuitem action="tools-shear"/>
	<menuitem action="tools-perspective"/>
        <menuitem action="edit-fill-bg"/>
        <menuitem action="edit-fill-pattern"/>
      </placeholder>
      <placeholder name="Stroke">
        <menuitem action="select-stroke"/>
        <menuitem action="vectors-stroke"/>
      </placeholder>
      <separator/>
    </menu>

    <menu action="select-menu" name="Select">
      <menuitem action="select-all"/>
      <menuitem action="select-none"/>
      <menuitem action="select-invert"/>
      <menuitem action="select-float"/>
      <menuitem action="tools-by-color-select-short"/>
      <menuitem action="vectors-selection-from-vectors"/>
      <menuitem action="dialogs-selection-editor"/>
      <separator/>
      <placeholder name="Modify">
        <menuitem action="select-feather"/>
        <menuitem action="select-sharpen"/>
        <menuitem action="select-shrink"/>
        <menuitem action="select-grow"/>
        <menuitem action="select-border"/>
      </placeholder>
      <separator/>
      <menuitem action="qmask-toggle"/>
      <menuitem action="select-save"/>
      <menuitem action="vectors-selection-to-vectors-short"/>
      <separator/>
    </menu>

    <menu action="view-menu" name="View">
      <menuitem action="view-new"/>
      <menuitem action="view-dot-for-dot"/>
      <menu action="view-zoom-menu" name="Zoom">
        <menuitem action="view-zoom-out"/>
        <menuitem action="view-zoom-in"/>
        <menuitem action="view-zoom-fit-in"/>
        <menuitem action="view-zoom-fit-to"/>
	<separator/>
        <menuitem action="view-zoom-16-1"/>
        <menuitem action="view-zoom-8-1"/>
        <menuitem action="view-zoom-4-1"/>
        <menuitem action="view-zoom-2-1"/>
        <menuitem action="view-zoom-1-1"/>
        <menuitem action="view-zoom-1-2"/>
        <menuitem action="view-zoom-1-4"/>
        <menuitem action="view-zoom-1-8"/>
        <menuitem action="view-zoom-1-16"/>
	<separator/>
          <menuitem action="drawable-rotate-90"/>
          <menuitem action="drawable-rotate-270"/>
          <menuitem action="drawable-rotate-180"/>
          <menuitem action="tools-rotate-arbitrary"/>
        </placeholder>
	<separator/> <placeholder name="Flip">
          <menuitem action="drawable-flip-horizontal"/>
          <menuitem action="drawable-flip-vertical"/>
        </placeholder>
        
	<separator/>
        <menuitem action="drawable-offset"/>
      <menuitem action="view-show-layer-boundary"/>
      <menuitem action="view-show-guides"/>
      <menuitem action="view-snap-to-guides"/>
      <menuitem action="view-show-grid"/>
      <menuitem action="view-snap-to-grid"/>
      <menu action="view-padding-color-menu" name="Padding color">
        <menuitem action="view-padding-color-theme"/>
        <menuitem action="view-padding-color-light-check"/>
        <menuitem action="view-padding-color-dark-check"/>
        <menuitem action="view-padding-color-custom"/>
        <separator/>
        <menuitem action="view-padding-color-prefs"/>
      </menu>
      <placeholder name="Clear">
        <menuitem action="edit-clear"/>
      </placeholder>
      <placeholder name="Fill">
        <menuitem action="edit-fill-fg"/>
        <menuitem action="edit-fill-bg"/>
        <menuitem action="edit-fill-pattern"/>
      </placeholder>
      <placeholder name="Stroke">
        <menuitem action="select-stroke"/>
        <menuitem action="vectors-stroke"/>
      </placeholder>
      <separator/>

      <menuitem action="view-show-rulers"/>
      <menuitem action="view-show-scrollbars"/>
      <menuitem action="view-show-statusbar"/>
      <separator/>
    </menu>

<menu action="image-menu" name="Image">
      <placeholder name="New">
        <menuitem action="image-duplicate"/>
      </placeholder>

        <menuitem action="image-convert-indexed"/>
	<separator/>
      </menu>
      <menu action="layers-colors-menu" name="Colors">
        <menuitem action="tools-levels"/>
        <placeholder name="Levelplace"></placeholder>
        <placeholder name="Contrastplace"></placeholder>
        <menuitem action="tools-curves"/>
        <menuitem action="tools-color-balance"/>
        <menuitem action="tools-brightness-contrast"/>
        <separator/>
        <menuitem action="tools-hue-saturation"/>
        <menuitem action="drawable-desaturate"/>
        <menuitem action="tools-colorize"/>
        <placeholder name="Gradmapplace"></placeholder>
        <separator/>
        <menuitem action="drawable-invert"/>
        <menuitem action="drawable-equalize"/>
        <menuitem action="tools-threshold"/>
        <menuitem action="tools-posterize"/>
        <menuitem action="drawable-levels-stretch"/>
      
      </menu>      

      <separator/>
      <placeholder name="Scale">
        <menuitem action="image-scale"/>
      </placeholder>
      <placeholder name="Resize">
        <menuitem action="image-resize"/>
        <menuitem action="image-resize-to-layers"/>
        <menuitem action="image-print-size"/>
      </placeholder>
      <menu action="image-transform-menu" name="Transform">
                <placeholder name="Rotate">
        <menuitem action="image-rotate-180"/>
          <menuitem action="image-rotate-90"/>
          <menuitem action="image-rotate-270"/>
        </placeholder>
	<separator/>
<placeholder name="Flip">
          <menuitem action="image-flip-horizontal"/>
          <menuitem action="image-flip-vertical"/>
        </placeholder>
      <separator/>
      <placeholder name="Structure">
        <menuitem action="image-merge-layers"/>
        <menuitem action="image-flatten"/>
      </placeholder>
      <separator/>
      <menu action="image-guides-menu" name="Guides">
      </menu>
      

      <separator/>
      <placeholder name="Crop">
        <menuitem action="image-crop"/>
      </placeholder>

    </menu>

<menu action="layers-menu" name="Layer">
      <placeholder name="New">
        <menuitem action="layers-new"/>
        <menuitem action="layers-duplicate"/>
      </placeholder>
      <placeholder name="Structure">
        <menuitem action="layers-anchor"/>
        <menuitem action="layers-merge-down"/>
        <menuitem action="layers-delete"/>
        <menuitem action="layers-text-discard"/>
      </placeholder>
      <separator/>
      <menu action="layers-stack-menu" name="Stack">
<placeholder name="Position">
          <menuitem action="layers-raise-to-top"/>
          <menuitem action="layers-select-next"/>
          <menuitem action="layers-select-top"/>
          <menuitem action="layers-select-bottom"/>
        </placeholder>
	<separator/>
        <placeholder name="Position">
          <menuitem action="layers-raise"/>
          <menuitem action="layers-lower"/>
          <menuitem action="layers-raise-to-top"/>
          <menuitem action="layers-lower-to-bottom"/>
        </placeholder>
        <separator/>
      </menu>
      <menu action="layers-colors-menu" name="Colors">
        <menuitem action="tools-color-balance"/>
        <menuitem action="tools-hue-saturation"/>
        <menuitem action="tools-colorize"/>
        <menuitem action="tools-brightness-contrast"/>
        <menuitem action="tools-threshold"/>
        <menuitem action="tools-levels"/>
        <menuitem action="tools-curves"/>
        <menuitem action="tools-posterize"/>
	<separator/>
        <menuitem action="drawable-desaturate"/>
        <menuitem action="drawable-invert"/>
	<menu action="layers-colors-auto-menu" name="Auto">
	  <menuitem action="drawable-equalize"/>
	  <menuitem action="drawable-levels-stretch"/>
	</menu>
	<separator/>
                <placeholder name="Select">
          <menuitem action="layers-select-previous"/>
          <menuitem action="layers-select-next"/>
          <menuitem action="layers-select-top"/>
          <menuitem action="layers-select-bottom"/>
        </placeholder>
        <separator/>
      </menu>
      <menu action="layers-mask-menu" name="Mask">
        <placeholder name="Modify">

	  <menuitem action="layers-alpha-selection-intersect"/>
        </placeholder>
	<separator/>
	      <placeholder name="Structuremerge">
	    <menuitem action="layers-merge-down"/>
        <menuitem action="image-merge-layers"/>
        <menuitem action="image-flatten"/>
      </placeholder>
        </placeholder>
	<separator/>
        <placeholder name="Rotate">
          <menuitem action="drawable-rotate-90"/>
          <menuitem action="drawable-rotate-270"/>
          <menuitem action="drawable-rotate-180"/>
          <menuitem action="tools-rotate-arbitrary"/>
        </placeholder>
	<separator/>
        <menuitem action="drawable-offset"/>
      </menu>

<!-- Layer Properties

      </menu>

-->

      <separator/>
      <placeholder name="Resize">
        <menuitem action="layers-resize"/>
        <menuitem action="layers-resize-to-image"/>

      <separator/>
    </menu>

    <menu action="select-menu" name="Select">
      <menuitem action="select-all"/>
      <menuitem action="select-none"/>
      <menuitem action="select-invert"/>
      <menuitem action="select-float"/>
      <menuitem action="tools-by-color-select-short"/>
      <menuitem action="vectors-selection-from-vectors"/>
      <menuitem action="dialogs-selection-editor"/>
      <separator/>
      <placeholder name="Modify">
        <menuitem action="select-feather"/>
        <menuitem action="select-border"/>
	    <menuitem action="select-grow"/>
	    <menuitem action="select-shrink"/> 
	    <menuitem action="select-sharpen"/>

      </placeholder>
      <separator/>
      <menuitem action="qmask-toggle"/>
      <menuitem action="select-save"/>
      <menuitem action="vectors-selection-to-vectors-short"/>
      <separator/>
    </menu>

<menu action="plug-in-menu" name="Filters">
      <menuitem action="plug-in-repeat"/>
      <menuitem action="plug-in-reshow"/>
      <menuitem action="plug-in-reset-all"/>
      <separator/>
      <menu action="plug-in-blur-menu" name="Blur"/>
      <menu action="plug-in-colors-menu" name="Colors">
	<menu action="plug-in-colors-map-menu" name="Map"/>
      </menu>
      <menu action="plug-in-noise-menu" name="Noise"/>
      <menu action="plug-in-edge-detect-menu" name="Edge-Detect"/>
      <menu action="plug-in-enhance-menu" name="Enhance"/>
      <menu action="plug-in-generic-menu" name="Generic"/>
      <separator/>
      <placeholder name="Shadowplug"></placeholder>
      <menu action="plug-in-glass-effects-menu" name="Glass Effects"/>
      <menu action="plug-in-light-effects-menu" name="Light Effects"/>
      <menu action="plug-in-distorts-menu" name="Distorts"/>
      <menu action="plug-in-artistic-menu" name="Artistic"/>
      <menu action="plug-in-map-menu" name="Map"/>
      <menu action="plug-in-render-menu" name="Render">
	<menu action="plug-in-render-clouds-menu" name="Clouds"/>
	<menu action="plug-in-render-nature-menu" name="Nature"/>
	<menu action="plug-in-render-pattern-menu" name="Pattern"/>
	<separator/>
      </menu>
      <menu action="plug-in-web-menu" name="Web"/>
      <separator/>
      <menu action="plug-in-animation-menu" name="Animation"/>
      <menu action="plug-in-combine-menu" name="Combine"/>
      <separator/>
      <menu action="plug-in-toys-menu" name="Toys"/>
    </menu>

    <menu action="view-menu" name="View">
      <menuitem action="view-new"/>
      <menuitem action="view-dot-for-dot"/>
      <menu action="view-zoom-menu" name="Zoom">
        <menuitem action="view-zoom-out"/>
        <menuitem action="view-zoom-in"/>
        <menuitem action="view-zoom-fit-in"/>
        <menuitem action="view-zoom-fit-to"/>
	<separator/>
        <menuitem action="view-zoom-16-1"/>
        <menuitem action="view-zoom-8-1"/>
        <menuitem action="view-zoom-4-1"/>
        <menuitem action="view-zoom-2-1"/>
        <menuitem action="view-zoom-1-1"/>
        <menuitem action="view-zoom-1-2"/>
        <menuitem action="view-zoom-1-4"/>
        <menuitem action="view-zoom-1-8"/>
        <menuitem action="view-zoom-1-16"/>
	<separator/>
        <menuitem action="view-zoom-other"/>
      </menu>
      <separator/>
      <menuitem action="view-shrink-wrap"/>
      <menuitem action="view-fullscreen"/>
      <menuitem action="view-move-to-screen"/>
      <separator/>
      <menuitem action="view-info-window"/>
      <menuitem action="view-navigation-window"/>
      <menuitem action="view-display-filters"/>
      <separator/>
      <menuitem action="view-show-selection"/>
      <menuitem action="view-show-layer-boundary"/>
      <menu action="image-guides-menu" name="Guides">
      <menuitem action="view-show-guides"/>
      </menu>
      
      <menuitem action="view-snap-to-guides"/>
      <menuitem action="view-show-grid"/>
      <menuitem action="view-snap-to-grid"/>
	  <menuitem action="image-configure-grid"/>
      <menu action="view-padding-color-menu" name="Padding color">
        <menuitem action="view-padding-color-theme"/>
        <menuitem action="view-padding-color-light-check"/>
        <menuitem action="view-padding-color-dark-check"/>
        <menuitem action="view-padding-color-custom"/>
        <separator/>
        <menuitem action="view-padding-color-prefs"/>
      </menu>
      <separator/>
      <menuitem action="view-show-menubar"/>
      <menuitem action="view-show-rulers"/>
      <menuitem action="view-show-scrollbars"/>
      <menuitem action="view-show-statusbar"/>
      <separator/>
    </menu> 

    <menu action="tools-menu" name="Tools">
      <menuitem action="dialogs-toolbox"/>
      <menuitem action="context-colors-default"/>

      <menuitem action="tools-measure"/>
      <menuitem action="tools-text"/>
    </menu>
    
    <menu action="dialogs-menu" name="Dialogs">
      <menu action="dialogs-new-dock-menu" name="Create New Dock">
	<menuitem action="dialogs-new-dock-lcp"/>


    </menu>

    <menu action="plug-in-menu" name="Filters">
      <menuitem action="plug-in-repeat"/>
      <menuitem action="plug-in-reshow"/>
      <menuitem action="plug-in-reset-all"/>
      <separator/>
      <menu action="plug-in-blur-menu" name="Blur"/>
      <menu action="plug-in-colors-menu" name="Colors">
	<menu action="plug-in-colors-map-menu" name="Map"/>
      </menu>
      <menu action="plug-in-noise-menu" name="Noise"/>
      <menu action="plug-in-edge-detect-menu" name="Edge-Detect"/>
      <menu action="plug-in-enhance-menu" name="Enhance"/>
      <menu action="plug-in-generic-menu" name="Generic"/>
      <separator/>
      <menu action="plug-in-glass-effects-menu" name="Glass Effects"/>
      <menu action="plug-in-light-effects-menu" name="Light Effects"/>
      <menu action="plug-in-distorts-menu" name="Distorts"/>
      <menu action="plug-in-artistic-menu" name="Artistic"/>
      <menu action="plug-in-map-menu" name="Map"/>
      <menu action="plug-in-render-menu" name="Render">
	<menu action="plug-in-render-clouds-menu" name="Clouds"/>
	<menu action="plug-in-render-nature-menu" name="Nature"/>
	<menu action="plug-in-render-pattern-menu" name="Pattern"/>
	<separator/>
      </menu>
      <menu action="plug-in-web-menu" name="Web"/>
      <separator/>
      <menu action="plug-in-animation-menu" name="Animation"/>
      <menu action="plug-in-combine-menu" name="Combine"/>
      <separator/>
      <menu action="plug-in-toys-menu" name="Toys"/>
    </menu>

  </menu></menubar>

</ui>




			  "Scott Goehring and Federico Mena Quintero",
			  "Scott Goehring and Federico Mena Quintero",
			  "1997",
			  N_("Auto Contrast _HSV"),
			  "RGB*, INDEXED*",
			  GIMP_PLUGIN,
			  G_N_ELEMENTS (args), 0,
			  args, NULL);

  gimp_plugin_menu_register ("plug_in_autostretch_hsv",
                             "<Image>/Image/Colors/Contrastplace");
}

static void




                          "Federico Mena Quintero",
                          "Federico Mena Quintero",
                          "1996",
                          N_("Auto Contrast"),
                          "RGB*, GRAY*, INDEXED*",
                          GIMP_PLUGIN,
                          G_N_ELEMENTS (args), 0,
                          args, NULL);

  gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Image/Colors/Contrastplace");
}

static void

Lines 114-120 Link Here

(-)gimp-2.2.4/plug-ins/common/ccanalyze.c (-1 lines)
114	args, return_vals);	114	args, return_vals);
115		115
116	gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Filters/Colors");	116	gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Filters/Colors");
117	gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Layer/Colors/Info");
118	}	117	}
119		118
120	/* main function */	119	/* main function */

Lines 84-90 Link Here

(-)gimp-2.2.4/plug-ins/common/color_enhance.c (-1 / +1 lines)
84	args, NULL);	84	args, NULL);
85		85
86	gimp_plugin_menu_register ("plug_in_color_enhance",	86	gimp_plugin_menu_register ("plug_in_color_enhance",
87	"<Image>/Layer/Colors/Auto");	87	"<Image>/Image/Colors/Gradmapplace");
88	}	88	}
89		89
90	static void	90	static void

Lines 89-95 Link Here

(-)gimp-2.2.4/plug-ins/common/gradmap.c (-1 / +1 lines)
89	G_N_ELEMENTS (args), 0,	89	G_N_ELEMENTS (args), 0,
90	args, NULL);	90	args, NULL);
91		91
92	gimp_plugin_menu_register ("plug_in_gradmap", "<Image>/Filters/Colors/Map");	92	gimp_plugin_menu_register ("plug_in_gradmap", "<Image>/Image/Colors/Gradmapplace");
93	}	93	}
94		94
95	static void	95	static void

Lines 75-81 Link Here

(-)gimp-2.2.4/plug-ins/common/guillotine.c (-1 / +1 lines)
75	G_N_ELEMENTS (args), 0,	75	G_N_ELEMENTS (args), 0,
76	args, NULL);	76	args, NULL);
77		77
78	gimp_plugin_menu_register ("plug_in_guillotine", "<Image>/Image/Transform");	78	gimp_plugin_menu_register ("plug_in_guillotine", "<Image>/Edit/Transform");
79	}	79	}
80		80
81	static void	81	static void




			  "Adam D. Moss, Federico Mena Quintero",
			  "Adam D. Moss, Federico Mena Quintero",
			  "1997",
			  N_("Auto Levels"),
			  "RGB*, GRAY*, INDEXED*",
			  GIMP_PLUGIN,
			  G_N_ELEMENTS (args), 0,
			  args, NULL);

  gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Image/Colors/Levelplace");
}

static void

Lines 175-178 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/drop-shadow.scm (-1 / +1 lines)
175	SF-TOGGLE _"Allow resizing" TRUE)	175	SF-TOGGLE _"Allow resizing" TRUE)
176		176
177	(script-fu-menu-register "script-fu-drop-shadow"	177	(script-fu-menu-register "script-fu-drop-shadow"
178	_"<Image>/Script-Fu/Shadow")	178	_"<Image>/Filters/Shadowplug/Shadows")

Lines 34-37 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/guides-from-selection.scm (-1 / +1 lines)
34	SF-DRAWABLE "Drawable" 0)	34	SF-DRAWABLE "Drawable" 0)
35		35
36	(script-fu-menu-register "script-fu-guides-from-selection"	36	(script-fu-menu-register "script-fu-guides-from-selection"
37	"<Image>/Image/Guides")	37	"<Image>/View/Guides")

Lines 37-40 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/guides-new-percent.scm (-1 / +1 lines)
37	SF-ADJUSTMENT _"Position (in %)" '(50 0 100 1 10 0 1))	37	SF-ADJUSTMENT _"Position (in %)" '(50 0 100 1 10 0 1))
38		38
39	(script-fu-menu-register "script-fu-guide-new-percent"	39	(script-fu-menu-register "script-fu-guide-new-percent"
40	"<Image>/Image/Guides")	40	"<Image>/View/Guides")

Lines 34-37 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/guides-new.scm (-1 / +1 lines)
34	SF-ADJUSTMENT "Position" '(0 0 262144 1 10 0 1))	34	SF-ADJUSTMENT "Position" '(0 0 262144 1 10 0 1))
35		35
36	(script-fu-menu-register "script-fu-guide-new"	36	(script-fu-menu-register "script-fu-guide-new"
37	"<Image>/Image/Guides")	37	"<Image>/View/Guides")

Lines 24-27 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/guides-remove-all.scm (-1 / +1 lines)
24	SF-DRAWABLE "Drawable" 0)	24	SF-DRAWABLE "Drawable" 0)
25		25
26	(script-fu-menu-register "script-fu-guides-remove"	26	(script-fu-menu-register "script-fu-guides-remove"
27	"<Image>/Image/Guides")	27	"<Image>/View/Guides")

Lines 193-196 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/perspective-shadow.scm (-1 / +1 lines)
193	SF-TOGGLE _"Allow resizing" FALSE)	193	SF-TOGGLE _"Allow resizing" FALSE)
194		194
195	(script-fu-menu-register "script-fu-perspective-shadow"	195	(script-fu-menu-register "script-fu-perspective-shadow"
196	_"<Image>/Script-Fu/Shadow")	196	_"<Image>/Filters/Shadowplug/Shadows")

Lines 131-134 Link Here

(-)gimp-2.2.4/plug-ins/script-fu/scripts/xach-effect.scm (-1 / +1 lines)
131	SF-TOGGLE _"Keep selection" TRUE)	131	SF-TOGGLE _"Keep selection" TRUE)
132		132
133	(script-fu-menu-register "script-fu-xach-effect"	133	(script-fu-menu-register "script-fu-xach-effect"
134	_"<Image>/Script-Fu/Shadow")	134	_"<Image>/Filters/Shadowplug/Shadows")

Lines 195-201 Link Here

(-)gimp-2.2.4/tools/pdbgen/pdb/selection_tools.pdb (-1 / +1 lines)
195	%invoke = (	195	%invoke = (
196	code => <<'CODE'	196	code => <<'CODE'
197	gimp_channel_select_polygon (gimp_image_get_mask (gimage),	197	gimp_channel_select_polygon (gimp_image_get_mask (gimage),
198	_("Free Select"),	198	_("Lasso Tool"),
199	num_segs,	199	num_segs,
200	(GimpVector2 *) segs,	200	(GimpVector2 *) segs,
201	operation,	201	operation,

Return to bug 87553

Lines 2742-2748 Link Here

(-)gimp-2.2.4/app/core/gimpimage.c (-15 / +15 lines)
2742		2742
2743	old_has_alpha = gimp_image_has_alpha (gimage);	2743	old_has_alpha = gimp_image_has_alpha (gimage);
2744		2744
2745	gimp_image_undo_push_layer_remove (gimage, _("Remove Layer"),	2745	gimp_image_undo_push_layer_remove (gimage, _("Delete Layer"),
2746	layer, index, active_layer);	2746	layer, index, active_layer);
2747		2747
2748	g_object_ref (layer);	2748	g_object_ref (layer);
Lines 2824-2830 Link Here
2824	}	2824	}
2825		2825
2826	return gimp_image_position_layer (gimage, layer, index - 1,	2826	return gimp_image_position_layer (gimage, layer, index - 1,
2827	TRUE, _("Raise Layer"));	2827	TRUE, _("Bring Forward"));
2828	}	2828	}
2829		2829
2830	gboolean	2830	gboolean
Lines 2846-2852 Link Here
2846	}	2846	}
2847		2847
2848	return gimp_image_position_layer (gimage, layer, index + 1,	2848	return gimp_image_position_layer (gimage, layer, index + 1,
2849	TRUE, _("Lower Layer"));	2849	TRUE, _("Send Backward"));
2850	}	2850	}
2851		2851
2852	gboolean	2852	gboolean
Lines 2874-2880 Link Here
2874	}	2874	}
2875		2875
2876	return gimp_image_position_layer (gimage, layer, 0,	2876	return gimp_image_position_layer (gimage, layer, 0,
2877	TRUE, _("Raise Layer to Top"));	2877	TRUE, _("Bring to Front"));
2878	}	2878	}
2879		2879
2880	gboolean	2880	gboolean
Lines 2899-2905 Link Here
2899	}	2899	}
2900		2900
2901	return gimp_image_position_layer (gimage, layer, length - 1,	2901	return gimp_image_position_layer (gimage, layer, length - 1,
2902	TRUE, _("Lower Layer to Bottom"));	2902	TRUE, _("Send to Back"));
2903	}	2903	}
2904		2904
2905	gboolean	2905	gboolean
Lines 3035-3041 Link Here
3035	index = gimp_container_get_child_index (gimage->channels,	3035	index = gimp_container_get_child_index (gimage->channels,
3036	GIMP_OBJECT (channel));	3036	GIMP_OBJECT (channel));
3037		3037
3038	gimp_image_undo_push_channel_remove (gimage, _("Remove Channel"),	3038	gimp_image_undo_push_channel_remove (gimage, _("Delete Channel"),
3039	channel, index, active_channel);	3039	channel, index, active_channel);
3040		3040
3041	g_object_ref (channel);	3041	g_object_ref (channel);
Lines 3084-3090 Link Here
3084	}	3084	}
3085		3085
3086	return gimp_image_position_channel (gimage, channel, index - 1,	3086	return gimp_image_position_channel (gimage, channel, index - 1,
3087	TRUE, _("Raise Channel"));	3087	TRUE, _("Bring Channel Forward"));
3088	}	3088	}
3089		3089
3090	gboolean	3090	gboolean
Lines 3106-3112 Link Here
3106	}	3106	}
3107		3107
3108	return gimp_image_position_channel (gimage, channel, 0,	3108	return gimp_image_position_channel (gimage, channel, 0,
3109	TRUE, _("Raise Channel to Top"));	3109	TRUE, _("Bring Channel to Front"));
3110	}	3110	}
3111		3111
3112	gboolean	3112	gboolean
Lines 3128-3134 Link Here
3128	}	3128	}
3129		3129
3130	return gimp_image_position_channel (gimage, channel, index + 1,	3130	return gimp_image_position_channel (gimage, channel, index + 1,
3131	TRUE, _("Lower Channel"));	3131	TRUE, _("Send Channel Backward"));
3132	}	3132	}
3133		3133
3134	gboolean	3134	gboolean
Lines 3153-3159 Link Here
3153	}	3153	}
3154		3154
3155	return gimp_image_position_channel (gimage, channel, length - 1,	3155	return gimp_image_position_channel (gimage, channel, length - 1,
3156	TRUE, _("Lower Channel to Bottom"));	3156	TRUE, _("Send Channel to Back"));
3157	}	3157	}
3158		3158
3159	gboolean	3159	gboolean
Lines 3273-3279 Link Here
3273	index = gimp_container_get_child_index (gimage->vectors,	3273	index = gimp_container_get_child_index (gimage->vectors,
3274	GIMP_OBJECT (vectors));	3274	GIMP_OBJECT (vectors));
3275		3275
3276	gimp_image_undo_push_vectors_remove (gimage, _("Remove Path"),	3276	gimp_image_undo_push_vectors_remove (gimage, _("Delete Path"),
3277	vectors, index, active_vectors);	3277	vectors, index, active_vectors);
3278		3278
3279	g_object_ref (vectors);	3279	g_object_ref (vectors);
Lines 3322-3328 Link Here
3322	}	3322	}
3323		3323
3324	return gimp_image_position_vectors (gimage, vectors, index - 1,	3324	return gimp_image_position_vectors (gimage, vectors, index - 1,
3325	TRUE, _("Raise Path"));	3325	TRUE, _("Bring Path Forward"));
3326	}	3326	}
3327		3327
3328	gboolean	3328	gboolean
Lines 3344-3350 Link Here
3344	}	3344	}
3345		3345
3346	return gimp_image_position_vectors (gimage, vectors, 0,	3346	return gimp_image_position_vectors (gimage, vectors, 0,
3347	TRUE, _("Raise Path to Top"));	3347	TRUE, _("Bring Path to Front"));
3348	}	3348	}
3349		3349
3350	gboolean	3350	gboolean
Lines 3366-3372 Link Here
3366	}	3366	}
3367		3367
3368	return gimp_image_position_vectors (gimage, vectors, index + 1,	3368	return gimp_image_position_vectors (gimage, vectors, index + 1,
3369	TRUE, _("Lower Path"));	3369	TRUE, _("Send Path Backward"));
3370	}	3370	}
3371		3371
3372	gboolean	3372	gboolean
Lines 3391-3397 Link Here
3391	}	3391	}
3392		3392
3393	return gimp_image_position_vectors (gimage, vectors, length - 1,	3393	return gimp_image_position_vectors (gimage, vectors, length - 1,
3394	TRUE, _("Lower Path to Bottom"));	3394	TRUE, _("Send Path to Back"));
3395	}	3395	}
3396		3396
3397	gboolean	3397	gboolean

Lines 372-384 Link Here

(-)gimp-2.2.4/app/core/gimppalette.c (-12 / +12 lines)
372	/* bad magic, but maybe it has \r\n at the end of lines? */	372	/* bad magic, but maybe it has \r\n at the end of lines? */
373	if (!strcmp (str, "GIMP Palette\r"))	373	if (!strcmp (str, "GIMP Palette\r"))
374	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,	374	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
375	_("Fatal parse error in palette file '%s': "	375	_("Fatal parse error in swatch file '%s': "
376	"Missing magic header.\n"	376	"Missing magic header.\n"
377	"Does this file need converting from DOS?"),	377	"Does this file need converting from DOS?"),
378	gimp_filename_to_utf8 (filename));	378	gimp_filename_to_utf8 (filename));
379	else	379	else
380	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,	380	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
381	_("Fatal parse error in palette file '%s': "	381	_("Fatal parse error in swatch file '%s': "
382	"Missing magic header."),	382	"Missing magic header."),
383	gimp_filename_to_utf8 (filename));	383	gimp_filename_to_utf8 (filename));
384		384
Lines 392-398 Link Here
392	if (! fgets (str, sizeof (str), file))	392	if (! fgets (str, sizeof (str), file))
393	{	393	{
394	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,	394	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
395	_("Fatal parse error in palette file '%s': "	395	_("Fatal parse error in swatch file '%s': "
396	"Read error in line %d."),	396	"Read error in line %d."),
397	gimp_filename_to_utf8 (filename), linenum);	397	gimp_filename_to_utf8 (filename), linenum);
398	fclose (file);	398	fclose (file);
Lines 407-413 Link Here
407	gchar *utf8;	407	gchar *utf8;
408		408
409	utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1,	409	utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1,
410	_("Invalid UTF-8 string in palette file '%s'"),	410	_("Invalid UTF-8 string in swatch file '%s'"),
411	gimp_filename_to_utf8 (filename));	411	gimp_filename_to_utf8 (filename));
412	g_strstrip (utf8);	412	g_strstrip (utf8);
413		413
Lines 417-423 Link Here
417	if (! fgets (str, sizeof (str), file))	417	if (! fgets (str, sizeof (str), file))
418	{	418	{
419	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,	419	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
420	_("Fatal parse error in palette file '%s': "	420	_("Fatal parse error in swatch file '%s': "
421	"Read error in line %d."),	421	"Read error in line %d."),
422	gimp_filename_to_utf8 (filename), linenum);	422	gimp_filename_to_utf8 (filename), linenum);
423	fclose (file);	423	fclose (file);
Lines 435-441 Link Here
435		435
436	if (columns < 0 \|\| columns > 256)	436	if (columns < 0 \|\| columns > 256)
437	{	437	{
438	g_message (_("Reading palette file '%s': "	438	g_message (_("Reading swatch file '%s': "
439	"Invalid number of columns in line %d. "	439	"Invalid number of columns in line %d. "
440	"Using default value."),	440	"Using default value."),
441	gimp_filename_to_utf8 (filename), linenum);	441	gimp_filename_to_utf8 (filename), linenum);
Lines 447-453 Link Here
447	if (! fgets (str, sizeof (str), file))	447	if (! fgets (str, sizeof (str), file))
448	{	448	{
449	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,	449	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
450	_("Fatal parse error in palette file '%s': "	450	_("Fatal parse error in swatch file '%s': "
451	"Read error in line %d."),	451	"Read error in line %d."),
452	gimp_filename_to_utf8 (filename), linenum);	452	gimp_filename_to_utf8 (filename), linenum);
453	fclose (file);	453	fclose (file);
Lines 481-487 Link Here
481	r = atoi (tok);	481	r = atoi (tok);
482	else	482	else
483	/* maybe we should just abort? */	483	/* maybe we should just abort? */
484	g_message (_("Reading palette file '%s': "	484	g_message (_("Reading swatch file '%s': "
485	"Missing RED component in line %d."),	485	"Missing RED component in line %d."),
486	gimp_filename_to_utf8 (filename), linenum);	486	gimp_filename_to_utf8 (filename), linenum);
487		487
Lines 489-495 Link Here
489	if (tok)	489	if (tok)
490	g = atoi (tok);	490	g = atoi (tok);
491	else	491	else
492	g_message (_("Reading palette '%s': "	492	g_message (_("Reading swatch '%s': "
493	"Missing GREEN component in line %d."),	493	"Missing GREEN component in line %d."),
494	gimp_filename_to_utf8 (filename), linenum);	494	gimp_filename_to_utf8 (filename), linenum);
495		495
Lines 497-503 Link Here
497	if (tok)	497	if (tok)
498	b = atoi (tok);	498	b = atoi (tok);
499	else	499	else
500	g_message (_("Reading palette file '%s': "	500	g_message (_("Reading swatch file '%s': "
501	"Missing BLUE component in line %d."),	501	"Missing BLUE component in line %d."),
502	gimp_filename_to_utf8 (filename), linenum);	502	gimp_filename_to_utf8 (filename), linenum);
503		503
Lines 507-513 Link Here
507	if (r < 0 \|\| r > 255 \|\|	507	if (r < 0 \|\| r > 255 \|\|
508	g < 0 \|\| g > 255 \|\|	508	g < 0 \|\| g > 255 \|\|
509	b < 0 \|\| b > 255)	509	b < 0 \|\| b > 255)
510	g_message (_("Reading palette file '%s': "	510	g_message (_("Reading swatch file '%s': "
511	"RGB value out of range in line %d."),	511	"RGB value out of range in line %d."),
512	gimp_filename_to_utf8 (filename), linenum);	512	gimp_filename_to_utf8 (filename), linenum);
513		513
Lines 533-539 Link Here
533	break;	533	break;
534		534
535	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,	535	g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ,
536	_("Fatal parse error in palette file '%s': "	536	_("Fatal parse error in swatch file '%s': "
537	"Read error in line %d."),	537	"Read error in line %d."),
538	gimp_filename_to_utf8 (filename), linenum);	538	gimp_filename_to_utf8 (filename), linenum);
539	fclose (file);	539	fclose (file);

Lines 1096-1102 Link Here

(-)gimp-2.2.4/app/dialogs/preferences-dialog.c (-5 / +5 lines)
1096	gtk_widget_show (checks_vbox);	1096	gtk_widget_show (checks_vbox);
1097		1097
1098	prefs_check_button_add (object, "show-selection",	1098	prefs_check_button_add (object, "show-selection",
1099	_("Show s_election"),	1099	_("Show s_election edges"),
1100	GTK_BOX (checks_vbox));	1100	GTK_BOX (checks_vbox));
1101	prefs_check_button_add (object, "show-layer-boundary",	1101	prefs_check_button_add (object, "show-layer-boundary",
1102	_("Show _layer boundary"),	1102	_("Show _layer boundary"),
Lines 1310-1316 Link Here
1310		1310
1311	combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0);	1311	combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0);
1312	gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,	1312	gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
1313	_("_Template:"), 0.0, 0.5,	1313	_("Preset:"), 0.0, 0.5,
1314	combo, 1, FALSE);	1314	combo, 1, FALSE);
1315		1315
1316	gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL);	1316	gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL);
Lines 1377-1383 Link Here
1377	_("Default _layer & channel preview size:"),	1377	_("Default _layer & channel preview size:"),
1378	GTK_TABLE (table), 0, size_group);	1378	GTK_TABLE (table), 0, size_group);
1379	prefs_enum_combo_box_add (object, "navigation-preview-size", 0, 0,	1379	prefs_enum_combo_box_add (object, "navigation-preview-size", 0, 0,
1380	_("Na_vigation preview size:"),	1380	_("Na_vigator preview size:"),
1381	GTK_TABLE (table), 1, size_group);	1381	GTK_TABLE (table), 1, size_group);
1382		1382
1383	/* Keyboard Shortcuts */	1383	/* Keyboard Shortcuts */
Lines 2302-2310 Link Here
2302	GIMP_HELP_PREFS_FOLDERS_PATTERNS,	2302	GIMP_HELP_PREFS_FOLDERS_PATTERNS,
2303	N_("Select Pattern Folders"),	2303	N_("Select Pattern Folders"),
2304	"pattern-path", "pattern-path-writable" },	2304	"pattern-path", "pattern-path-writable" },
2305	{ N_("Palettes"), N_("Palette Folders"), "folders-palettes.png",	2305	{ N_("Swatches"), N_("Swatch Folders"), "folders-palettes.png",
2306	GIMP_HELP_PREFS_FOLDERS_PALETTES,	2306	GIMP_HELP_PREFS_FOLDERS_PALETTES,
2307	N_("Select Palette Folders"),	2307	N_("Select Swatch Folders"),
2308	"palette-path", "palette-path-writable" },	2308	"palette-path", "palette-path-writable" },
2309	{ N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png",	2309	{ N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png",
2310	GIMP_HELP_PREFS_FOLDERS_GRADIENTS,	2310	GIMP_HELP_PREFS_FOLDERS_GRADIENTS,

Lines 108-114 Link Here

(-)gimp-2.2.4/app/actions/actions.c (-5 / +5 lines)
108	{ "debug", N_("Debug"), NULL,	108	{ "debug", N_("Debug"), NULL,
109	debug_actions_setup,	109	debug_actions_setup,
110	debug_actions_update },	110	debug_actions_update },
111	{ "dialogs", N_("Dialogs"), NULL,	111	{ "dialogs", N_("Window"), NULL,
112	dialogs_actions_setup,	112	dialogs_actions_setup,
113	dialogs_actions_update },	113	dialogs_actions_update },
114	{ "dockable", N_("Dockable"), NULL,	114	{ "dockable", N_("Dockable"), NULL,
Lines 150-159 Link Here
150	{ "layers", N_("Layers"), GIMP_STOCK_LAYER,	150	{ "layers", N_("Layers"), GIMP_STOCK_LAYER,
151	layers_actions_setup,	151	layers_actions_setup,
152	layers_actions_update },	152	layers_actions_update },
153	{ "palette-editor", N_("Palette Editor"), GIMP_STOCK_PALETTE,	153	{ "palette-editor", N_("Swatches Editor"), GIMP_STOCK_PALETTE,
154	palette_editor_actions_setup,	154	palette_editor_actions_setup,
155	palette_editor_actions_update },	155	palette_editor_actions_update },
156	{ "palettes", N_("Palettes"), GIMP_STOCK_PALETTE,	156	{ "palettes", N_("Swatches"), GIMP_STOCK_PALETTE,
157	palettes_actions_setup,	157	palettes_actions_setup,
158	palettes_actions_update },	158	palettes_actions_update },
159	{ "patterns", N_("Patterns"), GIMP_STOCK_PATTERN,	159	{ "patterns", N_("Patterns"), GIMP_STOCK_PATTERN,
Lines 162-174 Link Here
162	{ "plug-in", N_("Plug-Ins"), GIMP_STOCK_PLUGIN,	162	{ "plug-in", N_("Plug-Ins"), GIMP_STOCK_PLUGIN,
163	plug_in_actions_setup,	163	plug_in_actions_setup,
164	plug_in_actions_update },	164	plug_in_actions_update },
165	{ "qmask", N_("QuickMask"), GIMP_STOCK_QMASK_ON,	165	{ "qmask", N_("Quick Mask Mode"), GIMP_STOCK_QMASK_ON,
166	qmask_actions_setup,	166	qmask_actions_setup,
167	qmask_actions_update },	167	qmask_actions_update },
168	{ "select", N_("Select"), GIMP_STOCK_SELECTION,	168	{ "select", N_("Select"), GIMP_STOCK_SELECTION,
169	select_actions_setup,	169	select_actions_setup,
170	select_actions_update },	170	select_actions_update },
171	{ "templates", N_("Templates"), GIMP_STOCK_TEMPLATE,	171	{ "templates", N_("Presets"), GIMP_STOCK_TEMPLATE,
172	templates_actions_setup,	172	templates_actions_setup,
173	templates_actions_update },	173	templates_actions_update },
174	{ "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT,	174	{ "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT,

Lines 35-41 Link Here

(-)gimp-2.2.4/app/actions/dialogs-actions.c (-7 / +7 lines)
35		35
36	static GimpActionEntry dialogs_actions[] =	36	static GimpActionEntry dialogs_actions[] =
37	{	37	{
38	{ "dialogs-menu", NULL, N_("_Dialogs") },	38	{ "dialogs-menu", NULL, N_("Window") },
39	{ "dialogs-new-dock-menu", NULL, N_("Create New Doc_k") },	39	{ "dialogs-new-dock-menu", NULL, N_("Create New Doc_k") },
40		40
41	{ "dialogs-new-dock-lcp", NULL,	41	{ "dialogs-new-dock-lcp", NULL,
Lines 54-60 Link Here
54	GIMP_HELP_DOCK },	54	GIMP_HELP_DOCK },
55		55
56	{ "dialogs-toolbox", NULL,	56	{ "dialogs-toolbox", NULL,
57	N_("Tool_box"), NULL, NULL,	57	N_("Tools"), NULL, NULL,
58	G_CALLBACK (dialogs_show_toolbox_cmd_callback),	58	G_CALLBACK (dialogs_show_toolbox_cmd_callback),
59	GIMP_HELP_TOOLBOX }	59	GIMP_HELP_TOOLBOX }
60	};	60	};
Lines 62-68 Link Here
62	GimpStringActionEntry dialogs_dockable_actions[] =	62	GimpStringActionEntry dialogs_dockable_actions[] =
63	{	63	{
64	{ "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS,	64	{ "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS,
65	N_("Tool _Options"), "<control><shift>T", NULL,	65	N_("_Options"), "<control><shift>T", NULL,
66	"gimp-tool-options",	66	"gimp-tool-options",
67	GIMP_HELP_TOOL_OPTIONS_DIALOG },	67	GIMP_HELP_TOOL_OPTIONS_DIALOG },
68		68
Lines 102-108 Link Here
102	GIMP_HELP_SELECTION_DIALOG },	102	GIMP_HELP_SELECTION_DIALOG },
103		103
104	{ "dialogs-navigation", GIMP_STOCK_NAVIGATION,	104	{ "dialogs-navigation", GIMP_STOCK_NAVIGATION,
105	N_("Na_vigation"), NULL, NULL,	105	N_("Na_vigator"), NULL, NULL,
106	"gimp-navigation-view",	106	"gimp-navigation-view",
107	GIMP_HELP_NAVIGATION_DIALOG },	107	GIMP_HELP_NAVIGATION_DIALOG },
108		108
Lines 112-118 Link Here
112	GIMP_HELP_UNDO_DIALOG },	112	GIMP_HELP_UNDO_DIALOG },
113		113
114	{ "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS,	114	{ "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS,
115	N_("Colo_rs"), NULL, NULL,	115	N_("Colo_r"), NULL, NULL,
116	"gimp-color-editor",	116	"gimp-color-editor",
117	GIMP_HELP_COLOR_DIALOG },	117	GIMP_HELP_COLOR_DIALOG },
118		118
Lines 132-138 Link Here
132	GIMP_HELP_GRADIENT_DIALOG },	132	GIMP_HELP_GRADIENT_DIALOG },
133		133
134	{ "dialogs-palettes", GIMP_STOCK_PALETTE,	134	{ "dialogs-palettes", GIMP_STOCK_PALETTE,
135	N_("Pal_ettes"), "<control>P", NULL,	135	N_("Swatches"), "<control>P", NULL,
136	"gimp-palette-list\|gimp-palette-list",	136	"gimp-palette-list\|gimp-palette-list",
137	GIMP_HELP_PALETTE_DIALOG },	137	GIMP_HELP_PALETTE_DIALOG },
138		138
Lines 157-163 Link Here
157	GIMP_HELP_DOCUMENT_DIALOG },	157	GIMP_HELP_DOCUMENT_DIALOG },
158		158
159	{ "dialogs-templates", GIMP_STOCK_TEMPLATE,	159	{ "dialogs-templates", GIMP_STOCK_TEMPLATE,
160	N_("_Templates"), "", NULL,	160	N_("Presets"), "", NULL,
161	"gimp-template-list\|gimp-template-grid",	161	"gimp-template-list\|gimp-template-grid",
162	GIMP_HELP_TEMPLATE_DIALOG },	162	GIMP_HELP_TEMPLATE_DIALOG },
163		163

Lines 85-96 Link Here

(-)gimp-2.2.4/app/actions/drawable-actions.c (-5 / +5 lines)
85	static GimpEnumActionEntry drawable_flip_actions[] =	85	static GimpEnumActionEntry drawable_flip_actions[] =
86	{	86	{
87	{ "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,	87	{ "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
88	N_("Flip _Horizontally"), NULL, NULL,	88	N_("Flip _Horizontal"), NULL, NULL,
89	GIMP_ORIENTATION_HORIZONTAL, FALSE,	89	GIMP_ORIENTATION_HORIZONTAL, FALSE,
90	GIMP_HELP_LAYER_FLIP_HORIZONTAL },	90	GIMP_HELP_LAYER_FLIP_HORIZONTAL },
91		91
92	{ "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,	92	{ "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
93	N_("Flip _Vertically"), NULL, NULL,	93	N_("Flip _Vertical"), NULL, NULL,
94	GIMP_ORIENTATION_VERTICAL, FALSE,	94	GIMP_ORIENTATION_VERTICAL, FALSE,
95	GIMP_HELP_LAYER_FLIP_VERTICAL }	95	GIMP_HELP_LAYER_FLIP_VERTICAL }
96	};	96	};
Lines 98-114 Link Here
98	static GimpEnumActionEntry drawable_rotate_actions[] =	98	static GimpEnumActionEntry drawable_rotate_actions[] =
99	{	99	{
100	{ "drawable-rotate-90", GIMP_STOCK_ROTATE_90,	100	{ "drawable-rotate-90", GIMP_STOCK_ROTATE_90,
101	N_("Rotate 90 degrees _CW"), NULL, NULL,	101	N_("Rotate 90* _CW"), NULL, NULL,
102	GIMP_ROTATE_90, FALSE,	102	GIMP_ROTATE_90, FALSE,
103	GIMP_HELP_LAYER_ROTATE_90 },	103	GIMP_HELP_LAYER_ROTATE_90 },
104		104
105	{ "drawable-rotate-180", GIMP_STOCK_ROTATE_180,	105	{ "drawable-rotate-180", GIMP_STOCK_ROTATE_180,
106	N_("Rotate _180 degrees"), NULL, NULL,	106	N_("Rotate _180*"), NULL, NULL,
107	GIMP_ROTATE_180, FALSE,	107	GIMP_ROTATE_180, FALSE,
108	GIMP_HELP_LAYER_ROTATE_180 },	108	GIMP_HELP_LAYER_ROTATE_180 },
109		109
110	{ "drawable-rotate-270", GIMP_STOCK_ROTATE_270,	110	{ "drawable-rotate-270", GIMP_STOCK_ROTATE_270,
111	N_("Rotate 90 degrees CC_W"), NULL, NULL,	111	N_("Rotate 90* CC_W"), NULL, NULL,
112	GIMP_ROTATE_270, FALSE,	112	GIMP_ROTATE_270, FALSE,
113	GIMP_HELP_LAYER_ROTATE_270 }	113	GIMP_HELP_LAYER_ROTATE_270 }
114	};	114	};

Lines 105-116 Link Here

(-)gimp-2.2.4/app/actions/gradient-editor-actions.c (-2 / +2 lines)
105	GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE },	105	GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE },
106		106
107	{ "gradient-editor-blend-color", NULL,	107	{ "gradient-editor-blend-color", NULL,
108	N_("Ble_nd Endpoints' Colors"), NULL, NULL,	108	N_("Gradient Endpoints' Colors"), NULL, NULL,
109	G_CALLBACK (gradient_editor_blend_color_cmd_callback),	109	G_CALLBACK (gradient_editor_blend_color_cmd_callback),
110	GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR },	110	GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR },
111		111
112	{ "gradient-editor-blend-opacity", NULL,	112	{ "gradient-editor-blend-opacity", NULL,
113	N_("Blend Endpoints' Opacit_y"), NULL, NULL,	113	N_("Gradient Endpoints' Opacit_y"), NULL, NULL,
114	G_CALLBACK (gradient_editor_blend_opacity_cmd_callback),	114	G_CALLBACK (gradient_editor_blend_opacity_cmd_callback),
115	GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY }	115	GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY }
116	};	116	};

Lines 58-64 Link Here

(-)gimp-2.2.4/app/actions/image-actions.c (-9 / +9 lines)
58	{ "extensions-menu", NULL, N_("_Xtns") },	58	{ "extensions-menu", NULL, N_("_Xtns") },
59	{ "image-menu", NULL, N_("_Image") },	59	{ "image-menu", NULL, N_("_Image") },
60	{ "image-mode-menu", NULL, N_("_Mode") },	60	{ "image-mode-menu", NULL, N_("_Mode") },
61	{ "image-transform-menu", NULL, N_("_Transform") },	61	{ "image-transform-menu", NULL, N_("Rotate Canvas") },
62	{ "image-guides-menu", NULL, N_("_Guides") },	62	{ "image-guides-menu", NULL, N_("_Guides") },
63		63
64	{ "image-new", GTK_STOCK_NEW,	64	{ "image-new", GTK_STOCK_NEW,
Lines 87-93 Link Here
87	GIMP_HELP_IMAGE_PRINT_SIZE },	87	GIMP_HELP_IMAGE_PRINT_SIZE },
88		88
89	{ "image-scale", GIMP_STOCK_SCALE,	89	{ "image-scale", GIMP_STOCK_SCALE,
90	N_("_Scale Image..."), NULL, NULL,	90	N_("Image _Size..."), NULL, NULL,
91	G_CALLBACK (image_scale_cmd_callback),	91	G_CALLBACK (image_scale_cmd_callback),
92	GIMP_HELP_IMAGE_SCALE },	92	GIMP_HELP_IMAGE_SCALE },
93		93
Lines 102-108 Link Here
102	GIMP_HELP_IMAGE_DUPLICATE },	102	GIMP_HELP_IMAGE_DUPLICATE },
103		103
104	{ "image-merge-layers", NULL,	104	{ "image-merge-layers", NULL,
105	N_("Merge Visible _Layers..."), "<control>M", NULL,	105	N_("Merge Visible..."), "<control>M", NULL,
106	G_CALLBACK (image_merge_layers_cmd_callback),	106	G_CALLBACK (image_merge_layers_cmd_callback),
107	GIMP_HELP_IMAGE_MERGE_LAYERS },	107	GIMP_HELP_IMAGE_MERGE_LAYERS },
108		108
Lines 130-136 Link Here
130	GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },	130	GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },
131		131
132	{ "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED,	132	{ "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED,
133	N_("_Indexed..."), NULL, NULL,	133	N_("_Indexed Color..."), NULL, NULL,
134	GIMP_INDEXED, FALSE,	134	GIMP_INDEXED, FALSE,
135	GIMP_HELP_IMAGE_CONVERT_INDEXED }	135	GIMP_HELP_IMAGE_CONVERT_INDEXED }
136	};	136	};
Lines 138-149 Link Here
138	static GimpEnumActionEntry image_flip_actions[] =	138	static GimpEnumActionEntry image_flip_actions[] =
139	{	139	{
140	{ "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,	140	{ "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
141	N_("Flip _Horizontally"), NULL, NULL,	141	N_("Flip _Horizontal"), NULL, NULL,
142	GIMP_ORIENTATION_HORIZONTAL, FALSE,	142	GIMP_ORIENTATION_HORIZONTAL, FALSE,
143	GIMP_HELP_IMAGE_FLIP_HORIZONTAL },	143	GIMP_HELP_IMAGE_FLIP_HORIZONTAL },
144		144
145	{ "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,	145	{ "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
146	N_("Flip _Vertically"), NULL, NULL,	146	N_("Flip _Vertical"), NULL, NULL,
147	GIMP_ORIENTATION_VERTICAL, FALSE,	147	GIMP_ORIENTATION_VERTICAL, FALSE,
148	GIMP_HELP_IMAGE_FLIP_VERTICAL }	148	GIMP_HELP_IMAGE_FLIP_VERTICAL }
149	};	149	};
Lines 152-168 Link Here
152	{	152	{
153	{ "image-rotate-90", GIMP_STOCK_ROTATE_90,	153	{ "image-rotate-90", GIMP_STOCK_ROTATE_90,
154	/* please use the degree symbol in the translation */	154	/* please use the degree symbol in the translation */
155	N_("Rotate 90 degrees _CW"), NULL, NULL,	155	N_("Rotate 90* _CW"), NULL, NULL,
156	GIMP_ROTATE_90, FALSE,	156	GIMP_ROTATE_90, FALSE,
157	GIMP_HELP_IMAGE_ROTATE_90 },	157	GIMP_HELP_IMAGE_ROTATE_90 },
158		158
159	{ "image-rotate-180", GIMP_STOCK_ROTATE_180,	159	{ "image-rotate-180", GIMP_STOCK_ROTATE_180,
160	N_("Rotate _180 degrees"), NULL, NULL,	160	N_("Rotate _180*"), NULL, NULL,
161	GIMP_ROTATE_180, FALSE,	161	GIMP_ROTATE_180, FALSE,
162	GIMP_HELP_IMAGE_ROTATE_180 },	162	GIMP_HELP_IMAGE_ROTATE_180 },
163		163
164	{ "image-rotate-270", GIMP_STOCK_ROTATE_270,	164	{ "image-rotate-270", GIMP_STOCK_ROTATE_270,
165	N_("Rotate 90 degrees CC_W"), NULL, NULL,	165	N_("Rotate 90* CC_W"), NULL, NULL,
166	GIMP_ROTATE_270, FALSE,	166	GIMP_ROTATE_270, FALSE,
167	GIMP_HELP_IMAGE_ROTATE_270 }	167	GIMP_HELP_IMAGE_ROTATE_270 }
168	};	168	};

Lines 49-56 Link Here

(-)gimp-2.2.4/app/actions/layers-actions.c (-12 / +12 lines)
49	GIMP_HELP_LAYER_DIALOG },	49	GIMP_HELP_LAYER_DIALOG },
50		50
51	{ "layers-menu", NULL, N_("_Layer") },	51	{ "layers-menu", NULL, N_("_Layer") },
52	{ "layers-stack-menu", NULL, N_("Stac_k") },	52	{ "layers-stack-menu", NULL, N_("Arrange") },
53	{ "layers-colors-menu", NULL, N_("_Colors") },	53	{ "layers-colors-menu", NULL, N_("Adjustments") },
54	{ "layers-colors-auto-menu", NULL, N_("_Auto") },	54	{ "layers-colors-auto-menu", NULL, N_("_Auto") },
55	{ "layers-mask-menu", NULL, N_("_Mask") },	55	{ "layers-mask-menu", NULL, N_("_Mask") },
56	{ "layers-transparency-menu", NULL, N_("Tr_ansparency") },	56	{ "layers-transparency-menu", NULL, N_("Tr_ansparency") },
Lines 95-120 Link Here
95	GIMP_HELP_LAYER_DELETE },	95	GIMP_HELP_LAYER_DELETE },
96		96
97	{ "layers-raise", GTK_STOCK_GO_UP,	97	{ "layers-raise", GTK_STOCK_GO_UP,
98	N_("_Raise Layer"), "",	98	N_("Bring Forward"), "",
99	N_("Raise layer"),	99	N_("Bring Forward"),
100	G_CALLBACK (layers_raise_cmd_callback),	100	G_CALLBACK (layers_raise_cmd_callback),
101	GIMP_HELP_LAYER_RAISE },	101	GIMP_HELP_LAYER_RAISE },
102		102
103	{ "layers-raise-to-top", GTK_STOCK_GOTO_TOP,	103	{ "layers-raise-to-top", GTK_STOCK_GOTO_TOP,
104	N_("Layer to _Top"), "",	104	N_("Bring to Front"), "",
105	N_("Raise layer to top"),	105	N_("Bring layer to front"),
106	G_CALLBACK (layers_raise_to_top_cmd_callback),	106	G_CALLBACK (layers_raise_to_top_cmd_callback),
107	GIMP_HELP_LAYER_RAISE_TO_TOP },	107	GIMP_HELP_LAYER_RAISE_TO_TOP },
108		108
109	{ "layers-lower", GTK_STOCK_GO_DOWN,	109	{ "layers-lower", GTK_STOCK_GO_DOWN,
110	N_("_Lower Layer"), "",	110	N_("Send Backward"), "",
111	N_("Lower layer"),	111	N_("Send Backward"),
112	G_CALLBACK (layers_lower_cmd_callback),	112	G_CALLBACK (layers_lower_cmd_callback),
113	GIMP_HELP_LAYER_LOWER },	113	GIMP_HELP_LAYER_LOWER },
114		114
115	{ "layers-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,	115	{ "layers-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
116	N_("Layer to _Bottom"), "",	116	N_("Send to _Back"), "",
117	N_("Lower layer to bottom"),	117	N_("Send layer to back"),
118	G_CALLBACK (layers_lower_to_bottom_cmd_callback),	118	G_CALLBACK (layers_lower_to_bottom_cmd_callback),
119	GIMP_HELP_LAYER_LOWER_TO_BOTTOM },	119	GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
120		120
Lines 130-136 Link Here
130	GIMP_HELP_LAYER_MERGE_DOWN },	130	GIMP_HELP_LAYER_MERGE_DOWN },
131		131
132	{ "layers-merge-layers", NULL,	132	{ "layers-merge-layers", NULL,
133	N_("Merge _Visible Layers..."), NULL, NULL,	133	N_("Merge _Visible..."), NULL, NULL,
134	G_CALLBACK (image_merge_layers_cmd_callback),	134	G_CALLBACK (image_merge_layers_cmd_callback),
135	GIMP_HELP_IMAGE_MERGE_LAYERS },	135	GIMP_HELP_IMAGE_MERGE_LAYERS },
136		136
Lines 178-184 Link Here
178	static GimpToggleActionEntry layers_toggle_actions[] =	178	static GimpToggleActionEntry layers_toggle_actions[] =
179	{	179	{
180	{ "layers-preserve-transparency", GIMP_STOCK_TRANSPARENCY,	180	{ "layers-preserve-transparency", GIMP_STOCK_TRANSPARENCY,
181	N_("Keep Transparency"), NULL, NULL,	181	N_("Lock transparent pixels"), NULL, NULL,
182	G_CALLBACK (layers_preserve_trans_cmd_callback),	182	G_CALLBACK (layers_preserve_trans_cmd_callback),
183	FALSE,	183	FALSE,
184	GIMP_HELP_LAYER_KEEP_TRANSPARENCY },	184	GIMP_HELP_LAYER_KEEP_TRANSPARENCY },

Lines 41-82 Link Here

(-)gimp-2.2.4/app/actions/palettes-actions.c (-15 / +15 lines)
41	static GimpActionEntry palettes_actions[] =	41	static GimpActionEntry palettes_actions[] =
42	{	42	{
43	{ "palettes-popup", GIMP_STOCK_PALETTE,	43	{ "palettes-popup", GIMP_STOCK_PALETTE,
44	N_("Palettes Menu"), NULL, NULL, NULL,	44	N_("Swatches Menu"), NULL, NULL, NULL,
45	GIMP_HELP_PALETTE_DIALOG },	45	GIMP_HELP_PALETTE_DIALOG },
46		46
47	{ "palettes-new", GTK_STOCK_NEW,	47	{ "palettes-new", GTK_STOCK_NEW,
48	N_("_New Palette"), "",	48	N_("_New Swatch"), "",
49	N_("New palette"),	49	N_("New swatch"),
50	G_CALLBACK (data_new_data_cmd_callback),	50	G_CALLBACK (data_new_data_cmd_callback),
51	GIMP_HELP_PALETTE_NEW },	51	GIMP_HELP_PALETTE_NEW },
52		52
53	{ "palettes-import", GTK_STOCK_CONVERT,	53	{ "palettes-import", GTK_STOCK_CONVERT,
54	N_("_Import Palette..."), "",	54	N_("Load Swatches..."), "",
55	N_("Import palette"),	55	N_("Load swatches"),
56	G_CALLBACK (palettes_import_palette_cmd_callback),	56	G_CALLBACK (palettes_import_palette_cmd_callback),
57	GIMP_HELP_PALETTE_IMPORT },	57	GIMP_HELP_PALETTE_IMPORT },
58		58
59	{ "palettes-duplicate", GIMP_STOCK_DUPLICATE,	59	{ "palettes-duplicate", GIMP_STOCK_DUPLICATE,
60	N_("D_uplicate Palette"), NULL,	60	N_("D_uplicate Swatches"), NULL,
61	N_("Duplicate palette"),	61	N_("Duplicate swatches"),
62	G_CALLBACK (data_duplicate_data_cmd_callback),	62	G_CALLBACK (data_duplicate_data_cmd_callback),
63	GIMP_HELP_PALETTE_DUPLICATE },	63	GIMP_HELP_PALETTE_DUPLICATE },
64		64
65	{ "palettes-merge", NULL,	65	{ "palettes-merge", NULL,
66	N_("_Merge Palettes..."), NULL,	66	N_("_Merge Swatches..."), NULL,
67	N_("Merge palettes"),	67	N_("Merge swatches"),
68	G_CALLBACK (palettes_merge_palettes_cmd_callback),	68	G_CALLBACK (palettes_merge_palettes_cmd_callback),
69	GIMP_HELP_PALETTE_MERGE },	69	GIMP_HELP_PALETTE_MERGE },
70		70
71	{ "palettes-delete", GTK_STOCK_DELETE,	71	{ "palettes-delete", GTK_STOCK_DELETE,
72	N_("_Delete Palette"), "",	72	N_("_Delete Swatches"), "",
73	N_("Delete palette"),	73	N_("Delete swatches"),
74	G_CALLBACK (data_delete_data_cmd_callback),	74	G_CALLBACK (data_delete_data_cmd_callback),
75	GIMP_HELP_PALETTE_DELETE },	75	GIMP_HELP_PALETTE_DELETE },
76		76
77	{ "palettes-refresh", GTK_STOCK_REFRESH,	77	{ "palettes-refresh", GTK_STOCK_REFRESH,
78	N_("_Refresh Palettes"), "",	78	N_("_Refresh Swatches"), "",
79	N_("Refresh palettes"),	79	N_("Refresh swatches"),
80	G_CALLBACK (data_refresh_data_cmd_callback),	80	G_CALLBACK (data_refresh_data_cmd_callback),
81	GIMP_HELP_PALETTE_REFRESH }	81	GIMP_HELP_PALETTE_REFRESH }
82	};	82	};
Lines 84-91 Link Here
84	static GimpStringActionEntry palettes_edit_actions[] =	84	static GimpStringActionEntry palettes_edit_actions[] =
85	{	85	{
86	{ "palettes-edit", GIMP_STOCK_EDIT,	86	{ "palettes-edit", GIMP_STOCK_EDIT,
87	N_("_Edit Palette..."), NULL,	87	N_("_Edit Swatch..."), NULL,
88	N_("Edit palette"),	88	N_("Edit swatch"),
89	"gimp-palette-editor",	89	"gimp-palette-editor",
90	GIMP_HELP_PALETTE_EDIT }	90	GIMP_HELP_PALETTE_EDIT }
91	};	91	};

Lines 59-82 Link Here

(-)gimp-2.2.4/app/actions/plug-in-actions.c (-5 / +5 lines)
59		59
60	static GimpActionEntry plug_in_actions[] =	60	static GimpActionEntry plug_in_actions[] =
61	{	61	{
62	{ "plug-in-menu", NULL, N_("Filte_rs") },	62	{ "plug-in-menu", NULL, N_("Filter") },
63	{ "plug-in-blur-menu", NULL, N_("_Blur") },	63	{ "plug-in-blur-menu", NULL, N_("_Blur") },
64	{ "plug-in-colors-menu", NULL, N_("_Colors") },	64	{ "plug-in-colors-menu", NULL, N_("_Colors") },
65	{ "plug-in-colors-map-menu", NULL, N_("Ma_p") },	65	{ "plug-in-colors-map-menu", NULL, N_("Ma_p") },
66	{ "plug-in-noise-menu", NULL, N_("_Noise") },	66	{ "plug-in-noise-menu", NULL, N_("_Noise") },
67	{ "plug-in-edge-detect-menu", NULL, N_("Edge-De_tect") },	67	{ "plug-in-edge-detect-menu", NULL, N_("Edge-De_tect") },
68	{ "plug-in-enhance-menu", NULL, N_("En_hance") },	68	{ "plug-in-enhance-menu", NULL, N_("En_hance") },
69	{ "plug-in-generic-menu", NULL, N_("_Generic") },	69	{ "plug-in-generic-menu", NULL, N_("Sharpen") },
70	{ "plug-in-glass-effects-menu", NULL, N_("Gla_ss Effects") },	70	{ "plug-in-glass-effects-menu", NULL, N_("Gla_ss Effects") },
71	{ "plug-in-light-effects-menu", NULL, N_("_Light Effects") },	71	{ "plug-in-light-effects-menu", NULL, N_("_Light Effects") },
72	{ "plug-in-distorts-menu", NULL, N_("_Distorts") },	72	{ "plug-in-distorts-menu", NULL, N_("_Distort") },
73	{ "plug-in-artistic-menu", NULL, N_("_Artistic") },	73	{ "plug-in-artistic-menu", NULL, N_("_Artistic") },
74	{ "plug-in-map-menu", NULL, N_("_Map") },	74	{ "plug-in-map-menu", NULL, N_("_Map") },
75	{ "plug-in-render-menu", NULL, N_("_Render") },	75	{ "plug-in-render-menu", NULL, N_("_Render") },
76	{ "plug-in-render-clouds-menu", NULL, N_("_Clouds") },	76	{ "plug-in-render-clouds-menu", NULL, N_("_Clouds") },
77	{ "plug-in-render-nature-menu", NULL, N_("_Nature") },	77	{ "plug-in-render-nature-menu", NULL, N_("_Nature") },
78	{ "plug-in-render-pattern-menu", NULL, N_("_Pattern") },	78	{ "plug-in-render-pattern-menu", NULL, N_("_Pattern") },
79	{ "plug-in-web-menu", NULL, N_("_Web") },	79	{ "plug-in-web-menu", NULL, N_("Sharpen") },
80	{ "plug-in-animation-menu", NULL, N_("An_imation") },	80	{ "plug-in-animation-menu", NULL, N_("An_imation") },
81	{ "plug-in-combine-menu", NULL, N_("C_ombine") },	81	{ "plug-in-combine-menu", NULL, N_("C_ombine") },
82	{ "plug-in-toys-menu", NULL, N_("To_ys") },	82	{ "plug-in-toys-menu", NULL, N_("To_ys") },

Lines 39-45 Link Here

(-)gimp-2.2.4/app/actions/qmask-actions.c (-3 / +3 lines)
39	static GimpActionEntry qmask_actions[] =	39	static GimpActionEntry qmask_actions[] =
40	{	40	{
41	{ "qmask-popup", NULL,	41	{ "qmask-popup", NULL,
42	N_("Quick Mask Menu"), NULL, NULL, NULL,	42	N_("Quick Mask Mode Menu"), NULL, NULL, NULL,
43	GIMP_HELP_QMASK },	43	GIMP_HELP_QMASK },
44		44
45	{ "qmask-configure", NULL,	45	{ "qmask-configure", NULL,
Lines 51-63 Link Here
51	static GimpToggleActionEntry qmask_toggle_actions[] =	51	static GimpToggleActionEntry qmask_toggle_actions[] =
52	{	52	{
53	{ "qmask-active", NULL,	53	{ "qmask-active", NULL,
54	N_("_Quick Mask Active"), NULL, NULL,	54	N_("_Quick Mask Mode Active"), NULL, NULL,
55	G_CALLBACK (qmask_toggle_cmd_callback),	55	G_CALLBACK (qmask_toggle_cmd_callback),
56	FALSE,	56	FALSE,
57	GIMP_HELP_QMASK_TOGGLE },	57	GIMP_HELP_QMASK_TOGGLE },
58		58
59	{ "qmask-toggle", GIMP_STOCK_QMASK_ON,	59	{ "qmask-toggle", GIMP_STOCK_QMASK_ON,
60	N_("Toggle _Quick Mask"), "<shift>Q", NULL,	60	N_("Toggle _Quick Mask Mode"), "<shift>Q", NULL,
61	G_CALLBACK (qmask_toggle_cmd_callback),	61	G_CALLBACK (qmask_toggle_cmd_callback),
62	FALSE,	62	FALSE,
63	GIMP_HELP_QMASK_TOGGLE }	63	GIMP_HELP_QMASK_TOGGLE }

Lines 53-65 Link Here

(-)gimp-2.2.4/app/actions/select-actions.c (-6 / +6 lines)
53	GIMP_HELP_SELECTION_ALL },	53	GIMP_HELP_SELECTION_ALL },
54		54
55	{ "select-none", GIMP_STOCK_SELECTION_NONE,	55	{ "select-none", GIMP_STOCK_SELECTION_NONE,
56	N_("_None"), "<control><shift>A",	56	N_("Deselect"), "<control><shift>A",
57	N_("Select none"),	57	N_("Deselect"),
58	G_CALLBACK (select_none_cmd_callback),	58	G_CALLBACK (select_none_cmd_callback),
59	GIMP_HELP_SELECTION_NONE },	59	GIMP_HELP_SELECTION_NONE },
60		60
61	{ "select-invert", GIMP_STOCK_INVERT,	61	{ "select-invert", GIMP_STOCK_INVERT,
62	N_("_Invert"), "<control>I",	62	N_("_Inverse"), "<control>I",
63	N_("Invert selection"),	63	N_("Invert selection"),
64	G_CALLBACK (select_invert_cmd_callback),	64	G_CALLBACK (select_invert_cmd_callback),
65	GIMP_HELP_SELECTION_INVERT },	65	GIMP_HELP_SELECTION_INVERT },
Lines 80-91 Link Here
80	GIMP_HELP_SELECTION_SHARPEN },	80	GIMP_HELP_SELECTION_SHARPEN },
81		81
82	{ "select-shrink", GIMP_STOCK_SELECTION_SHRINK,	82	{ "select-shrink", GIMP_STOCK_SELECTION_SHRINK,
83	N_("S_hrink..."), NULL, NULL,	83	N_("Contract..."), NULL, NULL,
84	G_CALLBACK (select_shrink_cmd_callback),	84	G_CALLBACK (select_shrink_cmd_callback),
85	GIMP_HELP_SELECTION_SHRINK },	85	GIMP_HELP_SELECTION_SHRINK },
86		86
87	{ "select-grow", GIMP_STOCK_SELECTION_GROW,	87	{ "select-grow", GIMP_STOCK_SELECTION_GROW,
88	N_("_Grow..."), NULL, NULL,	88	N_("Expand..."), NULL, NULL,
89	G_CALLBACK (select_grow_cmd_callback),	89	G_CALLBACK (select_grow_cmd_callback),
90	GIMP_HELP_SELECTION_GROW },	90	GIMP_HELP_SELECTION_GROW },
91		91
Lines 95-101 Link Here
95	GIMP_HELP_SELECTION_BORDER },	95	GIMP_HELP_SELECTION_BORDER },
96		96
97	{ "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,	97	{ "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,
98	N_("Save to _Channel"), NULL,	98	N_("Save Selection"), NULL,
99	N_("Save selection to channel"),	99	N_("Save selection to channel"),
100	G_CALLBACK (select_save_cmd_callback),	100	G_CALLBACK (select_save_cmd_callback),
101	GIMP_HELP_SELECTION_TO_CHANNEL },	101	GIMP_HELP_SELECTION_TO_CHANNEL },

Lines 168-178 Link Here

(-)gimp-2.2.4/app/actions/select-commands.c (-5 / +5 lines)
168	GtkWidget *edge_lock;	168	GtkWidget *edge_lock;
169	return_if_no_display (gdisp, data);	169	return_if_no_display (gdisp, data);
170		170
171	dialog = gimp_query_size_box (_("Shrink Selection"),	171	dialog = gimp_query_size_box (_("Contract Selection"),
172	gdisp->shell,	172	gdisp->shell,
173	gimp_standard_help_func,	173	gimp_standard_help_func,
174	GIMP_HELP_SELECTION_SHRINK,	174	GIMP_HELP_SELECTION_SHRINK,
175	_("Shrink selection by"),	175	_("Contract selection by"),
176	select_shrink_pixels, 1, 32767, 0,	176	select_shrink_pixels, 1, 32767, 0,
177	GIMP_DISPLAY_SHELL (gdisp->shell)->unit,	177	GIMP_DISPLAY_SHELL (gdisp->shell)->unit,
178	MIN (gdisp->gimage->xresolution,	178	MIN (gdisp->gimage->xresolution,
Lines 181-187 Link Here
181	G_OBJECT (gdisp->gimage), "disconnect",	181	G_OBJECT (gdisp->gimage), "disconnect",
182	select_shrink_callback, gdisp->gimage);	182	select_shrink_callback, gdisp->gimage);
183		183
184	edge_lock = gtk_check_button_new_with_label (_("Shrink from image border"));	184	edge_lock = gtk_check_button_new_with_label (_("Contract from image border"));
185		185
186	gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), edge_lock,	186	gtk_box_pack_start (GTK_BOX (GIMP_QUERY_BOX_VBOX (dialog)), edge_lock,
187	FALSE, FALSE, 0);	187	FALSE, FALSE, 0);
Lines 202-212 Link Here
202	GtkWidget *dialog;	202	GtkWidget *dialog;
203	return_if_no_display (gdisp, data);	203	return_if_no_display (gdisp, data);
204		204
205	dialog = gimp_query_size_box (_("Grow Selection"),	205	dialog = gimp_query_size_box (_("Expand Selection"),
206	gdisp->shell,	206	gdisp->shell,
207	gimp_standard_help_func,	207	gimp_standard_help_func,
208	GIMP_HELP_SELECTION_GROW,	208	GIMP_HELP_SELECTION_GROW,
209	_("Grow selection by"),	209	_("Expand selection by"),
210	select_grow_pixels, 1, 32767, 0,	210	select_grow_pixels, 1, 32767, 0,
211	GIMP_DISPLAY_SHELL (gdisp->shell)->unit,	211	GIMP_DISPLAY_SHELL (gdisp->shell)->unit,
212	MIN (gdisp->gimage->xresolution,	212	MIN (gdisp->gimage->xresolution,

Lines 39-73 Link Here

(-)gimp-2.2.4/app/actions/templates-actions.c (-9 / +9 lines)
39	static GimpActionEntry templates_actions[] =	39	static GimpActionEntry templates_actions[] =
40	{	40	{
41	{ "templates-popup", GIMP_STOCK_TEMPLATE,	41	{ "templates-popup", GIMP_STOCK_TEMPLATE,
42	N_("Templates Menu"), NULL, NULL, NULL,	42	N_("Preset Menu"), NULL, NULL, NULL,
43	GIMP_HELP_TEMPLATE_DIALOG },	43	GIMP_HELP_TEMPLATE_DIALOG },
44		44
45	{ "templates-create-image", GIMP_STOCK_IMAGE,	45	{ "templates-create-image", GIMP_STOCK_IMAGE,
46	N_("_Create Image from Template..."), "",	46	N_("_Create Image from Preset..."), "",
47	N_("Create a new image from the selected template"),	47	N_("Create a new image from the selected preset"),
48	G_CALLBACK (templates_create_image_cmd_callback),	48	G_CALLBACK (templates_create_image_cmd_callback),
49	GIMP_HELP_TEMPLATE_IMAGE_NEW },	49	GIMP_HELP_TEMPLATE_IMAGE_NEW },
50		50
51	{ "templates-new", GTK_STOCK_NEW,	51	{ "templates-new", GTK_STOCK_NEW,
52	N_("_New Template..."), "",	52	N_("_New Preset..."), "",
53	N_("Create a new template"),	53	N_("Create a new template"),
54	G_CALLBACK (templates_new_template_cmd_callback),	54	G_CALLBACK (templates_new_template_cmd_callback),
55	GIMP_HELP_TEMPLATE_NEW },	55	GIMP_HELP_TEMPLATE_NEW },
56		56
57	{ "templates-duplicate", GIMP_STOCK_DUPLICATE,	57	{ "templates-duplicate", GIMP_STOCK_DUPLICATE,
58	N_("D_uplicate Template..."), "",	58	N_("D_uplicate Preset..."), "",
59	N_("Duplicate the selected template"),	59	N_("Duplicate the selected preset"),
60	G_CALLBACK (templates_duplicate_template_cmd_callback),	60	G_CALLBACK (templates_duplicate_template_cmd_callback),
61	GIMP_HELP_TEMPLATE_DUPLICATE },	61	GIMP_HELP_TEMPLATE_DUPLICATE },
62		62
63	{ "templates-edit", GIMP_STOCK_EDIT,	63	{ "templates-edit", GIMP_STOCK_EDIT,
64	N_("_Edit Template..."), "",	64	N_("_Edit Preset..."), "",
65	N_("Edit the selected template"),	65	N_("Edit the selected preset"),
66	G_CALLBACK (templates_edit_template_cmd_callback),	66	G_CALLBACK (templates_edit_template_cmd_callback),
67	GIMP_HELP_TEMPLATE_EDIT },	67	GIMP_HELP_TEMPLATE_EDIT },
68		68
69	{ "templates-delete", GTK_STOCK_DELETE,	69	{ "templates-delete", GTK_STOCK_DELETE,
70	N_("_Delete Template"), "",	70	N_("_Delete Preset"), "",
71	N_("Delete the selected template"),	71	N_("Delete the selected template"),
72	G_CALLBACK (templates_delete_template_cmd_callback),	72	G_CALLBACK (templates_delete_template_cmd_callback),
73	GIMP_HELP_TEMPLATE_DELETE }	73	GIMP_HELP_TEMPLATE_DELETE }

Lines 120-129 Link Here

(-)gimp-2.2.4/app/actions/templates-commands.c (-6 / +6 lines)
120		120
121	options = template_options_dialog_new (context->gimp, NULL,	121	options = template_options_dialog_new (context->gimp, NULL,
122	GTK_WIDGET (editor),	122	GTK_WIDGET (editor),
123	_("New Template"),	123	_("New Preset"),
124	"gimp-template-new",	124	"gimp-template-new",
125	GIMP_STOCK_TEMPLATE,	125	GIMP_STOCK_TEMPLATE,
126	_("Create a New Template"),	126	_("Create a New Preset"),
127	GIMP_HELP_TEMPLATE_NEW);	127	GIMP_HELP_TEMPLATE_NEW);
128		128
129	g_signal_connect (options->dialog, "response",	129	g_signal_connect (options->dialog, "response",
Lines 182-191 Link Here
182		182
183	options = template_options_dialog_new (context->gimp, template,	183	options = template_options_dialog_new (context->gimp, template,
184	GTK_WIDGET (editor),	184	GTK_WIDGET (editor),
185	_("Edit Template"),	185	_("Edit Preset"),
186	"gimp-template-edit",	186	"gimp-template-edit",
187	GIMP_STOCK_EDIT,	187	GIMP_STOCK_EDIT,
188	_("Edit Template"),	188	_("Edit Preset"),
189	GIMP_HELP_TEMPLATE_EDIT);	189	GIMP_HELP_TEMPLATE_EDIT);
190		190
191	g_signal_connect (options->dialog, "response",	191	g_signal_connect (options->dialog, "response",
Lines 221-227 Link Here
221	delete_data->template = template;	221	delete_data->template = template;
222		222
223	dialog =	223	dialog =
224	gimp_message_dialog_new (_("Delete Template"), GIMP_STOCK_QUESTION,	224	gimp_message_dialog_new (_("Delete Preset"), GIMP_STOCK_QUESTION,
225	GTK_WIDGET (editor), 0,	225	GTK_WIDGET (editor), 0,
226	gimp_standard_help_func, NULL,	226	gimp_standard_help_func, NULL,
227		227
Lines 241-247 Link Here
241		241
242	gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,	242	gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box,
243	_("Are you sure you want to delete "	243	_("Are you sure you want to delete "
244	"template '%s' from the list and "	244	"preset '%s' from the list and "
245	"from disk?"),	245	"from disk?"),
246	GIMP_OBJECT (template)->name);	246	GIMP_OBJECT (template)->name);
247	gtk_widget_show (dialog);	247	gtk_widget_show (dialog);

Lines 45-51 Link Here

(-)gimp-2.2.4/app/actions/vectors-actions.c (-9 / +9 lines)
45	GIMP_HELP_PATH_DIALOG },	45	GIMP_HELP_PATH_DIALOG },
46		46
47	{ "vectors-path-tool", GIMP_STOCK_TOOL_PATH,	47	{ "vectors-path-tool", GIMP_STOCK_TOOL_PATH,
48	N_("Path _Tool"), NULL, NULL,	48	N_("Pen _Tool"), NULL, NULL,
49	G_CALLBACK (vectors_vectors_tool_cmd_callback),	49	G_CALLBACK (vectors_vectors_tool_cmd_callback),
50	GIMP_HELP_TOOL_VECTORS },	50	GIMP_HELP_TOOL_VECTORS },
51		51
Lines 85-110 Link Here
85	GIMP_HELP_PATH_MERGE_VISIBLE },	85	GIMP_HELP_PATH_MERGE_VISIBLE },
86		86
87	{ "vectors-raise", GTK_STOCK_GO_UP,	87	{ "vectors-raise", GTK_STOCK_GO_UP,
88	N_("_Raise Path"), "",	88	N_("Bring Path Forward"), "",
89	N_("Raise path"),	89	N_("Bring path forward"),
90	G_CALLBACK (vectors_raise_cmd_callback),	90	G_CALLBACK (vectors_raise_cmd_callback),
91	GIMP_HELP_PATH_RAISE },	91	GIMP_HELP_PATH_RAISE },
92		92
93	{ "vectors-raise-to-top", GTK_STOCK_GOTO_TOP,	93	{ "vectors-raise-to-top", GTK_STOCK_GOTO_TOP,
94	N_("Raise Path to _Top"), "",	94	N_("Bring Path to Front"), "",
95	N_("Raise path to top"),	95	N_("Bring path to front"),
96	G_CALLBACK (vectors_raise_to_top_cmd_callback),	96	G_CALLBACK (vectors_raise_to_top_cmd_callback),
97	GIMP_HELP_PATH_RAISE_TO_TOP },	97	GIMP_HELP_PATH_RAISE_TO_TOP },
98		98
99	{ "vectors-lower", GTK_STOCK_GO_DOWN,	99	{ "vectors-lower", GTK_STOCK_GO_DOWN,
100	N_("_Lower Path"), "",	100	N_("Send Path Backward"), "",
101	N_("Lower path"),	101	N_("Send path backward"),
102	G_CALLBACK (vectors_lower_cmd_callback),	102	G_CALLBACK (vectors_lower_cmd_callback),
103	GIMP_HELP_PATH_LOWER },	103	GIMP_HELP_PATH_LOWER },
104		104
105	{ "vectors-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,	105	{ "vectors-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
106	N_("Lower Path to _Bottom"), "",	106	N_("Send Path to _Back"), "",
107	N_("Lower path to bottom"),	107	N_("Send path to back"),
108	G_CALLBACK (vectors_lower_to_bottom_cmd_callback),	108	G_CALLBACK (vectors_lower_to_bottom_cmd_callback),
109	GIMP_HELP_PATH_LOWER_TO_BOTTOM },	109	GIMP_HELP_PATH_LOWER_TO_BOTTOM },
110		110

Lines 1035-1041 Link Here

(-)gimp-2.2.4/app/core/core-enums.c (-3 / +3 lines)
1035	{ GIMP_UNDO_GROUP_IMAGE_CONVERT, N_("Convert image"), NULL },	1035	{ GIMP_UNDO_GROUP_IMAGE_CONVERT, N_("Convert image"), NULL },
1036	{ GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, N_("Merge layers"), NULL },	1036	{ GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, N_("Merge layers"), NULL },
1037	{ GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, N_("Merge vectors"), NULL },	1037	{ GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, N_("Merge vectors"), NULL },
1038	{ GIMP_UNDO_GROUP_IMAGE_QMASK, N_("Quick Mask"), NULL },	1038	{ GIMP_UNDO_GROUP_IMAGE_QMASK, N_("Quick Mask Mode"), NULL },
1039	{ GIMP_UNDO_GROUP_IMAGE_GRID, N_("Grid"), NULL },	1039	{ GIMP_UNDO_GROUP_IMAGE_GRID, N_("Grid"), NULL },
1040	{ GIMP_UNDO_GROUP_IMAGE_GUIDE, N_("Guide"), NULL },	1040	{ GIMP_UNDO_GROUP_IMAGE_GUIDE, N_("Guide"), NULL },
1041	{ GIMP_UNDO_GROUP_DRAWABLE, N_("Drawable"), NULL },	1041	{ GIMP_UNDO_GROUP_DRAWABLE, N_("Drawable"), NULL },
Lines 1055-1061 Link Here
1055	{ GIMP_UNDO_GROUP_FS_REMOVE, N_("Remove floating selection"), NULL },	1055	{ GIMP_UNDO_GROUP_FS_REMOVE, N_("Remove floating selection"), NULL },
1056	{ GIMP_UNDO_GROUP_EDIT_PASTE, N_("Paste"), NULL },	1056	{ GIMP_UNDO_GROUP_EDIT_PASTE, N_("Paste"), NULL },
1057	{ GIMP_UNDO_GROUP_EDIT_CUT, N_("Cut"), NULL },	1057	{ GIMP_UNDO_GROUP_EDIT_CUT, N_("Cut"), NULL },
1058	{ GIMP_UNDO_GROUP_TEXT, N_("Text"), NULL },	1058	{ GIMP_UNDO_GROUP_TEXT, N_("Type Tool"), NULL },
1059	{ GIMP_UNDO_GROUP_TRANSFORM, N_("Transform"), NULL },	1059	{ GIMP_UNDO_GROUP_TRANSFORM, N_("Transform"), NULL },
1060	{ GIMP_UNDO_GROUP_PAINT, N_("Paint"), NULL },	1060	{ GIMP_UNDO_GROUP_PAINT, N_("Paint"), NULL },
1061	{ GIMP_UNDO_GROUP_PARASITE_ATTACH, N_("Attach parasite"), NULL },	1061	{ GIMP_UNDO_GROUP_PARASITE_ATTACH, N_("Attach parasite"), NULL },
Lines 1083-1089 Link Here
1083	{ GIMP_UNDO_LAYER_MODE, N_("Set layer mode"), NULL },	1083	{ GIMP_UNDO_LAYER_MODE, N_("Set layer mode"), NULL },
1084	{ GIMP_UNDO_LAYER_OPACITY, N_("Set layer opacity"), NULL },	1084	{ GIMP_UNDO_LAYER_OPACITY, N_("Set layer opacity"), NULL },
1085	{ GIMP_UNDO_LAYER_PRESERVE_TRANS, N_("Set preserve trans"), NULL },	1085	{ GIMP_UNDO_LAYER_PRESERVE_TRANS, N_("Set preserve trans"), NULL },
1086	{ GIMP_UNDO_TEXT_LAYER, N_("Text"), NULL },	1086	{ GIMP_UNDO_TEXT_LAYER, N_("Type Tool"), NULL },
1087	{ GIMP_UNDO_TEXT_LAYER_MODIFIED, N_("Text modified"), NULL },	1087	{ GIMP_UNDO_TEXT_LAYER_MODIFIED, N_("Text modified"), NULL },
1088	{ GIMP_UNDO_CHANNEL_ADD, N_("New channel"), NULL },	1088	{ GIMP_UNDO_CHANNEL_ADD, N_("New channel"), NULL },
1089	{ GIMP_UNDO_CHANNEL_REMOVE, N_("Delete channel"), NULL },	1089	{ GIMP_UNDO_CHANNEL_REMOVE, N_("Delete channel"), NULL },

Lines 53-59 Link Here

(-)gimp-2.2.4/app/core/gimpchannel-select.c (-3 / +3 lines)
53	g_return_if_fail (GIMP_IS_CHANNEL (channel));	53	g_return_if_fail (GIMP_IS_CHANNEL (channel));
54	g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));	54	g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
55		55
56	gimp_channel_push_undo (channel, _("Rect Select"));	56	gimp_channel_push_undo (channel, _("Rectangular Marquee Tool"));
57		57
58	/* if applicable, replace the current selection */	58	/* if applicable, replace the current selection */
59	if (op == GIMP_CHANNEL_OP_REPLACE)	59	if (op == GIMP_CHANNEL_OP_REPLACE)
Lines 104-110 Link Here
104	g_return_if_fail (GIMP_IS_CHANNEL (channel));	104	g_return_if_fail (GIMP_IS_CHANNEL (channel));
105	g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));	105	g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel)));
106		106
107	gimp_channel_push_undo (channel, _("Ellipse Select"));	107	gimp_channel_push_undo (channel, _("Elliptical Marquee Tool"));
108		108
109	/* if applicable, replace the current selection */	109	/* if applicable, replace the current selection */
110	if (op == GIMP_CHANNEL_OP_REPLACE)	110	if (op == GIMP_CHANNEL_OP_REPLACE)
Lines 457-463 Link Here
457	if (! sample_merged)	457	if (! sample_merged)
458	gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);	458	gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y);
459		459
460	gimp_channel_select_channel (channel, _("Fuzzy Select"),	460	gimp_channel_select_channel (channel, _("Magic Wand Tool"),
461	add_on, add_on_x, add_on_y,	461	add_on, add_on_x, add_on_y,
462	op,	462	op,
463	feather,	463	feather,

Lines 141-147 Link Here

(-)gimp-2.2.4/app/dialogs/dialogs.c (-5 / +5 lines)
141	GIMP_HELP_PATTERN_DIALOG, GIMP_VIEW_SIZE_MEDIUM),	141	GIMP_HELP_PATTERN_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
142	LISTGRID (gradient, N_("Gradients"), NULL, GIMP_STOCK_GRADIENT,	142	LISTGRID (gradient, N_("Gradients"), NULL, GIMP_STOCK_GRADIENT,
143	GIMP_HELP_GRADIENT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),	143	GIMP_HELP_GRADIENT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
144	LISTGRID (palette, N_("Palettes"), NULL, GIMP_STOCK_PALETTE,	144	LISTGRID (palette, N_("Swatches"), NULL, GIMP_STOCK_PALETTE,
145	GIMP_HELP_PALETTE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),	145	GIMP_HELP_PALETTE_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
146	LISTGRID (font, N_("Fonts"), NULL, GIMP_STOCK_FONT,	146	LISTGRID (font, N_("Fonts"), NULL, GIMP_STOCK_FONT,
147	GIMP_HELP_FONT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),	147	GIMP_HELP_FONT_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
Lines 149-157 Link Here
149	GIMP_HELP_TOOLS_DIALOG, GIMP_VIEW_SIZE_SMALL),	149	GIMP_HELP_TOOLS_DIALOG, GIMP_VIEW_SIZE_SMALL),
150	LISTGRID (buffer, N_("Buffers"), NULL, GIMP_STOCK_BUFFER,	150	LISTGRID (buffer, N_("Buffers"), NULL, GIMP_STOCK_BUFFER,
151	GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM),	151	GIMP_HELP_BUFFER_DIALOG, GIMP_VIEW_SIZE_MEDIUM),
152	LISTGRID (document, N_("History"), N_("Document History"), GTK_STOCK_OPEN,	152	LISTGRID (document, N_("History"), N_("History"), GTK_STOCK_OPEN,
153	GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE),	153	GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE),
154	LISTGRID (template, N_("Templates"), N_("Image Templates"), GIMP_STOCK_TEMPLATE,	154	LISTGRID (template, N_("Presets"), N_("Image Presets"), GIMP_STOCK_TEMPLATE,
155	GIMP_HELP_TEMPLATE_DIALOG, GIMP_VIEW_SIZE_SMALL),	155	GIMP_HELP_TEMPLATE_DIALOG, GIMP_VIEW_SIZE_SMALL),
156		156
157	/* image related */	157	/* image related */
Lines 186-192 Link Here
186		186
187	/* display related */	187	/* display related */
188	DOCKABLE ("gimp-navigation-view",	188	DOCKABLE ("gimp-navigation-view",
189	N_("Navigation"), N_("Display Navigation"), GIMP_STOCK_NAVIGATION,	189	N_("Navigator"), N_("Display Navigator"), GIMP_STOCK_NAVIGATION,
190	GIMP_HELP_NAVIGATION_DIALOG,	190	GIMP_HELP_NAVIGATION_DIALOG,
191	dialogs_navigation_editor_new, 0, FALSE),	191	dialogs_navigation_editor_new, 0, FALSE),
192		192
Lines 206-212 Link Here
206	GIMP_HELP_GRADIENT_EDITOR_DIALOG,	206	GIMP_HELP_GRADIENT_EDITOR_DIALOG,
207	dialogs_gradient_editor_get, 0, TRUE),	207	dialogs_gradient_editor_get, 0, TRUE),
208	DOCKABLE ("gimp-palette-editor",	208	DOCKABLE ("gimp-palette-editor",
209	N_("Palette Editor"), NULL, GIMP_STOCK_PALETTE,	209	N_("Swatches Editor"), NULL, GIMP_STOCK_PALETTE,
210	GIMP_HELP_PALETTE_EDITOR_DIALOG,	210	GIMP_HELP_PALETTE_EDITOR_DIALOG,
211	dialogs_palette_editor_get, 0, TRUE)	211	dialogs_palette_editor_get, 0, TRUE)
212	};	212	};

Lines 168-176 Link Here

(-)gimp-2.2.4/app/dialogs/palette-import-dialog.c (-5 / +5 lines)
168	gimp_get_user_context (gimp));	168	gimp_get_user_context (gimp));
169		169
170	import_dialog->dialog =	170	import_dialog->dialog =
171	gimp_viewable_dialog_new (NULL, _("Import Palette"), "gimp-palette-import",	171	gimp_viewable_dialog_new (NULL, _("Import Color Table"), "gimp-palette-import",
172	GTK_STOCK_CONVERT,	172	GTK_STOCK_CONVERT,
173	_("Import a New Palette"),	173	_("Import a New Color Table"),
174	NULL,	174	NULL,
175	gimp_standard_help_func,	175	gimp_standard_help_func,
176	GIMP_HELP_PALETTE_IMPORT,	176	GIMP_HELP_PALETTE_IMPORT,
Lines 243-249 Link Here
243	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (import_dialog->image_radio));	243	group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (import_dialog->image_radio));
244		244
245	import_dialog->palettefile_radio =	245	import_dialog->palettefile_radio =
246	gtk_radio_button_new_with_mnemonic (group, _("Palette _file"));	246	gtk_radio_button_new_with_mnemonic (group, _("Color Table _file"));
247	gtk_table_attach_defaults (GTK_TABLE (table),	247	gtk_table_attach_defaults (GTK_TABLE (table),
248	import_dialog->palettefile_radio,	248	import_dialog->palettefile_radio,
249	0, 1, 2, 3);	249	0, 1, 2, 3);
Lines 270-276 Link Here
270		270
271	/* Palette file name entry */	271	/* Palette file name entry */
272	import_dialog->filename_entry =	272	import_dialog->filename_entry =
273	gimp_file_entry_new (_("Select palette file"), NULL, FALSE, FALSE);	273	gimp_file_entry_new (_("Select color table file"), NULL, FALSE, FALSE);
274	gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,	274	gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
275	NULL, 0.0, 0.5,	275	NULL, 0.0, 0.5,
276	import_dialog->filename_entry, 1, FALSE);	276	import_dialog->filename_entry, 1, FALSE);
Lines 316-322 Link Here
316	gtk_entry_set_text (GTK_ENTRY (import_dialog->entry),	316	gtk_entry_set_text (GTK_ENTRY (import_dialog->entry),
317	gradient ? GIMP_OBJECT (gradient)->name : _("New import"));	317	gradient ? GIMP_OBJECT (gradient)->name : _("New import"));
318	gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,	318	gimp_table_attach_aligned (GTK_TABLE (table), 0, 0,
319	_("Palette _Name:"), 0.0, 0.5,	319	_("Color Table _Name:"), 0.0, 0.5,
320	import_dialog->entry, 2, FALSE);	320	import_dialog->entry, 2, FALSE);
321		321
322	/* The # of colors */	322	/* The # of colors */

Lines 133-139 Link Here

(-)gimp-2.2.4/app/dialogs/user-install-dialog.c (-4 / +4 lines)
133	FALSE, "gimprc",	133	FALSE, "gimprc",
134	N_("The gimprc is used to store personal preferences "	134	N_("The gimprc is used to store personal preferences "
135	"that affect GIMP's default behavior. "	135	"that affect GIMP's default behavior. "
136	"Paths to search for brushes, palettes, gradients, "	136	"Paths to search for brushes, swatches, gradients, "
137	"patterns, plug-ins and modules can also configured "	137	"patterns, plug-ins and modules can also configured "
138	"here."),	138	"here."),
139	TREE_ITEM_DO_NOTHING	139	TREE_ITEM_DO_NOTHING
Lines 174-180 Link Here
174	{	174	{
175	FALSE, "templaterc",	175	FALSE, "templaterc",
176	N_("This file holds a collection of standard media sizes that "	176	N_("This file holds a collection of standard media sizes that "
177	"serve as image templates."),	177	"serve as image presets."),
178	TREE_ITEM_DO_NOTHING	178	TREE_ITEM_DO_NOTHING
179	},	179	},
180	{	180	{
Lines 213-221 Link Here
213	},	213	},
214	{	214	{
215	TRUE, "palettes",	215	TRUE, "palettes",
216	N_("This folder is used to store user defined palettes. "	216	N_("This folder is used to store user defined color tables. "
217	"The GIMP checks this folder in addition to the system-wide "	217	"The GIMP checks this folder in addition to the system-wide "
218	"GIMP palettes installation when searching for palettes."),	218	"GIMP swatches installation when searching for color tables."),
219	TREE_ITEM_MKDIR	219	TREE_ITEM_MKDIR
220	},	220	},
221	{	221	{

Lines 167-179 Link Here

(-)gimp-2.2.4/app/pdb/internal_procs.c (-2 / +2 lines)
167	(* status_callback) (NULL, _("Palette UI"), 0.739);	167	(* status_callback) (NULL, _("Palette UI"), 0.739);
168	register_palette_select_procs (gimp);	168	register_palette_select_procs (gimp);
169		169
170	(* status_callback) (NULL, _("Palettes"), 0.746);	170	(* status_callback) (NULL, _("Swatches"), 0.746);
171	register_palettes_procs (gimp);	171	register_palettes_procs (gimp);
172		172
173	(* status_callback) (NULL, _("Parasite procedures"), 0.755);	173	(* status_callback) (NULL, _("Parasite procedures"), 0.755);
174	register_parasite_procs (gimp);	174	register_parasite_procs (gimp);
175		175
176	(* status_callback) (NULL, _("Paths"), 0.783);	176	(* status_callback) (NULL, _("Pen Tool"), 0.783);
177	register_paths_procs (gimp);	177	register_paths_procs (gimp);
178		178
179	(* status_callback) (NULL, _("Pattern"), 0.818);	179	(* status_callback) (NULL, _("Pattern"), 0.818);

Lines 98-106 Link Here

(-)gimp-2.2.4/app/tools/gimpblendtool.c (-6 / +6 lines)
98	GIMP_CONTEXT_PAINT_MODE_MASK \|	98	GIMP_CONTEXT_PAINT_MODE_MASK \|
99	GIMP_CONTEXT_GRADIENT_MASK,	99	GIMP_CONTEXT_GRADIENT_MASK,
100	"gimp-blend-tool",	100	"gimp-blend-tool",
101	_("Blend"),	101	_("Gradient Tool"),
102	_("Fill with a color gradient"),	102	_("Fill with a color gradient"),
103	N_("Blen_d"), "L",	103	N_("Gradient Tool"), "L",
104	NULL, GIMP_HELP_TOOL_BLEND,	104	NULL, GIMP_HELP_TOOL_BLEND,
105	GIMP_STOCK_TOOL_BLEND,	105	GIMP_STOCK_TOOL_BLEND,
106	data);	106	data);
Lines 188-194 Link Here
188	switch (gimp_drawable_type (drawable))	188	switch (gimp_drawable_type (drawable))
189	{	189	{
190	case GIMP_INDEXED_IMAGE: case GIMP_INDEXEDA_IMAGE:	190	case GIMP_INDEXED_IMAGE: case GIMP_INDEXEDA_IMAGE:
191	g_message (_("Blend: Invalid for indexed images."));	191	g_message (_("Gradient Tool: Invalid for indexed images."));
192	return;	192	return;
193		193
194	break;	194	break;
Lines 206-212 Link Here
206	gimp_tool_control_activate (tool->control);	206	gimp_tool_control_activate (tool->control);
207		207
208	/* initialize the statusbar display */	208	/* initialize the statusbar display */
209	gimp_tool_push_status_coords (tool, _("Blend: "), 0, ", ", 0);	209	gimp_tool_push_status_coords (tool, _("Gradient: "), 0, ", ", 0);
210		210
211	/* Start drawing the blend tool */	211	/* Start drawing the blend tool */
212	gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);	212	gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp);
Lines 246-252 Link Here
246	GimpProgress *progress;	246	GimpProgress *progress;
247		247
248	progress = gimp_progress_start (GIMP_PROGRESS (gdisp),	248	progress = gimp_progress_start (GIMP_PROGRESS (gdisp),
249	_("Blending..."), FALSE);	249	_("Drawing Gradient..."), FALSE);
250		250
251	gimp_drawable_blend (gimp_image_active_drawable (gimage),	251	gimp_drawable_blend (gimp_image_active_drawable (gimage),
252	context,	252	context,
Lines 305-311 Link Here
305	gimp_tool_pop_status (tool);	305	gimp_tool_pop_status (tool);
306		306
307	gimp_tool_push_status_coords (tool,	307	gimp_tool_push_status_coords (tool,
308	_("Blend: "),	308	_("Gradient: "),
309	blend_tool->endx - blend_tool->startx,	309	blend_tool->endx - blend_tool->startx,
310	", ",	310	", ",
311	blend_tool->endy - blend_tool->starty);	311	blend_tool->endy - blend_tool->starty);

Lines 67-75 Link Here

(-)gimp-2.2.4/app/tools/gimpconvolvetool.c (-3 / +3 lines)
67	gimp_convolve_options_gui,	67	gimp_convolve_options_gui,
68	GIMP_PAINT_OPTIONS_CONTEXT_MASK,	68	GIMP_PAINT_OPTIONS_CONTEXT_MASK,
69	"gimp-convolve-tool",	69	"gimp-convolve-tool",
70	_("Convolve"),	70	_("Blur/Sharpen"),
71	_("Blur or Sharpen"),	71	_("Blur or Sharpen"),
72	N_("Con_volve"), "V",	72	N_("Blur/Sharpen"), "V",
73	NULL, GIMP_HELP_TOOL_CONVOLVE,	73	NULL, GIMP_HELP_TOOL_CONVOLVE,
74	GIMP_STOCK_TOOL_BLUR,	74	GIMP_STOCK_TOOL_BLUR,
75	data);	75	data);
Lines 190-196 Link Here
190	vbox = gimp_paint_options_gui (tool_options);	190	vbox = gimp_paint_options_gui (tool_options);
191		191
192	/* the type radio box */	192	/* the type radio box */
193	str = g_strdup_printf (_("Convolve Type %s"),	193	str = g_strdup_printf (_("Mode %s"),
194	gimp_get_mod_string (GDK_CONTROL_MASK));	194	gimp_get_mod_string (GDK_CONTROL_MASK));
195		195
196	frame = gimp_prop_enum_radio_frame_new (config, "type",	196	frame = gimp_prop_enum_radio_frame_new (config, "type",

Lines 67-74 Link Here

(-)gimp-2.2.4/app/widgets/gimpwidgets-constructors.c (-4 / +4 lines)
67	_("Difference"), GIMP_DIFFERENCE_MODE, NULL,	67	_("Difference"), GIMP_DIFFERENCE_MODE, NULL,
68	_("Addition"), GIMP_ADDITION_MODE, NULL,	68	_("Addition"), GIMP_ADDITION_MODE, NULL,
69	_("Subtract"), GIMP_SUBTRACT_MODE, NULL,	69	_("Subtract"), GIMP_SUBTRACT_MODE, NULL,
70	_("Darken only"), GIMP_DARKEN_ONLY_MODE, NULL,	70	_("Darken"), GIMP_DARKEN_ONLY_MODE, NULL,
71	_("Lighten only"), GIMP_LIGHTEN_ONLY_MODE, NULL,	71	_("Lighten"), GIMP_LIGHTEN_ONLY_MODE, NULL,
72	"---", 0, NULL,	72	"---", 0, NULL,
73	_("Hue"), GIMP_HUE_MODE, NULL,	73	_("Hue"), GIMP_HUE_MODE, NULL,
74	_("Saturation"), GIMP_SATURATION_MODE, NULL,	74	_("Saturation"), GIMP_SATURATION_MODE, NULL,
Lines 100-107 Link Here
100	_("Difference"), GIMP_DIFFERENCE_MODE, NULL,	100	_("Difference"), GIMP_DIFFERENCE_MODE, NULL,
101	_("Addition"), GIMP_ADDITION_MODE, NULL,	101	_("Addition"), GIMP_ADDITION_MODE, NULL,
102	_("Subtract"), GIMP_SUBTRACT_MODE, NULL,	102	_("Subtract"), GIMP_SUBTRACT_MODE, NULL,
103	_("Darken only"), GIMP_DARKEN_ONLY_MODE, NULL,	103	_("Darken"), GIMP_DARKEN_ONLY_MODE, NULL,
104	_("Lighten only"), GIMP_LIGHTEN_ONLY_MODE, NULL,	104	_("Lighten"), GIMP_LIGHTEN_ONLY_MODE, NULL,
105	"---", 0, NULL,	105	"---", 0, NULL,
106	_("Hue"), GIMP_HUE_MODE, NULL,	106	_("Hue"), GIMP_HUE_MODE, NULL,
107	_("Saturation"), GIMP_SATURATION_MODE, NULL,	107	_("Saturation"), GIMP_SATURATION_MODE, NULL,

Lines 77-90 Link Here

(-)gimp-2.2.4/plug-ins/common/autostretch_hsv.c (-2 / +2 lines)
77	"Scott Goehring and Federico Mena Quintero",	77	"Scott Goehring and Federico Mena Quintero",
78	"Scott Goehring and Federico Mena Quintero",	78	"Scott Goehring and Federico Mena Quintero",
79	"1997",	79	"1997",
80	N_("Stretch _HSV"),	80	N_("Auto Contrast _HSV"),
81	"RGB, INDEXED",	81	"RGB, INDEXED",
82	GIMP_PLUGIN,	82	GIMP_PLUGIN,
83	G_N_ELEMENTS (args), 0,	83	G_N_ELEMENTS (args), 0,
84	args, NULL);	84	args, NULL);
85		85
86	gimp_plugin_menu_register ("plug_in_autostretch_hsv",	86	gimp_plugin_menu_register ("plug_in_autostretch_hsv",
87	"<Image>/Layer/Colors/Auto");	87	"<Image>/Image/Colors/Contrastplace");
88	}	88	}
89		89
90	static void	90	static void

Lines 75-87 Link Here

(-)gimp-2.2.4/plug-ins/common/c_astretch.c (-2 / +2 lines)
75	"Federico Mena Quintero",	75	"Federico Mena Quintero",
76	"Federico Mena Quintero",	76	"Federico Mena Quintero",
77	"1996",	77	"1996",
78	N_("_Stretch Contrast"),	78	N_("Auto Contrast"),
79	"RGB, GRAY, INDEXED*",	79	"RGB, GRAY, INDEXED*",
80	GIMP_PLUGIN,	80	GIMP_PLUGIN,
81	G_N_ELEMENTS (args), 0,	81	G_N_ELEMENTS (args), 0,
82	args, NULL);	82	args, NULL);
83		83
84	gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Layer/Colors/Auto");	84	gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Image/Colors/Contrastplace");
85	}	85	}
86		86
87	static void	87	static void

Lines 85-97 Link Here

(-)gimp-2.2.4/plug-ins/common/normalize.c (-2 / +2 lines)
85	"Adam D. Moss, Federico Mena Quintero",	85	"Adam D. Moss, Federico Mena Quintero",
86	"Adam D. Moss, Federico Mena Quintero",	86	"Adam D. Moss, Federico Mena Quintero",
87	"1997",	87	"1997",
88	N_("_Normalize"),	88	N_("Auto Levels"),
89	"RGB, GRAY, INDEXED*",	89	"RGB, GRAY, INDEXED*",
90	GIMP_PLUGIN,	90	GIMP_PLUGIN,
91	G_N_ELEMENTS (args), 0,	91	G_N_ELEMENTS (args), 0,
92	args, NULL);	92	args, NULL);
93		93
94	gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Layer/Colors/Auto");	94	gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Image/Colors/Levelplace");
95	}	95	}
96		96
97	static void	97	static void