diff --git a/ChangeLog b/ChangeLog
index e9ce5416d0..1a9975ad1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-04-29  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimp*tool.c (gimp_*_tool_register): stripped the menu
+	paths from the "menu_path". Will be renamed to "action_name" or
+	something soon...
+
+	* plug-ins/dbbrowser/dbbrowser.c
+	* plug-ins/common/plugindetails.c
+	* plug-ins/common/uniteditor.c: register under the new
+	"Extensions" placeholder.
+
 2004-04-29  Michael Natterer  <mitch@gimp.org>
 
 	Switch from GtkItemFactory to GtkUIManager. The migration is
diff --git a/app/paint/gimpink.c b/app/paint/gimpink.c
index 4277b73541..c7f076db2f 100644
--- a/app/paint/gimpink.c
+++ b/app/paint/gimpink.c
@@ -167,7 +167,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-ink-tool",
                 _("Ink"),
                 _("Draw in ink"),
-                N_("/Tools/Paint Tools/In_k"), "K",
+                N_("In_k"), "K",
                 NULL, GIMP_HELP_TOOL_INK,
                 GIMP_STOCK_TOOL_INK,
                 data);
diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c
index f3ee3def4c..ccd8d76b59 100644
--- a/app/tools/gimpairbrushtool.c
+++ b/app/tools/gimpairbrushtool.c
@@ -55,7 +55,7 @@ gimp_airbrush_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-airbrush-tool",
                 _("Airbrush"),
                 _("Airbrush with variable pressure"),
-                N_("/Tools/Paint Tools/_Airbrush"), "A",
+                N_("_Airbrush"), "A",
                 NULL, GIMP_HELP_TOOL_AIRBRUSH,
                 GIMP_STOCK_TOOL_AIRBRUSH,
                 data);
diff --git a/app/tools/gimpblendtool.c b/app/tools/gimpblendtool.c
index d434a51f04..0c8eedcbc2 100644
--- a/app/tools/gimpblendtool.c
+++ b/app/tools/gimpblendtool.c
@@ -97,7 +97,7 @@ gimp_blend_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-blend-tool",
                 _("Blend"),
                 _("Fill with a color gradient"),
-                N_("/Tools/Paint Tools/Blen_d"), "L",
+                N_("Blen_d"), "L",
                 NULL, GIMP_HELP_TOOL_BLEND,
                 GIMP_STOCK_TOOL_BLEND,
                 data);
diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c
index df714112d5..72539f60cc 100644
--- a/app/tools/gimpbrightnesscontrasttool.c
+++ b/app/tools/gimpbrightnesscontrasttool.c
@@ -84,7 +84,7 @@ gimp_brightness_contrast_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-brightness-contrast-tool",
                 _("Brightness-Contrast"),
                 _("Adjust brightness and contrast"),
-                N_("/Tools/Color Tools/B_rightness-Contrast..."), NULL,
+                N_("B_rightness-Contrast..."), NULL,
                 NULL, GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST,
                 GIMP_STOCK_TOOL_BRIGHTNESS_CONTRAST,
                 data);
diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c
index 305d0c2c43..35efd2b73e 100644
--- a/app/tools/gimpbucketfilltool.c
+++ b/app/tools/gimpbucketfilltool.c
@@ -88,7 +88,7 @@ gimp_bucket_fill_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-bucket-fill-tool",
                 _("Bucket Fill"),
                 _("Fill with a color or pattern"),
-                N_("/Tools/Paint Tools/_Bucket Fill"), "<shift>B",
+                N_("_Bucket Fill"), "<shift>B",
                 NULL, GIMP_HELP_TOOL_BUCKET_FILL,
                 GIMP_STOCK_TOOL_BUCKET_FILL,
                 data);
