--- a/src/Gimpmain.c
+++ b/src/Gimpmain.c
@@ -48,6 +48,7 @@
 #define PARASITE_KEY     "panoplugin-options"
 
 /* These are defined for translation only */
+/* Remember not to translate <image> */
 #define TR_PANTOOLS N_("<Image>/Filters/Panorama Tools")
 #define TR_PANCTRLS N_("<Image>/Filters/Pan Controls")
 
@@ -105,182 +106,169 @@
 			  AUTHOR,
 			  LONGVERSION,
 			  VERSION,
-			  N_("Correct"),
-			  "RGB",
-			  GIMP_PLUGIN,
-			  G_N_ELEMENTS (params),
-			  G_N_ELEMENTS (return_vals), 
-			  params, 
-			  return_vals);
-  gimp_plugin_menu_register ("plug_in_correct", "<Image>/Filters/Panorama Tools");
+			  N_("<Image>/Filters/Panorama Tools/Correct"),
+			  "RGB",
+			  GIMP_PLUGIN,
+			  G_N_ELEMENTS (params),
+			  G_N_ELEMENTS (return_vals), 
+			  params, 
+			  return_vals);
   gimp_install_procedure ("plug_in_perspect", 
 			  "Software Shift Lens", 
 			  "",
 			  AUTHOR, 
 			  LONGVERSION, 
 			  VERSION, 
-			  N_("Perspective"),
+			  N_("<Image>/Filters/Panorama Tools/Perspective"),
 			  "RGB", 
 			  GIMP_PLUGIN, 
 			  G_N_ELEMENTS (params),
 			  G_N_ELEMENTS (return_vals), 
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_perspect", "<Image>/Filters/Panorama Tools");
   gimp_install_procedure ("plug_in_remap", 
 			  "Change Projection", 
 			  "", 
 			  AUTHOR,
 			  LONGVERSION, 
 			  VERSION, 
-			  N_("Remap"), 
+			  N_("<Image>/Filters/Panorama Tools/Remap"),
 			  "RGB",
 			  GIMP_PLUGIN, 
 			  G_N_ELEMENTS (params),
 			  G_N_ELEMENTS (return_vals), 
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_remap", "<Image>/Filters/Panorama Tools");
   gimp_install_procedure ("plug_in_adjust",
 			  "Insert/Extract Image into/from Panorama", 
 			  "",
 			  AUTHOR, 
 			  LONGVERSION, 
 			  VERSION, 
-			  N_("Adjust"), 
+			  N_("<Image>/Filters/Panorama Tools/Adjust"),
 			  "RGB",
 			  GIMP_PLUGIN, 
 			  G_N_ELEMENTS (params),
 			  G_N_ELEMENTS (return_vals), 
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_adjust", "<Image>/Filters/Panorama Tools");
   gimp_install_procedure ("plug_in_right", 
 			  "Pan", 
 			  "", 
 			  AUTHOR, 
 			  LONGVERSION,
 			  VERSION, 
-			  N_("Move Right"), 
+			  N_("<Image>/Filters/Pan Controls/Move Right"),
 			  "RGB", 
 			  GIMP_PLUGIN,
 			  G_N_ELEMENTS (params), 
 			  G_N_ELEMENTS (return_vals),
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_right", "<Image>/Filters/Pan Controls");
   gimp_install_procedure ("plug_in_left",
 			  "Pan",
 			  "",
 			  AUTHOR,
 			  LONGVERSION,
 			  VERSION,
-			  N_("Move Left"),
-			  "RGB",
-			  GIMP_PLUGIN,
-			  G_N_ELEMENTS (params),
-			  G_N_ELEMENTS (return_vals), 
-			  params, 
-			  return_vals);
-  gimp_plugin_menu_register ("plug_in_left", "<Image>/Filters/Pan Controls");
+			  N_("<Image>/Filters/Pan Controls/Move Left"),
+			  "RGB",
+			  GIMP_PLUGIN,
+			  G_N_ELEMENTS (params),
+			  G_N_ELEMENTS (return_vals), 
+			  params, 
+			  return_vals);
   gimp_install_procedure ("plug_in_up",
 			  "Pan",
 			  "",
 			  AUTHOR,
 			  LONGVERSION,
 			  VERSION,
-			  N_("Tilt Up"),
-			  "RGB",
-			  GIMP_PLUGIN,
-			  G_N_ELEMENTS (params),
-			  G_N_ELEMENTS (return_vals), 
-			  params, 
-			  return_vals);
-  gimp_plugin_menu_register ("plug_in_up", "<Image>/Filters/Pan Controls");
+			  N_("<Image>/Filters/Pan Controls/Tilt Up"),
+			  "RGB",
+			  GIMP_PLUGIN,
+			  G_N_ELEMENTS (params),
+			  G_N_ELEMENTS (return_vals), 
+			  params, 
+			  return_vals);
   gimp_install_procedure ("plug_in_down",
 			  "Pan",
 			  "",
 			  AUTHOR,
 			  LONGVERSION,
 			  VERSION,
-			  N_("Tilt Down"),
-			  "RGB",
-			  GIMP_PLUGIN,
-			  G_N_ELEMENTS (params),
-			  G_N_ELEMENTS (return_vals), 
-			  params, 
-			  return_vals);
-  gimp_plugin_menu_register ("plug_in_down", "<Image>/Filters/Pan Controls");
+			  N_("<Image>/Filters/Pan Controls/Tilt Down"),
+			  "RGB",
+			  GIMP_PLUGIN,
+			  G_N_ELEMENTS (params),
+			  G_N_ELEMENTS (return_vals), 
+			  params, 
+			  return_vals);
   gimp_install_procedure ("plug_in_zoomin",
 			  "Pan",
 			  "",
 			  AUTHOR,
 			  LONGVERSION,
 			  VERSION,
-			  N_("Zoom In"),
-			  "RGB",
-			  GIMP_PLUGIN,
-			  G_N_ELEMENTS (params),
-			  G_N_ELEMENTS (return_vals), 
-			  params, 
-			  return_vals);
-  gimp_plugin_menu_register ("plug_in_zoomin", "<Image>/Filters/Pan Controls");
+			  N_("<Image>/Filters/Pan Controls/Zoom In"),
+			  "RGB",
+			  GIMP_PLUGIN,
+			  G_N_ELEMENTS (params),
+			  G_N_ELEMENTS (return_vals), 
+			  params, 
+			  return_vals);
   gimp_install_procedure ("plug_in_zoomout", 
 			  "Pan", 
 			  "", 
 			  AUTHOR, 
 			  LONGVERSION,
 			  VERSION, 
-			  N_("Zoom Out"), 
+			  N_("<Image>/Filters/Pan Controls/Zoom Out"),
 			  "RGB", 
 			  GIMP_PLUGIN,
 			  G_N_ELEMENTS (params), 
 			  G_N_ELEMENTS (return_vals),
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_zoomout", "<Image>/Filters/Pan Controls");
   gimp_install_procedure ("plug_in_apply", 
 			  "Pan", 
 			  "", 
 			  AUTHOR, 
 			  LONGVERSION,
 			  VERSION, 
-			  N_("Apply Changes"), 
+			  N_("<Image>/Filters/Pan Controls/Apply Changes"),
 			  "RGB", 
 			  GIMP_PLUGIN,
 			  G_N_ELEMENTS (params), 
 			  G_N_ELEMENTS (return_vals),
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_apply", "<Image>/Filters/Pan Controls");
   gimp_install_procedure ("plug_in_getpano",
 			  "Pan",
 			  "",
 			  AUTHOR,
 			  LONGVERSION,
 			  VERSION,
-			  N_("Get Panorama"),
-			  "RGB",
-			  GIMP_PLUGIN,
-			  G_N_ELEMENTS (params),
-			  G_N_ELEMENTS (return_vals), 
-			  params, 
-			  return_vals);
-  gimp_plugin_menu_register ("plug_in_getpano", "<Image>/Filters/Pan Controls");
+			  N_("<Image>/Filters/Pan Controls/Get Panorama"),
+			  "RGB",
+			  GIMP_PLUGIN,
+			  G_N_ELEMENTS (params),
+			  G_N_ELEMENTS (return_vals), 
+			  params, 
+			  return_vals);
   gimp_install_procedure ("plug_in_increment", 
 			  "Pan", 
 			  "", 
 			  AUTHOR, 
 			  LONGVERSION,
 			  VERSION, 
-			  N_("Increment"), 
+			  N_("<Image>/Filters/Pan Controls/Increment"),
 			  "RGB", 
 			  GIMP_PLUGIN,
 			  G_N_ELEMENTS (params), 
 			  G_N_ELEMENTS (return_vals),
 			  params, 
 			  return_vals);
-  gimp_plugin_menu_register ("plug_in_increment", "<Image>/Filters/Pan Controls");
   DEXIT;
 }