diff --git a/gnome/ChangeLog b/gnome/ChangeLog
index da2afaaa4..d3162ac8b 100644
--- a/gnome/ChangeLog
+++ b/gnome/ChangeLog
@@ -1,5 +1,26 @@
 1998-12-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
+	* gdesktop.c (desktop_icon_delete): New function, used for
+	dicon_delete. 
+	(load_desktop_icons): Implemented the incremental reloading of
+	desktop icons.  This should make the code much nicer.
+	(reload_desktop_icons): Call x_flush_events to force a display at
+	that point.
+
+	* gpopup.c (dicon_delete): Implement this operation.
+	(desktop_icon_execute): Use the existing implementation for
+	launching desktop icons instead of a new hacked up version 
+
+	(desktop_icon_actions): Until copy/move is implemented, do not
+	even list them to the user.
+
+	* gdesktop.c (create_desktop_dir): No trashcan setup until it
+	works. 
+
+	* gscren.c (panel_widget_motion): Use button 2 for dragging and
+	asking. 
+	
+
 	* gscreen.c (panel_create_file_list): Use a notebook instead of
 	the hack I was using before for switching the panel contents.
 
diff --git a/gnome/gdesktop.c b/gnome/gdesktop.c
index 993363263..134e943ad 100644
--- a/gnome/gdesktop.c
+++ b/gnome/gdesktop.c
@@ -34,6 +34,7 @@
 #include "dialog.h"
 #define DIR_H_INCLUDE_HANDLE_DIRENT /* bleah */
 #include "dir.h"
+#include "file.h"
 #include "gdesktop.h"
 #include "gdesktop-icon.h"
 #include "gicon.h"
@@ -129,7 +130,6 @@ static int click_dragging;
 
 
 static struct desktop_icon_info *desktop_icon_info_new (char *filename, int auto_pos, int xpos, int ypos);
-static void desktop_icon_info_free (struct desktop_icon_info *dii);
 
 
 /* Looks for a free slot in the layout_slots array and returns the coordinates that coorespond to
@@ -291,8 +291,40 @@ icon_exists (char *filename)
 	return FALSE;
 }
 
+static GList *
+icon_exists_in_list (GList *list, char *filename)
+{
+	GList *l;
+
+	for (l = list; l; l = l->next){
+		struct desktop_icon_info *dii = l->data;
+
+		if (strcmp (filename, dii->filename) == 0)
+			return l;
+	}
+	return NULL;
+}
+
 /*
- * Reads the ~/Desktop directory and creates the desktop icons.  If
+ * Returns a GList with all of the icons on the desktop
+ */
+GList *
+desktop_get_all_icons (void)
+{
+	GList *l, *res;
+	int i;
+
+	res = NULL;
+	for (i = 0; i < (layout_cols * layout_rows); i++)
+		for (l = layout_slots [i].icons; l; l = l->next){
+			res = g_list_prepend (res, l->data);
+		}
+
+	return res;
+}
+
+/*
+ * Reads the ~/desktop directory and creates the desktop icons.  If
  * incremental is TRUE, then an icon will not be created for a file if
  * there is already an icon for it, and icons will be created starting
  * at the specified position.
@@ -306,6 +338,7 @@ load_desktop_icons (int incremental, int xpos, int ypos)
 	int have_pos, x, y;
 	struct desktop_icon_info *dii;
 	GSList *need_position_list, *l;
+	GList *all_icons;
 
 	dir = mc_opendir (desktop_directory);
 	if (!dir) {
@@ -316,20 +349,33 @@ load_desktop_icons (int incremental, int xpos, int ypos)
 		return;
 	}
 
-	/* First create the icons for all the files that do have their icon position set.  Build a
-	 * list of the icons that do not have their position set.
+	/*
+	 * First create the icons for all the files that do have their
+	 * icon position set.  Build a list of the icons that do not
+	 * have their position set.
 	 */
 
 	need_position_list = NULL;
 
+	all_icons = desktop_get_all_icons ();
+	
 	while ((dirent = mc_readdir (dir)) != NULL) {
 		if (((dirent->d_name[0] == '.') && (dirent->d_name[1] == 0))
 		    || ((dirent->d_name[0] == '.') && (dirent->d_name[1] == '.') && (dirent->d_name[2] == 0)))
 			continue;
 
-		if (incremental && icon_exists (dirent->d_name))
-			continue;
+		if (incremental){
+			GList *element;
 
+			element = icon_exists_in_list (all_icons, dirent->d_name);
+			
+			if (element){
+				g_list_remove_link (all_icons, element);
+				continue;
+			}
+
+		}
+		
 		full_name = g_concat_dir_and_file (desktop_directory, dirent->d_name);
 
 		have_pos = gmeta_get_icon_pos (full_name, &x, &y);
@@ -345,7 +391,23 @@ load_desktop_icons (int incremental, int xpos, int ypos)
 
 	mc_closedir (dir);
 
-	/* Now create the icons for all the files that did not have their position set.  This makes
+	/*
+	 * all_icons now contains a list of all of the icons that were not found
+	 * in the ~/desktop directory, remove them.
+	 */
+	if (incremental){
+		GList *l;
+		
+		for (l = all_icons; l; l = l->next){
+			struct desktop_icon_info *dii = l->data;
+
+			desktop_icon_destroy (dii);
+		}
+	}
+	g_list_free (all_icons);
+
+	/*
+	 * Now create the icons for all the files that did not have their position set.  This makes
 	 * auto-placement work correctly without overlapping icons.
 	 */
 
@@ -375,7 +437,7 @@ destroy_desktop_icons (void)
 			dii = l->data;
 			l = l->next;
 
-			desktop_icon_info_free (dii);
+			desktop_icon_destroy (dii);
 		}
 	}
 }
@@ -392,6 +454,7 @@ reload_desktop_icons (int incremental, int x, int y)
 		destroy_desktop_icons ();
 
 	load_desktop_icons (incremental, x, y);
+	x_flush_events ();
 }
 
 /* Unselects all the desktop icons except the one in exclude */
@@ -657,8 +720,8 @@ editing_stopped (GnomeIconTextItem *iti, gpointer data)
 }
 
 /* Used to open a desktop icon when the user double-clicks on it */
-static void
-open_desktop_icon (struct desktop_icon_info *dii)
+void
+desktop_icon_open (struct desktop_icon_info *dii)
 {
 	char *filename;
 	file_entry *fe;
@@ -675,6 +738,31 @@ open_desktop_icon (struct desktop_icon_info *dii)
 	file_entry_free (fe);
 }
 
+void
+desktop_icon_delete (struct desktop_icon_info *dii)
+{
+	char *full_name;
+	struct stat s;
+	long progress_count = 0;
+	double progress_bytes = 0;
+
+	/* 1. Delete the file */
+	create_op_win (OP_DELETE, 1);
+	x_flush_events ();
+	
+	full_name = g_concat_dir_and_file (desktop_directory, dii->filename);
+	stat (full_name, &s);
+	if (S_ISDIR (s.st_mode))
+		erase_dir (full_name, &progress_count, &progress_bytes);
+	else
+		erase_file (full_name, &progress_count, &progress_bytes, TRUE);
+	g_free (full_name);
+	destroy_op_win ();
+
+	/* 2. Destroy the dicon */
+	desktop_icon_destroy (dii);
+}
+
 /* Used to execute the popup menu for desktop icons */
 static void
 do_popup_menu (struct desktop_icon_info *dii, GdkEventButton *event)
@@ -684,7 +772,7 @@ do_popup_menu (struct desktop_icon_info *dii, GdkEventButton *event)
 	filename = g_concat_dir_and_file (desktop_directory, dii->filename);
 
 	if (gpopup_do_popup (event, NULL, dii, 0, filename) != -1)
-		reload_desktop_icons (FALSE, 0, 0); /* bleah */
+		reload_desktop_icons (TRUE, 0, 0); /* bleah */
 
 	g_free (filename);
 }
@@ -770,7 +858,7 @@ icon_button_press (GtkWidget *widget, GdkEventButton *event, gpointer data)
 		if (event->button != 1)
 			break;
 
-		open_desktop_icon (dii);
+		desktop_icon_open (dii);
 		retval = TRUE;
 		break;
 
@@ -1152,8 +1240,8 @@ desktop_icon_info_new (char *filename, int auto_pos, int xpos, int ypos)
  * Frees a desktop icon information structure, and destroy the icon
  * widget.  Does not remove the structure from the desktop_icons list!
  */
-static void
-desktop_icon_info_free (struct desktop_icon_info *dii)
+void
+desktop_icon_destroy (struct desktop_icon_info *dii)
 {
 	gtk_widget_destroy (dii->dicon);
 	remove_from_slot (dii);
@@ -1220,7 +1308,7 @@ create_desktop_dir (void)
 		g_free (home_link_name);
 	}
 
-	setup_trashcan (desktop_directory);
+/*	setup_trashcan (desktop_directory); */
 }
 
 /* Sets up a proxy window for DnD on the specified X window.  Courtesy of Owen Taylor */
diff --git a/gnome/gdesktop.h b/gnome/gdesktop.h
index 14e57252c..752b797d2 100644
--- a/gnome/gdesktop.h
+++ b/gnome/gdesktop.h
@@ -32,6 +32,7 @@ void desktop_init (void);
 /* Shuts the desktop down by destroying the desktop icons. */
 void desktop_destroy (void);
 