diff --git a/app/tools/gimpbycolorselecttool.c b/app/tools/gimpbycolorselecttool.c
index 7b78b94e41..4f857b0b29 100644
--- a/app/tools/gimpbycolorselecttool.c
+++ b/app/tools/gimpbycolorselecttool.c
@@ -81,7 +81,7 @@ gimp_by_color_select_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-by-color-select-tool",
                 _("Select By Color"),
                 _("Select regions by color"),
-                N_("/Tools/Selection Tools/_By Color Select"), NULL,
+                N_("_By Color Select"), NULL,
                 NULL, GIMP_HELP_TOOL_BY_COLOR_SELECT,
                 GIMP_STOCK_TOOL_BY_COLOR_SELECT,
                 data);
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index a10dd161b6..77cefa1751 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -100,7 +100,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-clone-tool",
                 _("Clone"),
                 _("Paint using Patterns or Image Regions"),
-                N_("/Tools/Paint Tools/_Clone"), "C",
+                N_("_Clone"), "C",
                 NULL, GIMP_HELP_TOOL_CLONE,
                 GIMP_STOCK_TOOL_CLONE,
                 data);
diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c
index 4c0054344d..4647aa5710 100644
--- a/app/tools/gimpcolorbalancetool.c
+++ b/app/tools/gimpcolorbalancetool.c
@@ -95,7 +95,7 @@ gimp_color_balance_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-color-balance-tool",
                 _("Color Balance"),
                 _("Adjust color balance"),
-                N_("/Tools/Color Tools/Color _Balance..."), NULL,
+                N_("Color _Balance..."), NULL,
                 NULL, GIMP_HELP_TOOL_COLOR_BALANCE,
                 GIMP_STOCK_TOOL_COLOR_BALANCE,
                 data);
diff --git a/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c
index af9232a777..298042761e 100644
--- a/app/tools/gimpcolorizetool.c
+++ b/app/tools/gimpcolorizetool.c
@@ -95,7 +95,7 @@ gimp_colorize_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-colorize-tool",
                 _("Colorize"),
                 _("Colorize the image"),
-                N_("/Tools/Color Tools/Colori_ze..."), NULL,
+                N_("Colori_ze..."), NULL,
                 NULL, GIMP_HELP_TOOL_COLORIZE,
                 GIMP_STOCK_TOOL_COLORIZE,
                 data);
diff --git a/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index 1e35db9f6a..7dd383f64e 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -96,7 +96,7 @@ gimp_color_picker_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-color-picker-tool",
                 _("Color Picker"),
                 _("Pick colors from the image"),
-                N_("/Tools/C_olor Picker"), "O",
+                N_("C_olor Picker"), "O",
                 NULL, GIMP_HELP_TOOL_COLOR_PICKER,
                 GIMP_STOCK_TOOL_COLOR_PICKER,
                 data);
diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c
index a2ac8652dd..1ba669fc5a 100644
--- a/app/tools/gimpconvolvetool.c
+++ b/app/tools/gimpconvolvetool.c
@@ -89,7 +89,7 @@ gimp_convolve_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-convolve-tool",
                 _("Convolve"),
                 _("Blur or Sharpen"),
-                N_("/Tools/Paint Tools/Con_volve"), "V",
+                N_("Con_volve"), "V",
                 NULL, GIMP_HELP_TOOL_CONVOLVE,
                 GIMP_STOCK_TOOL_BLUR,
                 data);
diff --git a/app/tools/gimpcroptool.c b/app/tools/gimpcroptool.c
index c68b262507..d705b3a1c1 100644
--- a/app/tools/gimpcroptool.c
+++ b/app/tools/gimpcroptool.c
@@ -161,7 +161,7 @@ gimp_crop_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-crop-tool",
                 _("Crop & Resize"),
                 _("Crop or Resize an image"),
-                N_("/Tools/Transform Tools/_Crop & Resize"), "<shift>C",
+                N_("_Crop & Resize"), "<shift>C",
                 NULL, GIMP_HELP_TOOL_CROP,
                 GIMP_STOCK_TOOL_CROP,
                 data);
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index bfef22635d..19fbe5bdd9 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -140,7 +140,7 @@ gimp_curves_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-curves-tool",
                 _("Curves"),
                 _("Adjust color curves"),
