diff -ruN old/mc-4.5.6/Specfile new/mc-4.5.7/Specfile
--- old/mc-4.5.6/Specfile	Wed Jan  6 15:26:11 1999
+++ new/mc-4.5.7/Specfile	Tue Jan 12 22:38:06 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      4.5.6
+%define ver      4.5.7
 %define rel      1
 %define prefix   /usr
 
diff -ruN old/mc-4.5.6/VERSION new/mc-4.5.7/VERSION
--- old/mc-4.5.6/VERSION	Wed Jan  6 15:26:11 1999
+++ new/mc-4.5.7/VERSION	Tue Jan 12 22:38:06 1999
@@ -1 +1 @@
-#define VERSION "4.5.6"
+#define VERSION "4.5.7"
diff -ruN old/mc-4.5.6/acconfig.h new/mc-4.5.7/acconfig.h
--- old/mc-4.5.6/acconfig.h	Wed Jan  6 15:26:11 1999
+++ new/mc-4.5.7/acconfig.h	Tue Jan 12 22:38:06 1999
@@ -225,6 +225,19 @@
 #ifdef __os2__
 #    define OS2_NT 1
 #    define S_ISFIFO(x) 0
+
+#    define NEEDS_IO_H
+#    define NEEDS_DRIVE_H
+#    define NEEDS_FCNTL_H
+#    define HAS_NO_GRP_PWD_H
+#    define HAS_NO_TERMIOS_H
+#    define HAS_NO_SYS_PARAM_H
+#    define HAS_NO_SYS_IOCTL_H
+
+#    define USE_O_TEXT
+#    define HAS_ACS_AS_PCCHARS
+#    define HAS_DIRECT_COLOR_ACCESS
+#    define NEEDS_CR_LF_TRANSLATION
 #endif
 
 #ifdef _OS_NT
diff -ruN old/mc-4.5.6/aclocal.m4 new/mc-4.5.7/aclocal.m4
--- old/mc-4.5.6/aclocal.m4	Wed Jan  6 15:26:11 1999
+++ new/mc-4.5.7/aclocal.m4	Tue Jan 12 22:38:06 1999
@@ -1622,7 +1622,7 @@
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
       CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$LIBS $GLIB_LIBS"
+      LIBS="$GLIB_LIBS $LIBS"
 dnl
 dnl Now check if the installed GLIB is sufficiently new. (Also sanity
 dnl checks the results of glib-config to some extent
diff -ruN old/mc-4.5.6/config.h.in new/mc-4.5.7/config.h.in
--- old/mc-4.5.6/config.h.in	Wed Jan  6 15:26:11 1999
+++ new/mc-4.5.7/config.h.in	Tue Jan 12 22:38:06 1999
@@ -550,6 +550,19 @@
 #ifdef __os2__
 #    define OS2_NT 1
 #    define S_ISFIFO(x) 0
+
+#    define NEEDS_IO_H
+#    define NEEDS_DRIVE_H
+#    define NEEDS_FCNTL_H
+#    define HAS_NO_GRP_PWD_H
+#    define HAS_NO_TERMIOS_H
+#    define HAS_NO_SYS_PARAM_H
+#    define HAS_NO_SYS_IOCTL_H
+
+#    define USE_O_TEXT
+#    define HAS_ACS_AS_PCCHARS
+#    define HAS_DIRECT_COLOR_ACCESS
+#    define NEEDS_CR_LF_TRANSLATION
 #endif
 
 #ifdef _OS_NT
diff -ruN old/mc-4.5.6/configure new/mc-4.5.7/configure
--- old/mc-4.5.6/configure	Wed Jan  6 15:26:10 1999
+++ new/mc-4.5.7/configure	Tue Jan 12 22:38:06 1999
@@ -583,7 +583,7 @@
 
 
 PACKAGE=mc
-VERSION=4.5.6
+VERSION=4.5.7
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -3492,7 +3492,7 @@
       ac_save_CFLAGS="$CFLAGS"
       ac_save_LIBS="$LIBS"
       CFLAGS="$CFLAGS $GLIB_CFLAGS"
-      LIBS="$LIBS $GLIB_LIBS"
+      LIBS="$GLIB_LIBS $LIBS"
       rm -f conf.glibtest
       if test "$cross_compiling" = yes; then
   echo $ac_n "cross compiling; assumed OK... $ac_c"
@@ -4168,16 +4168,19 @@
 
 
 
+Let me check for an incompatible regcomp in HP-UX before making this
+the default
+
 REGEX_O="regex.o"
 
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:4176: checking for st_blksize in struct stat" >&5
+echo "configure:4179: checking for st_blksize in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4181 "configure"
+#line 4184 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4185,7 +4188,7 @@
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:4189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -4206,12 +4209,12 @@
 fi
 
 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:4210: checking for st_blocks in struct stat" >&5
+echo "configure:4213: checking for st_blocks in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4215 "configure"
+#line 4218 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4219,7 +4222,7 @@
 struct stat s; s.st_blocks;
 ; return 0; }
 EOF
-if { (eval echo configure:4223: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blocks=yes
 else
@@ -4242,12 +4245,12 @@
 fi
 
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:4246: checking for st_rdev in struct stat" >&5
+echo "configure:4249: checking for st_rdev in struct stat" >&5
 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4251 "configure"
+#line 4254 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4255,7 +4258,7 @@
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:4259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -4280,12 +4283,12 @@
 for ac_func in strerror statfs getwd strcasecmp strncasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4284: checking for $ac_func" >&5
+echo "configure:4287: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4289 "configure"
+#line 4292 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4308,7 +4311,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4335,12 +4338,12 @@
 for ac_func in strdup memmove pwdauth truncate initgroups putenv
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4339: checking for $ac_func" >&5
+echo "configure:4342: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4344 "configure"
+#line 4347 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4363,7 +4366,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4390,12 +4393,12 @@
 for ac_func in memset memcpy tcsetattr tcgetattr cfgetospeed
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4394: checking for $ac_func" >&5
+echo "configure:4397: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4399 "configure"
+#line 4402 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4418,7 +4421,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4445,12 +4448,12 @@
 for ac_func in sigaction sigemptyset sigprocmask sigaddset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4449: checking for $ac_func" >&5
+echo "configure:4452: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4454 "configure"
+#line 4457 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4473,7 +4476,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4500,12 +4503,12 @@
 for ac_func in sysconf
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4504: checking for $ac_func" >&5
+echo "configure:4507: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4509 "configure"
+#line 4512 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4528,7 +4531,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4556,7 +4559,7 @@
 SHADOWLIB=
 if test x$system = xLinux; then
 echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
-echo "configure:4560: checking for pw_encrypt in -lshadow" >&5
+echo "configure:4563: checking for pw_encrypt in -lshadow" >&5
 ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4564,7 +4567,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lshadow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4568 "configure"
+#line 4571 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4575,7 +4578,7 @@
 pw_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4596,17 +4599,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4600: checking for $ac_hdr" >&5
+echo "configure:4603: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4605 "configure"
+#line 4608 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4639,17 +4642,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4643: checking for $ac_hdr" >&5
+echo "configure:4646: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4648 "configure"
+#line 4651 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4656: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4697,7 +4700,7 @@
 NEED_CRYPT_PROTOTYPE=yes
 if test x$ac_cv_header_crypt_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4701 "configure"
+#line 4704 "configure"
 #include "confdefs.h"
 #include <crypt.h>
 int main() { return 0; }
@@ -4718,7 +4721,7 @@
 else 
     if test x$ac_cv_header_unistd_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4722 "configure"
+#line 4725 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -4749,17 +4752,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4753: checking for $ac_hdr" >&5
+echo "configure:4756: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4758 "configure"
+#line 4761 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4790,12 +4793,12 @@
 for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4794: checking for $ac_func" >&5
+echo "configure:4797: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4799 "configure"
+#line 4802 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4818,7 +4821,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4822: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4840,7 +4843,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:4844: checking for crypt in -lcrypt" >&5
+echo "configure:4847: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4848,7 +4851,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4852 "configure"
+#line 4855 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4859,7 +4862,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4879,7 +4882,7 @@
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for crypt in -lcrypt_i""... $ac_c" 1>&6
-echo "configure:4883: checking for crypt in -lcrypt_i" >&5
+echo "configure:4886: checking for crypt in -lcrypt_i" >&5
 ac_lib_var=`echo crypt_i'_'crypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4887,7 +4890,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt_i  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4891 "configure"
+#line 4894 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4898,7 +4901,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4928,12 +4931,12 @@
 for ac_func in grantpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4932: checking for $ac_func" >&5
+echo "configure:4935: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4937 "configure"
+#line 4940 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4956,7 +4959,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4984,7 +4987,7 @@
     :
 else
     echo $ac_n "checking for grantpt in -lpt""... $ac_c" 1>&6
-echo "configure:4988: checking for grantpt in -lpt" >&5
+echo "configure:4991: checking for grantpt in -lpt" >&5
 ac_lib_var=`echo pt'_'grantpt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4992,7 +4995,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4996 "configure"
+#line 4999 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5003,7 +5006,7 @@
 grantpt()
 ; return 0; }
 EOF
-if { (eval echo configure:5007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5034,7 +5037,7 @@
 
 if test x$GCC = xyes; then
     echo $ac_n "checking for tolower in -lintl""... $ac_c" 1>&6
-echo "configure:5038: checking for tolower in -lintl" >&5
+echo "configure:5041: checking for tolower in -lintl" >&5
 ac_lib_var=`echo intl'_'tolower | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5042,7 +5045,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5046 "configure"
+#line 5049 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5053,7 +5056,7 @@
 tolower()
 ; return 0; }
 EOF
-if { (eval echo configure:5057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5085,12 +5088,12 @@
 for ac_func in statlstat
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5089: checking for $ac_func" >&5
+echo "configure:5092: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5094 "configure"
+#line 5097 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5113,7 +5116,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5139,9 +5142,9 @@
 
 
 echo $ac_n "checking for AIX defines""... $ac_c" 1>&6
-echo "configure:5143: checking for AIX defines" >&5
+echo "configure:5146: checking for AIX defines" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5145 "configure"
+#line 5148 "configure"
 #include "confdefs.h"
 #if defined(AIX) || defined(_AIX) || defined(__aix__) || defined(aix)
 yes
@@ -5166,7 +5169,7 @@
 
 
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5170: checking for getmntent in -lgen" >&5
+echo "configure:5173: checking for getmntent in -lgen" >&5
 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5174,7 +5177,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5178 "configure"
+#line 5181 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5185,7 +5188,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5211,17 +5214,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5215: checking for $ac_hdr" >&5
+echo "configure:5218: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5220 "configure"
+#line 5223 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5251,17 +5254,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5255: checking for $ac_hdr" >&5
+echo "configure:5258: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5260 "configure"
+#line 5263 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5268: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5291,17 +5294,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5295: checking for $ac_hdr" >&5
+echo "configure:5298: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5300 "configure"
+#line 5303 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5308: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5330,12 +5333,12 @@
     for ac_func in getmntinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5334: checking for $ac_func" >&5
+echo "configure:5337: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5339 "configure"
+#line 5342 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5358,7 +5361,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5385,12 +5388,12 @@
 
         
     echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6
-echo "configure:5389: checking for d_ino member in directory struct" >&5
+echo "configure:5392: checking for d_ino member in directory struct" >&5
     if eval "test \"`echo '$''{'fu_cv_sys_d_ino_in_dirent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5394 "configure"
+#line 5397 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5413,7 +5416,7 @@
 struct dirent dp; dp.d_ino = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:5417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   fu_cv_sys_d_ino_in_dirent=yes
 else
@@ -5440,7 +5443,7 @@
     # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX).
     # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware.
 echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6
-echo "configure:5444: checking for getmntent in -lsun" >&5
+echo "configure:5447: checking for getmntent in -lsun" >&5
 ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5448,7 +5451,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5452 "configure"
+#line 5455 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5459,7 +5462,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5478,7 +5481,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
-echo "configure:5482: checking for getmntent in -lseq" >&5
+echo "configure:5485: checking for getmntent in -lseq" >&5
 ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5486,7 +5489,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5490 "configure"
+#line 5493 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5497,7 +5500,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5516,7 +5519,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5520: checking for getmntent in -lgen" >&5
+echo "configure:5523: checking for getmntent in -lgen" >&5
 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -5524,7 +5527,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5528 "configure"
+#line 5531 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5535,7 +5538,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5560,12 +5563,12 @@
 fi
 
 echo $ac_n "checking for getmntent""... $ac_c" 1>&6
-echo "configure:5564: checking for getmntent" >&5
+echo "configure:5567: checking for getmntent" >&5
 if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5569 "configure"
+#line 5572 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getmntent(); below.  */
@@ -5588,7 +5591,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_getmntent=yes"
 else
@@ -5619,12 +5622,12 @@
       if test -z "$list_mounted_fs"; then
 	# SVR4
 	echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6
-echo "configure:5623: checking for two-argument getmntent function" >&5
+echo "configure:5626: checking for two-argument getmntent function" >&5
 	if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent2'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5628 "configure"
+#line 5631 "configure"
 #include "confdefs.h"
 #include <sys/mnttab.h>
 EOF
@@ -5653,7 +5656,7 @@
       if test -z "$list_mounted_fs"; then
 	# 4.3BSD, SunOS, HP-UX, Dynix, Irix
 	echo $ac_n "checking for one-argument getmntent function""... $ac_c" 1>&6
-echo "configure:5657: checking for one-argument getmntent function" >&5
+echo "configure:5660: checking for one-argument getmntent function" >&5
 	if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5682,12 +5685,12 @@
     if test -z "$list_mounted_fs"; then
       # DEC Alpha running OSF/1.
       echo $ac_n "checking for getfsstat function""... $ac_c" 1>&6
-echo "configure:5686: checking for getfsstat function" >&5
+echo "configure:5689: checking for getfsstat function" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_getsstat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5691 "configure"
+#line 5694 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5698,7 +5701,7 @@
       numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); 
 ; return 0; }
 EOF
-if { (eval echo configure:5702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   fu_cv_sys_mounted_getsstat=yes
 else
@@ -5723,17 +5726,17 @@
     if test -z "$list_mounted_fs"; then
       # AIX.
       echo $ac_n "checking for mntctl function and struct vmount""... $ac_c" 1>&6
-echo "configure:5727: checking for mntctl function and struct vmount" >&5
+echo "configure:5730: checking for mntctl function and struct vmount" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_vmount'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5732 "configure"
+#line 5735 "configure"
 #include "confdefs.h"
 #include <fshelp.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5737: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5761,12 +5764,12 @@
     if test -z "$list_mounted_fs"; then
       # SVR3
       echo $ac_n "checking for existence of three headers""... $ac_c" 1>&6
-echo "configure:5765: checking for existence of three headers" >&5
+echo "configure:5768: checking for existence of three headers" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread_fstyp'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5770 "configure"
+#line 5773 "configure"
 #include "confdefs.h"
 
 #include <sys/statfs.h>
@@ -5774,7 +5777,7 @@
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5802,7 +5805,7 @@
     if test -z "$list_mounted_fs"; then
       # 4.4BSD and DEC OSF/1.
       echo $ac_n "checking for getmntinfo function""... $ac_c" 1>&6
-echo "configure:5806: checking for getmntinfo function" >&5
+echo "configure:5809: checking for getmntinfo function" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntinfo'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5810,7 +5813,7 @@
 	  ok=
 	  if test $ac_cv_func_getmntinfo = yes; then
 	    cat > conftest.$ac_ext <<EOF
-#line 5814 "configure"
+#line 5817 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 EOF
@@ -5843,19 +5846,19 @@
     if test -z "$list_mounted_fs"; then
       # Ultrix
       echo $ac_n "checking for getmnt function""... $ac_c" 1>&6
-echo "configure:5847: checking for getmnt function" >&5
+echo "configure:5850: checking for getmnt function" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmnt'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5852 "configure"
+#line 5855 "configure"
 #include "confdefs.h"
 
 #include <sys/fs_types.h>
 #include <sys/mount.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5859: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5862: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5883,17 +5886,17 @@
     if test -z "$list_mounted_fs"; then
       # SVR2
     echo $ac_n "checking whether it is possible to resort to fread on /etc/mnttab""... $ac_c" 1>&6
-echo "configure:5887: checking whether it is possible to resort to fread on /etc/mnttab" >&5
+echo "configure:5890: checking whether it is possible to resort to fread on /etc/mnttab" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5892 "configure"
+#line 5895 "configure"
 #include "confdefs.h"
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5927,7 +5930,7 @@
 
 
     echo "checking how to get filesystem space usage" 1>&6
-echo "configure:5931: checking how to get filesystem space usage" >&5
+echo "configure:5934: checking how to get filesystem space usage" >&5
     space=no
 
     # Here we'll compromise a little (and perform only the link test)
@@ -5937,12 +5940,12 @@
       for ac_func in statvfs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5941: checking for $ac_func" >&5
+echo "configure:5944: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 5946 "configure"
+#line 5949 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5965,7 +5968,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6001,7 +6004,7 @@
     if test $space = no; then
       # DEC Alpha running OSF/1
       echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
-echo "configure:6005: checking for 3-argument statfs function (DEC OSF/1)" >&5
+echo "configure:6008: checking for 3-argument statfs function (DEC OSF/1)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6009,7 +6012,7 @@
   fu_cv_sys_stat_statfs3_osf1=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6013 "configure"
+#line 6016 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -6022,7 +6025,7 @@
 	exit (statfs (".", &fsd, sizeof (struct statfs)));
       }
 EOF
-if { (eval echo configure:6026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs3_osf1=yes
 else
@@ -6049,7 +6052,7 @@
     if test $space = no; then
     # AIX
       echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
-echo "configure:6053: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+echo "configure:6056: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6057,7 +6060,7 @@
   fu_cv_sys_stat_statfs2_bsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6061 "configure"
+#line 6064 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_PARAM_H
@@ -6076,7 +6079,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6080: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_bsize=yes
 else
@@ -6103,7 +6106,7 @@
     if test $space = no; then
     # SVR3
       echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
-echo "configure:6107: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+echo "configure:6110: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6111,7 +6114,7 @@
   fu_cv_sys_stat_statfs4=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6115 "configure"
+#line 6118 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statfs.h>
@@ -6121,7 +6124,7 @@
       exit (statfs (".", &fsd, sizeof fsd, 0));
       }
 EOF
-if { (eval echo configure:6125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6128: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs4=yes
 else
@@ -6148,7 +6151,7 @@
     if test $space = no; then
     # 4.4BSD and NetBSD
       echo $ac_n "checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)""... $ac_c" 1>&6
-echo "configure:6152: checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)" >&5
+echo "configure:6155: checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6156,7 +6159,7 @@
   fu_cv_sys_stat_statfs2_fsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6160 "configure"
+#line 6163 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -6172,7 +6175,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_fsize=yes
 else
@@ -6199,7 +6202,7 @@
     if test $space = no; then
       # Ultrix
       echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
-echo "configure:6203: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+echo "configure:6206: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
       if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6207,7 +6210,7 @@
   fu_cv_sys_stat_fs_data=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6211 "configure"
+#line 6214 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6228,7 +6231,7 @@
       exit (statfs (".", &fsd) != 1);
       }
 EOF
-if { (eval echo configure:6232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_fs_data=yes
 else
@@ -6256,12 +6259,12 @@
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6260: checking for mode_t" >&5
+echo "configure:6263: checking for mode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6265 "configure"
+#line 6268 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6289,12 +6292,12 @@
 fi
 
 echo $ac_n "checking for umode_t""... $ac_c" 1>&6
-echo "configure:6293: checking for umode_t" >&5
+echo "configure:6296: checking for umode_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_umode_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6298 "configure"
+#line 6301 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6322,12 +6325,12 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6326: checking for off_t" >&5
+echo "configure:6329: checking for off_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6331 "configure"
+#line 6334 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6355,12 +6358,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6359: checking for pid_t" >&5
+echo "configure:6362: checking for pid_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6364 "configure"
+#line 6367 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6388,12 +6391,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6392: checking for uid_t in sys/types.h" >&5
+echo "configure:6395: checking for uid_t in sys/types.h" >&5
 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6397 "configure"
+#line 6400 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -6422,12 +6425,12 @@
 fi
 
 echo $ac_n "checking for nlink_t""... $ac_c" 1>&6
-echo "configure:6426: checking for nlink_t" >&5
+echo "configure:6429: checking for nlink_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_nlink_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6431 "configure"
+#line 6434 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6459,17 +6462,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6463: checking for $ac_hdr" >&5
+echo "configure:6466: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6468 "configure"
+#line 6471 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6476: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6498,12 +6501,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6502: checking for $ac_func" >&5
+echo "configure:6505: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6507 "configure"
+#line 6510 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6526,7 +6529,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6551,7 +6554,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6555: checking for working mmap" >&5
+echo "configure:6558: checking for working mmap" >&5
 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6559,7 +6562,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6563 "configure"
+#line 6566 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6699,7 +6702,7 @@
 }
 
 EOF
-if { (eval echo configure:6703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6724,19 +6727,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:6728: checking for working alloca.h" >&5
+echo "configure:6731: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6733 "configure"
+#line 6736 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:6740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -6757,12 +6760,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6761: checking for alloca" >&5
+echo "configure:6764: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6766 "configure"
+#line 6769 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -6785,7 +6788,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:6789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -6817,12 +6820,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6821: checking whether alloca needs Cray hooks" >&5
+echo "configure:6824: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6826 "configure"
+#line 6829 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6847,12 +6850,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6851: checking for $ac_func" >&5
+echo "configure:6854: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 6856 "configure"
+#line 6859 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6875,7 +6878,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6902,7 +6905,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:6906: checking stack direction for C alloca" >&5
+echo "configure:6909: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -6910,7 +6913,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 6914 "configure"
+#line 6917 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -6929,7 +6932,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:6933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -6957,7 +6960,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:6961: checking for X" >&5
+echo "configure:6964: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -7019,12 +7022,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 7023 "configure"
+#line 7026 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7093,14 +7096,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7097 "configure"
+#line 7100 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:7104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -7206,17 +7209,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:7210: checking whether -R must be followed by a space" >&5
+echo "configure:7213: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 7213 "configure"
+#line 7216 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -7232,14 +7235,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 7236 "configure"
+#line 7239 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7246: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -7271,7 +7274,7 @@
     # libraries were built with DECnet support.  And karl@cs.umb.edu says
     # the Alpha needs dnet_stub (dnet does not exist).
     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:7275: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7278: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7279,7 +7282,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7283 "configure"
+#line 7286 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7290,7 +7293,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7294: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7312,7 +7315,7 @@
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:7316: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7319: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7320,7 +7323,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7324 "configure"
+#line 7327 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7331,7 +7334,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7360,12 +7363,12 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:7364: checking for gethostbyname" >&5
+echo "configure:7367: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7369 "configure"
+#line 7372 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -7388,7 +7391,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -7409,7 +7412,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7413: checking for gethostbyname in -lnsl" >&5
+echo "configure:7416: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7417,7 +7420,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7421 "configure"
+#line 7424 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7428,7 +7431,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7458,12 +7461,12 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:7462: checking for connect" >&5
+echo "configure:7465: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7467 "configure"
+#line 7470 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -7486,7 +7489,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -7507,7 +7510,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7511: checking for connect in -lsocket" >&5
+echo "configure:7514: checking for connect in -lsocket" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7515,7 +7518,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7519 "configure"
+#line 7522 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7526,7 +7529,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:7530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7550,12 +7553,12 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:7554: checking for remove" >&5
+echo "configure:7557: checking for remove" >&5
 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7559 "configure"
+#line 7562 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -7578,7 +7581,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -7599,7 +7602,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7603: checking for remove in -lposix" >&5
+echo "configure:7606: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7607,7 +7610,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7611 "configure"
+#line 7614 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7618,7 +7621,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:7622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7642,12 +7645,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7646: checking for shmat" >&5
+echo "configure:7649: checking for shmat" >&5
 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7651 "configure"
+#line 7654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -7670,7 +7673,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -7691,7 +7694,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7695: checking for shmat in -lipc" >&5
+echo "configure:7698: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7699,7 +7702,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7703 "configure"
+#line 7706 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7710,7 +7713,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:7714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7743,7 +7746,7 @@
   # libraries we check for below, so use a different variable.
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:7747: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7750: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7751,7 +7754,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7755 "configure"
+#line 7758 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7762,7 +7765,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:7766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7789,7 +7792,7 @@
 
 
 echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:7793: checking for t_accept in -lnsl" >&5
+echo "configure:7796: checking for t_accept in -lnsl" >&5
 ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7797,7 +7800,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7801 "configure"
+#line 7804 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7808,7 +7811,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7836,7 +7839,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:7840: checking for socket in -lsocket" >&5
+echo "configure:7843: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7844,7 +7847,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7848 "configure"
+#line 7851 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7855,7 +7858,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7887,12 +7890,12 @@
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7891: checking for $ac_func" >&5
+echo "configure:7894: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 7896 "configure"
+#line 7899 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7915,7 +7918,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7943,7 +7946,7 @@
   # socket is not in the default libraries.  See if it's in some other.
   for lib in bsd socket inet; do
     echo $ac_n "checking for socket in -l$lib""... $ac_c" 1>&6
-echo "configure:7947: checking for socket in -l$lib" >&5
+echo "configure:7950: checking for socket in -l$lib" >&5
 ac_lib_var=`echo $lib'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -7951,7 +7954,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7955 "configure"
+#line 7958 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -7962,7 +7965,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7994,12 +7997,12 @@
 
 have_gethostbyname=no
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:7998: checking for gethostbyname" >&5
+echo "configure:8001: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8003 "configure"
+#line 8006 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8022,7 +8025,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8026: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8045,7 +8048,7 @@
   # gethostbyname is not in the default libraries.  See if it's in some other.
   for lib in bsd socket inet; do
     echo $ac_n "checking for gethostbyname in -l$lib""... $ac_c" 1>&6
-echo "configure:8049: checking for gethostbyname in -l$lib" >&5
+echo "configure:8052: checking for gethostbyname in -l$lib" >&5
 ac_lib_var=`echo $lib'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8053,7 +8056,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8057 "configure"
+#line 8060 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8064,7 +8067,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8090,12 +8093,12 @@
 for ac_func in socketpair
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8094: checking for $ac_func" >&5
+echo "configure:8097: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8099 "configure"
+#line 8102 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8118,7 +8121,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8144,7 +8147,7 @@
 
 
 echo $ac_n "checking for get_process_stats in -lseq""... $ac_c" 1>&6
-echo "configure:8148: checking for get_process_stats in -lseq" >&5
+echo "configure:8151: checking for get_process_stats in -lseq" >&5
 ac_lib_var=`echo seq'_'get_process_stats | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8152,7 +8155,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8156 "configure"
+#line 8159 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8163,7 +8166,7 @@
 get_process_stats()
 ; return 0; }
 EOF
-if { (eval echo configure:8167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8191,7 +8194,7 @@
 
 
     echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:8195: checking for t_accept in -lnsl" >&5
+echo "configure:8198: checking for t_accept in -lnsl" >&5
 ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8199,7 +8202,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8203 "configure"
+#line 8206 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8210,7 +8213,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:8214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8238,7 +8241,7 @@
 fi
 
   echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8242: checking for socket in -lsocket" >&5
+echo "configure:8245: checking for socket in -lsocket" >&5
 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8246,7 +8249,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8250 "configure"
+#line 8253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8257,7 +8260,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8289,12 +8292,12 @@
   for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8293: checking for $ac_func" >&5
+echo "configure:8296: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8298 "configure"
+#line 8301 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8317,7 +8320,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8345,7 +8348,7 @@
     # socket is not in the default libraries.  See if it's in some other.
     for lib in bsd socket inet; do
       echo $ac_n "checking for socket in -l$lib""... $ac_c" 1>&6
-echo "configure:8349: checking for socket in -l$lib" >&5
+echo "configure:8352: checking for socket in -l$lib" >&5
 ac_lib_var=`echo $lib'_'socket | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8353,7 +8356,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8357 "configure"
+#line 8360 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8364,7 +8367,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8396,12 +8399,12 @@
 
   have_gethostbyname=no
   echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8400: checking for gethostbyname" >&5
+echo "configure:8403: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8405 "configure"
+#line 8408 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8424,7 +8427,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8447,7 +8450,7 @@
     # gethostbyname is not in the default libraries.  See if it's in some other.
     for lib in bsd socket inet; do
       echo $ac_n "checking for gethostbyname in -l$lib""... $ac_c" 1>&6
-echo "configure:8451: checking for gethostbyname in -l$lib" >&5
+echo "configure:8454: checking for gethostbyname in -l$lib" >&5
 ac_lib_var=`echo $lib'_'gethostbyname | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8455,7 +8458,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8459 "configure"
+#line 8462 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8466,7 +8469,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8496,14 +8499,14 @@
       
 av_struct_linger=no
 echo $ac_n "checking struct linger is available""... $ac_c" 1>&6
-echo "configure:8500: checking struct linger is available" >&5
+echo "configure:8503: checking struct linger is available" >&5
 if test "$cross_compiling" = yes; then
   
 av_struct_linger=no
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8507 "configure"
+#line 8510 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8519,7 +8522,7 @@
 }
 
 EOF
-if { (eval echo configure:8523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
 then
   
 cat >> confdefs.h <<\EOF
@@ -8544,12 +8547,12 @@
       for ac_func in pmap_set
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8548: checking for $ac_func" >&5
+echo "configure:8551: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8553 "configure"
+#line 8556 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8572,7 +8575,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8594,7 +8597,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pmap_set in -lrpc""... $ac_c" 1>&6
-echo "configure:8598: checking for pmap_set in -lrpc" >&5
+echo "configure:8601: checking for pmap_set in -lrpc" >&5
 ac_lib_var=`echo rpc'_'pmap_set | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8602,7 +8605,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrpc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8606 "configure"
+#line 8609 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8613,7 +8616,7 @@
 pmap_set()
 ; return 0; }
 EOF
-if { (eval echo configure:8617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8645,12 +8648,12 @@
       for ac_func in pmap_getport pmap_getmaps rresvport
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8649: checking for $ac_func" >&5
+echo "configure:8652: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8654 "configure"
+#line 8657 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8673,7 +8676,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8701,17 +8704,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8705: checking for $ac_hdr" >&5
+echo "configure:8708: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 8710 "configure"
+#line 8713 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8930,7 +8933,7 @@
 else
   
 	echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6
-echo "configure:8934: checking for Gpm_Repeat in -lgpm" >&5
+echo "configure:8937: checking for Gpm_Repeat in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Repeat | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -8938,7 +8941,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8942 "configure"
+#line 8945 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8949,7 +8952,7 @@
 Gpm_Repeat()
 ; return 0; }
 EOF
-if { (eval echo configure:8953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9088,7 +9091,7 @@
 	    # Extract the first word of "gnome-config", so it can be a program name with args.
 set dummy gnome-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9092: checking for $ac_word" >&5
+echo "configure:9095: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GNOME_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9121,7 +9124,7 @@
 	      no_gnome_config="yes"
 	    else
 	      echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
-echo "configure:9125: checking if $GNOME_CONFIG works" >&5
+echo "configure:9128: checking if $GNOME_CONFIG works" >&5
 	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
 	        echo "$ac_t""yes" 1>&6
 	        
@@ -9129,7 +9132,7 @@
 	# Extract the first word of "orbit-config", so it can be a program name with args.
 set dummy orbit-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9133: checking for $ac_word" >&5
+echo "configure:9136: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9161,7 +9164,7 @@
 	# Extract the first word of "orbit-idl", so it can be a program name with args.
 set dummy orbit-idl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9165: checking for $ac_word" >&5
+echo "configure:9168: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_IDL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9191,7 +9194,7 @@
 fi
 
 	echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6
-echo "configure:9195: checking for working ORBit environment" >&5
+echo "configure:9198: checking for working ORBit environment" >&5
 if eval "test \"`echo '$''{'gnome_cv_orbit_found'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9227,7 +9230,7 @@
 	fi
 
 	echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6
-echo "configure:9231: checking for gnorba libraries" >&5
+echo "configure:9234: checking for gnorba libraries" >&5
 if eval "test \"`echo '$''{'gnome_cv_gnorba_found'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9301,7 +9304,7 @@
 	
 	    if test "$no_gnome_config" = "yes"; then
               echo $ac_n "checking for gnomeConf.sh file in $gnome_prefix""... $ac_c" 1>&6
-echo "configure:9305: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo "configure:9308: checking for gnomeConf.sh file in $gnome_prefix" >&5
 	      if test -f $gnome_prefix/gnomeConf.sh; then
 	        echo "$ac_t""found" 1>&6
 	        echo "loading gnome configuration from" \
@@ -9335,7 +9338,7 @@
 # Extract the first word of "nroff", so it can be a program name with args.
 set dummy nroff; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9339: checking for $ac_word" >&5
+echo "configure:9342: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_nroff'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9363,7 +9366,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6
-echo "configure:9367: checking for manual formatting macros" >&5
+echo "configure:9370: checking for manual formatting macros" >&5
     if eval "test \"`echo '$''{'ac_cv_mandoc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9387,7 +9390,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6
-echo "configure:9391: checking If nroff accepts -Tascii" >&5
+echo "configure:9394: checking If nroff accepts -Tascii" >&5
     if eval "test \"`echo '$''{'ac_cv_nroff_tascii'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9411,7 +9414,7 @@
 # Extract the first word of "file", so it can be a program name with args.
 set dummy file; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:9415: checking for $ac_word" >&5
+echo "configure:9418: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HAVE_FILECMD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9439,7 +9442,7 @@
 
 if $HAVE_FILECMD; then
     echo $ac_n "checking for - option to file command""... $ac_c" 1>&6
-echo "configure:9443: checking for - option to file command" >&5
+echo "configure:9446: checking for - option to file command" >&5
     if eval "test \"`echo '$''{'ac_cv_filestdin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9482,7 +9485,7 @@
 
             
 echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6
-echo "configure:9486: checking for -L option to file command" >&5
+echo "configure:9489: checking for -L option to file command" >&5
 if eval "test \"`echo '$''{'ac_cv_filel'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9508,7 +9511,7 @@
 fi 
 
 echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6
-echo "configure:9512: checking for - option to grep command" >&5
+echo "configure:9515: checking for - option to grep command" >&5
 if eval "test \"`echo '$''{'ac_cv_grep_stdin'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -9548,7 +9551,7 @@
 
 
 echo $ac_n "checking for subshell support""... $ac_c" 1>&6
-echo "configure:9552: checking for subshell support" >&5
+echo "configure:9555: checking for subshell support" >&5
 # Check whether --with-subshell or --without-subshell was given.
 if test "${with_subshell+set}" = set; then
   withval="$with_subshell"
@@ -9690,7 +9693,7 @@
 slang_term=""
 slang_use_system_installed_lib=false
 echo $ac_n "checking for SLang_init_tty in -lslang""... $ac_c" 1>&6
-echo "configure:9694: checking for SLang_init_tty in -lslang" >&5
+echo "configure:9697: checking for SLang_init_tty in -lslang" >&5
 ac_lib_var=`echo slang'_'SLang_init_tty | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9698,7 +9701,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9702 "configure"
+#line 9705 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9709,7 +9712,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:9713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9728,17 +9731,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9732: checking for $ac_hdr" >&5
+echo "configure:9735: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9737 "configure"
+#line 9740 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9773,17 +9776,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9777: checking for $ac_hdr" >&5
+echo "configure:9780: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 9782 "configure"
+#line 9785 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9787: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9853,7 +9856,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:9857: checking for tgoto in -ltermcap" >&5
+echo "configure:9860: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9861,7 +9864,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9865 "configure"
+#line 9868 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9872,7 +9875,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:9876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9979,7 +9982,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:9983: checking for tgoto in -ltermcap" >&5
+echo "configure:9986: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -9987,7 +9990,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9991 "configure"
+#line 9994 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9998,7 +10001,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10173,17 +10176,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10177: checking for $ac_hdr" >&5
+echo "configure:10180: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10182 "configure"
+#line 10185 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10187: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10236,7 +10239,7 @@
 	fi
 else
   	echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6
-echo "configure:10240: checking for ext2fs_close in -lext2fs" >&5
+echo "configure:10243: checking for ext2fs_close in -lext2fs" >&5
 ac_lib_var=`echo ext2fs'_'ext2fs_close | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10244,7 +10247,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lext2fs -lcom_err $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10248 "configure"
+#line 10251 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10255,7 +10258,7 @@
 ext2fs_close()
 ; return 0; }
 EOF
-if { (eval echo configure:10259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10276,17 +10279,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10280: checking for $ac_hdr" >&5
+echo "configure:10283: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10285 "configure"
+#line 10288 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10351,7 +10354,7 @@
 if $search_ncurses
 then
     echo "checking "location of ncurses.h file"" 1>&6
-echo "configure:10355: checking "location of ncurses.h file"" >&5
+echo "configure:10358: checking "location of ncurses.h file"" >&5
 
     
     if $search_ncurses
@@ -10491,7 +10494,7 @@
                 if $search_ncurses 
     then
         cat > conftest.$ac_ext <<EOF
-#line 10495 "configure"
+#line 10498 "configure"
 #include "confdefs.h"
 #include </usr/include/curses.h>
 EOF
@@ -10517,7 +10520,7 @@
 rm -f conftest*
 
 	cat > conftest.$ac_ext <<EOF
-#line 10521 "configure"
+#line 10524 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -10577,10 +10580,10 @@
     else
         # check for ncurses version, to properly ifdef mouse-fix
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10581: checking for ncurses version" >&5
+echo "configure:10584: checking for ncurses version" >&5
 	ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 10584 "configure"
+#line 10587 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>
@@ -10621,12 +10624,12 @@
 for ac_func in resizeterm keyok
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10625: checking for $ac_func" >&5
+echo "configure:10628: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 10630 "configure"
+#line 10633 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10649,7 +10652,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10732,7 +10735,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10736: checking for tgoto in -ltermcap" >&5
+echo "configure:10739: checking for tgoto in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgoto | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10740,7 +10743,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10744 "configure"
+#line 10747 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10751,7 +10754,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10791,7 +10794,7 @@
     install_saver="yes"
 
                 echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:10795: checking for pam_start in -lpam" >&5
+echo "configure:10798: checking for pam_start in -lpam" >&5
 ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10799,7 +10802,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpam -ldl $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10803 "configure"
+#line 10806 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10810,7 +10813,7 @@
 pam_start()
 ; return 0; }
 EOF
-if { (eval echo configure:10814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10853,7 +10856,7 @@
 else
     
 echo $ac_n "checking for -lXpm""... $ac_c" 1>&6
-echo "configure:10857: checking for -lXpm" >&5
+echo "configure:10860: checking for -lXpm" >&5
 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10869,7 +10872,7 @@
 	has_xpm_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 10873 "configure"
+#line 10876 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -10879,7 +10882,7 @@
 XpmLibraryVersion();
 ; return 0; }
 EOF
-if { (eval echo configure:10883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_has_xpm=yes
 else
@@ -10901,7 +10904,7 @@
 	
 	
 echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6
-echo "configure:10905: checking for X11 non-rectangular shape extension" >&5
+echo "configure:10908: checking for X11 non-rectangular shape extension" >&5
 if eval "test \"`echo '$''{'ac_cv_has_shape'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -10917,7 +10920,7 @@
 	has_shape_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 10921 "configure"
+#line 10924 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -10932,7 +10935,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_has_shape=yes
 else
@@ -10968,7 +10971,7 @@
 			echo
 		else
 		echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6
-echo "configure:10972: checking for setupterm in -lcurses" >&5
+echo "configure:10975: checking for setupterm in -lcurses" >&5
 ac_lib_var=`echo curses'_'setupterm | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -10976,7 +10979,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10980 "configure"
+#line 10983 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10987,7 +10990,7 @@
 setupterm()
 ; return 0; }
 EOF
-if { (eval echo configure:10991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:10994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11004,7 +11007,7 @@
   echo "$ac_t""yes" 1>&6
   
 			cat > conftest.$ac_ext <<EOF
-#line 11008 "configure"
+#line 11011 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -11017,7 +11020,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11024: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			LIBS="$LIBS -lcurses"
diff -ruN old/mc-4.5.6/configure.in new/mc-4.5.7/configure.in
--- old/mc-4.5.6/configure.in	Wed Jan  6 15:26:10 1999
+++ new/mc-4.5.7/configure.in	Tue Jan 12 22:38:06 1999
@@ -5,7 +5,7 @@
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.6
+VERSION=4.5.7
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
@@ -144,22 +144,14 @@
     echo '/* NeXTStep malloc.h stub */' > $srcdir/malloc.h
 fi
 
-dnl (rx.h)
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 AC_SHORT_D_NAME_LEN
 AC_HEADER_STDC
 
-dnl
-dnl Let me check for an incompatible regcomp in HP-UX before making this
-dnl the default
-dnl
-dnl if test x$ac_cv_header_rx_h = xyes; then
-dnl AC_CHECK_FUNCS(regcomp)
-dnl if test x$ac_cv_func_regcomp = xyes; then
-dnl     REGEX_O=""
-dnl fi
-dnl fi
+
+Let me check for an incompatible regcomp in HP-UX before making this
+the default
 
 REGEX_O="regex.o"
 AC_SUBST(REGEX_O)
diff -ruN old/mc-4.5.6/gnome/ChangeLog new/mc-4.5.7/gnome/ChangeLog
--- old/mc-4.5.6/gnome/ChangeLog	Wed Jan  6 15:26:20 1999
+++ new/mc-4.5.7/gnome/ChangeLog	Tue Jan 12 22:38:07 1999
@@ -1,3 +1,96 @@
+1999-01-12  Jonathan Blandford  <jrb@redhat.com>
+
+	* gcmd.c (gnome_open_files): now you can open multiple files.
+	* glayout.c: layout changed some.  moved run command.
+	commented out ftplink/mkdir command for now.  gonna do mkdir
+	next.  Why is the ftplink command needed?
+
+1999-01-12  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* glayout.c (run_cmd): Add run command.  Add back FTP link
+	command.  Add Mkdir command.  Use standard key definitions.
+
+	* gview.c: Use new standard keybindings
+	
+	* gtkdtree.c: Now it uses the treestore code.
+
+	* treestore.c: New file format which includes the scan status of
+	the directories.
+
+	* treestore.c: Provide _opendir, _readdir, _closedir operations
+	for the tree cache.
+
+	Next step: load/save the tree_entry->scanned flag (without this,
+	you wont notice a big speedup).
+
+1999-01-10  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gutil.c (my_system_get_child_pid): Acknowledge new EXECUTE_WAIT
+	flag.  This is required by the vfs code.
+
+1999-01-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gscreen.c (panel_create_file_list, panel_create_icon_display):
+	I got excited adding the gtk_drag_source_set.  I generate those
+	events myself, no need to put them here.
+
+1999-01-04  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gwidget.c (stock_from_text): Return this value.
+
+1999-01-08  Jonathan Blandford  <jrb@redhat.com>
+
+	* glayout.c: now open the new (non-functional) dialog box.  If you
+	want functionality, I suppose you could put the old one back in.
+	I'll work on it more this weekend, though, so hopefully it can get
+	back to the old state relatively quickly.
+	* gprefs.c (gnome_configure_box): New function, new file, first
+	start at unified properties box.
+
+1999-01-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gscreen.c (panel_icon_list_select_icon): Remove debugging message.
+
+	* glayout.c: Add a create directory option.
+	
+1999-01-07  Jonathan Blandford  <jrb@redhat.com>
+
+	* gcmd.c (gnome_filter_cmd): now it works!  It's even sorta
+	useful.  I'm so psyched... (:
+	
+
+1999-01-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gscreen.c (panel_icon_list_drag_data_received): Do not update
+	contents if nothing was done (ie, the drop was cancelled).
+	(panel_create_file_list): Duh.  Restore this, as, ahem, we dont
+	have banding selection on CList.
+	(panel_icon_list_select_icon): Open the new panel only on button
+	release.
+	(panel_file_list_select_row): New panel started on clist when you
+	press middle button.
+
+	(panel_create_file_list): Ahaha!  I found that CList now has a
+	gtk_clist_set_buttion_actions.  Go figure why we need this and why
+	it was implemented, but now buttons work as they should on clist.
+
+	* gdnd.c (gdnd_drop_on_directory): Do nothing if the files dragged
+	are on the same directory we are.
+
+1999-01-07  Jonathan Blandford  <jrb@redhat.com>
+
+	* gcmd.c (gnome_filter_cmd): Function filled in now.  Actually
+	works (amazing!.)  Next: put a history on it, and maybe an event
+	box for the label.
+
+	* glayout.c: use the function below.
+
+	* gcmd.c (gnome_filter_cmd): New function (or a sorry excuse for
+	one, anyway...)
+
+	* gscreen.c (x_create_panel): now uses gnome-appbar instead of the
+	old, psuedo status bar.
+
 1999-01-06  Jonathan Blandford  <jrb@redhat.com>
 
 	* gcmd.c (gnome_external_panelize): Now it works.  Just need to save
diff -ruN old/mc-4.5.6/gnome/Makefile.in new/mc-4.5.7/gnome/Makefile.in
--- old/mc-4.5.6/gnome/Makefile.in	Wed Jan  6 15:26:20 1999
+++ new/mc-4.5.7/gnome/Makefile.in	Tue Jan 12 22:38:07 1999
@@ -48,6 +48,7 @@
 	gmetadata.c	\
 	gpageprop.c	\
 	gpopup.c	\
+	gprefs.c	\
 	gprop.c		\
 	gdialogs.c	\
 	gscreen.c 	\
@@ -56,8 +57,7 @@
 	gtree.c		\
 	gutil.c		\
 	gview.c		\
-	gwidget.c	\
-	temp-hack.c
+	gwidget.c
 
 GNOMEHDRS = 		\
 	gblist.h	\
@@ -75,8 +75,8 @@
 	gmetadata.h	\
 	gpageprop.h	\
 	gpopup.h	\
+	gprefs.h	\
 	gprop.h		\
-	gdialogs.h	\
 	gscreen.h	\
 	gtkdtree.h	\
 	gtree.h		\
@@ -103,13 +103,13 @@
 #
 # These objects from ../src do depend on HAVE_GNOME
 #
-OOBJS = dlg.o screen.o widget.o wtools.o info.o boxes.o \
-	file.o find.o dialog.o key.o chmod.o chown.o view.o \
-	panelize.o hotlist.o background.o dir.o util.o \
-	win.o color.o profile.o user.o ext.o setup.o \
-	subshell.o terms.o achown.o fsusage.o mountlist.o \
-	@XCURSES@ @REGEX_O@ complete.o command.o \
-	option.o cmd.o utilunix.o xslint.o gdialogs.o filenot.o 
+OOBJS = dlg.o screen.o widget.o wtools.o info.o boxes.o 	\
+	file.o find.o dialog.o key.o chmod.o chown.o view.o 	\
+	panelize.o hotlist.o background.o dir.o util.o 		\
+	win.o color.o profile.o user.o ext.o setup.o 		\
+	subshell.o terms.o achown.o fsusage.o mountlist.o 	\
+	@XCURSES@ @REGEX_O@ complete.o command.o 		\
+	option.o cmd.o utilunix.o xslint.o gdialogs.o filenot.o treestore.o
 
 CORBAOBJS = 			\
 	main-corba.o		\
@@ -139,6 +139,7 @@
 	gmetadata.o	\
 	gpageprop.o	\
 	gpopup.o	\
+	gprefs.o	\
 	gprop.o		\
 	gscreen.o 	\
 	gtools.o 	\
@@ -190,10 +191,10 @@
 	touch mx
 
 gmc: @LIBVFS@ $(OBJS) $(NORMALOBJS) @LIBSLANG@ libgtkedit.a
-	$(CC) $(LDFLAGS) -o gmc $(NORMALOBJS) $(OBJS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
+	$(CC) -o gmc $(NORMALOBJS) $(OBJS) $(LDFLAGS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
 
 corba-gmc: @LIBVFS@ $(OBJS) $(CORBAOBJS) @LIBSLANG@ libgtkedit.a
-	$(CC) $(CORBA_LDFLAGS) -o corba-gmc $(CORBAOBJS) $(OBJS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
+	$(CC) -o corba-gmc $(CORBAOBJS) $(OBJS) $(CORBA_LDFLAGS) -L../vfs -L../slang -L../gtkedit $(EXTRALIBS) $(LIBS) 
 
 mc.keys: mc.keys.in Makefile
 	sed -e 's^\@icondir\@^$(icondir)^g' < mc.keys.in > mc.keys.tmp \
diff -ruN old/mc-4.5.6/gnome/gcmd.c new/mc-4.5.7/gnome/gcmd.c
--- old/mc-4.5.6/gnome/gcmd.c	Wed Jan  6 15:26:20 1999
+++ new/mc-4.5.7/gnome/gcmd.c	Tue Jan 12 22:38:07 1999
@@ -200,7 +200,7 @@
         GtkWidget *menu;
         GtkWidget *menu_item;
 	GtkWidget *cbox1, *cbox2;
-	sortfn *sfn;
+	sortfn *sfn = NULL;
 
 	sort_box = gnome_dialog_new (_("Sort By"), GNOME_STOCK_BUTTON_OK, 
 				     GNOME_STOCK_BUTTON_CANCEL, NULL);
@@ -541,3 +541,108 @@
 	paint_panel (panel);
 	do_refresh ();
 }
+void
+gnome_filter_cmd (GtkWidget *widget, WPanel *panel)
+{
+	GtkWidget *filter_dlg;
+	GtkWidget *entry;
+	GtkWidget *label;
+	gchar *text1, *text2, *text3;
+	GList *list;
+
+	filter_dlg = gnome_dialog_new (_("Set Filter"), GNOME_STOCK_BUTTON_OK, 
+				       GNOME_STOCK_BUTTON_CANCEL, NULL);
+	if (easy_patterns) {
+		text1 = "mc_filter_globs";
+		text3 = _("Show all files");
+		if (panel->filter && (strcmp (panel->filter, "*")))
+			text2 = panel->filter;
+		else
+			text2 = NULL;
+	} else {
+		text1 = ("mc_filter_regexps");
+		text3 = _(".");
+		if (!panel->filter)
+			text2 = NULL;
+		else
+			text2 = panel->filter;
+	}
+	entry = gnome_entry_new (text1);
+	gnome_entry_load_history (GNOME_ENTRY (entry));
+	
+	if (text2) {
+		gtk_entry_set_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (entry))), text2);
+		gnome_entry_prepend_history (GNOME_ENTRY (entry), FALSE, text3);
+	} else
+		gtk_entry_set_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (entry))), text3);
+
+	if (easy_patterns)
+		label = gtk_label_new (_("Enter a filter here for files in the panel view.\n\nFor example:\n*.gif will show just gif images"));
+	else
+		label = gtk_label_new (_("Enter a Regular Expression to filter files in the panel view."));
+	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+	
+	gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (filter_dlg)->vbox), label, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (filter_dlg)->vbox), entry, FALSE, FALSE, 0);
+	gtk_widget_show_all (GNOME_DIALOG (filter_dlg)->vbox);
+	switch (gnome_dialog_run (GNOME_DIALOG (filter_dlg))) {
+	case 0:
+		gtk_widget_hide (filter_dlg);
+		if (panel->filter) {
+			g_free (panel->filter);
+			panel->filter = NULL;
+		}
+		panel->filter = g_strdup (gtk_entry_get_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (entry)))));
+		if (!strcmp (_("Show all files"), panel->filter)) {
+			g_free (panel->filter);
+			panel->filter = NULL;
+			gtk_entry_set_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY (entry))),
+					    "");
+			gtk_label_set_text (GTK_LABEL (panel->status), _("Show all files"));
+		} else if (!strcmp ("*", panel->filter)) {
+			g_free (panel->filter);
+			panel->filter = NULL;
+			gtk_label_set_text (GTK_LABEL (panel->status), _("Show all files"));
+		} else
+			gtk_label_set_text (GTK_LABEL (panel->status), panel->filter);
+		
+		gnome_entry_save_history (GNOME_ENTRY (entry));
+		reread_cmd ();
+		x_filter_changed (panel);
+		break;
+	}
+	gtk_widget_destroy (filter_dlg);
+}
+void
+gnome_open_files (GtkWidget *widget, WPanel *panel)
+{
+	GList *later = NULL;
+	GList *now;
+	gint i;
+
+	/* FIXME: this is the easy way to do things.  We want the
+	 * hard way sometime. */
+	for (i = 0; i < panel->count; i++) {
+		if (panel->dir.list [i].f.marked)
+			if (!do_enter_on_file_entry ((panel->dir.list) + i))
+				later = g_list_prepend (later, panel->dir.list + i);
+	}
+#if 0
+	/* This is sorta ugly.  Should we just skip these? There should be a better way. */
+	for (now = later; now; now = now->next) {
+		gchar *command;
+		command = input_expand_dialog (_(" Open with..."),
+					       _("Enter extra arguments:"), (WPanel *) now->data);
+		if (!command)
+			/* we break out. */
+			break;
+		execute (command);
+		free (command);
+	}
+#endif
+	g_list_free (later);
+	   
+}
+
diff -ruN old/mc-4.5.6/gnome/gcmd.h new/mc-4.5.7/gnome/gcmd.h
--- old/mc-4.5.6/gnome/gcmd.h	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gcmd.h	Tue Jan 12 22:38:07 1999
@@ -14,6 +14,8 @@
 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);
 
 #endif /* __GCMD_H */
diff -ruN old/mc-4.5.6/gnome/gdesktop.c new/mc-4.5.7/gnome/gdesktop.c
--- old/mc-4.5.6/gnome/gdesktop.c	Wed Jan  6 15:26:20 1999
+++ new/mc-4.5.7/gnome/gdesktop.c	Tue Jan 12 22:38:07 1999
@@ -341,6 +341,7 @@
 	GSList *need_position_list, *sl;
 	GList *all_icons, *l;
 
+	
 	dir = mc_opendir (desktop_directory);
 	if (!dir) {
 		message (FALSE,
@@ -350,6 +351,8 @@
 		return;
 	}
 
+	gnome_metadata_lock ();
+
 	/* Read the directory.  For each file for which we do have an existing
 	 * icon, do nothing.  Otherwise, if the file has its metadata for icon
 	 * position set, create an icon for it.  Otherwise, store it in a list
@@ -404,6 +407,8 @@
 
 	g_list_free (all_icons);
 
+	gnome_metadata_unlock ();
+	
 	/* Now create the icons for all the files that did not have their
 	 * position set.  This makes auto-placement work correctly without
 	 * overlapping icons.
diff -ruN old/mc-4.5.6/gnome/gdialogs.h new/mc-4.5.7/gnome/gdialogs.h
--- old/mc-4.5.6/gnome/gdialogs.h	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gdialogs.h	Wed Dec 31 19:00:00 1969
@@ -1,18 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- */
-/* New dialogs... */
-#include "../vfs/vfs.h"
-#include "file.h"
-#include "panel.h"
-
-FileProgressStatus file_progress_show_source (char *path);
-FileProgressStatus file_progress_show_target (char *path);
-FileProgressStatus file_progress_show_deleting (char *path);
-FileProgressStatus file_progress_show (long done, long total);
-FileProgressStatus file_progress_show_count (long done, long total);
-FileProgressStatus file_progress_show_bytes (long done, long total);
-FileProgressStatus file_progress_real_query_replace (enum OperationMode mode, char *destname, struct stat *_s_stat, struct stat *_d_stat);
-void file_progress_set_stalled_label (char *stalled_msg);
-char *file_mask_dialog (FileOperation operation, char *text, char *def_text, int only_one, int *do_background);
-void create_op_win (FileOperation op, int with_eta);
-void destroy_op_win (void);
-void fmd_init_i18n();
diff -ruN old/mc-4.5.6/gnome/gdnd.c new/mc-4.5.7/gnome/gdnd.c
--- old/mc-4.5.6/gnome/gdnd.c	Wed Jan  6 15:26:20 1999
+++ new/mc-4.5.7/gnome/gdnd.c	Tue Jan 12 22:38:07 1999
@@ -276,7 +276,12 @@
 	/* If we are dragging from a file panel, we can display a nicer status display */
 	source_panel = find_panel_owning_window (context);
 
-	printf ("Panel found for this source: %p\n", source_panel);
+	/* Check if the user did not drag the information to the same directory */
+	if (source_panel){
+		if (strcmp (source_panel->cwd, destdir) == 0)
+			return FALSE;
+	}
+	
 	/* Symlinks do not use file.c */
 
 	if (source_panel && action != GDK_ACTION_LINK)
diff -ruN old/mc-4.5.6/gnome/glayout.c new/mc-4.5.7/gnome/glayout.c
--- old/mc-4.5.6/gnome/glayout.c	Wed Jan  6 15:26:20 1999
+++ new/mc-4.5.7/gnome/glayout.c	Tue Jan 12 22:38:07 1999
@@ -15,6 +15,7 @@
 #include "main.h"
 #include "gmain.h"
 #include "cmd.h"
+#include "dialog.h"
 #include "boxes.h"
 #include "panelize.h"
 #include "gcmd.h"
@@ -22,7 +23,7 @@
 #include "gdesktop.h"
 #include "setup.h"
 #include "../vfs/vfs.h"
-
+#include "gprefs.h"
 #define UNDEFINED_INDEX -1
 
 GList *containers = 0;
@@ -260,12 +261,24 @@
 	}
 }
 
+static void
+run_cmd (void)
+{
+	char *cmd;
+
+	cmd = input_dialog (_("Enter command to run"), _("Enter command to run"), "");
+	if (cmd && *cmd){
+		my_system (EXECUTE_AS_SHELL, shell, cmd);
+	}
+}
+
 void configure_box (void);
 
 GtkCheckMenuItem *gnome_toggle_snap (void);
 
 GnomeUIInfo gnome_panel_file_menu [] = {
-	{ GNOME_APP_UI_ITEM, N_("_New window"),        N_("Opens a new window"), gnome_open_panel },
+	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: */
 	/* New-> */
@@ -274,25 +287,25 @@
 	/*  Gnumeric Spreadsheet */
 	/*  Text Document */
 	/*  etc... */
+
 	{ GNOME_APP_UI_SEPARATOR },
-	{ GNOME_APP_UI_ITEM, N_("_Open"),              N_("Open selected files"), NULL, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN },
+	{ GNOME_APP_UI_ITEM, N_("_Open"),              N_("Opens the selected files"), gnome_open_files },
+/*	{ GNOME_APP_UI_ITEM, N_("Open _FTP site"),     N_("Opens an FTP site"), ftplink_cmd },*/
 	{ GNOME_APP_UI_ITEM, N_("_Copy..."),           N_("Copy files"), copy_cmd, NULL},
-	{ GNOME_APP_UI_ITEM, N_("_Move..."),           N_("Rename or move files"), ren_cmd },
 	{ GNOME_APP_UI_ITEM, N_("_Delete..."),         N_("Delete files from disk"), delete_cmd },
+	{ GNOME_APP_UI_ITEM, N_("_Move..."),           N_("Rename or move files"), ren_cmd },
+/*	{ GNOME_APP_UI_ITEM, N_("_Make directory..."), N_("Creates a new directory"), mkdir_cmd },*/
 	{ GNOME_APP_UI_SEPARATOR },
 	{ GNOME_APP_UI_ITEM, N_("C_lose"),             N_("Close this panel"), gnome_close_panel, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE },
+	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE,
+	  GNOME_KEY_NAME_CLOSE, GNOME_KEY_MOD_CLOSE, NULL },
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
 };
 
 GnomeUIInfo gnome_panel_edit_menu [] = {
-	{ GNOME_APP_UI_ITEM, N_("_Cut"),               N_("Cuts the selected files into the cut buffer."),  NULL, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CUT },
-	{ GNOME_APP_UI_ITEM, N_("C_opy"),              N_("Copies the selected files into the cut buffer."),  NULL, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_COPY },
-	{ GNOME_APP_UI_ITEM, N_("_Paste"),             N_("Pastes files from the cut buffer into the current directory"),  NULL, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PASTE },
+	GNOMEUIINFO_MENU_CUT_ITEM(NULL, NULL),
+	GNOMEUIINFO_MENU_COPY_ITEM(NULL, NULL),
+	GNOMEUIINFO_MENU_PASTE_ITEM(NULL, NULL),
 	{ GNOME_APP_UI_SEPARATOR },
 	{ GNOME_APP_UI_ITEM, N_("_Select All"),        N_("Select all files in the current Panel"), gnome_select_all_cmd },
 	{ GNOME_APP_UI_ITEM, N_("_Select Files..."),   N_("Select a group of files"), select_cmd },
@@ -300,8 +313,7 @@
 	{ GNOME_APP_UI_SEPARATOR },
 	{ GNOME_APP_UI_ITEM, N_("_Rescan Directory"),  N_("Rescan the directory contents"), reread_cmd },
 	{ GNOME_APP_UI_SEPARATOR },
-	{ GNOME_APP_UI_ITEM, N_("Preferences..."),     N_("Configure the GNOME Midnight Commander"), configure_box, NULL,
-	  NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PROP},
+	GNOMEUIINFO_MENU_PREFERENCES_ITEM(gnome_configure_box, NULL),
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
 };
 
@@ -316,7 +328,7 @@
 
 GnomeUIInfo gnome_panel_layout_menu [] = {
 	{ GNOME_APP_UI_ITEM, N_("_Sort By..."),     N_("Confirmation settings"), gnome_sort_cmd },
-	{ GNOME_APP_UI_ITEM, N_("_Filter View..."),    N_("Global option settings"), filter_cmd },
+	{ GNOME_APP_UI_ITEM, N_("_Filter View..."),    N_("Global option settings"), gnome_filter_cmd },
 	{ GNOME_APP_UI_SEPARATOR },
 	{ GNOME_APP_UI_RADIOITEMS, NULL , NULL, gnome_panel_view_menu},
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
@@ -327,7 +339,10 @@
 	  NULL, GNOME_APP_PIXMAP_STOCK, 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_("Run a command and put the results in a panel"), gnome_external_panelize },
+	{ 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 },
+
 #ifdef USE_VFS					  
 	{ GNOME_APP_UI_ITEM, N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs },
 #endif
@@ -454,7 +469,8 @@
 		gtk_widget_set_uposition (GTK_WIDGET (app), xpos, ypos);
 
 	panel = panel_new (name);
-	vbox = gtk_vbox_new (0, 0);
+	vbox = gtk_vbox_new (FALSE, 0);
+	gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
 	gnome_app_set_contents (GNOME_APP (app), vbox);
 	gnome_app_create_menus_with_data (GNOME_APP (app), gnome_panel_menu, panel);
 
diff -ruN old/mc-4.5.6/gnome/gprefs.c new/mc-4.5.7/gnome/gprefs.c
--- old/mc-4.5.6/gnome/gprefs.c	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.7/gnome/gprefs.c	Tue Jan 12 22:38:07 1999
@@ -0,0 +1,98 @@
+#include <config.h>
+#include "x.h"
+#include <stdio.h>
+#include <sys/stat.h>
+#include "dir.h"
+#include "panel.h"
+#include "gscreen.h"
+#include "main.h"
+#include "gmain.h"
+#include "cmd.h"
+#include "boxes.h"
+#include "profile.h"
+#include "setup.h"
+#include "panelize.h"
+#include "dialog.h"
+#include "layout.h"
+#include "../vfs/vfs.h"
+#include "gprefs.h"
+
+/* Orphan confirmation options */
+/* Auto save setup */
+/* use internal edit */ /* maybe have a mime-type capplet for these */
+/* use internal view */
+/* complete: show all */
+/* Animation??? */
+/* advanced chown */
+/* cd follows links */
+/* safe delete */
+static GtkWidget *
+file_display_pane (WPanel *panel)
+{
+	/* This should configure the file options. */
+	/* Show Backup files */
+	/* show Hidden files */
+	/* mix files and directories */
+	/* shell patterns */
+	GtkWidget *vbox;
+	
+	vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL);
+	return vbox;
+}
+static GtkWidget *
+confirmation_pane (WPanel *panel)
+{
+	/* Confirm... */
+	/*  delete file*/
+	/*  overwrite */
+	/*  execute */
+	/* Verbose Operations */
+	return gtk_frame_new (NULL);
+}
+static GtkWidget *
+custom_view_pane (WPanel *panel)
+{ 
+	return gtk_frame_new (NULL);
+}
+static GtkWidget *
+vfs_pane (WPanel *panel)
+{
+	/* VFS timeout */
+	/* Anon ftp password */
+	/* Always use ftp proxy: */
+	return gtk_frame_new (NULL);
+}
+static GtkWidget *
+caching_and_optimizations_pane (WPanel *panel)
+{
+	/* Fast dir reload */
+	/* Compute totals */
+	/* ftpfs directory cache timeout */
+	return gtk_frame_new (NULL);
+}
+void
+gnome_configure_box (GtkWidget *widget, WPanel *panel)
+{
+	GtkWidget *prefs_dlg;
+
+	prefs_dlg = gnome_property_box_new ();
+	/* do we want a generic page? */
+	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefs_dlg),
+					file_display_pane (panel),
+					gtk_label_new (_("File Display")));
+	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefs_dlg),
+					confirmation_pane (panel),
+					gtk_label_new (_("Confirmation")));
+	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefs_dlg),
+					custom_view_pane (panel),
+					gtk_label_new (_("Custom View")));
+	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefs_dlg),
+					vfs_pane (panel),
+					gtk_label_new (_("Caching and Optimizations")));
+	gnome_property_box_append_page (GNOME_PROPERTY_BOX (prefs_dlg),
+					caching_and_optimizations_pane (panel),
+					gtk_label_new (_("VFS")));
+	gtk_widget_show_all (GNOME_PROPERTY_BOX (prefs_dlg)->notebook);
+	gnome_dialog_run_and_close (GNOME_DIALOG (prefs_dlg));
+}
+
diff -ruN old/mc-4.5.6/gnome/gprefs.h new/mc-4.5.7/gnome/gprefs.h
--- old/mc-4.5.6/gnome/gprefs.h	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.7/gnome/gprefs.h	Tue Jan 12 22:38:07 1999
@@ -0,0 +1,7 @@
+#ifndef __GPREFS_H__
+#define __GPREFS_H__
+
+void gnome_configure_box (GtkWidget *widget, WPanel *panel);
+
+
+#endif
diff -ruN old/mc-4.5.6/gnome/gscreen.c new/mc-4.5.7/gnome/gscreen.c
--- old/mc-4.5.6/gnome/gscreen.c	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gscreen.c	Tue Jan 12 22:38:07 1999
@@ -460,12 +460,25 @@
 
 	select_item (panel);
 }
-
+static int
+panel_file_list_press_row (GtkWidget *file_list, GdkEvent *event, WPanel *panel)
+{
+	/* FIXME: This is still very broken. */
+	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);
+		gpopup_do_popup ((GdkEventButton *) event, panel, NULL, row, panel->dir.list[row].fname);
+	}
+	return TRUE;
+}
 static void
 panel_file_list_select_row (GtkWidget *file_list, int row, int column, GdkEvent *event, WPanel *panel)
 {
 	int current_selection = panel->selected;
-
+	char *fullname;
+	
 	if (!event) {
 		internal_select_item (file_list, panel, row);
 		return;
@@ -478,19 +491,21 @@
 
 		switch (event->button.button) {
 		case 1:
-			if (!(event->button.state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)))
-				break;
-
-			/* fallback if shift-click is pressed */
-			do_file_mark_range (panel, row, current_selection);
+			if (!(event->button.state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK))){
+				do_file_mark (panel, row, !panel->dir.list[row].f.marked);
+			} else {
+				/* if shift-click is pressed */
+				do_file_mark_range (panel, row, current_selection);
+			}
 			break;
 
 		case 2:
-			do_file_mark (panel, row, !panel->dir.list[row].f.marked);
-			break;
-
-		case 3:
-			gpopup_do_popup ((GdkEventButton *) event, panel, NULL, row, panel->dir.list[row].fname);
+			if (S_ISDIR (panel->dir.list [current_selection].buf.st_mode) ||
+			    panel->dir.list [current_selection].f.link_to_dir){
+				fullname = concat_dir_and_file (panel->cwd, panel->dir.list [current_selection].fname);
+				new_panel_at (fullname);
+				free (fullname);
+			}
 			break;
 		}
 
@@ -769,7 +784,8 @@
 	GnomeIconList *gil = GNOME_ICON_LIST (widget);
 	char *dir;
 	int idx;
-
+	gboolean reload;
+	
 	idx = gnome_icon_list_get_icon_at (gil, x, y);
 	if (idx == -1)
 		dir = g_strdup (panel->cwd);
@@ -781,11 +797,13 @@
 			dir = g_strdup (panel->cwd);
 	}
 
-	gdnd_drop_on_directory (context, selection_data, dir);
+	reload = gdnd_drop_on_directory (context, selection_data, dir);
 	free (dir);
 
-	update_one_panel_widget (panel, 0, UP_KEEPSEL);
-	panel_update_contents (panel);
+	if (reload){
+		update_one_panel_widget (panel, 0, UP_KEEPSEL);
+		panel_update_contents (panel);
+	}
 }
 
 /**
@@ -1139,7 +1157,12 @@
 	gtk_signal_connect (GTK_OBJECT (file_list), "select_row",
 			    GTK_SIGNAL_FUNC (panel_file_list_select_row),
 			    panel);
-
+	gtk_signal_connect (GTK_OBJECT (file_list), "button_press_event",
+			    GTK_SIGNAL_FUNC (panel_file_list_press_row),
+			    panel);
+	gtk_clist_set_button_actions (GTK_CLIST (file_list), 1, GTK_BUTTON_SELECTS | GTK_BUTTON_DRAGS);
+	gtk_clist_set_button_actions (GTK_CLIST (file_list), 2, GTK_BUTTON_SELECTS);
+	
 	/* Set up drag and drop */
 
 	load_dnd_icons ();
@@ -1148,6 +1171,11 @@
 			   drop_types, ELEMENTS (drop_types),
 			   GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
 
+	/* Make directories draggable */
+	gtk_drag_source_set (GTK_WIDGET (file_list), GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+			     drag_types, ELEMENTS (drag_types),
+			     GDK_ACTION_LINK | GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_ASK);
+	
 	gtk_signal_connect (GTK_OBJECT (file_list), "drag_data_get",
 			    GTK_SIGNAL_FUNC (panel_drag_data_get), panel);
 	gtk_signal_connect (GTK_OBJECT (file_list), "drag_data_delete",
@@ -1196,13 +1224,16 @@
 	display_mini_info (panel);
 	execute_hooks (select_file_hook);
 
-	if (event)
-		printf ("Icon list select icon, event->type= %d %d %d\n", event->type, GDK_BUTTON_PRESS, GDK_2BUTTON_PRESS);
 	if (!event)
 		return;
 
 	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);
+		break;
+
+	case GDK_BUTTON_RELEASE:
 		if (event->button.button == 2){
 			char *fullname;
 
@@ -1214,10 +1245,8 @@
 			}
 			break;
 		} 
-		if (event->button.button == 3)
-			gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index, panel->dir.list[index].fname);
 		break;
-
+		
 	case GDK_2BUTTON_PRESS:
 		if (event->button.button == 1)
 			do_enter (panel);
@@ -1572,13 +1601,14 @@
 void
 display_mini_info (WPanel *panel)
 {
-	GtkLabel *label = GTK_LABEL (panel->ministatus);
+	GnomeAppBar *bar = GNOME_APPBAR (panel->ministatus);
 
 	if (panel->searching) {
 		char *buf;
 
 		buf = g_strdup_printf (_("Search: %s"), panel->search_buffer);
-		gtk_label_set (label, buf);
+		gnome_appbar_pop (bar);
+		gnome_appbar_push (bar, buf);
 		g_free (buf);
 		return;
 	}
@@ -1589,7 +1619,8 @@
 		buf = g_strdup_printf ((panel->marked == 1) ? _("%s bytes in %d file") : _("%s bytes in %d files"),
 				       size_trunc_sep (panel->total),
 				       panel->marked);
-		gtk_label_set (label, buf);
+		gnome_appbar_pop (bar);
+		gnome_appbar_push (bar, buf);
 		g_free (buf);
 		return;
 	}
@@ -1606,10 +1637,13 @@
 			link_target [len] = 0;
 			/* FIXME: Links should be handled differently */
 			/* str = copy_strings ("-> ", link_target, NULL); */
-			gtk_label_set (label, " ");
-			   /*free (str); */
-		} else
-			gtk_label_set (label, _("<readlink failed>"));
+			gnome_appbar_pop (bar);
+			gnome_appbar_push (bar, " ");
+			/*free (str); */
+		} else {
+			gnome_appbar_pop (bar);
+			gnome_appbar_push (bar, _("<readlink failed>"));
+		}
 		return;
 	}
 
@@ -1620,12 +1654,14 @@
 		buffer = xmalloc (len + 2, "display_mini_info");
 		format_file (buffer, panel, panel->selected, panel->estimated_total-2, 0, 1);
 		buffer [len] = 0;
-		gtk_label_set (label, buffer);
+		gnome_appbar_pop (bar);
+		gnome_appbar_push (bar, buffer);
 		free (buffer);
 	}
 	if (panel->list_type == list_icons){
 		if (panel->marked == 0){
-			gtk_label_set (label, " ");
+			gnome_appbar_pop (bar);
+			gnome_appbar_push (bar, " ");
 		}
 	}
 }
@@ -2248,47 +2284,30 @@
 	gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock),
 			     GNOME_DOCK_ITEM (dock), GNOME_DOCK_TOP, 1, 0, 0, FALSE);
 	gtk_widget_show_all (dock);
+	panel->view_table = gtk_table_new (1, 1, 0);
+	gtk_widget_show (panel->view_table);
 
 
 	/*
-	 * ministatus
-	 */
-	panel->ministatus = gtk_label_new (" "); /* was a cliplabel */
-	gtk_widget_set_usize (panel->ministatus, 0, -1);
-	gtk_misc_set_alignment (GTK_MISC (panel->ministatus), 0.0, 0.0);
-	gtk_misc_set_padding (GTK_MISC (panel->ministatus), 3, 0);
-	gtk_widget_show (panel->ministatus);
-	gtk_label_set_justify (GTK_LABEL (panel->ministatus), GTK_JUSTIFY_LEFT);
-
-	/*
-	 * The statusbar
-	 * This status bar now holds the  ministatus.
+	 * The status bar.
 	 */
-	frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-	gtk_container_set_border_width (GTK_CONTAINER (frame), 3);
-
-	panel->status = gtk_label_new (""); /* used to be a cliplabel */
-
-
-	/* we set up the status_bar */
-	gtk_misc_set_alignment (GTK_MISC (panel->status), 0.0, 0.5);
-	gtk_misc_set_padding (GTK_MISC (panel->status), 3, 0);
-	gtk_container_add (GTK_CONTAINER (frame), panel->ministatus);
-	gtk_label_set_justify (GTK_LABEL (panel->status), GTK_JUSTIFY_LEFT);
-	gtk_widget_show_all (frame);
-
-
-	panel->view_table = gtk_table_new (1, 1, 0);
-	gtk_widget_show (panel->view_table);
+	panel->ministatus = GNOME_APPBAR(gnome_appbar_new(FALSE, TRUE, GNOME_PREFERENCES_NEVER));
+	gnome_app_set_statusbar(GNOME_APP (panel->xwindow), GTK_WIDGET(panel->ministatus));
+	ministatus_box = gtk_frame_new (NULL);
+	gtk_frame_set_shadow_type (GTK_FRAME(ministatus_box), GTK_SHADOW_IN);
+      
+	panel->status = gtk_label_new (_("Show all files"));
+	gtk_misc_set_alignment (GTK_MISC (panel->status), 0.0, 0.0);
+      
+	gtk_box_pack_start (GTK_BOX (panel->ministatus), ministatus_box, FALSE, FALSE, 0);
+	gtk_container_add (GTK_CONTAINER(ministatus_box), panel->status);
+      
+	gtk_widget_show (ministatus_box);
+	gtk_widget_show (panel->status);
 
 	/*
 	 * Put the icon list and the file listing in a nice frame
 	 */
-	table_frame = gtk_frame_new (NULL);
-	gtk_frame_set_shadow_type (GTK_FRAME (table_frame), GTK_SHADOW_IN);
-	gtk_widget_show (table_frame);
-	gtk_container_add (GTK_CONTAINER (table_frame), panel->view_table);
 
 	/* Add both the icon view and the listing view */
 	gtk_table_attach (GTK_TABLE (panel->view_table), panel->notebook, 0, 1, 0, 1,
@@ -2301,7 +2320,7 @@
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK,
 			  0, 0);
 
-	gtk_paned_add2 (GTK_PANED (panel->pane), table_frame);
+	gtk_paned_add2 (GTK_PANED (panel->pane), panel->view_table);
 
 #if 0
 	gtk_table_attach (GTK_TABLE (panel->table), status_line, 0, 1, 0, 1,
@@ -2328,11 +2347,11 @@
 			  GTK_EXPAND | GTK_FILL | GTK_SHRINK,
 			  0, 0, 0);
 
-#endif
 	gtk_table_attach (GTK_TABLE (panel->table), frame, 0, 1, 3, 4,
 			  GTK_EXPAND | GTK_FILL,
 			  0, 0, 0);
 
+#endif
 	/* Ultra nasty hack: pull the vbox from wdata */
 	vbox =  GTK_WIDGET (panel->widget.wdata);
 
diff -ruN old/mc-4.5.6/gnome/gtkdtree.c new/mc-4.5.7/gnome/gtkdtree.c
--- old/mc-4.5.6/gnome/gtkdtree.c	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gtkdtree.c	Tue Jan 12 22:38:07 1999
@@ -7,6 +7,8 @@
  *
  */
 #include <config.h>
+#include "util.h"
+#include "treestore.h"
 #include <gnome.h>
 #include "gtkdtree.h"
 
@@ -14,7 +16,6 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include "../vfs/vfs.h"
 #include "dir-open.xpm"
 #include "dir-close.xpm"
 
@@ -101,46 +102,22 @@
 static gboolean
 gtk_dtree_load_path (GtkDTree *dtree, char *path, GtkCTreeNode *parent, int level)
 {
-	DIR *dir;
-	struct dirent *dirent;
+	tree_scan  *dir;
+	tree_entry *dirent;
 	
 	g_assert (path);
 	g_assert (parent);
 	g_assert (dtree);
 
-	dir = mc_opendir (path);
+	dir = tree_store_opendir (path);
 	if (!dir)
 		return FALSE;
 
-	for (; (dirent = mc_readdir (dir)) != NULL; ){
+	for (; (dirent = tree_store_readdir (dir)) != NULL; ){
 		GtkCTreeNode *sibling;
-		struct stat s;
-		char *full_name;
 		char *text [1];
-		int   res;
 		
-		if (dirent->d_name [0] == '.'){
-			if (dirent->d_name [1] == '.'){
-				if (dirent->d_name [2] == 0)
-					continue;
-			} else if (dirent->d_name [1] == 0)
-				continue;
-		}
-
-		full_name = g_concat_dir_and_file (path, dirent->d_name);
-		res = mc_stat (full_name, &s);
-
-		if (res == -1){
-			g_free (full_name);
-			continue;
-		}
-
-		if (!S_ISDIR (s.st_mode)){
-			g_free (full_name);
-			continue;
-		}
-
-		text [0] = dirent->d_name;
+		text [0] = x_basename (dirent->name);
 
 		/* Do not insert duplicates */
 		sibling = gtk_dtree_contains (dtree, parent, text [0]);
@@ -158,15 +135,13 @@
 		}
 
 		if (level)
-			gtk_dtree_load_path (dtree, full_name, sibling, level-1);
-
-		g_free (full_name);
+			gtk_dtree_load_path (dtree, dirent->name, sibling, level-1);
 
 		if (!level)
 			break;
 	}
 
-	mc_closedir (dir);
+	tree_store_closedir (dir);
 
 	return TRUE;
 }
@@ -195,7 +170,8 @@
 
 	dtree->current_path = path;
 
-	gtk_signal_emit (GTK_OBJECT (ctree), gtk_dtree_signals [DIRECTORY_CHANGED], path);
+	if (!dtree->internal)
+		gtk_signal_emit (GTK_OBJECT (ctree), gtk_dtree_signals [DIRECTORY_CHANGED], path);
 
 	gtk_dtree_load_path (dtree, path, row, 1);
 #if 0
@@ -248,7 +224,8 @@
 {
 	GtkCTreeNode *current_node;
 	char *s, *current, *npath;
-
+	char *request;
+	
 	g_return_val_if_fail (dtree != NULL, FALSE);
 	g_return_val_if_fail (GTK_IS_DTREE (dtree), FALSE);
 	g_return_val_if_fail (path != NULL, FALSE);
@@ -256,7 +233,7 @@
 	
 	if (dtree->current_path && (strcmp (path, dtree->current_path) == 0))
 		return TRUE;
-	
+
 	s = alloca (strlen (path)+1);
 	strcpy (s, path);
 	current_node = dtree->root_node;
@@ -264,6 +241,7 @@
 	s++;
 	npath = g_strdup ("/");
 
+	dtree->internal = 1;
 	while ((current = strtok (s, "/")) != NULL){
 		char *full_path;
 		GtkCTreeNode *node;
@@ -282,14 +260,12 @@
 		
 		if (node){
 			gtk_ctree_expand (GTK_CTREE (dtree), node);
-			while (gtk_events_pending ())
-				gtk_main_iteration ();
 			current_node = node;
 		} else
 			break;
 	}
         g_free (npath);
-
+	
 	if (current_node){
 		if (!gtk_ctree_node_is_visible (GTK_CTREE (dtree), current_node)){
 			gtk_ctree_node_moveto (GTK_CTREE (dtree), current_node, 0, 0.5, 0.0);
@@ -306,6 +282,8 @@
 		dtree->requested_path = NULL;
 	}
 
+	dtree->internal = 0;
+
 	return TRUE;
 }
 
@@ -331,10 +309,9 @@
 	if (dtree->visible)
 		gtk_dtree_do_select_dir (dtree, path);
 	else {
-		if (dtree->requested_path){
+		if (dtree->requested_path)
 			g_free (dtree->requested_path);
-			dtree->requested_path = g_strdup (path);
-		}
+		dtree->requested_path = g_strdup (path);
 	}
 
 	return TRUE;
@@ -344,7 +321,8 @@
 gtk_dtree_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
 {
 	GtkDTree *dtree = GTK_DTREE (widget);
-
+	char *request;
+	
 	GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
 	if (allocation->width != 0 && allocation->height != 0)
 		dtree->visible = TRUE;
@@ -353,11 +331,23 @@
 
 	if (!(dtree->visible && dtree->requested_path))
 		return;
+
+	if (!dtree->visible)
+		return;
+
+	if (!dtree->requested_path)
+		return;
 	
-	if (strcmp (dtree->current_path, dtree->requested_path) != 0)
+	if (strcmp (dtree->current_path, dtree->requested_path) == 0){
+		g_free (dtree->requested_path);
+		dtree->requested_path = NULL;
 		return;
+	}
 
-	gtk_dtree_do_select_dir (dtree, dtree->requested_path);
+	request = dtree->requested_path;
+	dtree->requested_path = NULL;
+	gtk_dtree_do_select_dir (dtree, request);
+	g_free (request);
 }
 
 static void
@@ -481,11 +471,45 @@
 		&dtree->pixmap_close, &dtree->bitmap_close);
 }
 
+static int dirty_tag = -1;
+
+static int
+gtk_dtree_save_tree (void)
+{
+	dirty_tag = -1;
+	mc_tree_store_save ();
+	return FALSE;
+}
+
+/*
+ * Callback routine invoked by the treestore code when the state
+ * of the treestore has been modified.
+ */
+static void
+gtk_dtree_dirty_notify (int state)
+{
+	if (dirty_tag != -1){
+		if (state)
+			return;
+		else {
+			gtk_timeout_remove (dirty_tag);
+			dirty_tag = -1;
+		}
+	}
+
+	if (state)
+		dirty_tag = gtk_timeout_add (10 * 1000, (GtkFunction) gtk_dtree_save_tree, NULL);
+}
+
 static void
 gtk_dtree_init (GtkDTree *dtree)
 {
+	static int tree_inited;
+	
 	dtree->current_path = NULL;
 	dtree->auto_expanded_nodes = NULL;
+
+	tree_store_dirty_notify = gtk_dtree_dirty_notify;
 }
 
 void
diff -ruN old/mc-4.5.6/gnome/gtkdtree.h new/mc-4.5.7/gnome/gtkdtree.h
--- old/mc-4.5.6/gnome/gtkdtree.h	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gtkdtree.h	Tue Jan 12 22:38:07 1999
@@ -30,6 +30,8 @@
 	/* Masks */
 	GdkBitmap *bitmap_open;
 	GdkBitmap *bitmap_close;
+
+	int internal;
 } GtkDTree;
 
 typedef struct {
diff -ruN old/mc-4.5.6/gnome/gtree.c new/mc-4.5.7/gnome/gtree.c
--- old/mc-4.5.6/gnome/gtree.c	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gtree.c	Tue Jan 12 22:38:07 1999
@@ -5,32 +5,10 @@
  */
 #include <config.h>
 #include <sys/types.h>
-#include "tree.h"
 #include <gnome.h>
 #include "gtree.h"
 
 void
-sync_tree (char *pathname)
+sync_tree (char *path)
 {
 }
-
-void
-tree_check (const char *dir)
-{
-}      
-
-void
-start_tree_check (WTree *tree)
-{
-}
-
-void
-do_tree_check (WTree *tree, const char *subname)
-{
-}
-
-void
-end_tree_check (WTree *tree)
-{
-}
-
diff -ruN old/mc-4.5.6/gnome/gutil.c new/mc-4.5.7/gnome/gutil.c
--- old/mc-4.5.6/gnome/gutil.c	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gutil.c	Tue Jan 12 22:38:07 1999
@@ -73,7 +73,9 @@
 		for (i = 3; i < top; i++)
 			close (i);
 
-		*pid = fork ();
+		if (!(flags & EXECUTE_WAIT))
+			*pid = fork ();
+		
 		if (*pid == 0){
 			if (flags & EXECUTE_AS_SHELL)
 				execl (shell, shell, "-c", command, (char *) 0);
@@ -94,13 +96,14 @@
 		 */
 		_exit (0);
 	}
+	if (*pid != 0 && (flags & EXECUTE_WAIT)){
+		int status;
+		
+		waitpid (*pid, &status, 0);
+	}
 	sigaction (SIGINT,  &save_intr, NULL);
 	sigaction (SIGQUIT, &save_quit, NULL);
 	sigaction (SIGTSTP, &save_stop, NULL);
-
-#ifdef SCO_FLAVOR 
-	waitpid(-1, NULL, WNOHANG);
-#endif /* SCO_FLAVOR */
 
 	return WEXITSTATUS(status);
 }
diff -ruN old/mc-4.5.6/gnome/gview.c new/mc-4.5.7/gnome/gview.c
--- old/mc-4.5.6/gnome/gview.c	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/gview.c	Tue Jan 12 22:38:07 1999
@@ -286,49 +286,43 @@
 }
 
 GnomeUIInfo gview_file_menu [] = {
-	GNOMEUIINFO_ITEM_STOCK (N_("Goto line"),
+	GNOMEUIINFO_ITEM_STOCK (N_("_Goto line"),
 				N_("Jump to a specified line number"),
 				&gnome_goto_line, GNOME_STOCK_PIXMAP_JUMP_TO),
-	GNOMEUIINFO_ITEM (N_("Monitor file"), N_("Monitor file growing"),            &gnome_monitor, NULL),
-	GNOMEUIINFO_ITEM_STOCK (N_("Close"),
-				N_("Close the viewer"),
-				&gview_quit, GNOME_STOCK_PIXMAP_QUIT),
+	GNOMEUIINFO_ITEM (N_("_Monitor file"), N_("Monitor file growing"),            &gnome_monitor, NULL),
+	GNOMEUIINFO_MENU_CLOSE_ITEM(gview_quit, NULL),
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
 };
 
 GnomeUIInfo gview_search_menu [] = {
-	GNOMEUIINFO_ITEM_STOCK (N_("Search"),
-				N_("String search"),
-				gnome_normal_search_cmd, GNOME_STOCK_MENU_SEARCH),
+	GNOMEUIINFO_MENU_FIND_ITEM(gnome_normal_search_cmd, NULL),
 	GNOMEUIINFO_ITEM_STOCK (N_("Regexp search"),
 				N_("Regular expression search"),
 				gnome_regexp_search_cmd, GNOME_STOCK_MENU_SEARCH),
-	GNOMEUIINFO_SEPARATOR,			 
-	GNOMEUIINFO_ITEM_STOCK (N_("Search again..."),
-				N_("Continue searching"),
-				gnome_continue_search, GNOME_STOCK_MENU_SRCHRPL),
+	GNOMEUIINFO_SEPARATOR,
+	GNOMEUIINFO_MENU_FIND_AGAIN_ITEM(gnome_continue_search, NULL),
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
 };
 
 GnomeUIInfo gview_mode_menu [] = {
 #define WRAP_POS 0
-	GNOMEUIINFO_TOGGLEITEM (N_("Wrap"),      N_("Wrap the text"), gnome_toggle_wrap, NULL),
+	GNOMEUIINFO_TOGGLEITEM (N_("_Wrap"),      N_("Wrap the text"), gnome_toggle_wrap, NULL),
 #if 0
 	/* Can not use this one yet, as it destroys the viewer, need to fix that */
-	GNOMEUIINFO_TOGGLEITEM ("Parsed view", NULL, gnome_toggle_parse, NULL),
+	GNOMEUIINFO_TOGGLEITEM ("_Parsed view", NULL, gnome_toggle_parse, NULL),
 #endif
 #define FORMAT_POS 1
-	GNOMEUIINFO_TOGGLEITEM (N_("Formatted"),   NULL, gnome_toggle_format, NULL),
+	GNOMEUIINFO_TOGGLEITEM (N_("_Formatted"),   NULL, gnome_toggle_format, NULL),
 #define HEX_POS 2
-	GNOMEUIINFO_TOGGLEITEM (N_("Hex"),         NULL, gnome_toggle_hex, NULL),
+	GNOMEUIINFO_TOGGLEITEM (N_("_Hex"),         NULL, gnome_toggle_hex, NULL),
 	
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
 };
 
 GnomeUIInfo gview_top_menu [] = {
-	{ GNOME_APP_UI_SUBTREE, N_("File"),     NULL, &gview_file_menu },
-	{ GNOME_APP_UI_SUBTREE, N_("Search"),   NULL, &gview_search_menu },
-	{ GNOME_APP_UI_SUBTREE, N_("Mode"),     NULL, &gview_mode_menu },
+	{ GNOME_APP_UI_SUBTREE, N_("_File"),     NULL, &gview_file_menu },
+	{ GNOME_APP_UI_SUBTREE, N_("_Search"),   NULL, &gview_search_menu },
+	{ GNOME_APP_UI_SUBTREE, N_("_Mode"),     NULL, &gview_mode_menu },
 	{ GNOME_APP_UI_ENDOFINFO, 0, 0 }
 };
 
diff -ruN old/mc-4.5.6/gnome/temp-hack.c new/mc-4.5.7/gnome/temp-hack.c
--- old/mc-4.5.6/gnome/temp-hack.c	Wed Jan  6 15:26:21 1999
+++ new/mc-4.5.7/gnome/temp-hack.c	Wed Dec 31 19:00:00 1969
@@ -1,264 +0,0 @@
-#include "global.h"
-#include "color.h"
-static struct stat *s_stat, *d_stat;
-
-/* Used for button result values */
-enum {
-    REPLACE_YES = B_USER,
-    REPLACE_NO,
-    REPLACE_APPEND,
-    REPLACE_ALWAYS,
-    REPLACE_UPDATE,
-    REPLACE_NEVER,
-    REPLACE_ABORT,
-    REPLACE_SIZE,
-    REPLACE_REGET
-} FileReplaceCode;
-
-static int
-replace_callback (struct Dlg_head *h, int Id, int Msg)
-{
-#ifndef HAVE_X
-
-    switch (Msg){
-    case DLG_DRAW:
-	dialog_repaint (h, ERROR_COLOR, ERROR_COLOR);
-	break;
-    }
-#endif
-    return 0;
-}
-
-#ifdef HAVE_X
-#define X_TRUNC 128
-#else
-#define X_TRUNC 52
-#endif
-
-/* File operate window sizes */
-#define WX 62
-#define WY 10
-#define BY 10
-#define WX_ETA_EXTRA  12
-
-static int       replace_colors [4];
-static Dlg_head *replace_dlg;
-/*
- * FIXME: probably it is better to replace this with quick dialog machinery,
- * but actually I'm not familiar with it and have not much time :(
- *   alex
- */
-static struct
-{
-	char* text;
-	int   ypos, xpos;	
-	int   value;		/* 0 for labels */
-	char* tkname;
-	WLay  layout;
-}
-rd_widgets [] =
-{
-	{N_("Target file \"%s\" already exists!"),
-	                 3,      4,  0,              "target-e",   XV_WLAY_CENTERROW},
-	{N_("&Abort"),   BY + 3, 25, REPLACE_ABORT,  "abort",      XV_WLAY_CENTERROW},
-	{N_("if &Size differs"),
-	                 BY + 1, 28, REPLACE_SIZE,   "if-size",    XV_WLAY_RIGHTOF},
-	{N_("non&E"),    BY,     47, REPLACE_NEVER,  "none",       XV_WLAY_RIGHTOF},
-	{N_("&Update"),  BY,     36, REPLACE_UPDATE, "update",     XV_WLAY_RIGHTOF},
-	{N_("al&L"),     BY,     28, REPLACE_ALWAYS, "all",        XV_WLAY_RIGHTOF},
-	{N_("Overwrite all targets?"),
-	                 BY,     4,  0,              "over-label", XV_WLAY_CENTERROW},
-	{N_("&Reget"),   BY - 1, 28, REPLACE_REGET,  "reget",      XV_WLAY_RIGHTOF},
-	{N_("ap&Pend"),  BY - 2, 45, REPLACE_APPEND, "append",     XV_WLAY_RIGHTOF},
-	{N_("&No"),      BY - 2, 37, REPLACE_NO,     "no",         XV_WLAY_RIGHTOF},
-	{N_("&Yes"),     BY - 2, 28, REPLACE_YES,    "yes",        XV_WLAY_RIGHTOF},
-	{N_("Overwrite this target?"),
-	                 BY - 2, 4,  0,              "overlab",    XV_WLAY_CENTERROW},
-	{N_("Target date: %s, size %d"),
-	                 6,      4,  0,              "target-date",XV_WLAY_CENTERROW},
-	{N_("Source date: %s, size %d"),
-	                 5,      4,  0,              "source-date",XV_WLAY_CENTERROW}
-}; 
-
-#define ADD_RD_BUTTON(i)\
-	add_widgetl (replace_dlg,\
-		button_new (rd_widgets [i].ypos, rd_widgets [i].xpos, rd_widgets [i].value,\
-		NORMAL_BUTTON, rd_widgets [i].text, 0, 0, rd_widgets [i].tkname), \
-		rd_widgets [i].layout)
-
-#define ADD_RD_LABEL(i,p1,p2)\
-	sprintf (buffer, rd_widgets [i].text, p1, p2);\
-	add_widgetl (replace_dlg,\
-		label_new (rd_widgets [i].ypos, rd_widgets [i].xpos, buffer, rd_widgets [i].tkname),\
-		rd_widgets [i].layout)
-
-static void
-init_replace (enum OperationMode mode)
-{
-    char buffer [128];
-	static int rd_xlen = 60, rd_trunc = X_TRUNC;
-
-#ifdef ENABLE_NLS
-	static int i18n_flag;
-	if (!i18n_flag)
-	{
-		int l1, l2, l, row;
-		register int i = sizeof (rd_widgets) / sizeof (rd_widgets [0]); 
-		while (i--)
-			rd_widgets [i].text = _(rd_widgets [i].text);
-
-		/* 
-		 *longest of "Overwrite..." labels 
-		 * (assume "Target date..." are short enough)
-		 */
-		l1 = max (strlen (rd_widgets [6].text), strlen (rd_widgets [11].text));
-
-		/* longest of button rows */
-		i = sizeof (rd_widgets) / sizeof (rd_widgets [0]);
-		for (row = l = l2 = 0; i--;)
-		{
-			if (rd_widgets [i].value != 0)
-			{
-				if (row != rd_widgets [i].ypos)
-				{
-					row = rd_widgets [i].ypos;
-					l2 = max (l2, l);
-					l = 0;
-				}
-				l += strlen (rd_widgets [i].text) + 4;
-			}
-		}
-		l2 = max (l2, l); /* last row */
-		rd_xlen = max (rd_xlen, l1 + l2 + 8);
-		rd_trunc = rd_xlen - 6;
-
-		/* Now place buttons */
-		l1 += 5; /* start of first button in the row */
-		i = sizeof (rd_widgets) / sizeof (rd_widgets [0]);
-		
-		for (l = l1, row = 0; --i > 1;)
-		{
-			if (rd_widgets [i].value != 0)
-			{
-				if (row != rd_widgets [i].ypos)
-				{
-					row = rd_widgets [i].ypos;
-					l = l1;
-				}
-				rd_widgets [i].xpos = l;
-				l += strlen (rd_widgets [i].text) + 4;
-			}
-		}
-		/* Abort button is centered */
-		rd_widgets [1].xpos = (rd_xlen - strlen (rd_widgets [1].text) - 3) / 2;
-
-	}
-#endif /* ENABLE_NLS */
-
-    replace_colors [0] = ERROR_COLOR;
-    replace_colors [1] = COLOR_NORMAL;
-    replace_colors [2] = ERROR_COLOR;
-    replace_colors [3] = COLOR_NORMAL;
-    
-    replace_dlg = create_dlg (0, 0, 16, rd_xlen, replace_colors, replace_callback,
-			      "[ Replace ]", "replace", DLG_CENTER);
-    
-    x_set_dialog_title (replace_dlg,
-        mode == Foreground ? _(" File exists ") : _(" Background process: File exists "));
-
-
-	ADD_RD_LABEL(0, name_trunc (file_progress_replace_filename, rd_trunc - strlen (rd_widgets [0].text)), 0 );
-	ADD_RD_BUTTON(1);    
-    
-	ADD_RD_BUTTON(2);
-	ADD_RD_BUTTON(3);
-	ADD_RD_BUTTON(4);
-	ADD_RD_BUTTON(5);
-	ADD_RD_LABEL(6,0,0);
-
-    /* "this target..." widgets */
-	if (!S_ISDIR (d_stat->st_mode)){
-		if ((d_stat->st_size && s_stat->st_size > d_stat->st_size))
-			ADD_RD_BUTTON(7);
-
-		ADD_RD_BUTTON(8);
-    }
-	ADD_RD_BUTTON(9);
-	ADD_RD_BUTTON(10);
-	ADD_RD_LABEL(11,0,0);
-    
-	ADD_RD_LABEL(12, file_date (d_stat->st_mtime), (int) d_stat->st_size);
-	ADD_RD_LABEL(13, file_date (s_stat->st_mtime), (int) s_stat->st_size);
-}
-
-FileProgressStatus
-file_progress_real_query_replace (enum OperationMode mode, char *destname, struct stat *_s_stat,
-				  struct stat *_d_stat)
-{
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-    g_warning ("memo: file_progress_real_query_replace!\n");
-
-    /* Better to have something than nothing at all */
-    if (file_progress_replace_result < REPLACE_ALWAYS){
-	file_progress_replace_filename = destname;
-	s_stat = _s_stat;
-	d_stat = _d_stat;
-	init_replace (mode);
-	run_dlg (replace_dlg);
-	file_progress_replace_result = replace_dlg->ret_value;
-	if (file_progress_replace_result == B_CANCEL)
-	    file_progress_replace_result = REPLACE_ABORT;
-	destroy_dlg (replace_dlg);
-    }
-
-    switch (file_progress_replace_result){
-    case REPLACE_UPDATE:
-	do_refresh ();
-	if (_s_stat->st_mtime > _d_stat->st_mtime)
-	    return FILE_CONT;
-	else
-	    return FILE_SKIP;
-
-    case REPLACE_SIZE:
-	do_refresh ();
-	if (_s_stat->st_size == _d_stat->st_size)
-	    return FILE_SKIP;
-	else
-	    return FILE_CONT;
-	
-    case REPLACE_REGET:
-	/* Carefull: we fall through and set do_append */
-	file_progress_do_reget = _d_stat->st_size;
-	
-    case REPLACE_APPEND:
-        file_progress_do_append = 1;
-	
-    case REPLACE_YES:
-    case REPLACE_ALWAYS:
-	do_refresh ();
-	return FILE_CONT;
-    case REPLACE_NO:
-    case REPLACE_NEVER:
-	do_refresh ();
-	return FILE_SKIP;
-    case REPLACE_ABORT:
-    default:
-	return FILE_ABORT;
-    }
-}
-
-
diff -ruN old/mc-4.5.6/gtkedit/edit.c new/mc-4.5.7/gtkedit/edit.c
--- old/mc-4.5.6/gtkedit/edit.c	Wed Jan  6 15:26:14 1999
+++ new/mc-4.5.7/gtkedit/edit.c	Tue Jan 12 22:38:06 1999
@@ -21,9 +21,11 @@
 #define _EDIT_C THIS_IS
 
 #include <config.h>
-#if defined(OS2_NT)
+#if defined(NEEDS_IO_H)
 #    include <io.h>
-#    include <fcntl.h>
+#endif
+#include <fcntl.h>
+#ifdef NEEDS_CR_LF_TRANSLATION
 #    define CR_LF_TRANSLATION
 #endif
 #include "edit.h"
@@ -255,7 +257,7 @@
 #if defined CR_LF_TRANSLATION
 	if(file && (!text)){
 		real_size=0;
-		tmp_buf[1024]=0;
+		tmp_buf[sizeof (tmp_buf)-1]=0;
 		while((bytes_read = read(file,tmp_buf,1024)) > 0){
 			real_size += bytes_read;
 		}
diff -ruN old/mc-4.5.6/gtkedit/edit.h new/mc-4.5.7/gtkedit/edit.h
--- old/mc-4.5.6/gtkedit/edit.h	Wed Jan  6 15:26:14 1999
+++ new/mc-4.5.7/gtkedit/edit.h	Tue Jan 12 22:38:06 1999
@@ -562,7 +562,7 @@
 
 /* put OS2/NT/WIN95 defines here */
 
-#    ifdef OS2_NT
+#    ifdef USE_O_TEXT
 #    	 define MY_O_TEXT O_TEXT
 #    else
 #    	 define MY_O_TEXT 0
diff -ruN old/mc-4.5.6/gtkedit/editcmd.c new/mc-4.5.7/gtkedit/editcmd.c
--- old/mc-4.5.6/gtkedit/editcmd.c	Wed Jan  6 15:26:14 1999
+++ new/mc-4.5.7/gtkedit/editcmd.c	Tue Jan 12 22:38:06 1999
@@ -21,7 +21,7 @@
 /* #define PIPE_BLOCKS_SO_READ_BYTE_BY_BYTE */
 
 #include <config.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #include <io.h>
 #include <fcntl.h>
 #endif
diff -ruN old/mc-4.5.6/gtkedit/syntax.c new/mc-4.5.7/gtkedit/syntax.c
--- old/mc-4.5.6/gtkedit/syntax.c	Wed Jan  6 15:26:14 1999
+++ new/mc-4.5.7/gtkedit/syntax.c	Tue Jan 12 22:38:06 1999
@@ -2430,7 +2430,7 @@
 "",
 "###############################################################################",
 "# Pascal (BP7 IDE alike)",
-"file ..\\*\\\\.(pp|PP|pas|PAS|)$ Pascal Program",
+"file ..\\*\\\\.(pp|PP|pas|PAS)$ Pascal Program",
 "context default yellow/24",
 "    keyword whole absolute white/25",
 "    keyword whole and white/25",
Binary files old/mc-4.5.6/new_icons/gnome-image-pgm.png and new/mc-4.5.7/new_icons/gnome-image-pgm.png differ
Binary files old/mc-4.5.6/new_icons/gnome-image-tiff.png and new/mc-4.5.7/new_icons/gnome-image-tiff.png differ
diff -ruN old/mc-4.5.6/pc/ChangeLog new/mc-4.5.7/pc/ChangeLog
--- old/mc-4.5.6/pc/ChangeLog	Wed Jan  6 15:26:22 1999
+++ new/mc-4.5.7/pc/ChangeLog	Tue Jan 12 22:38:08 1999
@@ -1,3 +1,8 @@
+1999-01-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* chmod.c (chmod_cmd): Killed the tk_end_frame and tk_new_frame
+	macros. 
+
 Wed Oct 14 14:51:23 1998  Franco Bez <franco.bez@augsburg.baynet.de>
 
 	* gtkedit/edit.c: Workarround for the CR/LF Translation problem.
diff -ruN old/mc-4.5.6/pc/Makefile.PC new/mc-4.5.7/pc/Makefile.PC
--- old/mc-4.5.6/pc/Makefile.PC	Wed Jan  6 15:26:22 1999
+++ new/mc-4.5.7/pc/Makefile.PC	Tue Jan 12 22:38:08 1999
@@ -27,6 +27,7 @@
 MC_SRC_DIR=../src
 VFS_DIR=../vfs
 MCEDIT_SRC_DIR=../edit
+MCGTKEDIT_SRC_DIR=../edit
 MCEDIT_OBJS_DIR=$(OBJS_DIR)/edit
 SLANG_SRC_DIR=../slang
 SLANG_OBJS_DIR=$(OBJS_DIR)/slang
@@ -77,80 +78,86 @@
 $(MCEDIT_OBJS_DIR)/%.$(OBJ_SUFFIX): $(MCEDIT_SRC_DIR)/%.c
 	$(CC) $(MCEDIT_CFLAGS) $(OBJ_PLACE)$@ $<
 
+$(MCEDIT_OBJS_DIR)/%.$(OBJ_SUFFIX) $(MCGTKEDIT_SRC_DIR)/%.c
+	$(CC) -I$(MCGTKEDIT_SRC_DIR) -I$(MCEDIT_SRC_DIR) -I$(MCEDIT_SRC_DIR)/.. $(MCEDIT_CFLAGS) $(OBJ_PLACE)$@ $<
+
 MC_SRCS= \
-	terms.c \
-	user.c \
-	file.c \
-	listmode.c \
-	cmd.c \
-	command.c \
-	help.c \
-	menu.c \
-	view.c \
-	dir.c \
-	info.c \
-	widget.c \
-	option.c \
-	dlg.c \
-	panelize.c \
-	profile.c \
-	util.c \
-	dialog.c \
-	ext.c \
-	color.c \
-	layout.c \
-	setup.c \
-	regex.c \
-	hotlist.c \
-	tree.c \
-	win.c \
-	complete.c \
-	find.c \
-	wtools.c \
-	boxes.c \
-	background.c \
-	main.c \
-	popt.c \
-	text.c \
+	terms.c 	\
+	user.c 		\
+	file.c 		\
+	filegui.c	\
+	filenot.c	\
+	findme.c	\
+	listmode.c 	\
+	cmd.c 		\
+	command.c 	\
+	help.c 		\
+	menu.c 		\
+	view.c 		\
+	dir.c 		\
+	info.c 		\
+	widget.c 	\
+	option.c 	\
+	dlg.c 		\
+	panelize.c 	\
+	profile.c 	\
+	util.c 		\
+	dialog.c 	\
+	ext.c 		\
+	color.c 	\
+	layout.c 	\
+	setup.c 	\
+	regex.c 	\
+	hotlist.c 	\
+	tree.c 		\
+	win.c 		\
+	complete.c 	\
+	find.c 		\
+	wtools.c 	\
+	boxes.c 	\
+	background.c 	\
+	main.c 		\
+	popt.c 		\
+	text.c 		\
 	screen.c
 
 PC_SRCS= \
-	slint_pc.c \
-	chmod.c \
+	slint_pc.c 	\
+	chmod.c 	\
 	drive.c
 
 NT_SRCS= \
-	cons_nt.c \
-	dirent_nt.c \
-	key_nt.c \
-	util_win32.c \
-	util_winnt.c \
+	cons_nt.c 	\
+	dirent_nt.c 	\
+	key_nt.c 	\
+	util_win32.c 	\
+	util_winnt.c 	\
 	util_nt.c
 
 OS2_SRCS= \
-	cons_os2.c \
-	dirent_os2.c \
-	key_os2.c \
+	cons_os2.c 	\
+	dirent_os2.c 	\
+	key_os2.c 	\
 	util_os2.c
 
 SLANG_NT=slw32tty.c
 SLANG_OS2=slos2tty.c
 
-SLANG_SRCS= \
-	slerr.c \
-	slgetkey.c \
-	slsmg.c \
-	slvideo.c \
+SLANG_SRCS= 		\
+	slerr.c 	\
+	slgetkey.c 	\
+	slsmg.c 	\
+	slvideo.c 	\
 	$(SLANG_$(TARGET_OS))
 
-MCEDIT_SRCS= \
-	edit.c \
-	editcmd.c \
-	editdraw.c \
-	editmenu.c \
-	editoptions.c \
-	editwidget.c \
-	syntax.c \
+MCEDIT_SRCS= 		\
+	edit.c 		\
+	editcmd.c 	\
+	editdraw.c 	\
+	editmenu.c 	\
+	editoptions.c 	\
+	editwidget.c 	\
+	syntax.c 	\
 	wordproc.c
 
 SRCS=$(MC_SRCS) $(PC_SRCS) $($(TARGET_OS)_SRCS) $(EXTRA_MC_SRCS)
diff -ruN old/mc-4.5.6/pc/chmod.c new/mc-4.5.7/pc/chmod.c
--- old/mc-4.5.6/pc/chmod.c	Wed Jan  6 15:26:22 1999
+++ new/mc-4.5.7/pc/chmod.c	Tue Jan 12 22:38:08 1999
@@ -250,7 +250,6 @@
 #define XTRACT(i) BY+chmod_but[i].y-single_set, BX+chmod_but[i].x, \
      chmod_but[i].ret_cmd, chmod_but[i].flags, chmod_but[i].text, 0, 0, NULL
 
-    tk_new_frame (ch_dlg, "b.");
     for (i = 0; i < BUTTONS; i++) {
 	if (i == 2 && single_set)
 	    break;
@@ -260,7 +259,6 @@
 
 
 #define XTRACT2(i) 0, check_perm [i].text, NULL
-    tk_new_frame (ch_dlg, "c.");
     for (i = 0; i < PERMISSIONS; i++) {
 	check_perm[i].check = check_new (PY + (PERMISSIONS - i), PX + 2,
 					 XTRACT2 (i));
@@ -417,7 +415,6 @@
 	    check_perm[i].selected = 0;
 	}
 
-	tk_new_frame (ch_dlg, "l.");
 	/* Set the labels */
 	c_fname = name_trunc (fname, 21);
 	add_widget (ch_dlg, label_new (FY+2, FX+2, c_fname, NULL));
@@ -428,7 +425,6 @@
 	sprintf (buffer, "%o", c_stat);
 	statl = label_new (FY+4, FX+2, buffer, NULL);
 	add_widget (ch_dlg, statl);
-	tk_end_frame ();
 	
 	run_dlg (ch_dlg);	/* retrieve an action */
 	
diff -ruN old/mc-4.5.6/pc/config.h new/mc-4.5.7/pc/config.h
--- old/mc-4.5.6/pc/config.h	Wed Jan  6 15:26:22 1999
+++ new/mc-4.5.7/pc/config.h	Tue Jan 12 22:38:08 1999
@@ -34,6 +34,19 @@
 
 #define OS2_NT
 
+#define NEEDS_IO_H
+#define NEEDS_DRIVE_H
+#define NEEDS_FCNTL_H
+#define HAS_NO_GRP_PWD_H
+#define HAS_NO_TERMIOS_H
+#define HAS_NO_SYS_PARAM_H
+#define HAS_NO_SYS_IOCTL_H
+
+#define USE_O_TEXT
+#define HAS_ACS_AS_PCCHARS
+#define HAS_DIRECT_COLOR_ACCESS
+#define NEEDS_CR_LF_TRANSLATION
+
 #ifdef MC_NT
 #  ifndef WIN32
 #    define WIN32
@@ -55,6 +68,7 @@
 #  endif
 #  ifndef __os2__
 #    define __os2__
+#    define NEEDS_LOCAL_DIRENT_H
 #  endif
 #endif /* MC_OS2 */
 
@@ -81,7 +95,6 @@
 #define HAVE_STRING_H
 #define HAVE_DIRENT_H
 #define HAVE_LIMITS_H
-#define HAVE_FCNTL_H
 #define HAVE_UTIME_H
 
 #define HAVE_MEMSET
diff -ruN old/mc-4.5.6/pc/slint_pc.c new/mc-4.5.7/pc/slint_pc.c
--- old/mc-4.5.6/pc/slint_pc.c	Wed Jan  6 15:26:22 1999
+++ new/mc-4.5.7/pc/slint_pc.c	Tue Jan 12 22:38:08 1999
@@ -19,6 +19,7 @@
 
 #include <config.h>
 #include <stdio.h>
+#include <string.h>
 #include "../src/tty.h"
 #include "../src/mad.h"
 #include "../src/color.h"
diff -ruN old/mc-4.5.6/po/cat-id-tbl.c new/mc-4.5.7/po/cat-id-tbl.c
--- old/mc-4.5.6/po/cat-id-tbl.c	Wed Jan  6 15:26:29 1999
+++ new/mc-4.5.7/po/cat-id-tbl.c	Tue Jan 12 22:38:13 1999
@@ -39,75 +39,79 @@
   {"Remove", 30},
   {"Run this Command", 31},
   {"Command: ", 32},
-  {"Warning", 33},
-  {"Could not open %s; will not have initial desktop icons", 34},
-  {"Trashcan", 35},
-  {"Home directory", 36},
-  {"Could not symlink %s to %s; will not have initial desktop icons.", 37},
-  {"Files Exist", 38},
-  {"Some of the files you are trying to copy already exist in the destination folder.", 39},
-  {"Prompt me before overwriting any file.", 40},
-  {"Don't overwrite any files.", 41},
-  {"Overwrite:", 42},
-  {"Older files.", 43},
-  {"Files only if size differs.", 44},
-  {"All files.", 45},
-  {"File Exists", 46},
-  {"The target file already exists: %s", 47},
-  {"Replace it?", 48},
-  {"Copy", 49},
-  {"Move", 50},
-  {"Destination", 51},
-  {"Find Destination Folder", 52},
-  {"Copy as a background process", 53},
-  {"Advanced Options", 54},
-  {"Preserve symlinks", 55},
-  {"Follow links.", 56},
-  {"Selecting this will copy the files that symlinks point to instead of just copying the link.", 57},
-  {"Preserve file attributes.", 58},
-  {"Preserves the permissions and the UID/GID if possible", 59},
-  {"Recursively copy subdirectories.", 60},
-  {"If set, this will copy the directories recursively", 61},
-  {"File ", 62},
-  {" is ", 63},
-  {" Done.", 64},
-  {"Move here", 65},
-  {"Copy here", 66},
-  {"Link here", 67},
-  {"Cancel drag", 68},
+  {"Set Filter", 33},
+  {"Show all files", 34},
+  {".", 35},
+  {"\
+Enter a filter here for files in the panel view.\n\
+\n\
+For example:\n\
+*.gif will show just gif images", 36},
+  {"Enter a Regular Expression to filter files in the panel view.", 37},
+  {" Open with...", 38},
+  {"Enter extra arguments:", 39},
+  {"Warning", 40},
+  {"Could not open %s; will not have initial desktop icons", 41},
+  {"Trashcan", 42},
+  {"Home directory", 43},
+  {"Could not symlink %s to %s; will not have initial desktop icons.", 44},
+  {"Files Exist", 45},
+  {"Some of the files you are trying to copy already exist in the destination folder.", 46},
+  {"Prompt me before overwriting any file.", 47},
+  {"Don't overwrite any files.", 48},
+  {"Overwrite:", 49},
+  {"Older files.", 50},
+  {"Files only if size differs.", 51},
+  {"All files.", 52},
+  {"File Exists", 53},
+  {"The target file already exists: %s", 54},
+  {"Replace it?", 55},
+  {"Copy", 56},
+  {"Move", 57},
+  {"Destination", 58},
+  {"Find Destination Folder", 59},
+  {"Copy as a background process", 60},
+  {"Advanced Options", 61},
+  {"Preserve symlinks", 62},
+  {"Follow links.", 63},
+  {"Selecting this will copy the files that symlinks point to instead of just copying the link.", 64},
+  {"Preserve file attributes.", 65},
+  {"Preserves the permissions and the UID/GID if possible", 66},
+  {"Recursively copy subdirectories.", 67},
+  {"If set, this will copy the directories recursively", 68},
+  {"File ", 69},
+  {" is ", 70},
+  {" Done.", 71},
+  {"Move here", 72},
+  {"Copy here", 73},
+  {"Link here", 74},
+  {"Cancel drag", 75},
   {"\
 Could not stat %s\n\
-%s", 69},
-  {"Error", 70},
-  {"Default set of icons not found, check your installation", 71},
-  {"_New window", 72},
-  {"Opens a new window", 73},
-  {"_Open", 74},
-  {"Open selected files", 75},
-  {"_Copy...", 76},
-  {"Copy files", 77},
-  {"_Move...", 78},
-  {"Rename or move files", 79},
-  {"_Delete...", 80},
-  {"Delete files from disk", 81},
-  {"C_lose", 82},
-  {"Close this panel", 83},
-  {"_Cut", 84},
-  {"Cuts the selected files into the cut buffer.", 85},
-  {"C_opy", 86},
-  {"Copies the selected files into the cut buffer.", 87},
-  {"_Paste", 88},
-  {"Pastes files from the cut buffer into the current directory", 89},
-  {"_Select All", 90},
-  {"Select all files in the current Panel", 91},
-  {"_Select Files...", 92},
-  {"Select a group of files", 93},
-  {"_Invert Selection", 94},
-  {"Reverses the list of tagged files", 95},
-  {"_Rescan Directory", 96},
-  {"Rescan the directory contents", 97},
-  {"Preferences...", 98},
-  {"Configure the GNOME Midnight Commander", 99},
+%s", 76},
+  {"Error", 77},
+  {"Default set of icons not found, check your installation", 78},
+  {"Enter command to run", 79},
+  {"_New window", 80},
+  {"Opens a new window", 81},
+  {"_Open", 82},
+  {"Opens the selected files", 83},
+  {"_Copy...", 84},
+  {"Copy files", 85},
+  {"_Delete...", 86},
+  {"Delete files from disk", 87},
+  {"_Move...", 88},
+  {"Rename or move files", 89},
+  {"C_lose", 90},
+  {"Close this panel", 91},
+  {"_Select All", 92},
+  {"Select all files in the current Panel", 93},
+  {"_Select Files...", 94},
+  {"Select a group of files", 95},
+  {"_Invert Selection", 96},
+  {"Reverses the list of tagged files", 97},
+  {"_Rescan Directory", 98},
+  {"Rescan the directory contents", 99},
   {"Icon View", 100},
   {"Partial View", 101},
   {"Full View", 102},
@@ -121,20 +125,20 @@
   {"_Compare panels...", 110},
   {"Compare two panel contents", 111},
   {"_Run Command...", 112},
-  {"Run a command and put the results in a panel", 113},
-  {"_Active VFS list...", 114},
-  {"List of active virtual file systems", 115},
-  {"_Background jobs...", 116},
-  {"List of background operations", 117},
-  {"_About", 118},
-  {"Information on this program", 119},
-  {"_File", 120},
-  {"_Edit", 121},
-  {"_Layout", 122},
-  {"_Commands", 123},
-  {"_Help", 124},
-  {" Open with...", 125},
-  {"Enter extra arguments:", 126},
+  {"Runs a command", 113},
+  {"_Run Command in panel...", 114},
+  {"Run a command and put the results in a panel", 115},
+  {"_Active VFS list...", 116},
+  {"List of active virtual file systems", 117},
+  {"_Background jobs...", 118},
+  {"List of background operations", 119},
+  {"_About", 120},
+  {"Information on this program", 121},
+  {"_File", 122},
+  {"_Edit", 123},
+  {"_Layout", 124},
+  {"_Commands", 125},
+  {"_Help", 126},
   {"Properties", 127},
   {"Open", 128},
   {"Open with", 129},
@@ -197,760 +201,757 @@
   {"Offset 0x%08x", 186},
   {"Col %d", 187},
   {"%s bytes", 188},
-  {"Goto line", 189},
+  {"_Goto line", 189},
   {"Jump to a specified line number", 190},
-  {"Monitor file", 191},
+  {"_Monitor file", 191},
   {"Monitor file growing", 192},
-  {"Close", 193},
-  {"Close the viewer", 194},
-  {"Search", 195},
-  {"String search", 196},
-  {"Regexp search", 197},
-  {"Regular expression search", 198},
-  {"Search again...", 199},
-  {"Continue searching", 200},
-  {"Wrap", 201},
-  {"Wrap the text", 202},
-  {"Formatted", 203},
-  {"Hex", 204},
-  {"File", 205},
-  {"Mode", 206},
-  {"ok", 207},
-  {"cancel", 208},
-  {"help", 209},
-  {"yes", 210},
-  {"no", 211},
-  {"exit", 212},
-  {"abort", 213},
-  {" Error ", 214},
-  {" Failed trying to open file for reading: ", 215},
-  {" Cannot get size/permissions info on file: ", 216},
-  {" Not an ordinary file: ", 217},
-  {" File is too large: ", 218},
+  {"Regexp search", 193},
+  {"Regular expression search", 194},
+  {"_Wrap", 195},
+  {"Wrap the text", 196},
+  {"_Formatted", 197},
+  {"_Hex", 198},
+  {"_Search", 199},
+  {"_Mode", 200},
+  {"ok", 201},
+  {"cancel", 202},
+  {"help", 203},
+  {"yes", 204},
+  {"no", 205},
+  {"exit", 206},
+  {"abort", 207},
+  {" Error ", 208},
+  {" Failed trying to open file for reading: ", 209},
+  {" Cannot get size/permissions info on file: ", 210},
+  {" Not an ordinary file: ", 211},
+  {" File is too large: ", 212},
   {"\
  \n\
- Increase edit.h:MAXBUF and recompile the editor. ", 219},
-  {" Error allocating memory ", 220},
-  {" Save As ", 221},
-  {" Warning ", 222},
-  {" A file already exists with this name. ", 223},
-  {"Overwrite", 224},
-  {"Cancel", 225},
-  {" Save as ", 226},
-  {" Error trying to save file. ", 227},
-  {" Delete macro ", 228},
-  {" Error trying to open temp file ", 229},
-  {" Error trying to open macro file ", 230},
-  {"key '%d 0': ", 231},
-  {" Error trying to overwrite macro file ", 232},
-  {" Macro ", 233},
-  {" Press the macro's new hotkey: ", 234},
-  {" Save macro ", 235},
-  {" Delete Macro ", 236},
-  {" Load macro ", 237},
-  {" Confirm save file? : ", 238},
-  {" Save file ", 239},
-  {"Save", 240},
+ Increase edit.h:MAXBUF and recompile the editor. ", 213},
+  {" Error allocating memory ", 214},
+  {" Save As ", 215},
+  {" Warning ", 216},
+  {" A file already exists with this name. ", 217},
+  {"Overwrite", 218},
+  {"Cancel", 219},
+  {" Save as ", 220},
+  {" Error trying to save file. ", 221},
+  {" Delete macro ", 222},
+  {" Error trying to open temp file ", 223},
+  {" Error trying to open macro file ", 224},
+  {"key '%d 0': ", 225},
+  {" Error trying to overwrite macro file ", 226},
+  {" Macro ", 227},
+  {" Press the macro's new hotkey: ", 228},
+  {" Save macro ", 229},
+  {" Delete Macro ", 230},
+  {" Load macro ", 231},
+  {" Confirm save file? : ", 232},
+  {" Save file ", 233},
+  {"Save", 234},
   {"\
  Current text was modified without a file save. \n\
- Continue discards these changes. ", 241},
-  {"Continue", 242},
-  {" Load ", 243},
-  {" Error trying to open file for reading ", 244},
-  {" Block is large, you may not be able to undo this action. ", 245},
-  {" Continue ", 246},
-  {" Cancel ", 247},
-  {" Replace with: ", 248},
-  {" Replace ", 249},
-  {" Search ", 250},
-  {" Enter search text : ", 251},
-  {" Enter replace text : ", 252},
-  {" Enter argument order : ", 253},
-  {"Enter the order of replacement of your scanf format specifiers", 254},
-  {" Whole words only ", 255},
-  {" Case sensitive ", 256},
-  {" Regular expression ", 257},
-  {"See the regex man page for how to compose a regular expression", 258},
-  {" Backwards ", 259},
-  {"Warning: Searching backward can be slow", 260},
-  {" Prompt on replace ", 261},
-  {"Ask before making each replacement", 262},
-  {" Replace all ", 263},
-  {" Scanf expression ", 264},
-  {"Allows entering of a C format string, see the scanf man page", 265},
-  {"Begin search, Enter", 266},
-  {"Abort this dialog, Esc", 267},
-  {"Replace", 268},
-  {"Skip", 269},
-  {"Replace all", 270},
-  {" Invalid regular expression, or scanf expression with to many conversions ", 271},
-  {" Error in replacement format string. ", 272},
-  {" %ld replacements made. ", 273},
-  {" Search string not found. ", 274},
-  {" Quit ", 275},
+ Continue discards these changes. ", 235},
+  {"Continue", 236},
+  {" Load ", 237},
+  {" Error trying to open file for reading ", 238},
+  {" Block is large, you may not be able to undo this action. ", 239},
+  {" Continue ", 240},
+  {" Cancel ", 241},
+  {" Replace with: ", 242},
+  {" Replace ", 243},
+  {" Search ", 244},
+  {" Enter search text : ", 245},
+  {" Enter replace text : ", 246},
+  {" Enter argument order : ", 247},
+  {"Enter the order of replacement of your scanf format specifiers", 248},
+  {" Whole words only ", 249},
+  {" Case sensitive ", 250},
+  {" Regular expression ", 251},
+  {"See the regex man page for how to compose a regular expression", 252},
+  {" Backwards ", 253},
+  {"Warning: Searching backward can be slow", 254},
+  {" Prompt on replace ", 255},
+  {"Ask before making each replacement", 256},
+  {" Replace all ", 257},
+  {" Scanf expression ", 258},
+  {"Allows entering of a C format string, see the scanf man page", 259},
+  {"Begin search, Enter", 260},
+  {"Abort this dialog, Esc", 261},
+  {"Replace", 262},
+  {"Skip", 263},
+  {"Replace all", 264},
+  {" Invalid regular expression, or scanf expression with to many conversions ", 265},
+  {" Error in replacement format string. ", 266},
+  {" %ld replacements made. ", 267},
+  {" Search string not found. ", 268},
+  {" Quit ", 269},
   {"\
  Current text was modified without a file save. \n\
- Save with exit? ", 276},
-  {" File was modified, Save with exit? ", 277},
-  {"Cancel quit", 278},
-  {" &Cancel quit ", 279},
-  {" &Yes ", 280},
-  {" &No ", 281},
-  {" Copy to clipboard ", 282},
-  {" Unable to save to file. ", 283},
-  {" Cut to clipboard ", 284},
-  {" Goto line ", 285},
-  {" Enter line: ", 286},
-  {" Save Block ", 287},
-  {" Insert File ", 288},
-  {" Insert file ", 289},
-  {" Error trying to insert file. ", 290},
-  {" Sort block ", 291},
-  {" You must first highlight a block of text. ", 292},
-  {" Run Sort ", 293},
-  {" Enter sort options (see manpage) separated by whitespace: ", 294},
-  {" Sort ", 295},
-  {" Error trying to execute sort command ", 296},
-  {" Sort returned non-zero: ", 297},
-  {" Process block ", 298},
-  {" Error trying to stat file ", 299},
-  {" Mail ", 300},
-  {" Word wrap ", 301},
-  {" Enter line length, 0 for off: ", 302},
-  {"&Open/load...     C-o", 303},
-  {"&New              C-n", 304},
-  {"&Save              F2", 305},
-  {"save &As...       F12", 306},
-  {"&Insert file...   F15", 307},
-  {"copy to &File...  C-f", 308},
-  {"a&Bout...            ", 309},
-  {"&Quit             F10", 310},
-  {"&New            C-x k", 311},
-  {"copy to &File...     ", 312},
-  {"&Toggle Mark       F3", 313},
-  {"&Mark Columns    S-F3", 314},
-  {"toggle &Ins/overw Ins", 315},
-  {"&Copy              F5", 316},
-  {"&Move              F6", 317},
-  {"&Delete            F8", 318},
-  {"&Undo             C-u", 319},
-  {"&Beginning     C-PgUp", 320},
-  {"&End           C-PgDn", 321},
-  {"&Search...         F7", 322},
-  {"search &Again     F17", 323},
-  {"&Replace...        F4", 324},
-  {"&Goto line...            M-l", 325},
-  {"insert &Literal...       C-q", 326},
-  {"&Refresh screen          C-l", 327},
-  {"&Start record macro      C-r", 328},
-  {"&Finish record macro...  C-r", 329},
-  {"&Execute macro...   C-a, KEY", 330},
-  {"delete macr&O...            ", 331},
-  {"insert &Date/time           ", 332},
-  {"format p&Aragraph        M-p", 333},
-  {"'ispell' s&Pell check    C-p", 334},
-  {"sor&T...                 M-t", 335},
-  {"'indent' &C Formatter    F19", 336},
-  {"&Mail...                    ", 337},
-  {"&Execute macro... C-x e, KEY", 338},
-  {"'ispell' s&Pell check    M-$", 339},
-  {"&General...  ", 340},
-  {"&Save mode...", 341},
-  {"&Layout...", 342},
-  {" File ", 343},
-  {" Edit ", 344},
-  {" Sear/Repl ", 345},
-  {" Command ", 346},
-  {" Options ", 347},
-  {"Open...\tC-o", 348},
-  {"New\tC-n", 349},
-  {"Save\tF2", 350},
-  {"Save as...\tF12", 351},
-  {"Insert file...\tF15", 352},
-  {"Copy to file...\tC-f", 353},
-  {"Disk operations", 354},
-  {"Toggle mark\tF3", 355},
-  {"Toggle mark columns\tC-b", 356},
-  {"Toggle insert/overwrite\tIns", 357},
-  {"Copy block to cursor\tF5", 358},
-  {"Move block to cursor\tF6", 359},
-  {"Delete block\tF8/C-Del", 360},
-  {"Copy block to clipbrd\tC-Ins", 361},
-  {"Cut block to clipbrd\tS-Del", 362},
-  {"Paste block from clipbrd\tS-Ins", 363},
-  {"Selection history\tM-Ins", 364},
-  {"Undo\tC-BackSpace", 365},
-  {"Manipulating blocks of text", 366},
-  {" Srch/Replce ", 367},
-  {"Search...\tF7", 368},
-  {"Search again\tF17", 369},
-  {"Replace...\tF4", 370},
-  {"Replace again\tF14", 371},
-  {"Search for and replace text", 372},
-  {"Goto line...\tM-l", 373},
-  {"Start record macro\tC-r", 374},
-  {"Finish record macro...\tC-r", 375},
-  {"Execute macro...\tC-a, KEY", 376},
-  {"Delete macro...\t", 377},
-  {"Insert date/time\tC-d", 378},
-  {"Format paragraph\tM-p", 379},
-  {"Refresh display\tC-l", 380},
-  {"Macros and internal commands", 381},
-  {"None", 382},
-  {"Dynamic paragraphing", 383},
-  {"Type writer wrap", 384},
-  {"Wrap mode", 385},
-  {"Key emulation", 386},
-  {"Error initialising editor.\n", 387},
-  {"Help", 388},
-  {"Mark", 389},
-  {"Replac", 390},
-  {"PullDn", 391},
-  {"Quit", 392},
-  {"The Quick Brown Fox Jumps Over The Lazy Dog", 393},
-  {"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 394},
-  {"Open/Load", 395},
-  {"Load a different/new file", 396},
-  {"New", 397},
-  {"Clear the edit buffer", 398},
-  {"Save the current edit buffer to filename", 399},
-  {"Save As", 400},
-  {"Save the current edit buffer as filename", 401},
-  {"Insert File", 402},
-  {"Insert text from a file", 403},
-  {"Copy to file", 404},
-  {"copy a block to a file", 405},
-  {"Exit", 406},
-  {"Quit editor", 407},
-  {"Copy selection to clipboard", 408},
-  {"Cut", 409},
-  {"Cut selection to clipboard", 410},
-  {"Paste", 411},
-  {"Paste clipboard", 412},
-  {"Undo", 413},
-  {"Go back in time one key press", 414},
-  {"Find", 415},
-  {"Find string/regular expression", 416},
-  {"Find again", 417},
-  {"Repeat most recent search", 418},
-  {"Search/Replace", 419},
-  {"Find and replace text/regular expressions", 420},
-  {"About...", 421},
-  {"Info about Mcedit", 422},
-  {" Load syntax file ", 423},
-  {" File access error ", 424},
-  {" Syntax error in file %s on line %d ", 425},
-  {"&Cancel", 426},
-  {"&Set", 427},
-  {"S&kip", 428},
-  {"Set &all", 429},
-  {"owner", 430},
-  {"group", 431},
-  {"other", 432},
-  {"On", 433},
-  {"Flag", 434},
-  {"%6d of %d", 435},
-  {" Chown advanced command ", 436},
+ Save with exit? ", 270},
+  {" File was modified, Save with exit? ", 271},
+  {"Cancel quit", 272},
+  {" &Cancel quit ", 273},
+  {" &Yes ", 274},
+  {" &No ", 275},
+  {" Copy to clipboard ", 276},
+  {" Unable to save to file. ", 277},
+  {" Cut to clipboard ", 278},
+  {" Goto line ", 279},
+  {" Enter line: ", 280},
+  {" Save Block ", 281},
+  {" Insert File ", 282},
+  {" Insert file ", 283},
+  {" Error trying to insert file. ", 284},
+  {" Sort block ", 285},
+  {" You must first highlight a block of text. ", 286},
+  {" Run Sort ", 287},
+  {" Enter sort options (see manpage) separated by whitespace: ", 288},
+  {" Sort ", 289},
+  {" Error trying to execute sort command ", 290},
+  {" Sort returned non-zero: ", 291},
+  {" Process block ", 292},
+  {" Error trying to stat file ", 293},
+  {" Mail ", 294},
+  {" Word wrap ", 295},
+  {" Enter line length, 0 for off: ", 296},
+  {"&Open/load...     C-o", 297},
+  {"&New              C-n", 298},
+  {"&Save              F2", 299},
+  {"save &As...       F12", 300},
+  {"&Insert file...   F15", 301},
+  {"copy to &File...  C-f", 302},
+  {"a&Bout...            ", 303},
+  {"&Quit             F10", 304},
+  {"&New            C-x k", 305},
+  {"copy to &File...     ", 306},
+  {"&Toggle Mark       F3", 307},
+  {"&Mark Columns    S-F3", 308},
+  {"toggle &Ins/overw Ins", 309},
+  {"&Copy              F5", 310},
+  {"&Move              F6", 311},
+  {"&Delete            F8", 312},
+  {"&Undo             C-u", 313},
+  {"&Beginning     C-PgUp", 314},
+  {"&End           C-PgDn", 315},
+  {"&Search...         F7", 316},
+  {"search &Again     F17", 317},
+  {"&Replace...        F4", 318},
+  {"&Goto line...            M-l", 319},
+  {"insert &Literal...       C-q", 320},
+  {"&Refresh screen          C-l", 321},
+  {"&Start record macro      C-r", 322},
+  {"&Finish record macro...  C-r", 323},
+  {"&Execute macro...   C-a, KEY", 324},
+  {"delete macr&O...            ", 325},
+  {"insert &Date/time           ", 326},
+  {"format p&Aragraph        M-p", 327},
+  {"'ispell' s&Pell check    C-p", 328},
+  {"sor&T...                 M-t", 329},
+  {"'indent' &C Formatter    F19", 330},
+  {"&Mail...                    ", 331},
+  {"&Execute macro... C-x e, KEY", 332},
+  {"'ispell' s&Pell check    M-$", 333},
+  {"&General...  ", 334},
+  {"&Save mode...", 335},
+  {"&Layout...", 336},
+  {" File ", 337},
+  {" Edit ", 338},
+  {" Sear/Repl ", 339},
+  {" Command ", 340},
+  {" Options ", 341},
+  {"Open...\tC-o", 342},
+  {"New\tC-n", 343},
+  {"Save\tF2", 344},
+  {"Save as...\tF12", 345},
+  {"Insert file...\tF15", 346},
+  {"Copy to file...\tC-f", 347},
+  {"Disk operations", 348},
+  {"Toggle mark\tF3", 349},
+  {"Toggle mark columns\tC-b", 350},
+  {"Toggle insert/overwrite\tIns", 351},
+  {"Copy block to cursor\tF5", 352},
+  {"Move block to cursor\tF6", 353},
+  {"Delete block\tF8/C-Del", 354},
+  {"Copy block to clipbrd\tC-Ins", 355},
+  {"Cut block to clipbrd\tS-Del", 356},
+  {"Paste block from clipbrd\tS-Ins", 357},
+  {"Selection history\tM-Ins", 358},
+  {"Undo\tC-BackSpace", 359},
+  {"Manipulating blocks of text", 360},
+  {" Srch/Replce ", 361},
+  {"Search...\tF7", 362},
+  {"Search again\tF17", 363},
+  {"Replace...\tF4", 364},
+  {"Replace again\tF14", 365},
+  {"Search for and replace text", 366},
+  {"Goto line...\tM-l", 367},
+  {"Start record macro\tC-r", 368},
+  {"Finish record macro...\tC-r", 369},
+  {"Execute macro...\tC-a, KEY", 370},
+  {"Delete macro...\t", 371},
+  {"Insert date/time\tC-d", 372},
+  {"Format paragraph\tM-p", 373},
+  {"Refresh display\tC-l", 374},
+  {"Macros and internal commands", 375},
+  {"None", 376},
+  {"Dynamic paragraphing", 377},
+  {"Type writer wrap", 378},
+  {"Wrap mode", 379},
+  {"Key emulation", 380},
+  {"Error initialising editor.\n", 381},
+  {"Help", 382},
+  {"Mark", 383},
+  {"Replac", 384},
+  {"Search", 385},
+  {"PullDn", 386},
+  {"Quit", 387},
+  {"The Quick Brown Fox Jumps Over The Lazy Dog", 388},
+  {"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 389},
+  {"Open/Load", 390},
+  {"Load a different/new file", 391},
+  {"New", 392},
+  {"Clear the edit buffer", 393},
+  {"Save the current edit buffer to filename", 394},
+  {"Save As", 395},
+  {"Save the current edit buffer as filename", 396},
+  {"Insert File", 397},
+  {"Insert text from a file", 398},
+  {"Copy to file", 399},
+  {"copy a block to a file", 400},
+  {"Exit", 401},
+  {"Quit editor", 402},
+  {"Copy selection to clipboard", 403},
+  {"Cut", 404},
+  {"Cut selection to clipboard", 405},
+  {"Paste", 406},
+  {"Paste clipboard", 407},
+  {"Undo", 408},
+  {"Go back in time one key press", 409},
+  {"Find", 410},
+  {"Find string/regular expression", 411},
+  {"Find again", 412},
+  {"Repeat most recent search", 413},
+  {"Search/Replace", 414},
+  {"Find and replace text/regular expressions", 415},
+  {"About...", 416},
+  {"Info about Mcedit", 417},
+  {"File", 418},
+  {" Load syntax file ", 419},
+  {" File access error ", 420},
+  {" Syntax error in file %s on line %d ", 421},
+  {"&Cancel", 422},
+  {"&Set", 423},
+  {"S&kip", 424},
+  {"Set &all", 425},
+  {"owner", 426},
+  {"group", 427},
+  {"other", 428},
+  {"On", 429},
+  {"Flag", 430},
+  {"Mode", 431},
+  {"%6d of %d", 432},
+  {" Chown advanced command ", 433},
   {"\
  Couldn't chmod \"%s\" \n\
- %s ", 437},
+ %s ", 434},
   {"\
  Couldn't chown \"%s\" \n\
- %s ", 438},
-  {" Oops... ", 439},
-  {" I can't run the Advanced Chown command on an extfs ", 440},
-  {" I can't run the Advanced Chown command on a tarfs ", 441},
-  {"Background process:", 442},
-  {" Background process error ", 443},
-  {" Child died unexpectedly ", 444},
-  {" Unknown error in child ", 445},
-  {" Background protocol error ", 446},
+ %s ", 435},
+  {" Oops... ", 436},
+  {" I can't run the Advanced Chown command on an extfs ", 437},
+  {" I can't run the Advanced Chown command on a tarfs ", 438},
+  {"Background process:", 439},
+  {" Background process error ", 440},
+  {" Child died unexpectedly ", 441},
+  {" Unknown error in child ", 442},
+  {" Background protocol error ", 443},
   {"\
  Background process sent us a request for more arguments \n\
- than we can handle. \n", 447},
-  {" Listing mode ", 448},
-  {"&Full file list", 449},
-  {"&Brief file list", 450},
-  {"&Long file list", 451},
-  {"&User defined:", 452},
-  {"&Icon view", 453},
-  {"user &Mini status", 454},
-  {"Listing mode", 455},
-  {"&Reverse", 456},
-  {"case sensi&tive", 457},
-  {"Sort order", 458},
-  {" confirm &Exit ", 459},
-  {" confirm e&Xecute ", 460},
-  {" confirm o&Verwrite ", 461},
-  {" confirm &Delete ", 462},
-  {" Confirmation ", 463},
-  {"Full 8 bits output", 464},
-  {"ISO 8859-1", 465},
-  {"7 bits", 466},
-  {"F&ull 8 bits input", 467},
-  {" Display bits ", 468},
-  {"&Always use ftp proxy", 469},
-  {"sec", 470},
-  {"ftpfs directory cache timeout:", 471},
-  {"ftp anonymous password:", 472},
-  {"Timeout for freeing VFSs:", 473},
-  {" Virtual File System Setting ", 474},
-  {"Quick cd", 475},
-  {"cd", 476},
-  {"Symbolic link filename:", 477},
-  {"Existing filename (filename symlink will point to):", 478},
-  {"Running ", 479},
-  {"Stopped", 480},
-  {"&Stop", 481},
-  {"&Resume", 482},
-  {"&Kill", 483},
-  {"Background Jobs", 484},
-  {"execute/search by others", 485},
-  {"write by others", 486},
-  {"read by others", 487},
-  {"execute/search by group", 488},
-  {"write by group", 489},
-  {"read by group", 490},
-  {"execute/search by owner", 491},
-  {"write by owner", 492},
-  {"read by owner", 493},
-  {"sticky bit", 494},
-  {"set group ID on execution", 495},
-  {"set user ID on execution", 496},
-  {"C&lear marked", 497},
-  {"S&et marked", 498},
-  {"&Marked all", 499},
-  {"Permissions (Octal)", 500},
-  {"Owner name", 501},
-  {"Group name", 502},
-  {" Chmod command ", 503},
-  {" Permission ", 504},
-  {"Use SPACE to change", 505},
-  {"an option, ARROW KEYS", 506},
-  {"to move between options", 507},
-  {"and T or INS to mark", 508},
-  {"Chmod command", 509},
-  {" I can't run the Chmod command on an extfs ", 510},
-  {"Set &users", 511},
-  {"Set &groups", 512},
-  {" Name ", 513},
-  {" Owner name ", 514},
-  {" Group name ", 515},
-  {" Size ", 516},
-  {" Chown command ", 517},
-  {" User name ", 518},
-  {"<Unknown user>", 519},
-  {"<Unknown group>", 520},
-  {" I can't run the Chown command on an extfs ", 521},
-  {" I can't run the Chown command on a tarfs ", 522},
-  {" Can not fetch a local copy of %s ", 523},
-  {" CD ", 524},
-  {"Files tagged, want to cd?", 525},
-  {"Could not change directory", 526},
-  {" View file ", 527},
-  {" Filename:", 528},
-  {" Filtered view ", 529},
-  {" Filter command and arguments:", 530},
-  {" Mkdir ", 531},
-  {" Enter directory name:", 532},
-  {" Filter ", 533},
-  {" Set expression for filtering filenames", 534},
-  {" Select ", 535},
-  {"  Malformed regular expression  ", 536},
-  {" Unselect ", 537},
-  {"Extension file edit", 538},
-  {" Which extension file you want to edit? ", 539},
-  {"&User", 540},
-  {"&System Wide", 541},
-  {"Menu file edit", 542},
-  {" Which menu file will you edit? ", 543},
-  {"&Local", 544},
-  {"&Home", 545},
-  {" Compare directories ", 546},
-  {" Select compare method: ", 547},
-  {"&Quick", 548},
-  {"&Size only", 549},
-  {"&Thorough", 550},
-  {" Both panels should be on the listing view mode to use this command ", 551},
-  {" The command history is empty ", 552},
-  {" Command history ", 553},
+ than we can handle. \n", 444},
+  {" Listing mode ", 445},
+  {"&Full file list", 446},
+  {"&Brief file list", 447},
+  {"&Long file list", 448},
+  {"&User defined:", 449},
+  {"&Icon view", 450},
+  {"user &Mini status", 451},
+  {"Listing mode", 452},
+  {"&Reverse", 453},
+  {"case sensi&tive", 454},
+  {"Sort order", 455},
+  {" confirm &Exit ", 456},
+  {" confirm e&Xecute ", 457},
+  {" confirm o&Verwrite ", 458},
+  {" confirm &Delete ", 459},
+  {" Confirmation ", 460},
+  {"Full 8 bits output", 461},
+  {"ISO 8859-1", 462},
+  {"7 bits", 463},
+  {"F&ull 8 bits input", 464},
+  {" Display bits ", 465},
+  {"&Always use ftp proxy", 466},
+  {"sec", 467},
+  {"ftpfs directory cache timeout:", 468},
+  {"ftp anonymous password:", 469},
+  {"Timeout for freeing VFSs:", 470},
+  {" Virtual File System Setting ", 471},
+  {"Quick cd", 472},
+  {"cd", 473},
+  {"Symbolic link filename:", 474},
+  {"Existing filename (filename symlink will point to):", 475},
+  {"Running ", 476},
+  {"Stopped", 477},
+  {"&Stop", 478},
+  {"&Resume", 479},
+  {"&Kill", 480},
+  {"Background Jobs", 481},
+  {"execute/search by others", 482},
+  {"write by others", 483},
+  {"read by others", 484},
+  {"execute/search by group", 485},
+  {"write by group", 486},
+  {"read by group", 487},
+  {"execute/search by owner", 488},
+  {"write by owner", 489},
+  {"read by owner", 490},
+  {"sticky bit", 491},
+  {"set group ID on execution", 492},
+  {"set user ID on execution", 493},
+  {"C&lear marked", 494},
+  {"S&et marked", 495},
+  {"&Marked all", 496},
+  {"Permissions (Octal)", 497},
+  {"Owner name", 498},
+  {"Group name", 499},
+  {" Chmod command ", 500},
+  {" Permission ", 501},
+  {"Use SPACE to change", 502},
+  {"an option, ARROW KEYS", 503},
+  {"to move between options", 504},
+  {"and T or INS to mark", 505},
+  {"Chmod command", 506},
+  {" I can't run the Chmod command on an extfs ", 507},
+  {"Set &users", 508},
+  {"Set &groups", 509},
+  {" Name ", 510},
+  {" Owner name ", 511},
+  {" Group name ", 512},
+  {" Size ", 513},
+  {" Chown command ", 514},
+  {" User name ", 515},
+  {"<Unknown user>", 516},
+  {"<Unknown group>", 517},
+  {" I can't run the Chown command on an extfs ", 518},
+  {" I can't run the Chown command on a tarfs ", 519},
+  {" Can not fetch a local copy of %s ", 520},
+  {" CD ", 521},
+  {"Files tagged, want to cd?", 522},
+  {"Could not change directory", 523},
+  {" View file ", 524},
+  {" Filename:", 525},
+  {" Filtered view ", 526},
+  {" Filter command and arguments:", 527},
+  {" Mkdir ", 528},
+  {" Enter directory name:", 529},
+  {" Filter ", 530},
+  {" Set expression for filtering filenames", 531},
+  {" Select ", 532},
+  {"  Malformed regular expression  ", 533},
+  {" Unselect ", 534},
+  {"Extension file edit", 535},
+  {" Which extension file you want to edit? ", 536},
+  {"&User", 537},
+  {"&System Wide", 538},
+  {"Menu file edit", 539},
+  {" Which menu file will you edit? ", 540},
+  {"&Local", 541},
+  {"&Home", 542},
+  {" Compare directories ", 543},
+  {" Select compare method: ", 544},
+  {"&Quick", 545},
+  {"&Size only", 546},
+  {"&Thorough", 547},
+  {" Both panels should be on the listing view mode to use this command ", 548},
+  {" The command history is empty ", 549},
+  {" Command history ", 550},
   {"\
  Not an xterm or Linux console; \n\
- the panels cannot be toggled. ", 554},
+ the panels cannot be toggled. ", 551},
   {"\
 Type `exit' to return to the Midnight Commander\n\
 \r\n\
-\r", 555},
+\r", 552},
   {"\
  Couldn't stat %s \n\
- %s ", 556},
-  {" Link ", 557},
-  {" to:", 558},
-  {" link: %s ", 559},
-  {" symlink: %s ", 560},
-  {" Symlink ", 561},
-  {" points to:", 562},
-  {" Edit symlink ", 563},
-  {" edit symlink: %s ", 564},
-  {" Link symbolically ", 565},
-  {" Relative symlink ", 566},
-  {" relative symlink: %s ", 567},
-  {" Enter machine name (F1 for details): ", 568},
-  {" Could not chdir to %s ", 569},
-  {" Link to a remote machine ", 570},
-  {" FTP to machine ", 571},
-  {" Socket source routing setup ", 572},
-  {" Enter host name to use as a source routing hop: ", 573},
-  {" Host name ", 574},
-  {" Error while looking up IP address ", 575},
-  {" Undelete files on an ext2 file system ", 576},
+ %s ", 553},
+  {" Link ", 554},
+  {" to:", 555},
+  {" link: %s ", 556},
+  {" symlink: %s ", 557},
+  {" Symlink ", 558},
+  {" points to:", 559},
+  {" Edit symlink ", 560},
+  {" edit symlink: %s ", 561},
+  {" Link symbolically ", 562},
+  {" Relative symlink ", 563},
+  {" relative symlink: %s ", 564},
+  {" Enter machine name (F1 for details): ", 565},
+  {" Could not chdir to %s ", 566},
+  {" Link to a remote machine ", 567},
+  {" FTP to machine ", 568},
+  {" Socket source routing setup ", 569},
+  {" Enter host name to use as a source routing hop: ", 570},
+  {" Host name ", 571},
+  {" Error while looking up IP address ", 572},
+  {" Undelete files on an ext2 file system ", 573},
   {"\
  Enter device (without /dev/) to undelete\n\
-   files on: (F1 for details)", 577},
-  {" Setup saved to ~/", 578},
-  {" Setup ", 579},
+   files on: (F1 for details)", 574},
+  {" Setup saved to ~/", 575},
+  {" Setup ", 576},
   {"\
  Can't chdir to '%s' \n\
- %s ", 580},
-  {" You can not execute commands on non-local filesystems", 581},
+ %s ", 577},
+  {" You can not execute commands on non-local filesystems", 578},
   {"\
 \n\
 \n\
 \n\
 refresh stack underflow!\n\
 \n\
-\n", 582},
-  {"&Unsorted", 583},
-  {"&Name", 584},
-  {"&Extension", 585},
-  {"&Modify time", 586},
-  {"&Access time", 587},
-  {"&Change time", 588},
-  {"&Size", 589},
-  {"&Inode", 590},
-  {"&Type", 591},
-  {"&Links", 592},
-  {"N&GID", 593},
-  {"N&UID", 594},
-  {"&Owner", 595},
-  {"&Group", 596},
-  {"File exists but can not be stat-ed: %s %s", 597},
-  {"Unknown", 598},
+\n", 579},
+  {"&Unsorted", 580},
+  {"&Name", 581},
+  {"&Extension", 582},
+  {"&Modify time", 583},
+  {"&Access time", 584},
+  {"&Change time", 585},
+  {"&Size", 586},
+  {"&Inode", 587},
+  {"&Type", 588},
+  {"&Links", 589},
+  {"N&GID", 590},
+  {"N&UID", 591},
+  {"&Owner", 592},
+  {"&Group", 593},
+  {"File exists but can not be stat-ed: %s %s", 594},
+  {"Unknown", 595},
   {"\
  Can't create temporary command file \n\
- %s ", 599},
-  {" Parameter ", 600},
-  {" Can't execute commands on a Virtual File System directory ", 601},
-  {" file error", 602},
-  {"Format of the ", 603},
-  {" file error ", 604},
-  {"Format of the ~/", 605},
+ %s ", 596},
+  {" Parameter ", 597},
+  {" Can't execute commands on a Virtual File System directory ", 598},
+  {" file error", 599},
+  {"Format of the ", 600},
+  {" file error ", 601},
+  {"Format of the ~/", 602},
   {"\
  file has changed\n\
 with version 3.0. You may want either to\n\
-copy it from ", 606},
+copy it from ", 603},
   {"\
 mc.ext or use that\n\
-file as an example of how to write it.\n", 607},
-  {"mc.ext will be used for this moment.", 608},
-  {" Copy ", 609},
-  {" Move ", 610},
-  {" Delete ", 611},
-  {" Invalid target mask ", 612},
-  {" Could not make the hardlink ", 613},
+file as an example of how to write it.\n", 604},
+  {"mc.ext will be used for this moment.", 605},
+  {" Copy ", 606},
+  {" Move ", 607},
+  {" Delete ", 608},
+  {" Invalid target mask ", 609},
+  {" Could not make the hardlink ", 610},
   {"\
  Cannot read source link \"%s\" \n\
- %s ", 614},
+ %s ", 611},
   {"\
  Cannot make stable symlinks across non-local filesystems: \n\
 \n\
- Option Stable Symlinks will be disabled ", 615},
+ Option Stable Symlinks will be disabled ", 612},
   {"\
  Cannot create target symlink \"%s\" \n\
- %s ", 616},
+ %s ", 613},
   {"\
  Cannot overwrite directory \"%s\" \n\
- %s ", 617},
+ %s ", 614},
   {"\
  Cannot stat source file \"%s\" \n\
- %s ", 618},
-  {" `%s' and `%s' are the same file. ", 619},
+ %s ", 615},
+  {" `%s' and `%s' are the same file. ", 616},
   {"\
  Cannot create special file \"%s\" \n\
- %s ", 620},
+ %s ", 617},
   {"\
  Cannot chown target file \"%s\" \n\
- %s ", 621},
+ %s ", 618},
   {"\
  Cannot chmod target file \"%s\" \n\
- %s ", 622},
+ %s ", 619},
   {"\
  Cannot open source file \"%s\" \n\
- %s ", 623},
-  {" Reget failed, about to overwrite file ", 624},
+ %s ", 620},
+  {" Reget failed, about to overwrite file ", 621},
   {"\
  Cannot fstat source file \"%s\" \n\
- %s ", 625},
+ %s ", 622},
   {"\
  Cannot create target file \"%s\" \n\
- %s ", 626},
+ %s ", 623},
   {"\
  Cannot fstat target file \"%s\" \n\
- %s ", 627},
+ %s ", 624},
   {"\
  Cannot read source file \"%s\" \n\
- %s ", 628},
+ %s ", 625},
   {"\
  Cannot write target file \"%s\" \n\
- %s ", 629},
-  {"(stalled)", 630},
+ %s ", 626},
+  {"(stalled)", 627},
   {"\
  Cannot close source file \"%s\" \n\
- %s ", 631},
+ %s ", 628},
   {"\
  Cannot close target file \"%s\" \n\
- %s ", 632},
-  {"Incomplete file was retrieved. Keep it?", 633},
-  {"&Delete", 634},
-  {"&Keep", 635},
+ %s ", 629},
+  {"Incomplete file was retrieved. Keep it?", 630},
+  {"&Delete", 631},
+  {"&Keep", 632},
   {"\
  Cannot stat source directory \"%s\" \n\
- %s ", 636},
+ %s ", 633},
   {"\
  Source directory \"%s\" is not a directory \n\
- %s ", 637},
+ %s ", 634},
   {"\
  Cannot copy cyclic symbolic link \n\
- `%s' ", 638},
+ `%s' ", 635},
   {"\
  Cannot create target directory \"%s\" \n\
- %s ", 639},
+ %s ", 636},
   {"\
  Cannot chown target directory \"%s\" \n\
- %s ", 640},
+ %s ", 637},
   {"\
  Cannot stat file \"%s\" \n\
- %s ", 641},
-  {" `%s' and `%s' are the same file ", 642},
-  {" Cannot overwrite directory `%s' ", 643},
+ %s ", 638},
+  {" `%s' and `%s' are the same file ", 639},
+  {" Cannot overwrite directory `%s' ", 640},
   {"\
  Cannot move file \"%s\" to \"%s\" \n\
- %s ", 644},
+ %s ", 641},
   {"\
  Cannot remove file \"%s\" \n\
- %s ", 645},
-  {" Cannot overwrite directory \"%s\" %s ", 646},
-  {" Cannot overwrite file \"%s\" %s ", 647},
+ %s ", 642},
+  {" Cannot overwrite directory \"%s\" %s ", 643},
+  {" Cannot overwrite file \"%s\" %s ", 644},
   {"\
  Cannot move directory \"%s\" to \"%s\" \n\
- %s ", 648},
+ %s ", 645},
   {"\
  Cannot delete file \"%s\" \n\
- %s ", 649},
+ %s ", 646},
   {"\
  Cannot remove directory \"%s\" \n\
- %s ", 650},
-  {" Internal error: get_file \n", 651},
-  {" Can't operate on \"..\"! ", 652},
-  {"Yes", 653},
-  {"No", 654},
-  {" Sorry, I could not put the job in background ", 655},
-  {" Internal failure ", 656},
-  {" Unknown file operation ", 657},
+ %s ", 647},
+  {" Internal error: get_file \n", 648},
+  {" Can't operate on \"..\"! ", 649},
+  {"Yes", 650},
+  {"No", 651},
+  {" Sorry, I could not put the job in background ", 652},
+  {" Internal failure ", 653},
+  {" Unknown file operation ", 654},
   {"\
  Destination \"%s\" must be a directory \n\
- %s ", 658},
-  {"&Skip", 659},
-  {"&Retry", 660},
-  {"&Abort", 661},
+ %s ", 655},
+  {"&Skip", 656},
+  {"&Retry", 657},
+  {"&Abort", 658},
   {"\
 \n\
    Directory not empty.   \n\
-   Delete it recursively? ", 662},
+   Delete it recursively? ", 659},
   {"\
 \n\
    Background process: Directory not empty \n\
-   Delete it recursively? ", 663},
-  {"a&ll", 664},
-  {"non&E", 665},
-  {" Type 'yes' if you REALLY want to delete ", 666},
-  {"all the directories ", 667},
-  {" Recursive Delete ", 668},
-  {" Background process: Recursive Delete ", 669},
-  {"1Copy", 670},
-  {"1Move", 671},
-  {"1Delete", 672},
-  {"%o %f \"%s\"%m", 673},
-  {"%o %d %f%m", 674},
-  {"%o %f \"%s\"%e", 675},
-  {"%o %d %f%e", 676},
-  {"file", 677},
-  {"files", 678},
-  {"directory", 679},
-  {"directories", 680},
-  {"files/directories", 681},
-  {" with source mask:", 682},
-  {"Count", 683},
-  {"Bytes", 684},
-  {"Source", 685},
-  {"Target", 686},
-  {"Deleting", 687},
-  {"Target file \"%s\" already exists!", 688},
-  {"if &Size differs", 689},
-  {"&Update", 690},
-  {"al&L", 691},
-  {"Overwrite all targets?", 692},
-  {"&Reget", 693},
-  {"ap&Pend", 694},
-  {"Overwrite this target?", 695},
-  {"Target date: %s, size %d", 696},
-  {"Source date: %s, size %d", 697},
-  {" File exists ", 698},
-  {" Background process: File exists ", 699},
-  {"preserve &Attributes", 700},
-  {"follow &Links", 701},
-  {"to:", 702},
-  {"&Using shell patterns", 703},
-  {"&Background", 704},
-  {"&Stable Symlinks", 705},
-  {"&Dive into subdir if exists", 706},
+   Delete it recursively? ", 660},
+  {"a&ll", 661},
+  {"non&E", 662},
+  {" Type 'yes' if you REALLY want to delete ", 663},
+  {"all the directories ", 664},
+  {" Recursive Delete ", 665},
+  {" Background process: Recursive Delete ", 666},
+  {"1Copy", 667},
+  {"1Move", 668},
+  {"1Delete", 669},
+  {"%o %f \"%s\"%m", 670},
+  {"%o %d %f%m", 671},
+  {"%o %f \"%s\"%e", 672},
+  {"%o %d %f%e", 673},
+  {"file", 674},
+  {"files", 675},
+  {"directory", 676},
+  {"directories", 677},
+  {"files/directories", 678},
+  {" with source mask:", 679},
+  {"Count", 680},
+  {"Bytes", 681},
+  {"Source", 682},
+  {"Target", 683},
+  {"Deleting", 684},
+  {"Target file \"%s\" already exists!", 685},
+  {"if &Size differs", 686},
+  {"&Update", 687},
+  {"al&L", 688},
+  {"Overwrite all targets?", 689},
+  {"&Reget", 690},
+  {"ap&Pend", 691},
+  {"Overwrite this target?", 692},
+  {"Target date: %s, size %d", 693},
+  {"Source date: %s, size %d", 694},
+  {" File exists ", 695},
+  {" Background process: File exists ", 696},
+  {"preserve &Attributes", 697},
+  {"follow &Links", 698},
+  {"to:", 699},
+  {"&Using shell patterns", 700},
+  {"&Background", 701},
+  {"&Stable Symlinks", 702},
+  {"&Dive into subdir if exists", 703},
   {"\
 Invalid source pattern `%s' \n\
- %s ", 707},
-  {"&Suspend", 708},
-  {"Con&tinue", 709},
-  {"&Chdir", 710},
-  {"&Again", 711},
-  {"&Quit", 712},
-  {"Pane&lize", 713},
-  {"&View - F3", 714},
-  {"&Edit - F4", 715},
-  {"Start at:", 716},
-  {"Filename:", 717},
-  {"Content: ", 718},
-  {"&Tree", 719},
-  {"Find File", 720},
-  {"Grepping in %s", 721},
-  {" Find/read ", 722},
-  {" Problem reading from child ", 723},
-  {"Finished", 724},
-  {"Searching %s", 725},
-  {"Searching", 726},
-  {"Find file", 727},
-  {"Usage: fixhlp <width> <tocname>\n", 728},
-  {"fixhlp: Cannot open toc for writing", 729},
+ %s ", 704},
+  {"&Suspend", 705},
+  {"Con&tinue", 706},
+  {"&Chdir", 707},
+  {"&Again", 708},
+  {"&Quit", 709},
+  {"Pane&lize", 710},
+  {"&View - F3", 711},
+  {"&Edit - F4", 712},
+  {"Start at:", 713},
+  {"Filename:", 714},
+  {"Content: ", 715},
+  {"&Tree", 716},
+  {"Find File", 717},
+  {"Grepping in %s", 718},
+  {" Find/read ", 719},
+  {" Problem reading from child ", 720},
+  {"Finished", 721},
+  {"Searching %s", 722},
+  {"Searching", 723},
+  {"Find file", 724},
+  {"Usage: fixhlp <width> <tocname>\n", 725},
+  {"fixhlp: Cannot open toc for writing", 726},
   {"\
 \004[Contents]\n\
  Topics:\n\
-\n", 730},
+\n", 727},
   {"\
  Help file format error\n\
-\004", 731},
-  {" Internal bug: Double start of link area ", 732},
-  {" Can't find node [Contents] in help file ", 733},
-  {" Help ", 734},
+\004", 728},
+  {" Internal bug: Double start of link area ", 729},
+  {" Can't find node [Contents] in help file ", 730},
+  {" Help ", 731},
   {"\
  Can't open file %s \n\
- %s ", 735},
-  {" Can't find node %s in help file ", 736},
-  {"Index", 737},
-  {"Prev", 738},
-  {"&Move", 739},
-  {"&Remove", 740},
-  {"&Append", 741},
-  {"&Insert", 742},
-  {"New &Entry", 743},
-  {"New &Group", 744},
-  {"&Up", 745},
-  {"&Add current", 746},
-  {"Change &To", 747},
-  {"Subgroup - press ENTER to see list", 748},
-  {"Active VFS directories", 749},
-  {"Directory hotlist", 750},
-  {" Directory path ", 751},
-  {" Directory label ", 752},
-  {"Moving ", 753},
-  {"New hotlist entry", 754},
-  {"Directory label", 755},
-  {"Directory path", 756},
-  {" New hotlist group ", 757},
-  {"Name of new group", 758},
-  {"Label for \"%s\":", 759},
-  {" Add to hotlist ", 760},
-  {" Remove: ", 761},
+ %s ", 732},
+  {" Can't find node %s in help file ", 733},
+  {"Index", 734},
+  {"Prev", 735},
+  {"&Move", 736},
+  {"&Remove", 737},
+  {"&Append", 738},
+  {"&Insert", 739},
+  {"New &Entry", 740},
+  {"New &Group", 741},
+  {"&Up", 742},
+  {"&Add current", 743},
+  {"Change &To", 744},
+  {"Subgroup - press ENTER to see list", 745},
+  {"Active VFS directories", 746},
+  {"Directory hotlist", 747},
+  {" Directory path ", 748},
+  {" Directory label ", 749},
+  {"Moving ", 750},
+  {"New hotlist entry", 751},
+  {"Directory label", 752},
+  {"Directory path", 753},
+  {" New hotlist group ", 754},
+  {"Name of new group", 755},
+  {"Label for \"%s\":", 756},
+  {" Add to hotlist ", 757},
+  {" Remove: ", 758},
   {"\
 \n\
  Group not empty.\n\
- Remove it?", 762},
-  {" Top level group ", 763},
-  {"Hotlist is now kept in file ~/", 764},
-  {"MC will load hotlist from ~/", 765},
-  {"and then delete [Hotlist] section there", 766},
-  {" Hotlist Load ", 767},
-  {"MC was unable to write ~/", 768},
-  {" file, your old hotlist entries were not deleted", 769},
-  {"You have ~/", 770},
-  {" file and [Hotlist] section in ~/", 771},
-  {"Your ~/", 772},
-  {" most probably was created\n", 773},
+ Remove it?", 759},
+  {" Top level group ", 760},
+  {"Hotlist is now kept in file ~/", 761},
+  {"MC will load hotlist from ~/", 762},
+  {"and then delete [Hotlist] section there", 763},
+  {" Hotlist Load ", 764},
+  {"MC was unable to write ~/", 765},
+  {" file, your old hotlist entries were not deleted", 766},
+  {"You have ~/", 767},
+  {" file and [Hotlist] section in ~/", 768},
+  {"Your ~/", 769},
+  {" most probably was created\n", 770},
   {"\
 by an earlier development version of MC\n\
-and is more actual than ~/", 774},
+and is more actual than ~/", 771},
   {"\
  entries\n\
-\n", 775},
+\n", 772},
   {"\
 You can choose between\n\
 \n\
-  Remove - remove old hotlist entries from ~/", 776},
+  Remove - remove old hotlist entries from ~/", 773},
   {"\
   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 ~/", 777},
-  {"&Merge", 778},
-  {" Entries from ~/", 779},
-  {" file your old hotlist entries were not deleted", 780},
-  {"Midnight Commander %s", 781},
-  {"Free nodes %d (%d%%) of %d", 782},
-  {"No node information", 783},
-  {"Free space ", 784},
-  {" (%d%%) of ", 785},
-  {"No space information", 786},
-  {"Type:      %s ", 787},
-  {"non-local vfs", 788},
-  {"Device:    %s", 789},
-  {"Filesystem: %s", 790},
-  {"Accessed:  %s", 791},
-  {"Modified:  %s", 792},
-  {"Created:   %s", 793},
-  {"Size:      ", 794},
-  {" (%d blocks)", 795},
-  {"Owner:     %s/%s", 796},
-  {"Links:     %d", 797},
-  {"Mode:      %s (%04o)", 798},
-  {"Location:  %Xh:%Xh", 799},
-  {"File:       %s", 800},
-  {"File:       None", 801},
-  {"&Vertical", 802},
-  {"&Horizontal", 803},
-  {"&Xterm hintbar", 804},
-  {"h&Intbar visible", 805},
-  {"&Keybar visible", 806},
-  {"command &Prompt", 807},
-  {"show &Mini status", 808},
-  {"menu&Bar visible", 809},
-  {"&Equal split", 810},
-  {"pe&Rmissions", 811},
-  {"&File types", 812},
-  {"&Save", 813},
-  {" Layout ", 814},
-  {" Panel split ", 815},
-  {" Highlight... ", 816},
-  {" Other options ", 817},
-  {"output lines", 818},
-  {"Layout", 819},
-  {" Learn keys ", 820},
-  {" Teach me a key ", 821},
+  Merge  - add old entries to hotlist as group \"Entries from ~/", 774},
+  {"&Merge", 775},
+  {" Entries from ~/", 776},
+  {" file your old hotlist entries were not deleted", 777},
+  {"Midnight Commander %s", 778},
+  {"Free nodes %d (%d%%) of %d", 779},
+  {"No node information", 780},
+  {"Free space ", 781},
+  {" (%d%%) of ", 782},
+  {"No space information", 783},
+  {"Type:      %s ", 784},
+  {"non-local vfs", 785},
+  {"Device:    %s", 786},
+  {"Filesystem: %s", 787},
+  {"Accessed:  %s", 788},
+  {"Modified:  %s", 789},
+  {"Created:   %s", 790},
+  {"Size:      ", 791},
+  {" (%d blocks)", 792},
+  {"Owner:     %s/%s", 793},
+  {"Links:     %d", 794},
+  {"Mode:      %s (%04o)", 795},
+  {"Location:  %Xh:%Xh", 796},
+  {"File:       %s", 797},
+  {"File:       None", 798},
+  {"&Vertical", 799},
+  {"&Horizontal", 800},
+  {"&Xterm hintbar", 801},
+  {"h&Intbar visible", 802},
+  {"&Keybar visible", 803},
+  {"command &Prompt", 804},
+  {"show &Mini status", 805},
+  {"menu&Bar visible", 806},
+  {"&Equal split", 807},
+  {"pe&Rmissions", 808},
+  {"&File types", 809},
+  {"&Save", 810},
+  {" Layout ", 811},
+  {" Panel split ", 812},
+  {" Highlight... ", 813},
+  {" Other options ", 814},
+  {"output lines", 815},
+  {"Layout", 816},
+  {" Learn keys ", 817},
+  {" Teach me a key ", 818},
   {"\
 Please press the %s\n\
 and then wait until this message disappears.\n\
@@ -959,326 +960,325 @@
 next to its button.\n\
 \n\
 If you want to escape, press a single Escape key\n\
-and wait as well.", 822},
-  {" Cannot accept this key ", 823},
-  {" You have entered \"%s\"", 824},
-  {"OK", 825},
+and wait as well.", 819},
+  {" Cannot accept this key ", 820},
+  {" You have entered \"%s\"", 821},
+  {"OK", 822},
   {"\
 It seems that all your keys already\n\
-work fine. That's great.", 826},
-  {"&Discard", 827},
+work fine. That's great.", 823},
+  {"&Discard", 824},
   {"\
 Great! You have a complete terminal database!\n\
-All your keys work well.", 828},
-  {"Learn keys", 829},
-  {"Press all the keys mentioned here. After you have done it, check", 830},
-  {"which keys are not marked with OK.  Press space on the missing", 831},
-  {"key, or click with the mouse to define it. Move around with Tab.", 832},
+All your keys work well.", 825},
+  {"Learn keys", 826},
+  {"Press all the keys mentioned here. After you have done it, check", 827},
+  {"which keys are not marked with OK.  Press space on the missing", 828},
+  {"key, or click with the mouse to define it. Move around with Tab.", 829},
   {"\
  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? ", 833},
-  {"Press any key to continue...", 834},
-  {" The shell is already running a command ", 835},
-  {"&Listing mode...", 836},
-  {"&Quick view     C-x q", 837},
-  {"&Info           C-x i", 838},
-  {"&Sort order...", 839},
-  {"&Filter...", 840},
-  {"&Network link...", 841},
-  {"FT&P link...", 842},
-  {"&Drive...       M-d", 843},
-  {"&Rescan         C-r", 844},
-  {"&User menu          F2", 845},
-  {"&View               F3", 846},
-  {"Vie&w file...         ", 847},
-  {"&Filtered view     M-!", 848},
-  {"&Edit               F4", 849},
-  {"&Copy               F5", 850},
-  {"c&Hmod           C-x c", 851},
-  {"&Link            C-x l", 852},
-  {"&SymLink         C-x s", 853},
-  {"edit s&Ymlink  C-x C-s", 854},
-  {"ch&Own           C-x o", 855},
-  {"&Advanced chown       ", 856},
-  {"&Rename/Move        F6", 857},
-  {"&Mkdir              F7", 858},
-  {"&Delete             F8", 859},
-  {"&Quick cd          M-c", 860},
-  {"select &Group      M-+", 861},
-  {"u&Nselect group    M-\\", 862},
-  {"reverse selec&Tion M-*", 863},
-  {"e&Xit              F10", 864},
-  {"&Directory tree", 865},
-  {"&Find file            M-?", 866},
-  {"s&Wap panels          C-u", 867},
-  {"switch &Panels on/off C-o", 868},
-  {"&Compare directories  C-x d", 869},
-  {"e&Xternal panelize    C-x !", 870},
-  {"show directory s&Izes", 871},
-  {"command &History", 872},
-  {"di&Rectory hotlist    C-\\", 873},
-  {"&Active VFS list      C-x a", 874},
-  {"&Background jobs      C-x j", 875},
-  {"&Undelete files (ext2fs only)", 876},
-  {"&Listing format edit", 877},
-  {"&Extension file edit", 878},
-  {"&Menu file edit", 879},
-  {"&Configuration...", 880},
-  {"c&Onfirmation...", 881},
-  {"&Display bits...", 882},
-  {"learn &Keys...", 883},
-  {"&Virtual FS...", 884},
-  {"&Save setup", 885},
-  {" &Left ", 886},
-  {" &Above ", 887},
-  {" &File ", 888},
-  {" &Command ", 889},
-  {" &Options ", 890},
-  {" &Right ", 891},
-  {" &Below ", 892},
-  {" Information ", 893},
+ extra access permissions with the \"su\" command? ", 830},
+  {"Press any key to continue...", 831},
+  {" The shell is already running a command ", 832},
+  {"&Listing mode...", 833},
+  {"&Quick view     C-x q", 834},
+  {"&Info           C-x i", 835},
+  {"&Sort order...", 836},
+  {"&Filter...", 837},
+  {"&Network link...", 838},
+  {"FT&P link...", 839},
+  {"&Drive...       M-d", 840},
+  {"&Rescan         C-r", 841},
+  {"&User menu          F2", 842},
+  {"&View               F3", 843},
+  {"Vie&w file...         ", 844},
+  {"&Filtered view     M-!", 845},
+  {"&Edit               F4", 846},
+  {"&Copy               F5", 847},
+  {"c&Hmod           C-x c", 848},
+  {"&Link            C-x l", 849},
+  {"&SymLink         C-x s", 850},
+  {"edit s&Ymlink  C-x C-s", 851},
+  {"ch&Own           C-x o", 852},
+  {"&Advanced chown       ", 853},
+  {"&Rename/Move        F6", 854},
+  {"&Mkdir              F7", 855},
+  {"&Delete             F8", 856},
+  {"&Quick cd          M-c", 857},
+  {"select &Group      M-+", 858},
+  {"u&Nselect group    M-\\", 859},
+  {"reverse selec&Tion M-*", 860},
+  {"e&Xit              F10", 861},
+  {"&Directory tree", 862},
+  {"&Find file            M-?", 863},
+  {"s&Wap panels          C-u", 864},
+  {"switch &Panels on/off C-o", 865},
+  {"&Compare directories  C-x d", 866},
+  {"e&Xternal panelize    C-x !", 867},
+  {"show directory s&Izes", 868},
+  {"command &History", 869},
+  {"di&Rectory hotlist    C-\\", 870},
+  {"&Active VFS list      C-x a", 871},
+  {"&Background jobs      C-x j", 872},
+  {"&Undelete files (ext2fs only)", 873},
+  {"&Listing format edit", 874},
+  {"&Extension file edit", 875},
+  {"&Menu file edit", 876},
+  {"&Configuration...", 877},
+  {"c&Onfirmation...", 878},
+  {"&Display bits...", 879},
+  {"learn &Keys...", 880},
+  {"&Virtual FS...", 881},
+  {"&Save setup", 882},
+  {" &Left ", 883},
+  {" &Above ", 884},
+  {" &File ", 885},
+  {" &Command ", 886},
+  {" &Options ", 887},
+  {" &Right ", 888},
+  {" &Below ", 889},
+  {" Information ", 890},
   {"\
  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.                                           ", 894},
-  {"Menu", 895},
-  {"Thank you for using GNU Midnight Commander", 896},
-  {"with mouse support on xterm%s.\n", 897},
-  {" and the Linux console", 898},
-  {"The TERM environment variable is unset!\n", 899},
-  {"Library directory for the Midnight Commander: %s\n", 900},
-  {"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 901},
-  {"Geometry for the window", 902},
-  {"GEOMETRY", 903},
-  {"No windows opened at startup", 904},
+ the details.                                           ", 891},
+  {"Menu", 892},
+  {"Thank you for using GNU Midnight Commander", 893},
+  {"with mouse support on xterm%s.\n", 894},
+  {" and the Linux console", 895},
+  {"The TERM environment variable is unset!\n", 896},
+  {"Library directory for the Midnight Commander: %s\n", 897},
+  {"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 898},
+  {"Geometry for the window", 899},
+  {"GEOMETRY", 900},
+  {"No windows opened at startup", 901},
   {"\
 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", 905},
-  {" Notice ", 906},
+On some systems you may want to run # `which mc`\n", 902},
+  {" Notice ", 903},
   {"\
  The Midnight Commander configuration files \n\
  are now stored in the ~/.mc directory, the \n\
- files have been moved now\n", 907},
-  {"safe de&Lete", 908},
-  {"cd follows lin&Ks", 909},
-  {"advanced cho&Wn", 910},
-  {"l&Ynx-like motion", 911},
-  {"Animation", 912},
-  {"rotatin&G dash", 913},
-  {"co&Mplete: show all", 914},
-  {"&Use internal view", 915},
-  {"use internal ed&It", 916},
-  {"auto m&Enus", 917},
-  {"&Auto save setup", 918},
-  {"shell &Patterns", 919},
-  {"Compute &Totals", 920},
-  {"&Verbose operation", 921},
-  {"&Fast dir reload", 922},
-  {"mi&X all files", 923},
-  {"&Drop down menus", 924},
-  {"ma&Rk moves down", 925},
-  {"show &Hidden files", 926},
-  {"show &Backup files", 927},
-  {"&Never", 928},
-  {"on dumb &Terminals", 929},
-  {"alwa&Ys", 930},
-  {" Configure options ", 931},
-  {" Panel options ", 932},
-  {" Pause after run... ", 933},
-  {"Configure options", 934},
-  {"&Add new", 935},
-  {" External panelize ", 936},
-  {"External panelize", 937},
-  {"Other command", 938},
-  {" Add to external panelize ", 939},
-  {" Enter command label: ", 940},
-  {" I can't run external panelize while logged on a non local directory ", 941},
-  {"Find *.orig after patching", 942},
-  {"Find SUID and SGID programs", 943},
-  {"Cannot invoke command.", 944},
-  {"Pipe close failed", 945},
-  {"Show this help message", 946},
-  {"Display brief usage message", 947},
-  {"MTime", 948},
-  {"Permission", 949},
-  {"Perm", 950},
-  {"|", 951},
-  {"Nl", 952},
-  {"GID", 953},
-  {"UID", 954},
-  {"ATime", 955},
-  {"CTime", 956},
-  {"Inode", 957},
-  {"  %s bytes in %d file%s", 958},
-  {"Unknow tag on display format: ", 959},
-  {" Do you really want to execute? ", 960},
-  {" No action taken ", 961},
-  {"RenMov", 962},
-  {"Mkdir", 963},
+ files have been moved now\n", 904},
+  {"safe de&Lete", 905},
+  {"cd follows lin&Ks", 906},
+  {"advanced cho&Wn", 907},
+  {"l&Ynx-like motion", 908},
+  {"Animation", 909},
+  {"rotatin&G dash", 910},
+  {"co&Mplete: show all", 911},
+  {"&Use internal view", 912},
+  {"use internal ed&It", 913},
+  {"auto m&Enus", 914},
+  {"&Auto save setup", 915},
+  {"shell &Patterns", 916},
+  {"Compute &Totals", 917},
+  {"&Verbose operation", 918},
+  {"&Fast dir reload", 919},
+  {"mi&X all files", 920},
+  {"&Drop down menus", 921},
+  {"ma&Rk moves down", 922},
+  {"show &Hidden files", 923},
+  {"show &Backup files", 924},
+  {"&Never", 925},
+  {"on dumb &Terminals", 926},
+  {"alwa&Ys", 927},
+  {" Configure options ", 928},
+  {" Panel options ", 929},
+  {" Pause after run... ", 930},
+  {"Configure options", 931},
+  {"&Add new", 932},
+  {" External panelize ", 933},
+  {"External panelize", 934},
+  {"Other command", 935},
+  {" Add to external panelize ", 936},
+  {" Enter command label: ", 937},
+  {" I can't run external panelize while logged on a non local directory ", 938},
+  {"Find *.orig after patching", 939},
+  {"Find SUID and SGID programs", 940},
+  {"Cannot invoke command.", 941},
+  {"Pipe close failed", 942},
+  {"Show this help message", 943},
+  {"Display brief usage message", 944},
+  {"MTime", 945},
+  {"Permission", 946},
+  {"Perm", 947},
+  {"|", 948},
+  {"Nl", 949},
+  {"GID", 950},
+  {"UID", 951},
+  {"ATime", 952},
+  {"CTime", 953},
+  {"Inode", 954},
+  {"  %s bytes in %d file%s", 955},
+  {"Unknow tag on display format: ", 956},
+  {" Do you really want to execute? ", 957},
+  {" No action taken ", 958},
+  {"RenMov", 959},
+  {"Mkdir", 960},
   {"\
  Can't chdir to %s \n\
- %s ", 964},
-  {"Couldn't open named pipe %s\n", 965},
-  {" The shell is still active. Quit anyway? ", 966},
-  {" There are stopped jobs.", 967},
-  {" Quit anyway? ", 968},
-  {"Warning: Couldn't change to %s.\n", 969},
+ %s ", 961},
+  {"Couldn't open named pipe %s\n", 962},
+  {" The shell is still active. Quit anyway? ", 963},
+  {" There are stopped jobs.", 964},
+  {" Quit anyway? ", 965},
+  {"Warning: Couldn't change to %s.\n", 966},
   {"\
 Can't open the %s file for writing:\n\
-%s\n", 970},
-  {"\
-Can't write to the %s file:\n\
-%s\n", 971},
-  {"Copy \"%s\" directory to:", 972},
-  {"Move \"%s\" directory to:", 973},
+%s\n", 967},
+  {"Copy \"%s\" directory to:", 968},
+  {"Move \"%s\" directory to:", 969},
   {"\
  Can't stat the destination \n\
- %s ", 974},
-  {" The destination isn't a directory ", 975},
-  {"  Delete %s?  ", 976},
-  {"Static", 977},
-  {"Dynamc", 978},
+ %s ", 970},
+  {" The destination isn't a directory ", 971},
+  {"  Delete %s?  ", 972},
+  {"Static", 973},
+  {"Dynamc", 974},
   {"\
  Can't chdir to \"%s\" \n\
- %s ", 979},
-  {"Rescan", 980},
-  {"Forget", 981},
-  {"Rmdir", 982},
-  {" Invalid shell pattern defination \"%c\". ", 983},
-  {" Debug ", 984},
-  {" ERROR: ", 985},
-  {" True:  ", 986},
-  {" False: ", 987},
-  {" Warning -- ignoring file ", 988},
+ %s ", 975},
+  {"Rescan", 976},
+  {"Forget", 977},
+  {"Rmdir", 978},
+  {" Invalid shell pattern defination \"%c\". ", 979},
+  {" Debug ", 980},
+  {" ERROR: ", 981},
+  {" True:  ", 982},
+  {" False: ", 983},
+  {" Warning -- ignoring file ", 984},
   {"\
 File %s is not owned by root or you or is world writable.\n\
-Using it may compromise your security", 989},
-  {" I can't run programs while logged on a non local directory ", 990},
-  {" User menu ", 991},
-  {"name_trunc: too big", 992},
-  {" Pipe failed ", 993},
-  {" Dup failed ", 994},
+Using it may compromise your security", 985},
+  {" I can't run programs while logged on a non local directory ", 986},
+  {" User menu ", 987},
+  {"name_trunc: too big", 988},
+  {" Pipe failed ", 989},
+  {" Dup failed ", 990},
   {"\
 File: \n\
 \n\
-    ", 995},
+    ", 991},
   {"\
 \n\
 \n\
-has been modified, do you want to save the changes?\n", 996},
-  {" Save changes ", 997},
-  {" Can't spawn child program ", 998},
-  {" Empty output from child filter ", 999},
-  {" Could not open file ", 1000},
-  {" Can't open file \"", 1001},
+has been modified, do you want to save the changes?\n", 992},
+  {" Save changes ", 993},
+  {" Can't spawn child program ", 994},
+  {" Empty output from child filter ", 995},
+  {" Could not open file ", 996},
+  {" Can't open file \"", 997},
   {"\
  Can't stat file \n\
- ", 1002},
-  {" Can't view: not a regular file ", 1003},
-  {"File: %s", 1004},
-  {"  [grow]", 1005},
-  {" Search string not found ", 1006},
-  {" Invalid regular expression ", 1007},
+ ", 998},
+  {" Can't view: not a regular file ", 999},
+  {"File: %s", 1000},
+  {"  [grow]", 1001},
+  {" Search string not found ", 1002},
+  {" Invalid regular expression ", 1003},
   {"\
  The current line number is %d.\n\
- Enter the new line number:", 1008},
-  {" Enter regexp:", 1009},
-  {" Enter search string:", 1010},
-  {"Ascii", 1011},
-  {"Line", 1012},
-  {"RxSrch", 1013},
-  {"EdText", 1014},
-  {"EdHex", 1015},
-  {"UnWrap", 1016},
-  {"HxSrch", 1017},
-  {"Raw", 1018},
-  {"Parse", 1019},
-  {"Unform", 1020},
-  {"Format", 1021},
-  {"Function key 1", 1022},
-  {"Function key 2", 1023},
-  {"Function key 3", 1024},
-  {"Function key 4", 1025},
-  {"Function key 5", 1026},
-  {"Function key 6", 1027},
-  {"Function key 7", 1028},
-  {"Function key 8", 1029},
-  {"Function key 9", 1030},
-  {"Function key 10", 1031},
-  {"Function key 11", 1032},
-  {"Function key 12", 1033},
-  {"Function key 13", 1034},
-  {"Function key 14", 1035},
-  {"Function key 15", 1036},
-  {"Function key 16", 1037},
-  {"Function key 17", 1038},
-  {"Function key 18", 1039},
-  {"Function key 19", 1040},
-  {"Function key 20", 1041},
-  {"Backspace key", 1042},
-  {"End key", 1043},
-  {"Up arrow key", 1044},
-  {"Down arrow key", 1045},
-  {"Left arrow key", 1046},
-  {"Right arrow key", 1047},
-  {"Home key", 1048},
-  {"Page Down key", 1049},
-  {"Page Up key", 1050},
-  {"Insert key", 1051},
-  {"Delete key", 1052},
-  {"Completion/M-tab", 1053},
-  {"+ on keypad", 1054},
-  {"- on keypad", 1055},
-  {"* on keypad", 1056},
-  {"Left arrow keypad", 1057},
-  {"Right arrow keypad", 1058},
-  {"Up arrow keypad", 1059},
-  {"Down arrow keypad", 1060},
-  {"Home on keypad", 1061},
-  {"End on keypad", 1062},
-  {"Page Down keypad", 1063},
-  {"Page Up keypad", 1064},
-  {"Insert on keypad", 1065},
-  {"Delete on keypad", 1066},
-  {"Enter on keypad", 1067},
-  {"Slash on keypad", 1068},
-  {"NumLock on keypad", 1069},
-  {"Password:", 1070},
-  {"Password", 1071},
-  {"Ok", 1072},
+ Enter the new line number:", 1004},
+  {" Enter regexp:", 1005},
+  {" Enter search string:", 1006},
+  {"Ascii", 1007},
+  {"Hex", 1008},
+  {"Line", 1009},
+  {"RxSrch", 1010},
+  {"EdText", 1011},
+  {"EdHex", 1012},
+  {"UnWrap", 1013},
+  {"Wrap", 1014},
+  {"HxSrch", 1015},
+  {"Raw", 1016},
+  {"Parse", 1017},
+  {"Unform", 1018},
+  {"Format", 1019},
+  {"Function key 1", 1020},
+  {"Function key 2", 1021},
+  {"Function key 3", 1022},
+  {"Function key 4", 1023},
+  {"Function key 5", 1024},
+  {"Function key 6", 1025},
+  {"Function key 7", 1026},
+  {"Function key 8", 1027},
+  {"Function key 9", 1028},
+  {"Function key 10", 1029},
+  {"Function key 11", 1030},
+  {"Function key 12", 1031},
+  {"Function key 13", 1032},
+  {"Function key 14", 1033},
+  {"Function key 15", 1034},
+  {"Function key 16", 1035},
+  {"Function key 17", 1036},
+  {"Function key 18", 1037},
+  {"Function key 19", 1038},
+  {"Function key 20", 1039},
+  {"Backspace key", 1040},
+  {"End key", 1041},
+  {"Up arrow key", 1042},
+  {"Down arrow key", 1043},
+  {"Left arrow key", 1044},
+  {"Right arrow key", 1045},
+  {"Home key", 1046},
+  {"Page Down key", 1047},
+  {"Page Up key", 1048},
+  {"Insert key", 1049},
+  {"Delete key", 1050},
+  {"Completion/M-tab", 1051},
+  {"+ on keypad", 1052},
+  {"- on keypad", 1053},
+  {"* on keypad", 1054},
+  {"Left arrow keypad", 1055},
+  {"Right arrow keypad", 1056},
+  {"Up arrow keypad", 1057},
+  {"Down arrow keypad", 1058},
+  {"Home on keypad", 1059},
+  {"End on keypad", 1060},
+  {"Page Down keypad", 1061},
+  {"Page Up keypad", 1062},
+  {"Insert on keypad", 1063},
+  {"Delete on keypad", 1064},
+  {"Enter on keypad", 1065},
+  {"Slash on keypad", 1066},
+  {"NumLock on keypad", 1067},
+  {"Password:", 1068},
+  {"Password", 1069},
+  {"Ok", 1070},
   {"\
 Couldn't open %s archive\n\
-%s", 1073},
-  {"Inconsistent extfs archive", 1074},
-  {"Sorry, we can not do password authenticated connections for now.", 1075},
-  {" Could not set source routing (%s)", 1076},
+%s", 1071},
+  {"Inconsistent extfs archive", 1072},
+  {"Sorry, we can not do password authenticated connections for now.", 1073},
+  {" Could not set source routing (%s)", 1074},
   {"\
 ~/.netrc file has not correct mode.\n\
-Remove password or correct mode.", 1077},
-  {" MCFS ", 1078},
-  {" The server does not support this version ", 1079},
+Remove password or correct mode.", 1075},
+  {" MCFS ", 1076},
+  {" The server does not support this version ", 1077},
   {"\
  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", 1080},
-  {" Yes ", 1081},
-  {" No ", 1082},
-  {" The remote server is running on strange port. Giving up.\n", 1083},
-  {" MCFS Password required ", 1084},
-  {" Invalid password ", 1085},
-  {" Too many open connections ", 1086},
+ not be safe on the remote side.  Continue? \n", 1078},
+  {" Yes ", 1079},
+  {" No ", 1080},
+  {" The remote server is running on strange port. Giving up.\n", 1081},
+  {" MCFS Password required ", 1082},
+  {" Invalid password ", 1083},
+  {" Too many open connections ", 1084},
   {"\
 Couldn't open tar archive\n\
-%s", 1087},
-  {"Unexpected EOF on archive file", 1088},
-  {"Inconsistent tar archive", 1089},
+%s", 1085},
+  {"Unexpected EOF on archive file", 1086},
+  {"Inconsistent tar archive", 1087},
   {"\
 Hmm,...\n\
 %s\n\
-doesn't look like a tar archive.", 1090},
+doesn't look like a tar archive.", 1088},
 };
 
-int _msg_tbl_length = 1090;
+int _msg_tbl_length = 1088;
Binary files old/mc-4.5.6/po/es.gmo and new/mc-4.5.7/po/es.gmo differ
diff -ruN old/mc-4.5.6/po/es.po new/mc-4.5.7/po/es.po
--- old/mc-4.5.6/po/es.po	Wed Jan  6 15:26:28 1999
+++ new/mc-4.5.7/po/es.po	Tue Jan 12 22:38:13 1999
@@ -1,26 +1,11 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: mc 4.5.2\n"
-"POT-Creation-Date: 1998-12-16 02:11-0600\n"
-"PO-Revision-Date: 1998-11-21 00:05+0100\n"
-"Last-Translator: Pablo Saratxaga <srtxg@chanae.alphanet.ch>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-1\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Date: 1998-11-21 00:05:11+0100\n"
+"POT-Creation-Date: 1999-01-04 19:04-0600\n"
+"Content-Type: text/plain; charset=\n"
+"Date: 1998-03-24 19:15:11-0600\n"
 "From: Miguel de Icaza,computo,622-4680 <miguel@metropolis.nuclecu.unam.mx>\n"
-"Xgettext-Options: --default-domain=mc --directory=.. --add-comments "
-"--keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
-"Files: edit/edit.c edit/edit_key_translator.c edit/editcmd.c edit/editmenu.c "
-"edit/editoptions.c edit/editwidget.c src/fixhlp.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/help.c "
-"src/hotlist.c src/info.c src/layout.c src/learn.c src/main.c src/menu.c "
-"src/option.c src/panelize.c 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 "
-"gnome/gcmd.c gnome/gdesktop.c gnome/glayout.c gnome/gprop.c gnome/gscreen.c "
-"gnome/gtools.c gnome/gview.c gnome/gwidget.c\n"
+"Xgettext-Options: --default-domain=mc --directory=.. --add-comments --keyword=_ --keyword=N_ --files-from=./POTFILES.in\n"
+"Files: edit/edit.c edit/edit_key_translator.c edit/editcmd.c edit/editmenu.c edit/editoptions.c edit/editwidget.c src/fixhlp.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/help.c src/hotlist.c src/info.c src/layout.c src/learn.c src/main.c src/menu.c src/option.c src/panelize.c 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 gnome/gcmd.c gnome/gdesktop.c gnome/glayout.c gnome/gprop.c gnome/gscreen.c gnome/gtools.c gnome/gview.c gnome/gwidget.c\n"
 
 #: edit/edit_key_translator.c:121
 msgid " Emacs key: "
@@ -37,119 +22,201 @@
 
 #: edit/edit_key_translator.c:144
 msgid " Insert Literal "
-msgstr " Inserta literalmente "
+msgstr " Insertar literalmente "
 
 #: edit/edit_key_translator.c:144
 msgid " Press any key: "
 msgstr " Presione cualquier tecla: "
 
-#: gnome/gcmd.c:43
+#: gnome/gcmd.c:52
 msgid " There is no other panel to compare contents to "
 msgstr " No existe otro panel para comparar el contenido "
 
-#: gnome/gcmd.c:78
+#: gnome/gcmd.c:87 gnome/gmc-window.c:68
 msgid "GNU Midnight Commander"
 msgstr "GNU Midnight Commander"
 
-#: gnome/gcmd.c:81
+#: gnome/gcmd.c:90 gnome/gmc-window.c:71
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr "La edición GNOME del manejador de archivos Midnight Commander."
 
-#: gnome/gcmd.c:93 src/main.c:813 src/screen.c:2035
+#: gnome/gcmd.c:102 src/main.c:818 src/screen.c:2043
 msgid " The Midnight Commander "
 msgstr " The Midnight Commander "
 
-#: gnome/gcmd.c:94 src/main.c:814
+#: gnome/gcmd.c:103 src/main.c:819
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr " ¿Realmente quiere salir del Midnight Commander? "
 
-#: gnome/gcmd.c:95 gtkedit/editcmd.c:2235 src/cmd.c:249 src/file.c:1715
-#: src/file.c:2078 src/filegui.c:496 src/hotlist.c:1029 src/main.c:815
-#: src/screen.c:2037 src/subshell.c:701 src/subshell.c:727 src/tree.c:1205
-#: src/view.c:408
+#: gnome/gcmd.c:104 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754 src/file.c:2159 src/filegui.c:496 src/hotlist.c:1029 src/main.c:820 src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:1207 src/view.c:408
 msgid "&Yes"
 msgstr "&Sí"
 
-#: gnome/gcmd.c:95 gtkedit/editcmd.c:2235 src/cmd.c:249 src/file.c:1715
-#: src/file.c:2078 src/filegui.c:495 src/hotlist.c:1029 src/main.c:815
-#: src/screen.c:2037 src/subshell.c:701 src/subshell.c:727 src/tree.c:1205
-#: src/view.c:408
+#: gnome/gcmd.c:104 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754 src/file.c:2159 src/filegui.c:495 src/hotlist.c:1029 src/main.c:820 src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:1207 src/view.c:408
 msgid "&No"
 msgstr "&No"
 
-#: gnome/gdesktop.c:319 gnome/gdesktop.c:1191
+#: gnome/gcmd.c:202
+msgid "Sort By"
+msgstr "Ordenar"
+
+#. we define this up here so we can pass it in to our callback
+#: gnome/gcmd.c:205
+msgid "Ignore case sensitivity."
+msgstr "No distinguir ma&Yúsculas."
+
+#: gnome/gcmd.c:213 src/chmod.c:151 src/screen.c:424
+msgid "Name"
+msgstr "Nombre"
+
+#: gnome/gcmd.c:220
+msgid "File Type"
+msgstr "Tipo de Archivo"
+
+#: gnome/gcmd.c:226 src/screen.c:425 src/screen.c:428
+msgid "Size"
+msgstr "Tamaño"
+
+#: gnome/gcmd.c:232
+msgid "Time Last Accessed"
+msgstr "Fecha de Acceso"
+
+#: gnome/gcmd.c:238
+msgid "Time Last Modified"
+msgstr "Fecha de Modificación"
+
+#: gnome/gcmd.c:244
+msgid "Time Last Changed"
+msgstr "Fecha de Cambio"
+
+#: gnome/gcmd.c:258
+msgid "Reverse the order."
+msgstr "Invertir el orden."
+
+#: gnome/gcmd.c:314
+msgid "Run Command"
+msgstr "Ejecutar Comando"
+
+#. Frame 1
+#: gnome/gcmd.c:318
+msgid "Preset Commands"
+msgstr "Comandos Predefinidos"
+
+#: gnome/gcmd.c:332
+msgid "Add"
+msgstr "Añadir"
+
+#: gnome/gcmd.c:335
+msgid "Remove"
+msgstr "Quitar"
+
+#. Frame 2
+#: gnome/gcmd.c:341
+msgid "Run this Command"
+msgstr "Ejecutar este Comando"
+
+#: gnome/gcmd.c:347
+msgid "Command: "
+msgstr "Comando: "
+
+#: gnome/gdesktop.c:347 gnome/gdesktop.c:1342
 msgid "Warning"
-msgstr "Cuidado"
+msgstr "¡ Atención !"
 
-#: gnome/gdesktop.c:320
+#: gnome/gdesktop.c:348
 #, c-format
 msgid "Could not open %s; will not have initial desktop icons"
-msgstr "No pude abrir %s; no habrá íconos sobre el escritorio al arrancar."
+msgstr "No pude abrir %s; no habrá iconos en el escritorio al arrancar"
+
+#: gnome/gdesktop.c:1308
+msgid "Trashcan"
+msgstr "Papelera"
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1187
+#: gnome/gdesktop.c:1338
 msgid "Home directory"
-msgstr "Directorio hogar"
+msgstr "Directorio personal"
 
-#: gnome/gdesktop.c:1192
+#: gnome/gdesktop.c:1343
 #, c-format
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
-msgstr ""
-"No pude ligar simbólicamente %s a %s; no habrá íconos sobre el escritorio al "
-"arrancar."
+msgstr "No pude enlazar simbólicamente %s a %s; no habrá iconos en el escritorio al arrancar"
+
+#: gnome/gdialogs.c:215
+msgid "Files Exist"
+msgstr "El archivo ya existe"
+
+#: gnome/gdialogs.c:226
+msgid "Some of the files you are trying to copy already exist in the destination folder."
+msgstr "Algunos de los ficheros que intenta copiar existen ya en la carpeta destino"
+
+#: gnome/gdialogs.c:235
+msgid "Prompt me before overwriting any file."
+msgstr "Confirmar ante de sobrescribir ningún archivo."
 
-#: gnome/gdialogs.c:201
-#, fuzzy
+#: gnome/gdialogs.c:241
+msgid "Don't overwrite any files."
+msgstr "No sobrescribir ningún archivo."
+
+#: gnome/gdialogs.c:250
+msgid "Overwrite:"
+msgstr "Sobrescribir:"
+
+#: gnome/gdialogs.c:256
+msgid "Older files."
+msgstr "Archivos más antiguos."
+
+#: gnome/gdialogs.c:260
+msgid "Files only if size differs."
+msgstr "Sólo si el tamaño difiere."
+
+#: gnome/gdialogs.c:264
+msgid "All files."
+msgstr "Todos los archivos."
+
+#: gnome/gdialogs.c:388
 msgid "Destination"
-msgstr "animación"
+msgstr "Destino"
 
-#: gnome/gdialogs.c:205
+#: gnome/gdialogs.c:392
 msgid "Find Destination Folder"
-msgstr "Muestra el folder destino"
+msgstr "Buscar Carpeta Destino"
 
-#: gnome/gdialogs.c:210
-#, fuzzy
+#: gnome/gdialogs.c:397
 msgid "Copy as a background process"
-msgstr "Procesos en el fondo"
+msgstr "Copiar en el fondo"
 
-#: gnome/gdialogs.c:230
-#, fuzzy
+#: gnome/gdialogs.c:417
 msgid "Advanced Options"
-msgstr "Opciones del panel"
+msgstr "Opciones Avanzadas"
 
-#: gnome/gdialogs.c:234
-#, fuzzy
+#: gnome/gdialogs.c:421
 msgid "Preserve symlinks"
-msgstr " enlace simbólico relativo: %s "
+msgstr "Preservar enlaces simbólicos"
 
-#: gnome/gdialogs.c:244
-#, fuzzy
+#: gnome/gdialogs.c:431
 msgid "Follow links."
-msgstr "cd sigue en&Laces"
+msgstr "Seguir los enlaces."
 
-#: gnome/gdialogs.c:251
+#: gnome/gdialogs.c:438
 msgid "Preserve file attributes."
-msgstr "Preserva los atributos del archivo."
+msgstr "Preservar atributos de archivo."
 
-#: gnome/gdialogs.c:259
-#, fuzzy
+#: gnome/gdialogs.c:446
 msgid "Recursively copy subdirectories."
-msgstr "Directorios virtuales (VFS) activos"
+msgstr "Copiar subdirectorios recursivamente."
 
-#: gnome/gdialogs.c:387
-#, fuzzy
+#: gnome/gdialogs.c:582
 msgid "File "
-msgstr " Archivo "
+msgstr "Archivo "
 
-#: gnome/gdialogs.c:391
-#, fuzzy
+#: gnome/gdialogs.c:586
 msgid " is "
-msgstr " Sí "
+msgstr " es "
 
-#: gnome/gdialogs.c:394
-#, fuzzy
+#: gnome/gdialogs.c:589
 msgid " Done."
-msgstr "Ninguno"
+msgstr " Hecho."
 
 #: gnome/gdnd.c:23
 msgid "Move here"
@@ -161,14 +228,14 @@
 
 #: gnome/gdnd.c:25
 msgid "Link here"
-msgstr "Ligar aquí"
+msgstr "Crear enlace aquí"
 
 #: gnome/gdnd.c:27
 msgid "Cancel drag"
-msgstr " Cancelar "
+msgstr "Cancelar arrastre"
 
 #. FIXME: this error message sucks
-#: gnome/gdnd.c:202
+#: gnome/gdnd.c:211
 #, c-format
 msgid ""
 "Could not stat %s\n"
@@ -177,286 +244,319 @@
 "No puedo hacer stat al archivo %s\n"
 "%s"
 
-#: gnome/gicon.c:83 gnome/gtools.c:48
+#: gnome/gicon.c:83 gnome/gtools.c:49
 msgid "Error"
 msgstr "Error"
 
 #: gnome/gicon.c:83
 msgid "Default set of icons not found, check your installation"
-msgstr "El conjunto de íconos básicos no fue encontrado, verifique su instalación"
+msgstr "Los iconos básicos no fueron encontrados, revise su instalación"
 
 #: gnome/glayout.c:268
 msgid "_New window"
-msgstr "_Nueva ventana"
+msgstr "Ventana _nueva"
 
 #: gnome/glayout.c:268
 msgid "Opens a new window"
-msgstr "Abre una nueva ventana"
-
-#: gnome/glayout.c:269
-msgid "New _Terminal"
-msgstr "Nuevo _Terminal"
+msgstr "Abre una ventana nueva"
 
-#: gnome/glayout.c:269
-msgid "Opens a terminal"
-msgstr "Inicia una nueva terminal"
+#: gnome/glayout.c:278
+msgid "_Open"
+msgstr "_Abrir"
+
+#: gnome/glayout.c:278
+msgid "Open selected files"
+msgstr "Abre ficheros seleccionados"
 
-#: gnome/glayout.c:271
+#: gnome/glayout.c:280
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: gnome/glayout.c:271
+#: gnome/glayout.c:280
 msgid "Copy files"
 msgstr "Copia archivos"
 
-#: gnome/glayout.c:272
-msgid "Rename/_Move..."
-msgstr "Renombrar/_Mover..."
+#: gnome/glayout.c:281
+msgid "_Move..."
+msgstr "_Mover..."
 
-#: gnome/glayout.c:272
+#: gnome/glayout.c:281
 msgid "Rename or move files"
-msgstr "Renombrar o mover archivos"
+msgstr "Renombra o mueve archivos"
 
-#: gnome/glayout.c:273
-msgid "New di_rectory..."
-msgstr "Nuevo _directorio"
-
-#: gnome/glayout.c:273
-msgid "Creates a new folder"
-msgstr "Crea un nuevo folder"
-
-#: gnome/glayout.c:274
+#: gnome/glayout.c:282
 msgid "_Delete..."
 msgstr "_Borrar..."
 
-#: gnome/glayout.c:274
+#: gnome/glayout.c:282
 msgid "Delete files from disk"
-msgstr "Borrar archivos del disco"
-
-#: gnome/glayout.c:276
-msgid "_View"
-msgstr "_Ver"
-
-#: gnome/glayout.c:276
-msgid "View file"
-msgstr "Ver archivo"
-
-#: gnome/glayout.c:277
-msgid "View r_aw"
-msgstr "Ver sin procesar"
-
-#: gnome/glayout.c:277
-msgid "View the file without further processing"
-msgstr "Ver el archivo sin procesar"
-
-#: gnome/glayout.c:279
-msgid "_Select group by pattern..."
-msgstr "_Seleccionar grupo por máscara..."
-
-#: gnome/glayout.c:279
-msgid "Select a group of files"
-msgstr "Seleccionar un grupo de archivos"
+msgstr "Borra archivos del disco"
 
-#: gnome/glayout.c:280
-msgid "_Unselect group by pattern..."
-msgstr "De_-selecciona un grupo por máscara..."
-
-#: gnome/glayout.c:280
-msgid "Un-selects a group of marked files"
-msgstr "De-selecciona un grupo de archivos"
-
-#: gnome/glayout.c:281
-msgid "R_everse selection"
-msgstr "_Invierte la selección"
-
-#: gnome/glayout.c:281
-msgid "Reverses the list of tagged files"
-msgstr "Invierte la selección en los archivos marcados"
-
-#: gnome/glayout.c:283
+#: gnome/glayout.c:284
 msgid "C_lose"
-msgstr "_Cerrar"
+msgstr "Cerra_r"
 
-#: gnome/glayout.c:283
+#: gnome/glayout.c:284
 msgid "Close this panel"
-msgstr "Cerrar este panel"
-
-#: gnome/glayout.c:285
-msgid "E_xit"
-msgstr "_Salir"
+msgstr "Cierra este panel"
 
-#: gnome/glayout.c:285
-msgid "Exit program"
-msgstr "Salir del programa"
+#: gnome/glayout.c:290
+msgid "_Cut"
+msgstr "_Cortar"
+
+#: gnome/glayout.c:290
+msgid "Cuts the selected files into the cut buffer."
+msgstr "Lleva los ficheros seleccionados a un almacén."
 
 #: gnome/glayout.c:292
-msgid "_Display mode..."
-msgstr "_Modo de listado"
+msgid "C_opy"
+msgstr "C_opiar"
 
 #: gnome/glayout.c:292
-msgid "Set the display mode for the panel"
-msgstr "Cambia el modo de listado"
-
-#: gnome/glayout.c:293
-msgid "_Sort order..."
-msgstr "_Ordenamiento..."
-
-#: gnome/glayout.c:293
-msgid "Changes the sort order of the files"
-msgstr "Cambiar el orden de los archivos"
+msgid "Copies the selected files into the cut buffer."
+msgstr "Copia los ficheros seleccionados a un almacén."
 
 #: gnome/glayout.c:294
-msgid "_Filter..."
-msgstr "_Filtro.."
+msgid "_Paste"
+msgstr "_Pegar"
 
 #: gnome/glayout.c:294
-msgid "Set a filter for the files"
-msgstr "Establece un filtro para archivos"
-
-#: gnome/glayout.c:295
-msgid "_Rescan"
-msgstr "_Releer"
+msgid "Pastes files from the cut buffer into the current directory"
+msgstr "Pega ficheros del almacén en el directorio actual."
 
-#: gnome/glayout.c:295
-msgid "Rescan the directory contents"
-msgstr "Relee el contenido del directorio"
+#: gnome/glayout.c:297
+msgid "_Select All"
+msgstr "_Seleccionar Todo"
+
+#: gnome/glayout.c:297
+msgid "Select all files in the current Panel"
+msgstr "Selecciona todos los ficheros del panel"
 
 #: gnome/glayout.c:298
-msgid "_Network link..."
-msgstr "Conección por _Red..."
+msgid "_Select Files..."
+msgstr "_Seleccionar Archivos..."
 
 #: gnome/glayout.c:298
-msgid "Connect to a remote machine"
-msgstr "Conectarse a una máquina remota"
+msgid "Select a group of files"
+msgstr "Selecciona un grupo de archivos."
 
 #: gnome/glayout.c:299
-msgid "FT_P link..."
-msgstr "Conexión FT_P..."
+msgid "_Invert Selection"
+msgstr "_Invertir Selección"
 
 #: gnome/glayout.c:299
-msgid "Connect to a remote machine with FTP"
-msgstr "Conectar con una máquina remota a través de FTP"
-
-#: gnome/glayout.c:305
-msgid "_Confirmation..."
-msgstr "_Confirmación..."
+msgid "Reverses the list of tagged files"
+msgstr "Selecciona los archivos desmarcados y viceversa."
 
-#: gnome/glayout.c:305
-msgid "Confirmation settings"
-msgstr "Opciones de confirmación"
+#: gnome/glayout.c:301
+msgid "_Rescan Directory"
+msgstr "_Refrescar Directorio"
 
-#: gnome/glayout.c:306
-msgid "_Options..."
-msgstr "_Opciones..."
+#: gnome/glayout.c:301
+msgid "Rescan the directory contents"
+msgstr "Relee el contenido del directorio."
 
-#: gnome/glayout.c:306
-msgid "Global option settings"
-msgstr "Opciones globales"
+#: gnome/glayout.c:303
+msgid "Preferences..."
+msgstr "Preferencias..."
+
+#: gnome/glayout.c:303
+msgid "Configure the GNOME Midnight Commander"
+msgstr "Configurar \"Midnight Commander para GNOME\""
 
 #: gnome/glayout.c:309
-msgid "_Virtual FS..."
-msgstr "directorios _Virtuales (VFS)..."
+msgid "Icon View"
+msgstr "Iconos"
 
-#: gnome/glayout.c:309
-msgid "Virtual File System settings"
-msgstr "Configuración del sistema de archivos virtual (VFS)"
+#: gnome/glayout.c:310
+msgid "Partial View"
+msgstr "Listado Breve"
+
+#: gnome/glayout.c:311
+msgid "Full View"
+msgstr "Listado Completo"
 
 #: gnome/glayout.c:312
-msgid "_Save setup"
-msgstr "_Guardar configuración"
-
-#: gnome/glayout.c:317
-msgid "_Find..."
-msgstr "_Buscar"
-
-#: gnome/glayout.c:317
-msgid "Locate files on disk"
-msgstr "Buscar archivos en disco"
+msgid "Custom View"
+msgstr "Listado Personalizado"
 
 #: gnome/glayout.c:318
-msgid "_Hotlist..."
-msgstr "_Favoritos..."
+msgid "_Sort By..."
+msgstr "_Ordenar..."
 
 #: gnome/glayout.c:318
-msgid "List of favorite sites"
-msgstr "Lista de directorios favoritos"
+msgid "Confirmation settings"
+msgstr "Opciones de confirmación"
 
 #: gnome/glayout.c:319
-msgid "_Compare panels..."
-msgstr "_Comparar paneles..."
+msgid "_Filter View..."
+msgstr "Ver _Filtrado..."
 
 #: gnome/glayout.c:319
-msgid "Compare panel contents"
-msgstr "Compara el contenido de los paneles"
+msgid "Global option settings"
+msgstr "Opciones generales"
 
-#: gnome/glayout.c:320
-msgid "_External panelize..."
-msgstr "Panelificación e_xterna..."
+#: gnome/glayout.c:326
+msgid "_Find File..."
+msgstr "_Buscar archivos..."
 
-#: gnome/glayout.c:322
-msgid "_Active VFS list..."
-msgstr "Lista de VFS _activos..."
+#: gnome/glayout.c:326
+msgid "Locate files on disk"
+msgstr "Busca archivos en disco"
 
-#: gnome/glayout.c:322
-msgid "List of active virtual file systems"
-msgstr "Lista de los VFS activos"
+#: gnome/glayout.c:329
+msgid "_Compare panels..."
+msgstr "_Comparar paneles..."
+
+#: gnome/glayout.c:329
+msgid "Compare two panel contents"
+msgstr "Compara el contenido de dos paneles"
+
+#: gnome/glayout.c:330
+msgid "_Run Command..."
+msgstr "Ejecuta_r Comando..."
+
+#: gnome/glayout.c:330
+msgid "Run a command and put the results in a panel"
+msgstr "Ejecutar un comando y mostrar resultados en un panel"
 
-#: gnome/glayout.c:325
-msgid "_Undelete files (ext2fs only)..."
-msgstr "_Recuperar archivos (ext2fs unicamente)..."
+#: gnome/glayout.c:332
+msgid "_Active VFS list..."
+msgstr "List_a de VFS activos..."
 
-#: gnome/glayout.c:325
-msgid "Recover deleted files"
-msgstr "Recupera archivos borrados"
+#: gnome/glayout.c:332
+msgid "List of active virtual file systems"
+msgstr "Lista de sistemas virtuales de archivos activos"
 
-#: gnome/glayout.c:328
+#: gnome/glayout.c:339
 msgid "_Background jobs..."
-msgstr "Procesos de f_ondo..."
+msgstr "Procesos de _fondo..."
 
-#: gnome/glayout.c:328
+#: gnome/glayout.c:339
 msgid "List of background operations"
 msgstr "Lista de procesos de fondo"
 
-#: gnome/glayout.c:335
-msgid "_Arrange icons"
-msgstr "_Ordena íconos"
-
-#: gnome/glayout.c:335
-msgid "Arranges the icons on the desktop"
-msgstr "Ordena los íconos en el escritorio"
-
-#: gnome/glayout.c:342
+#. GNOMEUIINFO_HELP ("midnight-commander"),
+#: gnome/glayout.c:347
 msgid "_About"
-msgstr "Acerca"
+msgstr "_Acerca de..."
 
-#: gnome/glayout.c:342
+#: gnome/glayout.c:347
 msgid "Information on this program"
 msgstr "Información sobre este programa"
 
-#: gnome/glayout.c:349
+#: gnome/glayout.c:353 gnome/gmc-window.c:119
 msgid "_File"
 msgstr "_Archivo"
 
-#: gnome/glayout.c:350
-msgid "_Window"
-msgstr "_Ventana"
+#: gnome/glayout.c:354
+msgid "_Edit"
+msgstr "_Editar"
 
-#: gnome/glayout.c:351
+#: gnome/glayout.c:355
+msgid "_Layout"
+msgstr "_Presentación"
+
+#: gnome/glayout.c:356
 msgid "_Commands"
 msgstr "_Comandos"
 
-#: gnome/glayout.c:352
-msgid "_Options"
-msgstr "_Opciones"
-
-#: gnome/glayout.c:353
-msgid "_Desktop"
-msgstr "_Escritorio"
-
-#: gnome/glayout.c:354
+#: gnome/glayout.c:357 gnome/gmc-window.c:121
 msgid "_Help"
 msgstr "A_yuda"
 
+#: gnome/gmc-window.c:69
+msgid "Copyright (C) 1998 The Free Software Foundation"
+msgstr "Copyright © 1998 The Free Software Foundation"
+
+#: gnome/gmc-window.c:81
+msgid "Open _new window"
+msgstr "Abrir una ventana _nueva"
+
+#: gnome/gmc-window.c:86
+msgid "_Close this window"
+msgstr "_Cerrar esta ventana"
+
+#: gnome/gmc-window.c:88
+msgid "E_xit"
+msgstr "Sali_r"
+
+#: gnome/gmc-window.c:95
+msgid "_Listing view"
+msgstr "Modo de _listado"
+
+#: gnome/gmc-window.c:96
+msgid "_Icon view"
+msgstr "_Iconos"
+
+#: gnome/gmc-window.c:102
+msgid "Display _tree view"
+msgstr "_Árbol"
+
+#: gnome/gmc-window.c:112
+msgid "_About the Midnight Commander..."
+msgstr "_Acerca del Midnight Commander..."
+
+#: gnome/gmc-window.c:120
+msgid "_View"
+msgstr "_Ver"
+
+#: gnome/gpopup.c:47
+msgid " Open with..."
+msgstr " Abrir con..."
+
+#: gnome/gpopup.c:48
+msgid "Enter extra arguments:"
+msgstr "Teclee argumentos extras:"
+
+#: gnome/gpopup.c:199 gnome/gpopup.c:200
+msgid "Properties"
+msgstr "Propiedades..."
+
+#: gnome/gpopup.c:202 gnome/gpopup.c:203
+msgid "Open"
+msgstr "Abrir"
+
+#: gnome/gpopup.c:204
+msgid "Open with"
+msgstr "Abrir con..."
+
+#: gnome/gpopup.c:205 src/screen.c:2281 src/screen.c:2311
+msgid "View"
+msgstr "Ver"
+
+#: gnome/gpopup.c:206
+msgid "View unfiltered"
+msgstr "Ver sin procesar"
+
+#: gnome/gpopup.c:207 gtkedit/gtkedit.c:1363 src/screen.c:2282 src/screen.c:2312 src/view.c:1972
+msgid "Edit"
+msgstr "Editar"
+
+#: gnome/gpopup.c:209
+msgid "Link..."
+msgstr "Enlace..."
+
+#: gnome/gpopup.c:210
+msgid "Symlink..."
+msgstr "Enlace simbólico..."
+
+#: gnome/gpopup.c:211
+msgid "Edit symlink..."
+msgstr "Editar enlace simbólico..."
+
+#: gnome/gpopup.c:218 gnome/gpopup.c:229
+msgid "Move/rename..."
+msgstr "Mover/Renombrar..."
+
+#: gnome/gpopup.c:219 gnome/gpopup.c:230
+msgid "Copy..."
+msgstr "Copiar..."
+
+#: gnome/gpopup.c:220 gnome/gpopup.c:232 gtkedit/editwidget.c:1067 src/screen.c:2286 src/screen.c:2316
+msgid "Delete"
+msgstr "Borrar"
+
 #: gnome/gprop.c:58 gnome/gprop.c:75
 msgid "Filename"
 msgstr "Archivo"
@@ -475,11 +575,11 @@
 
 #: gnome/gprop.c:129
 msgid "Use terminal"
-msgstr "Usar terminal"
+msgstr "Abrir un terminal"
 
 #: gnome/gprop.c:248
 msgid "File mode (permissions)"
-msgstr "Modo del archivo (Permisos)"
+msgstr "Modo del archivo (permisos)"
 
 #: gnome/gprop.c:259
 msgid "Current mode: "
@@ -548,177 +648,115 @@
 
 #: gnome/gprop.c:522
 msgid "Icon"
-msgstr "ícono"
+msgstr "Icono"
 
 #: gnome/gprop.c:536
 msgid "Select icon"
-msgstr "Seleccionar ícono"
-
-#: gnome/gpopup.c:48
-msgid " Open with..."
-msgstr " Abrir con..."
-
-#: gnome/gpopup.c:49
-msgid "Enter extra arguments:"
-msgstr "Teclee argumentos extras:"
-
-#: gnome/gpopup.c:179 gnome/gpopup.c:181
-msgid "Properties"
-msgstr "Propiedades"
-
-#: gnome/gpopup.c:184 gnome/gpopup.c:186
-msgid "Open"
-msgstr "Abrir"
-
-#: gnome/gpopup.c:188
-msgid "Open with"
-msgstr "Abrir con"
-
-#: gnome/gpopup.c:189 src/screen.c:2266 src/screen.c:2296
-msgid "View"
-msgstr "Ver"
-
-#: gnome/gpopup.c:190
-msgid "View unfiltered"
-msgstr "Ver sin procesar"
-
-#: gnome/gpopup.c:191 gtkedit/gtkedit.c:1208 src/screen.c:2267
-#: src/screen.c:2297 src/view.c:1972
-msgid "Edit"
-msgstr "Editar"
-
-#: gnome/gpopup.c:193
-msgid "Link..."
-msgstr "Enlace..."
-
-#: gnome/gpopup.c:194
-msgid "Symlink..."
-msgstr "Enlace simbólico"
-
-#: gnome/gpopup.c:195
-msgid "Edit symlink..."
-msgstr "Editar enlace simbólico"
-
-#: gnome/gpopup.c:202 gnome/gpopup.c:212
-msgid "Move/rename..."
-msgstr "Mover/renombrar"
-
-#: gnome/gpopup.c:203 gnome/gpopup.c:213
-msgid "Copy..."
-msgstr "Copiar..."
-
-#: gnome/gpopup.c:204 gnome/gpopup.c:214 gtkedit/editwidget.c:1136
-#: src/screen.c:2271 src/screen.c:2301
-msgid "Delete"
-msgstr "Borrar"
+msgstr "Seleccionar icono"
 
-#: gnome/gscreen.c:1323
+#: gnome/gscreen.c:1428
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: gnome/gscreen.c:1325
+#: gnome/gscreen.c:1430
 msgid "Archives and compressed files"
 msgstr "Archivos y archivos comprimidos"
 
-#: gnome/gscreen.c:1327
+#: gnome/gscreen.c:1432
 msgid "RPM/DEB files"
 msgstr "RPM/DEB"
 
-#: gnome/gscreen.c:1329
+#: gnome/gscreen.c:1434
 msgid "Text/Document files"
 msgstr "Textos/documentos"
 
-#: gnome/gscreen.c:1331
+#: gnome/gscreen.c:1436
 msgid "HTML and SGML files"
 msgstr "HTML y SGML"
 
-#: gnome/gscreen.c:1333
+#: gnome/gscreen.c:1438
 msgid "Postscript and PDF files"
 msgstr "Postscript y PDF"
 
-#: gnome/gscreen.c:1335
+#: gnome/gscreen.c:1440
 msgid "Spreadsheet files"
 msgstr "Hojas de cálculo"
 
-#: gnome/gscreen.c:1337
+#: gnome/gscreen.c:1442
 msgid "Image files"
 msgstr "Imágenes"
 
-#: gnome/gscreen.c:1340
+#: gnome/gscreen.c:1445
 msgid "Video/animation files"
 msgstr "Video/animaciones"
 
-#: gnome/gscreen.c:1342
+#: gnome/gscreen.c:1447
 msgid "Audio files"
 msgstr "Audio"
 
-#: gnome/gscreen.c:1344
+#: gnome/gscreen.c:1449
 msgid "C program files"
 msgstr "Fuentes de C"
 
-#: gnome/gscreen.c:1346
+#: gnome/gscreen.c:1451
 msgid "C++ program files"
 msgstr "Fuentes de C++"
 
-#: gnome/gscreen.c:1348
+#: gnome/gscreen.c:1453
 msgid "Objective-C program files"
 msgstr "Fuentes de Objective-C"
 
-#: gnome/gscreen.c:1350
+#: gnome/gscreen.c:1455
 msgid "Scheme program files"
 msgstr "Fuentes de Scheme"
 
-#: gnome/gscreen.c:1352
+#: gnome/gscreen.c:1457
 msgid "Assembler program files"
 msgstr "Fuentes de ensamblador"
 
-#: gnome/gscreen.c:1354
+#: gnome/gscreen.c:1459
 msgid "Misc. program files"
 msgstr "Fuentes varios"
 
-#: gnome/gscreen.c:1356
+#: gnome/gscreen.c:1461
 msgid "Font files"
 msgstr "Archivos de tipos de letra"
 
-#: gnome/gscreen.c:1483
-#, fuzzy, c-format
+#: gnome/gscreen.c:1588
+#, c-format
 msgid "Search: %s"
-msgstr "Buscar:"
+msgstr "Buscar: %s"
 
-#: gnome/gscreen.c:1492
-#, fuzzy, c-format
+#: gnome/gscreen.c:1597
+#, c-format
 msgid "%s bytes in %d file"
-msgstr " %s bytes en %d archivo%s"
+msgstr "%s bytes en %d archivo"
 
-#: gnome/gscreen.c:1492
-#, fuzzy, c-format
+#: gnome/gscreen.c:1597
+#, c-format
 msgid "%s bytes in %d files"
-msgstr " %s bytes en %d archivo%s"
+msgstr "%s bytes en %d archivos"
 
-#: gnome/gscreen.c:1515 src/screen.c:673
+#: gnome/gscreen.c:1620 src/screen.c:673
 msgid "<readlink failed>"
 msgstr "<readlink falló>"
 
-#: gnome/gscreen.c:1566
+#: gnome/gscreen.c:1671
 msgid "Filter"
 msgstr "Filtro"
 
-#: gnome/gscreen.c:2075
-#, fuzzy
+#: gnome/gscreen.c:2226
 msgid "Location:"
-msgstr "Lugar:      %Xh:%Xh"
+msgstr "Ubicación:"
 
-#: 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/filegui.c:724 src/find.c:154 src/layout.c:372
-#: src/option.c:143 src/wtools.c:292 src/wtools.c:564
+#: gnome/gtools.c:88 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 "&Aceptar"
 
 #: gnome/gview.c:119 src/view.c:687
 #, c-format
 msgid "Offset 0x%08x"
-msgstr "Offset: 0x%08x"
+msgstr "Offset 0x%08x"
 
 #: gnome/gview.c:121 src/view.c:689
 #, c-format
@@ -747,27 +785,24 @@
 msgstr "Monitorea el crecimiento de un archivo"
 
 #: gnome/gview.c:293
-#, fuzzy
 msgid "Close"
-msgstr "_Cerrar"
+msgstr "Cerrar"
 
 #: gnome/gview.c:294
-#, fuzzy
 msgid "Close the viewer"
 msgstr "Salir del visor de archivos"
 
-#: 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 "Buscar"
 
 #: gnome/gview.c:301
 msgid "String search"
-msgstr "Buscar una cadena"
+msgstr "Busca una cadena"
 
 #: gnome/gview.c:303
 msgid "Regexp search"
-msgstr "Buscar una expresión regular."
+msgstr "Buscar expresión regular..."
 
 #: gnome/gview.c:304
 msgid "Regular expression search"
@@ -783,11 +818,11 @@
 
 #: gnome/gview.c:315 src/view.c:1973
 msgid "Wrap"
-msgstr "Envolver"
+msgstr "Plegar"
 
 #: gnome/gview.c:315
 msgid "Wrap the text"
-msgstr "Enrollar el texto"
+msgstr "Plegar líneas de texto largas"
 
 #: gnome/gview.c:321
 msgid "Formatted"
@@ -797,7 +832,7 @@
 msgid "Hex"
 msgstr "Hex"
 
-#: gnome/gview.c:329 gtkedit/gtkedit.c:1207 src/filegui.c:361
+#: gnome/gview.c:329 gtkedit/gtkedit.c:1362 src/filegui.c:361
 msgid "File"
 msgstr "Archivo"
 
@@ -805,50 +840,46 @@
 msgid "Mode"
 msgstr "Modo"
 
-#: gnome/gwidget.c:92
+#: gnome/gwidget.c:90
 msgid "ok"
 msgstr "aceptar"
 
-#: gnome/gwidget.c:94
+#: gnome/gwidget.c:92
 msgid "cancel"
 msgstr "cancelar"
 
-#: gnome/gwidget.c:96
+#: gnome/gwidget.c:94
 msgid "help"
 msgstr "ayuda"
 
-#: gnome/gwidget.c:98
+#: gnome/gwidget.c:96
 msgid "yes"
 msgstr "sí"
 
-#: gnome/gwidget.c:100
+#: gnome/gwidget.c:98
 msgid "no"
 msgstr "no"
 
-#: gnome/gwidget.c:102
+#: gnome/gwidget.c:100
 msgid "exit"
 msgstr "salir"
 
-#: gnome/gwidget.c:104
+#: gnome/gwidget.c:102
 msgid "abort"
 msgstr "abortar"
 
 #. 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:2286 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:2301 src/tree.c:1145 src/tree.c:1151 src/wtools.c:225 vfs/fish.c:226
 msgid " Error "
 msgstr " Error "
 
 #: gtkedit/edit.c:127 gtkedit/edit.c:229
 msgid " Failed trying to open file for reading: "
-msgstr " Falló al tratar de abrir el archivo para lectura: "
+msgstr " Fallo al tratar de abrir el archivo para lectura: "
 
 #: gtkedit/edit.c:236
 msgid " Cannot get size/permissions info on file: "
-msgstr " No puedo obtener el tamaño del archivo: "
+msgstr " No puedo obtener tamaño/permisos del archivo: "
 
 #: gtkedit/edit.c:243
 msgid " Not an ordinary file: "
@@ -875,11 +906,7 @@
 msgstr " Guardar como "
 
 #. 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:295 src/file.c:674
-#: src/help.c:321 src/main.c:660 src/screen.c:2051 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:683 src/help.c:321 src/main.c:665 src/screen.c:2059 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 " ¡ Atención ! "
 
@@ -890,10 +917,9 @@
 #. Push buttons to over-write the current file, or cancel the operation
 #: gtkedit/editcmd.c:485
 msgid "Overwrite"
-msgstr "Sobreescribir"
+msgstr "Sobrescribir"
 
-#: gtkedit/editcmd.c:485 gtkedit/editcmd.c:774 gtkedit/editcmd.c:801
-#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1565
+#: gtkedit/editcmd.c:485 gtkedit/editcmd.c:774 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1565
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -901,7 +927,7 @@
 msgid " Save as "
 msgstr " Guardar como"
 
-#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2597
+#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2594
 msgid " Error trying to save file. "
 msgstr " Error al guardar el archivo. "
 
@@ -913,22 +939,21 @@
 #. 'Open' = load temp file
 #: gtkedit/editcmd.c:619
 msgid " Error trying to open temp file "
-msgstr "Error al tratar de abrir el archivo temporal "
+msgstr " Error al tratar de abrir el archivo temporal "
 
 #. 'Open' = load temp file
 #: gtkedit/editcmd.c:627 gtkedit/editcmd.c:688 gtkedit/editcmd.c:756
 msgid " Error trying to open macro file "
 msgstr " Error al tratar de abrir el archivo de macros "
 
-#: gtkedit/editcmd.c:632 gtkedit/editcmd.c:640 gtkedit/editcmd.c:676
-#: gtkedit/editcmd.c:731
+#: gtkedit/editcmd.c:632 gtkedit/editcmd.c:640 gtkedit/editcmd.c:676 gtkedit/editcmd.c:731
 #, c-format
 msgid "key '%d 0': "
 msgstr " tecla '%d 0': "
 
 #: gtkedit/editcmd.c:651
 msgid " Error trying to overwrite macro file "
-msgstr " Error al sobreescribir el archivo de macros "
+msgstr " Error al sobrescribir el archivo de macros "
 
 #. This heads the 'Macro' dialog box
 #: gtkedit/editcmd.c:668
@@ -963,8 +988,7 @@
 msgid " Save file "
 msgstr " Guardar archivo "
 
-#: 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 "Guardar"
 
@@ -991,9 +1015,7 @@
 
 #: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075
 msgid " Block is large, you may not be able to undo this action. "
-msgstr ""
-" El bloque es demasiado grande, es posible que no pueda deshacer esta "
-"acción. "
+msgstr " El bloque es demasiado grande, es posible que no pueda deshacer esta acción. "
 
 #: gtkedit/editcmd.c:1075
 msgid " Continue "
@@ -1009,16 +1031,12 @@
 msgstr " Reemplazar con: "
 
 #. Heads the 'Replace' dialog box
-#: gtkedit/editcmd.c:1140 gtkedit/editcmd.c:1217 gtkedit/editcmd.c:1467
-#: gtkedit/editcmd.c:1561 gtkedit/editcmd.c:2094 gtkedit/editcmd.c:2125
-#: gtkedit/editcmd.c:2127
+#: gtkedit/editcmd.c:1140 gtkedit/editcmd.c:1217 gtkedit/editcmd.c:1467 gtkedit/editcmd.c:1561 gtkedit/editcmd.c:2094 gtkedit/editcmd.c:2125 gtkedit/editcmd.c:2127
 msgid " Replace "
 msgstr " Reemplazar "
 
 #. Heads the 'Search' dialog box
-#: gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196
-#: src/view.c:1450 src/view.c:1540 src/view.c:1662 src/view.c:1861
-#: src/view.c:1893
+#: gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196 src/view.c:1450 src/view.c:1540 src/view.c:1662 src/view.c:1861 src/view.c:1893
 msgid " Search "
 msgstr " Buscar "
 
@@ -1055,9 +1073,7 @@
 
 #: gtkedit/editcmd.c:1362 gtkedit/editcmd.c:1363
 msgid "See the regex man page for how to compose a regular expression"
-msgstr ""
-"Vea la página de manual de regex para más información sobre como escrbir "
-"expresiones regulares"
+msgstr "Vea la página de manual de regex para más información sobre cómo escribir expresiones regulares"
 
 #: gtkedit/editcmd.c:1369
 msgid " Backwards "
@@ -1114,11 +1130,8 @@
 msgstr "Reemplazar todos"
 
 #: gtkedit/editcmd.c:1932
-msgid ""
-" Invalid regular expression, or scanf expression with to many conversions "
-msgstr ""
-" La Expresión regular es inválida o la expresión scanf tiene demasiadas "
-"conversiones "
+msgid " Invalid regular expression, or scanf expression with to many conversions "
+msgstr " La Expresión regular es inválida o la expresión scanf tiene demasiadas conversiones "
 
 #. "Invalid regexp string or scanf string"
 #: gtkedit/editcmd.c:2096
@@ -1144,12 +1157,12 @@
 " Current text was modified without a file save. \n"
 " Save with exit? "
 msgstr ""
-" El texto actual fue modificado sin ser guardado,\n"
-" ¿Guardar y salir?"
+" El texto actual fue modificado sin ser guardado. \n"
+" ¿Guardar al salir? "
 
 #: gtkedit/editcmd.c:2235
 msgid " File was modified, Save with exit? "
-msgstr " El archivo fue modificado, ¿Guardar y salir? "
+msgstr " El archivo fue modificado. ¿Guardar al salir? "
 
 #: gtkedit/editcmd.c:2235
 msgid "Cancel quit"
@@ -1157,7 +1170,7 @@
 
 #: gtkedit/editcmd.c:2239
 msgid " &Cancel quit "
-msgstr "&Cancelar salida "
+msgstr " &Cancelar salida "
 
 #: gtkedit/editcmd.c:2239
 msgid " &Yes "
@@ -1167,271 +1180,608 @@
 msgid " &No "
 msgstr " &No "
 
-#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2515
+#: gtkedit/editcmd.c:2434 gtkedit/editcmd.c:2509
 msgid " Copy to clipboard "
 msgstr " Copiar al portapapeles "
 
-#: 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 " No pude guardar el archivo. "
 
-#: gtkedit/editcmd.c:2458 gtkedit/editcmd.c:2528
+#: gtkedit/editcmd.c:2456 gtkedit/editcmd.c:2522
 msgid " Cut to clipboard "
 msgstr " Cortar al portapapeles "
 
-#: 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 gtkedit/editcmd.c:2556 src/view.c:1833
 msgid " Goto line "
 msgstr " Ir a la línea "
 
-#: gtkedit/editcmd.c:2550 gtkedit/editcmd.c:2554 gtkedit/editcmd.c:2559
+#: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 gtkedit/editcmd.c:2556
 msgid " Enter line: "
 msgstr " Línea: "
 
-#: gtkedit/editcmd.c:2580 gtkedit/editcmd.c:2597
+#: gtkedit/editcmd.c:2577 gtkedit/editcmd.c:2594
 msgid " Save Block "
 msgstr " Guardar bloque "
 
-#: gtkedit/editcmd.c:2631
+#: gtkedit/editcmd.c:2628
 msgid " Insert File "
 msgstr " Insertar archivo "
 
-#: gtkedit/editcmd.c:2646
+#: gtkedit/editcmd.c:2643
 msgid " Insert file "
-msgstr "Insertar archivo "
+msgstr " Insertar archivo "
 
-#: gtkedit/editcmd.c:2646
+#: gtkedit/editcmd.c:2643
 msgid " Error trying to insert file. "
 msgstr " Error al tratar de insertar el archivo "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2666
+#: gtkedit/editcmd.c:2663
 msgid " Sort block "
-msgstr " Ordena el bloque "
+msgstr " Ordenar bloque de texto "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2666 gtkedit/editcmd.c:2720
+#: gtkedit/editcmd.c:2663 gtkedit/editcmd.c:2717
 msgid " You must first highlight a block of text. "
 msgstr " Es necesario tener un bloque seleccionado "
 
-#: gtkedit/editcmd.c:2673
+#: gtkedit/editcmd.c:2670
 msgid " Run Sort "
-msgstr " Ordena el texto "
+msgstr " Ordenar bloque de texto "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2675
+#: gtkedit/editcmd.c:2672
 msgid " Enter sort options (see manpage) separated by whitespace: "
-msgstr " Opciones para `sort' (ver manual), separadas con espacios: "
+msgstr " Opciones para \"sort\" (ver manual), separadas por espacios: "
 
-#: gtkedit/editcmd.c:2686 gtkedit/editcmd.c:2692
+#: gtkedit/editcmd.c:2683 gtkedit/editcmd.c:2689
 msgid " Sort "
 msgstr " Ordenar "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2688
+#: gtkedit/editcmd.c:2685
 msgid " Error trying to execute sort command "
-msgstr " Error al tratar de ejectuar el comando `sort' "
+msgstr " Error al tratar de ejectuar el comando \"sort\" "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2694
+#: gtkedit/editcmd.c:2691
 msgid " Sort returned non-zero: "
-msgstr " `sort' regresó un valor distinto de cero "
+msgstr " \"sort\" regresó un valor distinto de cero "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2718 gtkedit/editcmd.c:2748
+#: gtkedit/editcmd.c:2715 gtkedit/editcmd.c:2745
 msgid " Process block "
-msgstr " Procesa bloque "
+msgstr " Procesar bloque "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2750
+#: gtkedit/editcmd.c:2747
 msgid " Error trying to stat file "
 msgstr " Error al tratar de solicitar información sobre el archivo "
 
-#: gtkedit/editcmd.c:2820
+#: gtkedit/editcmd.c:2817
 msgid " Mail "
 msgstr " Correo "
 
+#: gtkedit/editmenu.c:56
+msgid " Word wrap "
+msgstr " Word wrap "
+
 #. Not essential to translate
-#: gtkedit/editwidget.c:325
+#: gtkedit/editmenu.c:58
+msgid " Enter line length, 0 for off: "
+msgstr " Teclee la longitud de la línea, 0 para desactivar "
+
+#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134
+msgid "&Open/load...     C-o"
+msgstr "&Abrir/cargar...         C-o"
+
+#: gtkedit/editmenu.c:119
+msgid "&New              C-n"
+msgstr "&Nuevo                   C-n"
+
+#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137
+msgid "&Save              F2"
+msgstr "&Guardar                  F2"
+
+#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
+msgid "save &As...       F12"
+msgstr "guar&Dar como...         F12"
+
+#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140
+msgid "&Insert file...   F15"
+msgstr "&Insertar archivo...     F15"
+
+#: gtkedit/editmenu.c:125
+msgid "copy to &File...  C-f"
+msgstr "co&Piar a un archivo.... C-f"
+
+#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143
+msgid "a&Bout...            "
+msgstr "&Acerca de..."
+
+#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145
+msgid "&Quit             F10"
+msgstr "&Salir                   F10"
+
+#: gtkedit/editmenu.c:135
+msgid "&New            C-x k"
+msgstr "&Nuevo                 C-x k"
+
+#: gtkedit/editmenu.c:141
+msgid "copy to &File...     "
+msgstr "co&Piar a un archivo..."
+
+#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167
+msgid "&Toggle Mark       F3"
+msgstr "i&Nicio/fin de marca        F3"
+
+#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
+msgid "&Mark Columns    S-F3"
+msgstr "marcar c&Olumnas          S-F3"
+
+#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170
+msgid "toggle &Ins/overw Ins"
+msgstr "activar &Inserción         Ins"
+
+#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172
+msgid "&Copy              F5"
+msgstr "&Copiar                     F5"
+
+#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
+msgid "&Move              F6"
+msgstr "&Mover                      F6"
+
+#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
+msgid "&Delete            F8"
+msgstr "&Borrar                     F8"
+
+#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176
+msgid "&Undo             C-u"
+msgstr "&Deshacer                  C-u"
+
+#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178
+msgid "&Beginning     C-PgUp"
+msgstr "&Principio del archivo  C-PgUp"
+
+#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
+msgid "&End           C-PgDn"
+msgstr "&Fin del archivo        C-PgDn"
+
+#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191
+msgid "&Search...         F7"
+msgstr "&Buscar...          F7"
+
+#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
+msgid "search &Again     F17"
+msgstr "buscar &Siguiente  F17"
+
+#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
+msgid "&Replace...        F4"
+msgstr "&Reemplazar...      F4"
+
+#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220
+msgid "&Goto line...            M-l"
+msgstr "&Ir a la línea...                  M-l"
+
+#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222
+msgid "insert &Literal...       C-q"
+msgstr "insertar &Literalmente...          C-q"
+
+#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224
+msgid "&Refresh screen          C-l"
+msgstr "&Refrescar la pantalla             C-l"
+
+#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226
+msgid "&Start record macro      C-r"
+msgstr "iniciar grabación de &Macro        C-r"
+
+#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
+msgid "&Finish record macro...  C-r"
+msgstr "&Terminar grabación de macro...    C-r"
+
+#: gtkedit/editmenu.c:206
+msgid "&Execute macro...   C-a, KEY"
+msgstr "&Ejecutar macro             C-a, TECLA"
+
+#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229
+msgid "delete macr&O...            "
+msgstr "&Borrar macro..."
+
+#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231
+msgid "insert &Date/time           "
+msgstr "insertar &Fecha y hora"
+
+#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233
+msgid "format p&Aragraph        M-p"
+msgstr "dar formato al &Párrafo            M-p"
+
+#: gtkedit/editmenu.c:212
+msgid "'ispell' s&Pell check    C-p"
+msgstr "corregir orto&Grafía con \"ispell\"  C-p"
+
+#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235
+msgid "sor&T...                 M-t"
+msgstr "&Ordenar bloque de texto...        M-t"
+
+#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
+msgid "'indent' &C Formatter    F19"
+msgstr "adecentar código &C con \"indent\"   F19"
+
+#: gtkedit/editmenu.c:215
+msgid "&Mail...                    "
+msgstr "c&Orreo... "
+
+#: gtkedit/editmenu.c:228
+msgid "&Execute macro... C-x e, KEY"
+msgstr "&Ejecutar macro...        C-x e, TECLA"
+
+#: gtkedit/editmenu.c:234
+msgid "'ispell' s&Pell check    M-$"
+msgstr "\"ispell\" &Corrige ortografía     M-$"
+
+#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252
+msgid "&General...  "
+msgstr "&General..."
+
+#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
+msgid "&Save mode..."
+msgstr "&Modo de guardar..."
+
+#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302
+msgid "&Layout..."
+msgstr "&Presentación..."
+
+#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t'
+#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 src/chmod.c:165 src/chown.c:132
+msgid " File "
+msgstr " Archivo "
+
+#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407
+msgid " Edit "
+msgstr " Edición "
+
+#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276
+msgid " Sear/Repl "
+msgstr " Buscar/Reemplazar "
+
+#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442
+msgid " Command "
+msgstr " Comando "
+
+#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278
+msgid " Options "
+msgstr " Opciones "
+
+#: gtkedit/editmenu.c:392
+msgid "Open...\tC-o"
+msgstr "Abrir...\tC-o"
+
+#: gtkedit/editmenu.c:393
+msgid "New\tC-n"
+msgstr "Nuevo\tC-n"
+
+#: gtkedit/editmenu.c:395
+msgid "Save\tF2"
+msgstr "Guardar\tF2"
+
+#: gtkedit/editmenu.c:396
+msgid "Save as...\tF12"
+msgstr "Guardar como...\tF12"
+
+#: gtkedit/editmenu.c:398
+msgid "Insert file...\tF15"
+msgstr "Insertar archivo...\tF15"
+
+#: gtkedit/editmenu.c:399
+msgid "Copy to file...\tC-f"
+msgstr "Copiar a un archivo...\tC-f"
+
+#. Tool hint
+#: gtkedit/editmenu.c:402
+msgid "Disk operations"
+msgstr "Operaciones de archivos"
+
+#: gtkedit/editmenu.c:408
+msgid "Toggle mark\tF3"
+msgstr "Alterna marcado\tF3"
+
+#: gtkedit/editmenu.c:409
+msgid "Toggle mark columns\tC-b"
+msgstr "Alterna marcado de columnas\tF3"
+
+#: gtkedit/editmenu.c:411
+msgid "Toggle insert/overwrite\tIns"
+msgstr "Alterna modo de inserción\tIns"
+
+#: gtkedit/editmenu.c:413
+msgid "Copy block to cursor\tF5"
+msgstr "Copia el bloque a la posición actual\tF5"
+
+#: gtkedit/editmenu.c:414
+msgid "Move block to cursor\tF6"
+msgstr "Mueve bloque a la posición actual\tF6"
+
+#: gtkedit/editmenu.c:415
+msgid "Delete block\tF8/C-Del"
+msgstr "Borrar bloque\tF8/C-Del"
+
+#: gtkedit/editmenu.c:417
+msgid "Copy block to clipbrd\tC-Ins"
+msgstr "Copia el bloque al portapapeles\tC-Ins"
+
+#: gtkedit/editmenu.c:418
+msgid "Cut block to clipbrd\tS-Del"
+msgstr "Corta el bloque al portapapeles\tS-Del"
+
+#: gtkedit/editmenu.c:419
+msgid "Paste block from clipbrd\tS-Ins"
+msgstr "Pega el bloque del portapapeles\tS-Ins"
+
+#: gtkedit/editmenu.c:420
+msgid "Selection history\tM-Ins"
+msgstr "Historia de selecciones\tM-Ins"
+
+#: gtkedit/editmenu.c:422
+msgid "Undo\tC-BackSpace"
+msgstr "Deshacer\tC-Backspace"
+
+#. Tool hint
+#: gtkedit/editmenu.c:425
+msgid "Manipulating blocks of text"
+msgstr "Manipulación de bloques de texto"
+
+#: gtkedit/editmenu.c:430
+msgid " Srch/Replce "
+msgstr " Buscar/Reemplazar "
+
+#: gtkedit/editmenu.c:431
+msgid "Search...\tF7"
+msgstr "Buscar...\tF7"
+
+#: gtkedit/editmenu.c:432
+msgid "Search again\tF17"
+msgstr "Buscar de nuevo\tF17"
+
+#: gtkedit/editmenu.c:433
+msgid "Replace...\tF4"
+msgstr "Reemplazar...\tF4"
+
+#: gtkedit/editmenu.c:434
+msgid "Replace again\tF14"
+msgstr "Reemplazar de nuevo\tF14"
+
+#. Tool hint
+#: gtkedit/editmenu.c:437
+msgid "Search for and replace text"
+msgstr "Buscar y reemplazar texto"
+
+#: gtkedit/editmenu.c:443
+msgid "Goto line...\tM-l"
+msgstr "Ir a la línea...\tM-l"
+
+#: gtkedit/editmenu.c:445
+msgid "Start record macro\tC-r"
+msgstr "Empieza a grabar un macro\tC-r"
+
+#: gtkedit/editmenu.c:446
+msgid "Finish record macro...\tC-r"
+msgstr "Terminar de grabar un macro...\tC-r"
+
+#: gtkedit/editmenu.c:447
+msgid "Execute macro...\tC-a, KEY"
+msgstr "Ejecutar macro...\tC-a, TECLA"
+
+#: gtkedit/editmenu.c:448
+msgid "Delete macro...\t"
+msgstr "Borrar macro...\t"
+
+#: gtkedit/editmenu.c:450
+msgid "Insert date/time\tC-d"
+msgstr "Insertar fecha/hora\tC-d"
+
+#: gtkedit/editmenu.c:451
+msgid "Format paragraph\tM-p"
+msgstr "Formatea párrafo\tM-p"
+
+#: gtkedit/editmenu.c:453
+msgid "Refresh display\tC-l"
+msgstr "Refrescar pantalla\tC-l"
+
+#. Tool hint
+#: gtkedit/editmenu.c:456
+msgid "Macros and internal commands"
+msgstr "Macros y comandos internos"
+
+#: gtkedit/editoptions.c:37
+msgid "None"
+msgstr "Ninguno"
+
+#: gtkedit/editoptions.c:37
+msgid "Dynamic paragraphing"
+msgstr "Párrafos dinámicos"
+
+#: gtkedit/editoptions.c:37
+msgid "Type writer wrap"
+msgstr "Envolver como máquina de escribir"
+
+#. 13
+#: gtkedit/editoptions.c:100
+msgid "Wrap mode"
+msgstr "Modo de envoltura"
+
+#. 15
+#: gtkedit/editoptions.c:106
+msgid "Key emulation"
+msgstr "Emulación de teclas"
+
+#. Not essential to translate
+#: gtkedit/editwidget.c:310
 msgid "Error initialising editor.\n"
 msgstr "Error al inicializar el editor.\n"
 
-#: gtkedit/editwidget.c:1129 gtkedit/gtkedit.c:1210 src/help.c:809
-#: src/main.c:1678 src/screen.c:2264 src/screen.c:2294 src/tree.c:1478
-#: src/view.c:1963
+#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1365 src/help.c:809 src/main.c:1668 src/screen.c:2279 src/screen.c:2309 src/tree.c:1480 src/view.c:1963
 msgid "Help"
 msgstr "Ayuda"
 
-#: gtkedit/editwidget.c:1131
+#: gtkedit/editwidget.c:1062
 msgid "Mark"
 msgstr "Marca"
 
-#: gtkedit/editwidget.c:1132
+#: gtkedit/editwidget.c:1063
 msgid "Replac"
 msgstr "Reemplaza"
 
-#: gtkedit/editwidget.c:1133 gtkedit/gtkedit.c:1160 src/screen.c:2268
-#: src/screen.c:2298 src/tree.c:1484
+#: gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/screen.c:2283 src/screen.c:2313 src/tree.c:1486
 msgid "Copy"
 msgstr "Copiar"
 
-#: gtkedit/editwidget.c:1134
+#: gtkedit/editwidget.c:1065
 msgid "Move"
 msgstr "Mover"
 
-#: gtkedit/editwidget.c:1138 src/main.c:1680
+#: gtkedit/editwidget.c:1069 src/main.c:1670
 msgid "PullDn"
 msgstr "Menú"
 
-#: 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:1671 src/view.c:1965 src/view.c:1985
 msgid "Quit"
 msgstr "Salir"
 
-#: gtkedit/gtkedit.c:104
+#: gtkedit/gtkedit.c:107
 msgid "The Quick Brown Fox Jumps Over The Lazy Dog"
-msgstr ""
+msgstr "Un Vaso de Whisky Frio con Mucho Hielo"
 
-#: gtkedit/gtkedit.c:690
-msgid ""
-"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n"
-msgstr ""
-"gtkedit.c: variable de entorno HOME no definida y no hay definición en "
-"passwd - abortando\n"
+#: gtkedit/gtkedit.c:798
+msgid "gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n"
+msgstr "gtkedit.c: variable HOME sin definir y no hay entrada de \"passwd\" - abortando\n"
 
-#: gtkedit/gtkedit.c:1131
+#: gtkedit/gtkedit.c:1286
 msgid "Open/Load"
 msgstr "Abrir/Cargar"
 
-#: gtkedit/gtkedit.c:1131
+#: gtkedit/gtkedit.c:1286
 msgid "Load a different/new file"
-msgstr "Cargar un archivo diferente/nuevo"
+msgstr "Cargar archivo nuevo/diferente"
 
-#: gtkedit/gtkedit.c:1134
+#: gtkedit/gtkedit.c:1289
 msgid "New"
 msgstr "Nuevo"
 
-#: gtkedit/gtkedit.c:1134
+#: gtkedit/gtkedit.c:1289
 msgid "Clear the edit buffer"
-msgstr "Limpiar el buffer de edición"
+msgstr "Borrar almacén de edición"
 
-#: gtkedit/gtkedit.c:1138
+#: gtkedit/gtkedit.c:1293
 msgid "Save the current edit buffer to filename"
-msgstr "Guardar el buffer de edición actual hacia filename"
+msgstr "Guardar almacén de edición a un archivo"
 
-#: gtkedit/gtkedit.c:1141
+#: gtkedit/gtkedit.c:1296
 msgid "Save As"
 msgstr "Guardar como"
 
-#: gtkedit/gtkedit.c:1141
+#: gtkedit/gtkedit.c:1296
 msgid "Save the current edit buffer as filename"
-msgstr "Guardar el buffer de edición actual como filename"
+msgstr "Guardar almacén de edición como archivo"
 
-#: gtkedit/gtkedit.c:1145
+#: gtkedit/gtkedit.c:1300
 msgid "Insert File"
-msgstr "Insertar Archivo"
+msgstr "Insertar archivo"
 
-#: gtkedit/gtkedit.c:1145
+#: gtkedit/gtkedit.c:1300
 msgid "Insert text from a file"
-msgstr "Insertar texto de un archivo"
+msgstr "Insertar texto desde un archivo"
 
-#: gtkedit/gtkedit.c:1148
+#: gtkedit/gtkedit.c:1303
 msgid "Copy to file"
-msgstr "Copiar hacia un archivo"
+msgstr "Copiar en archivo"
 
-#: gtkedit/gtkedit.c:1148
+#: gtkedit/gtkedit.c:1303
 msgid "copy a block to a file"
-msgstr "copiar un bloque hacia un archivo"
+msgstr "copiar bloque en archivo"
 
-#: gtkedit/gtkedit.c:1152
+#: gtkedit/gtkedit.c:1307
 msgid "Exit"
 msgstr "Salir"
 
-#: gtkedit/gtkedit.c:1152
+#: gtkedit/gtkedit.c:1307
 msgid "Quit editor"
 msgstr "Salir del editor"
 
-#: gtkedit/gtkedit.c:1160
+#: gtkedit/gtkedit.c:1315
 msgid "Copy selection to clipboard"
-msgstr "Copiar la selección al portapapeles"
+msgstr "Copiar selección al portapapeles"
 
-#: gtkedit/gtkedit.c:1163
+#: gtkedit/gtkedit.c:1318
 msgid "Cut"
 msgstr "Cortar"
 
-#: gtkedit/gtkedit.c:1163
+#: gtkedit/gtkedit.c:1318
 msgid "Cut selection to clipboard"
-msgstr "Cortar la selección al portapapeles"
+msgstr "Cortar selección al portapapeles"
 
-#: gtkedit/gtkedit.c:1166
+#: gtkedit/gtkedit.c:1321
 msgid "Paste"
 msgstr "Pegar"
 
-#: gtkedit/gtkedit.c:1166
+#: gtkedit/gtkedit.c:1321
 msgid "Paste clipboard"
-msgstr "Pegar el portapapeles"
+msgstr "Pegar el contenido del portapapeles"
 
-#: gtkedit/gtkedit.c:1170
+#: gtkedit/gtkedit.c:1325
 msgid "Undo"
 msgstr "Deshacer"
 
-#: gtkedit/gtkedit.c:1170
+#: gtkedit/gtkedit.c:1325
 msgid "Go back in time one key press"
-msgstr "Volver hacia atrás de una tecla"
+msgstr "Deshacer la última tecla pulsada"
 
-#: gtkedit/gtkedit.c:1178
+#: gtkedit/gtkedit.c:1333
 msgid "Find"
 msgstr "Buscar"
 
-#: gtkedit/gtkedit.c:1178
+#: gtkedit/gtkedit.c:1333
 msgid "Find string/regular expression"
 msgstr "Buscar cadena/expresión regular"
 
-#: gtkedit/gtkedit.c:1181
+#: gtkedit/gtkedit.c:1336
 msgid "Find again"
-msgstr "Buscar de nuevo"
+msgstr "Buscar siguiente"
 
-#: gtkedit/gtkedit.c:1181
+#: gtkedit/gtkedit.c:1336
 msgid "Repeat most recent search"
-msgstr "Repetir última búsqueda"
+msgstr "Repetir la última búsqueda"
 
-#: gtkedit/gtkedit.c:1184 gtkedit/gtkedit.c:1209
+#: gtkedit/gtkedit.c:1339 gtkedit/gtkedit.c:1364
 msgid "Search/Replace"
 msgstr "Buscar/Reemplazar"
 
-#: gtkedit/gtkedit.c:1184
+#: gtkedit/gtkedit.c:1339
 msgid "Find and replace text/regular expressions"
 msgstr "Buscar y reemplazar texto/expresiones regulares"
 
-#: gtkedit/gtkedit.c:1193
+#: gtkedit/gtkedit.c:1348
 msgid "About..."
-msgstr "Acerca..."
+msgstr "Acerca de..."
 
-#: gtkedit/gtkedit.c:1193
-msgid "Info about GNOME hello"
-msgstr "Información sobre GNOME hello"
+#: gtkedit/gtkedit.c:1348
+msgid "Info about Mcedit"
+msgstr "Información acerca de Mcedit"
 
-#: gtkedit/syntax.c:3174 gtkedit/syntax.c:3181
+#: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
 msgid " Load syntax file "
-msgstr " Cargar archivo de síntaxis "
+msgstr " Cargar archivo de sintaxis "
 
-#: gtkedit/syntax.c:3174
+#: gtkedit/syntax.c:3180
 msgid " File access error "
-msgstr " Error de acceso al archivo "
+msgstr " Error de acceso a archivo "
 
-#: gtkedit/syntax.c:3180
+#: gtkedit/syntax.c:3186
 #, c-format
 msgid " Syntax error in file %s on line %d "
-msgstr " Error de síntaxi en el archivo %s a la línea %d "
+msgstr " Error de sintaxis en el fichero %s (línea %d) "
 
-#: 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/filegui.c:707
-#: 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:850 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 "&Cancelar"
 
@@ -1476,8 +1826,7 @@
 msgid " Chown advanced command "
 msgstr " Cambio de dueño y permisos "
 
-#: src/achown.c:631 src/achown.c:647 src/achown.c:710 src/chmod.c:286
-#: src/chmod.c:371
+#: src/achown.c:631 src/achown.c:647 src/achown.c:710 src/chmod.c:286 src/chmod.c:371
 #, c-format
 msgid ""
 " Couldn't chmod \"%s\" \n"
@@ -1486,8 +1835,7 @@
 " No puedo cambiar el modo a \"%s\" \n"
 " %s "
 
-#: src/achown.c:636 src/achown.c:651 src/achown.c:714 src/chown.c:225
-#: src/chown.c:347
+#: src/achown.c:636 src/achown.c:651 src/achown.c:714 src/chown.c:225 src/chown.c:347
 #, c-format
 msgid ""
 " Couldn't chown \"%s\" \n"
@@ -1496,24 +1844,23 @@
 " No puedo cambiar el modo a \"%s\" \n"
 " %s "
 
-#: src/achown.c:668 src/achown.c:672 src/chmod.c:321 src/chmod.c:325
-#: src/chown.c:262 src/chown.c:266 src/panelize.c:304 src/user.c:628
+#: src/achown.c:668 src/achown.c:672 src/chmod.c:321 src/chmod.c:325 src/chown.c:262 src/chown.c:266 src/panelize.c:304 src/user.c:628
 msgid " Oops... "
 msgstr " Oops... "
 
 #: src/achown.c:669
 msgid " I can't run the Advanced Chown command on an extfs "
-msgstr " No puedo ejecutar el comando AChown en un extfs "
+msgstr " No puedo \"cambiar dueño y permisos\" en un extfs "
 
 #: src/achown.c:673
 msgid " I can't run the Advanced Chown command on a tarfs "
-msgstr " No puedo correr el comando AChown en un tarfs "
+msgstr " No puedo \"cambiar dueño y permisos\" en un tarfs "
 
 #: src/background.c:181
 msgid "Background process:"
 msgstr "Procesos en el fondo"
 
-#: src/background.c:286 src/file.c:2021
+#: src/background.c:286 src/file.c:2102
 msgid " Background process error "
 msgstr " Error en un proceso en fondo"
 
@@ -1543,15 +1890,15 @@
 
 #: src/boxes.c:71
 msgid "&Full file list"
-msgstr "Listado &completo"
+msgstr "listado &Completo"
 
 #: src/boxes.c:72
 msgid "&Brief file list"
-msgstr "Listado &breve"
+msgstr "listado &Breve"
 
 #: src/boxes.c:73
 msgid "&Long file list"
-msgstr "Listado &largo"
+msgstr "listado &Largo"
 
 #: src/boxes.c:74
 msgid "&User defined:"
@@ -1559,7 +1906,7 @@
 
 #: src/boxes.c:75
 msgid "&Icon view"
-msgstr "V&ista de íconos"
+msgstr "&Iconos"
 
 #: src/boxes.c:140
 msgid "user &Mini status"
@@ -1621,82 +1968,70 @@
 msgid " Display bits "
 msgstr " Juego de caracteres "
 
-#: src/boxes.c:650
-msgid "Always to memory"
-msgstr "Siempre a memoria"
-
-#: src/boxes.c:650
-msgid "If size less than:"
-msgstr "Si el tamaño es menor a:"
-
-#: src/boxes.c:660
+#: src/boxes.c:654
 msgid "&Always use ftp proxy"
-msgstr "&Siempre usar proxy"
+msgstr "usar siempre pro&Xy"
 
-#: src/boxes.c:662
+#: src/boxes.c:656
 msgid "sec"
 msgstr "s."
 
-#: src/boxes.c:666
+#: src/boxes.c:660
 msgid "ftpfs directory cache timeout:"
-msgstr "Expiración del caché ftpfs:"
+msgstr "Descartar el caché de ftpfs tras: "
 
-#: src/boxes.c:670
+#: src/boxes.c:664
 msgid "ftp anonymous password:"
-msgstr "Contraseña para ftp anónimo:"
+msgstr "Contraseña FTP anónimo:"
 
-#: src/boxes.c:677
-msgid "Gzipped tar archive extract:"
-msgstr "Extraer archivo tar comprimido:"
-
-#: src/boxes.c:683
+#: src/boxes.c:671
 msgid "Timeout for freeing VFSs:"
-msgstr "Expiración del VFS:"
+msgstr "Descartar los VFS tras: "
 
-#: src/boxes.c:689
+#: src/boxes.c:677
 msgid " Virtual File System Setting "
-msgstr " Directorios virtuales (VFS)"
+msgstr " Sistema de archivos virtual (VFS) "
 
-#: src/boxes.c:789
+#: src/boxes.c:745
 msgid "Quick cd"
-msgstr "cd rápido"
+msgstr " Cambiar directorio "
 
 #. want cd like completion
-#: src/boxes.c:794
+#: src/boxes.c:750
 msgid "cd"
 msgstr "cd"
 
-#: src/boxes.c:850
+#: src/boxes.c:806
 msgid "Symbolic link filename:"
 msgstr "Nombre del nuevo enlace simbólico:"
 
-#: src/boxes.c:852
+#: src/boxes.c:808
 msgid "Existing filename (filename symlink will point to):"
 msgstr "Apuntando a:"
 
-#: src/boxes.c:881
+#: src/boxes.c:837
 msgid "Running "
 msgstr "Corriendo "
 
-#: src/boxes.c:882 src/find.c:667
+#: src/boxes.c:838 src/find.c:671
 msgid "Stopped"
 msgstr "Detenido "
 
-#: src/boxes.c:940
+#: src/boxes.c:896
 msgid "&Stop"
 msgstr "&Detener"
 
-#: src/boxes.c:941
+#: src/boxes.c:897
 msgid "&Resume"
-msgstr "C&ontinuar"
+msgstr "c&Ontinuar"
 
-#: src/boxes.c:942
+#: src/boxes.c:898
 msgid "&Kill"
 msgstr "&Matar"
 
-#: src/boxes.c:981
+#: src/boxes.c:937
 msgid "Background Jobs"
-msgstr "Procesos en el fondo"
+msgstr " Procesos en el fondo "
 
 #: src/chmod.c:96
 msgid "execute/search by others"
@@ -1758,10 +2093,6 @@
 msgid "&Marked all"
 msgstr "Marcados &todos"
 
-#: src/chmod.c:151 src/screen.c:424
-msgid "Name"
-msgstr "Nombre:"
-
 #: src/chmod.c:153
 msgid "Permissions (Octal)"
 msgstr "Permisos:"
@@ -1782,10 +2113,6 @@
 msgid " Permission "
 msgstr " Autorizaciones "
 
-#: src/chmod.c:165 src/chown.c:132
-msgid " File "
-msgstr " Archivo "
-
 #: src/chmod.c:170
 msgid "Use SPACE to change"
 msgstr "Use ESPACIO para cambiar"
@@ -1808,7 +2135,7 @@
 
 #: src/chmod.c:322
 msgid " I can't run the Chmod command on an extfs "
-msgstr " No puedo correr el comando chmod en un extfs "
+msgstr " No puedo \"cambiar permisos\" en un extfs "
 
 #: src/chown.c:83
 msgid "Set &users"
@@ -1844,148 +2171,147 @@
 
 #: src/chown.c:194
 msgid "<Unknown user>"
-msgstr "<Usuario desconocido>"
+msgstr "<desconocido>"
 
 #. add fields for unknown names (numbers)
 #: src/chown.c:195
 msgid "<Unknown group>"
-msgstr "<Grupo desconocido>"
+msgstr "<desconocido>"
 
 #: src/chown.c:263
 msgid " I can't run the Chown command on an extfs "
-msgstr " No puedo correr el comando Chown en un extfs "
+msgstr " No puedo \"cambiar permisos\" en un extfs "
 
 #: src/chown.c:267
 msgid " I can't run the Chown command on a tarfs "
-msgstr " No puedo correr el comando Chown en un tarfs "
+msgstr " No puedo \"cambiar permisos\" en un tarfs "
 
-#: src/cmd.c:198
+#: src/cmd.c:204
 #, c-format
 msgid " Can not fetch a local copy of %s "
-msgstr " No puedo obtener una copia local de `%s' "
+msgstr " No puedo obtener una copia local de \"%s\" "
 
-#: src/cmd.c:248
+#: src/cmd.c:254
 msgid " CD "
 msgstr " CD "
 
-#: src/cmd.c:248
+#: src/cmd.c:254
 msgid "Files tagged, want to cd?"
-msgstr " Hay archivos marcados, ¿quiere cambiar de directorio?"
+msgstr " Hay archivos marcados. ¿Quiere cambiar de directorio?"
 
-#: src/cmd.c:254 src/cmd.c:721 src/cmd.c:735
+#: src/cmd.c:260 src/cmd.c:709 src/cmd.c:723
 msgid "Could not change directory"
-msgstr "No pude cambiar de directorio"
+msgstr "No puedo cambiar de directorio"
 
-#: src/cmd.c:283
+#: src/cmd.c:289
 msgid " View file "
 msgstr " Ver archivo "
 
-#: src/cmd.c:283
+#: src/cmd.c:289
 msgid " Filename:"
 msgstr " Nombre de archivo:"
 
-#: src/cmd.c:300
+#: src/cmd.c:306
 msgid " Filtered view "
-msgstr " Ver archivo (con filtro)"
+msgstr " Ver archivo (con filtro) "
 
-#: src/cmd.c:300
+#: src/cmd.c:306
 msgid " Filter command and arguments:"
 msgstr " Comando para filtrar (incluya argumentos):"
 
-#: src/cmd.c:385
+#: src/cmd.c:391
 msgid " Mkdir "
 msgstr " Crear directorio "
 
-#: src/cmd.c:385
+#: src/cmd.c:391
 msgid " Enter directory name:"
 msgstr " Teclee el nombre del directorio: "
 
-#: src/cmd.c:440
+#: src/cmd.c:446
 msgid " Filter "
 msgstr " Filtro "
 
-#: src/cmd.c:440
+#: src/cmd.c:446
 msgid " Set expression for filtering filenames"
 msgstr " Teclee la expresión para filtrar nombres de archivo"
 
-#: src/cmd.c:524
+#: src/cmd.c:512
 msgid " Select "
 msgstr " Seleccionar grupo "
 
-#: src/cmd.c:552 src/cmd.c:603
+#: src/cmd.c:540 src/cmd.c:591
 msgid "  Malformed regular expression  "
 msgstr " La expresión regular es errónea "
 
-#: src/cmd.c:576
+#: src/cmd.c:564
 msgid " Unselect "
 msgstr " De-seleccionar grupo "
 
-#: src/cmd.c:648
+#: src/cmd.c:636
 msgid "Extension file edit"
 msgstr " Editar el archivo de extensiones "
 
-#: src/cmd.c:649
+#: src/cmd.c:637
 msgid " Which extension file you want to edit? "
 msgstr " ¿Qué archivo de extensión desea editar? "
 
-#: src/cmd.c:650
+#: src/cmd.c:638
 msgid "&User"
 msgstr "&Usuario"
 
-#: src/cmd.c:650 src/cmd.c:676
+#: src/cmd.c:638 src/cmd.c:664
 msgid "&System Wide"
 msgstr "&Sistema"
 
-#: src/cmd.c:673
+#: src/cmd.c:661
 msgid "Menu file edit"
-msgstr " Editar archivo de menús "
+msgstr " Editar archivo de menú "
 
-#: src/cmd.c:674
+#: src/cmd.c:662
 msgid " Which menu file will you edit? "
 msgstr " ¿Qué archivo de menú desea editar?"
 
-#: src/cmd.c:676
+#: src/cmd.c:664
 msgid "&Local"
 msgstr "&Local"
 
-#: src/cmd.c:676
+#: src/cmd.c:664
 msgid "&Home"
-msgstr "Directorio de &Inicio"
+msgstr "&Usuario"
 
-#: src/cmd.c:861
+#: src/cmd.c:849
 msgid " Compare directories "
 msgstr " Comparar directorios "
 
-#: src/cmd.c:861
+#: src/cmd.c:849
 msgid " Select compare method: "
 msgstr " Seleccione el método de comparación: "
 
-#: src/cmd.c:862
+#: src/cmd.c:850
 msgid "&Quick"
 msgstr "&Rápido"
 
-#: src/cmd.c:862
+#: src/cmd.c:850
 msgid "&Size only"
 msgstr "sólo &Tamaño"
 
-#: src/cmd.c:862
+#: src/cmd.c:850
 msgid "&Thorough"
 msgstr "&Completo"
 
-#: src/cmd.c:872
+#: src/cmd.c:860
 msgid " Both panels should be on the listing view mode to use this command "
-msgstr ""
-" Ambos paneles deben de estar en el modo de listad para usar este comando "
+msgstr " Ambos paneles deben estar en modo lista para poder usar este comando "
 
-#: src/cmd.c:886
+#: src/cmd.c:874
 msgid " The command history is empty "
 msgstr " La historia de comandos está vacía"
 
-#: src/cmd.c:892
+#: src/cmd.c:880
 msgid " Command history "
 msgstr " Historia de comandos "
 
-#: src/cmd.c:934
+#: src/cmd.c:922
 msgid ""
 " Not an xterm or Linux console; \n"
 " the panels cannot be toggled. "
@@ -1993,17 +2319,17 @@
 " No está ejecutando en un xterm o en la consola de Linux; \n"
 " Los páneles no pueden ser ocultados. "
 
-#: src/cmd.c:973
+#: src/cmd.c:961
 msgid ""
 "Type `exit' to return to the Midnight Commander\n"
 "\r\n"
 "\r"
 msgstr ""
-"Teclee `exit' para regresar al Midnight Commander\n"
+"Teclee \"exit\" para regresar al Midnight Commander\n"
 "\r\n"
 "\r"
 
-#: src/cmd.c:1026
+#: src/cmd.c:1014
 #, c-format
 msgid ""
 " Couldn't stat %s \n"
@@ -2012,122 +2338,104 @@
 " No puedo hacer stat al archivo %s \n"
 " %s "
 
-#: src/cmd.c:1035 src/cmd.c:1037
+#: src/cmd.c:1023 src/cmd.c:1025
 msgid " Link "
-msgstr " Ligar "
+msgstr " Crear enlace "
 
-#: src/cmd.c:1036 src/cmd.c:1141 src/file.c:2206
+#: src/cmd.c:1024 src/cmd.c:1129 src/file.c:2287
 msgid " to:"
 msgstr " a: "
 
-#: src/cmd.c:1047
+#: src/cmd.c:1035
 #, c-format
 msgid " link: %s "
 msgstr " enlace: %s"
 
-#: src/cmd.c:1080
+#: src/cmd.c:1068
 #, c-format
 msgid " symlink: %s "
 msgstr " enlace simbólico: %s "
 
-#: src/cmd.c:1106
+#: src/cmd.c:1094
 msgid " Symlink "
 msgstr " Enlace simbólico "
 
-#: src/cmd.c:1106
+#: src/cmd.c:1094
 msgid " points to:"
 msgstr " apunta a: "
 
-#: src/cmd.c:1111
+#: src/cmd.c:1099
 msgid " Edit symlink "
 msgstr " Editar enlace simbólico "
 
-#: src/cmd.c:1117
+#: src/cmd.c:1105
 #, c-format
 msgid " edit symlink: %s "
-msgstr " Editar enlace simbólico: %s "
+msgstr " editar enlace simbólico: %s "
 
-#: src/cmd.c:1141
+#: src/cmd.c:1129
 msgid " Link symbolically "
-msgstr " Ligar simbólicamente "
+msgstr " Crear enlace simbólico "
 
-#: src/cmd.c:1142
+#: src/cmd.c:1130
 msgid " Relative symlink "
 msgstr " Enlace simbólico relativo "
 
-#: src/cmd.c:1153
+#: src/cmd.c:1141
 #, c-format
 msgid " relative symlink: %s "
 msgstr " enlace simbólico relativo: %s "
 
-#: src/cmd.c:1256
+#: src/cmd.c:1244
 msgid " Enter machine name (F1 for details): "
 msgstr " Teclee el nombre de la máquina (F1 para más detalles): "
 
-#: src/cmd.c:1280
+#: src/cmd.c:1268
 #, c-format
 msgid " Could not chdir to %s "
 msgstr " No puedo cambiar al directorio %s "
 
-#: src/cmd.c:1287
+#: src/cmd.c:1275
 msgid " Link to a remote machine "
 msgstr " Conexión por red "
 
-#: src/cmd.c:1293
+#: src/cmd.c:1281
 msgid " FTP to machine "
 msgstr " Conexión por FTP "
 
-#: src/cmd.c:1303
+#: src/cmd.c:1291
 msgid " Socket source routing setup "
 msgstr " Configuración del ruteo específico "
 
-#: src/cmd.c:1304
+#: src/cmd.c:1292
 msgid " Enter host name to use as a source routing hop: "
 msgstr " Teclee el nombre de la máquina que será la intermediaria "
 
-#: src/cmd.c:1311
+#: src/cmd.c:1299
 msgid " Host name "
 msgstr " Nombre de la máquina "
 
-#: src/cmd.c:1311
+#: src/cmd.c:1299
 msgid " Error while looking up IP address "
 msgstr " Error al buscar la dirección IP "
 
-#: src/cmd.c:1322
+#: src/cmd.c:1310
 msgid " Undelete files on an ext2 file system "
-msgstr " Recupera archivos de un sistema de archivos ext2 "
+msgstr " Recuperar archivos de un sistema de archivos ext2 "
 
-#: src/cmd.c:1323
+#: src/cmd.c:1311
 msgid ""
 " Enter device (without /dev/) to undelete\n"
 "   files on: (F1 for details)"
 msgstr ""
-" Entre el dispositivo (sin /dev/) del cual quiere\n"
-"   recuperar los archivos: (F1 para más detalles)  el sistema de "
-"recuperación de archivos: (F1 para detalles) "
-
-#: src/cmd.c:1365
-#, fuzzy
-msgid "You can not scan disk usage on non-local filesystem. Sorry."
-msgstr " No puede ejecutar comandos en un sistema de archivos que no es local"
-
-#: src/cmd.c:1423
-msgid "Show directory sizes"
-msgstr "Muestra el tamaño de los directorios"
-
-#: src/cmd.c:1423 src/panelize.c:466
-msgid "Pipe close failed"
-msgstr "Fallo al cerrar la tubería"
+" Introduzca el dispositivo (sin /dev/) donde quiere\n"
+"  recuperar archivos: (F1 para más detalles)"
 
-#: src/cmd.c:1436
-msgid "Cannot invoke du command."
-msgstr "No puedo invocar el comando `du'"
-
-#: src/cmd.c:1447
+#: src/cmd.c:1361
 msgid " Setup saved to ~/"
 msgstr " Configuración almacenada en ~/"
 
-#: src/cmd.c:1452
+#: src/cmd.c:1366
 msgid " Setup "
 msgstr " Configuración "
 
@@ -2142,7 +2450,7 @@
 
 #: src/command.c:201
 msgid " You can not execute commands on non-local filesystems"
-msgstr " No puede ejecutar comandos en un sistema de archivos que no es local"
+msgstr " No puedo ejecutar comandos desde directorios no locales "
 
 #: src/dialog.c:59
 msgid ""
@@ -2155,7 +2463,9 @@
 msgstr ""
 "\n"
 "\n"
-"stack vacio\n"
+"\n"
+"stack vacío\n"
+"\n"
 "\n"
 
 #: src/dir.c:56
@@ -2197,7 +2507,7 @@
 
 #: src/dir.c:67
 msgid "&Links"
-msgstr "En&laces"
+msgstr "en&Laces"
 
 #: src/dir.c:68
 msgid "N&GID"
@@ -2215,51 +2525,49 @@
 msgid "&Group"
 msgstr "&Grupo"
 
-#: src/dir.c:377
+#: src/dir.c:378
 #, c-format
 msgid "File exists but can not be stat-ed: %s %s"
 msgstr "El archivo existe pero no se pudo hacer un stat(): %s %s"
 
-#: src/dir.c:632
+#: src/dir.c:636
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/ext.c:139 src/user.c:511
+#: src/ext.c:141 src/user.c:511
 #, c-format
 msgid ""
 " Can't create temporary command file \n"
 " %s "
 msgstr ""
-"No puedo crear el archivo temporal para comandos \n"
+" No puedo crear el archivo temporal para comandos \n"
 " %s "
 
-#: src/ext.c:152 src/user.c:538
+#: src/ext.c:154 src/user.c:538
 msgid " Parameter "
 msgstr "Parámetro"
 
-#: src/ext.c:295
+#: src/ext.c:297
 msgid " Can't execute commands on a Virtual File System directory "
-msgstr ""
-" No puedo ejecutar comandos en un directorio en el sistema virtual de "
-"archivos (VFS) "
+msgstr " No puedo ejecutar comandos desde directorios de un VFS "
 
-#: src/ext.c:392
+#: src/ext.c:394
 msgid " file error"
 msgstr " error de archivo"
 
-#: src/ext.c:393
+#: src/ext.c:395
 msgid "Format of the "
 msgstr "Formato del "
 
-#: src/ext.c:411
+#: src/ext.c:413
 msgid " file error "
 msgstr " error de archivo "
 
-#: src/ext.c:412
+#: src/ext.c:414
 msgid "Format of the ~/"
 msgstr "Formato de ~/"
 
-#: src/ext.c:412
+#: src/ext.c:414
 msgid ""
 " file has changed\n"
 "with version 3.0. You may want either to\n"
@@ -2268,7 +2576,7 @@
 " archivo ha cambiado\n"
 "con la versión 3.0.  Posiblemente quiera copiarlo de "
 
-#: 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"
@@ -2276,31 +2584,31 @@
 "mc.ext or usar\n"
 "ese archivo como referencia\n"
 
-#: src/ext.c:416
+#: src/ext.c:418
 msgid "mc.ext will be used for this moment."
 msgstr "mc.ext será usado para este momento."
 
-#: src/file.c:225 src/tree.c:1104
+#: src/file.c:229 src/tree.c:1104
 msgid " Copy "
 msgstr " Copiar "
 
-#: src/file.c:226 src/tree.c:1140
+#: src/file.c:230 src/tree.c:1140
 msgid " Move "
 msgstr " Mover "
 
-#: src/file.c:227 src/tree.c:1205
+#: src/file.c:231 src/tree.c:1207
 msgid " Delete "
 msgstr " Borrar "
 
-#: src/file.c:310
+#: src/file.c:313
 msgid " Invalid target mask "
 msgstr "La máscara destino es incorrecta"
 
-#: src/file.c:408
+#: src/file.c:411
 msgid " Could not make the hardlink "
-msgstr " No pude hacer el enlace duro "
+msgstr " No puedo crear el enlace "
 
-#: src/file.c:451
+#: src/file.c:454
 #, c-format
 msgid ""
 " Cannot read source link \"%s\" \n"
@@ -2309,19 +2617,18 @@
 " No puedo leer el enlace original \"%s\" \n"
 " %s "
 
-#: 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 ""
-" No puedo hacer enlaces simbólicos estables si los archivos están en "
-"distintos \n"
+" No puedo hacer enlaces simbólicos estables si los archivos están en distintos \n"
 " sistemas de archivos: \n"
 "\n"
 " La opción de enlaces simbólicos estables será desactivada "
 
-#: src/file.c:510
+#: src/file.c:513
 #, c-format
 msgid ""
 " Cannot create target symlink \"%s\" \n"
@@ -2330,16 +2637,16 @@
 " No puedo crear el enlace simbólico destino \"%s\" \n"
 " %s "
 
-#: src/file.c:571
+#: src/file.c:580
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo sobre-escribir el directorio \"%s\" \n"
+" No puedo sobrescribir el directorio \"%s\" \n"
 " %s "
 
-#: src/file.c:581
+#: src/file.c:590
 #, c-format
 msgid ""
 " Cannot stat source file \"%s\" \n"
@@ -2348,12 +2655,14 @@
 " Fallo al solicitar la información sobre el archivo fuente \"%s\" \n"
 " %s "
 
-#: src/file.c:595
+#: src/file.c:604
 #, c-format
 msgid " `%s' and `%s' are the same file. "
-msgstr " `%s' y `%s' son el mismo archivo. "
+msgstr ""
+" \"%s\" y \"%s\" \n"
+" son el mismo archivo. "
 
-#: src/file.c:631
+#: src/file.c:640
 #, c-format
 msgid ""
 " Cannot create special file \"%s\" \n"
@@ -2362,7 +2671,7 @@
 " No puedo crear el archivo especial \"%s\" \n"
 " %s "
 
-#: src/file.c:641 src/file.c:865
+#: src/file.c:650 src/file.c:874
 #, c-format
 msgid ""
 " Cannot chown target file \"%s\" \n"
@@ -2371,7 +2680,7 @@
 " No puedo cambiar el dueño del archivo destino: \"%s\" \n"
 " %s "
 
-#: src/file.c:650 src/file.c:881
+#: src/file.c:659 src/file.c:890
 #, c-format
 msgid ""
 " Cannot chmod target file \"%s\" \n"
@@ -2380,7 +2689,7 @@
 " No puedo cambiar los permisos del archivo destino \"%s\" \n"
 " %s "
 
-#: src/file.c:664
+#: src/file.c:673
 #, c-format
 msgid ""
 " Cannot open source file \"%s\" \n"
@@ -2389,11 +2698,11 @@
 " No puedo abrir el archivo fuente \"%s\" \n"
 " %s"
 
-#: src/file.c:674
+#: src/file.c:683
 msgid " Reget failed, about to overwrite file "
-msgstr " Falló el reintento, se va a sobre-escribir el archivo"
+msgstr " Falló el reintento, se va a sobrescribir el archivo "
 
-#: src/file.c:681
+#: src/file.c:690
 #, c-format
 msgid ""
 " Cannot fstat source file \"%s\" \n"
@@ -2402,7 +2711,7 @@
 " No puedo solicitar información sobre el archivo origen \"%s\" \n"
 " %s "
 
-#: src/file.c:703
+#: src/file.c:712
 #, c-format
 msgid ""
 " Cannot create target file \"%s\" \n"
@@ -2411,7 +2720,7 @@
 " No puedo crear el archivo destino \"%s\" \n"
 " %s "
 
-#: src/file.c:718
+#: src/file.c:727
 #, c-format
 msgid ""
 " Cannot fstat target file \"%s\" \n"
@@ -2420,7 +2729,7 @@
 " No puedo solicitar información sobre el archivo destino \"%s\" \n"
 " %s"
 
-#: src/file.c:749
+#: src/file.c:758
 #, c-format
 msgid ""
 " Cannot read source file \"%s\" \n"
@@ -2429,7 +2738,7 @@
 " No puedo leer el archivo fuente \"%s\" \n"
 " %s"
 
-#: src/file.c:779
+#: src/file.c:788
 #, c-format
 msgid ""
 " Cannot write target file \"%s\" \n"
@@ -2438,11 +2747,11 @@
 " No puedo escribir el archivo destino \"%s\" \n"
 " %s"
 
-#: src/file.c:797
+#: src/file.c:806
 msgid "(stalled)"
 msgstr "(caído)"
 
-#: src/file.c:836
+#: src/file.c:845
 #, c-format
 msgid ""
 " Cannot close source file \"%s\" \n"
@@ -2451,7 +2760,7 @@
 " No puedo cerrar el archivo fuente \"%s\" \n"
 " %s"
 
-#: src/file.c:846
+#: src/file.c:855
 #, c-format
 msgid ""
 " Cannot close target file \"%s\" \n"
@@ -2460,19 +2769,19 @@
 " No puedo cerrar el archivo destino \"%s\" \n"
 " %s"
 
-#: src/file.c:856
+#: src/file.c:865
 msgid "Incomplete file was retrieved. Keep it?"
-msgstr "Se recogió un archivo incompleto. ¿Se guarda?"
+msgstr "Archivo incompleto recuperado. ¿Desea conservarlo?"
 
-#: src/file.c:856
+#: src/file.c:865
 msgid "&Delete"
 msgstr "&Borrar"
 
-#: src/file.c:856 src/hotlist.c:1437
+#: src/file.c:865 src/hotlist.c:1437
 msgid "&Keep"
 msgstr "&Mantener"
 
-#: src/file.c:925
+#: src/file.c:937
 #, c-format
 msgid ""
 " Cannot stat source directory \"%s\" \n"
@@ -2481,7 +2790,7 @@
 " No puedo solicitar información sobre el directorio fuente \"%s\" \n"
 " %s"
 
-#: src/file.c:948
+#: src/file.c:960
 #, c-format
 msgid ""
 " Source directory \"%s\" is not a directory \n"
@@ -2491,16 +2800,16 @@
 " %s "
 
 #. we found a cyclic symbolic link
-#: src/file.c:956
+#: src/file.c:968
 #, c-format
 msgid ""
 " Cannot copy cyclic symbolic link \n"
 " `%s' "
 msgstr ""
 " No puedo copiar un enlace simbólico cíclico \n"
-" `%s' "
+" \"%s\" "
 
-#: src/file.c:1009
+#: src/file.c:1021
 #, c-format
 msgid ""
 " Cannot create target directory \"%s\" \n"
@@ -2509,7 +2818,7 @@
 " No puedo crear el directorio destino \"%s\" \n"
 " %s "
 
-#: src/file.c:1028
+#: src/file.c:1040
 #, c-format
 msgid ""
 " Cannot chown target directory \"%s\" \n"
@@ -2519,7 +2828,7 @@
 " %s "
 
 #. Source doesn't exist
-#: src/file.c:1140
+#: src/file.c:1155
 #, c-format
 msgid ""
 " Cannot stat file \"%s\" \n"
@@ -2528,113 +2837,121 @@
 " No puedo solicitar información sobre el archivo \"%s\" \n"
 " %s "
 
-#: src/file.c:1162
+#: src/file.c:1177
 #, c-format
 msgid " `%s' and `%s' are the same file "
-msgstr " `%s' y `%s' sob el mismo archivo "
+msgstr " \"%s\" y \"%s\" son el mismo archivo "
 
-#: src/file.c:1169
+#: src/file.c:1184
 #, c-format
 msgid " Cannot overwrite directory `%s' "
-msgstr " No puedo sobre-escribir el directorio `%s' "
+msgstr " No puedo sobrescribir el directorio \"%s\" "
 
-#: src/file.c:1202
+#: src/file.c:1217
 #, c-format
 msgid ""
 " Cannot move file \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo mover el archivo `%s' a `%s' \n"
+" No puedo mover el archivo \"%s\" a \"%s\" \n"
 " %s "
 
-#: src/file.c:1222
+#: src/file.c:1238
 #, c-format
 msgid ""
 " Cannot remove file \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo borrar el archivo `%s' \n"
+" No puedo borrar el archivo \"%s\" \n"
 " %s"
 
-#: src/file.c:1271
+#: src/file.c:1288
 #, c-format
 msgid " Cannot overwrite directory \"%s\" %s "
-msgstr " No puedo sobre-escribir el directorio \"%s\" %s "
+msgstr " No puedo sobrescribir el directorio \"%s\" %s "
 
-#: src/file.c:1273
+#: src/file.c:1290
 #, c-format
 msgid " Cannot overwrite file \"%s\" %s "
-msgstr " No puedo sobre-escrbir el archivo \"%s\" %s "
+msgstr " No puedo sobrescribir el archivo \"%s\" %s "
 
-#: src/file.c:1296
+#: src/file.c:1313
 #, c-format
 msgid ""
 " Cannot move directory \"%s\" to \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo mover el directorio `%s' a `%s' \n"
+" No puedo mover el directorio \"%s\" a \"%s\" \n"
 " %s "
 
-#: src/file.c:1352
+#: src/file.c:1377
 #, c-format
 msgid ""
 " Cannot delete file \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo borrar el archivo `%s' \n"
+" No puedo borrar el archivo \"%s\" \n"
 " %s "
 
-#: src/file.c:1405 src/file.c:1472 src/file.c:1501
+#: src/file.c:1436 src/file.c:1503 src/file.c:1532
 #, c-format
 msgid ""
 " Cannot remove directory \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo eliminar el directorio `%s' \n"
+" No puedo eliminar el directorio \"%s\" \n"
 " %s "
 
-#: src/file.c:1537
+#: src/file.c:1568
 msgid " Internal error: get_file \n"
 msgstr " Error interno: get_file \n"
 
-#: src/file.c:1700
+#: src/file.c:1735
 msgid " Can't operate on \"..\"! "
-msgstr " No puedo operar sobre \"..\" "
+msgstr " ¡No puedo operar sobre \"..\"! "
+
+#: src/file.c:1751
+msgid "Yes"
+msgstr "Sí"
 
-#: src/file.c:1750
+#: src/file.c:1751
+msgid "No"
+msgstr "No"
+
+#: src/file.c:1801
 msgid " Sorry, I could not put the job in background "
 msgstr " Lo siento, no pude poner la tarea en el fondo "
 
-#: src/file.c:1839 src/file.c:1932
+#: src/file.c:1891 src/file.c:2004
 msgid " Internal failure "
-msgstr " Fallo interna "
+msgstr " Fallo interno "
 
-#: src/file.c:1839 src/file.c:1933
+#: src/file.c:1891 src/file.c:2005
 msgid " Unknown file operation "
 msgstr " Operación desconocida sobre el archivo "
 
-#: src/file.c:1855
+#: src/file.c:1909
 #, c-format
 msgid ""
 " Destination \"%s\" must be a directory \n"
 " %s "
 msgstr ""
-" El destino \"%s\" debe de ser un directorio \n"
+" El destino \"%s\" debe ser un directorio \n"
 " %s "
 
-#: src/file.c:2022 src/filegui.c:248
+#: src/file.c:2103 src/filegui.c:248
 msgid "&Skip"
 msgstr "&Ignorar"
 
-#: src/file.c:2022
+#: src/file.c:2103
 msgid "&Retry"
 msgstr "&Reintentar"
 
-#: src/file.c:2022 src/file.c:2080 src/filegui.c:245 src/filegui.c:485
+#: src/file.c:2103 src/file.c:2161 src/filegui.c:245 src/filegui.c:485
 msgid "&Abort"
 msgstr "&Abortar"
 
-#: src/file.c:2071
+#: src/file.c:2152
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2644,7 +2961,7 @@
 " El directorio no está vacío.\n"
 " ¿Borrarlo recursivamente? "
 
-#: src/file.c:2072
+#: src/file.c:2153
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
@@ -2654,27 +2971,27 @@
 " Proceso en el fondo: El directorio no está vacío.\n"
 " ¿Borrarlo recursivamente? "
 
-#: src/file.c:2079
+#: src/file.c:2160
 msgid "a&ll"
 msgstr "&Todo"
 
-#: src/file.c:2079 src/filegui.c:488
+#: src/file.c:2160 src/filegui.c:488
 msgid "non&E"
-msgstr "nin&guno"
+msgstr "nin&Guno"
 
-#: src/file.c:2089
+#: src/file.c:2170
 msgid " Type 'yes' if you REALLY want to delete "
-msgstr " Teclee `yes' si REALMENTE quiere borrar "
+msgstr " Teclee \"yes\" si REALMENTE quiere borrar "
 
-#: src/file.c:2091
+#: src/file.c:2172
 msgid "all the directories "
 msgstr "todos los directorios "
 
-#: src/file.c:2093
+#: src/file.c:2174
 msgid " Recursive Delete "
 msgstr " Borrado recursivo "
 
-#: src/file.c:2094
+#: src/file.c:2175
 msgid " Background process: Recursive Delete "
 msgstr " Proceso en el fondo: Borrado recursivo "
 
@@ -2692,107 +3009,94 @@
 #. * (I don't use spaces around the words, because someday they could be
 #. * dropped, when widgets get smarter)
 #.
-#: src/file.c:2182
-#, fuzzy
+#: src/file.c:2263
 msgid "1Copy"
-msgstr "Copiar"
+msgstr "1Copiar"
 
-#: src/file.c:2182
-#, fuzzy
+#: src/file.c:2263
 msgid "1Move"
-msgstr "Mover"
+msgstr "1Mover"
 
-#: src/file.c:2182
-#, fuzzy
+#: src/file.c:2263
 msgid "1Delete"
-msgstr "Borrar"
+msgstr "1¿Borrar"
 
-#: src/file.c:2197
+#: src/file.c:2278
 #, c-format
 msgid "%o %f \"%s\"%m"
 msgstr "%o %f \"%s\"%m"
 
-#: src/file.c:2198
+#: src/file.c:2279
 #, c-format
 msgid "%o %d %f%m"
 msgstr "%o %d %f%m"
 
-#: src/file.c:2200
+#: src/file.c:2281
 #, c-format
 msgid "%o %f \"%s\"%e"
-msgstr ""
+msgstr "%o %f \"%s\"%e"
 
-#: src/file.c:2201
+#: src/file.c:2282
 #, c-format
 msgid "%o %d %f%e"
-msgstr ""
+msgstr "%o %d %f%e"
 
-#: src/file.c:2205
-#, fuzzy
+#: src/file.c:2286
 msgid "file"
-msgstr "Archivo"
+msgstr "archivo"
 
-#: src/file.c:2205
-#, fuzzy
+#: src/file.c:2286
 msgid "files"
-msgstr "Todos los archivos"
+msgstr "archivos"
 
-#: src/file.c:2205
-#, fuzzy
+#: src/file.c:2286
 msgid "directory"
-msgstr "Directorio hogar"
+msgstr "directorio"
 
-#: src/file.c:2205
-#, fuzzy
+#: src/file.c:2286
 msgid "directories"
-msgstr "Muestra el tamaño de los directorios"
+msgstr "directorios"
 
-#: src/file.c:2206
-#, fuzzy
+#: src/file.c:2287
 msgid "files/directories"
-msgstr "todos los directorios "
+msgstr "archivos/directorios"
 
-#: src/file.c:2206
+#: src/file.c:2287
 msgid " with source mask:"
-msgstr " con la máscara de origen:"
+msgstr " aplicando la máscara:"
 
 #: src/filegui.c:375
-#, fuzzy
 msgid "Count"
-msgstr "Cortar"
+msgstr "Total"
 
 #: src/filegui.c:387
-#, fuzzy
 msgid "Bytes"
-msgstr "sí"
+msgstr "Bytes"
 
 #: src/filegui.c:416
 msgid "Source"
 msgstr "Fuente"
 
 #: src/filegui.c:430
-#, fuzzy
 msgid "Target"
-msgstr "Olvidar"
+msgstr "Destino"
 
 #: src/filegui.c:443
-#, fuzzy
 msgid "Deleting"
-msgstr "Borrar"
+msgstr "Borrando"
 
 #: src/filegui.c:483
 #, c-format
 msgid "Target file \"%s\" already exists!"
-msgstr "El archivo destino \"%s\" ya existe!"
+msgstr "¡El archivo destino \"%s\" ya existe!"
 
 #: src/filegui.c:486
 msgid "if &Size differs"
-msgstr "Si el tamaño difiere"
+msgstr "si el &Tamaño difiere"
 
 #: src/filegui.c:489
-#, fuzzy
 msgid "&Update"
-msgstr "arri&Ba"
+msgstr "actuali&Zar"
 
 #: src/filegui.c:490
 msgid "al&L"
@@ -2800,82 +3104,74 @@
 
 #: src/filegui.c:491
 msgid "Overwrite all targets?"
-msgstr "¿Sobre-escribo todos los archivos destino?"
+msgstr "¿Sobrescribir todos los archivos?"
 
 #: src/filegui.c:493
-#, fuzzy
 msgid "&Reget"
 msgstr "&Reintentar"
 
 #: src/filegui.c:494
 msgid "ap&Pend"
-msgstr "Añade"
+msgstr "aña&Dir"
 
 #: src/filegui.c:497
 msgid "Overwrite this target?"
-msgstr "¿Sobre-escribo este archivo?"
+msgstr "¿Sobrescribir este archivo?"
 
 #: src/filegui.c:499
 #, c-format
 msgid "Target date: %s, size %d"
-msgstr "Fecha del archivo destino: %s, tamaño: %d"
+msgstr "Archivo destino: fecha %s, tamaño %d"
 
 #: src/filegui.c:501
 #, c-format
 msgid "Source date: %s, size %d"
-msgstr "Fecha del archivo fuente: %s, tamaño: %d"
+msgstr "Archivo origen: fecha %s, tamaño %d"
 
 #: src/filegui.c:589
-#, fuzzy
 msgid " File exists "
-msgstr " Archivo "
+msgstr " El archivo ya existe "
 
 #: src/filegui.c:589
-#, fuzzy
 msgid " Background process: File exists "
-msgstr " Proceso en el fondo: Borrado recursivo "
+msgstr " Proceso en el fondo: El archivo ya existe "
 
 #. follow symlinks and preserve Attributes must be the first
 #: src/filegui.c:683
 msgid "preserve &Attributes"
-msgstr "preservar los &Atributos"
+msgstr "&Preservar atributos"
 
 #: src/filegui.c:685
-#, fuzzy
 msgid "follow &Links"
-msgstr "cd sigue en&Laces"
+msgstr "seguir en&Laces"
 
 #: src/filegui.c:694
-#, fuzzy
 msgid "to:"
-msgstr " a: "
+msgstr "a:"
 
 #: src/filegui.c:695
-#, fuzzy
 msgid "&Using shell patterns"
-msgstr "&Patrones del shell"
+msgstr "&Usando patrones shell"
 
 #: src/filegui.c:716
-#, fuzzy
 msgid "&Background"
-msgstr "Procesos en el fondo"
+msgstr "&Fondo"
 
 #: src/filegui.c:725
-#, fuzzy
 msgid "&Stable Symlinks"
-msgstr " Enlace simbólico "
+msgstr "enlaces simbólicos &Estables"
 
 #: src/filegui.c:727
 msgid "&Dive into subdir if exists"
-msgstr "&Procesa recursivamente los directorios"
+msgstr "copiar &Recursivamente en subdirectorios"
 
 #: src/filegui.c:875
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Invalid source pattern `%s' \n"
 " %s "
 msgstr ""
-" No puedo leer el enlace original \"%s\" \n"
+" Patrón fuente incorrecto \"%s\" \n"
 " %s "
 
 #: src/find.c:120
@@ -2884,7 +3180,7 @@
 
 #: src/find.c:121
 msgid "Con&tinue"
-msgstr "Con&tinuar"
+msgstr "con&Tinuar"
 
 #: src/find.c:122
 msgid "&Chdir"
@@ -2922,7 +3218,7 @@
 msgid "Content: "
 msgstr "Contenido: "
 
-#: src/find.c:154 src/main.c:1207 src/main.c:1228
+#: src/find.c:154 src/main.c:1199 src/main.c:1220
 msgid "&Tree"
 msgstr "ár&Bol"
 
@@ -2947,26 +3243,26 @@
 msgid "Finished"
 msgstr "Terminado"
 
-#: src/find.c:535 src/view.c:1450
+#: src/find.c:539 src/view.c:1450
 #, c-format
 msgid "Searching %s"
 msgstr "Buscando %s"
 
-#: src/find.c:667 src/find.c:784
+#: src/find.c:671 src/find.c:788
 msgid "Searching"
 msgstr "Buscando"
 
-#: src/find.c:759
+#: src/find.c:763
 msgid "Find file"
 msgstr " Buscar archivos "
 
 #: src/fixhlp.c:173
 msgid "Usage: fixhlp <width> <tocname>\n"
-msgstr "Uso: fixhtml <ancho> <nombre-tabla-contenido>\n"
+msgstr "Uso: fixhlp <ancho> <nombre-tabla-contenido>\n"
 
 #: src/fixhlp.c:178
 msgid "fixhlp: Cannot open toc for writing"
-msgstr "fixhtml: No puedo escribir en el archivo de tabla de contenido "
+msgstr "fixhlp: No puedo escribir en el archivo de tabla de contenido "
 
 #: src/fixhlp.c:181
 msgid ""
@@ -2987,7 +3283,7 @@
 
 #: src/help.c:321
 msgid " Internal bug: Double start of link area "
-msgstr " Error interno: Doble inicio de un enlace "
+msgstr " Error interno: Doble inicio de enlace"
 
 #: src/help.c:575
 msgid " Can't find node [Contents] in help file "
@@ -3061,11 +3357,11 @@
 
 #: src/hotlist.c:622
 msgid "Active VFS directories"
-msgstr "Directorios virtuales (VFS) activos"
+msgstr " Directorios virtuales (VFS) activos "
 
 #: src/hotlist.c:622
 msgid "Directory hotlist"
-msgstr " Lista rápida de directorios "
+msgstr " Directorios favoritos "
 
 #: src/hotlist.c:641
 msgid " Directory path "
@@ -3103,11 +3399,11 @@
 #: src/hotlist.c:981
 #, c-format
 msgid "Label for \"%s\":"
-msgstr "Etiqueta para \"%s\":"
+msgstr " Etiqueta para \"%s\":"
 
 #: src/hotlist.c:986
 msgid " Add to hotlist "
-msgstr " Añadir a la lista "
+msgstr " Añadir actual "
 
 #: src/hotlist.c:1023
 msgid " Remove: "
@@ -3179,7 +3475,9 @@
 msgid ""
 " entries\n"
 "\n"
-msgstr "entradas\n"
+msgstr ""
+" entradas\n"
+"\n"
 
 #: src/hotlist.c:1429
 msgid ""
@@ -3245,7 +3543,7 @@
 
 #: src/info.c:134
 msgid "non-local vfs"
-msgstr "vfs no-local"
+msgstr "VFS no-local"
 
 #: src/info.c:140
 #, c-format
@@ -3289,7 +3587,7 @@
 #: src/info.c:184
 #, c-format
 msgid "Links:     %d"
-msgstr "Enlaces:    %d"
+msgstr "Enlaces:      %d"
 
 #: src/info.c:188
 #, c-format
@@ -3310,76 +3608,76 @@
 msgid "File:       None"
 msgstr "Archivo:     Ninguno"
 
-#: src/layout.c:161
+#: src/layout.c:159
 msgid "&Vertical"
 msgstr "&Vertical"
 
-#: src/layout.c:162
+#: src/layout.c:160
 msgid "&Horizontal"
 msgstr "&Horizontal"
 
-#: src/layout.c:172
+#: src/layout.c:170
 msgid "&Xterm hintbar"
 msgstr "sugerencias en &Xterm"
 
-#: src/layout.c:173
+#: src/layout.c:171
 msgid "h&Intbar visible"
 msgstr "&Sugerencias visibles"
 
-#: src/layout.c:174
+#: src/layout.c:172
 msgid "&Keybar visible"
 msgstr "&Barra de teclas visible"
 
-#: src/layout.c:175
+#: src/layout.c:173
 msgid "command &Prompt"
 msgstr "&Línea de comandos"
 
-#: src/layout.c:176
+#: src/layout.c:174
 msgid "show &Mini status"
 msgstr "mostrar m&Ini-estado"
 
-#: src/layout.c:177
+#: src/layout.c:175
 msgid "menu&Bar visible"
 msgstr "barra de &Menú visible"
 
-#: src/layout.c:178
+#: src/layout.c:176
 msgid "&Equal split"
 msgstr "simét&Rico"
 
-#: src/layout.c:179
+#: src/layout.c:177
 msgid "pe&Rmissions"
 msgstr "&Permisos"
 
-#: src/layout.c:180
+#: src/layout.c:178
 msgid "&File types"
 msgstr "&Tipos de archivos"
 
-#: 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 "&Guardar"
 
 #. length of line with '<' '>' buttons
-#: src/layout.c:382
+#: src/layout.c:380
 msgid " Layout "
 msgstr " Presentación "
 
-#: src/layout.c:383
+#: src/layout.c:381
 msgid " Panel split "
 msgstr " División de paneles "
 
-#: src/layout.c:384
+#: src/layout.c:382
 msgid " Highlight... "
 msgstr " Resaltar... "
 
-#: src/layout.c:385 src/option.c:156
+#: src/layout.c:383 src/option.c:157
 msgid " Other options "
 msgstr " Otras opciones "
 
-#: src/layout.c:386
+#: src/layout.c:384
 msgid "output lines"
 msgstr "líneas de salida"
 
-#: src/layout.c:453
+#: src/layout.c:451
 msgid "Layout"
 msgstr "Presentación"
 
@@ -3419,7 +3717,7 @@
 #: src/learn.c:125
 #, c-format
 msgid " You have entered \"%s\""
-msgstr " Usted tecleó `%s' "
+msgstr " Usted tecleó \"%s\" "
 
 #: src/learn.c:172
 msgid "OK"
@@ -3429,7 +3727,9 @@
 msgid ""
 "It seems that all your keys already\n"
 "work fine. That's great."
-msgstr "Parece ser que todas sus teclas funcionan correctamente"
+msgstr ""
+"Parece ser que todas sus teclas ya\n"
+"funcionan correctamente. Fantástico."
 
 #: src/learn.c:181
 msgid "&Discard"
@@ -3440,8 +3740,8 @@
 "Great! You have a complete terminal database!\n"
 "All your keys work well."
 msgstr ""
-"¡Fantástico! usted tiene ahora una base de datos completa sobre su terminal\n"
-"Todas sus telcas funcionan apropiadamente."
+"¡Fantástico! ¡Sus tablas de terminal son correctas!\n"
+"Todas las teclas funcionan apropiadamente."
 
 #: src/learn.c:269
 msgid "Learn keys"
@@ -3459,332 +3759,325 @@
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr "en esa tecla o presione el mouse. Puede moverse con el tabulador."
 
-#: src/main.c:661
+#: src/main.c:666
 msgid ""
 " 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? "
 msgstr ""
-" Midnight Commander no puede cambiarse al directorio que \n"
-" el subshell dice que es el directorio actual.  ¿Posiblemete\n"
-" usted borró el directorio o se dió otros permisos con el\n"
-" comando `su'?"
+" Midnight Commander no puede cambiar al directorio \n"
+" que el subshell dice que es el directorio actual. \n"
+" ¿Acaso borró usted el directorio o se dio otros \n"
+" permisos con el comando \"su\"?"
 
-#: src/main.c:736
+#: src/main.c:741
 msgid "Press any key to continue..."
 msgstr "Presione cualquier tecla para continuar..."
 
-#: src/main.c:786
+#: src/main.c:791
 msgid " The shell is already running a command "
 msgstr " El shell ya se encuentra corriendo un comando "
 
-#: src/main.c:1204 src/main.c:1225
+#: src/main.c:1196 src/main.c:1217
 msgid "&Listing mode..."
 msgstr "&Modo de listado..."
 
-#: src/main.c:1205 src/main.c:1226
+#: src/main.c:1197 src/main.c:1218
 msgid "&Quick view     C-x q"
-msgstr "&Vista rápida   C-x q"
+msgstr "&Vista rápida      C-x q"
 
-#: src/main.c:1206 src/main.c:1227
+#: src/main.c:1198 src/main.c:1219
 msgid "&Info           C-x i"
-msgstr "&Información    C-x i"
+msgstr "&Información       C-x i"
 
-#: src/main.c:1209 src/main.c:1230
+#: src/main.c:1201 src/main.c:1222
 msgid "&Sort order..."
 msgstr "&Ordenar..."
 
-#: src/main.c:1211 src/main.c:1232
+#: src/main.c:1203 src/main.c:1224
 msgid "&Filter..."
 msgstr "&Filtro..."
 
-#: src/main.c:1214 src/main.c:1235
+#: src/main.c:1206 src/main.c:1227
 msgid "&Network link..."
 msgstr "&Conexión por red..."
 
-#: src/main.c:1215 src/main.c:1236
+#: src/main.c:1207 src/main.c:1228
 msgid "FT&P link..."
 msgstr "conexión por FT&P..."
 
-#: src/main.c:1219 src/main.c:1240
+#: src/main.c:1211 src/main.c:1232
 msgid "&Drive...       M-d"
-msgstr "&Disco...         M-d"
+msgstr "&Disco...            M-d"
 
-#: src/main.c:1221 src/main.c:1242
+#: src/main.c:1213 src/main.c:1234
 msgid "&Rescan         C-r"
-msgstr "&Releer           C-r"
+msgstr "&Releer              C-r"
 
-#: src/main.c:1246
+#: src/main.c:1238
 msgid "&User menu          F2"
 msgstr "me&Nú de usuario               F2"
 
-#: src/main.c:1247
+#: src/main.c:1239
 msgid "&View               F3"
 msgstr "&Ver                           F3"
 
-#: src/main.c:1248
+#: src/main.c:1240
 msgid "Vie&w file...         "
-msgstr "Ver archivo...        "
+msgstr "ver arc&Hivo..."
 
-#: src/main.c:1249
+#: src/main.c:1241
 msgid "&Filtered view     M-!"
-msgstr "Ver usando &Filtro...         M-!"
+msgstr "ver archivo (con &Filtro)...  M-!"
 
-#: src/main.c:1250
+#: src/main.c:1242
 msgid "&Edit               F4"
 msgstr "&Editar                        F4"
 
-#: src/main.c:1251
+#: src/main.c:1243
 msgid "&Copy               F5"
 msgstr "&Copiar...                     F5"
 
-#: src/main.c:1252
+#: src/main.c:1244
 msgid "c&Hmod           C-x c"
 msgstr "cambiar &Permisos...        C-x c"
 
-#: src/main.c:1254
+#: src/main.c:1246
 msgid "&Link            C-x l"
-msgstr "&Ligar...                   C-x l"
+msgstr "crear en&Lace...            C-x l"
 
-#: src/main.c:1255
+#: src/main.c:1247
 msgid "&SymLink         C-x s"
-msgstr "Enlace &Simbólico...        C-x s"
+msgstr "crear enlace &Simbólico...  C-x s"
 
-#: src/main.c:1256
+#: src/main.c:1248
 msgid "edit s&Ymlink  C-x C-s"
 msgstr "edi&Tar enlace simbólico  C-x C-s"
 
-#: src/main.c:1257
+#: src/main.c:1249
 msgid "ch&Own           C-x o"
 msgstr "cambiar dueñ&O...           C-x o"
 
-#: src/main.c:1258
+#: src/main.c:1250
 msgid "&Advanced chown       "
 msgstr "c&Ambiar dueño y permisos..."
 
-#: src/main.c:1260
+#: src/main.c:1252
 msgid "&Rename/Move        F6"
 msgstr "&Renombrar/mover...            F6"
 
-#: src/main.c:1261
+#: src/main.c:1253
 msgid "&Mkdir              F7"
 msgstr "crear &Directorio...           F7"
 
-#: src/main.c:1262
+#: src/main.c:1254
 msgid "&Delete             F8"
 msgstr "&Borrar                        F8"
 
-#: src/main.c:1263
+#: src/main.c:1255
 msgid "&Quick cd          M-c"
 msgstr "ca&Mbiar directorio...        M-c"
 
-#: src/main.c:1265
+#: src/main.c:1257
 msgid "select &Group      M-+"
 msgstr "seleccionar &Grupo...         M-+"
 
-#: src/main.c:1266
+#: src/main.c:1258
 msgid "u&Nselect group    M-\\"
 msgstr "de-seleccionar gr&Upo...      M-\\"
 
-#: src/main.c:1267
+#: src/main.c:1259
 msgid "reverse selec&Tion M-*"
 msgstr "&Invertir la selección        M-*"
 
-#: src/main.c:1269
+#: src/main.c:1261
 msgid "e&Xit              F10"
-msgstr "Sali&R                        F10"
+msgstr "sali&R                        F10"
 
-#: src/main.c:1279
+#: src/main.c:1271
 msgid "&Directory tree"
-msgstr "Árbol de &Directorios"
+msgstr "árbol de &Directorios"
 
-#: src/main.c:1281
+#: src/main.c:1273
 msgid "&Find file            M-?"
 msgstr "&Buscar archivos...                M-?"
 
-#: src/main.c:1282
+#: src/main.c:1274
 msgid "s&Wap panels          C-u"
 msgstr "&Intercambiar paneles              C-u"
 
-#: src/main.c:1283
+#: src/main.c:1275
 msgid "switch &Panels on/off C-o"
 msgstr "&Activar/desactivar paneles        C-o"
 
-#: src/main.c:1284
+#: src/main.c:1276
 msgid "&Compare directories  C-x d"
-msgstr "&Comparar directorios            C-x d"
+msgstr "&Comparar directorios...         C-x d"
 
-#: src/main.c:1285
+#: src/main.c:1277
 msgid "e&Xternal panelize    C-x !"
-msgstr "panelizar con programa e&Xterno  C-x !"
+msgstr "búsquedas e&Xternas...           C-x !"
 
-#: src/main.c:1287
+#: src/main.c:1278
 msgid "show directory s&Izes"
 msgstr "mostrar &Tamaños de los directorios"
 
-#: src/main.c:1290
+#: src/main.c:1280
 msgid "command &History"
 msgstr "&Historia de comandos"
 
-#: src/main.c:1291
+#: src/main.c:1281
 msgid "di&Rectory hotlist    C-\\"
-msgstr "lista &Rápida de directorios...    C-\\"
+msgstr "directorios &Favoritos...          C-\\"
 
-#: src/main.c:1293
+#: src/main.c:1283
 msgid "&Active VFS list      C-x a"
 msgstr "directorios virtuales (&VFS)...  C-x a"
 
-#: src/main.c:1296
+#: src/main.c:1286
 msgid "&Background jobs      C-x j"
 msgstr "&Procesos en el fondo...         C-x j"
 
-#: src/main.c:1300
+#: src/main.c:1290
 msgid "&Undelete files (ext2fs only)"
-msgstr "&Recuperar archivos (sólo con ext2fs)"
+msgstr "&Recuperar archivos (ext2fs)..."
 
-#: src/main.c:1303
+#: src/main.c:1293
 msgid "&Listing format edit"
 msgstr "edición del formato de &Listado"
 
-#: src/main.c:1305
+#: src/main.c:1295
 msgid "&Extension file edit"
-msgstr "&Editar el archivo de extensiones"
+msgstr "&Editar el archivo de extensiones..."
 
-#: src/main.c:1306
+#: src/main.c:1296
 msgid "&Menu file edit"
-msgstr "editar archivo de &Menús"
+msgstr "editar archivo de &Menú..."
 
-#: src/main.c:1311
+#: src/main.c:1301
 msgid "&Configuration..."
 msgstr "&Configuración..."
 
-#: src/main.c:1312
-msgid "&Layout..."
-msgstr "&Presentación..."
-
-#: src/main.c:1313
+#: src/main.c:1303
 msgid "c&Onfirmation..."
 msgstr "c&Onfirmación..."
 
-#: src/main.c:1314
+#: src/main.c:1304
 msgid "&Display bits..."
 msgstr "&Juego de caracteres..."
 
-#: src/main.c:1316
+#: src/main.c:1306
 msgid "learn &Keys..."
 msgstr "redefinir &Teclas..."
 
-#: src/main.c:1319
+#: src/main.c:1309
 msgid "&Virtual FS..."
-msgstr "directorios &Virtuales (VFS)..."
+msgstr "sistema de archivos &Virtual (VFS)..."
 
-#: src/main.c:1322
+#: src/main.c:1312
 msgid "&Save setup"
 msgstr "&Guardar configuración"
 
-#: src/main.c:1338 src/main.c:1340
+#: src/main.c:1328 src/main.c:1330
 msgid " &Left "
 msgstr " &Izquierdo "
 
-#: src/main.c:1340
+#: src/main.c:1330
 msgid " &Above "
-msgstr " A&rriba "
+msgstr " a&Rriba "
 
-#: src/main.c:1343
+#: src/main.c:1333
 msgid " &File "
 msgstr " &Archivo "
 
-#: src/main.c:1344
+#: src/main.c:1334
 msgid " &Command "
 msgstr " &Comando "
 
-#: src/main.c:1345
+#: src/main.c:1335
 msgid " &Options "
 msgstr " &Opciones "
 
-#: src/main.c:1347 src/main.c:1349
+#: src/main.c:1337 src/main.c:1339
 msgid " &Right "
 msgstr " &Derecho "
 
-#: src/main.c:1349
+#: src/main.c:1339
 msgid " &Below "
-msgstr " Aba&jo "
+msgstr " a&Bajo "
 
-#: src/main.c:1404
+#: src/main.c:1394
 msgid " Information "
 msgstr " Información "
 
-#: src/main.c:1405
+#: src/main.c:1395
 msgid ""
 " 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.                                           "
 msgstr ""
-" El uso del `cargado rápido' puede ocasionar que el contenido\n"
+" El uso del \"cargado rápido\" puede ocasionar que el contenido\n"
 " del panel no siempre refleje el contenido del disco.  En ese\n"
 " caso use C-r para obligar al programa a actualizar los datos.\n"
 " Lea la página de manual para mayor información.             "
 
-#: src/main.c:1679 src/screen.c:2265 src/screen.c:2295
+#: src/main.c:1669 src/screen.c:2280 src/screen.c:2310
 msgid "Menu"
 msgstr "Menú"
 
-#: src/main.c:1884
+#: src/main.c:1874
 msgid "Thank you for using GNU Midnight Commander"
 msgstr "Gracias por usar el GNU Midnight Commander"
 
-#: src/main.c:2237
+#: src/main.c:2227
 #, c-format
 msgid "with mouse support on xterm%s.\n"
 msgstr "con soporte para ratón en xterm%s.\n"
 
-#: src/main.c:2238
+#: src/main.c:2228
 msgid " and the Linux console"
 msgstr " y la consola Linux"
 
-#: src/main.c:2333
+#: src/main.c:2323
 msgid "The TERM environment variable is unset!\n"
-msgstr "La variable de ambiente TERM no ha sido definida!\n"
+msgstr "¡La variable de entorno TERM está sin definir!\n"
 
-#: src/main.c:2535
+#: src/main.c:2525
 #, c-format
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr "Directorio para archivos del Midnight Commander: %s\n"
 
-#: src/main.c:2540
-msgid ""
-"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
-msgstr ""
-"La opción -m es obsoleta.  Por favor use \"Juego de caracteres\" en el menú "
-"de opciones\n"
+#: src/main.c:2530
+msgid "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
+msgstr "La opción -m está obsoleta. Vea \"Juego de caracteres...\" en el menú \"Opciones\"\n"
 
-#: src/main.c:2649
+#: src/main.c:2653
 msgid "Geometry for the window"
-msgstr "Geometría para la ventana"
+msgstr "Geometría de la ventana"
 
-#: src/main.c:2649
+#: src/main.c:2653
 msgid "GEOMETRY"
-msgstr "GEOMETRÍA"
+msgstr "GEOMETRIA"
 
-#: src/main.c:2650
+#: src/main.c:2654
 msgid "No windows opened at startup"
 msgstr "Ninguna ventana abierta al inicio"
 
-#: src/main.c:2870
+#: src/main.c:2895
 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 ""
-"No pude abrir la línea de la terminal.  Necesita correr el programa sin la\n"
-"opción -P.  En algunos sistemas, basta con correr `which mc`\n"
+"No pude abrir la línea de la terminal. Necesita ejecutar \"mc\" sin\n"
+"la opción -P. En algunos sistemas, basta con ejecutar `which mc`\n"
 
-#: src/main.c:2957
+#: src/main.c:2969
 msgid " Notice "
 msgstr " Aviso "
 
-#: src/main.c:2958
+#: src/main.c:2970
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -3816,7 +4109,7 @@
 msgstr "animación"
 
 #: src/option.c:82
-msgid "ro&Tating dash"
+msgid "rotatin&G dash"
 msgstr "simular &Hélice"
 
 #: src/option.c:84
@@ -3844,73 +4137,77 @@
 msgstr "&Patrones del shell"
 
 #: src/option.c:90
+msgid "Compute &Totals"
+msgstr "Calcular totales"
+
+#: src/option.c:91
 msgid "&Verbose operation"
 msgstr "ope&Ración detallada"
 
-#: src/option.c:91
+#: src/option.c:92
 msgid "&Fast dir reload"
 msgstr "carga rápida de contenido"
 
-#: src/option.c:92
+#: src/option.c:93
 msgid "mi&X all files"
 msgstr "me&Zclar todos los archivos"
 
-#: src/option.c:93
+#: src/option.c:94
 msgid "&Drop down menus"
 msgstr "menús &Desplegables"
 
-#: src/option.c:94
+#: src/option.c:95
 msgid "ma&Rk moves down"
 msgstr "marcar y a&Vanzar"
 
-#: src/option.c:95
+#: src/option.c:96
 msgid "show &Hidden files"
 msgstr "mostrar archivos &Ocultos"
 
-#: src/option.c:96
+#: src/option.c:97
 msgid "show &Backup files"
 msgstr "mostrar &Archivos de respaldo"
 
-#: src/option.c:103
+#: src/option.c:104
 msgid "&Never"
 msgstr "&Nunca"
 
-#: src/option.c:104
+#: src/option.c:105
 msgid "on dumb &Terminals"
 msgstr "sólo en terminales &Tontas"
 
-#: src/option.c:105
+#: src/option.c:106
 msgid "alwa&Ys"
 msgstr "&Siempre"
 
 #. Similar code is in layout.c (init_layout())
-#: src/option.c:153
+#: src/option.c:154
 msgid " Configure options "
-msgstr " Opciones de configuración "
+msgstr " Configuración "
 
-#: src/option.c:154
+#: src/option.c:155
 msgid " Panel options "
 msgstr " Opciones de los paneles "
 
-#: src/option.c:155
+#: src/option.c:156
 msgid " Pause after run... "
 msgstr " Pausa después de ejecutar... "
 
-#: src/option.c:207
+#: src/option.c:208
 msgid "Configure options"
-msgstr "Configura opciones"
+msgstr "Configuración"
 
 #: src/panelize.c:91
 msgid "&Add new"
-msgstr "&Añade nuevo"
+msgstr "&Añadir nuevo..."
 
 #: src/panelize.c:103
 msgid " External panelize "
-msgstr " Panelizar con programa externo "
+msgstr " Búsquedas externas "
 
 #: src/panelize.c:198 src/panelize.c:466
 msgid "External panelize"
-msgstr "Panelificación externa"
+msgstr "Búsquedas externas"
 
 #: src/panelize.c:223 src/panelize.c:280 src/panelize.c:351 src/panelize.c:372
 msgid "Other command"
@@ -3918,43 +4215,43 @@
 
 #: src/panelize.c:264
 msgid " Add to external panelize "
-msgstr " Añade a..."
+msgstr " Añadir nuevo "
 
 #: src/panelize.c:265
 msgid " Enter command label: "
-msgstr " Entrar una etiqueta de comando: "
+msgstr " Etiqueta del comando: "
 
 #: src/panelize.c:305
 msgid " I can't run external panelize while logged on a non local directory "
-msgstr "No puedo lanzar la panelización externa si no estoy en un disco real"
+msgstr " No puedo ejecutar busquedas externas en un directorio no local "
 
 #: src/panelize.c:354
 msgid "Find rejects after patching"
-msgstr "Busca archivos rechazados después de aplicar parches"
+msgstr "Buscar archivos rechazados después de aplicar parches"
 
 #: src/panelize.c:355
 msgid "Find *.orig after patching"
-msgstr "Busca archivos originales después de aplicar parches"
+msgstr "Buscar archivos originales después de aplicar parches"
 
 #: src/panelize.c:356
 msgid "Find SUID and SGID programs"
-msgstr "Busca programas con SUID y SGID"
+msgstr "Buscar programas con SUID y SGID"
 
 #: src/panelize.c:407
 msgid "Cannot invoke command."
 msgstr "No puedo invocar el comando."
 
+#: src/panelize.c:466
+msgid "Pipe close failed"
+msgstr "Fallo al cerrar la tubería"
+
 #: src/popthelp.c:31
 msgid "Show this help message"
 msgstr "Muestra este mensaje de ayuda"
 
 #: src/popthelp.c:32
 msgid "Display brief usage message"
-msgstr "Muestra un breve mensaje de uso"
-
-#: src/screen.c:425 src/screen.c:428
-msgid "Size"
-msgstr "Tamaño"
+msgstr "Muestra breve mensaje de ayuda"
 
 #: src/screen.c:427
 msgid "MTime"
@@ -3994,34 +4291,34 @@
 
 #: src/screen.c:442
 msgid "Inode"
-msgstr "Nodo-I"
+msgstr "Inodo"
 
 #: src/screen.c:646
 #, c-format
 msgid "  %s bytes in %d file%s"
 msgstr " %s bytes en %d archivo%s"
 
-#: src/screen.c:1299
+#: src/screen.c:1286
 msgid "Unknow tag on display format: "
 msgstr "Campo desconocido en el formato de pantalla: "
 
-#: src/screen.c:2036
+#: src/screen.c:2044
 msgid " Do you really want to execute? "
 msgstr " ¿Realmente quiere ejecutar?"
 
-#: src/screen.c:2051
+#: src/screen.c:2059
 msgid " No action taken "
 msgstr " No se tomó ninguna medida "
 
-#: src/screen.c:2269 src/screen.c:2299 src/tree.c:1486
+#: src/screen.c:2284 src/screen.c:2314 src/tree.c:1488
 msgid "RenMov"
 msgstr "RenMov"
 
-#: src/screen.c:2270 src/screen.c:2300 src/tree.c:1490
+#: src/screen.c:2285 src/screen.c:2315 src/tree.c:1492
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/screen.c:2286
+#: src/screen.c:2301
 #, c-format
 msgid ""
 " Can't chdir to %s \n"
@@ -4037,7 +4334,7 @@
 
 #: src/subshell.c:700
 msgid " The shell is still active. Quit anyway? "
-msgstr " El shell todavía está activo.  ¿Terminar de todas maneras?"
+msgstr " El shell todavía está activo. ¿Terminar de todas maneras?"
 
 #: src/subshell.c:726
 msgid " There are stopped jobs."
@@ -4045,7 +4342,7 @@
 
 #: src/subshell.c:727
 msgid " Quit anyway? "
-msgstr " ¿Terminae de todas maneras? "
+msgstr " ¿Terminar de todas maneras? "
 
 #: src/subshell.c:780
 #, c-format
@@ -4058,7 +4355,7 @@
 "Can't open the %s file for writing:\n"
 "%s\n"
 msgstr ""
-"No pude abrir el archivo `%s' para escritura:\n"
+"No pude abrir el archivo \"%s\" para escritura:\n"
 "%s\n"
 
 #: src/tree.c:633
@@ -4067,61 +4364,63 @@
 "Can't write to the %s file:\n"
 "%s\n"
 msgstr ""
-"NO pude escribir al archivo `%s':\n"
+"No pude escribir al archivo %s:\n"
 "%s\n"
 
 #: src/tree.c:1102
 #, c-format
 msgid "Copy \"%s\" directory to:"
-msgstr "Copiar el directorio `%s' a:"
+msgstr "Copiar el directorio \"%s\" a:"
 
 #: src/tree.c:1138
 #, c-format
 msgid "Move \"%s\" directory to:"
-msgstr "Mover el directorio `%s' a:"
+msgstr "Mover el directorio \"%s\" a:"
 
 #: src/tree.c:1145
 #, c-format
 msgid ""
 " Can't stat the destination \n"
 " %s "
-msgstr "No puedo solicitar información sobre el destino"
+msgstr ""
+" No puedo solicitar información sobre el destino \n"
+" %s "
 
 #: src/tree.c:1151
 msgid " The destination isn't a directory "
 msgstr " El destino no es un directorio "
 
-#: src/tree.c:1204
+#: src/tree.c:1206
 #, c-format
 msgid "  Delete %s?  "
-msgstr "  Borrar %s?  "
+msgstr "  ¿Borrar %s?  "
 
-#: src/tree.c:1246
+#: src/tree.c:1248
 msgid "Static"
 msgstr "Estát"
 
-#: src/tree.c:1246
+#: src/tree.c:1248
 msgid "Dynamc"
-msgstr "Dynam"
+msgstr "Dinám"
 
-#: src/tree.c:1336
+#: src/tree.c:1338
 #, c-format
 msgid ""
 " Can't chdir to \"%s\" \n"
 " %s "
 msgstr ""
-" No puedo cambiar al directorio `%s' \n"
+" No puedo cambiar al directorio \"%s\" \n"
 " %s "
 
-#: src/tree.c:1480
+#: src/tree.c:1482
 msgid "Rescan"
 msgstr "Releer"
 
-#: src/tree.c:1482
+#: src/tree.c:1484
 msgid "Forget"
 msgstr "Olvidar"
 
-#: src/tree.c:1495
+#: src/tree.c:1497
 msgid "Rmdir"
 msgstr "Eliminar"
 
@@ -4156,17 +4455,17 @@
 "File %s is not owned by root or you or is world writable.\n"
 "Using it may compromise your security"
 msgstr ""
-" El archivo `%s' no le pertenece a root o tiene permisos globales\n"
-" de escritura.  Usarlo puede causar una falla de segurdidad."
+" El archivo \"%s\" no pertenece a Ud. ni a root, ni tiene permiso\n"
+" global de escritura. Usarlo podría comprometer su seguridad."
 
 #: src/user.c:629
 msgid " I can't run programs while logged on a non local directory "
-msgstr " No puedo ejecutar programas cuando se está en un directorio virtual"
+msgstr " No puedo ejecutar programas estando en un directorio virtual "
 
 #. Create listbox
 #: src/user.c:716
 msgid " User menu "
-msgstr " Menú del usuario "
+msgstr " Menú de usuario "
 
 #: src/util.c:235
 msgid "name_trunc: too big"
@@ -4198,7 +4497,7 @@
 msgstr ""
 "\n"
 "\n"
-"ha sido modificado, ¿desea salvar sus cambios?\n"
+"ha sido modificado. ¿Desea guardar los cambios?\n"
 
 #: src/view.c:408
 msgid " Save changes "
@@ -4224,7 +4523,9 @@
 msgid ""
 " Can't stat file \n"
 " "
-msgstr "No puedo solicitar información sobre el archivo "
+msgstr ""
+" No puedo solicitar información sobre el archivo \n"
+" "
 
 #: src/view.c:492
 msgid " Can't view: not a regular file "
@@ -4286,7 +4587,7 @@
 
 #: src/view.c:1973
 msgid "UnWrap"
-msgstr "DesEnv"
+msgstr "Desple"
 
 #: src/view.c:1976
 msgid "HxSrch"
@@ -4513,7 +4814,7 @@
 
 #: src/wtools.c:645
 msgid "Ok"
-msgstr "Ok"
+msgstr "Aceptar"
 
 #: vfs/extfs.c:274
 #, c-format
@@ -4535,7 +4836,7 @@
 #: vfs/ftpfs.c:461
 #, c-format
 msgid " Could not set source routing (%s)"
-msgstr " No pude configurar del ruteo específico (%s)"
+msgstr " No pude preestablecer la ruta (%s)"
 
 #: vfs/ftpfs.c:1863 vfs/ftpfs.c:1878
 msgid ""
@@ -4559,9 +4860,9 @@
 " you need a password to log in, but the information may \n"
 " not be safe on the remote side.  Continue? \n"
 msgstr ""
-" El servidor remoto no está corriendo en un puerto sistema \n"
-" al cual haya que dar una contraseña para conectarse, \n"
-" pero la información puedo no ser segura de su lado. ¿Continuar? \n"
+" El servidor remoto no está en un puerto que requiera \n"
+" contraseña para conectarse, pero la información puede \n"
+" quedar desprotegida al otro lado. ¿Desea continuar? \n"
 
 #: vfs/mcfs.c:175
 msgid " Yes "
@@ -4573,337 +4874,187 @@
 
 #: vfs/mcfs.c:177
 msgid " The remote server is running on strange port. Giving up.\n"
-msgstr ""
-" El servidor remoto está corriendo en un puerto extraño. Abandonando.\n"
+msgstr " Desisto. El servidor remoto está en un puerto no habitual.\n"
 
 #: vfs/mcfs.c:189
 msgid " MCFS Password required "
-msgstr " Contraseña MCFS requerida "
+msgstr " Contraseña requerida para MCFS "
 
 #: vfs/mcfs.c:203
 msgid " Invalid password "
-msgstr " Contraseña incorrecta "
+msgstr " La contraseña es incorrecta "
 
 #: vfs/mcfs.c:322
 msgid " Too many open connections "
-msgstr " Demasiadas conexiones abiertas "
+msgstr " Demasiadas conexiones en curso "
 
-#: vfs/tar.c:90 vfs/tar.c:107
+#: vfs/tar.c:83 vfs/tar.c:100
 #, c-format
 msgid ""
 "Couldn't open tar archive\n"
 "%s"
 msgstr ""
-"No pude abrir el archivo tar\n"
+"No pude abrir archivo de tipo tar\n"
 "%s"
 
-#: vfs/tar.c:277
+#: vfs/tar.c:272
 msgid "Unexpected EOF on archive file"
-msgstr "EOF no esperado en el archivo"
+msgstr "Fin de archivo inesperado"
 
-#: vfs/tar.c:332 vfs/tar.c:339
+#: vfs/tar.c:327 vfs/tar.c:334
 msgid "Inconsistent tar archive"
-msgstr "Archivo tar inconsistente"
+msgstr "Archivo de tipo tar inconsistente"
 
 #. Error on first record
-#: vfs/tar.c:398
+#: vfs/tar.c:393
 #, c-format
 msgid ""
 "Hmm,...\n"
 "%s\n"
 "doesn't look like a tar archive."
-msgstr ""
-"Mmm,...\n"
+msgstr "" 
+"Hmm,...\n"
 "%s\n"
-"no se parece a un archivo tar."
-
-#~ msgid "Link"
-#~ msgstr "Ligar"
-
-#~ msgid "Do you want to delete "
-#~ msgstr "¿Desea borrar "
-
-#~ msgid "Open with..."
-#~ msgstr "Abrir con..."
-
-#~ msgid " Could not open %s directory"
-#~ msgstr " No puedo abrir el directorio `%s' "
-
-#~ msgid "Copyright (C) 1998 The Free Software Foundation"
-#~ msgstr "Copyright © 1998 la Free Software Foundation"
-
-#~ msgid "Open _new window"
-#~ msgstr "Abrir un _nuevo panel"
-
-#~ msgid "_Close this window"
-#~ msgstr "_Cerrar este panel"
-
-#~ msgid "_Listing view"
-#~ msgstr "Vista _listado"
+"no parece un archivo de tipo tar."
 
-#~ msgid "_Icon view"
-#~ msgstr "V_ista de íconos"
+#~ msgid "Always to memory"
+#~ msgstr "Siempre a memoria"
 
-#~ msgid "Display _tree view"
-#~ msgstr "Vista en _árbol"
+#~ msgid "If size less than:"
+#~ msgstr "Si el tamaño es menor que: "
 
-#~ msgid "_About the Midnight Commander..."
-#~ msgstr "Acerca del Midnight Commander..."
+#~ msgid "Gzipped tar archive extract:"
+#~ msgstr "Extraer archivo tar comprimido:"
 
-#~ msgid "Rename/move..."
-#~ msgstr "Renombrar/mover..."
-
-#~ msgid "Delete..."
-#~ msgstr "Borrar..."
-
-#~ msgid " Word wrap "
-#~ msgstr "word wrap "
-
-#~ msgid " Enter line length, 0 for off: "
-#~ msgstr " Teclee la longitud de la línea, 0 para desactivar "
-
-#~ msgid "&Open/load...     C-o"
-#~ msgstr "&Abrir/cargar...         C-o"
-
-#~ msgid "&New              C-n"
-#~ msgstr "&Nuevo                   C-n"
-
-#~ msgid "&Save              F2"
-#~ msgstr "&Guardar                  F2"
-
-#~ msgid "save &As...       F12"
-#~ msgstr "guar&Dar como...         F12"
-
-#~ msgid "&Insert file...   F15"
-#~ msgstr "&Insertar archivo...     F15"
-
-#~ msgid "copy to &File...  C-f"
-#~ msgstr "co&Piar a un archivo.... C-f"
-
-#~ msgid "a&Bout...            "
-#~ msgstr "&Acerca de..."
-
-#~ msgid "&Quit             F10"
-#~ msgstr "&Salir                   F10"
-
-#~ msgid "&New            C-x k"
-#~ msgstr "&Nuevo                 C-x k"
-
-#~ msgid "copy to &File...     "
-#~ msgstr "co&Piar a un archivo..."
-
-#~ msgid "&Toggle Mark       F3"
-#~ msgstr "i&Nicio/fin de marca        F3"
-
-#~ msgid "&Mark Columns    S-F3"
-#~ msgstr "&Marcar Columnas          S-F3"
-
-#~ msgid "toggle &Ins/overw Ins"
-#~ msgstr "activar &Inserción         Ins"
-
-#~ msgid "&Copy              F5"
-#~ msgstr "&Copiar                     F5"
-
-#~ msgid "&Move              F6"
-#~ msgstr "&Mover                      F6"
-
-#~ msgid "&Delete            F8"
-#~ msgstr "&Borrar                     F8"
-
-#~ msgid "&Undo             C-u"
-#~ msgstr "&Deshacer                  C-u"
-
-#~ msgid "&Beginning     C-PgUp"
-#~ msgstr "&Principio del archivo  C-PgUp"
-
-#~ msgid "&End           C-PgDn"
-#~ msgstr "&Fin del archivo        C-PgDn"
-
-#~ msgid "&Search...         F7"
-#~ msgstr "&Buscar...         F7"
-
-#~ msgid "search &Again     F17"
-#~ msgstr "buscar &Siguiente F17"
-
-#~ msgid "&Replace...        F4"
-#~ msgstr "&Reemplazar...     F4"
-
-#~ msgid "&Goto line...            M-l"
-#~ msgstr "&Ir a la línea...                M-l"
-
-#~ msgid "insert &Literal...       C-q"
-#~ msgstr "insertar &Literal...             C-q"
-
-#~ msgid "&Refresh screen          C-l"
-#~ msgstr "&Refresca la pantalla            C-l"
+#~ msgid "Show directory sizes"
+#~ msgstr "Muestra el tamaño de los directorios"
 
-#~ msgid "&Start record macro      C-r"
-#~ msgstr "iniciar grabación de &Macro      C-r"
+#~ msgid "Cannot invoke du command."
+#~ msgstr "No puedo invocar el comando \"du\""
 
-#~ msgid "&Finish record macro...  C-r"
-#~ msgstr "&Terminar grabación de macro...  C-r"
-
-#~ msgid "&Execute macro...   C-a, KEY"
-#~ msgstr "&Ejecutar macro           C-a, TECLA"
-
-#~ msgid "delete macr&O...            "
-#~ msgstr "&Borrar macro..."
-
-#~ msgid "insert &Date/time           "
-#~ msgstr "insertar &Fecha y hora"
-
-#~ msgid "format p&Aragraph        M-p"
-#~ msgstr "dar formato al &Párrafo          M-p"
-
-#~ msgid "'ispell' s&Pell check    C-p"
-#~ msgstr "corrector orto&Gráfico 'ispell'  C-p"
-
-#~ msgid "sor&T...                 M-t"
-#~ msgstr "&Ordena                          M-t"
-
-#~ msgid "'indent' &C Formatter    F19"
-#~ msgstr "adecentar código &C con `indent' F19"
-
-#~ msgid "&Mail...                    "
-#~ msgstr "c&Orreo... "
-
-#~ msgid "&Execute macro... C-x e, KEY"
-#~ msgstr "&Ejecutar macro...      C-x e, TECLA"
-
-#~ msgid "'ispell' s&Pell check    M-$"
-#~ msgstr "'ispell' &Corrige ortografía     M-$"
-
-#~ msgid "&General...  "
-#~ msgstr "&General..."
-
-#~ msgid "&Save mode..."
-#~ msgstr "&Modo de guardar..."
-
-#~ msgid " Edit "
-#~ msgstr " Edita "
-
-#~ msgid " Sear/Repl "
-#~ msgstr " Buscar/Reemplazar "
-
-#~ msgid " Command "
-#~ msgstr " Comando "
+#~ msgid ""
+#~ " Cannnot chmod target file \"%s\" \n"
+#~ " %s "
+#~ msgstr ""
+#~ " No puedo cambiar los permisos del archivo destino \"%s\" \n"
+#~ " %s "
 
-#~ msgid " Options "
-#~ msgstr " Opciones "
+#~ msgid " Can't open target file "
+#~ msgstr " No puedo abrir el archivo destino "
 
-#~ msgid "Open...\tC-o"
-#~ msgstr "Abrir...\tC-o"
+#~ msgid " Can't write to local target file "
+#~ msgstr " No puedo escribir al archivo destino (local)"
 
-#~ msgid "New\tC-n"
-#~ msgstr "Nuevo\tC-n"
+#~ msgid "Link"
+#~ msgstr "Enlace"
 
-#~ msgid "Save\tF2"
-#~ msgstr "Guardar\tF2"
+#~ msgid "Do you want to delete "
+#~ msgstr " ¿Realmente quiere eliminar "
 
-#~ msgid "Save as...\tF12"
-#~ msgstr "Guardar como...\tF12"
+#~ msgid "Open with..."
+#~ msgstr "Abrir con..."
 
-#~ msgid "Insert file...\tF15"
-#~ msgstr "Insertar archivo...\tF15"
+#~ msgid "Open Terminal"
+#~ msgstr "Abrir un terminal"
 
-#~ msgid "Copy to file...\tC-f"
-#~ msgstr "Copiar a un archivo...\tC-f"
+#~ msgid "Opens a terminal"
+#~ msgstr "Abre una ventana de terminal"
 
-#~ msgid "Disk operations"
-#~ msgstr "Operaciones de archivos"
+#~ msgid "Rename/Move..."
+#~ msgstr "Renombrar/mover..."
 
-#~ msgid "Toggle mark\tF3"
-#~ msgstr "Alterna marcado\tF3"
+#~ msgid "New directory..."
+#~ msgstr "Directorio nuevo..."
 
-#~ msgid "Toggle mark columns\tC-b"
-#~ msgstr "Alterna marcado columnas\tC-b"
+#~ msgid "Creates a new folder"
+#~ msgstr "Crea una carpeta nueva"
 
-#~ msgid "Toggle insert/overwrite\tIns"
-#~ msgstr "Alterna modo de inserción\tIns"
+#~ msgid "View raw"
+#~ msgstr "Ver sin formato"
 
-#~ msgid "Copy block to cursor\tF5"
-#~ msgstr "Copia el bloque a la posición actual\tF5"
+#~ msgid "View the file without further processing"
+#~ msgstr "Muestra un archivo ignorando formato"
 
-#~ msgid "Move block to cursor\tF6"
-#~ msgstr "Mueve bloque a la posición actual\tF6"
+#~ msgid "Select group by pattern..."
+#~ msgstr "Seleccionar grupo..."
 
-#~ msgid "Delete block\tF8/C-Del"
-#~ msgstr "Borrar bloque\tF8/C-Del"
+#~ msgid "Unselect group by pattern..."
+#~ msgstr "De-seleccionar grupo..."
 
-#~ msgid "Copy block to clipbrd\tC-Ins"
-#~ msgstr "Copia el bloque al portapapeles\tC-Ins"
+#~ msgid "Un-selects a group of marked files"
+#~ msgstr "De-selecciona un grupo de archivos"
 
-#~ msgid "Cut block to clipbrd\tS-Del"
-#~ msgstr "Corta el bloque al portapapeles\tS-Del"
+#~ msgid "Exit program"
+#~ msgstr "Sale del programa"
 
-#~ msgid "Paste block from clipbrd\tS-Ins"
-#~ msgstr "Pega el bloque del portapapeles\tS-Ins"
+#~ msgid "Display mode..."
+#~ msgstr "Modo de listado..."
 
-#~ msgid "Selection history\tM-Ins"
-#~ msgstr "Historia de selecciones\tM-Ins"
+#~ msgid "Set the display mode for the panel"
+#~ msgstr "Cambia el modo de listado"
 
-#~ msgid "Undo\tC-BackSpace"
-#~ msgstr "Deshacer\tC-Backspace"
+#~ msgid "Changes the sort order of the files"
+#~ msgstr "Cambia el orden de presentación de los archivos"
 
-#~ msgid "Manipulating blocks of text"
-#~ msgstr "Manipulación de bloques de texto"
+#~ msgid "Set a filter for the files"
+#~ msgstr "Establece un filtro para archivos"
 
-#~ msgid " Srch/Replce "
-#~ msgstr " Buscar/Reemplazar "
+#~ msgid "Network link..."
+#~ msgstr "Conexión por red..."
 
-#~ msgid "Search...\tF7"
-#~ msgstr "Buscar...\tF7"
+#~ msgid "Connect to a remote machine"
+#~ msgstr "Conecta a una máquina remota"
 
-#~ msgid "Search again\tF17"
-#~ msgstr "Buscar de nuevo\tF17"
+#~ msgid "FTP link..."
+#~ msgstr "Conexión por FTP..."
 
-#~ msgid "Replace...\tF4"
-#~ msgstr "Reemplazar...\tF4"
+#~ msgid "Connect to a remote machine with FTP"
+#~ msgstr "Conecta con una máquina remota a través de FTP"
 
-#~ msgid "Replace again\tF14"
-#~ msgstr "Replazar de nuevo\tF14"
+#~ msgid "Confirmation..."
+#~ msgstr "Confirmación..."
 
-#~ msgid "Search for and replace text"
-#~ msgstr "Buscar y replazar texto"
+#~ msgid "Options..."
+#~ msgstr "Configuración..."
 
-#~ msgid "Goto line...\tM-l"
-#~ msgstr "Ir a la línea...\tM-l"
+#~ msgid "Virtual FS..."
+#~ msgstr "Sistema de archivos virtual (VFS)..."
 
-#~ msgid "Start record macro\tC-r"
-#~ msgstr "Empieza a grabar un macro\tC-r"
+#~ msgid "Virtual File System settings"
+#~ msgstr "Configuración del sistema de archivos virtual (VFS)"
 
-#~ msgid "Finish record macro...\tC-r"
-#~ msgstr "Terminar de grabar un macro...\tC-r"
+#~ msgid "Save setup"
+#~ msgstr "Guardar configuración"
 
-#~ msgid "Execute macro...\tC-a, KEY"
-#~ msgstr "Ejecutar macro...\tC-a, TECLA"
+#~ msgid "Hotlist..."
+#~ msgstr "Favoritos..."
 
-#~ msgid "Delete macro...\t"
-#~ msgstr "Borrar macro...\t"
+#~ msgid "List of favorite sites"
+#~ msgstr "Lista de lugares favoritos"
 
-#~ msgid "Insert date/time\tC-d"
-#~ msgstr "Insertar fecha/hora\tC-d"
+#~ msgid "External panelize..."
+#~ msgstr "Panelificación externa..."
 
-#~ msgid "Format paragraph\tM-p"
-#~ msgstr "Formatea párrafo\tM-p"
+#~ msgid "Undelete files (ext2fs only)..."
+#~ msgstr "Recuperar archivos (ext2fs)..."
 
-#~ msgid "Refresh display\tC-l"
-#~ msgstr "Refrescar pantalla\tC-l"
+#~ msgid "Arrange icons"
+#~ msgstr "Ordenar iconos"
 
-#~ msgid "Macros and internal commands"
-#~ msgstr "Macros y comandos internos"
+#~ msgid "Arranges the icons on the desktop"
+#~ msgstr "Ordena los iconos del escritorio"
 
-#~ msgid "Dynamic paragraphing"
-#~ msgstr "Párrafos dinámicos"
+#~ msgid "Window"
+#~ msgstr "Ventana"
 
-#~ msgid "Type writer wrap"
-#~ msgstr "Envolver como máquina de escribir"
+#~ msgid "Options"
+#~ msgstr "Opciones"
 
-#~ msgid "Wrap mode"
-#~ msgstr "Modo de envoltura"
+#~ msgid "Desktop"
+#~ msgstr "Escritorio"
 
-#~ msgid "Key emulation"
-#~ msgstr "Emulación de teclas"
+#~ msgid "Rename/move.."
+#~ msgstr "Renombrar/mover..."
 
 #~ msgid "Other options"
 #~ msgstr "Otras opciones"
@@ -4918,8 +5069,7 @@
 #~ msgstr "[sólo desarroladores: Depurar código de copiado en fondo]"
 
 #~ msgid "Create command file to set default directory upon exit."
-#~ msgstr ""
-#~ "Crear archivo de comandos para configurar el directorio final al terminar."
+#~ msgstr "Crear archivo de comandos para configurar el directorio final al terminar."
 
 #~ msgid "Force color mode."
 #~ msgstr "Forzar el modo de color."
@@ -4927,15 +5077,12 @@
 #~ msgid "Specify colors (use --help-colors to get a list)."
 #~ msgstr "Especifica los colores (use --help-colors para obtener una lista)."
 
-#~ msgid "[DEVEL-ONLY: Debug the subshell]"
+#~ msgid "[DEVEL-ONLY: Debug the subshell."
 #~ msgstr "[sólo desarrolladores: Corrección de problemas en el subshell]"
 
 #~ msgid "Startup the internal editor."
 #~ msgstr "Inicia el editor interno."
 
-#~ msgid "Shows this help message."
-#~ msgstr "Muestra este mensaje de ayuda."
-
 #~ msgid "Help on how to specify colors."
 #~ msgstr "Ayuda sobre como especificar los colores."
 
@@ -4963,11 +5110,8 @@
 #~ msgid "At exit, print the last working directory."
 #~ msgstr "Al salir, imprime el último directorio visitado."
 
-#~ msgid ""
-#~ "Reset softkeys (HP terminals only) to their terminfo/termcap default."
-#~ msgstr ""
-#~ "Re-inicializa las teclas de función (sólo terminales HP) a los valores del "
-#~ "sistema."
+#~ msgid "Reset softkeys (HP terminals only) to their terminfo/termcap default."
+#~ msgstr "Re-inicializa las teclas de función (sólo terminales HP) a los valores del sistema."
 
 #~ msgid "Disables verbose operation (for slow terminals)."
 #~ msgstr "Activa el modo silencioso (para terminales lentas)."
@@ -4978,7 +5122,7 @@
 #~ msgid "Activate support for the TERMCAP variable."
 #~ msgstr "Activa el soporte para la variable TERMCAP."
 
-#~ msgid "Report version and configuration options."
+#~ msgid "Report versionand configuration options."
 #~ msgstr "Reporta la versión y las opciones de configuración."
 
 #~ msgid "Start up into the viewer mode."
@@ -4992,3 +5136,6 @@
 
 #~ msgid "Pause after run..."
 #~ msgstr "Pausa después de ejecutar..."
+
+#~ msgid " Can not fetch local copy "
+#~ msgstr " No puedo obtener una copia local "
diff -ruN old/mc-4.5.6/po/mc.pot new/mc-4.5.7/po/mc.pot
--- old/mc-4.5.6/po/mc.pot	Wed Jan  6 15:26:29 1999
+++ new/mc-4.5.7/po/mc.pot	Tue Jan 12 22:38:13 1999
@@ -1,6 +1,6 @@
 msgid ""
 msgstr ""
-"Date: 1999-01-06 14:26:22-0600\n"
+"Date: 1999-01-12 21:38:08-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"
@@ -39,19 +39,19 @@
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr ""
 
-#: gnome/gcmd.c:105 src/main.c:818 src/screen.c:2043
+#: gnome/gcmd.c:105 src/main.c:820 src/screen.c:2043
 msgid " The Midnight Commander "
 msgstr ""
 
-#: gnome/gcmd.c:106 src/main.c:819
+#: gnome/gcmd.c:106 src/main.c:821
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr ""
 
-#: gnome/gcmd.c:107 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754 src/file.c:2159 src/filegui.c:496 src/hotlist.c:1029 src/main.c:820 src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:1207 src/view.c:408
+#: gnome/gcmd.c:107 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754 src/file.c:2161 src/filegui.c:496 src/hotlist.c:1030 src/main.c:822 src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:753 src/view.c:408
 msgid "&Yes"
 msgstr ""
 
-#: gnome/gcmd.c:107 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754 src/file.c:2159 src/filegui.c:495 src/hotlist.c:1029 src/main.c:820 src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:1207 src/view.c:408
+#: gnome/gcmd.c:107 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754 src/file.c:2161 src/filegui.c:495 src/hotlist.c:1030 src/main.c:822 src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:753 src/view.c:408
 msgid "&No"
 msgstr ""
 
@@ -132,24 +132,56 @@
 msgid "Command: "
 msgstr ""
 
-#: gnome/gdesktop.c:347 gnome/gdesktop.c:1371
+#: gnome/gcmd.c:553
+msgid "Set Filter"
+msgstr ""
+
+#: gnome/gcmd.c:557 gnome/gcmd.c:598 gnome/gcmd.c:603 gnome/gcmd.c:607 gnome/gscreen.c:2299
+msgid "Show all files"
+msgstr ""
+
+#: gnome/gcmd.c:564
+msgid "."
+msgstr ""
+
+#: gnome/gcmd.c:580
+msgid ""
+"Enter a filter here for files in the panel view.\n"
+"\n"
+"For example:\n"
+"*.gif will show just gif images"
+msgstr ""
+
+#: gnome/gcmd.c:582
+msgid "Enter a Regular Expression to filter files in the panel view."
+msgstr ""
+
+#: gnome/gcmd.c:636 gnome/gpopup.c:47
+msgid " Open with..."
+msgstr ""
+
+#: gnome/gcmd.c:637 gnome/gpopup.c:48
+msgid "Enter extra arguments:"
+msgstr ""
+
+#: gnome/gdesktop.c:348 gnome/gdesktop.c:1376
 msgid "Warning"
 msgstr ""
 
-#: gnome/gdesktop.c:348
+#: gnome/gdesktop.c:349
 msgid "Could not open %s; will not have initial desktop icons"
 msgstr ""
 
-#: gnome/gdesktop.c:1337
+#: gnome/gdesktop.c:1342
 msgid "Trashcan"
 msgstr ""
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1367
+#: gnome/gdesktop.c:1372
 msgid "Home directory"
 msgstr ""
 
-#: gnome/gdesktop.c:1372
+#: gnome/gdesktop.c:1377
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
 msgstr ""
 
@@ -199,7 +231,7 @@
 msgstr ""
 
 #. Basic window
-#: gnome/gdialogs.c:405 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/screen.c:2283 src/screen.c:2313 src/tree.c:1486
+#: gnome/gdialogs.c:405 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/screen.c:2283 src/screen.c:2313 src/tree.c:1020
 msgid "Copy"
 msgstr ""
 
@@ -293,229 +325,201 @@
 msgid "Default set of icons not found, check your installation"
 msgstr ""
 
-#: gnome/glayout.c:268
+#: gnome/glayout.c:269
+msgid "Enter command to run"
+msgstr ""
+
+#: gnome/glayout.c:280
 msgid "_New window"
 msgstr ""
 
-#: gnome/glayout.c:268
+#: gnome/glayout.c:280
 msgid "Opens a new window"
 msgstr ""
 
-#. etc...
-#: gnome/glayout.c:278
+#: gnome/glayout.c:292
 msgid "_Open"
 msgstr ""
 
-#: gnome/glayout.c:278
-msgid "Open selected files"
+#: gnome/glayout.c:292
+msgid "Opens the selected files"
 msgstr ""
 
-#: gnome/glayout.c:280
+#. { GNOME_APP_UI_ITEM, N_("Open _FTP site"),     N_("Opens an FTP site"), ftplink_cmd },
+#: gnome/glayout.c:294
 msgid "_Copy..."
 msgstr ""
 
-#: gnome/glayout.c:280
+#: gnome/glayout.c:294
 msgid "Copy files"
 msgstr ""
 
-#: gnome/glayout.c:281
-msgid "_Move..."
-msgstr ""
-
-#: gnome/glayout.c:281
-msgid "Rename or move files"
-msgstr ""
-
-#: gnome/glayout.c:282
+#: gnome/glayout.c:295
 msgid "_Delete..."
 msgstr ""
 
-#: gnome/glayout.c:282
+#: gnome/glayout.c:295
 msgid "Delete files from disk"
 msgstr ""
 
-#: gnome/glayout.c:284
-msgid "C_lose"
-msgstr ""
-
-#: gnome/glayout.c:284
-msgid "Close this panel"
-msgstr ""
-
-#: gnome/glayout.c:290
-msgid "_Cut"
-msgstr ""
-
-#: gnome/glayout.c:290
-msgid "Cuts the selected files into the cut buffer."
-msgstr ""
-
-#: gnome/glayout.c:292
-msgid "C_opy"
+#: gnome/glayout.c:296
+msgid "_Move..."
 msgstr ""
 
-#: gnome/glayout.c:292
-msgid "Copies the selected files into the cut buffer."
+#: gnome/glayout.c:296
+msgid "Rename or move files"
 msgstr ""
 
-#: gnome/glayout.c:294
-msgid "_Paste"
+#: gnome/glayout.c:299
+msgid "C_lose"
 msgstr ""
 
-#: gnome/glayout.c:294
-msgid "Pastes files from the cut buffer into the current directory"
+#: gnome/glayout.c:299
+msgid "Close this panel"
 msgstr ""
 
-#: gnome/glayout.c:297
+#: gnome/glayout.c:310
 msgid "_Select All"
 msgstr ""
 
-#: gnome/glayout.c:297
+#: gnome/glayout.c:310
 msgid "Select all files in the current Panel"
 msgstr ""
 
-#: gnome/glayout.c:298
+#: gnome/glayout.c:311
 msgid "_Select Files..."
 msgstr ""
 
-#: gnome/glayout.c:298
+#: gnome/glayout.c:311
 msgid "Select a group of files"
 msgstr ""
 
-#: gnome/glayout.c:299
+#: gnome/glayout.c:312
 msgid "_Invert Selection"
 msgstr ""
 
-#: gnome/glayout.c:299
+#: gnome/glayout.c:312
 msgid "Reverses the list of tagged files"
 msgstr ""
 
-#: gnome/glayout.c:301
+#: gnome/glayout.c:314
 msgid "_Rescan Directory"
 msgstr ""
 
-#: gnome/glayout.c:301
+#: gnome/glayout.c:314
 msgid "Rescan the directory contents"
 msgstr ""
 
-#: gnome/glayout.c:303
-msgid "Preferences..."
-msgstr ""
-
-#: gnome/glayout.c:303
-msgid "Configure the GNOME Midnight Commander"
-msgstr ""
-
-#: gnome/glayout.c:309
+#: gnome/glayout.c:321
 msgid "Icon View"
 msgstr ""
 
-#: gnome/glayout.c:310
+#: gnome/glayout.c:322
 msgid "Partial View"
 msgstr ""
 
-#: gnome/glayout.c:311
+#: gnome/glayout.c:323
 msgid "Full View"
 msgstr ""
 
-#: gnome/glayout.c:312
+#: gnome/glayout.c:324
 msgid "Custom View"
 msgstr ""
 
-#: gnome/glayout.c:318
+#: gnome/glayout.c:330
 msgid "_Sort By..."
 msgstr ""
 
-#: gnome/glayout.c:318
+#: gnome/glayout.c:330
 msgid "Confirmation settings"
 msgstr ""
 
-#: gnome/glayout.c:319
+#: gnome/glayout.c:331
 msgid "_Filter View..."
 msgstr ""
 
-#: gnome/glayout.c:319
+#: gnome/glayout.c:331
 msgid "Global option settings"
 msgstr ""
 
-#: gnome/glayout.c:326
+#: gnome/glayout.c:338
 msgid "_Find File..."
 msgstr ""
 
-#: gnome/glayout.c:326
+#: gnome/glayout.c:338
 msgid "Locate files on disk"
 msgstr ""
 
-#: gnome/glayout.c:329
+#: gnome/glayout.c:341
 msgid "_Compare panels..."
 msgstr ""
 
-#: gnome/glayout.c:329
+#: gnome/glayout.c:341
 msgid "Compare two panel contents"
 msgstr ""
 
-#: gnome/glayout.c:330
+#: gnome/glayout.c:342
 msgid "_Run Command..."
 msgstr ""
 
-#: gnome/glayout.c:330
+#: gnome/glayout.c:342
+msgid "Runs a command"
+msgstr ""
+
+#: gnome/glayout.c:344
+msgid "_Run Command in panel..."
+msgstr ""
+
+#: gnome/glayout.c:344
 msgid "Run a command and put the results in a panel"
 msgstr ""
 
-#: gnome/glayout.c:332
+#: gnome/glayout.c:347
 msgid "_Active VFS list..."
 msgstr ""
 
-#: gnome/glayout.c:332
+#: gnome/glayout.c:347
 msgid "List of active virtual file systems"
 msgstr ""
 
+#. does this do anything?
 #. { GNOME_APP_UI_ITEM, N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd },
-#: gnome/glayout.c:339
+#: gnome/glayout.c:354
 msgid "_Background jobs..."
 msgstr ""
 
-#: gnome/glayout.c:339
+#: gnome/glayout.c:354
 msgid "List of background operations"
 msgstr ""
 
-#. GNOMEUIINFO_HELP ("midnight-commander"),
-#: gnome/glayout.c:347
+#: gnome/glayout.c:362
 msgid "_About"
 msgstr ""
 
-#: gnome/glayout.c:347
+#: gnome/glayout.c:362
 msgid "Information on this program"
 msgstr ""
 
-#: gnome/glayout.c:353
+#: gnome/glayout.c:368 gnome/gview.c:323
 msgid "_File"
 msgstr ""
 
-#: gnome/glayout.c:354
+#: gnome/glayout.c:369
 msgid "_Edit"
 msgstr ""
 
-#: gnome/glayout.c:355
+#: gnome/glayout.c:370
 msgid "_Layout"
 msgstr ""
 
-#: gnome/glayout.c:356
+#: gnome/glayout.c:371
 msgid "_Commands"
 msgstr ""
 
-#: gnome/glayout.c:357
+#: gnome/glayout.c:372
 msgid "_Help"
 msgstr ""
 
-#: gnome/gpopup.c:47
-msgid " Open with..."
-msgstr ""
-
-#: gnome/gpopup.c:48
-msgid "Enter extra arguments:"
-msgstr ""
-
 #: gnome/gpopup.c:199 gnome/gpopup.c:200
 msgid "Properties"
 msgstr ""
@@ -656,100 +660,100 @@
 msgid "Select icon"
 msgstr ""
 
-#: gnome/gscreen.c:1420
+#: gnome/gscreen.c:1449
 msgid "All files"
 msgstr ""
 
-#: gnome/gscreen.c:1422
+#: gnome/gscreen.c:1451
 msgid "Archives and compressed files"
 msgstr ""
 
-#: gnome/gscreen.c:1424
+#: gnome/gscreen.c:1453
 msgid "RPM/DEB files"
 msgstr ""
 
-#: gnome/gscreen.c:1426
+#: gnome/gscreen.c:1455
 msgid "Text/Document files"
 msgstr ""
 
-#: gnome/gscreen.c:1428
+#: gnome/gscreen.c:1457
 msgid "HTML and SGML files"
 msgstr ""
 
-#: gnome/gscreen.c:1430
+#: gnome/gscreen.c:1459
 msgid "Postscript and PDF files"
 msgstr ""
 
-#: gnome/gscreen.c:1432
+#: gnome/gscreen.c:1461
 msgid "Spreadsheet files"
 msgstr ""
 
-#: gnome/gscreen.c:1434
+#: gnome/gscreen.c:1463
 msgid "Image files"
 msgstr ""
 
-#: gnome/gscreen.c:1437
+#: gnome/gscreen.c:1466
 msgid "Video/animation files"
 msgstr ""
 
-#: gnome/gscreen.c:1439
+#: gnome/gscreen.c:1468
 msgid "Audio files"
 msgstr ""
 
-#: gnome/gscreen.c:1441
+#: gnome/gscreen.c:1470
 msgid "C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1443
+#: gnome/gscreen.c:1472
 msgid "C++ program files"
 msgstr ""
 
-#: gnome/gscreen.c:1445
+#: gnome/gscreen.c:1474
 msgid "Objective-C program files"
 msgstr ""
 
-#: gnome/gscreen.c:1447
+#: gnome/gscreen.c:1476
 msgid "Scheme program files"
 msgstr ""
 
-#: gnome/gscreen.c:1449
+#: gnome/gscreen.c:1478
 msgid "Assembler program files"
 msgstr ""
 
-#: gnome/gscreen.c:1451
+#: gnome/gscreen.c:1480
 msgid "Misc. program files"
 msgstr ""
 
-#: gnome/gscreen.c:1453
+#: gnome/gscreen.c:1482
 msgid "Font files"
 msgstr ""
 
-#: gnome/gscreen.c:1580
+#: gnome/gscreen.c:1609
 msgid "Search: %s"
 msgstr ""
 
-#: gnome/gscreen.c:1589
+#: gnome/gscreen.c:1619
 msgid "%s bytes in %d file"
 msgstr ""
 
-#: gnome/gscreen.c:1589
+#: gnome/gscreen.c:1619
 msgid "%s bytes in %d files"
 msgstr ""
 
-#: gnome/gscreen.c:1612 src/screen.c:673
+#: gnome/gscreen.c:1645 src/screen.c:673
 msgid "<readlink failed>"
 msgstr ""
 
-#: gnome/gscreen.c:1663
+#: gnome/gscreen.c:1699
 msgid "Filter"
 msgstr ""
 
-#: gnome/gscreen.c:2218
+#: gnome/gscreen.c:2254
 msgid "Location:"
 msgstr ""
 
 #. WITH_BACKGROUND
-#: gnome/gtools.c:103 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
+#: gnome/gtools.c:103 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:372 src/option.c:144 src/wtools.c:292 src/wtools.c:564
 msgid "&Ok"
 msgstr ""
 
@@ -766,7 +770,7 @@
 msgstr ""
 
 #: gnome/gview.c:289
-msgid "Goto line"
+msgid "_Goto line"
 msgstr ""
 
 #: gnome/gview.c:290
@@ -774,68 +778,44 @@
 msgstr ""
 
 #: gnome/gview.c:292
-msgid "Monitor file"
+msgid "_Monitor file"
 msgstr ""
 
 #: gnome/gview.c:292
 msgid "Monitor file growing"
 msgstr ""
 
-#: gnome/gview.c:293
-msgid "Close"
-msgstr ""
-
-#: gnome/gview.c:294
-msgid "Close the viewer"
-msgstr ""
-
-#: gnome/gview.c:300 gnome/gview.c:330 gtkedit/editwidget.c:1066 src/view.c:1976
-msgid "Search"
-msgstr ""
-
-#: gnome/gview.c:301
-msgid "String search"
-msgstr ""
-
-#: gnome/gview.c:303
+#: gnome/gview.c:299
 msgid "Regexp search"
 msgstr ""
 
-#: gnome/gview.c:304
+#: gnome/gview.c:300
 msgid "Regular expression search"
 msgstr ""
 
-#: gnome/gview.c:307
-msgid "Search again..."
-msgstr ""
-
-#: gnome/gview.c:308
-msgid "Continue searching"
-msgstr ""
-
-#: gnome/gview.c:315 src/view.c:1973
-msgid "Wrap"
+#: gnome/gview.c:309
+msgid "_Wrap"
 msgstr ""
 
-#: gnome/gview.c:315
+#: gnome/gview.c:309
 msgid "Wrap the text"
 msgstr ""
 
 #. Can not use this one yet, as it destroys the viewer, need to fix that
-#: gnome/gview.c:321
-msgid "Formatted"
+#: gnome/gview.c:315
+msgid "_Formatted"
 msgstr ""
 
-#: gnome/gview.c:323 src/view.c:1966
-msgid "Hex"
+#: gnome/gview.c:317
+msgid "_Hex"
 msgstr ""
 
-#: gnome/gview.c:329 gtkedit/gtkedit.c:1362 src/filegui.c:361
-msgid "File"
+#: gnome/gview.c:324
+msgid "_Search"
 msgstr ""
 
-#: gnome/gview.c:331 src/achown.c:380
-msgid "Mode"
+#: gnome/gview.c:325
+msgid "_Mode"
 msgstr ""
 
 #: gnome/gwidget.c:90
@@ -867,33 +847,33 @@
 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:947 src/dir.c:378 src/screen.c:2301 src/tree.c:1145 src/tree.c:1151 src/wtools.c:225 vfs/fish.c:226
+#: gtkedit/edit.c:129 gtkedit/edit.c:224 gtkedit/edit.c:231 gtkedit/edit.c:238 gtkedit/edit.c:245 gtkedit/edit.c:251 gtkedit/edit.c:308 gtkedit/edit.c:344 gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:378 src/screen.c:2301 src/tree.c:691 src/tree.c:697 src/wtools.c:225 vfs/fish.c:226
 msgid " Error "
 msgstr ""
 
-#: gtkedit/edit.c:127 gtkedit/edit.c:229
+#: gtkedit/edit.c:129 gtkedit/edit.c:231
 msgid " Failed trying to open file for reading: "
 msgstr ""
 
-#: gtkedit/edit.c:236
+#: gtkedit/edit.c:238
 msgid " Cannot get size/permissions info on file: "
 msgstr ""
 
-#: gtkedit/edit.c:243
+#: gtkedit/edit.c:245
 msgid " Not an ordinary file: "
 msgstr ""
 
-#: gtkedit/edit.c:249
+#: gtkedit/edit.c:251
 msgid " File is too large: "
 msgstr ""
 
-#: gtkedit/edit.c:250
+#: gtkedit/edit.c:252
 msgid ""
 " \n"
 " Increase edit.h:MAXBUF and recompile the editor. "
 msgstr ""
 
-#: gtkedit/edit.c:306 gtkedit/edit.c:342
+#: gtkedit/edit.c:308 gtkedit/edit.c:344
 msgid " Error allocating memory "
 msgstr ""
 
@@ -902,7 +882,7 @@
 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:297 src/file.c:683 src/help.c:321 src/main.c:665 src/screen.c:2059 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:683 src/help.c:321 src/main.c:667 src/screen.c:2059 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 ""
 
@@ -1406,7 +1386,7 @@
 msgid "&Save mode..."
 msgstr ""
 
-#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302
+#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1304
 msgid "&Layout..."
 msgstr ""
 
@@ -1597,7 +1577,7 @@
 msgid "Error initialising editor.\n"
 msgstr ""
 
-#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1365 src/help.c:809 src/main.c:1668 src/screen.c:2279 src/screen.c:2309 src/tree.c:1480 src/view.c:1963
+#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1365 src/help.c:809 src/main.c:1670 src/screen.c:2279 src/screen.c:2309 src/tree.c:1014 src/view.c:1963
 msgid "Help"
 msgstr ""
 
@@ -1609,11 +1589,15 @@
 msgid "Replac"
 msgstr ""
 
-#: gtkedit/editwidget.c:1069 src/main.c:1670
+#: gtkedit/editwidget.c:1066 src/view.c:1976
+msgid "Search"
+msgstr ""
+
+#: gtkedit/editwidget.c:1069 src/main.c:1672
 msgid "PullDn"
 msgstr ""
 
-#: gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1671 src/view.c:1965 src/view.c:1985
+#: gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1673 src/view.c:1965 src/view.c:1985
 msgid "Quit"
 msgstr ""
 
@@ -1737,6 +1721,10 @@
 msgid "Info about Mcedit"
 msgstr ""
 
+#: gtkedit/gtkedit.c:1362 src/filegui.c:361
+msgid "File"
+msgstr ""
+
 #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
 msgid " Load syntax file "
 msgstr ""
@@ -1749,7 +1737,7 @@
 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:647 src/boxes.c:732 src/boxes.c:786 src/chmod.c:115 src/chown.c:81 src/cmd.c:850 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
+#: 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:850 src/filegui.c:707 src/find.c:154 src/hotlist.c:141 src/hotlist.c:813 src/hotlist.c:906 src/layout.c:373 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 ""
 
@@ -1785,6 +1773,10 @@
 msgid "Flag"
 msgstr ""
 
+#: src/achown.c:380
+msgid "Mode"
+msgstr ""
+
 #: src/achown.c:385
 msgid "%6d of %d"
 msgstr ""
@@ -1822,7 +1814,7 @@
 msgid "Background process:"
 msgstr ""
 
-#: src/background.c:286 src/file.c:2102
+#: src/background.c:286 src/file.c:2104
 msgid " Background process error "
 msgstr ""
 
@@ -2292,7 +2284,7 @@
 msgid " Link "
 msgstr ""
 
-#: src/cmd.c:1024 src/cmd.c:1129 src/file.c:2287
+#: src/cmd.c:1024 src/cmd.c:1129 src/file.c:2289
 msgid " to:"
 msgstr ""
 
@@ -2514,15 +2506,15 @@
 msgid "mc.ext will be used for this moment."
 msgstr ""
 
-#: src/file.c:229 src/tree.c:1104
+#: src/file.c:229 src/tree.c:650
 msgid " Copy "
 msgstr ""
 
-#: src/file.c:230 src/tree.c:1140
+#: src/file.c:230 src/tree.c:686
 msgid " Move "
 msgstr ""
 
-#: src/file.c:231 src/tree.c:1207
+#: src/file.c:231 src/tree.c:753
 msgid " Delete "
 msgstr ""
 
@@ -2652,7 +2644,7 @@
 msgid "&Delete"
 msgstr ""
 
-#: src/file.c:865 src/hotlist.c:1437
+#: src/file.c:865 src/hotlist.c:1438
 msgid "&Keep"
 msgstr ""
 
@@ -2761,11 +2753,11 @@
 msgid " Sorry, I could not put the job in background "
 msgstr ""
 
-#: src/file.c:1891 src/file.c:2004
+#: src/file.c:1891 src/file.c:2006
 msgid " Internal failure "
 msgstr ""
 
-#: src/file.c:1891 src/file.c:2005
+#: src/file.c:1891 src/file.c:2007
 msgid " Unknown file operation "
 msgstr ""
 
@@ -2775,114 +2767,114 @@
 " %s "
 msgstr ""
 
-#: src/file.c:2103 src/filegui.c:248
+#: src/file.c:2105 src/filegui.c:248
 msgid "&Skip"
 msgstr ""
 
-#: src/file.c:2103
+#: src/file.c:2105
 msgid "&Retry"
 msgstr ""
 
-#: src/file.c:2103 src/file.c:2161 src/filegui.c:245 src/filegui.c:485
+#: src/file.c:2105 src/file.c:2163 src/filegui.c:245 src/filegui.c:485
 msgid "&Abort"
 msgstr ""
 
-#: src/file.c:2152
+#: src/file.c:2154
 msgid ""
 "\n"
 "   Directory not empty.   \n"
 "   Delete it recursively? "
 msgstr ""
 
-#: src/file.c:2153
+#: src/file.c:2155
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
 "   Delete it recursively? "
 msgstr ""
 
-#: src/file.c:2160
+#: src/file.c:2162
 msgid "a&ll"
 msgstr ""
 
-#: src/file.c:2160 src/filegui.c:488
+#: src/file.c:2162 src/filegui.c:488
 msgid "non&E"
 msgstr ""
 
-#: src/file.c:2170
+#: src/file.c:2172
 msgid " Type 'yes' if you REALLY want to delete "
 msgstr ""
 
-#: src/file.c:2172
+#: src/file.c:2174
 msgid "all the directories "
 msgstr ""
 
-#: src/file.c:2174
+#: src/file.c:2176
 msgid " Recursive Delete "
 msgstr ""
 
-#: src/file.c:2175
+#: src/file.c:2177
 msgid " Background process: Recursive Delete "
 msgstr ""
 
-#: src/file.c:2263
+#.
+#. * 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:2265
 msgid "1Copy"
 msgstr ""
 
-#: src/file.c:2263
+#: src/file.c:2265
 msgid "1Move"
 msgstr ""
 
-#: src/file.c:2263
+#: src/file.c:2265
 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:2278
+#: src/file.c:2280
 msgid "%o %f \"%s\"%m"
 msgstr ""
 
-#: src/file.c:2279
+#: src/file.c:2281
 msgid "%o %d %f%m"
 msgstr ""
 
-#: src/file.c:2281
+#: src/file.c:2283
 msgid "%o %f \"%s\"%e"
 msgstr ""
 
-#: src/file.c:2282
+#: src/file.c:2284
 msgid "%o %d %f%e"
 msgstr ""
 
-#: src/file.c:2286
+#: src/file.c:2288
 msgid "file"
 msgstr ""
 
-#: src/file.c:2286
+#: src/file.c:2288
 msgid "files"
 msgstr ""
 
-#: src/file.c:2286
+#: src/file.c:2288
 msgid "directory"
 msgstr ""
 
-#: src/file.c:2286
+#: src/file.c:2288
 msgid "directories"
 msgstr ""
 
-#: src/file.c:2287
+#: src/file.c:2289
 msgid "files/directories"
 msgstr ""
 
-#: src/file.c:2287
+#: src/file.c:2289
 msgid " with source mask:"
 msgstr ""
 
@@ -3033,7 +3025,7 @@
 msgid "Content: "
 msgstr ""
 
-#: src/find.c:154 src/main.c:1199 src/main.c:1220
+#: src/find.c:154 src/main.c:1201 src/main.c:1222
 msgid "&Tree"
 msgstr ""
 
@@ -3121,185 +3113,185 @@
 msgid "Prev"
 msgstr ""
 
-#: src/hotlist.c:134
+#: src/hotlist.c:135
 msgid "&Move"
 msgstr ""
 
-#: src/hotlist.c:135 src/hotlist.c:1437 src/panelize.c:92 src/wtools.c:386
+#: src/hotlist.c:136 src/hotlist.c:1438 src/panelize.c:92 src/wtools.c:386
 msgid "&Remove"
 msgstr ""
 
-#: src/hotlist.c:136 src/hotlist.c:816 src/hotlist.c:909
+#: src/hotlist.c:137 src/hotlist.c:817 src/hotlist.c:910
 msgid "&Append"
 msgstr ""
 
-#: src/hotlist.c:137 src/hotlist.c:814 src/hotlist.c:907
+#: src/hotlist.c:138 src/hotlist.c:815 src/hotlist.c:908
 msgid "&Insert"
 msgstr ""
 
-#: src/hotlist.c:138
+#: src/hotlist.c:139
 msgid "New &Entry"
 msgstr ""
 
-#: src/hotlist.c:139
+#: src/hotlist.c:140
 msgid "New &Group"
 msgstr ""
 
-#: src/hotlist.c:141
+#: src/hotlist.c:142
 msgid "&Up"
 msgstr ""
 
-#: src/hotlist.c:142
+#: src/hotlist.c:143
 msgid "&Add current"
 msgstr ""
 
-#: src/hotlist.c:143
+#: src/hotlist.c:144
 msgid "Change &To"
 msgstr ""
 
-#: src/hotlist.c:203
+#: src/hotlist.c:204
 msgid "Subgroup - press ENTER to see list"
 msgstr ""
 
-#: src/hotlist.c:622
+#: src/hotlist.c:623
 msgid "Active VFS directories"
 msgstr ""
 
-#: src/hotlist.c:622
+#: src/hotlist.c:623
 msgid "Directory hotlist"
 msgstr ""
 
-#: src/hotlist.c:641
+#: src/hotlist.c:642
 msgid " Directory path "
 msgstr ""
 
 #. This one holds the displayed pathname
-#: src/hotlist.c:644 src/hotlist.c:691
+#: src/hotlist.c:645 src/hotlist.c:692
 msgid " Directory label "
 msgstr ""
 
-#: src/hotlist.c:665
+#: src/hotlist.c:666
 msgid "Moving "
 msgstr ""
 
-#: src/hotlist.c:886
+#: src/hotlist.c:887
 msgid "New hotlist entry"
 msgstr ""
 
-#: src/hotlist.c:886
+#: src/hotlist.c:887
 msgid "Directory label"
 msgstr ""
 
-#: src/hotlist.c:886
+#: src/hotlist.c:887
 msgid "Directory path"
 msgstr ""
 
-#: src/hotlist.c:966
+#: src/hotlist.c:967
 msgid " New hotlist group "
 msgstr ""
 
-#: src/hotlist.c:966
+#: src/hotlist.c:967
 msgid "Name of new group"
 msgstr ""
 
-#: src/hotlist.c:981
+#: src/hotlist.c:982
 msgid "Label for \"%s\":"
 msgstr ""
 
-#: src/hotlist.c:986
+#: src/hotlist.c:987
 msgid " Add to hotlist "
 msgstr ""
 
-#: src/hotlist.c:1023
+#: src/hotlist.c:1024
 msgid " Remove: "
 msgstr ""
 
-#: src/hotlist.c:1027
+#: src/hotlist.c:1028
 msgid ""
 "\n"
 " Group not empty.\n"
 " Remove it?"
 msgstr ""
 
-#: src/hotlist.c:1372
+#: src/hotlist.c:1373
 msgid " Top level group "
 msgstr ""
 
-#: src/hotlist.c:1388
+#: src/hotlist.c:1389
 msgid "Hotlist is now kept in file ~/"
 msgstr ""
 
-#: src/hotlist.c:1390
+#: src/hotlist.c:1391
 msgid "MC will load hotlist from ~/"
 msgstr ""
 
-#: src/hotlist.c:1392
+#: src/hotlist.c:1393
 msgid "and then delete [Hotlist] section there"
 msgstr ""
 
-#: src/hotlist.c:1394 src/hotlist.c:1413 src/hotlist.c:1436 src/hotlist.c:1461
+#: src/hotlist.c:1395 src/hotlist.c:1414 src/hotlist.c:1437 src/hotlist.c:1462
 msgid " Hotlist Load "
 msgstr ""
 
-#: src/hotlist.c:1410 src/hotlist.c:1458
+#: src/hotlist.c:1411 src/hotlist.c:1459
 msgid "MC was unable to write ~/"
 msgstr ""
 
-#: src/hotlist.c:1411
+#: src/hotlist.c:1412
 msgid " file, your old hotlist entries were not deleted"
 msgstr ""
 
-#: src/hotlist.c:1425
+#: src/hotlist.c:1426
 msgid "You have ~/"
 msgstr ""
 
-#: src/hotlist.c:1425
+#: src/hotlist.c:1426
 msgid " file and [Hotlist] section in ~/"
 msgstr ""
 
-#: src/hotlist.c:1426
+#: src/hotlist.c:1427
 msgid "Your ~/"
 msgstr ""
 
-#: src/hotlist.c:1426
+#: src/hotlist.c:1427
 msgid " most probably was created\n"
 msgstr ""
 
-#: src/hotlist.c:1427
+#: src/hotlist.c:1428
 msgid ""
 "by an earlier development version of MC\n"
 "and is more actual than ~/"
 msgstr ""
 
-#: src/hotlist.c:1428
+#: src/hotlist.c:1429
 msgid ""
 " entries\n"
 "\n"
 msgstr ""
 
-#: src/hotlist.c:1429
+#: src/hotlist.c:1430
 msgid ""
 "You can choose between\n"
 "\n"
 "  Remove - remove old hotlist entries from ~/"
 msgstr ""
 
-#: src/hotlist.c:1431
+#: src/hotlist.c:1432
 msgid ""
 "  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 ~/"
 msgstr ""
 
-#: src/hotlist.c:1437
+#: src/hotlist.c:1438
 msgid "&Merge"
 msgstr ""
 
-#: src/hotlist.c:1449
+#: src/hotlist.c:1450
 msgid " Entries from ~/"
 msgstr ""
 
-#: src/hotlist.c:1459
+#: src/hotlist.c:1460
 msgid " file your old hotlist entries were not deleted"
 msgstr ""
 
@@ -3387,76 +3379,76 @@
 msgid "File:       None"
 msgstr ""
 
-#: src/layout.c:159
+#: src/layout.c:161
 msgid "&Vertical"
 msgstr ""
 
-#: src/layout.c:160
+#: src/layout.c:162
 msgid "&Horizontal"
 msgstr ""
 
-#: src/layout.c:170
+#: src/layout.c:172
 msgid "&Xterm hintbar"
 msgstr ""
 
-#: src/layout.c:171
+#: src/layout.c:173
 msgid "h&Intbar visible"
 msgstr ""
 
-#: src/layout.c:172
+#: src/layout.c:174
 msgid "&Keybar visible"
 msgstr ""
 
-#: src/layout.c:173
+#: src/layout.c:175
 msgid "command &Prompt"
 msgstr ""
 
-#: src/layout.c:174
+#: src/layout.c:176
 msgid "show &Mini status"
 msgstr ""
 
-#: src/layout.c:175
+#: src/layout.c:177
 msgid "menu&Bar visible"
 msgstr ""
 
-#: src/layout.c:176
+#: src/layout.c:178
 msgid "&Equal split"
 msgstr ""
 
-#: src/layout.c:177
+#: src/layout.c:179
 msgid "pe&Rmissions"
 msgstr ""
 
-#: src/layout.c:178
+#: src/layout.c:180
 msgid "&File types"
 msgstr ""
 
-#: src/layout.c:372 src/learn.c:62 src/learn.c:181 src/option.c:146
+#: src/layout.c:374 src/learn.c:62 src/learn.c:181 src/option.c:146
 msgid "&Save"
 msgstr ""
 
 #. length of line with '<' '>' buttons
-#: src/layout.c:380
+#: src/layout.c:382
 msgid " Layout "
 msgstr ""
 
-#: src/layout.c:381
+#: src/layout.c:383
 msgid " Panel split "
 msgstr ""
 
-#: src/layout.c:382
+#: src/layout.c:384
 msgid " Highlight... "
 msgstr ""
 
-#: src/layout.c:383 src/option.c:157
+#: src/layout.c:385 src/option.c:157
 msgid " Other options "
 msgstr ""
 
-#: src/layout.c:384
+#: src/layout.c:386
 msgid "output lines"
 msgstr ""
 
-#: src/layout.c:451
+#: src/layout.c:453
 msgid "Layout"
 msgstr ""
 
@@ -3524,7 +3516,7 @@
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr ""
 
-#: src/main.c:666
+#: src/main.c:668
 msgid ""
 " The Commander can't change to the directory that \n"
 " the subshell claims you are in.  Perhaps you have \n"
@@ -3532,127 +3524,127 @@
 " extra access permissions with the \"su\" command? "
 msgstr ""
 
-#: src/main.c:741
+#: src/main.c:743
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/main.c:791
+#: src/main.c:793
 msgid " The shell is already running a command "
 msgstr ""
 
-#: src/main.c:1196 src/main.c:1217
+#: src/main.c:1198 src/main.c:1219
 msgid "&Listing mode..."
 msgstr ""
 
-#: src/main.c:1197 src/main.c:1218
+#: src/main.c:1199 src/main.c:1220
 msgid "&Quick view     C-x q"
 msgstr ""
 
-#: src/main.c:1198 src/main.c:1219
+#: src/main.c:1200 src/main.c:1221
 msgid "&Info           C-x i"
 msgstr ""
 
-#: src/main.c:1201 src/main.c:1222
+#: src/main.c:1203 src/main.c:1224
 msgid "&Sort order..."
 msgstr ""
 
-#: src/main.c:1203 src/main.c:1224
+#: src/main.c:1205 src/main.c:1226
 msgid "&Filter..."
 msgstr ""
 
-#: src/main.c:1206 src/main.c:1227
+#: src/main.c:1208 src/main.c:1229
 msgid "&Network link..."
 msgstr ""
 
-#: src/main.c:1207 src/main.c:1228
+#: src/main.c:1209 src/main.c:1230
 msgid "FT&P link..."
 msgstr ""
 
-#: src/main.c:1211 src/main.c:1232
+#: src/main.c:1213 src/main.c:1234
 msgid "&Drive...       M-d"
 msgstr ""
 
-#: src/main.c:1213 src/main.c:1234
+#: src/main.c:1215 src/main.c:1236
 msgid "&Rescan         C-r"
 msgstr ""
 
-#: src/main.c:1238
+#: src/main.c:1240
 msgid "&User menu          F2"
 msgstr ""
 
-#: src/main.c:1239
+#: src/main.c:1241
 msgid "&View               F3"
 msgstr ""
 
-#: src/main.c:1240
+#: src/main.c:1242
 msgid "Vie&w file...         "
 msgstr ""
 
-#: src/main.c:1241
+#: src/main.c:1243
 msgid "&Filtered view     M-!"
 msgstr ""
 
-#: src/main.c:1242
+#: src/main.c:1244
 msgid "&Edit               F4"
 msgstr ""
 
-#: src/main.c:1243
+#: src/main.c:1245
 msgid "&Copy               F5"
 msgstr ""
 
-#: src/main.c:1244
+#: src/main.c:1246
 msgid "c&Hmod           C-x c"
 msgstr ""
 
-#: src/main.c:1246
+#: src/main.c:1248
 msgid "&Link            C-x l"
 msgstr ""
 
-#: src/main.c:1247
+#: src/main.c:1249
 msgid "&SymLink         C-x s"
 msgstr ""
 
-#: src/main.c:1248
+#: src/main.c:1250
 msgid "edit s&Ymlink  C-x C-s"
 msgstr ""
 
-#: src/main.c:1249
+#: src/main.c:1251
 msgid "ch&Own           C-x o"
 msgstr ""
 
-#: src/main.c:1250
+#: src/main.c:1252
 msgid "&Advanced chown       "
 msgstr ""
 
-#: src/main.c:1252
+#: src/main.c:1254
 msgid "&Rename/Move        F6"
 msgstr ""
 
-#: src/main.c:1253
+#: src/main.c:1255
 msgid "&Mkdir              F7"
 msgstr ""
 
-#: src/main.c:1254
+#: src/main.c:1256
 msgid "&Delete             F8"
 msgstr ""
 
-#: src/main.c:1255
+#: src/main.c:1257
 msgid "&Quick cd          M-c"
 msgstr ""
 
-#: src/main.c:1257
+#: src/main.c:1259
 msgid "select &Group      M-+"
 msgstr ""
 
-#: src/main.c:1258
+#: src/main.c:1260
 msgid "u&Nselect group    M-\\"
 msgstr ""
 
-#: src/main.c:1259
+#: src/main.c:1261
 msgid "reverse selec&Tion M-*"
 msgstr ""
 
-#: src/main.c:1261
+#: src/main.c:1263
 msgid "e&Xit              F10"
 msgstr ""
 
@@ -3660,124 +3652,124 @@
 #. * as a panel still has some problems, I have not yet finished
 #. * the WTree widget port, sorry.
 #.
-#: src/main.c:1271
+#: src/main.c:1273
 msgid "&Directory tree"
 msgstr ""
 
-#: src/main.c:1273
+#: src/main.c:1275
 msgid "&Find file            M-?"
 msgstr ""
 
-#: src/main.c:1274
+#: src/main.c:1276
 msgid "s&Wap panels          C-u"
 msgstr ""
 
-#: src/main.c:1275
+#: src/main.c:1277
 msgid "switch &Panels on/off C-o"
 msgstr ""
 
-#: src/main.c:1276
+#: src/main.c:1278
 msgid "&Compare directories  C-x d"
 msgstr ""
 
-#: src/main.c:1277
+#: src/main.c:1279
 msgid "e&Xternal panelize    C-x !"
 msgstr ""
 
-#: src/main.c:1278
+#: src/main.c:1280
 msgid "show directory s&Izes"
 msgstr ""
 
-#: src/main.c:1280
+#: src/main.c:1282
 msgid "command &History"
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1283
 msgid "di&Rectory hotlist    C-\\"
 msgstr ""
 
-#: src/main.c:1283
+#: src/main.c:1285
 msgid "&Active VFS list      C-x a"
 msgstr ""
 
-#: src/main.c:1286
+#: src/main.c:1288
 msgid "&Background jobs      C-x j"
 msgstr ""
 
-#: src/main.c:1290
+#: src/main.c:1292
 msgid "&Undelete files (ext2fs only)"
 msgstr ""
 
-#: src/main.c:1293
+#: src/main.c:1295
 msgid "&Listing format edit"
 msgstr ""
 
-#: src/main.c:1295
+#: src/main.c:1297
 msgid "&Extension file edit"
 msgstr ""
 
-#: src/main.c:1296
+#: src/main.c:1298
 msgid "&Menu file edit"
 msgstr ""
 
 #. Must keep in sync with the constants in menu_cmd
-#: src/main.c:1301
+#: src/main.c:1303
 msgid "&Configuration..."
 msgstr ""
 
-#: src/main.c:1303
+#: src/main.c:1305
 msgid "c&Onfirmation..."
 msgstr ""
 
-#: src/main.c:1304
+#: src/main.c:1306
 msgid "&Display bits..."
 msgstr ""
 
-#: src/main.c:1306
+#: src/main.c:1308
 msgid "learn &Keys..."
 msgstr ""
 
-#: src/main.c:1309
+#: src/main.c:1311
 msgid "&Virtual FS..."
 msgstr ""
 
-#: src/main.c:1312
+#: src/main.c:1314
 msgid "&Save setup"
 msgstr ""
 
-#: src/main.c:1328 src/main.c:1330
+#: src/main.c:1330 src/main.c:1332
 msgid " &Left "
 msgstr ""
 
-#: src/main.c:1330
+#: src/main.c:1332
 msgid " &Above "
 msgstr ""
 
-#: src/main.c:1333
+#: src/main.c:1335
 msgid " &File "
 msgstr ""
 
-#: src/main.c:1334
+#: src/main.c:1336
 msgid " &Command "
 msgstr ""
 
-#: src/main.c:1335
+#: src/main.c:1337
 msgid " &Options "
 msgstr ""
 
-#: src/main.c:1337 src/main.c:1339
+#: src/main.c:1339 src/main.c:1341
 msgid " &Right "
 msgstr ""
 
-#: src/main.c:1339
+#: src/main.c:1341
 msgid " &Below "
 msgstr ""
 
-#: src/main.c:1394
+#: src/main.c:1396
 msgid " Information "
 msgstr ""
 
-#: src/main.c:1395
+#: src/main.c:1397
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -3785,57 +3777,57 @@
 " the details.                                           "
 msgstr ""
 
-#: src/main.c:1669 src/screen.c:2280 src/screen.c:2310
+#: src/main.c:1671 src/screen.c:2280 src/screen.c:2310
 msgid "Menu"
 msgstr ""
 
-#: src/main.c:1874
+#: src/main.c:1876
 msgid "Thank you for using GNU Midnight Commander"
 msgstr ""
 
-#: src/main.c:2227
+#: src/main.c:2229
 msgid "with mouse support on xterm%s.\n"
 msgstr ""
 
-#: src/main.c:2228
+#: src/main.c:2230
 msgid " and the Linux console"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2325
 msgid "The TERM environment variable is unset!\n"
 msgstr ""
 
-#: src/main.c:2525
+#: src/main.c:2527
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr ""
 
-#: src/main.c:2530
+#: src/main.c:2532
 msgid "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 
-#: src/main.c:2653
+#: src/main.c:2655
 msgid "Geometry for the window"
 msgstr ""
 
-#: src/main.c:2653
+#: src/main.c:2655
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/main.c:2654
+#: src/main.c:2656
 msgid "No windows opened at startup"
 msgstr ""
 
-#: src/main.c:2895
+#: src/main.c:2925
 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:2969
+#: src/main.c:2999
 msgid " Notice "
 msgstr ""
 
-#: src/main.c:2970
+#: src/main.c:3000
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -4060,11 +4052,11 @@
 msgid " No action taken "
 msgstr ""
 
-#: src/screen.c:2284 src/screen.c:2314 src/tree.c:1488
+#: src/screen.c:2284 src/screen.c:2314 src/tree.c:1022
 msgid "RenMov"
 msgstr ""
 
-#: src/screen.c:2285 src/screen.c:2315 src/tree.c:1492
+#: src/screen.c:2285 src/screen.c:2315 src/tree.c:1026
 msgid "Mkdir"
 msgstr ""
 
@@ -4094,63 +4086,57 @@
 msgid "Warning: Couldn't change to %s.\n"
 msgstr ""
 
-#: src/tree.c:620
+#: src/tree.c:204
 msgid ""
 "Can't open the %s file for writing:\n"
 "%s\n"
 msgstr ""
 
-#: src/tree.c:633
-msgid ""
-"Can't write to the %s file:\n"
-"%s\n"
-msgstr ""
-
-#: src/tree.c:1102
+#: src/tree.c:648
 msgid "Copy \"%s\" directory to:"
 msgstr ""
 
-#: src/tree.c:1138
+#: src/tree.c:684
 msgid "Move \"%s\" directory to:"
 msgstr ""
 
-#: src/tree.c:1145
+#: src/tree.c:691
 msgid ""
 " Can't stat the destination \n"
 " %s "
 msgstr ""
 
-#: src/tree.c:1151
+#: src/tree.c:697
 msgid " The destination isn't a directory "
 msgstr ""
 
-#: src/tree.c:1206
+#: src/tree.c:752
 msgid "  Delete %s?  "
 msgstr ""
 
-#: src/tree.c:1248
+#: src/tree.c:782
 msgid "Static"
 msgstr ""
 
-#: src/tree.c:1248
+#: src/tree.c:782
 msgid "Dynamc"
 msgstr ""
 
-#: src/tree.c:1338
+#: src/tree.c:872
 msgid ""
 " Can't chdir to \"%s\" \n"
 " %s "
 msgstr ""
 
-#: src/tree.c:1482
+#: src/tree.c:1016
 msgid "Rescan"
 msgstr ""
 
-#: src/tree.c:1484
+#: src/tree.c:1018
 msgid "Forget"
 msgstr ""
 
-#: src/tree.c:1497
+#: src/tree.c:1031
 msgid "Rmdir"
 msgstr ""
 
@@ -4194,7 +4180,7 @@
 msgid " User menu "
 msgstr ""
 
-#: src/util.c:235
+#: src/util.c:239
 msgid "name_trunc: too big"
 msgstr ""
 
@@ -4284,6 +4270,10 @@
 msgid "Ascii"
 msgstr ""
 
+#: src/view.c:1966
+msgid "Hex"
+msgstr ""
+
 #: src/view.c:1967
 msgid "Line"
 msgstr ""
@@ -4304,6 +4294,10 @@
 msgid "UnWrap"
 msgstr ""
 
+#: src/view.c:1973
+msgid "Wrap"
+msgstr ""
+
 #: src/view.c:1976
 msgid "HxSrch"
 msgstr ""
@@ -4519,7 +4513,7 @@
 msgid "NumLock on keypad"
 msgstr ""
 
-#: src/wtools.c:590 vfs/vfs.c:1706
+#: src/wtools.c:590 vfs/vfs.c:1779
 msgid "Password:"
 msgstr ""
 
@@ -4545,11 +4539,11 @@
 msgid "Sorry, we can not do password authenticated connections for now."
 msgstr ""
 
-#: vfs/ftpfs.c:461
+#: vfs/ftpfs.c:466
 msgid " Could not set source routing (%s)"
 msgstr ""
 
-#: vfs/ftpfs.c:1863 vfs/ftpfs.c:1878
+#: vfs/ftpfs.c:1878 vfs/ftpfs.c:1893
 msgid ""
 "~/.netrc file has not correct mode.\n"
 "Remove password or correct mode."
@@ -4590,7 +4584,7 @@
 msgid " Invalid password "
 msgstr ""
 
-#: vfs/mcfs.c:322
+#: vfs/mcfs.c:323
 msgid " Too many open connections "
 msgstr ""
 
@@ -4600,16 +4594,15 @@
 "%s"
 msgstr ""
 
-#: vfs/tar.c:272
+#: vfs/tar.c:283
 msgid "Unexpected EOF on archive file"
 msgstr ""
 
-#: vfs/tar.c:327 vfs/tar.c:334
+#: vfs/tar.c:338 vfs/tar.c:345
 msgid "Inconsistent tar archive"
 msgstr ""
 
-#. Error on first record
-#: vfs/tar.c:393
+#: vfs/tar.c:411
 msgid ""
 "Hmm,...\n"
 "%s\n"
Binary files old/mc-4.5.6/po/no.gmo and new/mc-4.5.7/po/no.gmo differ
diff -ruN old/mc-4.5.6/po/no.po new/mc-4.5.7/po/no.po
--- old/mc-4.5.6/po/no.po	Wed Jan  6 15:26:28 1999
+++ new/mc-4.5.7/po/no.po	Tue Jan 12 22:38:13 1999
@@ -1,12 +1,12 @@
 # Norwegian translation of Midnight Commander (bokmål dialect)
 # Copyright (C) 1998 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@fib.hl.no>, 1998.
+# Kjartan Maraas <kmaraas@fib.hl.no>, 1998,1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mc 4.5.3\n"
-"POT-Creation-Date: 1998-12-26 13:45+0100\n"
-"PO-Revision-Date: 1998-12-27 13:40+0100\n"
+"Project-Id-Version: mc 4.5.6\n"
+"POT-Creation-Date: 1999-01-10 02:56+0100\n"
+"PO-Revision-Date: 1999-01-10 03:21+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@fib.hl.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -34,140 +34,286 @@
 msgid " Press any key: "
 msgstr " Trykk en tast: "
 
-#: gnome/gcmd.c:43
+#: gnome/gcmd.c:55
 msgid " There is no other panel to compare contents to "
 msgstr " Det er ingen andre paneler å sammenligne innholdet med "
 
-#: gnome/gcmd.c:78
+#: gnome/gcmd.c:90
 msgid "GNU Midnight Commander"
 msgstr "GNU Midnight Commander"
 
-#: gnome/gcmd.c:81
+#: gnome/gcmd.c:93
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr "GNOME utgaven av Midnight Commander filbehandleren."
 
-#: gnome/gcmd.c:93 src/main.c:813 src/screen.c:2041
+#: gnome/gcmd.c:105 src/main.c:818 src/screen.c:2043
 msgid " The Midnight Commander "
 msgstr " Midnight Commander "
 
-#: gnome/gcmd.c:94 src/main.c:814
+#: gnome/gcmd.c:106 src/main.c:819
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr " Vil du virkelig avslutte Midnight Commander? "
 
-#: 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
+#: gnome/gcmd.c:107 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754
+#: src/file.c:2161 src/filegui.c:496 src/hotlist.c:1029 src/main.c:820
+#: src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:756
 #: src/view.c:408
 msgid "&Yes"
 msgstr "&Ja"
 
-#: 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
+#: gnome/gcmd.c:107 gtkedit/editcmd.c:2235 src/cmd.c:255 src/file.c:1754
+#: src/file.c:2161 src/filegui.c:495 src/hotlist.c:1029 src/main.c:820
+#: src/screen.c:2045 src/subshell.c:701 src/subshell.c:727 src/tree.c:756
 #: src/view.c:408
 msgid "&No"
 msgstr "&Nei"
 
-#: gnome/gdesktop.c:313 gnome/gdesktop.c:1216
+#: gnome/gcmd.c:205
+msgid "Sort By"
+msgstr "Sorter etter"
+
+#. we define this up here so we can pass it in to our callback
+#: gnome/gcmd.c:208
+msgid "Ignore case sensitivity."
+msgstr "Ikke skill mellom s&tore/små tegn"
+
+#: gnome/gcmd.c:216 src/chmod.c:151 src/screen.c:424
+msgid "Name"
+msgstr "Navn"
+
+#: gnome/gcmd.c:223
+msgid "File Type"
+msgstr "Filtype"
+
+#: gnome/gcmd.c:229 src/screen.c:425 src/screen.c:428
+msgid "Size"
+msgstr "Størrelse"
+
+#: gnome/gcmd.c:235
+msgid "Time Last Accessed"
+msgstr "Tid for siste aksess"
+
+#: gnome/gcmd.c:241
+msgid "Time Last Modified"
+msgstr "Tid for siste modifikasjon"
+
+#: gnome/gcmd.c:247
+msgid "Time Last Changed"
+msgstr "Tid for siste endring"
+
+#: gnome/gcmd.c:261
+msgid "Reverse the order."
+msgstr "Reverser rekkefølgen."
+
+#: gnome/gcmd.c:323
+msgid "Enter name."
+msgstr "Skriv inn navn."
+
+#: gnome/gcmd.c:328
+msgid "Enter label for command:"
+msgstr "Skriv inn kommandomerkelapp:"
+
+#: gnome/gcmd.c:423
+msgid "Find all core files"
+msgstr "Finn alle core-filer"
+
+#: gnome/gcmd.c:426 src/panelize.c:354
+msgid "Find rejects after patching"
+msgstr "Finn avviste etter patching"
+
+#: gnome/gcmd.c:468
+msgid "Run Command"
+msgstr "Kjør kommando"
+
+#. Frame 1
+#: gnome/gcmd.c:472
+msgid "Preset Commands"
+msgstr "Forhåndsinnstilte kommandoer"
+
+#: gnome/gcmd.c:489
+msgid "Add"
+msgstr "Legg til"
+
+#: gnome/gcmd.c:493
+msgid "Remove"
+msgstr "Fjern"
+
+#. Frame 2
+#: gnome/gcmd.c:501
+msgid "Run this Command"
+msgstr "Kjør denne kommandoen"
+
+#: gnome/gcmd.c:508
+msgid "Command: "
+msgstr "Kommando: "
+
+#: gnome/gcmd.c:553
+msgid "Set Filter"
+msgstr "Sett filter"
+
+#: gnome/gcmd.c:557 gnome/gcmd.c:598 gnome/gcmd.c:603 gnome/gcmd.c:607
+#: gnome/gscreen.c:2288
+msgid "Show all files"
+msgstr "Vis alle filer"
+
+#: gnome/gcmd.c:564
+msgid "."
+msgstr "."
+
+#: gnome/gcmd.c:580
+msgid ""
+"Enter a filter here for files in the panel view.\n"
+"\n"
+"For example:\n"
+"*.gif will show just gif images"
+msgstr ""
+"Skriv inn et filter for filer i panelvisningen.\n"
+"\n"
+"For eksempel:\n"
+"*.gif vil kun vise gif bilder"
+
+#: gnome/gcmd.c:582
+msgid "Enter a Regular Expression to filter files in the panel view."
+msgstr "Skriv inn et regulært uttrykk for bruk som filter i panelvisningen."
+
+#: gnome/gdesktop.c:347 gnome/gdesktop.c:1371
 msgid "Warning"
 msgstr "Advarsel"
 
-#: gnome/gdesktop.c:314
+#: gnome/gdesktop.c:348
 #, c-format
 msgid "Could not open %s; will not have initial desktop icons"
 msgstr "Kunne ikke åpne %s; får ikke skrivebordsikoner"
 
-#: gnome/gdesktop.c:1182
+#: gnome/gdesktop.c:1337
 msgid "Trashcan"
 msgstr "Søppelkurv"
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1212
+#: gnome/gdesktop.c:1367
 msgid "Home directory"
 msgstr "Hjemmekatalog"
 
-#: gnome/gdesktop.c:1217
+#: gnome/gdesktop.c:1372
 #, c-format
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
 msgstr ""
 "Kunne ikke lage symbolsk lenke fra %s til %s; får ikke skrivebordsikoner."
 
-#: gnome/gdialogs.c:214
+#: gnome/gdialogs.c:241
 msgid "Files Exist"
 msgstr "Filene eksisterer"
 
-#: gnome/gdialogs.c:225
+#: gnome/gdialogs.c:252
 msgid ""
 "Some of the files you are trying to copy already exist in the destination "
 "folder."
 msgstr ""
 "Noen av filene du forsøker å kopiere eksisterer allerede i målkatalogen."
 
-#: gnome/gdialogs.c:234
+#: gnome/gdialogs.c:261
 msgid "Prompt me before overwriting any file."
 msgstr "Spør meg før filer overskrives."
 
-#: gnome/gdialogs.c:240
+#: gnome/gdialogs.c:267
 msgid "Don't overwrite any files."
 msgstr "Ikke overskriv filer."
 
-#: gnome/gdialogs.c:249
+#: gnome/gdialogs.c:276
 msgid "Overwrite:"
 msgstr "Overskriv:"
 
-#: gnome/gdialogs.c:255
+#: gnome/gdialogs.c:282
 msgid "Older files."
 msgstr "Eldre filer."
 
-#: gnome/gdialogs.c:259
+#: gnome/gdialogs.c:286
 msgid "Files only if size differs."
 msgstr "Filer bare hvis størrelsen er forskjellig."
 
-#: gnome/gdialogs.c:263
+#: gnome/gdialogs.c:290
 msgid "All files."
 msgstr "Alle filer."
 
-#: gnome/gdialogs.c:387
+#: gnome/gdialogs.c:330
+msgid "File Exists"
+msgstr "Filen eksisterer"
+
+#: gnome/gdialogs.c:335
+#, c-format
+msgid "The target file already exists: %s"
+msgstr "Målfilen eksisterer allerede: %s"
+
+#: gnome/gdialogs.c:342
+msgid "Replace it?"
+msgstr "Erstatt den?"
+
+#: gnome/gdialogs.c:405 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315
+#: src/screen.c:2283 src/screen.c:2313 src/tree.c:1023
+msgid "Copy"
+msgstr "Kopier"
+
+#: gnome/gdialogs.c:408 gtkedit/editwidget.c:1065
+msgid "Move"
+msgstr "Flytt"
+
+#: gnome/gdialogs.c:423
 msgid "Destination"
 msgstr "Mål"
 
-#: gnome/gdialogs.c:391
+#: gnome/gdialogs.c:427
 msgid "Find Destination Folder"
 msgstr "Finn målkatalog"
 
-#: gnome/gdialogs.c:396
+#: gnome/gdialogs.c:432
 msgid "Copy as a background process"
 msgstr "Kopier i bakgrunnen"
 
-#: gnome/gdialogs.c:416
+#: gnome/gdialogs.c:452
 msgid "Advanced Options"
 msgstr "Avanserte alternativer"
 
-#: gnome/gdialogs.c:420
+#: gnome/gdialogs.c:456
 msgid "Preserve symlinks"
 msgstr "Behold symbolske lenker"
 
-#: gnome/gdialogs.c:430
+#: gnome/gdialogs.c:466
 msgid "Follow links."
 msgstr "Følg lenker"
 
-#: gnome/gdialogs.c:437
+#: gnome/gdialogs.c:469
+msgid ""
+"Selecting this will copy the files that symlinks point to instead of just "
+"copying the link."
+msgstr ""
+"Dette valget vil kopiere filene som symlenken peker til i stedet for bare "
+"å kopiere lenken."
+
+#: gnome/gdialogs.c:473
 msgid "Preserve file attributes."
 msgstr "Behold filattributter."
 
-#: gnome/gdialogs.c:445
+#: gnome/gdialogs.c:476
+msgid "Preserves the permissions and the UID/GID if possible"
+msgstr "Tar vare på rettighetene og UID/GID hvis mulig"
+
+#: gnome/gdialogs.c:481
 msgid "Recursively copy subdirectories."
 msgstr "Kopier kataloger rekursivt."
 
-#: gnome/gdialogs.c:581
+#: gnome/gdialogs.c:484
+msgid "If set, this will copy the directories recursively"
+msgstr "Hvis satt, vil dette kopiere katalogen rekursivt"
+
+#: gnome/gdialogs.c:627
 msgid "File "
 msgstr "Fil "
 
-#: gnome/gdialogs.c:585
+#: gnome/gdialogs.c:631
 msgid " is "
 msgstr " er "
 
-#: gnome/gdialogs.c:588
+#: gnome/gdialogs.c:634
 msgid " Done."
 msgstr " Ferdig."
 
@@ -188,7 +334,7 @@
 msgstr "Avbryt dra"
 
 #. FIXME: this error message sucks
-#: gnome/gdnd.c:205
+#: gnome/gdnd.c:211
 #, c-format
 msgid ""
 "Could not stat %s\n"
@@ -197,7 +343,7 @@
 " Kunne ikke kjøre stat på %s \n"
 " %s "
 
-#: gnome/gicon.c:83 gnome/gtools.c:48
+#: gnome/gicon.c:83 gnome/gtools.c:50
 msgid "Error"
 msgstr "Feil"
 
@@ -214,269 +360,276 @@
 msgstr "Åpner et nytt vindu"
 
 #: gnome/glayout.c:269
-msgid "New _Terminal"
-msgstr "Ny terminal"
+msgid "_New folder"
+msgstr "Ny katalog"
 
 #: gnome/glayout.c:269
-msgid "Opens a terminal"
-msgstr "Åpner en terminal"
+msgid "Creates a folder"
+msgstr "Oppretter en katalog"
 
-#: gnome/glayout.c:271
+#: gnome/glayout.c:279
+msgid "_Open"
+msgstr "Åpne"
+
+#: gnome/glayout.c:279
+msgid "Open selected files"
+msgstr "Åpne valgte filer"
+
+#: gnome/glayout.c:281
 msgid "_Copy..."
 msgstr "Kopier..."
 
-#: gnome/glayout.c:271
+#: gnome/glayout.c:281
 msgid "Copy files"
 msgstr "Kopier filer"
 
-#: gnome/glayout.c:272
-msgid "Rename/_Move..."
-msgstr "Gi nytt navn/Flytt..."
-
-#: gnome/glayout.c:272
-msgid "Rename or move files"
-msgstr "Omdøp eller flytt filer"
-
-#: gnome/glayout.c:273
-msgid "New di_rectory..."
-msgstr "Ny katalog..."
-
-#: gnome/glayout.c:273
-msgid "Creates a new folder"
-msgstr "Oppretter en ny katalog"
-
-#: gnome/glayout.c:274
+#: gnome/glayout.c:282
 msgid "_Delete..."
 msgstr "Slett..."
 
-#: gnome/glayout.c:274
+#: gnome/glayout.c:282
 msgid "Delete files from disk"
 msgstr "Sletter filer fra disk"
 
-#: gnome/glayout.c:276
-msgid "_View"
-msgstr "Se på"
-
-#: gnome/glayout.c:276
-msgid "View file"
-msgstr "Se på fil"
-
-#: gnome/glayout.c:277
-msgid "View r_aw"
-msgstr "Se på ufiltrert"
-
-#: gnome/glayout.c:277
-msgid "View the file without further processing"
-msgstr "Se på filen uten filter"
-
-#: gnome/glayout.c:279
-msgid "_Select group by pattern..."
-msgstr "Velg gruppe etter mønster..."
-
-#: gnome/glayout.c:279
-msgid "Select a group of files"
-msgstr "Velg en gruppe av filer"
-
-#: gnome/glayout.c:280
-msgid "_Unselect group by pattern..."
-msgstr "Velg bort etter mønster..."
-
-#: gnome/glayout.c:280
-msgid "Un-selects a group of marked files"
-msgstr "Velger bort en gruppe med markerte filer"
-
-#: gnome/glayout.c:281
-msgid "R_everse selection"
-msgstr "Reverser valg"
-
-#: gnome/glayout.c:281
-msgid "Reverses the list of tagged files"
-msgstr "Reverserer listen med merkede filer"
+#: gnome/glayout.c:283
+msgid "_Move..."
+msgstr "Flytt..."
 
 #: gnome/glayout.c:283
+msgid "Rename or move files"
+msgstr "Omdøp eller flytt filer"
+
+#: gnome/glayout.c:285
 msgid "C_lose"
 msgstr "Lukk"
 
-#: gnome/glayout.c:283
+#: gnome/glayout.c:285
 msgid "Close this panel"
 msgstr "Lukk dette panelet"
 
-#: gnome/glayout.c:285
-msgid "E_xit"
-msgstr "Avslutt"
-
-#: gnome/glayout.c:285
-msgid "Exit program"
-msgstr "Avslutt programmet"
+#: gnome/glayout.c:291
+msgid "_Cut"
+msgstr "Klipp ut"
 
-#: gnome/glayout.c:292
-msgid "_Display mode..."
-msgstr "Visningsmodus..."
-
-#: gnome/glayout.c:292
-msgid "Set the display mode for the panel"
-msgstr "Sett visningsmodus for panelet"
+#: gnome/glayout.c:291
+msgid "Cuts the selected files into the cut buffer."
+msgstr "Klipper ut valgte filer til utklippsbufferen."
 
 #: gnome/glayout.c:293
-msgid "_Sort order..."
-msgstr "Sorteringsrekkefølge..."
+msgid "C_opy"
+msgstr "Kopier"
 
 #: gnome/glayout.c:293
-msgid "Changes the sort order of the files"
-msgstr "Endrer sorteringsrekkefølgen for filene"
-
-#: gnome/glayout.c:294
-msgid "_Filter..."
-msgstr "Filter..."
-
-#: gnome/glayout.c:294
-msgid "Set a filter for the files"
-msgstr "Sett et filter for filene"
+msgid "Copies the selected files into the cut buffer."
+msgstr "Kopierer valgte filer til utklippsbufferen."
 
 #: gnome/glayout.c:295
-msgid "_Rescan"
-msgstr "Oppdater"
+msgid "_Paste"
+msgstr "Lim inn"
 
 #: gnome/glayout.c:295
-msgid "Rescan the directory contents"
-msgstr "Oppdater kataloginnholdet"
+msgid "Pastes files from the cut buffer into the current directory"
+msgstr "Limer inn filer fra utklippsbufferen til aktiv katalog"
 
 #: gnome/glayout.c:298
-msgid "_Network link..."
-msgstr "Nettverkskobling..."
+msgid "_Select All"
+msgstr " Velg alle"
 
 #: gnome/glayout.c:298
-msgid "Connect to a remote machine"
-msgstr "Koble til en ekstern maskin"
+msgid "Select all files in the current Panel"
+msgstr "Velg alle filer i aktivt panel"
 
 #: gnome/glayout.c:299
-msgid "FT_P link..."
-msgstr "FTP kobling..."
+msgid "_Select Files..."
+msgstr "Velg filer..."
 
 #: gnome/glayout.c:299
-msgid "Connect to a remote machine with FTP"
-msgstr "Koble til en ekstern maskin med FTP"
+msgid "Select a group of files"
+msgstr "Velg en gruppe av filer"
 
-#: gnome/glayout.c:305
-msgid "_Confirmation..."
-msgstr "Bekreftelse..."
+#: gnome/glayout.c:300
+msgid "_Invert Selection"
+msgstr "Reverser valg"
 
-#: gnome/glayout.c:305
+#: gnome/glayout.c:300
+msgid "Reverses the list of tagged files"
+msgstr "Reverserer listen med merkede filer"
+
+#: gnome/glayout.c:302
+msgid "_Rescan Directory"
+msgstr "Oppdater kataloginnholdet"
+
+#: gnome/glayout.c:302
+msgid "Rescan the directory contents"
+msgstr "Oppdater kataloginnholdet"
+
+#: gnome/glayout.c:304
+msgid "Preferences..."
+msgstr "Innstillinger..."
+
+#: gnome/glayout.c:304
+msgid "Configure the GNOME Midnight Commander"
+msgstr "Konfigurér GNOME Midnight Commander"
+
+#: gnome/glayout.c:310
+msgid "Icon View"
+msgstr "Ikonvisning"
+
+#: gnome/glayout.c:311
+msgid "Partial View"
+msgstr "Delvis visning"
+
+#: gnome/glayout.c:312
+msgid "Full View"
+msgstr "Detaljert visning"
+
+#: gnome/glayout.c:313
+msgid "Custom View"
+msgstr "Egendefinert visning"
+
+#: gnome/glayout.c:319
+msgid "_Sort By..."
+msgstr "Sorter etter..."
+
+#: gnome/glayout.c:319
 msgid "Confirmation settings"
 msgstr "Innstillinger for bekreftelse"
 
-#: gnome/glayout.c:306
-msgid "_Options..."
-msgstr "Alternativer..."
+#: gnome/glayout.c:320
+msgid "_Filter View..."
+msgstr "Filtrert visning..."
 
-#: gnome/glayout.c:306
+#: gnome/glayout.c:320
 msgid "Global option settings"
 msgstr "Innstillinger for globale alternativer"
 
-#: gnome/glayout.c:309
-msgid "_Virtual FS..."
-msgstr "Virtuelt FS..."
+#: gnome/glayout.c:327
+msgid "_Find File..."
+msgstr "Finn fil..."
 
-#: gnome/glayout.c:309
-msgid "Virtual File System settings"
-msgstr "Instillinger for virtuelt filsystem"
-
-#: gnome/glayout.c:312
-msgid "_Save setup"
-msgstr "Lagre oppsett"
-
-#: gnome/glayout.c:317
-msgid "_Find..."
-msgstr "Finn..."
-
-#: gnome/glayout.c:317
+#: gnome/glayout.c:327
 msgid "Locate files on disk"
 msgstr "Lokaliser filer på disken"
 
-#: gnome/glayout.c:318
-msgid "_Hotlist..."
-msgstr "Hurtigliste..."
-
-#: gnome/glayout.c:318
-msgid "List of favorite sites"
-msgstr "Liste over favorittsteder"
-
-#: gnome/glayout.c:319
+#: gnome/glayout.c:330
 msgid "_Compare panels..."
 msgstr "Sammenlign paneler..."
 
-#: gnome/glayout.c:319
-msgid "Compare panel contents"
+#: gnome/glayout.c:330
+msgid "Compare two panel contents"
 msgstr "Sammenlign innholdet i panelene"
 
-#: gnome/glayout.c:320
-msgid "_External panelize..."
-msgstr "Eksternt panel..."
+#: gnome/glayout.c:331
+msgid "_Run Command..."
+msgstr "Kjør kommando..."
+
+#: gnome/glayout.c:331
+msgid "Run a command and put the results in a panel"
+msgstr "Kjør en kommando og legg resultatene i panelet"
 
-#: gnome/glayout.c:322
+#: gnome/glayout.c:333
 msgid "_Active VFS list..."
 msgstr "Liste over aktive VFS..."
 
-#: gnome/glayout.c:322
+#: gnome/glayout.c:333
 msgid "List of active virtual file systems"
 msgstr "Liste over aktive virtuelle filsystemer"
 
-#: gnome/glayout.c:325
-msgid "_Undelete files (ext2fs only)..."
-msgstr "Gjenopprett filer (kun ext2fs)..."
-
-#: gnome/glayout.c:325
-msgid "Recover deleted files"
-msgstr "Gjenopprett slettede filer"
-
-#: gnome/glayout.c:328
+#: gnome/glayout.c:340
 msgid "_Background jobs..."
 msgstr "Bakgrunnsjobber..."
 
-#: gnome/glayout.c:328
+#: gnome/glayout.c:340
 msgid "List of background operations"
 msgstr "Liste over bakgrunnsjobber"
 
-#: gnome/glayout.c:335
-msgid "_Arrange icons"
-msgstr "Plasser ikoner"
-
-#: gnome/glayout.c:335
-msgid "Arranges the icons on the desktop"
-msgstr "Plasserer ikonene på skrivebordet"
-
-#: gnome/glayout.c:342
+#. GNOMEUIINFO_HELP ("midnight-commander"),
+#: gnome/glayout.c:348
 msgid "_About"
 msgstr "Om"
 
-#: gnome/glayout.c:342
+#: gnome/glayout.c:348
 msgid "Information on this program"
 msgstr "Informasjon om dette programmet"
 
-#: gnome/glayout.c:349
+#: gnome/glayout.c:354
 msgid "_File"
 msgstr "Fil"
 
-#: gnome/glayout.c:350
-msgid "_Window"
-msgstr "Vindu"
+#: gnome/glayout.c:355
+msgid "_Edit"
+msgstr "Rediger"
+
+#: gnome/glayout.c:356
+msgid "_Layout"
+msgstr "Utseende"
 
-#: gnome/glayout.c:351
+#: gnome/glayout.c:357
 msgid "_Commands"
 msgstr "Kommandoer"
 
-#: gnome/glayout.c:352
-msgid "_Options"
-msgstr "Alternativer"
-
-#: gnome/glayout.c:353
-msgid "_Desktop"
-msgstr "Skrivebord"
-
-#: gnome/glayout.c:354
+#: gnome/glayout.c:358
 msgid "_Help"
 msgstr "Hjelp"
 
+#: gnome/gpopup.c:47
+msgid " Open with..."
+msgstr " Åpne med..."
+
+#: gnome/gpopup.c:48
+msgid "Enter extra arguments:"
+msgstr "Skriv inn ekstra argumenter:"
+
+#: gnome/gpopup.c:199 gnome/gpopup.c:200
+msgid "Properties"
+msgstr "Egenskaper"
+
+#: gnome/gpopup.c:202 gnome/gpopup.c:203
+msgid "Open"
+msgstr "Åpne"
+
+#: gnome/gpopup.c:204
+msgid "Open with"
+msgstr "Åpne med"
+
+#: gnome/gpopup.c:205 src/screen.c:2281 src/screen.c:2311
+msgid "View"
+msgstr "Se på"
+
+#: gnome/gpopup.c:206
+msgid "View unfiltered"
+msgstr "Se på ufiltrert"
+
+#: gnome/gpopup.c:207 gtkedit/gtkedit.c:1363 src/screen.c:2282
+#: src/screen.c:2312 src/view.c:1972
+msgid "Edit"
+msgstr "Rediger"
+
+#: gnome/gpopup.c:209
+msgid "Link..."
+msgstr "Finn..."
+
+#: gnome/gpopup.c:210
+msgid "Symlink..."
+msgstr "Symlenken..."
+
+#: gnome/gpopup.c:211
+msgid "Edit symlink..."
+msgstr "Rediger symlenke..."
+
+#: gnome/gpopup.c:218 gnome/gpopup.c:229
+msgid "Move/rename..."
+msgstr "Flytt/gi nytt navn..."
+
+#: gnome/gpopup.c:219 gnome/gpopup.c:230
+msgid "Copy..."
+msgstr "Kopier..."
+
+#: gnome/gpopup.c:220 gnome/gpopup.c:232 gtkedit/editwidget.c:1067
+#: src/screen.c:2286 src/screen.c:2316
+msgid "Delete"
+msgstr "Slett"
+
 #: gnome/gprop.c:58 gnome/gprop.c:75
 msgid "Filename"
 msgstr "Filnavn"
@@ -528,7 +681,7 @@
 msgstr "Bruker"
 
 #. Group
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:435
+#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:436
 msgid "Group"
 msgstr "Gruppe"
 
@@ -554,7 +707,7 @@
 msgstr "<Ukjent>"
 
 #. Owner
-#: gnome/gprop.c:390 src/screen.c:434
+#: gnome/gprop.c:390 src/screen.c:435
 msgid "Owner"
 msgstr "Eier"
 
@@ -574,162 +727,104 @@
 msgid "Select icon"
 msgstr "Velg ikon"
 
-#: gnome/gpopup.c:48
-msgid " Open with..."
-msgstr " Åpne med..."
-
-#: gnome/gpopup.c:49
-msgid "Enter extra arguments:"
-msgstr "Skriv inn ekstra argumenter:"
-
-#: gnome/gpopup.c:217 gnome/gpopup.c:218
-msgid "Properties"
-msgstr "Egenskaper"
-
-#: gnome/gpopup.c:220 gnome/gpopup.c:221
-msgid "Open"
-msgstr "Åpne"
-
-#: gnome/gpopup.c:222
-msgid "Open with"
-msgstr "Åpne med"
-
-#: gnome/gpopup.c:223 src/screen.c:2279 src/screen.c:2309
-msgid "View"
-msgstr "Se på"
-
-#: gnome/gpopup.c:224
-msgid "View unfiltered"
-msgstr "Se på ufiltrert"
-
-#: gnome/gpopup.c:225 gtkedit/gtkedit.c:1363 src/screen.c:2280
-#: src/screen.c:2310 src/view.c:1972
-msgid "Edit"
-msgstr "Rediger"
-
-#: gnome/gpopup.c:227
-msgid "Link..."
-msgstr "Finn..."
-
-#: gnome/gpopup.c:228
-msgid "Symlink..."
-msgstr "Symlenken..."
-
-#: gnome/gpopup.c:229
-msgid "Edit symlink..."
-msgstr "Rediger symlenke..."
-
-#: gnome/gpopup.c:236 gnome/gpopup.c:246
-msgid "Move/rename..."
-msgstr "Flytt/gi nytt navn..."
-
-#: gnome/gpopup.c:237 gnome/gpopup.c:247
-msgid "Copy..."
-msgstr "Kopier..."
-
-#: gnome/gpopup.c:238 gnome/gpopup.c:248 gtkedit/editwidget.c:1067
-#: src/screen.c:2284 src/screen.c:2314
-msgid "Delete"
-msgstr "Slett"
-
-#: gnome/gscreen.c:1331
+#: gnome/gscreen.c:1438
 msgid "All files"
 msgstr "Alle filer"
 
-#: gnome/gscreen.c:1333
+#: gnome/gscreen.c:1440
 msgid "Archives and compressed files"
 msgstr "Arkiver og komprimerte filer"
 
-#: gnome/gscreen.c:1335
+#: gnome/gscreen.c:1442
 msgid "RPM/DEB files"
 msgstr "RPM/DEB filer"
 
-#: gnome/gscreen.c:1337
+#: gnome/gscreen.c:1444
 msgid "Text/Document files"
 msgstr "Tekst-/dokumentfiler"
 
-#: gnome/gscreen.c:1339
+#: gnome/gscreen.c:1446
 msgid "HTML and SGML files"
 msgstr "HTML- og SGML-filer"
 
-#: gnome/gscreen.c:1341
+#: gnome/gscreen.c:1448
 msgid "Postscript and PDF files"
 msgstr "Postscript- of PDF-filer"
 
-#: gnome/gscreen.c:1343
+#: gnome/gscreen.c:1450
 msgid "Spreadsheet files"
 msgstr "Regnearkfiler"
 
-#: gnome/gscreen.c:1345
+#: gnome/gscreen.c:1452
 msgid "Image files"
 msgstr "Bildefiler"
 
-#: gnome/gscreen.c:1348
+#: gnome/gscreen.c:1455
 msgid "Video/animation files"
 msgstr "Video-/animasjonsfiler"
 
-#: gnome/gscreen.c:1350
+#: gnome/gscreen.c:1457
 msgid "Audio files"
 msgstr "Lydfiler"
 
-#: gnome/gscreen.c:1352
+#: gnome/gscreen.c:1459
 msgid "C program files"
 msgstr "C programfiler"
 
-#: gnome/gscreen.c:1354
+#: gnome/gscreen.c:1461
 msgid "C++ program files"
 msgstr "C++ programfiler"
 
-#: gnome/gscreen.c:1356
+#: gnome/gscreen.c:1463
 msgid "Objective-C program files"
 msgstr "Objektiv-C programfiler"
 
-#: gnome/gscreen.c:1358
+#: gnome/gscreen.c:1465
 msgid "Scheme program files"
 msgstr "Scheme programfiler"
 
-#: gnome/gscreen.c:1360
+#: gnome/gscreen.c:1467
 msgid "Assembler program files"
 msgstr "Assembler programfiler"
 
-#: gnome/gscreen.c:1362
+#: gnome/gscreen.c:1469
 msgid "Misc. program files"
 msgstr "Forskj. programfiler"
 
-#: gnome/gscreen.c:1364
+#: gnome/gscreen.c:1471
 msgid "Font files"
 msgstr "Skrifttypefiler"
 
-#: gnome/gscreen.c:1491
+#: gnome/gscreen.c:1598
 #, c-format
 msgid "Search: %s"
 msgstr "Søk: %s"
 
-#: gnome/gscreen.c:1500
+#: gnome/gscreen.c:1608
 #, c-format
 msgid "%s bytes in %d file"
 msgstr "%s bytes i %d fil"
 
-#: gnome/gscreen.c:1500
+#: gnome/gscreen.c:1608
 #, c-format
 msgid "%s bytes in %d files"
 msgstr "%s bytes i %d filer"
 
-#: gnome/gscreen.c:1523 src/screen.c:672
+#: gnome/gscreen.c:1634 src/screen.c:673
 msgid "<readlink failed>"
 msgstr "<readlink feilet>"
 
-#: gnome/gscreen.c:1574
+#: gnome/gscreen.c:1688
 msgid "Filter"
 msgstr "Filter"
 
-#: gnome/gscreen.c:2083
+#: gnome/gscreen.c:2243
 msgid "Location:"
 msgstr "Sted:"
 
-#: gnome/gtools.c:86 src/boxes.c:141 src/boxes.c:281 src/boxes.c:381
+#: gnome/gtools.c:103 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:372
+#: 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 "&Ok"
@@ -822,31 +917,31 @@
 msgid "Mode"
 msgstr "Modus"
 
-#: gnome/gwidget.c:92
+#: gnome/gwidget.c:90
 msgid "ok"
 msgstr "ok"
 
-#: gnome/gwidget.c:94
+#: gnome/gwidget.c:92
 msgid "cancel"
 msgstr "avbryt"
 
-#: gnome/gwidget.c:96
+#: gnome/gwidget.c:94
 msgid "help"
 msgstr "hjelp"
 
-#: gnome/gwidget.c:98
+#: gnome/gwidget.c:96
 msgid "yes"
 msgstr "ja"
 
-#: gnome/gwidget.c:100
+#: gnome/gwidget.c:98
 msgid "no"
 msgstr "nei"
 
-#: gnome/gwidget.c:102
+#: gnome/gwidget.c:100
 msgid "exit"
 msgstr "avslutt"
 
-#: gnome/gwidget.c:104
+#: gnome/gwidget.c:102
 msgid "abort"
 msgstr "avbryt"
 
@@ -854,7 +949,7 @@
 #: 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
+#: src/screen.c:2301 src/tree.c:694 src/tree.c:700 src/wtools.c:225
 #: vfs/fish.c:226
 msgid " Error "
 msgstr " Feil "
@@ -893,8 +988,8 @@
 
 #. 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:297 src/file.c:677
-#: src/help.c:321 src/main.c:660 src/screen.c:2057 src/subshell.c:700
+#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:297 src/file.c:683
+#: src/help.c:321 src/main.c:665 src/screen.c:2059 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 "
@@ -918,7 +1013,7 @@
 msgid " Save as "
 msgstr " Lagre som "
 
-#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2591
+#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2594
 msgid " Error trying to save file. "
 msgstr " Feil under lagring av fil. "
 
@@ -1195,84 +1290,438 @@
 msgstr " Klipp ut til utklippstavlen "
 
 #: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
-#: src/view.c:1833
+#: gtkedit/editcmd.c:2556 src/view.c:1833
 msgid " Goto line "
 msgstr " Gå til linje "
 
 #: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553
+#: gtkedit/editcmd.c:2556
 msgid " Enter line: "
 msgstr " Skriv inn linje: "
 
-#: gtkedit/editcmd.c:2574 gtkedit/editcmd.c:2591
+#: gtkedit/editcmd.c:2577 gtkedit/editcmd.c:2594
 msgid " Save Block "
 msgstr " Lagre blokk "
 
-#: gtkedit/editcmd.c:2625
+#: gtkedit/editcmd.c:2628
 msgid " Insert File "
 msgstr " Sett inn fil "
 
-#: gtkedit/editcmd.c:2640
+#: gtkedit/editcmd.c:2643
 msgid " Insert file "
 msgstr " Sett inn fil "
 
-#: gtkedit/editcmd.c:2640
+#: gtkedit/editcmd.c:2643
 msgid " Error trying to insert file. "
 msgstr " Feil under innsetting av fil. "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2660
+#: gtkedit/editcmd.c:2663
 msgid " Sort block "
 msgstr " Sorter blokk "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2660 gtkedit/editcmd.c:2714
+#: gtkedit/editcmd.c:2663 gtkedit/editcmd.c:2717
 msgid " You must first highlight a block of text. "
 msgstr " Du må først merke en tekstblokk. "
 
-#: gtkedit/editcmd.c:2667
+#: gtkedit/editcmd.c:2670
 msgid " Run Sort "
 msgstr " Kjør sortering "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2669
+#: gtkedit/editcmd.c:2672
 msgid " Enter sort options (see manpage) separated by whitespace: "
 msgstr " Skriv inn flagg for sortering (se manualside), skilt av tomrom: "
 
-#: gtkedit/editcmd.c:2680 gtkedit/editcmd.c:2686
+#: gtkedit/editcmd.c:2683 gtkedit/editcmd.c:2689
 msgid " Sort "
 msgstr " Sorter "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2682
+#: gtkedit/editcmd.c:2685
 msgid " Error trying to execute sort command "
 msgstr " Feil under kjøring av sorteringskommando "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2688
+#: gtkedit/editcmd.c:2691
 msgid " Sort returned non-zero: "
 msgstr " Sortering returnerte ikke-null: "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2712 gtkedit/editcmd.c:2742
+#: gtkedit/editcmd.c:2715 gtkedit/editcmd.c:2745
 msgid " Process block "
 msgstr " Prosesser blokk "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2744
+#: gtkedit/editcmd.c:2747
 msgid " Error trying to stat file "
 msgstr " Feil under stat av fil "
 
-#: gtkedit/editcmd.c:2814
+#: gtkedit/editcmd.c:2817
 msgid " Mail "
 msgstr " Send "
 
+#: gtkedit/editmenu.c:56
+msgid " Word wrap "
+msgstr " Ordbryting "
+
+#. Not essential to translate
+#: gtkedit/editmenu.c:58
+msgid " Enter line length, 0 for off: "
+msgstr " Skriv inn linjelengden, 0 for av: "
+
+#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134
+msgid "&Open/load...     C-o"
+msgstr "&Åpne/laste...    C-o"
+
+#: gtkedit/editmenu.c:119
+msgid "&New              C-n"
+msgstr "&Ny               C-n"
+
+#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137
+msgid "&Save              F2"
+msgstr "&Lagre             F2"
+
+#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
+msgid "save &As...       F12"
+msgstr "l&Agre som...     F12"
+
+#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140
+msgid "&Insert file...   F15"
+msgstr "sett &Inn fil...  F15"
+
+#: gtkedit/editmenu.c:125
+msgid "copy to &File...  C-f"
+msgstr "kopier til &Fil...C-f"
+
+#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143
+msgid "a&Bout...            "
+msgstr "Om                   "
+
+#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145
+msgid "&Quit             F10"
+msgstr "avslutt           F10"
+
+#: gtkedit/editmenu.c:135
+msgid "&New            C-x k"
+msgstr "&Ny             C-x k"
+
+#: gtkedit/editmenu.c:141
+msgid "copy to &File...     "
+msgstr "kopier til &Fil...   "
+
+#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167
+msgid "&Toggle Mark       F3"
+msgstr "slå av/på merking  F3"
+
+#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
+msgid "&Mark Columns    S-F3"
+msgstr "&Merk kolonner   S-F3"
+
+#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170
+msgid "toggle &Ins/overw Ins"
+msgstr "slå av/på sett inn/overskriv Ins"
+
+#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172
+msgid "&Copy              F5"
+msgstr "Kopier             F5"
+
+#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
+msgid "&Move              F6"
+msgstr "Flytt              F6"
+
+#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
+msgid "&Delete            F8"
+msgstr "Slett              F8"
+
+#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176
+msgid "&Undo             C-u"
+msgstr "Angre             C-u"
+
+#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178
+msgid "&Beginning     C-PgUp"
+msgstr "&Begynnelsen   C-PgUp"
+
+#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
+msgid "&End           C-PgDn"
+msgstr "Slutt          C-PgDn"
+
+#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191
+msgid "&Search...         F7"
+msgstr "Søk...             F7"
+
+#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
+msgid "search &Again     F17"
+msgstr "søk igjen         F17"
+
+#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
+msgid "&Replace...        F4"
+msgstr "Erstatt...         F4"
+
+#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220
+msgid "&Goto line...            M-l"
+msgstr "Gå til linje...          M-l"
+
+#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222
+msgid "insert &Literal...       C-q"
+msgstr "sett inn &Literal...     C-q"
+
+#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224
+msgid "&Refresh screen          C-l"
+msgstr "Oppdater skjermen        C-l"
+
+#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226
+msgid "&Start record macro      C-r"
+msgstr "&Start makroinnspilling  C-r"
+
+#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
+msgid "&Finish record macro...  C-r"
+msgstr "stopp makroinnspilling...C-r"
+
+#: gtkedit/editmenu.c:206
+msgid "&Execute macro...   C-a, KEY"
+msgstr "Kjør makro...       C-a, TAST"
+
+#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229
+msgid "delete macr&O...            "
+msgstr "slett makro...              "
+
+#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231
+msgid "insert &Date/time           "
+msgstr "sett inn dato/klokke        "
+
+#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233
+msgid "format p&Aragraph        M-p"
+msgstr "formater p&Aragraf       M-p"
+
+#: gtkedit/editmenu.c:212
+msgid "'ispell' s&Pell check    C-p"
+msgstr "'ispell' stavekontroll   C-p"
+
+#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235
+msgid "sor&T...                 M-t"
+msgstr "sor&Ter...               M-t"
+
+#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
+msgid "'indent' &C Formatter    F19"
+msgstr "'indent' C formatering   F19"
+
+#: gtkedit/editmenu.c:215
+msgid "&Mail...                    "
+msgstr "Send...                     "
+
+#: gtkedit/editmenu.c:228
+msgid "&Execute macro... C-x e, KEY"
+msgstr "Kjør makro...     C-x e, TAST"
+
+#: gtkedit/editmenu.c:234
+msgid "'ispell' s&Pell check    M-$"
+msgstr "'ispell' stavekontroll   M-$"
+
+#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252
+msgid "&General...  "
+msgstr "Generelt...  "
+
+#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
+msgid "&Save mode..."
+msgstr "Lagringsmodus..."
+
+#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302
+msgid "&Layout..."
+msgstr "Utseende."
+
+#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t'
+#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391
+#: src/chmod.c:165 src/chown.c:132
+msgid " File "
+msgstr " Fil "
+
+#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407
+msgid " Edit "
+msgstr " Rediger "
+
+#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276
+msgid " Sear/Repl "
+msgstr " Søk/Erstatt "
+
+#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442
+msgid " Command "
+msgstr " Kommando "
+
+#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278
+msgid " Options "
+msgstr " Alternativer "
+
+#: gtkedit/editmenu.c:392
+msgid "Open...\tC-o"
+msgstr "Åpne...\tC-o"
+
+#: gtkedit/editmenu.c:393
+msgid "New\tC-n"
+msgstr "Ny\tC-n"
+
+#: gtkedit/editmenu.c:395
+msgid "Save\tF2"
+msgstr "Lagre\tF2"
+
+#: gtkedit/editmenu.c:396
+msgid "Save as...\tF12"
+msgstr "Lagre som...\tF12"
+
+#: gtkedit/editmenu.c:398
+msgid "Insert file...\tF15"
+msgstr "Sett inn fil...\tF15"
+
+#: gtkedit/editmenu.c:399
+msgid "Copy to file...\tC-f"
+msgstr "Kopier til fil...\tC-f"
+
+#. Tool hint
+#: gtkedit/editmenu.c:402
+msgid "Disk operations"
+msgstr "Diskoperasjoner"
+
+#: gtkedit/editmenu.c:408
+msgid "Toggle mark\tF3"
+msgstr "Slå av/på marker\tF3"
+
+#: gtkedit/editmenu.c:409
+msgid "Toggle mark columns\tC-b"
+msgstr "Slå av/på marker kolonner\tC-b"
+
+#: gtkedit/editmenu.c:411
+msgid "Toggle insert/overwrite\tIns"
+msgstr "Slå av/på overskriv\tIns"
+
+#: gtkedit/editmenu.c:413
+msgid "Copy block to cursor\tF5"
+msgstr "Kopier blokk til markøren\tF5"
+
+#: gtkedit/editmenu.c:414
+msgid "Move block to cursor\tF6"
+msgstr "Flytt blokk til markøren\tF6"
+
+#: gtkedit/editmenu.c:415
+msgid "Delete block\tF8/C-Del"
+msgstr "Slett blokk\tF8/C-Del"
+
+#: gtkedit/editmenu.c:417
+msgid "Copy block to clipbrd\tC-Ins"
+msgstr "Kopier blokk til utklippstavle\tC-Ins"
+
+#: gtkedit/editmenu.c:418
+msgid "Cut block to clipbrd\tS-Del"
+msgstr "Klipp ut blokk til utklippstavle\tS-Del"
+
+#: gtkedit/editmenu.c:419
+msgid "Paste block from clipbrd\tS-Ins"
+msgstr "Lim inn blokk fra utklippstavlen\tS-Ins"
+
+#: gtkedit/editmenu.c:420
+msgid "Selection history\tM-Ins"
+msgstr "Utvalgshistorikk\tM-Ins"
+
+#: gtkedit/editmenu.c:422
+msgid "Undo\tC-BackSpace"
+msgstr "Angre\tC-Tilbake"
+
+#. Tool hint
+#: gtkedit/editmenu.c:425
+msgid "Manipulating blocks of text"
+msgstr "Manipulering av tekstblokker"
+
+#: gtkedit/editmenu.c:430
+msgid " Srch/Replce "
+msgstr " Søk/Erstatt "
+
+#: gtkedit/editmenu.c:431
+msgid "Search...\tF7"
+msgstr "Søk...\tF7"
+
+#: gtkedit/editmenu.c:432
+msgid "Search again\tF17"
+msgstr "Søk igjen\tF17"
+
+#: gtkedit/editmenu.c:433
+msgid "Replace...\tF4"
+msgstr "Erstatt...\tF4"
+
+#: gtkedit/editmenu.c:434
+msgid "Replace again\tF14"
+msgstr "Erstatt igjen\tF14"
+
+#. Tool hint
+#: gtkedit/editmenu.c:437
+msgid "Search for and replace text"
+msgstr "Søk etter og erstatt tekst"
+
+#: gtkedit/editmenu.c:443
+msgid "Goto line...\tM-l"
+msgstr "Gå til linje...\tM-l"
+
+#: gtkedit/editmenu.c:445
+msgid "Start record macro\tC-r"
+msgstr "Start makroinnspilling\tC-r"
+
+#: gtkedit/editmenu.c:446
+msgid "Finish record macro...\tC-r"
+msgstr "Avslutt makroinnspilling...\tC-r"
+
+#: gtkedit/editmenu.c:447
+msgid "Execute macro...\tC-a, KEY"
+msgstr "Kjør makro...\tC-a, TAST"
+
+#: gtkedit/editmenu.c:448
+msgid "Delete macro...\t"
+msgstr "Slett makro...\t"
+
+#: gtkedit/editmenu.c:450
+msgid "Insert date/time\tC-d"
+msgstr "Sett inn dato/klokkeslett\tC-d"
+
+#: gtkedit/editmenu.c:451
+msgid "Format paragraph\tM-p"
+msgstr "Formater paragraf\tM-p"
+
+#: gtkedit/editmenu.c:453
+msgid "Refresh display\tC-l"
+msgstr "Oppdater skjermen\tC-l"
+
+#. Tool hint
+#: gtkedit/editmenu.c:456
+msgid "Macros and internal commands"
+msgstr "Makroer og interne kommandoer"
+
+#: gtkedit/editoptions.c:37
+msgid "None"
+msgstr "Ingen"
+
+#: gtkedit/editoptions.c:37
+msgid "Dynamic paragraphing"
+msgstr "Dynamiske paragrafer"
+
+#: gtkedit/editoptions.c:37
+msgid "Type writer wrap"
+msgstr "Skrivemaskinsbryting"
+
+#. 13
+#: gtkedit/editoptions.c:100
+msgid "Wrap mode"
+msgstr "Brytningsmodus"
+
+#. 15
+#: gtkedit/editoptions.c:106
+msgid "Key emulation"
+msgstr "Tasteemulering"
+
 #. Not essential to translate
 #: gtkedit/editwidget.c:310
 msgid "Error initialising editor.\n"
 msgstr "Feil under initialisering av editor.\n"
 
 #: 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/main.c:1668 src/screen.c:2279 src/screen.c:2309 src/tree.c:1017
 #: src/view.c:1963
 msgid "Help"
 msgstr "Hjelp"
@@ -1285,20 +1734,11 @@
 msgid "Replac"
 msgstr "Erstatt"
 
-#: gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1315 src/screen.c:2281
-#: src/screen.c:2311 src/tree.c:1484
-msgid "Copy"
-msgstr "Kopier"
-
-#: gtkedit/editwidget.c:1065
-msgid "Move"
-msgstr "Flytt"
-
-#: gtkedit/editwidget.c:1069 src/main.c:1678
+#: gtkedit/editwidget.c:1069 src/main.c:1670
 msgid "PullDn"
 msgstr "Trekk ned"
 
-#: gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1679 src/view.c:1965
+#: gtkedit/editwidget.c:1070 src/help.c:821 src/main.c:1671 src/view.c:1965
 #: src/view.c:1985
 msgid "Quit"
 msgstr "Avslutt"
@@ -1441,9 +1881,9 @@
 
 #: 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/chmod.c:115 src/chown.c:81 src/cmd.c:850 src/filegui.c:707
 #: 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:145 src/panelize.c:90
+#: 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"
@@ -1527,7 +1967,7 @@
 msgid "Background process:"
 msgstr "Bakgrunnsprosess:"
 
-#: src/background.c:286 src/file.c:2062
+#: src/background.c:286 src/file.c:2104
 msgid " Background process error "
 msgstr " Feil i bakgrunnsprosess "
 
@@ -1680,7 +2120,7 @@
 msgid "Running "
 msgstr "Kjører"
 
-#: src/boxes.c:838 src/find.c:667
+#: src/boxes.c:838 src/find.c:671
 msgid "Stopped"
 msgstr "Stoppet"
 
@@ -1760,10 +2200,6 @@
 msgid "&Marked all"
 msgstr "&Markert alle"
 
-#: src/chmod.c:151 src/screen.c:423
-msgid "Name"
-msgstr "Navn"
-
 #: src/chmod.c:153
 msgid "Permissions (Octal)"
 msgstr "Rettigheter (Octal)"
@@ -1784,10 +2220,6 @@
 msgid " Permission "
 msgstr " Rettighet "
 
-#: src/chmod.c:165 src/chown.c:132
-msgid " File "
-msgstr " Fil "
-
 #: src/chmod.c:170
 msgid "Use SPACE to change"
 msgstr "Bruk SPACE for å endre"
@@ -1874,7 +2306,7 @@
 msgid "Files tagged, want to cd?"
 msgstr "Filer merket, vil du skifte katalog?"
 
-#: src/cmd.c:260 src/cmd.c:727 src/cmd.c:741
+#: src/cmd.c:260 src/cmd.c:709 src/cmd.c:723
 msgid "Could not change directory"
 msgstr " Kunne ikke skifte katalog"
 
@@ -1910,85 +2342,85 @@
 msgid " Set expression for filtering filenames"
 msgstr " Sett uttrykk for filtrering av filnavn"
 
-#: src/cmd.c:530
+#: src/cmd.c:512
 msgid " Select "
 msgstr " Velg "
 
-#: src/cmd.c:558 src/cmd.c:609
+#: src/cmd.c:540 src/cmd.c:591
 msgid "  Malformed regular expression  "
 msgstr "  Malformert vanlig uttrykk  "
 
-#: src/cmd.c:582
+#: src/cmd.c:564
 msgid " Unselect "
 msgstr " Velg bort "
 
-#: src/cmd.c:654
+#: src/cmd.c:636
 msgid "Extension file edit"
 msgstr "Rediger utvidelsesfil"
 
-#: src/cmd.c:655
+#: src/cmd.c:637
 msgid " Which extension file you want to edit? "
 msgstr " Hvilken utvidelsesfil vil du redigere? "
 
-#: src/cmd.c:656
+#: src/cmd.c:638
 msgid "&User"
 msgstr "&Bruker"
 
-#: src/cmd.c:656 src/cmd.c:682
+#: src/cmd.c:638 src/cmd.c:664
 msgid "&System Wide"
 msgstr "&System"
 
-#: src/cmd.c:679
+#: src/cmd.c:661
 msgid "Menu file edit"
 msgstr "Rediger menyfil"
 
-#: src/cmd.c:680
+#: src/cmd.c:662
 msgid " Which menu file will you edit? "
 msgstr " Hvilken menyfil vil du redigere? "
 
-#: src/cmd.c:682
+#: src/cmd.c:664
 msgid "&Local"
 msgstr "&Lokal"
 
-#: src/cmd.c:682
+#: src/cmd.c:664
 msgid "&Home"
 msgstr "&Hjemme"
 
-#: src/cmd.c:867
+#: src/cmd.c:849
 msgid " Compare directories "
 msgstr " Sammenlign kataloger "
 
-#: src/cmd.c:867
+#: src/cmd.c:849
 msgid " Select compare method: "
 msgstr " Velg metode for sammenligning: "
 
-#: src/cmd.c:868
+#: src/cmd.c:850
 msgid "&Quick"
 msgstr "&Rask"
 
-#: src/cmd.c:868
+#: src/cmd.c:850
 msgid "&Size only"
 msgstr "Bare &Størrelse"
 
-#: src/cmd.c:868
+#: src/cmd.c:850
 msgid "&Thorough"
 msgstr "&Grundig"
 
-#: src/cmd.c:878
+#: src/cmd.c:860
 msgid " Both panels should be on the listing view mode to use this command "
 msgstr ""
 " Begge panelene bør være i visningsmodus for liste for å bruke denne "
 "kommandoen "
 
-#: src/cmd.c:892
+#: src/cmd.c:874
 msgid " The command history is empty "
 msgstr " Kommandohistorikken er tom "
 
-#: src/cmd.c:898
+#: src/cmd.c:880
 msgid " Command history "
 msgstr " Kommandohistorikk "
 
-#: src/cmd.c:940
+#: src/cmd.c:922
 msgid ""
 " Not an xterm or Linux console; \n"
 " the panels cannot be toggled. "
@@ -1996,7 +2428,7 @@
 " Ikke en xterm elle Linux konsoll; \n"
 " panelene kan ikke slås av og på. "
 
-#: src/cmd.c:979
+#: src/cmd.c:961
 msgid ""
 "Type `exit' to return to the Midnight Commander\n"
 "\r\n"
@@ -2006,7 +2438,7 @@
 "\r\n"
 "\r"
 
-#: src/cmd.c:1032
+#: src/cmd.c:1014
 #, c-format
 msgid ""
 " Couldn't stat %s \n"
@@ -2015,92 +2447,92 @@
 " Kunne ikke kjøre stat på %s \n"
 " %s "
 
-#: src/cmd.c:1041 src/cmd.c:1043
+#: src/cmd.c:1023 src/cmd.c:1025
 msgid " Link "
 msgstr " Lenke "
 
-#: src/cmd.c:1042 src/cmd.c:1147 src/file.c:2247
+#: src/cmd.c:1024 src/cmd.c:1129 src/file.c:2289
 msgid " to:"
 msgstr " til:"
 
-#: src/cmd.c:1053
+#: src/cmd.c:1035
 #, c-format
 msgid " link: %s "
 msgstr " lenke: %s "
 
-#: src/cmd.c:1086
+#: src/cmd.c:1068
 #, c-format
 msgid " symlink: %s "
 msgstr " symlink: %s "
 
-#: src/cmd.c:1112
+#: src/cmd.c:1094
 msgid " Symlink "
 msgstr " Symlinken "
 
-#: src/cmd.c:1112
+#: src/cmd.c:1094
 msgid " points to:"
 msgstr " peker til:"
 
-#: src/cmd.c:1117
+#: src/cmd.c:1099
 msgid " Edit symlink "
 msgstr " Rediger symlink "
 
-#: src/cmd.c:1123
+#: src/cmd.c:1105
 #, c-format
 msgid " edit symlink: %s "
 msgstr " rediger symlink: %s "
 
-#: src/cmd.c:1147
+#: src/cmd.c:1129
 msgid " Link symbolically "
 msgstr " Lag symbolsk lenke "
 
-#: src/cmd.c:1148
+#: src/cmd.c:1130
 msgid " Relative symlink "
 msgstr " Relativ symlink "
 
-#: src/cmd.c:1159
+#: src/cmd.c:1141
 #, c-format
 msgid " relative symlink: %s "
 msgstr " relativ symlink: %s "
 
-#: src/cmd.c:1262
+#: src/cmd.c:1244
 msgid " Enter machine name (F1 for details): "
 msgstr " Skriv inn maskinnavn (F1 for detaljer): "
 
-#: src/cmd.c:1286
+#: src/cmd.c:1268
 #, c-format
 msgid " Could not chdir to %s "
 msgstr " Kunne ikke skifte katalog til %s "
 
-#: src/cmd.c:1293
+#: src/cmd.c:1275
 msgid " Link to a remote machine "
 msgstr " Lenke til en fjern maskin "
 
-#: src/cmd.c:1299
+#: src/cmd.c:1281
 msgid " FTP to machine "
 msgstr " FTP til maskin "
 
-#: src/cmd.c:1309
+#: src/cmd.c:1291
 msgid " Socket source routing setup "
 msgstr " Oppsett av kontaktens kilderuting"
 
-#: src/cmd.c:1310
+#: src/cmd.c:1292
 msgid " Enter host name to use as a source routing hop: "
 msgstr " Skriv inn vertsnavnet som skal brukes som kilderutingshop: "
 
-#: src/cmd.c:1317
+#: src/cmd.c:1299
 msgid " Host name "
 msgstr " Vertsnavn "
 
-#: src/cmd.c:1317
+#: src/cmd.c:1299
 msgid " Error while looking up IP address "
 msgstr " Feil under oppslag av IP-adresse "
 
-#: src/cmd.c:1328
+#: src/cmd.c:1310
 msgid " Undelete files on an ext2 file system "
 msgstr " Gjenopprett filer på et ext2 filsystem "
 
-#: src/cmd.c:1329
+#: src/cmd.c:1311
 msgid ""
 " Enter device (without /dev/) to undelete\n"
 "   files on: (F1 for details)"
@@ -2108,11 +2540,11 @@
 " Skriv inn enhet (uten /dev/) som det skal gjenopprettes\n"
 "   filer på: (F1 for detaljer)"
 
-#: src/cmd.c:1379
+#: src/cmd.c:1361
 msgid " Setup saved to ~/"
 msgstr " Oppsett lagret til ~/"
 
-#: src/cmd.c:1384
+#: src/cmd.c:1366
 msgid " Setup "
 msgstr " Oppsett "
 
@@ -2266,15 +2698,15 @@
 msgid "mc.ext will be used for this moment."
 msgstr "mc.ext vil bli brukt foreløpig."
 
-#: src/file.c:228 src/tree.c:1104
+#: src/file.c:229 src/tree.c:653
 msgid " Copy "
 msgstr " Kopier "
 
-#: src/file.c:229 src/tree.c:1140
+#: src/file.c:230 src/tree.c:689
 msgid " Move "
 msgstr " Flytt "
 
-#: src/file.c:230 src/tree.c:1205
+#: src/file.c:231 src/tree.c:756
 msgid " Delete "
 msgstr " Slett "
 
@@ -2314,7 +2746,7 @@
 " Kan ikke lage målsymlinken \"%s\" \n"
 " %s "
 
-#: src/file.c:574
+#: src/file.c:580
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -2323,7 +2755,7 @@
 " Kan ikke overskrive katalogen \"%s\" \n"
 " %s "
 
-#: src/file.c:584
+#: src/file.c:590
 #, c-format
 msgid ""
 " Cannot stat source file \"%s\" \n"
@@ -2332,12 +2764,12 @@
 " Kan ikke kjøre stat på kildefilen \"%s\" \n"
 " %s "
 
-#: src/file.c:598
+#: src/file.c:604
 #, c-format
 msgid " `%s' and `%s' are the same file. "
 msgstr " `%s' og `%s' er samme fil. "
 
-#: src/file.c:634
+#: src/file.c:640
 #, c-format
 msgid ""
 " Cannot create special file \"%s\" \n"
@@ -2346,7 +2778,7 @@
 " Kan ikke opprette den spesielle filen \"%s\" \n"
 " %s "
 
-#: src/file.c:644 src/file.c:868
+#: src/file.c:650 src/file.c:874
 #, c-format
 msgid ""
 " Cannot chown target file \"%s\" \n"
@@ -2355,7 +2787,7 @@
 " Kan ikke kjøre chown på målfilen \"%s\" \n"
 " %s "
 
-#: src/file.c:653 src/file.c:884
+#: src/file.c:659 src/file.c:890
 #, c-format
 msgid ""
 " Cannot chmod target file \"%s\" \n"
@@ -2364,7 +2796,7 @@
 " Kan ikke kjøre chmod på målfilen \"%s\" \n"
 " %s "
 
-#: src/file.c:667
+#: src/file.c:673
 #, c-format
 msgid ""
 " Cannot open source file \"%s\" \n"
@@ -2373,11 +2805,11 @@
 " Kan ikke åpne kildefilen \"%s\" \n"
 " %s "
 
-#: src/file.c:677
+#: src/file.c:683
 msgid " Reget failed, about to overwrite file "
 msgstr " Gjenhenting feilet, kommer til å overskrive filen "
 
-#: src/file.c:684
+#: src/file.c:690
 #, c-format
 msgid ""
 " Cannot fstat source file \"%s\" \n"
@@ -2386,7 +2818,7 @@
 " Kan ikke kjøre fstat på kildefilen \"%s\" \n"
 " %s "
 
-#: src/file.c:706
+#: src/file.c:712
 #, c-format
 msgid ""
 " Cannot create target file \"%s\" \n"
@@ -2395,7 +2827,7 @@
 " Kan ikke opprette målfilen \"%s\" \n"
 " %s "
 
-#: src/file.c:721
+#: src/file.c:727
 #, c-format
 msgid ""
 " Cannot fstat target file \"%s\" \n"
@@ -2404,7 +2836,7 @@
 " Kan ikke kjøre fstat på målfilen \"%s\" \n"
 " %s "
 
-#: src/file.c:752
+#: src/file.c:758
 #, c-format
 msgid ""
 " Cannot read source file \"%s\" \n"
@@ -2413,7 +2845,7 @@
 " Kan ikke lese kildefilen \"%s\" \n"
 " %s "
 
-#: src/file.c:782
+#: src/file.c:788
 #, c-format
 msgid ""
 " Cannot write target file \"%s\" \n"
@@ -2422,11 +2854,11 @@
 " Kan ikke skrive til målfilen \"%s\" \n"
 " %s "
 
-#: src/file.c:800
+#: src/file.c:806
 msgid "(stalled)"
 msgstr "(venter)"
 
-#: src/file.c:839
+#: src/file.c:845
 #, c-format
 msgid ""
 " Cannot close source file \"%s\" \n"
@@ -2435,7 +2867,7 @@
 " Kan ikke lukke kildefilen \"%s\" \n"
 " %s "
 
-#: src/file.c:849
+#: src/file.c:855
 #, c-format
 msgid ""
 " Cannot close target file \"%s\" \n"
@@ -2444,19 +2876,19 @@
 " Kan ikke lukke målfilen \"%s\" \n"
 " %s "
 
-#: src/file.c:859
+#: src/file.c:865
 msgid "Incomplete file was retrieved. Keep it?"
 msgstr "Ikke komplett fil ble hentet. Beholde den?"
 
-#: src/file.c:859
+#: src/file.c:865
 msgid "&Delete"
 msgstr "&Slett"
 
-#: src/file.c:859 src/hotlist.c:1437
+#: src/file.c:865 src/hotlist.c:1437
 msgid "&Keep"
 msgstr "&Behold"
 
-#: src/file.c:928
+#: src/file.c:937
 #, c-format
 msgid ""
 " Cannot stat source directory \"%s\" \n"
@@ -2465,7 +2897,7 @@
 " Kan ikke kjøre stat på kildekatalogen \"%s\" \n"
 " %s "
 
-#: src/file.c:951
+#: src/file.c:960
 #, c-format
 msgid ""
 " Source directory \"%s\" is not a directory \n"
@@ -2475,7 +2907,7 @@
 " %s "
 
 #. we found a cyclic symbolic link
-#: src/file.c:959
+#: src/file.c:968
 #, c-format
 msgid ""
 " Cannot copy cyclic symbolic link \n"
@@ -2484,7 +2916,7 @@
 " Kan ikke kopiere en sirkulær symbolsk lenke \n"
 " `%s' "
 
-#: src/file.c:1012
+#: src/file.c:1021
 #, c-format
 msgid ""
 " Cannot create target directory \"%s\" \n"
@@ -2493,7 +2925,7 @@
 " Kan ikke opprette målkatalogen \"%s\" \n"
 " %s "
 
-#: src/file.c:1031
+#: src/file.c:1040
 #, c-format
 msgid ""
 " Cannot chown target directory \"%s\" \n"
@@ -2503,7 +2935,7 @@
 " %s "
 
 #. Source doesn't exist
-#: src/file.c:1143
+#: src/file.c:1155
 #, c-format
 msgid ""
 " Cannot stat file \"%s\" \n"
@@ -2512,17 +2944,17 @@
 " Kan ikke kjøre stat på filen \"%s\" \n"
 " %s "
 
-#: src/file.c:1165
+#: src/file.c:1177
 #, c-format
 msgid " `%s' and `%s' are the same file "
 msgstr " `%s' og `%s' er samme fil "
 
-#: src/file.c:1172
+#: src/file.c:1184
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " Kan ikke overskrive katalogen `%s' "
 
-#: src/file.c:1205
+#: src/file.c:1217
 #, c-format
 msgid ""
 " Cannot move file \"%s\" to \"%s\" \n"
@@ -2531,7 +2963,7 @@
 " Kan ikke flytte filen \"%s\" til \"%s\" \n"
 " %s "
 
-#: src/file.c:1225
+#: src/file.c:1238
 #, c-format
 msgid ""
 " Cannot remove file \"%s\" \n"
@@ -2540,17 +2972,17 @@
 " Kan ikke fjerne filen \"%s\" \n"
 " %s "
 
-#: src/file.c:1274
+#: src/file.c:1288
 #, c-format
 msgid " Cannot overwrite directory \"%s\" %s "
 msgstr " Kan ikke overskrive katalogen \"%s\" %s "
 
-#: src/file.c:1276
+#: src/file.c:1290
 #, c-format
 msgid " Cannot overwrite file \"%s\" %s "
 msgstr " Kan ikke overskrive filen \"%s\" %s "
 
-#: src/file.c:1299
+#: src/file.c:1313
 #, c-format
 msgid ""
 " Cannot move directory \"%s\" to \"%s\" \n"
@@ -2559,7 +2991,7 @@
 " Kan ikke flytte  katalogen \"%s\" til \"%s\" \n"
 " %s "
 
-#: src/file.c:1355
+#: src/file.c:1377
 #, c-format
 msgid ""
 " Cannot delete file \"%s\" \n"
@@ -2568,7 +3000,7 @@
 " Kan ikke slette filen \"%s\" \n"
 " %s "
 
-#: src/file.c:1408 src/file.c:1475 src/file.c:1504
+#: src/file.c:1436 src/file.c:1503 src/file.c:1532
 #, c-format
 msgid ""
 " Cannot remove directory \"%s\" \n"
@@ -2577,35 +3009,35 @@
 " Kan ikke fjerne katalogen \"%s\" \n"
 " %s "
 
-#: src/file.c:1540
+#: src/file.c:1568
 msgid " Internal error: get_file \n"
 msgstr " Intern feil: get_file \n"
 
-#: src/file.c:1706
+#: src/file.c:1735
 msgid " Can't operate on \"..\"! "
 msgstr " Kan ikke arbeide på \"..\"! "
 
-#: src/file.c:1722
+#: src/file.c:1751
 msgid "Yes"
 msgstr "Ja"
 
-#: src/file.c:1722
+#: src/file.c:1751
 msgid "No"
 msgstr "Nei"
 
-#: src/file.c:1772
+#: src/file.c:1801
 msgid " Sorry, I could not put the job in background "
 msgstr " Beklager, Jeg kunne ikke plassere jobben i bakgrunnen "
 
-#: src/file.c:1862 src/file.c:1964
+#: src/file.c:1891 src/file.c:2006
 msgid " Internal failure "
 msgstr " Intern feil "
 
-#: src/file.c:1862 src/file.c:1965
+#: src/file.c:1891 src/file.c:2007
 msgid " Unknown file operation "
 msgstr " Ukjent filoperasjon "
 
-#: src/file.c:1878
+#: src/file.c:1909
 #, c-format
 msgid ""
 " Destination \"%s\" must be a directory \n"
@@ -2614,19 +3046,19 @@
 " Målet \"%s\" må være en katalog \n"
 " %s "
 
-#: src/file.c:2063 src/filegui.c:248
+#: src/file.c:2105 src/filegui.c:248
 msgid "&Skip"
 msgstr "&Hopp over"
 
-#: src/file.c:2063
+#: src/file.c:2105
 msgid "&Retry"
 msgstr "&Prøv igjen"
 
-#: src/file.c:2063 src/file.c:2121 src/filegui.c:245 src/filegui.c:485
+#: src/file.c:2105 src/file.c:2163 src/filegui.c:245 src/filegui.c:485
 msgid "&Abort"
 msgstr "&Avbryt"
 
-#: src/file.c:2112
+#: src/file.c:2154
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -2636,7 +3068,7 @@
 "   Katalogen er ikke tom. \n"
 "   Slett den rekursivt? "
 
-#: src/file.c:2113
+#: src/file.c:2155
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
@@ -2646,27 +3078,27 @@
 "   Bakgrunnsprosess: Katalogen er ikke tom. \n"
 "   Slett den rekursivt? "
 
-#: src/file.c:2120
+#: src/file.c:2162
 msgid "a&ll"
 msgstr "a&lle"
 
-#: src/file.c:2120 src/filegui.c:488
+#: src/file.c:2162 src/filegui.c:488
 msgid "non&E"
 msgstr "ing&En"
 
-#: src/file.c:2130
+#: src/file.c:2172
 msgid " Type 'yes' if you REALLY want to delete "
 msgstr " Skriv 'ja' hvis du VIRKELIG vil slette "
 
-#: src/file.c:2132
+#: src/file.c:2174
 msgid "all the directories "
 msgstr "alle katalogene "
 
-#: src/file.c:2134
+#: src/file.c:2176
 msgid " Recursive Delete "
 msgstr " Rekursiv sletting "
 
-#: src/file.c:2135
+#: src/file.c:2177
 msgid " Background process: Recursive Delete "
 msgstr " Bakgrunnsprosess: Rekursiv sletting "
 
@@ -2684,59 +3116,59 @@
 #. * (I don't use spaces around the words, because someday they could be
 #. * dropped, when widgets get smarter)
 #.
-#: src/file.c:2223
+#: src/file.c:2265
 msgid "1Copy"
 msgstr "1Kopier"
 
-#: src/file.c:2223
+#: src/file.c:2265
 msgid "1Move"
 msgstr "1Flytt"
 
-#: src/file.c:2223
+#: src/file.c:2265
 msgid "1Delete"
 msgstr "1Slett"
 
-#: src/file.c:2238
+#: src/file.c:2280
 #, c-format
 msgid "%o %f \"%s\"%m"
 msgstr "%o %f \"%s\"%m"
 
-#: src/file.c:2239
+#: src/file.c:2281
 #, c-format
 msgid "%o %d %f%m"
 msgstr "%o %d %f%m"
 
-#: src/file.c:2241
+#: src/file.c:2283
 #, c-format
 msgid "%o %f \"%s\"%e"
 msgstr "%o %f \"%s\"%e"
 
-#: src/file.c:2242
+#: src/file.c:2284
 #, c-format
 msgid "%o %d %f%e"
 msgstr "%o %d %f%e"
 
-#: src/file.c:2246
+#: src/file.c:2288
 msgid "file"
 msgstr "fil"
 
-#: src/file.c:2246
+#: src/file.c:2288
 msgid "files"
 msgstr "filer"
 
-#: src/file.c:2246
+#: src/file.c:2288
 msgid "directory"
 msgstr "katalog"
 
-#: src/file.c:2246
+#: src/file.c:2288
 msgid "directories"
 msgstr "kataloger"
 
-#: src/file.c:2247
+#: src/file.c:2289
 msgid "files/directories"
 msgstr "filer/kataloger"
 
-#: src/file.c:2247
+#: src/file.c:2289
 msgid " with source mask:"
 msgstr " med kildemaske:"
 
@@ -2893,7 +3325,7 @@
 msgid "Content: "
 msgstr "Innhold: "
 
-#: src/find.c:154 src/main.c:1207 src/main.c:1228
+#: src/find.c:154 src/main.c:1199 src/main.c:1220
 msgid "&Tree"
 msgstr "Tre"
 
@@ -2918,16 +3350,16 @@
 msgid "Finished"
 msgstr "Ferdig"
 
-#: src/find.c:535 src/view.c:1450
+#: src/find.c:539 src/view.c:1450
 #, c-format
 msgid "Searching %s"
 msgstr "Søker i %s"
 
-#: src/find.c:667 src/find.c:784
+#: src/find.c:671 src/find.c:788
 msgid "Searching"
 msgstr "Søker"
 
-#: src/find.c:759
+#: src/find.c:763
 msgid "Find file"
 msgstr "Finn fil"
 
@@ -3284,76 +3716,76 @@
 msgid "File:       None"
 msgstr "Fil:        Ingen"
 
-#: src/layout.c:161
+#: src/layout.c:159
 msgid "&Vertical"
 msgstr "Vertikal"
 
-#: src/layout.c:162
+#: src/layout.c:160
 msgid "&Horizontal"
 msgstr "Horisontal"
 
-#: src/layout.c:172
+#: src/layout.c:170
 msgid "&Xterm hintbar"
 msgstr "Xterm hintlinje"
 
-#: src/layout.c:173
+#: src/layout.c:171
 msgid "h&Intbar visible"
 msgstr "synlig hintlinje"
 
-#: src/layout.c:174
+#: src/layout.c:172
 msgid "&Keybar visible"
 msgstr "Tastaturlinje synlig"
 
-#: src/layout.c:175
+#: src/layout.c:173
 msgid "command &Prompt"
 msgstr "kommandoskall"
 
-#: src/layout.c:176
+#: src/layout.c:174
 msgid "show &Mini status"
 msgstr "vis ministatus"
 
-#: src/layout.c:177
+#: src/layout.c:175
 msgid "menu&Bar visible"
 msgstr "menylinje synlig"
 
-#: src/layout.c:178
+#: src/layout.c:176
 msgid "&Equal split"
 msgstr "lik deling"
 
-#: src/layout.c:179
+#: src/layout.c:177
 msgid "pe&Rmissions"
 msgstr "rettigheter"
 
-#: src/layout.c:180
+#: src/layout.c:178
 msgid "&File types"
 msgstr "filtyper"
 
-#: src/layout.c:374 src/learn.c:62 src/learn.c:181 src/option.c:146
+#: src/layout.c:372 src/learn.c:62 src/learn.c:181 src/option.c:146
 msgid "&Save"
 msgstr "lagre"
 
 #. length of line with '<' '>' buttons
-#: src/layout.c:382
+#: src/layout.c:380
 msgid " Layout "
 msgstr " Utseende "
 
-#: src/layout.c:383
+#: src/layout.c:381
 msgid " Panel split "
 msgstr " Del panel "
 
-#: src/layout.c:384
+#: src/layout.c:382
 msgid " Highlight... "
 msgstr " Uthev... "
 
-#: src/layout.c:385 src/option.c:157
+#: src/layout.c:383 src/option.c:157
 msgid " Other options "
 msgstr " Andre alternativer "
 
-#: src/layout.c:386
+#: src/layout.c:384
 msgid "output lines"
 msgstr "utskriftslinjer"
 
-#: src/layout.c:453
+#: src/layout.c:451
 msgid "Layout"
 msgstr "Utseende"
 
@@ -3435,7 +3867,7 @@
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr "tast, eller klikk med musen for å definere den. Flytt med Tab."
 
-#: src/main.c:661
+#: src/main.c:666
 msgid ""
 " The Commander can't change to the directory that \n"
 " the subshell claims you are in.  Perhaps you have \n"
@@ -3447,251 +3879,247 @@
 " arbeidskatalogen, eller gitt deg selv ekstra tilgangs- \n"
 " rettigheter med \"su\" kommandoen? "
 
-#: src/main.c:736
+#: src/main.c:741
 msgid "Press any key to continue..."
 msgstr "Trykk en tast for å fortsette..."
 
-#: src/main.c:786
+#: src/main.c:791
 msgid " The shell is already running a command "
 msgstr " Skallet kjører allerede en kommando "
 
-#: src/main.c:1204 src/main.c:1225
+#: src/main.c:1196 src/main.c:1217
 msgid "&Listing mode..."
 msgstr "Listemodus..."
 
-#: src/main.c:1205 src/main.c:1226
+#: src/main.c:1197 src/main.c:1218
 msgid "&Quick view     C-x q"
 msgstr "Rask visning   C-x q"
 
-#: src/main.c:1206 src/main.c:1227
+#: src/main.c:1198 src/main.c:1219
 msgid "&Info           C-x i"
 msgstr "Info           C-x i"
 
-#: src/main.c:1209 src/main.c:1230
+#: src/main.c:1201 src/main.c:1222
 msgid "&Sort order..."
 msgstr "Sorteringsrekkefølge..."
 
-#: src/main.c:1211 src/main.c:1232
+#: src/main.c:1203 src/main.c:1224
 msgid "&Filter..."
 msgstr "Filter..."
 
-#: src/main.c:1214 src/main.c:1235
+#: src/main.c:1206 src/main.c:1227
 msgid "&Network link..."
 msgstr "Nettverkskobling..."
 
-#: src/main.c:1215 src/main.c:1236
+#: src/main.c:1207 src/main.c:1228
 msgid "FT&P link..."
 msgstr "FTP kobling..."
 
-#: src/main.c:1219 src/main.c:1240
+#: src/main.c:1211 src/main.c:1232
 msgid "&Drive...       M-d"
 msgstr "Disk...        M-d"
 
-#: src/main.c:1221 src/main.c:1242
+#: src/main.c:1213 src/main.c:1234
 msgid "&Rescan         C-r"
 msgstr "Gjenles         C-r"
 
-#: src/main.c:1246
+#: src/main.c:1238
 msgid "&User menu          F2"
 msgstr "Brukermeny         F2"
 
-#: src/main.c:1247
+#: src/main.c:1239
 msgid "&View               F3"
 msgstr "Vis                F3"
 
-#: src/main.c:1248
+#: src/main.c:1240
 msgid "Vie&w file...         "
 msgstr "Vis fil...            "
 
-#: src/main.c:1249
+#: src/main.c:1241
 msgid "&Filtered view     M-!"
 msgstr "Filtrert visning  M-!"
 
-#: src/main.c:1250
+#: src/main.c:1242
 msgid "&Edit               F4"
 msgstr "Rediger            F4"
 
-#: src/main.c:1251
+#: src/main.c:1243
 msgid "&Copy               F5"
 msgstr "Kopier             F5"
 
-#: src/main.c:1252
+#: src/main.c:1244
 msgid "c&Hmod           C-x c"
 msgstr "chmod           C-x c"
 
-#: src/main.c:1254
+#: src/main.c:1246
 msgid "&Link            C-x l"
 msgstr "Lenke           C-x l"
 
-#: src/main.c:1255
+#: src/main.c:1247
 msgid "&SymLink         C-x s"
 msgstr "Symlenke        C-x s"
 
-#: src/main.c:1256
+#: src/main.c:1248
 msgid "edit s&Ymlink  C-x C-s"
 msgstr "rediger symlenke C-x C-s"
 
-#: src/main.c:1257
+#: src/main.c:1249
 msgid "ch&Own           C-x o"
 msgstr "chown           C-x o"
 
-#: src/main.c:1258
+#: src/main.c:1250
 msgid "&Advanced chown       "
 msgstr "Avansert chown       "
 
-#: src/main.c:1260
+#: src/main.c:1252
 msgid "&Rename/Move        F6"
 msgstr "Gi nytt navn/flytt F6"
 
-#: src/main.c:1261
+#: src/main.c:1253
 msgid "&Mkdir              F7"
 msgstr "Lag katalog        F7"
 
-#: src/main.c:1262
+#: src/main.c:1254
 msgid "&Delete             F8"
 msgstr "Slett              F8"
 
-#: src/main.c:1263
+#: src/main.c:1255
 msgid "&Quick cd          M-c"
 msgstr "rask cd            M-c"
 
-#: src/main.c:1265
+#: src/main.c:1257
 msgid "select &Group      M-+"
 msgstr "velg gruppe        M-+"
 
-#: src/main.c:1266
+#: src/main.c:1258
 msgid "u&Nselect group    M-\\"
 msgstr "velg bort gruppe   M-\\"
 
-#: src/main.c:1267
+#: src/main.c:1259
 msgid "reverse selec&Tion M-*"
 msgstr "reverser valg      M-*"
 
-#: src/main.c:1269
+#: src/main.c:1261
 msgid "e&Xit              F10"
 msgstr "avslutt            F10"
 
-#: src/main.c:1279
+#: src/main.c:1271
 msgid "&Directory tree"
 msgstr "Katalogtre"
 
-#: src/main.c:1281
+#: src/main.c:1273
 msgid "&Find file            M-?"
 msgstr "Finn fil             M-?"
 
-#: src/main.c:1282
+#: src/main.c:1274
 msgid "s&Wap panels          C-u"
 msgstr "bytt paneler          C-u"
 
-#: src/main.c:1283
+#: src/main.c:1275
 msgid "switch &Panels on/off C-o"
 msgstr "slå paneler på/av     C-o"
 
-#: src/main.c:1284
+#: src/main.c:1276
 msgid "&Compare directories  C-x d"
 msgstr "Sammenlign kataloger C-x d"
 
-#: src/main.c:1285
+#: src/main.c:1277
 msgid "e&Xternal panelize    C-x !"
 msgstr "eksternt panel  C-x !"
 
-#: src/main.c:1286
+#: src/main.c:1278
 msgid "show directory s&Izes"
 msgstr "vis katalogstørrelser"
 
-#: src/main.c:1288
+#: src/main.c:1280
 msgid "command &History"
 msgstr "kommandohistorikk"
 
-#: src/main.c:1289
+#: src/main.c:1281
 msgid "di&Rectory hotlist    C-\\"
 msgstr "kataloghurtigliste    C-\\"
 
-#: src/main.c:1291
+#: src/main.c:1283
 msgid "&Active VFS list      C-x a"
 msgstr "Aktivt VFS liste     C-x a"
 
-#: src/main.c:1294
+#: src/main.c:1286
 msgid "&Background jobs      C-x j"
 msgstr "Bakgrunnsjobber      C-x j"
 
-#: src/main.c:1298
+#: src/main.c:1290
 msgid "&Undelete files (ext2fs only)"
 msgstr "Gjenopprett filer (kun ext2fs)"
 
-#: src/main.c:1301
+#: src/main.c:1293
 msgid "&Listing format edit"
 msgstr "Redigering av listeformat"
 
-#: src/main.c:1303
+#: src/main.c:1295
 msgid "&Extension file edit"
 msgstr "Redigering av utvidelsesfil"
 
-#: src/main.c:1304
+#: src/main.c:1296
 msgid "&Menu file edit"
 msgstr "Menyfilredigering"
 
-#: src/main.c:1309
+#: src/main.c:1301
 msgid "&Configuration..."
 msgstr "Konfigurasjon..."
 
-#: src/main.c:1310
-msgid "&Layout..."
-msgstr "Utseende."
-
-#: src/main.c:1311
+#: src/main.c:1303
 msgid "c&Onfirmation..."
 msgstr "bekreftelse..."
 
-#: src/main.c:1312
+#: src/main.c:1304
 msgid "&Display bits..."
 msgstr "Tastaturdefinisjon..."
 
-#: src/main.c:1314
+#: src/main.c:1306
 msgid "learn &Keys..."
 msgstr "lær taster..."
 
-#: src/main.c:1317
+#: src/main.c:1309
 msgid "&Virtual FS..."
 msgstr "Virtuelt FS..."
 
-#: src/main.c:1320
+#: src/main.c:1312
 msgid "&Save setup"
 msgstr "Lagre oppsett"
 
-#: src/main.c:1336 src/main.c:1338
+#: src/main.c:1328 src/main.c:1330
 msgid " &Left "
 msgstr " Venstre "
 
-#: src/main.c:1338
+#: src/main.c:1330
 msgid " &Above "
 msgstr " Over "
 
-#: src/main.c:1341
+#: src/main.c:1333
 msgid " &File "
 msgstr " Fil "
 
-#: src/main.c:1342
+#: src/main.c:1334
 msgid " &Command "
 msgstr " Kommando "
 
-#: src/main.c:1343
+#: src/main.c:1335
 msgid " &Options "
 msgstr " Alternativer "
 
-#: src/main.c:1345 src/main.c:1347
+#: src/main.c:1337 src/main.c:1339
 msgid " &Right "
 msgstr " Høyre "
 
-#: src/main.c:1347
+#: src/main.c:1339
 msgid " &Below "
 msgstr " Under "
 
-#: src/main.c:1402
+#: src/main.c:1394
 msgid " Information "
 msgstr " Informasjon "
 
-#: src/main.c:1403
+#: src/main.c:1395
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -3703,52 +4131,52 @@
 " du utføre en manuell gjenlesing av katalogen. Se manualsiden for \n"
 " detaljene."
 
-#: src/main.c:1677 src/screen.c:2278 src/screen.c:2308
+#: src/main.c:1669 src/screen.c:2280 src/screen.c:2310
 msgid "Menu"
 msgstr "Meny"
 
-#: src/main.c:1882
+#: src/main.c:1874
 msgid "Thank you for using GNU Midnight Commander"
 msgstr "Takk for at du bruker GNU Midnight Commander"
 
-#: src/main.c:2235
+#: src/main.c:2227
 #, c-format
 msgid "with mouse support on xterm%s.\n"
 msgstr "med musstøtte i xterm%s.\n"
 
-#: src/main.c:2236
+#: src/main.c:2228
 msgid " and the Linux console"
 msgstr " og Linux konsollet"
 
-#: src/main.c:2331
+#: src/main.c:2323
 msgid "The TERM environment variable is unset!\n"
 msgstr "TERM miljøvariabelen er ikke satt!\n"
 
-#: src/main.c:2533
+#: src/main.c:2525
 #, c-format
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr "Bibliotekkatalog for Midnight Commander: %s\n"
 
-#: src/main.c:2538
+#: src/main.c:2530
 msgid ""
 "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 "Flagget -m er utgått. Vær snill å se på visningsbiter... i "
 "alternativermenyen\n"
 
-#: src/main.c:2661
+#: src/main.c:2653
 msgid "Geometry for the window"
 msgstr "Geometri for vinduet"
 
-#: src/main.c:2661
+#: src/main.c:2653
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/main.c:2662
+#: src/main.c:2654
 msgid "No windows opened at startup"
 msgstr "Ingen vinduer åpnet ved oppstart"
 
-#: src/main.c:2883
+#: src/main.c:2895
 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"
@@ -3756,11 +4184,11 @@
 "Kunne ikke åpne tty linjen. Du må kjøre mc uten -P flagget.\n"
 "På noen systemer vil du kanskje bruke # `which mc`\n"
 
-#: src/main.c:2970
+#: src/main.c:2969
 msgid " Notice "
 msgstr " Notis "
 
-#: src/main.c:2971
+#: src/main.c:2970
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -3907,10 +4335,6 @@
 msgid " I can't run external panelize while logged on a non local directory "
 msgstr " Kan ikke kjøre eksternt panel på en ikke-lokal katalog "
 
-#: src/panelize.c:354
-msgid "Find rejects after patching"
-msgstr "Finn avviste etter patching"
-
 #: src/panelize.c:355
 msgid "Find *.orig after patching"
 msgstr "Finn *.orig etter patching"
@@ -3935,76 +4359,72 @@
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: src/screen.c:424 src/screen.c:427
-msgid "Size"
-msgstr "Størrelse"
-
-#: src/screen.c:426
+#: src/screen.c:427
 msgid "MTime"
 msgstr "MTime"
 
-#: src/screen.c:428
+#: src/screen.c:429
 msgid "Permission"
 msgstr "Rettighet"
 
-#: src/screen.c:429
+#: src/screen.c:430
 msgid "Perm"
 msgstr "Rett"
 
-#: src/screen.c:430
+#: src/screen.c:431
 msgid "|"
 msgstr "|"
 
-#: src/screen.c:431
+#: src/screen.c:432
 msgid "Nl"
 msgstr "Nl"
 
-#: src/screen.c:432
+#: src/screen.c:433
 msgid "GID"
 msgstr "GID"
 
-#: src/screen.c:433
+#: src/screen.c:434
 msgid "UID"
 msgstr "UID"
 
-#: src/screen.c:436
+#: src/screen.c:437
 msgid "ATime"
 msgstr "ATime"
 
-#: src/screen.c:437
+#: src/screen.c:438
 msgid "CTime"
 msgstr "CTime"
 
-#: src/screen.c:441
+#: src/screen.c:442
 msgid "Inode"
 msgstr "Inode"
 
-#: src/screen.c:645
+#: src/screen.c:646
 #, c-format
 msgid "  %s bytes in %d file%s"
 msgstr "  %s bytes i %d file%s"
 
-#: src/screen.c:1284
+#: src/screen.c:1286
 msgid "Unknow tag on display format: "
 msgstr "Ukjent merke på skjermformatet: "
 
-#: src/screen.c:2042
+#: src/screen.c:2044
 msgid " Do you really want to execute? "
 msgstr " Vil du virkelig kjøre? "
 
-#: src/screen.c:2057
+#: src/screen.c:2059
 msgid " No action taken "
 msgstr " Ingen handling utført "
 
-#: src/screen.c:2282 src/screen.c:2312 src/tree.c:1486
+#: src/screen.c:2284 src/screen.c:2314 src/tree.c:1025
 msgid "RenMov"
 msgstr "RenMov"
 
-#: src/screen.c:2283 src/screen.c:2313 src/tree.c:1490
+#: src/screen.c:2285 src/screen.c:2315 src/tree.c:1029
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/screen.c:2299
+#: src/screen.c:2301
 #, c-format
 msgid ""
 " Can't chdir to %s \n"
@@ -4035,7 +4455,7 @@
 msgid "Warning: Couldn't change to %s.\n"
 msgstr "Advarsel: Kunne ikke skifte til %s.\n"
 
-#: src/tree.c:620
+#: src/tree.c:207
 #, c-format
 msgid ""
 "Can't open the %s file for writing:\n"
@@ -4044,26 +4464,17 @@
 "Kan ikke åpne filen %s for skriving:\n"
 "%s\n"
 
-#: src/tree.c:633
-#, c-format
-msgid ""
-"Can't write to the %s file:\n"
-"%s\n"
-msgstr ""
-"Kan ikke skrive til filen %s:\n"
-"%s\n"
-
-#: src/tree.c:1102
+#: src/tree.c:651
 #, c-format
 msgid "Copy \"%s\" directory to:"
 msgstr "Kopier \"%s\" katalogen til:"
 
-#: src/tree.c:1138
+#: src/tree.c:687
 #, c-format
 msgid "Move \"%s\" directory to:"
 msgstr "Flytt \"%s\" katalogen til:"
 
-#: src/tree.c:1145
+#: src/tree.c:694
 #, c-format
 msgid ""
 " Can't stat the destination \n"
@@ -4072,24 +4483,24 @@
 " Kan ikke kjøre stat på målet \n"
 " %s "
 
-#: src/tree.c:1151
+#: src/tree.c:700
 msgid " The destination isn't a directory "
 msgstr " Målet er ikke en katalog "
 
-#: src/tree.c:1204
+#: src/tree.c:755
 #, c-format
 msgid "  Delete %s?  "
 msgstr "  Slette %s?  "
 
-#: src/tree.c:1246
+#: src/tree.c:785
 msgid "Static"
 msgstr "Statisk"
 
-#: src/tree.c:1246
+#: src/tree.c:785
 msgid "Dynamc"
 msgstr "Dynamisk"
 
-#: src/tree.c:1336
+#: src/tree.c:875
 #, c-format
 msgid ""
 " Can't chdir to \"%s\" \n"
@@ -4098,15 +4509,15 @@
 "Kan ikke skifte katalog til \"%s\" \n"
 " %s "
 
-#: src/tree.c:1480
+#: src/tree.c:1019
 msgid "Rescan"
 msgstr "Oppdater"
 
-#: src/tree.c:1482
+#: src/tree.c:1021
 msgid "Forget"
 msgstr "Glem"
 
-#: src/tree.c:1495
+#: src/tree.c:1034
 msgid "Rmdir"
 msgstr "Rmdir"
 
@@ -4491,7 +4902,7 @@
 msgid "NumLock on keypad"
 msgstr "NumLock på numerisk tastatur"
 
-#: src/wtools.c:590 vfs/vfs.c:1706
+#: src/wtools.c:590 vfs/vfs.c:1770
 msgid "Password:"
 msgstr "Passord:"
 
@@ -4575,7 +4986,7 @@
 msgid " Too many open connections "
 msgstr " For mange åpne forbindelser "
 
-#: vfs/tar.c:88 vfs/tar.c:105
+#: vfs/tar.c:83 vfs/tar.c:100
 #, c-format
 msgid ""
 "Couldn't open tar archive\n"
@@ -4584,16 +4995,16 @@
 "Kunne ikke åpne tar-arkiv\n"
 "%s"
 
-#: vfs/tar.c:275
+#: vfs/tar.c:272
 msgid "Unexpected EOF on archive file"
 msgstr "Uventet EOF i arkivfilen"
 
-#: vfs/tar.c:330 vfs/tar.c:337
+#: vfs/tar.c:327 vfs/tar.c:334
 msgid "Inconsistent tar archive"
 msgstr "Ukonsistent tar-arkiv"
 
 #. Error on first record
-#: vfs/tar.c:396
+#: vfs/tar.c:393
 #, c-format
 msgid ""
 "Hmm,...\n"
diff -ruN old/mc-4.5.6/slang/slang.h new/mc-4.5.7/slang/slang.h
--- old/mc-4.5.6/slang/slang.h	Wed Jan  6 15:26:14 1999
+++ new/mc-4.5.7/slang/slang.h	Tue Jan 12 22:38:06 1999
@@ -62,6 +62,7 @@
 # endif
 # ifndef __os2__
 #   define __os2__
+#   define NEEDS_LOCAL_DIRENT_H
 # endif
 #endif
 
diff -ruN old/mc-4.5.6/src/ChangeLog new/mc-4.5.7/src/ChangeLog
--- old/mc-4.5.6/src/ChangeLog	Wed Jan  6 15:26:19 1999
+++ new/mc-4.5.7/src/ChangeLog	Tue Jan 12 22:38:07 1999
@@ -1,3 +1,50 @@
+Tue Jan 12 13:40:46 1999  Timur Bakeyev <mc@bat.ru>
+
+	* gtkedit(syntax.c): Fixed a typo in Pascal syntax.
+
+1999-01-12  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* treestore.c (tree_store_save): Add signature for version 2.0 of
+	the file format.
+
+1999-01-11  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* util.c: Provide workarounds for Linux kernel bug.
+
+Sun Jan 10 02:18:33 1999  Timur Bakeyev <mc@bat.ru>
+
+	* screen.c(string_file_size): Fixed (incorrect?) printing of device num-
+	bers. Major should never be greater 255.
+
+1999-01-08  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* dir.c (handle_dirent): Use the tree_store now.
+	(handle_path): ditto.
+	(do_load_dir): ditto.
+	(do_load_dir): ditto.
+	(do_reload_dir): ditto.
+	(do_reload_dir): ditto.
+
+	* treestore.c (tree_store_save): New file
+	(encode): New routine used to encode pathnames in a safe way that
+	are saved to the mc/.tree file.
+	(decode): New routine, used to decode the pathnames we encoded in
+	the step above.  Aint love grand?
+
+	* tree.c (load_tree): Kill dead code.
+
+	Moved all of the tree store information into a new file:
+	treestore.  To be reused by the Gnome code.
+	
+1999-01-08  Ilya Zakharevich <ilya@math.ohio-state.edu>
+
+	* popt.c: OS/2 and Windows NT portability fix.
+
+1999-01-07  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* file.c (panel_operate_flags): Only show this dialog box if it is
+	a copy or move operation
+
 1999-01-06  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
 	* widget.c (listbox_new): Assing l->height.
@@ -22,7 +69,7 @@
 	in x_create_listbox.
 
 	* main.c (main): Do not load the hotlist here anymore.   We
-	auto-load it on the 
+	auto-load it on the setup(?).
 
 1998-12-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
diff -ruN old/mc-4.5.6/src/Makefile.in new/mc-4.5.7/src/Makefile.in
--- old/mc-4.5.6/src/Makefile.in	Wed Jan  6 15:26:19 1999
+++ new/mc-4.5.7/src/Makefile.in	Tue Jan 12 22:38:07 1999
@@ -25,7 +25,7 @@
 	complete.c slint.c command.c cmd.c panelize.c learn.c		\
 	listmode.c utilunix.c background.c rxvt.c			\
 	text.c popt.c findme.c poptparse.c poptconfig.c popthelp.c	\
-	filegui.c filenot.c
+	filegui.c filenot.c treestore.c
 
 HDRS =	color.h file.h mouse.h user.h dialog.h find.h main.h		\
 	util.h dir.h global.h menu.h panel.h win.h mem.h		\
@@ -36,7 +36,7 @@
 	myslang.h command.h cmd.h tty.h fs.h panelize.h achown.h	\
 	learn.h listmode.h features.inc background.h			\
 	x.h textconf.h i18n.h findme.h popt.h filegui.h keys.h xtty.h	\
-	poptint.h
+	poptint.h treestore.h
 
 OBJS =	dir.o util.o screen.o dialog.o key.o keyxdef.o menu.o		\
 	file.o win.o color.o help.o find.o profile.o user.o view.o	\
@@ -46,7 +46,7 @@
 	mountlist.o @XCURSES@ @REGEX_O@ complete.o slint.o command.o	\
 	cmd.o main.o panelize.o learn.o listmode.o utilunix.o		\
 	background.o rxvt.o text.o popt.o findme.o poptparse.o		\
-	poptconfig.o popthelp.o filegui.o filenot.o
+	poptconfig.o popthelp.o filegui.o filenot.o treestore.o
 
 #
 # Distribution variables
diff -ruN old/mc-4.5.6/src/cmd.c new/mc-4.5.7/src/cmd.c
--- old/mc-4.5.6/src/cmd.c	Wed Jan  6 15:26:17 1999
+++ new/mc-4.5.7/src/cmd.c	Tue Jan 12 22:38:07 1999
@@ -39,7 +39,7 @@
 #include <fcntl.h>		/* open, O_RDWR */
 #include <errno.h>
 
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #   include <io.h>
 #endif
 
diff -ruN old/mc-4.5.6/src/color.c new/mc-4.5.7/src/color.c
--- old/mc-4.5.6/src/color.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/color.c	Tue Jan 12 22:38:07 1999
@@ -25,7 +25,7 @@
 #include "color.h"
 #include "x.h"
 
-/* "$Id: color.c,v 1.11 1998/12/29 16:52:56 norbert Exp $" */
+/* "$Id: color.c,v 1.12 1999/01/10 08:55:50 unammx Exp $" */
 
 /* To avoid excessive calls to ncurses' has_colors () */
 int   hascolors = 0;
@@ -294,7 +294,7 @@
 	}
 #endif
 
-#if defined HAVE_SLANG && !defined(OS2_NT)
+#if defined HAVE_SLANG && !defined(HAS_DIRECT_COLOR_ACCESS)
 	if (use_colors) { /* Hack to make COLOR_PAIR(DEFAULT_COLOR_INDEX) 
                              be the default fg/bg of the terminal */
 	    char *Norm_Vid = SLtt_tgetstr ("me");
diff -ruN old/mc-4.5.6/src/complete.c new/mc-4.5.7/src/complete.c
--- old/mc-4.5.6/src/complete.c	Wed Jan  6 15:26:17 1999
+++ new/mc-4.5.7/src/complete.c	Tue Jan 12 22:38:07 1999
@@ -31,7 +31,7 @@
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
 #if defined(HAVE_DIRENT_H) || defined(_POSIX_VERSION)
-# ifdef __os2__
+# ifdef NEEDS_LOCAL_DIRENT_H
 #   include "dirent.h"
 # else
 #   include <dirent.h>
@@ -55,7 +55,7 @@
 #endif /* not (HAVE_DIRENT_H or _POSIX_VERSION) */
 #include <sys/types.h>
 #include <sys/stat.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #   include <pwd.h>
 #endif
 
diff -ruN old/mc-4.5.6/src/dir.c new/mc-4.5.7/src/dir.c
--- old/mc-4.5.6/src/dir.c	Wed Jan  6 15:26:15 1999
+++ new/mc-4.5.7/src/dir.c	Tue Jan 12 22:38:07 1999
@@ -33,7 +33,7 @@
 #include "tree.h"
 #include "../vfs/vfs.h"
 
-/* "$Id: dir.c,v 1.9 1998/12/24 21:37:38 norbert Exp $" */
+/* "$Id: dir.c,v 1.11 1999/01/12 05:55:19 unammx Exp $" */
 
 /* If true show files starting with a dot */
 int show_dot_files = 1;
@@ -380,7 +380,7 @@
     }
 
     if (S_ISDIR (buf1->st_mode))
-	tree_check (dp->d_name);
+	tree_store_mark_checked (dp->d_name);
     
     /* A link to a file or a directory? */
     *link_to_dir = 0;
@@ -422,7 +422,7 @@
         return 0;
 
     if (S_ISDIR (buf1->st_mode))
-	tree_check (path);
+	tree_store_mark_checked (path);
     
     /* A link to a file or a directory? */
     *link_to_dir = 0;
@@ -455,7 +455,7 @@
     struct stat   buf;
     int dotdot_found = 0;
 
-    start_tree_check (NULL);
+    tree_store_start_check_cwd ();
     
     dirp = mc_opendir (".");
     if (!dirp){
@@ -491,7 +491,7 @@
 	return set_zero_dir (list);
     
     mc_closedir (dirp);
-    end_tree_check (NULL);
+    tree_store_end_check ();
     return next_free;
 }
 
@@ -551,7 +551,7 @@
     int		  tmp_len;  /* For optimisation */
     int 	  dotdot_found = 0; 
 
-    start_tree_check (NULL);
+    tree_store_start_check_cwd ();
     dirp = mc_opendir (".");
     if (!dirp) {
  	clean_dir (list, count);
@@ -613,7 +613,7 @@
 	    rotate_dash ();
     }
     mc_closedir (dirp);
-    end_tree_check (NULL);
+    tree_store_end_check ();
     if (next_free) {
 	if (!dotdot_found)
 	    add_dotdot_to_list (list, next_free++);
diff -ruN old/mc-4.5.6/src/ext.c new/mc-4.5.7/src/ext.c
--- old/mc-4.5.6/src/ext.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/ext.c	Tue Jan 12 22:38:07 1999
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
-#ifdef __os2__
+#ifdef NEEDS_IO_H
 # include <io.h>
 #endif
 
diff -ruN old/mc-4.5.6/src/file.c new/mc-4.5.7/src/file.c
--- old/mc-4.5.6/src/file.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/file.c	Tue Jan 12 22:38:07 1999
@@ -61,7 +61,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif 
 
@@ -112,7 +112,7 @@
 
 /* }}} */
 
-/* rcsid [] = "$Id: file.c,v 1.37 1998/12/30 02:51:11 unammx Exp $" */
+/* rcsid [] = "$Id: file.c,v 1.39 1999/01/10 08:55:54 unammx Exp $" */
 int verbose = 1;
 
 /* Recursive operation on subdirectories */
@@ -1925,15 +1925,17 @@
 	
 
 #ifdef HAVE_GNOME
-	/* FIXME: we need to determine if this dialog is actually needed. */
-	/* We need to pre-copy all the files and see if there are any 
-	 * over-writes.  Ugh, this sounds yucky.  )-: */
-	if (policy_over_write_necessary) {
-		if (file_progress_query_replace_policy (TRUE) == FILE_ABORT)
-			goto clean_up;
-		else
-			/* this will initialize some variables */
-			file_progress_query_replace_policy (FALSE);
+	if (operation != OP_DELETE){
+    	    /* FIXME: we need to determine if this dialog is actually needed. */
+    	    /* We need to pre-copy all the files and see if there are any 
+    	     * over-writes.  Ugh, this sounds yucky.  )-: */
+    	    if (policy_over_write_necessary) {
+    		    if (file_progress_query_replace_policy (TRUE) == FILE_ABORT)
+    			    goto clean_up;
+    		    else
+    			    /* this will initialize some variables */
+    			    file_progress_query_replace_policy (FALSE);
+    	    }
 	}
 #endif
 	/* We now have ETA in all cases */
diff -ruN old/mc-4.5.6/src/filegui.c new/mc-4.5.7/src/filegui.c
--- old/mc-4.5.6/src/filegui.c	Wed Jan  6 15:26:19 1999
+++ new/mc-4.5.7/src/filegui.c	Tue Jan 12 22:38:07 1999
@@ -63,7 +63,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif 
 
diff -ruN old/mc-4.5.6/src/find.c new/mc-4.5.7/src/find.c
--- old/mc-4.5.6/src/find.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/find.c	Tue Jan 12 22:38:07 1999
@@ -22,7 +22,7 @@
 #include "tty.h"
 #include <string.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
 #include "fs.h"
diff -ruN old/mc-4.5.6/src/fs.h new/mc-4.5.7/src/fs.h
--- old/mc-4.5.6/src/fs.h	Wed Jan  6 15:26:15 1999
+++ new/mc-4.5.7/src/fs.h	Tue Jan 12 22:38:07 1999
@@ -6,7 +6,7 @@
 #ifdef HAVE_UNISTD_H
 #   include <unistd.h>
 #endif
-#ifndef OS2_NT
+#ifndef HAS_NO_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 #include <sys/stat.h>
@@ -19,7 +19,7 @@
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
 #if defined(HAVE_DIRENT_H) || defined(_POSIX_VERSION)
-# ifdef __os2__
+# ifdef NEEDS_LOCAL_DIRENT_H
 #   include "dirent.h"
 # else
 #   include <dirent.h>
diff -ruN old/mc-4.5.6/src/help.c new/mc-4.5.7/src/help.c
--- old/mc-4.5.6/src/help.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/help.c	Tue Jan 12 22:38:07 1999
@@ -65,7 +65,7 @@
 #define HISTORY_SIZE 20
 #define HELP_WINDOW_WIDTH 62
 
-/* "$Id: help.c,v 1.7 1998/12/02 23:44:25 unammx Exp $" */
+/* "$Id: help.c,v 1.8 1999/01/10 08:55:58 unammx Exp $" */
 
 static char *data;		/* Pointer to the loaded data file */
 static int help_lines = 18;	/* Lines in help viewer */
@@ -96,7 +96,7 @@
 
 static int help_callback (struct Dlg_head *h, int id, int msg);
 
-#ifdef OS2_NT
+#ifdef HAS_ACS_AS_PCCHARS
 struct {
     int acscode;
     int pccode;
diff -ruN old/mc-4.5.6/src/hotlist.c new/mc-4.5.7/src/hotlist.c
--- old/mc-4.5.6/src/hotlist.c	Wed Jan  6 15:26:17 1999
+++ new/mc-4.5.7/src/hotlist.c	Tue Jan 12 22:38:07 1999
@@ -41,10 +41,11 @@
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
 #endif /* SCO_FLAVOR */
 #include <time.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #    include <grp.h>
 #    include <pwd.h>
-#else
+#endif
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
 #include "tty.h"
diff -ruN old/mc-4.5.6/src/layout.c new/mc-4.5.7/src/layout.c
--- old/mc-4.5.6/src/layout.c	Wed Jan  6 15:26:17 1999
+++ new/mc-4.5.7/src/layout.c	Tue Jan 12 22:38:07 1999
@@ -27,12 +27,14 @@
 #include <sys/param.h>		/* Required by tree.h */
 #include <sys/types.h>
 #include <sys/stat.h>
-#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(OS2_NT)
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
 #    include <termios.h>
+#endif
      /*
       * If TIOCGWINSZ supported, make it available here, because window-
       * resizing code depends on it...
       */
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_SYS_IOCTL_H)
 #	include <sys/ioctl.h>
 #endif
 #ifdef HAVE_UNISTD_H
@@ -74,7 +76,7 @@
 
 #include "x.h"
 
-/* "$Id: layout.c,v 1.15 1998/12/26 22:56:02 norbert Exp $" */
+/* "$Id: layout.c,v 1.16 1999/01/10 08:56:00 unammx Exp $" */
 
 /* Controls the display of the rotating dash on the verbose mode */
 int nice_rotating_dash = 1;
@@ -583,7 +585,7 @@
     extern int force_ugly_line_drawing;
     extern int SLtt_Has_Alt_Charset;
     SLtt_get_terminfo ();
-#ifndef OS2_NT
+#ifndef HAS_ACS_AS_PCCHARS
     if (force_ugly_line_drawing)
 	SLtt_Has_Alt_Charset = 0;
 #endif
diff -ruN old/mc-4.5.6/src/main.c new/mc-4.5.7/src/main.c
--- old/mc-4.5.6/src/main.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/main.c	Tue Jan 12 22:38:07 1999
@@ -72,7 +72,7 @@
 #endif
 
 #include <errno.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #    include <pwd.h>
 #endif
 #include <ctype.h>
@@ -128,8 +128,10 @@
 #include "chmod.h"
 #include "chown.h"
 
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
+#endif
+#ifdef NEEDS_DRIVE_H
 #    include <drive.h>
 #endif
 
@@ -139,7 +141,7 @@
 #include <glib.h>
 #include "popt.h"
 
-/* "$Id: main.c,v 1.68 1999/01/03 18:34:48 unammx Exp $" */
+/* "$Id: main.c,v 1.71 1999/01/12 09:08:42 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 */
@@ -2808,8 +2810,34 @@
 }
 #endif
 
+void
+mc_tree_store_load ()
+{
+	char *tree_file;
+	
+	tree_file = concat_dir_and_file (home_dir, MC_TREE);
+	tree_store_init ();
+	tree_store_load (tree_file);
+	free (tree_file);
+}
+
+void
+mc_tree_store_save ()
+{
+	char *tree_file;
+
+	printf ("Saving tree!\n");
+	tree_file = concat_dir_and_file (home_dir, MC_TREE);
+	tree_store_save (tree_file);
+	free (tree_file);
+}
+
 int main (int argc, char *argv [])
 {
+#ifdef HAVE_GNOME
+    /* Just to time things */
+    printf ("GNU Midnight Commander " VERSION "\n");
+#endif
     /* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */
     setlocale (LC_ALL, "");
     bindtextdomain ("mc", LOCALEDIR);
@@ -2854,6 +2882,8 @@
     }
 
     handle_args(argc, argv);
+
+    mc_tree_store_load ();
 
     session_management_setup (argv [0]);
     probably_finish_program ();
diff -ruN old/mc-4.5.6/src/mc.hlp new/mc-4.5.7/src/mc.hlp
--- old/mc-4.5.6/src/mc.hlp	Wed Jan  6 15:26:19 1999
+++ new/mc-4.5.7/src/mc.hlp	Tue Jan 12 22:38:07 1999
@@ -2767,14 +2767,13 @@
 (jjciarla@raiz.uncu.edu.ar), Ilya Rybkin
 (rybkin@rouge.phys.lsu.edu), Marcelo Roccasalva
 (mfroccas@raiz.uncu.edu.ar), Massimo Fontanelli
-(MC8737@mclink.it), Pavel Roskin
+(MC8737@mclink.it), Pavel Roskin 
 (pavel_roskin@geocities.com), Sergey Ya. Korshunoff
-(root@seyko.msk.su), Thomas Pundt
-(pundtt@math.uni-muenster.de), Timur Bakeyev
-(timur@goff.comtat.kazan.su), Tomasz Cholewo
-(tjchol01@mecca.spd.louisville.edu), Torben Fjerdingstad
-(torben.fjerdingstad@uni-c.dk), Vadim Sinolitis
-(vvs@nsrd.npi.msu.su) and Wim Osterholt
+(root@seyko.msk.su), Thomas Pundt 
+(pundtt@math.uni-muenster.de), Timur Bakeyev (timur@bat.ru), 
+Tomasz Cholewo (tjchol01@mecca.spd.louisville.edu), 
+Torben Fjerdingstad (torben.fjerdingstad@uni-c.dk), 
+Vadim Sinolitis (vvs@nsrd.npi.msu.su) and Wim Osterholt
 (wim@djo.wtm.tudelft.nl).
 
 [BUGS]
diff -ruN old/mc-4.5.6/src/mouse.c new/mc-4.5.7/src/mouse.c
--- old/mc-4.5.6/src/mouse.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/mouse.c	Tue Jan 12 22:38:07 1999
@@ -18,7 +18,7 @@
 /* Events received by clients of this library have their coordinates 0 */
 /* based */
 
-/* "$Id: mouse.c,v 1.2 1998/05/20 02:20:18 unammx Exp $" */
+/* "$Id: mouse.c,v 1.3 1999/01/10 08:56:03 unammx Exp $" */
 
 #include <config.h>
 #include <sys/types.h>
@@ -27,7 +27,7 @@
 #endif
 #include <signal.h>	/* For kill() and SIGQUIT */
 #include <fcntl.h>
-#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(OS2_NT)
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
 #    include <termios.h>
 #endif
 #include <malloc.h>
diff -ruN old/mc-4.5.6/src/myslang.h new/mc-4.5.7/src/myslang.h
--- old/mc-4.5.6/src/myslang.h	Wed Jan  6 15:26:15 1999
+++ new/mc-4.5.7/src/myslang.h	Tue Jan 12 22:38:07 1999
@@ -16,7 +16,7 @@
 #define ACS_URCORNER SLSMG_URCORN_CHAR
 #define ACS_LRCORNER SLSMG_LRCORN_CHAR
 
-#ifdef OS2_NT
+#ifdef HAS_ACS_AS_PCCHARS
 #    define ACS_LTEE 0xC3
 #    define acs()   ;
 #    define noacs() ;
@@ -121,7 +121,7 @@
 
 #define SLsmg_draw_double_box(r,c,dr,dc) SLsmg_draw_box ((r), (c), (dr), (dc))
 
-#ifdef OS2_NT
+#ifdef HAS_ACS_AS_PCCHARS
 #   define one_vline() addch(ACS_VLINE)
 #   define one_hline() addch(ACS_HLINE)
     /* This is fast, but unusefull if ! pc_system - doesn't use
diff -ruN old/mc-4.5.6/src/panelize.c new/mc-4.5.7/src/panelize.c
--- old/mc-4.5.6/src/panelize.c	Wed Jan  6 15:26:17 1999
+++ new/mc-4.5.7/src/panelize.c	Tue Jan 12 22:38:07 1999
@@ -33,7 +33,7 @@
 #ifdef HAVE_SYS_WAIT_H
 #   include <sys/wait.h>
 #endif
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #   include <grp.h>
 #   include <pwd.h>
 #endif
diff -ruN old/mc-4.5.6/src/popt.c new/mc-4.5.7/src/popt.c
--- old/mc-4.5.6/src/popt.c	Wed Jan  6 15:26:18 1999
+++ new/mc-4.5.7/src/popt.c	Tue Jan 12 22:38:07 1999
@@ -224,7 +224,9 @@
 #ifdef __hpux
     setresuid(getuid(), getuid(),-1);
 #else
+#ifndef OS2_NT
     setreuid(getuid(), getuid()); /*hlauer: not portable to hpux9.01 */
+#endif
 #endif
 
     execvp(argv[0], argv);
diff -ruN old/mc-4.5.6/src/regex.c new/mc-4.5.7/src/regex.c
--- old/mc-4.5.6/src/regex.c	Wed Jan  6 15:26:17 1999
+++ new/mc-4.5.7/src/regex.c	Tue Jan 12 22:38:07 1999
@@ -5168,7 +5168,7 @@
 
 /* POSIX.2 functions.  Don't define these for Emacs.  */
 
-#ifndef emacs
+#if 0
 
 /* regcomp takes a regular expression as a string and compiles it.
 
diff -ruN old/mc-4.5.6/src/screen.c new/mc-4.5.7/src/screen.c
--- old/mc-4.5.6/src/screen.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/screen.c	Tue Jan 12 22:38:07 1999
@@ -54,7 +54,7 @@
 #include "../vfs/extfs.h"
 #include <glib.h>
 
-#if defined(OS2_NT)
+#ifdef NEEDS_DRIVE_H
 # include "drive.h"
 #endif
 
@@ -296,7 +296,7 @@
 
 #ifdef HAVE_ST_RDEV
     if (S_ISBLK (fe->buf.st_mode) || S_ISCHR (fe->buf.st_mode))
-        sprintf (buffer, "%3d,%3d", (int) (fe->buf.st_rdev >> 8), 
+        sprintf (buffer, "%3d,%3d", (int) ((fe->buf.st_rdev >> 8) & 0xff), 
             (int) (fe->buf.st_rdev & 0xff));
     else
 #endif 
diff -ruN old/mc-4.5.6/src/tree.c new/mc-4.5.7/src/tree.c
--- old/mc-4.5.6/src/tree.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/tree.c	Tue Jan 12 22:38:07 1999
@@ -3,7 +3,7 @@
 
    Written: 1994, 1996 Janne Kukonlehto
             1997 Norbert Warmuth
-            1996 Miguel de Icaza
+            1996, 1999 Miguel de Icaza
 	    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,18 +27,9 @@
 
    */
 #include <config.h>
-#include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#include <fcntl.h>
-#include <sys/param.h>
-#include <sys/stat.h>
+#include <string.h>
 #include <errno.h>
-#include <dirent.h>
 #include <stdio.h>
-#include <stdlib.h>	/* For free() and atoi() */
-#include <string.h>
 #include "tty.h"
 #include "mad.h"
 #include "global.h"
@@ -57,9 +48,6 @@
 #include "tree.h"
 #include "cmd.h"
 #include "../vfs/vfs.h"
-#ifdef OS2_NT
-#   include <io.h>
-#endif
 
 extern int command_prompt;
 
@@ -72,17 +60,7 @@
 static int tree_callback (Dlg_head *h, WTree *tree, int msg, int par);
 #define tcallback (callback_fn) tree_callback
 
-/* "$Id: tree.c,v 1.13 1998/12/30 19:19:24 unammx Exp $" */
-
-/* Returns number of common characters */
-static inline int str_common (char *s1, char *s2)
-{
-    int result = 0;
-
-    while (*s1++ == *s2++)
-	result++;
-    return result;
-}
+/* "$Id: tree.c,v 1.16 1999/01/12 05:55:21 unammx Exp $" */
 
 static tree_entry *back_ptr (tree_entry *ptr, int *count)
 {
@@ -108,185 +86,14 @@
     return ptr;
 }
 
-/* The directory names are arranged in a single linked list in the same
-   order as they are displayed. When the tree is displayed the expected
-   order is like this:
-        /
-        /bin
-        /etc
-        /etc/X11
-        /etc/rc.d
-        /etc.old/X11
-        /etc.old/rc.d
-        /usr
-       
-   i.e. the required collating sequence when comparing two directory names is 
-        '\0' < PATH_SEP < all-other-characters-in-encoding-order
-   
-    Since strcmp doesn't fulfil this requirement we use pathcmp when
-    inserting directory names into the list. The meaning of the return value 
-    of pathcmp and strcmp are the same (an integer less than, equal to, or 
-    greater than zero if p1 is found to be less than, to match, or be greater 
-    than p2.
- */
-static int
-pathcmp (const char *p1, const char *p2)
-{
-    for ( ;*p1 == *p2; p1++, p2++)
-        if (*p1 == '\0' )
-    	    return 0;
-	    
-    if (*p1 == '\0')
-        return -1;
-    if (*p2 == '\0')
-        return 1;
-    if (*p1 == PATH_SEP)
-        return -1;
-    if (*p2 == PATH_SEP)
-        return 1;
-    return (*p1 - *p2);
-}
-
-/* Searches for specified directory */
-static tree_entry *whereis (WTree *tree, char *name)
-{
-    tree_entry *current = tree->tree_first;
-    int flag = -1;
-
-#if 0
-    if (tree->tree_last){
-	flag = strcmp (tree->tree_last->name, name);
-	if (flag <= 0){
-	    current = tree->tree_last;
-	} else if (tree->selected_ptr){
-	    flag = strcmp (tree->selected_ptr->name, name);
-	    if (flag <= 0){
-		current = tree->selected_ptr;
-	    }
-	}
-    }
-#endif
-    while (current && (flag = pathcmp (current->name, name)) < 0)
-	current = current->next;
-
-    if (flag == 0)
-	return current;
-    else
-	return NULL;
-}
-
 /* Add a directory to the list of directories */
 tree_entry *tree_add_entry (WTree *tree, char *name)
 {
-    int flag = -1;
-    tree_entry *current = tree->tree_first;
-    tree_entry *old = NULL;
-    tree_entry *new;
-    int i, len;
-    int submask = 0;
-
+    tree_entry entry;
     if (!tree)
 	return 0;
     
-    if (tree->tree_last && tree->tree_last->next)
-	abort ();
-#if 0
-    if (tree->tree_last){
-	flag = strcmp (tree->tree_last->name, name);
-	if (flag <= 0){
-	    current = tree->tree_last;
-	    old = current->prev;
-	} else if (tree->selected_ptr){
-	    flag = strcmp (tree->selected_ptr->name, name);
-	    if (flag <= 0){
-		current = tree->selected_ptr;
-		old = current->prev;
-	    }
-	}
-    }
-#endif
-    /* Search for the correct place */
-    while (current && (flag = pathcmp (current->name, name)) < 0){
-	old = current;
-	current = current->next;
-    }
-    
-    if (flag == 0)
-	return current; /* Already in the list */
-
-    /* Not in the list -> add it */
-    new = xmalloc (sizeof (tree_entry), "tree, tree_entry");
-    if (!current){
-	/* Append to the end of the list */
-	if (!tree->tree_first){
-	    /* Empty list */
-	    tree->tree_first = new;
-	    new->prev = NULL;
-	} else {
-	    old->next = new;
-	    new->prev = old;
-	}
-	new->next = NULL;
-	tree->tree_last = new;
-    } else {
-	/* Insert in to the middle of the list */
-	new->prev = old;
-	if (old){
-	    /* Yes, in the middle */
-	    new->next = old->next;
-	    old->next = new;
-	} else {
-	    /* Nope, in the beginning of the list */
-	    new->next = tree->tree_first;
-	    tree->tree_first = new;
-	}
-	new->next->prev = new;
-    }
-    /* tree_count++; */
-
-    /* Calculate attributes */
-    new->name = strdup (name);
-    len = strlen (new->name);
-    new->sublevel = 0;
-    for (i = 0; i < len; i++)
-	if (new->name [i] == PATH_SEP){
-	    new->sublevel++;
-	    new->subname = new->name + i + 1;
-	}
-    if (new->next)
-	submask = new->next->submask;
-    else
-	submask = 0;
-    submask |= 1 << new->sublevel;
-    submask &= (2 << new->sublevel) - 1;
-    new->submask = submask;
-    new->mark = 0;
-
-    /* Correct the submasks of the previous entries */
-    current = new->prev;
-    while (current && current->sublevel > new->sublevel){
-	current->submask |= 1 << new->sublevel;
-	current = current->prev;
-    }
-
-    /* The entry has now been added */
-
-    if (new->sublevel > 1){
-	/* Let's check if the parent directory is in the tree */
-	char *parent = strdup (new->name);
-	int i;
-
-	for (i = strlen (parent) - 1; i > 1; i--){
-	    if (parent [i] == PATH_SEP){
-		parent [i] = 0;
-		tree_add_entry (tree, parent);
-		break;
-	    }
-	}
-	free (parent);
-    }
-
-    return new;
+    return tree_store_add_entry (name);
 }
 
 #if 0
@@ -300,16 +107,16 @@
     /* We assume the directory is not yet in the list */
 
     new = xmalloc (sizeof (tree_entry), "tree, tree_entry");
-    if (!tree->tree_first){
+    if (!tree->store->tree_first){
         /* Empty list */
-        tree->tree_first = new;
+        tree->store->tree_first = new;
         new->prev = NULL;
     } else {
         tree->tree_last->next = new;
         new->prev = tree->tree_last;
     }
     new->next = NULL;
-    tree->tree_last = new;
+    tree->store->tree_last = new;
 
     /* Calculate attributes */
     new->name = strdup (name);
@@ -337,306 +144,67 @@
 }
 #endif
 
-static void remove_entry (WTree *tree, tree_entry *entry)
+void
+remove_callback (tree_entry *entry, void *data)
 {
-    tree_entry *current = entry->prev;
-    long submask = 0;
-
-    if (tree->selected_ptr == entry){
-	if (tree->selected_ptr->next)
-	    tree->selected_ptr = tree->selected_ptr->next;
-	else
-	    tree->selected_ptr = tree->selected_ptr->prev;
-    }
-
-    /* Correct the submasks of the previous entries */
-    if (entry->next)
-	submask = entry->next->submask;
-    while (current && current->sublevel > entry->sublevel){
-	submask |= 1 << current->sublevel;
-	submask &= (2 << current->sublevel) - 1;
-	current->submask = submask;
-	current = current->prev;
-    }
-
-    /* Unlink the entry from the list */
-    if (entry->prev)
-	entry->prev->next = entry->next;
-    else
-	tree->tree_first = entry->next;
-    if (entry->next)
-	entry->next->prev = entry->prev;
-    else
-	tree->tree_last = entry->prev;
-    /* tree_count--; */
+	WTree *tree = data;
 
-    /* Free the memory used by the entry */
-    free (entry->name);
-    free (entry);
+	if (tree->selected_ptr == entry){
+		if (tree->selected_ptr->next)
+			tree->selected_ptr = tree->selected_ptr->next;
+		else
+			tree->selected_ptr = tree->selected_ptr->prev;
+	}
 }
 
 void tree_remove_entry (WTree *tree, char *name)
 {
-    tree_entry *current, *base, *old;
-    int len, base_sublevel;
-
-    /* Miguel Ugly hack */
-    if (name [0] == PATH_SEP && name [1] == 0)
-	return;
-    /* Miguel Ugly hack end */
-    
-    base = whereis (tree, name);
-    if (!base)
-	return;	/* Doesn't exist */
-    if (tree->check_name [0] == PATH_SEP && tree->check_name [1] == 0)
-	base_sublevel = base->sublevel;
-    else
-	base_sublevel = base->sublevel + 1;
-    len = strlen (base->name);
-    current = base->next;
-    while (current
-	   && strncmp (current->name, base->name, len) == 0
-	   && (current->name[len] == '\0' || current->name[len] == PATH_SEP)){
-	old = current;
-	current = current->next;
-	remove_entry (tree, old);
-    }
-    remove_entry (tree, base);
+    tree_store_remove_entry (name);
 }
 
 void tree_destroy (WTree *tree)
 {
-    tree_entry *current, *old;
 
     save_tree (tree);
-    current = tree->tree_first;
-    while (current){
-	old = current;
-	current = current->next;
-	free (old->name);
-	free (old);
-    }
+    tree_store_destroy ();
+    
     if (tree->tree_shown){
 	free (tree->tree_shown);
 	tree->tree_shown = 0;
     }
-    tree->selected_ptr = tree->tree_first = tree->tree_last = NULL;
-}
-
-/* Mark the subdirectories of the current directory for delete */
-void start_tree_check (WTree *tree)
-{
-    tree_entry *current;
-    int len;
-
-    if (!tree)
-	tree = (WTree *) find_widget_type (current_dlg, tcallback);
-    if (!tree)
-	return;
-    
-    /* Search for the start of subdirectories */
-    mc_get_current_wd (tree->check_name, MC_MAXPATHLEN);
-    tree->check_start = NULL;
-    current = whereis (tree, tree->check_name);
-    if (!current){
-	/* Cwd doesn't exist -> add it */
-	current = tree_add_entry (tree, tree->check_name);
-	return;
-    }
-
-    /* Mark old subdirectories for delete */
-    tree->check_start = current->next;
-    len = strlen (tree->check_name);
-
-    current = tree->check_start;
-    while (current
-	   && strncmp (current->name, tree->check_name, len) == 0
-	   && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
-	current->mark = 1;
-	current = current->next;
-    }
-}
-
-/* This subdirectory exists -> clear deletion mark */
-void do_tree_check (WTree *tree, const char *subname)
-{
-    char *name;
-    tree_entry *current, *base;
-    int flag = 1, len;
-
-    /* Calculate the full name of the subdirectory */
-    if (subname [0] == '.' &&
-	(subname [1] == 0 || (subname [1] == '.' && subname [2] == 0)))
-	return;
-    if (tree->check_name [0] == PATH_SEP && tree->check_name [1] == 0)
-	name = copy_strings (PATH_SEP_STR, subname, 0);
-    else
-	name = concat_dir_and_file (tree->check_name, subname);
-
-    /* Search for the subdirectory */
-    current = tree->check_start;
-    while (current && (flag = pathcmp (current->name, name)) < 0)
-	current = current->next;
-    
-    if (flag != 0)
-	/* Doesn't exist -> add it */
-	current = tree_add_entry (tree, name);
-    free (name);
-
-    /* Clear the deletion mark from the subdirectory and its children */
-    base = current;
-    if (base){
-	len = strlen (base->name);
-	base->mark = 0;
-	current = base->next;
-	while (current
-	       && strncmp (current->name, base->name, len) == 0
-	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
-	    current->mark = 0;
-	    current = current->next;
-	}
-    }
-}
-
-/* Tree check searchs a tree widget in the current dialog and
- * if it finds it, it calls do_tree_check on the subname
- */
-void tree_check (const char *subname)
-{
-    WTree *tree;
-
-    tree = (WTree *) find_widget_type (current_dlg, tcallback);
-    if (!tree)
-	return;
-    do_tree_check (tree, subname);
-}
-
-
-/* Delete subdirectories which still have the deletion mark */
-void end_tree_check (WTree *tree)
-{
-    tree_entry *current, *old;
-    int len;
-
-    if (!tree)
-	tree = (WTree *) find_widget_type (current_dlg, tcallback);
-    if (!tree)
-	return;
-    
-    /* Check delete marks and delete if found */
-    len = strlen (tree->check_name);
-
-    current = tree->check_start;
-    while (current
-	   && strncmp (current->name, tree->check_name, len) == 0
-	   && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
-	old = current;
-	current = current->next;
-	if (old->mark)
-	    remove_entry (tree, old);
-    }
+    tree->selected_ptr = NULL;
 }
 
 /* Loads the .mc.tree file */
 void load_tree (WTree *tree)
 {
     char *filename;
-    FILE *file;
-    char name [MC_MAXPATHLEN], oldname[MC_MAXPATHLEN];
-    char *different;
-    int len, common;
-
+    int v;
+    
     filename = concat_dir_and_file (home_dir, MC_TREE);
-    file = fopen (filename, "r");
+    v = tree_store_load (filename);
     free (filename);
-    if (!file){
-	/* No new tree file -> let's try the old file */
-	filename = concat_dir_and_file (home_dir, MC_TREE);
-	file = fopen (filename, "r");
-	free (filename);
-    }
+
+    tree->selected_ptr = tree->store->tree_first;
     
-    if (file){
-	/* File open -> read contents */
-	oldname [0] = 0;
-	while (fgets (name, MC_MAXPATHLEN, file)){
-	    len = strlen (name);
-	    if (name [len - 1] == '\n'){
-		name [--len] = 0;
-	    }
-#ifdef OS2_NT
-            /* .ado: Drives for NT and OS/2 */
-            if ((len > 2)         && 
-                 isalpha(name[0]) && 
-                 (name[1] == ':') && 
-                 (name[2] == '\\')) {
-        		tree_add_entry (tree, name);
-        		strcpy (oldname, name);
-            } else
-#endif
-            /* UNIX Version */
-	    if (name [0] != PATH_SEP){
-		/* Clear-text decompression */
-		char *s = strtok (name, " ");
-
-		if (s){
-		    common = atoi (s);
-		    different = strtok (NULL, "");
-		    if (different){
-			strcpy (oldname + common, different);
-			tree_add_entry (tree, oldname);
-		    }
-		}
-	    } else {
-		tree_add_entry (tree, name);
-		strcpy (oldname, name);
-	    }
-	}
-	fclose (file);
-    }
-    if (!tree->tree_first){
-	/* Nothing loaded -> let's add some standard directories */
-	tree_add_entry (tree, PATH_SEP_STR);
-	tree->selected_ptr = tree->tree_first;
-	tree_rescan_cmd (tree);
-	tree_add_entry (tree, home_dir);
-	tree_chdir (tree, home_dir);
-	tree_rescan_cmd (tree);
-    }
+    tree_chdir (tree, home_dir);
 }
 
 /* Save the .mc.tree file */
 void save_tree (WTree *tree)
 {
-    tree_entry *current;
+    int error;
     char *filename;
-    FILE *file;
-    int i, common;
-
+    
     filename = concat_dir_and_file (home_dir, MC_TREE);
-    file = fopen (filename, "w");
+    error = tree_store_save (filename);
     free (filename);
-    if (!file){
+
+    if (error){
 	fprintf (stderr, _("Can't open the %s file for writing:\n%s\n"), MC_TREE,
-		 unix_error_string (errno));
+		 unix_error_string (error));
 	return;
     }
-
-    current = tree->tree_first;
-    while (current){
-	if (current->prev && (common = str_common (current->prev->name, current->name)) > 2)
-	    /* Clear-text compression */
-	    i = fprintf (file, "%d %s\n", common, current->name + common);
-	else
-	    i = fprintf (file, "%s\n", current->name);
-	if (i == EOF){
-	    fprintf (stderr, _("Can't write to the %s file:\n%s\n"), MC_TREE,
-		 unix_error_string (errno));
-	    break;
-	}
-	current = current->next;
-    }
-    fclose (file);
 }
 
 static void tree_show_mini_info (WTree *tree, int tree_lines, int tree_cols)
@@ -697,12 +265,12 @@
 					      "tree, show_tree");
     for (i = 0; i < tree_lines; i++)
 	tree->tree_shown [i] = NULL;
-    if (tree->tree_first)
-	topsublevel = tree->tree_first->sublevel;
+    if (tree->store->tree_first)
+	topsublevel = tree->store->tree_first->sublevel;
     else
 	topsublevel = 0;
     if (!tree->selected_ptr){
-	tree->selected_ptr = tree->tree_first;
+	tree->selected_ptr = tree->store->tree_first;
 	tree->topdiff = 0;
     }
     current = tree->selected_ptr;
@@ -915,7 +483,7 @@
 	tree->topdiff--;
     }
     if (!current)
-	current = tree->tree_first;
+	current = tree->store->tree_first;
     tree->selected_ptr = current;
     check_focus (tree);
     return tree->selected_ptr != old;
@@ -923,13 +491,13 @@
 
 void tree_move_to_top (WTree *tree)
 {
-    tree->selected_ptr = tree->tree_first;
+    tree->selected_ptr = tree->store->tree_first;
     tree->topdiff = 0;
 }
 
 void tree_move_to_bottom (WTree *tree)
 {
-    tree->selected_ptr = tree->tree_last;
+    tree->selected_ptr = tree->store->tree_last;
     tree->topdiff = tlines (tree) - 3 - 1;
 }
 
@@ -937,7 +505,7 @@
 {
     tree_entry *current;
 
-    current = whereis (tree, dir);
+    current = tree_store_whereis (dir);
     if (current){
 	tree->selected_ptr = current;
 	check_focus (tree);
@@ -1019,7 +587,7 @@
 	}
 	current = current->next;
 	if (!current){
-	    current = tree->tree_first;
+	    current = tree->store->tree_first;
 	    wrapped = 1;
 	}
 	tree->topdiff++;
@@ -1052,26 +620,13 @@
 
 void tree_rescan_cmd (WTree *tree)
 {
-    DIR *dirp;
-    struct dirent *dp;
-    struct stat buf;
     char old_dir [MC_MAXPATHLEN];
 
     if (!tree->selected_ptr || !mc_get_current_wd (old_dir, MC_MAXPATHLEN) ||
 	mc_chdir (tree->selected_ptr->name))
 	return;
-    
-    start_tree_check (tree);
-    dirp = opendir (".");
-    if (dirp){
-	for (dp = readdir (dirp); dp; dp = readdir (dirp)){
-	    lstat (dp->d_name, &buf);
-	    if (S_ISDIR (buf.st_mode))
-		do_tree_check (tree, dp->d_name);
-	}
-	closedir (dirp);
-    }
-    end_tree_check (tree);
+
+    tree_store_rescan (tree->selected_ptr->name);
     mc_chdir (old_dir);
 }
 
@@ -1082,15 +637,6 @@
     return 1;
 }
 
-#if 0
-static int toggle_nav_mode (void)
-{
-    tree_navigation_flag = 1 - tree_navigation_flag;
-
-    return 1;
-}
-#endif
-
 void tree_copy (WTree *tree, char *default_dest)
 {
     char   *dest;
@@ -1220,18 +766,6 @@
 	return;
 }
 
-#if 0
-static int
-tree_quit_cmd (void)
-{
-    /*
-       FIXME
-    return done = 1;
-    */
-    return 1;
-}
-#endif
-
 static void set_navig_label (Dlg_head *h);
 
 static void
@@ -1350,7 +884,7 @@
 
     if (tree->searching){
     
-	if (tree->selected_ptr == tree->tree_last)
+	if (tree->selected_ptr == tree->store->tree_last)
 	    tree_move_to_top(tree);
 	else {
 	/* set navigation mode temporarily to 'Static' because in 
@@ -1523,9 +1057,11 @@
 		 (destroy_fn) tree_destroy, (mouse_h) event_callback, NULL);
     tree->is_panel = is_panel;
     tree->selected_ptr = 0;
+
+    tree->store = tree_store_init ();
+    tree_store_add_entry_remove_hook (remove_callback, tree);
     tree->tree_shown = 0;
     tree->search_buffer [0] = 0;
-    tree->tree_first = tree->tree_last = 0;
     tree->topdiff = tree->widget.lines / 2;
     tree->searching = 0;
     tree->done = 0;
diff -ruN old/mc-4.5.6/src/tree.h new/mc-4.5.7/src/tree.h
--- old/mc-4.5.6/src/tree.h	Wed Jan  6 15:26:15 1999
+++ new/mc-4.5.7/src/tree.h	Tue Jan 12 22:38:07 1999
@@ -1,26 +1,15 @@
 #ifndef __TREE_H
 #define __TREE_H
 
-typedef struct tree_entry {
-    char *name;			/* The full path of directory */
-    int sublevel;		/* Number of parent directories (slashes) */
-    long submask;		/* Bitmask of existing sublevels after this entry */
-    char *subname;		/* The last part of name (the actual name) */
-    int mark;			/* Flag: Is this entry marked (e. g. for delete)? */
-    struct tree_entry *next;	/* Next item in the list */
-    struct tree_entry *prev;	/* Previous item in the list */
-} tree_entry;
+#include "treestore.h"
 
 #include "dlg.h"
 typedef struct {
     Widget     widget;
-    tree_entry *tree_first;     	/* First entry in the list */
-    tree_entry *tree_last;              /* Last entry in the list */
+    TreeStore  *store;
     tree_entry *selected_ptr;	        /* The selected directory */
     char       search_buffer [256];     /* Current search string */
     int        done;		        /* Flag: exit tree */
-    char       check_name [MC_MAXPATHLEN];/* Directory which is been checked */
-    tree_entry *check_start;		/* Start of checked subdirectories */
     tree_entry **tree_shown;	        /* Entries currently on screen */
     int        is_panel;		/* panel or plain widget flag */
     int        active;		        /* if it's currently selected */
@@ -47,10 +36,6 @@
 tree_entry *tree_add_entry (WTree *tree, char *name);
 void tree_remove_entry (WTree *tree, char *name);
 void tree_destroy (WTree *tree);
-void tree_check (const char *subname);
-void start_tree_check (WTree *tree);
-void do_tree_check (WTree *tree, const char *subname);
-void end_tree_check (WTree *tree);
 
 void tree_move_backward (WTree *tree, int i);
 void tree_move_forward (WTree *tree, int i);
@@ -68,9 +53,9 @@
 extern WTree *the_tree;
 
 #ifdef OS2_NT
-#   define MC_TREE "mc.tre"
+#   define MC_TREE "mcn.tre"
 #else
-#   define MC_TREE ".mc/tree"
+#   define MC_TREE ".mc/Tree"
 #endif
 
 #endif
diff -ruN old/mc-4.5.6/src/treestore.c new/mc-4.5.7/src/treestore.c
--- old/mc-4.5.6/src/treestore.c	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.7/src/treestore.c	Tue Jan 12 22:38:07 1999
@@ -0,0 +1,776 @@
+/*
+ * Tree Store
+ *
+ * Contains a storage of the file system tree representation
+ *
+   Copyright (C) 1994, 1995, 1996, 1997 The Free Software Foundation
+
+   Written: 1994, 1996 Janne Kukonlehto
+            1997 Norbert Warmuth
+            1996, 1999 Miguel de Icaza
+	    
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+   This module has been converted to be a widget.
+
+   The program load and saves the tree each time the tree widget is
+   created and destroyed.  This is required for the future vfs layer,
+   it will be possible to have tree views over virtual file systems.
+
+   */
+#include <config.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <fcntl.h>
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <dirent.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include "fs.h"
+#include "../vfs/vfs.h"
+#include "util.h"
+#include "treestore.h"
+#ifdef OS2_NT
+#   include <io.h>
+#endif
+
+#define TREE_SIGNATURE "Midnight Commander TreeStore v 2.0"
+
+static TreeStore ts;
+
+void (*tree_store_dirty_notify)(int state) = NULL;
+
+void
+tree_store_dirty (int state)
+{
+	ts.dirty = state;
+
+	if (tree_store_dirty_notify)
+		(*tree_store_dirty_notify)(state);
+}
+
+/* Returns number of common characters */
+static int str_common (char *s1, char *s2)
+{
+    int result = 0;
+
+    while (*s1++ == *s2++)
+	result++;
+    return result;
+}
+
+/* The directory names are arranged in a single linked list in the same
+   order as they are displayed. When the tree is displayed the expected
+   order is like this:
+        /
+        /bin
+        /etc
+        /etc/X11
+        /etc/rc.d
+        /etc.old/X11
+        /etc.old/rc.d
+        /usr
+       
+   i.e. the required collating sequence when comparing two directory names is 
+        '\0' < PATH_SEP < all-other-characters-in-encoding-order
+   
+    Since strcmp doesn't fulfil this requirement we use pathcmp when
+    inserting directory names into the list. The meaning of the return value 
+    of pathcmp and strcmp are the same (an integer less than, equal to, or 
+    greater than zero if p1 is found to be less than, to match, or be greater 
+    than p2.
+ */
+static int
+pathcmp (const char *p1, const char *p2)
+{
+    for ( ;*p1 == *p2; p1++, p2++)
+        if (*p1 == '\0' )
+    	    return 0;
+	    
+    if (*p1 == '\0')
+        return -1;
+    if (*p2 == '\0')
+        return 1;
+    if (*p1 == PATH_SEP)
+        return -1;
+    if (*p2 == PATH_SEP)
+        return 1;
+    return (*p1 - *p2);
+}
+
+/* Searches for specified directory */
+tree_entry *
+tree_store_whereis (char *name)
+{
+	tree_entry *current = ts.tree_first;
+	int flag = -1;
+	
+	while (current && (flag = pathcmp (current->name, name)) < 0)
+		current = current->next;
+	
+	if (flag == 0)
+		return current;
+	else
+		return NULL;
+}
+
+
+TreeStore *
+tree_store_init (void)
+{
+	ts.tree_first = 0;
+	ts.tree_last = 0;
+	ts.refcount++;
+
+	return &ts;
+}
+
+void
+tree_store_destroy (void)
+{
+	tree_entry *current, *old;
+
+	ts.refcount--;
+	
+	current = ts.tree_first;
+	while (current){
+		old = current;
+		current = current->next;
+		free (old->name);
+		free (old);
+	}
+
+	ts.tree_first = NULL;
+	ts.tree_last = NULL;
+	ts.loaded = FALSE;
+}
+
+static char *
+decode (char *buffer)
+{
+	char *res = strdup (buffer);
+	char *p, *q;
+	
+	for (p = q = res; *p; p++, q++){
+		if (*p == '\n'){
+			*q = 0;
+			return res;
+		}
+
+		if (*p != '\\'){
+			*q = *p;
+			continue;
+		}
+		
+		p++;
+		
+		switch (*p){
+		case 'n':
+			*q = '\n';
+			break;
+		case '\\':
+			*q = '\\';
+			break;
+		}
+	}
+	*q = *p;
+
+	return res;
+}
+
+int
+tree_store_load (char *name)
+{
+	FILE *file;
+	char buffer [MC_MAXPATHLEN + 20], oldname[MC_MAXPATHLEN];
+	char *different;
+	int len, common;
+	int do_load;
+	
+	g_return_if_fail (name != NULL);
+
+	if (ts.loaded)
+		return TRUE;
+	
+	file = fopen (name, "r");
+
+	if (file){
+		fgets (buffer, sizeof (buffer), file);
+	
+		if (strncmp (buffer, TREE_SIGNATURE, strlen (TREE_SIGNATURE)) != 0){
+			fclose (file);
+			do_load = FALSE;
+		} else
+			do_load = TRUE;
+	} else
+		do_load = FALSE;
+
+	if (do_load){
+		ts.loaded = TRUE;
+
+		/* File open -> read contents */
+		oldname [0] = 0;
+		while (fgets (buffer, MC_MAXPATHLEN, file)){
+			tree_entry *e;
+			int scanned;
+			char *name;
+
+			/* Skip invalid records */
+			if ((buffer [0] != '0' && buffer [0] != '1'))
+				continue;
+			
+			if (buffer [1] != ':')
+				continue;
+
+			scanned = buffer [0] == '1';
+
+			name = decode (buffer+2);
+
+			len = strlen (name);
+#ifdef OS2_NT
+			/* .ado: Drives for NT and OS/2 */
+			if ((len > 2)         && 
+			    isalpha(name[0]) && 
+			    (name[1] == ':') && 
+			    (name[2] == '\\')) {
+				tree_store_add_entry (name);
+				strcpy (oldname, name);
+			} else
+#endif
+				/* UNIX Version */
+				if (name [0] != PATH_SEP){
+					/* Clear-text decompression */
+					char *s = strtok (name, " ");
+					
+					if (s){
+						common = atoi (s);
+						different = strtok (NULL, "");
+						if (different){
+							strcpy (oldname + common, different);
+							e = tree_store_add_entry (oldname);
+							e->scanned = scanned;
+						}
+					}
+				} else {
+					e = tree_store_add_entry (name);
+					e->scanned = scanned;
+					strcpy (oldname, name);
+				}
+		}
+		fclose (file);
+	}
+
+	/* Nothing loaded, we add some standard directories */
+	if (!ts.tree_first){
+		tree_store_add_entry (PATH_SEP_STR);
+		tree_store_rescan (PATH_SEP_STR);
+		ts.loaded = TRUE;
+	}
+	
+	return TRUE;
+}
+
+static char *
+encode (char *string)
+{
+	int special_chars;
+	char *p, *q;
+	char *res;
+
+	for (special_chars = 0, p = string; *p; p++){
+		if (*p == '\n' || *p == '\\')
+			special_chars++;
+	}
+	
+	res = malloc (p - string + special_chars + 1);
+	for (p = string, q = res; *p; p++, q++){
+		if (*p != '\n' && *p != '\\'){
+			*q = *p;
+			continue;
+		}
+		
+		*q++ = '\\';
+		
+		switch (*p){
+		case '\n':
+			*q = 'n';
+			break;
+			
+		case '\\':
+			*q = '\\';
+			break;
+		}
+	}
+	*q = 0;
+	return res;
+}
+
+int
+tree_store_save (char *name)
+{
+	tree_entry *current;
+	FILE *file;
+
+	file = fopen (name, "w");
+	if (!file)
+		return errno;
+
+	fprintf (file, "%s\n", TREE_SIGNATURE);
+	
+	current = ts.tree_first;
+	while (current){
+		int i, common;
+
+		/* Clear-text compression */
+		if (current->prev && (common = str_common (current->prev->name, current->name)) > 2){
+			char *encoded = encode (current->name + common);
+			
+			i = fprintf (file, "%d:%d %s\n", current->scanned, common, encoded);
+			free (encoded);
+		} else {
+			char *encoded = encode (current->name);
+			
+			i = fprintf (file, "%d:%s\n", current->scanned, encoded);
+			free (encoded);
+		}
+		
+		if (i == EOF){
+			fprintf (stderr, _("Can't write to the %s file:\n%s\n"), name,
+				 unix_error_string (errno));
+			break;
+		}
+		current = current->next;
+	}
+	tree_store_dirty (FALSE);
+	fclose (file);
+
+	return 0;
+}
+
+tree_entry *
+tree_store_add_entry (char *name)
+{
+	int flag = -1;
+	tree_entry *current = ts.tree_first;
+	tree_entry *old = NULL;
+	tree_entry *new;
+	int i, len;
+	int submask = 0;
+
+	if (ts.tree_last && ts.tree_last->next)
+		abort ();
+
+	/* Search for the correct place */
+	while (current && (flag = pathcmp (current->name, name)) < 0){
+		old = current;
+		current = current->next;
+	}
+	
+	if (flag == 0)
+		return current; /* Already in the list */
+
+	/* Not in the list -> add it */
+	new = xmalloc (sizeof (tree_entry), "ts, tree_entry");
+	if (!current){
+		/* Append to the end of the list */
+		if (!ts.tree_first){
+			/* Empty list */
+			ts.tree_first = new;
+			new->prev = NULL;
+		} else {
+			old->next = new;
+			new->prev = old;
+		}
+		new->next = NULL;
+		ts.tree_last = new;
+	} else {
+		/* Insert in to the middle of the list */
+		new->prev = old;
+		if (old){
+			/* Yes, in the middle */
+			new->next = old->next;
+			old->next = new;
+		} else {
+			/* Nope, in the beginning of the list */
+			new->next = ts.tree_first;
+			ts.tree_first = new;
+		}
+		new->next->prev = new;
+	}
+
+	/* Calculate attributes */
+	new->name = strdup (name);
+	len = strlen (new->name);
+	new->sublevel = 0;
+	for (i = 0; i < len; i++)
+		if (new->name [i] == PATH_SEP){
+			new->sublevel++;
+			new->subname = new->name + i + 1;
+		}
+	if (new->next)
+		submask = new->next->submask;
+	else
+		submask = 0;
+	submask |= 1 << new->sublevel;
+	submask &= (2 << new->sublevel) - 1;
+	new->submask = submask;
+	new->mark = 0;
+	
+	/* Correct the submasks of the previous entries */
+	current = new->prev;
+	while (current && current->sublevel > new->sublevel){
+		current->submask |= 1 << new->sublevel;
+		current = current->prev;
+	}
+	
+	/* The entry has now been added */
+	
+	if (new->sublevel > 1){
+		/* Let's check if the parent directory is in the tree */
+		char *parent = strdup (new->name);
+		int i;
+		
+		for (i = strlen (parent) - 1; i > 1; i--){
+			if (parent [i] == PATH_SEP){
+				parent [i] = 0;
+				tree_store_add_entry (parent);
+				break;
+			}
+		}
+		free (parent);
+	}
+
+	tree_store_dirty (TRUE);
+	return new;
+}
+
+tree_entry *
+remove_entry (tree_entry *entry)
+{
+	tree_entry *current = entry->prev;
+	long submask = 0;
+	tree_entry *ret = NULL;
+	
+	tree_store_notify_remove (entry);
+	
+	/* Correct the submasks of the previous entries */
+	if (entry->next)
+		submask = entry->next->submask;
+	while (current && current->sublevel > entry->sublevel){
+		submask |= 1 << current->sublevel;
+		submask &= (2 << current->sublevel) - 1;
+		current->submask = submask;
+		current = current->prev;
+	}
+	
+	/* Unlink the entry from the list */
+	if (entry->prev)
+		entry->prev->next = entry->next;
+	else
+		ts.tree_first = entry->next;
+	if (entry->next)
+		entry->next->prev = entry->prev;
+	else
+		ts.tree_last = entry->prev;
+	
+	/* Free the memory used by the entry */
+	free (entry->name);
+	free (entry);
+
+	return ret;
+}
+
+void
+tree_store_remove_entry (char *name)
+{
+	tree_entry *current, *base, *old;
+	int len, base_sublevel;
+	
+	g_return_if_fail (name != NULL);
+	
+	/* Miguel Ugly hack */
+	if (name [0] == PATH_SEP && name [1] == 0)
+		return;
+	/* Miguel Ugly hack end */
+    
+	base = tree_store_whereis (name);
+	if (!base)
+		return;	/* Doesn't exist */
+	if (ts.check_name [0] == PATH_SEP && ts.check_name [1] == 0)
+		base_sublevel = base->sublevel;
+	else
+		base_sublevel = base->sublevel + 1;
+	len = strlen (base->name);
+	current = base->next;
+	while (current
+	       && strncmp (current->name, base->name, len) == 0
+	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP)){
+		old = current;
+		current = current->next;
+		remove_entry (old);
+	}
+	remove_entry (base);
+	tree_store_dirty (TRUE);
+
+	return;
+}
+
+/* This subdirectory exists -> clear deletion mark */
+void
+tree_store_mark_checked (const char *subname)
+{
+	char *name;
+	tree_entry *current, *base;
+	int flag = 1, len;
+	
+	if (!ts.loaded)
+		return;
+
+	/* Calculate the full name of the subdirectory */
+	if (subname [0] == '.' &&
+	    (subname [1] == 0 || (subname [1] == '.' && subname [2] == 0)))
+		return;
+	if (ts.check_name [0] == PATH_SEP && ts.check_name [1] == 0)
+		name = copy_strings (PATH_SEP_STR, subname, 0);
+	else
+		name = concat_dir_and_file (ts.check_name, subname);
+	
+	/* Search for the subdirectory */
+	current = ts.check_start;
+	while (current && (flag = pathcmp (current->name, name)) < 0)
+		current = current->next;
+	
+	if (flag != 0)
+		/* Doesn't exist -> add it */
+		current = tree_store_add_entry (name);
+	free (name);
+	
+	/* Clear the deletion mark from the subdirectory and its children */
+	base = current;
+	if (base){
+		len = strlen (base->name);
+		base->mark = 0;
+		current = base->next;
+		while (current
+		       && strncmp (current->name, base->name, len) == 0
+		       && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
+			current->mark = 0;
+			current = current->next;
+		}
+	}
+}
+
+/* Mark the subdirectories of the current directory for delete */
+tree_entry *
+tree_store_start_check (char *path)
+{
+	tree_entry *current, *retval;
+	int len;
+
+	if (!ts.loaded)
+		return NULL;
+
+	ts.check_start = NULL;
+	
+	/* Search for the start of subdirectories */
+	current = tree_store_whereis (path);
+	if (!current){
+		struct stat s;
+
+		if (stat (path, &s) == -1)
+			return NULL;
+
+		if (!S_ISDIR (s.st_mode))
+			return NULL;
+		
+		current = tree_store_add_entry (path);
+		ts.check_name = strdup (path);
+
+		return current;
+	}
+
+	ts.check_name = strdup (path);
+	
+	retval = current;
+	
+	/* Mark old subdirectories for delete */
+	ts.check_start = current->next;
+	len = strlen (ts.check_name);
+	
+	current = ts.check_start;
+	while (current
+	       && strncmp (current->name, ts.check_name, len) == 0
+	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
+		current->mark = 1;
+		current = current->next;
+	}
+
+	return retval;
+}
+
+tree_entry *
+tree_store_start_check_cwd (void)
+{
+	char buffer [MC_MAXPATHLEN];
+	
+	mc_get_current_wd (buffer, MC_MAXPATHLEN);
+	return tree_store_start_check (buffer);
+}
+
+/* Delete subdirectories which still have the deletion mark */
+void
+tree_store_end_check (void)
+{
+	tree_entry *current, *old;
+	int len;
+
+	if (!ts.loaded)
+		return;
+	
+	/* Check delete marks and delete if found */
+	len = strlen (ts.check_name);
+	
+	current = ts.check_start;
+	while (current
+	       && strncmp (current->name, ts.check_name, len) == 0
+	       && (current->name[len] == '\0' || current->name[len] == PATH_SEP || len == 1)){
+		old = current;
+		current = current->next;
+		if (old->mark)
+			remove_entry (old);
+	}
+
+	free (ts.check_name);
+}
+
+tree_entry *
+tree_store_rescan (char *dir)
+{
+	DIR *dirp;
+	struct dirent *dp;
+	struct stat buf;
+	tree_entry *entry;
+	
+	entry = tree_store_start_check (dir);
+
+	if (!entry)
+		return NULL;
+	
+	dirp = mc_opendir (dir);
+	if (dirp){
+		for (dp = mc_readdir (dirp); dp; dp = mc_readdir (dirp)){
+			char *full_name;
+
+			if (dp->d_name [0] == '.' &&
+			    dp->d_name [1] == 0 || (dp->d_name [1] == '.' && dp->d_name [2] == 0))
+				continue;
+
+			full_name = concat_dir_and_file (dir, dp->d_name);
+			if (lstat (full_name, &buf) != -1){
+				if (S_ISDIR (buf.st_mode))
+					tree_store_mark_checked (dp->d_name);
+			}
+			free (full_name);
+		}
+		mc_closedir (dirp);
+	}
+	tree_store_end_check ();
+	entry->scanned = 1;
+
+	return entry;
+}      
+
+static Hook *remove_entry_hooks;
+
+void
+tree_store_add_entry_remove_hook (tree_store_remove_fn callback, void *data)
+{
+	add_hook (&remove_entry_hooks, (void (*)(void *))callback, data);
+}
+
+void
+tree_store_notify_remove (tree_entry *entry)
+{
+	Hook *p = remove_entry_hooks;
+	tree_store_remove_fn r;
+
+	
+	while (p){
+		r = (tree_store_remove_fn) p->hook_fn;
+		r (entry, p->hook_data);
+		p = p->next;
+	}
+}
+
+tree_scan *
+tree_store_opendir (char *path)
+{
+	tree_entry *entry;
+	tree_scan *scan;
+
+	entry = tree_store_whereis (path);
+	if (!entry || (entry && !entry->scanned)){
+		entry = tree_store_rescan (path);
+
+		if (!entry)
+			return NULL;
+	}
+	
+	scan = xmalloc (sizeof (tree_scan), "");
+	scan->base = entry;
+	scan->current = entry->next;
+	scan->sublevel = entry->next->sublevel;
+	
+	scan->base_dir_len = strlen (path);
+	return scan;
+}
+
+tree_entry *
+tree_store_readdir (tree_scan *scan)
+{
+	tree_entry *entry;
+	int len;
+	
+	g_assert (scan != NULL);
+
+	len = scan->base_dir_len;
+	entry = scan->current;
+	while (entry &&
+	    (strncmp (entry->name, scan->base->name, len) == 0) &&
+	    (entry->name [len] == 0 || entry->name [len] == PATH_SEP || len == 1)){
+
+		if (entry->sublevel == scan->sublevel){
+			scan->current = entry->next;
+			return entry;
+		}
+		entry = entry->next;
+	}
+
+	return NULL;
+}
+
+void
+tree_store_closedir (tree_scan *scanner)
+{
+	g_assert (scanner != NULL);
+	
+	free (scanner);
+}
diff -ruN old/mc-4.5.6/src/treestore.h new/mc-4.5.7/src/treestore.h
--- old/mc-4.5.6/src/treestore.h	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.7/src/treestore.h	Tue Jan 12 22:38:07 1999
@@ -0,0 +1,55 @@
+#ifndef __TREE_STORE_H
+#define __TREE_STORE_H
+
+typedef struct tree_entry {
+	char *name;			/* The full path of directory */
+	int sublevel;			/* Number of parent directories (slashes) */
+	long submask;			/* Bitmask of existing sublevels after this entry */
+	char *subname;			/* The last part of name (the actual name) */
+	unsigned int mark:1;		/* Flag: Is this entry marked (e. g. for delete)? */
+	unsigned int scanned:1;		/* Flag: childs scanned or not */
+	struct tree_entry *next;	/* Next item in the list */
+	struct tree_entry *prev;	/* Previous item in the list */
+} tree_entry;
+
+typedef struct {
+	struct tree_entry *base;
+	struct tree_entry *current;
+	int base_dir_len;
+	int sublevel;
+} tree_scan;
+
+typedef struct {
+	int refcount;
+	tree_entry *tree_first;     	/* First entry in the list */
+	tree_entry *tree_last;          /* Last entry in the list */
+	tree_entry *check_start;	/* Start of checked subdirectories */
+	char       *check_name;		/* Directory which is been checked */
+	unsigned int loaded : 1;
+	unsigned int dirty : 1;
+} TreeStore;
+
+extern void (*tree_store_dirty_notify)(int state);
+
+TreeStore  *tree_store_init          (void);
+int         tree_store_load          (char *name);
+int         tree_store_save          (char *name);
+tree_entry *tree_store_add_entry     (char *name);
+void        tree_store_remove_entry  (char *name);
+void        tree_store_destroy       (void);
+tree_entry *tree_store_start_check   (char *path);
+void        tree_store_mark_checked  (const char *subname);
+void        tree_store_end_check     (void);
+tree_entry *tree_store_whereis       (char *name);
+tree_entry *tree_store_rescan        (char *dir);
+
+typedef void (*tree_store_remove_fn)(tree_entry *tree, void *data);
+void        tree_store_add_entry_remove_hook (tree_store_remove_fn callback, void *data);
+
+void        tree_store_notify_remove (tree_entry *entry);
+
+tree_scan  *tree_store_opendir       (char *path);
+tree_entry *tree_store_readdir       (tree_scan *scanner);
+void        tree_store_closedir      (tree_scan *scanner);
+
+#endif
diff -ruN old/mc-4.5.6/src/user.c new/mc-4.5.7/src/user.c
--- old/mc-4.5.6/src/user.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/user.c	Tue Jan 12 22:38:07 1999
@@ -17,7 +17,7 @@
 
 #include <config.h>
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #    include <io.h>
 #endif
 #include "tty.h"
@@ -47,7 +47,7 @@
 
 #include "view.h" /* for default_* externs */
 
-/* "$Id: user.c,v 1.8 1998/12/02 21:28:05 unammx Exp $" */
+/* "$Id: user.c,v 1.9 1999/01/10 08:56:08 unammx Exp $" */
 
 #define MAX_ENTRIES 40
 #define MAX_ENTRY_LEN 60
diff -ruN old/mc-4.5.6/src/util.c new/mc-4.5.7/src/util.c
--- old/mc-4.5.6/src/util.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/util.c	Tue Jan 12 22:38:07 1999
@@ -46,7 +46,7 @@
 #	include <sys/timeb.h>	/* alex: for struct timeb, used in time.h */
 #endif /* SCO_FLAVOR */
 #include <time.h>
-#ifndef OS2_NT
+#ifndef HAS_NO_GRP_PWD_H
 #   include <pwd.h>
 #   include <grp.h>
 #endif
@@ -65,6 +65,8 @@
 #  include <sys/ioctl.h>
 #endif
 
+#include <glib.h>	/* For funny new functions */
+
 #include "fs.h"
 #include "mountlist.h"
 
@@ -84,7 +86,7 @@
 #include "user.h"		/* expand_format */
 #include "../vfs/vfs.h"
 
-/* "$Id: util.c,v 1.9 1998/12/02 21:28:06 unammx Exp $" */
+/* "$Id: util.c,v 1.12 1999/01/12 02:24:54 unammx Exp $" */
 
 char app_text [] = "Midnight-Commander";
 
@@ -198,6 +200,8 @@
 	    case ')':
 	    case '[':
 	    case ']':
+	    case '{':
+	    case '}':
 	    case '"':
 	    case '!':
 	    case '&':
@@ -864,31 +868,30 @@
 static long
 get_small_endian_long (int fd)
 {
-    unsigned char a, b, c, d;
+    unsigned char buffer [4];
 
-    /* It needs to be read one byte at the time to avoid endianess
-       portability problems */
-    CHECK (mc_read (fd, &a, 1));
-    CHECK (mc_read (fd, &b, 1));
-    CHECK (mc_read (fd, &c, 1));
-    CHECK (mc_read (fd, &d, 1));
-    return (d << 24) | (c << 16) | (b << 8) | a;
+    CHECK (mc_read (fd, buffer, 4));
+    return (buffer [3] << 24) | (buffer [2] << 16) | (buffer [1] << 8) | buffer [0];
 }
 
+/*
+ * This constant makes the magic array on the stack be larger than
+ * it needs because Linux when reading the second byte of /proc/locks
+ * for example will write 2 bytes, even if we only asked for one
+ */
+#define LINUX_HAS_PROBLEMS_WHEN_READING_PROC_LOCKS_ON_SOME_KERNELS 40
+
 /* This function returns 0 if the file is not in gunzip format  */
 /* or how much memory must be allocated to load the gziped file */
 /* Warning: this function moves the current file pointer */
 long int is_gunzipable (int fd, int *type)
 {
-    unsigned char magic [4];
-	
+    unsigned char magic [4+LINUX_HAS_PROBLEMS_WHEN_READING_PROC_LOCKS_ON_SOME_KERNELS];
+    
     *type = ISGUNZIPABLE_GUNZIP;
 	
     /* Read the magic signature */
-    CHECK (mc_read (fd, &magic [0], 1));
-    CHECK (mc_read (fd, &magic [1], 1));
-    CHECK (mc_read (fd, &magic [2], 1));
-    CHECK (mc_read (fd, &magic [3], 1));
+    CHECK (mc_read (fd, &magic [0], 4));
 	
     /* GZIP_MAGIC and OLD_GZIP_MAGIC */
     if (magic [0] == 037 && (magic [1] == 0213 || magic [1] == 0236)){
@@ -901,8 +904,7 @@
     if (magic [0] == 0120 && magic [1] == 0113 && magic [2] == 003 && magic [3] == 004){
 	/* Read compression type */
 	mc_lseek (fd, 8, SEEK_SET);
-	CHECK (mc_read (fd, &magic [0], 1));
-	CHECK (mc_read (fd, &magic [1], 1));
+	CHECK (mc_read (fd, &magic [0], 2));
 	
 	/* Gzip can handle only deflated (8) or stored (0) files */
 	if ((magic [0] != 8 && magic [0] != 0) || magic [1] != 0)
diff -ruN old/mc-4.5.6/src/util.h new/mc-4.5.7/src/util.h
--- old/mc-4.5.6/src/util.h	Wed Jan  6 15:26:15 1999
+++ new/mc-4.5.7/src/util.h	Tue Jan 12 22:38:07 1999
@@ -108,6 +108,7 @@
 #define EXECUTE_TEMPFILE   2
 #define EXECUTE_AS_SHELL   4
 #define EXECUTE_SETUID     8
+#define EXECUTE_WAIT      16
 int my_system (int flags, const char *shell, const char *command);
 int my_system_get_child_pid (int flags, const char *shell, const char *command, pid_t *pid);
 void save_stop_handler (void);
diff -ruN old/mc-4.5.6/src/view.c new/mc-4.5.7/src/view.c
--- old/mc-4.5.6/src/view.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/view.c	Tue Jan 12 22:38:07 1999
@@ -29,7 +29,7 @@
 #include "tty.h"
 #include "x.h"
 #include <stdio.h>
-#ifdef OS2_NT
+#ifdef NEEDS_IO_H
 #   include <io.h>
 #endif
 #include <sys/types.h>
@@ -125,7 +125,7 @@
 int altered_nroff_flag = 0;
 /* }}} */
 
-/* "$Id: view.c,v 1.22 1998/12/10 22:04:57 psheer Exp $" */
+/* "$Id: view.c,v 1.23 1999/01/10 08:56:10 unammx Exp $" */
 
 static char hex_char[] = "0123456789ABCDEF";
 
diff -ruN old/mc-4.5.6/src/win.c new/mc-4.5.7/src/win.c
--- old/mc-4.5.6/src/win.c	Wed Jan  6 15:26:16 1999
+++ new/mc-4.5.7/src/win.c	Tue Jan 12 22:38:07 1999
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>	/* For free() */
 #include <string.h>
-#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(OS2_NT)
+#if (!defined(__IBMC__) && !defined(__IBMCPP__)) && !defined(HAS_NO_TERMIOS_H)
 #    include <termios.h>
 #endif
 #include "mad.h"
@@ -35,7 +35,7 @@
 #include "layout.h"
 #include "global.h"
 
-/* "$Id: win.c,v 1.3 1998/12/02 05:18:54 unammx Exp $" */
+/* "$Id: win.c,v 1.4 1999/01/10 08:56:12 unammx Exp $" */
 
 typedef void (*fnptr)(void);
 
diff -ruN old/mc-4.5.6/vfs/ChangeLog new/mc-4.5.7/vfs/ChangeLog
--- old/mc-4.5.6/vfs/ChangeLog	Wed Jan  6 15:26:11 1999
+++ new/mc-4.5.7/vfs/ChangeLog	Tue Jan 12 22:38:06 1999
@@ -1,3 +1,45 @@
+1999-01-10  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* sfs.c (redirect): tempnam returns a malloc()ed buffer.
+
+Sat Jan  9 19:15:00 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* vfs.c (vfs_timeout_handler): Guard from recursive invocation.
+
+Sat Jan  9 19:13:28 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* sfs.c (sfs_free): Fixed wrong linked list handling (head was
+	lost after the first iteration).
+
+	(sfs_getid): dito, return value was wrong.
+
+Sat Jan  9 22:49:02 1999  Timur I. Bakeyev <timur@com.bat.ru>
+
+	* vfs.c (parse_ls_lga): Rewrite function to make it more stright.
+	Also, fixed some bugs in parsing (and add new ones:), which diasallowed
+	proper parsing of device major and minor numbers. Some other fixes. Add
+	several new is_*() functions to make code readable.
+
+1999-01-08  Ilya Zakharevich <ilya@math.ohio-state.edu>
+
+	* vfs.h (vfs_strip_suffix_from_filename): Typo fix.  Include
+	defines for non-vfs compilation.
+
+Fri Jan  8 20:03:36 1999  Andrej Borsenkow <borsenkow.msk@sni.de>
+
+	* vfs.c (vfs_parse_filedate): I forgot to set got_year in one place 
+	(where YY-MM-DD is parsed).
+
+Thu Jan  7 06:24:25 1999  Andrej Borsenkow <borsenkow.msk@sni.de>
+
+	* vfs.c (vfs_parse_filedate): If the date is less than 6 months 
+	in the past, it is shown without year. In this case MC assumed
+	the current year which is wrong from Jan to Jun.
+
+Thu Jan  7 03:47:35 1999  Timur I. Bakeyev <timur@com.bat.ru>
+
+	* vfs.c (parse_ls_lga): Fixed Y2K typo pointed by Alex.
+
 Thu Dec 31 08:47:15 1998  Norbert Warmuth  <nwarmuth@privat.circular.de>
 
 	* sfs.c (sfs_nothingisopen): Assume for now it's always save to free
diff -ruN old/mc-4.5.6/vfs/direntry.c new/mc-4.5.7/vfs/direntry.c
--- old/mc-4.5.6/vfs/direntry.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/direntry.c	Tue Jan 12 22:38:06 1999
@@ -35,7 +35,8 @@
     vfs_s_inode *ino;
 
     ino = xmalloc(sizeof (vfs_s_inode), "Dcache inode");
-    if (!ino) return NULL;
+    if (!ino)
+	return NULL;
 
 
     ino->linkname = ino->localname = NULL;
@@ -66,7 +67,8 @@
 
     if (name)
 	entry->name = strdup (name);
-    else entry->name = NULL;
+    else
+	entry->name = NULL;
     entry->dir = NULL;
     entry->next = NULL;
     entry->prevp = NULL;
@@ -79,7 +81,8 @@
 
 void vfs_s_free_inode (vfs *me, vfs_s_inode *ino)
 {
-    if (!ino) vfs_die("Don't pass NULL to me");
+    if (!ino)
+	vfs_die ("Don't pass NULL to me");
 
     /* ==0 can happen if freshly created entry is deleted */
     if(ino->st.st_nlink <= 1) {
@@ -106,7 +109,8 @@
     int is_dot = 0;
     if (ent->prevp) {	/* It is possible that we are deleting freshly created entry */
 	*ent->prevp = ent->next;
-	if (ent->next) ent->next->prevp = ent->prevp;
+	if (ent->next)
+	    ent->next->prevp = ent->prevp;
     }
 
     if (ent->name) {
@@ -129,7 +133,8 @@
 {
     vfs_s_entry **ep;
 
-    for(ep = &dir->subdir; *ep != NULL; ep = &((*ep)->next));
+    for (ep = &dir->subdir; *ep != NULL; ep = &((*ep)->next))
+	;
     ent->prevp = ep;
     ent->next = NULL;
     ent->dir = dir;
@@ -251,7 +256,6 @@
 
 vfs_s_entry *vfs_s_find_entry_linear(vfs *me, vfs_s_inode *root, char *path, int follow, int flags)
 {
-    char *s;
     vfs_s_entry* ent = NULL;
 
     if (!(flags & FL_DIR)) {
@@ -435,7 +439,8 @@
 	}
     }
 
-    if (flags & FL_NO_OPEN) ERRNOR (EIO, NULL);
+    if (flags & FL_NO_OPEN)
+	ERRNOR (EIO, NULL);
 
     super = vfs_s_new_super (me);
     result = MEDATA->open_archive (me, super, archive_name, op);
@@ -523,8 +528,10 @@
     struct dirhandle *info;
 
     dir = vfs_s_inode_from_path (me, dirname, FL_DIR | FL_FOLLOW);
-    if (!dir) return NULL;
-    if (!S_ISDIR (dir->st.st_mode)) ERRNOR (ENOTDIR, NULL);
+    if (!dir)
+	return NULL;
+    if (!S_ISDIR (dir->st.st_mode))
+	ERRNOR (ENOTDIR, NULL);
 
     dir->st.st_nlink++;
 #if 0
@@ -556,7 +563,7 @@
 	strcpy (&(dir.dir.d_name [0]), info->cur->name);
     else
 	vfs_die( "Null in structure-can not happen");
-    
+
 #ifndef DIRENT_LENGTH_COMPUTED
     dir.d_namlen = strlen (dir.dir.d_name);
 #endif
@@ -573,7 +580,8 @@
 
     cur = info->dir->subdir;
     while (cur!=NULL) {
-        if (cur == info->cur) return num;
+        if (cur == info->cur)
+	    return num;
 	num++;
 	cur = cur->next;
     }
@@ -614,7 +622,8 @@
 {
     struct vfs_s_inode *ino;
 
-    if (!(ino = vfs_s_inode_from_path( me, path, flag ))) return -1;
+    if (!(ino = vfs_s_inode_from_path( me, path, flag )))
+	return -1;
     *buf = ino->st;
     return 0;
 }
@@ -640,9 +649,11 @@
     struct vfs_s_inode *ino;
 
     ino = vfs_s_inode_from_path(me, path, 0);
-    if (!ino) return -1;
+    if (!ino)
+	return -1;
 
-    if (!S_ISLNK (ino->st.st_mode)) ERRNOR (EINVAL, -1);
+    if (!S_ISLNK (ino->st.st_mode))
+	ERRNOR (EINVAL, -1);
     strncpy (buf, ino->linkname, size);
     *(buf+size-1) = 0;
     return strlen(buf);
@@ -681,7 +692,8 @@
 	was_changed = 1;
     }
 
-    if (S_ISDIR (ino->st.st_mode)) ERRNOR (EISDIR, NULL);
+    if (S_ISDIR (ino->st.st_mode))
+	ERRNOR (EISDIR, NULL);
     
     fh = (struct vfs_s_fh *) xmalloc (sizeof (struct vfs_s_fh), "Direntry: filehandle");
     fh->pos = 0;
@@ -810,8 +822,10 @@
 	res = MEDATA->fh_close (me, fh);
     if (FH->changed && MEDATA->file_store) {
 	char *s = vfs_s_fullpath( me, FH->ino );
-	if (!s) res = -1;
-	   else res = MEDATA->file_store (me, FH_SUPER, s, FH->ino->localname);
+	if (!s)
+	    res = -1;
+	else
+	    res = MEDATA->file_store (me, FH_SUPER, s, FH->ino->localname);
 	vfs_s_invalidate(me, FH_SUPER);
     }
     if (FH->handle)
@@ -848,7 +862,9 @@
 vfs_s_dump(vfs *me, char *prefix, vfs_s_inode *ino)
 {
     printf( "%s %s %d ", prefix, S_ISDIR(ino->st.st_mode) ? "DIR" : "FILE", ino->st.st_mode );
-    if (!ino->subdir) printf ("FILE\n");
+    if (!ino->subdir)
+	printf ("FILE\n");
+
     else
     {
 	struct vfs_s_entry *ent;
diff -ruN old/mc-4.5.6/vfs/extfs.c new/mc-4.5.7/vfs/extfs.c
--- old/mc-4.5.6/vfs/extfs.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/extfs.c	Tue Jan 12 22:38:06 1999
@@ -628,7 +628,7 @@
 	free (q);
 	free (mc_extfsdir);
 	free (archive_name);
-        if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID, shell, cmd) && !do_create){
+        if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, shell, cmd) && !do_create){
             free (entry->inode->local_filename);
             entry->inode->local_filename = NULL;
             free (cmd);
@@ -690,7 +690,7 @@
 			    file->entry->inode->local_filename, 0);
 	free (archive_name);
 	free (file_name);
-	if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID, shell, cmd))
+	if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, shell, cmd))
 	    errno_code = EIO;
 	free (cmd);
 	free (mc_extfsdir);
diff -ruN old/mc-4.5.6/vfs/fish.c new/mc-4.5.7/vfs/fish.c
--- old/mc-4.5.6/vfs/fish.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/fish.c	Tue Jan 12 22:38:06 1999
@@ -104,7 +104,7 @@
 {
     va_list ap;
     char *str;
-    int n, status;
+    int status;
     FILE *logfile = MEDATA->logfile;
 
     va_start (ap, fmt);
diff -ruN old/mc-4.5.6/vfs/ftpfs.c new/mc-4.5.7/vfs/ftpfs.c
--- old/mc-4.5.6/vfs/ftpfs.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/ftpfs.c	Tue Jan 12 22:38:06 1999
@@ -143,8 +143,8 @@
 #define WANT_STRING 0x02
 static char reply_str [80];
 
-static struct direntry *_get_file_entry(struct connection *bucket, 
-                char *file_name, int op, int flags);
+static struct direntry *_get_file_entry     (struct connection *bucket, 
+					     char *file_name, int op, int flags);
 
 static char    *ftpfs_get_current_directory (struct connection *bucket);
 static int      ftpfs_chdir_internal        (struct connection *bucket,
@@ -184,16 +184,16 @@
     int i;
     
     for (;;) {
-        if (!get_line(sock, answer, sizeof(answer), '\n')) {
+        if (!get_line (sock, answer, sizeof (answer), '\n')){
 	    if (string_buf)
 		*string_buf = 0;
 	    code = 421;
 	    return 4;
 	}
-	switch(sscanf(answer, "%d", &code)) {
+	switch (sscanf(answer, "%d", &code)){
 	    case 0:
 	        if (string_buf) {
-		    strncpy(string_buf, answer, string_len - 1);
+		    strncpy (string_buf, answer, string_len - 1);
 		    *(string_buf + string_len - 1) = 0;
 		}
 	        code = 500;
@@ -201,19 +201,19 @@
 	    case 1:
  		if (answer[3] == '-') {
 		    while (1) {
-			if (!get_line(sock, answer, sizeof(answer), '\n')) {
+			if (!get_line (sock, answer, sizeof(answer), '\n')){
 			    if (string_buf)
 				*string_buf = 0;
 			    code = 421;
 			    return 4;
 			}
-			if ((sscanf(answer, "%d", &i) > 0) && 
+			if ((sscanf (answer, "%d", &i) > 0) && 
 			    (code == i) && (answer[3] == ' '))
 			    break;
 		    }
 		}
-	        if (string_buf) {
-		    strncpy(string_buf, answer, string_len - 1);
+	        if (string_buf){
+		    strncpy (string_buf, answer, string_len - 1);
 		    *(string_buf + string_len - 1) = 0;
 		}
 		return code / 100;
@@ -226,7 +226,7 @@
 {
     va_list ap;
     char *str, *fmt_str;
-    int n, status;
+    int status;
     int sock = qsock (bucket);
     
     va_start (ap, fmt);
@@ -275,7 +275,7 @@
     struct connection *bucket = data;
 
     if (qsock (bucket) != -1){
-	print_vfs_message ("ftpfs: Disconnecting from %s", qhost(bucket));
+	print_vfs_message ("ftpfs: Disconnecting from %s", qhost (bucket));
 	command(bucket, NONE, "QUIT");
 	close(qsock(bucket));
     }
@@ -294,7 +294,8 @@
 changetype (struct connection *bucket, int binary)
 {
     if (binary != bucket->isbinary) {
-        if (command (bucket, WAIT_REPLY, "TYPE %c", binary ? 'I' : 'A') != COMPLETE) ERRNOR (EIO, -1);
+        if (command (bucket, WAIT_REPLY, "TYPE %c", binary ? 'I' : 'A') != COMPLETE)
+		ERRNOR (EIO, -1);
         bucket->isbinary = binary;
     }
     return binary;
@@ -316,19 +317,20 @@
     if (netrcpass)
         op = strdup (netrcpass);
     else {
-        if (!strcmp (quser(bucket), "anonymous") || 
-            !strcmp (quser(bucket), "ftp")) {
-	    op = strdup(ftpfs_anonymous_passwd);
+        if (!strcmp (quser (bucket), "anonymous") || 
+            !strcmp (quser (bucket), "ftp")) {
+	    op = strdup (ftpfs_anonymous_passwd);
 	    anon = 1;
          } else {
             char *p;
 
 	    if (!bucket->password){
-		p = copy_strings (" FTP: Password required for ", quser(bucket), 
+		p = copy_strings (" FTP: Password required for ", quser (bucket), 
 				  " ", NULL);
 		op = vfs_get_password (p);
 		free (p);
-		if (op == NULL) ERRNOR (EPERM, 0);
+		if (op == NULL)
+			ERRNOR (EPERM, 0);
 		bucket->password = strdup (op);
 	    } else
 		op = strdup (bucket->password);
@@ -347,44 +349,47 @@
 #if defined(HSC_PROXY)
 	char *p, *host;
 	int port;
-	p = my_get_host_and_username(ftpfs_proxy_host, &host, &proxyname,
-					&port, &proxypass);
+	p = my_get_host_and_username (ftpfs_proxy_host, &host, &proxyname,
+				      &port, &proxypass);
 	if (p)
 	    free (p);
 	
-	free(host);
+	free (host);
 	if (proxypass)
 	    wipe_password (proxypass);
-	p = copy_strings(" Proxy: Password required for ", proxyname, " ",
-			 NULL);
+	p = copy_strings (" Proxy: Password required for ", proxyname, " ",
+			  NULL);
 	proxypass = vfs_get_password (p);
-	free(p);
+	free (p);
 	if (proxypass == NULL) {
 	    wipe_password (pass);
 	    free (proxyname);
 	    ERRNOR (EPERM, 0);
 	}
-	name = strdup(quser (bucket));
+	name = strdup (quser (bucket));
 #else
-	name = copy_strings (quser(bucket), "@", 
-		qhost(bucket)[0] == '!' ? qhost(bucket)+1 : qhost(bucket), 0);
+	name = copy_strings (quser (bucket), "@", 
+		qhost (bucket)[0] == '!' ? qhost (bucket)+1 : qhost (bucket), 0);
 #endif
     } else 
 	name = strdup (quser (bucket));
     
-    if (get_reply (qsock(bucket), NULL, 0) == COMPLETE) {
+    if (get_reply (qsock (bucket), NULL, 0) == COMPLETE) {
 #if defined(HSC_PROXY)
-	if (qproxy(bucket)) {
-	    print_vfs_message("ftpfs: sending proxy login name");
+	if (qproxy (bucket)){
+	    print_vfs_message ("ftpfs: sending proxy login name");
 	    if (command (bucket, 1, "USER %s", proxyname) != CONTINUE)
 		goto proxyfail;
-	    print_vfs_message("ftpfs: sending proxy user password");
+
+	    print_vfs_message ("ftpfs: sending proxy user password");
 	    if (command (bucket, 1, "PASS %s", proxypass) != COMPLETE)
 		goto proxyfail;
-	    print_vfs_message("ftpfs: proxy authentication succeeded");
-	    if (command (bucket, 1, "SITE %s", qhost(bucket)+1) != COMPLETE)
+
+	    print_vfs_message ("ftpfs: proxy authentication succeeded");
+	    if (command (bucket, 1, "SITE %s", qhost (bucket)+1) != COMPLETE)
 		goto proxyfail;
-	    print_vfs_message("ftpfs: connected to %s", qhost(bucket)+1);
+
+	    print_vfs_message ("ftpfs: connected to %s", qhost (bucket)+1);
 	    if (0) {
 	    proxyfail:
 		bucket->failed_on_login = 1;
@@ -401,17 +406,17 @@
 	    free (proxyname);
 	}
 #endif
-	print_vfs_message("ftpfs: sending login name");
+	print_vfs_message ("ftpfs: sending login name");
 	code = command (bucket, WAIT_REPLY, "USER %s", name);
 
 	switch (code){
 	case CONTINUE:
-	    print_vfs_message("ftpfs: sending user password");
+	    print_vfs_message ("ftpfs: sending user password");
             if (command (bucket, WAIT_REPLY, "PASS %s", pass) != COMPLETE)
 		break;
 
 	case COMPLETE:
-	    print_vfs_message("ftpfs: logged in");
+	    print_vfs_message ("ftpfs: logged in");
 	    wipe_password (pass);
 	    free (name);
 	    return 1;
@@ -426,7 +431,7 @@
 	    goto login_fail;
 	}
     }
-    print_vfs_message ("ftpfs: Login incorrect for user %s ", quser(bucket));
+    print_vfs_message ("ftpfs: Login incorrect for user %s ", quser (bucket));
 login_fail:
     wipe_password (pass);
     free (name);
@@ -566,17 +571,17 @@
 #else
 #define PORT 21
 #endif
-    dir = vfs_split_url(proxy, host, &user, port, &pass, PORT, URL_DEFAULTANON);
+    dir = vfs_split_url (proxy, host, &user, port, &pass, PORT, URL_DEFAULTANON);
 
-    free(user);
+    free (user);
     if (pass)
 	wipe_password (pass);
     if (dir)
-	free(dir);
+	free (dir);
 }
 
 static int
-ftpfs_open_socket(struct connection *bucket)
+ftpfs_open_socket (struct connection *bucket)
 {
     struct   sockaddr_in server_address;
     struct   hostent *hp;
@@ -586,7 +591,7 @@
     int      free_host = 0;
     
     /* Use a proxy host? */
-    host = qhost(bucket);
+    host = qhost (bucket);
 
     if (!host || !*host){
 	print_vfs_message ("ftpfs: Invalid host name.");
@@ -595,7 +600,7 @@
     }
 
     /* Hosts to connect to that start with a ! should use proxy */
-    if (qproxy(bucket)) {
+    if (qproxy (bucket)){
 	ftpfs_get_proxy_host_and_port (ftpfs_proxy_host, &host, &port);
 	free_host = 1;
     }
@@ -607,9 +612,9 @@
     if (server_address.sin_addr.s_addr != -1)
 	server_address.sin_family = AF_INET;
     else {
-	hp = gethostbyname(host);
+	hp = gethostbyname (host);
 	if (hp == NULL){
-	    print_vfs_message("ftpfs: Invalid host address.");
+	    print_vfs_message ("ftpfs: Invalid host address.");
 	    my_errno = EINVAL;
 	    if (free_host)
 		free (host);
@@ -634,20 +639,20 @@
     }
     setup_source_route (my_socket, server_address.sin_addr.s_addr);
     
-    print_vfs_message("ftpfs: making connection to %s", host);
+    print_vfs_message ("ftpfs: making connection to %s", host);
     if (free_host)
 	free (host);
 
-    enable_interrupt_key(); /* clear the interrupt flag */
+    enable_interrupt_key (); /* clear the interrupt flag */
 
     if (connect (my_socket, (struct sockaddr *) &server_address,
 	     sizeof (server_address)) < 0){
 	my_errno = errno;
-	if (errno == EINTR && got_interrupt())
-	    print_vfs_message("ftpfs: connection interrupted by user");
+	if (errno == EINTR && got_interrupt ())
+	    print_vfs_message ("ftpfs: connection interrupted by user");
 	else
-	    print_vfs_message("ftpfs: connection to server failed: %s",
-			      unix_error_string(errno));
+	    print_vfs_message ("ftpfs: connection to server failed: %s",
+				   unix_error_string(errno));
 	disable_interrupt_key();
 	close (my_socket);
 	return -1;
@@ -665,7 +670,8 @@
     bucket = xmalloc(sizeof(struct connection), 
 		     "struct connection");
     
-    if (bucket == NULL) ERRNOR (ENOMEM, NULL);
+    if (bucket == NULL)
+	    ERRNOR (ENOMEM, NULL);
 #ifdef HAVE_MAD
     {
 	extern void *watch_free_pointer;
@@ -674,15 +680,15 @@
 	    watch_free_pointer = host;
     }
 #endif
-    qhost(bucket) = strdup (host);
-    quser(bucket) = strdup (user);
-    qcdir(bucket) = NULL;
-    qport(bucket) = port;
-    qlock(bucket) = 0;
-    qhome(bucket) = NULL;
-    qproxy(bucket)= 0;
-    qupdir(bucket)= 0;
-    qdcache(bucket)=0;
+    qhost (bucket) = strdup (host);
+    quser (bucket) = strdup (user);
+    qcdir (bucket) = NULL;
+    qport (bucket) = port;
+    qlock (bucket) = 0;
+    qhome (bucket) = NULL;
+    qproxy (bucket)= 0;
+    qupdir (bucket)= 0;
+    qdcache (bucket)=0;
     bucket->__inode_counter = 0;
     bucket->lock = 0;
     bucket->use_proxy = ftpfs_check_proxy (host);
@@ -696,10 +702,10 @@
     if (bucket->use_proxy)
 	bucket->use_passive_connection = 0;
 
-    if ((qdcache(bucket) = linklist_init()) == NULL) {
+    if ((qdcache (bucket) = linklist_init ()) == NULL) {
 	my_errno = ENOMEM;
-	free (qhost(bucket));
-	free (quser(bucket));
+	free (qhost (bucket));
+	free (quser (bucket));
 	free (bucket);
 	return NULL;
     }
@@ -708,13 +714,13 @@
     do { 
 	bucket->failed_on_login = 0;
 
-	qsock(bucket) = ftpfs_open_socket(bucket);
-	if (qsock(bucket) == -1)  {
+	qsock (bucket) = ftpfs_open_socket (bucket);
+	if (qsock (bucket) == -1)  {
 	    free_bucket (bucket);
 	    return NULL;
 	}
 
-	if (login_server(bucket, netrcpass)) {
+	if (login_server (bucket, netrcpass)) {
 	    /* Logged in, no need to retry the connection */
 	    break;
 	} else {
@@ -743,15 +749,15 @@
 	}
     } while (retry_seconds);
     
-    qhome(bucket) = ftpfs_get_current_directory (bucket);
-    if (!qhome(bucket))
-        qhome(bucket) = strdup ("/");
-    qupdir(bucket) = strdup ("/"); /* FIXME: I changed behavior to ignore last_current_dir */
+    qhome (bucket) = ftpfs_get_current_directory (bucket);
+    if (!qhome (bucket))
+        qhome (bucket) = strdup ("/");
+    qupdir (bucket) = strdup ("/"); /* FIXME: I changed behavior to ignore last_current_dir */
     return bucket;
 }
 
 static int
-is_connection_closed(struct connection *bucket)
+is_connection_closed (struct connection *bucket)
 {
     fd_set rset;
     struct timeval t;
@@ -761,16 +767,16 @@
     }
     t.tv_sec = 0;
     t.tv_usec = 0;
-    FD_ZERO(&rset);
-    FD_SET(qsock(bucket), &rset);
+    FD_ZERO (&rset);
+    FD_SET (qsock (bucket), &rset);
     while (1) {
-	if (select(qsock(bucket) + 1, &rset, NULL, NULL, &t) < 0)
+	if (select (qsock (bucket) + 1, &rset, NULL, NULL, &t) < 0)
 	    if (errno != EINTR)
 		return 1;
 	return 0;
 #if 0
-	if (FD_ISSET(qsock(bucket), &rset)) {
-	    n = read(qsock(bucket), &read_ahead, sizeof(read_ahead));
+	if (FD_ISSET (qsock(bucket), &rset)) {
+	    n = read (qsock(bucket), &read_ahead, sizeof (read_ahead));
 	    if (n <= 0) 
 		return 1;
 	} 	else
@@ -790,47 +796,48 @@
     for (lptr = connections_list->next; 
 	 lptr != connections_list; lptr = lptr->next) {
 	bucket = lptr->data;
-	if ((strcmp (host, qhost(bucket)) == 0) &&
-	    (strcmp (user, quser(bucket)) == 0) &&
-	    (port == qport(bucket))) {
+	if ((strcmp (host, qhost (bucket)) == 0) &&
+	    (strcmp (user, quser (bucket)) == 0) &&
+	    (port == qport (bucket))) {
 	    
 	    /* check the connection is closed or not, just hack */
-	    if (is_connection_closed(bucket)) {
-		flush_all_directory(bucket);
-		sock = ftpfs_open_socket(bucket);
+	    if (is_connection_closed (bucket)) {
+		flush_all_directory (bucket);
+		sock = ftpfs_open_socket (bucket);
 		if (sock != -1) {
-		    close(qsock(bucket));
-		    qsock(bucket) = sock;
-		    if (login_server(bucket, netrcpass))
+		    close (qsock (bucket));
+		    qsock (bucket) = sock;
+		    if (login_server (bucket, netrcpass))
 			return bucket;
 		} 
 		
 		/* connection refused */
 		lptr->prev->next = lptr->next;
 		lptr->next->prev = lptr->prev;
-		connection_destructor(bucket);
+		connection_destructor (bucket);
 		return NULL;
 	    }
 	    return bucket;
 	}
     }
-    bucket = open_command_connection(host, user, port, netrcpass);
+    bucket = open_command_connection (host, user, port, netrcpass);
     if (bucket == NULL)
 	return NULL;
-    if (!linklist_insert(connections_list, bucket)) {
+    if (!linklist_insert (connections_list, bucket)) {
 	my_errno = ENOMEM;
-	connection_destructor(bucket);
+	connection_destructor (bucket);
 	return NULL;
     }
     return bucket;
 }
 
 /* The returned directory should always contain a trailing slash */
-static char *ftpfs_get_current_directory(struct connection *bucket)
+static char *
+ftpfs_get_current_directory (struct connection *bucket)
 {
     char buf[4096], *bufp, *bufq;
 
-    if (command(bucket, NONE, "PWD") == COMPLETE &&
+    if (command (bucket, NONE, "PWD") == COMPLETE &&
         get_reply(qsock(bucket), buf, sizeof(buf)) == COMPLETE) {
     	bufp = NULL;
 	for (bufq = buf; *bufq; bufq++)
@@ -900,9 +907,11 @@
     data_addr.sin_port = 0;
     
     pe = getprotobyname("tcp");
-    if (pe == NULL) ERRNOR (EIO, -1);
+    if (pe == NULL)
+	    ERRNOR (EIO, -1);
     data = socket (AF_INET, SOCK_STREAM, pe->p_proto);
-    if (data < 0) ERRNOR (EIO, -1);
+    if (data < 0)
+	    ERRNOR (EIO, -1);
 
 #ifdef ORIGINAL_CONNECT_CODE
     if (bucket->use_source_route){
@@ -965,7 +974,8 @@
         j = command (bucket, WAIT_REPLY, "%s %s", cmd, remote);
     else
     	j = command (bucket, WAIT_REPLY, "%s", cmd);
-    if (j != PRELIM) ERRNOR (EPERM, -1);
+    if (j != PRELIM)
+	    ERRNOR (EPERM, -1);
     enable_interrupt_key();
     if (bucket->use_passive_connection)
 	data = s;
@@ -1222,7 +1232,8 @@
         }
 
     file_list = linklist_init();
-    if (file_list == NULL) ERRNOR (ENOMEM, NULL);
+    if (file_list == NULL)
+	    ERRNOR (ENOMEM, NULL);
     dcache = xmalloc(sizeof(struct dir), 
 		     "struct dir");
     if (dcache == NULL) {
@@ -1384,7 +1395,8 @@
 
     local_handle = open(fe->local_filename, O_RDONLY);
     unlink (fe->local_filename);
-    if (local_handle == -1) ERRNOR (EIO, 0);
+    if (local_handle == -1)
+	    ERRNOR (EIO, 0);
     fstat(local_handle, &s);
     sock = open_data_connection(fe->bucket, "STOR", fe->remote_filename, TYPE_BINARY, 0);
     if (sock < 0) {
@@ -1435,7 +1447,8 @@
     disable_interrupt_key();
     close(sock);
     close(local_handle);
-    if (get_reply (qsock (fe->bucket), NULL, 0) != COMPLETE) ERRNOR (EIO, 0);
+    if (get_reply (qsock (fe->bucket), NULL, 0) != COMPLETE)
+	    ERRNOR (EIO, 0);
     return 1;
 error_return:
     disable_interrupt_key();
@@ -1473,7 +1486,8 @@
 	break;
     }
 
-    if (n<0) linear_abort(fe);
+    if (n<0)
+	    linear_abort(fe);
 
     if (!n) {
         if ((get_reply (qsock (fe->bucket), NULL, 0) != COMPLETE)) {
@@ -1531,7 +1545,8 @@
     vfs_add_noncurrent_stamps (&vfs_ftpfs_ops, (vfsid) bucket, NULL);
     if (flags & OPT_IGNORE_ERROR)
 	r = COMPLETE;
-    if (r != COMPLETE) ERRNOR (EPERM, -1);
+    if (r != COMPLETE)
+	    ERRNOR (EPERM, -1);
     if (flush_directory_cache)
 	flush_all_directory(bucket);
     return 0;
diff -ruN old/mc-4.5.6/vfs/mcfs.c new/mc-4.5.7/vfs/mcfs.c
--- old/mc-4.5.6/vfs/mcfs.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/mcfs.c	Tue Jan 12 22:38:06 1999
@@ -211,7 +211,8 @@
 
 /* This used to be in utilvfs.c, but as it deals with portmapper, it
    is probably usefull for mcfs */
-static int open_tcp_link  (char *host, int *port, int *version, char *caller)
+int
+open_tcp_link  (char *host, int *port, int *version, char *caller)
 {
     struct   sockaddr_in server_address;
     unsigned long inaddr;
diff -ruN old/mc-4.5.6/vfs/sfs.c new/mc-4.5.7/vfs/sfs.c
--- old/mc-4.5.6/vfs/sfs.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/sfs.c	Tue Jan 12 22:38:06 1999
@@ -50,12 +50,12 @@
 #define F_NOLOCALCOPY 4
 #define F_FULLMATCH 8
 
-static int uptodate( char *name, char *cache )
+static int uptodate (char *name, char *cache)
 {
     return 1;
 }
 
-static int vfmake( vfs *me, char *name, char *cache )
+static int vfmake (vfs *me, char *name, char *cache)
 {
     char *inpath, *op;
     int w;
@@ -63,72 +63,77 @@
     char *s, *t = pad;
     int was_percent = 0;
 
-    vfs_split( name, &inpath, &op );
-    if ((w = (*me->which)( me, op )) == -1)
-        vfs_die( "This cannot happen... Hopefully.\n" );
+    vfs_split (name, &inpath, &op);
+    if ((w = (*me->which) (me, op)) == -1)
+        vfs_die ("This cannot happen... Hopefully.\n");
 
-    if ((sfs_flags[w] & F_1) || (!strcmp( name, "/" ))) ; else return -1;
+    if ((sfs_flags[w] & F_1) || (!strcmp (name, "/"))) ; else return -1;
     /*    if ((sfs_flags[w] & F_2) || (!inpath) || (!*inpath)); else return -1; */
     if (!(sfs_flags[w] & F_NOLOCALCOPY))
-        name = mc_getlocalcopy( name );
+        name = mc_getlocalcopy (name);
     else 
-        name = strdup( name );
+        name = strdup (name);
     s = sfs_command[w];
 #define COPY_CHAR if (t-pad>10200) return -1; else *t++ = *s;
-#define COPY_STRING(a) if ((t-pad)+strlen(a)>10200) return -1; else { strcpy( t, a ); t+= strlen(a); }
+#define COPY_STRING(a) if ((t-pad)+strlen(a)>10200) return -1; else { strcpy (t, a); t+= strlen(a); }
     while (*s) {
         if (was_percent) {
 	    switch (*s) {
-	    case '1': COPY_STRING( name ); break;
-	    case '2': COPY_STRING( op + strlen( sfs_prefix[w] ) ); break;
-	    case '3': COPY_STRING( cache ); break;
+	    case '1': COPY_STRING (name); break;
+	    case '2': COPY_STRING (op + strlen (sfs_prefix[w])); break;
+	    case '3': COPY_STRING (cache); break;
 	    case '%': COPY_CHAR; break; 
 	    }
 	    was_percent = 0;
 	} else {
-	    if (*s == '%') was_percent = 1;
-	              else COPY_CHAR;
+	    if (*s == '%')
+		was_percent = 1;
+	    else
+		COPY_CHAR;
 	}
 	s++;
     }
-    free( name );
+    free (name);
 
-    if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID, "/bin/sh", pad)) {
+    if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, "/bin/sh", pad)) {
 	return -1;
     }
 
     return 0; /* OK */
 }
 
-static char *redirect( vfs *me, char *name )
+static char *
+redirect (vfs *me, char *name)
 {
     struct cachedfile *cur = head;
     uid_t uid = vfs_uid;
     char *cache, *xname;
     int handle;
 
-    while (cur) {
-        if ((!strcmp( name, cur->name )) &&
+    while (cur){
+        if ((!strcmp (name, cur->name)) &&
 	    (uid == cur->uid) &&
-	    (uptodate( cur->name, cur->cache )))
-	  /* FIXME: when not uptodate, we might want to kill cache
-	   * file immediately, not to wait until timeout. */ {
-	    vfs_stamp( &vfs_sfs_ops, cur );
-	    return cur->cache;
+	    (uptodate (cur->name, cur->cache)))
+		/* FIXME: when not uptodate, we might want to kill cache
+		 * file immediately, not to wait until timeout. */ {
+		vfs_stamp (&vfs_sfs_ops, cur);
+		return cur->cache;
 	}
 	cur = cur->next;
     }
-    cache = tempnam( NULL, "sfs" );
-    handle = open(cache, O_RDWR | O_CREAT | O_EXCL, 0600);
+
+    cache = tempnam (NULL, "sfs");
+    handle = open (cache, O_RDWR | O_CREAT | O_EXCL, 0600);
     if (handle == -1)
         return "/SOMEONE_PLAYING_DIRTY_TMP_TRICKS_ON_US";
-    close(handle);
 
-    xname = strdup( name );
-    if (!vfmake( me, name, cache )) {
-        cur = xmalloc( sizeof(struct cachedfile), "SFS cache" );
+    close (handle);
+
+    xname = strdup (name);
+    if (!vfmake (me, name, cache)){
+        cur = xmalloc (sizeof(struct cachedfile), "SFS cache");
 	cur->name = xname;
-	cur->cache = strdup(cache);
+	cur->cache = cache;
 	cur->uid = uid;
 	cur->next = head;
 	head = cur;
@@ -143,14 +148,13 @@
     return "/I_MUST_NOT_EXIST";
 }
 
-#define REDIR path = redirect( me, path );
-    
-static void *sfs_open (vfs *me, char *path, int flags, int mode)
+static void *
+sfs_open (vfs *me, char *path, int flags, int mode)
 {
     int *sfs_info;
     int fd;
 
-    REDIR;
+    path = redirect (me, path);
     fd = open (path, flags, mode);
     if (fd == -1)
 	return 0;
@@ -163,13 +167,13 @@
 
 static int sfs_stat (vfs *me, char *path, struct stat *buf)
 {
-    REDIR;
+    path = redirect (me, path);
     return stat (path, buf);
 }
 
 static int sfs_lstat (vfs *me, char *path, struct stat *buf)
 {
-    REDIR;
+    path = redirect (me, path);
 #ifndef HAVE_STATLSTAT
     return lstat (path,buf);
 #else
@@ -179,52 +183,51 @@
 
 static int sfs_chmod (vfs *me, char *path, int mode)
 {
-    REDIR;
+    path = redirect (me, path);
     return chmod (path, mode);
 }
 
 static int sfs_chown (vfs *me, char *path, int owner, int group)
 {
-    REDIR;
+    path = redirect (me, path);
     return chown (path, owner, group);
 }
 
 static int sfs_utime (vfs *me, char *path, struct utimbuf *times)
 {
-    REDIR;
+    path = redirect (me, path);
     return utime (path, times);
 }
 
 static int sfs_readlink (vfs *me, char *path, char *buf, int size)
 {
-    REDIR;
+    path = redirect (me, path);
     return readlink (path, buf, size);
 }
 
-#define CUR (*cur)
 static vfsid sfs_getid (vfs *me, char *path, struct vfs_stamping **parent)
 {	/* FIXME: what should I do? */
     vfs *v;
     vfsid id;
     struct vfs_stamping *par;
-    struct cachedfile **cur = &head;
+    struct cachedfile *cur = head;
 
-    while (CUR) {
-        if ((!strcmp( path, CUR->name )) &&
-	    (vfs_uid == CUR->uid))
+    while (cur) {
+        if ((!strcmp( path, cur->name )) &&
+	    (vfs_uid == cur->uid))
 	    break;
-	CUR = CUR->next;
+	cur = cur->next;
     }
-    if (!CUR)
+    if (!cur)
         vfs_die( "sfs_getid of noncached thingie?" );
 
     *parent = NULL;
 
     {
-        char *path2 = strdup( path );
+        char *path2 = strdup (path);
 	v = vfs_split (path2, NULL, NULL);
 	id = (*v->getid) (v, path2, &par);
-	free( path2 );
+	free (path2);
     }
 
     if (id != (vfsid)-1) {
@@ -240,19 +243,19 @@
 static void sfs_free (vfsid id)
 {
     struct cachedfile *which = (struct cachedfile *) id;
-    struct cachedfile **cur = &head;
+    struct cachedfile *cur, *prev;
 
-    unlink( CUR->cache );
-    while (CUR) {
-        if (CUR == which)
-	    break;
-	CUR = CUR->next;
-    }
-    if (!CUR)
+    for (cur = head, prev = 0; cur && cur != which; prev = cur, cur = cur->next)
+	;
+    if (!cur)
     	vfs_die( "Free of thing which is unknown to me\n" );
-    *cur = CUR->next;
+    unlink (cur->cache);
+
+    if (prev)
+	prev->next = cur->next;
+    else
+	head = cur->next;
 }
-#undef CUR
 
 static void sfs_fill_names (vfs *me, void (*func)(char *))
 {
@@ -273,7 +276,7 @@
 
 static char *sfs_getlocalcopy (vfs *me, char *path)
 {
-    REDIR;
+    path = redirect (me, path);
     return strdup (path);
 }
 
@@ -283,30 +286,37 @@
 
 static int sfs_init (vfs *me)
 {
-    FILE *cfg = fopen( LIBDIR "extfs/sfs.ini", "r" );
-    if (!cfg) {
-        fprintf( stderr, "Warning: " LIBDIR "extfs/sfs.ini not found\n" );
+    FILE *cfg = fopen (LIBDIR "extfs/sfs.ini", "r");
+
+    if (!cfg){
+        fprintf (stderr, "Warning: " LIBDIR "extfs/sfs.ini not found\n");
         return 0;
     }
 
     sfs_no = 0;
-    while ( sfs_no < MAXFS ) {
+    while (sfs_no < MAXFS){
         char key[256];
 	char *c, *semi = NULL, flags = 0;
 	int i;
 
-        if (!fgets( key, 250, cfg ))
+        if (!fgets (key, 250, cfg))
 	    break;
 
 	if (*key == '#')
 	    continue;
 
-	for (i=0; i<strlen(key); i++)
-	    if ((key[i]==':') || (key[i]=='/'))
-  	        { semi = key+i; if (key[i]=='/') { key[i]=0; flags |= F_FULLMATCH; } break; }
+	for (i = 0; i < strlen (key); i++)
+	    if ((key[i]==':') || (key[i]=='/')){
+		semi = key+i;
+		if (key [i] == '/'){
+		    key [i] = 0;
+		    flags |= F_FULLMATCH;
+		}
+		break;
+	    }
 
-	if (!semi) {
-	    fprintf( stderr, "Warning: Invalid line %s in sfs.ini.\n", key );
+	if (!semi){
+	    fprintf (stderr, "Warning: Invalid line %s in sfs.ini.\n", key);
 	    continue;
 	}
 
@@ -317,13 +327,13 @@
 	    case '2': flags |= F_2; break;
 	    case 'R': flags |= F_NOLOCALCOPY; break;
 	    default:
-	      fprintf( stderr, "Warning: Invalid flag %c in sfs.ini line %s.\n", *c, key );
+	      fprintf (stderr, "Warning: Invalid flag %c in sfs.ini line %s.\n", *c, key);
 	    }	    
 	    c++;
 	}
 	c++;
 	*(semi+1) = 0;
-	if ((semi = strchr( c, '\n')))
+	if ((semi = strchr (c, '\n')))
 	    *semi = 0;
 
 	sfs_prefix [sfs_no] = strdup (key);
@@ -331,22 +341,25 @@
 	sfs_flags [sfs_no] = flags;
 	sfs_no++;
     }
-    fclose(cfg);
+    fclose (cfg);
     return 1;
 }
 
-static void sfs_done (vfs *me)
+static void
+sfs_done (vfs *me)
 {
     int i;
-    for (i=0; i<sfs_no; i++) {
-        free(sfs_prefix [i]);
-	free(sfs_command [i]);
+
+    for (i = 0; i < sfs_no; i++){
+        free (sfs_prefix [i]);
+	free (sfs_command [i]);
 	sfs_prefix [i] = sfs_command [i] = NULL;
     }
     sfs_no = 0;
 }
 
-static int sfs_which (vfs *me, char *path)
+static int
+sfs_which (vfs *me, char *path)
 {
     int i;
 
@@ -355,7 +368,7 @@
 	    if (!strcmp (path, sfs_prefix [i]))
 	        return i;
 	} else
-	    if (!strncmp (path, sfs_prefix [i], strlen( sfs_prefix[i]) ))
+	    if (!strncmp (path, sfs_prefix [i], strlen (sfs_prefix [i])))
 	        return i;
 
     
diff -ruN old/mc-4.5.6/vfs/tar.c new/mc-4.5.7/vfs/tar.c
--- old/mc-4.5.6/vfs/tar.c	Wed Jan  6 15:26:12 1999
+++ new/mc-4.5.7/vfs/tar.c	Tue Jan 12 22:38:06 1999
@@ -124,9 +124,13 @@
 
 static union record rec_buf;
 
-static union record *get_next_record (vfs_s_super *archive, int tard)
+static union record *
+get_next_record (vfs_s_super *archive, int tard)
 {
-    if (mc_read (tard, rec_buf.charptr, RECORDSIZE) != RECORDSIZE)
+    int n;
+
+    n = mc_read (tard, rec_buf.charptr, RECORDSIZE);
+    if (n != RECORDSIZE)
 	return NULL;		/* An error has occurred */
     current_tar_position += RECORDSIZE;
     return &rec_buf;
@@ -183,12 +187,19 @@
 }
 
 
+typedef enum {
+    STATUS_BADCHECKSUM,
+    STATUS_SUCCESS,
+    STATUS_EOFMARK,
+    STATUS_EOF,
+} ReadStatus;
 /*
  * Return 1 for success, 0 if the checksum is bad, EOF on eof,
  * 2 for a record full of zeros (EOF marker).
  *
  */
-static int read_header (vfs *me, vfs_s_super *archive, int tard)
+static ReadStatus
+read_header (vfs *me, vfs_s_super *archive, int tard)
 {
     register int i;
     register long sum, signed_sum, recsum;
@@ -204,7 +215,7 @@
 
     header = get_next_record (archive, tard);
     if (NULL == header)
-	return EOF;
+	return STATUS_EOF;
 
     recsum = from_oct (8, header->header.chksum);
 
@@ -227,25 +238,25 @@
     sum += ' ' * sizeof header->header.chksum;
     signed_sum += ' ' * sizeof header->header.chksum;
 
-    if (sum == 8 * ' ') {
-	/*
-	 * This is a zeroed record...whole record is 0's except
-	 * for the 8 blanks we faked for the checksum field.
-	 */
-	return 2;
-    }
+    /*
+     * This is a zeroed record...whole record is 0's except
+     * for the 8 blanks we faked for the checksum field.
+     */
+    if (sum == 8 * ' ')
+	return STATUS_EOFMARK;
+
     if (sum != recsum && signed_sum != recsum)
-	return 0;
+	return STATUS_BADCHECKSUM;
     
     /*
      * linkflag on BSDI tar (pax) always '\000'
      */
-    if(header->header.linkflag == '\000' &&
-       strlen(header->header.arch_name) &&
-       header->header.arch_name[strlen(header->header.arch_name) - 1] == '/')
+    if (header->header.linkflag == '\000' &&
+	strlen(header->header.arch_name) &&
+	header->header.arch_name[strlen(header->header.arch_name) - 1] == '/')
 	header->header.linkflag = LF_DIR;
     
-     /*
+    /*
      * Good record.  Decode file size and return.
      */
     if (header->header.linkflag == LF_LINK || header->header.linkflag == LF_DIR)
@@ -270,7 +281,7 @@
 	    data = get_next_record (archive, tard)->charptr;
 	    if (data == NULL) {
 		message_1s (1, MSG_ERROR, _("Unexpected EOF on archive file"));
-		return 0;
+		return STATUS_BADCHECKSUM;
 	    }
 	    written = RECORDSIZE;
 	    if (written > size)
@@ -325,7 +336,7 @@
 	parent = vfs_s_find_inode (me, archive->root, q, LINK_NO_FOLLOW, FL_MKDIR);
 	if (parent == NULL) {
 	    message_1s (1, MSG_ERROR, _("Inconsistent tar archive"));
-	    return 0;
+	    return STATUS_BADCHECKSUM;
 	}
 
 	if (header->header.linkflag == LF_LINK) {
@@ -357,7 +368,7 @@
 	    while (get_next_record (archive, tard)->ext_hdr.isextended);
 	    inode->u.tar.data_offset = current_tar_position;
 	}
-	return 1;
+	return STATUS_SUCCESS;
     }
 }
 
@@ -367,8 +378,8 @@
  */
 static int open_archive (vfs *me, vfs_s_super *archive, char *name, char *op)
 {
-    int status = 3;		/* Initial status at start of archive */
-    int prev_status;
+    ReadStatus status = STATUS_EOFMARK;		/* Initial status at start of archive */
+    ReadStatus prev_status;
     int tard;
 
     current_tar_position = 0;
@@ -378,33 +389,45 @@
     for (;;) {
 	prev_status = status;
 	status = read_header (me, archive, tard);
+
+
 	switch (status) {
 
-	case 1:		/* Valid header */
-		skip_n_records (archive, tard, (hstat.st_size + RECORDSIZE - 1) / RECORDSIZE);
-		continue;
-	                /*
-			 * If the previous header was good, tell them
-			 * that we are skipping bad ones.
-			 */
-	case 0:		/* Invalid header */
-	    switch (prev_status) {
-	    case 3:		/* Error on first record */
+	case STATUS_SUCCESS:
+	    skip_n_records (archive, tard, (hstat.st_size + RECORDSIZE - 1) / RECORDSIZE);
+	    continue;
+
+	    /*
+	     * Invalid header:
+	     *
+	     * If the previous header was good, tell them
+	     * that we are skipping bad ones.
+	     */
+	case STATUS_BADCHECKSUM:	
+	    switch (prev_status){
+
+		/* Error on first record */
+	    case STATUS_EOFMARK:
 		message_2s (1, MSG_ERROR, _("Hmm,...\n%s\ndoesn't look like a tar archive."), name);
 		/* FALL THRU */
-	    case 2:		/* Error after record of zeroes */
-	    case 1:		/* Error after header rec */
-#if 0
-		message_1s (0, " Warning ", "Skipping to next file header...");
-#endif
-	    case 0:		/* Error after error */
+
+		/* Error after header rec */
+	    case STATUS_SUCCESS:
+		/* Error after error */
+
+	    case STATUS_BADCHECKSUM:
 		return -1;
+
+	    case STATUS_EOF:
+		return 0;
 	    }
 
-	case 2:		/* Record of zeroes */
+	    /* Record of zeroes */
+	case STATUS_EOFMARK:	
 	    status = prev_status;	/* If error after 0's */
 	    /* FALL THRU */
-	case EOF:		/* End of archive */
+
+	case STATUS_EOF:	/* End of archive */
 	    break;
 	}
 	break;
diff -ruN old/mc-4.5.6/vfs/vfs.c new/mc-4.5.7/vfs/vfs.c
--- old/mc-4.5.6/vfs/vfs.c	Wed Jan  6 15:26:13 1999
+++ new/mc-4.5.7/vfs/vfs.c	Tue Jan 12 22:38:06 1999
@@ -116,10 +116,13 @@
 {
     int res;
 
-    if (!vfs) vfs_die("You can not register NULL.");
+    if (!vfs)
+	vfs_die("You can not register NULL.");
+    
     res = (vfs->init) ? (*vfs->init)(vfs) : 1;
 
-    if (!res) return 0;
+    if (!res)
+	return 0;
 
     vfs->next = vfs_list;
     vfs_list = vfs;
@@ -132,7 +135,8 @@
 {
     vfs *vfs;
 
-    if (!path) vfs_die( "vfs_type_from_op got NULL: impossible" );
+    if (!path)
+	vfs_die ("vfs_type_from_op got NULL: impossible");
     
     for (vfs = vfs_list; vfs != &vfs_local_ops; vfs = vfs->next){
         if (vfs->which) {
@@ -156,14 +160,15 @@
     char *semi;
     char *p;
 
-    if (!filename) vfs_die( "vfs_strip_suffix_from_path got NULL: impossible" );
+    if (!filename)
+	vfs_die("vfs_strip_suffix_from_path got NULL: impossible");
     
     p = strdup (filename);
     if (!(semi = strrchr (p, '#')))
 	return p;
 
     for (vfs = vfs_list; vfs != &vfs_local_ops; vfs = vfs->next){
-        if (vfs->which) {
+        if (vfs->which){
 	    if ((*vfs->which) (vfs, semi + 1) == -1)
 		continue;
 	    *semi = '\0'; /* Found valid suffix */
@@ -203,7 +208,8 @@
     char *slash;
     vfs *ret;
 
-    if (!path) vfs_die("Can not split NULL");
+    if (!path)
+	vfs_die("Can not split NULL");
     
     semi = strrchr (path, '#');
     if (!semi || !path_magic(path))
@@ -243,7 +249,9 @@
     char *slash;
     vfs *ret;
 
-    if (!path) vfs_die( "Can not rosplit NULL" );
+    if (!path)
+	vfs_die ("Can not rosplit NULL");
+    
     semi = strrchr (path, '#');
     
     if (!semi || !path_magic (path))
@@ -463,7 +471,8 @@
     int result;
 
     if (!path)
-	vfs_die( "You don't want to pass NULL to mc_setctl." );
+	vfs_die("You don't want to pass NULL to mc_setctl.");
+    
     path = vfs_canon (path);
     vfs = vfs_type (path);    
     result = vfs->setctl ? (*vfs->setctl)(vfs, path, ctlop, arg) : 0;
@@ -693,7 +702,8 @@
 char *
 vfs_canon (char *path)
 {
-    if (!path) vfs_die("Can not canonize NULL");
+    if (!path)
+	vfs_die("Can not canonize NULL");
 
     /* Tilde expansion */
     if (*path == '~'){ 
@@ -726,9 +736,9 @@
      * So we have path of following form:
      * /p1/p2#op/.././././p3#op/p4. Good luck.
      */
-    mad_check( "(pre-canonicalize)", 0);
+    mad_check("(pre-canonicalize)", 0);
     canonicalize_pathname (path);
-    mad_check( "(post-canonicalize)", 0);
+    mad_check("(post-canonicalize)", 0);
 
     return strdup (path);
 }
@@ -1150,9 +1160,16 @@
 void
 vfs_timeout_handler (void)
 {
+    static int locked;
     struct timeval time;
     struct vfs_stamping *stamp, *st;
 
+    /* Avoid recursive invocation, e.g. when one of the free functions
+       calls message_1s */
+    if (locked)
+	return;
+    locked = 1;
+
     gettimeofday (&time, NULL);
     time.tv_sec -= vfs_timeout;
 
@@ -1165,6 +1182,7 @@
         } else
             stamp = stamp->next;
     }
+    locked = 0;
 }
 
 void
@@ -1268,7 +1286,7 @@
 }
 
 /* Following stuff (parse_ls_lga) is used by ftpfs and extfs */
-#define MAXCOLS 30
+#define MAXCOLS		30
 
 static char *columns [MAXCOLS];	/* Points to the string in column n */
 static int   column_ptr [MAXCOLS]; /* Index from 0 to the starting positions of the columns */
@@ -1302,6 +1320,43 @@
 }
 
 static int
+is_dos_date(char *str)
+{
+    if (strlen(str) == 8 && str[2] == str[5] && strchr("\\-/", (int)str[2]) != NULL)
+	return (1);
+
+    return (0);
+}
+
+static int
+is_week (char *str, struct tm *tim)
+{
+    static char *week = "SunMonTueWedThuFriSat";
+    char *pos;
+
+    if((pos=strstr(week, str)) != NULL){
+        if(tim != NULL)
+	    tim->tm_wday = (pos - week)/3;
+	return (1);
+    }
+    return (0);    
+}
+
+static int
+is_month (char *str, struct tm *tim)
+{
+    static char *month = "JanFebMarAprMayJunJulAugSepOctNovDec";
+    char *pos;
+    
+    if((pos=strstr(month, str)) != NULL){
+        if(tim != NULL)
+	    tim->tm_mon = (pos - month)/3;
+	return (1);
+    }
+    return (0);
+}
+
+static int
 is_time (char *str, struct tm *tim)
 {
     char *p, *p2;
@@ -1327,20 +1382,20 @@
     long year;
 
     if (strchr(str,':'))
-        return 0;
+        return (0);
 
     if (strlen(str)!=4)
-        return 0;
+        return (0);
 
     if (sscanf(str, "%ld", &year) != 1)
-        return 0;
+        return (0);
 
     if (year < 1900 || year > 3000)
-        return 0;
+        return (0);
 
     tim->tm_year = (int) (year - 1900);
 
-    return 1;
+    return (1);
 }
 
 /*
@@ -1427,11 +1482,11 @@
 
 int vfs_parse_filedate(int idx, time_t *t)
 {	/* This thing parses from idx in columns[] array */
-    static char *month = "JanFebMarAprMayJunJulAugSepOctNovDec";
-    static char *week = "SunMonTueWedThuFriSat";
-    char *p, *pos;
-    int extfs_format_date = 0;
+
+    char *p;
     struct tm tim;
+    int d[3];
+    int	got_year = 0;
 
     /* Let's setup default time values */
     tim.tm_year = current_year;
@@ -1440,64 +1495,91 @@
     tim.tm_hour = 0;
     tim.tm_min  = 0;
     tim.tm_sec  = 0;
-    tim.tm_isdst = 0;
+    tim.tm_isdst = -1; /* Let mktime() try to guess correct dst offset */
     
     p = columns [idx++];
     
-    if((pos=strstr(week, p)) != NULL){
-        tim.tm_wday = (pos - week)/3;
+    /* We eat weekday name in case of extfs */
+    if(is_week(p, &tim))
 	p = columns [idx++];
-	}
 
-    if((pos=strstr(month, p)) != NULL)
-        tim.tm_mon = (pos - month)/3;
-    else {
-        /* This case should not normaly happen, but in extfs we allow these
-           date formats:
+    /* Month name */
+    if(is_month(p, &tim)){
+	/* And we expect, it followed by day number */
+	if (is_num (idx))
+    	    tim.tm_mday = (int)atol (columns [idx++]);
+	else
+	    return 0; /* No day */
+
+    } else {
+        /* We usually expect:
            Mon DD hh:mm
-           Mon DD YYYY
+           Mon DD  YYYY
+	   But in case of extfs we allow these date formats:
            Mon DD YYYY hh:mm
+	   Mon DD hh:mm YYYY
 	   Wek Mon DD hh:mm:ss YYYY
            MM-DD-YY hh:mm
            where Mon is Jan-Dec, DD, MM, YY two digit day, month, year,
-           YYYY four digit year, hh, mm two digit hour and minute. */
+           YYYY four digit year, hh, mm, ss two digit hour, minute or second. */
 
-        if (strlen (p) == 8 && p [2] == '-' && p [5] == '-'){
-            p [2] = 0;
-            p [5] = 0;
-            tim.tm_mon = (int) atol (p);
-            if (!tim.tm_mon)
-                return 0;
-            else
-                tim.tm_mon--;
-            tim.tm_mday = (int) atol (p + 3);
-            tim.tm_year = (int) atol (p + 6);
-            if (tim.tm_year < 70)
-                tim.tm_year += 70;
-            extfs_format_date = 1;
+	/* Here just this special case with MM-DD-YY */
+        if (is_dos_date(p)){
+            p[2] = p[5] = '-';
+	    
+	    if(sscanf(p, "%2d-%2d-%2d", &d[0], &d[1], &d[2]) == 3){
+	    /*  We expect to get:
+		1. MM-DD-YY
+		2. DD-MM-YY
+		3. YY-MM-DD
+		4. YY-DD-MM  */
+		
+		/* Hmm... maybe, next time :)*/
+		
+		/* At last, MM-DD-YY */
+		d[0]--; /* Months are zerobased */
+		/* Y2K madness */
+		if(d[2] < 70)
+		    d[2] += 100;
+
+        	tim.tm_mon  = d[0];
+        	tim.tm_mday = d[1];
+        	tim.tm_year = d[2];
+		got_year = 1;
+	    } else
+		return 0; /* sscanf failed */
         } else
-            return 0;
+            return 0; /* unsupported format */
     }
 
-    if (!extfs_format_date){
-        if (!is_num (idx))
-	    return 0;
-        tim.tm_mday = (int)atol (columns [idx++]);
-    }
+    /* Here we expect to find time and/or year */
     
     if (is_num (idx)) {
-        if(is_time(columns[idx], &tim) || is_year(columns[idx], &tim)) {
+        if(is_time(columns[idx], &tim) || (got_year = is_year(columns[idx], &tim))) {
 	idx++;
-	 
+
+	/* This is a special case for ctime() or Mon DD YYYY hh:mm */
 	if(is_num (idx) && 
-	    (is_year(columns[idx], &tim) || is_time(columns[idx], &tim)))
-	    idx++; /* time & year or reverse */
-	 } /* only time or date */
+	    ((got_year = is_year(columns[idx], &tim)) || is_time(columns[idx], &tim)))
+		idx++; /* time & year or reverse */
+	} /* only time or date */
     }
     else 
         return 0; /* Nor time or date */
 
-    if ((*t = mktime(&tim)) ==-1)
+    /*
+     * If the date is less than 6 months in the past, it is shown without year
+     * other dates in the past or future are shown with year but without time
+     * This does not check for years before 1900 ... I don't know, how
+     * to represent them at all
+     */
+    if (!got_year &&
+	current_mon < 6 && current_mon < tim.tm_mon && 
+	tim.tm_mon - current_mon >= 6)
+
+	tim.tm_year--;
+
+    if ((*t = mktime(&tim)) < 0)
         *t = 0;
     return idx;
 }
@@ -1505,7 +1587,7 @@
 int
 vfs_parse_ls_lga (char *p, struct stat *s, char **filename, char **linkname)
 {
-    int idx, idx2, num_cols, isconc = 0;
+    int idx, idx2, num_cols;
     int i;
     char *p_copy;
     
@@ -1552,20 +1634,17 @@
 
     /* Mhm, the ls -lg did not produce a group field */
     for (idx = 3; idx <= 5; idx++) 
-        if ((*columns [idx] >= 'A' && *columns [idx] <= 'S' &&
-            strlen (columns[idx]) == 3) || (strlen (columns[idx])==8 &&
-            columns [idx][2] == '-' && columns [idx][5] == '-'))
+        if (is_month(columns [idx], NULL) || is_week(columns [idx], NULL) || is_dos_date(columns[idx]))
             break;
+
     if (idx == 6 || (idx == 5 && !S_ISCHR (s->st_mode) && !S_ISBLK (s->st_mode)))
-        goto error;
-    if (idx < 5){
-        char *p = strchr(columns [idx - 1], ',');
-        if (p && p[1] >= '0' && p[1] <= '9')
-            isconc = 1;
-    }
-    if (idx == 3 || (idx == 4 && !isconc && (S_ISCHR(s->st_mode) || S_ISBLK (s->st_mode))))
+	goto error;
+
+    /* We don't have gid */	
+    if (idx == 3 || (idx == 4 && (S_ISCHR(s->st_mode) || S_ISBLK (s->st_mode))))
         idx2 = 2;
-    else {
+    else { 
+	/* We have gid field */
 	if (is_num (2))
 	    s->st_gid = (gid_t) atol (columns [2]);
 	else
@@ -1573,29 +1652,23 @@
 	idx2 = 3;
     }
 
+    /* This is device */
     if (S_ISCHR (s->st_mode) || S_ISBLK (s->st_mode)){
-        char *p;
-	if (!is_num (idx2))
+	int maj, min;
+	
+	if (!is_num (idx2) || sscanf(columns [idx2], " %d,", &maj) != 1)
+	    goto error;
+	
+	if (!is_num (++idx2) || sscanf(columns [idx2], " %d", &min) != 1)
 	    goto error;
-#ifdef HAVE_ST_RDEV
-	s->st_rdev = (atol (columns [idx2]) & 0xff) << 8;
-#endif
-	if (isconc){
-	    p = strchr (columns [idx2], ',');
-	    if (!p || p [1] < '0' || p [1] > '9')
-	        goto error;
-	    p++;
-	} else {
-	    p = columns [idx2 + 1];
-	    if (!is_num (idx2+1))
-	        goto error;
-	}
 	
 #ifdef HAVE_ST_RDEV
-	s->st_rdev |= (atol (p) & 0xff);
+	s->st_rdev = ((maj & 0xff) << 8) | (min & 0xffff00ff);
 #endif
 	s->st_size = 0;
+	
     } else {
+	/* Common file size */
 	if (!is_num (idx2))
 	    goto error;
 	
diff -ruN old/mc-4.5.6/vfs/vfs.h new/mc-4.5.7/vfs/vfs.h
--- old/mc-4.5.6/vfs/vfs.h	Wed Jan  6 15:26:13 1999
+++ new/mc-4.5.7/vfs/vfs.h	Tue Jan 12 22:38:06 1999
@@ -2,6 +2,7 @@
 #define __VFS_H
 
 #include <config.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <dirent.h>
 
@@ -9,7 +10,7 @@
 #include "src/mad.h"
 #endif
 
-#if !defined(SCO_FLAVOR) || !defined(_SYS_SELECT_H)
+#if !defined(SCO_FLAVOR) || !defined(_SYS_SELECT_H) || defined(IS_AIX)
 #	include <sys/time.h>	/* alex: this redefines struct timeval */
 #endif /* SCO_FLAVOR */
 
@@ -241,7 +242,7 @@
 #   define vfs_current_is_tarfs() 0
 #   define vfs_current_is_extfs() 0
 #   define vfs_path(x) x
-#   define vfs_strip_suffix_from_filename (x) strdup(x)
+#   define vfs_strip_suffix_from_filename(x) strdup(x)
 #   define mc_close close
 #   define mc_read read
 #   define mc_write write
@@ -273,7 +274,8 @@
 #   define mc_munmap munmap
 
 #   define mc_ctl(a,b,c) 0
-#   define mc_setctl(a,b,c)
+#   define mc_setctl(a,b,c) 0
+#   define vfs_translate_url strdup(s)
 
 #   define mc_stat stat
 #   define mc_mknod mknod
diff -ruN old/mc-4.5.6/vfs/xdirentry.h new/mc-4.5.7/vfs/xdirentry.h
--- old/mc-4.5.6/vfs/xdirentry.h	Wed Jan  6 15:26:13 1999
+++ new/mc-4.5.7/vfs/xdirentry.h	Tue Jan 12 22:38:06 1999
@@ -145,35 +145,52 @@
 };
 
 /* entries and inodes */
-vfs_s_inode *vfs_s_new_inode (vfs *me, vfs_s_super *super, struct stat *initstat);
-vfs_s_entry *vfs_s_new_entry (vfs *me, char *name, vfs_s_inode *inode);
-void vfs_s_free_entry (vfs *me, vfs_s_entry *ent);
-void vfs_s_insert_entry (vfs *me, vfs_s_inode *dir, vfs_s_entry *ent);
-struct stat *vfs_s_default_stat (vfs *me, mode_t mode);
-void vfs_s_add_dots (vfs *me, vfs_s_inode *dir, vfs_s_inode *parent);
-struct vfs_s_entry *vfs_s_generate_entry (vfs *me, char *name, struct vfs_s_inode *parent, mode_t mode);
-vfs_s_entry *vfs_s_automake(vfs *me, vfs_s_inode *dir, char *path, int flags);
-vfs_s_entry *vfs_s_find_entry_tree(vfs *me, vfs_s_inode *root, char *path, int follow, int flags);
-vfs_s_entry *vfs_s_find_entry_linear(vfs *me, vfs_s_inode *root, char *path, int follow, int flags);
-vfs_s_inode *vfs_s_find_inode(vfs *me, vfs_s_inode *root, char *path, int follow, int flags);
-vfs_s_inode *vfs_s_find_root(vfs *me, vfs_s_entry *entry);
-struct vfs_s_entry *vfs_s_resolve_symlink (vfs *me,  vfs_s_entry *entry, int follow);
+vfs_s_inode *vfs_s_new_inode         (vfs *me, vfs_s_super *super,
+				      struct stat *initstat);
+vfs_s_entry *vfs_s_new_entry         (vfs *me, char *name, vfs_s_inode *inode);
+void         vfs_s_free_entry        (vfs *me, vfs_s_entry *ent);
+void         vfs_s_insert_entry      (vfs *me, vfs_s_inode *dir,
+				      vfs_s_entry *ent);
+struct stat *vfs_s_default_stat      (vfs *me, mode_t mode);
+
+void         vfs_s_add_dots          (vfs *me, vfs_s_inode *dir,
+				      vfs_s_inode *parent);
+vfs_s_entry *vfs_s_generate_entry    (vfs *me, char *name,
+				      struct vfs_s_inode *parent, mode_t mode);
+vfs_s_entry *vfs_s_automake          (vfs *me, vfs_s_inode *dir, char *path,
+				      int flags);
+vfs_s_entry *vfs_s_find_entry_tree   (vfs *me, vfs_s_inode *root, char *path,
+				      int follow, int flags);
+vfs_s_entry *vfs_s_find_entry_linear (vfs *me, vfs_s_inode *root, char *path,
+				      int follow, int flags);
+vfs_s_inode *vfs_s_find_inode        (vfs *me, vfs_s_inode *root, char *path,
+				      int follow, int flags);
+vfs_s_inode *vfs_s_find_root         (vfs *me, vfs_s_entry *entry);
+vfs_s_entry *vfs_s_resolve_symlink   (vfs *me,  vfs_s_entry *entry,
+				      int follow);
+
 /* superblock games */
-vfs_s_super *vfs_s_new_super (vfs *me);
-void vfs_s_free_super (vfs *me, vfs_s_super *super); 
+vfs_s_super *vfs_s_new_super         (vfs *me);
+void vfs_s_free_super                (vfs *me, vfs_s_super *super); 
+
 /* outside interface */
-char *vfs_s_get_path_mangle (vfs *me, char *inname, vfs_s_super **archive, int flags);
-char *vfs_s_get_path (vfs *me, char *inname, vfs_s_super **archive, int flags);
-void vfs_s_invalidate (vfs *me, vfs_s_super *super);
+char *vfs_s_get_path_mangle          (vfs *me, char *inname, vfs_s_super **archive,
+				      int flags);
+char *vfs_s_get_path                 (vfs *me, char *inname, vfs_s_super **archive,
+				      int flags);
+void  vfs_s_invalidate               (vfs *me, vfs_s_super *super);
+char *vfs_s_fullpath                 (vfs *me, vfs_s_inode *ino);
+
 /* readdir & friends */
-vfs_s_super *vfs_s_super_from_path (vfs *me, char *name);
-vfs_s_inode *vfs_s_inode_from_path (vfs *me, char *name, int flags);
-void * vfs_s_opendir (vfs *me, char *dirname);
-void * vfs_s_readdir (void *data);
+vfs_s_super *vfs_s_super_from_path   (vfs *me, char *name);
+vfs_s_inode *vfs_s_inode_from_path   (vfs *me, char *name, int flags);
+void *vfs_s_opendir (vfs *me, char *dirname);
+void *vfs_s_readdir (void *data);
 int vfs_s_telldir (void *data);
 void vfs_s_seekdir (void *data, int offset);
 int vfs_s_closedir (void *data);
 int vfs_s_chdir (vfs *me, char *path);
+
 /* stat & friends */
 int vfs_s_stat (vfs *me, char *path, struct stat *buf);
 int vfs_s_lstat (vfs *me, char *path, struct stat *buf);
@@ -184,16 +201,19 @@
 int vfs_s_write (void *fh, char *buffer, int count);
 int vfs_s_lseek (void *fh, off_t offset, int whence);
 int vfs_s_close (void *fh);
+
 /* mc support */
 void vfs_s_fill_names (vfs *me, void (*func)(char *));
 int vfs_s_ferrno(vfs *me);
 void vfs_s_dump(vfs *me, char *prefix, vfs_s_inode *ino);
 char *vfs_s_getlocalcopy (vfs *me, char *path);
+
 /* stamping support */
 vfsid vfs_s_getid (vfs *me, char *path, struct vfs_stamping **parent);
 int vfs_s_nothingisopen (vfsid id);
 void vfs_s_free (vfsid id);
 int vfs_s_setctl (vfs *me, char *path, int ctlop, char *arg);
+
 /* network filesystems support */
 int vfs_s_select_on_two (int fd1, int fd2);
 int vfs_s_get_line (vfs *me, int sock, char *buf, int buf_len, char term);