gimp r27757 - in trunk: . app/actions app/widgets po



Author: neo
Date: Thu Dec  4 10:32:20 2008
New Revision: 27757
URL: http://svn.gnome.org/viewvc/gimp?rev=27757&view=rev

Log:
2008-12-04  Sven Neumann  <sven gimp org>

	* app/widgets/gimpactiongroup.[ch]: also use the translation
	context for the tooltips.

	* app/actions/*.c: added translation context to all tooltips. 
Also
	improved some tooltips while I was on it.



Modified:
   trunk/ChangeLog
   trunk/app/actions/actions.c
   trunk/app/actions/brushes-actions.c
   trunk/app/actions/buffers-actions.c
   trunk/app/actions/channels-actions.c
   trunk/app/actions/colormap-actions.c
   trunk/app/actions/config-actions.c
   trunk/app/actions/context-actions.c
   trunk/app/actions/cursor-info-actions.c
   trunk/app/actions/dialogs-actions.c
   trunk/app/actions/dock-actions.c
   trunk/app/actions/dockable-actions.c
   trunk/app/actions/documents-actions.c
   trunk/app/actions/drawable-actions.c
   trunk/app/actions/edit-actions.c
   trunk/app/actions/error-console-actions.c
   trunk/app/actions/file-actions.c
   trunk/app/actions/fonts-actions.c
   trunk/app/actions/gradient-editor-actions.c
   trunk/app/actions/gradients-actions.c
   trunk/app/actions/help-actions.c
   trunk/app/actions/image-actions.c
   trunk/app/actions/images-actions.c
   trunk/app/actions/layers-actions.c
   trunk/app/actions/palette-editor-actions.c
   trunk/app/actions/palettes-actions.c
   trunk/app/actions/patterns-actions.c
   trunk/app/actions/plug-in-actions.c
   trunk/app/actions/quick-mask-actions.c
   trunk/app/actions/sample-points-actions.c
   trunk/app/actions/select-actions.c
   trunk/app/actions/templates-actions.c
   trunk/app/actions/text-editor-actions.c
   trunk/app/actions/text-tool-actions.c
   trunk/app/actions/tool-options-actions.c
   trunk/app/actions/tools-actions.c
   trunk/app/actions/vectors-actions.c
   trunk/app/actions/view-actions.c
   trunk/app/actions/windows-actions.c
   trunk/app/widgets/gimpactiongroup.c
   trunk/app/widgets/gimpactiongroup.h
   trunk/po/ChangeLog
   trunk/po/de.po

Modified: trunk/app/actions/actions.c
==============================================================================
--- trunk/app/actions/actions.c	(original)
+++ trunk/app/actions/actions.c	Thu Dec  4 10:32:20 2008
@@ -98,7 +98,7 @@
 
 /*  private variables  */
 