-                N_("/Tools/Color Tools/_Curves..."), NULL,
+                N_("_Curves..."), NULL,
                 NULL, GIMP_HELP_TOOL_CURVES,
                 GIMP_STOCK_TOOL_CURVES,
                 data);
diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c
index 1d2e84af6e..88be20cc92 100644
--- a/app/tools/gimpdodgeburntool.c
+++ b/app/tools/gimpdodgeburntool.c
@@ -69,7 +69,7 @@ gimp_dodge_burn_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-dodge-burn-tool",
                 _("Dodge/Burn"),
                 _("Dodge or Burn strokes"),
-                N_("/Tools/Paint Tools/Dod_geBurn"), "<shift>D",
+                N_("Dod_geBurn"), "<shift>D",
                 NULL, GIMP_HELP_TOOL_DODGE_BURN,
                 GIMP_STOCK_TOOL_DODGE,
                 data);
diff --git a/app/tools/gimpellipseselecttool.c b/app/tools/gimpellipseselecttool.c
index 36ec745759..048e2f8566 100644
--- a/app/tools/gimpellipseselecttool.c
+++ b/app/tools/gimpellipseselecttool.c
@@ -70,7 +70,7 @@ gimp_ellipse_select_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-ellipse-select-tool",
                 _("Ellipse Select"),
                 _("Select elliptical regions"),
-                N_("/Tools/Selection Tools/_Ellipse Select"), "E",
+                N_("_Ellipse Select"), "E",
                 NULL, GIMP_HELP_TOOL_ELLIPSE_SELECT,
                 GIMP_STOCK_TOOL_ELLIPSE_SELECT,
                 data);
diff --git a/app/tools/gimperasertool.c b/app/tools/gimperasertool.c
index 73b29458f6..3c9bc4b212 100644
--- a/app/tools/gimperasertool.c
+++ b/app/tools/gimperasertool.c
@@ -69,7 +69,7 @@ gimp_eraser_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-eraser-tool",
                 _("Eraser"),
                 _("Erase to background or transparency"),
-                N_("/Tools/Paint Tools/_Eraser"), "<shift>E",
+                N_("_Eraser"), "<shift>E",
                 NULL, GIMP_HELP_TOOL_ERASER,
                 GIMP_STOCK_TOOL_ERASER,
                 data);
diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c
index 3c39382dc2..9cbc5f0a80 100644
--- a/app/tools/gimpfliptool.c
+++ b/app/tools/gimpfliptool.c
@@ -83,7 +83,7 @@ gimp_flip_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-flip-tool",
                 _("Flip"),
                 _("Flip the layer or selection"),
-                N_("/Tools/Transform Tools/_Flip"), "<shift>F",
+                N_("_Flip"), "<shift>F",
                 NULL, GIMP_HELP_TOOL_FLIP,
                 GIMP_STOCK_TOOL_FLIP,
                 data);
diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c
index f4e1afce5d..1d1d40a14e 100644
--- a/app/tools/gimpfreeselecttool.c
+++ b/app/tools/gimpfreeselecttool.c
@@ -96,7 +96,7 @@ gimp_free_select_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-free-select-tool",
                 _("Free Select"),
                 _("Select hand-drawn regions"),
-                N_("/Tools/Selection Tools/_Free Select"), "F",
+                N_("_Free Select"), "F",
                 NULL, GIMP_HELP_TOOL_FREE_SELECT,
                 GIMP_STOCK_TOOL_FREE_SELECT,
                 data);
diff --git a/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c
index 3c80d6ed46..df8b147338 100644
--- a/app/tools/gimphuesaturationtool.c
+++ b/app/tools/gimphuesaturationtool.c
@@ -109,7 +109,7 @@ gimp_hue_saturation_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-hue-saturation-tool",
                 _("Hue-Saturation"),
                 _("Adjust hue and saturation"),
