diff --git a/ChangeLog b/ChangeLog
index 03b8a840fc..5f25170b79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+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.
+
 2008-12-03  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/common/file-tiff-save.c (save_image)
diff --git a/app/actions/actions.c b/app/actions/actions.c
index db568eb91c..63f6116fb8 100644
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@@ -98,7 +98,7 @@ GimpActionFactory *global_action_factory = NULL;
 
 /*  private variables  */
 
-static GimpActionFactoryEntry action_groups[] =
+static const GimpActionFactoryEntry action_groups[] =
 {
   { "brush-editor", N_("Brush Editor"), GIMP_STOCK_BRUSH,
     brush_editor_actions_setup,
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index d89e2a3436..00c8b5566c 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -45,37 +45,37 @@ static const GimpActionEntry brushes_actions[] =
 
   { "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 @@ static const GimpStringActionEntry brushes_edit_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/buffers-actions.c b/app/actions/buffers-actions.c
index 469549ab94..82fb6399ca 100644
--- a/app/actions/buffers-actions.c
+++ b/app/actions/buffers-actions.c
@@ -44,25 +44,25 @@ static const GimpActionEntry buffers_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index f910791ef8..6eeda49b52 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -46,55 +46,58 @@ static const GimpActionEntry channels_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry channels_to_selection_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c
index 73a84e1922..d59d9dfd7b 100644
--- a/app/actions/colormap-actions.c
+++ b/app/actions/colormap-actions.c
@@ -47,7 +47,7 @@ static const GimpActionEntry colormap_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry colormap_add_color_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/config-actions.c b/app/actions/config-actions.c
index 485623a941..21efb3939d 100644
--- a/app/actions/config-actions.c
+++ b/app/actions/config-actions.c
@@ -37,7 +37,7 @@ static const GimpToggleActionEntry config_toggle_actions[] =
 {
   { "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 }
diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c
index c95dbcd6de..6db6c6a5ef 100644
--- a/app/actions/context-actions.c
+++ b/app/actions/context-actions.c
@@ -79,13 +79,14 @@ static const GimpActionEntry context_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/cursor-info-actions.c b/app/actions/cursor-info-actions.c
index c362ef455a..f4e84fc46b 100644
--- a/app/actions/cursor-info-actions.c
+++ b/app/actions/cursor-info-actions.c
@@ -46,7 +46,7 @@ static const GimpToggleActionEntry cursor_info_toggle_actions[] =
 {
   { "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 }
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index c7a8c77350..4b05713c16 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -37,163 +37,163 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
 {
   { "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 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
index 214e51fa88..55ce7a8f30 100644
--- a/app/actions/dock-actions.c
+++ b/app/actions/dock-actions.c
@@ -50,7 +50,7 @@ static const GimpActionEntry dock_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c
index 00e1b0773b..aed21b782e 100644
--- a/app/actions/dockable-actions.c
+++ b/app/actions/dockable-actions.c
@@ -49,10 +49,13 @@ static const GimpActionEntry dockable_actions[] =
     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 @@ static const GimpToggleActionEntry dockable_toggle_actions[] =
 {
   { "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 },
diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c
index fcd832237a..3da8db0053 100644
--- a/app/actions/documents-actions.c
+++ b/app/actions/documents-actions.c
@@ -44,55 +44,56 @@ static const GimpActionEntry documents_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/drawable-actions.c b/app/actions/drawable-actions.c
index 68e14ff90e..aacef89414 100644
--- a/app/actions/drawable-actions.c
+++ b/app/actions/drawable-actions.c
@@ -44,25 +44,26 @@ static const GimpActionEntry drawable_actions[] =
 {
   { "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 @@ static const GimpToggleActionEntry drawable_toggle_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry drawable_flip_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry drawable_rotate_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index bad326caff..da3f085254 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -71,115 +71,118 @@ static const GimpActionEntry edit_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry edit_fill_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/error-console-actions.c b/app/actions/error-console-actions.c
index 24b8f0ebdd..c52b2326d2 100644
--- a/app/actions/error-console-actions.c
+++ b/app/actions/error-console-actions.c
@@ -42,13 +42,13 @@ static const GimpActionEntry error_console_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry error_console_save_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index 612ceec399..00f23ebc2c 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -70,43 +70,43 @@ static const GimpActionEntry file_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry file_save_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c
index 13d4d879e5..3efe8ccb5e 100644
--- a/app/actions/fonts-actions.c
+++ b/app/actions/fonts-actions.c
@@ -46,7 +46,7 @@ static const GimpActionEntry fonts_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
index 2b601eda83..2b24d39bec 100644
--- a/app/actions/gradient-editor-actions.c
+++ b/app/actions/gradient-editor-actions.c
@@ -265,7 +265,8 @@ static const GimpRadioActionEntry gradient_editor_left_color_type_actions[] =
     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 @@ static const GimpRadioActionEntry gradient_editor_left_color_type_actions[] =
     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 @@ static const GimpRadioActionEntry gradient_editor_right_color_type_actions[] =
     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 @@ static const GimpRadioActionEntry gradient_editor_right_color_type_actions[] =
     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 }
 };
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index 423312ee5d..7d6e8f4422 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -46,37 +46,37 @@ static const GimpActionEntry gradients_actions[] =
 
   { "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 @@ static const GimpStringActionEntry gradients_edit_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/help-actions.c b/app/actions/help-actions.c
index 3c9c5f181a..ce92c48a10 100644
--- a/app/actions/help-actions.c
+++ b/app/actions/help-actions.c
@@ -39,13 +39,13 @@ static const GimpActionEntry help_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index d588793a6f..3ec32cc781 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -65,73 +65,73 @@ static const GimpActionEntry image_actions[] =
 
   { "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 @@ static const GimpRadioActionEntry image_convert_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry image_flip_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry image_rotate_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c
index 988f1c2c72..6a1393b1fd 100644
--- a/app/actions/images-actions.c
+++ b/app/actions/images-actions.c
@@ -46,19 +46,19 @@ static const GimpActionEntry images_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 882a93d002..a5753271d9 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -48,163 +48,175 @@ static const GimpActionEntry layers_actions[] =
     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 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
 {
   { "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 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry layers_mask_apply_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry layers_alpha_to_selection_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry layers_text_to_selection_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry layers_select_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
index 0dd1777992..a13763bd19 100644
--- a/app/actions/palette-editor-actions.c
+++ b/app/actions/palette-editor-actions.c
@@ -46,13 +46,13 @@ static const GimpActionEntry palette_editor_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry palette_editor_new_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index e51dffbd87..8ab765f782 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -46,43 +46,43 @@ static const GimpActionEntry palettes_actions[] =
 
   { "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 @@ static const GimpStringActionEntry palettes_edit_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index e5c009ec60..7637358ccc 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -45,37 +45,37 @@ static const GimpActionEntry patterns_actions[] =
 
   { "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 @@ static const GimpStringActionEntry patterns_edit_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/plug-in-actions.c b/app/actions/plug-in-actions.c
index 21c1db4c8c..290d7af39b 100644
--- a/app/actions/plug-in-actions.c
+++ b/app/actions/plug-in-actions.c
@@ -81,48 +81,48 @@ static void     plug_in_actions_build_path           (GimpActionGroup     *group
 
 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 @@ static const GimpEnumActionEntry plug_in_repeat_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c
index e761c0115a..4b7f8c21be 100644
--- a/app/actions/quick-mask-actions.c
+++ b/app/actions/quick-mask-actions.c
@@ -53,7 +53,7 @@ static const GimpToggleActionEntry quick_mask_toggle_actions[] =
 {
   { "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 }
diff --git a/app/actions/sample-points-actions.c b/app/actions/sample-points-actions.c
index bf6d33edab..f440f6d7da 100644
--- a/app/actions/sample-points-actions.c
+++ b/app/actions/sample-points-actions.c
@@ -45,7 +45,8 @@ static const GimpToggleActionEntry sample_points_toggle_actions[] =
 {
   { "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 }
diff --git a/app/actions/select-actions.c b/app/actions/select-actions.c
index 2dc3dabc3f..b35d34f936 100644
--- a/app/actions/select-actions.c
+++ b/app/actions/select-actions.c
@@ -49,73 +49,74 @@ static const GimpActionEntry select_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c
index cd1dc5f06b..0658df55ad 100644
--- a/app/actions/templates-actions.c
+++ b/app/actions/templates-actions.c
@@ -44,31 +44,31 @@ static const GimpActionEntry templates_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/text-editor-actions.c b/app/actions/text-editor-actions.c
index e591f33e31..5dec0cdd18 100644
--- a/app/actions/text-editor-actions.c
+++ b/app/actions/text-editor-actions.c
@@ -42,13 +42,13 @@ static const GimpActionEntry text_editor_actions[] =
 
   { "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 @@ static const GimpRadioActionEntry text_editor_direction_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
index 4df6b8ee4f..3437089226 100644
--- a/app/actions/text-tool-actions.c
+++ b/app/actions/text-tool-actions.c
@@ -81,19 +81,21 @@ static const GimpActionEntry text_tool_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index 30ee6bbeee..89beb324a2 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -85,7 +85,7 @@ static const GimpActionEntry tool_options_actions[] =
 
   { "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 }
 };
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 0b19359489..dd78715a73 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -55,31 +55,31 @@ static const GimpActionEntry tools_actions[] =
 
   { "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 @@ static const GimpStringActionEntry tools_alternative_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index 0022c7ccd3..317461a162 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -52,31 +52,31 @@ static const GimpActionEntry vectors_actions[] =
 
   { "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 @@ static const GimpActionEntry vectors_actions[] =
 
   { "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 @@ static const GimpEnumActionEntry vectors_to_selection_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry vectors_selection_to_vectors_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index e4618fe59d..475e6cbb03 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -75,55 +75,55 @@ static const GimpActionEntry view_actions[] =
 
   { "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 @@ static const GimpToggleActionEntry view_toggle_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry view_zoom_actions[] =
 
   { "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 @@ static const GimpRadioActionEntry view_zoom_explicit_actions[] =
 {
   { "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 @@ static const GimpEnumActionEntry view_padding_color_actions[] =
 {
   { "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 }
 };
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index 5e2d4f8853..19c79c9499 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -86,7 +86,7 @@ static const GimpActionEntry windows_actions[] =
 
   { "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 }
 };
diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c
index 80810c6041..fd56593200 100644
--- a/app/widgets/gimpactiongroup.c
+++ b/app/widgets/gimpactiongroup.c
@@ -352,7 +352,7 @@ gimp_action_group_update (GimpActionGroup *group,
 
 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 @@ gimp_action_group_add_actions (GimpActionGroup       *group,
     {
       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);
-      else
-	label = gettext (entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
 
-      tooltip = gettext (entries[i].tooltip);
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -405,7 +411,7 @@ gimp_action_group_add_actions (GimpActionGroup       *group,
 
 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 @@ gimp_action_group_add_toggle_actions (GimpActionGroup             *group,
     {
       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);
-      else
-	label = gettext (entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
 
-      tooltip = gettext (entries[i].tooltip);
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -460,7 +472,7 @@ gimp_action_group_add_toggle_actions (GimpActionGroup             *group,
 
 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 @@ gimp_action_group_add_radio_actions (GimpActionGroup            *group,
     {
       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);
-      else
-	label = gettext (entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
 
-      tooltip = gettext (entries[i].tooltip);
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -529,7 +547,7 @@ gimp_action_group_add_radio_actions (GimpActionGroup            *group,
 
 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 @@ gimp_action_group_add_enum_actions (GimpActionGroup           *group,
     {
       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);
-      else
-	label = gettext (entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
 
-      tooltip = gettext (entries[i].tooltip);
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
@@ -585,7 +609,7 @@ gimp_action_group_add_enum_actions (GimpActionGroup           *group,
 
 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 @@ gimp_action_group_add_string_actions (GimpActionGroup             *group,
     {
       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);
-      else
-	label = gettext (entries[i].label);
+      if (msg_context)
+        {
+          label = (gchar *) g_dpgettext2 (NULL, msg_context, entries[i].label);
 
-      tooltip = gettext (entries[i].tooltip);
+          if (entries[i].tooltip)
+            tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
+        }
+      else
+        {
+          label   = gettext (entries[i].label);
+          tooltip = gettext (entries[i].tooltip);
+        }
 
       if (! group->mnemonics)
         label = gimp_strip_uline (label);
diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h
index 1a095db517..9d0f29fb75 100644
--- a/app/widgets/gimpactiongroup.h
+++ b/app/widgets/gimpactiongroup.h
@@ -145,27 +145,27 @@ void   gimp_action_group_update               (GimpActionGroup       *group,
                                                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);
diff --git a/po/ChangeLog b/po/ChangeLog
index 3c5a2346c4..4f9b6206bb 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-04  Sven Neumann  <sven@gimp.org>
+
+	* de.po: updated German translation.
+
 2008-12-03  Sven Neumann  <sven@gimp.org>
 
 	* de.po: updated German translation.
diff --git a/po/de.po b/po/de.po
index e00244a0de..d051266eb9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-12-03 16:18+0100\n"
-"PO-Revision-Date: 2008-12-03 16:19+0100\n"
+"POT-Creation-Date: 2008-12-04 11:28+0100\n"
+"PO-Revision-Date: 2008-12-04 11:28+0100\n"
 "Last-Translator: Sven Neumann <sven@gimp.org>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -463,6 +463,7 @@ msgid "_Open Brush as Image"
 msgstr "Pinsel _als Bild öffnen"
 
 #: ../app/actions/brushes-actions.c:48
+msgctxt "brushes-action"
 msgid "Open brush as image"
 msgstr "Pinsel als Bild öffnen"
 
@@ -472,6 +473,7 @@ msgid "_New Brush"
 msgstr "_Neuer Pinsel"
 
 #: ../app/actions/brushes-actions.c:54
+msgctxt "brushes-action"
 msgid "Create a new brush"
 msgstr "Einen neuen Pinsel erstellen"
 
@@ -481,6 +483,7 @@ msgid "D_uplicate Brush"
 msgstr "Pinsel _duplizieren"
 
 #: ../app/actions/brushes-actions.c:60
+msgctxt "brushes-action"
 msgid "Duplicate this brush"
 msgstr "Diesen Pinsel duplizieren"
 
@@ -490,6 +493,7 @@ msgid "Copy Brush _Location"
 msgstr "Speicher_ort des Pinsels kopieren"
 
 #: ../app/actions/brushes-actions.c:66
+msgctxt "brushes-action"
 msgid "Copy brush file location to clipboard"
 msgstr "Den Speicherort der Pinseldatei in die Zwischenablage kopieren"
 
@@ -499,6 +503,7 @@ msgid "_Delete Brush"
 msgstr "Pinsel _löschen"
 
 #: ../app/actions/brushes-actions.c:72
+msgctxt "brushes-action"
 msgid "Delete this brush"
 msgstr "Diesen Pinsel löschen"
 
@@ -508,6 +513,7 @@ msgid "_Refresh Brushes"
 msgstr "Pinsel n_eu laden"
 
 #: ../app/actions/brushes-actions.c:78
+msgctxt "brushes-action"
 msgid "Refresh brushes"
 msgstr "Pinsel neu laden"
 
@@ -517,8 +523,9 @@ msgid "_Edit Brush..."
 msgstr "Pinsel b_earbeiten …"
 
 #: ../app/actions/brushes-actions.c:87
-msgid "Edit brush"
-msgstr "Pinsel bearbeiten …"
+msgctxt "brushes-action"
+msgid "Edit this brush"
+msgstr "Diesen Pinsel bearbeiten"
 
 #: ../app/actions/buffers-actions.c:42
 msgctxt "buffers-action"
@@ -531,6 +538,7 @@ msgid "_Paste Buffer"
 msgstr "Ablage e_infügen"
 
 #: ../app/actions/buffers-actions.c:47
+msgctxt "buffers-action"
 msgid "Paste the selected buffer"
 msgstr "Ausgewählte Ablage einfügen"
 
@@ -540,6 +548,7 @@ msgid "Paste Buffer _Into"
 msgstr "Ablage ein_fügen in"
 
 #: ../app/actions/buffers-actions.c:53
+msgctxt "buffers-action"
 msgid "Paste the selected buffer into the selection"
 msgstr "Fügt die gewählte Ablage in die Auswahl ein"
 
@@ -549,7 +558,8 @@ msgid "Paste Buffer as _New"
 msgstr "Ablage als _neues Bild"
 
 #: ../app/actions/buffers-actions.c:59
-msgid "Paste the selected buffer as new image"
+msgctxt "buffers-action"
+msgid "Paste the selected buffer as a new image"
 msgstr "Ein neues Bild aus der gewählten Ablage erstellen"
 
 #: ../app/actions/buffers-actions.c:64
@@ -558,6 +568,7 @@ msgid "_Delete Buffer"
 msgstr "Ablage _löschen"
 
 #: ../app/actions/buffers-actions.c:65
+msgctxt "buffers-action"
 msgid "Delete the selected buffer"
 msgstr "Die gewählten Ablage löschen"
 
@@ -572,6 +583,7 @@ msgid "_Edit Channel Attributes..."
 msgstr "Kanalei_genschaften …"
 
 #: ../app/actions/channels-actions.c:49
+msgctxt "channels-action"
 msgid "Edit the channel's name, color and opacity"
 msgstr "Name, Farbe und Deckkraft des Kanals bearbeiten"
 
@@ -581,6 +593,7 @@ msgid "_New Channel..."
 msgstr "_Neuer Kanal …"
 
 #: ../app/actions/channels-actions.c:55
+msgctxt "channels-action"
 msgid "Create a new channel"
 msgstr "Einen neuen Kanal erstellen"
 
@@ -590,6 +603,7 @@ msgid "_New Channel"
 msgstr "_Neuer Kanal"
 
 #: ../app/actions/channels-actions.c:61
+msgctxt "channels-action"
 msgid "Create a new channel with last used values"
 msgstr "Einen neuen Kanal mit den zuletzt verwendeten Werten erstellen"
 
@@ -598,88 +612,98 @@ msgctxt "channels-action"
 msgid "D_uplicate Channel"
 msgstr "Kanal _duplizieren"
 
-#: ../app/actions/channels-actions.c:67
+#: ../app/actions/channels-actions.c:68
+msgctxt "channels-action"
 msgid "Create a duplicate of this channel and add it to the image"
 msgstr "Ein Duplikat dieses Kanals erstellen und es zum Bild hinzufügen"
 
-#: ../app/actions/channels-actions.c:72
+#: ../app/actions/channels-actions.c:73
 msgctxt "channels-action"
 msgid "_Delete Channel"
 msgstr "Kanal _löschen"
 
-#: ../app/actions/channels-actions.c:73
+#: ../app/actions/channels-actions.c:74
+msgctxt "channels-action"
 msgid "Delete this channel"
 msgstr "Diesen Kanal löschen"
 
-#: ../app/actions/channels-actions.c:78
+#: ../app/actions/channels-actions.c:79
 msgctxt "channels-action"
 msgid "_Raise Channel"
 msgstr "Kanal _anheben"
 
-#: ../app/actions/channels-actions.c:79
+#: ../app/actions/channels-actions.c:80
+msgctxt "channels-action"
 msgid "Raise this channel one step in the channel stack"
 msgstr "Diesen Kanal um einen Schritt im Stapel anheben"
 
-#: ../app/actions/channels-actions.c:84
+#: ../app/actions/channels-actions.c:85
 msgctxt "channels-action"
 msgid "Raise Channel to _Top"
 msgstr "Kanal nach ganz _oben"
 
-#: ../app/actions/channels-actions.c:85
+#: ../app/actions/channels-actions.c:87
+msgctxt "channels-action"
 msgid "Raise this channel to the top of the channel stack"
 msgstr "Den Kanal an die Spitze des Stapels setzen"
 
-#: ../app/actions/channels-actions.c:90
+#: ../app/actions/channels-actions.c:92
 msgctxt "channels-action"
 msgid "_Lower Channel"
 msgstr "Kanal a_bsenken"
 
-#: ../app/actions/channels-actions.c:91
+#: ../app/actions/channels-actions.c:93
+msgctxt "channels-action"
 msgid "Lower this channel one step in the channel stack"
 msgstr "Den Kanal um einen Schritt im Stapel absenken"
 
-#: ../app/actions/channels-actions.c:96
+#: ../app/actions/channels-actions.c:98
 msgctxt "channels-action"
 msgid "Lower Channel to _Bottom"
 msgstr "Kanal nach ganz _unten"
 
-#: ../app/actions/channels-actions.c:97
+#: ../app/actions/channels-actions.c:100
+msgctxt "channels-action"
 msgid "Lower this channel to the bottom of the channel stack"
 msgstr "Den Kanal ans Ende des Stapels setzen"
 
-#: ../app/actions/channels-actions.c:105
+#: ../app/actions/channels-actions.c:108
 msgctxt "channels-action"
 msgid "Channel to Sele_ction"
 msgstr "Aus_wahl aus Kanal"
 
-#: ../app/actions/channels-actions.c:106
+#: ../app/actions/channels-actions.c:109
+msgctxt "channels-action"
 msgid "Replace the selection with this channel"
 msgstr "Die Auswahl durch diesen Kanal ersetzen"
 
-#: ../app/actions/channels-actions.c:111
+#: ../app/actions/channels-actions.c:114
 msgctxt "channels-action"
 msgid "_Add to Selection"
 msgstr "Zur Auswahl _hinzufügen"
 
-#: ../app/actions/channels-actions.c:112
+#: ../app/actions/channels-actions.c:115
+msgctxt "channels-action"
 msgid "Add this channel to the current selection"
 msgstr "Diesen Kanal der Auswahl hinzufügen"
 
-#: ../app/actions/channels-actions.c:117
+#: ../app/actions/channels-actions.c:120
 msgctxt "channels-action"
 msgid "_Subtract from Selection"
 msgstr "Von Auswahl ab_ziehen"
 
-#: ../app/actions/channels-actions.c:118
+#: ../app/actions/channels-actions.c:121
+msgctxt "channels-action"
 msgid "Subtract this channel from the current selection"
 msgstr "Diesen Kanal von der Auswahl abziehen"
 
-#: ../app/actions/channels-actions.c:123
+#: ../app/actions/channels-actions.c:126
 msgctxt "channels-action"
 msgid "_Intersect with Selection"
 msgstr "Schnittmenge _bilden"
 
-#: ../app/actions/channels-actions.c:124
+#: ../app/actions/channels-actions.c:127
+msgctxt "channels-action"
 msgid "Intersect this channel with the current selection"
 msgstr "Die Schnittmenge dieses Kanals mit der Auswahl bilden"
 
@@ -741,7 +765,7 @@ msgid "_Edit Color..."
 msgstr "Farbe _bearbeiten …"
 
 #: ../app/actions/colormap-actions.c:50
-#: ../app/actions/palette-editor-actions.c:49
+msgctxt "colormap-action"
 msgid "Edit this color"
 msgstr "Diese Farbe bearbeiten"
 
@@ -751,6 +775,7 @@ msgid "_Add Color from FG"
 msgstr "_Vordergrundfarbe einfügen"
 
 #: ../app/actions/colormap-actions.c:59
+msgctxt "colormap-action"
 msgid "Add current foreground color"
 msgstr "Die aktuelle Vordergrundfarbe einfügen"
 
@@ -760,6 +785,7 @@ msgid "_Add Color from BG"
 msgstr "_Hintergrundfarbe einfügen"
 
 #: ../app/actions/colormap-actions.c:65
+msgctxt "colormap-action"
 msgid "Add current background color"
 msgstr "Die aktuelle Hintergrundfarbe einfügen"
 
@@ -778,6 +804,7 @@ msgid "Use _GEGL"
 msgstr "_GEGL verwenden"
 
 #: ../app/actions/config-actions.c:40
+msgctxt "config-action"
 msgid "If possible, use GEGL for image processing"
 msgstr "Wenn möglich, verwende GEGL für die Bildbearbeitung"
 
@@ -866,17 +893,19 @@ msgctxt "context-action"
 msgid "_Default Colors"
 msgstr "_Standardfarben"
 
-#: ../app/actions/context-actions.c:82
+#: ../app/actions/context-actions.c:83
+msgctxt "context-action"
 msgid "Set foreground color to black, background color to white"
 msgstr ""
 "Die Vordergrundfarbe auf Schwarz und die Hintergrundfarbe auf Weiß setzen"
 
-#: ../app/actions/context-actions.c:87
+#: ../app/actions/context-actions.c:88
 msgctxt "context-action"
 msgid "S_wap Colors"
 msgstr "Farben _vertauschen"
 
-#: ../app/actions/context-actions.c:88
+#: ../app/actions/context-actions.c:89
+msgctxt "context-action"
 msgid "Exchange foreground and background colors"
 msgstr "Die Vorder- und Hintergrundfarbe vertauschen"
 
@@ -891,7 +920,7 @@ msgid "_Sample Merged"
 msgstr "_Vereinigung zeigen"
 
 #: ../app/actions/cursor-info-actions.c:49
-#: ../app/actions/sample-points-actions.c:48
+msgctxt "cursor-info-action"
 msgid "Use the composite color of all visible layers"
 msgstr "Das Ergebnis der Komposition aller sichtbaren Ebenen verwenden"
 
@@ -944,6 +973,7 @@ msgid "Tool _Options"
 msgstr "Werkzeug_einstellungen"
 
 #: ../app/actions/dialogs-actions.c:40
+msgctxt "dialogs-action"
 msgid "Open the tool options dialog"
 msgstr "Den Dialog »Werkzeugeinstellungen« anzeigen"
 
@@ -953,6 +983,7 @@ msgid "_Device Status"
 msgstr "_Gerätestatus"
 
 #: ../app/actions/dialogs-actions.c:46
+msgctxt "dialogs-action"
 msgid "Open the device status dialog"
 msgstr "Den Dialog »Gerätestatus« anzeigen"
 
@@ -962,6 +993,7 @@ msgid "_Layers"
 msgstr "_Ebenen"
 
 #: ../app/actions/dialogs-actions.c:52
+msgctxt "dialogs-action"
 msgid "Open the layers dialog"
 msgstr "Den Dialog »Ebenen« anzeigen"
 
@@ -971,6 +1003,7 @@ msgid "_Channels"
 msgstr "_Kanäle"
 
 #: ../app/actions/dialogs-actions.c:58
+msgctxt "dialogs-action"
 msgid "Open the channels dialog"
 msgstr "Den Dialog »Kanäle« anzeigen"
 
@@ -980,6 +1013,7 @@ msgid "_Paths"
 msgstr "_Pfade"
 
 #: ../app/actions/dialogs-actions.c:64
+msgctxt "dialogs-action"
 msgid "Open the paths dialog"
 msgstr "Den Dialog »Pfade« anzeigen"
 
@@ -989,6 +1023,7 @@ msgid "Color_map"
 msgstr "Farb_tabelle"
 
 #: ../app/actions/dialogs-actions.c:70
+msgctxt "dialogs-action"
 msgid "Open the colormap dialog"
 msgstr "Den Dialog »Farbtabelle« anzeigen"
 
@@ -998,6 +1033,7 @@ msgid "Histogra_m"
 msgstr "_Histogramm"
 
 #: ../app/actions/dialogs-actions.c:76
+msgctxt "dialogs-action"
 msgid "Open the histogram dialog"
 msgstr "Den Dialog »Histogramm« anzeigen"
 
@@ -1007,6 +1043,7 @@ msgid "_Selection Editor"
 msgstr "Auswahl_editor"
 
 #: ../app/actions/dialogs-actions.c:82
+msgctxt "dialogs-action"
 msgid "Open the selection editor"
 msgstr "Den Dialog »Auswahleditor« anzeigen"
 
@@ -1016,6 +1053,7 @@ msgid "Na_vigation"
 msgstr "_Navigation"
 
 #: ../app/actions/dialogs-actions.c:88
+msgctxt "dialogs-action"
 msgid "Open the display navigation dialog"
 msgstr "Den Dialog »Navigation« anzeigen"
 
@@ -1025,6 +1063,7 @@ msgid "Undo _History"
 msgstr "_Journal"
 
 #: ../app/actions/dialogs-actions.c:94
+msgctxt "dialogs-action"
 msgid "Open the undo history dialog"
 msgstr "Das Journal anzeigen"
 
@@ -1034,6 +1073,7 @@ msgid "Pointer"
 msgstr "Zeiger"
 
 #: ../app/actions/dialogs-actions.c:100
+msgctxt "dialogs-action"
 msgid "Open the pointer information dialog"
 msgstr "Den Dialog »Zeigerinformationen« anzeigen"
 
@@ -1043,6 +1083,7 @@ msgid "_Sample Points"
 msgstr "Pr_üfpunkte"
 
 #: ../app/actions/dialogs-actions.c:106
+msgctxt "dialogs-action"
 msgid "Open the sample points dialog"
 msgstr "Den Dialog »Prüfpunkte« anzeigen"
 
@@ -1052,6 +1093,7 @@ msgid "Colo_rs"
 msgstr "_Farben"
 
 #: ../app/actions/dialogs-actions.c:112
+msgctxt "dialogs-action"
 msgid "Open the FG/BG color dialog"
 msgstr "Den Dialog für Vorder- und Hintergrundfarbe anzeigen"
 
@@ -1061,6 +1103,7 @@ msgid "_Brushes"
 msgstr "_Pinsel"
 
 #: ../app/actions/dialogs-actions.c:118
+msgctxt "dialogs-action"
 msgid "Open the brushes dialog"
 msgstr "Den Dialog »Pinsel« anzeigen"
 
@@ -1070,6 +1113,7 @@ msgid "Brush Editor"
 msgstr "Pinseleditor"
 
 #: ../app/actions/dialogs-actions.c:124
+msgctxt "dialogs-action"
 msgid "Open the brush editor"
 msgstr "Den Dialog »Pinseleditor« anzeigen"
 
@@ -1079,6 +1123,7 @@ msgid "P_atterns"
 msgstr "_Muster"
 
 #: ../app/actions/dialogs-actions.c:130
+msgctxt "dialogs-action"
 msgid "Open the patterns dialog"
 msgstr "Den Dialog »Muster« anzeigen"
 
@@ -1088,6 +1133,7 @@ msgid "_Gradients"
 msgstr "Fa_rbverläufe"
 
 #: ../app/actions/dialogs-actions.c:136
+msgctxt "dialogs-action"
 msgid "Open the gradients dialog"
 msgstr "Den Dialog »Farbverläufe« anzeigen"
 
@@ -1097,6 +1143,7 @@ msgid "Gradient Editor"
 msgstr "Farbverlaufseditor"
 
 #: ../app/actions/dialogs-actions.c:142
+msgctxt "dialogs-action"
 msgid "Open the gradient editor"
 msgstr "Den Dialog »Farbverlaufseditor« anzeigen"
 
@@ -1106,6 +1153,7 @@ msgid "Pal_ettes"
 msgstr "_Paletten"
 
 #: ../app/actions/dialogs-actions.c:148
+msgctxt "dialogs-action"
 msgid "Open the palettes dialog"
 msgstr "Den Dialog »Palletten« anzeigen"
 
@@ -1115,6 +1163,7 @@ msgid "Palette Editor"
 msgstr "Paletteneditor"
 
 #: ../app/actions/dialogs-actions.c:154
+msgctxt "dialogs-action"
 msgid "Open the palette editor"
 msgstr "Den Dialog »Palletteneditor« anzeigen"
 
@@ -1124,6 +1173,7 @@ msgid "_Fonts"
 msgstr "_Schriften"
 
 #: ../app/actions/dialogs-actions.c:160
+msgctxt "dialogs-action"
 msgid "Open the fonts dialog"
 msgstr "Den Dialog »Schriften« anzeigen"
 
@@ -1133,6 +1183,7 @@ msgid "B_uffers"
 msgstr "A_blagen"
 
 #: ../app/actions/dialogs-actions.c:166
+msgctxt "dialogs-action"
 msgid "Open the named buffers dialog"
 msgstr "Den Dialog »Ablagen« anzeigen"
 
@@ -1142,6 +1193,7 @@ msgid "_Images"
 msgstr "_Bilder"
 
 #: ../app/actions/dialogs-actions.c:172
+msgctxt "dialogs-action"
 msgid "Open the images dialog"
 msgstr "Den Dialog »Bilder« anzeigen"
 
@@ -1151,6 +1203,7 @@ msgid "Document Histor_y"
 msgstr "_Dokumentenindex"
 
 #: ../app/actions/dialogs-actions.c:178
+msgctxt "dialogs-action"
 msgid "Open the document history dialog"
 msgstr "Den Dialog »Dokumentenindex« anzeigen"
 
@@ -1160,6 +1213,7 @@ msgid "_Templates"
 msgstr "_Vorlagen"
 
 #: ../app/actions/dialogs-actions.c:184
+msgctxt "dialogs-action"
 msgid "Open the image templates dialog"
 msgstr "Den Vorlagendialog anzeigen"
 
@@ -1169,6 +1223,7 @@ msgid "T_ools"
 msgstr "_Werkzeuge"
 
 #: ../app/actions/dialogs-actions.c:190
+msgctxt "dialogs-action"
 msgid "Open the tools dialog"
 msgstr "Den Dialog »Werkzeuge« anzeigen"
 
@@ -1178,6 +1233,7 @@ msgid "Error Co_nsole"
 msgstr "_Fehlerausgabe"
 
 #: ../app/actions/dialogs-actions.c:196
+msgctxt "dialogs-action"
 msgid "Open the error console"
 msgstr "Öffnet ein extra Fenster für die Fehlerausgabe"
 
@@ -1187,6 +1243,7 @@ msgid "_Preferences"
 msgstr "_Einstellungen"
 
 #: ../app/actions/dialogs-actions.c:207
+msgctxt "dialogs-action"
 msgid "Open the preferences dialog"
 msgstr "Den Dialog »Einstellungen« anzeigen"
 
@@ -1196,6 +1253,7 @@ msgid "_Keyboard Shortcuts"
 msgstr "_Tastenkombinationen"
 
 #: ../app/actions/dialogs-actions.c:213
+msgctxt "dialogs-action"
 msgid "Open the keyboard shortcuts editor"
 msgstr "Den Editor für die Tastenkombinationen öffnen"
 
@@ -1205,6 +1263,7 @@ msgid "_Modules"
 msgstr "_Module"
 
 #: ../app/actions/dialogs-actions.c:219
+msgctxt "dialogs-action"
 msgid "Open the module manager dialog"
 msgstr "Die Modulverwaltung öffnen"
 
@@ -1214,6 +1273,7 @@ msgid "_Tip of the Day"
 msgstr "_Tipp des Tages"
 
 #: ../app/actions/dialogs-actions.c:225
+msgctxt "dialogs-action"
 msgid "Show some helpful tips on using GIMP"
 msgstr "Zeigt hilfreiche Tipps zur Benutzung von GIMP"
 
@@ -1222,8 +1282,8 @@ msgctxt "dialogs-action"
 msgid "_About"
 msgstr "_Info"
 
-#: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:473
+#: ../app/actions/dialogs-actions.c:231
+msgctxt "dialogs-action"
 msgid "About GIMP"
 msgstr "Informationen zu GIMP"
 
@@ -1242,7 +1302,8 @@ msgctxt "dock-action"
 msgid "_Open Display..."
 msgstr "_Anzeige öffnen …"
 
-#: ../app/actions/dock-actions.c:53 ../app/actions/view-actions.c:126
+#: ../app/actions/dock-actions.c:53
+msgctxt "dock-action"
 msgid "Connect to another display"
 msgstr "Mit einer anderen Anzeige verbinden"
 
@@ -1261,121 +1322,122 @@ msgctxt "dockable-action"
 msgid "Dialogs Menu"
 msgstr "Dialogmenü"
 
-#: ../app/actions/dockable-actions.c:53
+#: ../app/actions/dockable-actions.c:54
 msgctxt "dockable-action"
 msgid "_Add Tab"
 msgstr "Reiter _hinzufügen"
 
-#: ../app/actions/dockable-actions.c:54
+#: ../app/actions/dockable-actions.c:56
 msgctxt "dockable-action"
 msgid "_Preview Size"
 msgstr "Vorschau_größe"
 
-#: ../app/actions/dockable-actions.c:55
+#: ../app/actions/dockable-actions.c:58
 msgctxt "dockable-action"
 msgid "_Tab Style"
 msgstr "Reiter_stil"
 
-#: ../app/actions/dockable-actions.c:58
+#: ../app/actions/dockable-actions.c:61
 msgctxt "dockable-action"
 msgid "_Close Tab"
 msgstr "Reiter s_chließen"
 
-#: ../app/actions/dockable-actions.c:63
+#: ../app/actions/dockable-actions.c:66
 msgctxt "dockable-action"
 msgid "_Detach Tab"
 msgstr "Reiter _lösen"
 
-#: ../app/actions/dockable-actions.c:82
+#: ../app/actions/dockable-actions.c:85
 msgctxt "preview-size"
 msgid "_Tiny"
 msgstr "_Winzig"
 
-#: ../app/actions/dockable-actions.c:84
+#: ../app/actions/dockable-actions.c:87
 msgctxt "preview-size"
 msgid "E_xtra Small"
 msgstr "_Sehr klein"
 
-#: ../app/actions/dockable-actions.c:86
+#: ../app/actions/dockable-actions.c:89
 msgctxt "preview-size"
 msgid "_Small"
 msgstr "_Klein"
 
-#: ../app/actions/dockable-actions.c:88
+#: ../app/actions/dockable-actions.c:91
 msgctxt "preview-size"
 msgid "_Medium"
 msgstr "_Mittel"
 
-#: ../app/actions/dockable-actions.c:90
+#: ../app/actions/dockable-actions.c:93
 msgctxt "preview-size"
 msgid "_Large"
 msgstr "_Groß"
 
-#: ../app/actions/dockable-actions.c:92
+#: ../app/actions/dockable-actions.c:95
 msgctxt "preview-size"
 msgid "Ex_tra Large"
 msgstr "S_ehr groß"
 
-#: ../app/actions/dockable-actions.c:94
+#: ../app/actions/dockable-actions.c:97
 msgctxt "preview-size"
 msgid "_Huge"
 msgstr "_Riesig"
 
-#: ../app/actions/dockable-actions.c:96
+#: ../app/actions/dockable-actions.c:99
 msgctxt "preview-size"
 msgid "_Enormous"
 msgstr "_Enorm"
 
-#: ../app/actions/dockable-actions.c:98
+#: ../app/actions/dockable-actions.c:101
 msgctxt "preview-size"
 msgid "_Gigantic"
 msgstr "_Gigantisch"
 
-#: ../app/actions/dockable-actions.c:104
+#: ../app/actions/dockable-actions.c:107
 msgctxt "tab-style"
 msgid "_Icon"
 msgstr "_Symbol"
 
-#: ../app/actions/dockable-actions.c:106
+#: ../app/actions/dockable-actions.c:109
 msgctxt "tab-style"
 msgid "Current _Status"
 msgstr "Aktueller _Status"
 
-#: ../app/actions/dockable-actions.c:108
+#: ../app/actions/dockable-actions.c:111
 msgctxt "tab-style"
 msgid "_Text"
 msgstr "_Text"
 
-#: ../app/actions/dockable-actions.c:110
+#: ../app/actions/dockable-actions.c:113
 msgctxt "tab-style"
 msgid "I_con & Text"
 msgstr "Symbol _und Text"
 
-#: ../app/actions/dockable-actions.c:112
+#: ../app/actions/dockable-actions.c:115
 msgctxt "tab-style"
 msgid "St_atus & Text"
 msgstr "St_atus und Text"
 
-#: ../app/actions/dockable-actions.c:122
+#: ../app/actions/dockable-actions.c:125
 msgctxt "dockable-action"
 msgid "Loc_k Tab to Dock"
 msgstr "Reiter _sperren"
 
-#: ../app/actions/dockable-actions.c:123
+#: ../app/actions/dockable-actions.c:127
+msgctxt "dockable-action"
 msgid "Protect this tab from being dragged with the mouse pointer"
 msgstr "Diese Reiter davor bewahren, mit der Maus bewegt zu werden"
 
-#: ../app/actions/dockable-actions.c:129
+#: ../app/actions/dockable-actions.c:133
 msgctxt "dockable-action"
 msgid "Show _Button Bar"
 msgstr "_Schaltflächen zeigen"
 
-#: ../app/actions/dockable-actions.c:138
+#: ../app/actions/dockable-actions.c:142
 msgctxt "dockable-action"
 msgid "View as _List"
 msgstr "Als _Liste anzeigen"
 
-#: ../app/actions/dockable-actions.c:143
+#: ../app/actions/dockable-actions.c:147
 msgctxt "dockable-action"
 msgid "View as _Grid"
 msgstr "Als _Raster anzeigen"
@@ -1391,6 +1453,7 @@ msgid "_Open Image"
 msgstr "Bild ö_ffnen"
 
 #: ../app/actions/documents-actions.c:47
+msgctxt "documents-action"
 msgid "Open the selected entry"
 msgstr "Gewählten Eintrag öffnen"
 
@@ -1400,6 +1463,7 @@ msgid "_Raise or Open Image"
 msgstr "Bild öffnen oder _anheben"
 
 #: ../app/actions/documents-actions.c:53
+msgctxt "documents-action"
 msgid "Raise window if already open"
 msgstr "Fenster in den Vordergrund bringen, falls es schon geöffnet ist"
 
@@ -1409,6 +1473,7 @@ msgid "File Open _Dialog"
 msgstr "Datei-Öffnen-_Dialog"
 
 #: ../app/actions/documents-actions.c:59
+msgctxt "documents-action"
 msgid "Open image dialog"
 msgstr "Dialog um ein Bild zu öffnen"
 
@@ -1418,6 +1483,7 @@ msgid "Copy Image _Location"
 msgstr "Speicher_ort des Bild kopieren"
 
 #: ../app/actions/documents-actions.c:65
+msgctxt "documents-action"
 msgid "Copy image location to clipboard"
 msgstr "Den Speicherort des Bildes in die Zwischenablage kopieren"
 
@@ -1427,6 +1493,7 @@ msgid "Remove _Entry"
 msgstr "Eintrag _entfernen"
 
 #: ../app/actions/documents-actions.c:71
+msgctxt "documents-action"
 msgid "Remove the selected entry"
 msgstr "Den gewählten Eintrag entfernen"
 
@@ -1436,8 +1503,9 @@ msgid "_Clear History"
 msgstr "Journal sä_ubern"
 
 #: ../app/actions/documents-actions.c:77
+msgctxt "documents-action"
 msgid "Clear the entire document history"
-msgstr "Das gesamte Journal dieses Dokuments säubern"
+msgstr "Die Liste der verwendeten Dokumente säubern"
 
 #: ../app/actions/documents-actions.c:82
 msgctxt "documents-action"
@@ -1445,26 +1513,29 @@ msgid "Recreate _Preview"
 msgstr "_Vorschau neu erzeugen"
 
 #: ../app/actions/documents-actions.c:83
+msgctxt "documents-action"
 msgid "Recreate preview"
 msgstr "Vorschau neu erzeugen"
 
 #: ../app/actions/documents-actions.c:88
 msgctxt "documents-action"
 msgid "Reload _all Previews"
-msgstr "A_lle Vorschaufenster neu laden"
+msgstr "A_lle Vorschauen neu laden"
 
 #: ../app/actions/documents-actions.c:89
+msgctxt "documents-action"
 msgid "Reload all previews"
-msgstr "Alle Vorschaufenster neu laden"
+msgstr "Alle Vorschaubilder neu laden"
 
 #: ../app/actions/documents-actions.c:94
 msgctxt "documents-action"
 msgid "Remove Dangling E_ntries"
 msgstr "_Hängende Einträge entfernen"
 
-#: ../app/actions/documents-actions.c:95
-msgid "Remove dangling entries"
-msgstr "Hängende Einträge entfernen"
+#: ../app/actions/documents-actions.c:96
+msgctxt "documents-action"
+msgid "Remove entries for which the corresponding file is not available"
+msgstr "Einträge entfernen, für die die dazugehörige Datei nicht existiert"
 
 #: ../app/actions/documents-commands.c:192
 msgid "Clear Document History"
@@ -1488,6 +1559,7 @@ msgid "_Equalize"
 msgstr "_Abgleichen"
 
 #: ../app/actions/drawable-actions.c:47
+msgctxt "drawable-action"
 msgid "Automatic contrast enhancement"
 msgstr "Automatische Kontrastverbesserung"
 
@@ -1497,6 +1569,7 @@ msgid "In_vert"
 msgstr "_Invertieren"
 
 #: ../app/actions/drawable-actions.c:53
+msgctxt "drawable-action"
 msgid "Invert the colors"
 msgstr "Kehrt den Farbwert jedes Pixels um"
 
@@ -1506,6 +1579,7 @@ msgid "_White Balance"
 msgstr "_Weißabgleich"
 
 #: ../app/actions/drawable-actions.c:59
+msgctxt "drawable-action"
 msgid "Automatic white balance correction"
 msgstr "Automatischer Weißabgleich"
 
@@ -1514,70 +1588,78 @@ msgctxt "drawable-action"
 msgid "_Offset..."
 msgstr "_Versatz …"
 
-#: ../app/actions/drawable-actions.c:65
+#: ../app/actions/drawable-actions.c:66
+msgctxt "drawable-action"
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "Pixel verschieben, und sie optional an den Rändern umbrechen"
 
-#: ../app/actions/drawable-actions.c:73
+#: ../app/actions/drawable-actions.c:74
 msgctxt "drawable-action"
 msgid "_Linked"
 msgstr "_Verknüpft"
 
-#: ../app/actions/drawable-actions.c:74
+#: ../app/actions/drawable-actions.c:75
+msgctxt "drawable-action"
 msgid "Toggle the linked state"
 msgstr "Verknüpfungsstatus ändern"
 
-#: ../app/actions/drawable-actions.c:80
+#: ../app/actions/drawable-actions.c:81
 msgctxt "drawable-action"
 msgid "_Visible"
 msgstr "_Sichtbar"
 
-#: ../app/actions/drawable-actions.c:81
+#: ../app/actions/drawable-actions.c:82
+msgctxt "drawable-action"
 msgid "Toggle visibility"
 msgstr "Sichtbarkeit einstellen"
 
-#: ../app/actions/drawable-actions.c:90
+#: ../app/actions/drawable-actions.c:91
 msgctxt "drawable-action"
 msgid "Flip _Horizontally"
 msgstr "_Horizontal spiegeln"
 
-#: ../app/actions/drawable-actions.c:91
+#: ../app/actions/drawable-actions.c:92
+msgctxt "drawable-action"
 msgid "Flip horizontally"
 msgstr "Horizontal spiegeln"
 
-#: ../app/actions/drawable-actions.c:96
+#: ../app/actions/drawable-actions.c:97
 msgctxt "drawable-action"
 msgid "Flip _Vertically"
 msgstr "_Vertikal spiegeln"
 
-#: ../app/actions/drawable-actions.c:97
+#: ../app/actions/drawable-actions.c:98
+msgctxt "drawable-action"
 msgid "Flip vertically"
 msgstr "Vertikal spiegeln"
 
-#: ../app/actions/drawable-actions.c:105
+#: ../app/actions/drawable-actions.c:106
 msgctxt "drawable-action"
 msgid "Rotate 90° _clockwise"
 msgstr "Um 90° im _Uhrzeigersinn drehen"
 
-#: ../app/actions/drawable-actions.c:106
+#: ../app/actions/drawable-actions.c:107
+msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the right"
 msgstr "Um 90° nach rechts drehen"
 
-#: ../app/actions/drawable-actions.c:111
+#: ../app/actions/drawable-actions.c:112
 msgctxt "drawable-action"
 msgid "Rotate _180°"
 msgstr "Um _180° drehen"
 
-#: ../app/actions/drawable-actions.c:112
+#: ../app/actions/drawable-actions.c:113
+msgctxt "drawable-action"
 msgid "Turn upside-down"
 msgstr "Auf den Kopf stellen"
 
-#: ../app/actions/drawable-actions.c:117
+#: ../app/actions/drawable-actions.c:118
 msgctxt "drawable-action"
 msgid "Rotate 90° counter-clock_wise"
 msgstr "Um 90° _gegen den Uhrzeigersinn drehen"
 
-#: ../app/actions/drawable-actions.c:118
+#: ../app/actions/drawable-actions.c:119
+msgctxt "drawable-action"
 msgid "Rotate 90 degrees to the left"
 msgstr "Um 90° nach links drehen"
 
@@ -1619,6 +1701,7 @@ msgid "_Undo"
 msgstr "_Rückgängig"
 
 #: ../app/actions/edit-actions.c:74
+msgctxt "edit-action"
 msgid "Undo the last operation"
 msgstr "Die letzte Operation rückgängig machen"
 
@@ -1628,6 +1711,7 @@ msgid "_Redo"
 msgstr "_Wiederherstellen"
 
 #: ../app/actions/edit-actions.c:80
+msgctxt "edit-action"
 msgid "Redo the last operation that was undone"
 msgstr "Die zuletzt zurück genommene Operation wiederherstellen"
 
@@ -1637,6 +1721,7 @@ msgid "Strong Undo"
 msgstr "Starkes Rückgängig"
 
 #: ../app/actions/edit-actions.c:86
+msgctxt "edit-action"
 msgid "Undo the last operation, skipping visibility changes"
 msgstr ""
 "Die letzte Aktion zurücknehmen und dabei Änderungen an Sichtbarkeit übergehen"
@@ -1646,197 +1731,215 @@ msgctxt "edit-action"
 msgid "Strong Redo"
 msgstr "Starkes Wiederherstellen"
 
-#: ../app/actions/edit-actions.c:92
+#: ../app/actions/edit-actions.c:93
+msgctxt "edit-action"
 msgid "Redo the last operation that was undone, skipping visibility changes"
 msgstr ""
 "Die zuletzt zurück genommene Operation wiederherstellen und dabei Änderungen "
 "an Sichtbarkeit übergehen"
 
-#: ../app/actions/edit-actions.c:97
+#: ../app/actions/edit-actions.c:98
 msgctxt "edit-action"
 msgid "_Clear Undo History"
 msgstr "Journal _leeren"
 
-#: ../app/actions/edit-actions.c:98
+#: ../app/actions/edit-actions.c:99
+msgctxt "edit-action"
 msgid "Remove all operations from the undo history"
 msgstr "Alle Einträge aus dem Journal entfernen"
 
-#: ../app/actions/edit-actions.c:103
+#: ../app/actions/edit-actions.c:104
 msgctxt "edit-action"
 msgid "_Fade..."
 msgstr "_Verblassen …"
 
-#: ../app/actions/edit-actions.c:104
+#: ../app/actions/edit-actions.c:106
+msgctxt "edit-action"
 msgid "Modify paint mode and opacity of the last pixel manipulation"
 msgstr ""
 "Den Zeichenmodus und die Deckkraft der letzten Pixel-Modifikation bearbeiten"
 
-#: ../app/actions/edit-actions.c:109
+#: ../app/actions/edit-actions.c:111
 msgctxt "edit-action"
 msgid "Cu_t"
 msgstr "_Ausschneiden"
 
-#: ../app/actions/edit-actions.c:110
+#: ../app/actions/edit-actions.c:112
+msgctxt "edit-action"
 msgid "Move the selected pixels to the clipboard"
 msgstr "Ausgewählte Pixel in die Zwischenablage verschieben"
 
-#: ../app/actions/edit-actions.c:115
+#: ../app/actions/edit-actions.c:117
 msgctxt "edit-action"
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: ../app/actions/edit-actions.c:116
+#: ../app/actions/edit-actions.c:118
+msgctxt "edit-action"
 msgid "Copy the selected pixels to the clipboard"
 msgstr "Ausgewählte Pixel in die Zwischenablage kopieren"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:121
+#: ../app/actions/edit-actions.c:123
 msgctxt "edit-action"
 msgid "Copy _Visible"
 msgstr "_Sichtbares kopieren"
 
-#: ../app/actions/edit-actions.c:122
+#: ../app/actions/edit-actions.c:124
+msgctxt "edit-action"
 msgid "Copy what is visible in the selected region"
 msgstr "Kopiert das was sichtbar und ausgewählt ist in die Zwischenablage"
 
-#: ../app/actions/edit-actions.c:127
+#: ../app/actions/edit-actions.c:129
 msgctxt "edit-action"
 msgid "_Paste"
 msgstr "E_infügen"
 
-#: ../app/actions/edit-actions.c:128
+#: ../app/actions/edit-actions.c:130
+msgctxt "edit-action"
 msgid "Paste the content of the clipboard"
 msgstr "Aus der Zwischenablage einfügen"
 
-#: ../app/actions/edit-actions.c:133
+#: ../app/actions/edit-actions.c:135
 msgctxt "edit-action"
 msgid "Paste _Into"
 msgstr "In Aus_wahl einfügen"
 
-#: ../app/actions/edit-actions.c:134
+#: ../app/actions/edit-actions.c:137
+msgctxt "edit-action"
 msgid "Paste the content of the clipboard into the current selection"
 msgstr "Den Inhalt der Zwischenablage in die Auswahl einfügen"
 
-#: ../app/actions/edit-actions.c:139
+#: ../app/actions/edit-actions.c:142
 msgctxt "edit-action"
 msgid "From _Clipboard"
 msgstr "Aus _Zwischenablage"
 
-#: ../app/actions/edit-actions.c:140 ../app/actions/edit-actions.c:146
+#: ../app/actions/edit-actions.c:143 ../app/actions/edit-actions.c:149
+msgctxt "edit-action"
 msgid "Create a new image from the content of the clipboard"
 msgstr "Ein neues Bild aus dem Inhalt der Zwischenablage erzeugen"
 
-#: ../app/actions/edit-actions.c:145
+#: ../app/actions/edit-actions.c:148
 msgctxt "edit-action"
 msgid "_New Image"
 msgstr "Neues _Bild"
 
-#: ../app/actions/edit-actions.c:151
+#: ../app/actions/edit-actions.c:154
 msgctxt "edit-action"
 msgid "New _Layer"
 msgstr "Neue _Ebene"
 
-#: ../app/actions/edit-actions.c:152
+#: ../app/actions/edit-actions.c:155
+msgctxt "edit-action"
 msgid "Create a new layer from the content of the clipboard"
 msgstr "Ein neue Ebene aus dem Inhalt der Zwischenablage erzeugen"
 
-#: ../app/actions/edit-actions.c:157
+#: ../app/actions/edit-actions.c:160
 msgctxt "edit-action"
 msgid "Cu_t Named..."
 msgstr "In Ablage _verschieben …"
 
-#: ../app/actions/edit-actions.c:158
+#: ../app/actions/edit-actions.c:161
+msgctxt "edit-action"
 msgid "Move the selected pixels to a named buffer"
 msgstr "Ausgewählte Pixel in eine benannte Ablage verschieben"
 
-#: ../app/actions/edit-actions.c:163
+#: ../app/actions/edit-actions.c:166
 msgctxt "edit-action"
 msgid "_Copy Named..."
 msgstr "In Ablage _kopieren …"
 
-#: ../app/actions/edit-actions.c:164
+#: ../app/actions/edit-actions.c:167
+msgctxt "edit-action"
 msgid "Copy the selected pixels to a named buffer"
 msgstr "Ausgewählte Pixel in eine benannte Ablage kopieren"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:169
+#: ../app/actions/edit-actions.c:172
 msgctxt "edit-action"
 msgid "Copy _Visible Named..."
 msgstr "_Sichtbares in Ablage kopieren …"
 
-#: ../app/actions/edit-actions.c:170
+#: ../app/actions/edit-actions.c:173
+msgctxt "edit-action"
 msgid "Copy the selected region to a named buffer"
 msgstr "Ausgewählten Bereich in eine benannte Ablage kopieren"
 
-#: ../app/actions/edit-actions.c:175
+#: ../app/actions/edit-actions.c:178
 msgctxt "edit-action"
 msgid "_Paste Named..."
 msgstr "Aus Ablage _einfügen …"
 
-#: ../app/actions/edit-actions.c:176
+#: ../app/actions/edit-actions.c:179
+msgctxt "edit-action"
 msgid "Paste the content of a named buffer"
 msgstr "Den Inhalt einer benannten Ablage einfügen"
 
-#: ../app/actions/edit-actions.c:181
+#: ../app/actions/edit-actions.c:184
 msgctxt "edit-action"
 msgid "Cl_ear"
 msgstr "_Löschen"
 
-#: ../app/actions/edit-actions.c:182
+#: ../app/actions/edit-actions.c:185
+msgctxt "edit-action"
 msgid "Clear the selected pixels"
 msgstr "Ausgewählte Pixel entfernen"
 
-#: ../app/actions/edit-actions.c:190
+#: ../app/actions/edit-actions.c:193
 msgctxt "edit-action"
 msgid "Fill with _FG Color"
 msgstr "Mit _Vordergrundfarbe füllen"
 
-#: ../app/actions/edit-actions.c:191
+#: ../app/actions/edit-actions.c:194
+msgctxt "edit-action"
 msgid "Fill the selection using the foreground color"
 msgstr "Die Auswahl mit der Vordergrundfarbe füllen"
 
-#: ../app/actions/edit-actions.c:196
+#: ../app/actions/edit-actions.c:199
 msgctxt "edit-action"
 msgid "Fill with B_G Color"
 msgstr "Mit _Hintergrundfarbe füllen"
 
-#: ../app/actions/edit-actions.c:197
+#: ../app/actions/edit-actions.c:200
+msgctxt "edit-action"
 msgid "Fill the selection using the background color"
 msgstr "Die Auswahl mit der Hintergrundfarbe füllen"
 
-#: ../app/actions/edit-actions.c:202
+#: ../app/actions/edit-actions.c:205
 msgctxt "edit-action"
 msgid "Fill with P_attern"
 msgstr "Mit _Muster füllen"
 
-#: ../app/actions/edit-actions.c:203
+#: ../app/actions/edit-actions.c:206
+msgctxt "edit-action"
 msgid "Fill the selection using the active pattern"
 msgstr "Die Auswahl mit dem aktuellen Muster füllen"
 
-#: ../app/actions/edit-actions.c:280
+#: ../app/actions/edit-actions.c:283
 #, c-format
 msgid "_Undo %s"
 msgstr "_Rückgängig: %s"
 
-#: ../app/actions/edit-actions.c:287
+#: ../app/actions/edit-actions.c:290
 #, c-format
 msgid "_Redo %s"
 msgstr "_Wiederholen: %s"
 
-#: ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:305
 #, c-format
 msgid "_Fade %s..."
 msgstr "%s verblassen …"
 
-#: ../app/actions/edit-actions.c:314
+#: ../app/actions/edit-actions.c:317
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: ../app/actions/edit-actions.c:315
+#: ../app/actions/edit-actions.c:318
 msgid "_Redo"
 msgstr "_Wiederherstellen"
 
-#: ../app/actions/edit-actions.c:316
+#: ../app/actions/edit-actions.c:319
 msgid "_Fade..."
 msgstr "_Verblassen …"
 
@@ -1919,6 +2022,7 @@ msgid "_Clear"
 msgstr "_Leeren"
 
 #: ../app/actions/error-console-actions.c:45
+msgctxt "error-console-action"
 msgid "Clear error console"
 msgstr "Fehlerkonsole leeren"
 
@@ -1928,7 +2032,8 @@ msgid "Select _All"
 msgstr "_Alles auswählen"
 
 #: ../app/actions/error-console-actions.c:51
-msgid "Select all errors"
+msgctxt "error-console-action"
+msgid "Select all error messages"
 msgstr "Alle Fehlermeldungen auswählen"
 
 #: ../app/actions/error-console-actions.c:59
@@ -1937,8 +2042,9 @@ msgid "_Save Error Log to File..."
 msgstr "Fehlerprotokoll in Datei _speichern …"
 
 #: ../app/actions/error-console-actions.c:60
-msgid "Save error log"
-msgstr "Fehlerprotokoll speichern"
+msgctxt "error-console-action"
+msgid "Write all error mesaages to a file"
+msgstr "Alle Fehlermeldungen in eine Datei schreiben"
 
 #: ../app/actions/error-console-actions.c:65
 msgctxt "error-console-action"
@@ -1946,8 +2052,9 @@ msgid "Save S_election to File..."
 msgstr "Aus_wahl in Datei speichern …"
 
 #: ../app/actions/error-console-actions.c:66
-msgid "Save selection"
-msgstr "Auswahl speichern"
+msgctxt "error-console-action"
+msgid "Write the selected error messages to a file"
+msgstr "Die ausgewählten Fehlermeldungen in eine Datei schreiben"
 
 #: ../app/actions/error-console-commands.c:85
 msgid "Cannot save. Nothing is selected."
@@ -1987,6 +2094,7 @@ msgid "_Open..."
 msgstr "Ö_ffnen …"
 
 #: ../app/actions/file-actions.c:73
+msgctxt "file-action"
 msgid "Open an image file"
 msgstr "Eine Bilddatei öffnen"
 
@@ -1996,6 +2104,7 @@ msgid "Op_en as Layers..."
 msgstr "Als _Ebenen öffnen …"
 
 #: ../app/actions/file-actions.c:79
+msgctxt "file-action"
 msgid "Open an image file as layers"
 msgstr "Bilddatei als Ebenen öffnen"
 
@@ -2005,6 +2114,7 @@ msgid "Open _Location..."
 msgstr "Adresse öffnen …"
 
 #: ../app/actions/file-actions.c:85
+msgctxt "file-action"
 msgid "Open an image file from a specified location"
 msgstr "Bilddatei von einer angegebenen Adresse öffnen"
 
@@ -2014,6 +2124,7 @@ msgid "Save as _Template..."
 msgstr "Als _Vorlage speichern …"
 
 #: ../app/actions/file-actions.c:91
+msgctxt "file-action"
 msgid "Create a new template from this image"
 msgstr "Aus diesem Bild eine neue Vorlage erzeugen"
 
@@ -2023,6 +2134,7 @@ msgid "Re_vert"
 msgstr "_Wiederherstellen"
 
 #: ../app/actions/file-actions.c:97
+msgctxt "file-action"
 msgid "Reload the image file from disk"
 msgstr "Den zuletzt gespeicherten Stand wiederherstellen"
 
@@ -2032,6 +2144,7 @@ msgid "Close all"
 msgstr "Alle schließen"
 
 #: ../app/actions/file-actions.c:103
+msgctxt "file-action"
 msgid "Close all opened images"
 msgstr "Alle geöffneten Bilder schließen"
 
@@ -2041,6 +2154,7 @@ msgid "_Quit"
 msgstr "_Beenden"
 
 #: ../app/actions/file-actions.c:109
+msgctxt "file-action"
 msgid "Quit the GNU Image Manipulation Program"
 msgstr "Das GNU Image Manipulation Program beenden"
 
@@ -2050,6 +2164,7 @@ msgid "_Save"
 msgstr "_Speichern"
 
 #: ../app/actions/file-actions.c:118
+msgctxt "file-action"
 msgid "Save this image"
 msgstr "Dieses Bild speichern"
 
@@ -2059,6 +2174,7 @@ msgid "Save _As..."
 msgstr "Speichern _unter …"
 
 #: ../app/actions/file-actions.c:124
+msgctxt "file-action"
 msgid "Save this image with a different name"
 msgstr "Dieses Bild unter einem anderen Namen speichern"
 
@@ -2067,18 +2183,20 @@ msgctxt "file-action"
 msgid "Save a Cop_y..."
 msgstr "_Kopie speichern …"
 
-#: ../app/actions/file-actions.c:130
+#: ../app/actions/file-actions.c:131
+msgctxt "file-action"
 msgid "Save this image with a different name, but keep its current name"
 msgstr ""
 "Dieses Bild unter einem anderen Namen speichern, aber den Namen des "
 "geöffneten Bildes behalten"
 
-#: ../app/actions/file-actions.c:135
+#: ../app/actions/file-actions.c:136
 msgctxt "file-action"
 msgid "Save and Close..."
 msgstr "Speichern und schließen …"
 
-#: ../app/actions/file-actions.c:136
+#: ../app/actions/file-actions.c:137
+msgctxt "file-action"
 msgid "Save this image and close its window"
 msgstr "Dieses Bild speichern und das Bildfenster schließen"
 
@@ -2176,8 +2294,9 @@ msgid "_Rescan Font List"
 msgstr "Schriften _neu einlesen"
 
 #: ../app/actions/fonts-actions.c:49
-msgid "Rescan font list"
-msgstr "Schriftenliste neu einlesen"
+msgctxt "fonts-action"
+msgid "Rescan the installed fonts"
+msgstr "Die installieren Schriften neu durchsuchen"
 
 #: ../app/actions/gradient-editor-actions.c:46
 msgctxt "gradient-editor-action"
@@ -2272,183 +2391,181 @@ msgid "_Left Endpoint"
 msgstr "Linker Endpunkt"
 
 #: ../app/actions/gradient-editor-actions.c:258
-#: ../app/actions/gradient-editor-actions.c:286
+#: ../app/actions/gradient-editor-actions.c:288
 msgctxt "gradient-editor-color-type"
 msgid "_Fixed"
 msgstr "_Fest"
 
 #: ../app/actions/gradient-editor-actions.c:263
-#: ../app/actions/gradient-editor-actions.c:291
+#: ../app/actions/gradient-editor-actions.c:293
 msgctxt "gradient-editor-color-type"
 msgid "F_oreground Color"
 msgstr "_Vordergrundfarbe"
 
-#: ../app/actions/gradient-editor-actions.c:268
-#: ../app/actions/gradient-editor-actions.c:296
+#: ../app/actions/gradient-editor-actions.c:269
+#: ../app/actions/gradient-editor-actions.c:299
 msgctxt "gradient-editor-color-type"
 msgid "Fo_reground Color (Transparent)"
 msgstr "V_ordergrundfarbe (transparent)"
 
-#: ../app/actions/gradient-editor-actions.c:273
-#: ../app/actions/gradient-editor-actions.c:301
+#: ../app/actions/gradient-editor-actions.c:274
+#: ../app/actions/gradient-editor-actions.c:304
 msgctxt "gradient-editor-color-type"
 msgid "_Background Color"
 msgstr "_Hintergrundfarbe"
 
-#: ../app/actions/gradient-editor-actions.c:278
-#: ../app/actions/gradient-editor-actions.c:306
+#: ../app/actions/gradient-editor-actions.c:280
+#: ../app/actions/gradient-editor-actions.c:310
 msgctxt "gradient-editor-color-type"
 msgid "B_ackground Color (Transparent)"
 msgstr "H_intergrundfarbe (transparent)"
 
-#: ../app/actions/gradient-editor-actions.c:314
+#: ../app/actions/gradient-editor-actions.c:318
 msgctxt "gradient-editor-blending"
 msgid "_Linear"
 msgstr "_Linear"
 
-#: ../app/actions/gradient-editor-actions.c:319
+#: ../app/actions/gradient-editor-actions.c:323
 msgctxt "gradient-editor-blending"
 msgid "_Curved"
 msgstr "_Kurven"
 
-#: ../app/actions/gradient-editor-actions.c:324
+#: ../app/actions/gradient-editor-actions.c:328
 msgctxt "gradient-editor-blending"
 msgid "_Sinusoidal"
 msgstr "_Sinusförmig"
 
-#: ../app/actions/gradient-editor-actions.c:329
+#: ../app/actions/gradient-editor-actions.c:333
 msgctxt "gradient-editor-blending"
 msgid "Spherical (i_ncreasing)"
 msgstr "Sphärisch (_zunehmend)"
 
-#: ../app/actions/gradient-editor-actions.c:334
+#: ../app/actions/gradient-editor-actions.c:338
 msgctxt "gradient-editor-blending"
 msgid "Spherical (_decreasing)"
 msgstr "Sphärisch (_abnehmend)"
 
-#: ../app/actions/gradient-editor-actions.c:339
+#: ../app/actions/gradient-editor-actions.c:343
 msgctxt "gradient-editor-blending"
 msgid "(Varies)"
 msgstr "(Variiert)"
 
-#: ../app/actions/gradient-editor-actions.c:347
+#: ../app/actions/gradient-editor-actions.c:351
 msgctxt "gradient-editor-coloring"
 msgid "_RGB"
 msgstr "_RGB"
 
-#: ../app/actions/gradient-editor-actions.c:352
+#: ../app/actions/gradient-editor-actions.c:356
 msgctxt "gradient-editor-coloring"
 msgid "HSV (_counter-clockwise hue)"
 msgstr "HSV (Farbton _gegen Uhrzeigersinn)"
 
-#: ../app/actions/gradient-editor-actions.c:357
+#: ../app/actions/gradient-editor-actions.c:361
 msgctxt "gradient-editor-coloring"
 msgid "HSV (clockwise _hue)"
 msgstr "HSV (Farbton _im Uhrzeigersinn)"
 
-#: ../app/actions/gradient-editor-actions.c:362
+#: ../app/actions/gradient-editor-actions.c:366
 msgctxt "gradient-editor-coloring"
 msgid "(Varies)"
 msgstr "(Variiert)"
 
-#: ../app/actions/gradient-editor-actions.c:370
+#: ../app/actions/gradient-editor-actions.c:374
 msgid "Zoom In"
 msgstr "Vergrößern"
 
-#: ../app/actions/gradient-editor-actions.c:371
-#: ../app/actions/palette-editor-actions.c:88
-#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283
+#: ../app/actions/gradient-editor-actions.c:375
+#: ../app/actions/palette-editor-actions.c:90
 msgid "Zoom in"
 msgstr "Vergrößern"
 
-#: ../app/actions/gradient-editor-actions.c:376
+#: ../app/actions/gradient-editor-actions.c:380
 msgid "Zoom Out"
 msgstr "Verkleinern"
 
-#: ../app/actions/gradient-editor-actions.c:377
-#: ../app/actions/palette-editor-actions.c:94
-#: ../app/actions/view-actions.c:265 ../app/actions/view-actions.c:277
+#: ../app/actions/gradient-editor-actions.c:381
+#: ../app/actions/palette-editor-actions.c:96
 msgid "Zoom out"
 msgstr "Verkleinern"
 
-#: ../app/actions/gradient-editor-actions.c:382
+#: ../app/actions/gradient-editor-actions.c:386
 msgid "Zoom All"
 msgstr "Alles anzeigen"
 
-#: ../app/actions/gradient-editor-actions.c:383
-#: ../app/actions/palette-editor-actions.c:100
+#: ../app/actions/gradient-editor-actions.c:387
+#: ../app/actions/palette-editor-actions.c:102
 msgid "Zoom all"
 msgstr "Alles anzeigen"
 
-#: ../app/actions/gradient-editor-actions.c:773
+#: ../app/actions/gradient-editor-actions.c:777
 msgid "_Blending Function for Segment"
 msgstr "_Verlaufsfunktion für Segment"
 
-#: ../app/actions/gradient-editor-actions.c:775
+#: ../app/actions/gradient-editor-actions.c:779
 msgid "Coloring _Type for Segment"
 msgstr "_Färbungsart für Segment"
 
-#: ../app/actions/gradient-editor-actions.c:778
+#: ../app/actions/gradient-editor-actions.c:782
 msgid "_Flip Segment"
 msgstr "Segment sp_iegeln"
 
-#: ../app/actions/gradient-editor-actions.c:780
+#: ../app/actions/gradient-editor-actions.c:784
 msgid "_Replicate Segment..."
 msgstr "Segment _duplizieren …"
 
-#: ../app/actions/gradient-editor-actions.c:782
+#: ../app/actions/gradient-editor-actions.c:786
 msgid "Split Segment at _Midpoint"
 msgstr "Segment _mittig teilen"
 
-#: ../app/actions/gradient-editor-actions.c:784
+#: ../app/actions/gradient-editor-actions.c:788
 msgid "Split Segment _Uniformly..."
 msgstr "Segment _gleichmäßig aufteilen …"
 
-#: ../app/actions/gradient-editor-actions.c:786
+#: ../app/actions/gradient-editor-actions.c:790
 msgid "_Delete Segment"
 msgstr "Segment _löschen"
 
-#: ../app/actions/gradient-editor-actions.c:788
+#: ../app/actions/gradient-editor-actions.c:792
 msgid "Re-_center Segment's Midpoint"
 msgstr "Mittelpunkt des Segments _zentrieren"
 
-#: ../app/actions/gradient-editor-actions.c:790
+#: ../app/actions/gradient-editor-actions.c:794
 msgid "Re-distribute _Handles in Segment"
 msgstr "Punkte _gleichmäßig im Segment verteilen"
 
-#: ../app/actions/gradient-editor-actions.c:795
+#: ../app/actions/gradient-editor-actions.c:799
 msgid "_Blending Function for Selection"
 msgstr "_Verlaufsfunktion für Auswahl"
 
-#: ../app/actions/gradient-editor-actions.c:797
+#: ../app/actions/gradient-editor-actions.c:801
 msgid "Coloring _Type for Selection"
 msgstr "_Färbungsart für Auswahl"
 
-#: ../app/actions/gradient-editor-actions.c:800
+#: ../app/actions/gradient-editor-actions.c:804
 msgid "_Flip Selection"
 msgstr "Auswahl sp_iegeln"
 
-#: ../app/actions/gradient-editor-actions.c:802
+#: ../app/actions/gradient-editor-actions.c:806
 msgid "_Replicate Selection..."
 msgstr "Auswahl _duplizieren …"
 
-#: ../app/actions/gradient-editor-actions.c:804
+#: ../app/actions/gradient-editor-actions.c:808
 msgid "Split Segments at _Midpoints"
 msgstr "Segmente an _Mittelpunkten aufteilen"
 
-#: ../app/actions/gradient-editor-actions.c:806
+#: ../app/actions/gradient-editor-actions.c:810
 msgid "Split Segments _Uniformly..."
 msgstr "Segmente _gleichmäßig aufteilen …"
 
-#: ../app/actions/gradient-editor-actions.c:808
+#: ../app/actions/gradient-editor-actions.c:812
 msgid "_Delete Selection"
 msgstr "Auswahl _löschen"
 
-#: ../app/actions/gradient-editor-actions.c:810
+#: ../app/actions/gradient-editor-actions.c:814
 msgid "Re-_center Midpoints in Selection"
 msgstr "Mittelpunkte in Auswahl _zentrieren"
 
-#: ../app/actions/gradient-editor-actions.c:812
+#: ../app/actions/gradient-editor-actions.c:816
 msgid "Re-distribute _Handles in Selection"
 msgstr "Punkte _gleichmäßig in Auswahl verteilen"
 
@@ -2551,6 +2668,7 @@ msgid "_New Gradient"
 msgstr "_Neuer Farbverlauf"
 
 #: ../app/actions/gradients-actions.c:49
+msgctxt "gradients-action"
 msgid "Create a new gradient"
 msgstr "Ein neues Bild erstellen"
 
@@ -2560,6 +2678,7 @@ msgid "D_uplicate Gradient"
 msgstr "Farbverlauf _duplizieren"
 
 #: ../app/actions/gradients-actions.c:55
+msgctxt "gradients-action"
 msgid "Duplicate this gradient"
 msgstr "Farbverlauf duplizieren"
 
@@ -2569,6 +2688,7 @@ msgid "Copy Gradient _Location"
 msgstr "Speicher_ort des Farbverlaufs kopieren"
 
 #: ../app/actions/gradients-actions.c:61
+msgctxt "gradients-action"
 msgid "Copy gradient file location to clipboard"
 msgstr "Den Speicherort der Farbverlaufsdatei in Zwischenablage kopieren"
 
@@ -2578,6 +2698,7 @@ msgid "Save as _POV-Ray..."
 msgstr "Als _POV-Ray-Datei speichern …"
 
 #: ../app/actions/gradients-actions.c:67
+msgctxt "gradients-action"
 msgid "Save gradient as POV-Ray"
 msgstr "Farbverlauf als POV-Ray-Datei speichern"
 
@@ -2587,8 +2708,9 @@ msgid "_Delete Gradient"
 msgstr "Farbverlauf _löschen"
 
 #: ../app/actions/gradients-actions.c:73
+msgctxt "gradients-action"
 msgid "Delete this gradient"
-msgstr "Farbverlauf löschen"
+msgstr "Diesen Farbverlauf löschen"
 
 #: ../app/actions/gradients-actions.c:78
 msgctxt "gradients-action"
@@ -2596,6 +2718,7 @@ msgid "_Refresh Gradients"
 msgstr "Farbverläufe n_eu laden"
 
 #: ../app/actions/gradients-actions.c:79
+msgctxt "gradients-action"
 msgid "Refresh gradients"
 msgstr "Farbverläufe neu laden"
 
@@ -2605,6 +2728,7 @@ msgid "_Edit Gradient..."
 msgstr "Farbverlauf _bearbeiten …"
 
 #: ../app/actions/gradients-actions.c:88
+msgctxt "gradients-action"
 msgid "Edit gradient"
 msgstr "Farbverlauf bearbeiten"
 
@@ -2619,6 +2743,7 @@ msgid "_Help"
 msgstr "_Hilfe"
 
 #: ../app/actions/help-actions.c:42
+msgctxt "help-action"
 msgid "Open the GIMP user manual"
 msgstr "Das GIMP-Benutzerhandbuch öffnen"
 
@@ -2628,6 +2753,7 @@ msgid "_Context Help"
 msgstr "_Kontexthilfe"
 
 #: ../app/actions/help-actions.c:48
+msgctxt "help-action"
 msgid "Show the help for a specific user interface item"
 msgstr "Hilfe für ein bestimmtes Bedienelement anzeigen"
 
@@ -2687,6 +2813,7 @@ msgid "_New..."
 msgstr "_Neu …"
 
 #: ../app/actions/image-actions.c:68
+msgctxt "image-action"
 msgid "Create a new image"
 msgstr "Ein neues Bild erstellen"
 
@@ -2696,6 +2823,7 @@ msgid "Can_vas Size..."
 msgstr "_Leinwandgröße …"
 
 #: ../app/actions/image-actions.c:74
+msgctxt "image-action"
 msgid "Adjust the image dimensions"
 msgstr "Bildabmessungen anpassen"
 
@@ -2705,6 +2833,7 @@ msgid "F_it Canvas to Layers"
 msgstr "_Leinwand an Ebenen anpassen"
 
 #: ../app/actions/image-actions.c:80
+msgctxt "image-action"
 msgid "Resize the image to enclose all layers"
 msgstr "Bildgröße so verändern, dass alle Ebenen hineinpassen"
 
@@ -2714,6 +2843,7 @@ msgid "F_it Canvas to Selection"
 msgstr "Leinwand an _Auswahl anpassen"
 
 #: ../app/actions/image-actions.c:86
+msgctxt "image-action"
 msgid "Resize the image to the extents of the selection"
 msgstr "Leinwand auf die Auswahlgröße zurechtschneiden"
 
@@ -2723,6 +2853,7 @@ msgid "_Print Size..."
 msgstr "_Druckgröße …"
 
 #: ../app/actions/image-actions.c:92
+msgctxt "image-action"
 msgid "Adjust the print resolution"
 msgstr "Die Druckauflösung anpassen"
 
@@ -2732,6 +2863,7 @@ msgid "_Scale Image..."
 msgstr "Bild _skalieren"
 
 #: ../app/actions/image-actions.c:98
+msgctxt "image-action"
 msgid "Change the size of the image content"
 msgstr "Die Größe des Bildinhaltes ändern"
 
@@ -2742,6 +2874,7 @@ msgstr "Auf Auswahl _zuschneiden"
 
 # XXX Das Bild auf die Auswahlgröße zurechtschneiden
 #: ../app/actions/image-actions.c:104
+msgctxt "image-action"
 msgid "Crop the image to the extents of the selection"
 msgstr "Schneidet das Bild auf die Auswahlgröße zurecht"
 
@@ -2751,6 +2884,7 @@ msgid "_Duplicate"
 msgstr "_Duplizieren"
 
 #: ../app/actions/image-actions.c:110
+msgctxt "image-action"
 msgid "Create a duplicate of this image"
 msgstr "Ein Duplikat dieses Bildes erzeugen"
 
@@ -2759,7 +2893,8 @@ msgctxt "image-action"
 msgid "Merge Visible _Layers..."
 msgstr "Sichtbare _Ebenen vereinen …"
 
-#: ../app/actions/image-actions.c:116 ../app/actions/layers-actions.c:141
+#: ../app/actions/image-actions.c:116
+msgctxt "image-action"
 msgid "Merge all visible layers into one layer"
 msgstr "Alle sichtbaren Ebenen in einer Ebene vereinigen"
 
@@ -2768,7 +2903,8 @@ msgctxt "image-action"
 msgid "_Flatten Image"
 msgstr "Bild z_usammenfügen"
 
-#: ../app/actions/image-actions.c:122 ../app/actions/layers-actions.c:147
+#: ../app/actions/image-actions.c:122
+msgctxt "image-action"
 msgid "Merge all layers into one and remove transparency"
 msgstr "Alle Ebenen in einer vereinen und die Transparenz entfernen"
 
@@ -2778,6 +2914,7 @@ msgid "Configure G_rid..."
 msgstr "_Raster konfigurieren …"
 
 #: ../app/actions/image-actions.c:128
+msgctxt "image-action"
 msgid "Configure the grid for this image"
 msgstr "Das Raster für dieses Bild einstellen"
 
@@ -2787,6 +2924,7 @@ msgid "Image Pr_operties"
 msgstr "Bild_eigenschaften"
 
 #: ../app/actions/image-actions.c:134
+msgctxt "image-action"
 msgid "Display information about this image"
 msgstr "Bildinformationen anzeigen"
 
@@ -2796,6 +2934,7 @@ msgid "_RGB"
 msgstr "_RGB"
 
 #: ../app/actions/image-actions.c:143
+msgctxt "image-convert-action"
 msgid "Convert the image to the RGB colorspace"
 msgstr "Bild in den RGB-Farbraum umwandeln"
 
@@ -2805,6 +2944,7 @@ msgid "_Grayscale"
 msgstr "_Graustufen"
 
 #: ../app/actions/image-actions.c:148
+msgctxt "image-convert-action"
 msgid "Convert the image to grayscale"
 msgstr "Bild in Graustufen umwandeln"
 
@@ -2814,6 +2954,7 @@ msgid "_Indexed..."
 msgstr "I_ndiziert …"
 
 #: ../app/actions/image-actions.c:153
+msgctxt "image-convert-action"
 msgid "Convert the image to indexed colors"
 msgstr "Bild in indizierte Farben umwandeln"
 
@@ -2823,6 +2964,7 @@ msgid "Flip _Horizontally"
 msgstr "_Horizontal spiegeln"
 
 #: ../app/actions/image-actions.c:161
+msgctxt "image-action"
 msgid "Flip image horizontally"
 msgstr "Das Bild horizontal spiegeln"
 
@@ -2832,6 +2974,7 @@ msgid "Flip _Vertically"
 msgstr "_Vertikal spiegeln"
 
 #: ../app/actions/image-actions.c:167
+msgctxt "image-action"
 msgid "Flip image vertically"
 msgstr "Das Bild vertikal spiegeln"
 
@@ -2841,6 +2984,7 @@ msgid "Rotate 90° _clockwise"
 msgstr "Um 90° im _Uhrzeigersinn drehen"
 
 #: ../app/actions/image-actions.c:176
+msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the right"
 msgstr "Das Bild um 90 Grad nach rechts drehen"
 
@@ -2850,6 +2994,7 @@ msgid "Rotate _180°"
 msgstr "Um _180° drehen"
 
 #: ../app/actions/image-actions.c:182
+msgctxt "image-action"
 msgid "Turn the image upside-down"
 msgstr "Das Bild auf den Kopf stellen"
 
@@ -2859,6 +3004,7 @@ msgid "Rotate 90° counter-clock_wise"
 msgstr "Um 90° _gegen den Uhrzeigersinn drehen"
 
 #: ../app/actions/image-actions.c:188
+msgctxt "image-action"
 msgid "Rotate the image 90 degrees to the left"
 msgstr "Das Bild um 90 Grad nach links drehen"
 
@@ -2924,6 +3070,7 @@ msgid "_Raise Views"
 msgstr "Ansichten an_heben"
 
 #: ../app/actions/images-actions.c:49
+msgctxt "images-action"
 msgid "Raise this image's displays"
 msgstr "Die Ansichten dieses Bildes anheben"
 
@@ -2933,6 +3080,7 @@ msgid "_New View"
 msgstr "_Neue Ansicht"
 
 #: ../app/actions/images-actions.c:55
+msgctxt "images-action"
 msgid "Create a new display for this image"
 msgstr "Eine neue Ansicht für dieses Bild erzeugen"
 
@@ -2942,6 +3090,7 @@ msgid "_Delete Image"
 msgstr "Bild _löschen"
 
 #: ../app/actions/images-actions.c:61
+msgctxt "images-action"
 msgid "Delete this image"
 msgstr "Dieses Bild löschen"
 
@@ -2950,439 +3099,493 @@ msgctxt "layers-action"
 msgid "Layers Menu"
 msgstr "Ebenenmenü"
 
-#: ../app/actions/layers-actions.c:51
+#: ../app/actions/layers-actions.c:52
 msgctxt "layers-action"
 msgid "_Layer"
 msgstr "_Ebene"
 
-#: ../app/actions/layers-actions.c:52
+#: ../app/actions/layers-actions.c:54
 msgctxt "layers-action"
 msgid "Stac_k"
 msgstr "_Stapel"
 
-#: ../app/actions/layers-actions.c:53
+#: ../app/actions/layers-actions.c:56
 msgctxt "layers-action"
 msgid "Te_xt to Selection"
 msgstr "Auswahl aus Te_xt"
 
-#: ../app/actions/layers-actions.c:54
+#: ../app/actions/layers-actions.c:58
 msgctxt "layers-action"
 msgid "_Mask"
 msgstr "_Maske"
 
-#: ../app/actions/layers-actions.c:55
+#: ../app/actions/layers-actions.c:60
 msgctxt "layers-action"
 msgid "Tr_ansparency"
 msgstr "Tr_ansparenz"
 
-#: ../app/actions/layers-actions.c:56
+#: ../app/actions/layers-actions.c:62
 msgctxt "layers-action"
 msgid "_Transform"
 msgstr "_Transformation"
 
-#: ../app/actions/layers-actions.c:57
+#: ../app/actions/layers-actions.c:64
 msgctxt "layers-action"
 msgid "_Properties"
 msgstr "_Eigenschaften"
 
-#: ../app/actions/layers-actions.c:58
+#: ../app/actions/layers-actions.c:66
 msgctxt "layers-action"
 msgid "_Opacity"
 msgstr "_Deckkraft"
 
-#: ../app/actions/layers-actions.c:59
+#: ../app/actions/layers-actions.c:68
 msgctxt "layers-action"
 msgid "Layer _Mode"
 msgstr "Ebenen_modus"
 
-#: ../app/actions/layers-actions.c:62
+#: ../app/actions/layers-actions.c:71
 msgctxt "layers-action"
 msgid "Te_xt Tool"
 msgstr "Te_xtwerkzeug"
 
-#: ../app/actions/layers-actions.c:63
+#: ../app/actions/layers-actions.c:72
+msgctxt "layers-action"
 msgid "Activate the text tool on this text layer"
 msgstr "Das Textwerkzeug für diese Textebene aktivieren"
 
-#: ../app/actions/layers-actions.c:68
+#: ../app/actions/layers-actions.c:77
 msgctxt "layers-action"
 msgid "_Edit Layer Attributes..."
 msgstr "Ebenenei_genschaften …"
 
-#: ../app/actions/layers-actions.c:69
+#: ../app/actions/layers-actions.c:78
+msgctxt "layers-action"
 msgid "Edit the layer's name"
 msgstr "Ebenenname bearbeiten"
 
-#: ../app/actions/layers-actions.c:74
+#: ../app/actions/layers-actions.c:83
 msgctxt "layers-action"
 msgid "_New Layer..."
 msgstr "_Neue Ebene …"
 
-#: ../app/actions/layers-actions.c:75
+#: ../app/actions/layers-actions.c:84
+msgctxt "layers-action"
 msgid "Create a new layer and add it to the image"
 msgstr "Eine neue Ebene erstellen und zum Ebenenstapel hinzufügen"
 
-#: ../app/actions/layers-actions.c:80
+#: ../app/actions/layers-actions.c:89
 msgctxt "layers-action"
 msgid "_New Layer"
 msgstr "_Neue Ebene"
 
-#: ../app/actions/layers-actions.c:81
+#: ../app/actions/layers-actions.c:90
+msgctxt "layers-action"
 msgid "Create a new layer with last used values"
 msgstr "Eine neue Ebene mit den zuletzt verwendeten Werten erstellen"
 
-#: ../app/actions/layers-actions.c:86
+#: ../app/actions/layers-actions.c:95
 msgctxt "layers-action"
 msgid "New from _Visible"
 msgstr "N_eu aus Sichtbarem"
 
-#: ../app/actions/layers-actions.c:87
+#: ../app/actions/layers-actions.c:97
+msgctxt "layers-action"
 msgid "Create a new layer from what is visible in this image"
 msgstr "Eine neue Ebene erstellen, aus dem, was in diesem Bild zu sehen ist"
 
-#: ../app/actions/layers-actions.c:92
+#: ../app/actions/layers-actions.c:102
 msgctxt "layers-action"
 msgid "D_uplicate Layer"
 msgstr "Ebene _duplizieren"
 
-#: ../app/actions/layers-actions.c:93
+#: ../app/actions/layers-actions.c:104
+msgctxt "layers-action"
 msgid "Create a duplicate of the layer and add it to the image"
 msgstr "Ein Duplikat dieser Ebene erstellen und zum Ebenenstapel hinzufügen"
 
-#: ../app/actions/layers-actions.c:98
+#: ../app/actions/layers-actions.c:109
 msgctxt "layers-action"
 msgid "_Delete Layer"
 msgstr "Ebene _löschen"
 
-#: ../app/actions/layers-actions.c:99
+#: ../app/actions/layers-actions.c:110
+msgctxt "layers-action"
 msgid "Delete this layer"
 msgstr "Diese Ebene löschen"
 
-#: ../app/actions/layers-actions.c:104
+#: ../app/actions/layers-actions.c:115
 msgctxt "layers-action"
 msgid "_Raise Layer"
 msgstr "Ebene an_heben"
 
-#: ../app/actions/layers-actions.c:105
+#: ../app/actions/layers-actions.c:116
+msgctxt "layers-action"
 msgid "Raise this layer one step in the layer stack"
 msgstr "Die Ebene um einen Schritt im Stapel anheben"
 
-#: ../app/actions/layers-actions.c:110
+#: ../app/actions/layers-actions.c:121
 msgctxt "layers-action"
 msgid "Layer to _Top"
 msgstr "Ebene nach ganz _oben"
 
-#: ../app/actions/layers-actions.c:111
+#: ../app/actions/layers-actions.c:122
+msgctxt "layers-action"
 msgid "Move this layer to the top of the layer stack"
 msgstr "Die Ebene an die Spitze des Stapels setzen"
 
-#: ../app/actions/layers-actions.c:116
+#: ../app/actions/layers-actions.c:127
 msgctxt "layers-action"
 msgid "_Lower Layer"
 msgstr "Ebene a_bsenken"
 
-#: ../app/actions/layers-actions.c:117
+#: ../app/actions/layers-actions.c:128
+msgctxt "layers-action"
 msgid "Lower this layer one step in the layer stack"
 msgstr "Die Ebene um einen Schritt im Stapel absenken"
 
-#: ../app/actions/layers-actions.c:122
+#: ../app/actions/layers-actions.c:133
 msgctxt "layers-action"
 msgid "Layer to _Bottom"
 msgstr "Ebene nach ganz _unten"
 
-#: ../app/actions/layers-actions.c:123
+#: ../app/actions/layers-actions.c:134
+msgctxt "layers-action"
 msgid "Move this layer to the bottom of the layer stack"
 msgstr "Die Ebene ans Ende des Stapels setzen"
 
-#: ../app/actions/layers-actions.c:128
+#: ../app/actions/layers-actions.c:139
 msgctxt "layers-action"
 msgid "_Anchor Layer"
 msgstr "Ebene _verankern"
 
-#: ../app/actions/layers-actions.c:129
+#: ../app/actions/layers-actions.c:140
+msgctxt "layers-action"
 msgid "Anchor the floating layer"
 msgstr "Schwebende Auswahl verankern"
 
-#: ../app/actions/layers-actions.c:134
+#: ../app/actions/layers-actions.c:145
 msgctxt "layers-action"
 msgid "Merge Do_wn"
 msgstr "Nach un_ten vereinen"
 
-#: ../app/actions/layers-actions.c:135
+#: ../app/actions/layers-actions.c:146
+msgctxt "layers-action"
 msgid "Merge this layer with the one below it"
 msgstr "Diese Ebene mit der darunterliegenden vereinen"
 
-#: ../app/actions/layers-actions.c:140
+#: ../app/actions/layers-actions.c:151
 msgctxt "layers-action"
 msgid "Merge _Visible Layers..."
 msgstr "Sichtbare _Ebenen vereinen …"
 
-#: ../app/actions/layers-actions.c:146
+#: ../app/actions/layers-actions.c:152
+msgctxt "layers-action"
+msgid "Merge all visible layers into one layer"
+msgstr "Alle sichtbaren Ebenen in einer Ebene vereinigen"
+
+#: ../app/actions/layers-actions.c:157
 msgctxt "layers-action"
 msgid "_Flatten Image"
 msgstr "Bild z_usammenfügen"
 
-#: ../app/actions/layers-actions.c:152
+#: ../app/actions/layers-actions.c:158
+msgctxt "layers-action"
+msgid "Merge all layers into one and remove transparency"
+msgstr "Alle Ebenen in einer vereinen und die Transparenz entfernen"
+
+#: ../app/actions/layers-actions.c:163
 msgctxt "layers-action"
 msgid "_Discard Text Information"
 msgstr "Te_xtinformationen verwerfen"
 
-#: ../app/actions/layers-actions.c:153
+#: ../app/actions/layers-actions.c:164
+msgctxt "layers-action"
 msgid "Turn this text layer into a normal layer"
 msgstr "Die Textebene in eine normale Ebene umwandeln"
 
-#: ../app/actions/layers-actions.c:158
+#: ../app/actions/layers-actions.c:169
 msgctxt "layers-action"
 msgid "Text to _Path"
 msgstr "_Pfad aus Text"
 
-#: ../app/actions/layers-actions.c:159
+#: ../app/actions/layers-actions.c:170
+msgctxt "layers-action"
 msgid "Create a path from this text layer"
 msgstr "Einen Pfad aus dem Text der Ebene erzeugen"
 
-#: ../app/actions/layers-actions.c:164
+#: ../app/actions/layers-actions.c:175
 msgctxt "layers-action"
 msgid "Text alon_g Path"
 msgstr "Text am Pfad entlan_g"
 
 # XXX "... ziehen" (!?)
-#: ../app/actions/layers-actions.c:165
+#: ../app/actions/layers-actions.c:176
+msgctxt "layers-action"
 msgid "Warp this layer's text along the current path"
 msgstr "Den Text der Ebene am aktuellen Pfad entlang verzerren"
 
-#: ../app/actions/layers-actions.c:170
+#: ../app/actions/layers-actions.c:181
 msgctxt "layers-action"
 msgid "Layer B_oundary Size..."
 msgstr "Ebenen_größe …"
 
-#: ../app/actions/layers-actions.c:171
+#: ../app/actions/layers-actions.c:182
+msgctxt "layers-action"
 msgid "Adjust the layer dimensions"
 msgstr "Die Größe der Ebene anpassen"
 
-#: ../app/actions/layers-actions.c:176
+#: ../app/actions/layers-actions.c:187
 msgctxt "layers-action"
 msgid "Layer to _Image Size"
 msgstr "Ebene auf _Bildgröße"
 
-#: ../app/actions/layers-actions.c:177
+#: ../app/actions/layers-actions.c:188
+msgctxt "layers-action"
 msgid "Resize the layer to the size of the image"
 msgstr "Die Größe der Ebene an die Bildgröße anpassen"
 
-#: ../app/actions/layers-actions.c:182
+#: ../app/actions/layers-actions.c:193
 msgctxt "layers-action"
 msgid "_Scale Layer..."
 msgstr "Ebene _skalieren …"
 
-#: ../app/actions/layers-actions.c:183
+#: ../app/actions/layers-actions.c:194
+msgctxt "layers-action"
 msgid "Change the size of the layer content"
 msgstr "Die Größe des Ebeneninhaltes ändern"
 
-#: ../app/actions/layers-actions.c:188
+#: ../app/actions/layers-actions.c:199
 msgctxt "layers-action"
 msgid "_Crop to Selection"
 msgstr "Auf Auswahl _zuschneiden"
 
-#: ../app/actions/layers-actions.c:189
+#: ../app/actions/layers-actions.c:200
+msgctxt "layers-action"
 msgid "Crop the layer to the extents of the selection"
 msgstr "Die Ebene auf die Auswahlgröße zurechtschneiden"
 
-#: ../app/actions/layers-actions.c:194
+#: ../app/actions/layers-actions.c:205
 msgctxt "layers-action"
 msgid "Add La_yer Mask..."
 msgstr "Ebenenmaske _hinzufügen …"
 
-#: ../app/actions/layers-actions.c:195
+#: ../app/actions/layers-actions.c:207
+msgctxt "layers-action"
 msgid "Add a mask that allows non-destructive editing of transparency"
 msgstr ""
 "Eine Maske hinzufügen, die ein nicht-destruktives Bearbeiten der Transparenz "
 "ermöglicht"
 
-#: ../app/actions/layers-actions.c:200
+#: ../app/actions/layers-actions.c:212
 msgctxt "layers-action"
 msgid "Add Alpha C_hannel"
 msgstr "Alphakanal hin_zufügen"
 
-#: ../app/actions/layers-actions.c:201
+#: ../app/actions/layers-actions.c:213
+msgctxt "layers-action"
 msgid "Add transparency information to the layer"
 msgstr "Transparenzinformationen zur Ebene hinzufügen"
 
-#: ../app/actions/layers-actions.c:206
+#: ../app/actions/layers-actions.c:218
 msgctxt "layers-action"
 msgid "_Remove Alpha Channel"
 msgstr "Alphakanal _entfernen"
 
-#: ../app/actions/layers-actions.c:207
+#: ../app/actions/layers-actions.c:219
+msgctxt "layers-action"
 msgid "Remove transparency information from the layer"
 msgstr "Transparenzinformationen von der Ebene entfernen"
 
-#: ../app/actions/layers-actions.c:215
+#: ../app/actions/layers-actions.c:227
 msgctxt "layers-action"
 msgid "Lock Alph_a Channel"
 msgstr "Alphakanal _sperren"
 
-#: ../app/actions/layers-actions.c:216
+#: ../app/actions/layers-actions.c:229
+msgctxt "layers-action"
 msgid "Keep transparency information on this layer from being modified"
 msgstr "Transparenzinformationen dieser Ebene vor Änderungen schützen"
 
-#: ../app/actions/layers-actions.c:222
+#: ../app/actions/layers-actions.c:235
 msgctxt "layers-action"
 msgid "_Edit Layer Mask"
 msgstr "Ebenen_maske bearbeiten"
 
-#: ../app/actions/layers-actions.c:223
+#: ../app/actions/layers-actions.c:236
+msgctxt "layers-action"
 msgid "Work on the layer mask"
 msgstr "An der Ebenenmaske arbeiten"
 
-#: ../app/actions/layers-actions.c:229
+#: ../app/actions/layers-actions.c:242
 msgctxt "layers-action"
 msgid "S_how Layer Mask"
 msgstr "E_benenmaske anzeigen"
 
-#: ../app/actions/layers-actions.c:235
+#: ../app/actions/layers-actions.c:248
 msgctxt "layers-action"
 msgid "_Disable Layer Mask"
 msgstr "Ebenenmaske _deaktivieren"
 
-#: ../app/actions/layers-actions.c:236
+#: ../app/actions/layers-actions.c:249
+msgctxt "layers-action"
 msgid "Dismiss the effect of the layer mask"
 msgstr "Effekt der Ebenenmaske übergehen"
 
-#: ../app/actions/layers-actions.c:245
+#: ../app/actions/layers-actions.c:258
 msgctxt "layers-action"
 msgid "Apply Layer _Mask"
 msgstr "Ebenenmaske an_wenden"
 
-#: ../app/actions/layers-actions.c:246
+#: ../app/actions/layers-actions.c:259
+msgctxt "layers-action"
 msgid "Apply the effect of the layer mask and remove it"
 msgstr "Effekt anwenden und die Ebenenmaske entfernen"
 
-#: ../app/actions/layers-actions.c:251
+#: ../app/actions/layers-actions.c:264
 msgctxt "layers-action"
 msgid "Delete Layer Mas_k"
 msgstr "Ebenenmaske lös_chen"
 
-#: ../app/actions/layers-actions.c:252
+#: ../app/actions/layers-actions.c:265
+msgctxt "layers-action"
 msgid "Remove the layer mask and its effect"
 msgstr "Ebenenmaske und deren Effekt entfernen"
 
-#: ../app/actions/layers-actions.c:260
+#: ../app/actions/layers-actions.c:273
 msgctxt "layers-action"
 msgid "_Mask to Selection"
 msgstr "Auswahl aus _Maske"
 
-#: ../app/actions/layers-actions.c:261
+#: ../app/actions/layers-actions.c:274
+msgctxt "layers-action"
 msgid "Replace the selection with the layer mask"
 msgstr "Die Auswahl durch die Ebenenmaske ersetzen"
 
-#: ../app/actions/layers-actions.c:266
+#: ../app/actions/layers-actions.c:279
 msgctxt "layers-action"
 msgid "_Add to Selection"
 msgstr "Zur Auswahl _hinzufügen"
 
-#: ../app/actions/layers-actions.c:267
+#: ../app/actions/layers-actions.c:280
+msgctxt "layers-action"
 msgid "Add the layer mask to the current selection"
 msgstr "Die Ebenenmaske zur Auswahl hinzufügen"
 
-#: ../app/actions/layers-actions.c:272 ../app/actions/layers-actions.c:299
-#: ../app/actions/layers-actions.c:326
+#: ../app/actions/layers-actions.c:285 ../app/actions/layers-actions.c:314
+#: ../app/actions/layers-actions.c:344
 msgctxt "layers-action"
 msgid "_Subtract from Selection"
 msgstr "Von Auswahl ab_ziehen"
 
-#: ../app/actions/layers-actions.c:273
+#: ../app/actions/layers-actions.c:286
+msgctxt "layers-action"
 msgid "Subtract the layer mask from the current selection"
 msgstr "Die Ebenenmaske von der Auswahl abziehen"
 
-#: ../app/actions/layers-actions.c:278 ../app/actions/layers-actions.c:305
-#: ../app/actions/layers-actions.c:332
+#: ../app/actions/layers-actions.c:291 ../app/actions/layers-actions.c:321
+#: ../app/actions/layers-actions.c:351
 msgctxt "layers-action"
 msgid "_Intersect with Selection"
 msgstr "Schnittmenge _bilden"
 
-#: ../app/actions/layers-actions.c:279
+#: ../app/actions/layers-actions.c:292
+msgctxt "layers-action"
 msgid "Intersect the layer mask with the current selection"
 msgstr "Die Ebenenmaske mit der Auswahl schneiden"
 
-#: ../app/actions/layers-actions.c:287
+#: ../app/actions/layers-actions.c:300
 msgctxt "layers-action"
 msgid "Al_pha to Selection"
 msgstr "Aus_wahl aus Alphakanal"
 
-#: ../app/actions/layers-actions.c:288
+#: ../app/actions/layers-actions.c:302
+msgctxt "layers-action"
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "Die Auswahl durch den Alphakanal der Ebene ersetzen"
 
-#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
+#: ../app/actions/layers-actions.c:307 ../app/actions/layers-actions.c:337
 msgctxt "layers-action"
 msgid "A_dd to Selection"
 msgstr "Zur Auswahl _hinzufügen"
 
-#: ../app/actions/layers-actions.c:294
+#: ../app/actions/layers-actions.c:309
+msgctxt "layers-action"
 msgid "Add the layer's alpha channel to the current selection"
 msgstr "Den Alphakanal der Ebene zur Auswahl hinzufügen"
 
-#: ../app/actions/layers-actions.c:300
+#: ../app/actions/layers-actions.c:316
+msgctxt "layers-action"
 msgid "Subtract the layer's alpha channel from the current selection"
 msgstr "Den Alphakanal der Ebene von der Auswahl abziehen"
 
-#: ../app/actions/layers-actions.c:306
+#: ../app/actions/layers-actions.c:323
+msgctxt "layers-action"
 msgid "Intersect the layer's alpha channel with the current selection"
 msgstr "Den Alphakanal der Ebene mit der Auswahl schneiden"
 
-#: ../app/actions/layers-actions.c:314
+#: ../app/actions/layers-actions.c:331
 msgctxt "layers-action"
 msgid "_Text to Selection"
 msgstr "Auswahl aus _Text"
 
-#: ../app/actions/layers-actions.c:315
+#: ../app/actions/layers-actions.c:332
+msgctxt "layers-action"
 msgid "Replace the selection with the text layer's outline"
 msgstr "Die Auswahl mit dem Umriss der Textebene ersetzen"
 
-#: ../app/actions/layers-actions.c:321
+#: ../app/actions/layers-actions.c:339
+msgctxt "layers-action"
 msgid "Add the text layer's outline to the current selection"
 msgstr "Den Umriss der Textebene zur aktuellen Auswahl hinzufügen"
 
-#: ../app/actions/layers-actions.c:327
+#: ../app/actions/layers-actions.c:346
+msgctxt "layers-action"
 msgid "Subtract the text layer's outline from the current selection"
 msgstr "Den Umriss der Textebene von der aktuellen Auswahl abziehen"
 
-#: ../app/actions/layers-actions.c:333
+#: ../app/actions/layers-actions.c:353
+msgctxt "layers-action"
 msgid "Intersect the text layer's outline with the current selection"
 msgstr "Den Umriss der Textebene mit der aktuellen Auswahl schneiden"
 
-#: ../app/actions/layers-actions.c:341
+#: ../app/actions/layers-actions.c:361
 msgctxt "layers-action"
 msgid "Select _Top Layer"
 msgstr "_Oberste Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:342
+#: ../app/actions/layers-actions.c:362
+msgctxt "layers-action"
 msgid "Select the topmost layer"
 msgstr "Die oberste Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:347
+#: ../app/actions/layers-actions.c:367
 msgctxt "layers-action"
 msgid "Select _Bottom Layer"
 msgstr "_Unterste Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:348
+#: ../app/actions/layers-actions.c:368
+msgctxt "layers-action"
 msgid "Select the bottommost layer"
 msgstr "Die unterste Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:353
+#: ../app/actions/layers-actions.c:373
 msgctxt "layers-action"
 msgid "Select _Previous Layer"
 msgstr "_Vorherige Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:354
+#: ../app/actions/layers-actions.c:374
+msgctxt "layers-action"
 msgid "Select the layer above the current layer"
 msgstr "Die Ebene oberhalb der aktiven Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:359
+#: ../app/actions/layers-actions.c:379
 msgctxt "layers-action"
 msgid "Select _Next Layer"
 msgstr "_Nächste Ebene auswählen"
 
-#: ../app/actions/layers-actions.c:360
+#: ../app/actions/layers-actions.c:380
+msgctxt "layers-action"
 msgid "Select the layer below the current layer"
 msgstr "Die Ebene unterhalb der aktiven Ebene auswählen"
 
@@ -3444,14 +3647,20 @@ msgctxt "palette-editor-action"
 msgid "_Edit Color..."
 msgstr "Farbe _bearbeiten …"
 
+#: ../app/actions/palette-editor-actions.c:49
+msgctxt "palette-editor-action"
+msgid "Edit this entry"
+msgstr "Diesen Eintrag bearbeiten"
+
 #: ../app/actions/palette-editor-actions.c:54
 msgctxt "palette-editor-action"
 msgid "_Delete Color"
 msgstr "Farbe _löschen"
 
 #: ../app/actions/palette-editor-actions.c:55
-msgid "Delete this color"
-msgstr "Diese Farbe löschen"
+msgctxt "palette-editor-action"
+msgid "Delete this entry"
+msgstr "Diesen Eintrag löschen"
 
 #: ../app/actions/palette-editor-actions.c:63
 msgctxt "palette-editor-action"
@@ -3463,28 +3672,30 @@ msgctxt "palette-editor-action"
 msgid "New Color from _FG"
 msgstr "Neue Farbe aus _Vordergrund"
 
-#: ../app/actions/palette-editor-actions.c:73
-msgid "New color from foreground color"
-msgstr "Neue Farbe aus Vordergrundfarbe"
+#: ../app/actions/palette-editor-actions.c:74
+msgctxt "palette-editor-action"
+msgid "Create a new entry from the foreground color"
+msgstr "Einen neuen Eintrag aus der Vordergrundfarbe erstellen"
 
-#: ../app/actions/palette-editor-actions.c:78
+#: ../app/actions/palette-editor-actions.c:79
 msgctxt "palette-editor-action"
 msgid "New Color from _BG"
 msgstr "Neue Farbe aus _Hintergrund"
 
-#: ../app/actions/palette-editor-actions.c:79
-msgid "New color from background color"
-msgstr "Neue Farbe aus Hintergrundfarbe"
+#: ../app/actions/palette-editor-actions.c:81
+msgctxt "palette-editor-action"
+msgid "Create a new entry from the background color"
+msgstr "Einen neuen Eintrag aus der Hintergrundfarbe erstellen"
 
-#: ../app/actions/palette-editor-actions.c:87
+#: ../app/actions/palette-editor-actions.c:89
 msgid "Zoom _In"
 msgstr "Ver_größern"
 
-#: ../app/actions/palette-editor-actions.c:93
+#: ../app/actions/palette-editor-actions.c:95
 msgid "Zoom _Out"
 msgstr "Ver_kleinern"
 
-#: ../app/actions/palette-editor-actions.c:99
+#: ../app/actions/palette-editor-actions.c:101
 msgid "Zoom _All"
 msgstr "_Alles anzeigen"
 
@@ -3507,6 +3718,7 @@ msgid "_New Palette"
 msgstr "_Neue Palette"
 
 #: ../app/actions/palettes-actions.c:49
+msgctxt "palettes-action"
 msgid "Create a new palette"
 msgstr "Eine neue Palette erstellen"
 
@@ -3516,6 +3728,7 @@ msgid "_Import Palette..."
 msgstr "Palette _importieren …"
 
 #: ../app/actions/palettes-actions.c:55
+msgctxt "palettes-action"
 msgid "Import palette"
 msgstr "Palette importieren"
 
@@ -3525,6 +3738,7 @@ msgid "D_uplicate Palette"
 msgstr "Palette _duplizieren"
 
 #: ../app/actions/palettes-actions.c:61
+msgctxt "palettes-action"
 msgid "Duplicate this palette"
 msgstr "Diese Palette duplizieren"
 
@@ -3534,6 +3748,7 @@ msgid "_Merge Palettes..."
 msgstr "Paletten _vereinen …"
 
 #: ../app/actions/palettes-actions.c:67
+msgctxt "palettes-action"
 msgid "Merge palettes"
 msgstr "Paletten vereinen"
 
@@ -3543,6 +3758,7 @@ msgid "Copy Palette _Location"
 msgstr "Speicher_ort der Palette kopieren"
 
 #: ../app/actions/palettes-actions.c:73
+msgctxt "palettes-action"
 msgid "Copy palette file location to clipboard"
 msgstr "Speicherort der Palettendatei in Zwischenablage kopieren"
 
@@ -3552,6 +3768,7 @@ msgid "_Delete Palette"
 msgstr "Palette _löschen"
 
 #: ../app/actions/palettes-actions.c:79
+msgctxt "palettes-action"
 msgid "Delete this palette"
 msgstr "Diese Palette löschen"
 
@@ -3561,6 +3778,7 @@ msgid "_Refresh Palettes"
 msgstr "Paletten n_eu laden"
 
 #: ../app/actions/palettes-actions.c:85
+msgctxt "palettes-action"
 msgid "Refresh palettes"
 msgstr "Paletten neu laden"
 
@@ -3570,6 +3788,7 @@ msgid "_Edit Palette..."
 msgstr "Palette _bearbeiten …"
 
 #: ../app/actions/palettes-actions.c:94
+msgctxt "palettes-action"
 msgid "Edit palette"
 msgstr "Palette bearbeiten"
 
@@ -3592,7 +3811,8 @@ msgid "_Open Pattern as Image"
 msgstr "Muster als Bild ö_ffnen"
 
 #: ../app/actions/patterns-actions.c:48
-msgid "Open pattern as image"
+msgctxt "patterns-action"
+msgid "Open this pattern as an image"
 msgstr "Muster als Bild öffnen"
 
 #: ../app/actions/patterns-actions.c:53
@@ -3601,6 +3821,7 @@ msgid "_New Pattern"
 msgstr "_Neues Muster"
 
 #: ../app/actions/patterns-actions.c:54
+msgctxt "patterns-action"
 msgid "Create a new pattern"
 msgstr "Ein neues Muster erstellen"
 
@@ -3610,6 +3831,7 @@ msgid "D_uplicate Pattern"
 msgstr "Muster _duplizieren"
 
 #: ../app/actions/patterns-actions.c:60
+msgctxt "patterns-action"
 msgid "Duplicate this pattern"
 msgstr "Dieses Muster duplizieren"
 
@@ -3619,6 +3841,7 @@ msgid "Copy Pattern _Location"
 msgstr "Speicher_ort des Musters kopieren"
 
 #: ../app/actions/patterns-actions.c:66
+msgctxt "patterns-action"
 msgid "Copy pattern file location to clipboard"
 msgstr "Den Speicherort der Musterdatei in Zwischenablage kopieren"
 
@@ -3628,6 +3851,7 @@ msgid "_Delete Pattern"
 msgstr "Muster _löschen"
 
 #: ../app/actions/patterns-actions.c:72
+msgctxt "patterns-action"
 msgid "Delete this pattern"
 msgstr "Dieses Muster löschen"
 
@@ -3637,6 +3861,7 @@ msgid "_Refresh Patterns"
 msgstr "Muster n_eu laden"
 
 #: ../app/actions/patterns-actions.c:78
+msgctxt "patterns-action"
 msgid "Refresh patterns"
 msgstr "Muster neu laden"
 
@@ -3646,6 +3871,7 @@ msgid "_Edit Pattern..."
 msgstr "Muster _bearbeiten …"
 
 #: ../app/actions/patterns-actions.c:87
+msgctxt "patterns-action"
 msgid "Edit pattern"
 msgstr "Muster bearbeiten"
 
@@ -3750,6 +3976,7 @@ msgid "Reset all _Filters"
 msgstr "Alle _Filter zurücksetzen"
 
 #: ../app/actions/plug-in-actions.c:125
+msgctxt "plug-in-action"
 msgid "Reset all plug-ins to their default settings"
 msgstr "Die Einstellungen aller Plugins auf die Standardwerte zurücksetzen"
 
@@ -3758,34 +3985,36 @@ msgctxt "plug-in-action"
 msgid "Re_peat Last"
 msgstr "Letzte Aktion _wiederholen"
 
-#: ../app/actions/plug-in-actions.c:134
+#: ../app/actions/plug-in-actions.c:135
+msgctxt "plug-in-action"
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "Das Plugin mit gleichen Einstellungen erneut ausführen"
 
-#: ../app/actions/plug-in-actions.c:139
+#: ../app/actions/plug-in-actions.c:140
 msgctxt "plug-in-action"
 msgid "R_e-Show Last"
 msgstr "_Letzte Aktion anzeigen"
 
-#: ../app/actions/plug-in-actions.c:140
+#: ../app/actions/plug-in-actions.c:141
+msgctxt "plug-in-action"
 msgid "Show the last used plug-in dialog again"
 msgstr "Das Dialogfenster des zuletzt genutzten Plugins erneut anzeigen"
 
-#: ../app/actions/plug-in-actions.c:523
+#: ../app/actions/plug-in-actions.c:524
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "»%s« _wiederholen"
 
-#: ../app/actions/plug-in-actions.c:524
+#: ../app/actions/plug-in-actions.c:525
 #, c-format
 msgid "R_e-Show \"%s\""
 msgstr "»%s« _erneut anzeigen"
 
-#: ../app/actions/plug-in-actions.c:540
+#: ../app/actions/plug-in-actions.c:541
 msgid "Repeat Last"
 msgstr "Letzte Aktion wiederholen"
 
-#: ../app/actions/plug-in-actions.c:542
+#: ../app/actions/plug-in-actions.c:543
 msgid "Re-Show Last"
 msgstr "Letzte Aktion erneut anzeigen"
 
@@ -3814,8 +4043,8 @@ msgid "Toggle _Quick Mask"
 msgstr "_Schnellmaske umschalten"
 
 #: ../app/actions/quick-mask-actions.c:56
-#: ../app/display/gimpdisplayshell.c:1183
-msgid "Toggle Quick Mask"
+msgctxt "quick-mask-action"
+msgid "Toggle Quick Mask on/off"
 msgstr "Schnellmaske umschalten"
 
 #: ../app/actions/quick-mask-actions.c:65
@@ -3854,6 +4083,11 @@ msgctxt "sample-points-action"
 msgid "_Sample Merged"
 msgstr "_Vereinigung prüfen"
 
+#: ../app/actions/sample-points-actions.c:49
+msgctxt "sample-points-action"
+msgid "Use the composite color of all visible layers"
+msgstr "Das Ergebnis der Komposition aller sichtbaren Ebenen verwenden"
+
 #: ../app/actions/select-actions.c:45
 msgctxt "select-action"
 msgid "Selection Editor Menu"
@@ -3870,6 +4104,7 @@ msgid "_All"
 msgstr "_Alles"
 
 #: ../app/actions/select-actions.c:52
+msgctxt "select-action"
 msgid "Select everything"
 msgstr "Alles auswählen"
 
@@ -3879,6 +4114,7 @@ msgid "_None"
 msgstr "Nichts"
 
 #: ../app/actions/select-actions.c:58
+msgctxt "select-action"
 msgid "Dismiss the selection"
 msgstr "Die Auswahl verwerfen"
 
@@ -3888,6 +4124,7 @@ msgid "_Invert"
 msgstr "_Invertieren"
 
 #: ../app/actions/select-actions.c:64
+msgctxt "select-action"
 msgid "Invert the selection"
 msgstr "Die Auswahl invertieren"
 
@@ -3897,6 +4134,7 @@ msgid "_Float"
 msgstr "_Schwebend"
 
 #: ../app/actions/select-actions.c:70
+msgctxt "select-action"
 msgid "Create a floating selection"
 msgstr "Eine Schwebende Auswahl erzeugen"
 
@@ -3905,70 +4143,78 @@ msgctxt "select-action"
 msgid "Fea_ther..."
 msgstr "A_usblenden …"
 
-#: ../app/actions/select-actions.c:76
+#: ../app/actions/select-actions.c:77
+msgctxt "select-action"
 msgid "Blur the selection border so that it fades out smoothly"
 msgstr "Auswahlkante weichzeichnen, um einen weichen Übergang zu erhalten"
 
-#: ../app/actions/select-actions.c:81
+#: ../app/actions/select-actions.c:82
 msgctxt "select-action"
 msgid "_Sharpen"
 msgstr "_Schärfen"
 
-#: ../app/actions/select-actions.c:82
+#: ../app/actions/select-actions.c:83
+msgctxt "select-action"
 msgid "Remove fuzzyness from the selection"
 msgstr "Unschärfe von der Auswahl entfernen"
 
-#: ../app/actions/select-actions.c:87
+#: ../app/actions/select-actions.c:88
 msgctxt "select-action"
 msgid "S_hrink..."
 msgstr "Ver_kleinern …"
 
-#: ../app/actions/select-actions.c:88
+#: ../app/actions/select-actions.c:89
+msgctxt "select-action"
 msgid "Contract the selection"
 msgstr "Auswahl zusammenziehen"
 
-#: ../app/actions/select-actions.c:93
+#: ../app/actions/select-actions.c:94
 msgctxt "select-action"
 msgid "_Grow..."
 msgstr "Ver_größern …"
 
-#: ../app/actions/select-actions.c:94
+#: ../app/actions/select-actions.c:95
+msgctxt "select-action"
 msgid "Enlarge the selection"
 msgstr "Auswahl vergrößern"
 
-#: ../app/actions/select-actions.c:99
+#: ../app/actions/select-actions.c:100
 msgctxt "select-action"
 msgid "Bo_rder..."
 msgstr "_Rand …"
 
-#: ../app/actions/select-actions.c:100
+#: ../app/actions/select-actions.c:101
+msgctxt "select-action"
 msgid "Replace the selection by its border"
 msgstr "Auswahl durch ihre Grenze ersetzen"
 
-#: ../app/actions/select-actions.c:105
+#: ../app/actions/select-actions.c:106
 msgctxt "select-action"
 msgid "Save to _Channel"
 msgstr "In _Kanal speichern"
 
-#: ../app/actions/select-actions.c:106
+#: ../app/actions/select-actions.c:107
+msgctxt "select-action"
 msgid "Save the selection to a channel"
 msgstr "Auswahl in Kanal speichern"
 
-#: ../app/actions/select-actions.c:111
+#: ../app/actions/select-actions.c:112
 msgctxt "select-action"
 msgid "_Stroke Selection..."
 msgstr "Auswahl nach_ziehen …"
 
-#: ../app/actions/select-actions.c:112
+#: ../app/actions/select-actions.c:113
+msgctxt "select-action"
 msgid "Paint along the selection outline"
 msgstr "Am Umriss der Auswahl entlang zeichnen"
 
-#: ../app/actions/select-actions.c:117
+#: ../app/actions/select-actions.c:118
 msgctxt "select-action"
 msgid "_Stroke Selection"
 msgstr "Auswahl nach_ziehen"
 
-#: ../app/actions/select-actions.c:118
+#: ../app/actions/select-actions.c:119
+msgctxt "select-action"
 msgid "Stroke the selection with last used values"
 msgstr "Auswahl mit den zuletzt benutzten Werten nachziehen"
 
@@ -4041,6 +4287,7 @@ msgid "_Create Image from Template"
 msgstr "B_ild aus Vorlage erstellen"
 
 #: ../app/actions/templates-actions.c:47
+msgctxt "templates-action"
 msgid "Create a new image from the selected template"
 msgstr "Ein neues Bild aus der gewählten Vorlage erzeugen"
 
@@ -4050,6 +4297,7 @@ msgid "_New Template..."
 msgstr "_Neue Vorlage …"
 
 #: ../app/actions/templates-actions.c:53
+msgctxt "templates-action"
 msgid "Create a new template"
 msgstr "Eine neue Vorlage erstellen"
 
@@ -4059,6 +4307,7 @@ msgid "D_uplicate Template..."
 msgstr "Vorlage _duplizieren …"
 
 #: ../app/actions/templates-actions.c:59
+msgctxt "templates-action"
 msgid "Duplicate this template"
 msgstr "Diese Vorlage duplizieren"
 
@@ -4068,6 +4317,7 @@ msgid "_Edit Template..."
 msgstr "Vorlage _bearbeiten …"
 
 #: ../app/actions/templates-actions.c:65
+msgctxt "templates-action"
 msgid "Edit this template"
 msgstr "Diese Vorlage bearbeiten"
 
@@ -4077,6 +4327,7 @@ msgid "_Delete Template"
 msgstr "Vorlage _löschen"
 
 #: ../app/actions/templates-actions.c:71
+msgctxt "templates-action"
 msgid "Delete this template"
 msgstr "Diese Vorlage löschen"
 
@@ -4111,6 +4362,7 @@ msgid "Open"
 msgstr "Öffnen"
 
 #: ../app/actions/text-editor-actions.c:45
+msgctxt "text-editor-action"
 msgid "Load text from file"
 msgstr "Text aus Datei laden"
 
@@ -4120,7 +4372,7 @@ msgid "Clear"
 msgstr "Löschen"
 
 #: ../app/actions/text-editor-actions.c:51
-#: ../app/actions/text-tool-actions.c:84
+msgctxt "text-editor-action"
 msgid "Clear all text"
 msgstr "Gesamten Text löschen"
 
@@ -4130,6 +4382,7 @@ msgid "LTR"
 msgstr "Links nach Rechts"
 
 #: ../app/actions/text-editor-actions.c:60
+msgctxt "text-editor-action"
 msgid "From left to right"
 msgstr "Von Links nach Rechts"
 
@@ -4139,6 +4392,7 @@ msgid "RTL"
 msgstr "Rechts nach Links"
 
 #: ../app/actions/text-editor-actions.c:66
+msgctxt "text-editor-action"
 msgid "From right to left"
 msgstr "Von Rechts nach Links"
 
@@ -4202,31 +4456,38 @@ msgctxt "text-tool-action"
 msgid "Cl_ear"
 msgstr "_Löschen"
 
+#: ../app/actions/text-tool-actions.c:84
+msgctxt "text-tool-action"
+msgid "Clear all text"
+msgstr "Gesamten Text löschen"
+
 #: ../app/actions/text-tool-actions.c:89
 msgctxt "text-tool-action"
 msgid "_Path from Text"
 msgstr "_Pfad aus Text"
 
-#: ../app/actions/text-tool-actions.c:90
+#: ../app/actions/text-tool-actions.c:91
+msgctxt "text-tool-action"
 msgid "Create a path from the outlines of the current text"
 msgstr "Einen Pfad aus dem Umriss des Texts erzeugen"
 
-#: ../app/actions/text-tool-actions.c:95
+#: ../app/actions/text-tool-actions.c:96
 msgctxt "text-tool-action"
 msgid "Text _along Path"
 msgstr "Text an _Pfad"
 
 # XXX "... ziehen" (!?)
-#: ../app/actions/text-tool-actions.c:96
+#: ../app/actions/text-tool-actions.c:98
+msgctxt "text-tool-action"
 msgid "Bend the text along the currently active path"
 msgstr "Den am aktuellen Pfad entlang verbiegen"
 
-#: ../app/actions/text-tool-actions.c:104
+#: ../app/actions/text-tool-actions.c:106
 msgctxt "text-tool-action"
 msgid "From left to right"
 msgstr "Von Links nach Rechts"
 
-#: ../app/actions/text-tool-actions.c:109
+#: ../app/actions/text-tool-actions.c:111
 msgctxt "text-tool-action"
 msgid "From right to left"
 msgstr "Von Rechts nach Links"
@@ -4278,6 +4539,7 @@ msgid "Reset _all Tool Options"
 msgstr "_Alle Werkzeugeinstellungen zurücksetzen"
 
 #: ../app/actions/tool-options-actions.c:88
+msgctxt "tool-options-action"
 msgid "Reset all tool options"
 msgstr "Alle Werkzeugeinstellungen zurücksetzen"
 
@@ -4349,8 +4611,9 @@ msgid "R_aise Tool"
 msgstr "Werkzeug an_heben"
 
 #: ../app/actions/tools-actions.c:58
-msgid "Raise tool"
-msgstr "Werkzeug anheben"
+msgctxt "tools-action"
+msgid "Raise this tool"
+msgstr "Das Werkzeug anheben"
 
 #: ../app/actions/tools-actions.c:63
 msgctxt "tools-action"
@@ -4358,7 +4621,8 @@ msgid "Ra_ise to Top"
 msgstr "Nach ganz _oben"
 
 #: ../app/actions/tools-actions.c:64
-msgid "Raise tool to top"
+msgctxt "tools-action"
+msgid "Raise this tool to the top"
 msgstr "Das Werkzeug nach ganz oben anheben"
 
 #: ../app/actions/tools-actions.c:69
@@ -4367,8 +4631,9 @@ msgid "L_ower Tool"
 msgstr "Werkzeug ab_senken"
 
 #: ../app/actions/tools-actions.c:70
-msgid "Lower tool"
-msgstr "Werkzeug absenken"
+msgctxt "tools-action"
+msgid "Lower this tool"
+msgstr "Das Werkzeug absenken"
 
 #: ../app/actions/tools-actions.c:75
 msgctxt "tools-action"
@@ -4376,7 +4641,8 @@ msgid "Lo_wer to Bottom"
 msgstr "Nach ganz _unten"
 
 #: ../app/actions/tools-actions.c:76
-msgid "Lower tool to bottom"
+msgctxt "tools-action"
+msgid "Lower this tool to the bottom"
 msgstr "Das Werkzeug nach ganz unten absenken"
 
 #: ../app/actions/tools-actions.c:81
@@ -4385,6 +4651,7 @@ msgid "_Reset Order & Visibility"
 msgstr "Ordnung und Sichtbarkeit _wiederherstellen"
 
 #: ../app/actions/tools-actions.c:82
+msgctxt "tools-action"
 msgid "Reset tool order and visibility"
 msgstr "Die Ordnung und Sichtbarkeit der Werkzeuge wiederherstellen"
 
@@ -4399,6 +4666,7 @@ msgid "_By Color"
 msgstr "Nach _Farbe"
 
 #: ../app/actions/tools-actions.c:100
+msgctxt "tools-action"
 msgid "Select regions with similar colors"
 msgstr "Bildbereiche mit ähnlichen Farben auswählen"
 
@@ -4408,6 +4676,7 @@ msgid "_Arbitrary Rotation..."
 msgstr "_Beliebig drehen …"
 
 #: ../app/actions/tools-actions.c:106
+msgctxt "tools-action"
 msgid "Rotate by an arbitrary angle"
 msgstr "Um einen beliebigen Winkel drehen"
 
@@ -4427,6 +4696,7 @@ msgid "_Edit Path Attributes..."
 msgstr "Pfadei_genschaften …"
 
 #: ../app/actions/vectors-actions.c:55
+msgctxt "vectors-action"
 msgid "Edit path attributes"
 msgstr "Pfadeigenschaften bearbeiten"
 
@@ -4436,6 +4706,7 @@ msgid "_New Path..."
 msgstr "_Neuer Pfad …"
 
 #: ../app/actions/vectors-actions.c:61
+msgctxt "vectors-action"
 msgid "Create a new path..."
 msgstr "Eine neue Vorlage erstellen"
 
@@ -4445,7 +4716,8 @@ msgid "_New Path with last values"
 msgstr "Neuer Pfad mit den aktuellen Werten"
 
 #: ../app/actions/vectors-actions.c:67
-msgid "Create a new path with last values"
+msgctxt "vectors-action"
+msgid "Create a new path with last used values"
 msgstr "Eine neue Ebene mit den zuletzt verwendeten Werten erstellen"
 
 #: ../app/actions/vectors-actions.c:72
@@ -4454,8 +4726,9 @@ msgid "D_uplicate Path"
 msgstr "Pfad _duplizieren"
 
 #: ../app/actions/vectors-actions.c:73
+msgctxt "vectors-action"
 msgid "Duplicate this path"
-msgstr "Pfad duplizieren"
+msgstr "Diesen Pfad duplizieren"
 
 #: ../app/actions/vectors-actions.c:78
 msgctxt "vectors-action"
@@ -4463,8 +4736,9 @@ msgid "_Delete Path"
 msgstr "Pfad _löschen"
 
 #: ../app/actions/vectors-actions.c:79
+msgctxt "vectors-action"
 msgid "Delete this path"
-msgstr "Pfad löschen"
+msgstr "Diesen Pfad löschen"
 
 #: ../app/actions/vectors-actions.c:84
 msgctxt "vectors-action"
@@ -4477,8 +4751,9 @@ msgid "_Raise Path"
 msgstr "Pfad _anheben"
 
 #: ../app/actions/vectors-actions.c:90
-msgid "Raise path"
-msgstr "Pfad anheben"
+msgctxt "vectors-action"
+msgid "Raise this path"
+msgstr "Diesen Pfad anheben"
 
 #: ../app/actions/vectors-actions.c:95
 msgctxt "vectors-action"
@@ -4486,8 +4761,9 @@ msgid "Raise Path to _Top"
 msgstr "Pfad nach ganz _oben"
 
 #: ../app/actions/vectors-actions.c:96
-msgid "Raise path to top"
-msgstr "Pfad nach ganz oben anheben"
+msgctxt "vectors-action"
+msgid "Raise this path to the top"
+msgstr "Diesen Pfad nach ganz oben anheben"
 
 #: ../app/actions/vectors-actions.c:101
 msgctxt "vectors-action"
@@ -4495,8 +4771,9 @@ msgid "_Lower Path"
 msgstr "Pfad a_bsenken"
 
 #: ../app/actions/vectors-actions.c:102
-msgid "Lower path"
-msgstr "Pfad absenken"
+msgctxt "vectors-action"
+msgid "Lower this path"
+msgstr "Diesen Pfad absenken"
 
 #: ../app/actions/vectors-actions.c:107
 msgctxt "vectors-action"
@@ -4504,8 +4781,9 @@ msgid "Lower Path to _Bottom"
 msgstr "Pfad nach ganz _unten"
 
 #: ../app/actions/vectors-actions.c:108
-msgid "Lower path to bottom"
-msgstr "Pfad nach ganz unten absenken"
+msgctxt "vectors-action"
+msgid "Lower this path to the bottom"
+msgstr "Diesen Pfad nach ganz unten absenken"
 
 #: ../app/actions/vectors-actions.c:113
 msgctxt "vectors-action"
@@ -4513,6 +4791,7 @@ msgid "Stro_ke Path..."
 msgstr "_Pfad nachziehen …"
 
 #: ../app/actions/vectors-actions.c:114
+msgctxt "vectors-action"
 msgid "Paint along the path"
 msgstr "Am Pfad entlang zeichnen"
 
@@ -4522,6 +4801,7 @@ msgid "Stro_ke Path"
 msgstr "Pfad _nachziehen"
 
 #: ../app/actions/vectors-actions.c:120
+msgctxt "vectors-action"
 msgid "Paint along the path with last values"
 msgstr "Mit den zuletzt benutzten Werten am Pfad entlang zeichnen"
 
@@ -4560,7 +4840,8 @@ msgctxt "vectors-action"
 msgid "Path to Sele_ction"
 msgstr "Aus_wahl aus Pfad"
 
-#: ../app/actions/vectors-actions.c:164 ../app/tools/gimpvectortool.c:1913
+#: ../app/actions/vectors-actions.c:164
+msgctxt "vectors-action"
 msgid "Path to selection"
 msgstr "Auswahl aus Pfad"
 
@@ -4570,6 +4851,7 @@ msgid "Fr_om Path"
 msgstr "_Vom Pfad"
 
 #: ../app/actions/vectors-actions.c:170
+msgctxt "vectors-action"
 msgid "Replace selection with path"
 msgstr "Die Auswahl durch den Pfad ersetzen"
 
@@ -4579,6 +4861,7 @@ msgid "_Add to Selection"
 msgstr "Zur Auswahl _hinzufügen"
 
 #: ../app/actions/vectors-actions.c:176
+msgctxt "vectors-action"
 msgid "Add path to selection"
 msgstr "Den Pfad der Auswahl hinzufügen"
 
@@ -4588,6 +4871,7 @@ msgid "_Subtract from Selection"
 msgstr "Von Auswahl ab_ziehen"
 
 #: ../app/actions/vectors-actions.c:182
+msgctxt "vectors-action"
 msgid "Subtract path from selection"
 msgstr "Den Pfas von der Auswahl abziehen"
 
@@ -4597,6 +4881,7 @@ msgid "_Intersect with Selection"
 msgstr "Schnittmenge _bilden"
 
 #: ../app/actions/vectors-actions.c:188
+msgctxt "vectors-action"
 msgid "Intersect path with selection"
 msgstr "Die Schnittmenge des Pfades mit der Auswahl bilden"
 
@@ -4606,6 +4891,7 @@ msgid "Selecti_on to Path"
 msgstr "P_fad aus Auswahl"
 
 #: ../app/actions/vectors-actions.c:197 ../app/actions/vectors-actions.c:203
+msgctxt "vectors-action"
 msgid "Selection to path"
 msgstr "Pfad aus Auswahl"
 
@@ -4621,6 +4907,7 @@ msgid "Selection to Path (_Advanced)"
 msgstr "Pfad aus Auswahl (_Erweitert)"
 
 #: ../app/actions/vectors-actions.c:209
+msgctxt "vectors-action"
 msgid "Advanced options"
 msgstr "Erweiterte Einstellungen"
 
@@ -4677,6 +4964,7 @@ msgid "_New View"
 msgstr "_Neue Ansicht"
 
 #: ../app/actions/view-actions.c:78
+msgctxt "view-action"
 msgid "Create another view on this image"
 msgstr "Eine neue Ansicht für das Bild erzeugen"
 
@@ -4686,6 +4974,7 @@ msgid "_Close"
 msgstr "_Schließen"
 
 #: ../app/actions/view-actions.c:84
+msgctxt "view-action"
 msgid "Close this image window"
 msgstr "Dieses Bildfenster schließen"
 
@@ -4695,6 +4984,7 @@ msgid "_Fit Image in Window"
 msgstr "Bild _in Fenster einpassen"
 
 #: ../app/actions/view-actions.c:90
+msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the image becomes fully visible"
 msgstr "Die Bildgröße so anpassen, dass das Bild vollständig sichtbar ist"
 
@@ -4704,6 +4994,7 @@ msgid "Fi_ll Window"
 msgstr "Fenster füllen"
 
 #: ../app/actions/view-actions.c:96
+msgctxt "view-action"
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr ""
 "Die Vergrößerung so anpassen, dass das Fenster vollständig ausgefüllt ist"
@@ -4714,6 +5005,7 @@ msgid "Re_vert Zoom"
 msgstr "_Vergrößerung zurücksetzen"
 
 #: ../app/actions/view-actions.c:102
+msgctxt "view-action"
 msgid "Restore the previous zoom level"
 msgstr "Vorherige Vergrößerungsstufe wiederherstellen"
 
@@ -4723,6 +5015,7 @@ msgid "Na_vigation Window"
 msgstr "Navi_gationsfenster"
 
 #: ../app/actions/view-actions.c:108
+msgctxt "view-action"
 msgid "Show an overview window for this image"
 msgstr "Eine Übersicht für dieses Bild anzeigen"
 
@@ -4732,6 +5025,7 @@ msgid "Display _Filters..."
 msgstr "Ansichts_filter …"
 
 #: ../app/actions/view-actions.c:114
+msgctxt "view-action"
 msgid "Configure filters applied to this view"
 msgstr "Auf diese Ansicht angewendete Filter einstellen"
 
@@ -4741,6 +5035,7 @@ msgid "Shrink _Wrap"
 msgstr "Fenster an_passen"
 
 #: ../app/actions/view-actions.c:120
+msgctxt "view-action"
 msgid "Reduce the image window to the size of the image display"
 msgstr "Größe des Bildfensters auf die Größe der Bildansicht reduzieren"
 
@@ -4749,12 +5044,18 @@ msgctxt "view-action"
 msgid "_Open Display..."
 msgstr "_Anzeige öffnen …"
 
+#: ../app/actions/view-actions.c:126
+msgctxt "view-action"
+msgid "Connect to another display"
+msgstr "Mit einer anderen Anzeige verbinden"
+
 #: ../app/actions/view-actions.c:134
 msgctxt "view-action"
 msgid "_Dot for Dot"
 msgstr "_Punkt für Punkt"
 
 #: ../app/actions/view-actions.c:135
+msgctxt "view-action"
 msgid "A pixel on the screen represents an image pixel"
 msgstr "Ein Pixel auf dem Bildschirms repräsentiert ein Pixel des Bildes"
 
@@ -4764,6 +5065,7 @@ msgid "Show _Selection"
 msgstr "_Auswahl anzeigen"
 
 #: ../app/actions/view-actions.c:142
+msgctxt "view-action"
 msgid "Display the selection outline"
 msgstr "Umriss der Auswahl anzeigen"
 
@@ -4773,6 +5075,7 @@ msgid "Show _Layer Boundary"
 msgstr "_Ebenenrahmen anzeigen"
 
 #: ../app/actions/view-actions.c:149
+msgctxt "view-action"
 msgid "Draw a border around the active layer"
 msgstr "Einen Rahmen um die aktive Ebene zeichnen"
 
@@ -4782,6 +5085,7 @@ msgid "Show _Guides"
 msgstr "_Hilfslinien anzeigen"
 
 #: ../app/actions/view-actions.c:156
+msgctxt "view-action"
 msgid "Display the image's guides"
 msgstr "Die Hilfslinien des Bildes anzeigen"
 
@@ -4791,6 +5095,7 @@ msgid "S_how Grid"
 msgstr "_Raster anzeigen"
 
 #: ../app/actions/view-actions.c:163
+msgctxt "view-action"
 msgid "Display the image's grid"
 msgstr "Das Bildraster anzeigen"
 
@@ -4800,6 +5105,7 @@ msgid "Show Sample Points"
 msgstr "Prüfpunkte anzeigen"
 
 #: ../app/actions/view-actions.c:170
+msgctxt "view-action"
 msgid "Display the image's color sample points"
 msgstr "Die Prüfpunkte des Bildes anzeigen"
 
@@ -4809,6 +5115,7 @@ msgid "Sn_ap to Guides"
 msgstr "_Magnetische Hilfslinien"
 
 #: ../app/actions/view-actions.c:177
+msgctxt "view-action"
 msgid "Tool operations snap to guides"
 msgstr "Werkzeugaktionen an den Hilfslinien einrasten"
 
@@ -4818,6 +5125,7 @@ msgid "Sna_p to Grid"
 msgstr "Magnetis_ches Raster"
 
 #: ../app/actions/view-actions.c:184
+msgctxt "view-action"
 msgid "Tool operations snap to the grid"
 msgstr "Werkzeugaktionen am Raster ausrichten"
 
@@ -4827,6 +5135,7 @@ msgid "Snap to _Canvas Edges"
 msgstr "An _Leinwandkanten einrasten"
 
 #: ../app/actions/view-actions.c:191
+msgctxt "view-action"
 msgid "Tool operations snap to the canvas edges"
 msgstr "Werkzeugaktionen an den Kanten der Zeichenfläche einrasten"
 
@@ -4836,6 +5145,7 @@ msgid "Snap t_o Active Path"
 msgstr "Am aktiven P_fad einrasten"
 
 #: ../app/actions/view-actions.c:198
+msgctxt "view-action"
 msgid "Tool operations snap to the active path"
 msgstr "Werkzeugaktionen am aktiven Pfad einrasten"
 
@@ -4845,6 +5155,7 @@ msgid "Show _Menubar"
 msgstr "Menüleis_te anzeigen"
 
 #: ../app/actions/view-actions.c:205
+msgctxt "view-action"
 msgid "Show this window's menubar"
 msgstr "Die Menüleiste dieses Fensters anzeigen"
 
@@ -4854,6 +5165,7 @@ msgid "Show R_ulers"
 msgstr "_Lineale anzeigen"
 
 #: ../app/actions/view-actions.c:212
+msgctxt "view-action"
 msgid "Show this window's rulers"
 msgstr "Die Lineale dieses Fensters anzeigen"
 
@@ -4863,6 +5175,7 @@ msgid "Show Scroll_bars"
 msgstr "_Bildlaufleisten anzeigen"
 
 #: ../app/actions/view-actions.c:219
+msgctxt "view-action"
 msgid "Show this window's scrollbars"
 msgstr "Die Bildlaufleisten dieses Fensters anzeigen"
 
@@ -4872,6 +5185,7 @@ msgid "Show S_tatusbar"
 msgstr "_Statusleiste anzeigen"
 
 #: ../app/actions/view-actions.c:226
+msgctxt "view-action"
 msgid "Show this window's statusbar"
 msgstr "Die Statusleiste dieses Fensters anzeigen"
 
@@ -4881,6 +5195,7 @@ msgid "Fullscr_een"
 msgstr "_Vollbild"
 
 #: ../app/actions/view-actions.c:233
+msgctxt "view-action"
 msgid "Toggle fullscreen view"
 msgstr "In Vollbildansicht umschalten"
 
@@ -4889,11 +5204,21 @@ msgctxt "view-zoom-action"
 msgid "Zoom _Out"
 msgstr "Ver_kleinern"
 
+#: ../app/actions/view-actions.c:265 ../app/actions/view-actions.c:277
+msgctxt "view-action"
+msgid "Zoom out"
+msgstr "Verkleinern"
+
 #: ../app/actions/view-actions.c:270
 msgctxt "view-zoom-action"
 msgid "Zoom _In"
 msgstr "Ver_größern"
 
+#: ../app/actions/view-actions.c:271 ../app/actions/view-actions.c:283
+msgctxt "view-action"
+msgid "Zoom in"
+msgstr "Vergrößern"
+
 #: ../app/actions/view-actions.c:276
 msgctxt "view-zoom-action"
 msgid "Zoom Out"
@@ -4910,6 +5235,7 @@ msgid "1_6:1  (1600%)"
 msgstr "1_6:1 (1600%)"
 
 #: ../app/actions/view-actions.c:302
+msgctxt "view-zoom-action"
 msgid "Zoom 16:1"
 msgstr "Maßstab 16:1"
 
@@ -4919,6 +5245,7 @@ msgid "_8:1  (800%)"
 msgstr "_8:1 (800%)"
 
 #: ../app/actions/view-actions.c:308
+msgctxt "view-zoom-action"
 msgid "Zoom 8:1"
 msgstr "Maßstab 8:1"
 
@@ -4928,6 +5255,7 @@ msgid "_4:1  (400%)"
 msgstr "_4:1 (400%)"
 
 #: ../app/actions/view-actions.c:314
+msgctxt "view-zoom-action"
 msgid "Zoom 4:1"
 msgstr "Maßstab 4:1"
 
@@ -4937,6 +5265,7 @@ msgid "_2:1  (200%)"
 msgstr "_2:1 (200%)"
 
 #: ../app/actions/view-actions.c:320
+msgctxt "view-zoom-action"
 msgid "Zoom 2:1"
 msgstr "Maßstab 2:1"
 
@@ -4946,6 +5275,7 @@ msgid "_1:1  (100%)"
 msgstr "_1:1 (100%)"
 
 #: ../app/actions/view-actions.c:326
+msgctxt "view-zoom-action"
 msgid "Zoom 1:1"
 msgstr "Maßstab 1:1"
 
@@ -4955,6 +5285,7 @@ msgid "1:_2  (50%)"
 msgstr "1:_2 (50%)"
 
 #: ../app/actions/view-actions.c:332
+msgctxt "view-zoom-action"
 msgid "Zoom 1:2"
 msgstr "Maßstab 2:1"
 
@@ -4964,6 +5295,7 @@ msgid "1:_4  (25%)"
 msgstr "1:_4 (25%)"
 
 #: ../app/actions/view-actions.c:338
+msgctxt "view-zoom-action"
 msgid "Zoom 1:4"
 msgstr "Maßstab 1:4"
 
@@ -4973,6 +5305,7 @@ msgid "1:_8  (12.5%)"
 msgstr "1:_8 (12.5%)"
 
 #: ../app/actions/view-actions.c:344
+msgctxt "view-zoom-action"
 msgid "Zoom 1:8"
 msgstr "Maßstab 1:8"
 
@@ -4982,6 +5315,7 @@ msgid "1:1_6  (6.25%)"
 msgstr "1:1_6 (6.25%)"
 
 #: ../app/actions/view-actions.c:350
+msgctxt "view-zoom-action"
 msgid "Zoom 1:16"
 msgstr "Maßstab 1:16"
 
@@ -4991,6 +5325,7 @@ msgid "Othe_r..."
 msgstr "_Benutzerdefiniert …"
 
 #: ../app/actions/view-actions.c:356
+msgctxt "view-zoom-action"
 msgid "Set a custom zoom factor"
 msgstr "Einen benutzerdefinierten Vergrößerungsfaktor setzen"
 
@@ -5000,6 +5335,7 @@ msgid "From _Theme"
 msgstr "Dem _Thema entsprechend"
 
 #: ../app/actions/view-actions.c:365
+msgctxt "view-padding-color"
 msgid "Use the current theme's background color"
 msgstr "Die Hintergrundfarbe des aktuellen Themas verwenden"
 
@@ -5009,6 +5345,7 @@ msgid "_Light Check Color"
 msgstr "H_elle Schachbrettfarbe"
 
 #: ../app/actions/view-actions.c:371
+msgctxt "view-padding-color"
 msgid "Use the light check color"
 msgstr "Helle Schachbrettfarbe verwenden"
 
@@ -5018,6 +5355,7 @@ msgid "_Dark Check Color"
 msgstr "_Dunkle Schachbrettfarbe"
 
 #: ../app/actions/view-actions.c:377
+msgctxt "view-padding-color"
 msgid "Use the dark check color"
 msgstr "Dunkle Schachbrettfarbe verwenden"
 
@@ -5027,6 +5365,7 @@ msgid "Select _Custom Color..."
 msgstr "_Benutzerdefinierte Farbe wählen …"
 
 #: ../app/actions/view-actions.c:383
+msgctxt "view-padding-color"
 msgid "Use an arbitrary color"
 msgstr "Eine beliebige Farbe verwenden"
 
@@ -5035,25 +5374,26 @@ msgctxt "view-padding-color"
 msgid "As in _Preferences"
 msgstr "Den _Einstellungen entsprechend"
 
-#: ../app/actions/view-actions.c:389
+#: ../app/actions/view-actions.c:390
+msgctxt "view-padding-color"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "Abstandsfarbe zur eingestellten Standardfarbe zurücksetzen"
 
-#: ../app/actions/view-actions.c:580
+#: ../app/actions/view-actions.c:581
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "_Vergrößerung (%d%%) zurücksetzen"
 
-#: ../app/actions/view-actions.c:588
+#: ../app/actions/view-actions.c:589
 msgid "Re_vert Zoom"
 msgstr "_Vergrößerung zurücksetzen"
 
-#: ../app/actions/view-actions.c:718
+#: ../app/actions/view-actions.c:719
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "A_ndere (%s) …"
 
-#: ../app/actions/view-actions.c:727
+#: ../app/actions/view-actions.c:728
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_Vergrößerung (%s)"
@@ -5097,6 +5437,7 @@ msgid "Tool_box"
 msgstr "_Werkzeugkasten"
 
 #: ../app/actions/windows-actions.c:89
+msgctxt "windows-action"
 msgid "Raise the toolbox"
 msgstr "Werkzeugkasten anheben"
 
@@ -7900,6 +8241,10 @@ msgctxt "plural"
 msgid "percent"
 msgstr "Prozent"
 
+#: ../app/dialogs/about-dialog.c:114 ../app/gui/gui.c:473
+msgid "About GIMP"
+msgstr "Informationen zu GIMP"
+
 #: ../app/dialogs/about-dialog.c:123
 msgid "Visit the GIMP website"
 msgstr "Die Internet-Seite von GIMP öffnen"
@@ -9581,6 +9926,10 @@ msgstr "Auf das Bildmenü zugreifen"
 msgid "Zoom image when window size changes"
 msgstr "Bild vergrößern, wenn die Fenstergröße sich ändert"
 
+#: ../app/display/gimpdisplayshell.c:1183
+msgid "Toggle Quick Mask"
+msgstr "Schnellmaske umschalten"
+
 #: ../app/display/gimpdisplayshell.c:1204
 msgid "Navigate the image display"
 msgstr "In der Bildansicht navigieren"
@@ -9726,7 +10075,7 @@ msgstr "(bereinigt)"
 
 #: ../app/display/gimpdisplayshell-title.c:342
 #: ../app/display/gimpdisplayshell-title.c:355
-#: ../app/widgets/gimpactiongroup.c:859
+#: ../app/widgets/gimpactiongroup.c:889
 msgid "(none)"
 msgstr "(kein)"
 
@@ -12473,6 +12822,10 @@ msgstr "Klicken Sie um den Knoten abzuwinkeln"
 msgid "Delete Anchors"
 msgstr "Anker löschen"
 
+#: ../app/tools/gimpvectortool.c:1913
+msgid "Path to selection"
+msgstr "Auswahl aus Pfad"
+
 #: ../app/tools/gimpvectortool.c:1940
 msgid "There is no active layer or channel to stroke to"
 msgstr ""
@@ -12657,7 +13010,7 @@ msgstr "Fehler beim Pfad-Import aus »%s«: %s"
 msgid "_Search:"
 msgstr "_Suche:"
 
-#: ../app/widgets/gimpactiongroup.c:856
+#: ../app/widgets/gimpactiongroup.c:886
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
@@ -14114,3 +14467,20 @@ msgstr "Bitte stellen Sie sicher, dass der Werkzeugkasten sichtbar ist!"
 msgid "Couldn't start '%s': %s"
 msgstr "»%s« konnte nicht gestartet werden: %s"
 
+#~ msgid "Remove dangling entries"
+#~ msgstr "Hängende Einträge entfernen"
+
+#~ msgid "Save error log"
+#~ msgstr "Fehlerprotokoll speichern"
+
+#~ msgid "Save selection"
+#~ msgstr "Auswahl speichern"
+
+#~ msgid "Rescan font list"
+#~ msgstr "Schriftenliste neu einlesen"
+
+#~ msgid "Delete this color"
+#~ msgstr "Diese Farbe löschen"
+
+#~ msgid "Raise tool"
+#~ msgstr "Werkzeug anheben"