diff --git a/app/actions/brush-editor-actions.c b/app/actions/brush-editor-actions.c
index df7d821e95..376232fdb7 100644
--- a/app/actions/brush-editor-actions.c
+++ b/app/actions/brush-editor-actions.c
@@ -40,14 +40,14 @@
 static const GimpActionEntry brush_editor_actions[] =
 {
   { "brush-editor-popup", GIMP_ICON_BRUSH,
-    NC_("brush-editor-action", "Brush Editor Menu"), { NULL }, NULL, NULL,
+    NC_("brush-editor-action", "Brush Editor Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_BRUSH_EDITOR_DIALOG }
 };
 
 static const GimpToggleActionEntry brush_editor_toggle_actions[] =
 {
   { "brush-editor-edit-active", GIMP_ICON_LINKED,
-    NC_("brush-editor-action", "Edit Active Brush"), { NULL }, NULL,
+    NC_("brush-editor-action", "Edit Active Brush"), NULL, { NULL }, NULL,
     data_editor_edit_active_cmd_callback,
     FALSE,
     GIMP_HELP_BRUSH_EDITOR_EDIT_ACTIVE }
diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c
index 8d8b6be198..24e7b98ff4 100644
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@@ -40,47 +40,47 @@
 static const GimpActionEntry brushes_actions[] =
 {
   { "brushes-popup", GIMP_ICON_BRUSH,
-    NC_("brushes-action", "Brushes Menu"), { NULL }, NULL, NULL,
+    NC_("brushes-action", "Brushes Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_BRUSH_DIALOG },
 
   { "brushes-open-as-image", GIMP_ICON_DOCUMENT_OPEN,
-    NC_("brushes-action", "_Open Brush as Image"), { NULL },
+    NC_("brushes-action", "_Open Brush as Image"), NULL, { NULL },
     NC_("brushes-action", "Open brush as image"),
     data_open_as_image_cmd_callback,
     GIMP_HELP_BRUSH_OPEN_AS_IMAGE },
 
   { "brushes-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("brushes-action", "_New Brush"), { NULL },
+    NC_("brushes-action", "_New Brush"), NULL, { NULL },
     NC_("brushes-action", "Create a new brush"),
     data_new_cmd_callback,
     GIMP_HELP_BRUSH_NEW },
 
   { "brushes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("brushes-action", "D_uplicate Brush"), { NULL },
+    NC_("brushes-action", "D_uplicate Brush"), NULL, { NULL },
     NC_("brushes-action", "Duplicate this brush"),
     data_duplicate_cmd_callback,
     GIMP_HELP_BRUSH_DUPLICATE },
 
   { "brushes-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("brushes-action", "Copy Brush _Location"), { NULL },
+    NC_("brushes-action", "Copy Brush _Location"), NULL, { NULL },
     NC_("brushes-action", "Copy brush file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_BRUSH_COPY_LOCATION },
 
   { "brushes-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("brushes-action", "Show in _File Manager"), { NULL },
+    NC_("brushes-action", "Show in _File Manager"), NULL, { NULL },
     NC_("brushes-action", "Show brush file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_BRUSH_SHOW_IN_FILE_MANAGER },
 
   { "brushes-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("brushes-action", "_Delete Brush"), { NULL },
+    NC_("brushes-action", "_Delete Brush"), NULL, { NULL },
     NC_("brushes-action", "Delete this brush"),
     data_delete_cmd_callback,
     GIMP_HELP_BRUSH_DELETE },
 
   { "brushes-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("brushes-action", "_Refresh Brushes"), { NULL },
+    NC_("brushes-action", "_Refresh Brushes"), NULL, { NULL },
     NC_("brushes-action", "Refresh brushes"),
     data_refresh_cmd_callback,
     GIMP_HELP_BRUSH_REFRESH }
@@ -89,7 +89,7 @@ static const GimpActionEntry brushes_actions[] =
 static const GimpStringActionEntry brushes_edit_actions[] =
 {
   { "brushes-edit", GIMP_ICON_EDIT,
-    NC_("brushes-action", "_Edit Brush..."), { NULL },
+    NC_("brushes-action", "_Edit Brush..."), NULL, { NULL },
     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 abd37b7a03..4f912841f8 100644
--- a/app/actions/buffers-actions.c
+++ b/app/actions/buffers-actions.c
@@ -39,17 +39,17 @@
 static const GimpActionEntry buffers_actions[] =
 {
   { "buffers-popup", GIMP_ICON_BUFFER,
-    NC_("buffers-action", "Buffers Menu"), { NULL }, NULL, NULL,
+    NC_("buffers-action", "Buffers Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_BUFFER_DIALOG },
 
   { "buffers-paste-as-new-image", GIMP_ICON_EDIT_PASTE_AS_NEW,
-    NC_("buffers-action", "Paste Buffer as _New Image"), { NULL },
+    NC_("buffers-action", "Paste Buffer as _New Image"), NULL, { NULL },
     NC_("buffers-action", "Paste the selected buffer as a new image"),
     buffers_paste_as_new_image_cmd_callback,
     GIMP_HELP_BUFFER_PASTE_AS_NEW_IMAGE },
 
   { "buffers-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("buffers-action", "_Delete Buffer"), { NULL },
+    NC_("buffers-action", "_Delete Buffer"), NULL, { NULL },
     NC_("buffers-action", "Delete the selected buffer"),
     buffers_delete_cmd_callback,
     GIMP_HELP_BUFFER_DELETE }
@@ -58,38 +58,38 @@ static const GimpActionEntry buffers_actions[] =
 static const GimpEnumActionEntry buffers_paste_actions[] =
 {
   { "buffers-paste", GIMP_ICON_EDIT_PASTE,
-    NC_("buffers-action", "_Paste Buffer"), { NULL },
+    NC_("buffers-action", "_Paste Buffer"), NULL, { NULL },
     NC_("buffers-action", "Paste the selected buffer"),
     GIMP_PASTE_TYPE_FLOATING, FALSE,
     GIMP_HELP_BUFFER_PASTE },
 
   { "buffers-paste-in-place", GIMP_ICON_EDIT_PASTE,
-    NC_("buffers-action", "Paste Buffer In Pl_ace"), { NULL },
+    NC_("buffers-action", "Paste Buffer In Pl_ace"), NULL, { NULL },
     NC_("buffers-action", "Paste the selected buffer at its original position"),
     GIMP_PASTE_TYPE_FLOATING_IN_PLACE, FALSE,
     GIMP_HELP_BUFFER_PASTE_IN_PLACE },
 
   { "buffers-paste-into", GIMP_ICON_EDIT_PASTE_INTO,
-    NC_("buffers-action", "Paste Buffer _Into The Selection"), { NULL },
+    NC_("buffers-action", "Paste Buffer _Into The Selection"), NULL, { NULL },
     NC_("buffers-action", "Paste the selected buffer into the selection"),
     GIMP_PASTE_TYPE_FLOATING_INTO, FALSE,
     GIMP_HELP_BUFFER_PASTE_INTO },
 
   { "buffers-paste-into-in-place", GIMP_ICON_EDIT_PASTE_INTO,
-    NC_("buffers-action", "Paste Buffer Into The Selection In Place"), { NULL },
+    NC_("buffers-action", "Paste Buffer Into The Selection In Place"), NULL, { NULL },
     NC_("buffers-action",
         "Paste the selected buffer into the selection at its original position"),
     GIMP_PASTE_TYPE_FLOATING_INTO_IN_PLACE, FALSE,
     GIMP_HELP_BUFFER_PASTE_INTO_IN_PLACE },
 
   { "buffers-paste-as-new-layer", GIMP_ICON_EDIT_PASTE_AS_NEW,
-    NC_("buffers-action", "Paste Buffer as New _Layer"), { NULL },
+    NC_("buffers-action", "Paste Buffer as New _Layer"), NULL, { NULL },
     NC_("buffers-action", "Paste the selected buffer as a new layer"),
     GIMP_PASTE_TYPE_NEW_LAYER, FALSE,
     GIMP_HELP_BUFFER_PASTE_AS_NEW_LAYER },
 
   { "buffers-paste-as-new-layer-in-place", GIMP_ICON_EDIT_PASTE_AS_NEW,
-    NC_("buffers-action", "Paste Buffer as New Layer in Place"), { NULL },
+    NC_("buffers-action", "Paste Buffer as New Layer in Place"), NULL, { NULL },
     NC_("buffers-action",
         "Paste the selected buffer as a new layer at its original position"),
     GIMP_PASTE_TYPE_NEW_LAYER_IN_PLACE, FALSE,
diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c
index 0308322066..5d9070cbaa 100644
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@@ -42,65 +42,65 @@
 static const GimpActionEntry channels_actions[] =
 {
   { "channels-popup", GIMP_ICON_DIALOG_CHANNELS,
-    NC_("channels-action", "Channels Menu"), { NULL }, NULL, NULL,
+    NC_("channels-action", "Channels Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_CHANNEL_DIALOG },
 
   { "channels-color-tag-menu", NULL,
-    NC_("channels-action", "Color Tag"), { NULL }, NULL, NULL,
+    NC_("channels-action", "Color Tag"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-edit-attributes", GIMP_ICON_EDIT,
-    NC_("channels-action", "_Edit Channel Attributes..."), { NULL },
+    NC_("channels-action", "_Edit Channel Attributes..."), NULL, { NULL },
     NC_("channels-action", "Edit the channel's name, color and opacity"),
     channels_edit_attributes_cmd_callback,
     GIMP_HELP_CHANNEL_EDIT },
 
   { "channels-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("channels-action", "_New Channel..."), { NULL },
+    NC_("channels-action", "_New Channel..."), NULL, { NULL },
     NC_("channels-action", "Create a new channel"),
     channels_new_cmd_callback,
     GIMP_HELP_CHANNEL_NEW },
 
   { "channels-new-last-values", GIMP_ICON_DOCUMENT_NEW,
-    NC_("channels-action", "_New Channel"), { NULL },
+    NC_("channels-action", "_New Channel"), NULL, { NULL },
     NC_("channels-action", "Create a new channel with last used values"),
     channels_new_last_vals_cmd_callback,
     GIMP_HELP_CHANNEL_NEW },
 
   { "channels-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("channels-action", "D_uplicate Channels"), { NULL },
+    NC_("channels-action", "D_uplicate Channels"), NULL, { NULL },
     NC_("channels-action",
         "Create duplicates of selected channels and add them to the image"),
     channels_duplicate_cmd_callback,
     GIMP_HELP_CHANNEL_DUPLICATE },
 
   { "channels-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("channels-action", "_Delete Channels"), { NULL },
+    NC_("channels-action", "_Delete Channels"), NULL, { NULL },
     NC_("channels-action", "Delete selected channels"),
     channels_delete_cmd_callback,
     GIMP_HELP_CHANNEL_DELETE },
 
   { "channels-raise", GIMP_ICON_GO_UP,
-    NC_("channels-action", "_Raise Channels"), { NULL },
+    NC_("channels-action", "_Raise Channels"), NULL, { NULL },
     NC_("channels-action", "Raise these channels one step in the channel stack"),
     channels_raise_cmd_callback,
     GIMP_HELP_CHANNEL_RAISE },
 
   { "channels-raise-to-top", GIMP_ICON_GO_TOP,
-    NC_("channels-action", "Raise Channels to _Top"), { NULL },
+    NC_("channels-action", "Raise Channels to _Top"), NULL, { NULL },
     NC_("channels-action",
         "Raise these channels to the top of the channel stack"),
     channels_raise_to_top_cmd_callback,
     GIMP_HELP_CHANNEL_RAISE_TO_TOP },
 
   { "channels-lower", GIMP_ICON_GO_DOWN,
-    NC_("channels-action", "_Lower Channels"), { NULL },
+    NC_("channels-action", "_Lower Channels"), NULL, { NULL },
     NC_("channels-action", "Lower these channels one step in the channel stack"),
     channels_lower_cmd_callback,
     GIMP_HELP_CHANNEL_LOWER },
 
   { "channels-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
-    NC_("channels-action", "Lower Channels to _Bottom"), { NULL },
+    NC_("channels-action", "Lower Channels to _Bottom"), NULL, { NULL },
     NC_("channels-action",
         "Lower these channels to the bottom of the channel stack"),
     channels_lower_to_bottom_cmd_callback,
@@ -110,19 +110,19 @@ static const GimpActionEntry channels_actions[] =
 static const GimpToggleActionEntry channels_toggle_actions[] =
 {
   { "channels-visible", GIMP_ICON_VISIBLE,
-    NC_("channels-action", "Toggle Channel _Visibility"), { NULL }, NULL,
+    NC_("channels-action", "Toggle Channel _Visibility"), NULL, { NULL }, NULL,
     channels_visible_cmd_callback,
     FALSE,
     GIMP_HELP_CHANNEL_VISIBLE },
 
   { "channels-lock-content", GIMP_ICON_LOCK_CONTENT,
-    NC_("channels-action", "L_ock Pixels of Channel"), { NULL }, NULL,
+    NC_("channels-action", "L_ock Pixels of Channel"), NULL, { NULL }, NULL,
     channels_lock_content_cmd_callback,
     FALSE,
     GIMP_HELP_CHANNEL_LOCK_PIXELS },
 
   { "channels-lock-position", GIMP_ICON_LOCK_POSITION,
-    NC_("channels-action", "L_ock Position of Channel"), { NULL }, NULL,
+    NC_("channels-action", "L_ock Position of Channel"), NULL, { NULL }, NULL,
     channels_lock_position_cmd_callback,
     FALSE,
     GIMP_HELP_CHANNEL_LOCK_POSITION }
@@ -131,55 +131,55 @@ static const GimpToggleActionEntry channels_toggle_actions[] =
 static const GimpEnumActionEntry channels_color_tag_actions[] =
 {
   { "channels-color-tag-none", GIMP_ICON_EDIT_CLEAR,
-    NC_("channels-action", "None"), { NULL },
+    NC_("channels-action", "None"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Clear"),
     GIMP_COLOR_TAG_NONE, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-blue", NULL,
-    NC_("channels-action", "Blue"), { NULL },
+    NC_("channels-action", "Blue"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Blue"),
     GIMP_COLOR_TAG_BLUE, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-green", NULL,
-    NC_("channels-action", "Green"), { NULL },
+    NC_("channels-action", "Green"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Green"),
     GIMP_COLOR_TAG_GREEN, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-yellow", NULL,
-    NC_("channels-action", "Yellow"), { NULL },
+    NC_("channels-action", "Yellow"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Yellow"),
     GIMP_COLOR_TAG_YELLOW, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-orange", NULL,
-    NC_("channels-action", "Orange"), { NULL },
+    NC_("channels-action", "Orange"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Orange"),
     GIMP_COLOR_TAG_ORANGE, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-brown", NULL,
-    NC_("channels-action", "Brown"), { NULL },
+    NC_("channels-action", "Brown"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Brown"),
     GIMP_COLOR_TAG_BROWN, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-red", NULL,
-    NC_("channels-action", "Red"), { NULL },
+    NC_("channels-action", "Red"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Red"),
     GIMP_COLOR_TAG_RED, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-violet", NULL,
-    NC_("channels-action", "Violet"), { NULL },
+    NC_("channels-action", "Violet"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Violet"),
     GIMP_COLOR_TAG_VIOLET, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG },
 
   { "channels-color-tag-gray", NULL,
-    NC_("channels-action", "Gray"), { NULL },
+    NC_("channels-action", "Gray"), NULL, { NULL },
     NC_("channels-action", "Channel Color Tag: Set to Gray"),
     GIMP_COLOR_TAG_GRAY, FALSE,
     GIMP_HELP_CHANNEL_COLOR_TAG }
@@ -188,25 +188,25 @@ static const GimpEnumActionEntry channels_color_tag_actions[] =
 static const GimpEnumActionEntry channels_to_selection_actions[] =
 {
   { "channels-selection-replace", GIMP_ICON_SELECTION_REPLACE,
-    NC_("channels-action", "Channels to Sele_ction"), { NULL },
+    NC_("channels-action", "Channels to Sele_ction"), NULL, { NULL },
     NC_("channels-action", "Replace the selection with selected channels"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_REPLACE },
 
   { "channels-selection-add", GIMP_ICON_SELECTION_ADD,
-    NC_("channels-action", "_Add Channels to Selection"), { NULL },
+    NC_("channels-action", "_Add Channels to Selection"), NULL, { NULL },
     NC_("channels-action", "Add selected channels to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_ADD },
 
   { "channels-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
-    NC_("channels-action", "_Subtract Channels from Selection"), { NULL },
+    NC_("channels-action", "_Subtract Channels from Selection"), NULL, { NULL },
     NC_("channels-action", "Subtract selected channels from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_SUBTRACT },
 
   { "channels-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
-    NC_("channels-action", "_Intersect Channels with Selection"), { NULL },
+    NC_("channels-action", "_Intersect Channels with Selection"), NULL, { NULL },
     NC_("channels-action", "Intersect selected channels with the current selection and each other"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_CHANNEL_SELECTION_INTERSECT }
@@ -215,25 +215,25 @@ static const GimpEnumActionEntry channels_to_selection_actions[] =
 static const GimpEnumActionEntry channels_select_actions[] =
 {
   { "channels-select-top", NULL,
-    NC_("channels-action", "Select _Top Channel"), { NULL },
+    NC_("channels-action", "Select _Top Channel"), NULL, { NULL },
     NC_("channels-action", "Select the topmost channel"),
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_CHANNEL_TOP },
 
   { "channels-select-bottom", NULL,
-    NC_("channels-action", "Select _Bottom Channel"), { NULL },
+    NC_("channels-action", "Select _Bottom Channel"), NULL, { NULL },
     NC_("channels-action", "Select the bottommost channel"),
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_CHANNEL_BOTTOM },
 
   { "channels-select-previous", NULL,
-    NC_("channels-action", "Select _Previous Channels"), { NULL },
+    NC_("channels-action", "Select _Previous Channels"), NULL, { NULL },
     NC_("channels-action", "Select the channels above the selected channels"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_CHANNEL_PREVIOUS },
 
   { "channels-select-next", NULL,
-    NC_("channels-action", "Select _Next Channels"), { NULL },
+    NC_("channels-action", "Select _Next Channels"), NULL, { NULL },
     NC_("channels-action", "Select the channels below the selected channels"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_CHANNEL_NEXT }
diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c
index 483b44adb0..1b3db9b5db 100644
--- a/app/actions/colormap-actions.c
+++ b/app/actions/colormap-actions.c
@@ -42,11 +42,11 @@
 static const GimpActionEntry colormap_actions[] =
 {
   { "colormap-popup", GIMP_ICON_COLORMAP,
-    NC_("colormap-action", "Colormap Menu"), { NULL }, NULL, NULL,
+    NC_("colormap-action", "Colormap Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
   { "colormap-edit-color", GIMP_ICON_EDIT,
-    NC_("colormap-action", "_Edit Color..."), { NULL },
+    NC_("colormap-action", "_Edit Color..."), NULL, { NULL },
     NC_("colormap-action", "Edit this color"),
     colormap_edit_color_cmd_callback,
     GIMP_HELP_INDEXED_PALETTE_EDIT }
@@ -55,13 +55,13 @@ static const GimpActionEntry colormap_actions[] =
 static const GimpEnumActionEntry colormap_add_color_actions[] =
 {
   { "colormap-add-color-from-fg", GIMP_ICON_LIST_ADD,
-    NC_("colormap-action", "_Add Color from FG"), { NULL },
+    NC_("colormap-action", "_Add Color from FG"), NULL, { NULL },
     NC_("colormap-action", "Add current foreground color"),
     FALSE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_ADD },
 
   { "colormap-add-color-from-bg", GIMP_ICON_LIST_ADD,
-    NC_("colormap-action", "_Add Color from BG"), { NULL },
+    NC_("colormap-action", "_Add Color from BG"), NULL, { NULL },
     NC_("colormap-action", "Add current background color"),
     TRUE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_ADD }
@@ -70,25 +70,25 @@ static const GimpEnumActionEntry colormap_add_color_actions[] =
 static const GimpEnumActionEntry colormap_to_selection_actions[] =
 {
   { "colormap-selection-replace", GIMP_ICON_SELECTION_REPLACE,
-    NC_("colormap-action", "_Select this Color"), { NULL },
+    NC_("colormap-action", "_Select this Color"), NULL, { NULL },
     NC_("colormap-action", "Select all pixels with this color"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_REPLACE },
 
   { "colormap-selection-add", GIMP_ICON_SELECTION_ADD,
-    NC_("colormap-action", "_Add to Selection"), { NULL },
+    NC_("colormap-action", "_Add to Selection"), NULL, { NULL },
     NC_("colormap-action", "Add all pixels with this color to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_ADD },
 
   { "colormap-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
-    NC_("colormap-action", "_Subtract from Selection"), { NULL },
+    NC_("colormap-action", "_Subtract from Selection"), NULL, { NULL },
     NC_("colormap-action", "Subtract all pixels with this color from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_SUBTRACT },
 
   { "colormap-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
-    NC_("colormap-action", "_Intersect with Selection"), { NULL },
+    NC_("colormap-action", "_Intersect with Selection"), NULL, { NULL },
     NC_("colormap-action", "Intersect all pixels with this color with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_INDEXED_PALETTE_SELECTION_INTERSECT }
diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c
index 6187394975..bd7325838f 100644
--- a/app/actions/context-actions.c
+++ b/app/actions/context-actions.c
@@ -78,14 +78,14 @@ static const GimpActionEntry context_actions[] =
                                                              "A_ngle")      },
 
   { "context-colors-default", GIMP_ICON_COLORS_DEFAULT,
-    NC_("context-action", "_Default Colors"), { "D", NULL },
+    NC_("context-action", "_Default Colors"), NULL, { "D", NULL },
     NC_("context-action",
         "Set foreground color to black, background color to white"),
     context_colors_default_cmd_callback,
     GIMP_HELP_TOOLBOX_DEFAULT_COLORS },
 
   { "context-colors-swap", GIMP_ICON_COLORS_SWAP,
-    NC_("context-action", "S_wap Colors"), { "X", NULL },
+    NC_("context-action", "S_wap Colors"), NULL, { "X", NULL },
     NC_("context-action", "Exchange foreground and background colors"),
     context_colors_swap_cmd_callback,
     GIMP_HELP_TOOLBOX_SWAP_COLORS }
@@ -94,31 +94,31 @@ static const GimpActionEntry context_actions[] =
 static GimpEnumActionEntry context_palette_foreground_actions[] =
 {
   { "context-palette-foreground-set", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Set Color From Palette"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Set Color From Palette"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-palette-foreground-first", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use First Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use First Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-palette-foreground-last", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use Last Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Last Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-palette-foreground-previous", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use Previous Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Previous Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-palette-foreground-next", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use Next Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Next Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-palette-foreground-previous-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Skip Back Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Skip Back Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-palette-foreground-next-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Skip Forward Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Skip Forward Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -126,31 +126,31 @@ static GimpEnumActionEntry context_palette_foreground_actions[] =
 static GimpEnumActionEntry context_palette_background_actions[] =
 {
   { "context-palette-background-set", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Set Color From Palette"), { NULL }, NULL,
+    NC_("context-action", "Background: Set Color From Palette"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-palette-background-first", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use First Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Background: Use First Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-palette-background-last", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use Last Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Last Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-palette-background-previous", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use Previous Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Previous Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-palette-background-next", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use Next Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Next Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-palette-background-previous-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Skip Back Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Background: Skip Back Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-palette-background-next-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Skip Forward Palette Color"), { NULL }, NULL,
+    NC_("context-action", "Background: Skip Forward Palette Color"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -158,31 +158,31 @@ static GimpEnumActionEntry context_palette_background_actions[] =
 static GimpEnumActionEntry context_colormap_foreground_actions[] =
 {
   { "context-colormap-foreground-set", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Set Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Set Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-colormap-foreground-first", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Use First Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use First Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-colormap-foreground-last", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Use Last Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Last Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-colormap-foreground-previous", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Use Previous Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Previous Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-foreground-next", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Use Next Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Next Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-colormap-foreground-previous-skip", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Skip Back Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Skip Back Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-foreground-next-skip", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Foreground: Skip Forward Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Skip Forward Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -190,31 +190,31 @@ static GimpEnumActionEntry context_colormap_foreground_actions[] =
 static GimpEnumActionEntry context_colormap_background_actions[] =
 {
   { "context-colormap-background-set", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Set Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Set Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-colormap-background-first", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Use First Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Use First Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-colormap-background-last", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Use Last Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Last Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-colormap-background-previous", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Use Previous Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Previous Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-background-next", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Use Next Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Next Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-colormap-background-previous-skip", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Skip Back Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Skip Back Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-colormap-background-next-skip", GIMP_ICON_COLORMAP,
-    NC_("context-action", "Background: Skip Forward Color From Colormap"), { NULL }, NULL,
+    NC_("context-action", "Background: Skip Forward Color From Colormap"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -222,31 +222,31 @@ static GimpEnumActionEntry context_colormap_background_actions[] =
 static GimpEnumActionEntry context_swatch_foreground_actions[] =
 {
   { "context-swatch-foreground-set", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Set Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Set Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-swatch-foreground-first", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use First Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use First Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-swatch-foreground-last", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use Last Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Use Last Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-swatch-foreground-previous", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use Previous Color From Swatch"), { "9", NULL }, NULL,
+    NC_("context-action", "Foreground: Use Previous Color From Swatch"), NULL, { "9", NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-foreground-next", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Use Next Color From Swatch"), { "0", NULL }, NULL,
+    NC_("context-action", "Foreground: Use Next Color From Swatch"), NULL, { "0", NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-swatch-foreground-previous-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Skip Back Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Skip Back Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-foreground-next-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Foreground: Skip Forward Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Foreground: Skip Forward Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -254,31 +254,31 @@ static GimpEnumActionEntry context_swatch_foreground_actions[] =
 static GimpEnumActionEntry context_swatch_background_actions[] =
 {
   { "context-swatch-background-set", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Set Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Set Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, FALSE,
     NULL },
   { "context-swatch-background-first", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use First Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Use First Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-swatch-background-last", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use Last Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Last Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-swatch-background-previous", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use Previous Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Previous Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-background-next", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Use Next Color From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Use Next Color From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-swatch-background-previous-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Skip Color Back From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Skip Color Back From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-swatch-background-next-skip", GIMP_ICON_PALETTE,
-    NC_("context-action", "Background: Skip Color Forward From Swatch"), { NULL }, NULL,
+    NC_("context-action", "Background: Skip Color Forward From Swatch"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -286,31 +286,31 @@ static GimpEnumActionEntry context_swatch_background_actions[] =
 static const GimpEnumActionEntry context_foreground_red_actions[] =
 {
   { "context-foreground-red-set", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Set"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-foreground-red-minimum", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-foreground-red-maximum", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-foreground-red-decrease", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-red-increase", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-foreground-red-decrease-skip", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-red-increase-skip", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Foreground Red: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Red: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -318,31 +318,31 @@ static const GimpEnumActionEntry context_foreground_red_actions[] =
 static const GimpEnumActionEntry context_foreground_green_actions[] =
 {
   { "context-foreground-green-set", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Set"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-foreground-green-minimum", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-foreground-green-maximum", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-foreground-green-decrease", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-green-increase", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-foreground-green-decrease-skip", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-green-increase-skip", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Foreground Green: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Green: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -350,31 +350,31 @@ static const GimpEnumActionEntry context_foreground_green_actions[] =
 static const GimpEnumActionEntry context_foreground_blue_actions[] =
 {
   { "context-foreground-blue-set", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Set"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-foreground-blue-minimum", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-foreground-blue-maximum", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-foreground-blue-decrease", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-blue-increase", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-foreground-blue-decrease-skip", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-blue-increase-skip", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Foreground Blue: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Blue: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -382,31 +382,31 @@ static const GimpEnumActionEntry context_foreground_blue_actions[] =
 static const GimpEnumActionEntry context_background_red_actions[] =
 {
   { "context-background-red-set", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Set"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-background-red-minimum", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-background-red-maximum", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-background-red-decrease", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-background-red-increase", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-background-red-decrease-skip", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-background-red-increase-skip", GIMP_ICON_CHANNEL_RED,
-    NC_("context-action", "Background Red: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Red: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -414,31 +414,31 @@ static const GimpEnumActionEntry context_background_red_actions[] =
 static const GimpEnumActionEntry context_background_green_actions[] =
 {
   { "context-background-green-set", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Set"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-background-green-minimum", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-background-green-maximum", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-background-green-decrease", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-background-green-increase", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-background-green-decrease-skip", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-background-green-increase-skip", GIMP_ICON_CHANNEL_GREEN,
-    NC_("context-action", "Background Green: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Green: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -446,31 +446,31 @@ static const GimpEnumActionEntry context_background_green_actions[] =
 static const GimpEnumActionEntry context_background_blue_actions[] =
 {
   { "context-background-blue-set", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Set"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-background-blue-minimum", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-background-blue-maximum", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-background-blue-decrease", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-background-blue-increase", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-background-blue-decrease-skip", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-background-blue-increase-skip", GIMP_ICON_CHANNEL_BLUE,
-    NC_("context-action", "Background Blue: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Blue: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -478,31 +478,31 @@ static const GimpEnumActionEntry context_background_blue_actions[] =
 static const GimpEnumActionEntry context_foreground_hue_actions[] =
 {
   { "context-foreground-hue-set", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Set"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-foreground-hue-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-foreground-hue-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-foreground-hue-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-hue-increase", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-foreground-hue-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-hue-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Hue: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Hue: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -510,31 +510,31 @@ static const GimpEnumActionEntry context_foreground_hue_actions[] =
 static const GimpEnumActionEntry context_foreground_saturation_actions[] =
 {
   { "context-foreground-saturation-set", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Set"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-foreground-saturation-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-foreground-saturation-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-foreground-saturation-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-saturation-increase", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-foreground-saturation-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-saturation-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Saturation: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Saturation: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -542,31 +542,31 @@ static const GimpEnumActionEntry context_foreground_saturation_actions[] =
 static const GimpEnumActionEntry context_foreground_value_actions[] =
 {
   { "context-foreground-value-set", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Set"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-foreground-value-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-foreground-value-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-foreground-value-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-value-increase", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-foreground-value-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-foreground-value-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Foreground Value: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Foreground Value: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -574,31 +574,31 @@ static const GimpEnumActionEntry context_foreground_value_actions[] =
 static const GimpEnumActionEntry context_background_hue_actions[] =
 {
   { "context-background-hue-set", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Set"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-background-hue-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-background-hue-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-background-hue-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-background-hue-increase", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-background-hue-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-background-hue-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Hue: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Hue: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -606,31 +606,31 @@ static const GimpEnumActionEntry context_background_hue_actions[] =
 static const GimpEnumActionEntry context_background_saturation_actions[] =
 {
   { "context-background-saturation-set", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Set"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-background-saturation-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-background-saturation-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-background-saturation-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-background-saturation-increase", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-background-saturation-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-background-saturation-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Saturation: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Saturation: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -638,31 +638,31 @@ static const GimpEnumActionEntry context_background_saturation_actions[] =
 static const GimpEnumActionEntry context_background_value_actions[] =
 {
   { "context-background-value-set", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Set"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-background-value-minimum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-background-value-maximum", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-background-value-decrease", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Decrease by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Decrease by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-background-value-increase", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Increase by 1%"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Increase by 1%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-background-value-decrease-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Decrease by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Decrease by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-background-value-increase-skip", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("context-action", "Background Value: Increase by 10%"), { NULL }, NULL,
+    NC_("context-action", "Background Value: Increase by 10%"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -670,31 +670,31 @@ static const GimpEnumActionEntry context_background_value_actions[] =
 static const GimpEnumActionEntry context_opacity_actions[] =
 {
   { "context-opacity-set", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Set Transparency"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Set Transparency"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-opacity-transparent", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Make Completely Transparent"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Make Completely Transparent"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-opacity-opaque", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Make Completely Opaque"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Make Completely Opaque"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-opacity-decrease", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Make 1% More Transparent"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Make 1% More Transparent"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-opacity-increase", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Make 1% More Opaque"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Make 1% More Opaque"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-opacity-decrease-skip", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Make 10% More Transparent"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Make 10% More Transparent"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-opacity-increase-skip", GIMP_ICON_TRANSPARENCY,
-    NC_("context-action", "Tool Opacity: Make 10% More Opaque"), { NULL }, NULL,
+    NC_("context-action", "Tool Opacity: Make 10% More Opaque"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -702,19 +702,19 @@ static const GimpEnumActionEntry context_opacity_actions[] =
 static const GimpEnumActionEntry context_paint_mode_actions[] =
 {
   { "context-paint-mode-first", GIMP_ICON_TOOL_PENCIL,
-    NC_("context-action", "Tool Paint Mode: Select First"), { NULL }, NULL,
+    NC_("context-action", "Tool Paint Mode: Select First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-paint-mode-last", GIMP_ICON_TOOL_PENCIL,
-    NC_("context-action", "Tool Paint Mode: Select Last"), { NULL }, NULL,
+    NC_("context-action", "Tool Paint Mode: Select Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-paint-mode-previous", GIMP_ICON_TOOL_PENCIL,
-    NC_("context-action", "Tool Paint Mode: Select Previous"), { NULL }, NULL,
+    NC_("context-action", "Tool Paint Mode: Select Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-paint-mode-next", GIMP_ICON_TOOL_PENCIL,
-    NC_("context-action", "Tool Paint Mode: Select Next"), { NULL }, NULL,
+    NC_("context-action", "Tool Paint Mode: Select Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -722,23 +722,23 @@ static const GimpEnumActionEntry context_paint_mode_actions[] =
 static const GimpEnumActionEntry context_tool_select_actions[] =
 {
   { "context-tool-select-set", GIMP_ICON_DIALOG_TOOLS,
-    NC_("context-action", "Tool Selection: Choose by Index"), { NULL }, NULL,
+    NC_("context-action", "Tool Selection: Choose by Index"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-tool-select-first", GIMP_ICON_DIALOG_TOOLS,
-    NC_("context-action", "Tool Selection: Switch to First"), { NULL }, NULL,
+    NC_("context-action", "Tool Selection: Switch to First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-tool-select-last", GIMP_ICON_DIALOG_TOOLS,
-    NC_("context-action", "Tool Selection: Switch to Last"), { NULL }, NULL,
+    NC_("context-action", "Tool Selection: Switch to Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-tool-select-previous", GIMP_ICON_DIALOG_TOOLS,
-    NC_("context-action", "Tool Selection: Switch to Previous"), { NULL }, NULL,
+    NC_("context-action", "Tool Selection: Switch to Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-tool-select-next", GIMP_ICON_DIALOG_TOOLS,
-    NC_("context-action", "Tool Selection: Switch to Next"), { NULL }, NULL,
+    NC_("context-action", "Tool Selection: Switch to Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -746,23 +746,23 @@ static const GimpEnumActionEntry context_tool_select_actions[] =
 static const GimpEnumActionEntry context_brush_select_actions[] =
 {
   { "context-brush-select-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Selection: Select by Index"), { NULL }, NULL,
+    NC_("context-action", "Brush Selection: Select by Index"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-select-first", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Selection: Switch to First"), { NULL }, NULL,
+    NC_("context-action", "Brush Selection: Switch to First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-select-last", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Selection: Switch to Last"), { NULL }, NULL,
+    NC_("context-action", "Brush Selection: Switch to Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-select-previous", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Selection: Switch to Previous"), { NULL }, NULL,
+    NC_("context-action", "Brush Selection: Switch to Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-select-next", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Selection: Switch to Next"), { NULL }, NULL,
+    NC_("context-action", "Brush Selection: Switch to Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -770,23 +770,23 @@ static const GimpEnumActionEntry context_brush_select_actions[] =
 static const GimpEnumActionEntry context_pattern_select_actions[] =
 {
   { "context-pattern-select-set", GIMP_ICON_PATTERN,
-    NC_("context-action", "Pattern Selection: Select by Index"), { NULL }, NULL,
+    NC_("context-action", "Pattern Selection: Select by Index"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-pattern-select-first", GIMP_ICON_PATTERN,
-    NC_("context-action", "Pattern Selection: Switch to First"), { NULL }, NULL,
+    NC_("context-action", "Pattern Selection: Switch to First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-pattern-select-last", GIMP_ICON_PATTERN,
-    NC_("context-action", "Pattern Selection: Switch to Last"), { NULL }, NULL,
+    NC_("context-action", "Pattern Selection: Switch to Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-pattern-select-previous", GIMP_ICON_PATTERN,
-    NC_("context-action", "Pattern Selection: Switch to Previous"), { NULL }, NULL,
+    NC_("context-action", "Pattern Selection: Switch to Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-pattern-select-next", GIMP_ICON_PATTERN,
-    NC_("context-action", "Pattern Selection: Switch to Next"), { NULL }, NULL,
+    NC_("context-action", "Pattern Selection: Switch to Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -794,23 +794,23 @@ static const GimpEnumActionEntry context_pattern_select_actions[] =
 static const GimpEnumActionEntry context_palette_select_actions[] =
 {
   { "context-palette-select-set", GIMP_ICON_PALETTE,
-    NC_("context-action", "Palette Selection: Select by Index"), { NULL }, NULL,
+    NC_("context-action", "Palette Selection: Select by Index"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-palette-select-first", GIMP_ICON_PALETTE,
-    NC_("context-action", "Palette Selection: Switch to First"), { NULL }, NULL,
+    NC_("context-action", "Palette Selection: Switch to First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-palette-select-last", GIMP_ICON_PALETTE,
-    NC_("context-action", "Palette Selection: Switch to Last"), { NULL }, NULL,
+    NC_("context-action", "Palette Selection: Switch to Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-palette-select-previous", GIMP_ICON_PALETTE,
-    NC_("context-action", "Palette Selection: Switch to Previous"), { NULL }, NULL,
+    NC_("context-action", "Palette Selection: Switch to Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-palette-select-next", GIMP_ICON_PALETTE,
-    NC_("context-action", "Palette Selection: Switch to Next"), { NULL }, NULL,
+    NC_("context-action", "Palette Selection: Switch to Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -818,23 +818,23 @@ static const GimpEnumActionEntry context_palette_select_actions[] =
 static const GimpEnumActionEntry context_gradient_select_actions[] =
 {
   { "context-gradient-select-set", GIMP_ICON_GRADIENT,
-    NC_("context-action", "Gradient Selection: Select by Index"), { NULL }, NULL,
+    NC_("context-action", "Gradient Selection: Select by Index"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-gradient-select-first", GIMP_ICON_GRADIENT,
-    NC_("context-action", "Gradient Selection: Switch to First"), { NULL }, NULL,
+    NC_("context-action", "Gradient Selection: Switch to First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-gradient-select-last", GIMP_ICON_GRADIENT,
-    NC_("context-action", "Gradient Selection: Switch to Last"), { NULL }, NULL,
+    NC_("context-action", "Gradient Selection: Switch to Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-gradient-select-previous", GIMP_ICON_GRADIENT,
-    NC_("context-action", "Gradient Selection: Switch to Previous"), { NULL }, NULL,
+    NC_("context-action", "Gradient Selection: Switch to Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-gradient-select-next", GIMP_ICON_GRADIENT,
-    NC_("context-action", "Gradient Selection: Switch to Next"), { NULL }, NULL,
+    NC_("context-action", "Gradient Selection: Switch to Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -842,23 +842,23 @@ static const GimpEnumActionEntry context_gradient_select_actions[] =
 static const GimpEnumActionEntry context_font_select_actions[] =
 {
   { "context-font-select-set", GIMP_ICON_FONT,
-    NC_("context-action", "Font Selection: Select by Index"), { NULL }, NULL,
+    NC_("context-action", "Font Selection: Select by Index"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-font-select-first", GIMP_ICON_FONT,
-    NC_("context-action", "Font Selection: Switch to First"), { NULL }, NULL,
+    NC_("context-action", "Font Selection: Switch to First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-font-select-last", GIMP_ICON_FONT,
-    NC_("context-action", "Font Selection: Switch to Last"), { NULL }, NULL,
+    NC_("context-action", "Font Selection: Switch to Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-font-select-previous", GIMP_ICON_FONT,
-    NC_("context-action", "Font Selection: Switch to Previous"), { NULL }, NULL,
+    NC_("context-action", "Font Selection: Switch to Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-font-select-next", GIMP_ICON_FONT,
-    NC_("context-action", "Font Selection: Switch to Next"), { NULL }, NULL,
+    NC_("context-action", "Font Selection: Switch to Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -866,31 +866,31 @@ static const GimpEnumActionEntry context_font_select_actions[] =
 static const GimpEnumActionEntry context_brush_spacing_actions[] =
 {
   { "context-brush-spacing-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Set"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-spacing-minimum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-spacing-maximum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-spacing-decrease", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Decrease by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-spacing-increase", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Increase by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-spacing-decrease-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Decrease by 10"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-spacing-increase-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spacing (Editor): Increase by 10"), { NULL }, NULL,
+    NC_("context-action", "Brush Spacing (Editor): Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -898,15 +898,15 @@ static const GimpEnumActionEntry context_brush_spacing_actions[] =
 static const GimpEnumActionEntry context_brush_shape_actions[] =
 {
   { "context-brush-shape-circle", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Shape (Editor): Use Circular"), { NULL }, NULL,
+    NC_("context-action", "Brush Shape (Editor): Use Circular"), NULL, { NULL }, NULL,
     GIMP_BRUSH_GENERATED_CIRCLE, FALSE,
     NULL },
   { "context-brush-shape-square", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Shape (Editor): Use Square"), { NULL }, NULL,
+    NC_("context-action", "Brush Shape (Editor): Use Square"), NULL, { NULL }, NULL,
     GIMP_BRUSH_GENERATED_SQUARE, FALSE,
     NULL },
   { "context-brush-shape-diamond", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Shape (Editor): Use Diamond"), { NULL }, NULL,
+    NC_("context-action", "Brush Shape (Editor): Use Diamond"), NULL, { NULL }, NULL,
     GIMP_BRUSH_GENERATED_DIAMOND, FALSE,
     NULL }
 };
@@ -914,47 +914,47 @@ static const GimpEnumActionEntry context_brush_shape_actions[] =
 static const GimpEnumActionEntry context_brush_radius_actions[] =
 {
   { "context-brush-radius-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Set"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-radius-minimum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-radius-maximum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-radius-decrease-less", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Decrease by 0.1"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Decrease by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SMALL_PREVIOUS, FALSE,
     NULL },
   { "context-brush-radius-increase-less", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Increase by 0.1"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Increase by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SMALL_NEXT, FALSE,
     NULL },
   { "context-brush-radius-decrease", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Decrease by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-radius-increase", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Increase by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-radius-decrease-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Decrease by 10"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-radius-increase-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Increase by 10"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "context-brush-radius-decrease-percent", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Decrease Relative"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-radius-increase-percent", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Radius (Editor): Increase Relative"), { NULL }, NULL,
+    NC_("context-action", "Brush Radius (Editor): Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL }
 };
@@ -962,31 +962,31 @@ static const GimpEnumActionEntry context_brush_radius_actions[] =
 static const GimpEnumActionEntry context_brush_spikes_actions[] =
 {
   { "context-brush-spikes-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Set"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-spikes-minimum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-spikes-maximum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-spikes-decrease", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Decrease by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-spikes-increase", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Increase by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-spikes-decrease-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Decrease by 4"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Decrease by 4"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-spikes-increase-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Spikes (Editor): Increase by 4"), { NULL }, NULL,
+    NC_("context-action", "Brush Spikes (Editor): Increase by 4"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -994,31 +994,31 @@ static const GimpEnumActionEntry context_brush_spikes_actions[] =
 static const GimpEnumActionEntry context_brush_hardness_actions[] =
 {
   { "context-brush-hardness-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Set"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-hardness-minimum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-hardness-maximum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-hardness-decrease", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Decrease by 0.01"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Decrease by 0.01"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-hardness-increase", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Increase by 0.01"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Increase by 0.01"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-hardness-decrease-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Decrease by 0.1"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Decrease by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-hardness-increase-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Hardness (Editor): Increase by 0.1"), { NULL }, NULL,
+    NC_("context-action", "Brush Hardness (Editor): Increase by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -1026,31 +1026,31 @@ static const GimpEnumActionEntry context_brush_hardness_actions[] =
 static const GimpEnumActionEntry context_brush_aspect_actions[] =
 {
   { "context-brush-aspect-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Set"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-aspect-minimum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Set to Minimum"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-aspect-maximum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Set to Maximum"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-aspect-decrease", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Decrease by 0.1"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Decrease by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-aspect-increase", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Increase by 0.1"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Increase by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-aspect-decrease-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Decrease by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-aspect-increase-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Aspect Ratio (Editor): Increase by 1"), { NULL }, NULL,
+    NC_("context-action", "Brush Aspect Ratio (Editor): Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -1058,31 +1058,31 @@ static const GimpEnumActionEntry context_brush_aspect_actions[] =
 static const GimpEnumActionEntry context_brush_angle_actions[] =
 {
   { "context-brush-angle-set", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Set"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "context-brush-angle-minimum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Make Horizontal"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Make Horizontal"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "context-brush-angle-maximum", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Make Vertical"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Make Vertical"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "context-brush-angle-decrease", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Rotate Right by 1°"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Rotate Right by 1°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "context-brush-angle-increase", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Rotate Left by 1°"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Rotate Left by 1°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "context-brush-angle-decrease-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Rotate Right by 15°"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Rotate Right by 15°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "context-brush-angle-increase-skip", GIMP_ICON_BRUSH,
-    NC_("context-action", "Brush Angle (Editor): Rotate Left by 15°"), { NULL }, NULL,
+    NC_("context-action", "Brush Angle (Editor): Rotate Left by 15°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -1090,7 +1090,7 @@ static const GimpEnumActionEntry context_brush_angle_actions[] =
 static const GimpToggleActionEntry context_toggle_actions[] =
 {
   { "context-dynamics-toggle", NULL,
-    NC_("context-action", "_Enable/Disable Dynamics"), { NULL },
+    NC_("context-action", "_Enable/Disable Dynamics"), NULL, { NULL },
     NC_("context-action", "Apply or ignore the dynamics when painting"),
     context_toggle_dynamics_cmd_callback,
     FALSE,
diff --git a/app/actions/cursor-info-actions.c b/app/actions/cursor-info-actions.c
index 4654f2b371..6959ddf595 100644
--- a/app/actions/cursor-info-actions.c
+++ b/app/actions/cursor-info-actions.c
@@ -38,14 +38,14 @@
 static const GimpActionEntry cursor_info_actions[] =
 {
   { "cursor-info-popup", GIMP_ICON_CURSOR,
-    NC_("cursor-info-action", "Pointer Information Menu"), { NULL }, NULL, NULL,
+    NC_("cursor-info-action", "Pointer Information Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_POINTER_INFO_DIALOG }
 };
 
 static const GimpToggleActionEntry cursor_info_toggle_actions[] =
 {
   { "cursor-info-sample-merged", NULL,
-    NC_("cursor-info-action", "_Sample Merged"), { NULL },
+    NC_("cursor-info-action", "_Sample Merged"), NULL, { NULL },
     NC_("cursor-info-action", "Use the composite color of all visible layers"),
     cursor_info_sample_merged_cmd_callback,
     TRUE,
diff --git a/app/actions/dashboard-actions.c b/app/actions/dashboard-actions.c
index ad50fe1ac0..7272ce95b2 100644
--- a/app/actions/dashboard-actions.c
+++ b/app/actions/dashboard-actions.c
@@ -37,7 +37,7 @@
 static const GimpActionEntry dashboard_actions[] =
 {
   { "dashboard-popup", GIMP_ICON_DIALOG_DASHBOARD,
-    NC_("dashboard-action", "Dashboard Menu"), { NULL }, NULL, NULL,
+    NC_("dashboard-action", "Dashboard Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_DASHBOARD_DIALOG },
 
   { "dashboard-groups", NULL,
@@ -48,25 +48,25 @@ static const GimpActionEntry dashboard_actions[] =
     NC_("dashboard-action", "_History Duration") },
 
   { "dashboard-log-record", GIMP_ICON_RECORD,
-    NC_("dashboard-action", "_Start/Stop Recording..."), { NULL },
+    NC_("dashboard-action", "_Start/Stop Recording..."), NULL, { NULL },
     NC_("dashboard-action", "Start/stop recording performance log"),
     dashboard_log_record_cmd_callback,
     GIMP_HELP_DASHBOARD_LOG_RECORD },
   { "dashboard-log-add-marker", GIMP_ICON_MARKER,
-    NC_("dashboard-action", "_Add Marker..."), { NULL },
+    NC_("dashboard-action", "_Add Marker..."), NULL, { NULL },
     NC_("dashboard-action", "Add an event marker "
                             "to the performance log"),
     dashboard_log_add_marker_cmd_callback,
     GIMP_HELP_DASHBOARD_LOG_ADD_MARKER },
   { "dashboard-log-add-empty-marker", GIMP_ICON_MARKER,
-    NC_("dashboard-action", "Add _Empty Marker"), { NULL },
+    NC_("dashboard-action", "Add _Empty Marker"), NULL, { NULL },
     NC_("dashboard-action", "Add an empty event marker "
                             "to the performance log"),
     dashboard_log_add_empty_marker_cmd_callback,
     GIMP_HELP_DASHBOARD_LOG_ADD_EMPTY_MARKER },
 
   { "dashboard-reset", GIMP_ICON_RESET,
-    NC_("dashboard-action", "_Reset"), { NULL },
+    NC_("dashboard-action", "_Reset"), NULL, { NULL },
     NC_("dashboard-action", "Reset cumulative data"),
     dashboard_reset_cmd_callback,
     GIMP_HELP_DASHBOARD_RESET },
@@ -75,7 +75,7 @@ static const GimpActionEntry dashboard_actions[] =
 static const GimpToggleActionEntry dashboard_toggle_actions[] =
 {
   { "dashboard-low-swap-space-warning", NULL,
-    NC_("dashboard-action", "_Low Swap Space Warning"), { NULL },
+    NC_("dashboard-action", "_Low Swap Space Warning"), NULL, { NULL },
     NC_("dashboard-action", "Raise the dashboard when "
                             "the swap size approaches its limit"),
     dashboard_low_swap_space_warning_cmd_callback,
@@ -86,27 +86,27 @@ static const GimpToggleActionEntry dashboard_toggle_actions[] =
 static const GimpRadioActionEntry dashboard_update_interval_actions[] =
 {
   { "dashboard-update-interval-0-25-sec", NULL,
-    NC_("dashboard-update-interval", "0.25 Seconds"), { NULL }, NULL,
+    NC_("dashboard-update-interval", "0.25 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_UPDATE_INTERVAL_0_25_SEC,
     GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
 
   { "dashboard-update-interval-0-5-sec", NULL,
-    NC_("dashboard-update-interval", "0.5 Seconds"), { NULL }, NULL,
+    NC_("dashboard-update-interval", "0.5 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_UPDATE_INTERVAL_0_5_SEC,
     GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
 
   { "dashboard-update-interval-1-sec", NULL,
-    NC_("dashboard-update-interval", "1 Second"), { NULL }, NULL,
+    NC_("dashboard-update-interval", "1 Second"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_UPDATE_INTERVAL_1_SEC,
     GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
 
   { "dashboard-update-interval-2-sec", NULL,
-    NC_("dashboard-update-interval", "2 Seconds"), { NULL }, NULL,
+    NC_("dashboard-update-interval", "2 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_UPDATE_INTERVAL_2_SEC,
     GIMP_HELP_DASHBOARD_UPDATE_INTERVAL },
 
   { "dashboard-update-interval-4-sec", NULL,
-    NC_("dashboard-update-interval", "4 Seconds"), { NULL }, NULL,
+    NC_("dashboard-update-interval", "4 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_UPDATE_INTERVAL_4_SEC,
     GIMP_HELP_DASHBOARD_UPDATE_INTERVAL }
 };
@@ -114,27 +114,27 @@ static const GimpRadioActionEntry dashboard_update_interval_actions[] =
 static const GimpRadioActionEntry dashboard_history_duration_actions[] =
 {
   { "dashboard-history-duration-15-sec", NULL,
-    NC_("dashboard-history-duration", "15 Seconds"), { NULL }, NULL,
+    NC_("dashboard-history-duration", "15 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_HISTORY_DURATION_15_SEC,
     GIMP_HELP_DASHBOARD_HISTORY_DURATION },
 
   { "dashboard-history-duration-30-sec", NULL,
-    NC_("dashboard-history-duration", "30 Seconds"), { NULL }, NULL,
+    NC_("dashboard-history-duration", "30 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_HISTORY_DURATION_30_SEC,
     GIMP_HELP_DASHBOARD_HISTORY_DURATION },
 
   { "dashboard-history-duration-60-sec", NULL,
-    NC_("dashboard-history-duration", "60 Seconds"), { NULL }, NULL,
+    NC_("dashboard-history-duration", "60 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_HISTORY_DURATION_60_SEC,
     GIMP_HELP_DASHBOARD_HISTORY_DURATION },
 
   { "dashboard-history-duration-120-sec", NULL,
-    NC_("dashboard-history-duration", "120 Seconds"), { NULL }, NULL,
+    NC_("dashboard-history-duration", "120 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_HISTORY_DURATION_120_SEC,
     GIMP_HELP_DASHBOARD_HISTORY_DURATION },
 
   { "dashboard-history-duration-240-sec", NULL,
-    NC_("dashboard-history-duration", "240 Seconds"), { NULL }, NULL,
+    NC_("dashboard-history-duration", "240 Seconds"), NULL, { NULL }, NULL,
     GIMP_DASHBOARD_HISTORY_DURATION_240_SEC,
     GIMP_HELP_DASHBOARD_HISTORY_DURATION }
 };
diff --git a/app/actions/debug-actions.c b/app/actions/debug-actions.c
index 0c4541249c..ac58b909cb 100644
--- a/app/actions/debug-actions.c
+++ b/app/actions/debug-actions.c
@@ -37,17 +37,17 @@ static const GimpActionEntry debug_actions[] =
   { "debug-menu", NULL, "_Debug" },
 
   { "debug-gtk-inspector", NULL,
-    "Start _GtkInspector", { NULL }, NULL,
+    "Start _GtkInspector", NULL, { NULL }, NULL,
     debug_gtk_inspector_cmd_callback,
     NULL },
 
   { "debug-mem-profile", NULL,
-    "_Memory Profile", { NULL }, NULL,
+    "_Memory Profile", NULL, { NULL }, NULL,
     debug_mem_profile_cmd_callback,
     NULL },
 
   { "debug-benchmark-projection", NULL,
-    "Benchmark _Projection", { NULL },
+    "Benchmark _Projection", NULL, { NULL },
     "Invalidates the entire projection, measures the time it takes to "
     "validate (render) the part that is visible in the active display, "
     "and print the result to stdout.",
@@ -55,18 +55,18 @@ static const GimpActionEntry debug_actions[] =
     NULL },
 
   { "debug-show-image-graph", NULL,
-    "Show Image _Graph", { NULL },
+    "Show Image _Graph", NULL, { NULL },
     "Creates a new image showing the GEGL graph of this image",
     debug_show_image_graph_cmd_callback,
     NULL },
 
   { "debug-dump-keyboard-shortcuts", NULL,
-    "Dump _Keyboard Shortcuts", { NULL }, NULL,
+    "Dump _Keyboard Shortcuts", NULL, { NULL }, NULL,
     debug_dump_keyboard_shortcuts_cmd_callback,
     NULL },
 
   { "debug-dump-attached-data", NULL,
-    "Dump Attached Data", { NULL }, NULL,
+    "Dump Attached Data", NULL, { NULL }, NULL,
     debug_dump_attached_data_cmd_callback,
     NULL }
 };
diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c
index 9b05e58a16..ee2adb1f3d 100644
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@@ -44,199 +44,199 @@
 const GimpStringActionEntry dialogs_dockable_actions[] =
 {
   { "dialogs-toolbox", NULL,
-    NC_("windows-action", "Tool_box"), { "<primary>B", NULL },
+    NC_("windows-action", "Tool_box"), NULL, { "<primary>B", NULL },
     NULL /* set in dialogs_actions_update() */,
     "gimp-toolbox",
     GIMP_HELP_TOOLBOX },
 
   { "dialogs-tool-options", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("dialogs-action", "Tool _Options"), { NULL },
+    NC_("dialogs-action", "Tool _Options"), NULL, { NULL },
     NC_("dialogs-action", "Open the tool options dialog"),
     "gimp-tool-options",
     GIMP_HELP_TOOL_OPTIONS_DIALOG },
 
   { "dialogs-device-status", GIMP_ICON_DIALOG_DEVICE_STATUS,
-    NC_("dialogs-action", "_Device Status"), { NULL },
+    NC_("dialogs-action", "_Device Status"), NULL, { NULL },
     NC_("dialogs-action", "Open the device status dialog"),
     "gimp-device-status",
     GIMP_HELP_DEVICE_STATUS_DIALOG },
 
   { "dialogs-symmetry", GIMP_ICON_SYMMETRY,
-    NC_("dialogs-action", "_Symmetry Painting"), { NULL },
+    NC_("dialogs-action", "_Symmetry Painting"), NULL, { NULL },
     NC_("dialogs-action", "Open the symmetry dialog"),
     "gimp-symmetry-editor",
     GIMP_HELP_SYMMETRY_DIALOG },
 
   { "dialogs-layers", GIMP_ICON_DIALOG_LAYERS,
-    NC_("dialogs-action", "_Layers"), { "<primary>L", NULL },
+    NC_("dialogs-action", "_Layers"), NULL, { "<primary>L", NULL },
     NC_("dialogs-action", "Open the layers dialog"),
     "gimp-layer-list",
     GIMP_HELP_LAYER_DIALOG },
 
   { "dialogs-channels", GIMP_ICON_DIALOG_CHANNELS,
-    NC_("dialogs-action", "_Channels"), { NULL },
+    NC_("dialogs-action", "_Channels"), NULL, { NULL },
     NC_("dialogs-action", "Open the channels dialog"),
     "gimp-channel-list",
     GIMP_HELP_CHANNEL_DIALOG },
 
   { "dialogs-vectors", GIMP_ICON_DIALOG_PATHS,
-    NC_("dialogs-action", "_Paths"), { NULL },
+    NC_("dialogs-action", "_Paths"), NULL, { NULL },
     NC_("dialogs-action", "Open the paths dialog"),
     "gimp-vectors-list",
     GIMP_HELP_PATH_DIALOG },
 
   { "dialogs-indexed-palette", GIMP_ICON_COLORMAP,
-    NC_("dialogs-action", "Color_map"), { NULL },
+    NC_("dialogs-action", "Color_map"), NULL, { NULL },
     NC_("dialogs-action", "Open the colormap dialog"),
     "gimp-indexed-palette",
     GIMP_HELP_INDEXED_PALETTE_DIALOG },
 
   { "dialogs-histogram", GIMP_ICON_HISTOGRAM,
-    NC_("dialogs-action", "Histogra_m"), { NULL },
+    NC_("dialogs-action", "Histogra_m"), NULL, { NULL },
     NC_("dialogs-action", "Open the histogram dialog"),
     "gimp-histogram-editor",
     GIMP_HELP_HISTOGRAM_DIALOG },
 
   { "dialogs-selection-editor", GIMP_ICON_SELECTION,
-    NC_("dialogs-action", "_Selection Editor"), { NULL },
+    NC_("dialogs-action", "_Selection Editor"), NULL, { NULL },
     NC_("dialogs-action", "Open the selection editor"),
     "gimp-selection-editor",
     GIMP_HELP_SELECTION_DIALOG },
 
   { "dialogs-navigation", GIMP_ICON_DIALOG_NAVIGATION,
-    NC_("dialogs-action", "Na_vigation"), { NULL },
+    NC_("dialogs-action", "Na_vigation"), NULL, { NULL },
     NC_("dialogs-action", "Open the display navigation dialog"),
     "gimp-navigation-view",
     GIMP_HELP_NAVIGATION_DIALOG },
 
   { "dialogs-undo-history", GIMP_ICON_DIALOG_UNDO_HISTORY,
-    NC_("dialogs-action", "Undo _History"), { NULL },
+    NC_("dialogs-action", "Undo _History"), NULL, { NULL },
     NC_("dialogs-action", "Open the undo history dialog"),
     "gimp-undo-history",
     GIMP_HELP_UNDO_DIALOG },
 
   { "dialogs-cursor", GIMP_ICON_CURSOR,
-    NC_("dialogs-action", "_Pointer"), { NULL },
+    NC_("dialogs-action", "_Pointer"), NULL, { NULL },
     NC_("dialogs-action", "Open the pointer information dialog"),
     "gimp-cursor-view",
     GIMP_HELP_POINTER_INFO_DIALOG },
 
   { "dialogs-sample-points", GIMP_ICON_SAMPLE_POINT,
-    NC_("dialogs-action", "_Sample Points"), { NULL },
+    NC_("dialogs-action", "_Sample Points"), NULL, { NULL },
     NC_("dialogs-action", "Open the sample points dialog"),
     "gimp-sample-point-editor",
     GIMP_HELP_SAMPLE_POINT_DIALOG },
 
   { "dialogs-colors", GIMP_ICON_COLORS_DEFAULT,
-    NC_("dialogs-action", "Colo_rs"), { NULL },
+    NC_("dialogs-action", "Colo_rs"), NULL, { NULL },
     NC_("dialogs-action", "Open the FG/BG color dialog"),
     "gimp-color-editor",
     GIMP_HELP_COLOR_DIALOG },
 
   { "dialogs-brushes", GIMP_ICON_BRUSH,
-    NC_("dialogs-action", "_Brushes"), { "<primary><shift>B", NULL },
+    NC_("dialogs-action", "_Brushes"), NULL, { "<primary><shift>B", NULL },
     NC_("dialogs-action", "Open the brushes dialog"),
     "gimp-brush-grid|gimp-brush-list",
     GIMP_HELP_BRUSH_DIALOG },
 
   { "dialogs-brush-editor", GIMP_ICON_BRUSH,
-    NC_("dialogs-action", "Brush Editor"), { NULL },
+    NC_("dialogs-action", "Brush Editor"), NULL, { NULL },
     NC_("dialogs-action", "Open the brush editor"),
     "gimp-brush-editor",
     GIMP_HELP_BRUSH_EDIT },
 
   { "dialogs-dynamics", GIMP_ICON_DYNAMICS,
-    NC_("dialogs-action", "Paint D_ynamics"), { NULL },
+    NC_("dialogs-action", "Paint D_ynamics"), NULL, { NULL },
     NC_("dialogs-action", "Open paint dynamics dialog"),
     "gimp-dynamics-list|gimp-dynamics-grid",
     GIMP_HELP_DYNAMICS_DIALOG },
 
   { "dialogs-dynamics-editor", GIMP_ICON_DYNAMICS,
-    NC_("dialogs-action", "Paint Dynamics Editor"), { NULL },
+    NC_("dialogs-action", "Paint Dynamics Editor"), NULL, { NULL },
     NC_("dialogs-action", "Open the paint dynamics editor"),
     "gimp-dynamics-editor",
     GIMP_HELP_DYNAMICS_EDITOR_DIALOG },
 
   { "dialogs-mypaint-brushes", GIMP_ICON_MYPAINT_BRUSH,
-    NC_("dialogs-action", "_MyPaint Brushes"), { NULL },
+    NC_("dialogs-action", "_MyPaint Brushes"), NULL, { NULL },
     NC_("dialogs-action", "Open the mypaint brushes dialog"),
     "gimp-mypaint-brush-grid|gimp-mapyint-brush-list",
     GIMP_HELP_MYPAINT_BRUSH_DIALOG },
 
   { "dialogs-patterns", GIMP_ICON_PATTERN,
-    NC_("dialogs-action", "P_atterns"), { "<primary><shift>P", NULL },
+    NC_("dialogs-action", "P_atterns"), NULL, { "<primary><shift>P", NULL },
     NC_("dialogs-action", "Open the patterns dialog"),
     "gimp-pattern-grid|gimp-pattern-list",
     GIMP_HELP_PATTERN_DIALOG },
 
   { "dialogs-gradients", GIMP_ICON_GRADIENT,
-    NC_("dialogs-action", "_Gradients"), { "<primary>G", NULL },
+    NC_("dialogs-action", "_Gradients"), NULL, { "<primary>G", NULL },
     NC_("dialogs-action", "Open the gradients dialog"),
     "gimp-gradient-list|gimp-gradient-grid",
     GIMP_HELP_GRADIENT_DIALOG },
 
   { "dialogs-gradient-editor", GIMP_ICON_GRADIENT,
-    NC_("dialogs-action", "Gradient Editor"), { NULL },
+    NC_("dialogs-action", "Gradient Editor"), NULL, { NULL },
     NC_("dialogs-action", "Open the gradient editor"),
     "gimp-gradient-editor",
     GIMP_HELP_GRADIENT_EDIT },
 
   { "dialogs-palettes", GIMP_ICON_PALETTE,
-    NC_("dialogs-action", "Pal_ettes"), { NULL },
+    NC_("dialogs-action", "Pal_ettes"), NULL, { NULL },
     NC_("dialogs-action", "Open the palettes dialog"),
     "gimp-palette-list|gimp-palette-grid",
     GIMP_HELP_PALETTE_DIALOG },
 
   { "dialogs-palette-editor", GIMP_ICON_PALETTE,
-    NC_("dialogs-action", "Palette _Editor"), { NULL },
+    NC_("dialogs-action", "Palette _Editor"), NULL, { NULL },
     NC_("dialogs-action", "Open the palette editor"),
     "gimp-palette-editor",
     GIMP_HELP_PALETTE_EDIT },
 
   { "dialogs-tool-presets", GIMP_ICON_TOOL_PRESET,
-    NC_("dialogs-action", "Tool Pre_sets"), { NULL },
+    NC_("dialogs-action", "Tool Pre_sets"), NULL, { NULL },
     NC_("dialogs-action", "Open tool presets dialog"),
     "gimp-tool-preset-list|gimp-tool-preset-grid",
     GIMP_HELP_TOOL_PRESET_DIALOG },
 
   { "dialogs-fonts", GIMP_ICON_FONT,
-    NC_("dialogs-action", "_Fonts"), { NULL },
+    NC_("dialogs-action", "_Fonts"), NULL, { NULL },
     NC_("dialogs-action", "Open the fonts dialog"),
     "gimp-font-list|gimp-font-grid",
     GIMP_HELP_FONT_DIALOG },
 
   { "dialogs-buffers", GIMP_ICON_BUFFER,
-    NC_("dialogs-action", "B_uffers"), { NULL },
+    NC_("dialogs-action", "B_uffers"), NULL, { NULL },
     NC_("dialogs-action", "Open the named buffers dialog"),
     "gimp-buffer-list|gimp-buffer-grid",
     GIMP_HELP_BUFFER_DIALOG },
 
   { "dialogs-images", GIMP_ICON_DIALOG_IMAGES,
-    NC_("dialogs-action", "_Images"), { NULL },
+    NC_("dialogs-action", "_Images"), NULL, { NULL },
     NC_("dialogs-action", "Open the images dialog"),
     "gimp-image-list|gimp-image-grid",
     GIMP_HELP_IMAGE_DIALOG },
 
   { "dialogs-document-history", GIMP_ICON_DOCUMENT_OPEN_RECENT,
-    NC_("dialogs-action", "Document Histor_y"), { NULL },
+    NC_("dialogs-action", "Document Histor_y"), NULL, { NULL },
     NC_("dialogs-action", "Open the document history dialog"),
     "gimp-document-list|gimp-document-grid",
     GIMP_HELP_DOCUMENT_DIALOG },
 
   { "dialogs-templates", GIMP_ICON_TEMPLATE,
-    NC_("dialogs-action", "_Templates"), { NULL },
+    NC_("dialogs-action", "_Templates"), NULL, { NULL },
     NC_("dialogs-action", "Open the image templates dialog"),
     "gimp-template-list|gimp-template-grid",
     GIMP_HELP_TEMPLATE_DIALOG },
 
   { "dialogs-error-console", GIMP_ICON_DIALOG_WARNING,
-    NC_("dialogs-action", "Error Co_nsole"), { NULL },
+    NC_("dialogs-action", "Error Co_nsole"), NULL, { NULL },
     NC_("dialogs-action", "Open the error console"),
     "gimp-error-console",
     GIMP_HELP_ERRORS_DIALOG },
 
   { "dialogs-dashboard", GIMP_ICON_DIALOG_DASHBOARD,
-    NC_("dialogs-action", "_Dashboard"), { NULL },
+    NC_("dialogs-action", "_Dashboard"), NULL, { NULL },
     NC_("dialogs-action", "Open the dashboard"),
     "gimp-dashboard",
     GIMP_HELP_ERRORS_DIALOG }
@@ -247,37 +247,37 @@ gint n_dialogs_dockable_actions = G_N_ELEMENTS (dialogs_dockable_actions);
 static const GimpStringActionEntry dialogs_toplevel_actions[] =
 {
   { "dialogs-preferences", GIMP_ICON_PREFERENCES_SYSTEM,
-    NC_("dialogs-action", "_Preferences"), { NULL },
+    NC_("dialogs-action", "_Preferences"), NULL, { NULL },
     NC_("dialogs-action", "Open the preferences dialog"),
     "gimp-preferences-dialog",
     GIMP_HELP_PREFS_DIALOG },
 
   { "dialogs-input-devices", GIMP_ICON_INPUT_DEVICE,
-    NC_("dialogs-action", "_Input Devices"), { NULL },
+    NC_("dialogs-action", "_Input Devices"), NULL, { NULL },
     NC_("dialogs-action", "Open the input devices editor"),
     "gimp-input-devices-dialog",
     GIMP_HELP_INPUT_DEVICES },
 
   { "dialogs-keyboard-shortcuts", GIMP_ICON_CHAR_PICKER,
-    NC_("dialogs-action", "_Keyboard Shortcuts"), { NULL },
+    NC_("dialogs-action", "_Keyboard Shortcuts"), NULL, { NULL },
     NC_("dialogs-action", "Open the keyboard shortcuts editor"),
     "gimp-keyboard-shortcuts-dialog",
     GIMP_HELP_KEYBOARD_SHORTCUTS },
 
   { "dialogs-module-dialog", GIMP_ICON_SYSTEM_RUN,
-    NC_("dialogs-action", "_Modules"), { NULL },
+    NC_("dialogs-action", "_Modules"), NULL, { NULL },
     NC_("dialogs-action", "Open the module manager dialog"),
     "gimp-module-dialog",
     GIMP_HELP_MODULE_DIALOG },
 
   { "dialogs-tips", GIMP_ICON_DIALOG_INFORMATION,
-    NC_("dialogs-action", "_Tip of the Day"), { NULL },
+    NC_("dialogs-action", "_Tip of the Day"), NULL, { NULL },
     NC_("dialogs-action", "Show some helpful tips on using GIMP"),
     "gimp-tips-dialog",
     GIMP_HELP_TIPS_DIALOG },
 
   { "dialogs-welcome", GIMP_ICON_DIALOG_INFORMATION,
-    NC_("dialogs-action", "Welcome Dialog"), { NULL },
+    NC_("dialogs-action", "Welcome Dialog"), NULL, { NULL },
     NC_("dialogs-action", "Show information on running GIMP release"),
     "gimp-welcome-dialog",
     GIMP_HELP_WELCOME_DIALOG },
@@ -290,19 +290,19 @@ static const GimpStringActionEntry dialogs_toplevel_actions[] =
 #else /* UNIX: use GNOME HIG */
     NC_("dialogs-action", "_About"),
 #endif
-    { NULL },
+    NULL, { NULL },
     NC_("dialogs-action", "About GIMP"),
     "gimp-about-dialog",
       GIMP_HELP_ABOUT_DIALOG },
 
   { "dialogs-action-search", GIMP_ICON_TOOL_ZOOM,
-    NC_("dialogs-action", "_Search and Run a Command"), { "slash", "KP_Divide", NULL },
+    NC_("dialogs-action", "_Search and Run a Command"), NULL, { "slash", "KP_Divide", NULL },
     NC_("dialogs-action", "Search commands by keyword, and run them"),
     "gimp-action-search-dialog",
     GIMP_HELP_ACTION_SEARCH_DIALOG },
 
   { "dialogs-extensions", GIMP_ICON_PLUGIN,
-    NC_("dialogs-action", "Manage _Extensions"), { NULL },
+    NC_("dialogs-action", "Manage _Extensions"), NULL, { NULL },
     NC_("dialogs-action", "Manage Extensions: search, install, uninstall, update."),
     "gimp-extensions-dialog",
     GIMP_HELP_EXTENSIONS_DIALOG }
diff --git a/app/actions/dock-actions.c b/app/actions/dock-actions.c
index 11eddf76db..70069e965e 100644
--- a/app/actions/dock-actions.c
+++ b/app/actions/dock-actions.c
@@ -43,16 +43,16 @@
 static const GimpActionEntry dock_actions[] =
 {
   { "dock-move-to-screen-menu", GIMP_ICON_WINDOW_MOVE_TO_SCREEN,
-    NC_("dock-action", "M_ove to Screen"), { NULL }, NULL, NULL,
+    NC_("dock-action", "M_ove to Screen"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_DOCK_CHANGE_SCREEN },
 
   { "dock-close", GIMP_ICON_WINDOW_CLOSE,
-    NC_("dock-action", "Close Dock"), { NULL }, NULL,
+    NC_("dock-action", "Close Dock"), NULL, { NULL }, NULL,
     window_close_cmd_callback,
     GIMP_HELP_DOCK_CLOSE },
 
   { "dock-open-display", NULL,
-    NC_("dock-action", "_Open Display..."), { NULL },
+    NC_("dock-action", "_Open Display..."), NULL, { NULL },
     NC_("dock-action", "Connect to another display"),
     window_open_display_cmd_callback,
     NULL }
@@ -61,13 +61,13 @@ static const GimpActionEntry dock_actions[] =
 static const GimpToggleActionEntry dock_toggle_actions[] =
 {
   { "dock-show-image-menu", NULL,
-    NC_("dock-action", "_Show Image Selection"), { NULL }, NULL,
+    NC_("dock-action", "_Show Image Selection"), NULL, { NULL }, NULL,
     dock_toggle_image_menu_cmd_callback,
     TRUE,
     GIMP_HELP_DOCK_IMAGE_MENU },
 
   { "dock-auto-follow-active", NULL,
-    NC_("dock-action", "Auto _Follow Active Image"), { NULL }, NULL,
+    NC_("dock-action", "Auto _Follow Active Image"), NULL, { NULL }, NULL,
     dock_toggle_auto_cmd_callback,
     TRUE,
     GIMP_HELP_DOCK_AUTO_BUTTON }
diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c
index 9974cc9186..de87ab96b3 100644
--- a/app/actions/dockable-actions.c
+++ b/app/actions/dockable-actions.c
@@ -46,7 +46,7 @@
 static const GimpActionEntry dockable_actions[] =
 {
   { "dockable-popup", NULL,
-    NC_("dockable-action", "Dialogs Menu"), { NULL }, NULL, NULL,
+    NC_("dockable-action", "Dialogs Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_DOCK },
 
   { "dockable-menu",              "image-missing", ""           },
@@ -58,24 +58,24 @@ static const GimpActionEntry dockable_actions[] =
                                             "_Tab Style")      },
 
   { "dockable-close-tab", "window-close",
-    NC_("dockable-action", "_Close Tab"), { NULL }, NULL,
+    NC_("dockable-action", "_Close Tab"), NULL, { NULL }, NULL,
     dockable_close_tab_cmd_callback,
     GIMP_HELP_DOCK_TAB_CLOSE },
 
   { "dockable-detach-tab", GIMP_ICON_DETACH,
-    NC_("dockable-action", "_Detach Tab"), { NULL }, NULL,
+    NC_("dockable-action", "_Detach Tab"), NULL, { NULL }, NULL,
     dockable_detach_tab_cmd_callback,
     GIMP_HELP_DOCK_TAB_DETACH }
 };
 
 #define VIEW_SIZE(action,label,size) \
   { "dockable-preview-size-" action, NULL, \
-    (label), { NULL }, NULL, \
+    (label), NULL, { NULL }, NULL, \
     (size), \
     GIMP_HELP_DOCK_PREVIEW_SIZE }
 #define TAB_STYLE(action,label,style) \
   { "dockable-tab-style-" action, NULL, \
-    (label), { NULL }, NULL, \
+    (label), NULL, { NULL }, NULL, \
     (style), \
     GIMP_HELP_DOCK_TAB_STYLE }
 
@@ -122,7 +122,7 @@ static const GimpRadioActionEntry dockable_tab_style_actions[] =
 static const GimpToggleActionEntry dockable_toggle_actions[] =
 {
   { "dockable-lock-tab", NULL,
-    NC_("dockable-action", "Loc_k Tab to Dock"), { NULL },
+    NC_("dockable-action", "Loc_k Tab to Dock"), NULL, { NULL },
     NC_("dockable-action",
         "Protect this tab from being dragged with the mouse pointer"),
     dockable_lock_tab_cmd_callback,
@@ -130,7 +130,7 @@ static const GimpToggleActionEntry dockable_toggle_actions[] =
     GIMP_HELP_DOCK_TAB_LOCK },
 
   { "dockable-show-button-bar", NULL,
-    NC_("dockable-action", "Show _Button Bar"), { NULL }, NULL,
+    NC_("dockable-action", "Show _Button Bar"), NULL, { NULL }, NULL,
     dockable_show_button_bar_cmd_callback,
     TRUE,
     GIMP_HELP_DOCK_SHOW_BUTTON_BAR }
@@ -139,12 +139,12 @@ static const GimpToggleActionEntry dockable_toggle_actions[] =
 static const GimpRadioActionEntry dockable_view_type_actions[] =
 {
   { "dockable-view-type-list", NULL,
-    NC_("dockable-action", "View as _List"), { NULL }, NULL,
+    NC_("dockable-action", "View as _List"), NULL, { NULL }, NULL,
     GIMP_VIEW_TYPE_LIST,
     GIMP_HELP_DOCK_VIEW_AS_LIST },
 
   { "dockable-view-type-grid", NULL,
-    NC_("dockable-action", "View as _Grid"), { NULL }, NULL,
+    NC_("dockable-action", "View as _Grid"), NULL, { NULL }, NULL,
     GIMP_VIEW_TYPE_GRID,
     GIMP_HELP_DOCK_VIEW_AS_GRID }
 };
diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c
index f8ea9e6fe4..62f4ead104 100644
--- a/app/actions/documents-actions.c
+++ b/app/actions/documents-actions.c
@@ -39,65 +39,65 @@
 static const GimpActionEntry documents_actions[] =
 {
   { "documents-popup", GIMP_ICON_DOCUMENT_OPEN_RECENT,
-    NC_("documents-action", "Documents Menu"), { NULL }, NULL, NULL,
+    NC_("documents-action", "Documents Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_DOCUMENT_DIALOG },
 
   { "documents-open", GIMP_ICON_DOCUMENT_OPEN,
-    NC_("documents-action", "_Open Image"), { NULL },
+    NC_("documents-action", "_Open Image"), NULL, { NULL },
     NC_("documents-action", "Open the selected entry"),
     documents_open_cmd_callback,
     GIMP_HELP_DOCUMENT_OPEN },
 
   { "documents-raise-or-open", NULL,
-    NC_("documents-action", "_Raise or Open Image"), { NULL },
+    NC_("documents-action", "_Raise or Open Image"), NULL, { NULL },
     NC_("documents-action", "Raise window if already open"),
     documents_raise_or_open_cmd_callback,
     GIMP_HELP_DOCUMENT_OPEN },
 
   { "documents-file-open-dialog", NULL,
-    NC_("documents-action", "File Open _Dialog"), { NULL },
+    NC_("documents-action", "File Open _Dialog"), NULL, { NULL },
     NC_("documents-action", "Open image dialog"),
     documents_file_open_dialog_cmd_callback,
     GIMP_HELP_DOCUMENT_OPEN },
 
   { "documents-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("documents-action", "Copy Image _Location"), { NULL },
+    NC_("documents-action", "Copy Image _Location"), NULL, { NULL },
     NC_("documents-action", "Copy image location to clipboard"),
     documents_copy_location_cmd_callback,
     GIMP_HELP_DOCUMENT_COPY_LOCATION },
 
   { "documents-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("documents-action", "Show in _File Manager"), { NULL },
+    NC_("documents-action", "Show in _File Manager"), NULL, { NULL },
     NC_("documents-action", "Show image location in the file manager"),
     documents_show_in_file_manager_cmd_callback,
     GIMP_HELP_DOCUMENT_SHOW_IN_FILE_MANAGER },
 
   { "documents-remove", GIMP_ICON_LIST_REMOVE,
-    NC_("documents-action", "Remove _Entry"), { NULL },
+    NC_("documents-action", "Remove _Entry"), NULL, { NULL },
     NC_("documents-action", "Remove the selected entry"),
     documents_remove_cmd_callback,
     GIMP_HELP_DOCUMENT_REMOVE },
 
   { "documents-clear", GIMP_ICON_SHRED,
-    NC_("documents-action", "_Clear History"), { NULL },
+    NC_("documents-action", "_Clear History"), NULL, { NULL },
     NC_("documents-action", "Clear the entire document history"),
     documents_clear_cmd_callback,
     GIMP_HELP_DOCUMENT_CLEAR },
 
   { "documents-recreate-preview", GIMP_ICON_VIEW_REFRESH,
-    NC_("documents-action", "Recreate _Preview"), { NULL },
+    NC_("documents-action", "Recreate _Preview"), NULL, { NULL },
     NC_("documents-action", "Recreate preview"),
     documents_recreate_preview_cmd_callback,
     GIMP_HELP_DOCUMENT_REFRESH },
 
   { "documents-reload-previews", NULL,
-    NC_("documents-action", "Reload _all Previews"), { NULL },
+    NC_("documents-action", "Reload _all Previews"), NULL, { NULL },
     NC_("documents-action", "Reload all previews"),
     documents_reload_previews_cmd_callback,
     GIMP_HELP_DOCUMENT_REFRESH },
 
   { "documents-remove-dangling", NULL,
-    NC_("documents-action", "Remove Dangling E_ntries"), { NULL },
+    NC_("documents-action", "Remove Dangling E_ntries"), NULL, { NULL },
     NC_("documents-action",
         "Remove entries for which the corresponding file is not available"),
     documents_remove_dangling_cmd_callback,
diff --git a/app/actions/drawable-actions.c b/app/actions/drawable-actions.c
index c251c51aee..c525ce49a9 100644
--- a/app/actions/drawable-actions.c
+++ b/app/actions/drawable-actions.c
@@ -42,13 +42,13 @@
 static const GimpActionEntry drawable_actions[] =
 {
   { "drawable-equalize", NULL,
-    NC_("drawable-action", "_Equalize"), { NULL },
+    NC_("drawable-action", "_Equalize"), NULL, { NULL },
     NC_("drawable-action", "Automatic contrast enhancement"),
     drawable_equalize_cmd_callback,
     GIMP_HELP_LAYER_EQUALIZE },
 
   { "drawable-levels-stretch", NULL,
-    NC_("drawable-action", "_White Balance"), { NULL },
+    NC_("drawable-action", "_White Balance"), NULL, { NULL },
     NC_("drawable-action", "Automatic white balance correction"),
     drawable_levels_stretch_cmd_callback,
     GIMP_HELP_LAYER_WHITE_BALANCE }
@@ -57,13 +57,13 @@ static const GimpActionEntry drawable_actions[] =
 static const GimpToggleActionEntry drawable_toggle_actions[] =
 {
   { "drawable-visible", GIMP_ICON_VISIBLE,
-    NC_("drawable-action", "Toggle Drawables _Visibility"), { NULL }, NULL,
+    NC_("drawable-action", "Toggle Drawables _Visibility"), NULL, { NULL }, NULL,
     drawable_visible_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_VISIBLE },
 
   { "drawable-lock-content", GIMP_ICON_LOCK_CONTENT,
-    NC_("drawable-action", "L_ock Pixels of Drawables"), { NULL },
+    NC_("drawable-action", "L_ock Pixels of Drawables"), NULL, { NULL },
     NC_("drawable-action",
         "Keep the pixels on selected drawables from being modified"),
     drawable_lock_content_cmd_callback,
@@ -71,7 +71,7 @@ static const GimpToggleActionEntry drawable_toggle_actions[] =
     GIMP_HELP_LAYER_LOCK_PIXELS },
 
   { "drawable-lock-position", GIMP_ICON_LOCK_POSITION,
-    NC_("drawable-action", "L_ock Position of Drawables"), { NULL },
+    NC_("drawable-action", "L_ock Position of Drawables"), NULL, { NULL },
     NC_("drawable-action",
         "Keep the position on selected drawables from being modified"),
     drawable_lock_position_cmd_callback,
@@ -82,13 +82,13 @@ static const GimpToggleActionEntry drawable_toggle_actions[] =
 static const GimpEnumActionEntry drawable_flip_actions[] =
 {
   { "drawable-flip-horizontal", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
-    NC_("drawable-action", "Flip _Horizontally"), { NULL },
+    NC_("drawable-action", "Flip _Horizontally"), NULL, { NULL },
     NC_("drawable-action", "Flip drawable horizontally"),
     GIMP_ORIENTATION_HORIZONTAL, FALSE,
     GIMP_HELP_LAYER_FLIP_HORIZONTAL },
 
   { "drawable-flip-vertical", GIMP_ICON_OBJECT_FLIP_VERTICAL,
-    NC_("drawable-action", "Flip _Vertically"), { NULL },
+    NC_("drawable-action", "Flip _Vertically"), NULL, { NULL },
     NC_("drawable-action", "Flip drawable vertically"),
     GIMP_ORIENTATION_VERTICAL, FALSE,
     GIMP_HELP_LAYER_FLIP_VERTICAL }
@@ -97,19 +97,19 @@ static const GimpEnumActionEntry drawable_flip_actions[] =
 static const GimpEnumActionEntry drawable_rotate_actions[] =
 {
   { "drawable-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
-    NC_("drawable-action", "Rotate 90° _clockwise"), { NULL },
+    NC_("drawable-action", "Rotate 90° _clockwise"), NULL, { NULL },
     NC_("drawable-action", "Rotate drawable 90 degrees to the right"),
     GIMP_ROTATE_90, FALSE,
     GIMP_HELP_LAYER_ROTATE_90 },
 
   { "drawable-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
-    NC_("drawable-action", "Rotate _180°"), { NULL },
+    NC_("drawable-action", "Rotate _180°"), NULL, { NULL },
     NC_("drawable-action", "Turn drawable upside-down"),
     GIMP_ROTATE_180, FALSE,
     GIMP_HELP_LAYER_ROTATE_180 },
 
   { "drawable-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
-    NC_("drawable-action", "Rotate 90° counter-clock_wise"), { NULL },
+    NC_("drawable-action", "Rotate 90° counter-clock_wise"), NULL, { NULL },
     NC_("drawable-action", "Rotate drawable 90 degrees to the left"),
     GIMP_ROTATE_270, FALSE,
     GIMP_HELP_LAYER_ROTATE_270 }
diff --git a/app/actions/dynamics-actions.c b/app/actions/dynamics-actions.c
index f5eb37fa17..a4a9471798 100644
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@@ -40,41 +40,41 @@
 static const GimpActionEntry dynamics_actions[] =
 {
   { "dynamics-popup", GIMP_ICON_DYNAMICS,
-    NC_("dynamics-action", "Paint Dynamics Menu"), { NULL }, NULL, NULL,
+    NC_("dynamics-action", "Paint Dynamics Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_DYNAMICS_DIALOG },
 
   { "dynamics-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("dynamics-action", "_New Dynamics"), { NULL },
+    NC_("dynamics-action", "_New Dynamics"), NULL, { NULL },
     NC_("dynamics-action", "Create a new dynamics"),
     data_new_cmd_callback,
     GIMP_HELP_DYNAMICS_NEW },
 
   { "dynamics-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("dynamics-action", "D_uplicate Dynamics"), { NULL },
+    NC_("dynamics-action", "D_uplicate Dynamics"), NULL, { NULL },
     NC_("dynamics-action", "Duplicate this dynamics"),
     data_duplicate_cmd_callback,
     GIMP_HELP_DYNAMICS_DUPLICATE },
 
   { "dynamics-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("dynamics-action", "Copy Dynamics _Location"), { NULL },
+    NC_("dynamics-action", "Copy Dynamics _Location"), NULL, { NULL },
     NC_("dynamics-action", "Copy dynamics file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_DYNAMICS_COPY_LOCATION },
 
   { "dynamics-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("dynamics-action", "Show in _File Manager"), { NULL },
+    NC_("dynamics-action", "Show in _File Manager"), NULL, { NULL },
     NC_("dynamics-action", "Show dynamics file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_DYNAMICS_SHOW_IN_FILE_MANAGER },
 
   { "dynamics-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("dynamics-action", "_Delete Dynamics"), { NULL },
+    NC_("dynamics-action", "_Delete Dynamics"), NULL, { NULL },
     NC_("dynamics-action", "Delete this dynamics"),
     data_delete_cmd_callback,
     GIMP_HELP_DYNAMICS_DELETE },
 
   { "dynamics-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("dynamics-action", "_Refresh Dynamics"), { NULL },
+    NC_("dynamics-action", "_Refresh Dynamics"), NULL, { NULL },
     NC_("dynamics-action", "Refresh dynamics"),
     data_refresh_cmd_callback,
     GIMP_HELP_DYNAMICS_REFRESH }
@@ -83,7 +83,7 @@ static const GimpActionEntry dynamics_actions[] =
 static const GimpStringActionEntry dynamics_edit_actions[] =
 {
   { "dynamics-edit", GIMP_ICON_EDIT,
-    NC_("dynamics-action", "_Edit Dynamics..."), { NULL },
+    NC_("dynamics-action", "_Edit Dynamics..."), NULL, { NULL },
     NC_("dynamics-action", "Edit this dynamics"),
     "gimp-dynamics-editor",
     GIMP_HELP_DYNAMICS_EDIT }
diff --git a/app/actions/dynamics-editor-actions.c b/app/actions/dynamics-editor-actions.c
index 2d7b61df0f..6be71b7b6d 100644
--- a/app/actions/dynamics-editor-actions.c
+++ b/app/actions/dynamics-editor-actions.c
@@ -40,7 +40,7 @@
 static const GimpActionEntry dynamics_editor_actions[] =
 {
   { "dynamics-editor-popup", GIMP_ICON_DYNAMICS,
-    NC_("dynamics-editor-action", "Paint Dynamics Editor Menu"), { NULL }, NULL, NULL,
+    NC_("dynamics-editor-action", "Paint Dynamics Editor Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_BRUSH_EDITOR_DIALOG }
 };
 
@@ -48,7 +48,7 @@ static const GimpActionEntry dynamics_editor_actions[] =
 static const GimpToggleActionEntry dynamics_editor_toggle_actions[] =
 {
   { "dynamics-editor-edit-active", GIMP_ICON_LINKED,
-    NC_("dynamics-editor-action", "Edit Active Dynamics"), { NULL }, NULL,
+    NC_("dynamics-editor-action", "Edit Active Dynamics"), NULL, { NULL }, NULL,
     data_editor_edit_active_cmd_callback,
     FALSE,
     GIMP_HELP_BRUSH_EDITOR_EDIT_ACTIVE }
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index b28f5b7875..fc8f56d469 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -67,97 +67,97 @@ static const GimpActionEntry edit_actions[] =
   { "edit-buffer-menu",   NULL, NC_("edit-action", "_Buffer")   },
 
   { "undo-popup",
-    "edit-undo", NC_("edit-action", "Undo History Menu"), { NULL }, NULL, NULL,
+    "edit-undo", NC_("edit-action", "Undo History Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_UNDO_DIALOG },
 
   { "edit-undo", GIMP_ICON_EDIT_UNDO,
-    NC_("edit-action", "_Undo"), { "<primary>Z", NULL },
+    NC_("edit-action", "_Undo"), NULL, { "<primary>Z", NULL },
     NC_("edit-action", "Undo the last operation"),
     edit_undo_cmd_callback,
     GIMP_HELP_EDIT_UNDO },
 
   { "edit-redo", GIMP_ICON_EDIT_REDO,
-    NC_("edit-action", "_Redo"), { "<primary>Y", NULL },
+    NC_("edit-action", "_Redo"), NULL, { "<primary>Y", NULL },
     NC_("edit-action", "Redo the last operation that was undone"),
     edit_redo_cmd_callback,
     GIMP_HELP_EDIT_REDO },
 
   { "edit-strong-undo", GIMP_ICON_EDIT_UNDO,
-    NC_("edit-action", "Strong Undo"), { "<primary><shift>Z", NULL },
+    NC_("edit-action", "Strong Undo"), NULL, { "<primary><shift>Z", NULL },
     NC_("edit-action", "Undo the last operation, skipping visibility changes"),
     edit_strong_undo_cmd_callback,
     GIMP_HELP_EDIT_STRONG_UNDO },
 
   { "edit-strong-redo", GIMP_ICON_EDIT_REDO,
-    NC_("edit-action", "Strong Redo"), { "<primary><shift>Y", NULL },
+    NC_("edit-action", "Strong Redo"), NULL, { "<primary><shift>Y", NULL },
     NC_("edit-action",
         "Redo the last operation that was undone, skipping visibility changes"),
     edit_strong_redo_cmd_callback,
     GIMP_HELP_EDIT_STRONG_REDO },
 
   { "edit-undo-clear", GIMP_ICON_SHRED,
-    NC_("edit-action", "_Clear Undo History"), { NULL },
+    NC_("edit-action", "_Clear Undo History"), NULL, { NULL },
     NC_("edit-action", "Remove all operations from the undo history"),
     edit_undo_clear_cmd_callback,
     GIMP_HELP_EDIT_UNDO_CLEAR },
 
   { "edit-cut", GIMP_ICON_EDIT_CUT,
-    NC_("edit-action", "Cu_t"), { "<primary>X", "Cut", NULL },
+    NC_("edit-action", "Cu_t"), NULL, { "<primary>X", "Cut", NULL },
     NC_("edit-action", "Move the selected pixels to the clipboard"),
     edit_cut_cmd_callback,
     GIMP_HELP_EDIT_CUT },
 
   { "edit-copy", GIMP_ICON_EDIT_COPY,
-    NC_("edit-action", "_Copy"), { "<primary>C", "Copy", NULL },
+    NC_("edit-action", "_Copy"), NULL, { "<primary>C", "Copy", NULL },
     NC_("edit-action", "Copy the selected pixels to the clipboard"),
     edit_copy_cmd_callback,
     GIMP_HELP_EDIT_COPY },
 
   { "edit-copy-visible", NULL, /* GIMP_ICON_COPY_VISIBLE, */
-    NC_("edit-action", "Copy _Visible"), { "<primary><shift>C", "<shift>Copy", NULL },
+    NC_("edit-action", "Copy _Visible"), NULL, { "<primary><shift>C", "<shift>Copy", NULL },
     NC_("edit-action", "Copy what is visible in the selected region"),
     edit_copy_visible_cmd_callback,
     GIMP_HELP_EDIT_COPY_VISIBLE },
 
   { "edit-paste-as-new-image", GIMP_ICON_EDIT_PASTE_AS_NEW,
-    NC_("edit-action", "From _Clipboard"), { "<primary><shift>V", "<shift>Paste", NULL },
+    NC_("edit-action", "From _Clipboard"), NULL, { "<primary><shift>V", "<shift>Paste", NULL },
     NC_("edit-action", "Create a new image from the content of the clipboard"),
     edit_paste_as_new_image_cmd_callback,
     GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
 
   { "edit-paste-as-new-image-short", GIMP_ICON_EDIT_PASTE_AS_NEW,
-    NC_("edit-action", "Paste as _New Image"), { NULL },
+    NC_("edit-action", "Paste as _New Image"), NULL, { NULL },
     NC_("edit-action", "Create a new image from the content of the clipboard"),
     edit_paste_as_new_image_cmd_callback,
     GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
 
   { "edit-named-cut", GIMP_ICON_EDIT_CUT,
-    NC_("edit-action", "Cu_t Named..."), { NULL },
+    NC_("edit-action", "Cu_t Named..."), NULL, { NULL },
     NC_("edit-action", "Move the selected pixels to a named buffer"),
     edit_named_cut_cmd_callback,
     GIMP_HELP_BUFFER_CUT },
 
   { "edit-named-copy", GIMP_ICON_EDIT_COPY,
-    NC_("edit-action", "_Copy Named..."), { NULL },
+    NC_("edit-action", "_Copy Named..."), NULL, { NULL },
     NC_("edit-action", "Copy the selected pixels to a named buffer"),
     edit_named_copy_cmd_callback,
     GIMP_HELP_BUFFER_COPY },
 
   { "edit-named-copy-visible", NULL, /* GIMP_ICON_COPY_VISIBLE, */
-    NC_("edit-action", "Copy _Visible Named..."), { NULL },
+    NC_("edit-action", "Copy _Visible Named..."), NULL, { NULL },
     NC_("edit-action",
         "Copy what is visible in the selected region to a named buffer"),
     edit_named_copy_visible_cmd_callback,
     GIMP_HELP_BUFFER_COPY },
 
   { "edit-named-paste", GIMP_ICON_EDIT_PASTE,
-    NC_("edit-action", "_Paste Named..."), { NULL },
+    NC_("edit-action", "_Paste Named..."), NULL, { NULL },
     NC_("edit-action", "Paste the content of a named buffer"),
     edit_named_paste_cmd_callback,
     GIMP_HELP_BUFFER_PASTE },
 
   { "edit-clear", GIMP_ICON_EDIT_CLEAR,
-    NC_("edit-action", "Cl_ear"), { "Delete", NULL },
+    NC_("edit-action", "Cl_ear"), NULL, { "Delete", NULL },
     NC_("edit-action", "Clear the selected pixels"),
     edit_clear_cmd_callback,
     GIMP_HELP_EDIT_CLEAR }
@@ -166,40 +166,40 @@ static const GimpActionEntry edit_actions[] =
 static const GimpEnumActionEntry edit_paste_actions[] =
 {
   { "edit-paste", GIMP_ICON_EDIT_PASTE,
-    NC_("edit-action", "_Paste"), { "<primary>V", "Paste", NULL },
+    NC_("edit-action", "_Paste"), NULL, { "<primary>V", "Paste", NULL },
     NC_("edit-action", "Paste the content of the clipboard"),
     GIMP_PASTE_TYPE_NEW_LAYER_OR_FLOATING, FALSE,
     GIMP_HELP_EDIT_PASTE },
 
   { "edit-paste-in-place", GIMP_ICON_EDIT_PASTE,
-    NC_("edit-action", "Paste In P_lace"), { "<primary><alt>V", "<alt>Paste", NULL },
+    NC_("edit-action", "Paste In P_lace"), NULL, { "<primary><alt>V", "<alt>Paste", NULL },
     NC_("edit-action",
         "Paste the content of the clipboard at its original position"),
     GIMP_PASTE_TYPE_NEW_LAYER_OR_FLOATING_IN_PLACE, FALSE,
     GIMP_HELP_EDIT_PASTE_IN_PLACE },
 
   { "edit-paste-merged", GIMP_ICON_EDIT_PASTE,
-    NC_("edit-action", "_Paste as Single Layer"), { NULL },
+    NC_("edit-action", "_Paste as Single Layer"), NULL, { NULL },
     NC_("edit-action", "Paste the content of the clipboard as a single layer"),
     GIMP_PASTE_TYPE_NEW_MERGED_LAYER_OR_FLOATING, FALSE,
     GIMP_HELP_EDIT_PASTE },
 
   { "edit-paste-merged-in-place", GIMP_ICON_EDIT_PASTE,
-    NC_("edit-action", "Paste as Single Layer In P_lace"), { NULL },
+    NC_("edit-action", "Paste as Single Layer In P_lace"), NULL, { NULL },
     NC_("edit-action",
         "Paste the content of the clipboard at its original position as a single layer"),
     GIMP_PASTE_TYPE_NEW_MERGED_LAYER_OR_FLOATING_IN_PLACE, FALSE,
     GIMP_HELP_EDIT_PASTE_IN_PLACE },
 
   { "edit-paste-into", GIMP_ICON_EDIT_PASTE_INTO,
-    NC_("edit-action", "Paste _Into Selection"), { NULL },
+    NC_("edit-action", "Paste _Into Selection"), NULL, { NULL },
     NC_("edit-action",
         "Paste the content of the clipboard into the current selection"),
     GIMP_PASTE_TYPE_FLOATING_INTO, FALSE,
     GIMP_HELP_EDIT_PASTE_INTO },
 
   { "edit-paste-into-in-place", GIMP_ICON_EDIT_PASTE_INTO,
-    NC_("edit-action", "Paste Int_o Selection In Place"), { NULL },
+    NC_("edit-action", "Paste Int_o Selection In Place"), NULL, { NULL },
     NC_("edit-action",
         "Paste the content of the clipboard into the current selection "
         "at its original position"),
@@ -210,19 +210,19 @@ static const GimpEnumActionEntry edit_paste_actions[] =
 static const GimpEnumActionEntry edit_fill_actions[] =
 {
   { "edit-fill-fg", GIMP_ICON_TOOL_BUCKET_FILL,
-    NC_("edit-action", "Fill with _FG Color"), { "<primary>comma", NULL },
+    NC_("edit-action", "Fill with _FG Color"), NULL, { "<primary>comma", NULL },
     NC_("edit-action", "Fill the selection using the foreground color"),
     GIMP_FILL_FOREGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_FG },
 
   { "edit-fill-bg", GIMP_ICON_TOOL_BUCKET_FILL,
-    NC_("edit-action", "Fill with B_G Color"), { "<primary>period", NULL },
+    NC_("edit-action", "Fill with B_G Color"), NULL, { "<primary>period", NULL },
     NC_("edit-action", "Fill the selection using the background color"),
     GIMP_FILL_BACKGROUND, FALSE,
     GIMP_HELP_EDIT_FILL_BG },
 
   { "edit-fill-pattern", GIMP_ICON_PATTERN,
-    NC_("edit-action", "Fill _with Pattern"), { "<primary>semicolon", NULL },
+    NC_("edit-action", "Fill _with Pattern"), NULL, { "<primary>semicolon", NULL },
     NC_("edit-action", "Fill the selection using the active pattern"),
     GIMP_FILL_PATTERN, FALSE,
     GIMP_HELP_EDIT_FILL_PATTERN }
diff --git a/app/actions/error-console-actions.c b/app/actions/error-console-actions.c
index b738600661..1bfcf6fb31 100644
--- a/app/actions/error-console-actions.c
+++ b/app/actions/error-console-actions.c
@@ -37,36 +37,36 @@
 static const GimpActionEntry error_console_actions[] =
 {
   { "error-console-popup", GIMP_ICON_DIALOG_WARNING,
-    NC_("error-console-action", "Error Console Menu"), { NULL }, NULL, NULL,
+    NC_("error-console-action", "Error Console Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_ERRORS_DIALOG },
 
   { "error-console-clear", GIMP_ICON_EDIT_CLEAR,
-    NC_("error-console-action", "_Clear"), { NULL },
+    NC_("error-console-action", "_Clear"), NULL, { NULL },
     NC_("error-console-action", "Clear error console"),
     error_console_clear_cmd_callback,
     GIMP_HELP_ERRORS_CLEAR },
 
   { "error-console-select-all", NULL,
-    NC_("error-console-action", "Select _All"), { NULL },
+    NC_("error-console-action", "Select _All"), NULL, { NULL },
     NC_("error-console-action", "Select all error messages"),
     error_console_select_all_cmd_callback,
     GIMP_HELP_ERRORS_SELECT_ALL },
 
   { "error-console-highlight", NULL,
-    NC_("error-console-action", "_Highlight"), { NULL }, NULL, NULL,
+    NC_("error-console-action", "_Highlight"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_ERRORS_HIGHLIGHT }
 };
 
 static const GimpEnumActionEntry error_console_save_actions[] =
 {
   { "error-console-save-all", GIMP_ICON_DOCUMENT_SAVE_AS,
-    NC_("error-console-action", "_Save Error Log to File..."), { NULL },
+    NC_("error-console-action", "_Save Error Log to File..."), NULL, { NULL },
     NC_("error-console-action", "Write all error messages to a file"),
     FALSE, FALSE,
     GIMP_HELP_ERRORS_SAVE },
 
   { "error-console-save-selection", GIMP_ICON_DOCUMENT_SAVE_AS,
-    NC_("error-console-action", "Save S_election to File..."), { NULL },
+    NC_("error-console-action", "Save S_election to File..."), NULL, { NULL },
     NC_("error-console-action", "Write the selected error messages to a file"),
     TRUE, FALSE,
     GIMP_HELP_ERRORS_SAVE }
@@ -75,21 +75,21 @@ static const GimpEnumActionEntry error_console_save_actions[] =
 static const GimpToggleActionEntry error_console_highlight_actions[] =
 {
   { "error-console-highlight-error", NULL,
-    NC_("error-console-action", "_Errors"), { NULL },
+    NC_("error-console-action", "_Errors"), NULL, { NULL },
     NC_("error-console-action", "Highlight error console on errors"),
     error_console_highlight_error_cmd_callback,
     FALSE,
     GIMP_HELP_ERRORS_HIGHLIGHT },
 
   { "error-console-highlight-warning", NULL,
-    NC_("error-console-action", "_Warnings"), { NULL },
+    NC_("error-console-action", "_Warnings"), NULL, { NULL },
     NC_("error-console-action", "Highlight error console on warnings"),
     error_console_highlight_warning_cmd_callback,
     FALSE,
     GIMP_HELP_ERRORS_HIGHLIGHT },
 
   { "error-console-highlight-info", NULL,
-    NC_("error-console-action", "_Messages"), { NULL },
+    NC_("error-console-action", "_Messages"), NULL, { NULL },
     NC_("error-console-action", "Highlight error console on messages"),
     error_console_highlight_info_cmd_callback,
     FALSE,
diff --git a/app/actions/file-actions.c b/app/actions/file-actions.c
index 996a6a0fc2..97e7234603 100644
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@@ -74,55 +74,55 @@ static const GimpActionEntry file_actions[] =
   { "file-open-recent-menu", NULL, NC_("file-action", "Open _Recent") },
 
   { "file-open", GIMP_ICON_IMAGE_OPEN,
-    NC_("file-action", "_Open..."), { "<primary>O", NULL },
+    NC_("file-action", "_Open..."), NULL, { "<primary>O", NULL },
     NC_("file-action", "Open an image file"),
     file_open_cmd_callback,
     GIMP_HELP_FILE_OPEN },
 
   { "file-open-as-layers", GIMP_ICON_LAYER,
-    NC_("file-action", "Op_en as Layers..."), { "<primary><alt>O", NULL },
+    NC_("file-action", "Op_en as Layers..."), NULL, { "<primary><alt>O", NULL },
     NC_("file-action", "Open an image file as layers"),
     file_open_as_layers_cmd_callback,
     GIMP_HELP_FILE_OPEN_AS_LAYER },
 
   { "file-open-location", GIMP_ICON_WEB,
-    NC_("file-action", "Open _Location..."), { NULL },
+    NC_("file-action", "Open _Location..."), NULL, { NULL },
     NC_("file-action", "Open an image file from a specified location"),
     file_open_location_cmd_callback,
     GIMP_HELP_FILE_OPEN_LOCATION },
 
   { "file-create-template", NULL,
-    NC_("file-action", "Create _Template..."), { NULL },
+    NC_("file-action", "Create _Template..."), NULL, { NULL },
     NC_("file-action", "Create a new template from this image"),
     file_create_template_cmd_callback,
     GIMP_HELP_FILE_CREATE_TEMPLATE },
 
   { "file-revert", GIMP_ICON_IMAGE_RELOAD,
-    NC_("file-action", "Re_vert"), { NULL },
+    NC_("file-action", "Re_vert"), NULL, { NULL },
     NC_("file-action", "Reload the image file from disk"),
     file_revert_cmd_callback,
     GIMP_HELP_FILE_REVERT },
 
   { "file-close-all", GIMP_ICON_CLOSE_ALL,
-    NC_("file-action", "C_lose All"), { "<primary><shift>W", NULL },
+    NC_("file-action", "C_lose All"), NULL, { "<primary><shift>W", NULL },
     NC_("file-action", "Close all opened images"),
     file_close_all_cmd_callback,
     GIMP_HELP_FILE_CLOSE_ALL },
 
   { "file-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("file-action", "Copy _Image Location"), { NULL },
+    NC_("file-action", "Copy _Image Location"), NULL, { NULL },
     NC_("file-action", "Copy image file location to clipboard"),
     file_copy_location_cmd_callback,
     GIMP_HELP_FILE_COPY_LOCATION },
 
   { "file-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("file-action", "Show in _File Manager"), { "<primary><alt>F", NULL },
+    NC_("file-action", "Show in _File Manager"), NULL, { "<primary><alt>F", NULL },
     NC_("file-action", "Show image file location in the file manager"),
     file_show_in_file_manager_cmd_callback,
     GIMP_HELP_FILE_SHOW_IN_FILE_MANAGER },
 
   { "file-quit", GIMP_ICON_APPLICATION_EXIT,
-    NC_("file-action", "_Quit"), { "<primary>Q", NULL },
+    NC_("file-action", "_Quit"), NULL, { "<primary>Q", NULL },
     NC_("file-action", "Quit the GNU Image Manipulation Program"),
     file_quit_cmd_callback,
     GIMP_HELP_FILE_QUIT }
@@ -131,19 +131,19 @@ static const GimpActionEntry file_actions[] =
 static const GimpEnumActionEntry file_save_actions[] =
 {
   { "file-save", GIMP_ICON_DOCUMENT_SAVE,
-    NC_("file-action", "_Save"), { "<primary>S", NULL },
+    NC_("file-action", "_Save"), NULL, { "<primary>S", NULL },
     NC_("file-action", "Save this image"),
     GIMP_SAVE_MODE_SAVE, FALSE,
     GIMP_HELP_FILE_SAVE },
 
   { "file-save-as", GIMP_ICON_DOCUMENT_SAVE_AS,
-    NC_("file-action", "Save _As..."), { "<primary><shift>S", NULL },
+    NC_("file-action", "Save _As..."), NULL, { "<primary><shift>S", NULL },
     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 },
+    NC_("file-action", "Save a Cop_y..."), NULL, { NULL },
     NC_("file-action",
         "Save a copy of this image, without affecting the source file "
         "(if any) or the current state of the image"),
@@ -151,25 +151,25 @@ static const GimpEnumActionEntry file_save_actions[] =
     GIMP_HELP_FILE_SAVE_A_COPY },
 
   { "file-save-and-close", NULL,
-    NC_("file-action", "Save and Close..."), { NULL },
+    NC_("file-action", "Save and Close..."), NULL, { NULL },
     NC_("file-action", "Save this image and close its window"),
     GIMP_SAVE_MODE_SAVE_AND_CLOSE, FALSE,
     GIMP_HELP_FILE_SAVE },
 
   { "file-export", NULL,
-    NC_("file-action", "E_xport..."), { "<primary>E", NULL },
+    NC_("file-action", "E_xport..."), NULL, { "<primary>E", NULL },
     NC_("file-action", "Export the image"),
     GIMP_SAVE_MODE_EXPORT, FALSE,
     GIMP_HELP_FILE_EXPORT },
 
   { "file-overwrite", NULL,
-    NC_("file-action", "Over_write"), { NULL },
+    NC_("file-action", "Over_write"), NULL, { NULL },
     NC_("file-action", "Export the image back to the imported file in the import format"),
     GIMP_SAVE_MODE_OVERWRITE, FALSE,
     GIMP_HELP_FILE_OVERWRITE },
 
   { "file-export-as", NULL,
-    NC_("file-action", "E_xport As..."), { "<primary><shift>E", NULL },
+    NC_("file-action", "E_xport As..."), NULL, { "<primary><shift>E", NULL },
     NC_("file-action", "Export the image to various file formats such as PNG or JPEG"),
     GIMP_SAVE_MODE_EXPORT_AS, FALSE,
     GIMP_HELP_FILE_EXPORT_AS }
diff --git a/app/actions/filters-actions.c b/app/actions/filters-actions.c
index be61264870..46e21be81b 100644
--- a/app/actions/filters-actions.c
+++ b/app/actions/filters-actions.c
@@ -106,32 +106,32 @@ static const GimpActionEntry filters_menu_actions[] =
 static const GimpStringActionEntry filters_actions[] =
 {
   { "filters-antialias", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Antialias"), { NULL }, NULL,
+    NC_("filters-action", "_Antialias"), NULL, { NULL }, NULL,
     "gegl:antialias",
     GIMP_HELP_FILTER_ANTIALIAS },
 
   { "filters-color-enhance", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Color Enhance"), { NULL }, NULL,
+    NC_("filters-action", "_Color Enhance"), NULL, { NULL }, NULL,
     "gegl:color-enhance",
     GIMP_HELP_FILTER_COLOR_ENHANCE },
 
   { "filters-invert-linear", GIMP_ICON_INVERT,
-    NC_("filters-action", "L_inear Invert"), { NULL }, NULL,
+    NC_("filters-action", "L_inear Invert"), NULL, { NULL }, NULL,
     "gegl:invert-linear",
     GIMP_HELP_FILTER_INVERT_LINEAR },
 
   { "filters-invert-perceptual", GIMP_ICON_INVERT,
-    NC_("filters-action", "In_vert"), { NULL }, NULL,
+    NC_("filters-action", "In_vert"), NULL, { NULL }, NULL,
     "gegl:invert-gamma",
     GIMP_HELP_FILTER_INVERT_PERCEPTUAL },
 
   { "filters-invert-value", GIMP_ICON_INVERT,
-    NC_("filters-action", "_Value Invert"), { NULL }, NULL,
+    NC_("filters-action", "_Value Invert"), NULL, { NULL }, NULL,
     "gegl:value-invert",
     GIMP_HELP_FILTER_INVERT_VALUE },
 
   { "filters-stretch-contrast-hsv", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Stretch Contrast HSV"), { NULL }, NULL,
+    NC_("filters-action", "_Stretch Contrast HSV"), NULL, { NULL }, NULL,
     "gegl:stretch-contrast-hsv",
     GIMP_HELP_FILTER_STRETCH_CONTRAST_HSV }
 };
@@ -139,7 +139,7 @@ static const GimpStringActionEntry filters_actions[] =
 static const GimpStringActionEntry filters_settings_actions[] =
 {
   { "filters-dilate", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Dilate"), { NULL },
+    NC_("filters-action", "_Dilate"), NULL, { NULL },
     NC_("filters-action", "Grow lighter areas of the image"),
     "gegl:value-propagate\n"
     "(mode white)"
@@ -155,7 +155,7 @@ static const GimpStringActionEntry filters_settings_actions[] =
     GIMP_HELP_FILTER_DILATE },
 
   { "filters-erode", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Erode"), { NULL },
+    NC_("filters-action", "_Erode"), NULL, { NULL },
     NC_("filters-action", "Grow darker areas of the image"),
     "gegl:value-propagate\n"
     "(mode black)"
@@ -174,602 +174,602 @@ static const GimpStringActionEntry filters_settings_actions[] =
 static const GimpStringActionEntry filters_interactive_actions[] =
 {
   { "filters-alien-map", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Alien Map..."), { NULL }, NULL,
+    NC_("filters-action", "_Alien Map..."), NULL, { NULL }, NULL,
     "gegl:alien-map",
     GIMP_HELP_FILTER_ALIEN_MAP },
 
   { "filters-apply-canvas", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Apply Canvas..."), { NULL }, NULL,
+    NC_("filters-action", "_Apply Canvas..."), NULL, { NULL }, NULL,
     "gegl:texturize-canvas",
     GIMP_HELP_FILTER_APPLY_CANVAS },
 
   { "filters-apply-lens", GIMP_ICON_GEGL,
-    NC_("filters-action", "Apply _Lens..."), { NULL }, NULL,
+    NC_("filters-action", "Apply _Lens..."), NULL, { NULL }, NULL,
     "gegl:apply-lens",
     GIMP_HELP_FILTER_APPLY_LENS },
 
   { "filters-bayer-matrix", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Bayer Matrix..."), { NULL }, NULL,
+    NC_("filters-action", "_Bayer Matrix..."), NULL, { NULL }, NULL,
     "gegl:bayer-matrix",
     GIMP_HELP_FILTER_BAYER_MATRIX },
 
   { "filters-bloom", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Bloom..."), { NULL }, NULL,
+    NC_("filters-action", "_Bloom..."), NULL, { NULL }, NULL,
     "gegl:bloom",
     GIMP_HELP_FILTER_BLOOM },
 
   { "filters-brightness-contrast", GIMP_ICON_TOOL_BRIGHTNESS_CONTRAST,
-    NC_("filters-action", "B_rightness-Contrast..."), { NULL }, NULL,
+    NC_("filters-action", "B_rightness-Contrast..."), NULL, { NULL }, NULL,
     "gimp:brightness-contrast",
     GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST },
 
   { "filters-bump-map", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Bump Map..."), { NULL }, NULL,
+    NC_("filters-action", "_Bump Map..."), NULL, { NULL }, NULL,
     "gegl:bump-map",
     GIMP_HELP_FILTER_BUMP_MAP },
 
   { "filters-c2g", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Color to Gray..."), { NULL }, NULL,
+    NC_("filters-action", "_Color to Gray..."), NULL, { NULL }, NULL,
     "gegl:c2g",
     GIMP_HELP_FILTER_C2G },
 
   { "filters-cartoon", GIMP_ICON_GEGL,
-    NC_("filters-action", "Ca_rtoon..."), { NULL }, NULL,
+    NC_("filters-action", "Ca_rtoon..."), NULL, { NULL }, NULL,
     "gegl:cartoon",
     GIMP_HELP_FILTER_CARTOON },
 
   { "filters-channel-mixer", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Channel Mixer..."), { NULL }, NULL,
+    NC_("filters-action", "_Channel Mixer..."), NULL, { NULL }, NULL,
     "gegl:channel-mixer",
     GIMP_HELP_FILTER_CHANNEL_MIXER },
 
   { "filters-checkerboard", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Checkerboard..."), { NULL }, NULL,
+    NC_("filters-action", "_Checkerboard..."), NULL, { NULL }, NULL,
     "gegl:checkerboard",
     GIMP_HELP_FILTER_CHECKERBOARD },
 
   { "filters-color-balance", GIMP_ICON_TOOL_COLOR_BALANCE,
-    NC_("filters-action", "Color _Balance..."), { NULL }, NULL,
+    NC_("filters-action", "Color _Balance..."), NULL, { NULL }, NULL,
     "gimp:color-balance",
     GIMP_HELP_TOOL_COLOR_BALANCE },
 
   { "filters-color-exchange", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Color Exchange..."), { NULL }, NULL,
+    NC_("filters-action", "_Color Exchange..."), NULL, { NULL }, NULL,
     "gegl:color-exchange",
     GIMP_HELP_FILTER_COLOR_EXCHANGE },
 
   { "filters-colorize", GIMP_ICON_TOOL_COLORIZE,
-    NC_("filters-action", "Colori_ze..."), { NULL }, NULL,
+    NC_("filters-action", "Colori_ze..."), NULL, { NULL }, NULL,
     "gimp:colorize",
     GIMP_HELP_TOOL_COLORIZE },
 
   { "filters-dither", GIMP_ICON_GEGL,
-    NC_("filters-action", "Dithe_r..."), { NULL }, NULL,
+    NC_("filters-action", "Dithe_r..."), NULL, { NULL }, NULL,
     "gegl:dither",
     GIMP_HELP_FILTER_DITHER },
 
   { "filters-color-rotate", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Rotate Colors..."), { NULL }, NULL,
+    NC_("filters-action", "_Rotate Colors..."), NULL, { NULL }, NULL,
     "gegl:color-rotate",
     GIMP_HELP_FILTER_COLOR_ROTATE },
 
   { "filters-color-temperature", GIMP_ICON_TOOL_COLOR_TEMPERATURE,
-    NC_("filters-action", "Color T_emperature..."), { NULL }, NULL,
+    NC_("filters-action", "Color T_emperature..."), NULL, { NULL }, NULL,
     "gegl:color-temperature",
     GIMP_HELP_FILTER_COLOR_TEMPERATURE },
 
   { "filters-color-to-alpha", GIMP_ICON_GEGL,
-    NC_("filters-action", "Color to _Alpha..."), { NULL }, NULL,
+    NC_("filters-action", "Color to _Alpha..."), NULL, { NULL }, NULL,
     "gegl:color-to-alpha",
     GIMP_HELP_FILTER_COLOR_TO_ALPHA },
 
   { "filters-component-extract", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Extract Component..."), { NULL }, NULL,
+    NC_("filters-action", "_Extract Component..."), NULL, { NULL }, NULL,
     "gegl:component-extract",
     GIMP_HELP_FILTER_COMPONENT_EXTRACT },
 
   { "filters-convolution-matrix", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Convolution Matrix..."), { NULL }, NULL,
+    NC_("filters-action", "_Convolution Matrix..."), NULL, { NULL }, NULL,
     "gegl:convolution-matrix",
     GIMP_HELP_FILTER_CONVOLUTION_MATRIX },
 
   { "filters-cubism", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Cubism..."), { NULL }, NULL,
+    NC_("filters-action", "_Cubism..."), NULL, { NULL }, NULL,
     "gegl:cubism",
     GIMP_HELP_FILTER_CUBISM },
 
   { "filters-curves", GIMP_ICON_TOOL_CURVES,
-    NC_("filters-action", "_Curves..."), { NULL }, NULL,
+    NC_("filters-action", "_Curves..."), NULL, { NULL }, NULL,
     "gimp:curves",
     GIMP_HELP_TOOL_CURVES },
 
   { "filters-deinterlace", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Deinterlace..."), { NULL }, NULL,
+    NC_("filters-action", "_Deinterlace..."), NULL, { NULL }, NULL,
     "gegl:deinterlace",
     GIMP_HELP_FILTER_DEINTERLACE },
 
   { "filters-desaturate", GIMP_ICON_TOOL_DESATURATE,
-    NC_("filters-action", "_Desaturate..."), { NULL }, NULL,
+    NC_("filters-action", "_Desaturate..."), NULL, { NULL }, NULL,
     "gimp:desaturate",
     GIMP_HELP_FILTER_DESATURATE },
 
   { "filters-difference-of-gaussians", GIMP_ICON_GEGL,
-    NC_("filters-action", "Difference of _Gaussians..."), { NULL }, NULL,
+    NC_("filters-action", "Difference of _Gaussians..."), NULL, { NULL }, NULL,
     "gegl:difference-of-gaussians",
     GIMP_HELP_FILTER_DIFFERENCE_OF_GAUSSIANS },
 
   { "filters-diffraction-patterns", GIMP_ICON_GEGL,
-    NC_("filters-action", "D_iffraction Patterns..."), { NULL }, NULL,
+    NC_("filters-action", "D_iffraction Patterns..."), NULL, { NULL }, NULL,
     "gegl:diffraction-patterns",
     GIMP_HELP_FILTER_DIFFRACTION_PATTERNS },
 
   { "filters-displace", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Displace..."), { NULL }, NULL,
+    NC_("filters-action", "_Displace..."), NULL, { NULL }, NULL,
     "gegl:displace",
     GIMP_HELP_FILTER_DISPLACE },
 
   { "filters-distance-map", GIMP_ICON_GEGL,
-    NC_("filters-action", "Distance _Map..."), { NULL }, NULL,
+    NC_("filters-action", "Distance _Map..."), NULL, { NULL }, NULL,
     "gegl:distance-transform",
     GIMP_HELP_FILTER_DISTANCE_MAP },
 
   { "filters-dropshadow", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Drop Shadow..."), { NULL }, NULL,
+    NC_("filters-action", "_Drop Shadow..."), NULL, { NULL }, NULL,
     "gegl:dropshadow",
     GIMP_HELP_FILTER_DROPSHADOW },
 
   { "filters-edge", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Edge..."), { NULL }, NULL,
+    NC_("filters-action", "_Edge..."), NULL, { NULL }, NULL,
     "gegl:edge",
     GIMP_HELP_FILTER_EDGE },
 
   { "filters-edge-laplace", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Laplace"), { NULL }, NULL,
+    NC_("filters-action", "_Laplace"), NULL, { NULL }, NULL,
     "gegl:edge-laplace",
     GIMP_HELP_FILTER_EDGE_LAPLACE },
 
   { "filters-edge-neon", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Neon..."), { NULL }, NULL,
+    NC_("filters-action", "_Neon..."), NULL, { NULL }, NULL,
     "gegl:edge-neon",
     GIMP_HELP_FILTER_EDGE_NEON },
 
   { "filters-edge-sobel", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Sobel..."), { NULL }, NULL,
+    NC_("filters-action", "_Sobel..."), NULL, { NULL }, NULL,
     "gegl:edge-sobel",
     GIMP_HELP_FILTER_EDGE_SOBEL },
 
   { "filters-emboss", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Emboss..."), { NULL }, NULL,
+    NC_("filters-action", "_Emboss..."), NULL, { NULL }, NULL,
     "gegl:emboss",
     GIMP_HELP_FILTER_EMBOSS },
 
   { "filters-engrave", GIMP_ICON_GEGL,
-    NC_("filters-action", "En_grave..."), { NULL }, NULL,
+    NC_("filters-action", "En_grave..."), NULL, { NULL }, NULL,
     "gegl:engrave",
     GIMP_HELP_FILTER_ENGRAVE },
 
   { "filters-exposure", GIMP_ICON_TOOL_EXPOSURE,
-    NC_("filters-action", "E_xposure..."), { NULL }, NULL,
+    NC_("filters-action", "E_xposure..."), NULL, { NULL }, NULL,
     "gegl:exposure",
     GIMP_HELP_FILTER_EXPOSURE },
 
   { "filters-fattal-2002", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Fattal et al. 2002..."), { NULL }, NULL,
+    NC_("filters-action", "_Fattal et al. 2002..."), NULL, { NULL }, NULL,
     "gegl:fattal02",
     GIMP_HELP_FILTER_FATTAL_2002 },
 
   { "filters-focus-blur", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Focus Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Focus Blur..."), NULL, { NULL }, NULL,
     "gegl:focus-blur",
     GIMP_HELP_FILTER_FOCUS_BLUR },
 
   { "filters-fractal-trace", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Fractal Trace..."), { NULL }, NULL,
+    NC_("filters-action", "_Fractal Trace..."), NULL, { NULL }, NULL,
     "gegl:fractal-trace",
     GIMP_HELP_FILTER_FRACTAL_TRACE },
 
   { "filters-gaussian-blur", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Gaussian Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Gaussian Blur..."), NULL, { NULL }, NULL,
     "gegl:gaussian-blur",
     GIMP_HELP_FILTER_GAUSSIAN_BLUR },
 
   { "filters-gaussian-blur-selective", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Selective Gaussian Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Selective Gaussian Blur..."), NULL, { NULL }, NULL,
     "gegl:gaussian-blur-selective",
     GIMP_HELP_FILTER_GAUSSIAN_BLUR_SELECTIVE },
 
   { "filters-gegl-graph", GIMP_ICON_GEGL,
-    NC_("filters-action", "_GEGL Graph..."), { NULL }, NULL,
+    NC_("filters-action", "_GEGL Graph..."), NULL, { NULL }, NULL,
     "gegl:gegl",
     GIMP_HELP_FILTER_GEGL_GRAPH },
 
   { "filters-grid", GIMP_ICON_GRID,
-    NC_("filters-action", "_Grid..."), { NULL }, NULL,
+    NC_("filters-action", "_Grid..."), NULL, { NULL }, NULL,
     "gegl:grid",
     GIMP_HELP_FILTER_GRID },
 
   { "filters-high-pass", GIMP_ICON_GEGL,
-    NC_("filters-action", "_High Pass..."), { NULL }, NULL,
+    NC_("filters-action", "_High Pass..."), NULL, { NULL }, NULL,
     "gegl:high-pass",
     GIMP_HELP_FILTER_HIGH_PASS },
 
   { "filters-hue-chroma", GIMP_ICON_GEGL,
-    NC_("filters-action", "Hue-_Chroma..."), { NULL }, NULL,
+    NC_("filters-action", "Hue-_Chroma..."), NULL, { NULL }, NULL,
     "gegl:hue-chroma",
     GIMP_HELP_FILTER_HUE_CHROMA },
 
   { "filters-hue-saturation", GIMP_ICON_TOOL_HUE_SATURATION,
-    NC_("filters-action", "Hue-_Saturation..."), { NULL }, NULL,
+    NC_("filters-action", "Hue-_Saturation..."), NULL, { NULL }, NULL,
     "gimp:hue-saturation",
     GIMP_HELP_TOOL_HUE_SATURATION },
 
   { "filters-illusion", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Illusion..."), { NULL }, NULL,
+    NC_("filters-action", "_Illusion..."), NULL, { NULL }, NULL,
     "gegl:illusion",
     GIMP_HELP_FILTER_ILLUSION },
 
   { "filters-image-gradient", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Image Gradient..."), { NULL }, NULL,
+    NC_("filters-action", "_Image Gradient..."), NULL, { NULL }, NULL,
     "gegl:image-gradient",
     GIMP_HELP_FILTER_IMAGE_GRADIENT },
 
   { "filters-kaleidoscope", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Kaleidoscope..."), { NULL }, NULL,
+    NC_("filters-action", "_Kaleidoscope..."), NULL, { NULL }, NULL,
     "gegl:mirrors",
     GIMP_HELP_FILTER_KALEIDOSCOPE },
 
   { "filters-lens-blur", GIMP_ICON_GEGL,
-    NC_("filters-action", "Le_ns Blur..."), { NULL }, NULL,
+    NC_("filters-action", "Le_ns Blur..."), NULL, { NULL }, NULL,
     "gegl:lens-blur",
     GIMP_HELP_FILTER_LENS_BLUR },
 
   { "filters-lens-distortion", GIMP_ICON_GEGL,
-    NC_("filters-action", "Le_ns Distortion..."), { NULL }, NULL,
+    NC_("filters-action", "Le_ns Distortion..."), NULL, { NULL }, NULL,
     "gegl:lens-distortion",
     GIMP_HELP_FILTER_LENS_DISTORTION },
 
   { "filters-lens-flare", GIMP_ICON_GEGL,
-    NC_("filters-action", "Lens _Flare..."), { NULL }, NULL,
+    NC_("filters-action", "Lens _Flare..."), NULL, { NULL }, NULL,
     "gegl:lens-flare",
     GIMP_HELP_FILTER_LENS_FLARE },
 
   { "filters-levels", GIMP_ICON_TOOL_LEVELS,
-    NC_("filters-action", "_Levels..."), { NULL }, NULL,
+    NC_("filters-action", "_Levels..."), NULL, { NULL }, NULL,
     "gimp:levels",
     GIMP_HELP_TOOL_LEVELS },
 
   { "filters-linear-sinusoid", GIMP_ICON_TOOL_LEVELS,
-    NC_("filters-action", "_Linear Sinusoid..."), { NULL }, NULL,
+    NC_("filters-action", "_Linear Sinusoid..."), NULL, { NULL }, NULL,
     "gegl:linear-sinusoid",
     GIMP_HELP_FILTER_LINEAR_SINUSOID },
 
   { "filters-little-planet", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Little Planet..."), { NULL }, NULL,
+    NC_("filters-action", "_Little Planet..."), NULL, { NULL }, NULL,
     "gegl:stereographic-projection",
     GIMP_HELP_FILTER_LITTLE_PLANET },
 
   { "filters-long-shadow", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Long Shadow..."), { NULL }, NULL,
+    NC_("filters-action", "_Long Shadow..."), NULL, { NULL }, NULL,
     "gegl:long-shadow",
     GIMP_HELP_FILTER_LONG_SHADOW },
 
   { "filters-mantiuk-2006", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Mantiuk 2006..."), { NULL }, NULL,
+    NC_("filters-action", "_Mantiuk 2006..."), NULL, { NULL }, NULL,
     "gegl:mantiuk06",
     GIMP_HELP_FILTER_MANTIUK_2006 },
 
   { "filters-maze", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Maze..."), { NULL }, NULL,
+    NC_("filters-action", "_Maze..."), NULL, { NULL }, NULL,
     "gegl:maze",
     GIMP_HELP_FILTER_MAZE },
 
   { "filters-mean-curvature-blur", GIMP_ICON_GEGL,
-    NC_("filters-action", "Mean C_urvature Blur..."), { NULL }, NULL,
+    NC_("filters-action", "Mean C_urvature Blur..."), NULL, { NULL }, NULL,
     "gegl:mean-curvature-blur",
     GIMP_HELP_FILTER_MEAN_CURVATURE_BLUR },
 
   { "filters-median-blur", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Median Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Median Blur..."), NULL, { NULL }, NULL,
     "gegl:median-blur",
     GIMP_HELP_FILTER_MEDIAN_BLUR },
 
   { "filters-mono-mixer", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Mono Mixer..."), { NULL }, NULL,
+    NC_("filters-action", "_Mono Mixer..."), NULL, { NULL }, NULL,
     "gegl:mono-mixer",
     GIMP_HELP_FILTER_MONO_MIXER },
 
   { "filters-mosaic", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Mosaic..."), { NULL }, NULL,
+    NC_("filters-action", "_Mosaic..."), NULL, { NULL }, NULL,
     "gegl:mosaic",
     GIMP_HELP_FILTER_MOSAIC },
 
   { "filters-motion-blur-circular", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Circular Motion Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Circular Motion Blur..."), NULL, { NULL }, NULL,
     "gegl:motion-blur-circular",
     GIMP_HELP_FILTER_MOTION_BLUR_CIRCULAR },
 
   { "filters-motion-blur-linear", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Linear Motion Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Linear Motion Blur..."), NULL, { NULL }, NULL,
     "gegl:motion-blur-linear",
     GIMP_HELP_FILTER_MOTION_BLUR_LINEAR },
 
   { "filters-motion-blur-zoom", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Zoom Motion Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Zoom Motion Blur..."), NULL, { NULL }, NULL,
     "gegl:motion-blur-zoom",
     GIMP_HELP_FILTER_MOTION_BLUR_ZOOM },
 
   { "filters-noise-cell", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Cell Noise..."), { NULL }, NULL,
+    NC_("filters-action", "_Cell Noise..."), NULL, { NULL }, NULL,
     "gegl:cell-noise",
     GIMP_HELP_FILTER_NOISE_CELL },
 
   { "filters-newsprint", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Newsprint..."), { NULL }, NULL,
+    NC_("filters-action", "_Newsprint..."), NULL, { NULL }, NULL,
     "gegl:newsprint",
     GIMP_HELP_FILTER_NEWSPRINT },
 
   { "filters-noise-cie-lch", GIMP_ICON_GEGL,
-    NC_("filters-action", "_CIE lch Noise..."), { NULL }, NULL,
+    NC_("filters-action", "_CIE lch Noise..."), NULL, { NULL }, NULL,
     "gegl:noise-cie-lch",
     GIMP_HELP_FILTER_NOISE_CIE_LCH },
 
   { "filters-noise-hsv", GIMP_ICON_GEGL,
-    NC_("filters-action", "HS_V Noise..."), { NULL }, NULL,
+    NC_("filters-action", "HS_V Noise..."), NULL, { NULL }, NULL,
     "gegl:noise-hsv",
     GIMP_HELP_FILTER_NOISE_HSV },
 
   { "filters-noise-hurl", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Hurl..."), { NULL }, NULL,
+    NC_("filters-action", "_Hurl..."), NULL, { NULL }, NULL,
     "gegl:noise-hurl",
     GIMP_HELP_FILTER_NOISE_HURL },
 
   { "filters-noise-perlin", GIMP_ICON_GEGL,
-    NC_("filters-action", "Perlin _Noise..."), { NULL }, NULL,
+    NC_("filters-action", "Perlin _Noise..."), NULL, { NULL }, NULL,
     "gegl:perlin-noise",
     GIMP_HELP_FILTER_NOISE_PERLIN },
 
   { "filters-noise-pick", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Pick..."), { NULL }, NULL,
+    NC_("filters-action", "_Pick..."), NULL, { NULL }, NULL,
     "gegl:noise-pick",
     GIMP_HELP_FILTER_NOISE_PICK },
 
   { "filters-noise-rgb", GIMP_ICON_GEGL,
-    NC_("filters-action", "_RGB Noise..."), { NULL }, NULL,
+    NC_("filters-action", "_RGB Noise..."), NULL, { NULL }, NULL,
     "gegl:noise-rgb",
     GIMP_HELP_FILTER_NOISE_RGB },
 
   { "filters-noise-reduction", GIMP_ICON_GEGL,
-    NC_("filters-action", "Noise R_eduction..."), { NULL }, NULL,
+    NC_("filters-action", "Noise R_eduction..."), NULL, { NULL }, NULL,
     "gegl:noise-reduction",
     GIMP_HELP_FILTER_NOISE_REDUCTION },
 
   { "filters-noise-simplex", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Simplex Noise..."), { NULL }, NULL,
+    NC_("filters-action", "_Simplex Noise..."), NULL, { NULL }, NULL,
     "gegl:simplex-noise",
     GIMP_HELP_FILTER_NOISE_SIMPLEX },
 
   { "filters-noise-slur", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Slur..."), { NULL }, NULL,
+    NC_("filters-action", "_Slur..."), NULL, { NULL }, NULL,
     "gegl:noise-slur",
     GIMP_HELP_FILTER_NOISE_SLUR },
 
   { "filters-noise-solid", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Solid Noise..."), { NULL }, NULL,
+    NC_("filters-action", "_Solid Noise..."), NULL, { NULL }, NULL,
     "gegl:noise-solid",
     GIMP_HELP_FILTER_NOISE_SOLID },
 
   { "filters-noise-spread", GIMP_ICON_GEGL,
-    NC_("filters-action", "Sp_read..."), { NULL }, NULL,
+    NC_("filters-action", "Sp_read..."), NULL, { NULL }, NULL,
     "gegl:noise-spread",
     GIMP_HELP_FILTER_NOISE_SPREAD },
 
   { "filters-normal-map", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Normal Map..."), { NULL }, NULL,
+    NC_("filters-action", "_Normal Map..."), NULL, { NULL }, NULL,
     "gegl:normal-map",
     GIMP_HELP_FILTER_NORMAL_MAP },
 
   { "filters-offset", GIMP_ICON_TOOL_OFFSET,
-    NC_("filters-action", "_Offset..."), { "<primary><shift>O", NULL }, NULL,
+    NC_("filters-action", "_Offset..."), NULL, { "<primary><shift>O", NULL }, NULL,
     "gimp:offset",
     GIMP_HELP_TOOL_OFFSET },
 
   { "filters-oilify", GIMP_ICON_GEGL,
-    NC_("filters-action", "Oili_fy..."), { NULL }, NULL,
+    NC_("filters-action", "Oili_fy..."), NULL, { NULL }, NULL,
     "gegl:oilify",
     GIMP_HELP_FILTER_OILIFY },
 
   { "filters-panorama-projection", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Panorama Projection..."), { NULL }, NULL,
+    NC_("filters-action", "_Panorama Projection..."), NULL, { NULL }, NULL,
     "gegl:panorama-projection",
     GIMP_HELP_FILTER_PANORAMA_PROJECTION },
 
   { "filters-photocopy", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Photocopy..."), { NULL }, NULL,
+    NC_("filters-action", "_Photocopy..."), NULL, { NULL }, NULL,
     "gegl:photocopy",
     GIMP_HELP_FILTER_PHOTOCOPY },
 
   { "filters-pixelize", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Pixelize..."), { NULL }, NULL,
+    NC_("filters-action", "_Pixelize..."), NULL, { NULL }, NULL,
     "gegl:pixelize",
     GIMP_HELP_FILTER_PIXELIZE },
 
   { "filters-plasma", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Plasma..."), { NULL }, NULL,
+    NC_("filters-action", "_Plasma..."), NULL, { NULL }, NULL,
     "gegl:plasma",
     GIMP_HELP_FILTER_PLASMA },
 
   { "filters-polar-coordinates", GIMP_ICON_GEGL,
-    NC_("filters-action", "P_olar Coordinates..."), { NULL }, NULL,
+    NC_("filters-action", "P_olar Coordinates..."), NULL, { NULL }, NULL,
     "gegl:polar-coordinates",
     GIMP_HELP_FILTER_POLAR_COORDINATES },
 
   { "filters-posterize", GIMP_ICON_TOOL_POSTERIZE,
-    NC_("filters-action", "_Posterize..."), { NULL }, NULL,
+    NC_("filters-action", "_Posterize..."), NULL, { NULL }, NULL,
     "gimp:posterize",
     GIMP_HELP_FILTER_POSTERIZE },
 
   { "filters-recursive-transform", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Recursive Transform..."), { NULL }, NULL,
+    NC_("filters-action", "_Recursive Transform..."), NULL, { NULL }, NULL,
     "gegl:recursive-transform",
     GIMP_HELP_FILTER_RECURSIVE_TRANSFORM },
 
   { "filters-red-eye-removal", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Red Eye Removal..."), { NULL }, NULL,
+    NC_("filters-action", "_Red Eye Removal..."), NULL, { NULL }, NULL,
     "gegl:red-eye-removal",
     GIMP_HELP_FILTER_RED_EYE_REMOVAL },
 
   { "filters-reinhard-2005", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Reinhard 2005..."), { NULL }, NULL,
+    NC_("filters-action", "_Reinhard 2005..."), NULL, { NULL }, NULL,
     "gegl:reinhard05",
     GIMP_HELP_FILTER_REINHARD_2005 },
 
   { "filters-rgb-clip", GIMP_ICON_GEGL,
-    NC_("filters-action", "RGB _Clip..."), { NULL }, NULL,
+    NC_("filters-action", "RGB _Clip..."), NULL, { NULL }, NULL,
     "gegl:rgb-clip",
     GIMP_HELP_FILTER_RGB_CLIP },
 
   { "filters-ripple", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Ripple..."), { NULL }, NULL,
+    NC_("filters-action", "_Ripple..."), NULL, { NULL }, NULL,
     "gegl:ripple",
     GIMP_HELP_FILTER_RIPPLE },
 
   { "filters-saturation", GIMP_ICON_GEGL,
-    NC_("filters-action", "Sat_uration..."), { NULL }, NULL,
+    NC_("filters-action", "Sat_uration..."), NULL, { NULL }, NULL,
     "gegl:saturation",
     GIMP_HELP_FILTER_SATURATION },
 
   { "filters-semi-flatten", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Semi-Flatten..."), { NULL }, NULL,
+    NC_("filters-action", "_Semi-Flatten..."), NULL, { NULL }, NULL,
     "gimp:semi-flatten",
     GIMP_HELP_FILTER_SEMI_FLATTEN },
 
   { "filters-sepia", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Sepia..."), { NULL }, NULL,
+    NC_("filters-action", "_Sepia..."), NULL, { NULL }, NULL,
     "gegl:sepia",
     GIMP_HELP_FILTER_SEPIA },
 
   { "filters-shadows-highlights", GIMP_ICON_TOOL_SHADOWS_HIGHLIGHTS,
-    NC_("filters-action", "S_hadows-Highlights..."), { NULL }, NULL,
+    NC_("filters-action", "S_hadows-Highlights..."), NULL, { NULL }, NULL,
     "gegl:shadows-highlights",
     GIMP_HELP_FILTER_SHADOWS_HIGHLIGHTS },
 
   { "filters-shift", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Shift..."), { NULL }, NULL,
+    NC_("filters-action", "_Shift..."), NULL, { NULL }, NULL,
     "gegl:shift",
     GIMP_HELP_FILTER_SHIFT },
 
   { "filters-sinus", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Sinus..."), { NULL }, NULL,
+    NC_("filters-action", "_Sinus..."), NULL, { NULL }, NULL,
     "gegl:sinus",
     GIMP_HELP_FILTER_SINUS },
 
   { "filters-slic", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Simple Linear Iterative Clustering..."), { NULL }, NULL,
+    NC_("filters-action", "_Simple Linear Iterative Clustering..."), NULL, { NULL }, NULL,
     "gegl:slic",
     GIMP_HELP_FILTER_SLIC },
 
   { "filters-snn-mean", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Symmetric Nearest Neighbor..."), { NULL }, NULL,
+    NC_("filters-action", "_Symmetric Nearest Neighbor..."), NULL, { NULL }, NULL,
     "gegl:snn-mean",
     GIMP_HELP_FILTER_SNN_MEAN },
 
   { "filters-softglow", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Softglow..."), { NULL }, NULL,
+    NC_("filters-action", "_Softglow..."), NULL, { NULL }, NULL,
     "gegl:softglow",
     GIMP_HELP_FILTER_SOFTGLOW },
 
   { "filters-spherize", GIMP_ICON_GEGL,
-    NC_("filters-action", "Spheri_ze..."), { NULL }, NULL,
+    NC_("filters-action", "Spheri_ze..."), NULL, { NULL }, NULL,
     "gegl:spherize",
     GIMP_HELP_FILTER_SPHERIZE },
 
   { "filters-spiral", GIMP_ICON_GEGL,
-    NC_("filters-action", "S_piral..."), { NULL }, NULL,
+    NC_("filters-action", "S_piral..."), NULL, { NULL }, NULL,
     "gegl:spiral",
     GIMP_HELP_FILTER_SPIRAL },
 
   { "filters-stretch-contrast", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Stretch Contrast..."), { NULL }, NULL,
+    NC_("filters-action", "_Stretch Contrast..."), NULL, { NULL }, NULL,
     "gegl:stretch-contrast",
     GIMP_HELP_FILTER_STRETCH_CONTRAST },
 
   { "filters-stress", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Stress..."), { NULL }, NULL,
+    NC_("filters-action", "_Stress..."), NULL, { NULL }, NULL,
     "gegl:stress",
     GIMP_HELP_FILTER_STRESS },
 
   { "filters-supernova", GIMP_ICON_GEGL,
-    NC_("filters-action", "Super_nova..."), { NULL }, NULL,
+    NC_("filters-action", "Super_nova..."), NULL, { NULL }, NULL,
     "gegl:supernova",
     GIMP_HELP_FILTER_SUPERNOVA },
 
   { "filters-threshold", GIMP_ICON_TOOL_THRESHOLD,
-    NC_("filters-action", "_Threshold..."), { NULL }, NULL,
+    NC_("filters-action", "_Threshold..."), NULL, { NULL }, NULL,
     "gimp:threshold",
     GIMP_HELP_TOOL_THRESHOLD },
 
   { "filters-threshold-alpha", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Threshold Alpha..."), { NULL }, NULL,
+    NC_("filters-action", "_Threshold Alpha..."), NULL, { NULL }, NULL,
     "gimp:threshold-alpha",
     GIMP_HELP_FILTER_THRESHOLD_ALPHA },
 
   { "filters-tile-glass", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Glass Tile..."), { NULL }, NULL,
+    NC_("filters-action", "_Glass Tile..."), NULL, { NULL }, NULL,
     "gegl:tile-glass",
     GIMP_HELP_FILTER_TILE_GLASS },
 
   { "filters-tile-paper", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Paper Tile..."), { NULL }, NULL,
+    NC_("filters-action", "_Paper Tile..."), NULL, { NULL }, NULL,
     "gegl:tile-paper",
     GIMP_HELP_FILTER_TILE_PAPER },
 
   { "filters-tile-seamless", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Tile Seamless..."), { NULL }, NULL,
+    NC_("filters-action", "_Tile Seamless..."), NULL, { NULL }, NULL,
     "gegl:tile-seamless",
     GIMP_HELP_FILTER_TILE_SEAMLESS },
 
   { "filters-unsharp-mask", GIMP_ICON_GEGL,
-    NC_("filters-action", "Sharpen (_Unsharp Mask)..."), { NULL }, NULL,
+    NC_("filters-action", "Sharpen (_Unsharp Mask)..."), NULL, { NULL }, NULL,
     "gegl:unsharp-mask",
     GIMP_HELP_FILTER_UNSHARP_MASK },
 
   { "filters-value-propagate", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Value Propagate..."), { NULL }, NULL,
+    NC_("filters-action", "_Value Propagate..."), NULL, { NULL }, NULL,
     "gegl:value-propagate",
     GIMP_HELP_FILTER_VALUE_PROPAGATE },
 
   { "filters-variable-blur", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Variable Blur..."), { NULL }, NULL,
+    NC_("filters-action", "_Variable Blur..."), NULL, { NULL }, NULL,
     "gegl:variable-blur",
     GIMP_HELP_FILTER_VARIABLE_BLUR },
 
   { "filters-video-degradation", GIMP_ICON_GEGL,
-    NC_("filters-action", "Vi_deo Degradation..."), { NULL }, NULL,
+    NC_("filters-action", "Vi_deo Degradation..."), NULL, { NULL }, NULL,
     "gegl:video-degradation",
     GIMP_HELP_FILTER_VIDEO_DEGRADATION },
 
   { "filters-vignette", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Vignette..."), { NULL }, NULL,
+    NC_("filters-action", "_Vignette..."), NULL, { NULL }, NULL,
     "gegl:vignette",
     GIMP_HELP_FILTER_VIGNETTE },
 
   { "filters-waterpixels", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Waterpixels..."), { NULL }, NULL,
+    NC_("filters-action", "_Waterpixels..."), NULL, { NULL }, NULL,
     "gegl:waterpixels",
     GIMP_HELP_FILTER_WATERPIXELS },
 
   { "filters-waves", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Waves..."), { NULL }, NULL,
+    NC_("filters-action", "_Waves..."), NULL, { NULL }, NULL,
     "gegl:waves",
     GIMP_HELP_FILTER_WAVES },
 
   { "filters-whirl-pinch", GIMP_ICON_GEGL,
-    NC_("filters-action", "W_hirl and Pinch..."), { NULL }, NULL,
+    NC_("filters-action", "W_hirl and Pinch..."), NULL, { NULL }, NULL,
     "gegl:whirl-pinch",
     GIMP_HELP_FILTER_WHIRL_PINCH },
 
   { "filters-wind", GIMP_ICON_GEGL,
-    NC_("filters-action", "W_ind..."), { NULL }, NULL,
+    NC_("filters-action", "W_ind..."), NULL, { NULL }, NULL,
     "gegl:wind",
     GIMP_HELP_FILTER_WIND }
 };
@@ -777,14 +777,14 @@ static const GimpStringActionEntry filters_interactive_actions[] =
 static const GimpEnumActionEntry filters_repeat_actions[] =
 {
   { "filters-repeat", GIMP_ICON_SYSTEM_RUN,
-    NC_("filters-action", "Re_peat Last"), { "<primary>F", NULL },
+    NC_("filters-action", "Re_peat Last"), NULL, { "<primary>F", NULL },
     NC_("filters-action",
         "Rerun the last used filter using the same settings"),
     GIMP_RUN_WITH_LAST_VALS, FALSE,
     GIMP_HELP_FILTER_REPEAT },
 
   { "filters-reshow", GIMP_ICON_DIALOG_RESHOW_FILTER,
-    NC_("filters-action", "R_e-Show Last"), { "<primary><shift>F", NULL },
+    NC_("filters-action", "R_e-Show Last"), NULL, { "<primary><shift>F", NULL },
     NC_("filters-action", "Show the last used filter dialog again"),
     GIMP_RUN_INTERACTIVE, FALSE,
     GIMP_HELP_FILTER_RESHOW }
diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c
index 963074ed11..277dd2894c 100644
--- a/app/actions/fonts-actions.c
+++ b/app/actions/fonts-actions.c
@@ -41,11 +41,11 @@
 static const GimpActionEntry fonts_actions[] =
 {
   { "fonts-popup", GIMP_ICON_FONT,
-    NC_("fonts-action", "Fonts Menu"), { NULL }, NULL, NULL,
+    NC_("fonts-action", "Fonts Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_FONT_DIALOG },
 
   { "fonts-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("fonts-action", "_Rescan Font List"), { NULL },
+    NC_("fonts-action", "_Rescan Font List"), NULL, { NULL },
     NC_("fonts-action", "Rescan the installed fonts"),
     data_refresh_cmd_callback,
     GIMP_HELP_FONT_REFRESH }
diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c
index addaddef09..c5d30274e5 100644
--- a/app/actions/gradient-editor-actions.c
+++ b/app/actions/gradient-editor-actions.c
@@ -44,7 +44,7 @@
 static const GimpActionEntry gradient_editor_actions[] =
 {
   { "gradient-editor-popup", GIMP_ICON_GRADIENT,
-    NC_("gradient-editor-action", "Gradient Editor Menu"), { NULL }, NULL, NULL,
+    NC_("gradient-editor-action", "Gradient Editor Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_GRADIENT_EDITOR_DIALOG },
 
   { "gradient-editor-left-color-type", NULL,
@@ -68,57 +68,57 @@ static const GimpActionEntry gradient_editor_actions[] =
   { "gradient-editor-coloring-type", NULL, "coloring-type"     },
 
   { "gradient-editor-left-color", NULL,
-    NC_("gradient-editor-action", "L_eft Endpoint's Color..."), { NULL }, NULL,
+    NC_("gradient-editor-action", "L_eft Endpoint's Color..."), NULL, { NULL }, NULL,
     gradient_editor_left_color_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
 
   { "gradient-editor-right-color", NULL,
-    NC_("gradient-editor-action", "R_ight Endpoint's Color..."), { NULL }, NULL,
+    NC_("gradient-editor-action", "R_ight Endpoint's Color..."), NULL, { NULL }, NULL,
     gradient_editor_right_color_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
   { "gradient-editor-flip", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
-    "flip", { NULL }, NULL,
+    NC_("gradient-editor-action", "Flip"), NULL, { NULL }, NULL,
     gradient_editor_flip_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_FLIP },
 
   { "gradient-editor-replicate", GIMP_ICON_OBJECT_DUPLICATE,
-    "replicate", { NULL }, NULL,
+    NC_("gradient-editor-action", "Replicate"), NULL, { NULL }, NULL,
     gradient_editor_replicate_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_FLIP },
 
   { "gradient-editor-split-midpoint", NULL,
-    "splitmidpoint", { NULL }, NULL,
+    NC_("gradient-editor-action", "Split Midpoint"), NULL, { NULL }, NULL,
     gradient_editor_split_midpoint_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_SPLIT_MIDPOINT },
 
   { "gradient-editor-split-uniform", NULL,
-    "splituniform", { NULL }, NULL,
+    NC_("gradient-editor-action", "Split Uniformly"), NULL, { NULL }, NULL,
     gradient_editor_split_uniformly_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_SPLIT_UNIFORM },
 
   { "gradient-editor-delete", GIMP_ICON_EDIT_DELETE,
-    "delete", { NULL }, NULL,
+    NC_("gradient-editor-action", "Delete"), NULL, { NULL }, NULL,
     gradient_editor_delete_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_DELETE },
 
   { "gradient-editor-recenter", NULL,
-    "recenter", { NULL }, NULL,
+    NC_("gradient-editor-action", "Recenter"), NULL, { NULL }, NULL,
     gradient_editor_recenter_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_RECENTER },
 
   { "gradient-editor-redistribute", NULL,
-    "redistribute", { NULL }, NULL,
+    NC_("gradient-editor-action", "Redistribute"), NULL, { NULL }, NULL,
     gradient_editor_redistribute_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_REDISTRIBUTE },
 
   { "gradient-editor-blend-color", NULL,
-    NC_("gradient-editor-action", "Ble_nd Endpoints' Colors"), { NULL }, NULL,
+    NC_("gradient-editor-action", "Ble_nd Endpoints' Colors"), NULL, { NULL }, NULL,
     gradient_editor_blend_color_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_BLEND_COLOR },
 
   { "gradient-editor-blend-opacity", NULL,
-    NC_("gradient-editor-action", "Blend Endpoints' Opacit_y"), { NULL }, NULL,
+    NC_("gradient-editor-action", "Blend Endpoints' Opacit_y"), NULL, { NULL }, NULL,
     gradient_editor_blend_opacity_cmd_callback,
     GIMP_HELP_GRADIENT_EDITOR_BLEND_OPACITY }
 };
@@ -126,7 +126,7 @@ static const GimpActionEntry gradient_editor_actions[] =
 static const GimpToggleActionEntry gradient_editor_toggle_actions[] =
 {
   { "gradient-editor-edit-active", GIMP_ICON_LINKED,
-    NC_("gradient-editor-action", "Edit Active Gradient"), { NULL }, NULL,
+    NC_("gradient-editor-action", "Edit Active Gradient"), NULL, { NULL }, NULL,
     data_editor_edit_active_cmd_callback,
     FALSE,
     GIMP_HELP_GRADIENT_EDITOR_EDIT_ACTIVE }
@@ -135,44 +135,44 @@ static const GimpToggleActionEntry gradient_editor_toggle_actions[] =
 
 #define LOAD_LEFT_FROM(num,magic) \
   { "gradient-editor-load-left-" num, NULL, \
-    num, { NULL }, NULL, \
+    num, NULL, { NULL }, NULL, \
     (magic), FALSE, \
     GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD }
 #define SAVE_LEFT_TO(num,magic) \
   { "gradient-editor-save-left-" num, NULL, \
-    num, { NULL }, NULL, \
+    num, NULL, { NULL }, NULL, \
     (magic), FALSE, \
     GIMP_HELP_GRADIENT_EDITOR_LEFT_SAVE }
 #define LOAD_RIGHT_FROM(num,magic) \
   { "gradient-editor-load-right-" num, NULL, \
-    num, { NULL }, NULL, \
+    num, NULL, { NULL }, NULL, \
     (magic), FALSE, \
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD }
 #define SAVE_RIGHT_TO(num,magic) \
   { "gradient-editor-save-right-" num, NULL, \
-    num, { NULL }, NULL, \
+    num, NULL, { NULL }, NULL, \
     (magic), FALSE, \
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_SAVE }
 
 static const GimpEnumActionEntry gradient_editor_load_left_actions[] =
 {
   { "gradient-editor-load-left-left-neighbor", NULL,
-    NC_("gradient-editor-action", "_Left Neighbor's Right Endpoint"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Left Neighbor's Right Endpoint"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
 
   { "gradient-editor-load-left-right-endpoint", NULL,
-    NC_("gradient-editor-action", "_Right Endpoint"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Right Endpoint"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
 
   { "gradient-editor-load-left-fg", NULL,
-    NC_("gradient-editor-action", "_Foreground Color"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Foreground Color"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_FOREGROUND, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
 
   { "gradient-editor-load-left-bg", NULL,
-    NC_("gradient-editor-action", "_Background Color"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Background Color"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_BACKGROUND, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_LOAD },
 
@@ -205,22 +205,22 @@ static const GimpEnumActionEntry gradient_editor_save_left_actions[] =
 static const GimpEnumActionEntry gradient_editor_load_right_actions[] =
 {
   { "gradient-editor-load-right-right-neighbor", NULL,
-    NC_("gradient-editor-action", "_Right Neighbor's Left Endpoint"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Right Neighbor's Left Endpoint"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_NEIGHBOR_ENDPOINT, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
 
   { "gradient-editor-load-right-left-endpoint", NULL,
-    NC_("gradient-editor-action", "_Left Endpoint"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Left Endpoint"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_OTHER_ENDPOINT, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
 
   { "gradient-editor-load-right-fg", NULL,
-    NC_("gradient-editor-action", "_Foreground Color"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Foreground Color"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_FOREGROUND, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
 
   { "gradient-editor-load-right-bg", NULL,
-    NC_("gradient-editor-action", "_Background Color"), { NULL }, NULL,
+    NC_("gradient-editor-action", "_Background Color"), NULL, { NULL }, NULL,
     GRADIENT_EDITOR_COLOR_BACKGROUND, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_LOAD },
 
@@ -259,29 +259,27 @@ static const GimpEnumActionEntry gradient_editor_save_right_actions[] =
 static const GimpRadioActionEntry gradient_editor_left_color_type_actions[] =
 {
   { "gradient-editor-left-color-fixed", NULL,
-    NC_("gradient-editor-color-type", "_Fixed"), { NULL }, NULL,
+    NC_("gradient-editor-color-type", "_Fixed"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_COLOR_FIXED,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
 
   { "gradient-editor-left-color-foreground", NULL,
-    NC_("gradient-editor-color-type", "F_oreground Color"), { NULL }, NULL,
+    NC_("gradient-editor-color-type", "F_oreground Color"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_COLOR_FOREGROUND,
     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 }, NULL,
     GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR },
 
   { "gradient-editor-left-color-background", NULL,
-    NC_("gradient-editor-color-type", "_Background Color"), { NULL }, NULL,
+    NC_("gradient-editor-color-type", "_Background Color"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_COLOR_BACKGROUND,
     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 }, NULL,
     GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_LEFT_COLOR }
 };
@@ -289,29 +287,27 @@ static const GimpRadioActionEntry gradient_editor_left_color_type_actions[] =
 static const GimpRadioActionEntry gradient_editor_right_color_type_actions[] =
 {
   { "gradient-editor-right-color-fixed", NULL,
-    NC_("gradient-editor-color-type", "_Fixed"), { NULL }, NULL,
+    NC_("gradient-editor-color-type", "_Fixed"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_COLOR_FIXED,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
   { "gradient-editor-right-color-foreground", NULL,
-    NC_("gradient-editor-color-type", "F_oreground Color"), { NULL }, NULL,
+    NC_("gradient-editor-color-type", "F_oreground Color"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_COLOR_FOREGROUND,
     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 }, NULL,
     GIMP_GRADIENT_COLOR_FOREGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR },
 
   { "gradient-editor-right-color-background", NULL,
-    NC_("gradient-editor-color-type", "_Background Color"), { NULL }, NULL,
+    NC_("gradient-editor-color-type", "_Background Color"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_COLOR_BACKGROUND,
     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 }, NULL,
     GIMP_GRADIENT_COLOR_BACKGROUND_TRANSPARENT,
     GIMP_HELP_GRADIENT_EDITOR_RIGHT_COLOR }
 };
@@ -319,37 +315,37 @@ static const GimpRadioActionEntry gradient_editor_right_color_type_actions[] =
 static const GimpRadioActionEntry gradient_editor_blending_actions[] =
 {
   { "gradient-editor-blending-linear", NULL,
-    NC_("gradient-editor-blending", "_Linear"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "_Linear"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_LINEAR,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING },
 
   { "gradient-editor-blending-curved", NULL,
-    NC_("gradient-editor-blending", "_Curved"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "_Curved"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_CURVED,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING },
 
   { "gradient-editor-blending-sine", NULL,
-    NC_("gradient-editor-blending", "_Sinusoidal"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "_Sinusoidal"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_SINE,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING },
 
   { "gradient-editor-blending-sphere-increasing", NULL,
-    NC_("gradient-editor-blending", "Spherical (i_ncreasing)"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "Spherical (i_ncreasing)"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_SPHERE_INCREASING,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING },
 
   { "gradient-editor-blending-sphere-decreasing", NULL,
-    NC_("gradient-editor-blending", "Spherical (_decreasing)"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "Spherical (_decreasing)"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_SPHERE_DECREASING,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING },
 
   { "gradient-editor-blending-step", NULL,
-    NC_("gradient-editor-blending", "S_tep"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "S_tep"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_STEP,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING },
 
   { "gradient-editor-blending-varies", NULL,
-    NC_("gradient-editor-blending", "(Varies)"), { NULL }, NULL,
+    NC_("gradient-editor-blending", "(Varies)"), NULL, { NULL }, NULL,
     -1,
     GIMP_HELP_GRADIENT_EDITOR_BLENDING }
 };
@@ -357,22 +353,22 @@ static const GimpRadioActionEntry gradient_editor_blending_actions[] =
 static const GimpRadioActionEntry gradient_editor_coloring_actions[] =
 {
   { "gradient-editor-coloring-rgb", NULL,
-    NC_("gradient-editor-coloring", "_RGB"), { NULL }, NULL,
+    NC_("gradient-editor-coloring", "_RGB"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_RGB,
     GIMP_HELP_GRADIENT_EDITOR_COLORING },
 
   { "gradient-editor-coloring-hsv-ccw", NULL,
-    NC_("gradient-editor-coloring", "HSV (_counter-clockwise hue)"), { NULL }, NULL,
+    NC_("gradient-editor-coloring", "HSV (_counter-clockwise hue)"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_HSV_CCW,
     GIMP_HELP_GRADIENT_EDITOR_COLORING },
 
   { "gradient-editor-coloring-hsv-cw", NULL,
-    NC_("gradient-editor-coloring", "HSV (clockwise _hue)"), { NULL }, NULL,
+    NC_("gradient-editor-coloring", "HSV (clockwise _hue)"), NULL, { NULL }, NULL,
     GIMP_GRADIENT_SEGMENT_HSV_CW,
     GIMP_HELP_GRADIENT_EDITOR_COLORING },
 
   { "gradient-editor-coloring-varies", NULL,
-    NC_("gradient-editor-coloring", "(Varies)"), { NULL }, NULL,
+    NC_("gradient-editor-coloring", "(Varies)"), NULL, { NULL }, NULL,
     -1,
     GIMP_HELP_GRADIENT_EDITOR_COLORING }
 };
@@ -380,19 +376,19 @@ static const GimpRadioActionEntry gradient_editor_coloring_actions[] =
 static const GimpEnumActionEntry gradient_editor_zoom_actions[] =
 {
   { "gradient-editor-zoom-in", GIMP_ICON_ZOOM_IN,
-    N_("Zoom In"), { NULL },
+    N_("Zoom In"), NULL, { NULL },
     N_("Zoom in"),
     GIMP_ZOOM_IN, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_ZOOM_IN },
 
   { "gradient-editor-zoom-out", GIMP_ICON_ZOOM_OUT,
-    N_("Zoom Out"), { NULL },
+    N_("Zoom Out"), NULL, { NULL },
     N_("Zoom out"),
     GIMP_ZOOM_OUT, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_ZOOM_OUT },
 
   { "gradient-editor-zoom-all", GIMP_ICON_ZOOM_FIT_BEST,
-    N_("Zoom All"), { NULL },
+    N_("Zoom All"), NULL, { NULL },
     N_("Zoom all"),
     GIMP_ZOOM_OUT_MAX, FALSE,
     GIMP_HELP_GRADIENT_EDITOR_ZOOM_ALL }
@@ -415,7 +411,7 @@ gradient_editor_actions_setup (GimpActionGroup *group)
                                       G_N_ELEMENTS (gradient_editor_load_left_actions),
                                       gradient_editor_load_left_cmd_callback);
 
-  gimp_action_group_add_enum_actions (group, "gradient-editor-action",
+  gimp_action_group_add_enum_actions (group, NULL,
                                       gradient_editor_save_left_actions,
                                       G_N_ELEMENTS (gradient_editor_save_left_actions),
                                       gradient_editor_save_left_cmd_callback);
@@ -426,7 +422,7 @@ gradient_editor_actions_setup (GimpActionGroup *group)
                                       gradient_editor_load_right_cmd_callback);
 
 
-  gimp_action_group_add_enum_actions (group, "gradient-editor-action",
+  gimp_action_group_add_enum_actions (group, NULL,
                                       gradient_editor_save_right_actions,
                                       G_N_ELEMENTS (gradient_editor_save_right_actions),
                                       gradient_editor_save_right_cmd_callback);
diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c
index 8e237b8ced..ead15a16a0 100644
--- a/app/actions/gradients-actions.c
+++ b/app/actions/gradients-actions.c
@@ -41,47 +41,47 @@
 static const GimpActionEntry gradients_actions[] =
 {
   { "gradients-popup", GIMP_ICON_GRADIENT,
-    NC_("gradients-action", "Gradients Menu"), { NULL }, NULL, NULL,
+    NC_("gradients-action", "Gradients Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_GRADIENT_DIALOG },
 
   { "gradients-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("gradients-action", "_New Gradient"), { NULL },
+    NC_("gradients-action", "_New Gradient"), NULL, { NULL },
     NC_("gradients-action", "Create a new gradient"),
     data_new_cmd_callback,
     GIMP_HELP_GRADIENT_NEW },
 
   { "gradients-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("gradients-action", "D_uplicate Gradient"), { NULL },
+    NC_("gradients-action", "D_uplicate Gradient"), NULL, { NULL },
     NC_("gradients-action", "Duplicate this gradient"),
     data_duplicate_cmd_callback,
     GIMP_HELP_GRADIENT_DUPLICATE },
 
   { "gradients-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("gradients-action", "Copy Gradient _Location"), { NULL },
+    NC_("gradients-action", "Copy Gradient _Location"), NULL, { NULL },
     NC_("gradients-action", "Copy gradient file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_GRADIENT_COPY_LOCATION },
 
   { "gradients-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("gradients-action", "Show in _File Manager"), { NULL },
+    NC_("gradients-action", "Show in _File Manager"), NULL, { NULL },
     NC_("gradients-action", "Show gradient file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_GRADIENT_SHOW_IN_FILE_MANAGER },
 
   { "gradients-save-as-pov", GIMP_ICON_DOCUMENT_SAVE_AS,
-    NC_("gradients-action", "Save as _POV-Ray..."), { NULL },
+    NC_("gradients-action", "Save as _POV-Ray..."), NULL, { NULL },
     NC_("gradients-action", "Save gradient as POV-Ray"),
     gradients_save_as_pov_ray_cmd_callback,
     GIMP_HELP_GRADIENT_SAVE_AS_POV },
 
   { "gradients-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("gradients-action", "_Delete Gradient"), { NULL },
+    NC_("gradients-action", "_Delete Gradient"), NULL, { NULL },
     NC_("gradients-action", "Delete this gradient"),
     data_delete_cmd_callback,
     GIMP_HELP_GRADIENT_DELETE },
 
   { "gradients-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("gradients-action", "_Refresh Gradients"), { NULL },
+    NC_("gradients-action", "_Refresh Gradients"), NULL, { NULL },
     NC_("gradients-action", "Refresh gradients"),
     data_refresh_cmd_callback,
     GIMP_HELP_GRADIENT_REFRESH }
@@ -90,7 +90,7 @@ static const GimpActionEntry gradients_actions[] =
 static const GimpStringActionEntry gradients_edit_actions[] =
 {
   { "gradients-edit", GIMP_ICON_EDIT,
-    NC_("gradients-action", "_Edit Gradient..."), { NULL },
+    NC_("gradients-action", "_Edit Gradient..."), NULL, { NULL },
     NC_("gradients-action", "Edit this gradient"),
     "gimp-gradient-editor",
     GIMP_HELP_GRADIENT_EDIT }
diff --git a/app/actions/help-actions.c b/app/actions/help-actions.c
index 56ff10799d..65e171c9eb 100644
--- a/app/actions/help-actions.c
+++ b/app/actions/help-actions.c
@@ -38,13 +38,13 @@ static const GimpActionEntry help_actions[] =
   { "help-menu", NULL, NC_("help-action", "_Help") },
 
   { "help-help", "gimp-prefs-help-system",
-    NC_("help-action", "_Help"), { "F1", NULL },
+    NC_("help-action", "_Help"), NULL, { "F1", NULL },
     NC_("help-action", "Open the GIMP user manual"),
     help_help_cmd_callback,
     GIMP_HELP_HELP },
 
   { "help-context-help", "gimp-prefs-help-system",
-    NC_("help-action", "_Context Help"), { "<shift>F1", NULL },
+    NC_("help-action", "_Context Help"), NULL, { "<shift>F1", NULL },
     NC_("help-action", "Show the help for a specific user interface item"),
     help_context_help_cmd_callback,
     GIMP_HELP_HELP_CONTEXT }
diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c
index 1edc09fce4..c3704d631b 100644
--- a/app/actions/image-actions.c
+++ b/app/actions/image-actions.c
@@ -52,11 +52,11 @@
 static const GimpActionEntry image_actions[] =
 {
   { "image-menubar", NULL,
-    NC_("image-action", "Image Menu"), { NULL }, NULL, NULL,
+    NC_("image-action", "Image Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_IMAGE_WINDOW },
 
   { "image-popup", NULL,
-    NC_("image-action", "Image Menu"), { NULL }, NULL, NULL,
+    NC_("image-action", "Image Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_IMAGE_WINDOW },
 
   { "image-menu",                  NULL, NC_("image-action", "_Image")     },
@@ -77,43 +77,43 @@ static const GimpActionEntry image_actions[] =
   { "colors-desaturate-menu",   NULL, NC_("image-action", "D_esaturate")   },
 
   { "image-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("image-action", "_New..."), { "<primary>N", NULL },
+    NC_("image-action", "_New..."), NULL, { "<primary>N", NULL },
     NC_("image-action", "Create a new image"),
     image_new_cmd_callback,
     GIMP_HELP_FILE_NEW },
 
   { "image-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("image-action", "_Duplicate"), { "<primary>D", NULL },
+    NC_("image-action", "_Duplicate"), NULL, { "<primary>D", NULL },
     NC_("image-action", "Create a duplicate of this image"),
     image_duplicate_cmd_callback,
     GIMP_HELP_IMAGE_DUPLICATE },
 
   { "image-color-profile-assign", NULL,
-    NC_("image-action", "_Assign Color Profile..."), { NULL },
+    NC_("image-action", "_Assign Color Profile..."), NULL, { NULL },
     NC_("image-action", "Set a color profile on the image"),
     image_color_profile_assign_cmd_callback,
     GIMP_HELP_IMAGE_COLOR_PROFILE_ASSIGN },
 
   { "image-color-profile-convert", NULL,
-    NC_("image-action", "_Convert to Color Profile..."), { NULL },
+    NC_("image-action", "_Convert to Color Profile..."), NULL, { NULL },
     NC_("image-action", "Apply a color profile to the image"),
     image_color_profile_convert_cmd_callback,
     GIMP_HELP_IMAGE_COLOR_PROFILE_CONVERT },
 
   { "image-color-profile-discard", NULL,
-    NC_("image-action", "_Discard Color Profile"), { NULL },
+    NC_("image-action", "_Discard Color Profile"), NULL, { NULL },
     NC_("image-action", "Remove the image's color profile"),
     image_color_profile_discard_cmd_callback,
     GIMP_HELP_IMAGE_COLOR_PROFILE_DISCARD },
 
   { "image-softproof-profile", NULL,
-    NC_("image-action", "_Soft-proof Profile..."), { NULL },
+    NC_("image-action", "_Soft-proof Profile..."), NULL, { NULL },
     NC_("image-action", "Set the soft-proofing profile"),
     image_softproof_profile_cmd_callback,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "image-color-profile-save", NULL,
-    NC_("image-action", "_Save Color Profile to File..."), { NULL },
+    NC_("image-action", "_Save Color Profile to File..."), NULL, { NULL },
     NC_("image-action", "Save the image's color profile to an ICC file"),
     image_color_profile_save_cmd_callback,
     GIMP_HELP_IMAGE_COLOR_PROFILE_SAVE },
@@ -122,67 +122,67 @@ static const GimpActionEntry image_actions[] =
     NC_("image-action", "Soft-Proofing Re_ndering Intent") },
 
   { "image-resize", GIMP_ICON_OBJECT_RESIZE,
-    NC_("image-action", "Can_vas Size..."), { NULL },
+    NC_("image-action", "Can_vas Size..."), NULL, { NULL },
     NC_("image-action", "Adjust the image dimensions"),
     image_resize_cmd_callback,
     GIMP_HELP_IMAGE_RESIZE },
 
   { "image-resize-to-layers", NULL,
-    NC_("image-action", "Fit Canvas to L_ayers"), { NULL },
+    NC_("image-action", "Fit Canvas to L_ayers"), NULL, { NULL },
     NC_("image-action", "Resize the image to enclose all layers"),
     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 },
+    NC_("image-action", "F_it Canvas to Selection"), NULL, { NULL },
     NC_("image-action", "Resize the image to the extents of the selection"),
     image_resize_to_selection_cmd_callback,
     GIMP_HELP_IMAGE_RESIZE_TO_SELECTION },
 
   { "image-print-size", GIMP_ICON_DOCUMENT_PRINT_RESOLUTION,
-    NC_("image-action", "_Print Size..."), { NULL },
+    NC_("image-action", "_Print Size..."), NULL, { NULL },
     NC_("image-action", "Adjust the print resolution"),
     image_print_size_cmd_callback,
     GIMP_HELP_IMAGE_PRINT_SIZE },
 
   { "image-scale", GIMP_ICON_OBJECT_SCALE,
-    NC_("image-action", "_Scale Image..."), { NULL },
+    NC_("image-action", "_Scale Image..."), NULL, { NULL },
     NC_("image-action", "Change the size of the image content"),
     image_scale_cmd_callback,
     GIMP_HELP_IMAGE_SCALE },
 
   { "image-crop-to-selection", GIMP_ICON_TOOL_CROP,
-    NC_("image-action", "_Crop to Selection"), { NULL },
+    NC_("image-action", "_Crop to Selection"), NULL, { NULL },
     NC_("image-action", "Crop the image to the extents of the selection"),
     image_crop_to_selection_cmd_callback,
     GIMP_HELP_IMAGE_CROP },
 
   { "image-crop-to-content", GIMP_ICON_TOOL_CROP,
-    NC_("image-action", "Crop to C_ontent"), { NULL },
+    NC_("image-action", "Crop to C_ontent"), NULL, { NULL },
     NC_("image-action", "Crop the image to the extents of its content (remove empty borders from the image)"),
     image_crop_to_content_cmd_callback,
     GIMP_HELP_IMAGE_CROP },
 
   { "image-merge-layers", NULL,
-    NC_("image-action", "Merge Visible _Layers..."), { "<primary>M", NULL },
+    NC_("image-action", "Merge Visible _Layers..."), NULL, { "<primary>M", NULL },
     NC_("image-action", "Merge all visible layers into one layer"),
     image_merge_layers_cmd_callback,
     GIMP_HELP_IMAGE_MERGE_LAYERS },
 
   { "image-flatten", NULL,
-    NC_("image-action", "_Flatten Image"), { NULL },
+    NC_("image-action", "_Flatten Image"), NULL, { NULL },
     NC_("image-action", "Merge all layers into one and remove transparency"),
     image_flatten_image_cmd_callback,
     GIMP_HELP_IMAGE_FLATTEN },
 
   { "image-configure-grid", GIMP_ICON_GRID,
-    NC_("image-action", "Configure G_rid..."), { NULL },
+    NC_("image-action", "Configure G_rid..."), NULL, { NULL },
     NC_("image-action", "Configure the grid for this image"),
     image_configure_grid_cmd_callback,
     GIMP_HELP_IMAGE_GRID },
 
   { "image-properties", "dialog-information",
-    NC_("image-action", "Image Pr_operties"), { "<alt>Return", NULL },
+    NC_("image-action", "Image Pr_operties"), NULL, { "<alt>Return", NULL },
     NC_("image-action", "Display information about this image"),
     image_properties_cmd_callback,
     GIMP_HELP_IMAGE_PROPERTIES }
@@ -191,7 +191,7 @@ static const GimpActionEntry image_actions[] =
 static const GimpToggleActionEntry image_toggle_actions[] =
 {
   { "image-color-profile-use-srgb", NULL,
-    NC_("image-action", "Use _sRGB Profile"), { NULL },
+    NC_("image-action", "Use _sRGB Profile"), NULL, { NULL },
     NC_("image-action", "Temporarily use an sRGB profile for the image. "
         "This is the same as discarding the image's color profile, but "
         "allows to easily restore the profile."),
@@ -200,7 +200,7 @@ static const GimpToggleActionEntry image_toggle_actions[] =
     GIMP_HELP_IMAGE_COLOR_PROFILE_USE_SRGB },
 
   { "image-softproof-black-point-compensation", NULL,
-    NC_("image-action", "_Black Point Compensation"), { NULL },
+    NC_("image-action", "_Black Point Compensation"), NULL, { NULL },
     NC_("image-action", "Use black point compensation for soft-proofing"),
     image_softproof_bpc_cmd_callback,
     TRUE,
@@ -210,17 +210,17 @@ static const GimpToggleActionEntry image_toggle_actions[] =
 static const GimpRadioActionEntry image_convert_base_type_actions[] =
 {
   { "image-convert-rgb", GIMP_ICON_CONVERT_RGB,
-    NC_("image-convert-action", "_RGB"), { NULL },
+    NC_("image-convert-action", "_RGB"), NULL, { NULL },
     NC_("image-convert-action", "Convert the image to the RGB colorspace"),
     GIMP_RGB, GIMP_HELP_IMAGE_CONVERT_RGB },
 
   { "image-convert-grayscale", GIMP_ICON_CONVERT_GRAYSCALE,
-    NC_("image-convert-action", "_Grayscale"), { NULL },
+    NC_("image-convert-action", "_Grayscale"), NULL, { NULL },
     NC_("image-convert-action", "Convert the image to grayscale"),
     GIMP_GRAY, GIMP_HELP_IMAGE_CONVERT_GRAYSCALE },
 
   { "image-convert-indexed", GIMP_ICON_CONVERT_INDEXED,
-    NC_("image-convert-action", "_Indexed..."), { NULL },
+    NC_("image-convert-action", "_Indexed..."), NULL, { NULL },
     NC_("image-convert-action", "Convert the image to indexed colors"),
     GIMP_INDEXED, GIMP_HELP_IMAGE_CONVERT_INDEXED }
 };
@@ -228,37 +228,37 @@ static const GimpRadioActionEntry image_convert_base_type_actions[] =
 static const GimpRadioActionEntry image_convert_precision_actions[] =
 {
   { "image-convert-u8", NULL,
-    NC_("image-convert-action", "8 bit integer"), { NULL },
+    NC_("image-convert-action", "8 bit integer"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to 8 bit integer"),
     GIMP_COMPONENT_TYPE_U8, GIMP_HELP_IMAGE_CONVERT_U8 },
 
   { "image-convert-u16", NULL,
-    NC_("image-convert-action", "16 bit integer"), { NULL },
+    NC_("image-convert-action", "16 bit integer"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to 16 bit integer"),
     GIMP_COMPONENT_TYPE_U16, GIMP_HELP_IMAGE_CONVERT_U16 },
 
   { "image-convert-u32", NULL,
-    NC_("image-convert-action", "32 bit integer"), { NULL },
+    NC_("image-convert-action", "32 bit integer"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to 32 bit integer"),
     GIMP_COMPONENT_TYPE_U32, GIMP_HELP_IMAGE_CONVERT_U32 },
 
   { "image-convert-half", NULL,
-    NC_("image-convert-action", "16 bit floating point"), { NULL },
+    NC_("image-convert-action", "16 bit floating point"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to 16 bit floating point"),
     GIMP_COMPONENT_TYPE_HALF, GIMP_HELP_IMAGE_CONVERT_HALF },
 
   { "image-convert-float", NULL,
-    NC_("image-convert-action", "32 bit floating point"), { NULL },
+    NC_("image-convert-action", "32 bit floating point"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to 32 bit floating point"),
     GIMP_COMPONENT_TYPE_FLOAT, GIMP_HELP_IMAGE_CONVERT_FLOAT },
 
   { "image-convert-double", NULL,
-    NC_("image-convert-action", "64 bit floating point"), { NULL },
+    NC_("image-convert-action", "64 bit floating point"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to 64 bit floating point"),
     GIMP_COMPONENT_TYPE_DOUBLE, GIMP_HELP_IMAGE_CONVERT_DOUBLE }
@@ -267,19 +267,19 @@ static const GimpRadioActionEntry image_convert_precision_actions[] =
 static const GimpRadioActionEntry image_convert_trc_actions[] =
 {
   { "image-convert-linear", NULL,
-    NC_("image-convert-action", "Linear light"), { NULL },
+    NC_("image-convert-action", "Linear light"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to linear light"),
     GIMP_TRC_LINEAR, GIMP_HELP_IMAGE_CONVERT_GAMMA },
 
   { "image-convert-non-linear", NULL,
-    NC_("image-convert-action", "Non-Linear"), { NULL },
+    NC_("image-convert-action", "Non-Linear"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to non-linear gamma from the color profile"),
     GIMP_TRC_NON_LINEAR, GIMP_HELP_IMAGE_CONVERT_GAMMA },
 
   { "image-convert-perceptual", NULL,
-    NC_("image-convert-action", "Perceptual (sRGB)"), { NULL },
+    NC_("image-convert-action", "Perceptual (sRGB)"), NULL, { NULL },
     NC_("image-convert-action",
         "Convert the image to perceptual (sRGB) gamma"),
     GIMP_TRC_PERCEPTUAL, GIMP_HELP_IMAGE_CONVERT_GAMMA }
@@ -288,13 +288,13 @@ static const GimpRadioActionEntry image_convert_trc_actions[] =
 static const GimpEnumActionEntry image_flip_actions[] =
 {
   { "image-flip-horizontal", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
-    NC_("image-action", "Flip _Horizontally"), { NULL },
+    NC_("image-action", "Flip _Horizontally"), NULL, { NULL },
     NC_("image-action", "Flip image horizontally"),
     GIMP_ORIENTATION_HORIZONTAL, FALSE,
     GIMP_HELP_IMAGE_FLIP_HORIZONTAL },
 
   { "image-flip-vertical", GIMP_ICON_OBJECT_FLIP_VERTICAL,
-    NC_("image-action", "Flip _Vertically"), { NULL },
+    NC_("image-action", "Flip _Vertically"), NULL, { NULL },
     NC_("image-action", "Flip image vertically"),
     GIMP_ORIENTATION_VERTICAL, FALSE,
     GIMP_HELP_IMAGE_FLIP_VERTICAL }
@@ -303,19 +303,19 @@ static const GimpEnumActionEntry image_flip_actions[] =
 static const GimpEnumActionEntry image_rotate_actions[] =
 {
   { "image-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
-    NC_("image-action", "Rotate 90° _clockwise"), { NULL },
+    NC_("image-action", "Rotate 90° _clockwise"), NULL, { NULL },
     NC_("image-action", "Rotate the image 90 degrees to the right"),
     GIMP_ROTATE_90, FALSE,
     GIMP_HELP_IMAGE_ROTATE_90 },
 
   { "image-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
-    NC_("image-action", "Rotate _180°"), { NULL },
+    NC_("image-action", "Rotate _180°"), NULL, { NULL },
     NC_("image-action", "Turn the image upside-down"),
     GIMP_ROTATE_180, FALSE,
     GIMP_HELP_IMAGE_ROTATE_180 },
 
   { "image-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
-    NC_("image-action", "Rotate 90° counter-clock_wise"), { NULL },
+    NC_("image-action", "Rotate 90° counter-clock_wise"), NULL, { NULL },
     NC_("image-action", "Rotate the image 90 degrees to the left"),
     GIMP_ROTATE_270, FALSE,
     GIMP_HELP_IMAGE_ROTATE_270 }
@@ -324,25 +324,25 @@ static const GimpEnumActionEntry image_rotate_actions[] =
 static const GimpRadioActionEntry image_softproof_intent_actions[] =
 {
   { "image-softproof-intent-perceptual", NULL,
-    NC_("image-action", "_Perceptual"), { NULL },
+    NC_("image-action", "_Perceptual"), NULL, { NULL },
     NC_("image-action", "Soft-proofing rendering intent is perceptual"),
     GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "image-softproof-intent-relative-colorimetric", NULL,
-    NC_("image-action", "_Relative Colorimetric"), { NULL },
+    NC_("image-action", "_Relative Colorimetric"), NULL, { NULL },
     NC_("image-action", "Soft-proofing rendering intent is relative colorimetric"),
     GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "image-softproof-intent-saturation", NULL,
-    NC_("image-action", "_Saturation"), { NULL },
+    NC_("image-action", "_Saturation"), NULL, { NULL },
     NC_("image-action", "Soft-proofing rendering intent is saturation"),
     GIMP_COLOR_RENDERING_INTENT_SATURATION,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "image-softproof-intent-absolute-colorimetric", NULL,
-    NC_("image-action", "_Absolute Colorimetric"), { NULL },
+    NC_("image-action", "_Absolute Colorimetric"), NULL, { NULL },
     NC_("image-action", "Soft-proofing rendering intent is absolute colorimetric"),
     GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT }
diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c
index bf629b0b0e..ab513c31bf 100644
--- a/app/actions/images-actions.c
+++ b/app/actions/images-actions.c
@@ -40,23 +40,23 @@
 static const GimpActionEntry images_actions[] =
 {
   { "images-popup", GIMP_ICON_DIALOG_IMAGES,
-    NC_("images-action", "Images Menu"), { NULL }, NULL, NULL,
+    NC_("images-action", "Images Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_IMAGE_DIALOG },
 
   { "images-raise-views", GIMP_ICON_GO_TOP,
-    NC_("images-action", "_Raise Views"), { NULL },
+    NC_("images-action", "_Raise Views"), NULL, { NULL },
     NC_("images-action", "Raise this image's displays"),
     images_raise_views_cmd_callback,
     NULL },
 
   { "images-new-view", GIMP_ICON_DOCUMENT_NEW,
-    NC_("images-action", "_New View"), { NULL },
+    NC_("images-action", "_New View"), NULL, { NULL },
     NC_("images-action", "Create a new display for this image"),
     images_new_view_cmd_callback,
     NULL },
 
   { "images-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("images-action", "_Delete Image"), { NULL },
+    NC_("images-action", "_Delete Image"), NULL, { NULL },
     NC_("images-action", "Delete this image"),
     images_delete_image_cmd_callback,
     NULL }
diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c
index 2689e5a82d..195e03a8ef 100644
--- a/app/actions/layers-actions.c
+++ b/app/actions/layers-actions.c
@@ -49,23 +49,23 @@
 static const GimpActionEntry layers_actions[] =
 {
   { "layers-popup", GIMP_ICON_DIALOG_LAYERS,
-    NC_("layers-action", "Layers Menu"), { NULL }, NULL, NULL,
+    NC_("layers-action", "Layers Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_LAYER_DIALOG },
 
   { "layers-blend-space-menu", NULL,
-    NC_("layers-action", "Blend Space"), { NULL }, NULL, NULL,
+    NC_("layers-action", "Blend Space"), NULL, { NULL }, NULL, NULL,
     NULL },
 
   { "layers-composite-space-menu", NULL,
-    NC_("layers-action", "Composite Space"), { NULL }, NULL, NULL,
+    NC_("layers-action", "Composite Space"), NULL, { NULL }, NULL, NULL,
     NULL },
 
   { "layers-composite-mode-menu", NULL,
-    NC_("layers-action", "Composite Mode"), { NULL }, NULL, NULL,
+    NC_("layers-action", "Composite Mode"), NULL, { NULL }, NULL, NULL,
     NULL },
 
   { "layers-color-tag-menu", NULL,
-    NC_("layers-action", "Color Tag"), { NULL }, NULL, NULL,
+    NC_("layers-action", "Color Tag"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-menu",                   NULL,
@@ -86,93 +86,93 @@ static const GimpActionEntry layers_actions[] =
     NC_("layers-action", "Layer _Mode")   },
 
   { "layers-edit", GIMP_ICON_EDIT,
-    NC_("layers-action", "Default Edit Action"), { NULL },
+    NC_("layers-action", "Default Edit Action"), NULL, { NULL },
     NC_("layers-action", "Activate the default edit action for this type of layer"),
     layers_edit_cmd_callback,
     GIMP_HELP_LAYER_EDIT },
 
   { "layers-edit-text", GIMP_ICON_EDIT,
-    NC_("layers-action", "Edit Te_xt on canvas"), { NULL },
+    NC_("layers-action", "Edit Te_xt on canvas"), NULL, { NULL },
     NC_("layers-action", "Edit this text layer content on canvas"),
     layers_edit_text_cmd_callback,
     GIMP_HELP_LAYER_EDIT },
 
   { "layers-edit-attributes", GIMP_ICON_EDIT,
-    NC_("layers-action", "_Edit Layer Attributes..."), { NULL },
+    NC_("layers-action", "_Edit Layer Attributes..."), NULL, { NULL },
     NC_("layers-action", "Edit the layer's name"),
     layers_edit_attributes_cmd_callback,
     GIMP_HELP_LAYER_EDIT },
 
   { "layers-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("layers-action", "_New Layer..."), { "<primary><shift>N", NULL },
+    NC_("layers-action", "_New Layer..."), NULL, { "<primary><shift>N", NULL },
     NC_("layers-action", "Create a new layer and add it to the image"),
     layers_new_cmd_callback,
     GIMP_HELP_LAYER_NEW },
 
   { "layers-new-last-values", GIMP_ICON_DOCUMENT_NEW,
-    NC_("layers-action", "_New Layer"), { NULL },
+    NC_("layers-action", "_New Layer"), NULL, { NULL },
     NC_("layers-action", "Create new layers with last used values"),
     layers_new_last_vals_cmd_callback,
     GIMP_HELP_LAYER_NEW },
 
   { "layers-new-from-visible", NULL,
-    NC_("layers-action", "New from _Visible"), { NULL },
+    NC_("layers-action", "New from _Visible"), NULL, { NULL },
     NC_("layers-action",
         "Create a new layer from what is visible in this image"),
     layers_new_from_visible_cmd_callback,
     GIMP_HELP_LAYER_NEW_FROM_VISIBLE },
 
   { "layers-new-group", GIMP_ICON_FOLDER_NEW,
-    NC_("layers-action", "New Layer _Group"), { NULL },
+    NC_("layers-action", "New Layer _Group"), NULL, { NULL },
     NC_("layers-action", "Create a new layer group and add it to the image"),
     layers_new_group_cmd_callback,
     GIMP_HELP_LAYER_NEW },
 
   { "layers-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("layers-action", "D_uplicate Layer"), { "<primary><shift>D", NULL },
+    NC_("layers-action", "D_uplicate Layer"), NULL, { "<primary><shift>D", NULL },
     NC_("layers-action",
         "Create duplicates of selected layers and add them to the image"),
     layers_duplicate_cmd_callback,
     GIMP_HELP_LAYER_DUPLICATE },
 
   { "layers-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("layers-action", "_Delete Layers"), { NULL },
+    NC_("layers-action", "_Delete Layers"), NULL, { NULL },
     NC_("layers-action", "Delete selected layers"),
     layers_delete_cmd_callback,
     GIMP_HELP_LAYER_DELETE },
 
   { "layers-raise", GIMP_ICON_GO_UP,
-    NC_("layers-action", "_Raise Layer"), { NULL },
+    NC_("layers-action", "_Raise Layer"), NULL, { NULL },
     NC_("layers-action", "Raise this layer one step in the layer stack"),
     layers_raise_cmd_callback,
     GIMP_HELP_LAYER_RAISE },
 
   { "layers-raise-to-top", GIMP_ICON_GO_TOP,
-    NC_("layers-action", "Layer to _Top"), { NULL },
+    NC_("layers-action", "Layer to _Top"), NULL, { NULL },
     NC_("layers-action", "Move this layer to the top of the layer stack"),
     layers_raise_to_top_cmd_callback,
     GIMP_HELP_LAYER_RAISE_TO_TOP },
 
   { "layers-lower", GIMP_ICON_GO_DOWN,
-    NC_("layers-action", "_Lower Layer"), { NULL },
+    NC_("layers-action", "_Lower Layer"), NULL, { NULL },
     NC_("layers-action", "Lower this layer one step in the layer stack"),
     layers_lower_cmd_callback,
     GIMP_HELP_LAYER_LOWER },
 
   { "layers-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
-    NC_("layers-action", "Layer to _Bottom"), { NULL },
+    NC_("layers-action", "Layer to _Bottom"), NULL, { NULL },
     NC_("layers-action", "Move this layer to the bottom of the layer stack"),
     layers_lower_to_bottom_cmd_callback,
     GIMP_HELP_LAYER_LOWER_TO_BOTTOM },
 
   { "layers-anchor", GIMP_ICON_LAYER_ANCHOR,
-    NC_("layers-action", "_Anchor Floating Layer or Mask"), { "<primary>H", NULL },
+    NC_("layers-action", "_Anchor Floating Layer or Mask"), NULL, { "<primary>H", NULL },
     NC_("layers-action", "Anchor the floating layer or mask"),
     layers_anchor_cmd_callback,
     GIMP_HELP_LAYER_ANCHOR },
 
   { "layers-merge-down", GIMP_ICON_LAYER_MERGE_DOWN,
-    NC_("layers-action", "Merge Do_wn"), { NULL },
+    NC_("layers-action", "Merge Do_wn"), NULL, { NULL },
     NC_("layers-action", "Merge these layers with the first visible layer below each"),
     layers_merge_down_cmd_callback,
     GIMP_HELP_LAYER_MERGE_DOWN },
@@ -181,85 +181,85 @@ static const GimpActionEntry layers_actions[] =
    * the layer can't be merged down
    */
   { "layers-merge-down-button", GIMP_ICON_LAYER_MERGE_DOWN,
-    NC_("layers-action", "Merge Do_wn"), { NULL },
+    NC_("layers-action", "Merge Do_wn"), NULL, { NULL },
     NC_("layers-action", "Merge these layers with the first visible layer below each"),
     layers_merge_down_cmd_callback,
     GIMP_HELP_LAYER_MERGE_DOWN },
 
   { "layers-merge-group", NULL,
-    NC_("layers-action", "Merge Layer Groups"), { NULL },
+    NC_("layers-action", "Merge Layer Groups"), NULL, { NULL },
     NC_("layers-action", "Merge the layer groups' layers into one normal layer"),
     layers_merge_group_cmd_callback,
     GIMP_HELP_LAYER_MERGE_GROUP },
 
   { "layers-merge-layers", NULL,
-    NC_("layers-action", "Merge _Visible Layers..."), { NULL },
+    NC_("layers-action", "Merge _Visible Layers..."), NULL, { NULL },
     NC_("layers-action", "Merge all visible layers into one layer"),
     image_merge_layers_cmd_callback,
     GIMP_HELP_IMAGE_MERGE_LAYERS },
 
   { "layers-merge-layers-last-values", NULL,
-    NC_("layers-action", "Merge _Visible Layers"), { NULL },
+    NC_("layers-action", "Merge _Visible Layers"), NULL, { NULL },
     NC_("layers-action", "Merge all visible layers with last used values"),
     image_merge_layers_last_vals_cmd_callback,
     GIMP_HELP_IMAGE_MERGE_LAYERS },
 
   { "layers-flatten-image", NULL,
-    NC_("layers-action", "_Flatten Image"), { NULL },
+    NC_("layers-action", "_Flatten Image"), NULL, { NULL },
     NC_("layers-action", "Merge all layers into one and remove transparency"),
     image_flatten_image_cmd_callback,
     GIMP_HELP_IMAGE_FLATTEN },
 
   { "layers-text-discard", GIMP_ICON_TOOL_TEXT,
-    NC_("layers-action", "_Discard Text Information"), { NULL },
+    NC_("layers-action", "_Discard Text Information"), NULL, { NULL },
     NC_("layers-action", "Turn these text layers into normal layers"),
     layers_text_discard_cmd_callback,
     GIMP_HELP_LAYER_TEXT_DISCARD },
 
   { "layers-text-to-vectors", GIMP_ICON_TOOL_TEXT,
-    NC_("layers-action", "Text to _Path"), { NULL },
+    NC_("layers-action", "Text to _Path"), NULL, { NULL },
     NC_("layers-action", "Create paths from text layers"),
     layers_text_to_vectors_cmd_callback,
     GIMP_HELP_LAYER_TEXT_TO_PATH },
 
   { "layers-text-along-vectors", GIMP_ICON_TOOL_TEXT,
-    NC_("layers-action", "Text alon_g Path"), { NULL },
+    NC_("layers-action", "Text alon_g Path"), NULL, { NULL },
     NC_("layers-action", "Warp this layer's text along the current path"),
     layers_text_along_vectors_cmd_callback,
     GIMP_HELP_LAYER_TEXT_ALONG_PATH },
 
   { "layers-resize", GIMP_ICON_OBJECT_RESIZE,
-    NC_("layers-action", "Layer B_oundary Size..."), { NULL },
+    NC_("layers-action", "Layer B_oundary Size..."), NULL, { NULL },
     NC_("layers-action", "Adjust the layer dimensions"),
     layers_resize_cmd_callback,
     GIMP_HELP_LAYER_RESIZE },
 
   { "layers-resize-to-image", GIMP_ICON_LAYER_TO_IMAGESIZE,
-    NC_("layers-action", "Layers to _Image Size"), { NULL },
+    NC_("layers-action", "Layers to _Image Size"), NULL, { NULL },
     NC_("layers-action", "Resize the layers to the size of the image"),
     layers_resize_to_image_cmd_callback,
     GIMP_HELP_LAYER_RESIZE_TO_IMAGE },
 
   { "layers-scale", GIMP_ICON_OBJECT_SCALE,
-    NC_("layers-action", "_Scale Layer..."), { NULL },
+    NC_("layers-action", "_Scale Layer..."), NULL, { NULL },
     NC_("layers-action", "Change the size of the layer content"),
     layers_scale_cmd_callback,
     GIMP_HELP_LAYER_SCALE },
 
   { "layers-crop-to-selection", GIMP_ICON_TOOL_CROP,
-    NC_("layers-action", "_Resize Layers to Selection"), { NULL },
+    NC_("layers-action", "_Resize Layers to Selection"), NULL, { NULL },
     NC_("layers-action", "Resize the layers to the extents of the selection"),
     layers_crop_to_selection_cmd_callback,
     GIMP_HELP_LAYER_CROP },
 
   { "layers-crop-to-content", GIMP_ICON_TOOL_CROP,
-    NC_("layers-action", "Crop Layers to C_ontent"), { NULL },
+    NC_("layers-action", "Crop Layers to C_ontent"), NULL, { NULL },
     NC_("layers-action", "Crop the layers to the extents of their content (remove empty borders from the layer)"),
     layers_crop_to_content_cmd_callback,
     GIMP_HELP_LAYER_CROP },
 
   { "layers-mask-add", GIMP_ICON_LAYER_MASK,
-    NC_("layers-action", "Add La_yer Masks..."), { NULL },
+    NC_("layers-action", "Add La_yer Masks..."), NULL, { NULL },
     NC_("layers-action",
         "Add masks to selected layers that allows non-destructive editing of transparency"),
     layers_mask_add_cmd_callback,
@@ -269,27 +269,27 @@ static const GimpActionEntry layers_actions[] =
    * there is a mask on the layer
    */
   { "layers-mask-add-button", GIMP_ICON_LAYER_MASK,
-    NC_("layers-action", "Add La_yer Masks..."), { NULL },
+    NC_("layers-action", "Add La_yer Masks..."), NULL, { NULL },
     NC_("layers-action",
         "Add masks to selected layers that allows non-destructive editing of transparency"),
     layers_mask_add_cmd_callback,
     GIMP_HELP_LAYER_MASK_ADD },
 
   { "layers-mask-add-last-values", GIMP_ICON_LAYER_MASK,
-    NC_("layers-action", "Add La_yer Masks with Last Values"), { NULL },
+    NC_("layers-action", "Add La_yer Masks with Last Values"), NULL, { NULL },
     NC_("layers-action",
         "Add mask to selected layers with last used values"),
     layers_mask_add_last_vals_cmd_callback,
     GIMP_HELP_LAYER_MASK_ADD },
 
   { "layers-alpha-add", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Add Alpha C_hannel"), { NULL },
+    NC_("layers-action", "Add Alpha C_hannel"), NULL, { NULL },
     NC_("layers-action", "Add transparency information to the layer"),
     layers_alpha_add_cmd_callback,
     GIMP_HELP_LAYER_ALPHA_ADD },
 
   { "layers-alpha-remove", NULL,
-    NC_("layers-action", "_Remove Alpha Channel"), { NULL },
+    NC_("layers-action", "_Remove Alpha Channel"), NULL, { NULL },
     NC_("layers-action", "Remove transparency information from the layer"),
     layers_alpha_remove_cmd_callback,
     GIMP_HELP_LAYER_ALPHA_REMOVE }
@@ -298,45 +298,45 @@ static const GimpActionEntry layers_actions[] =
 static const GimpToggleActionEntry layers_toggle_actions[] =
 {
   { "layers-mask-edit", GIMP_ICON_EDIT,
-    NC_("layers-action", "_Edit Layer Mask"), { NULL },
+    NC_("layers-action", "_Edit Layer Mask"), NULL, { NULL },
     NC_("layers-action", "Work on the layer mask"),
     layers_mask_edit_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_MASK_EDIT },
 
   { "layers-mask-show", GIMP_ICON_VISIBLE,
-    NC_("layers-action", "S_how Layer Masks"), { NULL }, NULL,
+    NC_("layers-action", "S_how Layer Masks"), NULL, { NULL }, NULL,
     layers_mask_show_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_MASK_SHOW },
 
   { "layers-mask-disable", NULL,
-    NC_("layers-action", "_Disable Layer Masks"), { NULL },
+    NC_("layers-action", "_Disable Layer Masks"), NULL, { NULL },
     NC_("layers-action", "Dismiss the effect of the layer mask"),
     layers_mask_disable_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_MASK_DISABLE },
 
   { "layers-visible", GIMP_ICON_VISIBLE,
-    NC_("layers-action", "Toggle Layer _Visibility"), { NULL }, NULL,
+    NC_("layers-action", "Toggle Layer _Visibility"), NULL, { NULL }, NULL,
     layers_visible_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_VISIBLE },
 
   { "layers-lock-content", GIMP_ICON_LOCK_CONTENT,
-    NC_("layers-action", "L_ock Pixels of Layer"), { NULL }, NULL,
+    NC_("layers-action", "L_ock Pixels of Layer"), NULL, { NULL }, NULL,
     layers_lock_content_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_LOCK_PIXELS },
 
   { "layers-lock-position", GIMP_ICON_LOCK_POSITION,
-    NC_("layers-action", "L_ock Position of Layer"), { NULL }, NULL,
+    NC_("layers-action", "L_ock Position of Layer"), NULL, { NULL }, NULL,
     layers_lock_position_cmd_callback,
     FALSE,
     GIMP_HELP_LAYER_LOCK_POSITION },
 
   { "layers-lock-alpha", GIMP_ICON_LOCK_ALPHA,
-    NC_("layers-action", "Lock Alph_a Channel"), { NULL },
+    NC_("layers-action", "Lock Alph_a Channel"), NULL, { NULL },
     NC_("layers-action",
         "Keep transparency information on this layer from being modified"),
     layers_lock_alpha_cmd_callback,
@@ -347,19 +347,19 @@ static const GimpToggleActionEntry layers_toggle_actions[] =
 static const GimpRadioActionEntry layers_blend_space_actions[] =
 {
   { "layers-blend-space-auto", NULL,
-    NC_("layers-action", "Auto"), { NULL },
+    NC_("layers-action", "Auto"), NULL, { NULL },
     NC_("layers-action", "Layer Blend Space: Auto"),
     GIMP_LAYER_COLOR_SPACE_AUTO,
     NULL },
 
   { "layers-blend-space-rgb-linear", NULL,
-    NC_("layers-action", "RGB (linear)"), { NULL },
+    NC_("layers-action", "RGB (linear)"), NULL, { NULL },
     NC_("layers-action", "Layer Blend Space: RGB (linear)"),
     GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
     NULL },
 
   { "layers-blend-space-rgb-perceptual", NULL,
-    NC_("layers-action", "RGB (perceptual)"), { NULL },
+    NC_("layers-action", "RGB (perceptual)"), NULL, { NULL },
     NC_("layers-action", "Layer Blend Space: RGB (perceptual)"),
     GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
     NULL }
@@ -368,19 +368,19 @@ static const GimpRadioActionEntry layers_blend_space_actions[] =
 static const GimpRadioActionEntry layers_composite_space_actions[] =
 {
   { "layers-composite-space-auto", NULL,
-    NC_("layers-action", "Auto"), { NULL },
+    NC_("layers-action", "Auto"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Space: Auto"),
     GIMP_LAYER_COLOR_SPACE_AUTO,
     NULL },
 
   { "layers-composite-space-rgb-linear", NULL,
-    NC_("layers-action", "RGB (linear)"), { NULL },
+    NC_("layers-action", "RGB (linear)"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Space: RGB (linear)"),
     GIMP_LAYER_COLOR_SPACE_RGB_LINEAR,
     NULL },
 
   { "layers-composite-space-rgb-perceptual", NULL,
-    NC_("layers-action", "RGB (perceptual)"), { NULL },
+    NC_("layers-action", "RGB (perceptual)"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Space: RGB (perceptual)"),
     GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
     NULL }
@@ -389,31 +389,31 @@ static const GimpRadioActionEntry layers_composite_space_actions[] =
 static const GimpRadioActionEntry layers_composite_mode_actions[] =
 {
   { "layers-composite-mode-auto", NULL,
-    NC_("layers-action", "Auto"), { NULL },
+    NC_("layers-action", "Auto"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Mode: Auto"),
     GIMP_LAYER_COMPOSITE_AUTO,
     NULL },
 
   { "layers-composite-mode-union", NULL,
-    NC_("layers-action", "Union"), { NULL },
+    NC_("layers-action", "Union"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Mode: Union"),
     GIMP_LAYER_COMPOSITE_UNION,
     NULL },
 
   { "layers-composite-mode-clip-to-backdrop", NULL,
-    NC_("layers-action", "Clip to Backdrop"), { NULL },
+    NC_("layers-action", "Clip to Backdrop"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Mode: Clip to Backdrop"),
     GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
     NULL },
 
   { "layers-composite-mode-clip-to-layer", NULL,
-    NC_("layers-action", "Clip to Layer"), { NULL },
+    NC_("layers-action", "Clip to Layer"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Mode: Clip to Layer"),
     GIMP_LAYER_COMPOSITE_CLIP_TO_LAYER,
     NULL },
 
   { "layers-composite-mode-intersection", NULL,
-    NC_("layers-action", "Intersection"), { NULL },
+    NC_("layers-action", "Intersection"), NULL, { NULL },
     NC_("layers-action", "Layer Composite Mode: Intersection"),
     GIMP_LAYER_COMPOSITE_INTERSECTION,
     NULL }
@@ -422,55 +422,55 @@ static const GimpRadioActionEntry layers_composite_mode_actions[] =
 static const GimpEnumActionEntry layers_color_tag_actions[] =
 {
   { "layers-color-tag-none", GIMP_ICON_EDIT_CLEAR,
-    NC_("layers-action", "None"), { NULL },
+    NC_("layers-action", "None"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Clear"),
     GIMP_COLOR_TAG_NONE, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-blue", NULL,
-    NC_("layers-action", "Blue"), { NULL },
+    NC_("layers-action", "Blue"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Blue"),
     GIMP_COLOR_TAG_BLUE, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-green", NULL,
-    NC_("layers-action", "Green"), { NULL },
+    NC_("layers-action", "Green"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Green"),
     GIMP_COLOR_TAG_GREEN, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-yellow", NULL,
-    NC_("layers-action", "Yellow"), { NULL },
+    NC_("layers-action", "Yellow"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Yellow"),
     GIMP_COLOR_TAG_YELLOW, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-orange", NULL,
-    NC_("layers-action", "Orange"), { NULL },
+    NC_("layers-action", "Orange"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Orange"),
     GIMP_COLOR_TAG_ORANGE, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-brown", NULL,
-    NC_("layers-action", "Brown"), { NULL },
+    NC_("layers-action", "Brown"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Brown"),
     GIMP_COLOR_TAG_BROWN, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-red", NULL,
-    NC_("layers-action", "Red"), { NULL },
+    NC_("layers-action", "Red"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Red"),
     GIMP_COLOR_TAG_RED, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-violet", NULL,
-    NC_("layers-action", "Violet"), { NULL },
+    NC_("layers-action", "Violet"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Violet"),
     GIMP_COLOR_TAG_VIOLET, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG },
 
   { "layers-color-tag-gray", NULL,
-    NC_("layers-action", "Gray"), { NULL },
+    NC_("layers-action", "Gray"), NULL, { NULL },
     NC_("layers-action", "Layer Color Tag: Set to Gray"),
     GIMP_COLOR_TAG_GRAY, FALSE,
     GIMP_HELP_LAYER_COLOR_TAG }
@@ -479,13 +479,13 @@ static const GimpEnumActionEntry layers_color_tag_actions[] =
 static const GimpEnumActionEntry layers_mask_apply_actions[] =
 {
   { "layers-mask-apply", NULL,
-    NC_("layers-action", "Apply Layer _Mask"), { NULL },
+    NC_("layers-action", "Apply Layer _Mask"), NULL, { NULL },
     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", GIMP_ICON_EDIT_DELETE,
-    NC_("layers-action", "Delete Layer Mas_k"), { NULL },
+    NC_("layers-action", "Delete Layer Mas_k"), NULL, { NULL },
     NC_("layers-action", "Remove layer masks and their effect"),
     GIMP_MASK_DISCARD, FALSE,
     GIMP_HELP_LAYER_MASK_DELETE }
@@ -494,25 +494,25 @@ static const GimpEnumActionEntry layers_mask_apply_actions[] =
 static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
 {
   { "layers-mask-selection-replace", GIMP_ICON_SELECTION_REPLACE,
-    NC_("layers-action", "_Masks to Selection"), { NULL },
+    NC_("layers-action", "_Masks to Selection"), NULL, { NULL },
     NC_("layers-action", "Replace the selection with the layer masks"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_REPLACE },
 
   { "layers-mask-selection-add", GIMP_ICON_SELECTION_ADD,
-    NC_("layers-action", "_Add Masks to Selection"), { NULL },
+    NC_("layers-action", "_Add Masks to Selection"), NULL, { NULL },
     NC_("layers-action", "Add the layer masks to the current selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_ADD },
 
   { "layers-mask-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
-    NC_("layers-action", "_Subtract Masks from Selection"), { NULL },
+    NC_("layers-action", "_Subtract Masks from Selection"), NULL, { NULL },
     NC_("layers-action", "Subtract the layer masks from the current selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_SUBTRACT },
 
   { "layers-mask-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
-    NC_("layers-action", "_Intersect Masks with Selection"), { NULL },
+    NC_("layers-action", "_Intersect Masks with Selection"), NULL, { NULL },
     NC_("layers-action", "Intersect the layer masks with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_LAYER_MASK_SELECTION_INTERSECT }
@@ -521,28 +521,28 @@ static const GimpEnumActionEntry layers_mask_to_selection_actions[] =
 static const GimpEnumActionEntry layers_alpha_to_selection_actions[] =
 {
   { "layers-alpha-selection-replace", GIMP_ICON_SELECTION_REPLACE,
-    NC_("layers-action", "Al_pha to Selection"), { NULL },
+    NC_("layers-action", "Al_pha to Selection"), NULL, { NULL },
     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_ICON_SELECTION_ADD,
-    NC_("layers-action", "A_dd Alpha to Selection"), { NULL },
+    NC_("layers-action", "A_dd Alpha to Selection"), NULL, { NULL },
     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_ICON_SELECTION_SUBTRACT,
-    NC_("layers-action", "_Subtract Alpha from Selection"), { NULL },
+    NC_("layers-action", "_Subtract Alpha from Selection"), NULL, { NULL },
     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_ICON_SELECTION_INTERSECT,
-    NC_("layers-action", "_Intersect Alpha with Selection"), { NULL },
+    NC_("layers-action", "_Intersect Alpha with Selection"), NULL, { NULL },
     NC_("layers-action",
         "Intersect the layer's alpha channel with the current selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
@@ -552,25 +552,25 @@ static const GimpEnumActionEntry layers_alpha_to_selection_actions[] =
 static const GimpEnumActionEntry layers_select_actions[] =
 {
   { "layers-select-top", NULL,
-    NC_("layers-action", "Select _Top Layer"), { "Home", NULL },
+    NC_("layers-action", "Select _Top Layer"), NULL, { "Home", NULL },
     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", NULL },
+    NC_("layers-action", "Select _Bottom Layer"), NULL, { "End", NULL },
     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 Layers"), { "Prior", NULL },
+    NC_("layers-action", "Select _Previous Layers"), NULL, { "Prior", NULL },
     NC_("layers-action", "Select the layers above the current layers"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_PREVIOUS },
 
   { "layers-select-next", NULL,
-    NC_("layers-action", "Select _Next Layers"), { "Next", NULL },
+    NC_("layers-action", "Select _Next Layers"), NULL, { "Next", NULL },
     NC_("layers-action", "Select the layers below the current layers"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_LAYER_NEXT }
@@ -579,31 +579,31 @@ static const GimpEnumActionEntry layers_select_actions[] =
 static const GimpEnumActionEntry layers_opacity_actions[] =
 {
   { "layers-opacity-set", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Set"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     GIMP_HELP_LAYER_OPACITY },
   { "layers-opacity-transparent", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Make Completely Transparent"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Make Completely Transparent"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_LAYER_OPACITY },
   { "layers-opacity-opaque", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Make Completely Opaque"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Make Completely Opaque"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_LAYER_OPACITY },
   { "layers-opacity-decrease", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Make More Transparent"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Make More Transparent"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_OPACITY },
   { "layers-opacity-increase", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Make More Opaque"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Make More Opaque"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_LAYER_OPACITY },
   { "layers-opacity-decrease-skip", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Make 10% More Transparent"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Make 10% More Transparent"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_OPACITY },
   { "layers-opacity-increase-skip", GIMP_ICON_TRANSPARENCY,
-    NC_("layers-action", "Layer Opacity: Make 10% More Opaque"), { NULL }, NULL,
+    NC_("layers-action", "Layer Opacity: Make 10% More Opaque"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_LAYER_OPACITY }
 };
@@ -611,19 +611,19 @@ static const GimpEnumActionEntry layers_opacity_actions[] =
 static const GimpEnumActionEntry layers_mode_actions[] =
 {
   { "layers-mode-first", GIMP_ICON_TOOL_PENCIL,
-    NC_("layers-action", "Layer Mode: Select First"), { NULL }, NULL,
+    NC_("layers-action", "Layer Mode: Select First"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_LAYER_MODE },
   { "layers-mode-last", GIMP_ICON_TOOL_PENCIL,
-    NC_("layers-action", "Layer Mode: Select Last"), { NULL }, NULL,
+    NC_("layers-action", "Layer Mode: Select Last"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_LAYER_MODE },
   { "layers-mode-previous", GIMP_ICON_TOOL_PENCIL,
-    NC_("layers-action", "Layer Mode: Select Previous"), { NULL }, NULL,
+    NC_("layers-action", "Layer Mode: Select Previous"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_LAYER_MODE },
   { "layers-mode-next", GIMP_ICON_TOOL_PENCIL,
-    NC_("layers-action", "Layer Mode: Select Next"), { NULL }, NULL,
+    NC_("layers-action", "Layer Mode: Select Next"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_LAYER_MODE }
 };
diff --git a/app/actions/mypaint-brushes-actions.c b/app/actions/mypaint-brushes-actions.c
index 4ffe009898..bc286a3804 100644
--- a/app/actions/mypaint-brushes-actions.c
+++ b/app/actions/mypaint-brushes-actions.c
@@ -40,41 +40,41 @@
 static const GimpActionEntry mypaint_brushes_actions[] =
 {
   { "mypaint-brushes-popup", GIMP_ICON_MYPAINT_BRUSH,
-    NC_("mypaint-brushes-action", "MyPaint Brushes Menu"), { NULL }, NULL, NULL,
+    NC_("mypaint-brushes-action", "MyPaint Brushes Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_MYPAINT_BRUSH_DIALOG },
 
   { "mypaint-brushes-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("mypaint-brushes-action", "_New MyPaint Brush"), { NULL },
+    NC_("mypaint-brushes-action", "_New MyPaint Brush"), NULL, { NULL },
     NC_("mypaint-brushes-action", "Create a new MyPaint brush"),
     data_new_cmd_callback,
     GIMP_HELP_MYPAINT_BRUSH_NEW },
 
   { "mypaint-brushes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("mypaint-brushes-action", "D_uplicate MyPaint Brush"), { NULL },
+    NC_("mypaint-brushes-action", "D_uplicate MyPaint Brush"), NULL, { NULL },
     NC_("mypaint-brushes-action", "Duplicate this MyPaint brush"),
     data_duplicate_cmd_callback,
     GIMP_HELP_MYPAINT_BRUSH_DUPLICATE },
 
   { "mypaint-brushes-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("mypaint-brushes-action", "Copy MyPaint Brush _Location"), { NULL },
+    NC_("mypaint-brushes-action", "Copy MyPaint Brush _Location"), NULL, { NULL },
     NC_("mypaint-brushes-action", "Copy MyPaint brush file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_MYPAINT_BRUSH_COPY_LOCATION },
 
   { "mypaint-brushes-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("mypaint-brushes-action", "Show in _File Manager"), { NULL },
+    NC_("mypaint-brushes-action", "Show in _File Manager"), NULL, { NULL },
     NC_("mypaint-brushes-action", "Show MyPaint brush file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_MYPAINT_BRUSH_SHOW_IN_FILE_MANAGER },
 
   { "mypaint-brushes-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("mypaint-brushes-action", "_Delete MyPaint Brush"), { NULL },
+    NC_("mypaint-brushes-action", "_Delete MyPaint Brush"), NULL, { NULL },
     NC_("mypaint-brushes-action", "Delete this MyPaint brush"),
     data_delete_cmd_callback,
     GIMP_HELP_MYPAINT_BRUSH_DELETE },
 
   { "mypaint-brushes-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("mypaint-brushes-action", "_Refresh MyPaint Brushes"), { NULL },
+    NC_("mypaint-brushes-action", "_Refresh MyPaint Brushes"), NULL, { NULL },
     NC_("mypaint-brushes-action", "Refresh MyPaint brushes"),
     data_refresh_cmd_callback,
     GIMP_HELP_MYPAINT_BRUSH_REFRESH }
@@ -83,7 +83,7 @@ static const GimpActionEntry mypaint_brushes_actions[] =
 static const GimpStringActionEntry mypaint_brushes_edit_actions[] =
 {
   { "mypaint-brushes-edit", GIMP_ICON_EDIT,
-    NC_("mypaint-brushes-action", "_Edit MyPaint Brush..."), { NULL },
+    NC_("mypaint-brushes-action", "_Edit MyPaint Brush..."), NULL, { NULL },
     NC_("mypaint-brushes-action", "Edit MyPaint brush"),
     "gimp-mybrush-editor",
     GIMP_HELP_MYPAINT_BRUSH_EDIT }
diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c
index 6e5a52f7df..60379bc7c4 100644
--- a/app/actions/palette-editor-actions.c
+++ b/app/actions/palette-editor-actions.c
@@ -41,17 +41,17 @@
 static const GimpActionEntry palette_editor_actions[] =
 {
   { "palette-editor-popup", GIMP_ICON_PALETTE,
-    NC_("palette-editor-action", "Palette Editor Menu"), { NULL }, NULL, NULL,
+    NC_("palette-editor-action", "Palette Editor Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_PALETTE_EDITOR_DIALOG },
 
   { "palette-editor-edit-color", GIMP_ICON_EDIT,
-    NC_("palette-editor-action", "_Edit Color..."), { NULL },
+    NC_("palette-editor-action", "_Edit Color..."), NULL, { NULL },
     NC_("palette-editor-action", "Edit this entry"),
     palette_editor_edit_color_cmd_callback,
     GIMP_HELP_PALETTE_EDITOR_EDIT },
 
   { "palette-editor-delete-color", GIMP_ICON_EDIT_DELETE,
-    NC_("palette-editor-action", "_Delete Color"), { NULL },
+    NC_("palette-editor-action", "_Delete Color"), NULL, { NULL },
     NC_("palette-editor-action", "Delete this entry"),
     palette_editor_delete_color_cmd_callback,
     GIMP_HELP_PALETTE_EDITOR_DELETE }
@@ -60,7 +60,7 @@ static const GimpActionEntry palette_editor_actions[] =
 static const GimpToggleActionEntry palette_editor_toggle_actions[] =
 {
   { "palette-editor-edit-active", GIMP_ICON_LINKED,
-    NC_("palette-editor-action", "Edit Active Palette"), { NULL }, NULL,
+    NC_("palette-editor-action", "Edit Active Palette"), NULL, { NULL }, NULL,
     data_editor_edit_active_cmd_callback,
     FALSE,
     GIMP_HELP_PALETTE_EDITOR_EDIT_ACTIVE }
@@ -69,14 +69,14 @@ static const GimpToggleActionEntry palette_editor_toggle_actions[] =
 static const GimpEnumActionEntry palette_editor_new_actions[] =
 {
   { "palette-editor-new-color-fg", GIMP_ICON_DOCUMENT_NEW,
-    NC_("palette-editor-action", "New Color from _FG"), { NULL },
+    NC_("palette-editor-action", "New Color from _FG"), NULL, { NULL },
     NC_("palette-editor-action",
         "Create a new entry from the foreground color"),
     FALSE, FALSE,
     GIMP_HELP_PALETTE_EDITOR_NEW },
 
   { "palette-editor-new-color-bg", GIMP_ICON_DOCUMENT_NEW,
-    NC_("palette-editor-action", "New Color from _BG"), { NULL },
+    NC_("palette-editor-action", "New Color from _BG"), NULL, { NULL },
     NC_("palette-editor-action",
         "Create a new entry from the background color"),
     TRUE, FALSE,
@@ -86,19 +86,19 @@ static const GimpEnumActionEntry palette_editor_new_actions[] =
 static const GimpEnumActionEntry palette_editor_zoom_actions[] =
 {
   { "palette-editor-zoom-in", GIMP_ICON_ZOOM_IN,
-    N_("Zoom _In"), { NULL },
+    N_("Zoom _In"), NULL, { NULL },
     N_("Zoom in"),
     GIMP_ZOOM_IN, FALSE,
     GIMP_HELP_PALETTE_EDITOR_ZOOM_IN },
 
   { "palette-editor-zoom-out", GIMP_ICON_ZOOM_OUT,
-    N_("Zoom _Out"), { NULL },
+    N_("Zoom _Out"), NULL, { NULL },
     N_("Zoom out"),
     GIMP_ZOOM_OUT, FALSE,
     GIMP_HELP_PALETTE_EDITOR_ZOOM_OUT },
 
   { "palette-editor-zoom-all", GIMP_ICON_ZOOM_FIT_BEST,
-    N_("Zoom _All"), { NULL },
+    N_("Zoom _All"), NULL, { NULL },
     N_("Zoom all"),
     GIMP_ZOOM_OUT_MAX, FALSE,
     GIMP_HELP_PALETTE_EDITOR_ZOOM_ALL }
diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c
index 637e3e39df..a3ef3af7c0 100644
--- a/app/actions/palettes-actions.c
+++ b/app/actions/palettes-actions.c
@@ -41,53 +41,53 @@
 static const GimpActionEntry palettes_actions[] =
 {
   { "palettes-popup", GIMP_ICON_PALETTE,
-    NC_("palettes-action", "Palettes Menu"), { NULL }, NULL, NULL,
+    NC_("palettes-action", "Palettes Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_PALETTE_DIALOG },
 
   { "palettes-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("palettes-action", "_New Palette"), { NULL },
+    NC_("palettes-action", "_New Palette"), NULL, { NULL },
     NC_("palettes-action", "Create a new palette"),
     data_new_cmd_callback,
     GIMP_HELP_PALETTE_NEW },
 
   { "palettes-import", "gtk-convert",
-    NC_("palettes-action", "_Import Palette..."), { NULL },
+    NC_("palettes-action", "_Import Palette..."), NULL, { NULL },
     NC_("palettes-action", "Import palette"),
     palettes_import_cmd_callback,
     GIMP_HELP_PALETTE_IMPORT },
 
   { "palettes-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("palettes-action", "D_uplicate Palette"), { NULL },
+    NC_("palettes-action", "D_uplicate Palette"), NULL, { NULL },
     NC_("palettes-action", "Duplicate this palette"),
     data_duplicate_cmd_callback,
     GIMP_HELP_PALETTE_DUPLICATE },
 
   { "palettes-merge", NULL,
-    NC_("palettes-action", "_Merge Palettes..."), { NULL },
+    NC_("palettes-action", "_Merge Palettes..."), NULL, { NULL },
     NC_("palettes-action", "Merge palettes"),
     palettes_merge_cmd_callback,
     GIMP_HELP_PALETTE_MERGE },
 
   { "palettes-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("palettes-action", "Copy Palette _Location"), { NULL },
+    NC_("palettes-action", "Copy Palette _Location"), NULL, { NULL },
     NC_("palettes-action", "Copy palette file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_PALETTE_COPY_LOCATION },
 
   { "palettes-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("palettes-action", "Show in _File Manager"), { NULL },
+    NC_("palettes-action", "Show in _File Manager"), NULL, { NULL },
     NC_("palettes-action", "Show palette file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_PALETTE_SHOW_IN_FILE_MANAGER },
 
   { "palettes-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("palettes-action", "_Delete Palette"), { NULL },
+    NC_("palettes-action", "_Delete Palette"), NULL, { NULL },
     NC_("palettes-action", "Delete this palette"),
     data_delete_cmd_callback,
     GIMP_HELP_PALETTE_DELETE },
 
   { "palettes-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("palettes-action", "_Refresh Palettes"), { NULL },
+    NC_("palettes-action", "_Refresh Palettes"), NULL, { NULL },
     NC_("palettes-action", "Refresh palettes"),
     data_refresh_cmd_callback,
     GIMP_HELP_PALETTE_REFRESH }
@@ -96,7 +96,7 @@ static const GimpActionEntry palettes_actions[] =
 static const GimpStringActionEntry palettes_edit_actions[] =
 {
   { "palettes-edit", GIMP_ICON_EDIT,
-    NC_("palettes-action", "_Edit Palette..."), { NULL },
+    NC_("palettes-action", "_Edit Palette..."), NULL, { NULL },
     NC_("palettes-action", "Edit this palette"),
     "gimp-palette-editor",
     GIMP_HELP_PALETTE_EDIT }
diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c
index f3a4618601..335a41c5e8 100644
--- a/app/actions/patterns-actions.c
+++ b/app/actions/patterns-actions.c
@@ -40,47 +40,47 @@
 static const GimpActionEntry patterns_actions[] =
 {
   { "patterns-popup", GIMP_ICON_PATTERN,
-    NC_("patterns-action", "Patterns Menu"), { NULL }, NULL, NULL,
+    NC_("patterns-action", "Patterns Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_PATTERN_DIALOG },
 
   { "patterns-open-as-image", GIMP_ICON_DOCUMENT_OPEN,
-    NC_("patterns-action", "_Open Pattern as Image"), { NULL },
+    NC_("patterns-action", "_Open Pattern as Image"), NULL, { NULL },
     NC_("patterns-action", "Open this pattern as an image"),
     data_open_as_image_cmd_callback,
     GIMP_HELP_PATTERN_OPEN_AS_IMAGE },
 
   { "patterns-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("patterns-action", "_New Pattern"), { NULL },
+    NC_("patterns-action", "_New Pattern"), NULL, { NULL },
     NC_("patterns-action", "Create a new pattern"),
     data_new_cmd_callback,
     GIMP_HELP_PATTERN_NEW },
 
   { "patterns-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("patterns-action", "D_uplicate Pattern"), { NULL },
+    NC_("patterns-action", "D_uplicate Pattern"), NULL, { NULL },
     NC_("patterns-action", "Duplicate this pattern"),
     data_duplicate_cmd_callback,
     GIMP_HELP_PATTERN_DUPLICATE },
 
   { "patterns-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("patterns-action", "Copy Pattern _Location"), { NULL },
+    NC_("patterns-action", "Copy Pattern _Location"), NULL, { NULL },
     NC_("patterns-action", "Copy pattern file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_PATTERN_COPY_LOCATION },
 
   { "patterns-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("patterns-action", "Show in _File Manager"), { NULL },
+    NC_("patterns-action", "Show in _File Manager"), NULL, { NULL },
     NC_("patterns-action", "Show pattern file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_PATTERN_SHOW_IN_FILE_MANAGER },
 
   { "patterns-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("patterns-action", "_Delete Pattern"), { NULL },
+    NC_("patterns-action", "_Delete Pattern"), NULL, { NULL },
     NC_("patterns-action", "Delete this pattern"),
     data_delete_cmd_callback,
     GIMP_HELP_PATTERN_DELETE },
 
   { "patterns-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("patterns-action", "_Refresh Patterns"), { NULL },
+    NC_("patterns-action", "_Refresh Patterns"), NULL, { NULL },
     NC_("patterns-action", "Refresh patterns"),
     data_refresh_cmd_callback,
     GIMP_HELP_PATTERN_REFRESH }
@@ -89,7 +89,7 @@ static const GimpActionEntry patterns_actions[] =
 static const GimpStringActionEntry patterns_edit_actions[] =
 {
   { "patterns-edit", GIMP_ICON_EDIT,
-    NC_("patterns-action", "_Edit Pattern..."), { NULL },
+    NC_("patterns-action", "_Edit Pattern..."), NULL, { NULL },
     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 4ef09b3b27..a36f306e56 100644
--- a/app/actions/plug-in-actions.c
+++ b/app/actions/plug-in-actions.c
@@ -66,7 +66,7 @@ static void     plug_in_actions_add_proc             (GimpActionGroup     *group
 static const GimpActionEntry plug_in_actions[] =
 {
   { "plug-in-reset-all", GIMP_ICON_RESET,
-    NC_("plug-in-action", "Reset all _Filters"), { NULL },
+    NC_("plug-in-action", "Reset all _Filters"), NULL, { NULL },
     NC_("plug-in-action", "Reset all plug-ins to their default settings"),
     plug_in_reset_all_cmd_callback,
     GIMP_HELP_FILTER_RESET_ALL }
diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c
index e0768aecbc..ebe61b9509 100644
--- a/app/actions/quick-mask-actions.c
+++ b/app/actions/quick-mask-actions.c
@@ -40,11 +40,11 @@
 static const GimpActionEntry quick_mask_actions[] =
 {
   { "quick-mask-popup", NULL,
-    NC_("quick-mask-action", "Quick Mask Menu"), { NULL }, NULL, NULL,
+    NC_("quick-mask-action", "Quick Mask Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_QUICK_MASK },
 
   { "quick-mask-configure", NULL,
-    NC_("quick-mask-action", "_Configure Color and Opacity..."), { NULL }, NULL,
+    NC_("quick-mask-action", "_Configure Color and Opacity..."), NULL, { NULL }, NULL,
     quick_mask_configure_cmd_callback,
     GIMP_HELP_QUICK_MASK_EDIT }
 };
@@ -52,7 +52,7 @@ static const GimpActionEntry quick_mask_actions[] =
 static const GimpToggleActionEntry quick_mask_toggle_actions[] =
 {
   { "quick-mask-toggle", GIMP_ICON_QUICK_MASK_ON,
-    NC_("quick-mask-action", "Toggle _Quick Mask"), { "<shift>Q", NULL },
+    NC_("quick-mask-action", "Toggle _Quick Mask"), NULL, { "<shift>Q", NULL },
     NC_("quick-mask-action", "Toggle Quick Mask on/off"),
     quick_mask_toggle_cmd_callback,
     FALSE,
@@ -62,12 +62,12 @@ static const GimpToggleActionEntry quick_mask_toggle_actions[] =
 static const GimpRadioActionEntry quick_mask_invert_actions[] =
 {
   { "quick-mask-invert-on", NULL,
-    NC_("quick-mask-action", "Mask _Selected Areas"), { NULL }, NULL,
+    NC_("quick-mask-action", "Mask _Selected Areas"), NULL, { NULL }, NULL,
     TRUE,
     GIMP_HELP_QUICK_MASK_INVERT },
 
   { "quick-mask-invert-off", NULL,
-    NC_("quick-mask-action", "Mask _Unselected Areas"), { NULL }, NULL,
+    NC_("quick-mask-action", "Mask _Unselected Areas"), NULL, { NULL }, NULL,
     FALSE,
     GIMP_HELP_QUICK_MASK_INVERT }
 };
diff --git a/app/actions/sample-points-actions.c b/app/actions/sample-points-actions.c
index f446830536..e5718a7405 100644
--- a/app/actions/sample-points-actions.c
+++ b/app/actions/sample-points-actions.c
@@ -37,14 +37,14 @@
 static const GimpActionEntry sample_points_actions[] =
 {
   { "sample-points-popup", GIMP_ICON_SAMPLE_POINT,
-    NC_("sample-points-action", "Sample Point Menu"), { NULL }, NULL, NULL,
+    NC_("sample-points-action", "Sample Point Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_SAMPLE_POINT_DIALOG }
 };
 
 static const GimpToggleActionEntry sample_points_toggle_actions[] =
 {
   { "sample-points-sample-merged", NULL,
-    NC_("sample-points-action", "_Sample Merged"), { NULL },
+    NC_("sample-points-action", "_Sample Merged"), NULL, { NULL },
     NC_("sample-points-action",
         "Use the composite color of all visible layers"),
     sample_points_sample_merged_cmd_callback,
diff --git a/app/actions/select-actions.c b/app/actions/select-actions.c
index 5e4ed6a391..ced171db67 100644
--- a/app/actions/select-actions.c
+++ b/app/actions/select-actions.c
@@ -41,98 +41,98 @@
 static const GimpActionEntry select_actions[] =
 {
   { "selection-popup", GIMP_ICON_SELECTION,
-    NC_("select-action", "Selection Editor Menu"), { NULL }, NULL, NULL,
+    NC_("select-action", "Selection Editor Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_SELECTION_DIALOG },
 
   { "select-menu", NULL, NC_("select-action", "_Select") },
 
   { "select-all", GIMP_ICON_SELECTION_ALL,
-    NC_("select-action", "_All"), { "<primary>A", NULL },
+    NC_("select-action", "_All"), NULL, { "<primary>A", NULL },
     NC_("select-action", "Select everything"),
     select_all_cmd_callback,
     GIMP_HELP_SELECTION_ALL },
 
   { "select-none", GIMP_ICON_SELECTION_NONE,
-    NC_("select-action", "_None"), { "<primary><shift>A", NULL },
+    NC_("select-action", "_None"), NULL, { "<primary><shift>A", NULL },
     NC_("select-action", "Dismiss the selection"),
     select_none_cmd_callback,
     GIMP_HELP_SELECTION_NONE },
 
   { "select-invert", GIMP_ICON_INVERT,
-    NC_("select-action", "_Invert"), { "<primary>I", NULL },
+    NC_("select-action", "_Invert"), NULL, { "<primary>I", NULL },
     NC_("select-action", "Invert the selection"),
     select_invert_cmd_callback,
     GIMP_HELP_SELECTION_INVERT },
 
   { "select-float", GIMP_ICON_LAYER_FLOATING_SELECTION,
-    NC_("select-action", "_Float"), { "<primary><shift>L", NULL },
+    NC_("select-action", "_Float"), NULL, { "<primary><shift>L", NULL },
     NC_("select-action", "Create a floating selection"),
     select_float_cmd_callback,
     GIMP_HELP_SELECTION_FLOAT },
 
   { "select-feather", NULL,
-    NC_("select-action", "Fea_ther..."), { NULL },
+    NC_("select-action", "Fea_ther..."), NULL, { NULL },
     NC_("select-action",
         "Blur the selection border so that it fades out smoothly"),
     select_feather_cmd_callback,
     GIMP_HELP_SELECTION_FEATHER },
 
   { "select-sharpen", NULL,
-    NC_("select-action", "_Sharpen"), { NULL },
+    NC_("select-action", "_Sharpen"), NULL, { NULL },
     NC_("select-action", "Remove fuzziness from the selection"),
     select_sharpen_cmd_callback,
     GIMP_HELP_SELECTION_SHARPEN },
 
   { "select-shrink", GIMP_ICON_SELECTION_SHRINK,
-    NC_("select-action", "S_hrink..."), { NULL },
+    NC_("select-action", "S_hrink..."), NULL, { NULL },
     NC_("select-action", "Contract the selection"),
     select_shrink_cmd_callback,
     GIMP_HELP_SELECTION_SHRINK },
 
   { "select-grow", GIMP_ICON_SELECTION_GROW,
-    NC_("select-action", "_Grow..."), { NULL },
+    NC_("select-action", "_Grow..."), NULL, { NULL },
     NC_("select-action", "Enlarge the selection"),
     select_grow_cmd_callback,
     GIMP_HELP_SELECTION_GROW },
 
   { "select-border", GIMP_ICON_SELECTION_BORDER,
-    NC_("select-action", "Bo_rder..."), { NULL },
+    NC_("select-action", "Bo_rder..."), NULL, { NULL },
     NC_("select-action", "Replace the selection by its border"),
     select_border_cmd_callback,
     GIMP_HELP_SELECTION_BORDER },
 
   { "select-flood", NULL,
-    NC_("select-action", "Re_move Holes"), { NULL },
+    NC_("select-action", "Re_move Holes"), NULL, { NULL },
     NC_("select-action", "Remove holes from the selection"),
     select_flood_cmd_callback,
     GIMP_HELP_SELECTION_FLOOD },
 
   { "select-save", GIMP_ICON_SELECTION_TO_CHANNEL,
-    NC_("select-action", "Save to _Channel"), { NULL },
+    NC_("select-action", "Save to _Channel"), NULL, { NULL },
     NC_("select-action", "Save the selection to a channel"),
     select_save_cmd_callback,
     GIMP_HELP_SELECTION_TO_CHANNEL },
 
   { "select-fill", GIMP_ICON_TOOL_BUCKET_FILL,
-    NC_("select-action", "_Fill Selection Outline..."), { NULL },
+    NC_("select-action", "_Fill Selection Outline..."), NULL, { NULL },
     NC_("select-action", "Fill the selection outline"),
     select_fill_cmd_callback,
     GIMP_HELP_SELECTION_FILL },
 
   { "select-fill-last-values", GIMP_ICON_TOOL_BUCKET_FILL,
-    NC_("select-action", "_Fill Selection Outline with last values"), { NULL },
+    NC_("select-action", "_Fill Selection Outline with last values"), NULL, { NULL },
     NC_("select-action", "Fill the selection outline with last used values"),
     select_fill_last_vals_cmd_callback,
     GIMP_HELP_SELECTION_FILL },
 
   { "select-stroke", GIMP_ICON_SELECTION_STROKE,
-    NC_("select-action", "_Stroke Selection..."), { NULL },
+    NC_("select-action", "_Stroke Selection..."), NULL, { NULL },
     NC_("select-action", "Paint along the selection outline"),
     select_stroke_cmd_callback,
     GIMP_HELP_SELECTION_STROKE },
 
   { "select-stroke-last-values", GIMP_ICON_SELECTION_STROKE,
-    NC_("select-action", "_Stroke Selection with last values"), { NULL },
+    NC_("select-action", "_Stroke Selection with last values"), NULL, { NULL },
     NC_("select-action", "Stroke the selection with last used values"),
     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 378ec72239..25d31eb064 100644
--- a/app/actions/templates-actions.c
+++ b/app/actions/templates-actions.c
@@ -39,35 +39,35 @@
 static const GimpActionEntry templates_actions[] =
 {
   { "templates-popup", GIMP_ICON_TEMPLATE,
-    NC_("templates-action", "Templates Menu"), { NULL }, NULL, NULL,
+    NC_("templates-action", "Templates Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TEMPLATE_DIALOG },
 
   { "templates-create-image", GIMP_ICON_IMAGE,
-    NC_("templates-action", "_Create Image from Template"), { NULL },
+    NC_("templates-action", "_Create Image from Template"), NULL, { NULL },
     NC_("templates-action", "Create a new image from the selected template"),
     templates_create_image_cmd_callback,
     GIMP_HELP_TEMPLATE_IMAGE_NEW },
 
   { "templates-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("templates-action", "_New Template..."), { NULL },
+    NC_("templates-action", "_New Template..."), NULL, { NULL },
     NC_("templates-action", "Create a new template"),
     templates_new_cmd_callback,
     GIMP_HELP_TEMPLATE_NEW },
 
   { "templates-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("templates-action", "D_uplicate Template..."), { NULL },
+    NC_("templates-action", "D_uplicate Template..."), NULL, { NULL },
     NC_("templates-action", "Duplicate this template"),
     templates_duplicate_cmd_callback,
     GIMP_HELP_TEMPLATE_DUPLICATE },
 
   { "templates-edit", GIMP_ICON_EDIT,
-    NC_("templates-action", "_Edit Template..."), { NULL },
+    NC_("templates-action", "_Edit Template..."), NULL, { NULL },
     NC_("templates-action", "Edit this template"),
     templates_edit_cmd_callback,
     GIMP_HELP_TEMPLATE_EDIT },
 
   { "templates-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("templates-action", "_Delete Template"), { NULL },
+    NC_("templates-action", "_Delete Template"), NULL, { NULL },
     NC_("templates-action", "Delete this template"),
     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 722619d5d9..9db7b1884e 100644
--- a/app/actions/text-editor-actions.c
+++ b/app/actions/text-editor-actions.c
@@ -37,17 +37,18 @@
 static const GimpActionEntry text_editor_actions[] =
 {
   { "text-editor-toolbar", GIMP_ICON_EDIT,
-    "Text Editor Toolbar", { NULL }, NULL, NULL,
+    NC_("text-editor-action", "Text Editor Toolbar"),
+    NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TEXT_EDITOR_DIALOG },
 
   { "text-editor-load", GIMP_ICON_DOCUMENT_OPEN,
-    NC_("text-editor-action", "Open"), { NULL },
+    NC_("text-editor-action", "Open"), NULL, { NULL },
     NC_("text-editor-action", "Load text from file"),
     text_editor_load_cmd_callback,
     NULL },
 
   { "text-editor-clear", GIMP_ICON_EDIT_CLEAR,
-    NC_("text-editor-action", "Clear"), { NULL },
+    NC_("text-editor-action", "Clear"), NULL, { NULL },
     NC_("text-editor-action", "Clear all text"),
     text_editor_clear_cmd_callback,
     NULL }
@@ -56,37 +57,37 @@ static const GimpActionEntry text_editor_actions[] =
 static const GimpRadioActionEntry text_editor_direction_actions[] =
 {
   { "text-editor-direction-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR,
-    NC_("text-editor-action", "LTR"), { NULL },
+    NC_("text-editor-action", "LTR"), NULL, { NULL },
     NC_("text-editor-action", "From left to right"),
     GIMP_TEXT_DIRECTION_LTR,
     NULL },
 
   { "text-editor-direction-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL,
-    NC_("text-editor-action", "RTL"), { NULL },
+    NC_("text-editor-action", "RTL"), NULL, { NULL },
     NC_("text-editor-action", "From right to left"),
     GIMP_TEXT_DIRECTION_RTL,
     NULL },
 
   { "text-editor-direction-ttb-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL,
-    NC_("text-editor-action", "TTB-RTL"), { NULL },
+    NC_("text-editor-action", "TTB-RTL"), NULL, { NULL },
     NC_("text-editor-action", "Vertical, right to left (mixed orientation)"),
     GIMP_TEXT_DIRECTION_TTB_RTL,
     NULL },
 
   { "text-editor-direction-ttb-rtl-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
-    NC_("text-editor-action", "TTB-RTL-UPRIGHT"), { NULL },
+    NC_("text-editor-action", "TTB-RTL-UPRIGHT"), NULL, { NULL },
     NC_("text-editor-action", "Vertical, right to left (upright orientation)"),
     GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
     NULL },
 
   { "text-editor-direction-ttb-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR,
-    NC_("text-editor-action", "TTB-LTR"), { NULL },
+    NC_("text-editor-action", "TTB-LTR"), NULL, { NULL },
     NC_("text-editor-action", "Vertical, left to right (mixed orientation)"),
     GIMP_TEXT_DIRECTION_TTB_LTR,
     NULL },
 
   { "text-editor-direction-ttb-ltr-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
-    NC_("text-editor-action", "TTB-LTR-UPRIGHT"), { NULL },
+    NC_("text-editor-action", "TTB-LTR-UPRIGHT"), NULL, { NULL },
     NC_("text-editor-action", "Vertical, left to right (upright orientation)"),
     GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
     NULL },
diff --git a/app/actions/text-tool-actions.c b/app/actions/text-tool-actions.c
index abf7f37d33..ec9fdaaf9b 100644
--- a/app/actions/text-tool-actions.c
+++ b/app/actions/text-tool-actions.c
@@ -47,49 +47,49 @@
 static const GimpActionEntry text_tool_actions[] =
 {
   { "text-tool-popup", NULL,
-    NC_("text-tool-action", "Text Tool Menu"), { NULL }, NULL, NULL,
+    NC_("text-tool-action", "Text Tool Menu"), NULL, { NULL }, NULL, NULL,
     NULL },
 
   { "text-tool-cut", GIMP_ICON_EDIT_CUT,
-    NC_("text-tool-action", "Cu_t"), { "<primary>X", NULL }, NULL,
+    NC_("text-tool-action", "Cu_t"), NULL, { "<primary>X", NULL }, NULL,
     text_tool_cut_cmd_callback,
     NULL },
 
   { "text-tool-copy", GIMP_ICON_EDIT_COPY,
-    NC_("text-tool-action", "_Copy"), { "<primary>C", NULL }, NULL,
+    NC_("text-tool-action", "_Copy"), NULL, { "<primary>C", NULL }, NULL,
     text_tool_copy_cmd_callback,
     NULL },
 
   { "text-tool-paste", GIMP_ICON_EDIT_PASTE,
-    NC_("text-tool-action", "_Paste"), { "<primary>V", NULL }, NULL,
+    NC_("text-tool-action", "_Paste"), NULL, { "<primary>V", NULL }, NULL,
     text_tool_paste_cmd_callback,
     NULL },
 
   { "text-tool-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("text-tool-action", "_Delete"), { NULL }, NULL,
+    NC_("text-tool-action", "_Delete"), NULL, { NULL }, NULL,
     text_tool_delete_cmd_callback,
     NULL },
 
   { "text-tool-load", GIMP_ICON_DOCUMENT_OPEN,
-    NC_("text-tool-action", "_Open text file..."), { NULL }, NULL,
+    NC_("text-tool-action", "_Open text file..."), NULL, { NULL }, NULL,
     text_tool_load_cmd_callback,
     NULL },
 
   { "text-tool-clear", GIMP_ICON_EDIT_CLEAR,
-    NC_("text-tool-action", "Cl_ear"), { NULL },
+    NC_("text-tool-action", "Cl_ear"), NULL, { NULL },
     NC_("text-tool-action", "Clear all text"),
     text_tool_clear_cmd_callback,
     NULL },
 
   { "text-tool-text-to-path", GIMP_ICON_PATH,
-    NC_("text-tool-action", "_Path from Text"), { NULL },
+    NC_("text-tool-action", "_Path from Text"), NULL, { NULL },
     NC_("text-tool-action",
         "Create a path from the outlines of the current text"),
     text_tool_text_to_path_cmd_callback,
     NULL },
 
   { "text-tool-text-along-path", GIMP_ICON_PATH,
-    NC_("text-tool-action", "Text _along Path"), { NULL },
+    NC_("text-tool-action", "Text _along Path"), NULL, { NULL },
     NC_("text-tool-action",
         "Bend the text along the currently active path"),
     text_tool_text_along_path_cmd_callback,
@@ -99,32 +99,32 @@ static const GimpActionEntry text_tool_actions[] =
 static const GimpRadioActionEntry text_tool_direction_actions[] =
 {
   { "text-tool-direction-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_LTR,
-    NC_("text-tool-action", "From left to right"), { NULL }, NULL,
+    NC_("text-tool-action", "From left to right"), NULL, { NULL }, NULL,
     GIMP_TEXT_DIRECTION_LTR,
     NULL },
 
   { "text-tool-direction-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_RTL,
-    NC_("text-tool-action", "From right to left"), { NULL }, NULL,
+    NC_("text-tool-action", "From right to left"), NULL, { NULL }, NULL,
     GIMP_TEXT_DIRECTION_RTL,
     NULL },
 
   { "text-tool-direction-ttb-rtl", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL,
-    NC_("text-tool-action", "Vertical, right to left (mixed orientation)"), { NULL }, NULL,
+    NC_("text-tool-action", "Vertical, right to left (mixed orientation)"), NULL, { NULL }, NULL,
     GIMP_TEXT_DIRECTION_TTB_RTL,
     NULL },
 
   { "text-tool-direction-ttb-rtl-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
-    NC_("text-tool-action", "Vertical, right to left (upright orientation)"), { NULL }, NULL,
+    NC_("text-tool-action", "Vertical, right to left (upright orientation)"), NULL, { NULL }, NULL,
     GIMP_TEXT_DIRECTION_TTB_RTL_UPRIGHT,
     NULL },
 
   { "text-tool-direction-ttb-ltr", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR,
-    NC_("text-tool-action", "Vertical, left to right (mixed orientation)"), { NULL }, NULL,
+    NC_("text-tool-action", "Vertical, left to right (mixed orientation)"), NULL, { NULL }, NULL,
     GIMP_TEXT_DIRECTION_TTB_LTR,
     NULL },
 
   { "text-tool-direction-ttb-ltr-upright", GIMP_ICON_FORMAT_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
-    NC_("text-tool-action", "Vertical, left to right (upright orientation)"), { NULL }, NULL,
+    NC_("text-tool-action", "Vertical, left to right (upright orientation)"), NULL, { NULL }, NULL,
     GIMP_TEXT_DIRECTION_TTB_LTR_UPRIGHT,
     NULL }
 };
diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c
index 42e74251bd..19aeb56174 100644
--- a/app/actions/tool-options-actions.c
+++ b/app/actions/tool-options-actions.c
@@ -55,38 +55,38 @@ static void tool_options_actions_update_presets (GimpActionGroup    *group,
 static const GimpActionEntry tool_options_actions[] =
 {
   { "tool-options-popup", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tool-options-action", "Tool Options Menu"), { NULL }, NULL, NULL,
+    NC_("tool-options-action", "Tool Options Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_DIALOG },
 
   { "tool-options-save-preset-menu", GIMP_ICON_DOCUMENT_SAVE,
-    NC_("tool-options-action", "_Save Tool Preset"), { NULL }, NULL, NULL,
+    NC_("tool-options-action", "_Save Tool Preset"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_SAVE },
 
   { "tool-options-restore-preset-menu", GIMP_ICON_DOCUMENT_REVERT,
-    NC_("tool-options-action", "_Restore Tool Preset"), { NULL }, NULL, NULL,
+    NC_("tool-options-action", "_Restore Tool Preset"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_RESTORE },
 
   { "tool-options-edit-preset-menu", GIMP_ICON_EDIT,
-    NC_("tool-options-action", "E_dit Tool Preset"), { NULL }, NULL, NULL,
+    NC_("tool-options-action", "E_dit Tool Preset"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_EDIT },
 
   { "tool-options-delete-preset-menu", GIMP_ICON_EDIT_DELETE,
-    NC_("tool-options-action", "_Delete Tool Preset"), { NULL }, NULL, NULL,
+    NC_("tool-options-action", "_Delete Tool Preset"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_OPTIONS_DELETE },
 
   { "tool-options-save-new-preset", GIMP_ICON_DOCUMENT_NEW,
-    NC_("tool-options-action", "_New Tool Preset..."), { NULL }, NULL,
+    NC_("tool-options-action", "_New Tool Preset..."), NULL, { NULL }, NULL,
     tool_options_save_new_preset_cmd_callback,
     GIMP_HELP_TOOL_OPTIONS_SAVE },
 
   { "tool-options-reset", GIMP_ICON_RESET,
-    NC_("tool-options-action", "R_eset Tool Options"), { NULL },
+    NC_("tool-options-action", "R_eset Tool Options"), NULL, { NULL },
     NC_("tool-options-action", "Reset to default values"),
     tool_options_reset_cmd_callback,
     GIMP_HELP_TOOL_OPTIONS_RESET },
 
   { "tool-options-reset-all", GIMP_ICON_RESET,
-    NC_("tool-options-action", "Reset _all Tool Options"), { NULL },
+    NC_("tool-options-action", "Reset _all Tool Options"), NULL, { NULL },
     NC_("tool-options-action", "Reset all tool options"),
     tool_options_reset_all_cmd_callback,
     GIMP_HELP_TOOL_OPTIONS_RESET }
diff --git a/app/actions/tool-preset-editor-actions.c b/app/actions/tool-preset-editor-actions.c
index e0d414d1ee..4b614cfdef 100644
--- a/app/actions/tool-preset-editor-actions.c
+++ b/app/actions/tool-preset-editor-actions.c
@@ -41,18 +41,18 @@
 static const GimpActionEntry tool_preset_editor_actions[] =
 {
   { "tool-preset-editor-popup", GIMP_ICON_TOOL_PRESET,
-    NC_("tool-preset-editor-action", "Tool Preset Editor Menu"), { NULL }, NULL, NULL,
+    NC_("tool-preset-editor-action", "Tool Preset Editor Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_PRESET_EDITOR_DIALOG },
 
   { "tool-preset-editor-save", GIMP_ICON_DOCUMENT_SAVE,
-    NC_("tool-preset-editor-action", "_Save Tool Options to Preset"), { NULL },
+    NC_("tool-preset-editor-action", "_Save Tool Options to Preset"), NULL, { NULL },
     NC_("tool-preset-editor-action", "Save the active tool options to this "
         "tool preset"),
     tool_preset_editor_save_cmd_callback,
     GIMP_HELP_TOOL_PRESET_SAVE },
 
   { "tool-preset-editor-restore", GIMP_ICON_DOCUMENT_REVERT,
-    NC_("tool-preset-editor-action", "_Restore Tool Preset"), { NULL },
+    NC_("tool-preset-editor-action", "_Restore Tool Preset"), NULL, { NULL },
     NC_("tool-preset-editor-action", "Restore this tool preset"),
     tool_preset_editor_restore_cmd_callback,
     GIMP_HELP_TOOL_PRESET_RESTORE }
@@ -62,7 +62,7 @@ static const GimpActionEntry tool_preset_editor_actions[] =
 static const GimpToggleActionEntry tool_preset_editor_toggle_actions[] =
 {
   { "tool-preset-editor-edit-active", GIMP_ICON_LINKED,
-    NC_("tool-preset-editor-action", "Edit Active Tool Preset"), { NULL }, NULL,
+    NC_("tool-preset-editor-action", "Edit Active Tool Preset"), NULL, { NULL }, NULL,
     data_editor_edit_active_cmd_callback,
     FALSE,
     GIMP_HELP_TOOL_PRESET_EDITOR_EDIT_ACTIVE }
diff --git a/app/actions/tool-presets-actions.c b/app/actions/tool-presets-actions.c
index ee70438c18..07b0999a72 100644
--- a/app/actions/tool-presets-actions.c
+++ b/app/actions/tool-presets-actions.c
@@ -43,54 +43,54 @@
 static const GimpActionEntry tool_presets_actions[] =
 {
   { "tool-presets-popup", GIMP_ICON_TOOL_PRESET,
-    NC_("tool-presets-action", "Tool Presets Menu"), { NULL }, NULL, NULL,
+    NC_("tool-presets-action", "Tool Presets Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_TOOL_PRESET_DIALOG },
 
   { "tool-presets-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("tool-presets-action", "_New Tool Preset"), { NULL },
+    NC_("tool-presets-action", "_New Tool Preset"), NULL, { NULL },
     NC_("tool-presets-action", "Create a new tool preset"),
     data_new_cmd_callback,
     GIMP_HELP_TOOL_PRESET_NEW },
 
   { "tool-presets-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("tool-presets-action", "D_uplicate Tool Preset"), { NULL },
+    NC_("tool-presets-action", "D_uplicate Tool Preset"), NULL, { NULL },
     NC_("tool-presets-action", "Duplicate this tool preset"),
     data_duplicate_cmd_callback,
     GIMP_HELP_TOOL_PRESET_DUPLICATE },
 
   { "tool-presets-copy-location", GIMP_ICON_EDIT_COPY,
-    NC_("tool-presets-action", "Copy Tool Preset _Location"), { NULL },
+    NC_("tool-presets-action", "Copy Tool Preset _Location"), NULL, { NULL },
     NC_("tool-presets-action", "Copy tool preset file location to clipboard"),
     data_copy_location_cmd_callback,
     GIMP_HELP_TOOL_PRESET_COPY_LOCATION },
 
   { "tool-presets-show-in-file-manager", GIMP_ICON_FILE_MANAGER,
-    NC_("tool-presets-action", "Show in _File Manager"), { NULL },
+    NC_("tool-presets-action", "Show in _File Manager"), NULL, { NULL },
     NC_("tool-presets-action", "Show tool preset file location in the file manager"),
     data_show_in_file_manager_cmd_callback,
     GIMP_HELP_TOOL_PRESET_SHOW_IN_FILE_MANAGER },
 
   { "tool-presets-save", GIMP_ICON_DOCUMENT_SAVE,
-    NC_("tool-presets-action", "_Save Tool Options to Preset"), { NULL },
+    NC_("tool-presets-action", "_Save Tool Options to Preset"), NULL, { NULL },
     NC_("tool-presets-action", "Save the active tool options to this "
         "tool preset"),
     tool_presets_save_cmd_callback,
     GIMP_HELP_TOOL_PRESET_SAVE },
 
   { "tool-presets-restore", GIMP_ICON_DOCUMENT_REVERT,
-    NC_("tool-presets-action", "_Restore Tool Preset"), { NULL },
+    NC_("tool-presets-action", "_Restore Tool Preset"), NULL, { NULL },
     NC_("tool-presets-action", "Restore this tool preset"),
     tool_presets_restore_cmd_callback,
     GIMP_HELP_TOOL_PRESET_RESTORE },
 
   { "tool-presets-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("tool-presets-action", "_Delete Tool Preset"), { NULL },
+    NC_("tool-presets-action", "_Delete Tool Preset"), NULL, { NULL },
     NC_("tool-presets-action", "Delete this tool preset"),
     data_delete_cmd_callback,
     GIMP_HELP_TOOL_PRESET_DELETE },
 
   { "tool-presets-refresh", GIMP_ICON_VIEW_REFRESH,
-    NC_("tool-presets-action", "_Refresh Tool Presets"), { NULL },
+    NC_("tool-presets-action", "_Refresh Tool Presets"), NULL, { NULL },
     NC_("tool-presets-action", "Refresh tool presets"),
     data_refresh_cmd_callback,
     GIMP_HELP_TOOL_PRESET_REFRESH }
@@ -99,7 +99,7 @@ static const GimpActionEntry tool_presets_actions[] =
 static const GimpStringActionEntry tool_presets_edit_actions[] =
 {
   { "tool-presets-edit", GIMP_ICON_EDIT,
-    NC_("tool-presets-action", "_Edit Tool Preset..."), { NULL },
+    NC_("tool-presets-action", "_Edit Tool Preset..."), NULL, { NULL },
     NC_("tool-presets-action", "Edit this tool preset"),
     "gimp-tool-preset-editor",
     GIMP_HELP_TOOL_PRESET_EDIT }
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 54a1a4021f..01661526e0 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -54,19 +54,19 @@ static const GimpActionEntry tools_actions[] =
 static const GimpStringActionEntry tools_alternative_actions[] =
 {
   { "tools-by-color-select-short", GIMP_ICON_TOOL_BY_COLOR_SELECT,
-    NC_("tools-action", "_By Color"), { NULL },
+    NC_("tools-action", "_By Color"), NULL, { NULL },
     NC_("tools-action", "Select regions with similar colors"),
     "gimp-by-color-select-tool",
     GIMP_HELP_TOOL_BY_COLOR_SELECT },
 
   { "tools-rotate-arbitrary", GIMP_ICON_TOOL_ROTATE,
-    NC_("tools-action", "_Arbitrary Rotation..."), { NULL },
+    NC_("tools-action", "_Arbitrary Rotation..."), NULL, { NULL },
     NC_("tools-action", "Rotate drawable by an arbitrary angle"),
     "gimp-rotate-layer",
     GIMP_HELP_TOOL_ROTATE },
 
   { "tools-rotate-image-arbitrary", GIMP_ICON_TOOL_ROTATE,
-    NC_("tools-action", "_Arbitrary Rotation..."), { NULL },
+    NC_("tools-action", "_Arbitrary Rotation..."), NULL, { NULL },
     NC_("tools-action", "Rotate image by an arbitrary angle"),
     "gimp-rotate-image",
     GIMP_HELP_TOOL_ROTATE }
@@ -75,7 +75,7 @@ static const GimpStringActionEntry tools_alternative_actions[] =
 static const GimpEnumActionEntry tools_color_average_radius_actions[] =
 {
   { "tools-color-average-radius-set", GIMP_ICON_TOOL_COLOR_PICKER,
-    "Set Color Picker Radius", { NULL }, NULL,
+    "Set Color Picker Radius", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -83,14 +83,14 @@ static const GimpEnumActionEntry tools_color_average_radius_actions[] =
 static const GimpDoubleActionEntry tools_paintbrush_pixel_size_actions[] =
 {
   { "tools-paintbrush-pixel-size-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
-    "Set Brush Size in Pixel", { NULL }, NULL,
+    "Set Brush Size in Pixel", NULL, { NULL }, NULL,
     1.0, NULL }
 };
 
 static const GimpEnumActionEntry tools_paintbrush_size_actions[] =
 {
   { "tools-paintbrush-size-set", GIMP_ICON_TOOL_PAINTBRUSH,
-    "Set Brush Size", { NULL }, NULL,
+    "Set Brush Size", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -98,7 +98,7 @@ static const GimpEnumActionEntry tools_paintbrush_size_actions[] =
 static const GimpEnumActionEntry tools_paintbrush_aspect_ratio_actions[] =
 {
   { "tools-paintbrush-aspect-ratio-set", GIMP_ICON_TOOL_PAINTBRUSH,
-    "Set Brush Aspect Ratio", { NULL }, NULL,
+    "Set Brush Aspect Ratio", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -106,7 +106,7 @@ static const GimpEnumActionEntry tools_paintbrush_aspect_ratio_actions[] =
 static const GimpEnumActionEntry tools_paintbrush_angle_actions[] =
 {
   { "tools-paintbrush-angle-set", GIMP_ICON_TOOL_PAINTBRUSH,
-    "Set Brush Angle", { NULL }, NULL,
+    "Set Brush Angle", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -114,7 +114,7 @@ static const GimpEnumActionEntry tools_paintbrush_angle_actions[] =
 static const GimpEnumActionEntry tools_paintbrush_spacing_actions[] =
 {
   { "tools-paintbrush-spacing-set", GIMP_ICON_TOOL_PAINTBRUSH,
-    "Set Brush Spacing", { NULL }, NULL,
+    "Set Brush Spacing", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -122,7 +122,7 @@ static const GimpEnumActionEntry tools_paintbrush_spacing_actions[] =
 static const GimpEnumActionEntry tools_paintbrush_hardness_actions[] =
 {
   { "tools-paintbrush-hardness-set", GIMP_ICON_TOOL_PAINTBRUSH,
-    "Set Brush Hardness", { NULL }, NULL,
+    "Set Brush Hardness", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -130,7 +130,7 @@ static const GimpEnumActionEntry tools_paintbrush_hardness_actions[] =
 static const GimpEnumActionEntry tools_paintbrush_force_actions[] =
 {
   { "tools-paintbrush-force-set", GIMP_ICON_TOOL_PAINTBRUSH,
-    "Set Brush Force", { NULL }, NULL,
+    "Set Brush Force", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -138,14 +138,14 @@ static const GimpEnumActionEntry tools_paintbrush_force_actions[] =
 static const GimpDoubleActionEntry tools_ink_blob_pixel_size_actions[] =
 {
   { "tools-ink-blob-pixel-size-set", GIMP_ICON_TOOL_INK,
-    "Set Ink Blob Size in Pixel", { NULL }, NULL,
+    "Set Ink Blob Size in Pixel", NULL, { NULL }, NULL,
     1.0, NULL }
 };
 
 static const GimpEnumActionEntry tools_ink_blob_size_actions[] =
 {
   { "tools-ink-blob-size-set", GIMP_ICON_TOOL_INK,
-    "Set Ink Blob Size", { NULL }, NULL,
+    "Set Ink Blob Size", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -153,7 +153,7 @@ static const GimpEnumActionEntry tools_ink_blob_size_actions[] =
 static const GimpEnumActionEntry tools_ink_blob_aspect_actions[] =
 {
   { "tools-ink-blob-aspect-set", GIMP_ICON_TOOL_INK,
-    "Set Ink Blob Aspect", { NULL }, NULL,
+    "Set Ink Blob Aspect", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -161,7 +161,7 @@ static const GimpEnumActionEntry tools_ink_blob_aspect_actions[] =
 static const GimpEnumActionEntry tools_ink_blob_angle_actions[] =
 {
   { "tools-ink-blob-angle-set", GIMP_ICON_TOOL_INK,
-    "Set Ink Blob Angle", { NULL }, NULL,
+    "Set Ink Blob Angle", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -169,31 +169,31 @@ static const GimpEnumActionEntry tools_ink_blob_angle_actions[] =
 static const GimpEnumActionEntry tools_airbrush_rate_actions[] =
 {
   { "tools-airbrush-rate-set", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Set"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-airbrush-rate-minimum", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Set to Minimum"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-airbrush-rate-maximum", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Set to Maximum"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-airbrush-rate-decrease", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Decrease by 1"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-airbrush-rate-increase", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Increase by 1"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-airbrush-rate-decrease-skip", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Decrease by 10"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-airbrush-rate-increase-skip", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Rate: Increase by 10"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Rate: Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -201,31 +201,31 @@ static const GimpEnumActionEntry tools_airbrush_rate_actions[] =
 static const GimpEnumActionEntry tools_airbrush_flow_actions[] =
 {
   { "tools-airbrush-flow-set", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Set"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-airbrush-flow-minimum", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Set to Minimum"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Set to Minimum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-airbrush-flow-maximum", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Set to Maximum"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Set to Maximum"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-airbrush-flow-decrease", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Decrease by 1"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-airbrush-flow-increase", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Increase by 1"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-airbrush-flow-decrease-skip", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Decrease by 10"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-airbrush-flow-increase-skip", GIMP_ICON_TOOL_AIRBRUSH,
-    NC_("tools-action", "Airbrush Flow: Increase by 10"), { NULL }, NULL,
+    NC_("tools-action", "Airbrush Flow: Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -233,7 +233,7 @@ static const GimpEnumActionEntry tools_airbrush_flow_actions[] =
 static const GimpEnumActionEntry tools_mybrush_radius_actions[] =
 {
   { "tools-mypaint-brush-radius-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
-    "Set MyPaint Brush Radius", { NULL }, NULL,
+    "Set MyPaint Brush Radius", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -241,14 +241,14 @@ static const GimpEnumActionEntry tools_mybrush_radius_actions[] =
 static const GimpDoubleActionEntry tools_mybrush_pixel_size_actions[] =
 {
   { "tools-mypaint-brush-pixel-size-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
-    "Set MyPaint Brush Diameter in Pixel", { NULL }, NULL,
+    "Set MyPaint Brush Diameter in Pixel", NULL, { NULL }, NULL,
     1.0, NULL }
 };
 
 static const GimpEnumActionEntry tools_mybrush_hardness_actions[] =
 {
   { "tools-mypaint-brush-hardness-set", GIMP_ICON_TOOL_MYPAINT_BRUSH,
-    "Set MyPaint Brush Hardness", { NULL }, NULL,
+    "Set MyPaint Brush Hardness", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -257,7 +257,7 @@ static const GimpEnumActionEntry tools_foreground_select_brush_size_actions[] =
 {
   { "tools-foreground-select-brush-size-set",
     GIMP_ICON_TOOL_FOREGROUND_SELECT,
-    "Set Foreground Select Brush Size", { NULL }, NULL,
+    "Set Foreground Select Brush Size", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -265,7 +265,7 @@ static const GimpEnumActionEntry tools_foreground_select_brush_size_actions[] =
 static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] =
 {
   { "tools-transform-preview-opacity-set", GIMP_ICON_TOOL_PERSPECTIVE,
-    "Set Transform Tool Preview Opacity", { NULL }, NULL,
+    "Set Transform Tool Preview Opacity", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -273,14 +273,14 @@ static const GimpEnumActionEntry tools_transform_preview_opacity_actions[] =
 static const GimpDoubleActionEntry tools_warp_effect_pixel_size_actions[] =
 {
   { "tools-warp-effect-pixel-size-set", GIMP_ICON_TOOL_WARP,
-    "Set Warp Effect Size in Pixel", { NULL }, NULL,
+    "Set Warp Effect Size in Pixel", NULL, { NULL }, NULL,
     1.0, NULL }
 };
 
 static const GimpEnumActionEntry tools_warp_effect_size_actions[] =
 {
   { "tools-warp-effect-size-set", GIMP_ICON_TOOL_WARP,
-    "Set Warp Effect Size", { NULL }, NULL,
+    "Set Warp Effect Size", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -288,7 +288,7 @@ static const GimpEnumActionEntry tools_warp_effect_size_actions[] =
 static const GimpEnumActionEntry tools_warp_effect_hardness_actions[] =
 {
   { "tools-warp-effect-hardness-set", GIMP_ICON_TOOL_WARP,
-    "Set Warp Effect Hardness", { NULL }, NULL,
+    "Set Warp Effect Hardness", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL }
 };
@@ -296,43 +296,43 @@ static const GimpEnumActionEntry tools_warp_effect_hardness_actions[] =
 static const GimpEnumActionEntry tools_opacity_actions[] =
 {
   { "tools-opacity-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Opacity: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-opacity-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Set to Default Value"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Opacity: Set to Default Value"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-opacity-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Opacity: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-opacity-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Opacity: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-opacity-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Decrease by 1"), { "less" }, NULL,
+    NC_("tools-action", "Tool's Opacity: Decrease by 1"), NULL, { "less" }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-opacity-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Increase by 1"), { "greater" }, NULL,
+    NC_("tools-action", "Tool's Opacity: Increase by 1"), NULL, { "greater" }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-opacity-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Decrease by 10"), { "<primary>less" }, NULL,
+    NC_("tools-action", "Tool's Opacity: Decrease by 10"), NULL, { "<primary>less" }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-opacity-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Increase by 10"), { "<primary>greater" }, NULL,
+    NC_("tools-action", "Tool's Opacity: Increase by 10"), NULL, { "<primary>greater" }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-opacity-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Opacity: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-opacity-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Opacity: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Opacity: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -340,43 +340,43 @@ static const GimpEnumActionEntry tools_opacity_actions[] =
 static const GimpEnumActionEntry tools_size_actions[] =
 {
   { "tools-size-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-size-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Set to Default Value"), { "backslash", NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Set to Default Value"), NULL, { "backslash", NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-size-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-size-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-size-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Decrease by 1"), { "bracketleft", NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Decrease by 1"), NULL, { "bracketleft", NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-size-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Increase by 1"), { "bracketright", NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Increase by 1"), NULL, { "bracketright", NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-size-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Decrease by 10"), { "braceleft", NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Decrease by 10"), NULL, { "braceleft", NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-size-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Increase by 10"), { "braceright", NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Increase by 10"), NULL, { "braceright", NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-size-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-size-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Size: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Size: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -384,43 +384,43 @@ static const GimpEnumActionEntry tools_size_actions[] =
 static const GimpEnumActionEntry tools_aspect_actions[] =
 {
   { "tools-aspect-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-aspect-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Set To Default Value"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Set To Default Value"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-aspect-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-aspect-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-aspect-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Decrease by 0.1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Decrease by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-aspect-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Increase by 0.1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Increase by 0.1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-aspect-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Decrease by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-aspect-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Increase by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-aspect-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-aspect-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Aspect Ratio: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Aspect Ratio: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -428,43 +428,43 @@ static const GimpEnumActionEntry tools_aspect_actions[] =
 static const GimpEnumActionEntry tools_angle_actions[] =
 {
   { "tools-angle-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-angle-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Set Angle To Default Value"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Set Angle To Default Value"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-angle-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-angle-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-angle-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Decrease by 1°"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Decrease by 1°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-angle-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Increase by 1°"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Increase by 1°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-angle-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Decrease by 15°"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Decrease by 15°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-angle-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Increase by 15°"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Increase by 15°"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-angle-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-angle-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Angle: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Angle: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -472,43 +472,43 @@ static const GimpEnumActionEntry tools_angle_actions[] =
 static const GimpEnumActionEntry tools_spacing_actions[] =
 {
   { "tools-spacing-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-spacing-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Set To Default Value"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Set To Default Value"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-spacing-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-spacing-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-spacing-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Decrease by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-spacing-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Increase by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-spacing-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Decrease by 10"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-spacing-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Increase by 10"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-spacing-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-spacing-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Spacing: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Spacing: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -516,43 +516,43 @@ static const GimpEnumActionEntry tools_spacing_actions[] =
 static const GimpEnumActionEntry tools_hardness_actions[] =
 {
   { "tools-hardness-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-hardness-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Set to Default Value"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Set to Default Value"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-hardness-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-hardness-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-hardness-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Decrease by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-hardness-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Increase by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-hardness-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Decrease by 10"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-hardness-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Increase by 10"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-hardness-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-hardness-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Hardness: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Hardness: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -560,43 +560,43 @@ static const GimpEnumActionEntry tools_hardness_actions[] =
 static const GimpEnumActionEntry tools_force_actions[] =
 {
   { "tools-force-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Set"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Set"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-force-set-to-default", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Set to Default Value"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Set to Default Value"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
     NULL },
   { "tools-force-minimum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Minimize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Minimize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-force-maximum", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Maximize"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Maximize"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-force-decrease", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Decrease by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Decrease by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-force-increase", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Increase by 1"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Increase by 1"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
   { "tools-force-decrease-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Decrease by 10"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Decrease by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
   { "tools-force-increase-skip", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Increase by 10"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Increase by 10"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL },
   { "tools-force-decrease-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Decrease Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Decrease Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_PREVIOUS, FALSE,
     NULL },
   { "tools-force-increase-percent", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    NC_("tools-action", "Tool's Force: Increase Relative"), { NULL }, NULL,
+    NC_("tools-action", "Tool's Force: Increase Relative"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PERCENT_NEXT, FALSE,
     NULL },
 };
@@ -604,30 +604,30 @@ static const GimpEnumActionEntry tools_force_actions[] =
 static const GimpDoubleActionEntry tools_paint_select_pixel_size_actions[] =
 {
   { "tools-paint-select-pixel-size-set", GIMP_ICON_TOOL_PAINT_SELECT,
-    "Set Paint Select Brush Size in Pixel", { NULL }, NULL,
+    "Set Paint Select Brush Size in Pixel", NULL, { NULL }, NULL,
     1.0, NULL }
 };
 
 static const GimpEnumActionEntry tools_object_1_actions[] =
 {
   { "tools-object-1-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Select Object 1 by Index", { NULL }, NULL,
+    "Select Object 1 by Index", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-object-1-first", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "First Object 1", { NULL }, NULL,
+    "First Object 1", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-object-1-last", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Last Object 1", { NULL }, NULL,
+    "Last Object 1", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-object-1-previous", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Previous Object 1", { NULL }, NULL,
+    "Previous Object 1", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-object-1-next", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Next Object 1", { NULL }, NULL,
+    "Next Object 1", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
@@ -635,23 +635,23 @@ static const GimpEnumActionEntry tools_object_1_actions[] =
 static const GimpEnumActionEntry tools_object_2_actions[] =
 {
   { "tools-object-2-set", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Select Object 2 by Index", { NULL }, NULL,
+    "Select Object 2 by Index", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
   { "tools-object-2-first", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "First Object 2", { NULL }, NULL,
+    "First Object 2", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
   { "tools-object-2-last", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Last Object 2", { NULL }, NULL,
+    "Last Object 2", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
   { "tools-object-2-previous", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Previous Object 2", { NULL }, NULL,
+    "Previous Object 2", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
   { "tools-object-2-next", GIMP_ICON_DIALOG_TOOL_OPTIONS,
-    "Next Object 2", { NULL }, NULL,
+    "Next Object 2", NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL }
 };
diff --git a/app/actions/vector-toolpath-actions.c b/app/actions/vector-toolpath-actions.c
index 742f8659d1..7f1f27901c 100644
--- a/app/actions/vector-toolpath-actions.c
+++ b/app/actions/vector-toolpath-actions.c
@@ -42,28 +42,28 @@
 static const GimpActionEntry vector_toolpath_actions[] =
 {
   { "vector-toolpath-popup", NULL,
-    NC_("vector-toolpath-action", "Vector Toolpath Menu"), { NULL }, NULL, NULL,
+    NC_("vector-toolpath-action", "Vector Toolpath Menu"), NULL, { NULL }, NULL, NULL,
     NULL },
 
   { "vector-toolpath-delete-anchor", GIMP_ICON_PATH,
-    NC_("vector-toolpath-action", "_Delete Anchor"), { NULL }, NULL,
+    NC_("vector-toolpath-action", "_Delete Anchor"), NULL, { NULL }, NULL,
     vector_toolpath_delete_anchor_cmd_callback,
     NULL },
   { "vector-toolpath-shift-start", GIMP_ICON_PATH,
-    NC_("vector-toolpath-action", "Shift S_tart"), { NULL }, NULL,
+    NC_("vector-toolpath-action", "Shift S_tart"), NULL, { NULL }, NULL,
     vector_toolpath_shift_start_cmd_callback,
     NULL },
 
   { "vector-toolpath-insert-anchor", GIMP_ICON_PATH,
-    NC_("vector-toolpath-action", "_Insert Anchor"), { NULL }, NULL,
+    NC_("vector-toolpath-action", "_Insert Anchor"), NULL, { NULL }, NULL,
     vector_toolpath_insert_anchor_cmd_callback,
     NULL },
   { "vector-toolpath-delete-segment", GIMP_ICON_PATH,
-    NC_("vector-toolpath-action", "Delete _Segment"), { NULL }, NULL,
+    NC_("vector-toolpath-action", "Delete _Segment"), NULL, { NULL }, NULL,
     vector_toolpath_delete_segment_cmd_callback,
     NULL },
   { "vector-toolpath-reverse-stroke", GIMP_ICON_PATH,
-    NC_("vector-toolpath-action", "_Reverse Stroke"), { NULL }, NULL,
+    NC_("vector-toolpath-action", "_Reverse Stroke"), NULL, { NULL }, NULL,
     vector_toolpath_reverse_stroke_cmd_callback,
     NULL }
 };
diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c
index 81de2f2115..60b63467d1 100644
--- a/app/actions/vectors-actions.c
+++ b/app/actions/vectors-actions.c
@@ -43,119 +43,119 @@
 static const GimpActionEntry vectors_actions[] =
 {
   { "vectors-popup", GIMP_ICON_DIALOG_PATHS,
-    NC_("vectors-action", "Paths Menu"), { NULL }, NULL, NULL,
+    NC_("vectors-action", "Paths Menu"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_PATH_DIALOG },
 
   { "vectors-color-tag-menu", NULL,
-    NC_("vectors-action", "Color Tag"), { NULL }, NULL, NULL,
+    NC_("vectors-action", "Color Tag"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-edit", GIMP_ICON_TOOL_PATH,
-    NC_("vectors-action", "Edit Pa_th"), { NULL },
+    NC_("vectors-action", "Edit Pa_th"), NULL, { NULL },
     NC_("vectors-action", "Edit the active path"),
     vectors_edit_cmd_callback,
     GIMP_HELP_TOOL_VECTORS },
 
   { "vectors-edit-attributes", GIMP_ICON_EDIT,
-    NC_("vectors-action", "_Edit Path Attributes..."), { NULL },
+    NC_("vectors-action", "_Edit Path Attributes..."), NULL, { NULL },
     NC_("vectors-action", "Edit path attributes"),
     vectors_edit_attributes_cmd_callback,
     GIMP_HELP_PATH_EDIT },
 
   { "vectors-new", GIMP_ICON_DOCUMENT_NEW,
-    NC_("vectors-action", "_New Path..."), { NULL },
+    NC_("vectors-action", "_New Path..."), NULL, { NULL },
     NC_("vectors-action", "Create a new path..."),
     vectors_new_cmd_callback,
     GIMP_HELP_PATH_NEW },
 
   { "vectors-new-last-values", GIMP_ICON_DOCUMENT_NEW,
-    NC_("vectors-action", "_New Path with last values"), { NULL },
+    NC_("vectors-action", "_New Path with last values"), NULL, { NULL },
     NC_("vectors-action", "Create a new path with last used values"),
     vectors_new_last_vals_cmd_callback,
     GIMP_HELP_PATH_NEW },
 
   { "vectors-duplicate", GIMP_ICON_OBJECT_DUPLICATE,
-    NC_("vectors-action", "D_uplicate Paths"), { NULL },
+    NC_("vectors-action", "D_uplicate Paths"), NULL, { NULL },
     NC_("vectors-action", "Duplicate these paths"),
     vectors_duplicate_cmd_callback,
     GIMP_HELP_PATH_DUPLICATE },
 
   { "vectors-delete", GIMP_ICON_EDIT_DELETE,
-    NC_("vectors-action", "_Delete Path"), { NULL },
+    NC_("vectors-action", "_Delete Path"), NULL, { NULL },
     NC_("vectors-action", "Delete this path"),
     vectors_delete_cmd_callback,
     GIMP_HELP_PATH_DELETE },
 
   { "vectors-merge-visible", NULL,
-    NC_("vectors-action", "Merge _Visible Paths"), { NULL }, NULL,
+    NC_("vectors-action", "Merge _Visible Paths"), NULL, { NULL }, NULL,
     vectors_merge_visible_cmd_callback,
     GIMP_HELP_PATH_MERGE_VISIBLE },
 
   { "vectors-raise", GIMP_ICON_GO_UP,
-    NC_("vectors-action", "_Raise Path"), { NULL },
+    NC_("vectors-action", "_Raise Path"), NULL, { NULL },
     NC_("vectors-action", "Raise this path"),
     vectors_raise_cmd_callback,
     GIMP_HELP_PATH_RAISE },
 
   { "vectors-raise-to-top", GIMP_ICON_GO_TOP,
-    NC_("vectors-action", "Raise Path to _Top"), { NULL },
+    NC_("vectors-action", "Raise Path to _Top"), NULL, { NULL },
     NC_("vectors-action", "Raise this path to the top"),
     vectors_raise_to_top_cmd_callback,
     GIMP_HELP_PATH_RAISE_TO_TOP },
 
   { "vectors-lower", GIMP_ICON_GO_DOWN,
-    NC_("vectors-action", "_Lower Path"), { NULL },
+    NC_("vectors-action", "_Lower Path"), NULL, { NULL },
     NC_("vectors-action", "Lower this path"),
     vectors_lower_cmd_callback,
     GIMP_HELP_PATH_LOWER },
 
   { "vectors-lower-to-bottom", GIMP_ICON_GO_BOTTOM,
-    NC_("vectors-action", "Lower Path to _Bottom"), { NULL },
+    NC_("vectors-action", "Lower Path to _Bottom"), NULL, { NULL },
     NC_("vectors-action", "Lower this path to the bottom"),
     vectors_lower_to_bottom_cmd_callback,
     GIMP_HELP_PATH_LOWER_TO_BOTTOM },
 
   { "vectors-fill", GIMP_ICON_TOOL_BUCKET_FILL,
-    NC_("vectors-action", "Fill Pat_hs..."), { NULL },
+    NC_("vectors-action", "Fill Pat_hs..."), NULL, { NULL },
     NC_("vectors-action", "Fill the paths"),
     vectors_fill_cmd_callback,
     GIMP_HELP_PATH_FILL },
 
   { "vectors-fill-last-values", GIMP_ICON_TOOL_BUCKET_FILL,
-    NC_("vectors-action", "Fill Paths"), { NULL },
+    NC_("vectors-action", "Fill Paths"), NULL, { NULL },
     NC_("vectors-action", "Fill the paths with last values"),
     vectors_fill_last_vals_cmd_callback,
     GIMP_HELP_PATH_FILL },
 
   { "vectors-stroke", GIMP_ICON_PATH_STROKE,
-    NC_("vectors-action", "Stro_ke Paths..."), { NULL },
+    NC_("vectors-action", "Stro_ke Paths..."), NULL, { NULL },
     NC_("vectors-action", "Paint along the paths"),
     vectors_stroke_cmd_callback,
     GIMP_HELP_PATH_STROKE },
 
   { "vectors-stroke-last-values", GIMP_ICON_PATH_STROKE,
-    NC_("vectors-action", "Stro_ke Paths"), { NULL },
+    NC_("vectors-action", "Stro_ke Paths"), NULL, { NULL },
     NC_("vectors-action", "Paint along the paths with last values"),
     vectors_stroke_last_vals_cmd_callback,
     GIMP_HELP_PATH_STROKE },
 
   { "vectors-copy", GIMP_ICON_EDIT_COPY,
-    NC_("vectors-action", "Co_py Paths"), { NULL }, NULL,
+    NC_("vectors-action", "Co_py Paths"), NULL, { NULL }, NULL,
     vectors_copy_cmd_callback,
     GIMP_HELP_PATH_COPY },
 
   { "vectors-paste", GIMP_ICON_EDIT_PASTE,
-    NC_("vectors-action", "Paste Pat_h"), { NULL }, NULL,
+    NC_("vectors-action", "Paste Pat_h"), NULL, { NULL }, NULL,
     vectors_paste_cmd_callback,
     GIMP_HELP_PATH_PASTE },
 
   { "vectors-export", GIMP_ICON_DOCUMENT_SAVE,
-    NC_("vectors-action", "E_xport Paths..."), { NULL }, NULL,
+    NC_("vectors-action", "E_xport Paths..."), NULL, { NULL }, NULL,
     vectors_export_cmd_callback,
     GIMP_HELP_PATH_EXPORT },
 
   { "vectors-import", GIMP_ICON_DOCUMENT_OPEN,
-    NC_("vectors-action", "I_mport Path..."), { NULL }, NULL,
+    NC_("vectors-action", "I_mport Path..."), NULL, { NULL }, NULL,
     vectors_import_cmd_callback,
     GIMP_HELP_PATH_IMPORT }
 };
@@ -163,19 +163,19 @@ static const GimpActionEntry vectors_actions[] =
 static const GimpToggleActionEntry vectors_toggle_actions[] =
 {
   { "vectors-visible", GIMP_ICON_VISIBLE,
-    NC_("vectors-action", "Toggle Path _Visibility"), { NULL }, NULL,
+    NC_("vectors-action", "Toggle Path _Visibility"), NULL, { NULL }, NULL,
     vectors_visible_cmd_callback,
     FALSE,
     GIMP_HELP_PATH_VISIBLE },
 
   { "vectors-lock-content", GIMP_ICON_LOCK_CONTENT,
-    NC_("vectors-action", "L_ock Strokes of Path"), { NULL }, NULL,
+    NC_("vectors-action", "L_ock Strokes of Path"), NULL, { NULL }, NULL,
     vectors_lock_content_cmd_callback,
     FALSE,
     GIMP_HELP_PATH_LOCK_STROKES },
 
   { "vectors-lock-position", GIMP_ICON_LOCK_POSITION,
-    NC_("vectors-action", "L_ock Position of Path"), { NULL }, NULL,
+    NC_("vectors-action", "L_ock Position of Path"), NULL, { NULL }, NULL,
     vectors_lock_position_cmd_callback,
     FALSE,
     GIMP_HELP_PATH_LOCK_POSITION }
@@ -184,55 +184,55 @@ static const GimpToggleActionEntry vectors_toggle_actions[] =
 static const GimpEnumActionEntry vectors_color_tag_actions[] =
 {
   { "vectors-color-tag-none", GIMP_ICON_EDIT_CLEAR,
-    NC_("vectors-action", "None"), { NULL },
+    NC_("vectors-action", "None"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Clear"),
     GIMP_COLOR_TAG_NONE, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-blue", NULL,
-    NC_("vectors-action", "Blue"), { NULL },
+    NC_("vectors-action", "Blue"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Blue"),
     GIMP_COLOR_TAG_BLUE, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-green", NULL,
-    NC_("vectors-action", "Green"), { NULL },
+    NC_("vectors-action", "Green"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Green"),
     GIMP_COLOR_TAG_GREEN, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-yellow", NULL,
-    NC_("vectors-action", "Yellow"), { NULL },
+    NC_("vectors-action", "Yellow"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Yellow"),
     GIMP_COLOR_TAG_YELLOW, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-orange", NULL,
-    NC_("vectors-action", "Orange"), { NULL },
+    NC_("vectors-action", "Orange"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Orange"),
     GIMP_COLOR_TAG_ORANGE, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-brown", NULL,
-    NC_("vectors-action", "Brown"), { NULL },
+    NC_("vectors-action", "Brown"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Brown"),
     GIMP_COLOR_TAG_BROWN, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-red", NULL,
-    NC_("vectors-action", "Red"), { NULL },
+    NC_("vectors-action", "Red"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Red"),
     GIMP_COLOR_TAG_RED, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-violet", NULL,
-    NC_("vectors-action", "Violet"), { NULL },
+    NC_("vectors-action", "Violet"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Violet"),
     GIMP_COLOR_TAG_VIOLET, FALSE,
     GIMP_HELP_PATH_COLOR_TAG },
 
   { "vectors-color-tag-gray", NULL,
-    NC_("vectors-action", "Gray"), { NULL },
+    NC_("vectors-action", "Gray"), NULL, { NULL },
     NC_("vectors-action", "Path Color Tag: Set to Gray"),
     GIMP_COLOR_TAG_GRAY, FALSE,
     GIMP_HELP_PATH_COLOR_TAG }
@@ -241,31 +241,31 @@ static const GimpEnumActionEntry vectors_color_tag_actions[] =
 static const GimpEnumActionEntry vectors_to_selection_actions[] =
 {
   { "vectors-selection-replace", GIMP_ICON_SELECTION_REPLACE,
-    NC_("vectors-action", "Paths to Sele_ction"), { NULL },
+    NC_("vectors-action", "Paths to Sele_ction"), NULL, { NULL },
     NC_("vectors-action", "Path to selection"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_PATH_SELECTION_REPLACE },
 
   { "vectors-selection-from-vectors", GIMP_ICON_SELECTION_REPLACE,
-    NC_("vectors-action", "Selection Fr_om Paths"), { "<shift>V", NULL },
+    NC_("vectors-action", "Selection Fr_om Paths"), NULL, { "<shift>V", NULL },
     NC_("vectors-action", "Replace selection with paths"),
     GIMP_CHANNEL_OP_REPLACE, FALSE,
     GIMP_HELP_PATH_SELECTION_REPLACE },
 
   { "vectors-selection-add", GIMP_ICON_SELECTION_ADD,
-    NC_("vectors-action", "_Add Paths to Selection"), { NULL },
+    NC_("vectors-action", "_Add Paths to Selection"), NULL, { NULL },
     NC_("vectors-action", "Add paths to selection"),
     GIMP_CHANNEL_OP_ADD, FALSE,
     GIMP_HELP_PATH_SELECTION_ADD },
 
   { "vectors-selection-subtract", GIMP_ICON_SELECTION_SUBTRACT,
-    NC_("vectors-action", "_Subtract Paths from Selection"), { NULL },
+    NC_("vectors-action", "_Subtract Paths from Selection"), NULL, { NULL },
     NC_("vectors-action", "Subtract paths from selection"),
     GIMP_CHANNEL_OP_SUBTRACT, FALSE,
     GIMP_HELP_PATH_SELECTION_SUBTRACT },
 
   { "vectors-selection-intersect", GIMP_ICON_SELECTION_INTERSECT,
-    NC_("vectors-action", "_Intersect Paths with Selection"), { NULL },
+    NC_("vectors-action", "_Intersect Paths with Selection"), NULL, { NULL },
     NC_("vectors-action", "Intersect paths with selection"),
     GIMP_CHANNEL_OP_INTERSECT, FALSE,
     GIMP_HELP_PATH_SELECTION_INTERSECT }
@@ -274,19 +274,19 @@ static const GimpEnumActionEntry vectors_to_selection_actions[] =
 static const GimpEnumActionEntry vectors_selection_to_vectors_actions[] =
 {
   { "vectors-selection-to-vectors", GIMP_ICON_SELECTION_TO_PATH,
-    NC_("vectors-action", "Selecti_on to Path"), { NULL },
+    NC_("vectors-action", "Selecti_on to Path"), NULL, { NULL },
     NC_("vectors-action", "Selection to path"),
     FALSE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH },
 
   { "vectors-selection-to-vectors-short", GIMP_ICON_SELECTION_TO_PATH,
-    NC_("vectors-action", "To _Path"), { NULL },
+    NC_("vectors-action", "To _Path"), NULL, { NULL },
     NC_("vectors-action", "Selection to path"),
     FALSE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH },
 
   { "vectors-selection-to-vectors-advanced", GIMP_ICON_SELECTION_TO_PATH,
-    NC_("vectors-action", "Selection to Path (_Advanced)"), { NULL },
+    NC_("vectors-action", "Selection to Path (_Advanced)"), NULL, { NULL },
     NC_("vectors-action", "Advanced options"),
     TRUE, FALSE,
     GIMP_HELP_SELECTION_TO_PATH }
@@ -295,25 +295,25 @@ static const GimpEnumActionEntry vectors_selection_to_vectors_actions[] =
 static const GimpEnumActionEntry vectors_select_actions[] =
 {
   { "vectors-select-top", NULL,
-    NC_("vectors-action", "Select _Top Path"), { NULL },
+    NC_("vectors-action", "Select _Top Path"), NULL, { NULL },
     NC_("vectors-action", "Select the topmost path"),
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_PATH_TOP },
 
   { "vectors-select-bottom", NULL,
-    NC_("vectors-action", "Select _Bottom Path"), { NULL },
+    NC_("vectors-action", "Select _Bottom Path"), NULL, { NULL },
     NC_("vectors-action", "Select the bottommost path"),
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_PATH_BOTTOM },
 
   { "vectors-select-previous", NULL,
-    NC_("vectors-action", "Select _Previous Path"), { NULL },
+    NC_("vectors-action", "Select _Previous Path"), NULL, { NULL },
     NC_("vectors-action", "Select the path above the current path"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_PATH_PREVIOUS },
 
   { "vectors-select-next", NULL,
-    NC_("vectors-action", "Select _Next Path"), { NULL },
+    NC_("vectors-action", "Select _Next Path"), NULL, { NULL },
     NC_("vectors-action", "Select the vector below the current path"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_PATH_NEXT }
diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c
index 98977ca5d2..b13483312e 100644
--- a/app/actions/view-actions.c
+++ b/app/actions/view-actions.c
@@ -78,98 +78,98 @@ static const GimpActionEntry view_actions[] =
     NC_("view-action", "Display _Rendering Intent") },
 
   { "view-move-to-screen-menu", GIMP_ICON_WINDOW_MOVE_TO_SCREEN,
-    NC_("view-action", "Move to Screen"), { NULL }, NULL, NULL,
+    NC_("view-action", "Move to Screen"), NULL, { NULL }, NULL, NULL,
     GIMP_HELP_VIEW_CHANGE_SCREEN },
 
   { "view-new", GIMP_ICON_WINDOW_NEW,
-    NC_("view-action", "_New View"), { NULL },
+    NC_("view-action", "_New View"), NULL, { NULL },
     NC_("view-action", "Create another view on this image"),
     view_new_cmd_callback,
     GIMP_HELP_VIEW_NEW },
 
   { "view-close", GIMP_ICON_WINDOW_CLOSE,
-    NC_("view-action",  "_Close View"), { "<primary>W", NULL },
+    NC_("view-action",  "_Close View"), NULL, { "<primary>W", NULL },
     NC_("view-action", "Close the active image view"),
     view_close_cmd_callback,
     GIMP_HELP_FILE_CLOSE },
 
   { "view-scroll-center", GIMP_ICON_CENTER,
-    NC_("view-action", "C_enter Image in Window"), { "<shift>J", NULL },
+    NC_("view-action", "C_enter Image in Window"), NULL, { "<shift>J", NULL },
     NC_("view-action", "Scroll the image so that it is centered in the window"),
     view_scroll_center_cmd_callback,
     GIMP_HELP_VIEW_SCROLL_CENTER },
 
   { "view-zoom-fit-in", GIMP_ICON_ZOOM_FIT_BEST,
-    NC_("view-action", "_Fit Image in Window"), { "<primary><shift>J", NULL },
+    NC_("view-action", "_Fit Image in Window"), NULL, { "<primary><shift>J", NULL },
     NC_("view-action", "Adjust the zoom ratio so that the image becomes fully visible"),
     view_zoom_fit_in_cmd_callback,
     GIMP_HELP_VIEW_ZOOM_FIT_IN },
 
   { "view-zoom-fill", GIMP_ICON_ZOOM_FIT_BEST,
-    NC_("view-action", "Fi_ll Window"), { NULL },
+    NC_("view-action", "Fi_ll Window"), NULL, { NULL },
     NC_("view-action", "Adjust the zoom ratio so that the entire window is used"),
     view_zoom_fill_cmd_callback,
     GIMP_HELP_VIEW_ZOOM_FILL },
 
   { "view-zoom-selection", GIMP_ICON_SELECTION,
-    NC_("view-action", "Zoom to _Selection"), { NULL },
+    NC_("view-action", "Zoom to _Selection"), NULL, { NULL },
     NC_("view-action", "Adjust the zoom ratio so that the selection fills the window"),
     view_zoom_selection_cmd_callback,
     GIMP_HELP_VIEW_ZOOM_SELECTION },
 
   { "view-zoom-revert", NULL,
-    NC_("view-action", "Re_vert Zoom"), { "grave", NULL },
+    NC_("view-action", "Re_vert Zoom"), NULL, { "grave", NULL },
     NC_("view-action", "Restore the previous zoom level"),
     view_zoom_revert_cmd_callback,
     GIMP_HELP_VIEW_ZOOM_REVERT },
 
   { "view-rotate-other", NULL,
-    NC_("view-action", "Othe_r rotation angle..."), { NULL },
+    NC_("view-action", "Othe_r rotation angle..."), NULL, { NULL },
     NC_("view-action", "Set a custom rotation angle"),
     view_rotate_other_cmd_callback,
     GIMP_HELP_VIEW_ROTATE_OTHER },
 
   { "view-flip-reset", GIMP_ICON_RESET,
-    NC_("view-action", "_Reset Flipping"), { NULL },
+    NC_("view-action", "_Reset Flipping"), NULL, { NULL },
     NC_("view-action",
         "Reset flipping to unflipped"),
     view_flip_reset_cmd_callback,
     GIMP_HELP_VIEW_FLIP_RESET },
 
   { "view-reset", GIMP_ICON_RESET,
-    NC_("view-action", "_Reset Flip & Rotate"), { "exclam", NULL },
+    NC_("view-action", "_Reset Flip & Rotate"), NULL, { "exclam", NULL },
     NC_("view-action",
         "Reset flipping to unflipped and the angle of rotation to 0°"),
     view_reset_cmd_callback,
     GIMP_HELP_VIEW_RESET },
 
   { "view-navigation-window", GIMP_ICON_DIALOG_NAVIGATION,
-    NC_("view-action", "Na_vigation Window"), { NULL },
+    NC_("view-action", "Na_vigation Window"), NULL, { NULL },
     NC_("view-action", "Show an overview window for this image"),
     view_navigation_window_cmd_callback,
     GIMP_HELP_NAVIGATION_DIALOG },
 
   { "view-display-filters", GIMP_ICON_DISPLAY_FILTER,
-    NC_("view-action", "Display _Filters..."), { NULL },
+    NC_("view-action", "Display _Filters..."), NULL, { NULL },
     NC_("view-action", "Configure filters applied to this view"),
     view_display_filters_cmd_callback,
     GIMP_HELP_DISPLAY_FILTER_DIALOG },
 
   { "view-color-management-reset", GIMP_ICON_RESET,
-    NC_("view-action", "As in _Preferences"), { NULL },
+    NC_("view-action", "As in _Preferences"), NULL, { NULL },
     NC_("view-action",
         "Reset color management to what's configured in preferences"),
     view_color_management_reset_cmd_callback,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-shrink-wrap", GIMP_ICON_ZOOM_FIT_BEST,
-    NC_("view-action", "Shrink _Wrap"), { "<primary>J", NULL },
+    NC_("view-action", "Shrink _Wrap"), NULL, { "<primary>J", NULL },
     NC_("view-action", "Reduce the image window to the size of the image display"),
     view_shrink_wrap_cmd_callback,
     GIMP_HELP_VIEW_SHRINK_WRAP },
 
   { "view-open-display", NULL,
-    NC_("view-action", "_Open Display..."), { NULL },
+    NC_("view-action", "_Open Display..."), NULL, { NULL },
     NC_("view-action", "Connect to another display"),
     window_open_display_cmd_callback,
     NULL }
@@ -179,42 +179,42 @@ static const GimpToggleActionEntry view_toggle_actions[] =
 {
 
   { "view-show-all", NULL,
-    NC_("view-action", "Show _All"), { NULL },
+    NC_("view-action", "Show _All"), NULL, { NULL },
     NC_("view-action", "Show full image content"),
     view_show_all_cmd_callback,
     FALSE,
     GIMP_HELP_VIEW_SHOW_ALL },
 
   { "view-dot-for-dot", NULL,
-    NC_("view-action", "_Dot for Dot"), { NULL },
+    NC_("view-action", "_Dot for Dot"), NULL, { NULL },
     NC_("view-action", "A pixel on the screen represents an image pixel"),
     view_dot_for_dot_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_DOT_FOR_DOT },
 
   { "view-color-management-enable", NULL,
-    NC_("view-action", "_Color-Manage this View"), { NULL },
+    NC_("view-action", "_Color-Manage this View"), NULL, { NULL },
     NC_("view-action", "Use color management for this view"),
     view_color_management_enable_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-color-management-softproof", NULL,
-    NC_("view-action", "_Proof Colors"), { NULL },
+    NC_("view-action", "_Proof Colors"), NULL, { NULL },
     NC_("view-action", "Use this view for soft-proofing"),
     view_color_management_softproof_cmd_callback,
     FALSE,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-display-black-point-compensation", NULL,
-    NC_("view-action", "_Black Point Compensation"), { NULL },
+    NC_("view-action", "_Black Point Compensation"), NULL, { NULL },
     NC_("view-action", "Use black point compensation for image display"),
     view_display_bpc_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-softproof-gamut-check", NULL,
-    NC_("view-action", "_Mark Out Of Gamut Colors"), { NULL },
+    NC_("view-action", "_Mark Out Of Gamut Colors"), NULL, { NULL },
     NC_("view-action", "When soft-proofing, mark colors which cannot "
         "be represented in the target color space"),
     view_softproof_gamut_check_cmd_callback,
@@ -222,105 +222,105 @@ static const GimpToggleActionEntry view_toggle_actions[] =
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-show-selection", NULL,
-    NC_("view-action", "Show _Selection"), { "<primary>T", NULL },
+    NC_("view-action", "Show _Selection"), NULL, { "<primary>T", NULL },
     NC_("view-action", "Display the selection outline"),
     view_toggle_selection_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_SELECTION },
 
   { "view-show-layer-boundary", NULL,
-    NC_("view-action", "Show _Layer Boundary"), { NULL },
+    NC_("view-action", "Show _Layer Boundary"), NULL, { NULL },
     NC_("view-action", "Draw a border around the active layer"),
     view_toggle_layer_boundary_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_LAYER_BOUNDARY },
 
   { "view-show-canvas-boundary", NULL,
-    NC_("view-action", "Show Canvas Bounda_ry"), { NULL },
+    NC_("view-action", "Show Canvas Bounda_ry"), NULL, { NULL },
     NC_("view-action", "Draw a border around the canvas"),
     view_toggle_canvas_boundary_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_CANVAS_BOUNDARY },
 
   { "view-show-guides", NULL,
-    NC_("view-action", "Show _Guides"), { "<primary><shift>T", NULL },
+    NC_("view-action", "Show _Guides"), NULL, { "<primary><shift>T", NULL },
     NC_("view-action", "Display the image's guides"),
     view_toggle_guides_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_GUIDES },
 
   { "view-show-grid", NULL,
-    NC_("view-action", "S_how Grid"), { NULL },
+    NC_("view-action", "S_how Grid"), NULL, { NULL },
     NC_("view-action", "Display the image's grid"),
     view_toggle_grid_cmd_callback,
     FALSE,
     GIMP_HELP_VIEW_SHOW_GRID },
 
   { "view-show-sample-points", NULL,
-    NC_("view-action", "Sh_ow Sample Points"), { NULL },
+    NC_("view-action", "Sh_ow Sample Points"), NULL, { NULL },
     NC_("view-action", "Display the image's color sample points"),
     view_toggle_sample_points_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_SAMPLE_POINTS },
 
   { "view-snap-to-guides", NULL,
-    NC_("view-action", "Snap to Gu_ides"), { NULL },
+    NC_("view-action", "Snap to Gu_ides"), NULL, { NULL },
     NC_("view-action", "Tool operations snap to guides"),
     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 },
+    NC_("view-action", "Sna_p to Grid"), NULL, { NULL },
     NC_("view-action", "Tool operations snap to the grid"),
     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 },
+    NC_("view-action", "Snap to _Canvas Edges"), NULL, { NULL },
     NC_("view-action", "Tool operations snap to the canvas edges"),
     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 },
+    NC_("view-action", "Snap t_o Active Path"), NULL, { NULL },
     NC_("view-action", "Tool operations snap to the active path"),
     view_snap_to_vectors_cmd_callback,
     FALSE,
     GIMP_HELP_VIEW_SNAP_TO_VECTORS },
 
   { "view-show-menubar", NULL,
-    NC_("view-action", "Show _Menubar"), { NULL },
+    NC_("view-action", "Show _Menubar"), NULL, { NULL },
     NC_("view-action", "Show this window's menubar"),
     view_toggle_menubar_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_MENUBAR },
 
   { "view-show-rulers", NULL,
-    NC_("view-action", "Show R_ulers"), { "<primary><shift>R", NULL },
+    NC_("view-action", "Show R_ulers"), NULL, { "<primary><shift>R", NULL },
     NC_("view-action", "Show this window's rulers"),
     view_toggle_rulers_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_RULERS },
 
   { "view-show-scrollbars", NULL,
-    NC_("view-action", "Show Scroll_bars"), { NULL },
+    NC_("view-action", "Show Scroll_bars"), NULL, { NULL },
     NC_("view-action", "Show this window's scrollbars"),
     view_toggle_scrollbars_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_SCROLLBARS },
 
   { "view-show-statusbar", NULL,
-    NC_("view-action", "Show S_tatusbar"), { NULL },
+    NC_("view-action", "Show S_tatusbar"), NULL, { NULL },
     NC_("view-action", "Show this window's statusbar"),
     view_toggle_statusbar_cmd_callback,
     TRUE,
     GIMP_HELP_VIEW_SHOW_STATUSBAR },
 
   { "view-fullscreen", GIMP_ICON_VIEW_FULLSCREEN,
-    NC_("view-action", "Fullscr_een"), { "F11", NULL },
+    NC_("view-action", "Fullscr_een"), NULL, { "F11", NULL },
     NC_("view-action", "Toggle fullscreen view"),
     view_fullscreen_cmd_callback,
     FALSE,
@@ -330,39 +330,39 @@ static const GimpToggleActionEntry view_toggle_actions[] =
 static const GimpEnumActionEntry view_zoom_actions[] =
 {
   { "view-zoom", NULL,
-    NC_("view-zoom-action", "Set zoom factor"), { NULL }, NULL,
+    NC_("view-zoom-action", "Set zoom factor"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
   { "view-zoom-minimum", GIMP_ICON_ZOOM_OUT,
-    NC_("view-zoom-action", "Zoom out as far as possible"), { NULL }, NULL,
+    NC_("view-zoom-action", "Zoom out as far as possible"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-maximum", GIMP_ICON_ZOOM_IN,
-    NC_("view-zoom-action", "Zoom in as far as possible"), { NULL }, NULL,
+    NC_("view-zoom-action", "Zoom in as far as possible"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-out", GIMP_ICON_ZOOM_OUT,
-    NC_("view-zoom-action", "Zoom _Out"), { "minus", "KP_Subtract", "ZoomOut", NULL },
+    NC_("view-zoom-action", "Zoom _Out"), NULL, { "minus", "KP_Subtract", "ZoomOut", NULL },
     NC_("view-zoom-action", "Zoom out"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-in", GIMP_ICON_ZOOM_IN,
-    NC_("view-zoom-action", "Zoom _In"), { "plus", "KP_Add", "ZoomIn", NULL },
+    NC_("view-zoom-action", "Zoom _In"), NULL, { "plus", "KP_Add", "ZoomIn", NULL },
     NC_("view-zoom-action", "Zoom in"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-out-skip", GIMP_ICON_ZOOM_OUT,
-    NC_("view-zoom-action", "Zoom out a lot"), { NULL }, NULL,
+    NC_("view-zoom-action", "Zoom out a lot"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-in-skip", GIMP_ICON_ZOOM_IN,
-    NC_("view-zoom-action", "Zoom in a lot"), { NULL }, NULL,
+    NC_("view-zoom-action", "Zoom in a lot"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_VIEW_ZOOM_IN }
 };
@@ -370,61 +370,61 @@ static const GimpEnumActionEntry view_zoom_actions[] =
 static const GimpRadioActionEntry view_zoom_explicit_actions[] =
 {
   { "view-zoom-16-1", NULL,
-    NC_("view-zoom-action", "1_6:1  (1600%)"), { "5", "KP_5", NULL },
+    NC_("view-zoom-action", "1_6:1  (1600%)"), NULL, { "5", "KP_5", NULL },
     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%)"), { "4", "KP_4", NULL },
+    NC_("view-zoom-action", "_8:1  (800%)"), NULL, { "4", "KP_4", NULL },
     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%)"), { "3", "KP_3", NULL },
+    NC_("view-zoom-action", "_4:1  (400%)"), NULL, { "3", "KP_3", NULL },
     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%)"), { "2", "KP_2", NULL },
+    NC_("view-zoom-action", "_2:1  (200%)"), NULL, { "2", "KP_2", NULL },
     NC_("view-zoom-action", "Zoom 2:1"),
     20000,
     GIMP_HELP_VIEW_ZOOM_IN },
 
   { "view-zoom-1-1", GIMP_ICON_ZOOM_ORIGINAL,
-    NC_("view-zoom-action", "_1:1  (100%)"), { "1", "KP_1", NULL },
+    NC_("view-zoom-action", "_1:1  (100%)"), NULL, { "1", "KP_1", NULL },
     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%)"), { "<shift>2", "<shift>KP_2", NULL },
+    NC_("view-zoom-action", "1:_2  (50%)"), NULL, { "<shift>2", "<shift>KP_2", NULL },
     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%)"), { "<shift>3", "<shift>KP_3", NULL },
+    NC_("view-zoom-action", "1:_4  (25%)"), NULL, { "<shift>3", "<shift>KP_3", NULL },
     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%)"), { "<shift>4", "<shift>KP_4", NULL },
+    NC_("view-zoom-action", "1:_8  (12.5%)"), NULL, { "<shift>4", "<shift>KP_4", NULL },
     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%)"), { "<shift>5", "<shift>KP_5", NULL },
+    NC_("view-zoom-action", "1:1_6  (6.25%)"), NULL, { "<shift>5", "<shift>KP_5", NULL },
     NC_("view-zoom-action", "Zoom 1:16"),
     625,
     GIMP_HELP_VIEW_ZOOM_OUT },
 
   { "view-zoom-other", NULL,
-    NC_("view-zoom-action", "Othe_r zoom factor..."), { NULL },
+    NC_("view-zoom-action", "Othe_r zoom factor..."), NULL, { NULL },
     NC_("view-zoom-action", "Set a custom zoom factor"),
     0,
     GIMP_HELP_VIEW_ZOOM_OTHER }
@@ -433,14 +433,14 @@ static const GimpRadioActionEntry view_zoom_explicit_actions[] =
 static const GimpToggleActionEntry view_flip_actions[] =
 {
   { "view-flip-horizontally", GIMP_ICON_OBJECT_FLIP_HORIZONTAL,
-    NC_("view-action", "Flip _Horizontally"), { NULL },
+    NC_("view-action", "Flip _Horizontally"), NULL, { NULL },
     NC_("view-action", "Flip the view horizontally"),
     view_flip_horizontally_cmd_callback,
     FALSE,
     GIMP_HELP_VIEW_FLIP },
 
   { "view-flip-vertically", GIMP_ICON_OBJECT_FLIP_VERTICAL,
-    NC_("view-action", "Flip _Vertically"), { NULL },
+    NC_("view-action", "Flip _Vertically"), NULL, { NULL },
     NC_("view-action", "Flip the view vertically"),
     view_flip_vertically_cmd_callback,
     FALSE,
@@ -450,12 +450,13 @@ static const GimpToggleActionEntry view_flip_actions[] =
 static const GimpEnumActionEntry view_rotate_absolute_actions[] =
 {
   { "view-rotate-set-absolute", NULL,
-    "Display Rotation Absolute Angle Set", { NULL }, NULL,
+    NC_("view-action", "Display Rotation Absolute Angle Set"),
+    NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
   { "view-rotate-reset", GIMP_ICON_RESET,
-    NC_("view-action", "_Reset Rotate"), { NULL },
+    NC_("view-action", "_Reset Rotate"), NULL, { NULL },
     NC_("view-action",
         "Reset the angle of rotation to 0°"),
     GIMP_ACTION_SELECT_SET_TO_DEFAULT, FALSE,
@@ -465,31 +466,31 @@ static const GimpEnumActionEntry view_rotate_absolute_actions[] =
 static const GimpEnumActionEntry view_rotate_relative_actions[] =
 {
   { "view-rotate-15", GIMP_ICON_OBJECT_ROTATE_90,
-    NC_("view-action", "Rotate 15° _clockwise"), { NULL },
+    NC_("view-action", "Rotate 15° _clockwise"), NULL, { NULL },
     NC_("view-action", "Rotate the view 15 degrees to the right"),
     GIMP_ACTION_SELECT_NEXT, FALSE,
     GIMP_HELP_VIEW_ROTATE_15 },
 
   { "view-rotate-90", GIMP_ICON_OBJECT_ROTATE_90,
-    NC_("view-action", "Rotate 90° _clockwise"), { NULL },
+    NC_("view-action", "Rotate 90° _clockwise"), NULL, { NULL },
     NC_("view-action", "Rotate the view 90 degrees to the right"),
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     GIMP_HELP_VIEW_ROTATE_90 },
 
   { "view-rotate-180", GIMP_ICON_OBJECT_ROTATE_180,
-    NC_("view-action", "Rotate _180°"), { NULL },
+    NC_("view-action", "Rotate _180°"), NULL, { NULL },
     NC_("view-action", "Turn the view upside-down"),
     GIMP_ACTION_SELECT_LAST, FALSE,
     GIMP_HELP_VIEW_ROTATE_180 },
 
   { "view-rotate-270", GIMP_ICON_OBJECT_ROTATE_270,
-    NC_("view-action", "Rotate 90° counter-clock_wise"), { NULL },
+    NC_("view-action", "Rotate 90° counter-clock_wise"), NULL, { NULL },
     NC_("view-action", "Rotate the view 90 degrees to the left"),
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ROTATE_270 },
 
   { "view-rotate-345", GIMP_ICON_OBJECT_ROTATE_270,
-    NC_("view-action", "Rotate 15° counter-clock_wise"), { NULL },
+    NC_("view-action", "Rotate 15° counter-clock_wise"), NULL, { NULL },
     NC_("view-action", "Rotate the view 15 degrees to the left"),
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     GIMP_HELP_VIEW_ROTATE_345 }
@@ -498,25 +499,25 @@ static const GimpEnumActionEntry view_rotate_relative_actions[] =
 static const GimpRadioActionEntry view_display_intent_actions[] =
 {
   { "view-display-intent-perceptual", NULL,
-    NC_("view-action", "_Perceptual"), { NULL },
+    NC_("view-action", "_Perceptual"), NULL, { NULL },
     NC_("view-action", "Display rendering intent is perceptual"),
     GIMP_COLOR_RENDERING_INTENT_PERCEPTUAL,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-display-intent-relative-colorimetric", NULL,
-    NC_("view-action", "_Relative Colorimetric"), { NULL },
+    NC_("view-action", "_Relative Colorimetric"), NULL, { NULL },
     NC_("view-action", "Display rendering intent is relative colorimetric"),
     GIMP_COLOR_RENDERING_INTENT_RELATIVE_COLORIMETRIC,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-display-intent-saturation", NULL,
-    NC_("view-action", "_Saturation"), { NULL },
+    NC_("view-action", "_Saturation"), NULL, { NULL },
     NC_("view-action", "Display rendering intent is saturation"),
     GIMP_COLOR_RENDERING_INTENT_SATURATION,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT },
 
   { "view-display-intent-absolute-colorimetric", NULL,
-    NC_("view-action", "_Absolute Colorimetric"), { NULL },
+    NC_("view-action", "_Absolute Colorimetric"), NULL, { NULL },
     NC_("view-action", "Display rendering intent is absolute colorimetric"),
     GIMP_COLOR_RENDERING_INTENT_ABSOLUTE_COLORIMETRIC,
     GIMP_HELP_VIEW_COLOR_MANAGEMENT }
@@ -525,31 +526,31 @@ static const GimpRadioActionEntry view_display_intent_actions[] =
 static const GimpEnumActionEntry view_padding_color_actions[] =
 {
   { "view-padding-color-theme", NULL,
-    NC_("view-padding-color", "From _Theme"), { NULL },
+    NC_("view-padding-color", "From _Theme"), NULL, { NULL },
     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 },
+    NC_("view-padding-color", "_Light Check Color"), NULL, { NULL },
     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 },
+    NC_("view-padding-color", "_Dark Check Color"), NULL, { NULL },
     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", GIMP_ICON_PALETTE,
-    NC_("view-padding-color", "_Custom Color..."), { NULL },
+    NC_("view-padding-color", "_Custom Color..."), NULL, { NULL },
     NC_("view-padding-color", "Use an arbitrary color"),
     GIMP_CANVAS_PADDING_MODE_CUSTOM, FALSE,
     GIMP_HELP_VIEW_PADDING_COLOR },
 
   { "view-padding-color-prefs", GIMP_ICON_RESET,
-    NC_("view-padding-color", "As in _Preferences"), { NULL },
+    NC_("view-padding-color", "As in _Preferences"), NULL, { NULL },
     NC_("view-padding-color",
         "Reset padding color to what's configured in preferences"),
     GIMP_CANVAS_PADDING_MODE_RESET, FALSE,
@@ -559,7 +560,7 @@ static const GimpEnumActionEntry view_padding_color_actions[] =
 static const GimpToggleActionEntry view_padding_color_toggle_actions[] =
 {
   { "view-padding-color-in-show-all", NULL,
-    NC_("view-padding-color", "Keep Padding in \"Show _All\" Mode"), { NULL },
+    NC_("view-padding-color", "Keep Padding in \"Show _All\" Mode"), NULL, { NULL },
     NC_("view-padding-color",
         "Keep canvas padding when \"View -> Show All\" is enabled"),
     view_padding_color_in_show_all_cmd_callback,
@@ -570,37 +571,37 @@ static const GimpToggleActionEntry view_padding_color_toggle_actions[] =
 static const GimpEnumActionEntry view_scroll_horizontal_actions[] =
 {
   { "view-scroll-horizontal", NULL,
-    NC_("view-action", "Set horizontal scroll offset"), { NULL }, NULL,
+    NC_("view-action", "Set horizontal scroll offset"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
   { "view-scroll-left-border", NULL,
-    NC_("view-action", "Scroll to left border"), { NULL }, NULL,
+    NC_("view-action", "Scroll to left border"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
 
   { "view-scroll-right-border", NULL,
-    NC_("view-action", "Scroll to right border"), { NULL }, NULL,
+    NC_("view-action", "Scroll to right border"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
 
   { "view-scroll-left", NULL,
-    NC_("view-action", "Scroll left"), { NULL }, NULL,
+    NC_("view-action", "Scroll left"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
 
   { "view-scroll-right", NULL,
-    NC_("view-action", "Scroll right"), { NULL }, NULL,
+    NC_("view-action", "Scroll right"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
 
   { "view-scroll-page-left", NULL,
-    NC_("view-action", "Scroll page left"), { NULL }, NULL,
+    NC_("view-action", "Scroll page left"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
 
   { "view-scroll-page-right", NULL,
-    NC_("view-action", "Scroll page right"), { NULL }, NULL,
+    NC_("view-action", "Scroll page right"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
@@ -608,37 +609,37 @@ static const GimpEnumActionEntry view_scroll_horizontal_actions[] =
 static const GimpEnumActionEntry view_scroll_vertical_actions[] =
 {
   { "view-scroll-vertical", NULL,
-    NC_("view-action", "Set vertical scroll offset"), { NULL }, NULL,
+    NC_("view-action", "Set vertical scroll offset"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SET, TRUE,
     NULL },
 
   { "view-scroll-top-border", NULL,
-    NC_("view-action", "Scroll to top border"), { NULL }, NULL,
+    NC_("view-action", "Scroll to top border"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_FIRST, FALSE,
     NULL },
 
   { "view-scroll-bottom-border", NULL,
-    NC_("view-action", "Scroll to bottom border"), { NULL }, NULL,
+    NC_("view-action", "Scroll to bottom border"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_LAST, FALSE,
     NULL },
 
   { "view-scroll-up", NULL,
-    NC_("view-action", "Scroll up"), { NULL }, NULL,
+    NC_("view-action", "Scroll up"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_PREVIOUS, FALSE,
     NULL },
 
   { "view-scroll-down", NULL,
-    NC_("view-action", "Scroll down"), { NULL }, NULL,
+    NC_("view-action", "Scroll down"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_NEXT, FALSE,
     NULL },
 
   { "view-scroll-page-up", NULL,
-    NC_("view-action", "Scroll page up"), { NULL }, NULL,
+    NC_("view-action", "Scroll page up"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
     NULL },
 
   { "view-scroll-page-down", NULL,
-    NC_("view-action", "Scroll page down"), { NULL }, NULL,
+    NC_("view-action", "Scroll page down"), NULL, { NULL }, NULL,
     GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
     NULL }
 };
diff --git a/app/actions/windows-actions.c b/app/actions/windows-actions.c
index 9b9c05dca8..f6c3876564 100644
--- a/app/actions/windows-actions.c
+++ b/app/actions/windows-actions.c
@@ -106,13 +106,13 @@ static const GimpActionEntry windows_actions[] =
                                       "_Dockable Dialogs")      },
 
   { "windows-show-display-next", NULL,
-    NC_("windows-action", "Next Image"), { "<alt>Tab", "Forward", NULL },
+    NC_("windows-action", "Next Image"), NULL, { "<alt>Tab", "Forward", NULL },
     NC_("windows-action", "Switch to the next image"),
     windows_show_display_next_cmd_callback,
     NULL },
 
   { "windows-show-display-previous", NULL,
-    NC_("windows-action", "Previous Image"), { "<alt><shift>Tab", "Back", NULL },
+    NC_("windows-action", "Previous Image"), NULL, { "<alt><shift>Tab", "Back", NULL },
     NC_("windows-action", "Switch to the previous image"),
     windows_show_display_previous_cmd_callback,
     NULL },
@@ -124,21 +124,21 @@ static const GimpActionEntry windows_actions[] =
 static const GimpToggleActionEntry windows_toggle_actions[] =
 {
   { "windows-hide-docks", NULL,
-    NC_("windows-action", "_Hide Docks"), { "Tab", NULL },
+    NC_("windows-action", "_Hide Docks"), NULL, { "Tab", NULL },
     NC_("windows-action", "When enabled, docks and other dialogs are hidden, leaving only image windows."),
     windows_hide_docks_cmd_callback,
     FALSE,
     GIMP_HELP_WINDOWS_HIDE_DOCKS },
 
   { "windows-show-tabs", NULL,
-    NC_("windows-action", "_Show Tabs"), { NULL },
+    NC_("windows-action", "_Show Tabs"), NULL, { NULL },
     NC_("windows-action", "When enabled, the image tabs bar is shown."),
     windows_show_tabs_cmd_callback,
     TRUE,
     GIMP_HELP_WINDOWS_SHOW_TABS },
 
   { "windows-use-single-window-mode", NULL,
-    NC_("windows-action", "Single-Window _Mode"), { NULL },
+    NC_("windows-action", "Single-Window _Mode"), NULL, { NULL },
     NC_("windows-action", "When enabled, GIMP is in a single-window mode."),
     windows_use_single_window_mode_cmd_callback,
     TRUE,
@@ -148,22 +148,22 @@ static const GimpToggleActionEntry windows_toggle_actions[] =
 static const GimpRadioActionEntry windows_tabs_position_actions[] =
 {
   { "windows-tabs-position-top", GIMP_ICON_GO_TOP,
-    NC_("windows-tabs-position-action", "_Top"), { NULL },
+    NC_("windows-tabs-position-action", "_Top"), NULL, { NULL },
     NC_("windows-tabs-position-action", "Position the tabs on the top"),
     GIMP_POSITION_TOP, GIMP_HELP_WINDOWS_TABS_POSITION },
 
   { "windows-tabs-position-bottom", GIMP_ICON_GO_BOTTOM,
-    NC_("windows-tabs-position-action", "_Bottom"), { NULL },
+    NC_("windows-tabs-position-action", "_Bottom"), NULL, { NULL },
     NC_("windows-tabs-position-action", "Position the tabs on the bottom"),
     GIMP_POSITION_BOTTOM, GIMP_HELP_WINDOWS_TABS_POSITION },
 
   { "windows-tabs-position-left", GIMP_ICON_GO_FIRST,
-    NC_("windows-tabs-position-action", "_Left"), { NULL },
+    NC_("windows-tabs-position-action", "_Left"), NULL, { NULL },
     NC_("windows-tabs-position-action", "Position the tabs on the left"),
     GIMP_POSITION_LEFT, GIMP_HELP_WINDOWS_TABS_POSITION },
 
   { "windows-tabs-position-right", GIMP_ICON_GO_LAST,
-    NC_("windows-tabs-position-action", "_Right"), { NULL },
+    NC_("windows-tabs-position-action", "_Right"), NULL, { NULL },
     NC_("windows-tabs-position-action", "Position the tabs on the right"),
     GIMP_POSITION_RIGHT, GIMP_HELP_WINDOWS_TABS_POSITION },
 };
diff --git a/app/widgets/gimpactiongroup.c b/app/widgets/gimpactiongroup.c
index 1c78431bbf..0af377abde 100644
--- a/app/widgets/gimpactiongroup.c
+++ b/app/widgets/gimpactiongroup.c
@@ -469,7 +469,8 @@ gimp_action_group_add_actions (GimpActionGroup       *group,
     {
       GimpAction  *action;
       const gchar *label;
-      const gchar *tooltip = NULL;
+      const gchar *short_label = NULL;
+      const gchar *tooltip     = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
@@ -478,17 +479,25 @@ gimp_action_group_add_actions (GimpActionGroup       *group,
         {
           label = g_dpgettext2 (NULL, msg_context, entries[i].label);
 
+          if (entries[i].short_label)
+            short_label = g_dpgettext2 (NULL, msg_context, entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
         }
       else
         {
-          label   = gettext (entries[i].label);
+          label = gettext (entries[i].label);
+
+          if (entries[i].short_label)
+            short_label = gettext (entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = gettext (entries[i].tooltip);
         }
 
-      action = gimp_action_impl_new (entries[i].name, label, tooltip,
+      action = gimp_action_impl_new (entries[i].name,
+                                     label, short_label, tooltip,
                                      entries[i].icon_name,
                                      entries[i].help_id, context);
 
@@ -519,7 +528,8 @@ gimp_action_group_add_toggle_actions (GimpActionGroup             *group,
     {
       GimpAction  *action;
       const gchar *label;
-      const gchar *tooltip = NULL;
+      const gchar *short_label = NULL;
+      const gchar *tooltip     = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
@@ -528,17 +538,25 @@ gimp_action_group_add_toggle_actions (GimpActionGroup             *group,
         {
           label = g_dpgettext2 (NULL, msg_context, entries[i].label);
 
+          if (entries[i].short_label)
+            short_label = g_dpgettext2 (NULL, msg_context, entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
         }
       else
         {
-          label   = gettext (entries[i].label);
+          label = gettext (entries[i].label);
+
+          if (entries[i].short_label)
+            short_label = gettext (entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = gettext (entries[i].tooltip);
         }
 
-      action = gimp_toggle_action_new (entries[i].name, label, tooltip,
+      action = gimp_toggle_action_new (entries[i].name,
+                                       label, short_label, tooltip,
                                        entries[i].icon_name,
                                        entries[i].help_id, context);
 
@@ -576,7 +594,8 @@ gimp_action_group_add_radio_actions (GimpActionGroup            *group,
     {
       GimpAction  *action;
       const gchar *label;
-      const gchar *tooltip = NULL;
+      const gchar *short_label = NULL;
+      const gchar *tooltip     = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
@@ -585,17 +604,25 @@ gimp_action_group_add_radio_actions (GimpActionGroup            *group,
         {
           label = g_dpgettext2 (NULL, msg_context, entries[i].label);
 
+          if (entries[i].short_label)
+            short_label = g_dpgettext2 (NULL, msg_context, entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
         }
       else
         {
-          label   = gettext (entries[i].label);
+          label = gettext (entries[i].label);
+
+          if (entries[i].short_label)
+            short_label = gettext (entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = gettext (entries[i].tooltip);
         }
 
-      action = gimp_radio_action_new (entries[i].name, label, tooltip,
+      action = gimp_radio_action_new (entries[i].name,
+                                      label, short_label, tooltip,
                                       entries[i].icon_name,
                                       entries[i].help_id,
                                       entries[i].value, context);
@@ -638,7 +665,8 @@ gimp_action_group_add_enum_actions (GimpActionGroup           *group,
     {
       GimpEnumAction *action;
       const gchar    *label;
-      const gchar    *tooltip = NULL;
+      const gchar    *short_label = NULL;
+      const gchar    *tooltip     = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
@@ -647,17 +675,25 @@ gimp_action_group_add_enum_actions (GimpActionGroup           *group,
         {
           label = g_dpgettext2 (NULL, msg_context, entries[i].label);
 
+          if (entries[i].short_label)
+            short_label = g_dpgettext2 (NULL, msg_context, entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
         }
       else
         {
-          label   = gettext (entries[i].label);
+          label = gettext (entries[i].label);
+
+          if (entries[i].short_label)
+            short_label = gettext (entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = gettext (entries[i].tooltip);
         }
 
-      action = gimp_enum_action_new (entries[i].name, label, tooltip,
+      action = gimp_enum_action_new (entries[i].name,
+                                     label, short_label, tooltip,
                                      entries[i].icon_name,
                                      entries[i].help_id,
                                      entries[i].value,
@@ -743,7 +779,8 @@ gimp_action_group_add_double_actions (GimpActionGroup             *group,
     {
       GimpDoubleAction *action;
       const gchar      *label;
-      const gchar      *tooltip = NULL;
+      const gchar      *short_label = NULL;
+      const gchar      *tooltip     = NULL;
 
       if (! gimp_action_group_check_unique_action (group, entries[i].name))
         continue;
@@ -752,17 +789,25 @@ gimp_action_group_add_double_actions (GimpActionGroup             *group,
         {
           label = g_dpgettext2 (NULL, msg_context, entries[i].label);
 
+          if (entries[i].short_label)
+            short_label = g_dpgettext2 (NULL, msg_context, entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = g_dpgettext2 (NULL, msg_context, entries[i].tooltip);
         }
       else
         {
           label = gettext (entries[i].label);
+
+          if (entries[i].short_label)
+            short_label = gettext (entries[i].short_label);
+
           if (entries[i].tooltip)
             tooltip = gettext (entries[i].tooltip);
         }
 
-      action = gimp_double_action_new (entries[i].name, label, tooltip,
+      action = gimp_double_action_new (entries[i].name,
+                                       label, short_label, tooltip,
                                        entries[i].icon_name,
                                        entries[i].help_id,
                                        entries[i].value, context);
diff --git a/app/widgets/gimpactiongroup.h b/app/widgets/gimpactiongroup.h
index 8af1d720a3..97877341e4 100644
--- a/app/widgets/gimpactiongroup.h
+++ b/app/widgets/gimpactiongroup.h
@@ -65,6 +65,7 @@ struct _GimpActionEntry
   const gchar        *name;
   const gchar        *icon_name;
   const gchar        *label;
+  const gchar        *short_label;
   const gchar        *accelerator[4];
   const gchar        *tooltip;
   GimpActionCallback  callback;
@@ -77,6 +78,7 @@ struct _GimpToggleActionEntry
   const gchar        *name;
   const gchar        *icon_name;
   const gchar        *label;
+  const gchar        *short_label;
   const gchar        *accelerator[4];
   const gchar        *tooltip;
   GimpActionCallback  callback;
@@ -90,6 +92,7 @@ struct _GimpRadioActionEntry
   const gchar *name;
   const gchar *icon_name;
   const gchar *label;
+  const gchar *short_label;
   const gchar *accelerator[4];
   const gchar *tooltip;
   gint         value;
@@ -102,6 +105,7 @@ struct _GimpEnumActionEntry
   const gchar *name;
   const gchar *icon_name;
   const gchar *label;
+  const gchar *short_label;
   const gchar *accelerator[4];
   const gchar *tooltip;
   gint         value;
@@ -115,6 +119,7 @@ struct _GimpStringActionEntry
   const gchar *name;
   const gchar *icon_name;
   const gchar *label;
+  const gchar *short_label;
   const gchar *accelerator[4];
   const gchar *tooltip;
   const gchar *value;
@@ -127,6 +132,7 @@ struct _GimpDoubleActionEntry
   const gchar   *name;
   const gchar   *icon_name;
   const gchar   *label;
+  const gchar   *short_label;
   const gchar   *accelerator[4];
   const gchar   *tooltip;
   const gdouble  value;
diff --git a/app/widgets/gimpactionimpl.c b/app/widgets/gimpactionimpl.c
index 1db941e521..5713669bfe 100644
--- a/app/widgets/gimpactionimpl.c
+++ b/app/widgets/gimpactionimpl.c
@@ -358,6 +358,7 @@ gimp_action_impl_get_state_hint (GAction *action)
 GimpAction *
 gimp_action_impl_new (const gchar *name,
                       const gchar *label,
+                      const gchar *short_label,
                       const gchar *tooltip,
                       const gchar *icon_name,
                       const gchar *help_id,
@@ -366,11 +367,12 @@ gimp_action_impl_new (const gchar *name,
   GimpAction *action;
 
   action = g_object_new (GIMP_TYPE_ACTION_IMPL,
-                         "name",      name,
-                         "label",     label,
-                         "tooltip",   tooltip,
-                         "icon-name", icon_name,
-                         "context",   context,
+                         "name",        name,
+                         "label",       label,
+                         "short-label", short_label,
+                         "tooltip",     tooltip,
+                         "icon-name",   icon_name,
+                         "context",     context,
                          NULL);
 
   gimp_action_set_help_id (action, help_id);
diff --git a/app/widgets/gimpactionimpl.h b/app/widgets/gimpactionimpl.h
index a8dc53845d..729a93bbc9 100644
--- a/app/widgets/gimpactionimpl.h
+++ b/app/widgets/gimpactionimpl.h
@@ -54,6 +54,7 @@ GType         gimp_action_impl_get_type       (void) G_GNUC_CONST;
 
 GimpAction  * gimp_action_impl_new            (const gchar   *name,
                                                const gchar   *label,
+                                               const gchar   *short_label,
                                                const gchar   *tooltip,
                                                const gchar   *icon_name,
                                                const gchar   *help_id,
diff --git a/app/widgets/gimpdashboard.c b/app/widgets/gimpdashboard.c
index 208dcf63f1..ff9a718af0 100644
--- a/app/widgets/gimpdashboard.c
+++ b/app/widgets/gimpdashboard.c
@@ -1314,7 +1314,7 @@ gimp_dashboard_constructed (GObject *object)
     {
       const GroupInfo       *group_info = &groups[group];
       GroupData             *group_data = &priv->groups[group];
-      GimpToggleActionEntry  entry      = {};
+      GimpToggleActionEntry  entry      = { 0 };
 
       entry.name      = g_strdup_printf ("dashboard-group-%s", group_info->name);
       entry.label     = g_dpgettext2 (NULL, "dashboard-group", group_info->title);
diff --git a/app/widgets/gimpdoubleaction.c b/app/widgets/gimpdoubleaction.c
index 3ca85f02e3..c36cd91859 100644
--- a/app/widgets/gimpdoubleaction.c
+++ b/app/widgets/gimpdoubleaction.c
@@ -127,6 +127,7 @@ gimp_double_action_set_property (GObject      *object,
 GimpDoubleAction *
 gimp_double_action_new (const gchar *name,
                         const gchar *label,
+                        const gchar *short_label,
                         const gchar *tooltip,
                         const gchar *icon_name,
                         const gchar *help_id,
@@ -136,12 +137,13 @@ gimp_double_action_new (const gchar *name,
   GimpDoubleAction *action;
 
   action = g_object_new (GIMP_TYPE_DOUBLE_ACTION,
-                         "name",      name,
-                         "label",     label,
-                         "tooltip",   tooltip,
-                         "icon-name", icon_name,
-                         "value",     value,
-                         "context",   context,
+                         "name",        name,
+                         "label",       label,
+                         "short-label", short_label,
+                         "tooltip",     tooltip,
+                         "icon-name",   icon_name,
+                         "value",       value,
+                         "context",     context,
                          NULL);
 
   gimp_action_set_help_id (GIMP_ACTION (action), help_id);
diff --git a/app/widgets/gimpdoubleaction.h b/app/widgets/gimpdoubleaction.h
index 9458d3e527..ad5cd9e3b5 100644
--- a/app/widgets/gimpdoubleaction.h
+++ b/app/widgets/gimpdoubleaction.h
@@ -52,6 +52,7 @@ GType              gimp_double_action_get_type (void) G_GNUC_CONST;
 
 GimpDoubleAction * gimp_double_action_new      (const gchar *name,
                                                 const gchar *label,
+                                                const gchar *short_label,
                                                 const gchar *tooltip,
                                                 const gchar *icon_name,
                                                 const gchar *help_id,
diff --git a/app/widgets/gimpenumaction.c b/app/widgets/gimpenumaction.c
index e74b8777cb..16a6bb1f84 100644
--- a/app/widgets/gimpenumaction.c
+++ b/app/widgets/gimpenumaction.c
@@ -151,6 +151,7 @@ gimp_enum_action_set_property (GObject      *object,
 GimpEnumAction *
 gimp_enum_action_new (const gchar *name,
                       const gchar *label,
+                      const gchar *short_label,
                       const gchar *tooltip,
                       const gchar *icon_name,
                       const gchar *help_id,
@@ -163,6 +164,7 @@ gimp_enum_action_new (const gchar *name,
   action = g_object_new (GIMP_TYPE_ENUM_ACTION,
                          "name",           name,
                          "label",          label,
+                         "short-label",    short_label,
                          "tooltip",        tooltip,
                          "icon-name",      icon_name,
                          "value",          value,
diff --git a/app/widgets/gimpenumaction.h b/app/widgets/gimpenumaction.h
index 4d330d6fe4..db7de0ce6e 100644
--- a/app/widgets/gimpenumaction.h
+++ b/app/widgets/gimpenumaction.h
@@ -53,6 +53,7 @@ GType            gimp_enum_action_get_type (void) G_GNUC_CONST;
 
 GimpEnumAction * gimp_enum_action_new      (const gchar *name,
                                             const gchar *label,
+                                            const gchar *short_label,
                                             const gchar *tooltip,
                                             const gchar *icon_name,
                                             const gchar *help_id,
diff --git a/app/widgets/gimpradioaction.c b/app/widgets/gimpradioaction.c
index 3be10519fb..54351cd971 100644
--- a/app/widgets/gimpradioaction.c
+++ b/app/widgets/gimpradioaction.c
@@ -337,6 +337,7 @@ gimp_radio_action_toggle (GimpToggleAction *action)
 GimpAction *
 gimp_radio_action_new (const gchar *name,
                        const gchar *label,
+                       const gchar *short_label,
                        const gchar *tooltip,
                        const gchar *icon_name,
                        const gchar *help_id,
@@ -346,12 +347,13 @@ gimp_radio_action_new (const gchar *name,
   GimpAction *action;
 
   action = g_object_new (GIMP_TYPE_RADIO_ACTION,
-                         "name",      name,
-                         "label",     label,
-                         "tooltip",   tooltip,
-                         "icon-name", icon_name,
-                         "value",     value,
-                         "context",   context,
+                         "name",        name,
+                         "label",       label,
+                         "short-label", short_label,
+                         "tooltip",     tooltip,
+                         "icon-name",   icon_name,
+                         "value",       value,
+                         "context",     context,
                          NULL);
 
   gimp_action_set_help_id (action, help_id);
diff --git a/app/widgets/gimpradioaction.h b/app/widgets/gimpradioaction.h
index 4388d7c7d5..f8392c1350 100644
--- a/app/widgets/gimpradioaction.h
+++ b/app/widgets/gimpradioaction.h
@@ -54,6 +54,7 @@ GType         gimp_radio_action_get_type          (void) G_GNUC_CONST;
 
 GimpAction  * gimp_radio_action_new               (const gchar *name,
                                                    const gchar *label,
+                                                   const gchar *short_label,
                                                    const gchar *tooltip,
                                                    const gchar *icon_name,
                                                    const gchar *help_id,
diff --git a/app/widgets/gimptoggleaction.c b/app/widgets/gimptoggleaction.c
index 0633c62c60..da68b8babb 100644
--- a/app/widgets/gimptoggleaction.c
+++ b/app/widgets/gimptoggleaction.c
@@ -243,6 +243,7 @@ gimp_toggle_action_toggle (GimpToggleAction *action)
 GimpAction *
 gimp_toggle_action_new (const gchar *name,
                         const gchar *label,
+                        const gchar *short_label,
                         const gchar *tooltip,
                         const gchar *icon_name,
                         const gchar *help_id,
@@ -251,11 +252,12 @@ gimp_toggle_action_new (const gchar *name,
   GimpAction *action;
 
   action = g_object_new (GIMP_TYPE_TOGGLE_ACTION,
-                         "name",      name,
-                         "label",     label,
-                         "tooltip",   tooltip,
-                         "icon-name", icon_name,
-                         "context",   context,
+                         "name",        name,
+                         "label",       label,
+                         "short-label", short_label,
+                         "tooltip",     tooltip,
+                         "icon-name",   icon_name,
+                         "context",     context,
                          NULL);
 
   gimp_action_set_help_id (GIMP_ACTION (action), help_id);
diff --git a/app/widgets/gimptoggleaction.h b/app/widgets/gimptoggleaction.h
index 2c8fc686a1..b5fd4ea573 100644
--- a/app/widgets/gimptoggleaction.h
+++ b/app/widgets/gimptoggleaction.h
@@ -63,6 +63,7 @@ GType             gimp_toggle_action_get_type  (void) G_GNUC_CONST;
 
 GimpAction      * gimp_toggle_action_new       (const gchar *name,
                                                 const gchar *label,
+                                                const gchar *short_label,
                                                 const gchar *tooltip,
                                                 const gchar *icon_name,
                                                 const gchar *help_id,