-                N_("/Tools/Color Tools/Hue-_Saturation..."), NULL,
+                N_("Hue-_Saturation..."), NULL,
                 NULL, GIMP_HELP_TOOL_HUE_SATURATION,
                 GIMP_STOCK_TOOL_HUE_SATURATION,
                 data);
diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c
index 4277b73541..c7f076db2f 100644
--- a/app/tools/gimpinktool.c
+++ b/app/tools/gimpinktool.c
@@ -167,7 +167,7 @@ gimp_ink_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-ink-tool",
                 _("Ink"),
                 _("Draw in ink"),
-                N_("/Tools/Paint Tools/In_k"), "K",
+                N_("In_k"), "K",
                 NULL, GIMP_HELP_TOOL_INK,
                 GIMP_STOCK_TOOL_INK,
                 data);
diff --git a/app/tools/gimpiscissorstool.c b/app/tools/gimpiscissorstool.c
index bf17afcf3a..607067f374 100644
--- a/app/tools/gimpiscissorstool.c
+++ b/app/tools/gimpiscissorstool.c
@@ -277,7 +277,7 @@ gimp_iscissors_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-iscissors-tool",
                 _("Scissors"),
                 _("Select shapes from image"),
-                N_("/Tools/Selection Tools/_Intelligent Scissors"),
+                N_("_Intelligent Scissors"),
                 "I",
                 NULL, GIMP_HELP_TOOL_ISCISSORS,
                 GIMP_STOCK_TOOL_ISCISSORS,
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 9472886720..e4f5fd78b5 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -158,7 +158,7 @@ gimp_levels_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-levels-tool",
                 _("Levels"),
                 _("Adjust color levels"),
-                N_("/Tools/Color Tools/_Levels..."), NULL,
+                N_("_Levels..."), NULL,
                 NULL, GIMP_HELP_TOOL_LEVELS,
                 GIMP_STOCK_TOOL_LEVELS,
                 data);
diff --git a/app/tools/gimpmagnifytool.c b/app/tools/gimpmagnifytool.c
index 93f13f8858..bba94a9f7b 100644
--- a/app/tools/gimpmagnifytool.c
+++ b/app/tools/gimpmagnifytool.c
@@ -94,7 +94,7 @@ gimp_magnify_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-magnify-tool",
                 _("Magnify"),
                 _("Zoom in & out"),
-                N_("/Tools/M_agnify"), NULL,
+                N_("M_agnify"), NULL,
                 NULL, GIMP_HELP_TOOL_ZOOM,
                 GIMP_STOCK_TOOL_ZOOM,
                 data);
diff --git a/app/tools/gimpmeasuretool.c b/app/tools/gimpmeasuretool.c
index 2ecac21833..760a6a93f2 100644
--- a/app/tools/gimpmeasuretool.c
+++ b/app/tools/gimpmeasuretool.c
@@ -112,7 +112,7 @@ gimp_measure_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-measure-tool",
                 _("Measure"),
                 _("Measure distances and angles"),
-                N_("/Tools/_Measure"), NULL,
+                N_("_Measure"), NULL,
                 NULL, GIMP_HELP_TOOL_MEASURE,
                 GIMP_STOCK_TOOL_MEASURE,
                 data);
diff --git a/app/tools/gimpmovetool.c b/app/tools/gimpmovetool.c
index 706a0fea59..bcdd6af6b5 100644
--- a/app/tools/gimpmovetool.c
+++ b/app/tools/gimpmovetool.c
@@ -108,7 +108,7 @@ gimp_move_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-move-tool",
                 _("Move"),
                 _("Move layers & selections"),
-                N_("/Tools/Transform Tools/_Move"), "M",
+                N_("_Move"), "M",
                 NULL, GIMP_HELP_TOOL_MOVE,
                 GIMP_STOCK_TOOL_MOVE,
                 data);
