diff --git a/po/mc.pot b/po/mc.pot
index 2ff4ac217..c8feb3f29 100644
--- a/po/mc.pot
+++ b/po/mc.pot
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Date: 1998-04-29 22:25:20-0500\n"
+"Date: 1998-05-04 02:53:24-0500\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"
@@ -308,11 +308,11 @@ msgstr ""
 msgid "Cancel quit"
 msgstr ""
 
-#: edit/editcmd.c:1969 gnome/gcmd.c:94 gnome/gdesktop.c:804 gnome/gdesktop.c:1116 src/cmd.c:248 src/file.c:2116 src/file.c:2469 src/file.c:2549 src/hotlist.c:1027 src/main.c:840 src/screen.c:1989 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
+#: edit/editcmd.c:1969 gnome/gcmd.c:94 gnome/gdesktop.c:804 gnome/gdesktop.c:1116 src/cmd.c:248 src/file.c:2124 src/file.c:2477 src/file.c:2557 src/hotlist.c:1027 src/main.c:840 src/screen.c:1989 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
 msgid "&Yes"
 msgstr ""
 
-#: edit/editcmd.c:1969 gnome/gcmd.c:94 gnome/gdesktop.c:804 gnome/gdesktop.c:1116 src/cmd.c:248 src/file.c:2116 src/file.c:2466 src/file.c:2549 src/hotlist.c:1027 src/main.c:840 src/screen.c:1989 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
+#: edit/editcmd.c:1969 gnome/gcmd.c:94 gnome/gdesktop.c:804 gnome/gdesktop.c:1116 src/cmd.c:248 src/file.c:2124 src/file.c:2474 src/file.c:2557 src/hotlist.c:1027 src/main.c:840 src/screen.c:1989 src/subshell.c:697 src/subshell.c:723 src/tree.c:1195 src/view.c:410
 msgid "&No"
 msgstr ""
 
@@ -810,7 +810,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: src/achown.c:72 src/boxes.c:139 src/boxes.c:274 src/boxes.c:371 src/boxes.c:458 src/boxes.c:637 src/boxes.c:758 src/boxes.c:800 src/chmod.c:115 src/chown.c:81 src/cmd.c:840 src/file.c:1953 src/find.c:158 src/hotlist.c:140 src/hotlist.c:810 src/hotlist.c:903 src/layout.c:365 src/learn.c:58 src/option.c:143 src/panelize.c:89 src/view.c:410 src/wtools.c:114 src/wtools.c:408 src/wtools.c:581 src/wtools.c:661
+#: src/achown.c:72 src/boxes.c:139 src/boxes.c:274 src/boxes.c:371 src/boxes.c:458 src/boxes.c:637 src/boxes.c:758 src/boxes.c:800 src/chmod.c:115 src/chown.c:81 src/cmd.c:840 src/file.c:1961 src/find.c:158 src/hotlist.c:140 src/hotlist.c:810 src/hotlist.c:903 src/layout.c:365 src/learn.c:58 src/option.c:143 src/panelize.c:89 src/view.c:410 src/wtools.c:114 src/wtools.c:408 src/wtools.c:581 src/wtools.c:661
 msgid "&Cancel"
 msgstr ""
 
@@ -886,7 +886,7 @@ msgstr ""
 msgid "Background process:"
 msgstr ""
 
-#: src/background.c:284 src/file.c:2354
+#: src/background.c:284 src/file.c:2362
 msgid " Background process error "
 msgstr ""
 
@@ -932,7 +932,7 @@ msgstr ""
 msgid "user &Mini status"
 msgstr ""
 
-#: gnome/gtools.c:130 src/boxes.c:138 src/boxes.c:273 src/boxes.c:373 src/boxes.c:460 src/boxes.c:639 src/boxes.c:759 src/boxes.c:802 src/boxes.c:911 src/file.c:1960 src/find.c:158 src/layout.c:364 src/option.c:142 src/wtools.c:302 src/wtools.c:583
+#: gnome/gtools.c:130 src/boxes.c:138 src/boxes.c:273 src/boxes.c:373 src/boxes.c:460 src/boxes.c:639 src/boxes.c:759 src/boxes.c:802 src/boxes.c:911 src/file.c:1968 src/find.c:158 src/layout.c:364 src/option.c:142 src/wtools.c:302 src/wtools.c:583
 msgid "&Ok"
 msgstr ""
 
