Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 55390 Details for
Bug 87553
gimpshop-2.2.4.ebuild - New ebuild for gimpshop
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
gimp-2.2.4-gimpshop.patch
gimp-2.2.4-gimpshop.patch (text/plain), 126.80 KB, created by
Sebastian Wramba
on 2005-04-05 12:29:23 UTC
(
hide
)
Description:
gimp-2.2.4-gimpshop.patch
Filename:
MIME Type:
Creator:
Sebastian Wramba
Created:
2005-04-05 12:29:23 UTC
Size:
126.80 KB
patch
obsolete
>diff -u -r gimp-2.2.4/app/actions/actions.c gimpshot-2.2.4/app/actions/actions.c >--- gimp-2.2.4/app/actions/actions.c 2004-12-16 14:26:35.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/actions.c 2005-03-22 10:40:00.000000000 +0100 >@@ -108,7 +108,7 @@ > { "debug", N_("Debug"), NULL, > debug_actions_setup, > debug_actions_update }, >- { "dialogs", N_("Dialogs"), NULL, >+ { "dialogs", N_("Window"), NULL, > dialogs_actions_setup, > dialogs_actions_update }, > { "dockable", N_("Dockable"), NULL, >@@ -150,10 +150,10 @@ > { "layers", N_("Layers"), GIMP_STOCK_LAYER, > layers_actions_setup, > layers_actions_update }, >- { "palette-editor", N_("Palette Editor"), GIMP_STOCK_PALETTE, >+ { "palette-editor", N_("Swatches Editor"), GIMP_STOCK_PALETTE, > palette_editor_actions_setup, > palette_editor_actions_update }, >- { "palettes", N_("Palettes"), GIMP_STOCK_PALETTE, >+ { "palettes", N_("Swatches"), GIMP_STOCK_PALETTE, > palettes_actions_setup, > palettes_actions_update }, > { "patterns", N_("Patterns"), GIMP_STOCK_PATTERN, >@@ -162,13 +162,13 @@ > { "plug-in", N_("Plug-Ins"), GIMP_STOCK_PLUGIN, > plug_in_actions_setup, > plug_in_actions_update }, >- { "qmask", N_("QuickMask"), GIMP_STOCK_QMASK_ON, >+ { "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_("Templates"), GIMP_STOCK_TEMPLATE, >+ { "templates", N_("Presets"), GIMP_STOCK_TEMPLATE, > templates_actions_setup, > templates_actions_update }, > { "text-editor", N_("Text Editor"), GIMP_STOCK_EDIT, >diff -u -r gimp-2.2.4/app/actions/context-actions.c gimpshot-2.2.4/app/actions/context-actions.c >--- gimp-2.2.4/app/actions/context-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/context-actions.c 2005-03-22 04:13:00.000000000 +0100 >@@ -44,7 +44,7 @@ > static GimpActionEntry context_actions[] = > { > { "context-menu", NULL, N_("_Context") }, >- { "context-colors-menu", GIMP_STOCK_DEFAULT_COLORS, N_("_Colors") }, >+ { "context-colors-menu", GIMP_STOCK_DEFAULT_COLORS, N_("Adjustments") }, > { "context-opacity-menu", GIMP_STOCK_TRANSPARENCY, N_("_Opacity") }, > { "context-paint-mode-menu", GIMP_STOCK_TOOL_PENCIL, N_("Paint _Mode") }, > { "context-tool-menu", GIMP_STOCK_TOOLS, N_("_Tool") }, >diff -u -r gimp-2.2.4/app/actions/dialogs-actions.c gimpshot-2.2.4/app/actions/dialogs-actions.c >--- gimp-2.2.4/app/actions/dialogs-actions.c 2004-10-22 16:43:43.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/dialogs-actions.c 2005-03-24 10:34:28.000000000 +0100 >@@ -35,7 +35,7 @@ > > static GimpActionEntry dialogs_actions[] = > { >- { "dialogs-menu", NULL, N_("_Dialogs") }, >+ { "dialogs-menu", NULL, N_("Window") }, > { "dialogs-new-dock-menu", NULL, N_("Create New Doc_k") }, > > { "dialogs-new-dock-lcp", NULL, >@@ -54,7 +54,7 @@ > GIMP_HELP_DOCK }, > > { "dialogs-toolbox", NULL, >- N_("Tool_box"), NULL, NULL, >+ N_("Tools"), NULL, NULL, > G_CALLBACK (dialogs_show_toolbox_cmd_callback), > GIMP_HELP_TOOLBOX } > }; >@@ -62,7 +62,7 @@ > GimpStringActionEntry dialogs_dockable_actions[] = > { > { "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS, >- N_("Tool _Options"), "<control><shift>T", NULL, >+ N_("_Options"), "<control><shift>T", NULL, > "gimp-tool-options", > GIMP_HELP_TOOL_OPTIONS_DIALOG }, > >@@ -102,7 +102,7 @@ > GIMP_HELP_SELECTION_DIALOG }, > > { "dialogs-navigation", GIMP_STOCK_NAVIGATION, >- N_("Na_vigation"), NULL, NULL, >+ N_("Na_vigator"), NULL, NULL, > "gimp-navigation-view", > GIMP_HELP_NAVIGATION_DIALOG }, > >@@ -112,7 +112,7 @@ > GIMP_HELP_UNDO_DIALOG }, > > { "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS, >- N_("Colo_rs"), NULL, NULL, >+ N_("Colo_r"), NULL, NULL, > "gimp-color-editor", > GIMP_HELP_COLOR_DIALOG }, > >@@ -132,7 +132,7 @@ > GIMP_HELP_GRADIENT_DIALOG }, > > { "dialogs-palettes", GIMP_STOCK_PALETTE, >- N_("Pal_ettes"), "<control>P", NULL, >+ N_("Swatches"), "<control>P", NULL, > "gimp-palette-list|gimp-palette-list", > GIMP_HELP_PALETTE_DIALOG }, > >@@ -157,7 +157,7 @@ > GIMP_HELP_DOCUMENT_DIALOG }, > > { "dialogs-templates", GIMP_STOCK_TEMPLATE, >- N_("_Templates"), "", NULL, >+ N_("Presets"), "", NULL, > "gimp-template-list|gimp-template-grid", > GIMP_HELP_TEMPLATE_DIALOG }, > >diff -u -r gimp-2.2.4/app/actions/drawable-actions.c gimpshot-2.2.4/app/actions/drawable-actions.c >--- gimp-2.2.4/app/actions/drawable-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/drawable-actions.c 2005-03-20 04:18:12.000000000 +0100 >@@ -85,12 +85,12 @@ > static GimpEnumActionEntry drawable_flip_actions[] = > { > { "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL, >- N_("Flip _Horizontally"), NULL, NULL, >+ N_("Flip _Horizontal"), NULL, NULL, > GIMP_ORIENTATION_HORIZONTAL, FALSE, > GIMP_HELP_LAYER_FLIP_HORIZONTAL }, > > { "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL, >- N_("Flip _Vertically"), NULL, NULL, >+ N_("Flip _Vertical"), NULL, NULL, > GIMP_ORIENTATION_VERTICAL, FALSE, > GIMP_HELP_LAYER_FLIP_VERTICAL } > }; >@@ -98,17 +98,17 @@ > static GimpEnumActionEntry drawable_rotate_actions[] = > { > { "drawable-rotate-90", GIMP_STOCK_ROTATE_90, >- N_("Rotate 90 degrees _CW"), NULL, NULL, >+ 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 degrees"), NULL, NULL, >+ N_("Rotate _180*"), NULL, NULL, > GIMP_ROTATE_180, FALSE, > GIMP_HELP_LAYER_ROTATE_180 }, > > { "drawable-rotate-270", GIMP_STOCK_ROTATE_270, >- N_("Rotate 90 degrees CC_W"), NULL, NULL, >+ N_("Rotate 90* CC_W"), NULL, NULL, > GIMP_ROTATE_270, FALSE, > GIMP_HELP_LAYER_ROTATE_270 } > }; >diff -u -r gimp-2.2.4/app/actions/edit-actions.c gimpshot-2.2.4/app/actions/edit-actions.c >--- gimp-2.2.4/app/actions/edit-actions.c 2004-12-12 15:01:07.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/edit-actions.c 2005-03-20 04:18:11.000000000 +0100 >@@ -90,7 +90,7 @@ > GIMP_HELP_EDIT_COPY }, > > { "edit-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */ >- N_("Copy _Visible"), "", NULL, >+ N_("Copy Merged"), "", NULL, > G_CALLBACK (edit_copy_visible_cmd_callback), > GIMP_HELP_EDIT_COPY_VISIBLE }, > >diff -u -r gimp-2.2.4/app/actions/file-actions.c gimpshot-2.2.4/app/actions/file-actions.c >--- gimp-2.2.4/app/actions/file-actions.c 2004-12-02 19:29:56.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/file-actions.c 2005-03-24 10:34:29.000000000 +0100 >@@ -98,7 +98,7 @@ > GIMP_HELP_FILE_SAVE_A_COPY }, > > { "file-save-as-template", NULL, >- N_("Save as _Template..."), NULL, NULL, >+ N_("Save as Preset..."), NULL, NULL, > G_CALLBACK (file_save_template_cmd_callback), > GIMP_HELP_FILE_SAVE_AS_TEMPLATE }, > >diff -u -r gimp-2.2.4/app/actions/gradient-editor-actions.c gimpshot-2.2.4/app/actions/gradient-editor-actions.c >--- gimp-2.2.4/app/actions/gradient-editor-actions.c 2004-12-27 20:42:16.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/gradient-editor-actions.c 2005-03-22 06:08:26.000000000 +0100 >@@ -105,12 +105,12 @@ > GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE }, > > { "gradient-editor-blend-color", NULL, >- N_("Ble_nd Endpoints' Colors"), NULL, 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_("Blend Endpoints' Opacit_y"), NULL, NULL, >+ N_("Gradient Endpoints' Opacit_y"), NULL, NULL, > G_CALLBACK (gradient_editor_blend_opacity_cmd_callback), > GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY } > }; >diff -u -r gimp-2.2.4/app/actions/image-actions.c gimpshot-2.2.4/app/actions/image-actions.c >--- gimp-2.2.4/app/actions/image-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/image-actions.c 2005-03-24 09:11:06.000000000 +0100 >@@ -58,7 +58,7 @@ > { "extensions-menu", NULL, N_("_Xtns") }, > { "image-menu", NULL, N_("_Image") }, > { "image-mode-menu", NULL, N_("_Mode") }, >- { "image-transform-menu", NULL, N_("_Transform") }, >+ { "image-transform-menu", NULL, N_("Rotate Canvas") }, > { "image-guides-menu", NULL, N_("_Guides") }, > > { "image-new", GTK_STOCK_NEW, >@@ -87,7 +87,7 @@ > GIMP_HELP_IMAGE_PRINT_SIZE }, > > { "image-scale", GIMP_STOCK_SCALE, >- N_("_Scale Image..."), NULL, NULL, >+ N_("Image _Size..."), NULL, NULL, > G_CALLBACK (image_scale_cmd_callback), > GIMP_HELP_IMAGE_SCALE }, > >@@ -102,7 +102,7 @@ > GIMP_HELP_IMAGE_DUPLICATE }, > > { "image-merge-layers", NULL, >- N_("Merge Visible _Layers..."), "<control>M", NULL, >+ N_("Merge Visible..."), "<control>M", NULL, > G_CALLBACK (image_merge_layers_cmd_callback), > GIMP_HELP_IMAGE_MERGE_LAYERS }, > >@@ -130,7 +130,7 @@ > GIMP_HELP_IMAGE_CONVERT_GRAYSCALE }, > > { "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED, >- N_("_Indexed..."), NULL, NULL, >+ N_("_Indexed Color..."), NULL, NULL, > GIMP_INDEXED, FALSE, > GIMP_HELP_IMAGE_CONVERT_INDEXED } > }; >@@ -138,12 +138,12 @@ > static GimpEnumActionEntry image_flip_actions[] = > { > { "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL, >- N_("Flip _Horizontally"), NULL, NULL, >+ N_("Flip _Horizontal"), NULL, NULL, > GIMP_ORIENTATION_HORIZONTAL, FALSE, > GIMP_HELP_IMAGE_FLIP_HORIZONTAL }, > > { "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL, >- N_("Flip _Vertically"), NULL, NULL, >+ N_("Flip _Vertical"), NULL, NULL, > GIMP_ORIENTATION_VERTICAL, FALSE, > GIMP_HELP_IMAGE_FLIP_VERTICAL } > }; >@@ -152,17 +152,17 @@ > { > { "image-rotate-90", GIMP_STOCK_ROTATE_90, > /* please use the degree symbol in the translation */ >- N_("Rotate 90 degrees _CW"), NULL, NULL, >+ 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 degrees"), NULL, NULL, >+ N_("Rotate _180*"), NULL, NULL, > GIMP_ROTATE_180, FALSE, > GIMP_HELP_IMAGE_ROTATE_180 }, > > { "image-rotate-270", GIMP_STOCK_ROTATE_270, >- N_("Rotate 90 degrees CC_W"), NULL, NULL, >+ N_("Rotate 90* CC_W"), NULL, NULL, > GIMP_ROTATE_270, FALSE, > GIMP_HELP_IMAGE_ROTATE_270 } > }; >diff -u -r gimp-2.2.4/app/actions/image-commands.c gimpshot-2.2.4/app/actions/image-commands.c >--- gimp-2.2.4/app/actions/image-commands.c 2004-11-14 23:01:13.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/image-commands.c 2005-03-24 09:13:20.000000000 +0100 >@@ -189,7 +189,7 @@ > options->context = action_data_get_context (data); > > dialog = resize_dialog_new (GIMP_VIEWABLE (gimage), >- _("Set Image Canvas Size"), "gimp-image-resize", >+ _("Canvas Size"), "gimp-image-resize", > widget, > gimp_standard_help_func, GIMP_HELP_IMAGE_RESIZE, > GIMP_DISPLAY_SHELL (gdisp->shell)->unit, >@@ -505,7 +505,7 @@ > return; > > gimp_image_undo_group_start (image, GIMP_UNDO_GROUP_IMAGE_SCALE, >- _("Scale Image")); >+ _("Image Size")); > > gimp_image_set_resolution (image, > dialog->xresolution, dialog->yresolution); >diff -u -r gimp-2.2.4/app/actions/layers-actions.c gimpshot-2.2.4/app/actions/layers-actions.c >--- gimp-2.2.4/app/actions/layers-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/layers-actions.c 2005-03-22 04:13:01.000000000 +0100 >@@ -49,8 +49,8 @@ > GIMP_HELP_LAYER_DIALOG }, > > { "layers-menu", NULL, N_("_Layer") }, >- { "layers-stack-menu", NULL, N_("Stac_k") }, >- { "layers-colors-menu", NULL, N_("_Colors") }, >+ { "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") }, >@@ -95,26 +95,26 @@ > GIMP_HELP_LAYER_DELETE }, > > { "layers-raise", GTK_STOCK_GO_UP, >- N_("_Raise Layer"), "", >- N_("Raise layer"), >+ 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_("Layer to _Top"), "", >- N_("Raise layer to 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_("_Lower Layer"), "", >- N_("Lower layer"), >+ 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_("Layer to _Bottom"), "", >- N_("Lower layer to bottom"), >+ N_("Send to _Back"), "", >+ N_("Send layer to back"), > G_CALLBACK (layers_lower_to_bottom_cmd_callback), > GIMP_HELP_LAYER_LOWER_TO_BOTTOM }, > >@@ -130,7 +130,7 @@ > GIMP_HELP_LAYER_MERGE_DOWN }, > > { "layers-merge-layers", NULL, >- N_("Merge _Visible Layers..."), NULL, NULL, >+ N_("Merge _Visible..."), NULL, NULL, > G_CALLBACK (image_merge_layers_cmd_callback), > GIMP_HELP_IMAGE_MERGE_LAYERS }, > >@@ -178,7 +178,7 @@ > static GimpToggleActionEntry layers_toggle_actions[] = > { > { "layers-preserve-transparency", GIMP_STOCK_TRANSPARENCY, >- N_("Keep Transparency"), NULL, NULL, >+ N_("Lock transparent pixels"), NULL, NULL, > G_CALLBACK (layers_preserve_trans_cmd_callback), > FALSE, > GIMP_HELP_LAYER_KEEP_TRANSPARENCY }, >diff -u -r gimp-2.2.4/app/actions/layers-commands.c gimpshot-2.2.4/app/actions/layers-commands.c >--- gimp-2.2.4/app/actions/layers-commands.c 2004-10-28 12:53:44.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/layers-commands.c 2005-03-20 04:42:03.000000000 +0100 >@@ -680,7 +680,7 @@ > gimp_item_offsets (GIMP_ITEM (mask), &off_x, &off_y); > > gimp_channel_select_channel (gimp_image_get_mask (gimage), >- _("Layer Mask to Selection"), >+ _("Set Selection to Layer Mask"), > GIMP_CHANNEL (mask), > off_x, off_y, > op, FALSE, 0.0, 0.0); >diff -u -r gimp-2.2.4/app/actions/palette-editor-actions.c gimpshot-2.2.4/app/actions/palette-editor-actions.c >--- gimp-2.2.4/app/actions/palette-editor-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/palette-editor-actions.c 2005-03-20 05:57:52.000000000 +0100 >@@ -40,7 +40,7 @@ > static GimpActionEntry palette_editor_actions[] = > { > { "palette-editor-popup", GIMP_STOCK_PALETTE, >- N_("Palette Editor Menu"), NULL, NULL, NULL, >+ N_("Swatches Editor Menu"), NULL, NULL, NULL, > GIMP_HELP_PALETTE_EDITOR_DIALOG }, > > { "palette-editor-edit-color", GIMP_STOCK_EDIT, >diff -u -r gimp-2.2.4/app/actions/palette-editor-commands.c gimpshot-2.2.4/app/actions/palette-editor-commands.c >--- gimp-2.2.4/app/actions/palette-editor-commands.c 2004-10-24 22:38:35.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/palette-editor-commands.c 2005-03-20 05:57:53.000000000 +0100 >@@ -65,9 +65,9 @@ > { > editor->color_dialog = > gimp_color_dialog_new (GIMP_VIEWABLE (palette), >- _("Edit Palette Color"), >+ _("Edit Swatch Color"), > GIMP_STOCK_PALETTE, >- _("Edit Color Palette Entry"), >+ _("Edit Swatch Color Entry"), > GTK_WIDGET (editor), > gimp_dialog_factory_from_name ("toplevel"), > "gimp-palette-editor-color-dialog", >diff -u -r gimp-2.2.4/app/actions/palettes-actions.c gimpshot-2.2.4/app/actions/palettes-actions.c >--- gimp-2.2.4/app/actions/palettes-actions.c 2004-10-18 13:29:58.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/palettes-actions.c 2005-03-20 05:57:54.000000000 +0100 >@@ -41,42 +41,42 @@ > static GimpActionEntry palettes_actions[] = > { > { "palettes-popup", GIMP_STOCK_PALETTE, >- N_("Palettes Menu"), NULL, NULL, NULL, >+ N_("Swatches Menu"), NULL, NULL, NULL, > GIMP_HELP_PALETTE_DIALOG }, > > { "palettes-new", GTK_STOCK_NEW, >- N_("_New Palette"), "", >- N_("New palette"), >+ N_("_New Swatch"), "", >+ N_("New swatch"), > G_CALLBACK (data_new_data_cmd_callback), > GIMP_HELP_PALETTE_NEW }, > > { "palettes-import", GTK_STOCK_CONVERT, >- N_("_Import Palette..."), "", >- N_("Import palette"), >+ 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 Palette"), NULL, >- N_("Duplicate palette"), >+ N_("D_uplicate Swatches"), NULL, >+ N_("Duplicate swatches"), > G_CALLBACK (data_duplicate_data_cmd_callback), > GIMP_HELP_PALETTE_DUPLICATE }, > > { "palettes-merge", NULL, >- N_("_Merge Palettes..."), NULL, >- N_("Merge palettes"), >+ 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 Palette"), "", >- N_("Delete palette"), >+ N_("_Delete Swatches"), "", >+ N_("Delete swatches"), > G_CALLBACK (data_delete_data_cmd_callback), > GIMP_HELP_PALETTE_DELETE }, > > { "palettes-refresh", GTK_STOCK_REFRESH, >- N_("_Refresh Palettes"), "", >- N_("Refresh palettes"), >+ N_("_Refresh Swatches"), "", >+ N_("Refresh swatches"), > G_CALLBACK (data_refresh_data_cmd_callback), > GIMP_HELP_PALETTE_REFRESH } > }; >@@ -84,8 +84,8 @@ > static GimpStringActionEntry palettes_edit_actions[] = > { > { "palettes-edit", GIMP_STOCK_EDIT, >- N_("_Edit Palette..."), NULL, >- N_("Edit palette"), >+ N_("_Edit Swatch..."), NULL, >+ N_("Edit swatch"), > "gimp-palette-editor", > GIMP_HELP_PALETTE_EDIT } > }; >diff -u -r gimp-2.2.4/app/actions/palettes-commands.c gimpshot-2.2.4/app/actions/palettes-commands.c >--- gimp-2.2.4/app/actions/palettes-commands.c 2004-10-19 16:08:44.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/palettes-commands.c 2005-03-20 05:57:54.000000000 +0100 >@@ -69,11 +69,11 @@ > GimpContainerEditor *editor = GIMP_CONTAINER_EDITOR (data); > GtkWidget *dialog; > >- dialog = gimp_query_string_box (_("Merge Palette"), >+ dialog = gimp_query_string_box (_("Merge Swatches"), > GTK_WIDGET (editor), > gimp_standard_help_func, > GIMP_HELP_PALETTE_MERGE, >- _("Enter a name for the merged palette"), >+ _("Enter a name for the merged swatches"), > NULL, > G_OBJECT (editor), "destroy", > palettes_merge_palettes_callback, >diff -u -r gimp-2.2.4/app/actions/plug-in-actions.c gimpshot-2.2.4/app/actions/plug-in-actions.c >--- gimp-2.2.4/app/actions/plug-in-actions.c 2005-01-03 16:06:47.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/plug-in-actions.c 2005-03-20 05:57:55.000000000 +0100 >@@ -59,24 +59,24 @@ > > static GimpActionEntry plug_in_actions[] = > { >- { "plug-in-menu", NULL, N_("Filte_rs") }, >+ { "plug-in-menu", NULL, N_("Filter") }, > { "plug-in-blur-menu", NULL, N_("_Blur") }, >- { "plug-in-colors-menu", NULL, N_("_Colors") }, >+ { "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_("_Generic") }, >+ { "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_("_Distorts") }, >+ { "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_("_Web") }, >+ { "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") }, >diff -u -r gimp-2.2.4/app/actions/qmask-actions.c gimpshot-2.2.4/app/actions/qmask-actions.c >--- gimp-2.2.4/app/actions/qmask-actions.c 2004-10-18 13:29:58.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/qmask-actions.c 2005-03-20 05:57:56.000000000 +0100 >@@ -39,7 +39,7 @@ > static GimpActionEntry qmask_actions[] = > { > { "qmask-popup", NULL, >- N_("Quick Mask Menu"), NULL, NULL, NULL, >+ N_("Quick Mask Mode Menu"), NULL, NULL, NULL, > GIMP_HELP_QMASK }, > > { "qmask-configure", NULL, >@@ -51,13 +51,13 @@ > static GimpToggleActionEntry qmask_toggle_actions[] = > { > { "qmask-active", NULL, >- N_("_Quick Mask Active"), NULL, 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"), "<shift>Q", NULL, >+ N_("Toggle _Quick Mask Mode"), "<shift>Q", NULL, > G_CALLBACK (qmask_toggle_cmd_callback), > FALSE, > GIMP_HELP_QMASK_TOGGLE } >diff -u -r gimp-2.2.4/app/actions/select-actions.c gimpshot-2.2.4/app/actions/select-actions.c >--- gimp-2.2.4/app/actions/select-actions.c 2004-10-23 02:53:48.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/select-actions.c 2005-03-20 05:57:57.000000000 +0100 >@@ -53,13 +53,13 @@ > GIMP_HELP_SELECTION_ALL }, > > { "select-none", GIMP_STOCK_SELECTION_NONE, >- N_("_None"), "<control><shift>A", >- N_("Select none"), >+ N_("Deselect"), "<control><shift>A", >+ N_("Deselect"), > G_CALLBACK (select_none_cmd_callback), > GIMP_HELP_SELECTION_NONE }, > > { "select-invert", GIMP_STOCK_INVERT, >- N_("_Invert"), "<control>I", >+ N_("_Inverse"), "<control>I", > N_("Invert selection"), > G_CALLBACK (select_invert_cmd_callback), > GIMP_HELP_SELECTION_INVERT }, >@@ -80,12 +80,12 @@ > GIMP_HELP_SELECTION_SHARPEN }, > > { "select-shrink", GIMP_STOCK_SELECTION_SHRINK, >- N_("S_hrink..."), NULL, NULL, >+ N_("Contract..."), NULL, NULL, > G_CALLBACK (select_shrink_cmd_callback), > GIMP_HELP_SELECTION_SHRINK }, > > { "select-grow", GIMP_STOCK_SELECTION_GROW, >- N_("_Grow..."), NULL, NULL, >+ N_("Expand..."), NULL, NULL, > G_CALLBACK (select_grow_cmd_callback), > GIMP_HELP_SELECTION_GROW }, > >@@ -95,7 +95,7 @@ > GIMP_HELP_SELECTION_BORDER }, > > { "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL, >- N_("Save to _Channel"), NULL, >+ N_("Save Selection"), NULL, > N_("Save selection to channel"), > G_CALLBACK (select_save_cmd_callback), > GIMP_HELP_SELECTION_TO_CHANNEL }, >diff -u -r gimp-2.2.4/app/actions/select-commands.c gimpshot-2.2.4/app/actions/select-commands.c >--- gimp-2.2.4/app/actions/select-commands.c 2004-10-23 21:13:17.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/select-commands.c 2005-03-20 05:57:58.000000000 +0100 >@@ -168,11 +168,11 @@ > GtkWidget *edge_lock; > return_if_no_display (gdisp, data); > >- dialog = gimp_query_size_box (_("Shrink Selection"), >+ dialog = gimp_query_size_box (_("Contract Selection"), > gdisp->shell, > gimp_standard_help_func, > GIMP_HELP_SELECTION_SHRINK, >- _("Shrink selection by"), >+ _("Contract selection by"), > select_shrink_pixels, 1, 32767, 0, > GIMP_DISPLAY_SHELL (gdisp->shell)->unit, > MIN (gdisp->gimage->xresolution, >@@ -181,7 +181,7 @@ > G_OBJECT (gdisp->gimage), "disconnect", > select_shrink_callback, gdisp->gimage); > >- edge_lock = gtk_check_button_new_with_label (_("Shrink from image border")); >+ 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); >@@ -202,11 +202,11 @@ > GtkWidget *dialog; > return_if_no_display (gdisp, data); > >- dialog = gimp_query_size_box (_("Grow Selection"), >+ dialog = gimp_query_size_box (_("Expand Selection"), > gdisp->shell, > gimp_standard_help_func, > GIMP_HELP_SELECTION_GROW, >- _("Grow selection by"), >+ _("Expand selection by"), > select_grow_pixels, 1, 32767, 0, > GIMP_DISPLAY_SHELL (gdisp->shell)->unit, > MIN (gdisp->gimage->xresolution, >diff -u -r gimp-2.2.4/app/actions/templates-actions.c gimpshot-2.2.4/app/actions/templates-actions.c >--- gimp-2.2.4/app/actions/templates-actions.c 2004-10-18 13:29:58.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/templates-actions.c 2005-03-20 05:57:59.000000000 +0100 >@@ -39,35 +39,35 @@ > static GimpActionEntry templates_actions[] = > { > { "templates-popup", GIMP_STOCK_TEMPLATE, >- N_("Templates Menu"), NULL, NULL, NULL, >+ N_("Preset Menu"), NULL, NULL, NULL, > GIMP_HELP_TEMPLATE_DIALOG }, > > { "templates-create-image", GIMP_STOCK_IMAGE, >- N_("_Create Image from Template..."), "", >- N_("Create a new image from the selected template"), >+ 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 Template..."), "", >+ 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 Template..."), "", >- N_("Duplicate the selected template"), >+ 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 Template..."), "", >- N_("Edit the selected template"), >+ 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 Template"), "", >+ N_("_Delete Preset"), "", > N_("Delete the selected template"), > G_CALLBACK (templates_delete_template_cmd_callback), > GIMP_HELP_TEMPLATE_DELETE } >diff -u -r gimp-2.2.4/app/actions/templates-commands.c gimpshot-2.2.4/app/actions/templates-commands.c >--- gimp-2.2.4/app/actions/templates-commands.c 2004-10-22 20:13:46.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/templates-commands.c 2005-03-20 05:57:59.000000000 +0100 >@@ -120,10 +120,10 @@ > > options = template_options_dialog_new (context->gimp, NULL, > GTK_WIDGET (editor), >- _("New Template"), >+ _("New Preset"), > "gimp-template-new", > GIMP_STOCK_TEMPLATE, >- _("Create a New Template"), >+ _("Create a New Preset"), > GIMP_HELP_TEMPLATE_NEW); > > g_signal_connect (options->dialog, "response", >@@ -182,10 +182,10 @@ > > options = template_options_dialog_new (context->gimp, template, > GTK_WIDGET (editor), >- _("Edit Template"), >+ _("Edit Preset"), > "gimp-template-edit", > GIMP_STOCK_EDIT, >- _("Edit Template"), >+ _("Edit Preset"), > GIMP_HELP_TEMPLATE_EDIT); > > g_signal_connect (options->dialog, "response", >@@ -221,7 +221,7 @@ > delete_data->template = template; > > dialog = >- gimp_message_dialog_new (_("Delete Template"), GIMP_STOCK_QUESTION, >+ gimp_message_dialog_new (_("Delete Preset"), GIMP_STOCK_QUESTION, > GTK_WIDGET (editor), 0, > gimp_standard_help_func, NULL, > >@@ -241,7 +241,7 @@ > > gimp_message_box_set_primary_text (GIMP_MESSAGE_DIALOG (dialog)->box, > _("Are you sure you want to delete " >- "template '%s' from the list and " >+ "preset '%s' from the list and " > "from disk?"), > GIMP_OBJECT (template)->name); > gtk_widget_show (dialog); >diff -u -r gimp-2.2.4/app/actions/tools-actions.c gimpshot-2.2.4/app/actions/tools-actions.c >--- gimp-2.2.4/app/actions/tools-actions.c 2004-10-18 13:29:58.000000000 +0200 >+++ gimpshot-2.2.4/app/actions/tools-actions.c 2005-03-22 04:13:03.000000000 +0100 >@@ -50,7 +50,7 @@ > { "tools-menu", NULL, N_("_Tools") }, > { "tools-select-menu", NULL, N_("_Selection Tools") }, > { "tools-paint-menu", NULL, N_("_Paint Tools") }, >- { "tools-transform-menu", NULL, N_("_Transform Tools") }, >+ { "tools-transform-menu", NULL, N_("_Transform") }, > { "tools-color-menu", NULL, N_("_Color Tools") }, > > { "tools-reset", GIMP_STOCK_RESET, >diff -u -r gimp-2.2.4/app/actions/vectors-actions.c gimpshot-2.2.4/app/actions/vectors-actions.c >--- gimp-2.2.4/app/actions/vectors-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/vectors-actions.c 2005-03-22 10:40:05.000000000 +0100 >@@ -45,7 +45,7 @@ > GIMP_HELP_PATH_DIALOG }, > > { "vectors-path-tool", GIMP_STOCK_TOOL_PATH, >- N_("Path _Tool"), NULL, NULL, >+ N_("Pen _Tool"), NULL, NULL, > G_CALLBACK (vectors_vectors_tool_cmd_callback), > GIMP_HELP_TOOL_VECTORS }, > >@@ -85,26 +85,26 @@ > GIMP_HELP_PATH_MERGE_VISIBLE }, > > { "vectors-raise", GTK_STOCK_GO_UP, >- N_("_Raise Path"), "", >- N_("Raise path"), >+ 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_("Raise Path to _Top"), "", >- N_("Raise path to 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_("_Lower Path"), "", >- N_("Lower path"), >+ 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_("Lower Path to _Bottom"), "", >- N_("Lower path to 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 }, > >diff -u -r gimp-2.2.4/app/actions/view-actions.c gimpshot-2.2.4/app/actions/view-actions.c >--- gimp-2.2.4/app/actions/view-actions.c 2004-11-18 17:04:41.000000000 +0100 >+++ gimpshot-2.2.4/app/actions/view-actions.c 2005-03-22 05:41:02.000000000 +0100 >@@ -92,7 +92,7 @@ > GIMP_HELP_INFO_DIALOG }, > > { "view-navigation-window", GIMP_STOCK_NAVIGATION, >- N_("Na_vigation Window"), "<control><shift>N", NULL, >+ N_("Na_vigator"), "<control><shift>N", NULL, > G_CALLBACK (view_navigation_window_cmd_callback), > GIMP_HELP_NAVIGATION_DIALOG }, > >@@ -122,7 +122,7 @@ > GIMP_HELP_VIEW_DOT_FOR_DOT }, > > { "view-show-selection", NULL, >- N_("Show _Selection"), "<control>T", NULL, >+ N_("Show _Selection Edges"), "<control>T", NULL, > G_CALLBACK (view_toggle_selection_cmd_callback), > TRUE, > GIMP_HELP_VIEW_SHOW_SELECTION }, >diff -u -r gimp-2.2.4/app/core/core-enums.c gimpshot-2.2.4/app/core/core-enums.c >--- gimp-2.2.4/app/core/core-enums.c 2005-02-12 14:39:57.000000000 +0100 >+++ gimpshot-2.2.4/app/core/core-enums.c 2005-03-28 09:12:06.000000000 +0200 >@@ -1035,7 +1035,7 @@ > { 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"), 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 }, >@@ -1055,7 +1055,7 @@ > { 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_("Text"), 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 }, >@@ -1083,7 +1083,7 @@ > { 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_("Text"), 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 }, >diff -u -r gimp-2.2.4/app/core/gimp.c gimpshot-2.2.4/app/core/gimp.c >--- gimp-2.2.4/app/core/gimp.c 2004-08-11 16:00:08.000000000 +0200 >+++ gimpshot-2.2.4/app/core/gimp.c 2005-03-20 05:58:00.000000000 +0100 >@@ -861,7 +861,7 @@ > gimp_data_factory_data_init (gimp->pattern_factory, gimp->no_data); > > /* initialize the list of gimp palettes */ >- (* status_callback) (NULL, _("Palettes"), 0.3); >+ (* status_callback) (NULL, _("Swatches"), 0.3); > gimp_data_factory_data_init (gimp->palette_factory, gimp->no_data); > > /* initialize the list of gimp gradients */ >@@ -877,7 +877,7 @@ > gimp_documents_load (gimp); > > /* initialize the template list */ >- (* status_callback) (NULL, _("Templates"), 0.7); >+ (* status_callback) (NULL, _("Presets"), 0.7); > gimp_templates_load (gimp); > > /* initialize the module list */ >diff -u -r gimp-2.2.4/app/core/gimpchannel-select.c gimpshot-2.2.4/app/core/gimpchannel-select.c >--- gimp-2.2.4/app/core/gimpchannel-select.c 2004-11-16 14:41:55.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpchannel-select.c 2005-03-22 06:28:56.000000000 +0100 >@@ -53,7 +53,7 @@ > g_return_if_fail (GIMP_IS_CHANNEL (channel)); > g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); > >- gimp_channel_push_undo (channel, _("Rect Select")); >+ gimp_channel_push_undo (channel, _("Rectangular Marquee Tool")); > > /* if applicable, replace the current selection */ > if (op == GIMP_CHANNEL_OP_REPLACE) >@@ -104,7 +104,7 @@ > g_return_if_fail (GIMP_IS_CHANNEL (channel)); > g_return_if_fail (gimp_item_is_attached (GIMP_ITEM (channel))); > >- gimp_channel_push_undo (channel, _("Ellipse Select")); >+ gimp_channel_push_undo (channel, _("Elliptical Marquee Tool")); > > /* if applicable, replace the current selection */ > if (op == GIMP_CHANNEL_OP_REPLACE) >@@ -457,7 +457,7 @@ > if (! sample_merged) > gimp_item_offsets (GIMP_ITEM (drawable), &add_on_x, &add_on_y); > >- gimp_channel_select_channel (channel, _("Fuzzy Select"), >+ gimp_channel_select_channel (channel, _("Magic Wand Tool"), > add_on, add_on_x, add_on_y, > op, > feather, >diff -u -r gimp-2.2.4/app/core/gimpchannel.c gimpshot-2.2.4/app/core/gimpchannel.c >--- gimp-2.2.4/app/core/gimpchannel.c 2004-11-16 14:41:55.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpchannel.c 2005-03-22 04:38:58.000000000 +0100 >@@ -380,7 +380,7 @@ > if (tooltip) > *tooltip = NULL; > >- return g_strdup (_("Quick Mask")); >+ return g_strdup (_("Quick Mask Mode")); > } > > return GIMP_VIEWABLE_CLASS (parent_class)->get_description (viewable, >diff -u -r gimp-2.2.4/app/core/gimpdrawable-blend.c gimpshot-2.2.4/app/core/gimpdrawable-blend.c >--- gimp-2.2.4/app/core/gimpdrawable-blend.c 2004-11-14 03:43:48.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpdrawable-blend.c 2005-03-22 06:10:24.000000000 +0100 >@@ -235,7 +235,7 @@ > > pixel_region_init (&bufPR, buf_tiles, 0, 0, width, height, FALSE); > gimp_drawable_apply_region (drawable, &bufPR, >- TRUE, _("Blend"), >+ TRUE, _("Gradient Tool"), > opacity, paint_mode, > NULL, x, y); > >diff -u -r gimp-2.2.4/app/core/gimpdrawable-bucket-fill.c gimpshot-2.2.4/app/core/gimpdrawable-bucket-fill.c >--- gimp-2.2.4/app/core/gimpdrawable-bucket-fill.c 2004-11-11 15:05:33.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpdrawable-bucket-fill.c 2005-03-22 06:17:54.000000000 +0100 >@@ -269,7 +269,7 @@ > /* Apply it to the image */ > pixel_region_init (&bufPR, buf_tiles, 0, 0, (x2 - x1), (y2 - y1), FALSE); > gimp_drawable_apply_region (drawable, &bufPR, >- TRUE, _("Bucket Fill"), >+ TRUE, _("Paint Bucket Tool"), > opacity, paint_mode, > NULL, x1, y1); > tile_manager_unref (buf_tiles); >diff -u -r gimp-2.2.4/app/core/gimpimage-convert.c gimpshot-2.2.4/app/core/gimpimage-convert.c >--- gimp-2.2.4/app/core/gimpimage-convert.c 2005-02-08 14:42:47.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpimage-convert.c 2005-03-22 05:00:42.000000000 +0100 >@@ -794,7 +794,7 @@ > break; > > case GIMP_INDEXED: >- undo_desc = _("Convert Image to Indexed"); >+ undo_desc = _("Convert Image to Indexed Color"); > break; > } > >diff -u -r gimp-2.2.4/app/core/gimpimage-qmask.c gimpshot-2.2.4/app/core/gimpimage-qmask.c >--- gimp-2.2.4/app/core/gimpimage-qmask.c 2004-09-25 18:52:49.000000000 +0200 >+++ gimpshot-2.2.4/app/core/gimpimage-qmask.c 2005-03-22 05:02:01.000000000 +0100 >@@ -64,7 +64,7 @@ > if (! mask) > { > gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_QMASK, >- _("Enable Quick Mask")); >+ _("Enable Quick Mask Mode")); > > if (gimp_channel_is_empty (selection)) > { >@@ -114,7 +114,7 @@ > GimpLayer *floating_sel = gimp_image_floating_sel (gimage); > > gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_QMASK, >- _("Disable Quick Mask")); >+ _("Disable Quick Mask Mode")); > > if (gimage->qmask_inverted) > gimp_channel_invert (mask, TRUE); >diff -u -r gimp-2.2.4/app/core/gimpimage-scale.c gimpshot-2.2.4/app/core/gimpimage-scale.c >--- gimp-2.2.4/app/core/gimpimage-scale.c 2004-08-10 20:46:36.000000000 +0200 >+++ gimpshot-2.2.4/app/core/gimpimage-scale.c 2005-03-24 09:13:19.000000000 +0100 >@@ -68,7 +68,7 @@ > g_object_freeze_notify (G_OBJECT (gimage)); > > gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_SCALE, >- _("Scale Image")); >+ _("Image Size")); > > /* Push the image size to the stack */ > gimp_image_undo_push_image_size (gimage, NULL); >diff -u -r gimp-2.2.4/app/core/gimpimage.c gimpshot-2.2.4/app/core/gimpimage.c >--- gimp-2.2.4/app/core/gimpimage.c 2004-11-14 03:43:48.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpimage.c 2005-03-22 05:12:28.000000000 +0100 >@@ -2742,7 +2742,7 @@ > > old_has_alpha = gimp_image_has_alpha (gimage); > >- gimp_image_undo_push_layer_remove (gimage, _("Remove Layer"), >+ gimp_image_undo_push_layer_remove (gimage, _("Delete Layer"), > layer, index, active_layer); > > g_object_ref (layer); >@@ -2824,7 +2824,7 @@ > } > > return gimp_image_position_layer (gimage, layer, index - 1, >- TRUE, _("Raise Layer")); >+ TRUE, _("Bring Forward")); > } > > gboolean >@@ -2846,7 +2846,7 @@ > } > > return gimp_image_position_layer (gimage, layer, index + 1, >- TRUE, _("Lower Layer")); >+ TRUE, _("Send Backward")); > } > > gboolean >@@ -2874,7 +2874,7 @@ > } > > return gimp_image_position_layer (gimage, layer, 0, >- TRUE, _("Raise Layer to Top")); >+ TRUE, _("Bring to Front")); > } > > gboolean >@@ -2899,7 +2899,7 @@ > } > > return gimp_image_position_layer (gimage, layer, length - 1, >- TRUE, _("Lower Layer to Bottom")); >+ TRUE, _("Send to Back")); > } > > gboolean >@@ -3035,7 +3035,7 @@ > index = gimp_container_get_child_index (gimage->channels, > GIMP_OBJECT (channel)); > >- gimp_image_undo_push_channel_remove (gimage, _("Remove Channel"), >+ gimp_image_undo_push_channel_remove (gimage, _("Delete Channel"), > channel, index, active_channel); > > g_object_ref (channel); >@@ -3084,7 +3084,7 @@ > } > > return gimp_image_position_channel (gimage, channel, index - 1, >- TRUE, _("Raise Channel")); >+ TRUE, _("Bring Channel Forward")); > } > > gboolean >@@ -3106,7 +3106,7 @@ > } > > return gimp_image_position_channel (gimage, channel, 0, >- TRUE, _("Raise Channel to Top")); >+ TRUE, _("Bring Channel to Front")); > } > > gboolean >@@ -3128,7 +3128,7 @@ > } > > return gimp_image_position_channel (gimage, channel, index + 1, >- TRUE, _("Lower Channel")); >+ TRUE, _("Send Channel Backward")); > } > > gboolean >@@ -3153,7 +3153,7 @@ > } > > return gimp_image_position_channel (gimage, channel, length - 1, >- TRUE, _("Lower Channel to Bottom")); >+ TRUE, _("Send Channel to Back")); > } > > gboolean >@@ -3273,7 +3273,7 @@ > index = gimp_container_get_child_index (gimage->vectors, > GIMP_OBJECT (vectors)); > >- gimp_image_undo_push_vectors_remove (gimage, _("Remove Path"), >+ gimp_image_undo_push_vectors_remove (gimage, _("Delete Path"), > vectors, index, active_vectors); > > g_object_ref (vectors); >@@ -3322,7 +3322,7 @@ > } > > return gimp_image_position_vectors (gimage, vectors, index - 1, >- TRUE, _("Raise Path")); >+ TRUE, _("Bring Path Forward")); > } > > gboolean >@@ -3344,7 +3344,7 @@ > } > > return gimp_image_position_vectors (gimage, vectors, 0, >- TRUE, _("Raise Path to Top")); >+ TRUE, _("Bring Path to Front")); > } > > gboolean >@@ -3366,7 +3366,7 @@ > } > > return gimp_image_position_vectors (gimage, vectors, index + 1, >- TRUE, _("Lower Path")); >+ TRUE, _("Send Path Backward")); > } > > gboolean >@@ -3391,7 +3391,7 @@ > } > > return gimp_image_position_vectors (gimage, vectors, length - 1, >- TRUE, _("Lower Path to Bottom")); >+ TRUE, _("Send Path to Back")); > } > > gboolean >diff -u -r gimp-2.2.4/app/core/gimppalette.c gimpshot-2.2.4/app/core/gimppalette.c >--- gimp-2.2.4/app/core/gimppalette.c 2004-09-28 16:59:55.000000000 +0200 >+++ gimpshot-2.2.4/app/core/gimppalette.c 2005-03-22 05:17:47.000000000 +0100 >@@ -372,13 +372,13 @@ > /* 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 palette file '%s': " >+ _("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 palette file '%s': " >+ _("Fatal parse error in swatch file '%s': " > "Missing magic header."), > gimp_filename_to_utf8 (filename)); > >@@ -392,7 +392,7 @@ > if (! fgets (str, sizeof (str), file)) > { > g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, >- _("Fatal parse error in palette file '%s': " >+ _("Fatal parse error in swatch file '%s': " > "Read error in line %d."), > gimp_filename_to_utf8 (filename), linenum); > fclose (file); >@@ -407,7 +407,7 @@ > gchar *utf8; > > utf8 = gimp_any_to_utf8 (&str[strlen ("Name: ")], -1, >- _("Invalid UTF-8 string in palette file '%s'"), >+ _("Invalid UTF-8 string in swatch file '%s'"), > gimp_filename_to_utf8 (filename)); > g_strstrip (utf8); > >@@ -417,7 +417,7 @@ > if (! fgets (str, sizeof (str), file)) > { > g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, >- _("Fatal parse error in palette file '%s': " >+ _("Fatal parse error in swatch file '%s': " > "Read error in line %d."), > gimp_filename_to_utf8 (filename), linenum); > fclose (file); >@@ -435,7 +435,7 @@ > > if (columns < 0 || columns > 256) > { >- g_message (_("Reading palette file '%s': " >+ g_message (_("Reading swatch file '%s': " > "Invalid number of columns in line %d. " > "Using default value."), > gimp_filename_to_utf8 (filename), linenum); >@@ -447,7 +447,7 @@ > if (! fgets (str, sizeof (str), file)) > { > g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, >- _("Fatal parse error in palette file '%s': " >+ _("Fatal parse error in swatch file '%s': " > "Read error in line %d."), > gimp_filename_to_utf8 (filename), linenum); > fclose (file); >@@ -481,7 +481,7 @@ > r = atoi (tok); > else > /* maybe we should just abort? */ >- g_message (_("Reading palette file '%s': " >+ g_message (_("Reading swatch file '%s': " > "Missing RED component in line %d."), > gimp_filename_to_utf8 (filename), linenum); > >@@ -489,7 +489,7 @@ > if (tok) > g = atoi (tok); > else >- g_message (_("Reading palette '%s': " >+ g_message (_("Reading swatch '%s': " > "Missing GREEN component in line %d."), > gimp_filename_to_utf8 (filename), linenum); > >@@ -497,7 +497,7 @@ > if (tok) > b = atoi (tok); > else >- g_message (_("Reading palette file '%s': " >+ g_message (_("Reading swatch file '%s': " > "Missing BLUE component in line %d."), > gimp_filename_to_utf8 (filename), linenum); > >@@ -507,7 +507,7 @@ > if (r < 0 || r > 255 || > g < 0 || g > 255 || > b < 0 || b > 255) >- g_message (_("Reading palette file '%s': " >+ g_message (_("Reading swatch file '%s': " > "RGB value out of range in line %d."), > gimp_filename_to_utf8 (filename), linenum); > >@@ -533,7 +533,7 @@ > break; > > g_set_error (error, GIMP_DATA_ERROR, GIMP_DATA_ERROR_READ, >- _("Fatal parse error in palette file '%s': " >+ _("Fatal parse error in swatch file '%s': " > "Read error in line %d."), > gimp_filename_to_utf8 (filename), linenum); > fclose (file); >diff -u -r gimp-2.2.4/app/core/gimpselection.c gimpshot-2.2.4/app/core/gimpselection.c >--- gimp-2.2.4/app/core/gimpselection.c 2004-11-16 14:41:55.000000000 +0100 >+++ gimpshot-2.2.4/app/core/gimpselection.c 2005-03-22 05:27:39.000000000 +0100 >@@ -200,7 +200,7 @@ > > channel_class->feather_desc = _("Feather Selection"); > channel_class->sharpen_desc = _("Sharpen Selection"); >- channel_class->clear_desc = _("Select None"); >+ channel_class->clear_desc = _("Deselect"); > channel_class->all_desc = _("Select All"); > channel_class->invert_desc = _("Invert Selection"); > channel_class->border_desc = _("Border Selection"); >diff -u -r gimp-2.2.4/app/dialogs/dialogs.c gimpshot-2.2.4/app/dialogs/dialogs.c >--- gimp-2.2.4/app/dialogs/dialogs.c 2004-11-22 17:03:54.000000000 +0100 >+++ gimpshot-2.2.4/app/dialogs/dialogs.c 2005-03-22 10:40:03.000000000 +0100 >@@ -141,7 +141,7 @@ > 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_("Palettes"), NULL, GIMP_STOCK_PALETTE, >+ 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), >@@ -149,9 +149,9 @@ > 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_("Document History"), GTK_STOCK_OPEN, >+ LISTGRID (document, N_("History"), N_("History"), GTK_STOCK_OPEN, > GIMP_HELP_DOCUMENT_DIALOG, GIMP_VIEW_SIZE_LARGE), >- LISTGRID (template, N_("Templates"), N_("Image Templates"), GIMP_STOCK_TEMPLATE, >+ LISTGRID (template, N_("Presets"), N_("Image Presets"), GIMP_STOCK_TEMPLATE, > GIMP_HELP_TEMPLATE_DIALOG, GIMP_VIEW_SIZE_SMALL), > > /* image related */ >@@ -186,7 +186,7 @@ > > /* display related */ > DOCKABLE ("gimp-navigation-view", >- N_("Navigation"), N_("Display Navigation"), GIMP_STOCK_NAVIGATION, >+ N_("Navigator"), N_("Display Navigator"), GIMP_STOCK_NAVIGATION, > GIMP_HELP_NAVIGATION_DIALOG, > dialogs_navigation_editor_new, 0, FALSE), > >@@ -206,7 +206,7 @@ > GIMP_HELP_GRADIENT_EDITOR_DIALOG, > dialogs_gradient_editor_get, 0, TRUE), > DOCKABLE ("gimp-palette-editor", >- N_("Palette Editor"), NULL, GIMP_STOCK_PALETTE, >+ N_("Swatches Editor"), NULL, GIMP_STOCK_PALETTE, > GIMP_HELP_PALETTE_EDITOR_DIALOG, > dialogs_palette_editor_get, 0, TRUE) > }; >diff -u -r gimp-2.2.4/app/dialogs/image-new-dialog.c gimpshot-2.2.4/app/dialogs/image-new-dialog.c >--- gimp-2.2.4/app/dialogs/image-new-dialog.c 2004-10-23 21:01:26.000000000 +0200 >+++ gimpshot-2.2.4/app/dialogs/image-new-dialog.c 2005-03-24 10:35:16.000000000 +0100 >@@ -127,7 +127,7 @@ > dialog->combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0); > > gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, >- _("_Template:"), 0.0, 0.5, >+ _("Preset:"), 0.0, 0.5, > dialog->combo, 1, FALSE); > > g_signal_connect (dialog->combo, "select_item", >diff -u -r gimp-2.2.4/app/dialogs/image-scale-dialog.c gimpshot-2.2.4/app/dialogs/image-scale-dialog.c >--- gimp-2.2.4/app/dialogs/image-scale-dialog.c 2005-02-08 14:42:47.000000000 +0100 >+++ gimpshot-2.2.4/app/dialogs/image-scale-dialog.c 2005-03-24 09:09:56.000000000 +0100 >@@ -88,7 +88,7 @@ > dialog->gdisp = display; > dialog->context = context; > dialog->dialog = scale_dialog_new (GIMP_VIEWABLE (display->gimage), >- _("Scale Image"), "gimp-image-scale", >+ _("Image Size"), "gimp-image-scale", > parent, > gimp_standard_help_func, > GIMP_HELP_IMAGE_SCALE, >diff -u -r gimp-2.2.4/app/dialogs/palette-import-dialog.c gimpshot-2.2.4/app/dialogs/palette-import-dialog.c >--- gimp-2.2.4/app/dialogs/palette-import-dialog.c 2004-11-14 03:44:31.000000000 +0100 >+++ gimpshot-2.2.4/app/dialogs/palette-import-dialog.c 2005-03-22 05:28:30.000000000 +0100 >@@ -168,9 +168,9 @@ > gimp_get_user_context (gimp)); > > import_dialog->dialog = >- gimp_viewable_dialog_new (NULL, _("Import Palette"), "gimp-palette-import", >+ gimp_viewable_dialog_new (NULL, _("Import Color Table"), "gimp-palette-import", > GTK_STOCK_CONVERT, >- _("Import a New Palette"), >+ _("Import a New Color Table"), > NULL, > gimp_standard_help_func, > GIMP_HELP_PALETTE_IMPORT, >@@ -243,7 +243,7 @@ > group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (import_dialog->image_radio)); > > import_dialog->palettefile_radio = >- gtk_radio_button_new_with_mnemonic (group, _("Palette _file")); >+ 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); >@@ -270,7 +270,7 @@ > > /* Palette file name entry */ > import_dialog->filename_entry = >- gimp_file_entry_new (_("Select palette file"), NULL, FALSE, FALSE); >+ 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); >@@ -316,7 +316,7 @@ > 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, >- _("Palette _Name:"), 0.0, 0.5, >+ _("Color Table _Name:"), 0.0, 0.5, > import_dialog->entry, 2, FALSE); > > /* The # of colors */ >diff -u -r gimp-2.2.4/app/dialogs/preferences-dialog.c gimpshot-2.2.4/app/dialogs/preferences-dialog.c >--- gimp-2.2.4/app/dialogs/preferences-dialog.c 2004-12-16 11:57:03.000000000 +0100 >+++ gimpshot-2.2.4/app/dialogs/preferences-dialog.c 2005-03-24 10:35:19.000000000 +0100 >@@ -1096,7 +1096,7 @@ > gtk_widget_show (checks_vbox); > > prefs_check_button_add (object, "show-selection", >- _("Show s_election"), >+ _("Show s_election edges"), > GTK_BOX (checks_vbox)); > prefs_check_button_add (object, "show-layer-boundary", > _("Show _layer boundary"), >@@ -1310,7 +1310,7 @@ > > combo = gimp_container_combo_box_new (gimp->templates, NULL, 16, 0); > gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, >- _("_Template:"), 0.0, 0.5, >+ _("Preset:"), 0.0, 0.5, > combo, 1, FALSE); > > gimp_container_view_select_item (GIMP_CONTAINER_VIEW (combo), NULL); >@@ -1377,7 +1377,7 @@ > _("Default _layer & channel preview size:"), > GTK_TABLE (table), 0, size_group); > prefs_enum_combo_box_add (object, "navigation-preview-size", 0, 0, >- _("Na_vigation preview size:"), >+ _("Na_vigator preview size:"), > GTK_TABLE (table), 1, size_group); > > /* Keyboard Shortcuts */ >@@ -2302,9 +2302,9 @@ > GIMP_HELP_PREFS_FOLDERS_PATTERNS, > N_("Select Pattern Folders"), > "pattern-path", "pattern-path-writable" }, >- { N_("Palettes"), N_("Palette Folders"), "folders-palettes.png", >+ { N_("Swatches"), N_("Swatch Folders"), "folders-palettes.png", > GIMP_HELP_PREFS_FOLDERS_PALETTES, >- N_("Select Palette Folders"), >+ N_("Select Swatch Folders"), > "palette-path", "palette-path-writable" }, > { N_("Gradients"), N_("Gradient Folders"), "folders-gradients.png", > GIMP_HELP_PREFS_FOLDERS_GRADIENTS, >diff -u -r gimp-2.2.4/app/dialogs/user-install-dialog.c gimpshot-2.2.4/app/dialogs/user-install-dialog.c >--- gimp-2.2.4/app/dialogs/user-install-dialog.c 2005-02-21 14:15:04.000000000 +0100 >+++ gimpshot-2.2.4/app/dialogs/user-install-dialog.c 2005-03-22 05:55:29.000000000 +0100 >@@ -133,7 +133,7 @@ > FALSE, "gimprc", > N_("The gimprc is used to store personal preferences " > "that affect GIMP's default behavior. " >- "Paths to search for brushes, palettes, gradients, " >+ "Paths to search for brushes, swatches, gradients, " > "patterns, plug-ins and modules can also configured " > "here."), > TREE_ITEM_DO_NOTHING >@@ -174,7 +174,7 @@ > { > FALSE, "templaterc", > N_("This file holds a collection of standard media sizes that " >- "serve as image templates."), >+ "serve as image presets."), > TREE_ITEM_DO_NOTHING > }, > { >@@ -213,9 +213,9 @@ > }, > { > TRUE, "palettes", >- N_("This folder is used to store user defined palettes. " >+ N_("This folder is used to store user defined color tables. " > "The GIMP checks this folder in addition to the system-wide " >- "GIMP palettes installation when searching for palettes."), >+ "GIMP swatches installation when searching for color tables."), > TREE_ITEM_MKDIR > }, > { >diff -u -r gimp-2.2.4/app/paint/gimpclone.c gimpshot-2.2.4/app/paint/gimpclone.c >--- gimp-2.2.4/app/paint/gimpclone.c 2004-07-28 13:17:49.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimpclone.c 2005-03-22 06:20:15.000000000 +0100 >@@ -86,7 +86,7 @@ > (* callback) (gimp, > GIMP_TYPE_CLONE, > GIMP_TYPE_CLONE_OPTIONS, >- _("Clone")); >+ _("Clone Stamp Tool")); > } > > GType >diff -u -r gimp-2.2.4/app/paint/gimpconvolve.c gimpshot-2.2.4/app/paint/gimpconvolve.c >--- gimp-2.2.4/app/paint/gimpconvolve.c 2004-07-19 16:37:40.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimpconvolve.c 2005-03-22 05:59:35.000000000 +0100 >@@ -118,7 +118,7 @@ > (* callback) (gimp, > GIMP_TYPE_CONVOLVE, > GIMP_TYPE_CONVOLVE_OPTIONS, >- _("Convolve")); >+ _("Blur/Sharpen")); > } > > GType >diff -u -r gimp-2.2.4/app/paint/gimpdodgeburn.c gimpshot-2.2.4/app/paint/gimpdodgeburn.c >--- gimp-2.2.4/app/paint/gimpdodgeburn.c 2004-07-19 16:37:40.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimpdodgeburn.c 2005-03-28 09:16:42.000000000 +0200 >@@ -84,7 +84,7 @@ > (* callback) (gimp, > GIMP_TYPE_DODGE_BURN, > GIMP_TYPE_DODGE_BURN_OPTIONS, >- _("Dodge/Burn")); >+ _("Dodge/Burn Tool")); > } > > GType >diff -u -r gimp-2.2.4/app/paint/gimperaser.c gimpshot-2.2.4/app/paint/gimperaser.c >--- gimp-2.2.4/app/paint/gimperaser.c 2004-07-19 16:37:40.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimperaser.c 2005-03-28 09:09:31.000000000 +0200 >@@ -61,7 +61,7 @@ > (* callback) (gimp, > GIMP_TYPE_ERASER, > GIMP_TYPE_ERASER_OPTIONS, >- _("Eraser")); >+ _("Eraser Tool")); > } > > GType >diff -u -r gimp-2.2.4/app/paint/gimppaintbrush.c gimpshot-2.2.4/app/paint/gimppaintbrush.c >--- gimp-2.2.4/app/paint/gimppaintbrush.c 2004-07-19 16:37:40.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimppaintbrush.c 2005-03-22 06:47:38.000000000 +0100 >@@ -62,7 +62,7 @@ > (* callback) (gimp, > GIMP_TYPE_PAINTBRUSH, > GIMP_TYPE_PAINT_OPTIONS, >- _("Paintbrush")); >+ _("Brush Tool")); > } > > GType >diff -u -r gimp-2.2.4/app/paint/gimppencil.c gimpshot-2.2.4/app/paint/gimppencil.c >--- gimp-2.2.4/app/paint/gimppencil.c 2004-05-25 22:41:08.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimppencil.c 2005-03-28 09:03:09.000000000 +0200 >@@ -35,7 +35,7 @@ > (* callback) (gimp, > GIMP_TYPE_PENCIL, > GIMP_TYPE_PENCIL_OPTIONS, >- _("Pencil")); >+ _("Pencil Tool")); > } > > GType >diff -u -r gimp-2.2.4/app/paint/gimpsmudge.c gimpshot-2.2.4/app/paint/gimpsmudge.c >--- gimp-2.2.4/app/paint/gimpsmudge.c 2004-07-19 16:37:40.000000000 +0200 >+++ gimpshot-2.2.4/app/paint/gimpsmudge.c 2005-03-22 07:05:46.000000000 +0100 >@@ -75,7 +75,7 @@ > (* callback) (gimp, > GIMP_TYPE_SMUDGE, > GIMP_TYPE_SMUDGE_OPTIONS, >- _("Smudge")); >+ _("Smudge Tool")); > } > > GType >diff -u -r gimp-2.2.4/app/pdb/internal_procs.c gimpshot-2.2.4/app/pdb/internal_procs.c >--- gimp-2.2.4/app/pdb/internal_procs.c 2004-12-14 00:36:16.000000000 +0100 >+++ gimpshot-2.2.4/app/pdb/internal_procs.c 2005-03-22 05:40:59.000000000 +0100 >@@ -167,13 +167,13 @@ > (* status_callback) (NULL, _("Palette UI"), 0.739); > register_palette_select_procs (gimp); > >- (* status_callback) (NULL, _("Palettes"), 0.746); >+ (* status_callback) (NULL, _("Swatches"), 0.746); > register_palettes_procs (gimp); > > (* status_callback) (NULL, _("Parasite procedures"), 0.755); > register_parasite_procs (gimp); > >- (* status_callback) (NULL, _("Paths"), 0.783); >+ (* status_callback) (NULL, _("Pen Tool"), 0.783); > register_paths_procs (gimp); > > (* status_callback) (NULL, _("Pattern"), 0.818); >diff -u -r gimp-2.2.4/app/pdb/selection_tools_cmds.c gimpshot-2.2.4/app/pdb/selection_tools_cmds.c >--- gimp-2.2.4/app/pdb/selection_tools_cmds.c 2004-10-06 15:13:07.000000000 +0200 >+++ gimpshot-2.2.4/app/pdb/selection_tools_cmds.c 2005-03-27 07:23:47.000000000 +0200 >@@ -329,7 +329,7 @@ > > if (success) > gimp_channel_select_polygon (gimp_image_get_mask (gimage), >- _("Free Select"), >+ _("Lasso Tool"), > num_segs, > (GimpVector2 *) segs, > operation, >diff -u -r gimp-2.2.4/app/tools/gimpblendtool.c gimpshot-2.2.4/app/tools/gimpblendtool.c >--- gimp-2.2.4/app/tools/gimpblendtool.c 2004-08-22 23:48:50.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpblendtool.c 2005-03-22 06:17:52.000000000 +0100 >@@ -98,9 +98,9 @@ > GIMP_CONTEXT_PAINT_MODE_MASK | > GIMP_CONTEXT_GRADIENT_MASK, > "gimp-blend-tool", >- _("Blend"), >+ _("Gradient Tool"), > _("Fill with a color gradient"), >- N_("Blen_d"), "L", >+ N_("Gradient Tool"), "L", > NULL, GIMP_HELP_TOOL_BLEND, > GIMP_STOCK_TOOL_BLEND, > data); >@@ -188,7 +188,7 @@ > switch (gimp_drawable_type (drawable)) > { > case GIMP_INDEXED_IMAGE: case GIMP_INDEXEDA_IMAGE: >- g_message (_("Blend: Invalid for indexed images.")); >+ g_message (_("Gradient Tool: Invalid for indexed images.")); > return; > > break; >@@ -206,7 +206,7 @@ > gimp_tool_control_activate (tool->control); > > /* initialize the statusbar display */ >- gimp_tool_push_status_coords (tool, _("Blend: "), 0, ", ", 0); >+ gimp_tool_push_status_coords (tool, _("Gradient: "), 0, ", ", 0); > > /* Start drawing the blend tool */ > gimp_draw_tool_start (GIMP_DRAW_TOOL (tool), gdisp); >@@ -246,7 +246,7 @@ > GimpProgress *progress; > > progress = gimp_progress_start (GIMP_PROGRESS (gdisp), >- _("Blending..."), FALSE); >+ _("Drawing Gradient..."), FALSE); > > gimp_drawable_blend (gimp_image_active_drawable (gimage), > context, >@@ -305,7 +305,7 @@ > gimp_tool_pop_status (tool); > > gimp_tool_push_status_coords (tool, >- _("Blend: "), >+ _("Gradient: "), > blend_tool->endx - blend_tool->startx, > ", ", > blend_tool->endy - blend_tool->starty); >diff -u -r gimp-2.2.4/app/tools/gimpbucketfilltool.c gimpshot-2.2.4/app/tools/gimpbucketfilltool.c >--- gimp-2.2.4/app/tools/gimpbucketfilltool.c 2004-07-13 18:36:29.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpbucketfilltool.c 2005-03-22 06:17:53.000000000 +0100 >@@ -88,9 +88,9 @@ > GIMP_CONTEXT_PAINT_MODE_MASK | > GIMP_CONTEXT_PATTERN_MASK, > "gimp-bucket-fill-tool", >- _("Bucket Fill"), >+ _("Paint Bucket Tool"), > _("Fill with a color or pattern"), >- N_("_Bucket Fill"), "<shift>B", >+ N_("Paint _Bucket Tool"), "<shift>B", > NULL, GIMP_HELP_TOOL_BUCKET_FILL, > GIMP_STOCK_TOOL_BUCKET_FILL, > data); >diff -u -r gimp-2.2.4/app/tools/gimpclonetool.c gimpshot-2.2.4/app/tools/gimpclonetool.c >--- gimp-2.2.4/app/tools/gimpclonetool.c 2005-02-17 15:52:04.000000000 +0100 >+++ gimpshot-2.2.4/app/tools/gimpclonetool.c 2005-03-22 06:20:14.000000000 +0100 >@@ -86,9 +86,9 @@ > GIMP_PAINT_OPTIONS_CONTEXT_MASK | > GIMP_CONTEXT_PATTERN_MASK, > "gimp-clone-tool", >- _("Clone"), >+ _("Clone Stamp Tool"), > _("Paint using Patterns or Image Regions"), >- N_("_Clone"), "C", >+ N_("_Clone Stamp Tool"), "C", > NULL, GIMP_HELP_TOOL_CLONE, > GIMP_STOCK_TOOL_CLONE, > data); >diff -u -r gimp-2.2.4/app/tools/gimpcolorpickertool.c gimpshot-2.2.4/app/tools/gimpcolorpickertool.c >--- gimp-2.2.4/app/tools/gimpcolorpickertool.c 2004-07-28 18:21:00.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpcolorpickertool.c 2005-03-28 09:14:09.000000000 +0200 >@@ -96,9 +96,9 @@ > gimp_color_picker_options_gui, > 0, > "gimp-color-picker-tool", >- _("Color Picker"), >+ _("Eyedropper Tool"), > _("Pick colors from the image"), >- N_("C_olor Picker"), "O", >+ N_("Eyedropper Tool"), "O", > NULL, GIMP_HELP_TOOL_COLOR_PICKER, > GIMP_STOCK_TOOL_COLOR_PICKER, > data); >diff -u -r gimp-2.2.4/app/tools/gimpconvolvetool.c gimpshot-2.2.4/app/tools/gimpconvolvetool.c >--- gimp-2.2.4/app/tools/gimpconvolvetool.c 2004-06-29 01:30:56.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpconvolvetool.c 2005-03-22 06:23:01.000000000 +0100 >@@ -67,9 +67,9 @@ > gimp_convolve_options_gui, > GIMP_PAINT_OPTIONS_CONTEXT_MASK, > "gimp-convolve-tool", >- _("Convolve"), >+ _("Blur/Sharpen"), > _("Blur or Sharpen"), >- N_("Con_volve"), "V", >+ N_("Blur/Sharpen"), "V", > NULL, GIMP_HELP_TOOL_CONVOLVE, > GIMP_STOCK_TOOL_BLUR, > data); >@@ -190,7 +190,7 @@ > vbox = gimp_paint_options_gui (tool_options); > > /* the type radio box */ >- str = g_strdup_printf (_("Convolve Type %s"), >+ str = g_strdup_printf (_("Mode %s"), > gimp_get_mod_string (GDK_CONTROL_MASK)); > > frame = gimp_prop_enum_radio_frame_new (config, "type", >diff -u -r gimp-2.2.4/app/tools/gimpdodgeburntool.c gimpshot-2.2.4/app/tools/gimpdodgeburntool.c >--- gimp-2.2.4/app/tools/gimpdodgeburntool.c 2004-06-29 01:30:56.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpdodgeburntool.c 2005-03-28 09:16:40.000000000 +0200 >@@ -67,9 +67,9 @@ > gimp_dodge_burn_options_gui, > GIMP_PAINT_OPTIONS_CONTEXT_MASK, > "gimp-dodge-burn-tool", >- _("Dodge/Burn"), >+ _("Dodge/Burn Tool"), > _("Dodge or Burn strokes"), >- N_("Dod_geBurn"), "<shift>D", >+ N_("Dodge/Burn Tool"), "<shift>D", > NULL, GIMP_HELP_TOOL_DODGE_BURN, > GIMP_STOCK_TOOL_DODGE, > data); >diff -u -r gimp-2.2.4/app/tools/gimpellipseselecttool.c gimpshot-2.2.4/app/tools/gimpellipseselecttool.c >--- gimp-2.2.4/app/tools/gimpellipseselecttool.c 2004-06-05 01:08:28.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpellipseselecttool.c 2005-03-22 06:26:42.000000000 +0100 >@@ -68,9 +68,9 @@ > gimp_selection_options_gui, > 0, > "gimp-ellipse-select-tool", >- _("Ellipse Select"), >+ _("Elliptical Marquee Tool"), > _("Select elliptical regions"), >- N_("_Ellipse Select"), "E", >+ N_("_Elliptical Marquee Tool"), "E", > NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT, > GIMP_STOCK_TOOL_ELLIPSE_SELECT, > data); >diff -u -r gimp-2.2.4/app/tools/gimperasertool.c gimpshot-2.2.4/app/tools/gimperasertool.c >--- gimp-2.2.4/app/tools/gimperasertool.c 2004-06-29 01:30:56.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimperasertool.c 2005-03-28 09:09:32.000000000 +0200 >@@ -67,9 +67,9 @@ > gimp_eraser_options_gui, > GIMP_PAINT_OPTIONS_CONTEXT_MASK, > "gimp-eraser-tool", >- _("Eraser"), >+ _("Eraser Tool"), > _("Erase to background or transparency"), >- N_("_Eraser"), "<shift>E", >+ N_("Eraser Tool"), "<shift>E", > NULL, GIMP_HELP_TOOL_ERASER, > GIMP_STOCK_TOOL_ERASER, > data); >diff -u -r gimp-2.2.4/app/tools/gimpfreeselecttool.c gimpshot-2.2.4/app/tools/gimpfreeselecttool.c >--- gimp-2.2.4/app/tools/gimpfreeselecttool.c 2004-07-26 16:50:51.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpfreeselecttool.c 2005-03-27 07:24:01.000000000 +0200 >@@ -93,9 +93,9 @@ > gimp_selection_options_gui, > 0, > "gimp-free-select-tool", >- _("Free Select"), >+ _("Lasso Tool"), > _("Select hand-drawn regions"), >- N_("_Free Select"), "F", >+ N_("Lasso Tool"), "F", > NULL, GIMP_HELP_TOOL_FREE_SELECT, > GIMP_STOCK_TOOL_FREE_SELECT, > data); >diff -u -r gimp-2.2.4/app/tools/gimpfuzzyselecttool.c gimpshot-2.2.4/app/tools/gimpfuzzyselecttool.c >--- gimp-2.2.4/app/tools/gimpfuzzyselecttool.c 2004-07-26 16:50:51.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpfuzzyselecttool.c 2005-03-22 04:45:59.000000000 +0100 >@@ -94,9 +94,9 @@ > gimp_selection_options_gui, > 0, > "gimp-fuzzy-select-tool", >- _("Fuzzy Select"), >+ _("Magic Wand Tool"), > _("Select contiguous regions"), >- N_("Fu_zzy Select"), "Z", >+ N_("Magic Wand Tool"), "Z", > NULL, GIMP_HELP_TOOL_FUZZY_SELECT, > GIMP_STOCK_TOOL_FUZZY_SELECT, > data); >diff -u -r gimp-2.2.4/app/tools/gimpiscissorstool.c gimpshot-2.2.4/app/tools/gimpiscissorstool.c >--- gimp-2.2.4/app/tools/gimpiscissorstool.c 2004-10-18 13:29:58.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpiscissorstool.c 2005-03-22 06:38:49.000000000 +0100 >@@ -274,9 +274,9 @@ > gimp_selection_options_gui, > 0, > "gimp-iscissors-tool", >- _("Scissors"), >+ _("Magnetic Lasso Tool"), > _("Select shapes from image"), >- N_("Intelligent _Scissors"), >+ N_("Magnetic Lasso Tool"), > "I", > NULL, GIMP_HELP_TOOL_ISCISSORS, > GIMP_STOCK_TOOL_ISCISSORS, >diff -u -r gimp-2.2.4/app/tools/gimpmagnifytool.c gimpshot-2.2.4/app/tools/gimpmagnifytool.c >--- gimp-2.2.4/app/tools/gimpmagnifytool.c 2004-06-05 01:08:28.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpmagnifytool.c 2005-03-22 07:05:48.000000000 +0100 >@@ -92,9 +92,9 @@ > gimp_magnify_options_gui, > 0, > "gimp-magnify-tool", >- _("Magnify"), >+ _("Zoom Tool"), > _("Zoom in & out"), >- N_("M_agnify"), NULL, >+ N_("Zoom Tool"), NULL, > NULL, GIMP_HELP_TOOL_ZOOM, > GIMP_STOCK_TOOL_ZOOM, > data); >diff -u -r gimp-2.2.4/app/tools/gimpmeasuretool.c gimpshot-2.2.4/app/tools/gimpmeasuretool.c >--- gimp-2.2.4/app/tools/gimpmeasuretool.c 2004-10-08 17:32:30.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpmeasuretool.c 2005-03-22 07:05:48.000000000 +0100 >@@ -115,9 +115,9 @@ > gimp_measure_options_gui, > 0, > "gimp-measure-tool", >- _("Measure"), >+ _("Measure Tool"), > _("Measure distances and angles"), >- N_("_Measure"), NULL, >+ N_("_Measure Tool"), NULL, > NULL, GIMP_HELP_TOOL_MEASURE, > GIMP_STOCK_TOOL_MEASURE, > data); >diff -u -r gimp-2.2.4/app/tools/gimpmoveoptions.c gimpshot-2.2.4/app/tools/gimpmoveoptions.c >--- gimp-2.2.4/app/tools/gimpmoveoptions.c 2004-10-30 17:02:39.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpmoveoptions.c 2005-03-24 09:47:49.000000000 +0100 >@@ -168,7 +168,7 @@ > switch (move_options->move_type) > { > case GIMP_TRANSFORM_TYPE_LAYER: >- false_label = _("Pick a layer or guide"); >+ false_label = _("Auto Select Layer"); > true_label = _("Move the current layer"); > break; > >diff -u -r gimp-2.2.4/app/tools/gimpmovetool.c gimpshot-2.2.4/app/tools/gimpmovetool.c >--- gimp-2.2.4/app/tools/gimpmovetool.c 2004-12-17 16:16:36.000000000 +0100 >+++ gimpshot-2.2.4/app/tools/gimpmovetool.c 2005-03-22 06:40:03.000000000 +0100 >@@ -113,9 +113,9 @@ > gimp_move_options_gui, > 0, > "gimp-move-tool", >- _("Move"), >+ _("Move Tool"), > _("Move layers & selections"), >- N_("_Move"), "M", >+ N_("_Move Tool"), "M", > NULL, GIMP_HELP_TOOL_MOVE, > GIMP_STOCK_TOOL_MOVE, > data); >diff -u -r gimp-2.2.4/app/tools/gimppaintbrushtool.c gimpshot-2.2.4/app/tools/gimppaintbrushtool.c >--- gimp-2.2.4/app/tools/gimppaintbrushtool.c 2004-06-05 01:08:28.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimppaintbrushtool.c 2005-03-22 06:47:37.000000000 +0100 >@@ -48,9 +48,9 @@ > GIMP_PAINT_OPTIONS_CONTEXT_MASK | > GIMP_CONTEXT_GRADIENT_MASK, > "gimp-paintbrush-tool", >- _("Paintbrush"), >+ _("Brush Tool"), > _("Paint fuzzy brush strokes"), >- N_("_Paintbrush"), "P", >+ N_("Brush Tool"), "P", > NULL, GIMP_HELP_TOOL_PAINTBRUSH, > GIMP_STOCK_TOOL_PAINTBRUSH, > data); >diff -u -r gimp-2.2.4/app/tools/gimppenciltool.c gimpshot-2.2.4/app/tools/gimppenciltool.c >--- gimp-2.2.4/app/tools/gimppenciltool.c 2004-09-23 23:04:39.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimppenciltool.c 2005-03-28 09:03:08.000000000 +0200 >@@ -48,9 +48,9 @@ > GIMP_PAINT_OPTIONS_CONTEXT_MASK | > GIMP_CONTEXT_GRADIENT_MASK, > "gimp-pencil-tool", >- _("Pencil"), >+ _("Pencil Tool"), > _("Paint hard edged pixels"), >- N_("Pe_ncil"), "N", >+ N_("Pencil Tool"), "N", > NULL, GIMP_HELP_TOOL_PENCIL, > GIMP_STOCK_TOOL_PENCIL, > data); >diff -u -r gimp-2.2.4/app/tools/gimprectselecttool.c gimpshot-2.2.4/app/tools/gimprectselecttool.c >--- gimp-2.2.4/app/tools/gimprectselecttool.c 2004-07-26 16:50:51.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimprectselecttool.c 2005-03-22 06:26:43.000000000 +0100 >@@ -93,9 +93,9 @@ > gimp_selection_options_gui, > 0, > "gimp-rect-select-tool", >- _("Rect Select"), >+ _("Rectangular Marquee Tool"), > _("Select rectangular regions"), >- N_("_Rect Select"), "R", >+ N_("_Rectangular Marquee Tool"), "R", > NULL, GIMP_HELP_TOOL_RECT_SELECT, > GIMP_STOCK_TOOL_RECT_SELECT, > data); >diff -u -r gimp-2.2.4/app/tools/gimpsmudgetool.c gimpshot-2.2.4/app/tools/gimpsmudgetool.c >--- gimp-2.2.4/app/tools/gimpsmudgetool.c 2004-06-05 01:08:28.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpsmudgetool.c 2005-03-22 07:05:45.000000000 +0100 >@@ -51,9 +51,9 @@ > gimp_smudge_options_gui, > GIMP_PAINT_OPTIONS_CONTEXT_MASK, > "gimp-smudge-tool", >- _("Smudge"), >+ _("Smudge Tool"), > _("Smudge image"), >- N_("_Smudge"), "S", >+ N_("_Smudge Tool"), "S", > NULL, GIMP_HELP_TOOL_SMUDGE, > GIMP_STOCK_TOOL_SMUDGE, > data); >diff -u -r gimp-2.2.4/app/tools/gimptexttool.c gimpshot-2.2.4/app/tools/gimptexttool.c >--- gimp-2.2.4/app/tools/gimptexttool.c 2005-02-21 14:15:04.000000000 +0100 >+++ gimpshot-2.2.4/app/tools/gimptexttool.c 2005-03-28 09:12:03.000000000 +0200 >@@ -141,9 +141,9 @@ > gimp_text_options_gui, > GIMP_CONTEXT_FOREGROUND_MASK | GIMP_CONTEXT_FONT_MASK, > "gimp-text-tool", >- _("Text"), >+ _("Type Tool"), > _("Add text to the image"), >- N_("Te_xt"), "T", >+ N_("Type Tool"), "T", > NULL, GIMP_HELP_TOOL_TEXT, > GIMP_STOCK_TOOL_TEXT, > data); >diff -u -r gimp-2.2.4/app/tools/gimpvectortool.c gimpshot-2.2.4/app/tools/gimpvectortool.c >--- gimp-2.2.4/app/tools/gimpvectortool.c 2004-10-25 15:29:32.000000000 +0200 >+++ gimpshot-2.2.4/app/tools/gimpvectortool.c 2005-03-22 10:40:04.000000000 +0100 >@@ -157,7 +157,7 @@ > gimp_vector_options_gui, > 0, > "gimp-vector-tool", >- _("Paths"), >+ _("Pen Tool"), > _("Create and edit paths"), > N_("_Paths"), "b", > NULL, GIMP_HELP_TOOL_PATH, >diff -u -r gimp-2.2.4/app/widgets/gimpwidgets-constructors.c gimpshot-2.2.4/app/widgets/gimpwidgets-constructors.c >--- gimp-2.2.4/app/widgets/gimpwidgets-constructors.c 2004-06-24 00:44:04.000000000 +0200 >+++ gimpshot-2.2.4/app/widgets/gimpwidgets-constructors.c 2005-03-22 07:19:08.000000000 +0100 >@@ -67,8 +67,8 @@ > _("Difference"), GIMP_DIFFERENCE_MODE, NULL, > _("Addition"), GIMP_ADDITION_MODE, NULL, > _("Subtract"), GIMP_SUBTRACT_MODE, NULL, >- _("Darken only"), GIMP_DARKEN_ONLY_MODE, NULL, >- _("Lighten only"), GIMP_LIGHTEN_ONLY_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, >@@ -100,8 +100,8 @@ > _("Difference"), GIMP_DIFFERENCE_MODE, NULL, > _("Addition"), GIMP_ADDITION_MODE, NULL, > _("Subtract"), GIMP_SUBTRACT_MODE, NULL, >- _("Darken only"), GIMP_DARKEN_ONLY_MODE, NULL, >- _("Lighten only"), GIMP_LIGHTEN_ONLY_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, >Files gimp-2.2.4/data/images/gimp-splash.png and gimpshot-2.2.4/data/images/gimp-splash.png differ >diff -u -r gimp-2.2.4/menus/image-menu.xml gimpshot-2.2.4/menus/image-menu.xml >--- gimp-2.2.4/menus/image-menu.xml 2004-12-18 00:46:22.000000000 +0100 >+++ gimpshot-2.2.4/menus/image-menu.xml 2005-03-29 12:22:03.000000000 +0200 >@@ -167,7 +167,26 @@ > <menuitem action="edit-named-copy"/> > <menuitem action="edit-named-paste"/> > </menu> >- <separator/> >+ <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> >@@ -181,179 +200,96 @@ > <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="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"> > >- <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="Flip"> >- <menuitem action="image-flip-horizontal"/> >- <menuitem action="image-flip-vertical"/> >- </placeholder> >- <separator/> >- <placeholder name="Rotate"> >+ <placeholder name="Rotate"> >+ <menuitem action="image-rotate-180"/> > <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> >- <separator/> >- <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"> >+<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="Select"> >- <menuitem action="layers-select-previous"/> >- <menuitem action="layers-select-next"/> >- <menuitem action="layers-select-top"/> >- <menuitem action="layers-select-bottom"/> >- </placeholder> >- <separator/> >- <placeholder name="Position"> >+<placeholder name="Position"> >+ <menuitem action="layers-raise-to-top"/> > <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="Info"> >- <menuitem action="dialogs-histogram"/> >+ <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"> >@@ -389,21 +325,6 @@ > </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 > >@@ -427,8 +348,6 @@ > </menu> > > --> >- >- <separator/> > <placeholder name="Resize"> > <menuitem action="layers-resize"/> > <menuitem action="layers-resize-to-image"/> >@@ -440,59 +359,127 @@ > <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="tools-menu" name="Tools"> >- <menuitem action="dialogs-toolbox"/> >- <menuitem action="context-colors-default"/> >- <menuitem action="context-colors-swap"/> >+ <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/> >- <menu action="tools-select-menu" name="Selection Tools"> >- <menuitem action="tools-rect-select"/> >- <menuitem action="tools-ellipse-select"/> >- <menuitem action="tools-free-select"/> >- <menuitem action="tools-fuzzy-select"/> >- <menuitem action="tools-by-color-select"/> >- <menuitem action="tools-iscissors"/> >+ <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="tools-paint-menu" name="Paint Tools"> >- <menuitem action="tools-bucket-fill"/> >- <menuitem action="tools-blend"/> >- <menuitem action="tools-pencil"/> >- <menuitem action="tools-paintbrush"/> >- <menuitem action="tools-eraser"/> >- <menuitem action="tools-airbrush"/> >- <menuitem action="tools-ink"/> >- <menuitem action="tools-clone"/> >- <menuitem action="tools-convolve"/> >- <menuitem action="tools-smudge"/> >- <menuitem action="tools-dodge-burn"/> >+ <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="tools-transform-menu" name="Transform Tools"> >- <menuitem action="tools-move"/> >- <menuitem action="tools-crop"/> >- <menuitem action="tools-rotate"/> >- <menuitem action="tools-scale"/> >- <menuitem action="tools-shear"/> >- <menuitem action="tools-perspective"/> >- <menuitem action="tools-flip"/> >+ <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> >- <menu action="tools-color-menu" name="Color Tools"> >- <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="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="tools-vector"/> >- <menuitem action="tools-color-picker"/> >- <menuitem action="tools-magnify"/> >- <menuitem action="tools-measure"/> >- <menuitem action="tools-text"/> >- </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"> >@@ -528,43 +515,11 @@ > <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"> >+ <menu action="file-menu" name="File"> > <placeholder name="New"> > <menuitem action="image-new-from-image"/> > </placeholder> >@@ -726,98 +681,43 @@ > <menuitem action="edit-named-copy"/> > <menuitem action="edit-named-paste"/> > </menu> >- <separator/> >- <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/> >- </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/> <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="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"/> >+ <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> >+ <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-menubar"/> >- <menuitem action="view-show-rulers"/> >- <menuitem action="view-show-scrollbars"/> >- <menuitem action="view-show-statusbar"/> >- <separator/> >+ > </menu> > >- <menu action="image-menu" name="Image"> >+<menu action="image-menu" name="Image"> > <placeholder name="New"> > <menuitem action="image-duplicate"/> > </placeholder> >@@ -827,92 +727,88 @@ > <menuitem action="image-convert-indexed"/> > <separator/> > </menu> >- <menu action="image-transform-menu" name="Transform"> >- <placeholder name="Flip"> >- <menuitem action="image-flip-horizontal"/> >- <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/> >- </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> >- <placeholder name="Scale"> >- <menuitem action="image-scale"/> >- </placeholder> >- <placeholder name="Crop"> >- <menuitem action="image-crop"/> >- </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> >- <menuitem action="image-configure-grid"/> >+ >+ > <separator/> >+ <placeholder name="Crop"> >+ <menuitem action="image-crop"/> >+ </placeholder> >+ > </menu> > >- <menu action="layers-menu" name="Layer"> >+<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="Select"> >- <menuitem action="layers-select-previous"/> >- <menuitem action="layers-select-next"/> >- <menuitem action="layers-select-top"/> >- <menuitem action="layers-select-bottom"/> >- </placeholder> >- <separator/> >- <placeholder name="Position"> >+<placeholder name="Position"> >+ <menuitem action="layers-raise-to-top"/> > <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="Info"> >- <menuitem action="dialogs-histogram"/> >+ <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"> >@@ -947,21 +843,11 @@ > <menuitem action="layers-alpha-selection-intersect"/> > </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"/> >+ <placeholder name="Structuremerge"> >+ <menuitem action="layers-merge-down"/> >+ <menuitem action="image-merge-layers"/> >+ <menuitem action="image-flatten"/> >+ </placeholder> > </menu> > > <!-- Layer Properties >@@ -986,8 +872,6 @@ > </menu> > > --> >- >- <separator/> > <placeholder name="Resize"> > <menuitem action="layers-resize"/> > <menuitem action="layers-resize-to-image"/> >@@ -1001,6 +885,120 @@ > <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"/> >@@ -1052,7 +1050,7 @@ > <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"/> >@@ -1088,39 +1086,6 @@ > > </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> >diff -u -r gimp-2.2.4/plug-ins/common/autostretch_hsv.c gimpshot-2.2.4/plug-ins/common/autostretch_hsv.c >--- gimp-2.2.4/plug-ins/common/autostretch_hsv.c 2004-11-02 13:00:24.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/common/autostretch_hsv.c 2005-03-24 08:55:21.000000000 +0100 >@@ -77,14 +77,14 @@ > "Scott Goehring and Federico Mena Quintero", > "Scott Goehring and Federico Mena Quintero", > "1997", >- N_("Stretch _HSV"), >+ N_("Auto Contrast _HSV"), > "RGB*, INDEXED*", > GIMP_PLUGIN, > G_N_ELEMENTS (args), 0, > args, NULL); > > gimp_plugin_menu_register ("plug_in_autostretch_hsv", >- "<Image>/Layer/Colors/Auto"); >+ "<Image>/Image/Colors/Contrastplace"); > } > > static void >diff -u -r gimp-2.2.4/plug-ins/common/c_astretch.c gimpshot-2.2.4/plug-ins/common/c_astretch.c >--- gimp-2.2.4/plug-ins/common/c_astretch.c 2004-11-02 13:00:24.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/common/c_astretch.c 2005-03-24 08:55:19.000000000 +0100 >@@ -75,13 +75,13 @@ > "Federico Mena Quintero", > "Federico Mena Quintero", > "1996", >- N_("_Stretch Contrast"), >+ N_("Auto Contrast"), > "RGB*, GRAY*, INDEXED*", > GIMP_PLUGIN, > G_N_ELEMENTS (args), 0, > args, NULL); > >- gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Layer/Colors/Auto"); >+ gimp_plugin_menu_register ("plug_in_c_astretch", "<Image>/Image/Colors/Contrastplace"); > } > > static void >diff -u -r gimp-2.2.4/plug-ins/common/ccanalyze.c gimpshot-2.2.4/plug-ins/common/ccanalyze.c >--- gimp-2.2.4/plug-ins/common/ccanalyze.c 2004-11-04 11:06:22.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/common/ccanalyze.c 2005-03-23 09:07:10.000000000 +0100 >@@ -114,7 +114,6 @@ > args, return_vals); > > gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Filters/Colors"); >- gimp_plugin_menu_register ("plug_in_ccanalyze", "<Image>/Layer/Colors/Info"); > } > > /* main function */ >diff -u -r gimp-2.2.4/plug-ins/common/color_enhance.c gimpshot-2.2.4/plug-ins/common/color_enhance.c >--- gimp-2.2.4/plug-ins/common/color_enhance.c 2004-11-02 13:00:24.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/common/color_enhance.c 2005-03-24 09:57:00.000000000 +0100 >@@ -84,7 +84,7 @@ > args, NULL); > > gimp_plugin_menu_register ("plug_in_color_enhance", >- "<Image>/Layer/Colors/Auto"); >+ "<Image>/Image/Colors/Gradmapplace"); > } > > static void >diff -u -r gimp-2.2.4/plug-ins/common/gradmap.c gimpshot-2.2.4/plug-ins/common/gradmap.c >--- gimp-2.2.4/plug-ins/common/gradmap.c 2004-10-12 23:48:38.000000000 +0200 >+++ gimpshot-2.2.4/plug-ins/common/gradmap.c 2005-03-24 09:01:25.000000000 +0100 >@@ -89,7 +89,7 @@ > G_N_ELEMENTS (args), 0, > args, NULL); > >- gimp_plugin_menu_register ("plug_in_gradmap", "<Image>/Filters/Colors/Map"); >+ gimp_plugin_menu_register ("plug_in_gradmap", "<Image>/Image/Colors/Gradmapplace"); > } > > static void >diff -u -r gimp-2.2.4/plug-ins/common/guillotine.c gimpshot-2.2.4/plug-ins/common/guillotine.c >--- gimp-2.2.4/plug-ins/common/guillotine.c 2004-10-12 23:48:38.000000000 +0200 >+++ gimpshot-2.2.4/plug-ins/common/guillotine.c 2005-03-23 09:16:45.000000000 +0100 >@@ -75,7 +75,7 @@ > G_N_ELEMENTS (args), 0, > args, NULL); > >- gimp_plugin_menu_register ("plug_in_guillotine", "<Image>/Image/Transform"); >+ gimp_plugin_menu_register ("plug_in_guillotine", "<Image>/Edit/Transform"); > } > > static void >diff -u -r gimp-2.2.4/plug-ins/common/normalize.c gimpshot-2.2.4/plug-ins/common/normalize.c >--- gimp-2.2.4/plug-ins/common/normalize.c 2004-11-02 13:00:24.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/common/normalize.c 2005-03-23 08:08:25.000000000 +0100 >@@ -85,13 +85,13 @@ > "Adam D. Moss, Federico Mena Quintero", > "Adam D. Moss, Federico Mena Quintero", > "1997", >- N_("_Normalize"), >+ N_("Auto Levels"), > "RGB*, GRAY*, INDEXED*", > GIMP_PLUGIN, > G_N_ELEMENTS (args), 0, > args, NULL); > >- gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Layer/Colors/Auto"); >+ gimp_plugin_menu_register ("plug_in_normalize", "<Image>/Image/Colors/Levelplace"); > } > > static void >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/drop-shadow.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/drop-shadow.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/drop-shadow.scm 2004-11-18 23:44:28.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/drop-shadow.scm 2005-03-28 07:12:09.000000000 +0200 >@@ -175,4 +175,4 @@ > SF-TOGGLE _"Allow resizing" TRUE) > > (script-fu-menu-register "script-fu-drop-shadow" >- _"<Image>/Script-Fu/Shadow") >+ _"<Image>/Filters/Shadowplug/Shadows") >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/guides-from-selection.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-from-selection.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/guides-from-selection.scm 2004-11-18 23:44:28.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-from-selection.scm 2005-03-26 04:12:58.000000000 +0100 >@@ -34,4 +34,4 @@ > SF-DRAWABLE "Drawable" 0) > > (script-fu-menu-register "script-fu-guides-from-selection" >- "<Image>/Image/Guides") >+ "<Image>/View/Guides") >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/guides-new-percent.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-new-percent.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/guides-new-percent.scm 2004-11-18 23:44:28.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-new-percent.scm 2005-03-26 04:12:59.000000000 +0100 >@@ -37,4 +37,4 @@ > SF-ADJUSTMENT _"Position (in %)" '(50 0 100 1 10 0 1)) > > (script-fu-menu-register "script-fu-guide-new-percent" >- "<Image>/Image/Guides") >+ "<Image>/View/Guides") >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/guides-new.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-new.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/guides-new.scm 2005-02-17 15:52:05.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-new.scm 2005-03-26 04:12:59.000000000 +0100 >@@ -34,4 +34,4 @@ > SF-ADJUSTMENT "Position" '(0 0 262144 1 10 0 1)) > > (script-fu-menu-register "script-fu-guide-new" >- "<Image>/Image/Guides") >+ "<Image>/View/Guides") >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/guides-remove-all.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-remove-all.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/guides-remove-all.scm 2004-11-18 23:44:28.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/guides-remove-all.scm 2005-03-26 04:13:00.000000000 +0100 >@@ -24,4 +24,4 @@ > SF-DRAWABLE "Drawable" 0) > > (script-fu-menu-register "script-fu-guides-remove" >- "<Image>/Image/Guides") >+ "<Image>/View/Guides") >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/perspective-shadow.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/perspective-shadow.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/perspective-shadow.scm 2004-11-18 23:44:28.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/perspective-shadow.scm 2005-03-28 07:12:11.000000000 +0200 >@@ -193,4 +193,4 @@ > SF-TOGGLE _"Allow resizing" FALSE) > > (script-fu-menu-register "script-fu-perspective-shadow" >- _"<Image>/Script-Fu/Shadow") >+ _"<Image>/Filters/Shadowplug/Shadows") >diff -u -r gimp-2.2.4/plug-ins/script-fu/scripts/xach-effect.scm gimpshot-2.2.4/plug-ins/script-fu/scripts/xach-effect.scm >--- gimp-2.2.4/plug-ins/script-fu/scripts/xach-effect.scm 2004-11-18 23:44:28.000000000 +0100 >+++ gimpshot-2.2.4/plug-ins/script-fu/scripts/xach-effect.scm 2005-03-28 07:12:12.000000000 +0200 >@@ -131,4 +131,4 @@ > SF-TOGGLE _"Keep selection" TRUE) > > (script-fu-menu-register "script-fu-xach-effect" >- _"<Image>/Script-Fu/Shadow") >+ _"<Image>/Filters/Shadowplug/Shadows") >diff -u -r gimp-2.2.4/tools/pdbgen/pdb/selection_tools.pdb gimpshot-2.2.4/tools/pdbgen/pdb/selection_tools.pdb >--- gimp-2.2.4/tools/pdbgen/pdb/selection_tools.pdb 2003-10-06 14:15:08.000000000 +0200 >+++ gimpshot-2.2.4/tools/pdbgen/pdb/selection_tools.pdb 2005-03-27 07:23:34.000000000 +0200 >@@ -195,7 +195,7 @@ > %invoke = ( > code => <<'CODE' > gimp_channel_select_polygon (gimp_image_get_mask (gimage), >- _("Free Select"), >+ _("Lasso Tool"), > num_segs, > (GimpVector2 *) segs, > operation,
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=55390">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 87553
:
55028
|
55389
| 55390 |
55391
|
75697
|
79299
|
98065
|
98066