diff --git a/app/tools/gimppaintbrushtool.c b/app/tools/gimppaintbrushtool.c
index 00118c01fc..100f16802a 100644
--- a/app/tools/gimppaintbrushtool.c
+++ b/app/tools/gimppaintbrushtool.c
@@ -52,7 +52,7 @@ gimp_paintbrush_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-paintbrush-tool",
                 _("Paintbrush"),
                 _("Paint fuzzy brush strokes"),
-                N_("/Tools/Paint Tools/_Paintbrush"), "P",
+                N_("_Paintbrush"), "P",
                 NULL, GIMP_HELP_TOOL_PAINTBRUSH,
                 GIMP_STOCK_TOOL_PAINTBRUSH,
                 data);
diff --git a/app/tools/gimppenciltool.c b/app/tools/gimppenciltool.c
index 1c05d4d3c3..a063a3c02b 100644
--- a/app/tools/gimppenciltool.c
+++ b/app/tools/gimppenciltool.c
@@ -51,7 +51,7 @@ gimp_pencil_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-pencil-tool",
                 _("Pencil"),
                 _("Paint hard edged pixels"),
-                N_("/Tools/Paint Tools/Pe_ncil"), "N",
+                N_("Pe_ncil"), "N",
                 NULL, GIMP_HELP_TOOL_PENCIL,
                 GIMP_STOCK_TOOL_PENCIL,
                 data);
diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c
index 4737378000..80d58f72b5 100644
--- a/app/tools/gimpperspectivetool.c
+++ b/app/tools/gimpperspectivetool.c
@@ -82,7 +82,7 @@ gimp_perspective_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-perspective-tool",
                 _("Perspective"),
                 _("Change perspective of the layer or selection"),
-                N_("/Tools/Transform Tools/_Perspective"), "<shift>P",
+                N_("_Perspective"), "<shift>P",
                 NULL, GIMP_HELP_TOOL_PERSPECTIVE,
                 GIMP_STOCK_TOOL_PERSPECTIVE,
                 data);
diff --git a/app/tools/gimpposterizetool.c b/app/tools/gimpposterizetool.c
index 39ae9a785b..e78415b09f 100644
--- a/app/tools/gimpposterizetool.c
+++ b/app/tools/gimpposterizetool.c
@@ -77,7 +77,7 @@ gimp_posterize_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-posterize-tool",
                 _("Posterize"),
                 _("Reduce image to a fixed number of colors"),
-                N_("/Tools/Color Tools/_Posterize..."), NULL,
+                N_("_Posterize..."), NULL,
                 NULL, GIMP_HELP_TOOL_POSTERIZE,
                 GIMP_STOCK_TOOL_POSTERIZE,
                 data);
diff --git a/app/tools/gimprectselecttool.c b/app/tools/gimprectselecttool.c
index bc5e3f1a86..70e5129a55 100644
--- a/app/tools/gimprectselecttool.c
+++ b/app/tools/gimprectselecttool.c
@@ -97,7 +97,7 @@ gimp_rect_select_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-rect-select-tool",
                 _("Rect Select"),
                 _("Select rectangular regions"),
-                N_("/Tools/Selection Tools/_Rect Select"), "R",
+                N_("_Rect Select"), "R",
                 NULL, GIMP_HELP_TOOL_RECT_SELECT,
                 GIMP_STOCK_TOOL_RECT_SELECT,
                 data);
diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c
index 25f729d04c..2f1f09e19a 100644
--- a/app/tools/gimprotatetool.c
+++ b/app/tools/gimprotatetool.c
@@ -102,7 +102,7 @@ gimp_rotate_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-rotate-tool",
                 _("Rotate"),
                 _("Rotate the layer or selection"),
-                N_("/Tools/Transform Tools/_Rotate"), "<shift>R",
+                N_("_Rotate"), "<shift>R",
                 NULL, GIMP_HELP_TOOL_ROTATE,
                 GIMP_STOCK_TOOL_ROTATE,
                 data);
diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c
index 5ccb3fc160..c825808fa3 100644
--- a/app/tools/gimpscaletool.c
+++ b/app/tools/gimpscaletool.c
@@ -98,7 +98,7 @@ gimp_scale_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-scale-tool",
                 _("Scale"),
                 _("Scale the layer or selection"),
-                N_("/Tools/Transform Tools/_Scale"), "<shift>T",
+                N_("_Scale"), "<shift>T",
                 NULL, GIMP_HELP_TOOL_SCALE,
                 GIMP_STOCK_TOOL_SCALE,
                 data);
diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c
index 3700b47587..b95dc04e7d 100644
--- a/app/tools/gimpsheartool.c
+++ b/app/tools/gimpsheartool.c
@@ -99,7 +99,7 @@ gimp_shear_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-shear-tool",
                 _("Shear"),
                 _("Shear the layer or selection"),
-                N_("/Tools/Transform Tools/S_hear"), "<shift>S",
+                N_("S_hear"), "<shift>S",
                 NULL, GIMP_HELP_TOOL_SHEAR,
                 GIMP_STOCK_TOOL_SHEAR,
                 data);
diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c
index 3b7cb55efa..70f23e8fc9 100644
--- a/app/tools/gimpsmudgetool.c
+++ b/app/tools/gimpsmudgetool.c
@@ -55,7 +55,7 @@ gimp_smudge_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-smudge-tool",
                 _("Smudge"),
                 _("Smudge image"),
-                N_("/Tools/Paint Tools/_Smudge"), "S",
+                N_("_Smudge"), "S",
                 NULL, GIMP_HELP_TOOL_SMUDGE,
                 GIMP_STOCK_TOOL_SMUDGE,
                 data);
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index a10dd161b6..77cefa1751 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -100,7 +100,7 @@ gimp_clone_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-clone-tool",
                 _("Clone"),
                 _("Paint using Patterns or Image Regions"),
-                N_("/Tools/Paint Tools/_Clone"), "C",
+                N_("_Clone"), "C",
                 NULL, GIMP_HELP_TOOL_CLONE,
                 GIMP_STOCK_TOOL_CLONE,
                 data);
diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index fdb9a75240..c427f5a322 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -140,7 +140,7 @@ gimp_text_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-text-tool",
                 _("Text"),
                 _("Add text to the image"),
-                N_("/Tools/Te_xt"), "T",
+                N_("Te_xt"), "T",
                 NULL, GIMP_HELP_TOOL_TEXT,
                 GIMP_STOCK_TOOL_TEXT,
                 data);
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
index 1d07785851..b46b4436b3 100644
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@@ -91,7 +91,7 @@ gimp_threshold_tool_register (GimpToolRegisterCallback  callback,
                 "gimp-threshold-tool",
                 _("Threshold"),
                 _("Reduce image to two colors using a threshold"),
-                N_("/Tools/Color Tools/_Threshold..."), NULL,
+                N_("_Threshold..."), NULL,
                 NULL, GIMP_HELP_TOOL_THRESHOLD,
                 GIMP_STOCK_TOOL_THRESHOLD,
                 data);
diff --git a/app/tools/gimpvectortool.c b/app/tools/gimpvectortool.c
index 834ee60607..ab1ceb5cdf 100644
--- a/app/tools/gimpvectortool.c
+++ b/app/tools/gimpvectortool.c
@@ -157,7 +157,7 @@ gimp_vector_tool_register (GimpToolRegisterCallback callback,
                 "gimp-vector-tool",
                 _("Paths"),
                 _("Create and edit paths"),
-                N_("/Tools/_Paths"), "b",
+                N_("_Paths"), "b",
                 NULL, GIMP_HELP_TOOL_PATH,
                 GIMP_STOCK_TOOL_PATH,
                 data);
diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c
index da368aad94..4dee9a62c1 100644
--- a/plug-ins/common/plugin-browser.c
+++ b/plug-ins/common/plugin-browser.c
@@ -150,7 +150,7 @@ query (void)
                           "Andy Thomas",
                           "Andy Thomas",
                           "1999",