@@ -1577,11 +1577,11 @@ msgstr ""
 msgid "mc.ext will be used for this moment."
 msgstr ""
 
-#: src/file.c:391 src/file.c:2355 src/file.c:2434 src/file.c:2549
+#: src/file.c:391 src/file.c:2363 src/file.c:2442 src/file.c:2557
 msgid "&Abort"
 msgstr ""
 
-#: src/file.c:394 src/file.c:2355
+#: src/file.c:394 src/file.c:2363
 msgid "&Skip"
 msgstr ""
 
@@ -1656,7 +1656,7 @@ msgid ""
 " %s "
 msgstr ""
 
-#: src/file.c:995 src/file.c:1263
+#: src/file.c:995 src/file.c:1271
 msgid ""
 " Cannot chown target file \"%s\" \n"
 " %s "
@@ -1712,284 +1712,282 @@ msgstr ""
 msgid " Can't write to local target file "
 msgstr ""
 
-#: src/file.c:1195
+#: src/file.c:1203
 msgid "(stalled)"
 msgstr ""
 
-#: src/file.c:1234
+#: src/file.c:1242
 msgid ""
 " Cannot close source file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1244
+#: src/file.c:1252
 msgid ""
 " Cannot close target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1277
+#: src/file.c:1285
 msgid ""
 " Cannot chmod target file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1314
+#: src/file.c:1322
 msgid ""
 " Cannot stat source directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1337
+#: src/file.c:1345
 msgid ""
 " Source directory \"%s\" is not a directory \n"
 " %s "
 msgstr ""
 
-#. we found a cyclic symbolic link
-#: src/file.c:1345
+#: src/file.c:1353
 msgid ""
 " Cannot copy cyclic symbolic link \n"
 " `%s' "
 msgstr ""
 
-#: src/file.c:1395
+#: src/file.c:1403
 msgid ""
 " Cannot create target directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1414
+#: src/file.c:1422
 msgid ""
 " Cannot chown target directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#. Source doesn't exist
-#: src/file.c:1522
+#: src/file.c:1530
 msgid ""
 " Cannot stat file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1544
+#: src/file.c:1552
 msgid " `%s' and `%s' are the same file "
 msgstr ""
 
-#. OS2_NT
-#: src/file.c:1551
+#: src/file.c:1559
 msgid " Cannot overwrite directory `%s' "
 msgstr ""
 
-#: src/file.c:1591
+#: src/file.c:1599
 msgid ""
 " Cannot move file \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1609
+#: src/file.c:1617
 msgid ""
 " Cannot remove file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1650
+#: src/file.c:1658
 msgid " Cannot overwrite directory \"%s\" %s "
 msgstr ""
 
-#: src/file.c:1652
+#: src/file.c:1660
 msgid " Cannot overwrite file \"%s\" %s "
 msgstr ""
 
-#: src/file.c:1675
+#: src/file.c:1683
 msgid ""
 " Cannot move directory \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1731
+#: src/file.c:1739
 msgid ""
 " Cannot delete file \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1785 src/file.c:1818 src/file.c:1844
+#: src/file.c:1793 src/file.c:1826 src/file.c:1852
 msgid ""
 " Cannot remove directory \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/file.c:1880
+#: src/file.c:1888
 msgid " Internal error: get_file \n"
 msgstr ""
 
-#: src/file.c:1927
+#. follow symlinks and preserve Attributes must be the first
+#: src/file.c:1935
 msgid "preserve &Attributes"
 msgstr ""
 
-#: src/file.c:1929
+#: src/file.c:1937
 msgid "follow &Links"
 msgstr ""
 
-#: src/file.c:1938
+#: src/file.c:1946
 msgid "to:"
 msgstr ""
 
-#: src/file.c:1939
+#: src/file.c:1947
 msgid "&Using shell patterns"
 msgstr ""
 
-#: src/file.c:1958
+#: src/file.c:1966
 msgid "&Background"
 msgstr ""
 
-#: src/file.c:1961
+#: src/file.c:1969
 msgid "&Stable Symlinks"
 msgstr ""
 
-#: src/file.c:1963
+#: src/file.c:1971
 msgid "&Dive into subdir if exists"
 msgstr ""
 