-static GimpActionFactoryEntry action_groups[] =
+static const GimpActionFactoryEntry action_groups[] =
 {
   { "brush-editor", N_("Brush Editor"), GIMP_STOCK_BRUSH,
     brush_editor_actions_setup,

Modified: trunk/app/actions/brushes-actions.c
==============================================================================
--- trunk/app/actions/brushes-actions.c	(original)
+++ trunk/app/actions/brushes-actions.c	Thu Dec  4 10:32:20 2008
@@ -45,37 +45,37 @@
 
   { "brushes-open-as-image", GTK_STOCK_OPEN,
     NC_("brushes-action", "_Open Brush as Image"), "",
-    N_("Open brush as image"),
+    NC_("brushes-action", "Open brush as image"),
     G_CALLBACK (data_open_as_image_cmd_callback),
     GIMP_HELP_BRUSH_OPEN_AS_IMAGE },
 
   { "brushes-new", GTK_STOCK_NEW,
     NC_("brushes-action", "_New Brush"), "",
-    N_("Create a new brush"),
+    NC_("brushes-action", "Create a new brush"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_BRUSH_NEW },
 
   { "brushes-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("brushes-action", "D_uplicate Brush"), NULL,
-    N_("Duplicate this brush"),
+    NC_("brushes-action", "Duplicate this brush"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_BRUSH_DUPLICATE },
 
   { "brushes-copy-location", GTK_STOCK_COPY,
     NC_("brushes-action", "Copy Brush _Location"), "",
-    N_("Copy brush file location to clipboard"),
+    NC_("brushes-action", "Copy brush file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_BRUSH_COPY_LOCATION },
 
   { "brushes-delete", GTK_STOCK_DELETE,
     NC_("brushes-action", "_Delete Brush"), "",
-    N_("Delete this brush"),
+    NC_("brushes-action", "Delete this brush"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_BRUSH_DELETE },
 
   { "brushes-refresh", GTK_STOCK_REFRESH,
     NC_("brushes-action", "_Refresh Brushes"), "",
-    N_("Refresh brushes"),
+    NC_("brushes-action", "Refresh brushes"),
     G_CALLBACK (data_refresh_cmd_callback),
     GIMP_HELP_BRUSH_REFRESH }
 };
@@ -84,7 +84,7 @@
 {
   { "brushes-edit", GTK_STOCK_EDIT,
     NC_("brushes-action", "_Edit Brush..."), NULL,
-    N_("Edit brush"),
+    NC_("brushes-action", "Edit this brush"),
     "gimp-brush-editor",
     GIMP_HELP_BRUSH_EDIT }
 };

Modified: trunk/app/actions/buffers-actions.c
==============================================================================
--- trunk/app/actions/buffers-actions.c	(original)
+++ trunk/app/actions/buffers-actions.c	Thu Dec  4 10:32:20 2008
@@ -44,25 +44,25 @@
 
   { "buffers-paste", GTK_STOCK_PASTE,
     NC_("buffers-action", "_Paste Buffer"), "",
-    N_("Paste the selected buffer"),
+    NC_("buffers-action", "Paste the selected buffer"),
     G_CALLBACK (buffers_paste_cmd_callback),
     GIMP_HELP_BUFFER_PASTE },
 
   { "buffers-paste-into", GIMP_STOCK_PASTE_INTO,
     NC_("buffers-action", "Paste Buffer _Into"), NULL,
-    N_("Paste the selected buffer into the selection"),
+    NC_("buffers-action", "Paste the selected buffer into the selection"),
     G_CALLBACK (buffers_paste_into_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_INTO },
 
   { "buffers-paste-as-new", GIMP_STOCK_PASTE_AS_NEW,
     NC_("buffers-action", "Paste Buffer as _New"), NULL,
-    N_("Paste the selected buffer as new image"),
+    NC_("buffers-action", "Paste the selected buffer as a new image"),
     G_CALLBACK (buffers_paste_as_new_cmd_callback),
     GIMP_HELP_BUFFER_PASTE_AS_NEW },
 
   { "buffers-delete", GTK_STOCK_DELETE,
     NC_("buffers-action", "_Delete Buffer"), "",
-    N_("Delete the selected buffer"),
+    NC_("buffers-action", "Delete the selected buffer"),
     G_CALLBACK (buffers_delete_cmd_callback),
     GIMP_HELP_BUFFER_DELETE }
 };

Modified: trunk/app/actions/channels-actions.c
==============================================================================
--- trunk/app/actions/channels-actions.c	(original)
+++ trunk/app/actions/channels-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,55 +46,58 @@
 
   { "channels-edit-attributes", GTK_STOCK_EDIT,
     NC_("channels-action", "_Edit Channel Attributes..."), NULL,
-    N_("Edit the channel's name, color and opacity"),
+    NC_("channels-action", "Edit the channel's name, color and opacity"),
     G_CALLBACK (channels_edit_attributes_cmd_callback),
     GIMP_HELP_CHANNEL_EDIT },
 
   { "channels-new", GTK_STOCK_NEW,
     NC_("channels-action", "_New Channel..."), "",
-    N_("Create a new channel"),
+    NC_("channels-action", "Create a new channel"),
     G_CALLBACK (channels_new_cmd_callback),
     GIMP_HELP_CHANNEL_NEW },
 
   { "channels-new-last-values", GTK_STOCK_NEW,
     NC_("channels-action", "_New Channel"), "",
-    N_("Create a new channel with last used values"),
+    NC_("channels-action", "Create a new channel with last used values"),
     G_CALLBACK (channels_new_last_vals_cmd_callback),
     GIMP_HELP_CHANNEL_NEW },
 
   { "channels-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("channels-action", "D_uplicate Channel"), NULL,
-    N_("Create a duplicate of this channel and add it to the image"),
+    NC_("channels-action",
+        "Create a duplicate of this channel and add it to the image"),
     G_CALLBACK (channels_duplicate_cmd_callback),
     GIMP_HELP_CHANNEL_DUPLICATE },
 
   { "channels-delete", GTK_STOCK_DELETE,
     NC_("channels-action", "_Delete Channel"), "",
-    N_("Delete this channel"),
+    NC_("channels-action", "Delete this channel"),
     G_CALLBACK (channels_delete_cmd_callback),
     GIMP_HELP_CHANNEL_DELETE },
 
   { "channels-raise", GTK_STOCK_GO_UP,
     NC_("channels-action", "_Raise Channel"), "",
-    N_("Raise this channel one step in the channel stack"),
+    NC_("channels-action", "Raise this channel one step in the channel stack"),
     G_CALLBACK (channels_raise_cmd_callback),
     GIMP_HELP_CHANNEL_RAISE },
 
   { "channels-raise-to-top", GTK_STOCK_GOTO_TOP,
     NC_("channels-action", "Raise Channel to _Top"), "",
-    N_("Raise this channel to the top of the channel stack"),
+    NC_("channels-action",
+        "Raise this channel to the top of the channel stack"),
     G_CALLBACK (channels_raise_to_top_cmd_callback),
     GIMP_HELP_CHANNEL_RAISE_TO_TOP },
 
   { "channels-lower", GTK_STOCK_GO_DOWN,
     NC_("channels-action", "_Lower Channel"), "",
-    N_("Lower this channel one step in the channel stack"),
+    NC_("channels-action", "Lower this channel one step in the channel stack"),
     G_CALLBACK (channels_lower_cmd_callback),
     GIMP_HELP_CHANNEL_LOWER },
 
   { "channels-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
     NC_("channels-action", "Lower Channel to _Bottom"), "",
-    N_("Lower this channel to the bottom of the channel stack"),
+    NC_("channels-action",
+        "Lower this channel to the bottom of the channel stack"),
     G_CALLBACK (channels_lower_to_bottom_cmd_callback),
     GIMP_HELP_CHANNEL_LOWER_TO_BOTTOM }
 };
@@ -103,25 +106,25 @@
 {
   { "channels-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
     NC_("channels-action", "Channel to Sele_ction"), NULL,
-    N_("Replace the selection with this channel"),
+    NC_("channels-action", "Replace the selection with this channel"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_REPLACE },
 
   { "channels-selection-add", GIMP_STOCK_SELECTION_ADD,
     NC_("channels-action", "_Add to Selection"), NULL,
-    N_("Add this channel to the current selection"),
+    NC_("channels-action", "Add this channel to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_ADD },
 
   { "channels-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
     NC_("channels-action", "_Subtract from Selection"), NULL,
-    N_("Subtract this channel from the current selection"),
+    NC_("channels-action", "Subtract this channel from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_SUBTRACT },
 
   { "channels-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
     NC_("channels-action", "_Intersect with Selection"), NULL,
-    N_("Intersect this channel with the current selection"),
+    NC_("channels-action", "Intersect this channel with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_INTERSECT }
 };

Modified: trunk/app/actions/colormap-actions.c
==============================================================================
--- trunk/app/actions/colormap-actions.c	(original)
+++ trunk/app/actions/colormap-actions.c	Thu Dec  4 10:32:20 2008
@@ -47,7 +47,7 @@
 
   { "colormap-edit-color", GTK_STOCK_EDIT,
     NC_("colormap-action", "_Edit Color..."), NULL,
-    N_("Edit this color"),
+    NC_("colormap-action", "Edit this color"),
     G_CALLBACK (colormap_edit_color_cmd_callback),
     GIMP_HELP_INDEXED_PALETTE_EDIT }
 };
@@ -56,13 +56,13 @@
 {
   { "colormap-add-color-from-fg", GTK_STOCK_ADD,
     NC_("colormap-action", "_Add Color from FG"), "",
-    N_("Add current foreground color"),
+    NC_("colormap-action", "Add current foreground color"),
     FALSE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_ADD },
 
   { "colormap-add-color-from-bg", GTK_STOCK_ADD,
     NC_("colormap-action", "_Add Color from BG"), "",
-    N_("Add current background color"),
+    NC_("colormap-action", "Add current background color"),
     TRUE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_ADD }
 };

Modified: trunk/app/actions/config-actions.c
==============================================================================
--- trunk/app/actions/config-actions.c	(original)
+++ trunk/app/actions/config-actions.c	Thu Dec  4 10:32:20 2008
@@ -37,7 +37,7 @@
 {
   { "config-use-gegl", NULL,
     NC_("config-action", "Use _GEGL"), NULL,
-    N_("If possible, use GEGL for image processing"),
+    NC_("config-action", "If possible, use GEGL for image processing"),
     G_CALLBACK (config_use_gegl_cmd_callback),
     FALSE,
     GIMP_HELP_CONFIG_USE_GEGL }

Modified: trunk/app/actions/context-actions.c
==============================================================================
--- trunk/app/actions/context-actions.c	(original)
+++ trunk/app/actions/context-actions.c	Thu Dec  4 10:32:20 2008
@@ -79,13 +79,14 @@
 
   { "context-colors-default", GIMP_STOCK_DEFAULT_COLORS,
     NC_("context-action", "_Default Colors"), "D",
-    N_("Set foreground color to black, background color to white"),
+    NC_("context-action",
+        "Set foreground color to black, background color to white"),
     G_CALLBACK (context_colors_default_cmd_callback),
     GIMP_HELP_TOOLBOX_DEFAULT_COLORS },
 
   { "context-colors-swap", GIMP_STOCK_SWAP_COLORS,
     NC_("context-action", "S_wap Colors"), "X",
-    N_("Exchange foreground and background colors"),
+    NC_("context-action", "Exchange foreground and background colors"),
     G_CALLBACK (context_colors_swap_cmd_callback),
     GIMP_HELP_TOOLBOX_SWAP_COLORS }
 };

Modified: trunk/app/actions/cursor-info-actions.c
==============================================================================
--- trunk/app/actions/cursor-info-actions.c	(original)
+++ trunk/app/actions/cursor-info-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,7 +46,7 @@
 {
   { "cursor-info-sample-merged", NULL,
     NC_("cursor-info-action", "_Sample Merged"), "",
-    N_("Use the composite color of all visible layers"),
+    NC_("cursor-info-action", "Use the composite color of all visible layers"),
     G_CALLBACK (cursor_info_sample_merged_cmd_callback),
     TRUE,
     GIMP_HELP_POINTER_INFO_SAMPLE_MERGED }

Modified: trunk/app/actions/dialogs-actions.c
==============================================================================
--- trunk/app/actions/dialogs-actions.c	(original)
+++ trunk/app/actions/dialogs-actions.c	Thu Dec  4 10:32:20 2008
@@ -37,163 +37,163 @@
 {
   { "dialogs-tool-options", GIMP_STOCK_TOOL_OPTIONS,
     NC_("dialogs-action", "Tool _Options"), NULL,
-    N_("Open the tool options dialog"),
+    NC_("dialogs-action", "Open the tool options dialog"),
     "gimp-tool-options",
     GIMP_HELP_TOOL_OPTIONS_DIALOG },
 
   { "dialogs-device-status", GIMP_STOCK_DEVICE_STATUS,
     NC_("dialogs-action", "_Device Status"), NULL,
-    N_("Open the device status dialog"),
+    NC_("dialogs-action", "Open the device status dialog"),
     "gimp-device-status",
     GIMP_HELP_DEVICE_STATUS_DIALOG },
 
   { "dialogs-layers", GIMP_STOCK_LAYERS,
     NC_("dialogs-action", "_Layers"), "<control>L",
-    N_("Open the layers dialog"),
+    NC_("dialogs-action", "Open the layers dialog"),
     "gimp-layer-list",
     GIMP_HELP_LAYER_DIALOG },
 
   { "dialogs-channels", GIMP_STOCK_CHANNELS,
     NC_("dialogs-action", "_Channels"), NULL,
-    N_("Open the channels dialog"),
+    NC_("dialogs-action", "Open the channels dialog"),
     "gimp-channel-list",
     GIMP_HELP_CHANNEL_DIALOG },
 
   { "dialogs-vectors", GIMP_STOCK_PATHS,
     NC_("dialogs-action", "_Paths"), NULL,
-    N_("Open the paths dialog"),
+    NC_("dialogs-action", "Open the paths dialog"),
     "gimp-vectors-list",
     GIMP_HELP_PATH_DIALOG },
 
   { "dialogs-indexed-palette", GIMP_STOCK_COLORMAP,
     NC_("dialogs-action", "Color_map"), NULL,
-    N_("Open the colormap dialog"),
+    NC_("dialogs-action", "Open the colormap dialog"),
     "gimp-indexed-palette",
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
   { "dialogs-histogram", GIMP_STOCK_HISTOGRAM,
     NC_("dialogs-action", "Histogra_m"), NULL,
-    N_("Open the histogram dialog"),
+    NC_("dialogs-action", "Open the histogram dialog"),
     "gimp-histogram-editor",
     GIMP_HELP_HISTOGRAM_DIALOG },
 
   { "dialogs-selection-editor", GIMP_STOCK_TOOL_RECT_SELECT,
     NC_("dialogs-action", "_Selection Editor"), NULL,
-    N_("Open the selection editor"),
+    NC_("dialogs-action", "Open the selection editor"),
     "gimp-selection-editor",
     GIMP_HELP_SELECTION_DIALOG },
 
   { "dialogs-navigation", GIMP_STOCK_NAVIGATION,
     NC_("dialogs-action", "Na_vigation"), NULL,
-    N_("Open the display navigation dialog"),
+    NC_("dialogs-action", "Open the display navigation dialog"),
     "gimp-navigation-view",
     GIMP_HELP_NAVIGATION_DIALOG },
 
   { "dialogs-undo-history", GIMP_STOCK_UNDO_HISTORY,
     NC_("dialogs-action", "Undo _History"), NULL,
-    N_("Open the undo history dialog"),
+    NC_("dialogs-action", "Open the undo history dialog"),
     "gimp-undo-history",
     GIMP_HELP_UNDO_DIALOG },
 
   { "dialogs-cursor", GIMP_STOCK_CURSOR,
     NC_("dialogs-action", "Pointer"), NULL,
-    N_("Open the pointer information dialog"),
+    NC_("dialogs-action", "Open the pointer information dialog"),
     "gimp-cursor-view",
     GIMP_HELP_POINTER_INFO_DIALOG },
 
   { "dialogs-sample-points", GIMP_STOCK_SAMPLE_POINT,
     NC_("dialogs-action", "_Sample Points"), NULL,
-    N_("Open the sample points dialog"),
+    NC_("dialogs-action", "Open the sample points dialog"),
     "gimp-sample-point-editor",
     GIMP_HELP_SAMPLE_POINT_DIALOG },
 
   { "dialogs-colors", GIMP_STOCK_DEFAULT_COLORS,
     NC_("dialogs-action", "Colo_rs"), NULL,
-    N_("Open the FG/BG color dialog"),
+    NC_("dialogs-action", "Open the FG/BG color dialog"),
     "gimp-color-editor",
     GIMP_HELP_COLOR_DIALOG },
 
   { "dialogs-brushes", GIMP_STOCK_BRUSH,
     NC_("dialogs-action", "_Brushes"), "<control><shift>B",
-    N_("Open the brushes dialog"),
+    NC_("dialogs-action", "Open the brushes dialog"),
     "gimp-brush-grid|gimp-brush-list",
     GIMP_HELP_BRUSH_DIALOG },
 
   { "dialogs-brush-editor", GIMP_STOCK_BRUSH,
     NC_("dialogs-action", "Brush Editor"), NULL,
-    N_("Open the brush editor"),
+    NC_("dialogs-action", "Open the brush editor"),
     "gimp-brush-editor",
     GIMP_HELP_BRUSH_EDIT },
 
   { "dialogs-patterns", GIMP_STOCK_PATTERN,
     NC_("dialogs-action", "P_atterns"), "<control><shift>P",
-    N_("Open the patterns dialog"),
+    NC_("dialogs-action", "Open the patterns dialog"),
     "gimp-pattern-grid|gimp-pattern-list",
     GIMP_HELP_PATTERN_DIALOG },
 
   { "dialogs-gradients", GIMP_STOCK_GRADIENT,
     NC_("dialogs-action", "_Gradients"), "<control>G",
-    N_("Open the gradients dialog"),
+    NC_("dialogs-action", "Open the gradients dialog"),
     "gimp-gradient-list|gimp-gradient-grid",
     GIMP_HELP_GRADIENT_DIALOG },
 
   { "dialogs-gradient-editor", GIMP_STOCK_GRADIENT,
     NC_("dialogs-action", "Gradient Editor"), NULL,
-    N_("Open the gradient editor"),
+    NC_("dialogs-action", "Open the gradient editor"),
     "gimp-gradient-editor",
     GIMP_HELP_GRADIENT_EDIT },
 
   { "dialogs-palettes", GIMP_STOCK_PALETTE,
     NC_("dialogs-action", "Pal_ettes"), NULL,
-    N_("Open the palettes dialog"),
+    NC_("dialogs-action", "Open the palettes dialog"),
     "gimp-palette-list|gimp-palette-grid",
     GIMP_HELP_PALETTE_DIALOG },
 
   { "dialogs-palette-editor", GIMP_STOCK_PALETTE,
     NC_("dialogs-action", "Palette Editor"), NULL,
-    N_("Open the palette editor"),
+    NC_("dialogs-action", "Open the palette editor"),
     "gimp-palette-editor",
     GIMP_HELP_PALETTE_EDIT },
 
   { "dialogs-fonts", GIMP_STOCK_FONT,
     NC_("dialogs-action", "_Fonts"), NULL,
-    N_("Open the fonts dialog"),
+    NC_("dialogs-action", "Open the fonts dialog"),
     "gimp-font-list|gimp-font-grid",
     GIMP_HELP_FONT_DIALOG },
 
   { "dialogs-buffers", GIMP_STOCK_BUFFER,
     NC_("dialogs-action", "B_uffers"), "",
-    N_("Open the named buffers dialog"),
+    NC_("dialogs-action", "Open the named buffers dialog"),
     "gimp-buffer-list|gimp-buffer-grid",
     GIMP_HELP_BUFFER_DIALOG },
 
   { "dialogs-images", GIMP_STOCK_IMAGES,
     NC_("dialogs-action", "_Images"), NULL,
-    N_("Open the images dialog"),
+    NC_("dialogs-action", "Open the images dialog"),
     "gimp-image-list|gimp-image-grid",
     GIMP_HELP_IMAGE_DIALOG },
 
   { "dialogs-document-history", "document-open-recent",
     NC_("dialogs-action", "Document Histor_y"), "",
-    N_("Open the document history dialog"),
+    NC_("dialogs-action", "Open the document history dialog"),
     "gimp-document-list|gimp-document-grid",
     GIMP_HELP_DOCUMENT_DIALOG },
 
   { "dialogs-templates", GIMP_STOCK_TEMPLATE,
     NC_("dialogs-action", "_Templates"), "",
-    N_("Open the image templates dialog"),
+    NC_("dialogs-action", "Open the image templates dialog"),
     "gimp-template-list|gimp-template-grid",
     GIMP_HELP_TEMPLATE_DIALOG },
 
   { "dialogs-tools", GIMP_STOCK_TOOLS,
     NC_("dialogs-action", "T_ools"), NULL,
-    N_("Open the tools dialog"),
+    NC_("dialogs-action", "Open the tools dialog"),
     "gimp-tool-list|gimp-tool-grid",
     GIMP_HELP_TOOLS_DIALOG },
 
   { "dialogs-error-console", GIMP_STOCK_WARNING,
     NC_("dialogs-action", "Error Co_nsole"), NULL,
-    N_("Open the error console"),
+    NC_("dialogs-action", "Open the error console"),
     "gimp-error-console",
     GIMP_HELP_ERRORS_DIALOG }
 };
@@ -204,31 +204,31 @@
 {
   { "dialogs-preferences", GTK_STOCK_PREFERENCES,
     NC_("dialogs-action", "_Preferences"), NULL,
-    N_("Open the preferences dialog"),
+    NC_("dialogs-action", "Open the preferences dialog"),
     "gimp-preferences-dialog",
     GIMP_HELP_PREFS_DIALOG },
 
   { "dialogs-keyboard-shortcuts", GIMP_STOCK_CHAR_PICKER,
     NC_("dialogs-action", "_Keyboard Shortcuts"), NULL,
-    N_("Open the keyboard shortcuts editor"),
+    NC_("dialogs-action", "Open the keyboard shortcuts editor"),
     "gimp-keyboard-shortcuts-dialog",
     GIMP_HELP_KEYBOARD_SHORTCUTS },
 
   { "dialogs-module-dialog", GTK_STOCK_EXECUTE,
     NC_("dialogs-action", "_Modules"), NULL,
-    N_("Open the module manager dialog"),
+    NC_("dialogs-action", "Open the module manager dialog"),
     "gimp-module-dialog",
     GIMP_HELP_MODULE_DIALOG },
 
   { "dialogs-tips", GIMP_STOCK_INFO,
     NC_("dialogs-action", "_Tip of the Day"), NULL,
-    N_("Show some helpful tips on using GIMP"),
+    NC_("dialogs-action", "Show some helpful tips on using GIMP"),
     "gimp-tips-dialog",
     GIMP_HELP_TIPS_DIALOG },
 
   { "dialogs-about", GTK_STOCK_ABOUT,
     NC_("dialogs-action", "_About"), NULL,
-    N_("About GIMP"),
+    NC_("dialogs-action", "About GIMP"),
     "gimp-about-dialog",
     GIMP_HELP_ABOUT_DIALOG }
 };

Modified: trunk/app/actions/dock-actions.c
==============================================================================
--- trunk/app/actions/dock-actions.c	(original)
+++ trunk/app/actions/dock-actions.c	Thu Dec  4 10:32:20 2008
@@ -50,7 +50,7 @@
 
   { "dock-open-display", NULL,
     NC_("dock-action", "_Open Display..."), NULL,
-    N_("Connect to another display"),
+    NC_("dock-action", "Connect to another display"),
     G_CALLBACK (window_open_display_cmd_callback),
     NULL }
 };

Modified: trunk/app/actions/dockable-actions.c
==============================================================================
--- trunk/app/actions/dockable-actions.c	(original)
+++ trunk/app/actions/dockable-actions.c	Thu Dec  4 10:32:20 2008
@@ -49,10 +49,13 @@
     NC_("dockable-action", "Dialogs Menu"), NULL, NULL, NULL,
     GIMP_HELP_DOCK },
 
-  { "dockable-menu",               GTK_STOCK_MISSING_IMAGE, "" },
-  { "dockable-add-tab-menu",       NULL, NC_("dockable-action", "_Add Tab")        },
-  { "dockable-preview-size-menu",  NULL, NC_("dockable-action", "_Preview Size")   },
-  { "dockable-tab-style-menu",     NULL, NC_("dockable-action", "_Tab Style")      },
+  { "dockable-menu",              GTK_STOCK_MISSING_IMAGE, "" },
+  { "dockable-add-tab-menu",      NULL, NC_("dockable-action",
+                                            "_Add Tab")        },
+  { "dockable-preview-size-menu", NULL, NC_("dockable-action",
+                                            "_Preview Size")   },
+  { "dockable-tab-style-menu",    NULL, NC_("dockable-action",
+                                            "_Tab Style")      },
 
   { "dockable-close-tab", GTK_STOCK_CLOSE,
     NC_("dockable-action", "_Close Tab"), "", NULL,
@@ -120,7 +123,8 @@
 {
   { "dockable-lock-tab", NULL,
     NC_("dockable-action", "Loc_k Tab to Dock"), NULL,
-    N_("Protect this tab from being dragged with the mouse pointer"),
+    NC_("dockable-action",
+        "Protect this tab from being dragged with the mouse pointer"),
     G_CALLBACK (dockable_lock_tab_cmd_callback),
     FALSE,
     GIMP_HELP_DOCK_TAB_LOCK },

Modified: trunk/app/actions/documents-actions.c
==============================================================================
--- trunk/app/actions/documents-actions.c	(original)
+++ trunk/app/actions/documents-actions.c	Thu Dec  4 10:32:20 2008
@@ -44,55 +44,56 @@
 
   { "documents-open", GTK_STOCK_OPEN,
     NC_("documents-action", "_Open Image"), "",
-    N_("Open the selected entry"),
+    NC_("documents-action", "Open the selected entry"),
     G_CALLBACK (documents_open_cmd_callback),
     GIMP_HELP_DOCUMENT_OPEN },
 
   { "documents-raise-or-open", NULL,
     NC_("documents-action", "_Raise or Open Image"), "",
-    N_("Raise window if already open"),
+    NC_("documents-action", "Raise window if already open"),
     G_CALLBACK (documents_raise_or_open_cmd_callback),
     GIMP_HELP_DOCUMENT_OPEN },
 
   { "documents-file-open-dialog", NULL,
     NC_("documents-action", "File Open _Dialog"), "",
-    N_("Open image dialog"),
+    NC_("documents-action", "Open image dialog"),
     G_CALLBACK (documents_file_open_dialog_cmd_callback),
     GIMP_HELP_DOCUMENT_OPEN },
 
   { "documents-copy-location", GTK_STOCK_COPY,
     NC_("documents-action", "Copy Image _Location"), "",
-    N_("Copy image location to clipboard"),
+    NC_("documents-action", "Copy image location to clipboard"),
     G_CALLBACK (documents_copy_location_cmd_callback),
     GIMP_HELP_DOCUMENT_COPY_LOCATION },
 
   { "documents-remove", GTK_STOCK_REMOVE,
     NC_("documents-action", "Remove _Entry"), "",
-    N_("Remove the selected entry"),
+    NC_("documents-action", "Remove the selected entry"),
     G_CALLBACK (documents_remove_cmd_callback),
     GIMP_HELP_DOCUMENT_REMOVE },
 
   { "documents-clear", GTK_STOCK_CLEAR,
     NC_("documents-action", "_Clear History"), "",
-    N_("Clear the entire document history"),
+    NC_("documents-action", "Clear the entire document history"),
     G_CALLBACK (documents_clear_cmd_callback),
     GIMP_HELP_DOCUMENT_CLEAR },
 
   { "documents-recreate-preview", GTK_STOCK_REFRESH,
     NC_("documents-action", "Recreate _Preview"), "",
-    N_("Recreate preview"),
+    NC_("documents-action", "Recreate preview"),
     G_CALLBACK (documents_recreate_preview_cmd_callback),
     GIMP_HELP_DOCUMENT_REFRESH },
 
   { "documents-reload-previews", NULL,
     NC_("documents-action", "Reload _all Previews"), "",
-    N_("Reload all previews"),
+    NC_("documents-action", "Reload all previews"),
     G_CALLBACK (documents_reload_previews_cmd_callback),
     GIMP_HELP_DOCUMENT_REFRESH },
 
   { "documents-remove-dangling", NULL,
     NC_("documents-action", "Remove Dangling E_ntries"), "",
-    N_("Remove dangling entries"),
+    NC_("documents-action",
+        "Remove entries for which the corresponding file is not available"),
     G_CALLBACK (documents_remove_dangling_cmd_callback),
     GIMP_HELP_DOCUMENT_REFRESH }
 };

Modified: trunk/app/actions/drawable-actions.c
==============================================================================
--- trunk/app/actions/drawable-actions.c	(original)
+++ trunk/app/actions/drawable-actions.c	Thu Dec  4 10:32:20 2008
@@ -44,25 +44,26 @@
 {
   { "drawable-equalize", NULL,
     NC_("drawable-action", "_Equalize"), NULL,
-    N_("Automatic contrast enhancement"),
+    NC_("drawable-action", "Automatic contrast enhancement"),
     G_CALLBACK (drawable_equalize_cmd_callback),
     GIMP_HELP_LAYER_EQUALIZE },
 
   { "drawable-invert", GIMP_STOCK_INVERT,
     NC_("drawable-action", "In_vert"), NULL,
-    N_("Invert the colors"),
+    NC_("drawable-action", "Invert the colors"),
     G_CALLBACK (drawable_invert_cmd_callback),
     GIMP_HELP_LAYER_INVERT },
 
   { "drawable-levels-stretch", NULL,
     NC_("drawable-action", "_White Balance"), NULL,
-    N_("Automatic white balance correction"),
+    NC_("drawable-action", "Automatic white balance correction"),
     G_CALLBACK (drawable_levels_stretch_cmd_callback),
     GIMP_HELP_LAYER_WHITE_BALANCE},
 
   { "drawable-offset", NULL,
     NC_("drawable-action", "_Offset..."), "<control><shift>O",
-    N_("Shift the pixels, optionally wrapping them at the borders"),
+    NC_("drawable-action",
+        "Shift the pixels, optionally wrapping them at the borders"),
     G_CALLBACK (drawable_offset_cmd_callback),
     GIMP_HELP_LAYER_OFFSET }
 };
@@ -71,14 +72,14 @@
 {
   { "drawable-linked", GIMP_STOCK_LINKED,
     NC_("drawable-action", "_Linked"), NULL,
-    N_("Toggle the linked state"),
+    NC_("drawable-action", "Toggle the linked state"),
     G_CALLBACK (drawable_linked_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_LINKED },
 
   { "drawable-visible", GIMP_STOCK_VISIBLE,
     NC_("drawable-action", "_Visible"), NULL,
-    N_("Toggle visibility"),
+    NC_("drawable-action", "Toggle visibility"),
     G_CALLBACK (drawable_visible_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_VISIBLE }
@@ -88,13 +89,13 @@
 {
   { "drawable-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
     NC_("drawable-action", "Flip _Horizontally"), NULL,
-    N_("Flip horizontally"),
+    NC_("drawable-action", "Flip horizontally"),
     GIMP_ORIENTATION_HORIZONTAL, FALSE,
     GIMP_HELP_LAYER_FLIP_HORIZONTAL },
 
   { "drawable-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
     NC_("drawable-action", "Flip _Vertically"), NULL,
-    N_("Flip vertically"),
+    NC_("drawable-action", "Flip vertically"),
     GIMP_ORIENTATION_VERTICAL, FALSE,
     GIMP_HELP_LAYER_FLIP_VERTICAL }
 };
@@ -103,19 +104,19 @@
 {
   { "drawable-rotate-90", GIMP_STOCK_ROTATE_90,
     NC_("drawable-action", "Rotate 90Â _clockwise"), NULL,
-    N_("Rotate 90 degrees to the right"),
+    NC_("drawable-action", "Rotate 90 degrees to the right"),
     GIMP_ROTATE_90, FALSE,
     GIMP_HELP_LAYER_ROTATE_90 },
 
   { "drawable-rotate-180", GIMP_STOCK_ROTATE_180,
     NC_("drawable-action", "Rotate _180Â"), NULL,
-    N_("Turn upside-down"),
+    NC_("drawable-action", "Turn upside-down"),
     GIMP_ROTATE_180, FALSE,
     GIMP_HELP_LAYER_ROTATE_180 },
 
   { "drawable-rotate-270", GIMP_STOCK_ROTATE_270,
     NC_("drawable-action", "Rotate 90Â counter-clock_wise"), NULL,
-    N_("Rotate 90 degrees to the left"),
+    NC_("drawable-action", "Rotate 90 degrees to the left"),
     GIMP_ROTATE_270, FALSE,
     GIMP_HELP_LAYER_ROTATE_270 }
 };

Modified: trunk/app/actions/edit-actions.c
==============================================================================
--- trunk/app/actions/edit-actions.c	(original)
+++ trunk/app/actions/edit-actions.c	Thu Dec  4 10:32:20 2008
@@ -71,115 +71,118 @@
 
   { "edit-undo", GTK_STOCK_UNDO,
     NC_("edit-action", "_Undo"), "<control>Z",
-    N_("Undo the last operation"),
+    NC_("edit-action", "Undo the last operation"),
     G_CALLBACK (edit_undo_cmd_callback),
     GIMP_HELP_EDIT_UNDO },
 
   { "edit-redo", GTK_STOCK_REDO,
     NC_("edit-action", "_Redo"), "<control>Y",
-    N_("Redo the last operation that was undone"),
+    NC_("edit-action", "Redo the last operation that was undone"),
     G_CALLBACK (edit_redo_cmd_callback),
     GIMP_HELP_EDIT_REDO },
 
   { "edit-strong-undo", GTK_STOCK_UNDO,
     NC_("edit-action", "Strong Undo"), "<control><shift>Z",
-    N_("Undo the last operation, skipping visibility changes"),
+    NC_("edit-action", "Undo the last operation, skipping visibility changes"),
     G_CALLBACK (edit_strong_undo_cmd_callback),
     GIMP_HELP_EDIT_STRONG_UNDO },
 
   { "edit-strong-redo", GTK_STOCK_REDO,
     NC_("edit-action", "Strong Redo"), "<control><shift>Y",
-    N_("Redo the last operation that was undone, skipping visibility changes"),
+    NC_("edit-action",
+        "Redo the last operation that was undone, skipping visibility changes"),
     G_CALLBACK (edit_strong_redo_cmd_callback),
     GIMP_HELP_EDIT_STRONG_REDO },
 
   { "edit-undo-clear", GTK_STOCK_CLEAR,
     NC_("edit-action", "_Clear Undo History"), "",
-    N_("Remove all operations from the undo history"),
+    NC_("edit-action", "Remove all operations from the undo history"),
     G_CALLBACK (edit_undo_clear_cmd_callback),
     GIMP_HELP_EDIT_UNDO_CLEAR },
 
   { "edit-fade", GTK_STOCK_UNDO,
     NC_("edit-action", "_Fade..."), "",
-    N_("Modify paint mode and opacity of the last pixel manipulation"),
+    NC_("edit-action",
+        "Modify paint mode and opacity of the last pixel manipulation"),
     G_CALLBACK (edit_fade_cmd_callback),
     GIMP_HELP_EDIT_FADE },
 
   { "edit-cut", GTK_STOCK_CUT,
     NC_("edit-action", "Cu_t"), "<control>X",
-    N_("Move the selected pixels to the clipboard"),
+    NC_("edit-action", "Move the selected pixels to the clipboard"),
     G_CALLBACK (edit_cut_cmd_callback),
     GIMP_HELP_EDIT_CUT },
 
   { "edit-copy", GTK_STOCK_COPY,
     NC_("edit-action", "_Copy"), "<control>C",
-    N_("Copy the selected pixels to the clipboard"),
+    NC_("edit-action", "Copy the selected pixels to the clipboard"),
     G_CALLBACK (edit_copy_cmd_callback),
     GIMP_HELP_EDIT_COPY },
 
   { "edit-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
     NC_("edit-action", "Copy _Visible"), "<control><shift>C",
-    N_("Copy what is visible in the selected region"),
+    NC_("edit-action", "Copy what is visible in the selected region"),
     G_CALLBACK (edit_copy_visible_cmd_callback),
     GIMP_HELP_EDIT_COPY_VISIBLE },
 
   { "edit-paste", GTK_STOCK_PASTE,
     NC_("edit-action", "_Paste"), "<control>V",
-    N_("Paste the content of the clipboard"),
+    NC_("edit-action", "Paste the content of the clipboard"),
     G_CALLBACK (edit_paste_cmd_callback),
     GIMP_HELP_EDIT_PASTE },
 
   { "edit-paste-into", GIMP_STOCK_PASTE_INTO,
     NC_("edit-action", "Paste _Into"), NULL,
-    N_("Paste the content of the clipboard into the current selection"),
+    NC_("edit-action",
+        "Paste the content of the clipboard into the current selection"),
     G_CALLBACK (edit_paste_into_cmd_callback),
     GIMP_HELP_EDIT_PASTE_INTO },
 
   { "edit-paste-as-new", GIMP_STOCK_PASTE_AS_NEW,
     NC_("edit-action", "From _Clipboard"), "<control><shift>V",
-    N_("Create a new image from the content of the clipboard"),
+    NC_("edit-action", "Create a new image from the content of the clipboard"),
     G_CALLBACK (edit_paste_as_new_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW },
 
   { "edit-paste-as-new-short", GIMP_STOCK_PASTE_AS_NEW,
     NC_("edit-action", "_New Image"), NULL,
-    N_("Create a new image from the content of the clipboard"),
+    NC_("edit-action", "Create a new image from the content of the clipboard"),
     G_CALLBACK (edit_paste_as_new_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW },
 
   { "edit-paste-as-new-layer", NULL,
     NC_("edit-action", "New _Layer"), NULL,
-    N_("Create a new layer from the content of the clipboard"),
+    NC_("edit-action", "Create a new layer from the content of the clipboard"),
     G_CALLBACK (edit_paste_as_new_layer_cmd_callback),
     GIMP_HELP_EDIT_PASTE_AS_NEW_LAYER },
 
   { "edit-named-cut", GTK_STOCK_CUT,
     NC_("edit-action", "Cu_t Named..."), "",
-    N_("Move the selected pixels to a named buffer"),
+    NC_("edit-action", "Move the selected pixels to a named buffer"),
     G_CALLBACK (edit_named_cut_cmd_callback),
     GIMP_HELP_BUFFER_CUT },
 
   { "edit-named-copy", GTK_STOCK_COPY,
     NC_("edit-action", "_Copy Named..."), "",
-    N_("Copy the selected pixels to a named buffer"),
+    NC_("edit-action", "Copy the selected pixels to a named buffer"),
     G_CALLBACK (edit_named_copy_cmd_callback),
     GIMP_HELP_BUFFER_COPY },
 
   { "edit-named-copy-visible", NULL, /* GIMP_STOCK_COPY_VISIBLE, */
     NC_("edit-action", "Copy _Visible Named..."), "",
-    N_("Copy the selected region to a named buffer"),
+    NC_("edit-action", "Copy the selected region to a named buffer"),
     G_CALLBACK (edit_named_copy_visible_cmd_callback),
     GIMP_HELP_BUFFER_COPY },
 
   { "edit-named-paste", GTK_STOCK_PASTE,
     NC_("edit-action", "_Paste Named..."), "",
-    N_("Paste the content of a named buffer"),
+    NC_("edit-action", "Paste the content of a named buffer"),
     G_CALLBACK (edit_named_paste_cmd_callback),
     GIMP_HELP_BUFFER_PASTE },
 
   { "edit-clear", GTK_STOCK_CLEAR,
     NC_("edit-action", "Cl_ear"), "Delete",
-    N_("Clear the selected pixels"),
+    NC_("edit-action", "Clear the selected pixels"),
     G_CALLBACK (edit_clear_cmd_callback),
     GIMP_HELP_EDIT_CLEAR }
 };
@@ -188,19 +191,19 @@
 {
   { "edit-fill-fg", GIMP_STOCK_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with _FG Color"), "<control>comma",
-    N_("Fill the selection using the foreground color"),
+    NC_("edit-action", "Fill the selection using the foreground color"),
     GIMP_FOREGROUND_FILL, FALSE,
     GIMP_HELP_EDIT_FILL_FG },
 
   { "edit-fill-bg", GIMP_STOCK_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with B_G Color"), "<control>period",
-    N_("Fill the selection using the background color"),
+    NC_("edit-action", "Fill the selection using the background color"),
     GIMP_BACKGROUND_FILL, FALSE,
     GIMP_HELP_EDIT_FILL_BG },
 
   { "edit-fill-pattern", GIMP_STOCK_TOOL_BUCKET_FILL,
     NC_("edit-action", "Fill with P_attern"), "<control>semicolon",
-    N_("Fill the selection using the active pattern"),
+    NC_("edit-action", "Fill the selection using the active pattern"),
     GIMP_PATTERN_FILL, FALSE,
     GIMP_HELP_EDIT_FILL_PATTERN }
 };

Modified: trunk/app/actions/error-console-actions.c
==============================================================================
--- trunk/app/actions/error-console-actions.c	(original)
+++ trunk/app/actions/error-console-actions.c	Thu Dec  4 10:32:20 2008
@@ -42,13 +42,13 @@
 
   { "error-console-clear", GTK_STOCK_CLEAR,
     NC_("error-console-action", "_Clear"), "",
-    N_("Clear error console"),
+    NC_("error-console-action", "Clear error console"),
     G_CALLBACK (error_console_clear_cmd_callback),
     GIMP_HELP_ERRORS_CLEAR },
 
   { "error-console-select-all", NULL,
     NC_("error-console-action", "Select _All"), "",
-    N_("Select all errors"),
+    NC_("error-console-action", "Select all error messages"),
     G_CALLBACK (error_console_select_all_cmd_callback),
     GIMP_HELP_ERRORS_SELECT_ALL }
 };
@@ -57,13 +57,13 @@
 {
   { "error-console-save-all", GTK_STOCK_SAVE_AS,
     NC_("error-console-action", "_Save Error Log to File..."), "",
-    N_("Save error log"),
+    NC_("error-console-action", "Write all error mesaages to a file"),
     FALSE, FALSE,
     GIMP_HELP_ERRORS_SAVE },
 
   { "error-console-save-selection", GTK_STOCK_SAVE_AS,
     NC_("error-console-action", "Save S_election to File..."), "",
-    N_("Save selection"),
+    NC_("error-console-action", "Write the selected error messages to a file"),
     TRUE, FALSE,
     GIMP_HELP_ERRORS_SAVE }
 };

Modified: trunk/app/actions/file-actions.c
==============================================================================
--- trunk/app/actions/file-actions.c	(original)
+++ trunk/app/actions/file-actions.c	Thu Dec  4 10:32:20 2008
@@ -70,43 +70,43 @@
 
   { "file-open", GTK_STOCK_OPEN,
     NC_("file-action", "_Open..."), NULL,
-    N_("Open an image file"),
+    NC_("file-action", "Open an image file"),
     G_CALLBACK (file_open_cmd_callback),
     GIMP_HELP_FILE_OPEN },
 
   { "file-open-as-layers", GIMP_STOCK_LAYER,
     NC_("file-action", "Op_en as Layers..."), "<control><alt>O",
-    N_("Open an image file as layers"),
+    NC_("file-action", "Open an image file as layers"),
     G_CALLBACK (file_open_as_layers_cmd_callback),
     GIMP_HELP_FILE_OPEN_AS_LAYER },
 
   { "file-open-location", GIMP_STOCK_WEB,
     NC_("file-action", "Open _Location..."), NULL,
-    N_("Open an image file from a specified location"),
+    NC_("file-action", "Open an image file from a specified location"),
     G_CALLBACK (file_open_location_cmd_callback),
     GIMP_HELP_FILE_OPEN_LOCATION },
 
   { "file-save-as-template", NULL,
     NC_("file-action", "Save as _Template..."), NULL,
-    N_("Create a new template from this image"),
+    NC_("file-action", "Create a new template from this image"),
     G_CALLBACK (file_save_template_cmd_callback),
     GIMP_HELP_FILE_SAVE_AS_TEMPLATE },
 
   { "file-revert", GTK_STOCK_REVERT_TO_SAVED,
     NC_("file-action", "Re_vert"), NULL,
-    N_("Reload the image file from disk"),
+    NC_("file-action", "Reload the image file from disk"),
     G_CALLBACK (file_revert_cmd_callback),
     GIMP_HELP_FILE_REVERT },
 
   { "file-close-all", GTK_STOCK_CLOSE,
     NC_("file-action", "Close all"), "<shift><control>W",
-    N_("Close all opened images"),
+    NC_("file-action", "Close all opened images"),
     G_CALLBACK (file_close_all_cmd_callback),
     GIMP_HELP_FILE_CLOSE_ALL },
 
   { "file-quit", GTK_STOCK_QUIT,
     NC_("file-action", "_Quit"), "<control>Q",
-    N_("Quit the GNU Image Manipulation Program"),
+    NC_("file-action", "Quit the GNU Image Manipulation Program"),
     G_CALLBACK (file_quit_cmd_callback),
     GIMP_HELP_FILE_QUIT }
 };
@@ -115,25 +115,26 @@
 {
   { "file-save", GTK_STOCK_SAVE,
     NC_("file-action", "_Save"), "<control>S",
-    N_("Save this image"),
+    NC_("file-action", "Save this image"),
     GIMP_SAVE_MODE_SAVE, FALSE,
     GIMP_HELP_FILE_SAVE },
 
   { "file-save-as", GTK_STOCK_SAVE_AS,
     NC_("file-action", "Save _As..."), "<control><shift>S",
-    N_("Save this image with a different name"),
+    NC_("file-action", "Save this image with a different name"),
     GIMP_SAVE_MODE_SAVE_AS, FALSE,
     GIMP_HELP_FILE_SAVE_AS },
 
   { "file-save-a-copy", NULL,
     NC_("file-action", "Save a Cop_y..."), NULL,
-    N_("Save this image with a different name, but keep its current name"),
+    NC_("file-action",
+        "Save this image with a different name, but keep its current name"),
     GIMP_SAVE_MODE_SAVE_A_COPY, FALSE,
     GIMP_HELP_FILE_SAVE_A_COPY },
 
   { "file-save-and-close", NULL,
     NC_("file-action", "Save and Close..."), NULL,
-    N_("Save this image and close its window"),
+    NC_("file-action", "Save this image and close its window"),
     GIMP_SAVE_MODE_SAVE_AND_CLOSE, FALSE,
     GIMP_HELP_FILE_SAVE }
 };

Modified: trunk/app/actions/fonts-actions.c
==============================================================================
--- trunk/app/actions/fonts-actions.c	(original)
+++ trunk/app/actions/fonts-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,7 +46,7 @@
 
   { "fonts-refresh", GTK_STOCK_REFRESH,
     NC_("fonts-action", "_Rescan Font List"), "",
-    N_("Rescan font list"),
+    NC_("fonts-action", "Rescan the installed fonts"),
     G_CALLBACK (fonts_refresh_cmd_callback),
     GIMP_HELP_FONT_REFRESH }
 };

Modified: trunk/app/actions/gradient-editor-actions.c
==============================================================================
--- trunk/app/actions/gradient-editor-actions.c	(original)
+++ trunk/app/actions/gradient-editor-actions.c	Thu Dec  4 10:32:20 2008
@@ -265,7 +265,8 @@
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
 
   { "gradient-editor-left-color-foreground-transparent", NULL,
-    NC_("gradient-editor-color-type", "Fo_reground Color (Transparent)"), NULL, NULL,
+    NC_("gradient-editor-color-type",
+        "Fo_reground Color (Transparent)"), NULL, NULL,
     GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
 
@@ -275,7 +276,8 @@
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
 
   { "gradient-editor-left-color-background-transparent", NULL,
-    NC_("gradient-editor-color-type", "B_ackground Color (Transparent)"), NULL, NULL,
+    NC_("gradient-editor-color-type",
+        "B_ackground Color (Transparent)"), NULL, NULL,
     GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR }
 };
@@ -293,7 +295,8 @@
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
   { "gradient-editor-right-color-foreground-transparent", NULL,
-    NC_("gradient-editor-color-type", "Fo_reground Color (Transparent)"), NULL, NULL,
+    NC_("gradient-editor-color-type",
+        "Fo_reground Color (Transparent)"), NULL, NULL,
     GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
@@ -303,7 +306,8 @@
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
   { "gradient-editor-right-color-background-transparent", NULL,
-    NC_("gradient-editor-color-type", "B_ackground Color (Transparent)"), NULL, NULL,
+    NC_("gradient-editor-color-type",
+        "B_ackground Color (Transparent)"), NULL, NULL,
     GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR }
 };

Modified: trunk/app/actions/gradients-actions.c
==============================================================================
--- trunk/app/actions/gradients-actions.c	(original)
+++ trunk/app/actions/gradients-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,37 +46,37 @@
 
   { "gradients-new", GTK_STOCK_NEW,
     NC_("gradients-action", "_New Gradient"), "",
-    N_("Create a new gradient"),
+    NC_("gradients-action", "Create a new gradient"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_GRADIENT_NEW },
 
   { "gradients-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("gradients-action", "D_uplicate Gradient"), NULL,
-    N_("Duplicate this gradient"),
+    NC_("gradients-action", "Duplicate this gradient"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_GRADIENT_DUPLICATE },
 
   { "gradients-copy-location", GTK_STOCK_COPY,
     NC_("gradients-action", "Copy Gradient _Location"), "",
-    N_("Copy gradient file location to clipboard"),
+    NC_("gradients-action", "Copy gradient file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_GRADIENT_COPY_LOCATION },
 
   { "gradients-save-as-pov", GTK_STOCK_SAVE_AS,
     NC_("gradients-action", "Save as _POV-Ray..."), "",
-    N_("Save gradient as POV-Ray"),
+    NC_("gradients-action", "Save gradient as POV-Ray"),
     G_CALLBACK (gradients_save_as_pov_ray_cmd_callback),
     GIMP_HELP_GRADIENT_SAVE_AS_POV },
 
   { "gradients-delete", GTK_STOCK_DELETE,
     NC_("gradients-action", "_Delete Gradient"), "",
-    N_("Delete this gradient"),
+    NC_("gradients-action", "Delete this gradient"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_GRADIENT_DELETE },
 
   { "gradients-refresh", GTK_STOCK_REFRESH,
     NC_("gradients-action", "_Refresh Gradients"), "",
-    N_("Refresh gradients"),
+    NC_("gradients-action", "Refresh gradients"),
     G_CALLBACK (data_refresh_cmd_callback),
     GIMP_HELP_GRADIENT_REFRESH }
 };
@@ -85,7 +85,7 @@
 {
   { "gradients-edit", GTK_STOCK_EDIT,
     NC_("gradients-action", "_Edit Gradient..."), NULL,
-    N_("Edit gradient"),
+    NC_("gradients-action", "Edit gradient"),
     "gimp-gradient-editor",
     GIMP_HELP_GRADIENT_EDIT }
 };

Modified: trunk/app/actions/help-actions.c
==============================================================================
--- trunk/app/actions/help-actions.c	(original)
+++ trunk/app/actions/help-actions.c	Thu Dec  4 10:32:20 2008
@@ -39,13 +39,13 @@
 
   { "help-help", GTK_STOCK_HELP,
     NC_("help-action", "_Help"), "F1",
-    N_("Open the GIMP user manual"),
+    NC_("help-action", "Open the GIMP user manual"),
     G_CALLBACK (help_help_cmd_callback),
     GIMP_HELP_HELP },
 
   { "help-context-help", GTK_STOCK_HELP,
     NC_("help-action", "_Context Help"), "<shift>F1",
-    N_("Show the help for a specific user interface item"),
+    NC_("help-action", "Show the help for a specific user interface item"),
     G_CALLBACK (help_context_help_cmd_callback),
     GIMP_HELP_HELP_CONTEXT }
 };

Modified: trunk/app/actions/image-actions.c
==============================================================================
--- trunk/app/actions/image-actions.c	(original)
+++ trunk/app/actions/image-actions.c	Thu Dec  4 10:32:20 2008
@@ -65,73 +65,73 @@
 
   { "image-new", GTK_STOCK_NEW,
     NC_("image-action", "_New..."), "<control>N",
-    N_("Create a new image"),
+    NC_("image-action", "Create a new image"),
     G_CALLBACK (image_new_cmd_callback),
     GIMP_HELP_FILE_NEW },
 
   { "image-resize", GIMP_STOCK_RESIZE,
     NC_("image-action", "Can_vas Size..."), NULL,
-    N_("Adjust the image dimensions"),
+    NC_("image-action", "Adjust the image dimensions"),
     G_CALLBACK (image_resize_cmd_callback),
     GIMP_HELP_IMAGE_RESIZE },
 
   { "image-resize-to-layers", NULL,
     NC_("image-action", "F_it Canvas to Layers"), NULL,
-    N_("Resize the image to enclose all layers"),
+    NC_("image-action", "Resize the image to enclose all layers"),
     G_CALLBACK (image_resize_to_layers_cmd_callback),
     GIMP_HELP_IMAGE_RESIZE_TO_LAYERS },
 
   { "image-resize-to-selection", NULL,
     NC_("image-action", "F_it Canvas to Selection"), NULL,
-    N_("Resize the image to the extents of the selection"),
+    NC_("image-action", "Resize the image to the extents of the selection"),
     G_CALLBACK (image_resize_to_selection_cmd_callback),
     GIMP_HELP_IMAGE_RESIZE_TO_SELECTION },
 
   { "image-print-size", GIMP_STOCK_PRINT_RESOLUTION,
     NC_("image-action", "_Print Size..."), NULL,
-    N_("Adjust the print resolution"),
+    NC_("image-action", "Adjust the print resolution"),
     G_CALLBACK (image_print_size_cmd_callback),
     GIMP_HELP_IMAGE_PRINT_SIZE },
 
   { "image-scale", GIMP_STOCK_SCALE,
     NC_("image-action", "_Scale Image..."), NULL,
-    N_("Change the size of the image content"),
+    NC_("image-action", "Change the size of the image content"),
     G_CALLBACK (image_scale_cmd_callback),
     GIMP_HELP_IMAGE_SCALE },
 
   { "image-crop", GIMP_STOCK_TOOL_CROP,
     NC_("image-action", "_Crop to Selection"), NULL,
-    N_("Crop the image to the extents of the selection"),
+    NC_("image-action", "Crop the image to the extents of the selection"),
     G_CALLBACK (image_crop_cmd_callback),
     GIMP_HELP_IMAGE_CROP },
 
   { "image-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("image-action", "_Duplicate"), "<control>D",
-    N_("Create a duplicate of this image"),
+    NC_("image-action", "Create a duplicate of this image"),
     G_CALLBACK (image_duplicate_cmd_callback),
     GIMP_HELP_IMAGE_DUPLICATE },
 
   { "image-merge-layers", NULL,
     NC_("image-action", "Merge Visible _Layers..."), "<control>M",
-    N_("Merge all visible layers into one layer"),
+    NC_("image-action", "Merge all visible layers into one layer"),
     G_CALLBACK (image_merge_layers_cmd_callback),
     GIMP_HELP_IMAGE_MERGE_LAYERS },
 
   { "image-flatten", NULL,
     NC_("image-action", "_Flatten Image"), NULL,
-    N_("Merge all layers into one and remove transparency"),
+    NC_("image-action", "Merge all layers into one and remove transparency"),
     G_CALLBACK (image_flatten_image_cmd_callback),
     GIMP_HELP_IMAGE_FLATTEN },
 
   { "image-configure-grid", GIMP_STOCK_GRID,
     NC_("image-action", "Configure G_rid..."), NULL,
-    N_("Configure the grid for this image"),
+    NC_("image-action", "Configure the grid for this image"),
     G_CALLBACK (image_configure_grid_cmd_callback),
     GIMP_HELP_IMAGE_GRID },
 
   { "image-properties", GTK_STOCK_INFO,
     NC_("image-action", "Image Pr_operties"), "<alt>Return",
-    N_("Display information about this image"),
+    NC_("image-action", "Display information about this image"),
     G_CALLBACK (image_properties_cmd_callback),
     GIMP_HELP_IMAGE_PROPERTIES }
 };
@@ -140,17 +140,17 @@
 {
   { "image-convert-rgb", GIMP_STOCK_CONVERT_RGB,
     NC_("image-convert-action", "_RGB"), NULL,
-    N_("Convert the image to the RGB colorspace"),
+    NC_("image-convert-action", "Convert the image to the RGB colorspace"),
     GIMP_RGB, GIMP_HELP_IMAGE_CONVERT_RGB },
 
   { "image-convert-grayscale", GIMP_STOCK_CONVERT_GRAYSCALE,
     NC_("image-convert-action", "_Grayscale"), NULL,
-    N_("Convert the image to grayscale"),
+    NC_("image-convert-action", "Convert the image to grayscale"),
     GIMP_GRAY, GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },
 
   { "image-convert-indexed", GIMP_STOCK_CONVERT_INDEXED,
     NC_("image-convert-action", "_Indexed..."), NULL,
-    N_("Convert the image to indexed colors"),
+    NC_("image-convert-action", "Convert the image to indexed colors"),
     GIMP_INDEXED, GIMP_HELP_IMAGE_CONVERT_INDEXED }
 };
 
@@ -158,13 +158,13 @@
 {
   { "image-flip-horizontal", GIMP_STOCK_FLIP_HORIZONTAL,
     NC_("image-action", "Flip _Horizontally"), NULL,
-    N_("Flip image horizontally"),
+    NC_("image-action", "Flip image horizontally"),
     GIMP_ORIENTATION_HORIZONTAL, FALSE,
     GIMP_HELP_IMAGE_FLIP_HORIZONTAL },
 
   { "image-flip-vertical", GIMP_STOCK_FLIP_VERTICAL,
     NC_("image-action", "Flip _Vertically"), NULL,
-    N_("Flip image vertically"),
+    NC_("image-action", "Flip image vertically"),
     GIMP_ORIENTATION_VERTICAL, FALSE,
     GIMP_HELP_IMAGE_FLIP_VERTICAL }
 };
@@ -173,19 +173,19 @@
 {
   { "image-rotate-90", GIMP_STOCK_ROTATE_90,
     NC_("image-action", "Rotate 90Â _clockwise"), NULL,
-    N_("Rotate the image 90 degrees to the right"),
+    NC_("image-action", "Rotate the image 90 degrees to the right"),
     GIMP_ROTATE_90, FALSE,
     GIMP_HELP_IMAGE_ROTATE_90 },
 
   { "image-rotate-180", GIMP_STOCK_ROTATE_180,
     NC_("image-action", "Rotate _180Â"), NULL,
-    N_("Turn the image upside-down"),
+    NC_("image-action", "Turn the image upside-down"),
     GIMP_ROTATE_180, FALSE,
     GIMP_HELP_IMAGE_ROTATE_180 },
 
   { "image-rotate-270", GIMP_STOCK_ROTATE_270,
     NC_("image-action", "Rotate 90Â counter-clock_wise"), NULL,
-    N_("Rotate the image 90 degrees to the left"),
+    NC_("image-action", "Rotate the image 90 degrees to the left"),
     GIMP_ROTATE_270, FALSE,
     GIMP_HELP_IMAGE_ROTATE_270 }
 };

Modified: trunk/app/actions/images-actions.c
==============================================================================
--- trunk/app/actions/images-actions.c	(original)
+++ trunk/app/actions/images-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,19 +46,19 @@
 
   { "images-raise-views", GTK_STOCK_GOTO_TOP,
     NC_("images-action", "_Raise Views"), "",
-    N_("Raise this image's displays"),
+    NC_("images-action", "Raise this image's displays"),
     G_CALLBACK (images_raise_views_cmd_callback),
     NULL },
 
   { "images-new-view", GTK_STOCK_NEW,
     NC_("images-action", "_New View"), "",
-    N_("Create a new display for this image"),
+    NC_("images-action", "Create a new display for this image"),
     G_CALLBACK (images_new_view_cmd_callback),
     NULL },
 
   { "images-delete", GTK_STOCK_DELETE,
     NC_("images-action", "_Delete Image"), "",
-    N_("Delete this image"),
+    NC_("images-action", "Delete this image"),
     G_CALLBACK (images_delete_image_cmd_callback),
     NULL }
 };

Modified: trunk/app/actions/layers-actions.c
==============================================================================
--- trunk/app/actions/layers-actions.c	(original)
+++ trunk/app/actions/layers-actions.c	Thu Dec  4 10:32:20 2008
@@ -48,163 +48,175 @@
     NC_("layers-action", "Layers Menu"), NULL, NULL, NULL,
     GIMP_HELP_LAYER_DIALOG },
 
-  { "layers-menu",              NULL,                      NC_("layers-action", "_Layer")        },
-  { "layers-stack-menu",        NULL,                      NC_("layers-action", "Stac_k")        },
-  { "layers-text-to-selection-menu", GIMP_STOCK_TOOL_TEXT, NC_("layers-action", "Te_xt to Selection") },
-  { "layers-mask-menu",         NULL,                      NC_("layers-action", "_Mask")         },
-  { "layers-transparency-menu", NULL,                      NC_("layers-action", "Tr_ansparency") },
-  { "layers-transform-menu",    NULL,                      NC_("layers-action", "_Transform")    },
-  { "layers-properties-menu",   GTK_STOCK_PROPERTIES,      NC_("layers-action", "_Properties")   },
-  { "layers-opacity-menu",      GIMP_STOCK_TRANSPARENCY,   NC_("layers-action", "_Opacity")      },
-  { "layers-mode-menu",         GIMP_STOCK_TOOL_PENCIL,    NC_("layers-action", "Layer _Mode")   },
+  { "layers-menu",                   NULL,
+    NC_("layers-action", "_Layer")        },
+  { "layers-stack-menu",             NULL,
+    NC_("layers-action", "Stac_k")        },
+  { "layers-text-to-selection-menu", GIMP_STOCK_TOOL_TEXT,
+    NC_("layers-action", "Te_xt to Selection") },
+  { "layers-mask-menu",              NULL,
+    NC_("layers-action", "_Mask")         },
+  { "layers-transparency-menu",      NULL,
+    NC_("layers-action", "Tr_ansparency") },
+  { "layers-transform-menu",         NULL,
+    NC_("layers-action", "_Transform")    },
+  { "layers-properties-menu",        GTK_STOCK_PROPERTIES,
+    NC_("layers-action", "_Properties")   },
+  { "layers-opacity-menu",           GIMP_STOCK_TRANSPARENCY,
+    NC_("layers-action", "_Opacity")      },
+  { "layers-mode-menu",              GIMP_STOCK_TOOL_PENCIL,
+    NC_("layers-action", "Layer _Mode")   },
 
   { "layers-text-tool", GIMP_STOCK_TOOL_TEXT,
     NC_("layers-action", "Te_xt Tool"), NULL,
-    N_("Activate the text tool on this text layer"),
+    NC_("layers-action", "Activate the text tool on this text layer"),
     G_CALLBACK (layers_text_tool_cmd_callback),
     GIMP_HELP_TOOL_TEXT },
 
   { "layers-edit-attributes", GTK_STOCK_EDIT,
     NC_("layers-action", "_Edit Layer Attributes..."), NULL,
-    N_("Edit the layer's name"),
+    NC_("layers-action", "Edit the layer's name"),
     G_CALLBACK (layers_edit_attributes_cmd_callback),
     GIMP_HELP_LAYER_EDIT },
 
   { "layers-new", GTK_STOCK_NEW,
     NC_("layers-action", "_New Layer..."), "<control><shift>N",
-    N_("Create a new layer and add it to the image"),
+    NC_("layers-action", "Create a new layer and add it to the image"),
     G_CALLBACK (layers_new_cmd_callback),
     GIMP_HELP_LAYER_NEW },
 
   { "layers-new-last-values", GTK_STOCK_NEW,
     NC_("layers-action", "_New Layer"), "",
-    N_("Create a new layer with last used values"),
+    NC_("layers-action", "Create a new layer with last used values"),
     G_CALLBACK (layers_new_last_vals_cmd_callback),
     GIMP_HELP_LAYER_NEW },
 
   { "layers-new-from-visible", NULL,
     NC_("layers-action", "New from _Visible"), NULL,
-    N_("Create a new layer from what is visible in this image"),
+    NC_("layers-action",
+        "Create a new layer from what is visible in this image"),
     G_CALLBACK (layers_new_from_visible_cmd_callback),
     GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
 
   { "layers-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("layers-action", "D_uplicate Layer"), "<control><shift>D",
-    N_("Create a duplicate of the layer and add it to the image"),
+    NC_("layers-action",
+        "Create a duplicate of the layer and add it to the image"),
     G_CALLBACK (layers_duplicate_cmd_callback),
     GIMP_HELP_LAYER_DUPLICATE },
 
   { "layers-delete", GTK_STOCK_DELETE,
     NC_("layers-action", "_Delete Layer"), "",
-    N_("Delete this layer"),
+    NC_("layers-action", "Delete this layer"),
     G_CALLBACK (layers_delete_cmd_callback),
     GIMP_HELP_LAYER_DELETE },
 
   { "layers-raise", GTK_STOCK_GO_UP,
     NC_("layers-action", "_Raise Layer"), "",
-    N_("Raise this layer one step in the layer stack"),
+    NC_("layers-action", "Raise this layer one step in the layer stack"),
     G_CALLBACK (layers_raise_cmd_callback),
     GIMP_HELP_LAYER_RAISE },
 
   { "layers-raise-to-top", GTK_STOCK_GOTO_TOP,
     NC_("layers-action", "Layer to _Top"), "",
-    N_("Move this layer to the top of the layer stack"),
+    NC_("layers-action", "Move this layer to the top of the layer stack"),
     G_CALLBACK (layers_raise_to_top_cmd_callback),
     GIMP_HELP_LAYER_RAISE_TO_TOP },
 
   { "layers-lower", GTK_STOCK_GO_DOWN,
     NC_("layers-action", "_Lower Layer"), "",
-    N_("Lower this layer one step in the layer stack"),
+    NC_("layers-action", "Lower this layer one step in the layer stack"),
     G_CALLBACK (layers_lower_cmd_callback),
     GIMP_HELP_LAYER_LOWER },
 
   { "layers-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
     NC_("layers-action", "Layer to _Bottom"), "",
-    N_("Move this layer to the bottom of the layer stack"),
+    NC_("layers-action", "Move this layer to the bottom of the layer stack"),
     G_CALLBACK (layers_lower_to_bottom_cmd_callback),
     GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
 
   { "layers-anchor", GIMP_STOCK_ANCHOR,
     NC_("layers-action", "_Anchor Layer"), "<control>H",
-    N_("Anchor the floating layer"),
+    NC_("layers-action", "Anchor the floating layer"),
     G_CALLBACK (layers_anchor_cmd_callback),
     GIMP_HELP_LAYER_ANCHOR },
 
   { "layers-merge-down", GIMP_STOCK_MERGE_DOWN,
     NC_("layers-action", "Merge Do_wn"), NULL,
-    N_("Merge this layer with the one below it"),
+    NC_("layers-action", "Merge this layer with the one below it"),
     G_CALLBACK (layers_merge_down_cmd_callback),
     GIMP_HELP_LAYER_MERGE_DOWN },
 
   { "layers-merge-layers", NULL,
     NC_("layers-action", "Merge _Visible Layers..."), NULL,
-    N_("Merge all visible layers into one layer"),
+    NC_("layers-action", "Merge all visible layers into one layer"),
     G_CALLBACK (image_merge_layers_cmd_callback),
     GIMP_HELP_IMAGE_MERGE_LAYERS },
 
   { "layers-flatten-image", NULL,
     NC_("layers-action", "_Flatten Image"), NULL,
-    N_("Merge all layers into one and remove transparency"),
+    NC_("layers-action", "Merge all layers into one and remove transparency"),
     G_CALLBACK (image_flatten_image_cmd_callback),
     GIMP_HELP_IMAGE_FLATTEN },
 
   { "layers-text-discard", GIMP_STOCK_TOOL_TEXT,
     NC_("layers-action", "_Discard Text Information"), NULL,
-    N_("Turn this text layer into a normal layer"),
+    NC_("layers-action", "Turn this text layer into a normal layer"),
     G_CALLBACK (layers_text_discard_cmd_callback),
     GIMP_HELP_LAYER_TEXT_DISCARD },
 
   { "layers-text-to-vectors", GIMP_STOCK_TOOL_TEXT,
     NC_("layers-action", "Text to _Path"), NULL,
-    N_("Create a path from this text layer"),
+    NC_("layers-action", "Create a path from this text layer"),
     G_CALLBACK (layers_text_to_vectors_cmd_callback),
     GIMP_HELP_LAYER_TEXT_TO_PATH },
 
   { "layers-text-along-vectors", GIMP_STOCK_TOOL_TEXT,
     NC_("layers-action", "Text alon_g Path"), NULL,
-    N_("Warp this layer's text along the current path"),
+    NC_("layers-action", "Warp this layer's text along the current path"),
     G_CALLBACK (layers_text_along_vectors_cmd_callback),
     GIMP_HELP_LAYER_TEXT_ALONG_PATH },
 
   { "layers-resize", GIMP_STOCK_RESIZE,
     NC_("layers-action", "Layer B_oundary Size..."), NULL,
-    N_("Adjust the layer dimensions"),
+    NC_("layers-action", "Adjust the layer dimensions"),
     G_CALLBACK (layers_resize_cmd_callback),
     GIMP_HELP_LAYER_RESIZE },
 
   { "layers-resize-to-image", GIMP_STOCK_LAYER_TO_IMAGESIZE,
     NC_("layers-action", "Layer to _Image Size"), NULL,
-    N_("Resize the layer to the size of the image"),
+    NC_("layers-action", "Resize the layer to the size of the image"),
     G_CALLBACK (layers_resize_to_image_cmd_callback),
     GIMP_HELP_LAYER_RESIZE_TO_IMAGE },
 
   { "layers-scale", GIMP_STOCK_SCALE,
     NC_("layers-action", "_Scale Layer..."), NULL,
-    N_("Change the size of the layer content"),
+    NC_("layers-action", "Change the size of the layer content"),
     G_CALLBACK (layers_scale_cmd_callback),
     GIMP_HELP_LAYER_SCALE },
 
   { "layers-crop", GIMP_STOCK_TOOL_CROP,
     NC_("layers-action", "_Crop to Selection"), NULL,
-    N_("Crop the layer to the extents of the selection"),
+    NC_("layers-action", "Crop the layer to the extents of the selection"),
     G_CALLBACK (layers_crop_cmd_callback),
     GIMP_HELP_LAYER_CROP },
 
   { "layers-mask-add", GIMP_STOCK_LAYER_MASK,
     NC_("layers-action", "Add La_yer Mask..."), NULL,
-    N_("Add a mask that allows non-destructive editing of transparency"),
+    NC_("layers-action",
+        "Add a mask that allows non-destructive editing of transparency"),
     G_CALLBACK (layers_mask_add_cmd_callback),
     GIMP_HELP_LAYER_MASK_ADD },
 
   { "layers-alpha-add", GIMP_STOCK_TRANSPARENCY,
     NC_("layers-action", "Add Alpha C_hannel"), NULL,
-    N_("Add transparency information to the layer"),
+    NC_("layers-action", "Add transparency information to the layer"),
     G_CALLBACK (layers_alpha_add_cmd_callback),
     GIMP_HELP_LAYER_ALPHA_ADD },
 
   { "layers-alpha-remove", NULL,
     NC_("layers-action", "_Remove Alpha Channel"), NULL,
-    N_("Remove transparency information from the layer"),
+    NC_("layers-action", "Remove transparency information from the layer"),
     G_CALLBACK (layers_alpha_remove_cmd_callback),
     GIMP_HELP_LAYER_ALPHA_REMOVE }
 };
@@ -213,14 +225,15 @@
 {
   { "layers-lock-alpha", GIMP_STOCK_TRANSPARENCY,
     NC_("layers-action", "Lock Alph_a Channel"), NULL,
-    N_("Keep transparency information on this layer from being modified"),
+    NC_("layers-action",
+        "Keep transparency information on this layer from being modified"),
     G_CALLBACK (layers_lock_alpha_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_LOCK_ALPHA },
 
   { "layers-mask-edit", GTK_STOCK_EDIT,
     NC_("layers-action", "_Edit Layer Mask"), NULL,
-    N_("Work on the layer mask"),
+    NC_("layers-action", "Work on the layer mask"),
     G_CALLBACK (layers_mask_edit_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_MASK_EDIT },
@@ -233,7 +246,7 @@
 
   { "layers-mask-disable", NULL,
     NC_("layers-action", "_Disable Layer Mask"), NULL,
-    N_("Dismiss the effect of the layer mask"),
+    NC_("layers-action", "Dismiss the effect of the layer mask"),
     G_CALLBACK (layers_mask_disable_cmd_callback),
     FALSE,
     GIMP_HELP_LAYER_MASK_DISABLE }
@@ -243,13 +256,13 @@
 {
   { "layers-mask-apply", NULL,
     NC_("layers-action", "Apply Layer _Mask"), NULL,
-    N_("Apply the effect of the layer mask and remove it"),
+    NC_("layers-action", "Apply the effect of the layer mask and remove it"),
     GIMP_MASK_APPLY, FALSE,
     GIMP_HELP_LAYER_MASK_APPLY },
 
   { "layers-mask-delete", GTK_STOCK_DELETE,
     NC_("layers-action", "Delete Layer Mas_k"), "",
-    N_("Remove the layer mask and its effect"),
+    NC_("layers-action", "Remove the layer mask and its effect"),
     GIMP_MASK_DISCARD, FALSE,
     GIMP_HELP_LAYER_MASK_DELETE }
 };
@@ -258,25 +271,25 @@
 {
   { "layers-mask-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
     NC_("layers-action", "_Mask to Selection"), NULL,
-    N_("Replace the selection with the layer mask"),
+    NC_("layers-action", "Replace the selection with the layer mask"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_REPLACE },
 
   { "layers-mask-selection-add", GIMP_STOCK_SELECTION_ADD,
     NC_("layers-action", "_Add to Selection"), NULL,
-    N_("Add the layer mask to the current selection"),
+    NC_("layers-action", "Add the layer mask to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_ADD },
 
   { "layers-mask-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
     NC_("layers-action", "_Subtract from Selection"), NULL,
-    N_("Subtract the layer mask from the current selection"),
+    NC_("layers-action", "Subtract the layer mask from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT },
 
   { "layers-mask-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
     NC_("layers-action", "_Intersect with Selection"), NULL,
-    N_("Intersect the layer mask with the current selection"),
+    NC_("layers-action", "Intersect the layer mask with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT }
 };
@@ -285,25 +298,29 @@
 {
   { "layers-alpha-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
     NC_("layers-action", "Al_pha to Selection"), NULL,
-    N_("Replace the selection with the layer's alpha channel"),
+    NC_("layers-action",
+        "Replace the selection with the layer's alpha channel"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_REPLACE },
 
   { "layers-alpha-selection-add", GIMP_STOCK_SELECTION_ADD,
     NC_("layers-action", "A_dd to Selection"), NULL,
-    N_("Add the layer's alpha channel to the current selection"),
+    NC_("layers-action",
+        "Add the layer's alpha channel to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_ADD },
 
   { "layers-alpha-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
     NC_("layers-action", "_Subtract from Selection"), NULL,
-    N_("Subtract the layer's alpha channel from the current selection"),
+    NC_("layers-action",
+        "Subtract the layer's alpha channel from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_SUBTRACT },
 
   { "layers-alpha-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
     NC_("layers-action", "_Intersect with Selection"), NULL,
-    N_("Intersect the layer's alpha channel with the current selection"),
+    NC_("layers-action",
+        "Intersect the layer's alpha channel with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_LAYER_ALPHA_SELECTION_INTERSECT }
 };
@@ -312,25 +329,28 @@
 {
   { "layers-text-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
     NC_("layers-action", "_Text to Selection"), NULL,
-    N_("Replace the selection with the text layer's outline"),
+    NC_("layers-action", "Replace the selection with the text layer's outline"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_LAYER_TEXT_SELECTION_REPLACE },
 
   { "layers-text-selection-add", GIMP_STOCK_SELECTION_ADD,
     NC_("layers-action", "A_dd to Selection"), NULL,
-    N_("Add the text layer's outline to the current selection"),
+    NC_("layers-action",
+        "Add the text layer's outline to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_LAYER_TEXT_SELECTION_ADD },
 
   { "layers-text-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
     NC_("layers-action", "_Subtract from Selection"), NULL,
-    N_("Subtract the text layer's outline from the current selection"),
+    NC_("layers-action",
+        "Subtract the text layer's outline from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_LAYER_TEXT_SELECTION_SUBTRACT },
 
   { "layers-text-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
     NC_("layers-action", "_Intersect with Selection"), NULL,
-    N_("Intersect the text layer's outline with the current selection"),
+    NC_("layers-action",
+        "Intersect the text layer's outline with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_LAYER_TEXT_SELECTION_INTERSECT }
 };
@@ -339,25 +359,25 @@
 {
   { "layers-select-top", NULL,
     NC_("layers-action", "Select _Top Layer"), "Home",
-    N_("Select the topmost layer"),
+    NC_("layers-action", "Select the topmost layer"),
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_LAYER_TOP },
 
   { "layers-select-bottom", NULL,
     NC_("layers-action", "Select _Bottom Layer"), "End",
-    N_("Select the bottommost layer"),
+    NC_("layers-action", "Select the bottommost layer"),
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_LAYER_BOTTOM },
 
   { "layers-select-previous", NULL,
     NC_("layers-action", "Select _Previous Layer"), "Prior",
-    N_("Select the layer above the current layer"),
+    NC_("layers-action", "Select the layer above the current layer"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_PREVIOUS },
 
   { "layers-select-next", NULL,
     NC_("layers-action", "Select _Next Layer"), "Next",
-    N_("Select the layer below the current layer"),
+    NC_("layers-action", "Select the layer below the current layer"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_LAYER_NEXT }
 };

Modified: trunk/app/actions/palette-editor-actions.c
==============================================================================
--- trunk/app/actions/palette-editor-actions.c	(original)
+++ trunk/app/actions/palette-editor-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,13 +46,13 @@
 
   { "palette-editor-edit-color", GTK_STOCK_EDIT,
     NC_("palette-editor-action", "_Edit Color..."), "",
-    N_("Edit this color"),
+    NC_("palette-editor-action", "Edit this entry"),
     G_CALLBACK (palette_editor_edit_color_cmd_callback),
     GIMP_HELP_PALETTE_EDITOR_EDIT },
 
   { "palette-editor-delete-color", GTK_STOCK_DELETE,
     NC_("palette-editor-action", "_Delete Color"), "",
-    N_("Delete this color"),
+    NC_("palette-editor-action", "Delete this entry"),
     G_CALLBACK (palette_editor_delete_color_cmd_callback),
     GIMP_HELP_PALETTE_EDITOR_DELETE }
 };
@@ -70,13 +70,15 @@
 {
   { "palette-editor-new-color-fg", GTK_STOCK_NEW,
     NC_("palette-editor-action", "New Color from _FG"), "",
-    N_("New color from foreground color"),
+    NC_("palette-editor-action",
+        "Create a new entry from the foreground color"),
     FALSE, FALSE,
     GIMP_HELP_PALETTE_EDITOR_NEW },
 
   { "palette-editor-new-color-bg", GTK_STOCK_NEW,
     NC_("palette-editor-action", "New Color from _BG"), "",
-    N_("New color from background color"),
+    NC_("palette-editor-action",
+        "Create a new entry from the background color"),
     TRUE, FALSE,
     GIMP_HELP_PALETTE_EDITOR_NEW }
 };

Modified: trunk/app/actions/palettes-actions.c
==============================================================================
--- trunk/app/actions/palettes-actions.c	(original)
+++ trunk/app/actions/palettes-actions.c	Thu Dec  4 10:32:20 2008
@@ -46,43 +46,43 @@
 
   { "palettes-new", GTK_STOCK_NEW,
     NC_("palettes-action", "_New Palette"), "",
-    N_("Create a new palette"),
+    NC_("palettes-action", "Create a new palette"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_PALETTE_NEW },
 
   { "palettes-import", GTK_STOCK_CONVERT,
     NC_("palettes-action", "_Import Palette..."), "",
-    N_("Import palette"),
+    NC_("palettes-action", "Import palette"),
     G_CALLBACK (palettes_import_cmd_callback),
     GIMP_HELP_PALETTE_IMPORT },
 
   { "palettes-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("palettes-action", "D_uplicate Palette"), NULL,
-    N_("Duplicate this palette"),
+    NC_("palettes-action", "Duplicate this palette"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_PALETTE_DUPLICATE },
 
   { "palettes-merge", NULL,
     NC_("palettes-action", "_Merge Palettes..."), NULL,
-    N_("Merge palettes"),
+    NC_("palettes-action", "Merge palettes"),
     G_CALLBACK (palettes_merge_cmd_callback),
     GIMP_HELP_PALETTE_MERGE },
 
   { "palettes-copy-location", GTK_STOCK_COPY,
     NC_("palettes-action", "Copy Palette _Location"), "",
-    N_("Copy palette file location to clipboard"),
+    NC_("palettes-action", "Copy palette file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_PALETTE_COPY_LOCATION },
 
   { "palettes-delete", GTK_STOCK_DELETE,
     NC_("palettes-action", "_Delete Palette"), "",
-    N_("Delete this palette"),
+    NC_("palettes-action", "Delete this palette"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_PALETTE_DELETE },
 
   { "palettes-refresh", GTK_STOCK_REFRESH,
     NC_("palettes-action", "_Refresh Palettes"), "",
-    N_("Refresh palettes"),
+    NC_("palettes-action", "Refresh palettes"),
     G_CALLBACK (data_refresh_cmd_callback),
     GIMP_HELP_PALETTE_REFRESH }
 };
@@ -91,7 +91,7 @@
 {
   { "palettes-edit", GTK_STOCK_EDIT,
     NC_("palettes-action", "_Edit Palette..."), NULL,
-    N_("Edit palette"),
+    NC_("palettes-action", "Edit palette"),
     "gimp-palette-editor",
     GIMP_HELP_PALETTE_EDIT }
 };

Modified: trunk/app/actions/patterns-actions.c
==============================================================================
--- trunk/app/actions/patterns-actions.c	(original)
+++ trunk/app/actions/patterns-actions.c	Thu Dec  4 10:32:20 2008
@@ -45,37 +45,37 @@
 
   { "patterns-open-as-image", GTK_STOCK_OPEN,
     NC_("patterns-action", "_Open Pattern as Image"), "",
-    N_("Open pattern as image"),
+    NC_("patterns-action", "Open this pattern as an image"),
     G_CALLBACK (data_open_as_image_cmd_callback),
     GIMP_HELP_PATTERN_OPEN_AS_IMAGE },
 
   { "patterns-new", GTK_STOCK_NEW,
     NC_("patterns-action", "_New Pattern"), "",
-    N_("Create a new pattern"),
+    NC_("patterns-action", "Create a new pattern"),
     G_CALLBACK (data_new_cmd_callback),
     GIMP_HELP_PATTERN_NEW },
 
   { "patterns-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("patterns-action", "D_uplicate Pattern"), NULL,
-    N_("Duplicate this pattern"),
+    NC_("patterns-action", "Duplicate this pattern"),
     G_CALLBACK (data_duplicate_cmd_callback),
     GIMP_HELP_PATTERN_DUPLICATE },
 
   { "patterns-copy-location", GTK_STOCK_COPY,
     NC_("patterns-action", "Copy Pattern _Location"), "",
-    N_("Copy pattern file location to clipboard"),
+    NC_("patterns-action", "Copy pattern file location to clipboard"),
     G_CALLBACK (data_copy_location_cmd_callback),
     GIMP_HELP_PATTERN_COPY_LOCATION },
 
   { "patterns-delete", GTK_STOCK_DELETE,
     NC_("patterns-action", "_Delete Pattern"), "",
-    N_("Delete this pattern"),
+    NC_("patterns-action", "Delete this pattern"),
     G_CALLBACK (data_delete_cmd_callback),
     GIMP_HELP_PATTERN_DELETE },
 
   { "patterns-refresh", GTK_STOCK_REFRESH,
     NC_("patterns-action", "_Refresh Patterns"), "",
-    N_("Refresh patterns"),
+    NC_("patterns-action", "Refresh patterns"),
     G_CALLBACK (data_refresh_cmd_callback),
     GIMP_HELP_PATTERN_REFRESH }
 };
@@ -84,7 +84,7 @@
 {
   { "patterns-edit", GTK_STOCK_EDIT,
     NC_("patterns-action", "_Edit Pattern..."), NULL,
-    N_("Edit pattern"),
+    NC_("patterns-action", "Edit pattern"),
     "gimp-pattern-editor",
     GIMP_HELP_PATTERN_EDIT }
 };

Modified: trunk/app/actions/plug-in-actions.c
==============================================================================
--- trunk/app/actions/plug-in-actions.c	(original)
+++ trunk/app/actions/plug-in-actions.c	Thu Dec  4 10:32:20 2008
@@ -81,48 +81,48 @@
 
 static const GimpActionEntry plug_in_actions[] =
 {
-  { "plug-in-menu",                   NULL, NC_("plug-in-action",
-                                                "Filte_rs")          },
-  { "plug-in-recent-menu",            NULL, NC_("plug-in-action",
-                                                "Recently Used")     },
-  { "plug-in-blur-menu",              NULL, NC_("plug-in-action",
-                                                "_Blur")             },
-  { "plug-in-noise-menu",             NULL, NC_("plug-in-action",
-                                                "_Noise")            },
-  { "plug-in-edge-detect-menu",       NULL, NC_("plug-in-action",
-                                                "Edge-De_tect")      },
-  { "plug-in-enhance-menu",           NULL, NC_("plug-in-action",
-                                                "En_hance")          },
-  { "plug-in-combine-menu",           NULL, NC_("plug-in-action",
-                                                "C_ombine")          },
-  { "plug-in-generic-menu",           NULL, NC_("plug-in-action",
-                                                "_Generic")          },
-  { "plug-in-light-shadow-menu",      NULL, NC_("plug-in-action",
-                                                "_Light and Shadow") },
-  { "plug-in-distorts-menu",          NULL, NC_("plug-in-action",
-                                                "_Distorts")         },
-  { "plug-in-artistic-menu",          NULL, NC_("plug-in-action",
-                                                "_Artistic")         },
-  { "plug-in-decor-menu",             NULL, NC_("plug-in-action",
-                                                "_Decor")            },
-  { "plug-in-map-menu",               NULL, NC_("plug-in-action",
-                                                "_Map")              },
-  { "plug-in-render-menu",            NULL, NC_("plug-in-action",
-                                                "_Render")           },
-  { "plug-in-render-clouds-menu",     NULL, NC_("plug-in-action",
-                                                "_Clouds")           },
-  { "plug-in-render-nature-menu",     NULL, NC_("plug-in-action",
-                                                "_Nature")           },
-  { "plug-in-render-pattern-menu",    NULL, NC_("plug-in-action",
-                                                "_Pattern")          },
-  { "plug-in-web-menu",               NULL, NC_("plug-in-action",
-                                                "_Web")              },
-  { "plug-in-animation-menu",         NULL, NC_("plug-in-action",
-                                                "An_imation")        },
+  { "plug-in-menu",                NULL, NC_("plug-in-action",
+                                             "Filte_rs")          },
+  { "plug-in-recent-menu",         NULL, NC_("plug-in-action",
+                                             "Recently Used")     },
+  { "plug-in-blur-menu",           NULL, NC_("plug-in-action",
+                                             "_Blur")             },
+  { "plug-in-noise-menu",          NULL, NC_("plug-in-action",
+                                             "_Noise")            },
+  { "plug-in-edge-detect-menu",    NULL, NC_("plug-in-action",
+                                             "Edge-De_tect")      },
+  { "plug-in-enhance-menu",        NULL, NC_("plug-in-action",
+                                             "En_hance")          },
+  { "plug-in-combine-menu",        NULL, NC_("plug-in-action",
+                                             "C_ombine")          },
+  { "plug-in-generic-menu",        NULL, NC_("plug-in-action",
+                                             "_Generic")          },
+  { "plug-in-light-shadow-menu",   NULL, NC_("plug-in-action",
+                                             "_Light and Shadow") },
+  { "plug-in-distorts-menu",       NULL, NC_("plug-in-action",
+                                             "_Distorts")         },
+  { "plug-in-artistic-menu",       NULL, NC_("plug-in-action",
+                                             "_Artistic")         },
+  { "plug-in-decor-menu",          NULL, NC_("plug-in-action",
+                                             "_Decor")            },
+  { "plug-in-map-menu",            NULL, NC_("plug-in-action",
+                                             "_Map")              },
+  { "plug-in-render-menu",         NULL, NC_("plug-in-action",
+                                             "_Render")           },
+  { "plug-in-render-clouds-menu",  NULL, NC_("plug-in-action",
+                                             "_Clouds")           },
+  { "plug-in-render-nature-menu",  NULL, NC_("plug-in-action",
+                                             "_Nature")           },
+  { "plug-in-render-pattern-menu", NULL, NC_("plug-in-action",
+                                             "_Pattern")          },
+  { "plug-in-web-menu",            NULL, NC_("plug-in-action",
+                                             "_Web")              },
+  { "plug-in-animation-menu",      NULL, NC_("plug-in-action",
+                                             "An_imation")        },
 
   { "plug-in-reset-all", GIMP_STOCK_RESET,
     NC_("plug-in-action", "Reset all _Filters"), NULL,
-    N_("Reset all plug-ins to their default settings"),
+    NC_("plug-in-action", "Reset all plug-ins to their default settings"),
     G_CALLBACK (plug_in_reset_all_cmd_callback),
     GIMP_HELP_FILTER_RESET_ALL }
 };
@@ -131,13 +131,14 @@
 {
   { "plug-in-repeat", GTK_STOCK_EXECUTE,
     NC_("plug-in-action", "Re_peat Last"), "<control>F",
-    N_("Rerun the last used plug-in using the same settings"),
+    NC_("plug-in-action",
+        "Rerun the last used plug-in using the same settings"),
     GIMP_RUN_WITH_LAST_VALS, FALSE,
     GIMP_HELP_FILTER_REPEAT },
 
   { "plug-in-reshow", GIMP_STOCK_RESHOW_FILTER,
     NC_("plug-in-action", "R_e-Show Last"), "<control><shift>F",
-    N_("Show the last used plug-in dialog again"),
+    NC_("plug-in-action", "Show the last used plug-in dialog again"),
     GIMP_RUN_INTERACTIVE, FALSE,
     GIMP_HELP_FILTER_RESHOW }
 };

Modified: trunk/app/actions/quick-mask-actions.c
==============================================================================
--- trunk/app/actions/quick-mask-actions.c	(original)
+++ trunk/app/actions/quick-mask-actions.c	Thu Dec  4 10:32:20 2008
@@ -53,7 +53,7 @@
 {
   { "quick-mask-toggle", GIMP_STOCK_QUICK_MASK_ON,
     NC_("quick-mask-action", "Toggle _Quick Mask"), "<shift>Q",
-    N_("Toggle Quick Mask"),
+    NC_("quick-mask-action", "Toggle Quick Mask on/off"),
     G_CALLBACK (quick_mask_toggle_cmd_callback),
     FALSE,
     GIMP_HELP_QUICK_MASK_TOGGLE }

Modified: trunk/app/actions/sample-points-actions.c
==============================================================================
--- trunk/app/actions/sample-points-actions.c	(original)
+++ trunk/app/actions/sample-points-actions.c	Thu Dec  4 10:32:20 2008
@@ -45,7 +45,8 @@
 {
   { "sample-points-sample-merged", NULL,
     NC_("sample-points-action", "_Sample Merged"), "",
-    N_("Use the composite color of all visible layers"),
+    NC_("sample-points-action",
+        "Use the composite color of all visible layers"),
     G_CALLBACK (sample_points_sample_merged_cmd_callback),
     TRUE,
     GIMP_HELP_SAMPLE_POINT_SAMPLE_MERGED }

Modified: trunk/app/actions/select-actions.c
==============================================================================
--- trunk/app/actions/select-actions.c	(original)
+++ trunk/app/actions/select-actions.c	Thu Dec  4 10:32:20 2008
@@ -49,73 +49,74 @@
 
   { "select-all", GIMP_STOCK_SELECTION_ALL,
     NC_("select-action", "_All"), "<control>A",
-    N_("Select everything"),
+    NC_("select-action", "Select everything"),
     G_CALLBACK (select_all_cmd_callback),
     GIMP_HELP_SELECTION_ALL },
 
   { "select-none", GIMP_STOCK_SELECTION_NONE,
     NC_("select-action", "_None"), "<control><shift>A",
-    N_("Dismiss the selection"),
+    NC_("select-action", "Dismiss the selection"),
     G_CALLBACK (select_none_cmd_callback),
     GIMP_HELP_SELECTION_NONE },
 
   { "select-invert", GIMP_STOCK_INVERT,
     NC_("select-action", "_Invert"), "<control>I",
-    N_("Invert the selection"),
+    NC_("select-action", "Invert the selection"),
     G_CALLBACK (select_invert_cmd_callback),
     GIMP_HELP_SELECTION_INVERT },
 
   { "select-float", GIMP_STOCK_FLOATING_SELECTION,
     NC_("select-action", "_Float"), "<control><shift>L",
-    N_("Create a floating selection"),
+    NC_("select-action", "Create a floating selection"),
     G_CALLBACK (select_float_cmd_callback),
     GIMP_HELP_SELECTION_FLOAT },
 
   { "select-feather", NULL,
     NC_("select-action", "Fea_ther..."), NULL,
-    N_("Blur the selection border so that it fades out smoothly"),
+    NC_("select-action",
+        "Blur the selection border so that it fades out smoothly"),
     G_CALLBACK (select_feather_cmd_callback),
     GIMP_HELP_SELECTION_FEATHER },
 
   { "select-sharpen", NULL,
     NC_("select-action", "_Sharpen"), NULL,
-    N_("Remove fuzzyness from the selection"),
+    NC_("select-action", "Remove fuzzyness from the selection"),
     G_CALLBACK (select_sharpen_cmd_callback),
     GIMP_HELP_SELECTION_SHARPEN },
 
   { "select-shrink", GIMP_STOCK_SELECTION_SHRINK,
     NC_("select-action", "S_hrink..."), NULL,
-    N_("Contract the selection"),
+    NC_("select-action", "Contract the selection"),
     G_CALLBACK (select_shrink_cmd_callback),
     GIMP_HELP_SELECTION_SHRINK },
 
   { "select-grow", GIMP_STOCK_SELECTION_GROW,
     NC_("select-action", "_Grow..."), NULL,
-    N_("Enlarge the selection"),
+    NC_("select-action", "Enlarge the selection"),
     G_CALLBACK (select_grow_cmd_callback),
     GIMP_HELP_SELECTION_GROW },
 
   { "select-border", GIMP_STOCK_SELECTION_BORDER,
     NC_("select-action", "Bo_rder..."), NULL,
-    N_("Replace the selection by its border"),
+    NC_("select-action", "Replace the selection by its border"),
     G_CALLBACK (select_border_cmd_callback),
     GIMP_HELP_SELECTION_BORDER },
 
   { "select-save", GIMP_STOCK_SELECTION_TO_CHANNEL,
     NC_("select-action", "Save to _Channel"), NULL,
-    N_("Save the selection to a channel"),
+    NC_("select-action", "Save the selection to a channel"),
     G_CALLBACK (select_save_cmd_callback),
     GIMP_HELP_SELECTION_TO_CHANNEL },
 
   { "select-stroke", GIMP_STOCK_SELECTION_STROKE,
     NC_("select-action", "_Stroke Selection..."), NULL,
-    N_("Paint along the selection outline"),
+    NC_("select-action", "Paint along the selection outline"),
     G_CALLBACK (select_stroke_cmd_callback),
     GIMP_HELP_SELECTION_STROKE },
 
   { "select-stroke-last-values", GIMP_STOCK_SELECTION_STROKE,
     NC_("select-action", "_Stroke Selection"), NULL,
-    N_("Stroke the selection with last used values"),
+    NC_("select-action", "Stroke the selection with last used values"),
     G_CALLBACK (select_stroke_last_vals_cmd_callback),
     GIMP_HELP_SELECTION_STROKE }
 };

Modified: trunk/app/actions/templates-actions.c
==============================================================================
--- trunk/app/actions/templates-actions.c	(original)
+++ trunk/app/actions/templates-actions.c	Thu Dec  4 10:32:20 2008
@@ -44,31 +44,31 @@
 
   { "templates-create-image", GIMP_STOCK_IMAGE,
     NC_("templates-action", "_Create Image from Template"), "",
-    N_("Create a new image from the selected template"),
+    NC_("templates-action", "Create a new image from the selected template"),
     G_CALLBACK (templates_create_image_cmd_callback),
     GIMP_HELP_TEMPLATE_IMAGE_NEW },
 
   { "templates-new", GTK_STOCK_NEW,
     NC_("templates-action", "_New Template..."), "",
-    N_("Create a new template"),
+    NC_("templates-action", "Create a new template"),
     G_CALLBACK (templates_new_cmd_callback),
     GIMP_HELP_TEMPLATE_NEW },
 
   { "templates-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("templates-action", "D_uplicate Template..."), "",
-    N_("Duplicate this template"),
+    NC_("templates-action", "Duplicate this template"),
     G_CALLBACK (templates_duplicate_cmd_callback),
     GIMP_HELP_TEMPLATE_DUPLICATE },
 
   { "templates-edit", GTK_STOCK_EDIT,
     NC_("templates-action", "_Edit Template..."), "",
-    N_("Edit this template"),
+    NC_("templates-action", "Edit this template"),
     G_CALLBACK (templates_edit_cmd_callback),
     GIMP_HELP_TEMPLATE_EDIT },
 
   { "templates-delete", GTK_STOCK_DELETE,
     NC_("templates-action", "_Delete Template"), "",
-    N_("Delete this template"),
+    NC_("templates-action", "Delete this template"),
     G_CALLBACK (templates_delete_cmd_callback),
     GIMP_HELP_TEMPLATE_DELETE }
 };

Modified: trunk/app/actions/text-editor-actions.c
==============================================================================
--- trunk/app/actions/text-editor-actions.c	(original)
+++ trunk/app/actions/text-editor-actions.c	Thu Dec  4 10:32:20 2008
@@ -42,13 +42,13 @@
 
   { "text-editor-load", GTK_STOCK_OPEN,
     NC_("text-editor-action", "Open"), "",
-    N_("Load text from file"),
+    NC_("text-editor-action", "Load text from file"),
     G_CALLBACK (text_editor_load_cmd_callback),
     NULL },
 
   { "text-editor-clear", GTK_STOCK_CLEAR,
     NC_("text-editor-action", "Clear"), "",
-    N_("Clear all text"),
+    NC_("text-editor-action", "Clear all text"),
     G_CALLBACK (text_editor_clear_cmd_callback),
     NULL }
 };
@@ -57,13 +57,13 @@
 {
   { "text-editor-direction-ltr", GIMP_STOCK_TEXT_DIR_LTR,
     NC_("text-editor-action", "LTR"), "",
-    N_("From left to right"),
+    NC_("text-editor-action", "From left to right"),
     GIMP_TEXT_DIRECTION_LTR,
     NULL },
 
   { "text-editor-direction-rtl", GIMP_STOCK_TEXT_DIR_RTL,
     NC_("text-editor-action", "RTL"), "",
-    N_("From right to left"),
+    NC_("text-editor-action", "From right to left"),
     GIMP_TEXT_DIRECTION_RTL,
     NULL }
 };

Modified: trunk/app/actions/text-tool-actions.c
==============================================================================
--- trunk/app/actions/text-tool-actions.c	(original)
+++ trunk/app/actions/text-tool-actions.c	Thu Dec  4 10:32:20 2008
@@ -81,19 +81,21 @@
 
   { "text-tool-clear", GTK_STOCK_CLEAR,
     NC_("text-tool-action", "Cl_ear"), "",
-    N_("Clear all text"),
+    NC_("text-tool-action", "Clear all text"),
     G_CALLBACK (text_tool_clear_cmd_callback),
     NULL },
 
   { "text-tool-text-to-path", GIMP_STOCK_PATH,
     NC_("text-tool-action", "_Path from Text"), "",
-    N_("Create a path from the outlines of the current text"),
+    NC_("text-tool-action",
+        "Create a path from the outlines of the current text"),
     G_CALLBACK (text_tool_text_to_path_cmd_callback),
     NULL },
 
   { "text-tool-text-along-path", GIMP_STOCK_PATH,
     NC_("text-tool-action", "Text _along Path"), "",
-    N_("Bend the text along the currently active path"),
+    NC_("text-tool-action",
+        "Bend the text along the currently active path"),
     G_CALLBACK (text_tool_text_along_path_cmd_callback),
     NULL }
 };

Modified: trunk/app/actions/tool-options-actions.c
==============================================================================
--- trunk/app/actions/tool-options-actions.c	(original)
+++ trunk/app/actions/tool-options-actions.c	Thu Dec  4 10:32:20 2008
@@ -85,7 +85,7 @@
 
   { "tool-options-reset-all", GIMP_STOCK_RESET,
     NC_("tool-options-action", "Reset _all Tool Options"), "",
-    N_("Reset all tool options"),
+    NC_("tool-options-action", "Reset all tool options"),
     G_CALLBACK (tool_options_reset_all_cmd_callback),
     GIMP_HELP_TOOL_OPTIONS_RESET }
 };

Modified: trunk/app/actions/tools-actions.c
==============================================================================
--- trunk/app/actions/tools-actions.c	(original)
+++ trunk/app/actions/tools-actions.c	Thu Dec  4 10:32:20 2008
@@ -55,31 +55,31 @@
 
   { "tools-raise", GTK_STOCK_GO_UP,
     NC_("tools-action", "R_aise Tool"), NULL,
-    N_("Raise tool"),
+    NC_("tools-action", "Raise this tool"),
     G_CALLBACK (tools_raise_cmd_callback),
     NULL },
 
   { "tools-raise-to-top", GTK_STOCK_GOTO_TOP,
     NC_("tools-action", "Ra_ise to Top"), NULL,
-    N_("Raise tool to top"),
+    NC_("tools-action", "Raise this tool to the top"),
     G_CALLBACK (tools_raise_to_top_cmd_callback),
     NULL },
 
   { "tools-lower", GTK_STOCK_GO_DOWN,
     NC_("tools-action", "L_ower Tool"), NULL,
-    N_("Lower tool"),
+    NC_("tools-action", "Lower this tool"),
     G_CALLBACK (tools_lower_cmd_callback),
     NULL },
 
   { "tools-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
     NC_("tools-action", "Lo_wer to Bottom"), NULL,
-    N_("Lower tool to bottom"),
+    NC_("tools-action", "Lower this tool to the bottom"),
     G_CALLBACK (tools_lower_to_bottom_cmd_callback),
     NULL },
 
   { "tools-reset", GIMP_STOCK_RESET,
     NC_("tools-action", "_Reset Order & Visibility"), NULL,
-    N_("Reset tool order and visibility"),
+    NC_("tools-action", "Reset tool order and visibility"),
     G_CALLBACK (tools_reset_cmd_callback),
     NULL }
 };
@@ -97,13 +97,13 @@
 {
   { "tools-by-color-select-short", GIMP_STOCK_TOOL_BY_COLOR_SELECT,
     NC_("tools-action", "_By Color"), NULL,
-    N_("Select regions with similar colors"),
+    NC_("tools-action", "Select regions with similar colors"),
     "gimp-by-color-select-tool",
     GIMP_HELP_TOOL_BY_COLOR_SELECT },
 
   { "tools-rotate-arbitrary", GIMP_STOCK_TOOL_ROTATE,
     NC_("tools-action", "_Arbitrary Rotation..."), "",
-    N_("Rotate by an arbitrary angle"),
+    NC_("tools-action", "Rotate by an arbitrary angle"),
     "gimp-rotate-layer",
     GIMP_HELP_TOOL_ROTATE }
 };

Modified: trunk/app/actions/vectors-actions.c
==============================================================================
--- trunk/app/actions/vectors-actions.c	(original)
+++ trunk/app/actions/vectors-actions.c	Thu Dec  4 10:32:20 2008
@@ -52,31 +52,31 @@
 
   { "vectors-edit-attributes", GTK_STOCK_EDIT,
     NC_("vectors-action", "_Edit Path Attributes..."), NULL,
-    N_("Edit path attributes"),
+    NC_("vectors-action", "Edit path attributes"),
     G_CALLBACK (vectors_edit_attributes_cmd_callback),
     GIMP_HELP_PATH_EDIT },
 
   { "vectors-new", GTK_STOCK_NEW,
     NC_("vectors-action", "_New Path..."), "",
-    N_("Create a new path..."),
+    NC_("vectors-action", "Create a new path..."),
     G_CALLBACK (vectors_new_cmd_callback),
     GIMP_HELP_PATH_NEW },
 
   { "vectors-new-last-values", GTK_STOCK_NEW,
     NC_("vectors-action", "_New Path with last values"), "",
-    N_("Create a new path with last values"),
+    NC_("vectors-action", "Create a new path with last used values"),
     G_CALLBACK (vectors_new_last_vals_cmd_callback),
     GIMP_HELP_PATH_NEW },
 
   { "vectors-duplicate", GIMP_STOCK_DUPLICATE,
     NC_("vectors-action", "D_uplicate Path"), NULL,
-    N_("Duplicate this path"),
+    NC_("vectors-action", "Duplicate this path"),
     G_CALLBACK (vectors_duplicate_cmd_callback),
     GIMP_HELP_PATH_DUPLICATE },
 
   { "vectors-delete", GTK_STOCK_DELETE,
     NC_("vectors-action", "_Delete Path"), "",
-    N_("Delete this path"),
+    NC_("vectors-action", "Delete this path"),
     G_CALLBACK (vectors_delete_cmd_callback),
     GIMP_HELP_PATH_DELETE },
 
@@ -87,37 +87,37 @@
 
   { "vectors-raise", GTK_STOCK_GO_UP,
     NC_("vectors-action", "_Raise Path"), "",
-    N_("Raise path"),
+    NC_("vectors-action", "Raise this path"),
     G_CALLBACK (vectors_raise_cmd_callback),
     GIMP_HELP_PATH_RAISE },
 
   { "vectors-raise-to-top", GTK_STOCK_GOTO_TOP,
     NC_("vectors-action", "Raise Path to _Top"), "",
-    N_("Raise path to top"),
+    NC_("vectors-action", "Raise this path to the top"),
     G_CALLBACK (vectors_raise_to_top_cmd_callback),
     GIMP_HELP_PATH_RAISE_TO_TOP },
 
   { "vectors-lower", GTK_STOCK_GO_DOWN,
     NC_("vectors-action", "_Lower Path"), "",
-    N_("Lower path"),
+    NC_("vectors-action", "Lower this path"),
     G_CALLBACK (vectors_lower_cmd_callback),
     GIMP_HELP_PATH_LOWER },
 
   { "vectors-lower-to-bottom", GTK_STOCK_GOTO_BOTTOM,
     NC_("vectors-action", "Lower Path to _Bottom"), "",
-    N_("Lower path to bottom"),
+    NC_("vectors-action", "Lower this path to the bottom"),
     G_CALLBACK (vectors_lower_to_bottom_cmd_callback),
     GIMP_HELP_PATH_LOWER_TO_BOTTOM },
 
   { "vectors-stroke", GIMP_STOCK_PATH_STROKE,
     NC_("vectors-action", "Stro_ke Path..."), NULL,
-    N_("Paint along the path"),
+    NC_("vectors-action", "Paint along the path"),
     G_CALLBACK (vectors_stroke_cmd_callback),
     GIMP_HELP_PATH_STROKE },
 
   { "vectors-stroke-last-values", GIMP_STOCK_PATH_STROKE,
     NC_("vectors-action", "Stro_ke Path"), NULL,
-    N_("Paint along the path with last values"),
+    NC_("vectors-action", "Paint along the path with last values"),
     G_CALLBACK (vectors_stroke_last_vals_cmd_callback),
     GIMP_HELP_PATH_STROKE },
 
@@ -161,31 +161,31 @@
 {
   { "vectors-selection-replace", GIMP_STOCK_SELECTION_REPLACE,
     NC_("vectors-action", "Path to Sele_ction"), NULL,
-    N_("Path to selection"),
+    NC_("vectors-action", "Path to selection"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_PATH_SELECTION_REPLACE },
 
   { "vectors-selection-from-vectors", GIMP_STOCK_SELECTION_REPLACE,
     NC_("vectors-action", "Fr_om Path"), "<shift>V",
-    N_("Replace selection with path"),
+    NC_("vectors-action", "Replace selection with path"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_PATH_SELECTION_REPLACE },
 
   { "vectors-selection-add", GIMP_STOCK_SELECTION_ADD,
     NC_("vectors-action", "_Add to Selection"), NULL,
-    N_("Add path to selection"),
+    NC_("vectors-action", "Add path to selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_PATH_SELECTION_ADD },
 
   { "vectors-selection-subtract", GIMP_STOCK_SELECTION_SUBTRACT,
     NC_("vectors-action", "_Subtract from Selection"), NULL,
-    N_("Subtract path from selection"),
+    NC_("vectors-action", "Subtract path from selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_PATH_SELECTION_SUBTRACT },
 
   { "vectors-selection-intersect", GIMP_STOCK_SELECTION_INTERSECT,
     NC_("vectors-action", "_Intersect with Selection"), NULL,
-    N_("Intersect path with selection"),
+    NC_("vectors-action", "Intersect path with selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_PATH_SELECTION_INTERSECT }
 };
@@ -194,19 +194,19 @@
 {
   { "vectors-selection-to-vectors", GIMP_STOCK_SELECTION_TO_PATH,
     NC_("vectors-action", "Selecti_on to Path"), NULL,
-    N_("Selection to path"),
+    NC_("vectors-action", "Selection to path"),
     FALSE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH },
 
   { "vectors-selection-to-vectors-short", GIMP_STOCK_SELECTION_TO_PATH,
     NC_("vectors-action", "To _Path"), NULL,
-    N_("Selection to path"),
+    NC_("vectors-action", "Selection to path"),
     FALSE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH },
 
   { "vectors-selection-to-vectors-advanced", GIMP_STOCK_SELECTION_TO_PATH,
     NC_("vectors-action", "Selection to Path (_Advanced)"), NULL,
-    N_("Advanced options"),
+    NC_("vectors-action", "Advanced options"),
     TRUE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH }
 };

Modified: trunk/app/actions/view-actions.c
==============================================================================
--- trunk/app/actions/view-actions.c	(original)
+++ trunk/app/actions/view-actions.c	Thu Dec  4 10:32:20 2008
@@ -75,55 +75,55 @@
 
   { "view-new", GTK_STOCK_NEW,
     NC_("view-action", "_New View"), "",
-    N_("Create another view on this image"),
+    NC_("view-action", "Create another view on this image"),
     G_CALLBACK (view_new_cmd_callback),
     GIMP_HELP_VIEW_NEW },
 
   { "view-close", GTK_STOCK_CLOSE,
     NC_("view-action",  "_Close"), "<control>W",
-    N_("Close this image window"),
+    NC_("view-action", "Close this image window"),
     G_CALLBACK (window_close_cmd_callback),
     GIMP_HELP_FILE_CLOSE },
 
   { "view-zoom-fit-in", GTK_STOCK_ZOOM_FIT,
     NC_("view-action", "_Fit Image in Window"), "<control><shift>E",
-    N_("Adjust the zoom ratio so that the image becomes fully visible"),
+    NC_("view-action", "Adjust the zoom ratio so that the image becomes fully visible"),
     G_CALLBACK (view_zoom_fit_in_cmd_callback),
     GIMP_HELP_VIEW_ZOOM_FIT_IN },
 
   { "view-zoom-fill", GTK_STOCK_ZOOM_FIT,
     NC_("view-action", "Fi_ll Window"), NULL,
-    N_("Adjust the zoom ratio so that the entire window is used"),
+    NC_("view-action", "Adjust the zoom ratio so that the entire window is used"),
     G_CALLBACK (view_zoom_fill_cmd_callback),
     GIMP_HELP_VIEW_ZOOM_FILL },
 
   { "view-zoom-revert", NULL,
     NC_("view-action", "Re_vert Zoom"), "grave",
-    N_("Restore the previous zoom level"),
+    NC_("view-action", "Restore the previous zoom level"),
     G_CALLBACK (view_zoom_revert_cmd_callback),
     GIMP_HELP_VIEW_ZOOM_REVERT },
 
   { "view-navigation-window", GIMP_STOCK_NAVIGATION,
     NC_("view-action", "Na_vigation Window"), NULL,
-    N_("Show an overview window for this image"),
+    NC_("view-action", "Show an overview window for this image"),
     G_CALLBACK (view_navigation_window_cmd_callback),
     GIMP_HELP_NAVIGATION_DIALOG },
 
   { "view-display-filters", GIMP_STOCK_DISPLAY_FILTER,
     NC_("view-action", "Display _Filters..."), NULL,
-    N_("Configure filters applied to this view"),
+    NC_("view-action", "Configure filters applied to this view"),
     G_CALLBACK (view_display_filters_cmd_callback),
     GIMP_HELP_DISPLAY_FILTER_DIALOG },
 
   { "view-shrink-wrap", GTK_STOCK_ZOOM_FIT,
     NC_("view-action", "Shrink _Wrap"), "<control>E",
-    N_("Reduce the image window to the size of the image display"),
+    NC_("view-action", "Reduce the image window to the size of the image display"),
     G_CALLBACK (view_shrink_wrap_cmd_callback),
     GIMP_HELP_VIEW_SHRINK_WRAP },
 
   { "view-open-display", NULL,
     NC_("view-action", "_Open Display..."), NULL,
-    N_("Connect to another display"),
+    NC_("view-action", "Connect to another display"),
     G_CALLBACK (window_open_display_cmd_callback),
     NULL }
 };
@@ -132,105 +132,105 @@
 {
   { "view-dot-for-dot", NULL,
     NC_("view-action", "_Dot for Dot"), NULL,
-    N_("A pixel on the screen represents an image pixel"),
+    NC_("view-action", "A pixel on the screen represents an image pixel"),
     G_CALLBACK (view_dot_for_dot_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_DOT_FOR_DOT },
 
   { "view-show-selection", NULL,
     NC_("view-action", "Show _Selection"), "<control>T",
-    N_("Display the selection outline"),
+    NC_("view-action", "Display the selection outline"),
     G_CALLBACK (view_toggle_selection_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_SELECTION },
 
   { "view-show-layer-boundary", NULL,
     NC_("view-action", "Show _Layer Boundary"), NULL,
-    N_("Draw a border around the active layer"),
+    NC_("view-action", "Draw a border around the active layer"),
     G_CALLBACK (view_toggle_layer_boundary_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY },
 
   { "view-show-guides", NULL,
     NC_("view-action", "Show _Guides"), "<control><shift>T",
-    N_("Display the image's guides"),
+    NC_("view-action", "Display the image's guides"),
     G_CALLBACK (view_toggle_guides_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_GUIDES },
 
   { "view-show-grid", NULL,
     NC_("view-action", "S_how Grid"), NULL,
-    N_("Display the image's grid"),
+    NC_("view-action", "Display the image's grid"),
     G_CALLBACK (view_toggle_grid_cmd_callback),
     FALSE,
     GIMP_HELP_VIEW_SHOW_GRID },
 
   { "view-show-sample-points", NULL,
     NC_("view-action", "Show Sample Points"), NULL,
-    N_("Display the image's color sample points"),
+    NC_("view-action", "Display the image's color sample points"),
     G_CALLBACK (view_toggle_sample_points_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_SAMPLE_POINTS },
 
   { "view-snap-to-guides", NULL,
     NC_("view-action", "Sn_ap to Guides"), NULL,
-    N_("Tool operations snap to guides"),
+    NC_("view-action", "Tool operations snap to guides"),
     G_CALLBACK (view_snap_to_guides_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SNAP_TO_GUIDES },
 
   { "view-snap-to-grid", NULL,
     NC_("view-action", "Sna_p to Grid"), NULL,
-    N_("Tool operations snap to the grid"),
+    NC_("view-action", "Tool operations snap to the grid"),
     G_CALLBACK (view_snap_to_grid_cmd_callback),
     FALSE,
     GIMP_HELP_VIEW_SNAP_TO_GRID },
 
   { "view-snap-to-canvas", NULL,
     NC_("view-action", "Snap to _Canvas Edges"), NULL,
-    N_("Tool operations snap to the canvas edges"),
+    NC_("view-action", "Tool operations snap to the canvas edges"),
     G_CALLBACK (view_snap_to_canvas_cmd_callback),
     FALSE,
     GIMP_HELP_VIEW_SNAP_TO_CANVAS },
 
   { "view-snap-to-vectors", NULL,
     NC_("view-action", "Snap t_o Active Path"), NULL,
-    N_("Tool operations snap to the active path"),
+    NC_("view-action", "Tool operations snap to the active path"),
     G_CALLBACK (view_snap_to_vectors_cmd_callback),
     FALSE,
     GIMP_HELP_VIEW_SNAP_TO_VECTORS },
 
   { "view-show-menubar", NULL,
     NC_("view-action", "Show _Menubar"), NULL,
-    N_("Show this window's menubar"),
+    NC_("view-action", "Show this window's menubar"),
     G_CALLBACK (view_toggle_menubar_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_MENUBAR },
 
   { "view-show-rulers", NULL,
     NC_("view-action", "Show R_ulers"), "<control><shift>R",
-    N_("Show this window's rulers"),
+    NC_("view-action", "Show this window's rulers"),
     G_CALLBACK (view_toggle_rulers_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_RULERS },
 
   { "view-show-scrollbars", NULL,
     NC_("view-action", "Show Scroll_bars"), NULL,
-    N_("Show this window's scrollbars"),
+    NC_("view-action", "Show this window's scrollbars"),
     G_CALLBACK (view_toggle_scrollbars_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_SCROLLBARS },
 
   { "view-show-statusbar", NULL,
     NC_("view-action", "Show S_tatusbar"), NULL,
-    N_("Show this window's statusbar"),
+    NC_("view-action", "Show this window's statusbar"),
     G_CALLBACK (view_toggle_statusbar_cmd_callback),
     TRUE,
     GIMP_HELP_VIEW_SHOW_STATUSBAR },
 
   { "view-fullscreen", GTK_STOCK_FULLSCREEN,
     NC_("view-action", "Fullscr_een"), "F11",
-    N_("Toggle fullscreen view"),
+    NC_("view-action", "Toggle fullscreen view"),
     G_CALLBACK (view_fullscreen_cmd_callback),
     FALSE,
     GIMP_HELP_VIEW_FULLSCREEN },
@@ -262,25 +262,25 @@
 
   { "view-zoom-out", GTK_STOCK_ZOOM_OUT,
     NC_("view-zoom-action", "Zoom _Out"), "minus",
-    N_("Zoom out"),
+    NC_("view-action", "Zoom out"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-in", GTK_STOCK_ZOOM_IN,
     NC_("view-zoom-action", "Zoom _In"), "plus",
-    N_("Zoom in"),
+    NC_("view-action", "Zoom in"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-out-accel", GIMP_STOCK_CHAR_PICKER,
     NC_("view-zoom-action", "Zoom Out"), "KP_Subtract",
-    N_("Zoom out"),
+    NC_("view-action", "Zoom out"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-in-accel", GIMP_STOCK_CHAR_PICKER,
     NC_("view-zoom-action", "Zoom In"), "KP_Add",
-    N_("Zoom in"),
+    NC_("view-action", "Zoom in"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
@@ -299,61 +299,61 @@
 {
   { "view-zoom-16-1", NULL,
     NC_("view-zoom-action", "1_6:1  (1600%)"), NULL,
-    N_("Zoom 16:1"),
+    NC_("view-zoom-action", "Zoom 16:1"),
     160000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-8-1", NULL,
     NC_("view-zoom-action", "_8:1  (800%)"), NULL,
-    N_("Zoom 8:1"),
+    NC_("view-zoom-action", "Zoom 8:1"),
     80000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-4-1", NULL,
     NC_("view-zoom-action", "_4:1  (400%)"), NULL,
-    N_("Zoom 4:1"),
+    NC_("view-zoom-action", "Zoom 4:1"),
     40000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-2-1", NULL,
     NC_("view-zoom-action", "_2:1  (200%)"), NULL,
-    N_("Zoom 2:1"),
+    NC_("view-zoom-action", "Zoom 2:1"),
     20000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-1-1", GTK_STOCK_ZOOM_100,
     NC_("view-zoom-action", "_1:1  (100%)"), "1",
-    N_("Zoom 1:1"),
+    NC_("view-zoom-action", "Zoom 1:1"),
     10000,
     GIMP_HELP_VIEW_ZOOM_100 },
 
   { "view-zoom-1-2", NULL,
     NC_("view-zoom-action", "1:_2  (50%)"), NULL,
-    N_("Zoom 1:2"),
+    NC_("view-zoom-action", "Zoom 1:2"),
     5000,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-1-4", NULL,
     NC_("view-zoom-action", "1:_4  (25%)"), NULL,
-    N_("Zoom 1:4"),
+    NC_("view-zoom-action", "Zoom 1:4"),
     2500,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-1-8", NULL,
     NC_("view-zoom-action", "1:_8  (12.5%)"), NULL,
-    N_("Zoom 1:8"),
+    NC_("view-zoom-action", "Zoom 1:8"),
     1250,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-1-16", NULL,
     NC_("view-zoom-action", "1:1_6  (6.25%)"), NULL,
-    N_("Zoom 1:16"),
+    NC_("view-zoom-action", "Zoom 1:16"),
     625,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-other", NULL,
     NC_("view-zoom-action", "Othe_r..."), NULL,
-    N_("Set a custom zoom factor"),
+    NC_("view-zoom-action", "Set a custom zoom factor"),
     0,
     GIMP_HELP_VIEW_ZOOM_OTHER }
 };
@@ -362,31 +362,32 @@
 {
   { "view-padding-color-theme", NULL,
     NC_("view-padding-color", "From _Theme"), NULL,
-    N_("Use the current theme's background color"),
+    NC_("view-padding-color", "Use the current theme's background color"),
     GIMP_CANVAS_PADDING_MODE_DEFAULT, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
   { "view-padding-color-light-check", NULL,
     NC_("view-padding-color", "_Light Check Color"), NULL,
-    N_("Use the light check color"),
+    NC_("view-padding-color", "Use the light check color"),
     GIMP_CANVAS_PADDING_MODE_LIGHT_CHECK, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
   { "view-padding-color-dark-check", NULL,
     NC_("view-padding-color", "_Dark Check Color"), NULL,
-    N_("Use the dark check color"),
+    NC_("view-padding-color", "Use the dark check color"),
     GIMP_CANVAS_PADDING_MODE_DARK_CHECK, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
   { "view-padding-color-custom", GTK_STOCK_SELECT_COLOR,
     NC_("view-padding-color", "Select _Custom Color..."), NULL,
-    N_("Use an arbitrary color"),
+    NC_("view-padding-color", "Use an arbitrary color"),
     GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
   { "view-padding-color-prefs", GIMP_STOCK_RESET,
     NC_("view-padding-color", "As in _Preferences"), NULL,
-    N_("Reset padding color to what's configured in preferences"),
+    NC_("view-padding-color",
+        "Reset padding color to what's configured in preferences"),
     GIMP_CANVAS_PADDING_MODE_RESET, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR }
 };

Modified: trunk/app/actions/windows-actions.c
==============================================================================
--- trunk/app/actions/windows-actions.c	(original)
+++ trunk/app/actions/windows-actions.c	Thu Dec  4 10:32:20 2008
@@ -86,7 +86,7 @@
 
   { "windows-show-toolbox", NULL,
     NC_("windows-action", "Tool_box"), "<control>B",
-    N_("Raise the toolbox"),
+    NC_("windows-action", "Raise the toolbox"),
     G_CALLBACK (windows_show_toolbox_cmd_callback),
     GIMP_HELP_TOOLBOX }
 };

Modified: trunk/app/widgets/gimpactiongroup.c
==============================================================================
--- trunk/app/widgets/gimpactiongroup.c	(original)
+++ trunk/app/widgets/gimpactiongroup.c	Thu Dec  4 10:32:20 2008
@@ -352,7 +352,7 @@
 
 void
 gimp_action_group_add_actions (GimpActionGroup       *group,
-			       const gchar           *label_context,
+			       const gchar           *msg_context,
                                const GimpActionEntry *entries,
                                guint                  n_entries)
 {
@@ -364,17 +364,23 @@
     {
       GimpAction  *action;
       gchar       *label;
-      const gchar *tooltip;
+      const gchar *tooltip = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
 
-      if (label_context)
-	label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
       else
-	label = gettext (entries[i].label);
-
-      tooltip = gettext (entries[i].tooltip);
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -405,7 +411,7 @@
 
 void
 gimp_action_group_add_toggle_actions (GimpActionGroup             *group,
-                                      const gchar                 *label_context,
+                                      const gchar                 *msg_context,
                                       const GimpToggleActionEntry *entries,
                                       guint                        n_entries)
 {
@@ -417,17 +423,23 @@
     {
       GtkToggleAction *action;
       gchar           *label;
-      const gchar     *tooltip;
+      const gchar     *tooltip = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
 
-      if (label_context)
-	label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
       else
-	label = gettext (entries[i].label);
-
-      tooltip = gettext (entries[i].tooltip);
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -460,7 +472,7 @@
 
 GSList *
 gimp_action_group_add_radio_actions (GimpActionGroup            *group,
-                                     const gchar                *label_context,
+                                     const gchar                *msg_context,
                                      const GimpRadioActionEntry *entries,
                                      guint                       n_entries,
                                      GSList                     *radio_group,
@@ -476,17 +488,23 @@
     {
       GtkRadioAction *action;
       gchar          *label;
-      const gchar    *tooltip;
+      const gchar    *tooltip = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
 
-      if (label_context)
-	label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
       else
-	label = gettext (entries[i].label);
-
-      tooltip = gettext (entries[i].tooltip);
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -529,7 +547,7 @@
 
 void
 gimp_action_group_add_enum_actions (GimpActionGroup           *group,
-                                    const gchar               *label_context,
+                                    const gchar               *msg_context,
                                     const GimpEnumActionEntry *entries,
                                     guint                      n_entries,
                                     GCallback                  callback)
@@ -542,17 +560,23 @@
     {
       GimpEnumAction *action;
       gchar          *label;
-      const gchar    *tooltip;
+      const gchar    *tooltip = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
 
-      if (label_context)
-	label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
       else
-	label = gettext (entries[i].label);
-
-      tooltip = gettext (entries[i].tooltip);
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -585,7 +609,7 @@
 
 void
 gimp_action_group_add_string_actions (GimpActionGroup             *group,
-                                      const gchar                 *label_context,
+                                      const gchar                 *msg_context,
                                       const GimpStringActionEntry *entries,
                                       guint                        n_entries,
                                       GCallback                    callback)
@@ -598,17 +622,23 @@
     {
       GimpStringAction *action;
       gchar            *label;
-      const gchar      *tooltip;
+      const gchar      *tooltip = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
 
-      if (label_context)
-	label = (gchar *) g_dpgettext2 (NULL, label_context, entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
+
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
       else
-	label = gettext (entries[i].label);
-
-      tooltip = gettext (entries[i].tooltip);
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);

Modified: trunk/app/widgets/gimpactiongroup.h
==============================================================================
--- trunk/app/widgets/gimpactiongroup.h	(original)
+++ trunk/app/widgets/gimpactiongroup.h	Thu Dec  4 10:32:20 2008
@@ -145,27 +145,27 @@
                                                gpointer               update_data);
 
 void   gimp_action_group_add_actions          (GimpActionGroup             *group,
-					       const gchar                 *label_context,
+					       const gchar                 *msg_context,
                                                const GimpActionEntry       *entries,
                                                guint                        n_entries);
 void   gimp_action_group_add_toggle_actions   (GimpActionGroup             *group,
-					       const gchar                 *label_context,
+					       const gchar                 *msg_context,
                                                const GimpToggleActionEntry *entries,
                                                guint                        n_entries);
 GSList *gimp_action_group_add_radio_actions   (GimpActionGroup             *group,
-					       const gchar                 *label_context,
+					       const gchar                 *msg_context,
                                                const GimpRadioActionEntry  *entries,
                                                guint                        n_entries,
                                                GSList                      *radio_group,
                                                gint                         value,
                                                GCallback                    callback);
 void   gimp_action_group_add_enum_actions     (GimpActionGroup             *group,
-					       const gchar                 *label_context,
+					       const gchar                 *msg_context,
                                                const GimpEnumActionEntry   *entries,
                                                guint                        n_entries,
                                                GCallback                    callback);
 void   gimp_action_group_add_string_actions   (GimpActionGroup             *group,
-					       const gchar                 *label_context,
+					       const gchar                 *msg_context,
                                                const GimpStringActionEntry *entries,
                                                guint                        n_entries,
                                                GCallback                    callback);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]