-                          N_("<Toolbox>/Xtns/_Plugin Details"),
+                          N_("<Toolbox>/Xtns/Extensions/_Plugin Details"),
                           "",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
diff --git a/plug-ins/common/plugindetails.c b/plug-ins/common/plugindetails.c
index da368aad94..4dee9a62c1 100644
--- a/plug-ins/common/plugindetails.c
+++ b/plug-ins/common/plugindetails.c
@@ -150,7 +150,7 @@ query (void)
                           "Andy Thomas",
                           "Andy Thomas",
                           "1999",
-                          N_("<Toolbox>/Xtns/_Plugin Details"),
+                          N_("<Toolbox>/Xtns/Extensions/_Plugin Details"),
                           "",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c
index e4f61824d7..533fa3bf33 100644
--- a/plug-ins/common/procedure-browser.c
+++ b/plug-ins/common/procedure-browser.c
@@ -86,7 +86,7 @@ query (void)
                           "Thomas Noel",
                           "Thomas Noel",
                           "23th june 1997",
-                          N_("<Toolbox>/Xtns/_DB Browser"),
+                          N_("<Toolbox>/Xtns/Extensions/_DB Browser"),
                           "",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
diff --git a/plug-ins/common/uniteditor.c b/plug-ins/common/uniteditor.c
index cd485b5728..ca8595b478 100644
--- a/plug-ins/common/uniteditor.c
+++ b/plug-ins/common/uniteditor.c
@@ -114,7 +114,7 @@ query (void)
                           "Michael Natterer <mitch@gimp.org>",
                           "Michael Natterer <mitch@gimp.org>",
                           "2000",
-			  N_("<Toolbox>/Xtns/_Unit Editor"),
+			  N_("<Toolbox>/Xtns/Extensions/_Unit Editor"),
 			  "",
                           GIMP_PLUGIN,
 			  G_N_ELEMENTS (args), 0,
diff --git a/plug-ins/dbbrowser/dbbrowser.c b/plug-ins/dbbrowser/dbbrowser.c
index e4f61824d7..533fa3bf33 100644
--- a/plug-ins/dbbrowser/dbbrowser.c
+++ b/plug-ins/dbbrowser/dbbrowser.c
@@ -86,7 +86,7 @@ query (void)
                           "Thomas Noel",
                           "Thomas Noel",
                           "23th june 1997",
-                          N_("<Toolbox>/Xtns/_DB Browser"),
+                          N_("<Toolbox>/Xtns/Extensions/_DB Browser"),
                           "",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
diff --git a/plug-ins/dbbrowser/plugin-browser.c b/plug-ins/dbbrowser/plugin-browser.c
index da368aad94..4dee9a62c1 100644
--- a/plug-ins/dbbrowser/plugin-browser.c
+++ b/plug-ins/dbbrowser/plugin-browser.c
@@ -150,7 +150,7 @@ query (void)
                           "Andy Thomas",
                           "Andy Thomas",
                           "1999",
-                          N_("<Toolbox>/Xtns/_Plugin Details"),
+                          N_("<Toolbox>/Xtns/Extensions/_Plugin Details"),
                           "",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,
diff --git a/plug-ins/dbbrowser/procedure-browser.c b/plug-ins/dbbrowser/procedure-browser.c
index e4f61824d7..533fa3bf33 100644
--- a/plug-ins/dbbrowser/procedure-browser.c
+++ b/plug-ins/dbbrowser/procedure-browser.c
@@ -86,7 +86,7 @@ query (void)
                           "Thomas Noel",
                           "Thomas Noel",
                           "23th june 1997",
-                          N_("<Toolbox>/Xtns/_DB Browser"),
+                          N_("<Toolbox>/Xtns/Extensions/_DB Browser"),
                           "",
                           GIMP_PLUGIN,
                           G_N_ELEMENTS (args), 0,