-#: src/file.c:2030
+#: src/file.c:2038
 msgid ""
 "Invalid source pattern `%s' \n"
 " %s "
 msgstr ""
 
-#: src/file.c:2089
+#: src/file.c:2097
 msgid " Can't operate on \"..\"! "
 msgstr ""
 
-#: src/file.c:2100
+#: src/file.c:2108
 msgid "directories"
 msgstr ""
 
-#: src/file.c:2101
+#: src/file.c:2109
 msgid "files/directories"
 msgstr ""
 
-#: src/file.c:2101
+#: src/file.c:2109
 msgid "files"
 msgstr ""
 
-#: src/file.c:2102 src/file.c:2108
+#: src/file.c:2110 src/file.c:2116
 msgid " with source mask:"
 msgstr ""
 
-#: src/file.c:2106
+#: src/file.c:2114
 msgid "directory"
 msgstr ""
 
-#: src/file.c:2106
+#: src/file.c:2114
 msgid "file"
 msgstr ""
 
-#: src/file.c:2151
+#: src/file.c:2159
 msgid " Sorry, I could not put the job in background "
 msgstr ""
 
-#: src/file.c:2214 src/file.c:2284
+#: src/file.c:2222 src/file.c:2292
 msgid " Internal failure "
 msgstr ""
 
-#: src/file.c:2214 src/file.c:2285
+#: src/file.c:2222 src/file.c:2293
 msgid " Unknown file operation "
 msgstr ""
 
-#: src/file.c:2230
+#: src/file.c:2238
 msgid ""
 " Destination \"%s\" must be a directory \n"
 " %s "
 msgstr ""
 
-#: src/file.c:2355
+#: src/file.c:2363
 msgid "&Retry"
 msgstr ""
 
-#: src/file.c:2393
+#: src/file.c:2401
 msgid "Target file \"%s\" already exists!"
 msgstr ""
 
-#: src/file.c:2423
+#: src/file.c:2431
 msgid " File exists "
 msgstr ""
 
-#: src/file.c:2423
+#: src/file.c:2431
 msgid " Background process: File exists "
 msgstr ""
 
-#: src/file.c:2439
+#: src/file.c:2447
 msgid "if &Size differs"
 msgstr ""
 
-#: src/file.c:2442 src/file.c:2549
+#: src/file.c:2450 src/file.c:2557
 msgid "non&E"
 msgstr ""
 
-#: src/file.c:2445
+#: src/file.c:2453
 msgid "&Update"
 msgstr ""
 
-#: src/file.c:2448
+#: src/file.c:2456
 msgid "al&L"
 msgstr ""
 
-#: src/file.c:2451
+#: src/file.c:2459
 msgid "Overwrite all targets?"
 msgstr ""
 
-#: src/file.c:2460
+#: src/file.c:2468
 msgid "&Reget"
 msgstr ""
 
-#: src/file.c:2462
+#: src/file.c:2470
 msgid "ap&Pend"
 msgstr ""
 
-#: src/file.c:2471
+#: src/file.c:2479
 msgid "Overwrite this target?"
 msgstr ""
 
-#: src/file.c:2475
+#: src/file.c:2483
 msgid "Target date: %s, size %d"
 msgstr ""
 
-#: src/file.c:2478
+#: src/file.c:2486
 msgid "Source date: %s, size %d"
 msgstr ""
 
-#: src/file.c:2542
+#: src/file.c:2550
 msgid ""
 "\n"
 "   Directory not empty.   \n"
 "   Delete it recursively? "
 msgstr ""
 
-#: src/file.c:2543
+#: src/file.c:2551
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
 "   Delete it recursively? "
 msgstr ""
 
-#: src/file.c:2549
+#: src/file.c:2557
 msgid "a&ll"
 msgstr ""
 
-#: src/file.c:2557
+#: src/file.c:2565
 msgid " Type 'yes' if you REALLY want to delete "
 msgstr ""
 
-#: src/file.c:2559
+#: src/file.c:2567
 msgid "all the directories "
 msgstr ""
 
-#: src/file.c:2560
+#: src/file.c:2568
 msgid " Recursive Delete "
 msgstr ""
 