+
 /* This structure defines the information carried by a desktop icon */
 typedef struct desktop_icon_info {
 	GtkWidget *dicon;		/* The desktop icon widget */
@@ -45,19 +46,16 @@ typedef struct desktop_icon_info {
 					 */
 } desktop_icon_info;
 
-
-
-
-
-
-
-
+void desktop_icon_destroy   (struct desktop_icon_info *dii);
+void desktop_icon_open      (struct desktop_icon_info *dii);
+void desktop_icon_delete    (struct desktop_icon_info *dii);
 
 typedef enum {
 	application,
 	directory,
 	file
 } icon_t;
+
 /* A structure that describes each icon on the desktop */
 typedef struct {
 	GnomeDesktopEntry *dentry;
diff --git a/gnome/gpopup.c b/gnome/gpopup.c
index 130fa795b..348a8374b 100644
--- a/gnome/gpopup.c
+++ b/gnome/gpopup.c
@@ -18,7 +18,6 @@
 #include "gpopup.h"
 #include "main.h"
 
-
 #define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child)
 
 
@@ -82,39 +81,27 @@ panel_action_edit (GtkWidget *widget, WPanel *panel)
 static void
 desktop_icon_view(GtkWidget *widget, desktop_icon_info *dii)
 {
-  g_warning("NYI");
+	g_warning ("Not yet implemented\n");
 }
 
 /* Pops up the icon properties pages */
 void
 desktop_icon_properties (GtkWidget *widget, desktop_icon_info *dii)
 {
-  int retval;
-  char *path;
-
-  path = g_copy_strings(getenv("HOME"), "/desktop/", dii->filename, NULL);
-  retval = item_properties (dii->dicon, path, dii);
-  g_free(path);
-  if(retval)
-    reread_cmd(); /* Lame. Slow. Works. */
+	int retval;
+	char *path;
+	
+	path = g_copy_strings (getenv("HOME"), "/desktop/", dii->filename, NULL);
+	retval = item_properties (dii->dicon, path, dii);
+	g_free(path);
+	if (retval)
+		reread_cmd ();
 }
 
 void
 desktop_icon_execute (GtkWidget *ignored, desktop_icon_info *dii)
 {
-  char *path;
-  /* Ultra lame-o execute.  This should be replaced by the fixed regexp_command
-   * invocation 
-   */
-  
-  path = g_copy_strings(getenv("HOME"), "/desktop/", dii->filename, NULL);
-
-  if (g_file_test(path, G_FILE_TEST_ISDIR))
-    new_panel_at (path);
-  else 
-    gnome_desktop_entry_launch (path);
-
-  g_free(path);
+	desktop_icon_open (dii);
 }
 
 static void
@@ -144,7 +131,7 @@ dicon_copy (GtkWidget *widget, desktop_icon_info *dii)
 static void
 dicon_delete (GtkWidget *widget, desktop_icon_info *dii)
 {
-	g_warning ("Implement this function!");
+	desktop_icon_delete (dii);
 }
 
 /* This is our custom signal connection function for popup menu items -- see below for the
@@ -243,8 +230,10 @@ static GnomeUIInfo panel_actions[] = {
 /* Menu entries for files from desktop icons */
 static GnomeUIInfo desktop_icon_actions[] = {
 	GNOMEUIINFO_SEPARATOR,
+#if 0
 	GNOMEUIINFO_ITEM_NONE (N_("Move/rename..."), NULL, dicon_move),
 	GNOMEUIINFO_ITEM_NONE (N_("Copy..."), NULL, dicon_copy),
+#endif
 	GNOMEUIINFO_ITEM_NONE (N_("Delete"), NULL, dicon_delete),
 	GNOMEUIINFO_SEPARATOR,
 	GNOMEUIINFO_END
@@ -545,7 +534,7 @@ gpopup_do_popup (GdkEventButton *event,
 
 	/* Run it */
 
-	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 3, event->time);
+	gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time);
 	gtk_grab_add (menu);
 	gtk_main ();
 	gtk_grab_remove (menu);
diff --git a/gnome/gscreen.c b/gnome/gscreen.c
index c3231692d..a656eb532 100644
--- a/gnome/gscreen.c
+++ b/gnome/gscreen.c
@@ -904,7 +904,7 @@ panel_widget_motion (GtkWidget *widget, GdkEventMotion *event, WPanel *panel)
 
 	list = gtk_target_list_new (drag_types, ELEMENTS (drag_types));
 
-	if (panel->maybe_start_drag == 3)
+	if (panel->maybe_start_drag == 2)
 		action = GDK_ACTION_ASK;
 	else
 		action = GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK;
@@ -1126,16 +1126,12 @@ panel_icon_list_select_icon (GtkWidget *widget, int index, GdkEvent *event, WPan
 				new_panel_at (fullname);
 				free (fullname);
 			}
-		}
+			break;
+		} 
+		if (event->button.button == 3)
+			gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index, panel->dir.list[index].fname);
 		break;
 
-	case GDK_BUTTON_RELEASE:
-		if (event->button.button != 3)
-			return;
-		
-		gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index, panel->dir.list[index].fname);
-		return;
-		
 	case GDK_2BUTTON_PRESS:
 		if (event->button.button == 1)
 			do_enter (panel);
