diff --git a/ChangeLog b/ChangeLog
index f66d8411d3..a263dead32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 23 22:57:13 MET 1999  Sven Neumann <sven@gimp.org>
+
+	* plug-ins/Lighting/lighting_main.c
+	* plug-ins/common/rotate.c
+	* plug-ins/common/warp.c
+	* plug-ins/common/winprint.c: the ones I missed last times...
+
 Tue Nov 23 22:00:12 MET 1999  Sven Neumann <sven@gimp.org>
 
 	* app/menus.c: Looks like I managed to accidentially revert my
diff --git a/plug-ins/Lighting/lighting_main.c b/plug-ins/Lighting/lighting_main.c
index b50e2b58c2..a2366dc4f8 100644
--- a/plug-ins/Lighting/lighting_main.c
+++ b/plug-ins/Lighting/lighting_main.c
@@ -174,7 +174,7 @@ static void query(void)
 			  "Tom Bech & Federico Mena Quintero",
 			  "Tom Bech & Federico Mena Quintero",
 			  "Version 0.2.0, March 15 1998",
-			  _("<Image>/Filters/Light Effects/Lighting Effects"),
+			  N_("<Image>/Filters/Light Effects/Lighting Effects..."),
 			  "RGB*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
diff --git a/plug-ins/common/rotate.c b/plug-ins/common/rotate.c
index e20bf62ba0..1accffbeed 100644
--- a/plug-ins/common/rotate.c
+++ b/plug-ins/common/rotate.c
@@ -161,7 +161,7 @@ gimp_install_procedure ("plug_in_layer_rot90",
 			PLUG_IN_AUTHOR,
 			PLUG_IN_COPYRIGHT,
 			PLUG_IN_VERSION,
-			_("<Image>/Layers/Rotate/90 degrees"),
+			N_("<Image>/Layers/Rotate/90 degrees"),
 			PLUG_IN_IMAGE_TYPES,
 			PROC_PLUG_IN,
 			nmenuargs, nreturn_vals,
@@ -172,7 +172,7 @@ gimp_install_procedure ("plug_in_layer_rot180",
 			PLUG_IN_AUTHOR,
 			PLUG_IN_COPYRIGHT,
 			PLUG_IN_VERSION,
-			_("<Image>/Layers/Rotate/180 degrees"),
+			N_("<Image>/Layers/Rotate/180 degrees"),
 			PLUG_IN_IMAGE_TYPES,
 			PROC_PLUG_IN,
 			nmenuargs, nreturn_vals,
@@ -183,7 +183,7 @@ gimp_install_procedure ("plug_in_layer_rot270",
 			PLUG_IN_AUTHOR,
 			PLUG_IN_COPYRIGHT,
 			PLUG_IN_VERSION,
-			_("<Image>/Layers/Rotate/270 degrees"),
+			N_("<Image>/Layers/Rotate/270 degrees"),
 			PLUG_IN_IMAGE_TYPES,
 			PROC_PLUG_IN,
 			nmenuargs, nreturn_vals,
@@ -195,7 +195,7 @@ gimp_install_procedure ("plug_in_image_rot90",
 			PLUG_IN_AUTHOR,
 			PLUG_IN_COPYRIGHT,
 			PLUG_IN_VERSION,
-			_("<Image>/Image/Transforms/Rotate/90 degrees"),
+			N_("<Image>/Image/Transforms/Rotate/90 degrees"),
 			PLUG_IN_IMAGE_TYPES,
 			PROC_PLUG_IN,
 			nmenuargs, nreturn_vals,
@@ -206,7 +206,7 @@ gimp_install_procedure ("plug_in_image_rot180",
 			PLUG_IN_AUTHOR,
 			PLUG_IN_COPYRIGHT,
 			PLUG_IN_VERSION,
-			_("<Image>/Image/Transforms/Rotate/180 degrees"),
+			N_("<Image>/Image/Transforms/Rotate/180 degrees"),
 			PLUG_IN_IMAGE_TYPES,
 			PROC_PLUG_IN,
 			nmenuargs, nreturn_vals,
@@ -217,7 +217,7 @@ gimp_install_procedure ("plug_in_image_rot270",
 			PLUG_IN_AUTHOR,
 			PLUG_IN_COPYRIGHT,
 			PLUG_IN_VERSION,
-			_("<Image>/Image/Transforms/Rotate/270 degrees"),
+			N_("<Image>/Image/Transforms/Rotate/270 degrees"),
 			PLUG_IN_IMAGE_TYPES,
 			PROC_PLUG_IN,
 			nmenuargs, nreturn_vals,
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 6cea71c882..90ff97093f 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -303,7 +303,7 @@ query ()
 			  "John P. Beale",
 			  "John P. Beale",
 			  "1997",
-			  _("<Image>/Filters/Map/Warp"),
+			  N_("<Image>/Filters/Map/Warp"),
 			  "RGB*, GRAY*",
 			  PROC_PLUG_IN,
 			  nargs, nreturn_vals,
@@ -436,6 +436,7 @@ warp_dialog (GDrawable *drawable)
 {
   GtkWidget *dlg;
   GtkWidget *label;
+  GtkWidget *hbbox;
   GtkWidget *button;
   GtkWidget *toggle;
   GtkWidget *toggle_hbox;
@@ -505,21 +506,28 @@ warp_dialog (GDrawable *drawable)
 
 
   /*  Action area  */
-  button = gtk_button_new_with_label ( _("OK"));
+  gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dlg)->action_area), 2);
+  gtk_box_set_homogeneous (GTK_BOX (GTK_DIALOG (dlg)->action_area), FALSE);
+  hbbox = gtk_hbutton_box_new ();
+  gtk_button_box_set_spacing (GTK_BUTTON_BOX (hbbox), 4);
+  gtk_box_pack_end (GTK_BOX (GTK_DIALOG (dlg)->action_area), hbbox, FALSE, FALSE, 0);
+  gtk_widget_show (hbbox);
+ 
+  button = gtk_button_new_with_label (_("OK"));
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect (GTK_OBJECT (button), "clicked",
-                      (GtkSignalFunc) warp_ok_callback,
-                      dlg);
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+		      (GtkSignalFunc) warp_ok_callback,
+		      dlg);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
 
-  button = gtk_button_new_with_label ( _("Cancel"));
+  button = gtk_button_new_with_label (_("Cancel"));
   GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT);
   gtk_signal_connect_object (GTK_OBJECT (button), "clicked",
 			     (GtkSignalFunc) gtk_widget_destroy,
 			     GTK_OBJECT (dlg));
-  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0);
+  gtk_box_pack_start (GTK_BOX (hbbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
   /*  The main table  */
diff --git a/plug-ins/common/winprint.c b/plug-ins/common/winprint.c
index acb29a06c1..b6dd6452d5 100644
--- a/plug-ins/common/winprint.c
+++ b/plug-ins/common/winprint.c
@@ -187,7 +187,7 @@ query(void)
       "Tor Lillqvist <tml@iki.fi>",
       "Copyright 1999 Tor Lillqvist",
       "$Id$",
-      _("<Image>/File/Print"),
+      N_("<Image>/File/Print"),
       "RGB*,GRAY*,INDEXED*",
       PROC_PLUG_IN,
       print_nargs,
@@ -202,7 +202,7 @@ query(void)
       "Tor Lillqvist <tml@iki.fi>",
       "Copyright 1999 Tor Lillqvist",
       "$Id$",
-      _("<Image>/File/Page Setup"),
+      N_("<Image>/File/Page Setup"),
       "RGB*,GRAY*,INDEXED*",
       PROC_PLUG_IN,
       pagesetup_nargs,