-#: src/file.c:2561
+#: src/file.c:2569
 msgid " Background process: Recursive Delete "
 msgstr ""
 
@@ -2800,121 +2798,129 @@ msgstr ""
 msgid "The TERM environment variable is unset!\n"
 msgstr ""
 
-#: src/main.c:2572
+#: src/main.c:2577
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr ""
 
-#: src/main.c:2577
+#: src/main.c:2582
 msgid "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 
-#: src/main.c:2640
+#: src/main.c:2645
 msgid "[DEVEL-ONLY: Debug the background code]"
 msgstr ""
 
-#: src/main.c:2643
+#: src/main.c:2648
 msgid "Create command file to set default directory upon exit."
 msgstr ""
 
-#: src/main.c:2645
+#: src/main.c:2650
 msgid "Force color mode."
 msgstr ""
 
-#: src/main.c:2646
+#: src/main.c:2651
 msgid "Specify colors (use --help-colors to get a list)."
 msgstr ""
 
-#: src/main.c:2648
+#: src/main.c:2653
 msgid "[DEVEL-ONLY: Debug the subshell."
 msgstr ""
 
-#: src/main.c:2650
+#: src/main.c:2655
 msgid "Startup the internal editor."
 msgstr ""
 
-#: src/main.c:2651
+#: src/main.c:2656
 msgid "Shows this help message."
 msgstr ""
 
-#: src/main.c:2652
+#: src/main.c:2657
 msgid "Help on how to specify colors."
 msgstr ""
 
-#: src/main.c:2654
+#: src/main.c:2659
 msgid "Log ftpfs commands to the file."
 msgstr ""
 
-#: src/main.c:2656
+#: src/main.c:2661
 msgid "Prints out the configured paths."
 msgstr ""
 
-#: src/main.c:2658
+#: src/main.c:2663
 msgid "Force black and white display."
 msgstr ""
 
-#: src/main.c:2659
+#: src/main.c:2664
 msgid "Disable mouse support."
 msgstr ""
 
-#: src/main.c:2661
+#: src/main.c:2666
 msgid "Force the concurrent subshell mode"
 msgstr ""
 
-#: src/main.c:2662
+#: src/main.c:2667
 msgid "Disable the concurrent subshell mode."
 msgstr ""
 
-#: src/main.c:2663
+#: src/main.c:2668
 msgid "Force subshell execution."
 msgstr ""
 
-#: src/main.c:2665
+#: src/main.c:2670
 msgid "At exit, print the last working directory."
 msgstr ""
 
-#: src/main.c:2666
+#: src/main.c:2671
 msgid "Reset softkeys (HP terminals only) to their terminfo/termcap default."
 msgstr ""
 
-#: src/main.c:2667
+#: src/main.c:2672
 msgid "Disables verbose operation (for slow terminals)."
 msgstr ""
 
-#: src/main.c:2669
+#: src/main.c:2674
 msgid "Use simple symbols for line drawing."
 msgstr ""
 
-#: src/main.c:2674
+#: src/main.c:2679
 msgid "Activate support for the TERMCAP variable."
 msgstr ""
 
-#: src/main.c:2676
+#: src/main.c:2681
 msgid "Report versionand configuration options."
 msgstr ""
 
-#: src/main.c:2677
+#: src/main.c:2682
 msgid "Start up into the viewer mode."
 msgstr ""
 
-#: src/main.c:2678
+#: src/main.c:2683
 msgid "Force xterm mouse support and screen save/restore"
 msgstr ""
 
-#: src/main.c:2747
+#: src/main.c:2684
+msgid "Geometry for the window"
+msgstr ""
+
+#: src/main.c:2685
+msgid "No windows opened at startup"
+msgstr ""
+
+#: src/main.c:2762
 msgid "[this dir] [other dir]"
 msgstr ""
 
-#: src/main.c:2988
+#: src/main.c:3004
 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:3076
+#: src/main.c:3092
 msgid " Notice "
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3093
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -3139,7 +3145,7 @@ msgstr ""
 msgid "  %s bytes in %d file%s"
 msgstr ""
 
-#: gnome/gscreen.c:1201 src/screen.c:667
+#: gnome/gscreen.c:1200 src/screen.c:667
 msgid "<readlink failed>"
 msgstr ""
 
