diff -ruN old/mc-4.5.14/Specfile new/mc-4.5.15/Specfile
--- old/mc-4.5.14/Specfile	Thu Feb 11 21:44:21 1999
+++ new/mc-4.5.15/Specfile	Mon Feb 15 18:29:07 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      4.5.14
+%define ver      4.5.15
 %define prefix   /usr
 
 Summary:   Midnight Commander visual shell
diff -ruN old/mc-4.5.14/VERSION new/mc-4.5.15/VERSION
--- old/mc-4.5.14/VERSION	Thu Feb 11 21:44:21 1999
+++ new/mc-4.5.15/VERSION	Mon Feb 15 18:29:07 1999
@@ -1 +1 @@
-#define VERSION "4.5.14"
+#define VERSION "4.5.15"
diff -ruN old/mc-4.5.14/configure new/mc-4.5.15/configure
--- old/mc-4.5.14/configure	Thu Feb 11 21:44:21 1999
+++ new/mc-4.5.15/configure	Mon Feb 15 18:29:07 1999
@@ -586,7 +586,7 @@
 
 
 PACKAGE=mc
-VERSION=4.5.14
+VERSION=4.5.15
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -10068,7 +10068,7 @@
 	    #include <slang.h>
 	    #endif
 	    int main(void){
-		SLtt_initialize("");
+		SLtt_get_terminfo();
 		SLtt_tgetflag("");
 		return 0;
 	    } 
@@ -10903,7 +10903,7 @@
 	    #include <slang.h>
 	    #endif
 	    int main(void){
-		SLtt_initialize("");
+		SLtt_get_terminfo();
 		SLtt_tgetflag("");
 		return 0;
 	    } 
diff -ruN old/mc-4.5.14/configure.in new/mc-4.5.15/configure.in
--- old/mc-4.5.14/configure.in	Thu Feb 11 21:44:21 1999
+++ new/mc-4.5.15/configure.in	Mon Feb 15 18:29:07 1999
@@ -5,7 +5,7 @@
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.14
+VERSION=4.5.15
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
@@ -831,7 +831,7 @@
 	    #include <slang.h>
 	    #endif
 	    int main(void){
-		SLtt_initialize("");
+		SLtt_get_terminfo();
 		SLtt_tgetflag("");
 		return 0;
 	    } ], 
diff -ruN old/mc-4.5.14/gnome/ChangeLog new/mc-4.5.15/gnome/ChangeLog
--- old/mc-4.5.14/gnome/ChangeLog	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/ChangeLog	Mon Feb 15 18:29:18 1999
@@ -1,3 +1,83 @@
+1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdesktop.c (reload_desktop_icons): Take auto-positioning and
+	snap-positioning into account.  This is the right thing to do.
+	(get_icon_auto_pos): Do auto-positioning in two steps, first from
+	the requested position to the end of the slot array, then from
+	slot zero forwards if required.
+
+1999-02-15  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gcmd.c (gnome_open_terminal_with_cmd): New routine, based on the
+	gnome_open_terminal routine, that will allow the user to specify a
+	command to execute (used internally).
+
+	* gaction.c (gmc_edit_filename): Support for the GNOME editor
+	environment properties. 
+
+	* gdesktop.c (create_desktop_dir): Support GNOME_DESKTOP_DIR
+	variable to configure the desktop directory.
+
+1999-02-15  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* mc.keys.in.in: Use "gnome-moz-remote file:%d/%f" for the html
+	file actions.
+
+	* gscreen.c (toolbar): Added a "rescan" button.
+
+	* gprefs.c (create_prop_box): Make the preferences dialog modal.
+	Also, set the window title and set the window's parent.
+	Removed some unused functions.
+
+1999-02-14  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdesktop.c (desktop_popup): Handle popup menus for the desktop.
+	(arrange_desktop_icons): New function to auto-arrange the desktop
+	icons.
+	(reload_desktop_icons): Take care of positioning the new icons by
+	ourselves; do not rely on desktop_icon_info_new() to do it.
+	(remove_from_slot): Reset the icon's slot to -1.
+	(reload_desktop_icons): Show all the icons after they have been
+	loaded, instead doing it one by one.
+
+	* gscreen.c (file_list_popup): Handle popup menus for the blank
+	areas of the file panels.
+	(panel_icon_list_button_press): Call file_list_popup().
+	(panel_file_list_press_row): Likewise.
+
+1999-02-14  Sergey Panov <sipan@mit.edu>
+
+        * glayout.c: Fixed my own stupid typo( stock ID instead of NULL)
+        it was not critical. A few minor, rather cosmetic changes in
+        GnomeUIInfo structures.
+
+1999-02-13  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* mc.keys.in.in: Use Tigert's new icon for man pages.
+
+1999-02-12  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gdialogs.c (file_mask_dialog): Renaming files was not working
+	due to having the "file-must-exist" bit turned on.
+
+	* gnome-file-property-dialog.c (apply_metadata_change): Metadata
+	rename the file.  
+
+	Change fpd->file_name to point to the new name so that any
+	metadat changes take effect on the new name, not the old name.
+
+	Test return value from move_file_file.
+	
+	(init_metadata): Fixed typo.
+
+1999-02-12  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* mc.metadata.in: Added a regexp for EPS files.
+
+	* mc.keys.in.in: Use Tigert's new icon for Postscript files.
+	Possible FIXME: are there different MIME types for PS and EPS
+	files?
+
 1999-02-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdesktop-icon.c (set_icon): Do not destroy the image if it is
diff -ruN old/mc-4.5.14/gnome/dir-close.xpm new/mc-4.5.15/gnome/dir-close.xpm
--- old/mc-4.5.14/gnome/dir-close.xpm	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/dir-close.xpm	Mon Feb 15 18:29:18 1999
@@ -1,28 +1,47 @@
 /* XPM */
-static char *DIRECTORY_CLOSE_XPM[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 6 1",
-"  c Gray0",
-". c #635d4f",
-"X c #88806c",
-"o c #a9907b",
-"O c Gray100",
-"+ c None",
-/* pixels */
-"++++++++++++++++",
-"+++++++++  +++++",
-"+++++++  XX  +++",
-"+  ++  XX.   +++",
-" XX  XX.  ooo ++",
-" XXXX.  ooooo ++",
-"+ X.  oooooooo +",
-"+   oooooooooo +",
-"++  oooooooooo +",
-"++   oooooooo  +",
-"+++  oooooo  +++",
-"+++   ooo  +++++",
-"++++  o  +++++++",
-"+++++  +++++++++",
-"++++++++++++++++",
-"++++++++++++++++"
-};
+static char * DIRECTORY_CLOSE_XPM[] = {
+"16 16 28 1",
+" 	c None",
+".	c #000000",
+"+	c #C4B893",
+"@	c #A59A7C",
+"#	c #AAA07F",
+"$	c #8F866B",
+"%	c #EEEADC",
+"&	c #E6DCC3",
+"*	c #F1ECE0",
+"=	c #CCC4AF",
+"-	c #D7D3C8",
+";	c #E2D8B9",
+">	c #CBC0A1",
+",	c #DBCDA5",
+"'	c #C5B996",
+")	c #C0B591",
+"!	c #AFA586",
+"~	c #8F866D",
+"{	c #EAE4D0",
+"]	c #807764",
+"^	c #746D5C",
+"/	c #B3A988",
+"(	c #9F9679",
+"_	c #BDB18F",
+":	c #9E9377",
+"<	c #696454",
+"[	c #DFD4B0",
+"}	c #585448",
+"                ",
+"                ",
+"    ....        ",
+"   .+@+@.       ",
+"  .#$#$#$...... ",
+"  .%&*&*&%*=-;>.",
+"  .;+,+,+,')!+~.",
+"  .{,+,+,))!+!].",
+"  .;+,+,)+!+!!^.",
+"  .{,+,)+!+!/(^.",
+"  .;+,_+!+!!(:<.",
+"  .{,_+!+!!::~<.",
+"  .[]~]:]~]^<<}.",
+"   ............ ",
+"                ",
+"                "};
diff -ruN old/mc-4.5.14/gnome/dir-open.xpm new/mc-4.5.15/gnome/dir-open.xpm
--- old/mc-4.5.14/gnome/dir-open.xpm	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/dir-open.xpm	Mon Feb 15 18:29:18 1999
@@ -1,35 +1,53 @@
 /* XPM */
-static char *DIRECTORY_OPEN_XPM[] = {
-/* columns rows colors chars-per-pixel */
-"16 16 13 1",
-"  c Gray0",
-". c #88806c",
-"X c #8d8571",
-"o c #938a75",
-"O c #a9907b",
-"+ c #99907c",
-"@ c #9a917d",
-"# c #9c937f",
-"$ c #9e9683",
-"% c #ada694",
-"& c #fffef7",
-"* c Gray100",
-"= c None",
-/* pixels */
-"================",
-"=========  =====",
-"=======  .. ====",
-"=  ==  o+%& ====",
-" ..  @#%&&&    =",
-" ..o+%&&&&  OO =",
-"= .$&&&&  OOOO =",
-"= X&&&  OOOOOO =",
-"=  &  OOOOOOOO =",
-"==  OOOOOOOOO ==",
-"==  OOOOOOO  ===",
-"===  OOOO  =====",
-"===  OO  =======",
-"====   =========",
-"================",
-"================"
-};
+static char * DIRECTORY_OPEN_XPM[] = {
+"16 16 34 1",
+" 	c None",
+".	c #000000",
+"+	c #C4B893",
+"@	c #A59A7C",
+"#	c #AAA07F",
+"$	c #8F866B",
+"%	c #B3AB92",
+"&	c #9B9174",
+"*	c #ADA282",
+"=	c #988F72",
+"-	c #8A826A",
+";	c #716A56",
+">	c #605A48",
+",	c #353128",
+"'	c #8F866D",
+")	c #E5DBC0",
+"!	c #E8E0C9",
+"~	c #DCD0AA",
+"{	c #565041",
+"]	c #655E4F",
+"^	c #EAE4D0",
+"/	c #D7C89C",
+"(	c #B3A57D",
+"_	c #D4C494",
+":	c #5B5648",
+"<	c #DCD7C6",
+"[	c #83795B",
+"}	c #353535",
+"|	c #ACA181",
+"1	c #534F42",
+"2	c #E2D9BB",
+"3	c #72694F",
+"4	c #C0B79E",
+"5	c #978C69",
+"                ",
+"                ",
+"    ....        ",
+"   .+@+@.       ",
+"  .#$#$#$...... ",
+"  .%&*&*&*=-&-;.",
+" ...........>,'.",
+".)!~!~!~!~!~.{].",
+".^/(_(_(_(_(.{:.",
+" .<_(_(_(_(_[.:.",
+" }!|_(_(_(_(_.1.",
+"  }2(_(_(_(_(3..",
+"  .4(5(5(5(5(5..",
+"   ............ ",
+"                ",
+"                "};
diff -ruN old/mc-4.5.14/gnome/gaction.c new/mc-4.5.15/gnome/gaction.c
--- old/mc-4.5.14/gnome/gaction.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gaction.c	Mon Feb 15 18:29:18 1999
@@ -18,7 +18,7 @@
 #include "../vfs/vfs.h"
 
 static void
-gmc_execute (char *fname, char *buf)
+gmc_execute (const char *fname, const char *buf)
 {
 	exec_extension (fname, buf, NULL, NULL, 0);
 }
@@ -81,6 +81,8 @@
 	const char *cmd;
 	char *buf;
 	int size;
+	char *editor, *type;
+	int on_terminal;
 
 	if (gnome_metadata_get (fname, "edit", &size, &buf) == 0){
 		gmc_execute (fname, buf);
@@ -89,18 +91,43 @@
 	}
 
 	mime_type = gnome_mime_type_or_default (fname, NULL);
-	if (!mime_type)
-		return 0;
+	if (mime_type){
+		cmd = gnome_mime_get_value (mime_type, "edit");
 	
-		
-	cmd = gnome_mime_get_value (mime_type, "edit");
+		if (cmd){
+			gmc_execute (fname, cmd);
+			return 1;
+		}
+	}
 	
-	if (cmd){
-		gmc_execute (fname, cmd);
+	gnome_config_push_prefix( "/editor/Editor/");
+	type = gnome_config_get_string ("EDITOR_TYPE=executable");
+	
+	if (strcmp (type, "mc-internal") == 0){
+		g_free (type);
+		do_edit (fname);
 		return 1;
 	}
-	
-	do_edit (fname);
+	g_free (type);
+		
+	editor = gnome_config_get_string ("EDITOR=emacs");
+	on_terminal = gnome_config_get_bool ("NEEDS_TERM=false");
+
+	if (on_terminal){
+		char *quoted = name_quote (fname, 0);
+		char *editor_cmd = g_strconcat (editor, " ", quoted, NULL);
+		
+		gnome_open_terminal_with_cmd (editor_cmd);
+		g_free (quoted);
+		g_free (editor_cmd);
+	} else {
+		char *cmd = g_strconcat (editor, " %s", NULL);
+		
+		gmc_execute (fname, cmd);
+		g_free (cmd);
+	}
+
+	g_free (editor);
 	return 0;
 }
 
@@ -112,7 +139,7 @@
 }
 
 static void
-gmc_run_view (char *filename, char *buf)
+gmc_run_view (const char *filename, const char *buf)
 {
 	exec_extension (filename, buf, NULL, NULL, 0);
 }
diff -ruN old/mc-4.5.14/gnome/gcmd.c new/mc-4.5.15/gnome/gcmd.c
--- old/mc-4.5.14/gnome/gcmd.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gcmd.c	Mon Feb 15 18:29:18 1999
@@ -60,7 +60,7 @@
 }
 
 void
-gnome_open_terminal (void)
+gnome_open_terminal_with_cmd (const char *command)
 {
 	char *p;
 	
@@ -71,10 +71,25 @@
 					if (!(p = gnome_is_program_in_path ("rxvt")))
 						p = gnome_is_program_in_path ("xterm");
 
-	if (p)
-		my_system (EXECUTE_AS_SHELL, shell, p);
-	else
+	if (p){
+		if (command){
+			char *q;
+			
+			q = g_strconcat (p, " -e ", command, NULL);
+			my_system (EXECUTE_AS_SHELL, shell, q);
+			g_free (q);
+		} else
+			my_system (EXECUTE_AS_SHELL, shell, p);
+
+		g_free (p);
+	} else
 		message (1, MSG_ERROR, " Could not start a terminal ");
+}
+
+void
+gnome_open_terminal (void)
+{
+	gnome_open_terminal_with_cmd (NULL);
 }
 
 void
diff -ruN old/mc-4.5.14/gnome/gcmd.h new/mc-4.5.15/gnome/gcmd.h
--- old/mc-4.5.14/gnome/gcmd.h	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gcmd.h	Mon Feb 15 18:29:19 1999
@@ -1,24 +1,25 @@
 #ifndef __GCMD_H
 #define __GCMD_H
 
-void gnome_listing_cmd       (GtkWidget *widget, WPanel *panel);
-void gnome_compare_panels    (void);
-void gnome_open_terminal     (void);
-void gnome_about_cmd         (void);
-void gnome_quit_cmd          (void);
-void gnome_open_panel        (GtkWidget *widget, WPanel *panel);
-void gnome_close_panel       (GtkWidget *widget, WPanel *panel);
-void gnome_icon_view_cmd     (GtkWidget *widget, WPanel *panel);
-void gnome_partial_view_cmd  (GtkWidget *widget, WPanel *panel);
-void gnome_full_view_cmd     (GtkWidget *widget, WPanel *panel);
-void gnome_custom_view_cmd   (GtkWidget *widget, WPanel *panel);
-void gnome_sort_cmd          (GtkWidget *widget, WPanel *panel);
-void gnome_select_all_cmd    (GtkWidget *widget, WPanel *panel);
-void gnome_filter_cmd        (GtkWidget *widget, WPanel *panel);
-void gnome_external_panelize (GtkWidget *widget, WPanel *panel);
-void gnome_open_files        (GtkWidget *widget, WPanel *panel);
-void gnome_run_new           (GtkWidget *widget, GnomeDesktopEntry *gde);
-void gnome_mkdir_cmd         (GtkWidget *widget, WPanel *panel);
+void gnome_listing_cmd        	  (GtkWidget *widget, WPanel *panel);
+void gnome_compare_panels     	  (void);
+void gnome_open_terminal      	  (void);
+void gnome_open_terminal_with_cmd (const char *command);
+void gnome_about_cmd              (void);
+void gnome_quit_cmd               (void);
+void gnome_open_panel             (GtkWidget *widget, WPanel *panel);
+void gnome_close_panel            (GtkWidget *widget, WPanel *panel);
+void gnome_icon_view_cmd          (GtkWidget *widget, WPanel *panel);
+void gnome_partial_view_cmd       (GtkWidget *widget, WPanel *panel);
+void gnome_full_view_cmd          (GtkWidget *widget, WPanel *panel);
+void gnome_custom_view_cmd        (GtkWidget *widget, WPanel *panel);
+void gnome_sort_cmd               (GtkWidget *widget, WPanel *panel);
+void gnome_select_all_cmd         (GtkWidget *widget, WPanel *panel);
+void gnome_filter_cmd             (GtkWidget *widget, WPanel *panel);
+void gnome_external_panelize      (GtkWidget *widget, WPanel *panel);
+void gnome_open_files             (GtkWidget *widget, WPanel *panel);
+void gnome_run_new                (GtkWidget *widget, GnomeDesktopEntry *gde);
+void gnome_mkdir_cmd              (GtkWidget *widget, WPanel *panel);
 void gnome_reverse_selection_cmd_panel (WPanel *panel);
 
 #endif /* __GCMD_H */
diff -ruN old/mc-4.5.14/gnome/gdesktop.c new/mc-4.5.15/gnome/gdesktop.c
--- old/mc-4.5.14/gnome/gdesktop.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gdesktop.c	Mon Feb 15 18:29:18 1999
@@ -122,45 +122,78 @@
 static int click_dragging;
 
 
-static DesktopIconInfo *desktop_icon_info_new (char *filename, char *url,
-					       char *caption,
-					       int user_pos, int auto_pos,
+static DesktopIconInfo *desktop_icon_info_new (char *filename, char *url, char *caption,
 					       int xpos, int ypos);
 
 
-/* Looks for a free slot in the layout_slots array and returns the coordinates that coorespond to
- * it.  "Free" means it either has zero icons in it, or it has the minimum number of icons of all
- * the slots.
+/* Convenience function to figure out the slot corresponding to an (x, y) position */
+static void
+get_slot_from_pos (int x, int y, int *u, int *v)
+{
+	*u = (x + DESKTOP_SNAP_X / 2) / DESKTOP_SNAP_X;
+	*v = (y + DESKTOP_SNAP_Y / 2) / DESKTOP_SNAP_Y;
+}
+
+/* Looks for a free slot in the layout_slots array and returns the coordinates
+ * that coorespond to it.  "Free" means it either has zero icons in it, or it
+ * has the minimum number of icons of all the slots.  Returns the number of
+ * icons in the sought spot (ideally 0).
  */
+static int
+auto_pos (int start_slot, int end_slot, int *slot)
+{
+	int min, min_slot;
+	int i;
+	int val;
+
+	min = layout_slots[start_slot].num_icons;
+	min_slot = start_slot;
+
+	for (i = start_slot; i < end_slot; i++) {
+		val = layout_slots[i].num_icons;
+
+		if (val < min || val == 0) {
+			min = val;
+			min_slot = i;
+			if (val == 0)
+				break;
+		}
+	}
+
+	*slot = min_slot;
+	return min;
+}
+
+/* Looks for free space in the icon grid, scanning it in column-wise order */
 static void
 get_icon_auto_pos (int *x, int *y)
 {
-	int min, min_x, min_y;
+	int start, end;
 	int u, v;
-	int val;
+	int val1, val2;
+	int slot1, slot2;
+	int slot;
+
+	get_slot_from_pos (*x, *y, &u, &v);
+	start = u * layout_rows + v;
+	end = layout_rows * layout_cols;
 
-	min = l_slots (0, 0).num_icons;
-	min_x = min_y = 0;
-
-	for (u = 0; u < layout_cols; u++)
-		for (v = 0; v < layout_rows; v++) {
-			val = l_slots (u, v).num_icons;
+	/* Look forwards until the end of the grid.  If we could not find an
+	 * empty spot, find the second best.
+	 */
 
-			if (val == 0) {
-				/* Optimization: if it is zero, return immediately */
+	val1 = auto_pos (start, end, &slot1);
 
-				*x = u * DESKTOP_SNAP_X;
-				*y = v * DESKTOP_SNAP_Y;
-				return;
-			} else if (val < min) {
-				min = val;
-				min_x = u;
-				min_y = v;
-			}
-		}
+	if (val1 == 0)
+		slot = slot1;
+	else {
+		val2 = auto_pos (0, start, &slot2);
+		if (val2 < val1)
+			slot = slot2;
+	}
 
-	*x = min_x * DESKTOP_SNAP_X;
-	*y = min_y * DESKTOP_SNAP_Y;
+	*x = (slot / layout_rows) * DESKTOP_SNAP_X;
+	*y = (slot % layout_rows) * DESKTOP_SNAP_Y;
 }
 
 /* Snaps the specified position to the icon grid.  It looks for the closest free spot on the grid,
@@ -211,28 +244,21 @@
 
 	layout_slots[dii->slot].num_icons--;
 	layout_slots[dii->slot].icons = g_list_remove (layout_slots[dii->slot].icons, dii);
+
+	dii->slot = -1;
+	dii->x = 0;
+	dii->y = 0;
 }
 
-/* Places a desktop icon.  If auto_pos is true, then the function will look for
- * a place to position the icon automatically, else it will use the specified
- * coordinates, snapped to the grid if the global desktop_snap_icons flag is
- * set.
- */
+/* Places a desktop icon on the specified position */
 static void
-desktop_icon_info_place (DesktopIconInfo *dii, int user_pos, int auto_pos, int xpos, int ypos)
+desktop_icon_info_place (DesktopIconInfo *dii, int xpos, int ypos)
 {
 	int u, v;
 	char *filename;
 
 	remove_from_slot (dii);
 
-	if (!user_pos && auto_pos) {
-		if (desktop_snap_icons)
-			get_icon_snap_pos (&xpos, &ypos);
-		else
-			get_icon_auto_pos (&xpos, &ypos);
-	}
-
 	if (xpos < 0)
 		xpos = 0;
 	else if (xpos > layout_screen_width)
@@ -245,8 +271,7 @@
 
 	/* Increase the number of icons in the corresponding slot */
 
-	u = (xpos + DESKTOP_SNAP_X / 2) / DESKTOP_SNAP_X;
-	v = (ypos + DESKTOP_SNAP_X / 2) / DESKTOP_SNAP_Y;
+	get_slot_from_pos (xpos, ypos, &u, &v);
 
 	dii->slot = u * layout_rows + v;
 	layout_slots[dii->slot].num_icons++;
@@ -326,8 +351,7 @@
 	char *caption;
 } file_and_url_t;
 
-/*
- * Reloads the desktop icons efficiently.  If there are "new" files for which no
+/* Reloads the desktop icons efficiently.  If there are "new" files for which no
  * icons have been created, then icons for them will be created started at the
  * specified position if user_pos is TRUE.  If it is FALSE, the icons will be
  * auto-placed.
@@ -343,6 +367,7 @@
 	GSList *need_position_list, *sl;
 	GList *all_icons, *l;
 	char *desktop_url, *caption;
+	int orig_xpos, orig_ypos;
 
 	dir = mc_opendir (desktop_directory);
 	if (!dir) {
@@ -404,7 +429,7 @@
 		gnome_metadata_get (full_name, "icon-caption", &size, &caption);
 		
 		if (have_pos) {
-			dii = desktop_icon_info_new (dirent->d_name, desktop_url, caption, FALSE, FALSE, x, y);
+			dii = desktop_icon_info_new (dirent->d_name, desktop_url, caption, x, y);
 			gtk_widget_show (dii->dicon);
 
 			g_free (full_name);
@@ -452,10 +477,31 @@
 
 	need_position_list = g_slist_reverse (need_position_list);
 
+	orig_xpos = orig_ypos = 0;
+
 	for (sl = need_position_list; sl; sl = sl->next) {
 		file_and_url_t *fau = sl->data;
 
-		dii = desktop_icon_info_new (fau->filename, fau->url, fau->caption, user_pos, TRUE, xpos, ypos);
+		if (user_pos && sl == need_position_list) {
+			/* If we are on the first icon, place it "by hand".
+			 * Else, use automatic placement based on the position
+			 * of the first icon of the series.
+			 */
+			if (desktop_auto_placement) {
+				xpos = ypos = 0;
+				get_icon_auto_pos (&xpos, &ypos);
+			} else if (desktop_snap_icons)
+				get_icon_snap_pos (&xpos, &ypos);
+
+			orig_xpos = xpos;
+			orig_ypos = ypos;
+		} else {
+			xpos = orig_xpos;
+			ypos = orig_ypos;
+			get_icon_auto_pos (&xpos, &ypos);
+		}
+
+		dii = desktop_icon_info_new (fau->filename, fau->url, fau->caption, xpos, ypos);
 		gtk_widget_show (dii->dicon);
 
 		if (fau->url)
@@ -467,13 +513,32 @@
 	}
 
 	g_slist_free (need_position_list);
-
 	gnome_metadata_unlock ();
 
 	/* Flush events to make the icons paint themselves */
 	x_flush_events ();
 }
 
+/* Perform automatic arrangement of the desktop icons */
+static void
+arrange_desktop_icons (void)
+{
+	GList *icons, *l;
+	int xpos, ypos;
+
+	icons = g_list_reverse (get_all_icons ());
+
+	for (l = icons; l; l = l->next)
+		remove_from_slot (l->data);
+
+	for (l = icons; l; l = l->next) {
+		get_icon_auto_pos (&xpos, &ypos);
+		desktop_icon_info_place (l->data, xpos, ypos);
+	}
+
+	g_list_free (icons);
+}
+
 /* Unselects all the desktop icons except the one in exclude */
 static void
 unselect_all (DesktopIconInfo *exclude)
@@ -1278,21 +1343,22 @@
 				sel_icons = g_slist_prepend (sel_icons, l->data);
 		}
 
-	/* Move the icons */
+	/* Move the icons.  FIXME: handle auto-placement by reinserting the
+	 * icons in the proper place.
+	 */
 