@@ -1200,8 +1196,10 @@ panel_icon_list_button_press (GtkWidget *widget, GdkEventButton *event, WPanel *
 
 	if (icon == -1)
 		panel->maybe_start_drag = 0;
-	else
-		panel->maybe_start_drag = event->button;
+	else {
+		if (event->button != 3)
+			panel->maybe_start_drag = event->button;
+	}
 
 	panel->click_x = event->x;
 	panel->click_y = event->y;
diff --git a/po/mc.pot b/po/mc.pot
index 56daab61b..b2b226116 100644
--- a/po/mc.pot
+++ b/po/mc.pot
@@ -1,10 +1,10 @@
 msgid ""
 msgstr ""
-"Date: 1998-12-15 04:49:13-0600\n"
+"Date: 1998-12-28 21:04:00-0600\n"
 "From: Miguel de Icaza,computo,622-4680 <miguel@metropolis.nuclecu.unam.mx>\n"
 "Content-Type: text/plain; charset=\n"
 "Xgettext-Options: --default-domain=mc --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
-"Files: edit/edit_key_translator.c gnome/gcmd.c gnome/gdesktop.c gnome/gdnd.c gnome/glayout.c gnome/gmc-window.c gnome/gprop.c gnome/gscreen.c gnome/gtools.c gnome/gview.c gnome/gwidget.c gtkedit/edit.c gtkedit/edit.h gtkedit/editcmd.c gtkedit/editmenu.c gtkedit/editoptions.c gtkedit/editwidget.c gtkedit/gtkedit.c gtkedit/syntax.c src/achown.c src/background.c src/boxes.c src/chmod.c src/chown.c src/cmd.c src/command.c src/dialog.c src/dir.c src/ext.c src/file.c src/find.c src/fixhlp.c src/help.c src/hotlist.c src/i18n.h src/info.c src/layout.c src/learn.c src/main.c src/menu.c src/option.c src/panelize.c src/popthelp.c src/poptint.h src/screen.c src/subshell.c src/tree.c src/user.c src/util.c src/utilunix.c src/view.c src/win.c src/wtools.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c vfs/mcfs.c vfs/tar.c vfs/vfs.c\n"
+"Files: edit/edit_key_translator.c gnome/gcmd.c gnome/gdesktop.c gnome/gdialogs.c gnome/gdnd.c gnome/gicon.c gnome/glayout.c gnome/gprop.c gnome/gpopup.c gnome/gscreen.c gnome/gtools.c gnome/gview.c gnome/gwidget.c gtkedit/edit.c gtkedit/edit.h gtkedit/editcmd.c gtkedit/editwidget.c gtkedit/gtkedit.c gtkedit/syntax.c src/achown.c src/background.c src/boxes.c src/chmod.c src/chown.c src/cmd.c src/command.c src/dialog.c src/dir.c src/ext.c src/file.c src/filegui.c src/find.c src/fixhlp.c src/help.c src/hotlist.c src/i18n.h src/info.c src/layout.c src/learn.c src/main.c src/menu.c src/option.c src/panelize.c src/popthelp.c src/poptint.h src/screen.c src/subshell.c src/tree.c src/user.c src/util.c src/utilunix.c src/view.c src/win.c src/wtools.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c vfs/mcfs.c vfs/tar.c vfs/vfs.c\n"
 
 #: edit/edit_key_translator.c:121
 msgid " Emacs key: "
@@ -31,15 +31,15 @@ msgstr ""
 msgid " There is no other panel to compare contents to "
 msgstr ""
 
-#: gnome/gcmd.c:78 gnome/gmc-window.c:68
+#: gnome/gcmd.c:78
 msgid "GNU Midnight Commander"
 msgstr ""
 
-#: gnome/gcmd.c:81 gnome/gmc-window.c:71
+#: gnome/gcmd.c:81
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr ""
 
-#: gnome/gcmd.c:93 src/main.c:813 src/screen.c:2050
+#: gnome/gcmd.c:93 src/main.c:813 src/screen.c:2041
 msgid " The Midnight Commander "
 msgstr ""
 
@@ -47,31 +47,110 @@ msgstr ""
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr ""
 
-#: gnome/gcmd.c:95 gtkedit/editcmd.c:2235 src/cmd.c:249 src/file.c:1715 src/file.c:2078 src/hotlist.c:1029 src/main.c:815 src/screen.c:2052 src/subshell.c:701 src/subshell.c:727 src/tree.c:1205 src/view.c:408
+#: gnome/gcmd.c:95 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1725 src/file.c:2119 src/filegui.c:496 src/hotlist.c:1029 src/main.c:815 src/screen.c:2043 src/subshell.c:701 src/subshell.c:727 src/tree.c:1205 src/view.c:408
 msgid "&Yes"
 msgstr ""
 
-#: gnome/gcmd.c:95 gtkedit/editcmd.c:2235 src/cmd.c:249 src/file.c:1715 src/file.c:2078 src/hotlist.c:1029 src/main.c:815 src/screen.c:2052 src/subshell.c:701 src/subshell.c:727 src/tree.c:1205 src/view.c:408
+#: gnome/gcmd.c:95 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1725 src/file.c:2119 src/filegui.c:495 src/hotlist.c:1029 src/main.c:815 src/screen.c:2043 src/subshell.c:701 src/subshell.c:727 src/tree.c:1205 src/view.c:408
 msgid "&No"
 msgstr ""
 
-#: gnome/gdesktop.c:319 gnome/gdesktop.c:1191
+#: gnome/gdesktop.c:313 gnome/gdesktop.c:1216
 msgid "Warning"
 msgstr ""
 
-#: gnome/gdesktop.c:320
+#: gnome/gdesktop.c:314
 msgid "Could not open %s; will not have initial desktop icons"
 msgstr ""
 
-#. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1187
+#: gnome/gdesktop.c:1182
+msgid "Trashcan"
+msgstr ""
+
+#: gnome/gdesktop.c:1212
 msgid "Home directory"
 msgstr ""
 
-#: gnome/gdesktop.c:1192
+#: gnome/gdesktop.c:1217
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
 msgstr ""
 
+#: gnome/gdialogs.c:214
+msgid "Files Exist"
+msgstr ""
+
+#: gnome/gdialogs.c:225
+msgid "Some of the files you are trying to copy already exist in the destination folder."
+msgstr ""
+
+#: gnome/gdialogs.c:234
+msgid "Prompt me before overwriting any file."
+msgstr ""
+
+#: gnome/gdialogs.c:240
+msgid "Don't overwrite any files."
+msgstr ""
+
+#: gnome/gdialogs.c:249
+msgid "Overwrite:"
+msgstr ""
+
+#: gnome/gdialogs.c:255
+msgid "Older files."
+msgstr ""
+
+#: gnome/gdialogs.c:259
+msgid "Files only if size differs."
+msgstr ""
+
+#: gnome/gdialogs.c:263
+msgid "All files."
+msgstr ""
+
+#: gnome/gdialogs.c:387
+msgid "Destination"
+msgstr ""
+
+#: gnome/gdialogs.c:391
+msgid "Find Destination Folder"
+msgstr ""
+
+#: gnome/gdialogs.c:396
+msgid "Copy as a background process"
+msgstr ""
+
+#: gnome/gdialogs.c:416
+msgid "Advanced Options"
+msgstr ""
+
+#: gnome/gdialogs.c:420
+msgid "Preserve symlinks"
+msgstr ""
+
+#: gnome/gdialogs.c:430
+msgid "Follow links."
+msgstr ""
+
+#: gnome/gdialogs.c:437
+msgid "Preserve file attributes."
+msgstr ""
+
+#: gnome/gdialogs.c:445
+msgid "Recursively copy subdirectories."
+msgstr ""
+
+#: gnome/gdialogs.c:581
+msgid "File "
+msgstr ""
+
+#: gnome/gdialogs.c:585
+msgid " is "
+msgstr ""
+
+#: gnome/gdialogs.c:588
+msgid " Done."
+msgstr ""
+
 #: gnome/gdnd.c:23
 msgid "Move here"
 msgstr ""
@@ -88,12 +167,20 @@ msgstr ""
 msgid "Cancel drag"
 msgstr ""
 
-#: gnome/gdnd.c:202
+#: gnome/gdnd.c:211
 msgid ""
 "Could not stat %s\n"
 "%s"
 msgstr ""
 
+#: gnome/gicon.c:83 gnome/gtools.c:48
+msgid "Error"
+msgstr ""
+
+#: gnome/gicon.c:83
+msgid "Default set of icons not found, check your installation"
+msgstr ""
+
 #: gnome/glayout.c:268
 msgid "_New window"
 msgstr ""
@@ -142,7 +229,7 @@ msgstr ""
 msgid "Delete files from disk"
 msgstr ""
 
-#: gnome/glayout.c:276 gnome/gmc-window.c:120
+#: gnome/glayout.c:276
 msgid "_View"
 msgstr ""
 
@@ -190,7 +277,7 @@ msgstr ""
 msgid "Close this panel"
 msgstr ""
 
-#: gnome/glayout.c:285 gnome/gmc-window.c:88
+#: gnome/glayout.c:285
 msgid "E_xit"
 msgstr ""
 
@@ -342,7 +429,7 @@ msgstr ""
 msgid "Information on this program"
 msgstr ""
 
-#: gnome/glayout.c:349 gnome/gmc-window.c:119
+#: gnome/glayout.c:349
 msgid "_File"
 msgstr ""
 
@@ -362,39 +449,10 @@ msgstr ""
 msgid "_Desktop"
 msgstr ""
 
-#: gnome/glayout.c:354 gnome/gmc-window.c:121
+#: gnome/glayout.c:354
 msgid "_Help"
 msgstr ""
 
-#: gnome/gmc-window.c:69
-msgid "Copyright (C) 1998 The Free Software Foundation"
-msgstr ""
-
-#: gnome/gmc-window.c:81
-msgid "Open _new window"
-msgstr ""
-
-#: gnome/gmc-window.c:86
-msgid "_Close this window"
-msgstr ""
-
-#: gnome/gmc-window.c:95
-msgid "_Listing view"
-msgstr ""
-
-#: gnome/gmc-window.c:96
-msgid "_Icon view"
-msgstr ""
-
-#: gnome/gmc-window.c:102
-msgid "Display _tree view"
-msgstr ""
-
-#. Help menu
-#: gnome/gmc-window.c:112
-msgid "_About the Midnight Commander..."
-msgstr ""
-
 #: gnome/gprop.c:58 gnome/gprop.c:75
 msgid "Filename"
 msgstr ""
@@ -443,7 +501,7 @@ msgstr ""
 msgid "User"
 msgstr ""
 
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:436
+#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:435
 msgid "Group"
 msgstr ""
 
@@ -467,7 +525,7 @@ msgstr ""
 msgid "<Unknown>"
 msgstr ""
 
-#: gnome/gprop.c:390 src/screen.c:435
+#: gnome/gprop.c:390 src/screen.c:434
 msgid "Owner"
 msgstr ""
 
@@ -487,103 +545,159 @@ msgstr ""
 msgid "Select icon"
 msgstr ""
 
-#: gnome/gscreen.c:1323
+#: gnome/gpopup.c:48
+msgid " Open with..."
+msgstr ""
+
+#: gnome/gpopup.c:49
+msgid "Enter extra arguments:"
+msgstr ""
+
+#. The context menu: text displayed, condition that must be met and the routine that gets invoked
+#. * upon activation.
+#.
+#: gnome/gpopup.c:217 gnome/gpopup.c:218
+msgid "Properties"
+msgstr ""
+
+#: gnome/gpopup.c:220 gnome/gpopup.c:221
+msgid "Open"
+msgstr ""
+
+#: gnome/gpopup.c:222
+msgid "Open with"
+msgstr ""
+
+#: gnome/gpopup.c:223 src/screen.c:2279 src/screen.c:2309
+msgid "View"
+msgstr ""
+
+#: gnome/gpopup.c:224
+msgid "View unfiltered"
+msgstr ""
+
+#: gnome/gpopup.c:225 gtkedit/gtkedit.c:1363 src/screen.c:2280 src/screen.c:2310 src/view.c:1972
+msgid "Edit"
+msgstr ""
+
+#: gnome/gpopup.c:227
+msgid "Link..."
+msgstr ""
+
+#: gnome/gpopup.c:228
+msgid "Symlink..."
+msgstr ""
+
+#: gnome/gpopup.c:229
+msgid "Edit symlink..."
+msgstr ""
+
+#: gnome/gpopup.c:236 gnome/gpopup.c:246
+msgid "Move/rename..."
+msgstr ""
+
+#: gnome/gpopup.c:237 gnome/gpopup.c:247
+msgid "Copy..."
+msgstr ""
+
+#: gnome/gpopup.c:238 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 src/screen.c:2284 src/screen.c:2314
+msgid "Delete"
+msgstr ""
+
+#: gnome/gscreen.c:1332
 msgid "All files"
 msgstr ""
 
-#: gnome/gscreen.c:1325
+#: gnome/gscreen.c:1334
 msgid "Archives and compressed files"
 msgstr ""
 
-#: gnome/gscreen.c:1327
+#: gnome/gscreen.c:1336
 msgid "RPM/DEB files"
 msgstr ""
 
-#: gnome/gscreen.c:1329
+#: gnome/gscreen.c:1338
 msgid "Text/Document files"
 msgstr ""
 
-#: gnome/gscreen.c:1331
+#: gnome/gscreen.c:1340
 msgid "HTML and SGML files"
 msgstr ""
 
-#: gnome/gscreen.c:1333
+#: gnome/gscreen.c:1342
 msgid "Postscript and PDF files"
 msgstr ""
 
-#: gnome/gscreen.c:1335
+#: gnome/gscreen.c:1344
 msgid "Spreadsheet files"
 msgstr ""
 
-#: gnome/gscreen.c:1337
+#: gnome/gscreen.c:1346
 msgid "Image files"
 msgstr ""
 
-#: gnome/gscreen.c:1340
+#: gnome/gscreen.c:1349
 msgid "Video/animation files"
 msgstr ""
 
-#: gnome/gscreen.c:1342
+#: gnome/gscreen.c:1351
 msgid "Audio files"
 msgstr ""
 
-#: gnome/gscreen.c:1344
+#: gnome/gscreen.c:1353
 msgid "C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1346
+#: gnome/gscreen.c:1355
 msgid "C++ program files"
 msgstr ""
 
-#: gnome/gscreen.c:1348
+#: gnome/gscreen.c:1357
 msgid "Objective-C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1350
+#: gnome/gscreen.c:1359
 msgid "Scheme program files"
 msgstr ""
 
-#: gnome/gscreen.c:1352
+#: gnome/gscreen.c:1361
 msgid "Assembler program files"
 msgstr ""
 
-#: gnome/gscreen.c:1354
+#: gnome/gscreen.c:1363
 msgid "Misc. program files"
 msgstr ""
 
-#: gnome/gscreen.c:1356
+#: gnome/gscreen.c:1365
 msgid "Font files"
 msgstr ""
 
-#: gnome/gscreen.c:1483
+#: gnome/gscreen.c:1492
 msgid "Search: %s"
 msgstr ""
 
-#: gnome/gscreen.c:1492
+#: gnome/gscreen.c:1501
 msgid "%s bytes in %d file"
 msgstr ""
 
-#: gnome/gscreen.c:1492
+#: gnome/gscreen.c:1501
 msgid "%s bytes in %d files"
 msgstr ""
 
-#: gnome/gscreen.c:1515 src/screen.c:673
+#: gnome/gscreen.c:1524 src/screen.c:672
 msgid "<readlink failed>"
 msgstr ""
 
-#: gnome/gscreen.c:1566
+#: gnome/gscreen.c:1575
 msgid "Filter"
 msgstr ""
 
-#: gnome/gscreen.c:2075
+#: gnome/gscreen.c:2084
 msgid "Location:"
 msgstr ""
 
-#: gnome/gtools.c:48
-msgid "Error"
-msgstr ""
-
-#: gnome/gtools.c:131 src/boxes.c:141 src/boxes.c:281 src/boxes.c:381 src/boxes.c:469 src/boxes.c:655 src/boxes.c:777 src/boxes.c:832 src/boxes.c:943 src/find.c:154 src/layout.c:372 src/option.c:143 src/wtools.c:292 src/wtools.c:564
+#. WITH_BACKGROUND
+#: gnome/gtools.c:86 src/boxes.c:141 src/boxes.c:281 src/boxes.c:381 src/boxes.c:469 src/boxes.c:649 src/boxes.c:733 src/boxes.c:788 src/boxes.c:899 src/filegui.c:724 src/find.c:154 src/layout.c:370 src/option.c:144 src/wtools.c:292 src/wtools.c:564
 msgid "&Ok"
 msgstr ""
 
@@ -623,7 +737,7 @@ msgstr ""
 msgid "Close the viewer"
 msgstr ""
 
-#: gnome/gview.c:300 gnome/gview.c:330 gtkedit/editwidget.c:1135 src/view.c:1976
+#: gnome/gview.c:300 gnome/gview.c:330 gtkedit/editwidget.c:1066 src/view.c:1976
 msgid "Search"
 msgstr ""
 
@@ -664,7 +778,7 @@ msgstr ""
 msgid "Hex"
 msgstr ""
 
-#: gnome/gview.c:329 gtkedit/gtkedit.c:1207
+#: gnome/gview.c:329 gtkedit/gtkedit.c:1362 src/filegui.c:361
 msgid "File"
 msgstr ""
 
@@ -701,7 +815,7 @@ msgid "abort"
 msgstr ""
 
 #. The file-name is printed after the ':'
-#: gtkedit/edit.c:127 gtkedit/edit.c:222 gtkedit/edit.c:229 gtkedit/edit.c:236 gtkedit/edit.c:243 gtkedit/edit.c:249 gtkedit/edit.c:306 gtkedit/edit.c:342 gtkedit/editcmd.c:1932 gtkedit/editwidget.c:1016 src/dir.c:377 src/screen.c:2304 src/tree.c:1145 src/tree.c:1151 src/wtools.c:225 vfs/fish.c:226
+#: gtkedit/edit.c:127 gtkedit/edit.c:222 gtkedit/edit.c:229 gtkedit/edit.c:236 gtkedit/edit.c:243 gtkedit/edit.c:249 gtkedit/edit.c:306 gtkedit/edit.c:342 gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:378 src/screen.c:2299 src/tree.c:1145 src/tree.c:1151 src/wtools.c:225 vfs/fish.c:226
 msgid " Error "
 msgstr ""
 
@@ -736,7 +850,7 @@ msgid " Save As "
 msgstr ""
 
 #. the file exists
-#: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:295 src/file.c:674 src/help.c:321 src/main.c:660 src/screen.c:2066 src/subshell.c:700 src/subshell.c:726 src/utilunix.c:384 src/utilunix.c:388 src/utilunix.c:454 vfs/mcfs.c:171
+#: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:297 src/file.c:677 src/help.c:321 src/main.c:660 src/screen.c:2057 src/subshell.c:700 src/subshell.c:726 src/utilunix.c:384 src/utilunix.c:388 src/utilunix.c:454 vfs/mcfs.c:171
 msgid " Warning "
 msgstr ""
 
@@ -757,7 +871,7 @@ msgstr ""
 msgid " Save as "
 msgstr ""
 
-#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2597
+#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2591
 msgid " Error trying to save file. "
 msgstr ""
 
@@ -815,7 +929,7 @@ msgstr ""
 msgid " Save file "
 msgstr ""
 
-#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1130 gtkedit/gtkedit.c:1138 src/view.c:1968
+#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1293 src/view.c:1968
 msgid "Save"
 msgstr ""
 
@@ -993,613 +1107,255 @@ msgstr ""
 msgid " &No "
 msgstr ""
 
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2515
+#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2509
 msgid " Copy to clipboard "
 msgstr ""
 
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2458 gtkedit/editcmd.c:2515 gtkedit/editcmd.c:2528
+#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2509 gtkedit/editcmd.c:2522
 msgid " Unable to save to file. "
 msgstr ""
 
-#: gtkedit/editcmd.c:2458 gtkedit/editcmd.c:2528
+#: gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2522
 msgid " Cut to clipboard "
 msgstr ""
 
 #. ***
-#: gtkedit/editcmd.c:2550 gtkedit/editcmd.c:2554 gtkedit/editcmd.c:2559 src/view.c:1833
+#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 src/view.c:1833
 msgid " Goto line "
 msgstr ""
 
-#: gtkedit/editcmd.c:2550 gtkedit/editcmd.c:2554 gtkedit/editcmd.c:2559
+#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
 msgid " Enter line: "
 msgstr ""
 
-#: gtkedit/editcmd.c:2580 gtkedit/editcmd.c:2597
+#: gtkedit/editcmd.c:2574 gtkedit/editcmd.c:2591
 msgid " Save Block "
 msgstr ""
 
 #. returns 1 on success
-#: gtkedit/editcmd.c:2631
+#: gtkedit/editcmd.c:2625
 msgid " Insert File "
 msgstr ""
 
-#: gtkedit/editcmd.c:2646
+#: gtkedit/editcmd.c:2640
 msgid " Insert file "
 msgstr ""
 
-#: gtkedit/editcmd.c:2646
+#: gtkedit/editcmd.c:2640
 msgid " Error trying to insert file. "
 msgstr ""
 
-#: gtkedit/editcmd.c:2666
+#: gtkedit/editcmd.c:2660
 msgid " Sort block "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2666 gtkedit/editcmd.c:2720
+#: gtkedit/editcmd.c:2660 gtkedit/editcmd.c:2714
 msgid " You must first highlight a block of text. "
 msgstr ""
 
-#: gtkedit/editcmd.c:2673
+#: gtkedit/editcmd.c:2667
 msgid " Run Sort "
 msgstr ""
 
-#: gtkedit/editcmd.c:2675
+#: gtkedit/editcmd.c:2669
 msgid " Enter sort options (see manpage) separated by whitespace: "
 msgstr ""
 
-#: gtkedit/editcmd.c:2686 gtkedit/editcmd.c:2692
+#: gtkedit/editcmd.c:2680 gtkedit/editcmd.c:2686
 msgid " Sort "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2688
+#: gtkedit/editcmd.c:2682
 msgid " Error trying to execute sort command "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2694
+#: gtkedit/editcmd.c:2688
 msgid " Sort returned non-zero: "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2718 gtkedit/editcmd.c:2748
+#: gtkedit/editcmd.c:2712 gtkedit/editcmd.c:2742
 msgid " Process block "
 msgstr ""
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2750
+#: gtkedit/editcmd.c:2744
 msgid " Error trying to stat file "
 msgstr ""
 
-#: gtkedit/editcmd.c:2820
+#: gtkedit/editcmd.c:2814
 msgid " Mail "
 msgstr ""
 
-#: gtkedit/editmenu.c:56
-msgid " Word wrap "
-msgstr ""
-
 #. Not essential to translate
-#: gtkedit/editmenu.c:58
-msgid " Enter line length, 0 for off: "
-msgstr ""
-
-#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134
-msgid "&Open/load...     C-o"
-msgstr ""
-
-#: gtkedit/editmenu.c:119
-msgid "&New              C-n"
-msgstr ""
-
-#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137
-msgid "&Save              F2"
-msgstr ""
-
-#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
-msgid "save &As...       F12"
-msgstr ""
-
-#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140
-msgid "&Insert file...   F15"
-msgstr ""
-
-#: gtkedit/editmenu.c:125
-msgid "copy to &File...  C-f"
-msgstr ""
-
-#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143
-msgid "a&Bout...            "
-msgstr ""
-
-#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145
-msgid "&Quit             F10"
-msgstr ""
-
-#: gtkedit/editmenu.c:135
-msgid "&New            C-x k"
-msgstr ""
-
-#: gtkedit/editmenu.c:141
-msgid "copy to &File...     "
-msgstr ""
-
-#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167
-msgid "&Toggle Mark       F3"
-msgstr ""
-
-#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
-msgid "&Mark Columns    S-F3"
-msgstr ""
-
-#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170
-msgid "toggle &Ins/overw Ins"
-msgstr ""
-
-#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172
-msgid "&Copy              F5"
-msgstr ""
-
-#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
-msgid "&Move              F6"
-msgstr ""
-
-#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
-msgid "&Delete            F8"
-msgstr ""
-
-#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176
-msgid "&Undo             C-u"
-msgstr ""
-
-#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178
-msgid "&Beginning     C-PgUp"
-msgstr ""
-
-#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
-msgid "&End           C-PgDn"
-msgstr ""
-
-#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191
-msgid "&Search...         F7"
-msgstr ""
-
-#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
-msgid "search &Again     F17"
-msgstr ""
-
-#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
-msgid "&Replace...        F4"
-msgstr ""
-
-#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220
-msgid "&Goto line...            M-l"
-msgstr ""
-
-#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222
-msgid "insert &Literal...       C-q"
-msgstr ""
-
-#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224
-msgid "&Refresh screen          C-l"
-msgstr ""
-
-#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226
-msgid "&Start record macro      C-r"
-msgstr ""
-
-#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
-msgid "&Finish record macro...  C-r"
-msgstr ""
-
-#: gtkedit/editmenu.c:206
-msgid "&Execute macro...   C-a, KEY"
-msgstr ""
-
-#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229
-msgid "delete macr&O...            "
-msgstr ""
-
-#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231
-msgid "insert &Date/time           "
-msgstr ""
-
-#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233
-msgid "format p&Aragraph        M-p"
-msgstr ""
-
-#: gtkedit/editmenu.c:212
-msgid "'ispell' s&Pell check    C-p"
-msgstr ""
-
-#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235
-msgid "sor&T...                 M-t"
-msgstr ""
-
-#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
-msgid "'indent' &C Formatter    F19"
-msgstr ""
-
-#: gtkedit/editmenu.c:215
-msgid "&Mail...                    "
-msgstr ""
-
-#: gtkedit/editmenu.c:228
-msgid "&Execute macro... C-x e, KEY"
-msgstr ""
-
-#: gtkedit/editmenu.c:234
-msgid "'ispell' s&Pell check    M-$"
-msgstr ""
-
-#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252
-msgid "&General...  "
-msgstr ""
-
-#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
-msgid "&Save mode..."
-msgstr ""
-
-#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1312
-msgid "&Layout..."
-msgstr ""
-
-#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 src/chmod.c:165 src/chown.c:132
-msgid " File "
-msgstr ""
-
-#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407
-msgid " Edit "
-msgstr ""
-
-#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276
-msgid " Sear/Repl "
-msgstr ""
-
-#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442
-msgid " Command "
-msgstr ""
-
-#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278
-msgid " Options "
-msgstr ""
-
-#: gtkedit/editmenu.c:392
-msgid "Open...\tC-o"
-msgstr ""
-
-#: gtkedit/editmenu.c:393
-msgid "New\tC-n"
-msgstr ""
-
-#: gtkedit/editmenu.c:395
-msgid "Save\tF2"
-msgstr ""
-
-#: gtkedit/editmenu.c:396
-msgid "Save as...\tF12"
-msgstr ""
-
-#: gtkedit/editmenu.c:398
-msgid "Insert file...\tF15"
-msgstr ""
-
-#: gtkedit/editmenu.c:399
-msgid "Copy to file...\tC-f"
-msgstr ""
-
-#. Tool hint
-#: gtkedit/editmenu.c:402
-msgid "Disk operations"
-msgstr ""
-
-#: gtkedit/editmenu.c:408
-msgid "Toggle mark\tF3"
-msgstr ""
-
-#: gtkedit/editmenu.c:409
-msgid "Toggle mark columns\tC-b"
-msgstr ""
-
-#: gtkedit/editmenu.c:411
-msgid "Toggle insert/overwrite\tIns"
-msgstr ""
-
-#: gtkedit/editmenu.c:413
-msgid "Copy block to cursor\tF5"
-msgstr ""
-
-#: gtkedit/editmenu.c:414
-msgid "Move block to cursor\tF6"
-msgstr ""
-
-#: gtkedit/editmenu.c:415
-msgid "Delete block\tF8/C-Del"
-msgstr ""
-
-#: gtkedit/editmenu.c:417
-msgid "Copy block to clipbrd\tC-Ins"
-msgstr ""
-
-#: gtkedit/editmenu.c:418
-msgid "Cut block to clipbrd\tS-Del"
-msgstr ""
-
-#: gtkedit/editmenu.c:419
-msgid "Paste block from clipbrd\tS-Ins"
-msgstr ""
-
-#: gtkedit/editmenu.c:420
-msgid "Selection history\tM-Ins"
-msgstr ""
-
-#: gtkedit/editmenu.c:422
-msgid "Undo\tC-BackSpace"
-msgstr ""
-
-#. Tool hint
-#: gtkedit/editmenu.c:425
-msgid "Manipulating blocks of text"
-msgstr ""
-
-#: gtkedit/editmenu.c:430
-msgid " Srch/Replce "
-msgstr ""
-
-#: gtkedit/editmenu.c:431
-msgid "Search...\tF7"
-msgstr ""
-
-#: gtkedit/editmenu.c:432
-msgid "Search again\tF17"
-msgstr ""
-
-#: gtkedit/editmenu.c:433
-msgid "Replace...\tF4"
-msgstr ""
-
-#: gtkedit/editmenu.c:434
-msgid "Replace again\tF14"
-msgstr ""
-
-#. Tool hint
-#: gtkedit/editmenu.c:437
-msgid "Search for and replace text"
-msgstr ""
-
-#: gtkedit/editmenu.c:443
-msgid "Goto line...\tM-l"
-msgstr ""
-
-#: gtkedit/editmenu.c:445
-msgid "Start record macro\tC-r"
-msgstr ""
-
-#: gtkedit/editmenu.c:446
-msgid "Finish record macro...\tC-r"
-msgstr ""
-
-#: gtkedit/editmenu.c:447
-msgid "Execute macro...\tC-a, KEY"
-msgstr ""
-
-#: gtkedit/editmenu.c:448
-msgid "Delete macro...\t"
-msgstr ""
-
-#: gtkedit/editmenu.c:450
-msgid "Insert date/time\tC-d"
-msgstr ""
-
-#: gtkedit/editmenu.c:451
-msgid "Format paragraph\tM-p"
-msgstr ""
-
-#: gtkedit/editmenu.c:453
-msgid "Refresh display\tC-l"
-msgstr ""
-
-#. Tool hint
-#: gtkedit/editmenu.c:456
-msgid "Macros and internal commands"
-msgstr ""
-
-#: gtkedit/editoptions.c:37
-msgid "None"
-msgstr ""
-
-#: gtkedit/editoptions.c:37
-msgid "Dynamic paragraphing"
-msgstr ""
-
-#: gtkedit/editoptions.c:37
-msgid "Type writer wrap"
-msgstr ""
-
-#. 13
-#: gtkedit/editoptions.c:100
-msgid "Wrap mode"
-msgstr ""
-
-#. 15
-#: gtkedit/editoptions.c:106
-msgid "Key emulation"
-msgstr ""
-
-#: gtkedit/editwidget.c:325
+#: gtkedit/editwidget.c:310
 msgid "Error initialising editor.\n"
 msgstr ""
 
-#: gtkedit/editwidget.c:1129 gtkedit/gtkedit.c:1210 src/help.c:809 src/main.c:1678 src/screen.c:2282 src/screen.c:2312 src/tree.c:1478 src/view.c:1963
+#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1365 src/help.c:809 src/main.c:1676 src/screen.c:2277 src/screen.c:2307 src/tree.c:1478 src/view.c:1963
 msgid "Help"
 msgstr ""
 
-#: gtkedit/editwidget.c:1131
+#: gtkedit/editwidget.c:1062
 msgid "Mark"
 msgstr ""
 
-#: gtkedit/editwidget.c:1132
+#: gtkedit/editwidget.c:1063
 msgid "Replac"
 msgstr ""
 
-#: gtkedit/editwidget.c:1133 gtkedit/gtkedit.c:1160 src/screen.c:2286 src/screen.c:2316 src/tree.c:1484
+#: gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/screen.c:2281 src/screen.c:2311 src/tree.c:1484
 msgid "Copy"
 msgstr ""
 
-#: gtkedit/editwidget.c:1134
+#: gtkedit/editwidget.c:1065
 msgid "Move"
 msgstr ""
 
-#: gtkedit/editwidget.c:1136 src/screen.c:2289 src/screen.c:2319
-msgid "Delete"
-msgstr ""
-
-#: gtkedit/editwidget.c:1138 src/main.c:1680
+#: gtkedit/editwidget.c:1069 src/main.c:1678
 msgid "PullDn"
 msgstr ""
 
-#: gtkedit/editwidget.c:1139 src/help.c:821 src/main.c:1681 src/view.c:1965 src/view.c:1985
+#: gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1679 src/view.c:1965 src/view.c:1985
 msgid "Quit"
 msgstr ""
 
-#: gtkedit/gtkedit.c:104
+#: gtkedit/gtkedit.c:107
 msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
 msgstr ""
 
-#: gtkedit/gtkedit.c:690
+#: gtkedit/gtkedit.c:798
 msgid "gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1131
+#: gtkedit/gtkedit.c:1286
 msgid "Open/Load"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1131
+#: gtkedit/gtkedit.c:1286
 msgid "Load a different/new file"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1134
+#: gtkedit/gtkedit.c:1289
 msgid "New"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1134
+#: gtkedit/gtkedit.c:1289
 msgid "Clear the edit buffer"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1138
+#: gtkedit/gtkedit.c:1293
 msgid "Save the current edit buffer to filename"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1141
+#: gtkedit/gtkedit.c:1296
 msgid "Save As"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1141
+#: gtkedit/gtkedit.c:1296
 msgid "Save the current edit buffer as filename"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1145
+#: gtkedit/gtkedit.c:1300
 msgid "Insert File"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1145
+#: gtkedit/gtkedit.c:1300
 msgid "Insert text from a file"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1148
+#: gtkedit/gtkedit.c:1303
 msgid "Copy to file"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1148
+#: gtkedit/gtkedit.c:1303
 msgid "copy a block to a file"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1152
+#: gtkedit/gtkedit.c:1307
 msgid "Exit"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1152
+#: gtkedit/gtkedit.c:1307
 msgid "Quit editor"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1160
+#: gtkedit/gtkedit.c:1315
 msgid "Copy selection to clipboard"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1163
+#: gtkedit/gtkedit.c:1318
 msgid "Cut"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1163
+#: gtkedit/gtkedit.c:1318
 msgid "Cut selection to clipboard"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1166
+#: gtkedit/gtkedit.c:1321
 msgid "Paste"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1166
+#: gtkedit/gtkedit.c:1321
 msgid "Paste clipboard"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1170
+#: gtkedit/gtkedit.c:1325
 msgid "Undo"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1170
+#: gtkedit/gtkedit.c:1325
 msgid "Go back in time one key press"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1178
+#: gtkedit/gtkedit.c:1333
 msgid "Find"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1178
+#: gtkedit/gtkedit.c:1333
 msgid "Find string/regular expression"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1181
+#: gtkedit/gtkedit.c:1336
 msgid "Find again"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1181
+#: gtkedit/gtkedit.c:1336
 msgid "Repeat most recent search"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1184 gtkedit/gtkedit.c:1209
+#: gtkedit/gtkedit.c:1339 gtkedit/gtkedit.c:1364
 msgid "Search/Replace"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1184
+#: gtkedit/gtkedit.c:1339
 msgid "Find and replace text/regular expressions"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1193
+#: gtkedit/gtkedit.c:1348
 msgid "About..."
 msgstr ""
 
-#: gtkedit/gtkedit.c:1193
-msgid "Info about GNOME hello"
+#: gtkedit/gtkedit.c:1348
+msgid "Info about Mcedit"
 msgstr ""
 
-#: gtkedit/gtkedit.c:1208 src/screen.c:2285 src/screen.c:2315 src/view.c:1972
-msgid "Edit"
-msgstr ""
-
-#: gtkedit/syntax.c:3174 gtkedit/syntax.c:3181
+#: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
 msgid " Load syntax file "
 msgstr ""
 
-#: gtkedit/syntax.c:3174
+#: gtkedit/syntax.c:3180
 msgid " File access error "
 msgstr ""
 
-#: gtkedit/syntax.c:3180
+#: gtkedit/syntax.c:3186
 msgid " Syntax error in file %s on line %d "
 msgstr ""
 
-#: src/achown.c:73 src/boxes.c:142 src/boxes.c:282 src/boxes.c:379 src/boxes.c:467 src/boxes.c:653 src/boxes.c:776 src/boxes.c:830 src/chmod.c:115 src/chown.c:81 src/cmd.c:862 src/find.c:154 src/hotlist.c:140 src/hotlist.c:812 src/hotlist.c:905 src/layout.c:373 src/learn.c:61 src/option.c:144 src/panelize.c:90 src/view.c:408 src/wtools.c:114 src/wtools.c:389 src/wtools.c:562 src/wtools.c:643
+#: src/achown.c:73 src/boxes.c:142 src/boxes.c:282 src/boxes.c:379 src/boxes.c:467 src/boxes.c:647 src/boxes.c:732 src/boxes.c:786 src/chmod.c:115 src/chown.c:81 src/cmd.c:868 src/filegui.c:707 src/find.c:154 src/hotlist.c:140 src/hotlist.c:812 src/hotlist.c:905 src/layout.c:371 src/learn.c:61 src/option.c:145 src/panelize.c:90 src/view.c:408 src/wtools.c:114 src/wtools.c:389 src/wtools.c:562 src/wtools.c:643
 msgid "&Cancel"
 msgstr ""
 
@@ -1672,7 +1428,7 @@ msgstr ""
 msgid "Background process:"
 msgstr ""
 
-#: src/background.c:286 src/file.c:2021
+#: src/background.c:286 src/file.c:2062
 msgid " Background process error "
 msgstr ""
 
@@ -1778,80 +1534,67 @@ msgstr ""
 msgid " Display bits "
 msgstr ""
 
-#: src/boxes.c:650
-msgid "Always to memory"
-msgstr ""
-
-#: src/boxes.c:650
-msgid "If size less than:"
-msgstr ""
-
-#: src/boxes.c:660
+#: src/boxes.c:654
 msgid "&Always use ftp proxy"
 msgstr ""
 
-#: src/boxes.c:662
+#: src/boxes.c:656
 msgid "sec"
 msgstr ""
 
-#: src/boxes.c:666
+#: src/boxes.c:660
 msgid "ftpfs directory cache timeout:"
 msgstr ""
 
-#: src/boxes.c:670
+#: src/boxes.c:664
 msgid "ftp anonymous password:"
 msgstr ""
 
-#: src/boxes.c:677
-msgid "Gzipped tar archive extract:"
-msgstr ""
-
-#: src/boxes.c:683
+#: src/boxes.c:671
 msgid "Timeout for freeing VFSs:"
 msgstr ""
 
-#: src/boxes.c:689
+#: src/boxes.c:677
 msgid " Virtual File System Setting "
 msgstr ""
 
-#: src/boxes.c:789
+#: src/boxes.c:745
 msgid "Quick cd"
 msgstr ""
 
-#. want cd like completion
-#: src/boxes.c:794
+#: src/boxes.c:750
 msgid "cd"
 msgstr ""
 
-#: src/boxes.c:850
+#: src/boxes.c:806
 msgid "Symbolic link filename:"
 msgstr ""
 
-#: src/boxes.c:852
+#: src/boxes.c:808
 msgid "Existing filename (filename symlink will point to):"
 msgstr ""
 
-#: src/boxes.c:881
+#: src/boxes.c:837
 msgid "Running "
 msgstr ""
 
-#: src/boxes.c:882 src/find.c:667
+#: src/boxes.c:838 src/find.c:667
 msgid "Stopped"
 msgstr ""
 
-#: src/boxes.c:940
+#: src/boxes.c:896
 msgid "&Stop"
 msgstr ""
 
-#: src/boxes.c:941
+#: src/boxes.c:897
 msgid "&Resume"
 msgstr ""
 
-#: src/boxes.c:942
+#: src/boxes.c:898
 msgid "&Kill"
 msgstr ""
 
-#: src/boxes.c:981
+#: src/boxes.c:937
 msgid "Background Jobs"
 msgstr ""
 
@@ -1915,7 +1658,7 @@ msgstr ""
 msgid "&Marked all"
 msgstr ""
 
-#: src/chmod.c:151 src/screen.c:424
+#: src/chmod.c:151 src/screen.c:423
 msgid "Name"
 msgstr ""
 
@@ -1939,6 +1682,10 @@ msgstr ""
 msgid " Permission "
 msgstr ""
 
+#: src/chmod.c:165 src/chown.c:132
+msgid " File "
+msgstr ""
+
 #: src/chmod.c:170
 msgid "Use SPACE to change"
 msgstr ""
@@ -2012,256 +1759,240 @@ msgstr ""
 msgid " I can't run the Chown command on a tarfs "
 msgstr ""
 
-#: src/cmd.c:198
+#: src/cmd.c:204
 msgid " Can not fetch a local copy of %s "
 msgstr ""
 
-#: src/cmd.c:248
+#: src/cmd.c:254
 msgid " CD "
 msgstr ""
 
-#: src/cmd.c:248
+#: src/cmd.c:254
 msgid "Files tagged, want to cd?"
 msgstr ""
 
-#: src/cmd.c:254 src/cmd.c:721 src/cmd.c:735
+#: src/cmd.c:260 src/cmd.c:727 src/cmd.c:741
 msgid "Could not change directory"
 msgstr ""
 
-#: src/cmd.c:283
+#: src/cmd.c:289
 msgid " View file "
 msgstr ""
 
-#: src/cmd.c:283
+#: src/cmd.c:289
 msgid " Filename:"
 msgstr ""
 
-#: src/cmd.c:300
+#: src/cmd.c:306
 msgid " Filtered view "
 msgstr ""
 
-#: src/cmd.c:300
+#: src/cmd.c:306
 msgid " Filter command and arguments:"
 msgstr ""
 
-#: src/cmd.c:385
+#: src/cmd.c:391
 msgid " Mkdir "
 msgstr ""
 
-#: src/cmd.c:385
+#: src/cmd.c:391
 msgid " Enter directory name:"
 msgstr ""
 
-#: src/cmd.c:440
+#: src/cmd.c:446
 msgid " Filter "
 msgstr ""
 
-#: src/cmd.c:440
+#: src/cmd.c:446
 msgid " Set expression for filtering filenames"
 msgstr ""
 
-#: src/cmd.c:524
+#: src/cmd.c:530
 msgid " Select "
 msgstr ""
 
-#: src/cmd.c:552 src/cmd.c:603
+#: src/cmd.c:558 src/cmd.c:609
 msgid "  Malformed regular expression  "
 msgstr ""
 
-#: src/cmd.c:576
+#: src/cmd.c:582
 msgid " Unselect "
 msgstr ""
 
-#: src/cmd.c:648
+#: src/cmd.c:654
 msgid "Extension file edit"
 msgstr ""
 
-#: src/cmd.c:649
+#: src/cmd.c:655
 msgid " Which extension file you want to edit? "
 msgstr ""
 
-#: src/cmd.c:650
+#: src/cmd.c:656
 msgid "&User"
 msgstr ""
 
-#: src/cmd.c:650 src/cmd.c:676
+#: src/cmd.c:656 src/cmd.c:682
 msgid "&System Wide"
 msgstr ""
 
-#: src/cmd.c:673
+#: src/cmd.c:679
 msgid "Menu file edit"
 msgstr ""
 
-#: src/cmd.c:674
+#: src/cmd.c:680
 msgid " Which menu file will you edit? "
 msgstr ""
 
-#: src/cmd.c:676
+#: src/cmd.c:682
 msgid "&Local"
 msgstr ""
 
-#: src/cmd.c:676
+#: src/cmd.c:682
 msgid "&Home"
 msgstr ""
 
-#: src/cmd.c:861
+#: src/cmd.c:867
 msgid " Compare directories "
 msgstr ""
 
-#: src/cmd.c:861
+#: src/cmd.c:867
 msgid " Select compare method: "
 msgstr ""
 
-#: src/cmd.c:862
+#: src/cmd.c:868
 msgid "&Quick"
 msgstr ""
 
-#: src/cmd.c:862
+#: src/cmd.c:868
 msgid "&Size only"
 msgstr ""
 
-#: src/cmd.c:862
+#: src/cmd.c:868
 msgid "&Thorough"
 msgstr ""
 
-#: src/cmd.c:872
+#: src/cmd.c:878
 msgid " Both panels should be on the listing view mode to use this command "
 msgstr ""
 
-#: src/cmd.c:886
+#: src/cmd.c:892
 msgid " The command history is empty "
 msgstr ""
 
-#: src/cmd.c:892
+#: src/cmd.c:898
 msgid " Command history "
 msgstr ""
 
-#: src/cmd.c:934
+#: src/cmd.c:940
 msgid ""
 " Not an xterm or Linux console; \n"
 " the panels cannot be toggled. "
 msgstr ""
 
-#: src/cmd.c:973
+#: src/cmd.c:979
 msgid ""
 "Type `exit' to return to the Midnight Commander\n"
 "\r\n"
 "\r"
 msgstr ""
 
-#: src/cmd.c:1026
+#: src/cmd.c:1032
 msgid ""
 " Couldn't stat %s \n"
 " %s "
 msgstr ""
 
-#: src/cmd.c:1035 src/cmd.c:1037
+#: src/cmd.c:1041 src/cmd.c:1043
 msgid " Link "
 msgstr ""
 
-#: src/cmd.c:1036 src/cmd.c:1141 src/file.c:2206
+#: src/cmd.c:1042 src/cmd.c:1147 src/file.c:2247
 msgid " to:"
 msgstr ""
 
-#: src/cmd.c:1047
+#: src/cmd.c:1053
 msgid " link: %s "
 msgstr ""
 
-#: src/cmd.c:1080
+#: src/cmd.c:1086
 msgid " symlink: %s "
 msgstr ""
 
-#: src/cmd.c:1106
+#: src/cmd.c:1112
 msgid " Symlink "
 msgstr ""
 
-#: src/cmd.c:1106
+#: src/cmd.c:1112
 msgid " points to:"
 msgstr ""
 
-#: src/cmd.c:1111
+#: src/cmd.c:1117
 msgid " Edit symlink "
 msgstr ""
 
-#: src/cmd.c:1117
+#: src/cmd.c:1123
 msgid " edit symlink: %s "
 msgstr ""
 
-#: src/cmd.c:1141
+#: src/cmd.c:1147
 msgid " Link symbolically "
 msgstr ""
 
-#: src/cmd.c:1142
+#: src/cmd.c:1148
 msgid " Relative symlink "
 msgstr ""
 
-#: src/cmd.c:1153
+#: src/cmd.c:1159
 msgid " relative symlink: %s "
 msgstr ""
 
-#: src/cmd.c:1256
+#: src/cmd.c:1262
 msgid " Enter machine name (F1 for details): "
 msgstr ""
 
-#: src/cmd.c:1280
+#: src/cmd.c:1286
 msgid " Could not chdir to %s "
 msgstr ""
 
-#: src/cmd.c:1287
+#: src/cmd.c:1293
 msgid " Link to a remote machine "
 msgstr ""
 
-#: src/cmd.c:1293
+#: src/cmd.c:1299
 msgid " FTP to machine "
 msgstr ""
 
-#: src/cmd.c:1303
+#: src/cmd.c:1309
 msgid " Socket source routing setup "
 msgstr ""
 
-#: src/cmd.c:1304
+#: src/cmd.c:1310
 msgid " Enter host name to use as a source routing hop: "
 msgstr ""
 
-#: src/cmd.c:1311
+#: src/cmd.c:1317
 msgid " Host name "
 msgstr ""
 
-#: src/cmd.c:1311
+#: src/cmd.c:1317
 msgid " Error while looking up IP address "
 msgstr ""
 
-#: src/cmd.c:1322
+#: src/cmd.c:1328
 msgid " Undelete files on an ext2 file system "
 msgstr ""
 
-#: src/cmd.c:1323
+#: src/cmd.c:1329
 msgid ""
 " Enter device (without /dev/) to undelete\n"
 "   files on: (F1 for details)"
 msgstr ""
 
-#: src/cmd.c:1365
-msgid "You can not scan disk usage on non-local filesystem. Sorry."
-msgstr ""
-
-#: src/cmd.c:1423
-msgid "Show directory sizes"
-msgstr ""
-
-#: src/cmd.c:1423 src/panelize.c:466
-msgid "Pipe close failed"
-msgstr ""
-
-#: src/cmd.c:1436
-msgid "Cannot invoke du command."
-msgstr ""
-
-#: src/cmd.c:1447
+#: src/cmd.c:1379
 msgid " Setup saved to ~/"
 msgstr ""
 
-#: src/cmd.c:1452
+#: src/cmd.c:1384
 msgid " Setup "
 msgstr ""
 
@@ -2342,423 +2073,536 @@ msgstr ""
 msgid "&Group"
 msgstr ""
 
-#: src/dir.c:377
+#: src/dir.c:378
 msgid "File exists but can not be stat-ed: %s %s"
 msgstr ""
 
-#: src/dir.c:632
+#: src/dir.c:636
 msgid "Unknown"
 msgstr ""
 
-#: src/ext.c:139 src/user.c:511
+#: src/ext.c:141 src/user.c:511
 msgid ""
 " Can't create temporary command file \n"
 " %s "
 msgstr ""
 
-#: src/ext.c:152 src/user.c:538
+#: src/ext.c:154 src/user.c:538
 msgid " Parameter "
 msgstr ""
 
-#: src/ext.c:295
+#: src/ext.c:297
 msgid " Can't execute commands on a Virtual File System directory "
 msgstr ""
 
-#: src/ext.c:392
+#: src/ext.c:394
 msgid " file error"
 msgstr ""
 
-#: src/ext.c:393
+#: src/ext.c:395
 msgid "Format of the "
 msgstr ""
 
-#: src/ext.c:411
+#: src/ext.c:413
 msgid " file error "
 msgstr ""
 
-#: src/ext.c:412
+#: src/ext.c:414
 msgid "Format of the ~/"
 msgstr ""
 
-#: src/ext.c:412
+#: src/ext.c:414
 msgid ""
 " file has changed\n"
 "with version 3.0. You may want either to\n"
 "copy it from "
 msgstr ""
 
-#: src/ext.c:414
+#: src/ext.c:416
 msgid ""
 "mc.ext or use that\n"
 "file as an example of how to write it.\n"
 msgstr ""
 
-#: src/ext.c:416
+#: src/ext.c:418
 msgid "mc.ext will be used for this moment."
 msgstr ""
 
-#: src/file.c:225 src/tree.c:1104
+#: src/file.c:228 src/tree.c:1104
 msgid " Copy "
 msgstr ""
 
-#: src/file.c:226 src/tree.c:1140
+#: src/file.c:229 src/tree.c:1140
 msgid " Move "
 msgstr ""
 
-#: src/file.c:227 src/tree.c:1205
+#: src/file.c:230 src/tree.c:1205
 msgid " Delete "
 msgstr ""
 
-#: src/file.c:310
+#: src/file.c:313
 msgid " Invalid target mask "
 msgstr ""
 
-#: src/file.c:408
+#: src/file.c:411
 msgid " Could not make the hardlink "
 msgstr ""
 
-#: src/file.c:451
+#: src/file.c:454
 msgid ""
 " Cannot read source link \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:461
+#: src/file.c:464
 msgid ""
 " Cannot make stable symlinks across non-local filesystems: \n"
 "\n"
 " Option Stable Symlinks will be disabled "
 msgstr ""
 
-#: src/file.c:510
+#: src/file.c:513
 msgid ""
 " Cannot create target symlink \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:571
+#: src/file.c:574
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:581
+#: src/file.c:584
 msgid ""
 " Cannot stat source file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:595
+#: src/file.c:598
 msgid " `%s' and `%s' are the same file. "
 msgstr ""
 
-#: src/file.c:631
+#: src/file.c:634
 msgid ""
 " Cannot create special file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:641 src/file.c:865
+#: src/file.c:644 src/file.c:868
 msgid ""
 " Cannot chown target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:650 src/file.c:881
+#: src/file.c:653 src/file.c:884
 msgid ""
 " Cannot chmod target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:664
+#: src/file.c:667
 msgid ""
 " Cannot open source file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:674
+#: src/file.c:677
 msgid " Reget failed, about to overwrite file "
 msgstr ""
 
-#: src/file.c:681
+#: src/file.c:684
 msgid ""
 " Cannot fstat source file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:703
+#: src/file.c:706
 msgid ""
 " Cannot create target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:718
+#: src/file.c:721
 msgid ""
 " Cannot fstat target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:749
+#: src/file.c:752
 msgid ""
 " Cannot read source file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:779
+#: src/file.c:782
 msgid ""
 " Cannot write target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:797
+#: src/file.c:800
 msgid "(stalled)"
 msgstr ""
 
-#: src/file.c:836
+#: src/file.c:839
 msgid ""
 " Cannot close source file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:846
+#: src/file.c:849
 msgid ""
 " Cannot close target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:856
+#. Remove short file
+#: src/file.c:859
 msgid "Incomplete file was retrieved. Keep it?"
 msgstr ""
 
-#: src/file.c:856
+#: src/file.c:859
 msgid "&Delete"
 msgstr ""
 
-#: src/file.c:856 src/hotlist.c:1437
+#: src/file.c:859 src/hotlist.c:1437
 msgid "&Keep"
 msgstr ""
 
-#: src/file.c:925
+#: src/file.c:928
 msgid ""
 " Cannot stat source directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:948
+#: src/file.c:951
 msgid ""
 " Source directory \"%s\" is not a directory \n"
 " %s "
 msgstr ""
 
-#: src/file.c:956
+#. we found a cyclic symbolic link
+#: src/file.c:959
 msgid ""
 " Cannot copy cyclic symbolic link \n"
 " `%s' "
 msgstr ""
 
-#: src/file.c:1009
+#: src/file.c:1012
 msgid ""
 " Cannot create target directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1028
+#: src/file.c:1031
 msgid ""
 " Cannot chown target directory \"%s\" \n"
 " %s "
 msgstr ""
 
 #. Source doesn't exist
-#: src/file.c:1140
+#: src/file.c:1143
 msgid ""
 " Cannot stat file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1162
+#: src/file.c:1165
 msgid " `%s' and `%s' are the same file "
 msgstr ""
 
 #. OS2_NT
-#: src/file.c:1169
+#: src/file.c:1172
 msgid " Cannot overwrite directory `%s' "
 msgstr ""
 
-#: src/file.c:1202
+#: src/file.c:1205
 msgid ""
 " Cannot move file \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1222
+#: src/file.c:1225
 msgid ""
 " Cannot remove file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1271
+#: src/file.c:1274
 msgid " Cannot overwrite directory \"%s\" %s "
 msgstr ""
 
-#: src/file.c:1273
+#: src/file.c:1276
 msgid " Cannot overwrite file \"%s\" %s "
 msgstr ""
 
-#: src/file.c:1296
+#: src/file.c:1299
 msgid ""
 " Cannot move directory \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1352
+#: src/file.c:1355
 msgid ""
 " Cannot delete file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1405 src/file.c:1472 src/file.c:1501
+#: src/file.c:1408 src/file.c:1475 src/file.c:1504
 msgid ""
 " Cannot remove directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1537
+#: src/file.c:1540
 msgid " Internal error: get_file \n"
 msgstr ""
 
-#: src/file.c:1700
+#: src/file.c:1706
 msgid " Can't operate on \"..\"! "
 msgstr ""
 
-#: src/file.c:1750
+#: src/file.c:1722
+msgid "Yes"
+msgstr ""
+
+#: src/file.c:1722
+msgid "No"
+msgstr ""
+
+#: src/file.c:1772
 msgid " Sorry, I could not put the job in background "
 msgstr ""
 
-#: src/file.c:1839 src/file.c:1932
+#: src/file.c:1862 src/file.c:1964
 msgid " Internal failure "
 msgstr ""
 
-#: src/file.c:1839 src/file.c:1933
+#: src/file.c:1862 src/file.c:1965
 msgid " Unknown file operation "
 msgstr ""
 
-#: src/file.c:1855
+#: src/file.c:1878
 msgid ""
 " Destination \"%s\" must be a directory \n"
 " %s "
 msgstr ""
 
-#: src/file.c:2022
+#: src/file.c:2063 src/filegui.c:248
 msgid "&Skip"
 msgstr ""
 
-#: src/file.c:2022
+#: src/file.c:2063
 msgid "&Retry"
 msgstr ""
 
-#: src/file.c:2022 src/file.c:2080
+#: src/file.c:2063 src/file.c:2121 src/filegui.c:245 src/filegui.c:485
 msgid "&Abort"
 msgstr ""
 
-#: src/file.c:2071
+#: src/file.c:2112
 msgid ""
 "\n"
 "   Directory not empty.   \n"
 "   Delete it recursively? "
 msgstr ""
 
-#: src/file.c:2072
+#: src/file.c:2113
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
 "   Delete it recursively? "
 msgstr ""
 
-#: src/file.c:2079
+#: src/file.c:2120
 msgid "a&ll"
 msgstr ""
 
-#: src/file.c:2079
+#: src/file.c:2120 src/filegui.c:488
 msgid "non&E"
 msgstr ""
 
-#: src/file.c:2089
+#: src/file.c:2130
 msgid " Type 'yes' if you REALLY want to delete "
 msgstr ""
 
-#: src/file.c:2091
+#: src/file.c:2132
 msgid "all the directories "
 msgstr ""
 
-#: src/file.c:2093
+#: src/file.c:2134
 msgid " Recursive Delete "
 msgstr ""
 
-#: src/file.c:2094
+#: src/file.c:2135
 msgid " Background process: Recursive Delete "
 msgstr ""
 
-#: src/file.c:2182
+#.
+#. * This array introduced to avoid translation problems. The former (op_names)
+#. * is assumed to be nouns, suitable in dialog box titles; this one should
+#. * contain whatever is used in prompt itself (i.e. in russian, it's verb).
+#. * Notice first symbol - it is to fool gettext and force these strings to
+#. * be different for it. First symbol is skipped while building a prompt.
+#. * (I don't use spaces around the words, because someday they could be
+#. * dropped, when widgets get smarter)
+#.
+#: src/file.c:2223
 msgid "1Copy"
 msgstr ""
 
-#: src/file.c:2182
+#: src/file.c:2223
 msgid "1Move"
 msgstr ""
 
-#: src/file.c:2182
+#: src/file.c:2223
 msgid "1Delete"
 msgstr ""
 
-#.
-#. * These are formats for building a prompt. Parts encoded as follows:
-#. * %o - operation from op_names1
-#. * %f - file/files or files/directories, as appropriate
-#. * %m - "with source mask" or question mark for delete
-#. * %s - source name (truncated)
-#. * %d - number of marked files
-#. * %e - "to:" or question mark for delete
-#.
-#: src/file.c:2197
+#: src/file.c:2238
 msgid "%o %f \"%s\"%m"
 msgstr ""
 
-#: src/file.c:2198
+#: src/file.c:2239
 msgid "%o %d %f%m"
 msgstr ""
 
-#: src/file.c:2200
+#: src/file.c:2241
 msgid "%o %f \"%s\"%e"
 msgstr ""
 
-#: src/file.c:2201
+#: src/file.c:2242
 msgid "%o %d %f%e"
 msgstr ""
 
-#: src/file.c:2205
+#: src/file.c:2246
 msgid "file"
 msgstr ""
 
-#: src/file.c:2205
+#: src/file.c:2246
 msgid "files"
 msgstr ""
 
-#: src/file.c:2205
+#: src/file.c:2246
 msgid "directory"
 msgstr ""
 
-#: src/file.c:2205
+#: src/file.c:2246
 msgid "directories"
 msgstr ""
 
-#: src/file.c:2206
+#: src/file.c:2247
 msgid "files/directories"
 msgstr ""
 
-#: src/file.c:2206
+#: src/file.c:2247
 msgid " with source mask:"
 msgstr ""
 
+#: src/filegui.c:375
+msgid "Count"
+msgstr ""
+
+#: src/filegui.c:387
+msgid "Bytes"
+msgstr ""
+
+#. WITH_FULL_PATHS
+#: src/filegui.c:416
+msgid "Source"
+msgstr ""
+
+#: src/filegui.c:430
+msgid "Target"
+msgstr ""
+
+#: src/filegui.c:443
+msgid "Deleting"
+msgstr ""
+
+#: src/filegui.c:483
+msgid "Target file \"%s\" already exists!"
+msgstr ""
+
+#: src/filegui.c:486
+msgid "if &Size differs"
+msgstr ""
+
+#: src/filegui.c:489
+msgid "&Update"
+msgstr ""
+
+#: src/filegui.c:490
+msgid "al&L"
+msgstr ""
+
+#: src/filegui.c:491
+msgid "Overwrite all targets?"
+msgstr ""
+
+#: src/filegui.c:493
+msgid "&Reget"
+msgstr ""
+
+#: src/filegui.c:494
+msgid "ap&Pend"
+msgstr ""
+
+#: src/filegui.c:497
+msgid "Overwrite this target?"
+msgstr ""
+
+#: src/filegui.c:499
+msgid "Target date: %s, size %d"
+msgstr ""
+
+#: src/filegui.c:501
+msgid "Source date: %s, size %d"
+msgstr ""
+
+#: src/filegui.c:589
+msgid " File exists "
+msgstr ""
+
+#: src/filegui.c:589
+msgid " Background process: File exists "
+msgstr ""
+
+#: src/filegui.c:683
+msgid "preserve &Attributes"
+msgstr ""
+
+#: src/filegui.c:685
+msgid "follow &Links"
+msgstr ""
+
+#: src/filegui.c:694
+msgid "to:"
+msgstr ""
+
+#: src/filegui.c:695
+msgid "&Using shell patterns"
+msgstr ""
+
+#: src/filegui.c:716
+msgid "&Background"
+msgstr ""
+
+#: src/filegui.c:725
+msgid "&Stable Symlinks"
+msgstr ""
+
+#: src/filegui.c:727
+msgid "&Dive into subdir if exists"
+msgstr ""
+
+#: src/filegui.c:875
+msgid ""
+"Invalid source pattern `%s' \n"
+" %s "
+msgstr ""
+
 #: src/find.c:120
 msgid "&Suspend"
 msgstr ""
@@ -3157,76 +3001,76 @@ msgstr ""
 msgid "File:       None"
 msgstr ""
 
-#: src/layout.c:161
+#: src/layout.c:159
 msgid "&Vertical"
 msgstr ""
 
-#: src/layout.c:162
+#: src/layout.c:160
 msgid "&Horizontal"
 msgstr ""
 
-#: src/layout.c:172
+#: src/layout.c:170
 msgid "&Xterm hintbar"
 msgstr ""
 
-#: src/layout.c:173
+#: src/layout.c:171
 msgid "h&Intbar visible"
 msgstr ""
 
-#: src/layout.c:174
+#: src/layout.c:172
 msgid "&Keybar visible"
 msgstr ""
 
-#: src/layout.c:175
+#: src/layout.c:173
 msgid "command &Prompt"
 msgstr ""
 
-#: src/layout.c:176
+#: src/layout.c:174
 msgid "show &Mini status"
 msgstr ""
 
-#: src/layout.c:177
+#: src/layout.c:175
 msgid "menu&Bar visible"
 msgstr ""
 
-#: src/layout.c:178
+#: src/layout.c:176
 msgid "&Equal split"
 msgstr ""
 
-#: src/layout.c:179
+#: src/layout.c:177
 msgid "pe&Rmissions"
 msgstr ""
 
-#: src/layout.c:180
+#: src/layout.c:178
 msgid "&File types"
 msgstr ""
 
-#: src/layout.c:374 src/learn.c:62 src/learn.c:181 src/option.c:145
+#: src/layout.c:372 src/learn.c:62 src/learn.c:181 src/option.c:146
 msgid "&Save"
 msgstr ""
 
 #. length of line with '<' '>' buttons
-#: src/layout.c:382
+#: src/layout.c:380
 msgid " Layout "
 msgstr ""
 
-#: src/layout.c:383
+#: src/layout.c:381
 msgid " Panel split "
 msgstr ""
 
-#: src/layout.c:384
+#: src/layout.c:382
 msgid " Highlight... "
 msgstr ""
 
-#: src/layout.c:385 src/option.c:156
+#: src/layout.c:383 src/option.c:157
 msgid " Other options "
 msgstr ""
 
-#: src/layout.c:386
+#: src/layout.c:384
 msgid "output lines"
 msgstr ""
 
-#: src/layout.c:453
+#: src/layout.c:451
 msgid "Layout"
 msgstr ""
 
@@ -3451,99 +3295,103 @@ msgstr ""
 msgid "e&Xternal panelize    C-x !"
 msgstr ""
 
-#: src/main.c:1287
+#: src/main.c:1286
 msgid "show directory s&Izes"
 msgstr ""
 
-#: src/main.c:1290
+#: src/main.c:1288
 msgid "command &History"
 msgstr ""
 
-#: src/main.c:1291
+#: src/main.c:1289
 msgid "di&Rectory hotlist    C-\\"
 msgstr ""
 
-#: src/main.c:1293
+#: src/main.c:1291
 msgid "&Active VFS list      C-x a"
 msgstr ""
 
-#: src/main.c:1296
+#: src/main.c:1294
 msgid "&Background jobs      C-x j"
 msgstr ""
 
-#: src/main.c:1300
+#: src/main.c:1298
 msgid "&Undelete files (ext2fs only)"
 msgstr ""
 
-#: src/main.c:1303
+#: src/main.c:1301
 msgid "&Listing format edit"
 msgstr ""
 
-#: src/main.c:1305
+#: src/main.c:1303
 msgid "&Extension file edit"
 msgstr ""
 
-#: src/main.c:1306
+#: src/main.c:1304
 msgid "&Menu file edit"
 msgstr ""
 
-#: src/main.c:1311
+#: src/main.c:1309
 msgid "&Configuration..."
 msgstr ""
 
-#: src/main.c:1313
+#: src/main.c:1310
+msgid "&Layout..."
+msgstr ""
+
+#: src/main.c:1311
 msgid "c&Onfirmation..."
 msgstr ""
 
-#: src/main.c:1314
+#: src/main.c:1312
 msgid "&Display bits..."
 msgstr ""
 
-#: src/main.c:1316
+#: src/main.c:1314
 msgid "learn &Keys..."
 msgstr ""
 
-#: src/main.c:1319
+#: src/main.c:1317
 msgid "&Virtual FS..."
 msgstr ""
 
-#: src/main.c:1322
+#: src/main.c:1320
 msgid "&Save setup"
 msgstr ""
 
-#: src/main.c:1338 src/main.c:1340
+#: src/main.c:1336 src/main.c:1338
 msgid " &Left "
 msgstr ""
 
-#: src/main.c:1340
+#: src/main.c:1338
 msgid " &Above "
 msgstr ""
 
-#: src/main.c:1343
+#: src/main.c:1341
 msgid " &File "
 msgstr ""
 
-#: src/main.c:1344
+#: src/main.c:1342
 msgid " &Command "
 msgstr ""
 
-#: src/main.c:1345
+#: src/main.c:1343
 msgid " &Options "
 msgstr ""
 
-#: src/main.c:1347 src/main.c:1349
+#: src/main.c:1345 src/main.c:1347
 msgid " &Right "
 msgstr ""
 
-#: src/main.c:1349
+#: src/main.c:1347
 msgid " &Below "
 msgstr ""
 
-#: src/main.c:1404
+#: src/main.c:1402
 msgid " Information "
 msgstr ""
 
-#: src/main.c:1405
+#: src/main.c:1403
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -3551,57 +3399,57 @@ msgid ""
 " the details.                                           "
 msgstr ""
 
-#: src/main.c:1679 src/screen.c:2283 src/screen.c:2313
+#: src/main.c:1677 src/screen.c:2278 src/screen.c:2308
 msgid "Menu"
 msgstr ""
 
-#: src/main.c:1884
+#: src/main.c:1882
 msgid "Thank you for using GNU Midnight Commander"
 msgstr ""
 
-#: src/main.c:2237
+#: src/main.c:2235
 msgid "with mouse support on xterm%s.\n"
 msgstr ""
 
-#: src/main.c:2238
+#: src/main.c:2236
 msgid " and the Linux console"
 msgstr ""
 
-#: src/main.c:2333
+#: src/main.c:2331
 msgid "The TERM environment variable is unset!\n"
 msgstr ""
 
-#: src/main.c:2535
+#: src/main.c:2533
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr ""
 
-#: src/main.c:2540
+#: src/main.c:2538
 msgid "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 
-#: src/main.c:2649
+#: src/main.c:2661
 msgid "Geometry for the window"
 msgstr ""
 
-#: src/main.c:2649
+#: src/main.c:2661
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/main.c:2650
+#: src/main.c:2662
 msgid "No windows opened at startup"
 msgstr ""
 
-#: src/main.c:2870
+#: src/main.c:2890
 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:2957
+#: src/main.c:2977
 msgid " Notice "
 msgstr ""
 
-#: src/main.c:2958
+#: src/main.c:2978
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -3629,7 +3477,7 @@ msgid "Animation"
 msgstr ""
 
 #: src/option.c:82
-msgid "ro&Tating dash"
+msgid "rotatin&G dash"
 msgstr ""
 
 #: src/option.c:84
@@ -3657,58 +3505,62 @@ msgid "shell &Patterns"
 msgstr ""
 
 #: src/option.c:90
-msgid "&Verbose operation"
+msgid "Compute &Totals"
 msgstr ""
 
 #: src/option.c:91
-msgid "&Fast dir reload"
+msgid "&Verbose operation"
 msgstr ""
 
 #: src/option.c:92
-msgid "mi&X all files"
+msgid "&Fast dir reload"
 msgstr ""
 
 #: src/option.c:93
-msgid "&Drop down menus"
+msgid "mi&X all files"
 msgstr ""
 
 #: src/option.c:94
-msgid "ma&Rk moves down"
+msgid "&Drop down menus"
 msgstr ""
 
 #: src/option.c:95
-msgid "show &Hidden files"
+msgid "ma&Rk moves down"
 msgstr ""
 
 #: src/option.c:96
+msgid "show &Hidden files"
+msgstr ""
+
+#: src/option.c:97
 msgid "show &Backup files"
 msgstr ""
 
-#: src/option.c:103
+#: src/option.c:104
 msgid "&Never"
 msgstr ""
 
-#: src/option.c:104
+#: src/option.c:105
 msgid "on dumb &Terminals"
 msgstr ""
 
-#: src/option.c:105
+#: src/option.c:106
 msgid "alwa&Ys"
 msgstr ""
 
-#: src/option.c:153
+#: src/option.c:154
 msgid " Configure options "
 msgstr ""
 
-#: src/option.c:154
+#: src/option.c:155
 msgid " Panel options "
 msgstr ""
 
-#: src/option.c:155
+#: src/option.c:156
 msgid " Pause after run... "
 msgstr ""
 
-#: src/option.c:207
+#: src/option.c:208
 msgid "Configure options"
 msgstr ""
 
@@ -3758,6 +3610,10 @@ msgstr ""
 msgid "Cannot invoke command."
 msgstr ""
 
+#: src/panelize.c:466
+msgid "Pipe close failed"
+msgstr ""
+
 #: src/popthelp.c:31
 msgid "Show this help message"
 msgstr ""
@@ -3766,79 +3622,75 @@ msgstr ""
 msgid "Display brief usage message"
 msgstr ""
 
-#: src/screen.c:425 src/screen.c:428
+#: src/screen.c:424 src/screen.c:427
 msgid "Size"
 msgstr ""
 
-#: src/screen.c:427
+#: src/screen.c:426
 msgid "MTime"
 msgstr ""
 
-#: src/screen.c:429
+#: src/screen.c:428
 msgid "Permission"
 msgstr ""
 
-#: src/screen.c:430
+#: src/screen.c:429
 msgid "Perm"
 msgstr ""
 
-#: src/screen.c:431
+#: src/screen.c:430
 msgid "|"
 msgstr ""
 
-#: src/screen.c:432
+#: src/screen.c:431
 msgid "Nl"
 msgstr ""
 
-#: src/screen.c:433
+#: src/screen.c:432
 msgid "GID"
 msgstr ""
 
-#: src/screen.c:434
+#: src/screen.c:433
 msgid "UID"
 msgstr ""
 
-#: src/screen.c:437
+#: src/screen.c:436
 msgid "ATime"
 msgstr ""
 
-#: src/screen.c:438
+#: src/screen.c:437
 msgid "CTime"
 msgstr ""
 
-#: src/screen.c:442
+#: src/screen.c:441
 msgid "Inode"
 msgstr ""
 
-#: src/screen.c:646
+#: src/screen.c:645
 msgid "  %s bytes in %d file%s"
 msgstr ""
 
-#: src/screen.c:1314
+#: src/screen.c:1284
 msgid "Unknow tag on display format: "
 msgstr ""
 
-#: src/screen.c:2051
+#: src/screen.c:2042
 msgid " Do you really want to execute? "
 msgstr ""
 
-#: src/screen.c:2066
+#: src/screen.c:2057
 msgid " No action taken "
 msgstr ""
 
-#: src/screen.c:2284 src/screen.c:2314
-msgid "View"
-msgstr ""
-
-#: src/screen.c:2287 src/screen.c:2317 src/tree.c:1486
+#: src/screen.c:2282 src/screen.c:2312 src/tree.c:1486
 msgid "RenMov"
 msgstr ""
 
-#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1490
+#: src/screen.c:2283 src/screen.c:2313 src/tree.c:1490
 msgid "Mkdir"
 msgstr ""
 
-#: src/screen.c:2304
+#: src/screen.c:2299
 msgid ""
 " Can't chdir to %s \n"
 " %s "
@@ -4289,7 +4141,7 @@ msgstr ""
 msgid "NumLock on keypad"
 msgstr ""
 
-#: src/wtools.c:590 vfs/vfs.c:1675
+#: src/wtools.c:590 vfs/vfs.c:1706
 msgid "Password:"
 msgstr ""
 
@@ -4364,7 +4216,7 @@ msgstr ""
 msgid " Too many open connections "
 msgstr ""
 
-#: vfs/tar.c:90 vfs/tar.c:107
+#: vfs/tar.c:88 vfs/tar.c:105
 msgid ""
 "Couldn't open tar archive\n"
 "%s"
diff --git a/src/ChangeLog b/src/ChangeLog
index f43b75fa4..6a7d7f418 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+1998-12-29  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* cmd.c (check_for_default): Make this compile.
+
 Tue Dec 29 22:25:34 1998  Timur Bakeyev <mc@bat.ru>
 
 	* mountlist.c: Compress all xBSD systems to one line and add check
diff --git a/src/file.c b/src/file.c
index 621a52866..239232b81 100644
--- a/src/file.c
+++ b/src/file.c
@@ -232,8 +232,6 @@ char *op_names [3] = {
 };
 
 static int recursive_erase (char *s, long *progress_count, double *progress_bytes);
-static int erase_file (char *s, long *progress_count, 
-                       double *progress_bytes, int is_toplevel_file);
 
 /* }}} */
 
@@ -1357,7 +1355,7 @@ oktoret:
 
 /* {{{ Erase routines */
 /* Don't update progress status if progress_count==NULL */
-static int
+int
 erase_file (char *s, 
             long *progress_count, 
             double *progress_bytes, 
diff --git a/src/file.h b/src/file.h
index 9a3276a6f..3849c8f74 100644
--- a/src/file.h
+++ b/src/file.h
@@ -41,6 +41,7 @@ int copy_dir_dir        (char *s, char *d, int toplevel, int move_over,
 			 int delete, struct link *parent_dirs,
 			 long *progres_count, double *progress_bytes);
 int erase_dir           (char *s, long *progres_count, double *progress_bytes);
+int erase_file          (char *s, long *progress_count, double *progress_bytes, int is_toplevel_file);
 int erase_dir_iff_empty (char *s);
 
 /*
diff --git a/src/main.c b/src/main.c
index fa56c5f98..343733cd0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2684,6 +2684,9 @@ handle_args (int argc, char *argv [])
     corba_register_server ();
 #else
     gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx);
+    gtk_widget_push_visual (gdk_imlib_get_visual ());
+    gtk_widget_push_colormap (gdk_imlib_get_colormap ());
+	
 #endif
     poptResetContext (ctx);
 #else
@@ -2818,6 +2821,13 @@ int main (int argc, char *argv [])
     bindtextdomain ("mc", LOCALEDIR);
     textdomain ("mc");
 
+    {
+	    volatile  int i = 1;
+
+	    while (!i)
+		    ;
+
+    }
     /* Initialize list of all user group for timur_clr_mode */
     init_groups ();
     
diff --git a/src/panel.h b/src/panel.h
index 97f392605..8124bc4c2 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -124,6 +124,7 @@ typedef struct {
     void *list;
     void *tree;
     void *icons;
+    void *notebook;
     void *scrollbar;
     void *status;
     void *ministatus;