@@ -4047,83 +4053,83 @@ msgstr ""
 msgid "Rename/move.."
 msgstr ""
 
-#: gnome/gscreen.c:1009
+#: gnome/gscreen.c:1008
 msgid "All files"
 msgstr ""
 
-#: gnome/gscreen.c:1011
+#: gnome/gscreen.c:1010
 msgid "Archives and compressed files"
 msgstr ""
 
-#: gnome/gscreen.c:1013
+#: gnome/gscreen.c:1012
 msgid "RPM/DEB files"
 msgstr ""
 
-#: gnome/gscreen.c:1015
+#: gnome/gscreen.c:1014
 msgid "Text/Document files"
 msgstr ""
 
-#: gnome/gscreen.c:1017
+#: gnome/gscreen.c:1016
 msgid "HTML and SGML files"
 msgstr ""
 
-#: gnome/gscreen.c:1019
+#: gnome/gscreen.c:1018
 msgid "Postscript and PDF files"
 msgstr ""
 
-#: gnome/gscreen.c:1021
+#: gnome/gscreen.c:1020
 msgid "Spreadsheet files"
 msgstr ""
 
-#: gnome/gscreen.c:1023
+#: gnome/gscreen.c:1022
 msgid "Image files"
 msgstr ""
 
-#: gnome/gscreen.c:1026
+#: gnome/gscreen.c:1025
 msgid "Video/animation files"
 msgstr ""
 
-#: gnome/gscreen.c:1028
+#: gnome/gscreen.c:1027
 msgid "Audio files"
 msgstr ""
 
-#: gnome/gscreen.c:1030
+#: gnome/gscreen.c:1029
 msgid "C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1032
+#: gnome/gscreen.c:1031
 msgid "C++ program files"
 msgstr ""
 
-#: gnome/gscreen.c:1034
+#: gnome/gscreen.c:1033
 msgid "Objective-C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1036
+#: gnome/gscreen.c:1035
 msgid "Scheme program files"
 msgstr ""
 
-#: gnome/gscreen.c:1038
+#: gnome/gscreen.c:1037
 msgid "Assembler program files"
 msgstr ""
 
-#: gnome/gscreen.c:1040
+#: gnome/gscreen.c:1039
 msgid "Misc. program files"
 msgstr ""
 
-#: gnome/gscreen.c:1042
+#: gnome/gscreen.c:1041
 msgid "Font files"
 msgstr ""
 
-#: gnome/gscreen.c:1167
+#: gnome/gscreen.c:1166
 msgid "Search: "
 msgstr ""
 
-#: gnome/gscreen.c:1177
+#: gnome/gscreen.c:1176
 msgid " %s bytes in %d file%s"
 msgstr ""
 
-#: gnome/gscreen.c:1247
+#: gnome/gscreen.c:1246
 msgid "Filter"
 msgstr ""
 
diff --git a/src/main.c b/src/main.c
index a36208eab..e3e3ad660 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2553,7 +2553,8 @@ probably_finish_program (void)
 }
 
 enum {
-	GEOMETRY_KEY = -1
+	GEOMETRY_KEY = -1,
+	NOWIN_KEY    = -2
 };
 
 static int
@@ -2681,11 +2682,13 @@ static struct argp_option argp_options [] = {
     { "view", 		'v', NULL, 0, N_("Start up into the viewer mode."), 0 },
     { "xterm", 		'x', NULL, 0, N_("Force xterm mouse support and screen save/restore"), 0 },
     { "geometry",       GEOMETRY_KEY,  "GEOMETRY", 0, N_("Geometry for the window"), 0 },
+    { "nowindows",      NOWIN_KEY, NULL, 0, N_("No windows opened at startup"), 0 },
     { NULL, 		0,   NULL, 0, NULL },
 };
 
 GList *directory_list = 0;
 GList *geometry_list  = 0;
+int   nowindows;
 
 static error_t
 parse_an_arg (int key, char *arg, struct argp_state *state)
@@ -2729,6 +2732,9 @@ parse_an_arg (int key, char *arg, struct argp_state *state)
 	case GEOMETRY_KEY:
 	    geometry_list = g_list_append (geometry_list, arg);
 	    return 0;
+
+	case NOWIN_KEY:
+	    nowindows = 1;
 	    
 	case ARGP_KEY_ARG:
 	    break;