-	for (sl = sel_icons; sl; sl = sl->next) {
-		dii = sl->data;
-		desktop_icon_info_place (dii,
-					 !desktop_auto_placement,
-					 desktop_auto_placement,
-					 dii->x + dx, dii->y + dy);
-	}
+	if (!desktop_auto_placement)
+		for (sl = sel_icons; sl; sl = sl->next) {
+			dii = sl->data;
+			desktop_icon_info_place (dii, dii->x + dx, dii->y + dy);
+		}
 
 	/* Clean up */
 
 	g_slist_free (sel_icons);
 }
 
+/* Handler for drag_data_received for desktop icons */
 static void
 icon_drag_data_received (GtkWidget *widget, GdkDragContext *context, gint x, gint y,
 			 GtkSelectionData *data, guint info, guint time, gpointer user_data)
@@ -1313,7 +1379,7 @@
 			return; /* eeeek */
 
 		if (gdnd_perform_drop (context, data, fe, full_name))
-			reload_desktop_icons (TRUE, x, y);
+			reload_desktop_icons (FALSE, 0, 0);
 
 		file_entry_free (fe);
 	}
@@ -1341,7 +1407,7 @@
  * desktop directory.  It does not show the icon.
  */
 static DesktopIconInfo *
-desktop_icon_info_new (char *filename, char *url, char *caption, int user_pos, int auto_pos, int xpos, int ypos)
+desktop_icon_info_new (char *filename, char *url, char *caption, int xpos, int ypos)
 {
 	DesktopIconInfo *dii;
 	file_entry *fe;
@@ -1427,7 +1493,7 @@
 
 	/* Place the icon and append it to the list */
 
-	desktop_icon_info_place (dii, user_pos, auto_pos, xpos, ypos);
+	desktop_icon_info_place (dii, xpos, ypos);
 	return dii;
 }
 
@@ -1519,7 +1585,10 @@
 {
 	char *home_link_name;
 
-	desktop_directory = g_concat_dir_and_file (gnome_user_home_dir, DESKTOP_DIR_NAME);
+	if (getenv ("GNOME_DESKTOP_DIR") != NULL)
+		desktop_directory = g_strdup (getenv ("GNOME_DESKTOP_DIR"));
+	else
+		desktop_directory = g_concat_dir_and_file (gnome_user_home_dir, DESKTOP_DIR_NAME);
 
 	if (!g_file_exists (desktop_directory)) {
 		/* Create the directory */
@@ -1822,11 +1891,36 @@
 	return proxy_gdk_window;
 }
 
+/* Callback for arranging the icons on the desktop */
+static void
+handle_arrange_icons (GtkWidget *widget, gpointer data)
+{
+	arrange_desktop_icons ();
+}
+
+/* Callback for rescanning the desktop directory */
+static void
+handle_rescan_desktop (GtkWidget *widget, gpointer data)
+{
+	reload_desktop_icons (FALSE, 0, 0);
+}
+
+/* The popup menu for the desktop */
+static GnomeUIInfo desktop_popup_items[] = {
+	GNOMEUIINFO_ITEM_NONE (N_("Arrange Icons"), NULL, handle_arrange_icons),
+	GNOMEUIINFO_ITEM_NONE (N_("Rescan Desktop"), NULL, handle_rescan_desktop),
+	GNOMEUIINFO_END
+};
+
 /* Executes the popup menu for the desktop */
 static void
 desktop_popup (GdkEventButton *event)
 {
-	printf ("FIXME: display desktop popup menu\n");
+	GtkWidget *popup;
+
+	popup = gnome_popup_menu_new (desktop_popup_items);
+	gnome_popup_menu_do_popup_modal (popup, NULL, NULL, event, NULL);
+	gtk_widget_destroy (popup);
 }
 
 /* Draws the rubberband rectangle for selecting icons on the desktop */
diff -ruN old/mc-4.5.14/gnome/gdialogs.c new/mc-4.5.15/gnome/gdialogs.c
--- old/mc-4.5.14/gnome/gdialogs.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gdialogs.c	Mon Feb 15 18:29:18 1999
@@ -629,7 +629,7 @@
                 return NULL;
         }
 
-        dest_dir = gnome_file_entry_get_full_path(GNOME_FILE_ENTRY (fentry), TRUE);
+        dest_dir = gnome_file_entry_get_full_path(GNOME_FILE_ENTRY (fentry), FALSE);
         gtk_widget_destroy (fmd_win);
         easy_patterns = 1;
         if (!dest_dir || !*dest_dir)
diff -ruN old/mc-4.5.14/gnome/glayout.c new/mc-4.5.15/gnome/glayout.c
--- old/mc-4.5.14/gnome/glayout.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/glayout.c	Mon Feb 15 18:29:18 1999
@@ -289,7 +289,8 @@
 
 
 GnomeUIInfo gnome_panel_file_menu [] = {
-	GNOMEUIINFO_MENU_NEW_ITEM(N_("New _Window"), N_("Opens a new window"), gnome_open_panel, NULL),
+        GNOMEUIINFO_MENU_NEW_WINDOW_ITEM(gnome_open_panel, NULL),
+	/*GNOMEUIINFO_MENU_NEW_ITEM(N_("New _Window"), N_("Opens a new window"), gnome_open_panel, NULL),*/
 	
 	/* We want to make a new menu entry here... */
 	/* For example: */
@@ -301,13 +302,13 @@
 	/*  etc... */
 	GNOMEUIINFO_MENU_NEW_SUBTREE(gnome_panel_new_menu),
 	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_OPEN_ITEM( gnome_open_files, GNOME_STOCK_PIXMAP_OPEN),
+	GNOMEUIINFO_MENU_OPEN_ITEM( gnome_open_files, NULL),
 /*	GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },*/
 	GNOMEUIINFO_ITEM_STOCK(N_("_Copy..."), N_("Copy files"), copy_cmd, GNOME_STOCK_PIXMAP_COPY),
 	GNOMEUIINFO_ITEM_STOCK(N_("_Delete..."), N_("Delete files"), delete_cmd, GNOME_STOCK_PIXMAP_REMOVE),
         GNOMEUIINFO_ITEM_NONE(N_("_Move..."), N_("Rename or move files"), ren_cmd),
 	GNOMEUIINFO_SEPARATOR,
-	GNOMEUIINFO_MENU_CLOSE_ITEM(gnome_close_panel, NULL),
+	GNOMEUIINFO_MENU_CLOSE_WINDOW_ITEM(gnome_close_panel, NULL),
         GNOMEUIINFO_END
 };
 
@@ -340,20 +341,19 @@
 };
 
 GnomeUIInfo gnome_panel_commands_menu [] = {
-	{ GNOME_APP_UI_ITEM, N_("_Find File..."),      N_("Locate files on disk"),   find_cmd, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_JUMP_TO},
+        GNOMEUIINFO_ITEM_STOCK(N_("_Find File..."), N_("Locate files on disk"), find_cmd, GNOME_STOCK_MENU_JUMP_TO),
 	  
 /*	{ GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },*/
 	{ GNOME_APP_UI_ITEM, N_("_Run Command..."),               N_("Runs a command"), run_cmd, NULL,
 	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, GDK_F2, 0 },
-	{ GNOME_APP_UI_ITEM, N_("_Run Command in panel..."),N_("Run a command and put the results in a panel"), gnome_external_panelize },
+	GNOMEUIINFO_ITEM_NONE(N_("_Run Command in panel..."),N_("Run a command and put the results in a panel"), gnome_external_panelize),
 
 #ifdef USE_VFS					  
-	 GNOMEUIINFO_ITEM_NONE(N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs),
+	GNOMEUIINFO_ITEM_NONE(N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs),
 #endif
 #ifdef USE_EXT2FSLIB
 	/*does this do anything?*/
-/*	{ GNOME_APP_UI_ITEM, N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd },*/
+/*	 GNOMEUIINFO_ITEM_NONE(N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd ),*/
 #endif
 #ifdef WITH_BACKGROUND
 	GNOMEUIINFO_ITEM_NONE( N_("_Background jobs..."),   N_("List of background operations"), jobs_cmd ),
diff -ruN old/mc-4.5.14/gnome/gmain.c new/mc-4.5.15/gnome/gmain.c
--- old/mc-4.5.14/gnome/gmain.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gmain.c	Mon Feb 15 18:29:18 1999
@@ -52,6 +52,8 @@
 /* The Dlg_head for the whole desktop */
 Dlg_head *desktop_dlg;
 
+int run_desktop = 1;
+
 /* This is only used by the editor, so we provide a dummy implementation */
 void
 try_alloc_color_pair (char *str, char *str2)
@@ -147,6 +149,7 @@
 
 			if (i->editing)
 				return FALSE;
+			
 		}
 	} 
 
@@ -505,7 +508,9 @@
 {
 	WPanel *panel;
 
-	desktop_init ();
+	if (run_desktop)
+		desktop_init ();
+	
 	cmdline = command_new (0, 0, 0);
 	the_hint = label_new (0, 0, 0, NULL);
 
diff -ruN old/mc-4.5.14/gnome/gnome-file-property-dialog.c new/mc-4.5.15/gnome/gnome-file-property-dialog.c
--- old/mc-4.5.14/gnome/gnome-file-property-dialog.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gnome-file-property-dialog.c	Mon Feb 15 18:29:19 1999
@@ -16,12 +16,13 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
-
+#include <config.h>
+#include "dir.h"
+#include "util.h"
 #include <gnome.h>
 #include <time.h>
 #include <string.h>
 #include "gnome-file-property-dialog.h"
-#include "dir.h"
 #include "gdesktop.h"
 #include <pwd.h>
 #include <grp.h>
@@ -32,7 +33,6 @@
 #include "../vfs/vfs.h"
 #include "gicon.h"
 #include "dialog.h"
-#include "util.h"
 
 static void gnome_file_property_dialog_init		(GnomeFilePropertyDialog	 *file_property_dialog);
 static void gnome_file_property_dialog_class_init	(GnomeFilePropertyDialogClass	 *klass);
@@ -980,7 +980,7 @@
 	if (!fp_dlg->mime_fm_view)
 		fp_dlg->mime_fm_view = gnome_mime_get_value (mime_type, "view");
 	fp_dlg->mime_edit = gnome_mime_get_value (mime_type, "edit");
-	fp_dlg->mime_edit = gnome_mime_get_value (mime_type, "drop-target");
+	fp_dlg->mime_drop_target = gnome_mime_get_value (mime_type, "drop-target");
 
 	gnome_metadata_get (fp_dlg->file_name, "icon-filename", &size, &fp_dlg->icon_filename);
 	if (fp_dlg->icon_filename)
@@ -1144,6 +1144,7 @@
 			return 0;
 		} else {
 			char *p;
+			int s;
 			
 			/* create the files. */
 			base_name = g_strdup (fpd->file_name);
@@ -1157,9 +1158,14 @@
 
 			ctx = file_op_context_new ();
 			file_op_context_create_ui (ctx, OP_MOVE, FALSE);
-			move_file_file (ctx, fpd->file_name, full_target, &count, &bytes);
+			s = move_file_file (ctx, fpd->file_name, full_target, &count, &bytes);
 			file_op_context_destroy (ctx);
-			g_free (full_target);
+
+			if (s == FILE_CONT){
+				g_free (fpd->file_name);
+				fpd->file_name = full_target;
+			} else
+				g_free (full_target);
 		}
 	}
 	return 1;
@@ -1169,6 +1175,7 @@
 {
 	gchar *text;
 	gchar *icon_name;
+	char *filename;
 
 	/* If we don't have an open_cbox, that means we have no metadata
 	 * to set.
@@ -1282,6 +1289,7 @@
 gnome_file_property_dialog_make_changes (GnomeFilePropertyDialog *file_property_dialog)
 {
 	gint retval = 0;
+	
 	g_return_val_if_fail (file_property_dialog != NULL, 1);
 	g_return_val_if_fail (GNOME_IS_FILE_PROPERTY_DIALOG (file_property_dialog), 1);
 
diff -ruN old/mc-4.5.14/gnome/gnome-file-property-dialog.h new/mc-4.5.15/gnome/gnome-file-property-dialog.h
--- old/mc-4.5.14/gnome/gnome-file-property-dialog.h	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gnome-file-property-dialog.h	Mon Feb 15 18:29:19 1999
@@ -75,10 +75,10 @@
 	gchar *fm_view;
 	gchar *drop_target;
 	gchar *edit;
-	gchar *mime_fm_open;
-	gchar *mime_fm_view;
-	gchar *mime_drop_target;
-	gchar *mime_edit;
+	const gchar *mime_fm_open;
+	const gchar *mime_fm_view;
+	const gchar *mime_drop_target;
+	const gchar *mime_edit;
 	gchar *icon_filename;
 	gchar *desktop_url;
 	gchar *caption;
diff -ruN old/mc-4.5.14/gnome/gpopup2.c new/mc-4.5.15/gnome/gpopup2.c
--- old/mc-4.5.14/gnome/gpopup2.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gpopup2.c	Mon Feb 15 18:29:19 1999
@@ -25,6 +25,7 @@
 #include "gnome-file-property-dialog.h"
 #define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child)
 
+
 /* Flags for the popup menu entries.  They specify to which kinds of files an
  * entry is valid for.
  */
@@ -34,9 +35,9 @@
 	F_SYMLINK	= 1 << 2,	/* Applies only to symlinks */
 	F_SINGLE	= 1 << 3,	/* Applies only to a single file, not to multiple files */
 	F_NOTDIR	= 1 << 4,	/* Applies to non-directories */
-	F_DICON		= 1 << 5,	/* Applies only to desktop icons */
-	F_NOTDEV	= 1 << 6,	/* Applies to non-devices only (ie. reg, lnk, dir) */
-	F_ADVANCED	= 1 << 7        /* Only appears in advanced mode */
+	F_NOTDEV	= 1 << 5,	/* Applies to non-devices only (ie. reg, lnk, dir) */
+	F_ADVANCED	= 1 << 6,	/* Only appears in advanced mode */
+	F_MIME_ACTIONS	= 1 << 7	/* Special marker for the position of MIME actions */
 };
 
 /* typedefs */
@@ -46,8 +47,8 @@
 	gpointer callback;	/* Callback for menu item */
 };
 
+
 /* Multiple File commands */
-static void panel_action_open_with (GtkWidget *widget, WPanel *panel);
 static void handle_open (GtkWidget *widget, WPanel *panel);
 static void handle_view (GtkWidget *widget, WPanel *panel);
 static void handle_view_unfiltered (GtkWidget *widget, WPanel *panel);
@@ -63,11 +64,6 @@
 static void handle_symlink (GtkWidget *widget, WPanel *panel);
 static void handle_edit_symlink (GtkWidget *widget, WPanel *panel);
 
-/* Generic Options */
-static void handle_display_properties (GtkWidget *widget, WPanel *panel);
-static void handle_rescan (GtkWidget *widget, WPanel *panel);
-static void handle_arrange_icons (GtkWidget *widget, WPanel *panel);
-static void handle_logout (GtkWidget *widget, WPanel *panel);
 
 /* global vars */
 extern int we_can_afford_the_speed;
@@ -75,9 +71,10 @@
 static struct action file_actions[] = {
 	{ N_("Open"),			F_NOTDEV,				handle_open },
 	{ "",				F_NOTDEV,				NULL },
+	{ "",				F_MIME_ACTIONS,				NULL },
 	{ N_("Open with..."),		F_REGULAR | F_SINGLE, 			handle_open_with },
 	{ N_("View"),			F_REGULAR | F_SINGLE, 			handle_view },
-	{ N_("View Unfiltered"),	F_REGULAR | F_ADVANCED | F_SINGLE,	handle_view_unfiltered },  
+	{ N_("View Unfiltered"),	F_REGULAR | F_ADVANCED | F_SINGLE,	handle_view_unfiltered },
 	{ N_("Edit"),			F_REGULAR | F_SINGLE, 			handle_edit },
 	{ "",				F_REGULAR | F_SINGLE, 			NULL },
 	{ N_("Copy..."),		F_ALL, 					handle_copy },
@@ -170,11 +167,103 @@
 	gnome_app_fill_menu_custom (menu_shell, uiinfo, &uibdata, NULL, FALSE, pos);
 }
 
+/* Convenience function to free something when an object is destroyed */
+static void
+free_on_destroy (GtkObject *object, gpointer data)
+{
+	g_free (data);
+}
+
+/* Callback for MIME-based actions */
+static void
+mime_action_callback (GtkWidget *widget, gpointer data)
+{
+	char *filename;
+	char *key;
+	char *mime_type;
+	char *value;
+
+	filename = data;
+	key = gtk_object_get_user_data (GTK_OBJECT (widget));
 
-/* The context menu: text displayed, condition that must be met and the routine
- * that gets invoked upon activation.
+	g_assert (filename != NULL);
+	g_assert (key != NULL);
+
+	mime_type = gnome_mime_type_or_default (filename, NULL);
+	g_assert (mime_type != NULL);
+
+	value = gnome_mime_get_value (mime_type, key);
+	exec_extension (filename, value, NULL, NULL, 0);
+}
+
+/* Creates the menu items for actions based on the MIME type of the selected
+ * file in the panel.
  */
+static int
+create_mime_actions (GtkWidget *menu, WPanel *panel, int pos)
+{
+	char *full_name;
+	const char *mime_type;
+	GList *keys, *l;
+	GnomeUIInfo uiinfo[] = {
+		{ 0 },
+		GNOMEUIINFO_END
+	};
+
+	full_name = g_concat_dir_and_file (panel->cwd, panel->dir.list[panel->selected].fname);
+	mime_type = gnome_mime_type_or_default (full_name, NULL);
+	g_free (full_name);
+
+	if (!mime_type)
+		return pos;
+
+	keys = gnome_mime_get_keys (mime_type);
+	for (l = keys; l; l = l->next) {
+		char *key;
+		char *str;
+
+		str = key = l->data;
+
+		if (strncmp (key, "open.", 5) != 0)
+			continue;
+
+		str += 5;
+		while (*str && *str != '.')
+			str++;
+
+		if (*str)
+			str++;
+
+		if (!*str)
+			continue;
+
+		/* Create the item for that entry */
+
+		uiinfo[0].type = GNOME_APP_UI_ITEM;
+		uiinfo[0].label = str;
+		uiinfo[0].hint = NULL;
+		uiinfo[0].moreinfo = mime_action_callback;
+		uiinfo[0].user_data = full_name;
+		uiinfo[0].unused_data = NULL;
+		uiinfo[0].pixmap_type = GNOME_APP_PIXMAP_NONE;
+		uiinfo[0].pixmap_info = NULL;
+		uiinfo[0].accelerator_key = 0;
+		uiinfo[0].ac_mods = 0;
+		uiinfo[0].widget = NULL;
+
+		fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos++);
+		gtk_object_set_user_data (GTK_OBJECT (uiinfo[0].widget), key);
 
+		/* Remember to free this memory */
+
+		gtk_signal_connect (GTK_OBJECT (uiinfo[0].widget), "destroy",
+				    (GtkSignalFunc) free_on_destroy,
+				    full_name);
+	}
+
+	g_list_free (keys);
+	return pos;
+}
 
 /* Creates the menu items for the standard actions.  Returns the position at
  * which additional menu items should be inserted.
@@ -192,9 +281,17 @@
 	pos = 0;
 
 	for (action = file_actions; action->text; action++) {
+		/* Insert the MIME actions if appropriate */
+		if ((action->flags & F_MIME_ACTIONS) && (flags & F_SINGLE)) {
+			pos = create_mime_actions (menu, panel, pos);
+			continue;
+		}
+
+		/* Filter the actions that are not appropriate */
 		if ((action->flags & flags) != action->flags)
 			continue;
 
+		/* Create the menu item for this action */
 		if (action->text[0]) {
 			uiinfo[0].type = GNOME_APP_UI_ITEM;
 			uiinfo[0].label = _(action->text);
@@ -309,27 +406,12 @@
 }
 
 static void
-panel_action_open_with (GtkWidget *widget, WPanel *panel)
-{
-	char *command;
-	
-	command = input_expand_dialog (_(" Open with..."),
-				       _("Enter extra arguments:"),
-				       panel->dir.list [panel->selected].fname);
-	if (!command)
-		return;
-
-	execute (command);
-	g_free (command);
-}
-
-static void
 handle_open (GtkWidget *widget, WPanel *panel)
 {
 	if (do_enter (panel))
 		return;
 
-	panel_action_open_with (widget, panel);
+	handle_open_with (widget, panel);
 }
 
 static void
@@ -373,14 +455,13 @@
 handle_properties (GtkWidget *widget, WPanel *panel)
 {
 	gint retval;
-	file_entry *fe = &panel->dir.list [panel->selected];
-	char *full_name = concat_dir_and_file (panel->cwd, fe->fname);
+	file_entry *fe;
+	char *full_name;
 	GtkWidget *dlg;
 
-#if 0
-	if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0)
-		reread_cmd ();
-#endif
+	fe = &panel->dir.list [panel->selected];
+	full_name = concat_dir_and_file (panel->cwd, fe->fname);
+
 	dlg = gnome_file_property_dialog_new (full_name, we_can_afford_the_speed);
 	gnome_dialog_set_parent (GNOME_DIALOG (dlg),
 				 GTK_WINDOW (gtk_widget_get_toplevel (panel->ministatus)));
@@ -399,7 +480,7 @@
 {
 	char *command;
 
-	command = input_expand_dialog (_(" Open with..."),
+	command = input_expand_dialog (_("Open with"),
 				       _("Enter extra arguments:"),
 				       panel->dir.list [panel->selected].fname);
 	if (!command)
@@ -429,28 +510,7 @@
 }
 
 static void
-handle_display_properties (GtkWidget *widget, WPanel *panel)
-{
-	/* FIXME */
-	g_warning ("FIXME: implement popup_handle_display_properties()");
-}
-
-static void
 handle_rescan (GtkWidget *widget, WPanel *panel)
 {
 	reread_cmd ();
-}
-
-static void
-handle_arrange_icons (GtkWidget *widget, WPanel *panel)
-{
-	/* FIXME */
-	g_warning ("FIXME: implement popup_handle_arrange_icons()");
-}
-
-static void
-handle_logout (GtkWidget *widget, WPanel *panel)
-{
-	/* FIXME */
-	g_warning ("FIXME: implement popup_handle_logout()");
 }
diff -ruN old/mc-4.5.14/gnome/gprefs.c new/mc-4.5.15/gnome/gprefs.c
--- old/mc-4.5.14/gnome/gprefs.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gprefs.c	Mon Feb 15 18:29:19 1999
@@ -72,24 +72,6 @@
 typedef GtkWidget* (*CustomCreateFunc) (PrefsDlg *dlg, Property *prop);
 typedef void (*CustomApplyFunc) (PrefsDlg *dlg, Property *prop);
 
-static void
-gnome_toggle_show_backup (void)
-{
-    show_backups = !show_backups;
-}
-
-static void
-gnome_toggle_show_hidden (void)
-{
-    show_dot_files = !show_dot_files;
-}
-
-static void
-toggle_mix_all_files (void)
-{
-    mix_all_files = !mix_all_files;
-}
-
 static Property file_display_props [] = 
 {
         {
@@ -135,11 +117,11 @@
 static Property vfs_props [] =
 {
         {
-                N_("VFS Timeout :"), PROPERTY_INT,
+                N_("VFS Timeout:"), PROPERTY_INT,
                 &vfs_timeout, N_("Seconds"), NULL, NULL
         },
         {
-                N_("Anonymous FTP password :"), PROPERTY_STRING,
+                N_("Anonymous FTP password:"), PROPERTY_STRING,
                 &ftpfs_anonymous_passwd, NULL, NULL, NULL
         },
         {
@@ -252,7 +234,7 @@
         while (cur_prop.label != NULL) {
                 switch (cur_prop.type) {
                 case PROPERTY_NONE :
-                        g_warning ("Invalid case in gprefs.c:apply_page_changes");
+                        g_warning ("Invalid case in gprefs.c:  apply_page_changes");
                         break;
                 case PROPERTY_BOOL : 
                         apply_changes_bool (dlg, &cur_prop);
@@ -411,7 +393,7 @@
 {
         switch (prop->type) {
         case PROPERTY_NONE :
-                g_warning ("Invalid case in gprefs.c - create_prop_widget");
+                g_warning ("Invalid case in gprefs.c:  create_prop_widget");
                 break;
         case PROPERTY_BOOL :
                 return create_prop_bool (dlg, prop);
@@ -458,8 +440,11 @@
 {
         gint i;
         PrefsPage *cur_page;
-        
-        dlg->prop_box = gnome_property_box_new ();
+
+	dlg->prop_box = gnome_property_box_new ();
+	gnome_dialog_set_parent (GNOME_DIALOG (dlg->prop_box), GTK_WINDOW (dlg->panel->xwindow));
+	gtk_window_set_modal (GTK_WINDOW (dlg->prop_box), TRUE);
+	gtk_window_set_title (GTK_WINDOW (dlg->prop_box), _("Preferences"));
 
         i = 0;
         cur_page = &(dlg->prefs_pages [i]);
@@ -468,19 +453,19 @@
                 i++;
                 cur_page = &(dlg->prefs_pages [i]);
         }
-        
+
         gtk_signal_connect (GTK_OBJECT (dlg->prop_box), "apply",
                             GTK_SIGNAL_FUNC (apply_callback), dlg);
 }
+
 void
 gnome_configure_box (GtkWidget *widget, WPanel *panel)
 {
-        static PrefsDlg dlg;
+	static PrefsDlg dlg;
 
         dlg.panel = panel;
         dlg.prefs_pages = prefs_pages;
 
         create_prop_box (&dlg);
-
         gtk_widget_show (dlg.prop_box);
 }
diff -ruN old/mc-4.5.14/gnome/gscreen.c new/mc-4.5.15/gnome/gscreen.c
--- old/mc-4.5.14/gnome/gscreen.c	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/gscreen.c	Mon Feb 15 18:29:19 1999
@@ -77,6 +77,8 @@
 GtkWidget *drag_multiple     = NULL;
 GtkWidget *drag_multiple_ok  = NULL;
 
+static void file_list_popup (GdkEventButton *event, WPanel *panel);
+
 
 void
 repaint_file (WPanel *panel, int file_index, int move, int attr, int isstatus)
@@ -462,12 +464,18 @@
 	if (event->type == GDK_BUTTON_PRESS && event->button.button == 3) {
 		gint row, column;
 
-		gtk_clist_get_selection_info (GTK_CLIST (file_list),
-					      event->button.x, event->button.y,
-					      &row, &column);
-		gtk_clist_select_row (GTK_CLIST (file_list), row, 0);
-		gpopup_do_popup ((GdkEventButton *) event, panel, NULL,
-				 row, panel->dir.list[row].fname);
+		if (gtk_clist_get_selection_info (GTK_CLIST (file_list),
+						  event->button.x, event->button.y,
+						  &row, &column)) {
+			gtk_clist_select_row (GTK_CLIST (file_list), row, 0);
+#if 0
+			gpopup_do_popup2 ((GdkEventButton *) event, panel);
+#else
+			gpopup_do_popup ((GdkEventButton *) event, panel,
+					 NULL, row, panel->dir.list[row].fname);
+#endif
+		} else
+			file_list_popup ((GdkEventButton *) event, panel);
 	}
 	return TRUE;
 }
@@ -1361,9 +1369,14 @@
 
 	switch (event->type){
 	case GDK_BUTTON_PRESS:
-		if (event->button.button == 3)
-			gpopup_do_popup ((GdkEventButton *) event, panel, NULL,
-					 index, panel->dir.list[index].fname);
+		if (event->button.button == 3) {
+#if 0
+			gpopup_do_popup2 ((GdkEventButton *) event, panel);
+#else
+			gpopup_do_popup ((GdkEventButton *) event, panel,
+					 NULL, index, panel->dir.list[index].fname);
+#endif
+		}
 		break;
 
 	case GDK_BUTTON_RELEASE:
@@ -1412,6 +1425,34 @@
 		return FALSE;
 }
 
+/* Callback for rescanning the cwd */
+static void
+handle_rescan_directory (GtkWidget *widget, gpointer data)
+{
+	reread_cmd ();
+}
+
+/* The popup menu for file panels */
+static GnomeUIInfo file_list_popup_items[] = {
+	GNOMEUIINFO_ITEM_NONE (N_("Rescan Directory"), N_("Reloads the current directory"),
+			       handle_rescan_directory),
+	GNOMEUIINFO_END
+};
+
+/* Creates the popup menu when the user clicks button 3 on the blank area of the
+ * file panels.
+ */
+static void
+file_list_popup (GdkEventButton *event, WPanel *panel)
+{
+	GtkWidget *popup;
+
+	popup = gnome_popup_menu_new (file_list_popup_items);
+	gnome_popup_menu_do_popup_modal (popup, NULL, NULL, event, panel);
+	gtk_widget_destroy (popup);
+}
+
+
 /*
  * Strategy for activaing the drags from the icon-list:
  *
@@ -1430,11 +1471,8 @@
 	icon = gnome_icon_list_get_icon_at (gil, event->x, event->y);
 
 	if (icon == -1) {
-		if (event->button == 3) {
-#if 0
-			g_warning ("FIXME: icon_list_button_press menu");
-			gpopup_do_popup ((GdkEventButton *) event, panel, NULL, FALSE);
-#endif
+		if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+			file_list_popup (event, panel);
 			return TRUE;
 		}
 	} else if (event->button != 3)
@@ -2297,10 +2335,19 @@
 }
 
 static void
+rescan_panel (GtkWidget *widget, gpointer data)
+{
+	reread_cmd ();
+}
+
+static void
 go_home (GtkWidget *widget, WPanel *panel)
 {
 	do_panel_cd (panel, "~", cd_exact);
 }
+
+/* View mode radio buttons for toolbar */
+
 static GnomeUIInfo viewbar[] = {
 	{ GNOME_APP_UI_ITEM, N_("Icon"), N_("Switch view to an Icon view"), do_switch_to_iconic, NULL, NULL, \
 		GNOME_APP_PIXMAP_DATA, listing_iconic_xpm, 0, (GdkModifierType) 0, NULL },
@@ -2312,6 +2359,9 @@
 		GNOME_APP_PIXMAP_DATA, listing_custom_xpm, 0, (GdkModifierType) 0, NULL },
 	GNOMEUIINFO_END
 };
+
+/* The toolbar */
+
 static GnomeUIInfo toolbar[] = {
 	GNOMEUIINFO_ITEM_STOCK (N_("Back"), N_("Go to the previously visited directory"),
 				panel_back, GNOME_STOCK_PIXMAP_BACK),
@@ -2319,6 +2369,9 @@
 				panel_up, GNOME_STOCK_PIXMAP_UP),
 	GNOMEUIINFO_ITEM_STOCK (N_("Forward"), N_("Go to the next directory"),
 				panel_fwd, GNOME_STOCK_PIXMAP_FORWARD),
+	GNOMEUIINFO_SEPARATOR,
+	GNOMEUIINFO_ITEM_STOCK (N_("Rescan"), N_("Rescan the current directory"),
+				rescan_panel, GNOME_STOCK_PIXMAP_REFRESH),
 	GNOMEUIINFO_SEPARATOR,
 	GNOMEUIINFO_ITEM_STOCK (N_("Home"), N_("Go to your home directory"),
 				go_home, GNOME_STOCK_PIXMAP_HOME),
diff -ruN old/mc-4.5.14/gnome/listing-brief-list.xpm new/mc-4.5.15/gnome/listing-brief-list.xpm
--- old/mc-4.5.14/gnome/listing-brief-list.xpm	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/listing-brief-list.xpm	Mon Feb 15 18:29:18 1999
@@ -1,22 +1,44 @@
 /* XPM */
 static char * listing_brief_list_xpm[] = {
-"19 16 3 1",
+"24 24 17 1",
 " 	c None",
 ".	c #000000",
-"+	c #FFFF00",
-"                   ",
-" ...               ",
-" .+...  .          ",
-" .+++.  .          ",
-" .....  .....  ... ",
-"                   ",
-" ...               ",
-" .+...  .          ",
-" .+++.  .          ",
-" .....  .....  ... ",
-"                   ",
-" ...               ",
-" .+...  .          ",
-" .+++.  .          ",
-" .....  .....  ... ",
-"                   "};
+"+	c #A59A7C",
+"@	c #EEEADC",
+"#	c #F1ECE0",
+"$	c #CCC4AF",
+"%	c #E2D8B9",
+"&	c #EAE4D0",
+"*	c #C4B893",
+"=	c #C0B591",
+"-	c #AFA586",
+";	c #9F9679",
+">	c #BDB18F",
+",	c #9E9377",
+"'	c #8F866D",
+")	c #040404",
+"!	c #0C0C0B",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"   ...                  ",
+"  .+++...               ",
+"  .@##@$%. .            ",
+"  .&**=--. .            ",
+"  .&*=--;. .   .        ",
+"  .&>--,'. . .. .       ",
+"   ......               ",
+"                        ",
+"   ...                  ",
+"  .+++...               ",
+"  .@##@$%. .            ",
+"  .&**=--. .            ",
+"  .&*=--;. .  .         ",
+"  .&>--,'. ... .        ",
+"  )!.....               ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff -ruN old/mc-4.5.14/gnome/listing-custom.xpm new/mc-4.5.15/gnome/listing-custom.xpm
--- old/mc-4.5.14/gnome/listing-custom.xpm	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/listing-custom.xpm	Mon Feb 15 18:29:18 1999
@@ -1,23 +1,69 @@
 /* XPM */
 static char * listing_custom_xpm[] = {
-"19 16 4 1",
+"24 24 42 1",
 " 	c None",
 ".	c #000000",
-"+	c #FFFF00",
-"@	c #FFFFFF",
-"                   ",
-" ...       ...     ",
-" .+...  . .@@@.    ",
-" .+++.  ..@@@@@.   ",
-" .....  .@@...@@.. ",
-"        .@@. .@@.  ",
-" ...     ..  .@@.  ",
-" .+...  .   .@@.   ",
-" .+++.  .  .@@.    ",
-" .....  ...@@. ... ",
-"           ..      ",
-" ...      .@@.     ",
-" .+...  . .@@.     ",
-" .+++.  .  ..      ",
-" .....  .....  ... ",
-"                   "};
+"+	c #DAB7B7",
+"@	c #E7D2D2",
+"#	c #CC9D9D",
+"$	c #C28989",
+"%	c #773E3E",
+"&	c #A59A7C",
+"*	c #F0E3E3",
+"=	c #E9D6D6",
+"-	c #D0A5A5",
+";	c #CA9999",
+">	c #904B4B",
+",	c #EEEADC",
+"'	c #F1ECE0",
+")	c #CCC4AF",
+"!	c #E2D8B9",
+"~	c #E9D4D4",
+"{	c #DEC1C1",
+"]	c #A75656",
+"^	c #A45555",
+"/	c #AA5B5B",
+"(	c #EAE4D0",
+"_	c #C4B893",
+":	c #C0B591",
+"<	c #AFA586",
+"[	c #D8B5B5",
+"}	c #BA7979",
+"|	c #9F9679",
+"1	c #BB7C7C",
+"2	c #BDB18F",
+"3	c #9E9377",
+"4	c #8F866D",
+"5	c #DAB9B9",
+"6	c #9C5151",
+"7	c #E5CCCC",
+"8	c #D6AFAF",
+"9	c #894646",
+"0	c #E2C7C7",
+"a	c #040404",
+"b	c #0C0C0B",
+"c	c #AD6262",
+"                        ",
+"                        ",
+"                        ",
+"              .....     ",
+"   ...       .+@#$%.    ",
+"  .&&&...   .*=---;>.   ",
+"  .,'',)!. .~{]...^;/.  ",
+"  .(__:<<. .[}..  .{;.  ",
+"  .(_:<<|. ... . ..{1. .",
+"  .(2<<34. . .. ..5;6.. ",
+"   ......       .{;6.   ",
+"               .7;6.    ",
+"   ...        .{;%.     ",
+"  .&&&...     .8;9.     ",
+"  .,'',)!. .   ....     ",
+"  .(__:<<. .      .  .  ",
+"  .(_:<<|. .  .... . .  ",
+"  .(2<<34. ....086. . ..",
+"  ab.....     .cc6.     ",
+"               ...      ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff -ruN old/mc-4.5.14/gnome/listing-iconic.xpm new/mc-4.5.15/gnome/listing-iconic.xpm
--- old/mc-4.5.14/gnome/listing-iconic.xpm	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/listing-iconic.xpm	Mon Feb 15 18:29:18 1999
@@ -1,22 +1,42 @@
 /* XPM */
 static char * listing_iconic_xpm[] = {
-"19 16 3 1",
+"24 24 15 1",
 " 	c None",
-".	c #000000000000",
-"X	c #FFFFFFFF0000",
-"                   ",
-"                   ",
-"  ...     ...      ",
-"  .X....  .X....   ",
-"  .XXXX.  .XXXX.   ",
-"  .XXXX.  .XXXX.   ",
-"  ......  ......   ",
-"                   ",
-"                   ",
-"  ...     ...      ",
-"  .X....  .X....   ",
-"  .XXXX.  .XXXX.   ",
-"  .XXXX.  .XXXX.   ",
-"  ......  ......   ",
-"                   ",
-"                   "};
+".	c #000000",
+"+	c #A59A7C",
+"@	c #EEEADC",
+"#	c #F1ECE0",
+"$	c #CCC4AF",
+"%	c #E2D8B9",
+"&	c #EAE4D0",
+"*	c #C4B893",
+"=	c #C0B591",
+"-	c #AFA586",
+";	c #9F9679",
+">	c #BDB18F",
+",	c #9E9377",
+"'	c #8F866D",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"    ...        ...      ",
+"   .+++...    .+++...   ",
+"   .@##@$%.   .@##@$%.  ",
+"   .&**=--.   .&**=--.  ",
+"   .&*=--;.   .&*=--;.  ",
+"   .&>--,'.   .&>--,'.  ",
+"    ......     ......   ",
+"                        ",
+"                        ",
+"    ...        ...      ",
+"   .+++...    .+++...   ",
+"   .@##@$%.   .@##@$%.  ",
+"   .&**=--.   .&**=--.  ",
+"   .&*=--;.   .&*=--;.  ",
+"   .&>--,'.   .&>--,'.  ",
+"    ......     ......   ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff -ruN old/mc-4.5.14/gnome/listing-list.xpm new/mc-4.5.15/gnome/listing-list.xpm
--- old/mc-4.5.14/gnome/listing-list.xpm	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/listing-list.xpm	Mon Feb 15 18:29:18 1999
@@ -1,22 +1,44 @@
 /* XPM */
 static char * listing_list_xpm[] = {
-"19 16 3 1",
+"24 24 17 1",
 " 	c None",
-".	c #000000000000",
-"X	c #FFFFFFFF0000",
-"                   ",
-" ...               ",
-" .X...  .          ",
-" .XXX.  .. .    .  ",
-" .....  .....  ... ",
-"                   ",
-" ...               ",
-" .X...      .      ",
-" .XXX.  .   ..  .  ",
-" .....  .......... ",
-"                   ",
-" ...               ",
-" .X...  .   .      ",
-" .XXX.  .. ..    . ",
-" .....  .......... ",
-"                   "};
+".	c #000000",
+"+	c #A59A7C",
+"@	c #EEEADC",
+"#	c #F1ECE0",
+"$	c #CCC4AF",
+"%	c #E2D8B9",
+"&	c #EAE4D0",
+"*	c #C4B893",
+"=	c #C0B591",
+"-	c #AFA586",
+";	c #9F9679",
+">	c #BDB18F",
+",	c #9E9377",
+"'	c #8F866D",
+")	c #040404",
+"!	c #0C0C0B",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"   ...             .    ",
+"  .+++...               ",
+"  .@##@$%. .       .    ",
+"  .&**=--. .   .   .    ",
+"  .&*=--;. .   . . ... .",
+"  .&>--,'. . .. . ..  . ",
+"   ......               ",
+"                        ",
+"   ...                  ",
+"  .+++...               ",
+"  .@##@$%. .      .     ",
+"  .&**=--. .      .  .  ",
+"  .&*=--;. .  .  . . .  ",
+"  .&>--,'. ... . .  . ..",
+"  )!.....               ",
+"                        ",
+"                        ",
+"                        ",
+"                        ",
+"                        "};
diff -ruN old/mc-4.5.14/gnome/mc.keys.in.in new/mc-4.5.15/gnome/mc.keys.in.in
--- old/mc-4.5.14/gnome/mc.keys.in.in	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/gnome/mc.keys.in.in	Mon Feb 15 18:29:18 1999
@@ -97,7 +97,7 @@
 
 application/postscript:
 	open=gv %f
-	icon-filename=@icondir@/postscript.xpm
+	icon-filename=@icondir@/gnome-application-postscript.png
 
 application/x-object-file:
 	icon-filename=@icondir@/o.xpm
@@ -128,16 +128,14 @@
 
 text/html:
 	icon-filename=@icondir@/gnome-text-html.png
-	open=gnome-moz-remote %f
-	open.netscape.View this file with Netscape=gnome-moz-remote %f
+	open=gnome-moz-remote file:%d/%f
+	open.netscape.View this file with Netscape=gnome-moz-remote file:%d/%f
 
 application/vcard:
 	icon-filename=@gnomeicons@/gnome-calendar.png
 
 x-url/http:
 	icon-filename=@icondir@/gnome-text-url.png
-
-x-url/http:
 	open=gnome-moz-remote %f
 
 x-url/ftp:
@@ -147,12 +145,12 @@
 	open=gnome-moz-remote %f
 
 application/x-troff-man:
-	icon-filename=@icondir@/man.xpm
+	icon-filename=@icondir@/gnome-manpage.png
 	fm-view=%view{ascii,nroff} nroff @TROFFASCII@ @MANDOC@ %f
 
 application/x-troff-man-compressed:
 	fm-view=%view{ascii,nroff} gunzip -dc %f | nroff @TROFFASCII@ @MANDOC@
-	icon-filename=@icondir@/gnome-compressed.png
+	icon-filename=@icondir@/gnome-manpage.png
 
 application/x-troff-ms:
 	fm-view=%view{ascii,nroff} nroff @TROFFASCII@ -ms %f
diff -ruN old/mc-4.5.14/gtkedit/editcmd.c new/mc-4.5.15/gtkedit/editcmd.c
--- old/mc-4.5.14/gtkedit/editcmd.c	Thu Feb 11 21:44:23 1999
+++ new/mc-4.5.15/gtkedit/editcmd.c	Mon Feb 15 18:29:09 1999
@@ -2261,8 +2261,16 @@
 	unlink (catstrs (edit->dir, edit->filename, 0));
 #endif
 #ifdef MIDNIGHT
-    edit->widget.parent->running = 0;
+    dlg_stop (edit->widget.parent);
 #else
+#ifdef GTK
+    {
+	    extern char *edit_one_file;
+
+	    if (edit_one_file)
+		    gtk_main_quit ();
+    }
+#endif
     edit->stopped = 1;
 #endif
 }
diff -ruN old/mc-4.5.14/new_icons/Makefile.in new/mc-4.5.15/new_icons/Makefile.in
--- old/mc-4.5.14/new_icons/Makefile.in	Thu Feb 11 21:44:25 1999
+++ new/mc-4.5.15/new_icons/Makefile.in	Mon Feb 15 18:29:19 1999
@@ -13,38 +13,41 @@
 #
 
 DISTICONS = Makefile.in $(ALLICONS)
-ALLICONS = 				\
-	gnome-image-bmp.png		\
-	gnome-image-generic.png		\
-	gnome-image-gif.png		\
-	gnome-image-ief.png		\
-	gnome-image-jpeg.png		\
-	gnome-image-pbm.png		\
-	gnome-image-pgm.png		\
-	gnome-image-png.png		\
-	gnome-image-pnm.png		\
-	gnome-image-ppm.png		\
-	gnome-image-ras.png		\
-	gnome-image-rgb.png		\
-	gnome-image-tga.png		\
-	gnome-image-tiff.png		\
-	gnome-image-xbm.png		\
-	gnome-image-xpm.png		\
-	gnome-image-xwd.png		\
-	gnome-pack-deb.png		\
-	gnome-pack-rpm.png		\
-	gnome-video-mpeg.png		\
-	gnome-video-quicktime.png 	\
-	gnome-video-x-msvideo.png 	\
-	gnome-text-html.png		\
-	gnome-http-url.png		\
-	gnome-image-generic.png		\
-	gnome-application-x-c-header.png	\
-	gnome-application-x-c-source.png	\
-	gnome-application-x-cc-source.png \
-	gnome-package.png		\
-	gnome-compressed.png		\
-	gnome-core.png
+ALLICONS =						\
+	gnome-image-bmp.png				\
+	gnome-image-generic.png				\
+	gnome-image-gif.png				\
+	gnome-image-ief.png				\
+	gnome-image-jpeg.png				\
+	gnome-image-pbm.png				\
+	gnome-image-pgm.png				\
+	gnome-image-png.png				\
+	gnome-image-pnm.png				\
+	gnome-image-ppm.png				\
+	gnome-image-ras.png				\
+	gnome-image-rgb.png				\
+	gnome-image-tga.png				\
+	gnome-image-tiff.png				\
+	gnome-image-xbm.png				\
+	gnome-image-xpm.png				\
+	gnome-image-xwd.png				\
+	gnome-pack-deb.png				\
+	gnome-pack-rpm.png				\
+	gnome-video-mpeg.png				\
+	gnome-video-quicktime.png			\
+	gnome-video-x-msvideo.png			\
+	gnome-text-html.png				\
+	gnome-http-url.png				\
+	gnome-image-generic.png				\
+	gnome-application-encapsulated_postscript.png	\
+	gnome-application-postscript.png		\
+	gnome-application-x-c-header.png		\
+	gnome-application-x-c-source.png		\
+	gnome-application-x-cc-source.png		\
+	gnome-package.png				\
+	gnome-compressed.png				\
+	gnome-core.png					\
+	gnome-manpage.png
 
 all:
 
Binary files old/mc-4.5.14/new_icons/gnome-application-encapsulated_postscript.png and new/mc-4.5.15/new_icons/gnome-application-encapsulated_postscript.png differ
Binary files old/mc-4.5.14/new_icons/gnome-application-postscript.png and new/mc-4.5.15/new_icons/gnome-application-postscript.png differ
Binary files old/mc-4.5.14/new_icons/gnome-manpage.png and new/mc-4.5.15/new_icons/gnome-manpage.png differ
diff -ruN old/mc-4.5.14/pc/util_os2.c new/mc-4.5.15/pc/util_os2.c
--- old/mc-4.5.14/pc/util_os2.c	Thu Feb 11 21:44:26 1999
+++ new/mc-4.5.15/pc/util_os2.c	Mon Feb 15 18:29:20 1999
@@ -49,6 +49,13 @@
 #include "../src/util.h"
 #include "../src/dialog.h"
 
+#ifdef get_default_editor
+#undef get_default_editor
+#endif
+
+char *get_default_shell();
+
+
 #ifndef ENOTEMPTY
 #define ENOTEMPTY ERROR_DIR_NOT_EMPTY
 #endif
@@ -167,9 +174,21 @@
    char *parm;          /* This is the parameter (can be more than one) */
    register int length, i;
    char temp[4096];     /* That's enough! */
+   char *t, *t1;
 
    sh = get_default_shell();
-   if (strcmp(sh, shell)) {
+   if (!strcmp("/bin/sh", shell)) {	/* Translate "/bin/sh" to "sh" */
+	return spawnlp(P_WAIT, "sh", shell, "-c", command, NULL);
+   } else if (( (t = strrchr(shell,'/'))	/* Specialcase Bourne */
+		|| (t = strrchr(shell,'\\')))
+		&& (t1 = strchr(t, '.'))
+		&& (
+		    ((t1 - t == 4) && strncmp("bash", t, 4))
+		    || ((t1 - t == 3) && strncmp("ksh", t, 3))
+		    || ((t1 - t == 2) && strncmp("sh", t, 2))
+		   )) {
+	return spawnlp(P_WAIT, shell, shell, "-c", command, NULL);
+   } else if (strcmp(sh, shell)) {
       /* 
          Not equal  -- That means: shell is the program and command is the
          parameter 
@@ -524,6 +543,7 @@
     free(pFsInfo);
 }
 
+#ifndef __EMX__
 int 
 gettimeofday (struct timeval* tvp, void *p)
 {
@@ -540,6 +560,7 @@
     tvp->tv_sec = tvp->tv_usec * 1000 + pdt.hundredths * 10;
     return 0;
 }
+#endif
 
 /* FAKE functions */
 
@@ -634,7 +655,7 @@
 int 
 mc_doublepopen (int inhandle, int inlen, pid_t *the_pid, char *command, ...)
 {
-	return 0;
+	return -1;
 }
 
 int 
@@ -643,12 +664,14 @@
 	return 0;
 }
 
+#ifndef HAVE_VFS
 /*hacks to get it compile, remove these after vfs works */
 char *
 vfs_get_current_dir (void)
 {
 	return NULL;
 }
+#endif
 
 int 
 vfs_current_is_extfs (void)
@@ -656,6 +679,7 @@
 	return 0;
 }
 
+#ifndef HAVE_VFS
 int 
 vfs_file_is_ftp (char *filename)
 {
@@ -674,14 +698,34 @@
 {
    return;
 }
+#endif
+
+void *
+getgrent(void) {   return NULL; }
+
+void
+setgrent(void) {}
+
+void
+endgrent(void) {}
+
+int
+setreuid(uid_t ruid, uid_t euid) {    return -1; }
+
+pid_t
+setsid(void) { return (pid_t)-1; }
 
 int
-geteuid(void)
+mkfifo(const char *path, mode_t mode) { return -1; }
+
+int 
+socketpair(int i, int i1, int i2, int *i3)
 {
-   return 0;
+   return -1;
 }
 
 
+#ifndef HAVE_VFS
 int
 mc_chdir(char *pathname)
 {
@@ -711,6 +755,7 @@
    int os2Mode = unxmode & 0x0FFF;
    return chmod(pathName, os2Mode);
 }
+#endif
 
 static int
 conv_os2_unx_rc(int os2rc)
@@ -738,6 +783,7 @@
    return errCode;
 }
 
+#ifndef HAVE_VFS
 int
 mc_open (char *file, int flags, int pmode)
 {
@@ -768,6 +814,7 @@
       return -1;
    }
 }
+#endif
 
 char *
 get_default_editor (void)
diff -ruN old/mc-4.5.14/po/cat-id-tbl.c new/mc-4.5.15/po/cat-id-tbl.c
--- old/mc-4.5.14/po/cat-id-tbl.c	Thu Feb 11 21:44:27 1999
+++ new/mc-4.5.15/po/cat-id-tbl.c	Mon Feb 15 18:29:23 1999
@@ -55,59 +55,59 @@
   {"Trashcan", 42},
   {"Home directory", 43},
   {"Could not symlink %s to %s; will not have initial desktop icons.", 44},
-  {"To: ", 45},
-  {"Copying from: ", 46},
-  {"Deleting file: ", 47},
-  {"Files Exist", 48},
+  {"Arrange Icons", 45},
+  {"Rescan Desktop", 46},
+  {"To: ", 47},
+  {"Copying from: ", 48},
+  {"Deleting file: ", 49},
+  {"Files Exist", 50},
   {"\
 Some of the files you are trying to copy already exist in the destination \
-folder.", 49},
-  {"Prompt me before overwriting any file.", 50},
-  {"Don't overwrite any files.", 51},
-  {"Overwrite:", 52},
-  {"Older files.", 53},
-  {"Files only if size differs.", 54},
-  {"All files.", 55},
-  {"File Exists", 56},
-  {"The target file already exists: %s", 57},
-  {"Replace it?", 58},
-  {"Copy", 59},
-  {"Move", 60},
-  {"Destination", 61},
-  {"Find Destination Folder", 62},
-  {"Copy as a background process", 63},
-  {"Advanced Options", 64},
-  {"Preserve symlinks", 65},
-  {"Follow links.", 66},
+folder.", 51},
+  {"Prompt me before overwriting any file.", 52},
+  {"Don't overwrite any files.", 53},
+  {"Overwrite:", 54},
+  {"Older files.", 55},
+  {"Files only if size differs.", 56},
+  {"All files.", 57},
+  {"File Exists", 58},
+  {"The target file already exists: %s", 59},
+  {"Replace it?", 60},
+  {"Copy", 61},
+  {"Move", 62},
+  {"Destination", 63},
+  {"Find Destination Folder", 64},
+  {"Copy as a background process", 65},
+  {"Advanced Options", 66},
+  {"Preserve symlinks", 67},
+  {"Follow links.", 68},
   {"\
 Selecting this will copy the files that symlinks point to instead of just \
-copying the link.", 67},
-  {"Preserve file attributes.", 68},
-  {"Preserves the permissions and the UID/GID if possible", 69},
-  {"Recursively copy subdirectories.", 70},
-  {"If set, this will copy the directories recursively", 71},
-  {"Move Progress", 72},
-  {"Copy Progress", 73},
-  {"Delete Progress", 74},
-  {"File ", 75},
-  {" is ", 76},
-  {" Done.", 77},
-  {"_Move here", 78},
-  {"_Copy here", 79},
-  {"_Link here", 80},
-  {"Cancel drag", 81},
+copying the link.", 69},
+  {"Preserve file attributes.", 70},
+  {"Preserves the permissions and the UID/GID if possible", 71},
+  {"Recursively copy subdirectories.", 72},
+  {"If set, this will copy the directories recursively", 73},
+  {"Move Progress", 74},
+  {"Copy Progress", 75},
+  {"Delete Progress", 76},
+  {"File ", 77},
+  {" is ", 78},
+  {" Done.", 79},
+  {"_Move here", 80},
+  {"_Copy here", 81},
+  {"_Link here", 82},
+  {"Cancel drag", 83},
   {"\
 Could not stat %s\n\
-%s", 82},
-  {"Error", 83},
-  {"Default set of icons not found, check your installation", 84},
-  {"Enter command to run", 85},
-  {"_Terminal", 86},
-  {"Launch a new terminal in the current directory", 87},
-  {"_Directory...", 88},
-  {"Creates a new directory", 89},
-  {"New _Window", 90},
-  {"Opens a new window", 91},
+%s", 84},
+  {"Error", 85},
+  {"Default set of icons not found, check your installation", 86},
+  {"Enter command to run", 87},
+  {"_Terminal", 88},
+  {"Launch a new terminal in the current directory", 89},
+  {"_Directory...", 90},
+  {"Creates a new directory", 91},
   {"_Copy...", 92},
   {"Copy files", 93},
   {"_Delete...", 94},
@@ -163,9 +163,9 @@
   {"Confirm when overwriting files", 144},
   {"Confirm when executing files", 145},
   {"Show progress while operations are being performed", 146},
-  {"VFS Timeout :", 147},
+  {"VFS Timeout:", 147},
   {"Seconds", 148},
-  {"Anonymous FTP password :", 149},
+  {"Anonymous FTP password:", 149},
   {"Always use FTP proxy", 150},
   {"Fast directory reload", 151},
   {"Compute totals before copying files", 152},
@@ -175,729 +175,734 @@
   {"Confirmation", 156},
   {"VFS", 157},
   {"Caching", 158},
-  {"Filename", 159},
-  {"Full name: ", 160},
-  {"Command", 161},
-  {"Command:", 162},
-  {"Use terminal", 163},
-  {"File mode (permissions)", 164},
-  {"Current mode: ", 165},
-  {"Read", 166},
-  {"Write", 167},
-  {"Exec", 168},
-  {"Special", 169},
-  {"User", 170},
-  {"Group", 171},
-  {"Other", 172},
-  {"Set UID", 173},
-  {"Set GID", 174},
-  {"Sticky", 175},
-  {"<Unknown>", 176},
-  {"Owner", 177},
-  {"General", 178},
-  {"Title", 179},
-  {"Icon", 180},
-  {"Select icon", 181},
-  {"All files", 182},
-  {"Archives and compressed files", 183},
-  {"RPM/DEB files", 184},
-  {"Text/Document files", 185},
-  {"HTML and SGML files", 186},
-  {"Postscript and PDF files", 187},
-  {"Spreadsheet files", 188},
-  {"Image files", 189},
-  {"Video/animation files", 190},
-  {"Audio files", 191},
-  {"C program files", 192},
-  {"C++ program files", 193},
-  {"Objective-C program files", 194},
-  {"Scheme program files", 195},
-  {"Assembler program files", 196},
-  {"Misc. program files", 197},
-  {"Font files", 198},
-  {"Search: %s", 199},
-  {"%s bytes in %d file", 200},
-  {"%s bytes in %d files", 201},
-  {"<readlink failed>", 202},
-  {"Filter", 203},
-  {"Switch view to an Icon view", 204},
-  {"Brief", 205},
-  {"Switch view to show just file name and type", 206},
-  {"Detailed", 207},
-  {"Switch view to show detailed file statistics", 208},
-  {"Custom", 209},
-  {"Switch view to show custom determined statistics.", 210},
-  {"Back", 211},
-  {"Go to the previously visited directory", 212},
-  {"Up", 213},
-  {"Go up a level in the directory heirarchy", 214},
-  {"Forward", 215},
-  {"Go to the next directory", 216},
-  {"Home", 217},
-  {"Go to your home directory", 218},
-  {"Location:", 219},
-  {"&Ok", 220},
-  {"Offset 0x%08x", 221},
-  {"Col %d", 222},
-  {"%s bytes", 223},
-  {"_Goto line", 224},
-  {"Jump to a specified line number", 225},
-  {"_Monitor file", 226},
-  {"Monitor file growing", 227},
-  {"Regexp search", 228},
-  {"Regular expression search", 229},
-  {"_Wrap", 230},
-  {"Wrap the text", 231},
-  {"_Parsed view", 232},
-  {"_Formatted", 233},
-  {"_Hex", 234},
-  {"_Search", 235},
-  {"ok", 236},
-  {"cancel", 237},
-  {"help", 238},
-  {"yes", 239},
-  {"no", 240},
-  {"exit", 241},
-  {"abort", 242},
-  {" Error ", 243},
-  {" Failed trying to open file for reading: ", 244},
-  {" Cannot get size/permissions info on file: ", 245},
-  {" Not an ordinary file: ", 246},
-  {" File is too large: ", 247},
+  {"Preferences", 159},
+  {"Filename", 160},
+  {"Full name: ", 161},
+  {"Command", 162},
+  {"Command:", 163},
+  {"Use terminal", 164},
+  {"File mode (permissions)", 165},
+  {"Current mode: ", 166},
+  {"Read", 167},
+  {"Write", 168},
+  {"Exec", 169},
+  {"Special", 170},
+  {"User", 171},
+  {"Group", 172},
+  {"Other", 173},
+  {"Set UID", 174},
+  {"Set GID", 175},
+  {"Sticky", 176},
+  {"<Unknown>", 177},
+  {"Owner", 178},
+  {"General", 179},
+  {"Title", 180},
+  {"Icon", 181},
+  {"Select icon", 182},
+  {"Rescan Directory", 183},
+  {"Reloads the current directory", 184},
+  {"All files", 185},
+  {"Archives and compressed files", 186},
+  {"RPM/DEB files", 187},
+  {"Text/Document files", 188},
+  {"HTML and SGML files", 189},
+  {"Postscript and PDF files", 190},
+  {"Spreadsheet files", 191},
+  {"Image files", 192},
+  {"Video/animation files", 193},
+  {"Audio files", 194},
+  {"C program files", 195},
+  {"C++ program files", 196},
+  {"Objective-C program files", 197},
+  {"Scheme program files", 198},
+  {"Assembler program files", 199},
+  {"Misc. program files", 200},
+  {"Font files", 201},
+  {"Search: %s", 202},
+  {"%s bytes in %d file", 203},
+  {"%s bytes in %d files", 204},
+  {"<readlink failed>", 205},
+  {"Filter", 206},
+  {"Switch view to an Icon view", 207},
+  {"Brief", 208},
+  {"Switch view to show just file name and type", 209},
+  {"Detailed", 210},
+  {"Switch view to show detailed file statistics", 211},
+  {"Custom", 212},
+  {"Switch view to show custom determined statistics.", 213},
+  {"Back", 214},
+  {"Go to the previously visited directory", 215},
+  {"Up", 216},
+  {"Go up a level in the directory heirarchy", 217},
+  {"Forward", 218},
+  {"Go to the next directory", 219},
+  {"Rescan", 220},
+  {"Rescan the current directory", 221},
+  {"Home", 222},
+  {"Go to your home directory", 223},
+  {"Location:", 224},
+  {"&Ok", 225},
+  {"Offset 0x%08x", 226},
+  {"Col %d", 227},
+  {"%s bytes", 228},
+  {"_Goto line", 229},
+  {"Jump to a specified line number", 230},
+  {"_Monitor file", 231},
+  {"Monitor file growing", 232},
+  {"Regexp search", 233},
+  {"Regular expression search", 234},
+  {"_Wrap", 235},
+  {"Wrap the text", 236},
+  {"_Parsed view", 237},
+  {"_Formatted", 238},
+  {"_Hex", 239},
+  {"_Search", 240},
+  {"ok", 241},
+  {"cancel", 242},
+  {"help", 243},
+  {"yes", 244},
+  {"no", 245},
+  {"exit", 246},
+  {"abort", 247},
+  {" Error ", 248},
+  {" Failed trying to open file for reading: ", 249},
+  {" Cannot get size/permissions info on file: ", 250},
+  {" Not an ordinary file: ", 251},
+  {" File is too large: ", 252},
   {"\
  \n\
- Increase edit.h:MAXBUF and recompile the editor. ", 248},
-  {" Error allocating memory ", 249},
-  {" Save As ", 250},
-  {" Warning ", 251},
-  {" A file already exists with this name. ", 252},
-  {"Overwrite", 253},
-  {"Cancel", 254},
-  {" Save as ", 255},
-  {" Error trying to save file. ", 256},
-  {" Delete macro ", 257},
-  {" Error trying to open temp file ", 258},
-  {" Error trying to open macro file ", 259},
-  {"key '%d 0': ", 260},
-  {" Error trying to overwrite macro file ", 261},
-  {" Macro ", 262},
-  {" Press the macro's new hotkey: ", 263},
-  {" Save macro ", 264},
-  {" Delete Macro ", 265},
-  {" Load macro ", 266},
-  {" Confirm save file? : ", 267},
-  {" Save file ", 268},
-  {"Save", 269},
+ Increase edit.h:MAXBUF and recompile the editor. ", 253},
+  {" Error allocating memory ", 254},
+  {" Save As ", 255},
+  {" Warning ", 256},
+  {" A file already exists with this name. ", 257},
+  {"Overwrite", 258},
+  {"Cancel", 259},
+  {" Save as ", 260},
+  {" Error trying to save file. ", 261},
+  {" Delete macro ", 262},
+  {" Error trying to open temp file ", 263},
+  {" Error trying to open macro file ", 264},
+  {"key '%d 0': ", 265},
+  {" Error trying to overwrite macro file ", 266},
+  {" Macro ", 267},
+  {" Press the macro's new hotkey: ", 268},
+  {" Save macro ", 269},
+  {" Delete Macro ", 270},
+  {" Load macro ", 271},
+  {" Confirm save file? : ", 272},
+  {" Save file ", 273},
+  {"Save", 274},
   {"\
  Current text was modified without a file save. \n\
- Continue discards these changes. ", 270},
-  {"Continue", 271},
-  {" Load ", 272},
-  {" Error trying to open file for reading ", 273},
-  {" Block is large, you may not be able to undo this action. ", 274},
-  {" Continue ", 275},
-  {" Cancel ", 276},
-  {" Replace with: ", 277},
-  {" Replace ", 278},
-  {" Search ", 279},
-  {" Enter search text : ", 280},
-  {" Enter replace text : ", 281},
-  {" Enter argument order : ", 282},
-  {"Enter the order of replacement of your scanf format specifiers", 283},
-  {" Whole words only ", 284},
-  {" Case sensitive ", 285},
-  {" Regular expression ", 286},
-  {"See the regex man page for how to compose a regular expression", 287},
-  {" Backwards ", 288},
-  {"Warning: Searching backward can be slow", 289},
-  {" Prompt on replace ", 290},
-  {"Ask before making each replacement", 291},
-  {" Replace all ", 292},
-  {" Scanf expression ", 293},
-  {"Allows entering of a C format string, see the scanf man page", 294},
-  {"Begin search, Enter", 295},
-  {"Abort this dialog, Esc", 296},
-  {"Replace", 297},
-  {"Skip", 298},
-  {"Replace all", 299},
-  {"\
- Invalid regular expression, or scanf expression with to many conversions ", 300},
-  {" Error in replacement format string. ", 301},
-  {" %ld replacements made. ", 302},
-  {" Search string not found. ", 303},
-  {" Quit ", 304},
+ Continue discards these changes. ", 275},
+  {"Continue", 276},
+  {" Load ", 277},
+  {" Error trying to open file for reading ", 278},
+  {" Block is large, you may not be able to undo this action. ", 279},
+  {" Continue ", 280},
+  {" Cancel ", 281},
+  {" Replace with: ", 282},
+  {" Replace ", 283},
+  {" Search ", 284},
+  {" Enter search text : ", 285},
+  {" Enter replace text : ", 286},
+  {" Enter argument order : ", 287},
+  {"Enter the order of replacement of your scanf format specifiers", 288},
+  {" Whole words only ", 289},
+  {" Case sensitive ", 290},
+  {" Regular expression ", 291},
+  {"See the regex man page for how to compose a regular expression", 292},
+  {" Backwards ", 293},
+  {"Warning: Searching backward can be slow", 294},
+  {" Prompt on replace ", 295},
+  {"Ask before making each replacement", 296},
+  {" Replace all ", 297},
+  {" Scanf expression ", 298},
+  {"Allows entering of a C format string, see the scanf man page", 299},
+  {"Begin search, Enter", 300},
+  {"Abort this dialog, Esc", 301},
+  {"Replace", 302},
+  {"Skip", 303},
+  {"Replace all", 304},
+  {"\
+ Invalid regular expression, or scanf expression with to many conversions ", 305},
+  {" Error in replacement format string. ", 306},
+  {" %ld replacements made. ", 307},
+  {" Search string not found. ", 308},
+  {" Quit ", 309},
   {"\
  Current text was modified without a file save. \n\
- Save with exit? ", 305},
-  {" File was modified, Save with exit? ", 306},
-  {"Cancel quit", 307},
-  {" &Cancel quit ", 308},
-  {" &Yes ", 309},
-  {" &No ", 310},
-  {" Copy to clipboard ", 311},
-  {" Unable to save to file. ", 312},
-  {" Cut to clipboard ", 313},
-  {" Goto line ", 314},
-  {" Enter line: ", 315},
-  {" Save Block ", 316},
-  {" Insert File ", 317},
-  {" Insert file ", 318},
-  {" Error trying to insert file. ", 319},
-  {" Sort block ", 320},
-  {" You must first highlight a block of text. ", 321},
-  {" Run Sort ", 322},
-  {" Enter sort options (see manpage) separated by whitespace: ", 323},
-  {" Sort ", 324},
-  {" Error trying to execute sort command ", 325},
-  {" Sort returned non-zero: ", 326},
-  {" Process block ", 327},
-  {" Error trying to stat file ", 328},
-  {" Mail ", 329},
-  {"None", 330},
-  {"Dynamic paragraphing", 331},
-  {"Type writer wrap", 332},
-  {"Wrap mode", 333},
-  {"Key emulation", 334},
-  {"Error initialising editor.\n", 335},
-  {"Help", 336},
-  {"Mark", 337},
-  {"Replac", 338},
-  {"Search", 339},
-  {"PullDn", 340},
-  {"Quit", 341},
-  {"&Dismiss", 342},
-  {"The Quick Brown Fox Jumps Over The Lazy Dog", 343},
-  {"\
-gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 344},
-  {"Clear the edit buffer", 345},
-  {"Insert File", 346},
-  {"Insert text from a file", 347},
-  {"Copy to file", 348},
-  {"copy a block to a file", 349},
-  {"Search/Replace", 350},
-  {" Load syntax file ", 351},
-  {" File access error ", 352},
-  {" Syntax error in file %s on line %d ", 353},
-  {"&Cancel", 354},
-  {"&Set", 355},
-  {"S&kip", 356},
-  {"Set &all", 357},
-  {"owner", 358},
-  {"group", 359},
-  {"other", 360},
-  {"On", 361},
-  {"Flag", 362},
-  {"Mode", 363},
-  {"%6d of %d", 364},
-  {" Chown advanced command ", 365},
+ Save with exit? ", 310},
+  {" File was modified, Save with exit? ", 311},
+  {"Cancel quit", 312},
+  {" &Cancel quit ", 313},
+  {" &Yes ", 314},
+  {" &No ", 315},
+  {" Copy to clipboard ", 316},
+  {" Unable to save to file. ", 317},
+  {" Cut to clipboard ", 318},
+  {" Goto line ", 319},
+  {" Enter line: ", 320},
+  {" Save Block ", 321},
+  {" Insert File ", 322},
+  {" Insert file ", 323},
+  {" Error trying to insert file. ", 324},
+  {" Sort block ", 325},
+  {" You must first highlight a block of text. ", 326},
+  {" Run Sort ", 327},
+  {" Enter sort options (see manpage) separated by whitespace: ", 328},
+  {" Sort ", 329},
+  {" Error trying to execute sort command ", 330},
+  {" Sort returned non-zero: ", 331},
+  {" Process block ", 332},
+  {" Error trying to stat file ", 333},
+  {" Mail ", 334},
+  {"None", 335},
+  {"Dynamic paragraphing", 336},
+  {"Type writer wrap", 337},
+  {"Wrap mode", 338},
+  {"Key emulation", 339},
+  {"Error initialising editor.\n", 340},
+  {"Help", 341},
+  {"Mark", 342},
+  {"Replac", 343},
+  {"Search", 344},
+  {"PullDn", 345},
+  {"Quit", 346},
+  {"&Dismiss", 347},
+  {"The Quick Brown Fox Jumps Over The Lazy Dog", 348},
+  {"\
+gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 349},
+  {"Clear the edit buffer", 350},
+  {"Insert File", 351},
+  {"Insert text from a file", 352},
+  {"Copy to file", 353},
+  {"copy a block to a file", 354},
+  {"Search/Replace", 355},
+  {" Load syntax file ", 356},
+  {" File access error ", 357},
+  {" Syntax error in file %s on line %d ", 358},
+  {"&Cancel", 359},
+  {"&Set", 360},
+  {"S&kip", 361},
+  {"Set &all", 362},
+  {"owner", 363},
+  {"group", 364},
+  {"other", 365},
+  {"On", 366},
+  {"Flag", 367},
+  {"Mode", 368},
+  {"%6d of %d", 369},
+  {" Chown advanced command ", 370},
   {"\
  Couldn't chmod \"%s\" \n\
- %s ", 366},
+ %s ", 371},
   {"\
  Couldn't chown \"%s\" \n\
- %s ", 367},
-  {" Oops... ", 368},
-  {" I can't run the Advanced Chown command on an extfs ", 369},
-  {" I can't run the Advanced Chown command on a tarfs ", 370},
-  {"Background process:", 371},
-  {" Background process error ", 372},
-  {" Child died unexpectedly ", 373},
-  {" Unknown error in child ", 374},
-  {" Background protocol error ", 375},
+ %s ", 372},
+  {" Oops... ", 373},
+  {" I can't run the Advanced Chown command on an extfs ", 374},
+  {" I can't run the Advanced Chown command on a tarfs ", 375},
+  {"Background process:", 376},
+  {" Background process error ", 377},
+  {" Child died unexpectedly ", 378},
+  {" Unknown error in child ", 379},
+  {" Background protocol error ", 380},
   {"\
  Background process sent us a request for more arguments \n\
- than we can handle. \n", 376},
-  {" Listing mode ", 377},
-  {"&Full file list", 378},
-  {"&Brief file list", 379},
-  {"&Long file list", 380},
-  {"&User defined:", 381},
-  {"&Icon view", 382},
-  {"user &Mini status", 383},
-  {"Listing mode", 384},
-  {"&Reverse", 385},
-  {"case sensi&tive", 386},
-  {"Sort order", 387},
-  {" confirm &Exit ", 388},
-  {" confirm e&Xecute ", 389},
-  {" confirm o&Verwrite ", 390},
-  {" confirm &Delete ", 391},
-  {" Confirmation ", 392},
-  {"Full 8 bits output", 393},
-  {"ISO 8859-1", 394},
-  {"7 bits", 395},
-  {"F&ull 8 bits input", 396},
-  {" Display bits ", 397},
-  {"&Always use ftp proxy", 398},
-  {"sec", 399},
-  {"ftpfs directory cache timeout:", 400},
-  {"ftp anonymous password:", 401},
-  {"Timeout for freeing VFSs:", 402},
-  {" Virtual File System Setting ", 403},
-  {"Quick cd", 404},
-  {"cd", 405},
-  {"Symbolic link", 406},
-  {"Symbolic link filename:", 407},
-  {"Existing filename (filename symlink will point to):", 408},
-  {"Running ", 409},
-  {"Stopped", 410},
-  {"&Stop", 411},
-  {"&Resume", 412},
-  {"&Kill", 413},
-  {"Background Jobs", 414},
-  {"execute/search by others", 415},
-  {"write by others", 416},
-  {"read by others", 417},
-  {"execute/search by group", 418},
-  {"write by group", 419},
-  {"read by group", 420},
-  {"execute/search by owner", 421},
-  {"write by owner", 422},
-  {"read by owner", 423},
-  {"sticky bit", 424},
-  {"set group ID on execution", 425},
-  {"set user ID on execution", 426},
-  {"C&lear marked", 427},
-  {"S&et marked", 428},
-  {"&Marked all", 429},
-  {"Permissions (Octal)", 430},
-  {"Owner name", 431},
-  {"Group name", 432},
-  {" Chmod command ", 433},
-  {" Permission ", 434},
-  {" File ", 435},
-  {"Use SPACE to change", 436},
-  {"an option, ARROW KEYS", 437},
-  {"to move between options", 438},
-  {"and T or INS to mark", 439},
-  {"Chmod command", 440},
-  {" I can't run the Chmod command on an extfs ", 441},
-  {"Set &users", 442},
-  {"Set &groups", 443},
-  {" Name ", 444},
-  {" Owner name ", 445},
-  {" Group name ", 446},
-  {" Size ", 447},
-  {" Chown command ", 448},
-  {" User name ", 449},
-  {"<Unknown user>", 450},
-  {"<Unknown group>", 451},
-  {" I can't run the Chown command on an extfs ", 452},
-  {" I can't run the Chown command on a tarfs ", 453},
-  {" Can not fetch a local copy of %s ", 454},
-  {" CD ", 455},
-  {"Files tagged, want to cd?", 456},
-  {"Could not change directory", 457},
-  {" View file ", 458},
-  {" Filename:", 459},
-  {" Filtered view ", 460},
-  {" Filter command and arguments:", 461},
-  {"Create a new Directory", 462},
-  {" Enter directory name:", 463},
-  {" Filter ", 464},
-  {" Set expression for filtering filenames", 465},
-  {" Select ", 466},
-  {"  Malformed regular expression  ", 467},
-  {" Unselect ", 468},
-  {"Extension file edit", 469},
-  {" Which extension file you want to edit? ", 470},
-  {"&User", 471},
-  {"&System Wide", 472},
-  {"Menu file edit", 473},
-  {" Which menu file will you edit? ", 474},
-  {"&Local", 475},
-  {"&Home", 476},
-  {" Compare directories ", 477},
-  {" Select compare method: ", 478},
-  {"&Quick", 479},
-  {"&Size only", 480},
-  {"&Thorough", 481},
-  {" Both panels should be on the listing view mode to use this command ", 482},
-  {" The command history is empty ", 483},
-  {" Command history ", 484},
+ than we can handle. \n", 381},
+  {" Listing mode ", 382},
+  {"&Full file list", 383},
+  {"&Brief file list", 384},
+  {"&Long file list", 385},
+  {"&User defined:", 386},
+  {"&Icon view", 387},
+  {"user &Mini status", 388},
+  {"Listing mode", 389},
+  {"&Reverse", 390},
+  {"case sensi&tive", 391},
+  {"Sort order", 392},
+  {" confirm &Exit ", 393},
+  {" confirm e&Xecute ", 394},
+  {" confirm o&Verwrite ", 395},
+  {" confirm &Delete ", 396},
+  {" Confirmation ", 397},
+  {"Full 8 bits output", 398},
+  {"ISO 8859-1", 399},
+  {"7 bits", 400},
+  {"F&ull 8 bits input", 401},
+  {" Display bits ", 402},
+  {"&Always use ftp proxy", 403},
+  {"sec", 404},
+  {"ftpfs directory cache timeout:", 405},
+  {"ftp anonymous password:", 406},
+  {"Timeout for freeing VFSs:", 407},
+  {" Virtual File System Setting ", 408},
+  {"Quick cd", 409},
+  {"cd", 410},
+  {"Symbolic link", 411},
+  {"Symbolic link filename:", 412},
+  {"Existing filename (filename symlink will point to):", 413},
+  {"Running ", 414},
+  {"Stopped", 415},
+  {"&Stop", 416},
+  {"&Resume", 417},
+  {"&Kill", 418},
+  {"Background Jobs", 419},
+  {"execute/search by others", 420},
+  {"write by others", 421},
+  {"read by others", 422},
+  {"execute/search by group", 423},
+  {"write by group", 424},
+  {"read by group", 425},
+  {"execute/search by owner", 426},
+  {"write by owner", 427},
+  {"read by owner", 428},
+  {"sticky bit", 429},
+  {"set group ID on execution", 430},
+  {"set user ID on execution", 431},
+  {"C&lear marked", 432},
+  {"S&et marked", 433},
+  {"&Marked all", 434},
+  {"Permissions (Octal)", 435},
+  {"Owner name", 436},
+  {"Group name", 437},
+  {" Chmod command ", 438},
+  {" Permission ", 439},
+  {" File ", 440},
+  {"Use SPACE to change", 441},
+  {"an option, ARROW KEYS", 442},
+  {"to move between options", 443},
+  {"and T or INS to mark", 444},
+  {"Chmod command", 445},
+  {" I can't run the Chmod command on an extfs ", 446},
+  {"Set &users", 447},
+  {"Set &groups", 448},
+  {" Name ", 449},
+  {" Owner name ", 450},
+  {" Group name ", 451},
+  {" Size ", 452},
+  {" Chown command ", 453},
+  {" User name ", 454},
+  {"<Unknown user>", 455},
+  {"<Unknown group>", 456},
+  {" I can't run the Chown command on an extfs ", 457},
+  {" I can't run the Chown command on a tarfs ", 458},
+  {" Can not fetch a local copy of %s ", 459},
+  {" CD ", 460},
+  {"Files tagged, want to cd?", 461},
+  {"Could not change directory", 462},
+  {" View file ", 463},
+  {" Filename:", 464},
+  {" Filtered view ", 465},
+  {" Filter command and arguments:", 466},
+  {"Create a new Directory", 467},
+  {" Enter directory name:", 468},
+  {" Filter ", 469},
+  {" Set expression for filtering filenames", 470},
+  {" Select ", 471},
+  {"  Malformed regular expression  ", 472},
+  {" Unselect ", 473},
+  {"Extension file edit", 474},
+  {" Which extension file you want to edit? ", 475},
+  {"&User", 476},
+  {"&System Wide", 477},
+  {"Menu file edit", 478},
+  {" Which menu file will you edit? ", 479},
+  {"&Local", 480},
+  {"&Home", 481},
+  {" Compare directories ", 482},
+  {" Select compare method: ", 483},
+  {"&Quick", 484},
+  {"&Size only", 485},
+  {"&Thorough", 486},
+  {" Both panels should be on the listing view mode to use this command ", 487},
+  {" The command history is empty ", 488},
+  {" Command history ", 489},
   {"\
  Not an xterm or Linux console; \n\
- the panels cannot be toggled. ", 485},
-  {"Type `exit' to return to the Midnight Commander", 486},
+ the panels cannot be toggled. ", 490},
+  {"Type `exit' to return to the Midnight Commander", 491},
   {"\
  Couldn't stat %s \n\
- %s ", 487},
-  {" Link ", 488},
-  {" to:", 489},
-  {" link: %s ", 490},
-  {" symlink: %s ", 491},
-  {" Symlink ", 492},
-  {" points to:", 493},
-  {" Edit symlink ", 494},
-  {" edit symlink: %s ", 495},
-  {" Link symbolically ", 496},
-  {" Relative symlink ", 497},
-  {" relative symlink: %s ", 498},
-  {" Enter machine name (F1 for details): ", 499},
-  {" Could not chdir to %s ", 500},
-  {" Link to a remote machine ", 501},
-  {" FTP to machine ", 502},
-  {" Socket source routing setup ", 503},
-  {" Enter host name to use as a source routing hop: ", 504},
-  {" Host name ", 505},
-  {" Error while looking up IP address ", 506},
-  {" Undelete files on an ext2 file system ", 507},
+ %s ", 492},
+  {" Link ", 493},
+  {" to:", 494},
+  {" link: %s ", 495},
+  {" symlink: %s ", 496},
+  {" Symlink ", 497},
+  {" points to:", 498},
+  {" Edit symlink ", 499},
+  {" edit symlink: %s ", 500},
+  {" Link symbolically ", 501},
+  {" Relative symlink ", 502},
+  {" relative symlink: %s ", 503},
+  {" Enter machine name (F1 for details): ", 504},
+  {" Could not chdir to %s ", 505},
+  {" Link to a remote machine ", 506},
+  {" FTP to machine ", 507},
+  {" Socket source routing setup ", 508},
+  {" Enter host name to use as a source routing hop: ", 509},
+  {" Host name ", 510},
+  {" Error while looking up IP address ", 511},
+  {" Undelete files on an ext2 file system ", 512},
   {"\
  Enter device (without /dev/) to undelete\n\
-   files on: (F1 for details)", 508},
-  {" Setup saved to ~/", 509},
-  {" Setup ", 510},
+   files on: (F1 for details)", 513},
+  {" Setup saved to ~/", 514},
+  {" Setup ", 515},
   {"\
  Can't chdir to '%s' \n\
- %s ", 511},
-  {" You can not execute commands on non-local filesystems", 512},
+ %s ", 516},
+  {" You can not execute commands on non-local filesystems", 517},
   {"\
 \n\
 \n\
 \n\
 refresh stack underflow!\n\
 \n\
-\n", 513},
-  {"&Unsorted", 514},
-  {"&Name", 515},
-  {"&Extension", 516},
-  {"&Modify time", 517},
-  {"&Access time", 518},
-  {"&Change time", 519},
-  {"&Size", 520},
-  {"&Inode", 521},
-  {"&Type", 522},
-  {"&Links", 523},
-  {"N&GID", 524},
-  {"N&UID", 525},
-  {"&Owner", 526},
-  {"&Group", 527},
-  {"File exists but can not be stat-ed: %s %s", 528},
-  {"Unknown", 529},
+\n", 518},
+  {"&Unsorted", 519},
+  {"&Name", 520},
+  {"&Extension", 521},
+  {"&Modify time", 522},
+  {"&Access time", 523},
+  {"&Change time", 524},
+  {"&Size", 525},
+  {"&Inode", 526},
+  {"&Type", 527},
+  {"&Links", 528},
+  {"N&GID", 529},
+  {"N&UID", 530},
+  {"&Owner", 531},
+  {"&Group", 532},
+  {"File exists but can not be stat-ed: %s %s", 533},
+  {"Unknown", 534},
   {"\
  Can't create temporary command file \n\
- %s ", 530},
-  {" Parameter ", 531},
-  {" Can't execute commands on a Virtual File System directory ", 532},
-  {" file error", 533},
-  {"Format of the ", 534},
-  {" file error ", 535},
-  {"Format of the ~/", 536},
+ %s ", 535},
+  {" Parameter ", 536},
+  {" Can't execute commands on a Virtual File System directory ", 537},
+  {" file error", 538},
+  {"Format of the ", 539},
+  {" file error ", 540},
+  {"Format of the ~/", 541},
   {"\
  file has changed\n\
 with version 3.0. You may want either to\n\
-copy it from ", 537},
+copy it from ", 542},
   {"\
 mc.ext or use that\n\
-file as an example of how to write it.\n", 538},
-  {"mc.ext will be used for this moment.", 539},
-  {" Copy ", 540},
-  {" Move ", 541},
-  {" Delete ", 542},
-  {" Invalid target mask ", 543},
-  {" Could not make the hardlink ", 544},
+file as an example of how to write it.\n", 543},
+  {"mc.ext will be used for this moment.", 544},
+  {" Copy ", 545},
+  {" Move ", 546},
+  {" Delete ", 547},
+  {" Invalid target mask ", 548},
+  {" Could not make the hardlink ", 549},
   {"\
  Cannot read source link \"%s\" \n\
- %s ", 545},
+ %s ", 550},
   {"\
  Cannot make stable symlinks across non-local filesystems: \n\
 \n\
- Option Stable Symlinks will be disabled ", 546},
+ Option Stable Symlinks will be disabled ", 551},
   {"\
  Cannot create target symlink \"%s\" \n\
- %s ", 547},
+ %s ", 552},
   {"\
  Cannot overwrite directory \"%s\" \n\
- %s ", 548},
+ %s ", 553},
   {"\
  Cannot stat source file \"%s\" \n\
- %s ", 549},
-  {" `%s' and `%s' are the same file. ", 550},
+ %s ", 554},
+  {" `%s' and `%s' are the same file. ", 555},
   {"\
  Cannot create special file \"%s\" \n\
- %s ", 551},
+ %s ", 556},
   {"\
  Cannot chown target file \"%s\" \n\
- %s ", 552},
+ %s ", 557},
   {"\
  Cannot chmod target file \"%s\" \n\
- %s ", 553},
+ %s ", 558},
   {"\
  Cannot open source file \"%s\" \n\
- %s ", 554},
-  {" Reget failed, about to overwrite file ", 555},
+ %s ", 559},
+  {" Reget failed, about to overwrite file ", 560},
   {"\
  Cannot fstat source file \"%s\" \n\
- %s ", 556},
+ %s ", 561},
   {"\
  Cannot create target file \"%s\" \n\
- %s ", 557},
+ %s ", 562},
   {"\
  Cannot fstat target file \"%s\" \n\
- %s ", 558},
+ %s ", 563},
   {"\
  Cannot read source file \"%s\" \n\
- %s ", 559},
+ %s ", 564},
   {"\
  Cannot write target file \"%s\" \n\
- %s ", 560},
-  {"(stalled)", 561},
+ %s ", 565},
+  {"(stalled)", 566},
   {"\
  Cannot close source file \"%s\" \n\
- %s ", 562},
+ %s ", 567},
   {"\
  Cannot close target file \"%s\" \n\
- %s ", 563},
-  {"Incomplete file was retrieved. Keep it?", 564},
-  {"&Delete", 565},
-  {"&Keep", 566},
+ %s ", 568},
+  {"Incomplete file was retrieved. Keep it?", 569},
+  {"&Delete", 570},
+  {"&Keep", 571},
   {"\
  Cannot stat source directory \"%s\" \n\
- %s ", 567},
+ %s ", 572},
   {"\
  Source directory \"%s\" is not a directory \n\
- %s ", 568},
+ %s ", 573},
   {"\
  Cannot copy cyclic symbolic link \n\
- `%s' ", 569},
+ `%s' ", 574},
   {"\
  Cannot create target directory \"%s\" \n\
- %s ", 570},
+ %s ", 575},
   {"\
  Cannot chown target directory \"%s\" \n\
- %s ", 571},
+ %s ", 576},
   {"\
  Cannot stat file \"%s\" \n\
- %s ", 572},
-  {" `%s' and `%s' are the same file ", 573},
-  {" Cannot overwrite directory `%s' ", 574},
+ %s ", 577},
+  {" `%s' and `%s' are the same file ", 578},
+  {" Cannot overwrite directory `%s' ", 579},
   {"\
  Cannot move file \"%s\" to \"%s\" \n\
- %s ", 575},
+ %s ", 580},
   {"\
  Cannot remove file \"%s\" \n\
- %s ", 576},
-  {" Cannot overwrite directory \"%s\" %s ", 577},
-  {" Cannot overwrite file \"%s\" %s ", 578},
+ %s ", 581},
+  {" Cannot overwrite directory \"%s\" %s ", 582},
+  {" Cannot overwrite file \"%s\" %s ", 583},
   {"\
  Cannot move directory \"%s\" to \"%s\" \n\
- %s ", 579},
+ %s ", 584},
   {"\
  Cannot delete file \"%s\" \n\
- %s ", 580},
+ %s ", 585},
   {"\
  Cannot remove directory \"%s\" \n\
- %s ", 581},
-  {" Internal error: get_file \n", 582},
-  {"1Copy", 583},
-  {"1Move", 584},
-  {"1Delete", 585},
-  {"%o %f \"%s\"%m", 586},
-  {"%o %d %f%m", 587},
-  {"%o %f \"%s\"%e", 588},
-  {"%o %d %f%e", 589},
-  {"file", 590},
-  {"files", 591},
-  {"directory", 592},
-  {"directories", 593},
-  {"files/directories", 594},
-  {" with source mask:", 595},
-  {" Can't operate on \"..\"! ", 596},
-  {"Yes", 597},
-  {"No", 598},
-  {" Sorry, I could not put the job in background ", 599},
-  {" Internal failure ", 600},
-  {" Unknown file operation ", 601},
+ %s ", 586},
+  {" Internal error: get_file \n", 587},
+  {"1Copy", 588},
+  {"1Move", 589},
+  {"1Delete", 590},
+  {"%o %f \"%s\"%m", 591},
+  {"%o %d %f%m", 592},
+  {"%o %f \"%s\"%e", 593},
+  {"%o %d %f%e", 594},
+  {"file", 595},
+  {"files", 596},
+  {"directory", 597},
+  {"directories", 598},
+  {"files/directories", 599},
+  {" with source mask:", 600},
+  {" Can't operate on \"..\"! ", 601},
+  {"Yes", 602},
+  {"No", 603},
+  {" Sorry, I could not put the job in background ", 604},
+  {" Internal failure ", 605},
+  {" Unknown file operation ", 606},
   {"\
  Destination \"%s\" must be a directory \n\
- %s ", 602},
-  {"&Skip", 603},
-  {"&Retry", 604},
-  {"&Abort", 605},
+ %s ", 607},
+  {"&Skip", 608},
+  {"&Retry", 609},
+  {"&Abort", 610},
   {"\
 \n\
    Directory not empty.   \n\
-   Delete it recursively? ", 606},
+   Delete it recursively? ", 611},
   {"\
 \n\
    Background process: Directory not empty \n\
-   Delete it recursively? ", 607},
-  {" Delete: ", 608},
-  {"a&ll", 609},
-  {"non&E", 610},
-  {" Type 'yes' if you REALLY want to delete ", 611},
-  {"all the directories ", 612},
-  {" Recursive Delete ", 613},
-  {" Background process: Recursive Delete ", 614},
-  {"File", 615},
-  {"Count", 616},
-  {"Bytes", 617},
-  {"Source", 618},
-  {"Target", 619},
-  {"Deleting", 620},
-  {"Target file \"%s\" already exists!", 621},
-  {"if &Size differs", 622},
-  {"&Update", 623},
-  {"al&L", 624},
-  {"Overwrite all targets?", 625},
-  {"&Reget", 626},
-  {"ap&Pend", 627},
-  {"Overwrite this target?", 628},
-  {"Target date: %s, size %d", 629},
-  {"Source date: %s, size %d", 630},
-  {" File exists ", 631},
-  {" Background process: File exists ", 632},
-  {"preserve &Attributes", 633},
-  {"follow &Links", 634},
-  {"to:", 635},
-  {"&Using shell patterns", 636},
-  {"&Background", 637},
-  {"&Stable Symlinks", 638},
-  {"&Dive into subdir if exists", 639},
+   Delete it recursively? ", 612},
+  {" Delete: ", 613},
+  {"a&ll", 614},
+  {"non&E", 615},
+  {" Type 'yes' if you REALLY want to delete ", 616},
+  {"all the directories ", 617},
+  {" Recursive Delete ", 618},
+  {" Background process: Recursive Delete ", 619},
+  {"File", 620},
+  {"Count", 621},
+  {"Bytes", 622},
+  {"Source", 623},
+  {"Target", 624},
+  {"Deleting", 625},
+  {"Target file \"%s\" already exists!", 626},
+  {"if &Size differs", 627},
+  {"&Update", 628},
+  {"al&L", 629},
+  {"Overwrite all targets?", 630},
+  {"&Reget", 631},
+  {"ap&Pend", 632},
+  {"Overwrite this target?", 633},
+  {"Target date: %s, size %d", 634},
+  {"Source date: %s, size %d", 635},
+  {" File exists ", 636},
+  {" Background process: File exists ", 637},
+  {"preserve &Attributes", 638},
+  {"follow &Links", 639},
+  {"to:", 640},
+  {"&Using shell patterns", 641},
+  {"&Background", 642},
+  {"&Stable Symlinks", 643},
+  {"&Dive into subdir if exists", 644},
   {"\
 Invalid source pattern `%s' \n\
- %s ", 640},
-  {"&Suspend", 641},
-  {"Con&tinue", 642},
-  {"&Chdir", 643},
-  {"&Again", 644},
-  {"&Quit", 645},
-  {"Pane&lize", 646},
-  {"&View - F3", 647},
-  {"&Edit - F4", 648},
-  {"Start at:", 649},
-  {"Filename:", 650},
-  {"Content: ", 651},
-  {"&Tree", 652},
-  {"Find File", 653},
-  {"Grepping in %s", 654},
-  {" Find/read ", 655},
-  {" Problem reading from child ", 656},
-  {"Finished", 657},
-  {"Searching %s", 658},
-  {"Suspend", 659},
-  {"Restart", 660},
-  {"Searching", 661},
-  {"Find file", 662},
-  {"Change to this directory", 663},
-  {"Search again", 664},
-  {"View this file", 665},
-  {"Edit this file", 666},
-  {"Send the results to a Panel", 667},
-  {"Usage: fixhlp <width> <tocname>\n", 668},
-  {"fixhlp: Cannot open toc for writing", 669},
+ %s ", 645},
+  {"&Suspend", 646},
+  {"Con&tinue", 647},
+  {"&Chdir", 648},
+  {"&Again", 649},
+  {"&Quit", 650},
+  {"Pane&lize", 651},
+  {"&View - F3", 652},
+  {"&Edit - F4", 653},
+  {"Start at:", 654},
+  {"Filename:", 655},
+  {"Content: ", 656},
+  {"&Tree", 657},
+  {"Find File", 658},
+  {"Grepping in %s", 659},
+  {" Find/read ", 660},
+  {" Problem reading from child ", 661},
+  {"Finished", 662},
+  {"Searching %s", 663},
+  {"Suspend", 664},
+  {"Restart", 665},
+  {"Searching", 666},
+  {"Find file", 667},
+  {"Change to this directory", 668},
+  {"Search again", 669},
+  {"View this file", 670},
+  {"Edit this file", 671},
+  {"Send the results to a Panel", 672},
+  {"Usage: fixhlp <width> <tocname>\n", 673},
+  {"fixhlp: Cannot open toc for writing", 674},
   {"\
 [Contents]\n\
  Topics:\n\
-\n", 670},
+\n", 675},
   {"\
  Help file format error\n\
-", 671},
-  {" Internal bug: Double start of link area ", 672},
-  {" Can't find node [Contents] in help file ", 673},
-  {" Help ", 674},
+", 676},
+  {" Internal bug: Double start of link area ", 677},
+  {" Can't find node [Contents] in help file ", 678},
+  {" Help ", 679},
   {"\
  Can't open file %s \n\
- %s ", 675},
-  {" Can't find node %s in help file ", 676},
-  {"Index", 677},
-  {"Prev", 678},
-  {"&Move", 679},
-  {"&Remove", 680},
-  {"&Append", 681},
-  {"&Insert", 682},
-  {"New &Entry", 683},
-  {"New &Group", 684},
-  {"&Up", 685},
-  {"&Add current", 686},
-  {"Change &To", 687},
-  {"Subgroup - press ENTER to see list", 688},
-  {"Active VFS directories", 689},
-  {"Directory hotlist", 690},
-  {" Directory path ", 691},
-  {" Directory label ", 692},
-  {"Moving ", 693},
-  {"New hotlist entry", 694},
-  {"Directory label", 695},
-  {"Directory path", 696},
-  {" New hotlist group ", 697},
-  {"Name of new group", 698},
-  {"Label for \"%s\":", 699},
-  {" Add to hotlist ", 700},
-  {" Remove: ", 701},
+ %s ", 680},
+  {" Can't find node %s in help file ", 681},
+  {"Index", 682},
+  {"Prev", 683},
+  {"&Move", 684},
+  {"&Remove", 685},
+  {"&Append", 686},
+  {"&Insert", 687},
+  {"New &Entry", 688},
+  {"New &Group", 689},
+  {"&Up", 690},
+  {"&Add current", 691},
+  {"Change &To", 692},
+  {"Subgroup - press ENTER to see list", 693},
+  {"Active VFS directories", 694},
+  {"Directory hotlist", 695},
+  {" Directory path ", 696},
+  {" Directory label ", 697},
+  {"Moving ", 698},
+  {"New hotlist entry", 699},
+  {"Directory label", 700},
+  {"Directory path", 701},
+  {" New hotlist group ", 702},
+  {"Name of new group", 703},
+  {"Label for \"%s\":", 704},
+  {" Add to hotlist ", 705},
+  {" Remove: ", 706},
   {"\
 \n\
  Group not empty.\n\
- Remove it?", 702},
-  {" Top level group ", 703},
-  {"Hotlist is now kept in file ~/", 704},
-  {"MC will load hotlist from ~/", 705},
-  {"and then delete [Hotlist] section there", 706},
-  {" Hotlist Load ", 707},
-  {"MC was unable to write ~/", 708},
-  {" file, your old hotlist entries were not deleted", 709},
-  {"You have ~/", 710},
-  {" file and [Hotlist] section in ~/", 711},
-  {"Your ~/", 712},
-  {" most probably was created\n", 713},
+ Remove it?", 707},
+  {" Top level group ", 708},
+  {"Hotlist is now kept in file ~/", 709},
+  {"MC will load hotlist from ~/", 710},
+  {"and then delete [Hotlist] section there", 711},
+  {" Hotlist Load ", 712},
+  {"MC was unable to write ~/", 713},
+  {" file, your old hotlist entries were not deleted", 714},
+  {"You have ~/", 715},
+  {" file and [Hotlist] section in ~/", 716},
+  {"Your ~/", 717},
+  {" most probably was created\n", 718},
   {"\
 by an earlier development version of MC\n\
-and is more actual than ~/", 714},
+and is more actual than ~/", 719},
   {"\
  entries\n\
-\n", 715},
+\n", 720},
   {"\
 You can choose between\n\
 \n\
-  Remove - remove old hotlist entries from ~/", 716},
+  Remove - remove old hotlist entries from ~/", 721},
   {"\
   Keep   - keep your old entries; you will be asked\n\
            the same question next time\n\
-  Merge  - add old entries to hotlist as group \"Entries from ~/", 717},
-  {"&Merge", 718},
-  {" Entries from ~/", 719},
-  {" file your old hotlist entries were not deleted", 720},
-  {"Midnight Commander %s", 721},
-  {"Free nodes %d (%d%%) of %d", 722},
-  {"No node information", 723},
-  {"Free space ", 724},
-  {" (%d%%) of ", 725},
-  {"No space information", 726},
-  {"Type:      %s ", 727},
-  {"non-local vfs", 728},
-  {"Device:    %s", 729},
-  {"Filesystem: %s", 730},
-  {"Accessed:  %s", 731},
-  {"Modified:  %s", 732},
-  {"Created:   %s", 733},
-  {"Size:      ", 734},
-  {" (%d blocks)", 735},
-  {"Owner:     %s/%s", 736},
-  {"Links:     %d", 737},
-  {"Mode:      %s (%04o)", 738},
-  {"Location:  %Xh:%Xh", 739},
-  {"File:       %s", 740},
-  {"File:       None", 741},
-  {"&Vertical", 742},
-  {"&Horizontal", 743},
-  {"&Xterm hintbar", 744},
-  {"h&Intbar visible", 745},
-  {"&Keybar visible", 746},
-  {"command &Prompt", 747},
-  {"show &Mini status", 748},
-  {"menu&Bar visible", 749},
-  {"&Equal split", 750},
-  {"pe&Rmissions", 751},
-  {"&File types", 752},
-  {"&Save", 753},
-  {" Layout ", 754},
-  {" Panel split ", 755},
-  {" Highlight... ", 756},
-  {" Other options ", 757},
-  {"output lines", 758},
-  {"Layout", 759},
-  {" Learn keys ", 760},
-  {" Teach me a key ", 761},
+  Merge  - add old entries to hotlist as group \"Entries from ~/", 722},
+  {"&Merge", 723},
+  {" Entries from ~/", 724},
+  {" file your old hotlist entries were not deleted", 725},
+  {"Midnight Commander %s", 726},
+  {"Free nodes %d (%d%%) of %d", 727},
+  {"No node information", 728},
+  {"Free space ", 729},
+  {" (%d%%) of ", 730},
+  {"No space information", 731},
+  {"Type:      %s ", 732},
+  {"non-local vfs", 733},
+  {"Device:    %s", 734},
+  {"Filesystem: %s", 735},
+  {"Accessed:  %s", 736},
+  {"Modified:  %s", 737},
+  {"Created:   %s", 738},
+  {"Size:      ", 739},
+  {" (%d blocks)", 740},
+  {"Owner:     %s/%s", 741},
+  {"Links:     %d", 742},
+  {"Mode:      %s (%04o)", 743},
+  {"Location:  %Xh:%Xh", 744},
+  {"File:       %s", 745},
+  {"File:       None", 746},
+  {"&Vertical", 747},
+  {"&Horizontal", 748},
+  {"&Xterm hintbar", 749},
+  {"h&Intbar visible", 750},
+  {"&Keybar visible", 751},
+  {"command &Prompt", 752},
+  {"show &Mini status", 753},
+  {"menu&Bar visible", 754},
+  {"&Equal split", 755},
+  {"pe&Rmissions", 756},
+  {"&File types", 757},
+  {"&Save", 758},
+  {" Layout ", 759},
+  {" Panel split ", 760},
+  {" Highlight... ", 761},
+  {" Other options ", 762},
+  {"output lines", 763},
+  {"Layout", 764},
+  {" Learn keys ", 765},
+  {" Teach me a key ", 766},
   {"\
 Please press the %s\n\
 and then wait until this message disappears.\n\
@@ -906,331 +911,330 @@
 next to its button.\n\
 \n\
 If you want to escape, press a single Escape key\n\
-and wait as well.", 762},
-  {" Cannot accept this key ", 763},
-  {" You have entered \"%s\"", 764},
-  {"OK", 765},
+and wait as well.", 767},
+  {" Cannot accept this key ", 768},
+  {" You have entered \"%s\"", 769},
+  {"OK", 770},
   {"\
 It seems that all your keys already\n\
-work fine. That's great.", 766},
-  {"&Discard", 767},
+work fine. That's great.", 771},
+  {"&Discard", 772},
   {"\
 Great! You have a complete terminal database!\n\
-All your keys work well.", 768},
-  {"Learn keys", 769},
-  {"Press all the keys mentioned here. After you have done it, check", 770},
-  {"which keys are not marked with OK.  Press space on the missing", 771},
-  {"key, or click with the mouse to define it. Move around with Tab.", 772},
+All your keys work well.", 773},
+  {"Learn keys", 774},
+  {"Press all the keys mentioned here. After you have done it, check", 775},
+  {"which keys are not marked with OK.  Press space on the missing", 776},
+  {"key, or click with the mouse to define it. Move around with Tab.", 777},
   {"\
  The Commander can't change to the directory that \n\
  the subshell claims you are in.  Perhaps you have \n\
  deleted your working directory, or given yourself \n\
- extra access permissions with the \"su\" command? ", 773},
-  {"Press any key to continue...", 774},
-  {" The shell is already running a command ", 775},
-  {"&Listing mode...", 776},
-  {"&Quick view     C-x q", 777},
-  {"&Info           C-x i", 778},
-  {"&Sort order...", 779},
-  {"&Filter...", 780},
-  {"&Network link...", 781},
-  {"FT&P link...", 782},
-  {"&Drive...       M-d", 783},
-  {"&Rescan         C-r", 784},
-  {"&User menu          F2", 785},
-  {"&View               F3", 786},
-  {"Vie&w file...         ", 787},
-  {"&Filtered view     M-!", 788},
-  {"&Edit               F4", 789},
-  {"&Copy               F5", 790},
-  {"c&Hmod           C-x c", 791},
-  {"&Link            C-x l", 792},
-  {"&SymLink         C-x s", 793},
-  {"edit s&Ymlink  C-x C-s", 794},
-  {"ch&Own           C-x o", 795},
-  {"&Advanced chown       ", 796},
-  {"&Rename/Move        F6", 797},
-  {"&Mkdir              F7", 798},
-  {"&Delete             F8", 799},
-  {"&Quick cd          M-c", 800},
-  {"select &Group      M-+", 801},
-  {"u&Nselect group    M-\\", 802},
-  {"reverse selec&Tion M-*", 803},
-  {"e&Xit              F10", 804},
-  {"&Directory tree", 805},
-  {"&Find file            M-?", 806},
-  {"s&Wap panels          C-u", 807},
-  {"switch &Panels on/off C-o", 808},
-  {"&Compare directories  C-x d", 809},
-  {"e&Xternal panelize    C-x !", 810},
-  {"show directory s&Izes", 811},
-  {"command &History", 812},
-  {"di&Rectory hotlist    C-\\", 813},
-  {"&Active VFS list      C-x a", 814},
-  {"&Background jobs      C-x j", 815},
-  {"&Undelete files (ext2fs only)", 816},
-  {"&Listing format edit", 817},
-  {"&Extension file edit", 818},
-  {"&Menu file edit", 819},
-  {"&Configuration...", 820},
-  {"&Layout...", 821},
-  {"c&Onfirmation...", 822},
-  {"&Display bits...", 823},
-  {"learn &Keys...", 824},
-  {"&Virtual FS...", 825},
-  {"&Save setup", 826},
-  {" &Left ", 827},
-  {" &Above ", 828},
-  {" &File ", 829},
-  {" &Command ", 830},
-  {" &Options ", 831},
-  {" &Right ", 832},
-  {" &Below ", 833},
-  {" Information ", 834},
+ extra access permissions with the \"su\" command? ", 778},
+  {"Press any key to continue...", 779},
+  {" The shell is already running a command ", 780},
+  {"&Listing mode...", 781},
+  {"&Quick view     C-x q", 782},
+  {"&Info           C-x i", 783},
+  {"&Sort order...", 784},
+  {"&Filter...", 785},
+  {"&Network link...", 786},
+  {"FT&P link...", 787},
+  {"&Drive...       M-d", 788},
+  {"&Rescan         C-r", 789},
+  {"&User menu          F2", 790},
+  {"&View               F3", 791},
+  {"Vie&w file...         ", 792},
+  {"&Filtered view     M-!", 793},
+  {"&Edit               F4", 794},
+  {"&Copy               F5", 795},
+  {"c&Hmod           C-x c", 796},
+  {"&Link            C-x l", 797},
+  {"&SymLink         C-x s", 798},
+  {"edit s&Ymlink  C-x C-s", 799},
+  {"ch&Own           C-x o", 800},
+  {"&Advanced chown       ", 801},
+  {"&Rename/Move        F6", 802},
+  {"&Mkdir              F7", 803},
+  {"&Delete             F8", 804},
+  {"&Quick cd          M-c", 805},
+  {"select &Group      M-+", 806},
+  {"u&Nselect group    M-\\", 807},
+  {"reverse selec&Tion M-*", 808},
+  {"e&Xit              F10", 809},
+  {"&Directory tree", 810},
+  {"&Find file            M-?", 811},
+  {"s&Wap panels          C-u", 812},
+  {"switch &Panels on/off C-o", 813},
+  {"&Compare directories  C-x d", 814},
+  {"e&Xternal panelize    C-x !", 815},
+  {"show directory s&Izes", 816},
+  {"command &History", 817},
+  {"di&Rectory hotlist    C-\\", 818},
+  {"&Active VFS list      C-x a", 819},
+  {"&Background jobs      C-x j", 820},
+  {"&Undelete files (ext2fs only)", 821},
+  {"&Listing format edit", 822},
+  {"&Extension file edit", 823},
+  {"&Menu file edit", 824},
+  {"&Configuration...", 825},
+  {"&Layout...", 826},
+  {"c&Onfirmation...", 827},
+  {"&Display bits...", 828},
+  {"learn &Keys...", 829},
+  {"&Virtual FS...", 830},
+  {"&Save setup", 831},
+  {" &Left ", 832},
+  {" &Above ", 833},
+  {" &File ", 834},
+  {" &Command ", 835},
+  {" &Options ", 836},
+  {" &Right ", 837},
+  {" &Below ", 838},
+  {" Information ", 839},
   {"\
  Using the fast reload option may not reflect the exact \n\
  directory contents. In this cases you'll need to do a  \n\
  manual reload of the directory. See the man page for   \n\
- the details.                                           ", 835},
-  {"Menu", 836},
-  {"Thank you for using GNU Midnight Commander", 837},
-  {"with mouse support on xterm%s.\n", 838},
-  {" and the Linux console", 839},
-  {"The TERM environment variable is unset!\n", 840},
-  {"Library directory for the Midnight Commander: %s\n", 841},
-  {"\
-Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 842},
-  {"Geometry for the window", 843},
-  {"GEOMETRY", 844},
-  {"No windows opened at startup", 845},
-  {"Force activation even if a server is already running", 846},
+ the details.                                           ", 840},
+  {"Menu", 841},
+  {"Thank you for using GNU Midnight Commander", 842},
+  {"with mouse support on xterm%s.\n", 843},
+  {" and the Linux console", 844},
+  {"The TERM environment variable is unset!\n", 845},
+  {"Library directory for the Midnight Commander: %s\n", 846},
+  {"\
+Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 847},
+  {"Geometry for the window", 848},
+  {"GEOMETRY", 849},
+  {"No windows opened at startup", 850},
+  {"Force activation even if a server is already running", 851},
   {"\
 Couldn't open tty line. You have to run mc without the -P flag.\n\
-On some systems you may want to run # `which mc`\n", 847},
-  {" Notice ", 848},
+On some systems you may want to run # `which mc`\n", 852},
+  {" Notice ", 853},
   {"\
  The Midnight Commander configuration files \n\
  are now stored in the ~/.mc directory, the \n\
- files have been moved now\n", 849},
-  {"safe de&Lete", 850},
-  {"cd follows lin&Ks", 851},
-  {"advanced cho&Wn", 852},
-  {"l&Ynx-like motion", 853},
-  {"Animation", 854},
-  {"rotatin&G dash", 855},
-  {"co&Mplete: show all", 856},
-  {"&Use internal view", 857},
-  {"use internal ed&It", 858},
-  {"auto m&Enus", 859},
-  {"&Auto save setup", 860},
-  {"shell &Patterns", 861},
-  {"Compute &Totals", 862},
-  {"&Verbose operation", 863},
-  {"&Fast dir reload", 864},
-  {"mi&X all files", 865},
-  {"&Drop down menus", 866},
-  {"ma&Rk moves down", 867},
-  {"show &Hidden files", 868},
-  {"show &Backup files", 869},
-  {"&Never", 870},
-  {"on dumb &Terminals", 871},
-  {"alwa&Ys", 872},
-  {" Configure options ", 873},
-  {" Panel options ", 874},
-  {" Pause after run... ", 875},
-  {"Configure options", 876},
-  {"&Add new", 877},
-  {" External panelize ", 878},
-  {"External panelize", 879},
-  {"Other command", 880},
-  {" Add to external panelize ", 881},
-  {" Enter command label: ", 882},
-  {" I can't run external panelize while logged on a non local directory ", 883},
-  {"Find *.orig after patching", 884},
-  {"Find SUID and SGID programs", 885},
-  {"Cannot invoke command.", 886},
-  {"Pipe close failed", 887},
-  {"Show this help message", 888},
-  {"Display brief usage message", 889},
-  {"MTime", 890},
-  {"ATime", 891},
-  {"CTime", 892},
-  {"Permission", 893},
-  {"Perm", 894},
-  {"Nl", 895},
-  {"Inode", 896},
-  {"UID", 897},
-  {"GID", 898},
-  {"  %s bytes in %d file%s", 899},
-  {"Unknow tag on display format: ", 900},
-  {" Do you really want to execute? ", 901},
-  {" No action taken ", 902},
-  {"RenMov", 903},
-  {"Mkdir", 904},
+ files have been moved now\n", 854},
+  {"safe de&Lete", 855},
+  {"cd follows lin&Ks", 856},
+  {"advanced cho&Wn", 857},
+  {"l&Ynx-like motion", 858},
+  {"Animation", 859},
+  {"rotatin&G dash", 860},
+  {"co&Mplete: show all", 861},
+  {"&Use internal view", 862},
+  {"use internal ed&It", 863},
+  {"auto m&Enus", 864},
+  {"&Auto save setup", 865},
+  {"shell &Patterns", 866},
+  {"Compute &Totals", 867},
+  {"&Verbose operation", 868},
+  {"&Fast dir reload", 869},
+  {"mi&X all files", 870},
+  {"&Drop down menus", 871},
+  {"ma&Rk moves down", 872},
+  {"show &Hidden files", 873},
+  {"show &Backup files", 874},
+  {"&Never", 875},
+  {"on dumb &Terminals", 876},
+  {"alwa&Ys", 877},
+  {" Configure options ", 878},
+  {" Panel options ", 879},
+  {" Pause after run... ", 880},
+  {"Configure options", 881},
+  {"&Add new", 882},
+  {" External panelize ", 883},
+  {"External panelize", 884},
+  {"Other command", 885},
+  {" Add to external panelize ", 886},
+  {" Enter command label: ", 887},
+  {" I can't run external panelize while logged on a non local directory ", 888},
+  {"Find *.orig after patching", 889},
+  {"Find SUID and SGID programs", 890},
+  {"Cannot invoke command.", 891},
+  {"Pipe close failed", 892},
+  {"Show this help message", 893},
+  {"Display brief usage message", 894},
+  {"MTime", 895},
+  {"ATime", 896},
+  {"CTime", 897},
+  {"Permission", 898},
+  {"Perm", 899},
+  {"Nl", 900},
+  {"Inode", 901},
+  {"UID", 902},
+  {"GID", 903},
+  {"  %s bytes in %d file%s", 904},
+  {"Unknow tag on display format: ", 905},
+  {" Do you really want to execute? ", 906},
+  {" No action taken ", 907},
+  {"RenMov", 908},
+  {"Mkdir", 909},
   {"\
  Can't chdir to %s \n\
- %s ", 905},
-  {"Couldn't open named pipe %s\n", 906},
-  {" The shell is still active. Quit anyway? ", 907},
-  {" There are stopped jobs.", 908},
-  {" Quit anyway? ", 909},
-  {"Warning: Couldn't change to %s.\n", 910},
+ %s ", 910},
+  {"Couldn't open named pipe %s\n", 911},
+  {" The shell is still active. Quit anyway? ", 912},
+  {" There are stopped jobs.", 913},
+  {" Quit anyway? ", 914},
+  {"Warning: Couldn't change to %s.\n", 915},
   {"\
 Can't open the %s file for writing:\n\
-%s\n", 911},
-  {"Copy \"%s\" directory to:", 912},
-  {"Move \"%s\" directory to:", 913},
+%s\n", 916},
+  {"Copy \"%s\" directory to:", 917},
+  {"Move \"%s\" directory to:", 918},
   {"\
  Can't stat the destination \n\
- %s ", 914},
-  {" The destination isn't a directory ", 915},
-  {"  Delete %s?  ", 916},
-  {"Static", 917},
-  {"Dynamc", 918},
+ %s ", 919},
+  {" The destination isn't a directory ", 920},
+  {"  Delete %s?  ", 921},
+  {"Static", 922},
+  {"Dynamc", 923},
   {"\
  Can't chdir to \"%s\" \n\
- %s ", 919},
-  {"Rescan", 920},
-  {"Forget", 921},
-  {"Rmdir", 922},
+ %s ", 924},
+  {"Forget", 925},
+  {"Rmdir", 926},
   {"\
 Can't write to the %s file:\n\
-%s\n", 923},
-  {" Invalid shell pattern defination \"%c\". ", 924},
-  {" Debug ", 925},
-  {" ERROR: ", 926},
-  {" True:  ", 927},
-  {" False: ", 928},
-  {" Warning -- ignoring file ", 929},
+%s\n", 927},
+  {" Invalid shell pattern defination \"%c\". ", 928},
+  {" Debug ", 929},
+  {" ERROR: ", 930},
+  {" True:  ", 931},
+  {" False: ", 932},
+  {" Warning -- ignoring file ", 933},
   {"\
 File %s is not owned by root or you or is world writable.\n\
-Using it may compromise your security", 930},
-  {" I can't run programs while logged on a non local directory ", 931},
-  {" User menu ", 932},
-  {"name_trunc: too big", 933},
-  {" Pipe failed ", 934},
-  {" Dup failed ", 935},
+Using it may compromise your security", 934},
+  {" I can't run programs while logged on a non local directory ", 935},
+  {" User menu ", 936},
+  {"name_trunc: too big", 937},
+  {" Pipe failed ", 938},
+  {" Dup failed ", 939},
   {"\
 File: \n\
 \n\
-    ", 936},
+    ", 940},
   {"\
 \n\
 \n\
-has been modified, do you want to save the changes?\n", 937},
-  {" Save changes ", 938},
-  {" Can't spawn child program ", 939},
-  {" Empty output from child filter ", 940},
-  {" Could not open file ", 941},
-  {" Can't open file \"", 942},
+has been modified, do you want to save the changes?\n", 941},
+  {" Save changes ", 942},
+  {" Can't spawn child program ", 943},
+  {" Empty output from child filter ", 944},
+  {" Could not open file ", 945},
+  {" Can't open file \"", 946},
   {"\
  Can't stat file \n\
- ", 943},
-  {" Can't view: not a regular file ", 944},
-  {"File: %s", 945},
-  {"  [grow]", 946},
-  {"Searching for `%s'", 947},
-  {" Search string not found ", 948},
-  {" Invalid regular expression ", 949},
+ ", 947},
+  {" Can't view: not a regular file ", 948},
+  {"File: %s", 949},
+  {"  [grow]", 950},
+  {"Searching for `%s'", 951},
+  {" Search string not found ", 952},
+  {" Invalid regular expression ", 953},
   {"\
  The current line number is %d.\n\
- Enter the new line number:", 950},
-  {" Enter regexp:", 951},
-  {" Enter search string:", 952},
-  {"Ascii", 953},
-  {"Hex", 954},
-  {"Line", 955},
-  {"RxSrch", 956},
-  {"EdText", 957},
-  {"EdHex", 958},
-  {"UnWrap", 959},
-  {"Wrap", 960},
-  {"HxSrch", 961},
-  {"Raw", 962},
-  {"Parse", 963},
-  {"Unform", 964},
-  {"Format", 965},
-  {"Function key 1", 966},
-  {"Function key 2", 967},
-  {"Function key 3", 968},
-  {"Function key 4", 969},
-  {"Function key 5", 970},
-  {"Function key 6", 971},
-  {"Function key 7", 972},
-  {"Function key 8", 973},
-  {"Function key 9", 974},
-  {"Function key 10", 975},
-  {"Function key 11", 976},
-  {"Function key 12", 977},
-  {"Function key 13", 978},
-  {"Function key 14", 979},
-  {"Function key 15", 980},
-  {"Function key 16", 981},
-  {"Function key 17", 982},
-  {"Function key 18", 983},
-  {"Function key 19", 984},
-  {"Function key 20", 985},
-  {"Backspace key", 986},
-  {"End key", 987},
-  {"Up arrow key", 988},
-  {"Down arrow key", 989},
-  {"Left arrow key", 990},
-  {"Right arrow key", 991},
-  {"Home key", 992},
-  {"Page Down key", 993},
-  {"Page Up key", 994},
-  {"Insert key", 995},
-  {"Delete key", 996},
-  {"Completion/M-tab", 997},
-  {"+ on keypad", 998},
-  {"- on keypad", 999},
-  {"* on keypad", 1000},
-  {"Left arrow keypad", 1001},
-  {"Right arrow keypad", 1002},
-  {"Up arrow keypad", 1003},
-  {"Down arrow keypad", 1004},
-  {"Home on keypad", 1005},
-  {"End on keypad", 1006},
-  {"Page Down keypad", 1007},
-  {"Page Up keypad", 1008},
-  {"Insert on keypad", 1009},
-  {"Delete on keypad", 1010},
-  {"Enter on keypad", 1011},
-  {"Slash on keypad", 1012},
-  {"NumLock on keypad", 1013},
-  {"Password:", 1014},
-  {"Password", 1015},
-  {"Ok", 1016},
+ Enter the new line number:", 954},
+  {" Enter regexp:", 955},
+  {" Enter search string:", 956},
+  {"Ascii", 957},
+  {"Hex", 958},
+  {"Line", 959},
+  {"RxSrch", 960},
+  {"EdText", 961},
+  {"EdHex", 962},
+  {"UnWrap", 963},
+  {"Wrap", 964},
+  {"HxSrch", 965},
+  {"Raw", 966},
+  {"Parse", 967},
+  {"Unform", 968},
+  {"Format", 969},
+  {"Function key 1", 970},
+  {"Function key 2", 971},
+  {"Function key 3", 972},
+  {"Function key 4", 973},
+  {"Function key 5", 974},
+  {"Function key 6", 975},
+  {"Function key 7", 976},
+  {"Function key 8", 977},
+  {"Function key 9", 978},
+  {"Function key 10", 979},
+  {"Function key 11", 980},
+  {"Function key 12", 981},
+  {"Function key 13", 982},
+  {"Function key 14", 983},
+  {"Function key 15", 984},
+  {"Function key 16", 985},
+  {"Function key 17", 986},
+  {"Function key 18", 987},
+  {"Function key 19", 988},
+  {"Function key 20", 989},
+  {"Backspace key", 990},
+  {"End key", 991},
+  {"Up arrow key", 992},
+  {"Down arrow key", 993},
+  {"Left arrow key", 994},
+  {"Right arrow key", 995},
+  {"Home key", 996},
+  {"Page Down key", 997},
+  {"Page Up key", 998},
+  {"Insert key", 999},
+  {"Delete key", 1000},
+  {"Completion/M-tab", 1001},
+  {"+ on keypad", 1002},
+  {"- on keypad", 1003},
+  {"* on keypad", 1004},
+  {"Left arrow keypad", 1005},
+  {"Right arrow keypad", 1006},
+  {"Up arrow keypad", 1007},
+  {"Down arrow keypad", 1008},
+  {"Home on keypad", 1009},
+  {"End on keypad", 1010},
+  {"Page Down keypad", 1011},
+  {"Page Up keypad", 1012},
+  {"Insert on keypad", 1013},
+  {"Delete on keypad", 1014},
+  {"Enter on keypad", 1015},
+  {"Slash on keypad", 1016},
+  {"NumLock on keypad", 1017},
+  {"Password:", 1018},
+  {"Password", 1019},
+  {"Ok", 1020},
   {"\
 Couldn't open %s archive\n\
-%s", 1017},
-  {"Inconsistent extfs archive", 1018},
-  {"Sorry, we can not do password authenticated connections for now.", 1019},
-  {" Could not set source routing (%s)", 1020},
+%s", 1021},
+  {"Inconsistent extfs archive", 1022},
+  {"Sorry, we can not do password authenticated connections for now.", 1023},
+  {" Could not set source routing (%s)", 1024},
   {"\
 ~/.netrc file has not correct mode.\n\
-Remove password or correct mode.", 1021},
-  {" MCFS ", 1022},
-  {" The server does not support this version ", 1023},
+Remove password or correct mode.", 1025},
+  {" MCFS ", 1026},
+  {" The server does not support this version ", 1027},
   {"\
  The remote server is not running on a system port \n\
  you need a password to log in, but the information may \n\
- not be safe on the remote side.  Continue? \n", 1024},
-  {" Yes ", 1025},
-  {" No ", 1026},
-  {" The remote server is running on strange port. Giving up.\n", 1027},
-  {" MCFS Password required ", 1028},
-  {" Invalid password ", 1029},
-  {" Too many open connections ", 1030},
+ not be safe on the remote side.  Continue? \n", 1028},
+  {" Yes ", 1029},
+  {" No ", 1030},
+  {" The remote server is running on strange port. Giving up.\n", 1031},
+  {" MCFS Password required ", 1032},
+  {" Invalid password ", 1033},
+  {" Too many open connections ", 1034},
   {"\
 Couldn't open tar archive\n\
-%s", 1031},
-  {"Unexpected EOF on archive file", 1032},
-  {"Inconsistent tar archive", 1033},
+%s", 1035},
+  {"Unexpected EOF on archive file", 1036},
+  {"Inconsistent tar archive", 1037},
   {"\
 Hmm,...\n\
 %s\n\
-doesn't look like a tar archive.", 1034},
+doesn't look like a tar archive.", 1038},
 };
 
-int _msg_tbl_length = 1034;
+int _msg_tbl_length = 1038;
diff -ruN old/mc-4.5.14/po/mc.pot new/mc-4.5.15/po/mc.pot
--- old/mc-4.5.14/po/mc.pot	Thu Feb 11 21:44:27 1999
+++ new/mc-4.5.15/po/mc.pot	Mon Feb 15 18:29:23 1999
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-02-11 20:35-0600\n"
+"POT-Creation-Date: 1999-02-15 17:04-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,129 +39,129 @@
 msgid " There is no other panel to compare contents to "
 msgstr ""
 
-#: gnome/gcmd.c:91
+#: gnome/gcmd.c:106
 msgid "GNU Midnight Commander"
 msgstr ""
 
-#: gnome/gcmd.c:94
+#: gnome/gcmd.c:109
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr ""
 
-#: gnome/gcmd.c:106 src/main.c:818 src/screen.c:2048
+#: gnome/gcmd.c:121 src/main.c:821 src/screen.c:2048
 msgid " The Midnight Commander "
 msgstr ""
 
-#: gnome/gcmd.c:107 src/main.c:819
+#: gnome/gcmd.c:122 src/main.c:822
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr ""
 
-#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809
-#: src/file.c:2189 src/filegui.c:573 src/hotlist.c:1035 src/main.c:820
+#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809
+#: src/file.c:2189 src/filegui.c:573 src/hotlist.c:1035 src/main.c:823
 #: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
 #: src/view.c:404
 msgid "&Yes"
 msgstr ""
 
-#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809
-#: src/file.c:2189 src/filegui.c:572 src/hotlist.c:1035 src/main.c:820
+#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809
+#: src/file.c:2189 src/filegui.c:572 src/hotlist.c:1035 src/main.c:823
 #: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
 #: src/view.c:404
 msgid "&No"
 msgstr ""
 
-#: gnome/gcmd.c:205
+#: gnome/gcmd.c:220
 msgid "Sort By"
 msgstr ""
 
 #. we define this up here so we can pass it in to our callback
-#: gnome/gcmd.c:210
+#: gnome/gcmd.c:225
 msgid "Ignore case sensitivity."
 msgstr ""
 
-#: gnome/gcmd.c:218 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:233 src/chmod.c:150 src/screen.c:425
 msgid "Name"
 msgstr ""
 
-#: gnome/gcmd.c:225
+#: gnome/gcmd.c:240
 msgid "File Type"
 msgstr ""
 
-#: gnome/gcmd.c:231 src/screen.c:426 src/screen.c:427
+#: gnome/gcmd.c:246 src/screen.c:426 src/screen.c:427
 msgid "Size"
 msgstr ""
 
-#: gnome/gcmd.c:237
+#: gnome/gcmd.c:252
 msgid "Time Last Accessed"
 msgstr ""
 
-#: gnome/gcmd.c:243
+#: gnome/gcmd.c:258
 msgid "Time Last Modified"
 msgstr ""
 
-#: gnome/gcmd.c:249
+#: gnome/gcmd.c:264
 msgid "Time Last Changed"
 msgstr ""
 
-#: gnome/gcmd.c:263
+#: gnome/gcmd.c:278
 msgid "Reverse the order."
 msgstr ""
 
-#: gnome/gcmd.c:325
+#: gnome/gcmd.c:340
 msgid "Enter name."
 msgstr ""
 
-#: gnome/gcmd.c:331
+#: gnome/gcmd.c:346
 msgid "Enter label for command:"
 msgstr ""
 
-#: gnome/gcmd.c:426
+#: gnome/gcmd.c:441
 msgid "Find all core files"
 msgstr ""
 
-#: gnome/gcmd.c:429 src/panelize.c:350
+#: gnome/gcmd.c:444 src/panelize.c:350
 msgid "Find rejects after patching"
 msgstr ""
 
-#: gnome/gcmd.c:471
+#: gnome/gcmd.c:486
 msgid "Run Command"
 msgstr ""
 
 #. Frame 1
-#: gnome/gcmd.c:476
+#: gnome/gcmd.c:491
 msgid "Preset Commands"
 msgstr ""
 
-#: gnome/gcmd.c:493
+#: gnome/gcmd.c:508
 msgid "Add"
 msgstr ""
 
-#: gnome/gcmd.c:497
+#: gnome/gcmd.c:512
 msgid "Remove"
 msgstr ""
 
 #. Frame 2
-#: gnome/gcmd.c:505
+#: gnome/gcmd.c:520
 msgid "Run this Command"
 msgstr ""
 
-#: gnome/gcmd.c:512
+#: gnome/gcmd.c:527
 msgid "Command: "
 msgstr ""
 
-#: gnome/gcmd.c:573
+#: gnome/gcmd.c:588
 msgid "Set Filter"
 msgstr ""
 
-#: gnome/gcmd.c:578 gnome/gcmd.c:619 gnome/gcmd.c:624 gnome/gcmd.c:628
-#: gnome/gscreen.c:2512
+#: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643
+#: gnome/gscreen.c:2565
 msgid "Show all files"
 msgstr ""
 
-#: gnome/gcmd.c:585
+#: gnome/gcmd.c:600
 msgid "."
 msgstr ""
 
-#: gnome/gcmd.c:601
+#: gnome/gcmd.c:616
 msgid ""
 "Enter a filter here for files in the panel view.\n"
 "\n"
@@ -169,41 +169,49 @@
 "*.gif will show just gif images"
 msgstr ""
 
-#: gnome/gcmd.c:603
+#: gnome/gcmd.c:618
 msgid "Enter a Regular Expression to filter files in the panel view."
 msgstr ""
 
-#: gnome/gcmd.c:660 gnome/gpopup.c:49
+#: gnome/gcmd.c:675 gnome/gpopup.c:49
 msgid " Open with..."
 msgstr ""
 
-#: gnome/gcmd.c:661 gnome/gpopup.c:50
+#: gnome/gcmd.c:676 gnome/gpopup.c:50
 msgid "Enter extra arguments:"
 msgstr ""
 
-#: gnome/gdesktop.c:350 gnome/gdesktop.c:1534
+#: gnome/gdesktop.c:375 gnome/gdesktop.c:1603
 msgid "Warning"
 msgstr ""
 
-#: gnome/gdesktop.c:351
+#: gnome/gdesktop.c:376
 #, c-format
 msgid "Could not open %s; will not have desktop icons"
 msgstr ""
 
-#: gnome/gdesktop.c:1500
+#: gnome/gdesktop.c:1566
 msgid "Trashcan"
 msgstr ""
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1530
+#: gnome/gdesktop.c:1599
 msgid "Home directory"
 msgstr ""
 
-#: gnome/gdesktop.c:1535
+#: gnome/gdesktop.c:1604
 #, c-format
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
 msgstr ""
 
+#: gnome/gdesktop.c:1910
+msgid "Arrange Icons"
+msgstr ""
+
+#: gnome/gdesktop.c:1911
+msgid "Rescan Desktop"
+msgstr ""
+
 #: gnome/gdialogs.c:58
 msgid "To: "
 msgstr ""
@@ -395,108 +403,100 @@
 msgid "Creates a new directory"
 msgstr ""
 
-#: gnome/glayout.c:292
-msgid "New _Window"
-msgstr ""
-
-#: gnome/glayout.c:292
-msgid "Opens a new window"
-msgstr ""
-
 #. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:306
+#: gnome/glayout.c:307
 msgid "_Copy..."
 msgstr ""
 
-#: gnome/glayout.c:306
+#: gnome/glayout.c:307
 msgid "Copy files"
 msgstr ""
 
-#: gnome/glayout.c:307
+#: gnome/glayout.c:308
 msgid "_Delete..."
 msgstr ""
 
-#: gnome/glayout.c:307
+#: gnome/glayout.c:308
 msgid "Delete files"
 msgstr ""
 
-#: gnome/glayout.c:308
+#: gnome/glayout.c:309
 msgid "_Move..."
 msgstr ""
 
-#: gnome/glayout.c:308
+#: gnome/glayout.c:309
 msgid "Rename or move files"
 msgstr ""
 
-#: gnome/glayout.c:315
+#: gnome/glayout.c:316
 msgid "Select _All"
 msgstr ""
 
-#: gnome/glayout.c:315
+#: gnome/glayout.c:316
 msgid "Select all files in the current Panel"
 msgstr ""
 
-#: gnome/glayout.c:317
+#: gnome/glayout.c:318
 msgid "_Select Files..."
 msgstr ""
 
-#: gnome/glayout.c:317
+#: gnome/glayout.c:318
 msgid "Select a group of files"
 msgstr ""
 
-#: gnome/glayout.c:318
+#: gnome/glayout.c:319
 msgid "_Invert Selection"
 msgstr ""
 
-#: gnome/glayout.c:318
+#: gnome/glayout.c:319
 msgid "Reverses the list of tagged files"
 msgstr ""
 
-#: gnome/glayout.c:320
+#: gnome/glayout.c:321
 msgid "_Rescan Directory"
 msgstr ""
 
-#: gnome/glayout.c:320
+#: gnome/glayout.c:321
 msgid "Rescan the directory contents"
 msgstr ""
 
-#: gnome/glayout.c:327
+#: gnome/glayout.c:328
 msgid "Icon View"
 msgstr ""
 
-#: gnome/glayout.c:328
+#: gnome/glayout.c:329
 msgid "Partial View"
 msgstr ""
 
-#: gnome/glayout.c:329
+#: gnome/glayout.c:330
 msgid "Full View"
 msgstr ""
 
-#: gnome/glayout.c:330
+#: gnome/glayout.c:331
 msgid "Custom View"
 msgstr ""
 
-#: gnome/glayout.c:335
+#: gnome/glayout.c:336
 msgid "_Sort By..."
 msgstr ""
 
-#: gnome/glayout.c:335
+#: gnome/glayout.c:336
 msgid "Confirmation settings"
 msgstr ""
 
-#: gnome/glayout.c:336
+#: gnome/glayout.c:337
 msgid "_Filter View..."
 msgstr ""
 
-#: gnome/glayout.c:336
+#: gnome/glayout.c:337
 msgid "Global option settings"
 msgstr ""
 
-#: gnome/glayout.c:343
+#: gnome/glayout.c:344
 msgid "_Find File..."
 msgstr ""
 
-#: gnome/glayout.c:343
+#: gnome/glayout.c:344
 msgid "Locate files on disk"
 msgstr ""
 
@@ -594,86 +594,90 @@
 msgid "Delete"
 msgstr ""
 
-#: gnome/gprefs.c:96
+#: gnome/gprefs.c:78
 msgid "Show backup files"
 msgstr ""
 
-#: gnome/gprefs.c:100
+#: gnome/gprefs.c:82
 msgid "Show hidden files"
 msgstr ""
 
-#: gnome/gprefs.c:104
+#: gnome/gprefs.c:86
 msgid "Mix files and directories"
 msgstr ""
 
-#: gnome/gprefs.c:108
+#: gnome/gprefs.c:90
 msgid "Use shell patterns instead of regular expressions"
 msgstr ""
 
-#: gnome/gprefs.c:117
+#: gnome/gprefs.c:99
 msgid "Confirm when deleting file"
 msgstr ""
 
-#: gnome/gprefs.c:121
+#: gnome/gprefs.c:103
 msgid "Confirm when overwriting files"
 msgstr ""
 
-#: gnome/gprefs.c:125
+#: gnome/gprefs.c:107
 msgid "Confirm when executing files"
 msgstr ""
 
-#: gnome/gprefs.c:129
+#: gnome/gprefs.c:111
 msgid "Show progress while operations are being performed"
 msgstr ""
 
-#: gnome/gprefs.c:138
-msgid "VFS Timeout :"
+#: gnome/gprefs.c:120
+msgid "VFS Timeout:"
 msgstr ""
 
-#: gnome/gprefs.c:139 gnome/gprefs.c:164
+#: gnome/gprefs.c:121 gnome/gprefs.c:146
 msgid "Seconds"
 msgstr ""
 
-#: gnome/gprefs.c:142
-msgid "Anonymous FTP password :"
+#: gnome/gprefs.c:124
+msgid "Anonymous FTP password:"
 msgstr ""
 
-#: gnome/gprefs.c:146
+#: gnome/gprefs.c:128
 msgid "Always use FTP proxy"
 msgstr ""
 
-#: gnome/gprefs.c:155
+#: gnome/gprefs.c:137
 msgid "Fast directory reload"
 msgstr ""
 
-#: gnome/gprefs.c:159
+#: gnome/gprefs.c:141
 msgid "Compute totals before copying files"
 msgstr ""
 
-#: gnome/gprefs.c:163
+#: gnome/gprefs.c:145
 msgid "FTP directory cache timeout :"
 msgstr ""
 
-#: gnome/gprefs.c:167
+#: gnome/gprefs.c:149
 msgid "Allow customization of icons in icon view"
 msgstr ""
 
-#: gnome/gprefs.c:176
+#: gnome/gprefs.c:158
 msgid "File display"
 msgstr ""
 
-#: gnome/gprefs.c:180
+#: gnome/gprefs.c:162
 msgid "Confirmation"
 msgstr ""
 
-#: gnome/gprefs.c:184
+#: gnome/gprefs.c:166
 msgid "VFS"
 msgstr ""
 
-#: gnome/gprefs.c:188
+#: gnome/gprefs.c:170
 msgid "Caching"
 msgstr ""
 
+#: gnome/gprefs.c:447
+msgid "Preferences"
+msgstr ""
+
 #: gnome/gprop.c:58 gnome/gprop.c:75
 msgid "Filename"
 msgstr ""
@@ -763,7 +767,7 @@
 msgid "Title"
 msgstr ""
 
-#: gnome/gprop.c:521 gnome/gscreen.c:2305
+#: gnome/gprop.c:521 gnome/gscreen.c:2352
 msgid "Icon"
 msgstr ""
 
@@ -771,164 +775,180 @@
 msgid "Select icon"
 msgstr ""
 
-#: gnome/gscreen.c:1577
+#: gnome/gscreen.c:1437
+msgid "Rescan Directory"
+msgstr ""
+
+#: gnome/gscreen.c:1437
+msgid "Reloads the current directory"
+msgstr ""
+
+#: gnome/gscreen.c:1615
 msgid "All files"
 msgstr ""
 
-#: gnome/gscreen.c:1579
+#: gnome/gscreen.c:1617
 msgid "Archives and compressed files"
 msgstr ""
 
-#: gnome/gscreen.c:1581
+#: gnome/gscreen.c:1619
 msgid "RPM/DEB files"
 msgstr ""
 
-#: gnome/gscreen.c:1583
+#: gnome/gscreen.c:1621
 msgid "Text/Document files"
 msgstr ""
 
-#: gnome/gscreen.c:1585
+#: gnome/gscreen.c:1623
 msgid "HTML and SGML files"
 msgstr ""
 
-#: gnome/gscreen.c:1587
+#: gnome/gscreen.c:1625
 msgid "Postscript and PDF files"
 msgstr ""
 
-#: gnome/gscreen.c:1589
+#: gnome/gscreen.c:1627
 msgid "Spreadsheet files"
 msgstr ""
 
-#: gnome/gscreen.c:1591
+#: gnome/gscreen.c:1629
 msgid "Image files"
 msgstr ""
 
-#: gnome/gscreen.c:1594
+#: gnome/gscreen.c:1632
 msgid "Video/animation files"
 msgstr ""
 
-#: gnome/gscreen.c:1596
+#: gnome/gscreen.c:1634
 msgid "Audio files"
 msgstr ""
 
-#: gnome/gscreen.c:1598
+#: gnome/gscreen.c:1636
 msgid "C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1600
+#: gnome/gscreen.c:1638
 msgid "C++ program files"
 msgstr ""
 
-#: gnome/gscreen.c:1602
+#: gnome/gscreen.c:1640
 msgid "Objective-C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1604
+#: gnome/gscreen.c:1642
 msgid "Scheme program files"
 msgstr ""
 
-#: gnome/gscreen.c:1606
+#: gnome/gscreen.c:1644
 msgid "Assembler program files"
 msgstr ""
 
-#: gnome/gscreen.c:1608
+#: gnome/gscreen.c:1646
 msgid "Misc. program files"
 msgstr ""
 
-#: gnome/gscreen.c:1610
+#: gnome/gscreen.c:1648
 msgid "Font files"
 msgstr ""
 
-#: gnome/gscreen.c:1737
+#: gnome/gscreen.c:1775
 #, c-format
 msgid "Search: %s"
 msgstr ""
 
-#: gnome/gscreen.c:1747
+#: gnome/gscreen.c:1785
 #, c-format
 msgid "%s bytes in %d file"
 msgstr ""
 
-#: gnome/gscreen.c:1747
+#: gnome/gscreen.c:1785
 #, c-format
 msgid "%s bytes in %d files"
 msgstr ""
 
-#: gnome/gscreen.c:1773 src/screen.c:677
+#: gnome/gscreen.c:1811 src/screen.c:677
 msgid "<readlink failed>"
 msgstr ""
 
-#: gnome/gscreen.c:1827
+#: gnome/gscreen.c:1865
 msgid "Filter"
 msgstr ""
 
-#: gnome/gscreen.c:2305
+#: gnome/gscreen.c:2352
 msgid "Switch view to an Icon view"
 msgstr ""
 
-#: gnome/gscreen.c:2307
+#: gnome/gscreen.c:2354
 msgid "Brief"
 msgstr ""
 
-#: gnome/gscreen.c:2307
+#: gnome/gscreen.c:2354
 msgid "Switch view to show just file name and type"
 msgstr ""
 
-#: gnome/gscreen.c:2309
+#: gnome/gscreen.c:2356
 msgid "Detailed"
 msgstr ""
 
-#: gnome/gscreen.c:2309
+#: gnome/gscreen.c:2356
 msgid "Switch view to show detailed file statistics"
 msgstr ""
 
-#: gnome/gscreen.c:2311
+#: gnome/gscreen.c:2358
 msgid "Custom"
 msgstr ""
 
-#: gnome/gscreen.c:2311
+#: gnome/gscreen.c:2358
 msgid "Switch view to show custom determined statistics."
 msgstr ""
 
-#: gnome/gscreen.c:2316
+#: gnome/gscreen.c:2366
 msgid "Back"
 msgstr ""
 
-#: gnome/gscreen.c:2316
+#: gnome/gscreen.c:2366
 msgid "Go to the previously visited directory"
 msgstr ""
 
-#: gnome/gscreen.c:2318
+#: gnome/gscreen.c:2368
 msgid "Up"
 msgstr ""
 
-#: gnome/gscreen.c:2318
+#: gnome/gscreen.c:2368
 msgid "Go up a level in the directory heirarchy"
 msgstr ""
 
-#: gnome/gscreen.c:2320
+#: gnome/gscreen.c:2370
 msgid "Forward"
 msgstr ""
 
-#: gnome/gscreen.c:2320
+#: gnome/gscreen.c:2370
 msgid "Go to the next directory"
 msgstr ""
 
-#: gnome/gscreen.c:2323
+#: gnome/gscreen.c:2373 src/tree.c:1020
+msgid "Rescan"
+msgstr ""
+
+#: gnome/gscreen.c:2373
+msgid "Rescan the current directory"
+msgstr ""
+
+#: gnome/gscreen.c:2376
 msgid "Home"
 msgstr ""
 
-#: gnome/gscreen.c:2323
+#: gnome/gscreen.c:2376
 msgid "Go to your home directory"
 msgstr ""
 
-#: gnome/gscreen.c:2457
+#: gnome/gscreen.c:2510
 msgid "Location:"
 msgstr ""
 
 #: gnome/gtools.c:104 src/boxes.c:138 src/boxes.c:278 src/boxes.c:378
 #: src/boxes.c:466 src/boxes.c:646 src/boxes.c:728 src/boxes.c:783
-#: src/boxes.c:894 src/filegui.c:807 src/find.c:171 src/layout.c:369
+#: src/boxes.c:897 src/filegui.c:807 src/find.c:171 src/layout.c:369
 #: src/option.c:144 src/wtools.c:289 src/wtools.c:561
 msgid "&Ok"
 msgstr ""
@@ -1067,9 +1087,9 @@
 #. Warning message with a query to continue or cancel the operation
 #: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831
 #: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:606
-#: src/help.c:318 src/main.c:665 src/screen.c:2064 src/subshell.c:700
-#: src/subshell.c:726 src/utilunix.c:382 src/utilunix.c:386 src/utilunix.c:452
-#: vfs/mcfs.c:169
+#: src/help.c:318 src/main.c:668 src/screen.c:2064 src/subshell.c:700
+#: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458
+#: vfs/mcfs.c:170
 msgid " Warning "
 msgstr ""
 
@@ -1091,7 +1111,7 @@
 msgid " Save as "
 msgstr ""
 
-#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2594
+#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2602
 msgid " Error trying to save file. "
 msgstr ""
 
@@ -1346,89 +1366,89 @@
 msgid " &No "
 msgstr ""
 
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2509
+#: gtkedit/editcmd.c:2442 gtkedit/editcmd.c:2517
 msgid " Copy to clipboard "
 msgstr ""
 
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2509
-#: gtkedit/editcmd.c:2522
+#: gtkedit/editcmd.c:2442 gtkedit/editcmd.c:2464 gtkedit/editcmd.c:2517
+#: gtkedit/editcmd.c:2530
 msgid " Unable to save to file. "
 msgstr ""
 
-#: gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2522
+#: gtkedit/editcmd.c:2464 gtkedit/editcmd.c:2530
 msgid " Cut to clipboard "
 msgstr ""
 
-#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
-#: gtkedit/editcmd.c:2556 src/view.c:1857
+#: gtkedit/editcmd.c:2552 gtkedit/editcmd.c:2556 gtkedit/editcmd.c:2561
+#: gtkedit/editcmd.c:2564 src/view.c:1857
 msgid " Goto line "
 msgstr ""
 
-#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
-#: gtkedit/editcmd.c:2556
+#: gtkedit/editcmd.c:2552 gtkedit/editcmd.c:2556 gtkedit/editcmd.c:2561
+#: gtkedit/editcmd.c:2564
 msgid " Enter line: "
 msgstr ""
 
-#: gtkedit/editcmd.c:2577 gtkedit/editcmd.c:2594
+#: gtkedit/editcmd.c:2585 gtkedit/editcmd.c:2602
 msgid " Save Block "
 msgstr ""
 
-#: gtkedit/editcmd.c:2628
+#: gtkedit/editcmd.c:2636
 msgid " Insert File "
 msgstr ""
 
-#: gtkedit/editcmd.c:2643
+#: gtkedit/editcmd.c:2651
 msgid " Insert file "
 msgstr ""
 
-#: gtkedit/editcmd.c:2643
+#: gtkedit/editcmd.c:2651
 msgid " Error trying to insert file. "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2663
+#: gtkedit/editcmd.c:2671
 msgid " Sort block "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2663 gtkedit/editcmd.c:2717
+#: gtkedit/editcmd.c:2671 gtkedit/editcmd.c:2725
 msgid " You must first highlight a block of text. "
 msgstr ""
 
-#: gtkedit/editcmd.c:2670
+#: gtkedit/editcmd.c:2678
 msgid " Run Sort "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2672
+#: gtkedit/editcmd.c:2680
 msgid " Enter sort options (see manpage) separated by whitespace: "
 msgstr ""
 
-#: gtkedit/editcmd.c:2683 gtkedit/editcmd.c:2689
+#: gtkedit/editcmd.c:2691 gtkedit/editcmd.c:2697
 msgid " Sort "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2685
+#: gtkedit/editcmd.c:2693
 msgid " Error trying to execute sort command "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2691
+#: gtkedit/editcmd.c:2699
 msgid " Sort returned non-zero: "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2715 gtkedit/editcmd.c:2745
+#: gtkedit/editcmd.c:2723 gtkedit/editcmd.c:2753
 msgid " Process block "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2747
+#: gtkedit/editcmd.c:2755
 msgid " Error trying to stat file "
 msgstr ""
 
-#: gtkedit/editcmd.c:2817
+#: gtkedit/editcmd.c:2825
 msgid " Mail "
 msgstr ""
 
@@ -1459,7 +1479,7 @@
 msgid "Error initialising editor.\n"
 msgstr ""
 
-#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2285
+#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1671 src/screen.c:2285
 #: src/screen.c:2315 src/tree.c:1018 src/view.c:1987
 msgid "Help"
 msgstr ""
@@ -1476,11 +1496,11 @@
 msgid "Search"
 msgstr ""
 
-#: gtkedit/editwidget.c:1069 src/main.c:1670
+#: gtkedit/editwidget.c:1069 src/main.c:1673
 msgid "PullDn"
 msgstr ""
 
-#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1671 src/view.c:1989
+#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1674 src/view.c:1989
 #: src/view.c:2009
 msgid "Quit"
 msgstr ""
@@ -1782,19 +1802,19 @@
 msgid "Stopped"
 msgstr ""
 
-#: src/boxes.c:891
+#: src/boxes.c:894
 msgid "&Stop"
 msgstr ""
 
-#: src/boxes.c:892
+#: src/boxes.c:895
 msgid "&Resume"
 msgstr ""
 
-#: src/boxes.c:893
+#: src/boxes.c:896
 msgid "&Kill"
 msgstr ""
 
-#: src/boxes.c:932
+#: src/boxes.c:935
 msgid "Background Jobs"
 msgstr ""
 
@@ -2279,7 +2299,7 @@
 msgid "File exists but can not be stat-ed: %s %s"
 msgstr ""
 
-#: src/dir.c:643
+#: src/dir.c:647
 msgid "Unknown"
 msgstr ""
 
@@ -2899,7 +2919,7 @@
 msgid "Content: "
 msgstr ""
 
-#: src/find.c:171 src/main.c:1199 src/main.c:1220
+#: src/find.c:171 src/main.c:1202 src/main.c:1223
 msgid "&Tree"
 msgstr ""
 
@@ -3438,7 +3458,7 @@
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr ""
 
-#: src/main.c:666
+#: src/main.c:669
 msgid ""
 " The Commander can't change to the directory that \n"
 " the subshell claims you are in.  Perhaps you have \n"
@@ -3446,251 +3466,251 @@
 " extra access permissions with the \"su\" command? "
 msgstr ""
 
-#: src/main.c:741
+#: src/main.c:744
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/main.c:791
+#: src/main.c:794
 msgid " The shell is already running a command "
 msgstr ""
 
-#: src/main.c:1196 src/main.c:1217
+#: src/main.c:1199 src/main.c:1220
 msgid "&Listing mode..."
 msgstr ""
 
-#: src/main.c:1197 src/main.c:1218
+#: src/main.c:1200 src/main.c:1221
 msgid "&Quick view     C-x q"
 msgstr ""
 
-#: src/main.c:1198 src/main.c:1219
+#: src/main.c:1201 src/main.c:1222
 msgid "&Info           C-x i"
 msgstr ""
 
-#: src/main.c:1201 src/main.c:1222
+#: src/main.c:1204 src/main.c:1225
 msgid "&Sort order..."
 msgstr ""
 
-#: src/main.c:1203 src/main.c:1224
+#: src/main.c:1206 src/main.c:1227
 msgid "&Filter..."
 msgstr ""
 
-#: src/main.c:1206 src/main.c:1227
+#: src/main.c:1209 src/main.c:1230
 msgid "&Network link..."
 msgstr ""
 
-#: src/main.c:1207 src/main.c:1228
+#: src/main.c:1210 src/main.c:1231
 msgid "FT&P link..."
 msgstr ""
 
-#: src/main.c:1211 src/main.c:1232
+#: src/main.c:1214 src/main.c:1235
 msgid "&Drive...       M-d"
 msgstr ""
 
-#: src/main.c:1213 src/main.c:1234
+#: src/main.c:1216 src/main.c:1237
 msgid "&Rescan         C-r"
 msgstr ""
 
-#: src/main.c:1238
+#: src/main.c:1241
 msgid "&User menu          F2"
 msgstr ""
 
-#: src/main.c:1239
+#: src/main.c:1242
 msgid "&View               F3"
 msgstr ""
 
-#: src/main.c:1240
+#: src/main.c:1243
 msgid "Vie&w file...         "
 msgstr ""
 
-#: src/main.c:1241
+#: src/main.c:1244
 msgid "&Filtered view     M-!"
 msgstr ""
 
-#: src/main.c:1242
+#: src/main.c:1245
 msgid "&Edit               F4"
 msgstr ""
 
-#: src/main.c:1243
+#: src/main.c:1246
 msgid "&Copy               F5"
 msgstr ""
 
-#: src/main.c:1244
+#: src/main.c:1247
 msgid "c&Hmod           C-x c"
 msgstr ""
 
-#: src/main.c:1246
+#: src/main.c:1249
 msgid "&Link            C-x l"
 msgstr ""
 
-#: src/main.c:1247
+#: src/main.c:1250
 msgid "&SymLink         C-x s"
 msgstr ""
 
-#: src/main.c:1248
+#: src/main.c:1251
 msgid "edit s&Ymlink  C-x C-s"
 msgstr ""
 
-#: src/main.c:1249
+#: src/main.c:1252
 msgid "ch&Own           C-x o"
 msgstr ""
 
-#: src/main.c:1250
+#: src/main.c:1253
 msgid "&Advanced chown       "
 msgstr ""
 
-#: src/main.c:1252
+#: src/main.c:1255
 msgid "&Rename/Move        F6"
 msgstr ""
 
-#: src/main.c:1253
+#: src/main.c:1256
 msgid "&Mkdir              F7"
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1257
 msgid "&Delete             F8"
 msgstr ""
 
-#: src/main.c:1255
+#: src/main.c:1258
 msgid "&Quick cd          M-c"
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1260
 msgid "select &Group      M-+"
 msgstr ""
 
-#: src/main.c:1258
+#: src/main.c:1261
 msgid "u&Nselect group    M-\\"
 msgstr ""
 
-#: src/main.c:1259
+#: src/main.c:1262
 msgid "reverse selec&Tion M-*"
 msgstr ""
 
-#: src/main.c:1261
+#: src/main.c:1264
 msgid "e&Xit              F10"
 msgstr ""
 
-#: src/main.c:1271
+#: src/main.c:1274
 msgid "&Directory tree"
 msgstr ""
 
-#: src/main.c:1273
+#: src/main.c:1276
 msgid "&Find file            M-?"
 msgstr ""
 
-#: src/main.c:1274
+#: src/main.c:1277
 msgid "s&Wap panels          C-u"
 msgstr ""
 
-#: src/main.c:1275
+#: src/main.c:1278
 msgid "switch &Panels on/off C-o"
 msgstr ""
 
-#: src/main.c:1276
+#: src/main.c:1279
 msgid "&Compare directories  C-x d"
 msgstr ""
 
-#: src/main.c:1277
+#: src/main.c:1280
 msgid "e&Xternal panelize    C-x !"
 msgstr ""
 
-#: src/main.c:1278
+#: src/main.c:1281
 msgid "show directory s&Izes"
 msgstr ""
 
-#: src/main.c:1280
+#: src/main.c:1283
 msgid "command &History"
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1284
 msgid "di&Rectory hotlist    C-\\"
 msgstr ""
 
-#: src/main.c:1283
+#: src/main.c:1286
 msgid "&Active VFS list      C-x a"
 msgstr ""
 
-#: src/main.c:1286
+#: src/main.c:1289
 msgid "&Background jobs      C-x j"
 msgstr ""
 
-#: src/main.c:1290
+#: src/main.c:1293
 msgid "&Undelete files (ext2fs only)"
 msgstr ""
 
-#: src/main.c:1293
+#: src/main.c:1296
 msgid "&Listing format edit"
 msgstr ""
 
-#: src/main.c:1295
+#: src/main.c:1298
 msgid "&Extension file edit"
 msgstr ""
 
-#: src/main.c:1296
+#: src/main.c:1299
 msgid "&Menu file edit"
 msgstr ""
 
-#: src/main.c:1301
+#: src/main.c:1304
 msgid "&Configuration..."
 msgstr ""
 
-#: src/main.c:1302
+#: src/main.c:1305
 msgid "&Layout..."
 msgstr ""
 
-#: src/main.c:1303
+#: src/main.c:1306
 msgid "c&Onfirmation..."
 msgstr ""
 
-#: src/main.c:1304
+#: src/main.c:1307
 msgid "&Display bits..."
 msgstr ""
 
-#: src/main.c:1306
+#: src/main.c:1309
 msgid "learn &Keys..."
 msgstr ""
 
-#: src/main.c:1309
+#: src/main.c:1312
 msgid "&Virtual FS..."
 msgstr ""
 
-#: src/main.c:1312
+#: src/main.c:1315
 msgid "&Save setup"
 msgstr ""
 
-#: src/main.c:1328 src/main.c:1330
+#: src/main.c:1331 src/main.c:1333
 msgid " &Left "
 msgstr ""
 
-#: src/main.c:1330
+#: src/main.c:1333
 msgid " &Above "
 msgstr ""
 
-#: src/main.c:1333
+#: src/main.c:1336
 msgid " &File "
 msgstr ""
 
-#: src/main.c:1334
+#: src/main.c:1337
 msgid " &Command "
 msgstr ""
 
-#: src/main.c:1335
+#: src/main.c:1338
 msgid " &Options "
 msgstr ""
 
-#: src/main.c:1337 src/main.c:1339
+#: src/main.c:1340 src/main.c:1342
 msgid " &Right "
 msgstr ""
 
-#: src/main.c:1339
+#: src/main.c:1342
 msgid " &Below "
 msgstr ""
 
-#: src/main.c:1394
+#: src/main.c:1397
 msgid " Information "
 msgstr ""
 
-#: src/main.c:1395
+#: src/main.c:1398
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -3698,64 +3718,64 @@
 " the details.                                           "
 msgstr ""
 
-#: src/main.c:1669 src/screen.c:2286 src/screen.c:2316
+#: src/main.c:1672 src/screen.c:2286 src/screen.c:2316
 msgid "Menu"
 msgstr ""
 
-#: src/main.c:1874
+#: src/main.c:1877
 msgid "Thank you for using GNU Midnight Commander"
 msgstr ""
 
-#: src/main.c:2227
+#: src/main.c:2236
 #, c-format
 msgid "with mouse support on xterm%s.\n"
 msgstr ""
 
-#: src/main.c:2228
+#: src/main.c:2237
 msgid " and the Linux console"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2332
 msgid "The TERM environment variable is unset!\n"
 msgstr ""
 
-#: src/main.c:2528
+#: src/main.c:2539
 #, c-format
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr ""
 
-#: src/main.c:2539
+#: src/main.c:2550
 msgid ""
 "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 
-#: src/main.c:2666
+#: src/main.c:2676
 msgid "Geometry for the window"
 msgstr ""
 
-#: src/main.c:2666
+#: src/main.c:2676
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/main.c:2667
+#: src/main.c:2677
 msgid "No windows opened at startup"
 msgstr ""
 
-#: src/main.c:2668
+#: src/main.c:2678
 msgid "Force activation even if a server is already running"
 msgstr ""
 
-#: src/main.c:2940
+#: src/main.c:2950
 msgid ""
 "Couldn't open tty line. You have to run mc without the -P flag.\n"
 "On some systems you may want to run # `which mc`\n"
 msgstr ""
 
-#: src/main.c:3014
+#: src/main.c:3024
 msgid " Notice "
 msgstr ""
 
-#: src/main.c:3015
+#: src/main.c:3025
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -4061,10 +4081,6 @@
 " %s "
 msgstr ""
 
-#: src/tree.c:1020
-msgid "Rescan"
-msgstr ""
-
 #: src/tree.c:1022
 msgid "Forget"
 msgstr ""
@@ -4125,11 +4141,11 @@
 msgid "name_trunc: too big"
 msgstr ""
 
-#: src/utilunix.c:382
+#: src/utilunix.c:388
 msgid " Pipe failed "
 msgstr ""
 
-#: src/utilunix.c:386
+#: src/utilunix.c:392
 msgid " Dup failed "
 msgstr ""
 
@@ -4461,7 +4477,7 @@
 msgid "NumLock on keypad"
 msgstr ""
 
-#: src/wtools.c:587 vfs/vfs.c:1757
+#: src/wtools.c:587 vfs/vfs.c:1760
 msgid "Password:"
 msgstr ""
 
@@ -4499,42 +4515,42 @@
 "Remove password or correct mode."
 msgstr ""
 
-#: vfs/mcfs.c:153
+#: vfs/mcfs.c:154
 msgid " MCFS "
 msgstr ""
 
-#: vfs/mcfs.c:153
+#: vfs/mcfs.c:154
 msgid " The server does not support this version "
 msgstr ""
 
-#: vfs/mcfs.c:170
+#: vfs/mcfs.c:171
 msgid ""
 " The remote server is not running on a system port \n"
 " you need a password to log in, but the information may \n"
 " not be safe on the remote side.  Continue? \n"
 msgstr ""
 
-#: vfs/mcfs.c:173
+#: vfs/mcfs.c:174
 msgid " Yes "
 msgstr ""
 
-#: vfs/mcfs.c:173
+#: vfs/mcfs.c:174
 msgid " No "
 msgstr ""
 
-#: vfs/mcfs.c:175
+#: vfs/mcfs.c:176
 msgid " The remote server is running on strange port. Giving up.\n"
 msgstr ""
 
-#: vfs/mcfs.c:187
+#: vfs/mcfs.c:188
 msgid " MCFS Password required "
 msgstr ""
 
-#: vfs/mcfs.c:201
+#: vfs/mcfs.c:202
 msgid " Invalid password "
 msgstr ""
 
-#: vfs/mcfs.c:321
+#: vfs/mcfs.c:322
 msgid " Too many open connections "
 msgstr ""
 
diff -ruN old/mc-4.5.14/slang/ChangeLog new/mc-4.5.15/slang/ChangeLog
--- old/mc-4.5.14/slang/ChangeLog	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.15/slang/ChangeLog	Mon Feb 15 18:29:09 1999
@@ -0,0 +1,10 @@
+Sun Feb 14 01:05:42 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* sldisply.c (SLtt_get_terminfo): use g_snprintf instead of
+	sprintf
+
+	* slsmg.c (SLsmg_printf): ditto
+
+	* sltermin.c (SLtt_tigetent): ditto
+
+
diff -ruN old/mc-4.5.14/slang/Makefile.in new/mc-4.5.15/slang/Makefile.in
--- old/mc-4.5.14/slang/Makefile.in	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/slang/Makefile.in	Mon Feb 15 18:29:09 1999
@@ -25,7 +25,7 @@
 # Distribution variables
 #
 
-DISTSLANG = 	Makefile.in README $(SLANGSRCS) $(SLANGHDRS)
+DISTSLANG = 	Makefile.in ChangeLog README $(SLANGSRCS) $(SLANGHDRS)
 
 all: @LIBSLANG@
 
diff -ruN old/mc-4.5.14/slang/sldisply.c new/mc-4.5.15/slang/sldisply.c
--- old/mc-4.5.14/slang/sldisply.c	Thu Feb 11 21:44:23 1999
+++ new/mc-4.5.15/slang/sldisply.c	Mon Feb 15 18:29:09 1999
@@ -1781,7 +1781,7 @@
    	     SLtt_set_term_vtxxx (&vt102);
 	     return;
 	  }
-	sprintf (err_buf, "Unknown terminal: %s\n\
+	g_snprintf (err_buf, sizeof (err_buf), "Unknown terminal: %s\n\
 Check the TERM environment variable.\n\
 Also make sure that the terminal is defined in the terminfo database.\n\
 Alternatively, set the TERMCAP environment variable to the desired\n\
diff -ruN old/mc-4.5.14/slang/slerr.c new/mc-4.5.15/slang/slerr.c
--- old/mc-4.5.14/slang/slerr.c	Thu Feb 11 21:44:23 1999
+++ new/mc-4.5.15/slang/slerr.c	Mon Feb 15 18:29:09 1999
@@ -35,7 +35,7 @@
    
    str = "Slang/Midnight Commander unknown error";
 
-   sprintf(err, "S-Lang Error: %s", str);
+   g_snprintf(err, sizeof (err), "S-Lang Error: %s", str);
    
    if (SLang_Error_Routine == NULL)
      {
diff -ruN old/mc-4.5.14/slang/slsmg.c new/mc-4.5.15/slang/slsmg.c
--- old/mc-4.5.14/slang/slsmg.c	Thu Feb 11 21:44:23 1999
+++ new/mc-4.5.15/slang/slsmg.c	Mon Feb 15 18:29:09 1999
@@ -189,7 +189,7 @@
    va_list ap;
 
    va_start(ap, fmt);
-   (void) vsprintf(p, fmt, ap);
+   (void) g_vsnprintf(p, sizeof (p), fmt, ap);
    va_end(ap);
    
    SLsmg_write_string (p);
@@ -947,7 +947,7 @@
 {
    char p[1000];
    
-   (void) vsprintf(p, fmt, ap);
+   (void) g_vsnprintf(p, sizeof (p), fmt, ap);
    
    SLsmg_write_string (p);
 }
diff -ruN old/mc-4.5.14/slang/sltermin.c new/mc-4.5.15/slang/sltermin.c
--- old/mc-4.5.14/slang/sltermin.c	Thu Feb 11 21:44:23 1999
+++ new/mc-4.5.15/slang/sltermin.c	Mon Feb 15 18:29:09 1999
@@ -269,7 +269,7 @@
 	tidir = Terminfo_Dirs[i];
 	if (tidir != NULL)
 	  {
-	     sprintf (file, "%s/%c/%s", tidir, *term, term);
+	     g_snprintf (file, sizeof (file), "%s/%c/%s", tidir, *term, term);
 	     if (NULL != (fp = open_terminfo (file, ti))) break;
 	  }
 	i++;
diff -ruN old/mc-4.5.14/src/ChangeLog new/mc-4.5.15/src/ChangeLog
--- old/mc-4.5.14/src/ChangeLog	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/ChangeLog	Mon Feb 15 18:29:14 1999
@@ -1,3 +1,20 @@
+Sun Feb 14 02:59:09 1999  Timur Bakeyev  <mc@bat.ru>
+
+	* utilunix.c (my_system): Fix the order of preferenses, as setuid 
+	more desirable on BSD systems. Terminate execl[p]() with NULL, as
+	this is formally correct.
+
+1999-02-12  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* dir.c (do_load_dir): Added missing calls to tree_store_end_check. 
+
+	* find.c (add_to_list): Pass the data pointer as well.
+
+Fri Feb 12 06:36:58 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* utilunix.c (my_system): Compilation fix: on systems without
+	setreuid use setuid.
+
 1999-02-11  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* panel.h (WPanel): Removed unused field "corbadat".
diff -ruN old/mc-4.5.14/src/boxes.c new/mc-4.5.15/src/boxes.c
--- old/mc-4.5.14/src/boxes.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/boxes.c	Mon Feb 15 18:29:13 1999
@@ -847,7 +847,7 @@
 task_cb (int action, void *ignored)
 {
     TaskList *tl;
-    int sig;
+    int sig = 0;
     
     if (!bg_list->list)
 	return 0;
@@ -855,13 +855,16 @@
     /* Get this instance information */
     tl = (TaskList *) bg_list->current->data;
     
+#  ifdef SIGTSTP
     if (action == B_STOP){
 	sig   = SIGSTOP;
 	tl->state = Task_Stopped;
     } else if (action == B_RESUME){
 	sig   = SIGCONT;
 	tl->state = Task_Running;
-    } else if (action == B_KILL){
+    } else 
+#  endif
+    if (action == B_KILL){
 	sig = SIGKILL;
     }
     
diff -ruN old/mc-4.5.14/src/color.c new/mc-4.5.15/src/color.c
--- old/mc-4.5.14/src/color.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/color.c	Mon Feb 15 18:29:12 1999
@@ -24,7 +24,7 @@
 #include "color.h"
 #include "x.h"
 
-/* "$Id: color.c,v 1.13 1999/01/27 01:08:41 timur Exp $" */
+/* "$Id: color.c,v 1.14 1999/02/13 21:39:21 unammx Exp $" */
 
 /* To avoid excessive calls to ncurses' has_colors () */
 int   hascolors = 0;
@@ -241,7 +241,7 @@
 }
 
 #ifndef HAVE_SLANG
-#define MAX_PAIRS 34
+#define MAX_PAIRS 64
 int attr_pairs [MAX_PAIRS];
 #endif
 
diff -ruN old/mc-4.5.14/src/dir.c new/mc-4.5.15/src/dir.c
--- old/mc-4.5.14/src/dir.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/dir.c	Mon Feb 15 18:29:11 1999
@@ -30,7 +30,7 @@
 #include "tree.h"
 #include "../vfs/vfs.h"
 
-/* "$Id: dir.c,v 1.14 1999/02/10 21:58:09 unammx Exp $" */
+/* "$Id: dir.c,v 1.15 1999/02/12 22:23:38 unammx Exp $" */
 
 /*
  * If true show files starting with a dot.
@@ -464,6 +464,7 @@
     
     dirp = mc_opendir (".");
     if (!dirp){
+	tree_store_end_check ();
 	return set_zero_dir (list);
     }
     for (dp = mc_readdir (dirp); dp; dp = mc_readdir (dirp)){
@@ -471,8 +472,10 @@
 	    &stalled_link);
 	if (status == 0)
 	    continue;
-	if (status == -1)
+	if (status == -1){
+	    tree_store_end_check ();
 	    return next_free;
+	}
 	list->list [next_free].fnamelen = NLENGTH (dp);
 	list->list [next_free].fname = g_strdup (dp->d_name);
 	list->list [next_free].f.marked = 0;
@@ -491,9 +494,10 @@
 	if (!dotdot_found)
 	    add_dotdot_to_list (list, next_free++);
 	do_sort (list, sort, next_free-1, reverse, case_sensitive);
-    }
-    else
+    } else {
+	tree_store_end_check ();
 	return set_zero_dir (list);
+    }
     
     mc_closedir (dirp);
     tree_store_end_check ();
diff -ruN old/mc-4.5.14/src/ext.c new/mc-4.5.15/src/ext.c
--- old/mc-4.5.14/src/ext.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/ext.c	Mon Feb 15 18:29:12 1999
@@ -97,7 +97,7 @@
 }
 	     
 void
-exec_extension (char *filename, char *data, char **drops, int *move_dir, int start_line)
+exec_extension (const char *filename, const char *data, char **drops, int *move_dir, int start_line)
 {
     char *file_name;
     int  cmd_file_fd;
diff -ruN old/mc-4.5.14/src/ext.h new/mc-4.5.15/src/ext.h
--- old/mc-4.5.14/src/ext.h	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/ext.h	Mon Feb 15 18:29:10 1999
@@ -2,7 +2,7 @@
 #define __EXT_H
 
 char *regex_command (char *filename, char *action, char **drops, int *move_dir);
-void exec_extension (char *filename, char *data, char **drops, int *move_dir, int start_line);
+void exec_extension (const char *filename, const char *data, char **drops, int *move_dir, int start_line);
 
 /* Call it after the user has edited the mc.ext file, 
  * to flush the cached mc.ext file
diff -ruN old/mc-4.5.14/src/find.c new/mc-4.5.15/src/find.c
--- old/mc-4.5.14/src/find.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/find.c	Mon Feb 15 18:29:12 1999
@@ -892,7 +892,7 @@
 static char *
 add_to_list (char *text, void *data)
 {
-	return listbox_add_item (find_list, 0, 0, text, 0);
+	return listbox_add_item (find_list, 0, 0, text, data);
 }
 
 static void
diff -ruN old/mc-4.5.14/src/listmode.c new/mc-4.5.15/src/listmode.c
--- old/mc-4.5.14/src/listmode.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/listmode.c	Mon Feb 15 18:29:14 1999
@@ -28,7 +28,7 @@
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/stat.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #    include <grp.h>
 #    include <pwd.h>
 #endif
diff -ruN old/mc-4.5.14/src/main.c new/mc-4.5.15/src/main.c
--- old/mc-4.5.14/src/main.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/main.c	Mon Feb 15 18:29:11 1999
@@ -139,7 +139,7 @@
 
 #include "popt.h"
 
-/* "$Id: main.c,v 1.76 1999/02/03 23:19:41 norbert Exp $" */
+/* "$Id: main.c,v 1.78 1999/02/15 21:19:29 unammx Exp $" */
 
 /* When the modes are active, left_panel, right_panel and tree_panel */
 /* Point to a proper data structure.  You should check with the functions */
@@ -349,6 +349,9 @@
 /* Used during argument processing */
 int finish_program = 0;
 
+/* If set, then no windows are displayed in the GNOME edition */
+int   nowindows = 0;
+
 /* Forward declarations */
 char *get_mc_lib_dir ();
 int panel_event    (Gpm_Event *event, WPanel *panel);
@@ -1631,7 +1634,7 @@
     if (console_flag && !use_subshell)
 	restore_console ();
 
-#ifndef OS2_NT
+#ifdef SIGTSTP
     {
 	struct sigaction sigtstp_action;
 	
@@ -2164,8 +2167,14 @@
 #ifdef USE_INTERNAL_EDIT
     else {
 	    path = prepend_cwd_on_local ("");
+#ifndef HAVE_GNOME
 	    setup_dummy_mc (path);
+#endif
 	    edit (edit_one_file, 1);
+#ifdef HAVE_GNOME
+	    gtk_main ();
+	    exit (1);
+#endif
     }
 #endif
     g_free (path);
@@ -2372,9 +2381,11 @@
     if (pid == cons_saver_pid){
 	/* {{{ Someone has stopped or killed cons.saver; restart it */
 
+#  ifdef SIGTSTP
 	if (WIFSTOPPED (status))
 	    kill (pid, SIGCONT);
 	else
+#  endif
 	{
 	    handle_console (CONSOLE_DONE);
 	    handle_console (CONSOLE_INIT);
@@ -2606,7 +2617,6 @@
 #endif
 
 char *cmdline_geometry = NULL;
-int   nowindows = 0;
 char **directory_list = NULL;
 int   force_activation = 0;
 
diff -ruN old/mc-4.5.14/src/main.h new/mc-4.5.15/src/main.h
--- old/mc-4.5.14/src/main.h	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/main.h	Mon Feb 15 18:29:10 1999
@@ -99,6 +99,7 @@
 extern int midnight_shutdown;
 extern char search_buffer [256];
 extern char cmd_buf [512];
+extern int run_desktop;
 
 #if HAVE_GNOME
 #define MENU_PANEL get_current_panel ()
diff -ruN old/mc-4.5.14/src/subshell.c new/mc-4.5.15/src/subshell.c
--- old/mc-4.5.14/src/subshell.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/subshell.c	Mon Feb 15 18:29:13 1999
@@ -818,6 +818,7 @@
     if (pid == subshell_pid) {
 	/* {{{ Figure out what has happened to the subshell */
 
+#  ifdef SIGTSTP
 	if (WIFSTOPPED (status))
 	{
 	    if (WSTOPSIG (status) == SIGTSTP)
@@ -828,6 +829,7 @@
 		subshell_stopped = TRUE;
 	}
 	else  /* The subshell has either exited normally or been killed */
+#  endif
 	{
 	    subshell_alive = FALSE;
 	    if (WIFEXITED (status) && WEXITSTATUS (status) != FORK_FAILURE)
@@ -844,9 +846,11 @@
     if (pid == cons_saver_pid) {
 	/* {{{ Someone has stopped or killed cons.saver; restart it */
 
+#  ifdef SIGTSTP
 	if (WIFSTOPPED (status))
 	    kill (pid, SIGCONT);
 	else
+#  endif
 	{
 	    handle_console (CONSOLE_DONE);
 	    handle_console (CONSOLE_INIT);
@@ -860,6 +864,9 @@
 #endif /* ! SCO_FLAVOR */
 #endif /* ! HAVE_X */
     /* If we get here, some other child exited; ignore it */
+#  ifdef __EMX__				/* Need to report */
+    pid = wait(&status);
+#  endif
 }
 
 /* }}} */
@@ -1007,7 +1014,9 @@
     while (subshell_alive && !subshell_stopped)
 	sigsuspend (&old_mask);
     subshell_stopped = FALSE;
+#  ifdef SIGTSTP
     kill (subshell_pid, SIGCONT);
+#  endif
 
     sigprocmask (SIG_SETMASK, &old_mask, NULL);
     /* We can't do any better without modifying the shell(s) */
diff -ruN old/mc-4.5.14/src/treestore.c new/mc-4.5.15/src/treestore.c
--- old/mc-4.5.14/src/treestore.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/treestore.c	Mon Feb 15 18:29:14 1999
@@ -45,7 +45,7 @@
 #include "global.h"
 #include "treestore.h"
 #include "../vfs/vfs.h"
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #   include <io.h>
 #endif
 
diff -ruN old/mc-4.5.14/src/util.c new/mc-4.5.15/src/util.c
--- old/mc-4.5.14/src/util.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/util.c	Mon Feb 15 18:29:11 1999
@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include <stdio.h>
-#if defined(__os2__)            /* OS/2 need io.h! .ado */
+#if defined(NEEDS_IO_H)            /* OS/2 need io.h! .ado */
 #    include <io.h>
 #endif
 #include <sys/types.h>
@@ -76,7 +76,7 @@
 #include "user.h"		/* expand_format */
 #include "../vfs/vfs.h"
 
-/* "$Id: util.c,v 1.17 1999/02/03 23:19:43 norbert Exp $" */
+/* "$Id: util.c,v 1.18 1999/02/13 20:12:52 unammx Exp $" */
 
 char app_text [] = "Midnight-Commander";
 
@@ -659,8 +659,12 @@
 void my_putenv (char *name, char *data)
 {
     char *full;
+    char *len = strlen (name) + strlen (data) + 2;
 
-    full = g_strdup_printf ("%s=%s", name, data);
+    full = malloc (len);
+    strcpy (full, name);
+    strcat (full, "=");
+    strcat (full, data);
     putenv (full);
 
     /* WARNING: NEVER FREE THE full VARIABLE!!!!!!!!!!!!!!!!!!!!!!!! */
diff -ruN old/mc-4.5.14/src/utilunix.c new/mc-4.5.15/src/utilunix.c
--- old/mc-4.5.14/src/utilunix.c	Thu Feb 11 21:44:24 1999
+++ new/mc-4.5.15/src/utilunix.c	Mon Feb 15 18:29:14 1999
@@ -283,13 +283,19 @@
 
 #ifdef USE_VFS
 	if (flags & EXECUTE_SETUID)
+#    if defined (HAVE_SETUID)
+	    setuid (vfs_uid);
+#    elif defined (HAVE_SETREUID)
 	    setreuid (vfs_uid, vfs_uid);
+#    else
+	    ; /* Can't drop privileges */
+#    endif
 #endif
 	
 	if (flags & EXECUTE_AS_SHELL)
-	    execl (shell, shell, "-c", command, (char *) 0);
+	    execl (shell, shell, "-c", command, NULL);
 	else
-	    execlp (shell, shell, command, (char *) 0);
+	    execlp (shell, shell, command, NULL);
 
 	_exit (127);		/* Exec error */
     } else {
diff -ruN old/mc-4.5.14/vfs/ChangeLog new/mc-4.5.15/vfs/ChangeLog
--- old/mc-4.5.14/vfs/ChangeLog	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/ChangeLog	Mon Feb 15 18:29:07 1999
@@ -1,3 +1,8 @@
+1999-02-12  Sergey Korshunoff <seyko@p5.f434.n5020.z2.fidonet.org>
+
+	* unlha.in: Fix the problem of having incorrect pathnames when
+	pulling out files from the LHA file.
+
 Sat Feb  6 23:44:28 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* tar.c (read_header): Treat hardlinks correctly.
diff -ruN old/mc-4.5.14/vfs/direntry.c new/mc-4.5.15/vfs/direntry.c
--- old/mc-4.5.14/vfs/direntry.c	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/direntry.c	Mon Feb 15 18:29:08 1999
@@ -28,6 +28,7 @@
 
 #include "utilvfs.h"
 #include "xdirentry.h"
+#include "../src/tty.h"
 
 #define CALL(x) if (MEDATA->x) MEDATA->x
 
diff -ruN old/mc-4.5.14/vfs/extfs/ulha.in new/mc-4.5.15/vfs/extfs/ulha.in
--- old/mc-4.5.14/vfs/extfs/ulha.in	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/extfs/ulha.in	Mon Feb 15 18:29:08 1999
@@ -44,7 +44,7 @@
 # Define which archiver you are using with appropriate options
 LHA_LIST="lha l"
 LHA_GET="lha pq"
-LHA_PUT="lha a"
+LHA_PUT="lha aq"
 
 # Define the temporary name of a command to be run from the archive
 TMPCMD=/tmp/mc-cmd.$$
@@ -117,8 +117,20 @@
 
 mc_lha_fs_copyin ()
 {
-   # This isn't called from this version of mc
-   $LHA_PUT $1 $3  2> /dev/null
+   NAME2=`basename $2`; DIR2=${2%$NAME2}
+   NAME3=`basename $3`; DIR3=${3%$NAME3}
+
+   cd ${DIR3}
+
+   ONE2=${2%%/*}
+   [ -n ${ONE2} ] || exit
+   [ -e ${ONE2} ] && exit
+
+   [ -e ${DIR2} ] || mkdir -p ${DIR2}
+   ln $3 $2       || exit
+
+   $LHA_PUT $1 $2  2> /dev/null
+   rm -r ${ONE2}
 }
 
 # The 'run' command executive to run a command from within an archive
diff -ruN old/mc-4.5.14/vfs/mcfs.c new/mc-4.5.15/vfs/mcfs.c
--- old/mc-4.5.14/vfs/mcfs.c	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/mcfs.c	Mon Feb 15 18:29:08 1999
@@ -31,6 +31,7 @@
 #include <stdarg.h>
 #include <fcntl.h>
 #include <pwd.h>
+#include <sys/types.h>		/* POSIX-required by sys/socket.h and netdb.h */
 #include <netdb.h>		/* struct hostent */
 #include <sys/socket.h>		/* AF_INET */
 #include <netinet/in.h>		/* struct in_addr */
diff -ruN old/mc-4.5.14/vfs/mcserv.c new/mc-4.5.15/vfs/mcserv.c
--- old/mc-4.5.14/vfs/mcserv.c	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/mcserv.c	Mon Feb 15 18:29:08 1999
@@ -1095,6 +1095,7 @@
     struct hostent *hp;
     char hostname [255];
     int yes = 1;
+    char *me;
     
     if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
 	return "Can't create socket";
@@ -1106,6 +1107,10 @@
     gethostname (hostname, 255);
     if (verbose) printf ("hostname=%s\n", hostname);
     hp = gethostbyname (hostname);
+#ifdef __EMX__
+    if (hp == 0 && (me = getenv("HOSTNAME")) && (0 == strcmp(hostname, me)))
+	hp = gethostbyname ("localhost");
+#endif
     if (hp == 0)
 	return "hp = 0!";
     
diff -ruN old/mc-4.5.14/vfs/vfs.c new/mc-4.5.15/vfs/vfs.c
--- old/mc-4.5.14/vfs/vfs.c	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/vfs.c	Mon Feb 15 18:29:08 1999
@@ -28,7 +28,10 @@
 
 #include <config.h>
 
-#include <syslog.h>
+#ifndef NO_SYSLOG_H
+#  include <syslog.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>	/* For atol() */
 #include <stdarg.h>
diff -ruN old/mc-4.5.14/vfs/vfs.h new/mc-4.5.15/vfs/vfs.h
--- old/mc-4.5.14/vfs/vfs.h	Thu Feb 11 21:44:22 1999
+++ new/mc-4.5.15/vfs/vfs.h	Mon Feb 15 18:29:08 1999
@@ -8,6 +8,9 @@
 
 #if !defined(SCO_FLAVOR) || !defined(_SYS_SELECT_H) || defined(IS_AIX)
 #	include <sys/time.h>	/* alex: this redefines struct timeval */
+#  ifdef IS_AIX
+#       include <time.h>
+#  endif
 #endif /* SCO_FLAVOR */
 
 #ifdef HAVE_UTIME_H