diff -ruN old/mc-4.5.28/Specfile new/mc-4.5.29/Specfile
--- old/mc-4.5.28/Specfile	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/Specfile	Tue Mar 30 01:34:33 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver      4.5.28
+%define ver      4.5.29
 %define rel      1
 %define prefix  /usr
 
diff -ruN old/mc-4.5.28/VERSION new/mc-4.5.29/VERSION
--- old/mc-4.5.28/VERSION	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/VERSION	Tue Mar 30 01:34:33 1999
@@ -1 +1 @@
-#define VERSION "4.5.28"
+#define VERSION "4.5.29"
diff -ruN old/mc-4.5.28/aclocal.m4 new/mc-4.5.29/aclocal.m4
--- old/mc-4.5.28/aclocal.m4	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/aclocal.m4	Tue Mar 30 01:34:33 1999
@@ -1764,9 +1764,12 @@
 dnl     Sets termnet  to true or false depending on whether it is required.
 dnl        If yes, defines USE_TERMNET.
 dnl     Sets vfs_flags to "pretty" list of vfs implementations we include.
+dnl     Sets shell variable use_vfs to yes (default, --with-vfs) or
+dnl        "no" (--without-vfs).
 dnl     Calls AC_SUBST(mcserv), which is either empty or "mcserv".
 
-AC_DEFUN([GNOME_VFS_CHECKS],[
+dnl Private define
+AC_DEFUN([GNOME_WITH_VFS],[
   dnl FIXME: network checks should probably be in their own macro.
   AC_CHECK_LIB(nsl, t_accept)
   AC_CHECK_LIB(socket, socket)
@@ -1793,7 +1796,6 @@
     done
   fi
 
-
   vfs_flags="tarfs"
   use_net_code=false
   if test $have_socket = yes; then
@@ -1834,9 +1836,30 @@
 	TERMNET="-ltermnet"
      fi
   fi
+
   AC_SUBST(TERMNET)
   AC_SUBST(mcserv)
+
+dnl FIXME:
+dnl GNOME_VFS_LIBS=
+
 ])
+
+AC_DEFUN([GNOME_VFS_CHECKS],[
+	use_vfs=yes
+	AC_ARG_WITH(vfs,
+		[--with-vfs		   Compile with the VFS code],
+		use_vfs=$withval
+	)
+	case $use_vfs in
+		yes) 	GNOME_WITH_VFS;;
+		no) 	use_vfs=no;;
+		*)   	use_vfs=no;;
+			dnl Should we issue a warning?
+	esac
+])
+
+
 
 dnl
 dnl Check for struct linger
diff -ruN old/mc-4.5.28/configure new/mc-4.5.29/configure
--- old/mc-4.5.28/configure	Fri Mar 26 15:30:37 1999
+++ new/mc-4.5.29/configure	Tue Mar 30 01:34:33 1999
@@ -26,6 +26,8 @@
 ac_help="$ac_help
   --with-x                use the X Window System"
 ac_help="$ac_help
+--with-vfs		   Compile with the VFS code"
+ac_help="$ac_help
 --with-termnet             If you want a termified net support"
 ac_help="$ac_help
 --with-sco                 Use this to turn on SCO-specific code"
@@ -48,8 +50,6 @@
 ac_help="$ac_help
   --with-gnome            Specify prefix for GNOME files"
 ac_help="$ac_help
---with-termnet             If you want a termified net support"
-ac_help="$ac_help
 --with-subshell            If you want to use a concurrent shell"
 ac_help="$ac_help
 --with-debug               For use by developers only: activates -Wall and MAD"
@@ -66,8 +66,6 @@
 ac_help="$ac_help
 --with-slang		   Compile with the slang screen manager"
 ac_help="$ac_help
---with-vfs		   Compile with the VFS code"
-ac_help="$ac_help
 --with-edit                Define INTERNAL_EDIT"
 ac_help="$ac_help
 --with-netrc               Compile with ftp .netrc support"
@@ -586,7 +584,7 @@
 
 
 PACKAGE=mc
-VERSION=4.5.28
+VERSION=4.5.29
 cat >> confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -606,7 +604,7 @@
 unset CFLAGS
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:610: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:608: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -635,7 +633,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:639: checking for $ac_word" >&5
+echo "configure:637: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -665,7 +663,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:669: checking for $ac_word" >&5
+echo "configure:667: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -716,7 +714,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:720: checking for $ac_word" >&5
+echo "configure:718: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -748,7 +746,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:752: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:750: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -759,12 +757,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 763 "configure"
+#line 761 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -790,12 +788,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:794: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:792: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:799: checking whether we are using GNU C" >&5
+echo "configure:797: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -804,7 +802,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -823,7 +821,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:827: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:825: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -855,7 +853,7 @@
 fi
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:859: checking how to run the C preprocessor" >&5
+echo "configure:857: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -870,13 +868,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 874 "configure"
+#line 872 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -887,13 +885,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 891 "configure"
+#line 889 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:897: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -904,13 +902,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 908 "configure"
+#line 906 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -937,7 +935,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:941: checking for $ac_word" >&5
+echo "configure:939: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -965,7 +963,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:969: checking whether ln -s works" >&5
+echo "configure:967: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -990,7 +988,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:994: checking for $ac_word" >&5
+echo "configure:992: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1036,7 +1034,7 @@
 
 
 echo $ac_n "checking whether we are using GNU make""... $ac_c" 1>&6
-echo "configure:1040: checking whether we are using GNU make" >&5
+echo "configure:1038: checking whether we are using GNU make" >&5
 set dummy ${MAKE-make}; ac_make=$2
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_make'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1062,9 +1060,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:1066: checking for AIX" >&5
+echo "configure:1064: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 1068 "configure"
+#line 1066 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -1087,17 +1085,17 @@
 
 ac_safe=`echo "minix/config.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for minix/config.h""... $ac_c" 1>&6
-echo "configure:1091: checking for minix/config.h" >&5
+echo "configure:1089: checking for minix/config.h" >&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 1096 "configure"
+#line 1094 "configure"
 #include "confdefs.h"
 #include <minix/config.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1101: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1135,7 +1133,7 @@
 fi
 
 echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:1139: checking for POSIXized ISC" >&5
+echo "configure:1137: checking for POSIXized ISC" >&5
 if test -d /etc/conf/kconfig.d &&
   grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
 then
@@ -1156,7 +1154,7 @@
 fi
 
 echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6
-echo "configure:1160: checking for ${CC-cc} option to accept ANSI C" >&5
+echo "configure:1158: checking for ${CC-cc} option to accept ANSI C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1166,7 +1164,7 @@
 do
   CFLAGS="$ac_save_CFLAGS $ac_arg"
   cat > conftest.$ac_ext <<EOF
-#line 1170 "configure"
+#line 1168 "configure"
 #include "confdefs.h"
 #include <signal.h>
 #if !defined(__STDC__) || __STDC__ != 1
@@ -1180,7 +1178,7 @@
 struct s2 {int (*f) (double a);};
 ; return 0; }
 EOF
-if { (eval echo configure:1184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1182: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_cc_stdc="$ac_arg"; break
 else
@@ -1200,19 +1198,19 @@
 esac
 
 echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6
-echo "configure:1204: checking whether sys/types.h defines makedev" >&5
+echo "configure:1202: checking whether sys/types.h defines makedev" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1209 "configure"
+#line 1207 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 int main() {
 return makedev(0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_sys_types_h_makedev=yes
 else
@@ -1230,17 +1228,17 @@
 if test $ac_cv_header_sys_types_h_makedev = no; then
 ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6
-echo "configure:1234: checking for sys/mkdev.h" >&5
+echo "configure:1232: checking for sys/mkdev.h" >&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 1239 "configure"
+#line 1237 "configure"
 #include "confdefs.h"
 #include <sys/mkdev.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1268,17 +1266,17 @@
   if test $ac_cv_header_sys_mkdev_h = no; then
 ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6
-echo "configure:1272: checking for sys/sysmacros.h" >&5
+echo "configure:1270: checking for sys/sysmacros.h" >&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 1277 "configure"
+#line 1275 "configure"
 #include "confdefs.h"
 #include <sys/sysmacros.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1282: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1280: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1306,12 +1304,12 @@
 fi
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:1310: checking for working const" >&5
+echo "configure:1308: checking for working const" >&5
 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1315 "configure"
+#line 1313 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -1360,7 +1358,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:1364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1362: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -1383,7 +1381,7 @@
 # Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1387: checking for $ac_word" >&5
+echo "configure:1385: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1419,7 +1417,7 @@
 # Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1423: checking for $ac_word" >&5
+echo "configure:1421: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1455,7 +1453,7 @@
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1459: checking for $ac_word" >&5
+echo "configure:1457: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1491,7 +1489,7 @@
 # Extract the first word of "chmod", so it can be a program name with args.
 set dummy chmod; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1495: checking for $ac_word" >&5
+echo "configure:1493: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1527,7 +1525,7 @@
 # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1531: checking for $ac_word" >&5
+echo "configure:1529: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1564,7 +1562,7 @@
 # Extract the first word of "uname", so it can be a program name with args.
 set dummy uname; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1568: checking for $ac_word" >&5
+echo "configure:1566: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_system'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1596,7 +1594,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1600: checking for $ac_word" >&5
+echo "configure:1598: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_X11_WWW'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1631,12 +1629,12 @@
 
 ALL_LINGUAS="cs da de es fr it ko no pl ru ro"
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:1635: checking for ANSI C header files" >&5
+echo "configure:1633: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1640 "configure"
+#line 1638 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -1644,7 +1642,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1661,7 +1659,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1665 "configure"
+#line 1663 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -1679,7 +1677,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 1683 "configure"
+#line 1681 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -1700,7 +1698,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 1704 "configure"
+#line 1702 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1711,7 +1709,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:1713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -1735,21 +1733,21 @@
 fi
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:1739: checking for inline" >&5
+echo "configure:1737: checking for inline" >&5
 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 1746 "configure"
+#line 1744 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -1775,12 +1773,12 @@
 esac
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:1779: checking for off_t" >&5
+echo "configure:1777: 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 1784 "configure"
+#line 1782 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1808,12 +1806,12 @@
 fi
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:1812: checking for size_t" >&5
+echo "configure:1810: checking for size_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1817 "configure"
+#line 1815 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -1843,19 +1841,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:1847: checking for working alloca.h" >&5
+echo "configure:1845: 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 1852 "configure"
+#line 1850 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -1876,12 +1874,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:1880: checking for alloca" >&5
+echo "configure:1878: 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 1885 "configure"
+#line 1883 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -1909,7 +1907,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -1941,12 +1939,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:1945: checking whether alloca needs Cray hooks" >&5
+echo "configure:1943: 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 1950 "configure"
+#line 1948 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -1971,12 +1969,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:1975: checking for $ac_func" >&5
+echo "configure:1973: 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 1980 "configure"
+#line 1978 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -1999,7 +1997,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2026,7 +2024,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2030: checking stack direction for C alloca" >&5
+echo "configure:2028: 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
@@ -2034,7 +2032,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 2038 "configure"
+#line 2036 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -2053,7 +2051,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -2078,17 +2076,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2082: checking for $ac_hdr" >&5
+echo "configure:2080: 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 2087 "configure"
+#line 2085 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2117,12 +2115,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2121: checking for $ac_func" >&5
+echo "configure:2119: 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 2126 "configure"
+#line 2124 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2145,7 +2143,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2170,7 +2168,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2174: checking for working mmap" >&5
+echo "configure:2172: 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
@@ -2178,7 +2176,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2182 "configure"
+#line 2180 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -2318,7 +2316,7 @@
 }
 
 EOF
-if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -2346,17 +2344,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2350: checking for $ac_hdr" >&5
+echo "configure:2348: 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 2355 "configure"
+#line 2353 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2386,12 +2384,12 @@
 __argz_count __argz_stringify __argz_next
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2390: checking for $ac_func" >&5
+echo "configure:2388: 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 2395 "configure"
+#line 2393 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2414,7 +2412,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2443,12 +2441,12 @@
      for ac_func in stpcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2447: checking for $ac_func" >&5
+echo "configure:2445: 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 2452 "configure"
+#line 2450 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2471,7 +2469,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2505,19 +2503,19 @@
 
    if test $ac_cv_header_locale_h = yes; then
     echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:2509: checking for LC_MESSAGES" >&5
+echo "configure:2507: checking for LC_MESSAGES" >&5
 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2514 "configure"
+#line 2512 "configure"
 #include "confdefs.h"
 #include <locale.h>
 int main() {
 return LC_MESSAGES
 ; return 0; }
 EOF
-if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   am_cv_val_LC_MESSAGES=yes
 else
@@ -2538,7 +2536,7 @@
     fi
   fi
    echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:2542: checking whether NLS is requested" >&5
+echo "configure:2540: checking whether NLS is requested" >&5
         # Check whether --enable-nls or --disable-nls was given.
 if test "${enable_nls+set}" = set; then
   enableval="$enable_nls"
@@ -2558,7 +2556,7 @@
 EOF
 
       echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:2562: checking whether included gettext is requested" >&5
+echo "configure:2560: checking whether included gettext is requested" >&5
       # Check whether --with-included-gettext or --without-included-gettext was given.
 if test "${with_included_gettext+set}" = set; then
   withval="$with_included_gettext"
@@ -2577,17 +2575,17 @@
 
 	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:2581: checking for libintl.h" >&5
+echo "configure:2579: checking for libintl.h" >&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 2586 "configure"
+#line 2584 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2604,19 +2602,19 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:2608: checking for gettext in libc" >&5
+echo "configure:2606: checking for gettext in libc" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2613 "configure"
+#line 2611 "configure"
 #include "confdefs.h"
 #include <libintl.h>
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libc=yes
 else
@@ -2632,7 +2630,7 @@
 
 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
 	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:2636: checking for bindtextdomain in -lintl" >&5
+echo "configure:2634: checking for bindtextdomain in -lintl" >&5
 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2640,7 +2638,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2644 "configure"
+#line 2642 "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
@@ -2651,7 +2649,7 @@
 bindtextdomain()
 ; return 0; }
 EOF
-if { (eval echo configure:2655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2667,19 +2665,19 @@
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:2671: checking for gettext in libintl" >&5
+echo "configure:2669: checking for gettext in libintl" >&5
 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2676 "configure"
+#line 2674 "configure"
 #include "confdefs.h"
 
 int main() {
 return (int) gettext ("")
 ; return 0; }
 EOF
-if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   gt_cv_func_gettext_libintl=yes
 else
@@ -2707,7 +2705,7 @@
 	      # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2711: checking for $ac_word" >&5
+echo "configure:2709: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2741,12 +2739,12 @@
 		for ac_func in dcgettext
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2745: checking for $ac_func" >&5
+echo "configure:2743: 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 2750 "configure"
+#line 2748 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2769,7 +2767,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -2796,7 +2794,7 @@
 		# Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2800: checking for $ac_word" >&5
+echo "configure:2798: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2832,7 +2830,7 @@
 		# Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2836: checking for $ac_word" >&5
+echo "configure:2834: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2864,7 +2862,7 @@
 fi
 
 		cat > conftest.$ac_ext <<EOF
-#line 2868 "configure"
+#line 2866 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -2872,7 +2870,7 @@
 			       return _nl_msg_cat_cntr
 ; return 0; }
 EOF
-if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   CATOBJEXT=.gmo
 		   DATADIRNAME=share
@@ -2895,7 +2893,7 @@
 
         if test "$CATOBJEXT" = "NONE"; then
 	  echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6
-echo "configure:2899: checking whether catgets can be used" >&5
+echo "configure:2897: checking whether catgets can be used" >&5
 	  # Check whether --with-catgets or --without-catgets was given.
 if test "${with_catgets+set}" = set; then
   withval="$with_catgets"
@@ -2908,7 +2906,7 @@
 
 	  if test "$nls_cv_use_catgets" = "yes"; then
 	    	    echo $ac_n "checking for main in -li""... $ac_c" 1>&6
-echo "configure:2912: checking for main in -li" >&5
+echo "configure:2910: checking for main in -li" >&5
 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2916,14 +2914,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-li  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2920 "configure"
+#line 2918 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:2927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2951,12 +2949,12 @@
 fi
 
 	    echo $ac_n "checking for catgets""... $ac_c" 1>&6
-echo "configure:2955: checking for catgets" >&5
+echo "configure:2953: checking for catgets" >&5
 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2960 "configure"
+#line 2958 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char catgets(); below.  */
@@ -2979,7 +2977,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_catgets=yes"
 else
@@ -3001,7 +2999,7 @@
 	       # Extract the first word of "gencat", so it can be a program name with args.
 set dummy gencat; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3005: checking for $ac_word" >&5
+echo "configure:3003: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3037,7 +3035,7 @@
 		 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3041: checking for $ac_word" >&5
+echo "configure:3039: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3074,7 +3072,7 @@
 		   # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3078: checking for $ac_word" >&5
+echo "configure:3076: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3109,7 +3107,7 @@
 		 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3113: checking for $ac_word" >&5
+echo "configure:3111: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3167,7 +3165,7 @@
         # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3171: checking for $ac_word" >&5
+echo "configure:3169: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3201,7 +3199,7 @@
         # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3205: checking for $ac_word" >&5
+echo "configure:3203: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3237,7 +3235,7 @@
         # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3241: checking for $ac_word" >&5
+echo "configure:3239: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3327,7 +3325,7 @@
        LINGUAS=
      else
        echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3331: checking for catalogs to be installed" >&5
+echo "configure:3329: checking for catalogs to be installed" >&5
        NEW_LINGUAS=
        for lang in ${LINGUAS=$ALL_LINGUAS}; do
          case "$ALL_LINGUAS" in
@@ -3355,17 +3353,17 @@
    if test "$CATOBJEXT" = ".cat"; then
      ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3359: checking for linux/version.h" >&5
+echo "configure:3357: checking for linux/version.h" >&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 3364 "configure"
+#line 3362 "configure"
 #include "confdefs.h"
 #include <linux/version.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3369: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3525,7 +3523,7 @@
   # Extract the first word of "glib-config", so it can be a program name with args.
 set dummy glib-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3529: checking for $ac_word" >&5
+echo "configure:3527: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3560,7 +3558,7 @@
 
   min_glib_version=1.2.0
   echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6
-echo "configure:3564: checking for GLIB - version >= $min_glib_version" >&5
+echo "configure:3562: checking for GLIB - version >= $min_glib_version" >&5
   no_glib=""
   if test "$GLIB_CONFIG" = "no" ; then
     no_glib=yes
@@ -3583,7 +3581,7 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat > conftest.$ac_ext <<EOF
-#line 3587 "configure"
+#line 3585 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -3659,7 +3657,7 @@
 }
 
 EOF
-if { (eval echo configure:3663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -3693,7 +3691,7 @@
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           cat > conftest.$ac_ext <<EOF
-#line 3697 "configure"
+#line 3695 "configure"
 #include "confdefs.h"
 
 #include <glib.h>
@@ -3703,7 +3701,7 @@
  return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); 
 ; return 0; }
 EOF
-if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    echo "*** The test program compiled, but did not run. This usually means"
           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
@@ -3786,7 +3784,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3790: checking for a BSD compatible install" >&5
+echo "configure:3788: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3842,17 +3840,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3846: checking for $ac_hdr" >&5
+echo "configure:3844: 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 3851 "configure"
+#line 3849 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3882,17 +3880,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3886: checking for $ac_hdr" >&5
+echo "configure:3884: 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 3891 "configure"
+#line 3889 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3924,12 +3922,12 @@
 fi
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3928: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3926: checking for sys/wait.h that is POSIX.1 compatible" >&5
 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3933 "configure"
+#line 3931 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3945,7 +3943,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3947: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3970,12 +3968,12 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3974: checking for $ac_hdr that defines DIR" >&5
+echo "configure:3972: checking for $ac_hdr that defines DIR" >&5
 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3979 "configure"
+#line 3977 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_hdr>
@@ -3983,7 +3981,7 @@
 DIR *dirp = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:3987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3985: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   eval "ac_cv_header_dirent_$ac_safe=yes"
 else
@@ -4008,7 +4006,7 @@
 # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
 if test $ac_header_dirent = dirent.h; then
 echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4012: checking for opendir in -ldir" >&5
+echo "configure:4010: checking for opendir in -ldir" >&5
 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4016,7 +4014,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldir  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4020 "configure"
+#line 4018 "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
@@ -4027,7 +4025,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4049,7 +4047,7 @@
 
 else
 echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4053: checking for opendir in -lx" >&5
+echo "configure:4051: checking for opendir in -lx" >&5
 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4057,7 +4055,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lx  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4061 "configure"
+#line 4059 "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
@@ -4068,7 +4066,7 @@
 opendir()
 ; return 0; }
 EOF
-if { (eval echo configure:4072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4070: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4092,7 +4090,7 @@
 
 
 echo $ac_n "checking filename fits on dirent.d_name""... $ac_c" 1>&6
-echo "configure:4096: checking filename fits on dirent.d_name" >&5
+echo "configure:4094: checking filename fits on dirent.d_name" >&5
 if eval "test \"`echo '$''{'ac_cv_dnamesize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4106,7 +4104,7 @@
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 4110 "configure"
+#line 4108 "configure"
 #include "confdefs.h"
 
 #include <src/fs.h>
@@ -4123,7 +4121,7 @@
 
 
 EOF
-if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
     ac_cv_dnamesize="no"
@@ -4152,12 +4150,12 @@
 echo "$ac_t""$ac_cv_dnamesize" 1>&6
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4156: checking for ANSI C header files" >&5
+echo "configure:4154: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4161 "configure"
+#line 4159 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4165,7 +4163,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4169: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4182,7 +4180,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4186 "configure"
+#line 4184 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4200,7 +4198,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4204 "configure"
+#line 4202 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4221,7 +4219,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4225 "configure"
+#line 4223 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4232,7 +4230,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4264,12 +4262,12 @@
 
 
 echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6
-echo "configure:4268: checking for st_blksize in struct stat" >&5
+echo "configure:4266: 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 4273 "configure"
+#line 4271 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4277,7 +4275,7 @@
 struct stat s; s.st_blksize;
 ; return 0; }
 EOF
-if { (eval echo configure:4281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blksize=yes
 else
@@ -4298,12 +4296,12 @@
 fi
 
 echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
-echo "configure:4302: checking for st_blocks in struct stat" >&5
+echo "configure:4300: 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 4307 "configure"
+#line 4305 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4311,7 +4309,7 @@
 struct stat s; s.st_blocks;
 ; return 0; }
 EOF
-if { (eval echo configure:4315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_blocks=yes
 else
@@ -4334,12 +4332,12 @@
 fi
 
 echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
-echo "configure:4338: checking for st_rdev in struct stat" >&5
+echo "configure:4336: 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 4343 "configure"
+#line 4341 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -4347,7 +4345,7 @@
 struct stat s; s.st_rdev;
 ; return 0; }
 EOF
-if { (eval echo configure:4351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_st_rdev=yes
 else
@@ -4372,12 +4370,12 @@
 for ac_func in strerror statfs getwd strcasecmp strncasecmp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4376: checking for $ac_func" >&5
+echo "configure:4374: 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 4381 "configure"
+#line 4379 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4400,7 +4398,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4427,12 +4425,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:4431: checking for $ac_func" >&5
+echo "configure:4429: 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 4436 "configure"
+#line 4434 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4455,7 +4453,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4482,12 +4480,12 @@
 for ac_func in memset memcpy tcsetattr tcgetattr cfgetospeed
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4486: checking for $ac_func" >&5
+echo "configure:4484: 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 4491 "configure"
+#line 4489 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4510,7 +4508,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4537,12 +4535,12 @@
 for ac_func in sigaction sigemptyset sigprocmask sigaddset
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4541: checking for $ac_func" >&5
+echo "configure:4539: 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 4546 "configure"
+#line 4544 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4565,7 +4563,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4592,12 +4590,12 @@
 for ac_func in sysconf setuid setreuid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4596: checking for $ac_func" >&5
+echo "configure:4594: 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 4601 "configure"
+#line 4599 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4620,7 +4618,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4648,7 +4646,7 @@
 SHADOWLIB=
 if test x$system = xLinux; then
 echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6
-echo "configure:4652: checking for pw_encrypt in -lshadow" >&5
+echo "configure:4650: 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
@@ -4656,7 +4654,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lshadow  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4660 "configure"
+#line 4658 "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
@@ -4667,7 +4665,7 @@
 pw_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4688,17 +4686,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4692: checking for $ac_hdr" >&5
+echo "configure:4690: 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 4697 "configure"
+#line 4695 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4700: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4731,17 +4729,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4735: checking for $ac_hdr" >&5
+echo "configure:4733: 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 4740 "configure"
+#line 4738 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4789,7 +4787,7 @@
 NEED_CRYPT_PROTOTYPE=yes
 if test x$ac_cv_header_crypt_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4793 "configure"
+#line 4791 "configure"
 #include "confdefs.h"
 #include <crypt.h>
 int main() { return 0; }
@@ -4810,7 +4808,7 @@
 else 
     if test x$ac_cv_header_unistd_h = xyes; then
 cat > conftest.$ac_ext <<EOF
-#line 4814 "configure"
+#line 4812 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 int main() { return 0; }
@@ -4841,17 +4839,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4845: checking for $ac_hdr" >&5
+echo "configure:4843: 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 4850 "configure"
+#line 4848 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4855: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4882,12 +4880,12 @@
 for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4886: checking for $ac_func" >&5
+echo "configure:4884: 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 4891 "configure"
+#line 4889 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4910,7 +4908,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4932,7 +4930,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:4936: checking for crypt in -lcrypt" >&5
+echo "configure:4934: 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
@@ -4940,7 +4938,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4944 "configure"
+#line 4942 "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
@@ -4951,7 +4949,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4971,7 +4969,7 @@
   echo "$ac_t""no" 1>&6
 
 	echo $ac_n "checking for crypt in -lcrypt_i""... $ac_c" 1>&6
-echo "configure:4975: checking for crypt in -lcrypt_i" >&5
+echo "configure:4973: 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
@@ -4979,7 +4977,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypt_i  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4983 "configure"
+#line 4981 "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
@@ -4990,7 +4988,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5020,12 +5018,12 @@
 for ac_func in grantpt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5024: checking for $ac_func" >&5
+echo "configure:5022: 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 5029 "configure"
+#line 5027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5048,7 +5046,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5076,7 +5074,7 @@
     :
 else
     echo $ac_n "checking for grantpt in -lpt""... $ac_c" 1>&6
-echo "configure:5080: checking for grantpt in -lpt" >&5
+echo "configure:5078: 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
@@ -5084,7 +5082,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5088 "configure"
+#line 5086 "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
@@ -5095,7 +5093,7 @@
 grantpt()
 ; return 0; }
 EOF
-if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5126,7 +5124,7 @@
 
 if test x$GCC = xyes; then
     echo $ac_n "checking for tolower in -lintl""... $ac_c" 1>&6
-echo "configure:5130: checking for tolower in -lintl" >&5
+echo "configure:5128: 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
@@ -5134,7 +5132,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lintl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5138 "configure"
+#line 5136 "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
@@ -5145,7 +5143,7 @@
 tolower()
 ; return 0; }
 EOF
-if { (eval echo configure:5149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5177,12 +5175,12 @@
 for ac_func in statlstat
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5181: checking for $ac_func" >&5
+echo "configure:5179: 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 5186 "configure"
+#line 5184 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5205,7 +5203,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5231,9 +5229,9 @@
 
 
 echo $ac_n "checking for AIX defines""... $ac_c" 1>&6
-echo "configure:5235: checking for AIX defines" >&5
+echo "configure:5233: checking for AIX defines" >&5
 cat > conftest.$ac_ext <<EOF
-#line 5237 "configure"
+#line 5235 "configure"
 #include "confdefs.h"
 #if defined(AIX) || defined(_AIX) || defined(__aix__) || defined(aix)
 yes
@@ -5258,7 +5256,7 @@
 
 
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5262: checking for getmntent in -lgen" >&5
+echo "configure:5260: 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
@@ -5266,7 +5264,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5270 "configure"
+#line 5268 "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
@@ -5277,7 +5275,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5303,17 +5301,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5307: checking for $ac_hdr" >&5
+echo "configure:5305: 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 5312 "configure"
+#line 5310 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5315: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5343,17 +5341,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5347: checking for $ac_hdr" >&5
+echo "configure:5345: 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 5352 "configure"
+#line 5350 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5383,17 +5381,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5387: checking for $ac_hdr" >&5
+echo "configure:5385: 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 5392 "configure"
+#line 5390 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5395: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5422,12 +5420,12 @@
     for ac_func in getmntinfo
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5426: checking for $ac_func" >&5
+echo "configure:5424: 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 5431 "configure"
+#line 5429 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5450,7 +5448,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5477,12 +5475,12 @@
 
         
     echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6
-echo "configure:5481: checking for d_ino member in directory struct" >&5
+echo "configure:5479: 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 5486 "configure"
+#line 5484 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5505,7 +5503,7 @@
 struct dirent dp; dp.d_ino = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5507: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   fu_cv_sys_d_ino_in_dirent=yes
 else
@@ -5532,7 +5530,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:5536: checking for getmntent in -lsun" >&5
+echo "configure:5534: 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
@@ -5540,7 +5538,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsun  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5544 "configure"
+#line 5542 "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
@@ -5551,7 +5549,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5570,7 +5568,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6
-echo "configure:5574: checking for getmntent in -lseq" >&5
+echo "configure:5572: 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
@@ -5578,7 +5576,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5582 "configure"
+#line 5580 "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
@@ -5589,7 +5587,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5608,7 +5606,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6
-echo "configure:5612: checking for getmntent in -lgen" >&5
+echo "configure:5610: 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
@@ -5616,7 +5614,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgen  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5620 "configure"
+#line 5618 "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
@@ -5627,7 +5625,7 @@
 getmntent()
 ; return 0; }
 EOF
-if { (eval echo configure:5631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5652,12 +5650,12 @@
 fi
 
 echo $ac_n "checking for getmntent""... $ac_c" 1>&6
-echo "configure:5656: checking for getmntent" >&5
+echo "configure:5654: 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 5661 "configure"
+#line 5659 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char getmntent(); below.  */
@@ -5680,7 +5678,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_getmntent=yes"
 else
@@ -5711,12 +5709,12 @@
       if test -z "$list_mounted_fs"; then
 	# SVR4
 	echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6
-echo "configure:5715: checking for two-argument getmntent function" >&5
+echo "configure:5713: 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 5720 "configure"
+#line 5718 "configure"
 #include "confdefs.h"
 #include <sys/mnttab.h>
 EOF
@@ -5745,7 +5743,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:5749: checking for one-argument getmntent function" >&5
+echo "configure:5747: 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
@@ -5774,12 +5772,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:5778: checking for getfsstat function" >&5
+echo "configure:5776: 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 5783 "configure"
+#line 5781 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -5790,7 +5788,7 @@
       numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); 
 ; return 0; }
 EOF
-if { (eval echo configure:5794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   fu_cv_sys_mounted_getsstat=yes
 else
@@ -5815,17 +5813,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:5819: checking for mntctl function and struct vmount" >&5
+echo "configure:5817: 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 5824 "configure"
+#line 5822 "configure"
 #include "confdefs.h"
 #include <fshelp.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5853,12 +5851,12 @@
     if test -z "$list_mounted_fs"; then
       # SVR3
       echo $ac_n "checking for existence of three headers""... $ac_c" 1>&6
-echo "configure:5857: checking for existence of three headers" >&5
+echo "configure:5855: 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 5862 "configure"
+#line 5860 "configure"
 #include "confdefs.h"
 
 #include <sys/statfs.h>
@@ -5866,7 +5864,7 @@
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5894,7 +5892,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:5898: checking for getmntinfo function" >&5
+echo "configure:5896: 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
@@ -5902,7 +5900,7 @@
 	  ok=
 	  if test $ac_cv_func_getmntinfo = yes; then
 	    cat > conftest.$ac_ext <<EOF
-#line 5906 "configure"
+#line 5904 "configure"
 #include "confdefs.h"
 #include <sys/mount.h>
 EOF
@@ -5935,19 +5933,19 @@
     if test -z "$list_mounted_fs"; then
       # Ultrix
       echo $ac_n "checking for getmnt function""... $ac_c" 1>&6
-echo "configure:5939: checking for getmnt function" >&5
+echo "configure:5937: 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 5944 "configure"
+#line 5942 "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:5951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5949: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5975,17 +5973,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:5979: checking whether it is possible to resort to fread on /etc/mnttab" >&5
+echo "configure:5977: 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 5984 "configure"
+#line 5982 "configure"
 #include "confdefs.h"
 #include <mnttab.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5989: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6019,7 +6017,7 @@
 
 
     echo "checking how to get filesystem space usage" 1>&6
-echo "configure:6023: checking how to get filesystem space usage" >&5
+echo "configure:6021: checking how to get filesystem space usage" >&5
     space=no
 
     # Here we'll compromise a little (and perform only the link test)
@@ -6029,12 +6027,12 @@
       for ac_func in statvfs
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6033: checking for $ac_func" >&5
+echo "configure:6031: 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 6038 "configure"
+#line 6036 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6057,7 +6055,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6093,7 +6091,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:6097: checking for 3-argument statfs function (DEC OSF/1)" >&5
+echo "configure:6095: 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
@@ -6101,7 +6099,7 @@
   fu_cv_sys_stat_statfs3_osf1=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6105 "configure"
+#line 6103 "configure"
 #include "confdefs.h"
 
 #include <sys/param.h>
@@ -6114,7 +6112,7 @@
 	exit (statfs (".", &fsd, sizeof (struct statfs)));
       }
 EOF
-if { (eval echo configure:6118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs3_osf1=yes
 else
@@ -6141,7 +6139,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:6145: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+echo "configure:6143: 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
@@ -6149,7 +6147,7 @@
   fu_cv_sys_stat_statfs2_bsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6153 "configure"
+#line 6151 "configure"
 #include "confdefs.h"
 
 #ifdef HAVE_SYS_PARAM_H
@@ -6168,7 +6166,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_bsize=yes
 else
@@ -6195,7 +6193,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:6199: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+echo "configure:6197: 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
@@ -6203,7 +6201,7 @@
   fu_cv_sys_stat_statfs4=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6207 "configure"
+#line 6205 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/statfs.h>
@@ -6213,7 +6211,7 @@
       exit (statfs (".", &fsd, sizeof fsd, 0));
       }
 EOF
-if { (eval echo configure:6217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs4=yes
 else
@@ -6240,7 +6238,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:6244: checking for two-argument statfs with statfs.fsize     member (4.4BSD and NetBSD)" >&5
+echo "configure:6242: 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
@@ -6248,7 +6246,7 @@
   fu_cv_sys_stat_statfs2_fsize=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6252 "configure"
+#line 6250 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #ifdef HAVE_SYS_PARAM_H
@@ -6264,7 +6262,7 @@
       exit (statfs (".", &fsd));
       }
 EOF
-if { (eval echo configure:6268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_statfs2_fsize=yes
 else
@@ -6291,7 +6289,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:6295: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+echo "configure:6293: 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
@@ -6299,7 +6297,7 @@
   fu_cv_sys_stat_fs_data=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6303 "configure"
+#line 6301 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -6320,7 +6318,7 @@
       exit (statfs (".", &fsd) != 1);
       }
 EOF
-if { (eval echo configure:6324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fu_cv_sys_stat_fs_data=yes
 else
@@ -6348,12 +6346,12 @@
 
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:6352: checking for mode_t" >&5
+echo "configure:6350: 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 6357 "configure"
+#line 6355 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6381,12 +6379,12 @@
 fi
 
 echo $ac_n "checking for umode_t""... $ac_c" 1>&6
-echo "configure:6385: checking for umode_t" >&5
+echo "configure:6383: 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 6390 "configure"
+#line 6388 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6414,12 +6412,12 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:6418: checking for off_t" >&5
+echo "configure:6416: 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 6423 "configure"
+#line 6421 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6447,12 +6445,12 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:6451: checking for pid_t" >&5
+echo "configure:6449: 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 6456 "configure"
+#line 6454 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6480,12 +6478,12 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:6484: checking for uid_t in sys/types.h" >&5
+echo "configure:6482: 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 6489 "configure"
+#line 6487 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -6514,12 +6512,12 @@
 fi
 
 echo $ac_n "checking for nlink_t""... $ac_c" 1>&6
-echo "configure:6518: checking for nlink_t" >&5
+echo "configure:6516: 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 6523 "configure"
+#line 6521 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -6551,17 +6549,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6555: checking for $ac_hdr" >&5
+echo "configure:6553: 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 6560 "configure"
+#line 6558 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6590,12 +6588,12 @@
 for ac_func in getpagesize
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6594: checking for $ac_func" >&5
+echo "configure:6592: 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 6599 "configure"
+#line 6597 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6618,7 +6616,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6643,7 +6641,7 @@
 done
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:6647: checking for working mmap" >&5
+echo "configure:6645: 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
@@ -6651,7 +6649,7 @@
   ac_cv_func_mmap_fixed_mapped=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 6655 "configure"
+#line 6653 "configure"
 #include "confdefs.h"
 
 /* Thanks to Mike Haertel and Jim Avera for this test.
@@ -6791,7 +6789,7 @@
 }
 
 EOF
-if { (eval echo configure:6795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_func_mmap_fixed_mapped=yes
 else
@@ -6816,19 +6814,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:6820: checking for working alloca.h" >&5
+echo "configure:6818: 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 6825 "configure"
+#line 6823 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -6849,12 +6847,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:6853: checking for alloca" >&5
+echo "configure:6851: 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 6858 "configure"
+#line 6856 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -6882,7 +6880,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -6914,12 +6912,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:6918: checking whether alloca needs Cray hooks" >&5
+echo "configure:6916: 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 6923 "configure"
+#line 6921 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -6944,12 +6942,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:6948: checking for $ac_func" >&5
+echo "configure:6946: 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 6953 "configure"
+#line 6951 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6972,7 +6970,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6999,7 +6997,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7003: checking stack direction for C alloca" >&5
+echo "configure:7001: 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
@@ -7007,7 +7005,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 7011 "configure"
+#line 7009 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7026,7 +7024,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:7028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -7054,7 +7052,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:7058: checking for X" >&5
+echo "configure:7056: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -7116,12 +7114,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 7120 "configure"
+#line 7118 "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:7125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7123: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7190,14 +7188,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7194 "configure"
+#line 7192 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -7303,17 +7301,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:7307: checking whether -R must be followed by a space" >&5
+echo "configure:7305: 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 7310 "configure"
+#line 7308 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -7329,14 +7327,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 7333 "configure"
+#line 7331 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:7340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -7368,7 +7366,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:7372: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:7370: 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
@@ -7376,7 +7374,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7380 "configure"
+#line 7378 "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
@@ -7387,7 +7385,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7409,7 +7407,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:7413: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:7411: 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
@@ -7417,7 +7415,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldnet_stub  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7421 "configure"
+#line 7419 "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 +7426,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:7432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7457,12 +7455,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:7461: checking for gethostbyname" >&5
+echo "configure:7459: 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 7466 "configure"
+#line 7464 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -7485,7 +7483,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -7506,7 +7504,7 @@
 
     if test $ac_cv_func_gethostbyname = no; then
       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:7510: checking for gethostbyname in -lnsl" >&5
+echo "configure:7508: 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
@@ -7514,7 +7512,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7518 "configure"
+#line 7516 "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
@@ -7525,7 +7523,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:7529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7555,12 +7553,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:7559: checking for connect" >&5
+echo "configure:7557: 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 7564 "configure"
+#line 7562 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -7583,7 +7581,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -7604,7 +7602,7 @@
 
     if test $ac_cv_func_connect = no; then
       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
-echo "configure:7608: checking for connect in -lsocket" >&5
+echo "configure:7606: 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
@@ -7612,7 +7610,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7616 "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
@@ -7623,7 +7621,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:7627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7647,12 +7645,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:7651: checking for remove" >&5
+echo "configure:7649: 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 7656 "configure"
+#line 7654 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -7675,7 +7673,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -7696,7 +7694,7 @@
 
     if test $ac_cv_func_remove = no; then
       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:7700: checking for remove in -lposix" >&5
+echo "configure:7698: 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
@@ -7704,7 +7702,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7708 "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
@@ -7715,7 +7713,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:7719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7739,12 +7737,12 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:7743: checking for shmat" >&5
+echo "configure:7741: 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 7748 "configure"
+#line 7746 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -7767,7 +7765,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -7788,7 +7786,7 @@
 
     if test $ac_cv_func_shmat = no; then
       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:7792: checking for shmat in -lipc" >&5
+echo "configure:7790: 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
@@ -7796,7 +7794,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lipc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7800 "configure"
+#line 7798 "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
@@ -7807,7 +7805,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:7811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7840,7 +7838,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:7844: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:7842: 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
@@ -7848,7 +7846,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7852 "configure"
+#line 7850 "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
@@ -7859,7 +7857,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7886,7 +7884,7 @@
 
 
 echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:7890: checking for t_accept in -lnsl" >&5
+echo "configure:7888: 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
@@ -7894,7 +7892,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7898 "configure"
+#line 7896 "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
@@ -7905,7 +7903,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7933,7 +7931,7 @@
 fi
 
 echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:7937: checking for socket in -lsocket" >&5
+echo "configure:7935: 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
@@ -7941,7 +7939,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 7945 "configure"
+#line 7943 "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
@@ -7952,7 +7950,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:7956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -7984,12 +7982,12 @@
 for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7988: checking for $ac_func" >&5
+echo "configure:7986: 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 7993 "configure"
+#line 7991 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8012,7 +8010,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8040,7 +8038,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:8044: checking for socket in -l$lib" >&5
+echo "configure:8042: 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
@@ -8048,7 +8046,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8052 "configure"
+#line 8050 "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
@@ -8059,7 +8057,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8091,12 +8089,12 @@
 
 have_gethostbyname=no
 echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8095: checking for gethostbyname" >&5
+echo "configure:8093: 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 8100 "configure"
+#line 8098 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8119,7 +8117,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8142,7 +8140,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:8146: checking for gethostbyname in -l$lib" >&5
+echo "configure:8144: 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
@@ -8150,7 +8148,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8154 "configure"
+#line 8152 "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
@@ -8161,7 +8159,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8187,12 +8185,12 @@
 for ac_func in socketpair
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8191: checking for $ac_func" >&5
+echo "configure:8189: 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 8196 "configure"
+#line 8194 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8215,7 +8213,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8241,7 +8239,7 @@
 
 
 echo $ac_n "checking for get_process_stats in -lseq""... $ac_c" 1>&6
-echo "configure:8245: checking for get_process_stats in -lseq" >&5
+echo "configure:8243: 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
@@ -8249,7 +8247,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lseq  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8253 "configure"
+#line 8251 "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
@@ -8260,7 +8258,7 @@
 get_process_stats()
 ; return 0; }
 EOF
-if { (eval echo configure:8264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8287,8 +8285,18 @@
 
 
 
+	use_vfs=yes
+	# Check whether --with-vfs or --without-vfs was given.
+if test "${with_vfs+set}" = set; then
+  withval="$with_vfs"
+  use_vfs=$withval
+	
+fi
+
+	case $use_vfs in
+		yes) 	
     echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6
-echo "configure:8292: checking for t_accept in -lnsl" >&5
+echo "configure:8300: 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
@@ -8296,7 +8304,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8300 "configure"
+#line 8308 "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
@@ -8307,7 +8315,7 @@
 t_accept()
 ; return 0; }
 EOF
-if { (eval echo configure:8311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8335,7 +8343,7 @@
 fi
 
   echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6
-echo "configure:8339: checking for socket in -lsocket" >&5
+echo "configure:8347: 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
@@ -8343,7 +8351,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8347 "configure"
+#line 8355 "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
@@ -8354,7 +8362,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8386,12 +8394,12 @@
   for ac_func in socket
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8390: checking for $ac_func" >&5
+echo "configure:8398: 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 8395 "configure"
+#line 8403 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8414,7 +8422,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8442,7 +8450,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:8446: checking for socket in -l$lib" >&5
+echo "configure:8454: 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
@@ -8450,7 +8458,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8454 "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
@@ -8461,7 +8469,7 @@
 socket()
 ; return 0; }
 EOF
-if { (eval echo configure:8465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8493,12 +8501,12 @@
 
   have_gethostbyname=no
   echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:8497: checking for gethostbyname" >&5
+echo "configure:8505: 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 8502 "configure"
+#line 8510 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -8521,7 +8529,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -8544,7 +8552,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:8548: checking for gethostbyname in -l$lib" >&5
+echo "configure:8556: 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
@@ -8552,7 +8560,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-l$lib  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8556 "configure"
+#line 8564 "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
@@ -8563,7 +8571,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:8567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8586,21 +8594,20 @@
     done
   fi
 
-
   vfs_flags="tarfs"
   use_net_code=false
   if test $have_socket = yes; then
       
 av_struct_linger=no
 echo $ac_n "checking struct linger is available""... $ac_c" 1>&6
-echo "configure:8597: checking struct linger is available" >&5
+echo "configure:8604: checking struct linger is available" >&5
 if test "$cross_compiling" = yes; then
   
 av_struct_linger=no
 
 else
   cat > conftest.$ac_ext <<EOF
-#line 8604 "configure"
+#line 8611 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -8616,7 +8623,7 @@
 }
 
 EOF
-if { (eval echo configure:8620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:8627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   
 cat >> confdefs.h <<\EOF
@@ -8641,12 +8648,12 @@
       for ac_func in pmap_set
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8645: 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 8650 "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.  */
@@ -8669,7 +8676,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8691,7 +8698,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for pmap_set in -lrpc""... $ac_c" 1>&6
-echo "configure:8695: checking for pmap_set in -lrpc" >&5
+echo "configure:8702: 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
@@ -8699,7 +8706,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrpc  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 8703 "configure"
+#line 8710 "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
@@ -8710,7 +8717,7 @@
 pmap_set()
 ; return 0; }
 EOF
-if { (eval echo configure:8714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8742,12 +8749,12 @@
       for ac_func in pmap_getport pmap_getmaps rresvport
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8746: checking for $ac_func" >&5
+echo "configure:8753: 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 8751 "configure"
+#line 8758 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -8770,7 +8777,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -8798,17 +8805,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:8802: checking for $ac_hdr" >&5
+echo "configure:8809: 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 8807 "configure"
+#line 8814 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8872,15 +8879,39 @@
 	TERMNET="-ltermnet"
      fi
   fi
+
   
   
 
+
+;;
+		no) 	use_vfs=no;;
+		*)   	use_vfs=no;;
+				esac
+
 NETFILES=
 if test $have_socket = yes; then
    NETFILES="\$(NETFILES)"
 fi
 
 
+LIBVFS=""
+LVFS=""
+fastdepvfs=""
+vfs_type="normal"
+if test $use_vfs = yes
+then
+	LIBVFS="libvfs-mc.a"
+	LVFS="-lvfs-mc"
+	fastdepvfs=fastdepvfs
+	MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
+	echo "$ac_t""Using the VFS switch code" 1>&6
+	vfs_type="Midnight Commander Virtual File System"
+fi
+
+
+
+
 screen_manager=unknown
 search_ncurses=false
 
@@ -9027,7 +9058,7 @@
 else
   
 	echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6
-echo "configure:9031: checking for Gpm_Repeat in -lgpm" >&5
+echo "configure:9062: 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
@@ -9035,7 +9066,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lgpm $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9039 "configure"
+#line 9070 "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
@@ -9046,7 +9077,7 @@
 Gpm_Repeat()
 ; return 0; }
 EOF
-if { (eval echo configure:9050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9187,7 +9218,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:9191: checking for $ac_word" >&5
+echo "configure:9222: 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
@@ -9224,7 +9255,7 @@
 	      no_gnome_config="yes"
 	    else
 	      echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6
-echo "configure:9228: checking if $GNOME_CONFIG works" >&5
+echo "configure:9259: checking if $GNOME_CONFIG works" >&5
 	      if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
 	        echo "$ac_t""yes" 1>&6
 	        
@@ -9232,7 +9263,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:9236: checking for $ac_word" >&5
+echo "configure:9267: 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
@@ -9268,7 +9299,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:9272: checking for $ac_word" >&5
+echo "configure:9303: 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
@@ -9302,7 +9333,7 @@
 fi
 
 	echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6
-echo "configure:9306: checking for working ORBit environment" >&5
+echo "configure:9337: 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
@@ -9338,7 +9369,7 @@
 	fi
 
 	echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6
-echo "configure:9342: checking for gnorba libraries" >&5
+echo "configure:9373: 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
@@ -9413,7 +9444,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:9417: checking for gnomeConf.sh file in $gnome_prefix" >&5
+echo "configure:9448: 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" \
@@ -9444,7 +9475,7 @@
 	  n=""
 	  for i in $n; do
 	    echo $ac_n "checking extra library $i""... $ac_c" 1>&6
-echo "configure:9448: checking extra library $i" >&5
+echo "configure:9479: checking extra library $i" >&5
 	    case $i in 
 	      applets)
 		
@@ -9469,7 +9500,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:9473: checking for $ac_word" >&5
+echo "configure:9504: 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
@@ -9498,7 +9529,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6
-echo "configure:9502: checking for manual formatting macros" >&5
+echo "configure:9533: 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
@@ -9522,7 +9553,7 @@
 
 if $HAVE_nroff; then
     echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6
-echo "configure:9526: checking If nroff accepts -Tascii" >&5
+echo "configure:9557: 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
@@ -9546,7 +9577,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:9550: checking for $ac_word" >&5
+echo "configure:9581: 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
@@ -9575,7 +9606,7 @@
 
 if $HAVE_FILECMD; then
     echo $ac_n "checking for - option to file command""... $ac_c" 1>&6
-echo "configure:9579: checking for - option to file command" >&5
+echo "configure:9610: 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
@@ -9618,7 +9649,7 @@
 
             
 echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6
-echo "configure:9622: checking for -L option to file command" >&5
+echo "configure:9653: 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
@@ -9644,7 +9675,7 @@
 fi 
 
 echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6
-echo "configure:9648: checking for - option to grep command" >&5
+echo "configure:9679: 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
@@ -9666,25 +9697,9 @@
 fi
 echo "$ac_t""$ac_cv_grep_stdin" 1>&6
 
-termnet=false
-# Check whether --with-termnet or --without-termnet was given.
-if test "${with_termnet+set}" = set; then
-  withval="$with_termnet"
-  
-	if test x$withval = xyes; then
-		cat >> confdefs.h <<\EOF
-#define USE_TERMNET 1
-EOF
-
-		termnet=true		
-	fi
-
-fi
-
-
 
 echo $ac_n "checking for subshell support""... $ac_c" 1>&6
-echo "configure:9688: checking for subshell support" >&5
+echo "configure:9703: checking for subshell support" >&5
 # Check whether --with-subshell or --without-subshell was given.
 if test "${with_subshell+set}" = set; then
   withval="$with_subshell"
@@ -9826,7 +9841,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:9830: checking for SLang_init_tty in -lslang" >&5
+echo "configure:9845: 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
@@ -9834,7 +9849,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lslang  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 9838 "configure"
+#line 9853 "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
@@ -9845,7 +9860,7 @@
 SLang_init_tty()
 ; return 0; }
 EOF
-if { (eval echo configure:9849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9864,17 +9879,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9868: checking for $ac_hdr" >&5
+echo "configure:9883: 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 9873 "configure"
+#line 9888 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9878: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9909,17 +9924,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9913: checking for $ac_hdr" >&5
+echo "configure:9928: 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 9918 "configure"
+#line 9933 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9923: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9938: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9989,7 +10004,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:9993: checking for tgoto in -ltermcap" >&5
+echo "configure:10008: 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
@@ -9997,7 +10012,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10001 "configure"
+#line 10016 "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
@@ -10008,7 +10023,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10079,7 +10094,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 10083 "configure"
+#line 10098 "configure"
 #include "confdefs.h"
  
 	    #ifdef SLANG_H_INSIDE_SLANG_DIR
@@ -10093,7 +10108,7 @@
 		return 0;
 	    } 
 EOF
-if { (eval echo configure:10097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF
 #define SLANG_TERMINFO 1
@@ -10112,7 +10127,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10116: checking for tgoto in -ltermcap" >&5
+echo "configure:10131: 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
@@ -10120,7 +10135,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10124 "configure"
+#line 10139 "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
@@ -10131,7 +10146,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10194,7 +10209,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10198: checking for tgoto in -ltermcap" >&5
+echo "configure:10213: 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
@@ -10202,7 +10217,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10206 "configure"
+#line 10221 "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
@@ -10213,7 +10228,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10247,68 +10262,6 @@
 
 
 
-TERMNET=""
-
-
-
-LIBVFS=""
-LVFS=""
-fastdepvfs=""
-vfs_type="normal"
-# Check whether --with-vfs or --without-vfs was given.
-if test "${with_vfs+set}" = set; then
-  withval="$with_vfs"
-  if test x$withval = xyes
-	then 
-		
-	cat >> confdefs.h <<\EOF
-#define USE_VFS 1
-EOF
-
-	if $use_net_code; then
-	    cat >> confdefs.h <<\EOF
-#define USE_NETCODE 1
-EOF
-
-        fi
-	LIBVFS="libvfs-mc.a"
-	LVFS="-lvfs-mc"
-	fastdepvfs=fastdepvfs
-	MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
-	echo "$ac_t""Using the VFS switch code" 1>&6
-	vfs_type="Midnight Commander Virtual File System"
-
-	else
-		vfs_flags=""
-		TERMNET=""
-		mcserv=""
-	fi
-else
-  	
-	cat >> confdefs.h <<\EOF
-#define USE_VFS 1
-EOF
-
-	if $use_net_code; then
-	    cat >> confdefs.h <<\EOF
-#define USE_NETCODE 1
-EOF
-
-        fi
-	LIBVFS="libvfs-mc.a"
-	LVFS="-lvfs-mc"
-	fastdepvfs=fastdepvfs
-	MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
-	echo "$ac_t""Using the VFS switch code" 1>&6
-	vfs_type="Midnight Commander Virtual File System"
-	
-
-fi
-
-
-
-
-
 
 
 LIBEDIT_A=""
@@ -10388,17 +10341,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10392: checking for $ac_hdr" >&5
+echo "configure:10345: 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 10397 "configure"
+#line 10350 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10402: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10451,7 +10404,7 @@
 	fi
 else
   	echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6
-echo "configure:10455: checking for ext2fs_close in -lext2fs" >&5
+echo "configure:10408: 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
@@ -10459,7 +10412,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lext2fs -lcom_err $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10463 "configure"
+#line 10416 "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
@@ -10470,7 +10423,7 @@
 ext2fs_close()
 ; return 0; }
 EOF
-if { (eval echo configure:10474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10491,17 +10444,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10495: checking for $ac_hdr" >&5
+echo "configure:10448: 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 10500 "configure"
+#line 10453 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10566,7 +10519,7 @@
 if $search_ncurses
 then
     echo "checking "location of ncurses.h file"" 1>&6
-echo "configure:10570: checking "location of ncurses.h file"" >&5
+echo "configure:10523: checking "location of ncurses.h file"" >&5
 
     
     if $search_ncurses
@@ -10706,7 +10659,7 @@
                 if $search_ncurses 
     then
         cat > conftest.$ac_ext <<EOF
-#line 10710 "configure"
+#line 10663 "configure"
 #include "confdefs.h"
 #include </usr/include/curses.h>
 EOF
@@ -10732,7 +10685,7 @@
 rm -f conftest*
 
 	cat > conftest.$ac_ext <<EOF
-#line 10736 "configure"
+#line 10689 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -10792,10 +10745,10 @@
     else
         # check for ncurses version, to properly ifdef mouse-fix
 	echo $ac_n "checking for ncurses version""... $ac_c" 1>&6
-echo "configure:10796: checking for ncurses version" >&5
+echo "configure:10749: checking for ncurses version" >&5
 	ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 10799 "configure"
+#line 10752 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>
@@ -10839,12 +10792,12 @@
 for ac_func in resizeterm keyok
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10843: checking for $ac_func" >&5
+echo "configure:10796: 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 10848 "configure"
+#line 10801 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10867,7 +10820,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10915,7 +10868,7 @@
     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
 else
   cat > conftest.$ac_ext <<EOF
-#line 10919 "configure"
+#line 10872 "configure"
 #include "confdefs.h"
  
 	    #ifdef SLANG_H_INSIDE_SLANG_DIR
@@ -10929,7 +10882,7 @@
 		return 0;
 	    } 
 EOF
-if { (eval echo configure:10933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:10886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   LIBS="$ac_save_LIBS"; cat >> confdefs.h <<\EOF
 #define SLANG_TERMINFO 1
@@ -10948,7 +10901,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:10952: checking for tgoto in -ltermcap" >&5
+echo "configure:10905: 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
@@ -10956,7 +10909,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 10960 "configure"
+#line 10913 "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
@@ -10967,7 +10920,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:10971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11030,7 +10983,7 @@
 EOF
 
 		echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6
-echo "configure:11034: checking for tgoto in -ltermcap" >&5
+echo "configure:10987: 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
@@ -11038,7 +10991,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ltermcap $LIBS $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11042 "configure"
+#line 10995 "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
@@ -11049,7 +11002,7 @@
 tgoto()
 ; return 0; }
 EOF
-if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11089,7 +11042,7 @@
     install_saver="yes"
 
                 echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
-echo "configure:11093: checking for pam_start in -lpam" >&5
+echo "configure:11046: 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
@@ -11097,7 +11050,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lpam -ldl $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11101 "configure"
+#line 11054 "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
@@ -11108,7 +11061,7 @@
 pam_start()
 ; return 0; }
 EOF
-if { (eval echo configure:11112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11151,7 +11104,7 @@
 else
     
 echo $ac_n "checking for -lXpm""... $ac_c" 1>&6
-echo "configure:11155: checking for -lXpm" >&5
+echo "configure:11108: checking for -lXpm" >&5
 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -11167,7 +11120,7 @@
 	has_xpm_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 11171 "configure"
+#line 11124 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11177,7 +11130,7 @@
 XpmLibraryVersion();
 ; return 0; }
 EOF
-if { (eval echo configure:11181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_has_xpm=yes
 else
@@ -11199,7 +11152,7 @@
 	
 	
 echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6
-echo "configure:11203: checking for X11 non-rectangular shape extension" >&5
+echo "configure:11156: 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
@@ -11215,7 +11168,7 @@
 	has_shape_save_CFLAGS=$CFLAGS
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	cat > conftest.$ac_ext <<EOF
-#line 11219 "configure"
+#line 11172 "configure"
 #include "confdefs.h"
 
 #include <X11/Xlib.h>
@@ -11230,7 +11183,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_has_shape=yes
 else
@@ -11266,7 +11219,7 @@
 			echo
 		else
 		echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6
-echo "configure:11270: checking for setupterm in -lcurses" >&5
+echo "configure:11223: 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
@@ -11274,7 +11227,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lcurses  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 11278 "configure"
+#line 11231 "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
@@ -11285,7 +11238,7 @@
 setupterm()
 ; return 0; }
 EOF
-if { (eval echo configure:11289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -11302,7 +11255,7 @@
   echo "$ac_t""yes" 1>&6
   
 			cat > conftest.$ac_ext <<EOF
-#line 11306 "configure"
+#line 11259 "configure"
 #include "confdefs.h"
 
 #include <curses.h>
@@ -11315,7 +11268,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11272: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 			LIBS="$LIBS -lcurses"
@@ -11604,6 +11557,9 @@
 s%@TERMNET@%$TERMNET%g
 s%@mcserv@%$mcserv%g
 s%@NETFILES@%$NETFILES%g
+s%@LIBVFS@%$LIBVFS%g
+s%@LVFS@%$LVFS%g
+s%@fastdepvfs@%$fastdepvfs%g
 s%@XCURSES@%$XCURSES%g
 s%@LGPM@%$LGPM%g
 s%@insticons@%$insticons%g
@@ -11640,9 +11596,6 @@
 s%@LIBSLANG@%$LIBSLANG%g
 s%@LSLANG@%$LSLANG%g
 s%@fastdepslang@%$fastdepslang%g
-s%@LIBVFS@%$LIBVFS%g
-s%@LVFS@%$LVFS%g
-s%@fastdepvfs@%$fastdepvfs%g
 s%@LIBEDIT_A@%$LIBEDIT_A%g
 s%@MCEDIT@%$MCEDIT%g
 s%@LEDIT@%$LEDIT%g
diff -ruN old/mc-4.5.28/configure.in new/mc-4.5.29/configure.in
--- old/mc-4.5.28/configure.in	Fri Mar 26 15:30:37 1999
+++ new/mc-4.5.29/configure.in	Tue Mar 30 01:34:33 1999
@@ -5,7 +5,7 @@
 AC_CONFIG_HEADER(config.h)
 
 PACKAGE=mc
-VERSION=4.5.28
+VERSION=4.5.29
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(VERSION)
@@ -340,6 +340,23 @@
 fi
 AC_SUBST(NETFILES)
 
+LIBVFS=""
+LVFS=""
+fastdepvfs=""
+vfs_type="normal"
+if test $use_vfs = yes
+then
+	LIBVFS="libvfs-mc.a"
+	LVFS="-lvfs-mc"
+	fastdepvfs=fastdepvfs
+	MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
+	AC_MSG_RESULT(Using the VFS switch code)
+	vfs_type="Midnight Commander Virtual File System"
+fi
+AC_SUBST(LIBVFS)
+AC_SUBST(LVFS)
+AC_SUBST(fastdepvfs)
+
 screen_manager=unknown
 search_ncurses=false
 
@@ -628,18 +645,6 @@
 AC_MSG_RESULT($ac_cv_grep_stdin)
 
 dnl
-dnl The termnet support
-dnl
-termnet=false
-AC_ARG_WITH(termnet,
-	[--with-termnet             If you want a termified net support],[
-	if test x$withval = xyes; then
-		AC_DEFINE(USE_TERMNET)
-		termnet=true		
-	fi
-])
-
-dnl
 dnl The subshell support
 dnl
 
@@ -880,42 +885,6 @@
 AC_SUBST(LIBSLANG)
 AC_SUBST(LSLANG)
 AC_SUBST(fastdepslang)
-
-TERMNET=""
-AC_DEFUN(AC_WITH_VFS, [
-	AC_DEFINE(USE_VFS)
-	if $use_net_code; then
-	    AC_DEFINE(USE_NETCODE)
-        fi
-	LIBVFS="libvfs-mc.a"
-	LVFS="-lvfs-mc"
-	fastdepvfs=fastdepvfs
-	MCCPPFLAGS="$MCCPPFLAGS -I\$(vfsdir)"
-	AC_MSG_RESULT(Using the VFS switch code)
-	vfs_type="Midnight Commander Virtual File System"
-])
-AC_SUBST(TERMNET)
-
-LIBVFS=""
-LVFS=""
-fastdepvfs=""
-vfs_type="normal"
-AC_ARG_WITH(vfs,
-	[--with-vfs		   Compile with the VFS code],
-	if test x$withval = xyes
-	then 
-		AC_WITH_VFS
-	else
-		vfs_flags=""
-		TERMNET=""
-		mcserv=""
-	fi,
-	dnl Default: provide the VFS code
-	AC_WITH_VFS	
-)
-AC_SUBST(LIBVFS)
-AC_SUBST(LVFS)
-AC_SUBST(fastdepvfs)
 
 AC_DEFUN(AC_WITH_EDIT, [
 	AC_DEFINE(USE_INTERNAL_EDIT)
diff -ruN old/mc-4.5.28/gnome/ChangeLog new/mc-4.5.29/gnome/ChangeLog
--- old/mc-4.5.28/gnome/ChangeLog	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/ChangeLog	Tue Mar 30 01:34:43 1999
@@ -1,3 +1,50 @@
+1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* gdesktop-icon.c (desktop_icon_realize): Remove the
+	WM_CLIENT_LEADER property from icon windows so that window
+	managers will not store SM information for them.
+
+	* gnome-open-dialog.c: Added missing #includes.
+
+	* gdesktop-init.c (desktop_init_at): Removed an unused variable.
+
+	* gdesktop.h: Added some missing prototypes.
+
+	* gmain.h: Added some missing prototypes.
+
+	* Makefile.in: Added gsession.[ch] to the list of sources.
+
+	* gmain.c (create_panels): Consider whether we have a CORBA server
+	and session management.
+
+	* gdesktop.c: #include "gdesktop-init.h"
+	* gdesktop.c: Added a missing cast to GNOME_DIALOG.
+
+	* gmain.c (create_panels): Removed the run_desktop global
+	variable.
+
+	* glayout.c (create_container): Set the wmclass of the panel to
+	include its unique ID.
+
+	* gsession.[ch]: New file with the functions that deal with
+	session management.
+
+	* glayout.c (gnome_exit): Use session_set_restart().
+
+	* gcorba.c (corba_init): Now returns an int with an error value.
+	(corba_init_server): Initialize the server properly.
+	Fixed all the object implementation code.
+	(corba_create_window): New function used to create a window with
+	the CORBA server.
+
+	* gmain.c (gnome_check_super_user): Now the check for running as
+	root is done here.  There should be no GUI code in src/.
+
+1999-03-29  Jonathan Blandford  <jrb@redhat.com>
+
+	* gdesktop.c (create_desktop_dir): improved wording.
+	(create_desktop_dir): improved wording.
+
 1999-03-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* mc.keys.in: Now that the menu code uses the full filename, we do
diff -ruN old/mc-4.5.28/gnome/Makefile.in new/mc-4.5.29/gnome/Makefile.in
--- old/mc-4.5.28/gnome/Makefile.in	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/Makefile.in	Tue Mar 30 01:34:43 1999
@@ -27,69 +27,71 @@
 	dir-close.xpm		\
 	dir-open.xpm
 
-GNOMESRCS = 		\
-	gaction.c	\
-	gcache.c	\
-	gcliplabel.c	\
-	gcustom-layout.c\
-	gcmd.c		\
-	gcorba.c	\
-	gdesktop-icon.c	\
-	gdesktop-init.c	\
-	gdesktop.c 	\
-	gdialogs.c	\
-	gdnd.c		\
-	ghelp.c 	\
-	gicon.c		\
-	ginfo.c 	\
-	gkey.c 		\
-	glayout.c 	\
-	gmain.c 	\
-	gmount.c	\
-	gmc-chargrid.c	\
-	gmenu.c		\
-	gmetadata.c	\
-	gpageprop.c	\
-	gpopup2.c	\
-	gprefs.c	\
-	gprint.c	\
-	gprop.c		\
-	gnome-file-property-dialog.c \
-	gnome-open-dialog.c \
-	gscreen.c 	\
-	gtools.c 	\
-	gtkdtree.c	\
-	gtree.c		\
-	gutil.c		\
-	gview.c		\
+GNOMESRCS =					\
+	gaction.c				\
+	gcache.c				\
+	gcliplabel.c				\
+	gcustom-layout.c			\
+	gcmd.c					\
+	gcorba.c				\
+	gdesktop-icon.c				\
+	gdesktop-init.c				\
+	gdesktop.c				\
+	gdialogs.c				\
+	gdnd.c					\
+	ghelp.c					\
+	gicon.c					\
+	ginfo.c					\
+	gkey.c					\
+	glayout.c				\
+	gmain.c					\
+	gmount.c				\
+	gmc-chargrid.c				\
+	gmenu.c					\
+	gmetadata.c				\
+	gpageprop.c				\
+	gpopup2.c				\
+	gprefs.c				\
+	gprint.c				\
+	gprop.c					\
+	gnome-file-property-dialog.c		\
+	gnome-open-dialog.c			\
+	gscreen.c				\
+	gsession.c				\
+	gtools.c				\
+	gtkdtree.c				\
+	gtree.c					\
+	gutil.c					\
+	gview.c					\
 	gwidget.c
 
-GNOMEHDRS = 		\
-	gcache.h	\
-	gcliplabel.h	\
-	gcmd.h		\
-	gconf.h		\
-	gcorba.h	\
-	gcustom-layout.h\
-	gdesktop-icon.h	\
-	gdesktop-init.h	\
-	gdesktop.h	\
-	gdnd.h		\
-	gicon.h		\
-	gmain.h 	\
-	gmount.h	\
-	gmc-chargrid.h	\
-	gmetadata.h	\
-	gpageprop.h	\
-	gpopup.h	\
-	gprefs.h	\
-	gprint.h	\
-	gprop.h		\
-	gnome-file-property-dialog.h \
-	gnome-open-dialog.h \
-	gscreen.h	\
-	gtkdtree.h	\
-	gtree.h		\
+GNOMEHDRS =					\
+	gcache.h				\
+	gcliplabel.h				\
+	gcmd.h					\
+	gconf.h					\
+	gcorba.h				\
+	gcustom-layout.h			\
+	gdesktop-icon.h				\
+	gdesktop-init.h				\
+	gdesktop.h				\
+	gdnd.h					\
+	gicon.h					\
+	gmain.h					\
+	gmount.h				\
+	gmc-chargrid.h				\
+	gmetadata.h				\
+	gpageprop.h				\
+	gpopup.h				\
+	gprefs.h				\
+	gprint.h				\
+	gprop.h					\
+	gnome-file-property-dialog.h		\
+	gnome-open-dialog.h			\
+	gscreen.h				\
+	gsession.h				\
+	gtkdtree.h				\
+	gtree.h					\
 	gwidget.h
 
 ICONS = 			\
@@ -134,44 +136,45 @@
 	FileManager-stubs.o	\
 	FileManager-common.o
 
-OBJS = 			\
-	$(LOBJS) 	\
-	$(OOBJS) 	\
-	gaction.o	\
-	gcache.o	\
-	gcliplabel.o	\
-	gcmd.o		\
-	gcustom-layout.o\
-	gdesktop-icon.o	\
-	gdesktop-init.o \
-	gdesktop.o 	\
-	gdnd.o		\
-	ghelp.o 	\
-	gicon.o		\
-	ginfo.o 	\
-	gkey.o 		\
-	glayout.o 	\
-	gmain.o 	\
-	gmount.o	\
-	gmc-chargrid.o 	\
-	gmenu.o 	\
-	gmetadata.o	\
-	gpageprop.o	\
-	gpopup2.o	\
-	gprefs.o	\
-	gprint.o	\
-	gprop.o		\
-	gnome-file-property-dialog.o \
-	gnome-open-dialog.o \
-	gscreen.o 	\
-	gtools.o 	\
-	gtree.o		\
-	gutil.o 	\
-	gview.o		\
-	gtkdtree.o	\
+OBJS =						\
+	$(LOBJS)				\
+	$(OOBJS)				\
+	gaction.o				\
+	gcache.o				\
+	gcliplabel.o				\
+	gcmd.o					\
+	gcustom-layout.o			\
+	gdesktop-icon.o				\
+	gdesktop-init.o				\
+	gdesktop.o				\
+	gdnd.o					\
+	ghelp.o					\
+	gicon.o					\
+	ginfo.o					\
+	gkey.o					\
+	glayout.o				\
+	gmain.o					\
+	gmount.o				\
+	gmc-chargrid.o				\
+	gmenu.o					\
+	gmetadata.o				\
+	gpageprop.o				\
+	gpopup2.o				\
+	gprefs.o				\
+	gprint.o				\
+	gprop.o					\
+	gnome-file-property-dialog.o		\
+	gnome-open-dialog.o			\
+	gscreen.o				\
+	gsession.o				\
+	gtools.o				\
+	gtree.o					\
+	gutil.o					\
+	gview.o					\
+	gtkdtree.o				\
 	gwidget.o
 
-NORMALOBJS =		\
+NORMALOBJS =	\
 	main.o
 
 CORBA_GENERATED =		\
diff -ruN old/mc-4.5.28/gnome/gcmd.c new/mc-4.5.29/gnome/gcmd.c
--- old/mc-4.5.28/gnome/gcmd.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gcmd.c	Tue Mar 30 01:34:44 1999
@@ -271,7 +271,7 @@
 	gmc_window_setup_from_panel (GNOME_DIALOG (sort_box), panel);
 	
 	/* we define this up here so we can pass it in to our callback */
-	cbox1 = gtk_check_button_new_with_label (N_("Ignore case sensitivity."));
+	cbox1 = gtk_check_button_new_with_label (_("Ignore case sensitivity."));
 	hbox = gtk_hbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (sort_box)->vbox), hbox, FALSE, FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new ("Sort files by "), FALSE, FALSE, 0);
@@ -324,7 +324,7 @@
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (sort_box)->vbox),
 			    cbox1, FALSE, FALSE, 0);
 
-	cbox2 = gtk_check_button_new_with_label (N_("Reverse the order."));
+	cbox2 = gtk_check_button_new_with_label (_("Reverse the order."));
 	gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (cbox2), panel->reverse);
 	gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (sort_box)->vbox),
 			    cbox2, FALSE, FALSE, 0);
diff -ruN old/mc-4.5.28/gnome/gcorba.c new/mc-4.5.29/gnome/gcorba.c
--- old/mc-4.5.28/gnome/gcorba.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gcorba.c	Tue Mar 30 01:34:44 1999
@@ -1,36 +1,37 @@
-/*
- * gcorba.c:  CORBA support code for the GNOME Midnight Commander
+/* CORBA support for the Midhignt Commander
  *
- * Author:
- *    Miguel de Icaza (miguel@gnu.org)
- *    Elliot Lee (sopwith@cuc.edu)
+ * Copyright (C) 1999 The Free Sofware Foundation
+ *
+ * Authors: Miguel de Icaza <miguel@nuclecu.unam.mx>
+ *          Federico Mena <federico@nuclecu.unam.mx>
+ *          Elliot Lee <sopwith@cuc.edu>
  */
+
 #include <config.h>
+#include "panel.h"
 #include <libgnorba/gnorba.h>
-#include <libgnorba/gnome-factory.h>
 #include "FileManager.h"
-#include <config.h>
-#include "x.h"
-#include <stdio.h>
-#include <sys/stat.h>
-#include "dir.h"
-#include "global.h"
-#include "panel.h"
-#include "gscreen.h"
-#include "main.h"
-#include "gmain.h"
 #include "gcmd.h"
 #include "gcorba.h"
+#include "global.h"
+#include "gmain.h"
+
+/*** Global variables ***/
+
+CORBA_ORB orb = CORBA_OBJECT_NIL;
 
-PortableServer_POA poa;
-PortableServer_POAManager poa_manager;
-CORBA_ORB orb;
+/*** Local variables ***/
+
+/* Reference to the server object */
+static CORBA_Object gmc_server;
+
+/*** App-specific servant structures ***/
 
 typedef struct {
 	POA_GNOME_FileManagerWindow servant;
 	PortableServer_POA poa;
-	
-	WPanel *mywin;
+
+	WPanel *panel;
 } impl_POA_GNOME_FileManagerWindow;
 
 typedef struct {
@@ -40,55 +41,64 @@
 
 /*** Implementation stub prototypes ***/
 
-static void
-impl_GNOME_FileManagerWindow_close (impl_POA_GNOME_FileManagerWindow * servant,
-				    CORBA_Environment * ev);
-
-GNOME_FileManagerWindow
-impl_GNOME_FileManagerFactory_create_window (impl_POA_GNOME_FileManagerFactory * servant,
-					     CORBA_char * dir,
-					     CORBA_Environment * ev);
-
-CORBA_boolean
-impl_GNOME_FileManagerFactory_supports (impl_POA_GNOME_FileManagerFactory * servant,
-					CORBA_char * obj_goad_id,
-					CORBA_Environment * ev);
-CORBA_Object
-impl_GNOME_FileManagerFactory_create_object (impl_POA_GNOME_FileManagerFactory * servant,
-					     CORBA_char * goad_id,
-					     GNOME_stringlist * params,
-					     CORBA_Environment * ev);
+static void impl_GNOME_FileManagerWindow__destroy (impl_POA_GNOME_FileManagerWindow *servant,
+						   CORBA_Environment *ev);
+static void impl_GNOME_FileManagerWindow_close (impl_POA_GNOME_FileManagerWindow *servant,
+						CORBA_Environment *ev);
+
+static void impl_GNOME_FileManagerFactory__destroy (impl_POA_GNOME_FileManagerFactory *servant,
+						    CORBA_Environment *ev);
+
+static CORBA_boolean impl_GNOME_FileManagerFactory_supports (
+	impl_POA_GNOME_FileManagerFactory *servant,
+	const CORBA_char *obj_goad_id,
+	CORBA_Environment *ev);
+
+static CORBA_Object impl_GNOME_FileManagerFactory_create_object (
+	impl_POA_GNOME_FileManagerFactory *servant,
+	const CORBA_char *goad_id,
+	const GNOME_stringlist *params,
+	CORBA_Environment *ev);
+
+static GNOME_FileManagerWindow impl_GNOME_FileManagerFactory_create_window (
+	impl_POA_GNOME_FileManagerFactory * servant,
+	const CORBA_char * dir,
+	CORBA_Environment * ev);
 
 /*** epv structures ***/
 
 static PortableServer_ServantBase__epv impl_GNOME_FileManagerWindow_base_epv =
 {
-	NULL, NULL, NULL
+	NULL,							/* _private data */
+	NULL,							/* finalize routine */
+	NULL,							/* default_POA routine */
 };
 
 static POA_GNOME_FileManagerWindow__epv impl_GNOME_FileManagerWindow_epv =
 {
-	NULL,			/* _private */
-	(gpointer) & impl_GNOME_FileManagerWindow_close,
+	NULL,							/* _private */
+	(gpointer) &impl_GNOME_FileManagerWindow_close,
+
 };
 
 static PortableServer_ServantBase__epv impl_GNOME_FileManagerFactory_base_epv =
 {
-	NULL,			/* _private data */
-	NULL,
-	NULL			/* default_POA routine */
+	NULL,							/* _private data */
+	NULL,							/* finalize routine */
+	NULL,							/* default_POA routine */
 };
+
 static POA_GNOME_FileManagerFactory__epv impl_GNOME_FileManagerFactory_epv =
 {
-	NULL,			/* _private */
-	(gpointer) & impl_GNOME_FileManagerFactory_create_window,
+	NULL,							/* _private */
+	(gpointer) &impl_GNOME_FileManagerFactory_create_window,
 };
 
 static POA_GNOME_GenericFactory__epv impl_GNOME_FileManagerFactory_GNOME_GenericFactory_epv =
 {
-	NULL,			/* _private */
-	(gpointer) & impl_GNOME_FileManagerFactory_supports,
-	(gpointer) & impl_GNOME_FileManagerFactory_create_object,
+	NULL,							/* _private */
+	(gpointer) &impl_GNOME_FileManagerFactory_supports,
+	(gpointer) &impl_GNOME_FileManagerFactory_create_object
 };
 
 /*** vepv structures ***/
@@ -96,205 +106,269 @@
 static POA_GNOME_FileManagerWindow__vepv impl_GNOME_FileManagerWindow_vepv =
 {
 	&impl_GNOME_FileManagerWindow_base_epv,
-	&impl_GNOME_FileManagerWindow_epv,
+	&impl_GNOME_FileManagerWindow_epv
 };
 
 static POA_GNOME_FileManagerFactory__vepv impl_GNOME_FileManagerFactory_vepv =
 {
 	&impl_GNOME_FileManagerFactory_base_epv,
 	&impl_GNOME_FileManagerFactory_GNOME_GenericFactory_epv,
-	&impl_GNOME_FileManagerFactory_epv,
+	&impl_GNOME_FileManagerFactory_epv
 };
 
-impl_POA_GNOME_FileManagerFactory poa_filemanagerfactory_servant =
+/*** Stub implementations ***/
+
+static GNOME_FileManagerWindow 
+impl_GNOME_FileManagerWindow__create(PortableServer_POA poa,
+				     impl_POA_GNOME_FileManagerWindow **servant,
+				     CORBA_Environment *ev)
 {
-	{ NULL, &impl_GNOME_FileManagerFactory_vepv}, NULL
-};
+	GNOME_FileManagerWindow retval;
+	impl_POA_GNOME_FileManagerWindow *newservant;
+	PortableServer_ObjectId *objid;
+
+	newservant = g_new0 (impl_POA_GNOME_FileManagerWindow, 1);
+	newservant->servant.vepv = &impl_GNOME_FileManagerWindow_vepv;
+	newservant->poa = poa;
+	POA_GNOME_FileManagerWindow__init ((PortableServer_Servant) newservant, ev);
+	objid = PortableServer_POA_activate_object (poa, newservant, ev);
+	CORBA_free (objid);
+	retval = PortableServer_POA_servant_to_reference (poa, newservant, ev);
 
-GNOME_FileManagerFactory filemanagerfactory_server;
+	if (servant)
+		*servant = newservant;
 
-/*** Stub implementations ***/
+	return retval;
+}
 
+/* You shouldn't call this routine directly without first deactivating the servant... */
 static void
-do_window_close(GtkWidget *widget, gpointer _servant)
+impl_GNOME_FileManagerWindow__destroy(impl_POA_GNOME_FileManagerWindow *servant,
+				      CORBA_Environment *ev)
 {
-	CORBA_Environment ev;
 	PortableServer_ObjectId *objid;
-	impl_POA_GNOME_FileManagerWindow *servant = _servant;
-	
-	CORBA_exception_init(&ev);
-	objid = PortableServer_POA_servant_to_id (servant->poa, _servant, &ev);
-	PortableServer_POA_deactivate_object (servant->poa, objid, &ev);
-#if 1
-#warning Remove this ifdef when the new ORBit is released.
-	g_warning ("Developer Warning: when a new ORBIt is released, remove this code\n");
-#else
+
+	objid = PortableServer_POA_servant_to_id (servant->poa, servant, ev);
+	PortableServer_POA_deactivate_object (servant->poa, objid, ev);
 	CORBA_free (objid);
-#endif
-	POA_GNOME_FileManagerWindow__fini(_servant, &ev);
-	
+
+	POA_GNOME_FileManagerWindow__fini ((PortableServer_Servant) servant, ev);
 	g_free(servant);
-	CORBA_exception_free(&ev);
 }
 
 static void
-impl_GNOME_FileManagerWindow_close (impl_POA_GNOME_FileManagerWindow * servant, CORBA_Environment * ev)
+impl_GNOME_FileManagerWindow_close(impl_POA_GNOME_FileManagerWindow *servant,
+				   CORBA_Environment *ev)
 {
-	gnome_close_panel (GTK_WIDGET (servant->mywin->widget.wdata), servant->mywin);
+	gnome_close_panel (GTK_WIDGET (servant->panel->xwindow), servant->panel);
 }
 
-GNOME_FileManagerWindow
-impl_GNOME_FileManagerFactory_create_window (impl_POA_GNOME_FileManagerFactory * servant,
-					     CORBA_char * dir,
-					     CORBA_Environment * ev)
+static GNOME_FileManagerFactory 
+impl_GNOME_FileManagerFactory__create(PortableServer_POA poa,
+				      impl_POA_GNOME_FileManagerFactory **servant,
+				      CORBA_Environment *ev)
 {
-	GNOME_FileManagerWindow retval;
-	impl_POA_GNOME_FileManagerWindow *newservant;
+	GNOME_FileManagerFactory retval;
+	impl_POA_GNOME_FileManagerFactory *newservant;
 	PortableServer_ObjectId *objid;
-	
-	newservant = g_new0(impl_POA_GNOME_FileManagerWindow, 1);
-	newservant->servant.vepv = &impl_GNOME_FileManagerWindow_vepv;
+
+	newservant = g_new0 (impl_POA_GNOME_FileManagerFactory, 1);
+	newservant->servant.vepv = &impl_GNOME_FileManagerFactory_vepv;
 	newservant->poa = poa;
-	newservant->mywin = new_panel_at ((dir && *dir) ? dir : home_dir);
-	
-	gtk_signal_connect(GTK_OBJECT(newservant->mywin->xwindow),
-			   "destroy", do_window_close,
-			   newservant);
-	
-	POA_GNOME_FileManagerWindow__init((PortableServer_Servant) newservant, ev);
-	objid = PortableServer_POA_activate_object(poa, newservant, ev);
-	CORBA_free(objid);
-	retval = PortableServer_POA_servant_to_reference(poa, newservant, ev);
-	
+	POA_GNOME_FileManagerFactory__init ((PortableServer_Servant) newservant, ev);
+	objid = PortableServer_POA_activate_object (poa, newservant, ev);
+	CORBA_free (objid);
+	retval = PortableServer_POA_servant_to_reference (poa, newservant, ev);
+
+	if (servant)
+		*servant = newservant;
+
 	return retval;
 }
 
-CORBA_boolean
-impl_GNOME_FileManagerFactory_supports (impl_POA_GNOME_FileManagerFactory * servant,
-					CORBA_char * obj_goad_id,
-					CORBA_Environment * ev)
-{
-	return !strcmp(obj_goad_id, "gmc_filemanager_window");
-}
-
-CORBA_Object
-impl_GNOME_FileManagerFactory_create_object(impl_POA_GNOME_FileManagerFactory * servant,
-					    CORBA_char * goad_id,
-					    GNOME_stringlist * params,
-					    CORBA_Environment * ev)
-{
-	if(!strcmp(goad_id, "gmc_filemanager_window"))
-		return impl_GNOME_FileManagerFactory_create_window(
-			servant,
-			params->_length ? params->_buffer [0] : home_dir, ev);
-	
-	CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-			     ex_GNOME_GenericFactory_CannotActivate,
-			     NULL);
-	
-	return CORBA_OBJECT_NIL;
+/* You shouldn't call this routine directly without first deactivating the servant... */
+static void
+impl_GNOME_FileManagerFactory__destroy(impl_POA_GNOME_FileManagerFactory *servant,
+				       CORBA_Environment *ev)
+{
+	PortableServer_ObjectId *objid;
+
+	objid = PortableServer_POA_servant_to_id (servant->poa, servant, ev);
+	PortableServer_POA_deactivate_object (servant->poa, objid, ev);
+	CORBA_free (objid);
+
+	POA_GNOME_FileManagerFactory__fini ((PortableServer_Servant) servant, ev);
+	g_free (servant);
 }
 
-int
-try_to_activate_running_copy (void)
-{
-	CORBA_Object name_service;
-	CORBA_Environment ev;
-	CosNaming_NameComponent nc[3] = {{"GNOME", "subcontext"},
-					 {"Servers", "subcontext"},
-					 {"gmc_filemanager_factory", "object"}};
-	CosNaming_Name          nom = {0, 3, nc, CORBA_FALSE};
-	CORBA_Object retval = CORBA_OBJECT_NIL;
-	
-	CORBA_exception_init (&ev);
-	
-	name_service = gnome_name_service_get();
-	if (name_service == CORBA_OBJECT_NIL)
-		goto out;
+static CORBA_boolean
+impl_GNOME_FileManagerFactory_supports (impl_POA_GNOME_FileManagerFactory *servant,
+					const CORBA_char *obj_goad_id,
+					CORBA_Environment *ev)
+{
+	if (strcmp (obj_goad_id, "gmc_filemanager_window") == 0)
+		return CORBA_TRUE;
+	else
+		return CORBA_FALSE;
+}
 
-	retval = CosNaming_NamingContext_resolve (name_service, &nom, &ev);
-	if (ev._major == CORBA_USER_EXCEPTION
-	    && strcmp(CORBA_exception_id(&ev), ex_CosNaming_NamingContext_NotFound) == 0){
-		retval = CORBA_OBJECT_NIL;
-		goto out;
+static CORBA_Object
+impl_GNOME_FileManagerFactory_create_object (impl_POA_GNOME_FileManagerFactory *servant,
+					     const CORBA_char *goad_id,
+					     const GNOME_stringlist *params,
+					     CORBA_Environment *ev)
+{
+	if (strcmp (goad_id, "gmc_filemanager_window") != 0) {
+		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
+				     ex_GNOME_GenericFactory_CannotActivate,
+				     NULL);
+		return CORBA_OBJECT_NIL;
 	}
 
-	if (CORBA_Object_is_nil (retval, &ev))
-		goto out;
+	return impl_GNOME_FileManagerFactory_create_window (
+		servant,
+		params->_length ? params->_buffer[0] : home_dir,
+		ev);
+}
 
-	GNOME_FileManagerFactory_create_window (retval, home_dir, &ev);
+/* Callback used when a panel is destroyed */
+static void
+panel_destroyed (GtkObject *object, gpointer data)
+{
+	impl_POA_GNOME_FileManagerWindow *servant;
+	CORBA_Environment ev;
 
-	if (ev._major != CORBA_NO_EXCEPTION)
-		retval = CORBA_OBJECT_NIL;
-out:
+	servant = data;
+
+	CORBA_exception_init (&ev);
+	impl_GNOME_FileManagerWindow__destroy (servant, &ev);
 	CORBA_exception_free (&ev);
-	CORBA_Object_release (name_service, &ev);
-	return retval != CORBA_OBJECT_NIL;
 }
 
-void
-corba_init (void)
+static GNOME_FileManagerWindow
+impl_GNOME_FileManagerFactory_create_window(impl_POA_GNOME_FileManagerFactory *servant,
+					    const CORBA_char *dir,
+					    CORBA_Environment *ev)
+{
+	GNOME_FileManagerWindow retval;
+	impl_POA_GNOME_FileManagerWindow *newservant;
+	WPanel *panel;
+
+	retval = impl_GNOME_FileManagerWindow__create (servant->poa,
+						       &newservant,
+						       ev);
+
+	panel = new_panel_at ((dir && *dir) ? dir : home_dir);
+	newservant->panel = panel;
+
+	gtk_signal_connect (GTK_OBJECT (panel->xwindow), "destroy",
+			    (GtkSignalFunc) panel_destroyed,
+			    newservant);
+
+	return retval;
+}
+
+/*** Public non-implementation functions ***/
+
+/* Creates the CORBA server */
+static int
+create_server (void)
 {
 	CORBA_Environment ev;
-	
+	PortableServer_POA poa;
+	PortableServer_POAManager poa_manager;
+	int retval;
+	int v;
+
+	retval = FALSE;
 	CORBA_exception_init (&ev);
 
-	orb = gnome_CORBA_ORB ();
+	/* Get the POA and create the server */
 
 	poa = (PortableServer_POA) CORBA_ORB_resolve_initial_references (orb, "RootPOA", &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		printf ("Can not resolve initial reference to RootPOA");
-		return;
-	}
+	if (ev._major != CORBA_NO_EXCEPTION)
+		goto out;
 
 	poa_manager = PortableServer_POA__get_the_POAManager (poa, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		printf ("Can not get the POAmanager");
-		return;
-	}
-	
+	if (ev._major != CORBA_NO_EXCEPTION)
+		goto out;
+
 	PortableServer_POAManager_activate (poa_manager, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-		printf ("Can not get the POAmanager");
-		return;
+	if (ev._major != CORBA_NO_EXCEPTION)
+		goto out;
+
+	gmc_server = impl_GNOME_FileManagerFactory__create (poa, NULL, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION)
+		goto out;
+
+	CORBA_Object_release ((CORBA_Object) poa, &ev);
+	if (ev._major != CORBA_NO_EXCEPTION)
+		goto out;
+
+	/* Register the server and see if it was already there */
+
+	v = goad_server_register (CORBA_OBJECT_NIL, gmc_server,
+				  "gmc_filemanager_factory", "server", &ev);
+	switch (v) {
+	case 0:
+		corba_have_server = FALSE;
+		break;
+
+	case -2:
+		corba_have_server = FALSE;
+		break;
+
+	default:
+		goto out;
 	}
+
+	retval = TRUE;
+
+	/* Done */
+
+ out:
+	return retval;
 }
 
+/**
+ * corba_init_server:
+ * @void: 
+ * 
+ * Initializes the CORBA factory object for gmc.  Returns whether initialization
+ * was successful or not, and sets the global corba_have_server variable.
+ * 
+ * Return value: TRUE if successful, FALSE otherwise.
+ **/
+int
+corba_init_server (void)
+{
+	gmc_server = goad_server_activate_with_id (NULL,
+						   "gmc_filemanager_factory",
+						   GOAD_ACTIVATE_EXISTING_ONLY,
+						   NULL);
+
+	if (gmc_server != CORBA_OBJECT_NIL) {
+		corba_have_server = TRUE;
+		return TRUE;
+	} else
+		return create_server ();
+}
+
+/**
+ * corba_create_window:
+ * @void: 
+ * 
+ * Creates a GMC window using a CORBA call to the server.
+ **/
 void
-corba_register_server (void)
+corba_create_window (void)
 {
 	CORBA_Environment ev;
-	int v;
-	
-	CORBA_exception_init (&ev);
+	char cwd[MC_MAXPATHLEN];
 
-	/*
-	 * Initialize the Factory Object
-	 */
-	POA_GNOME_FileManagerFactory__init (
-		(POA_GNOME_FileManagerFactory*)&poa_filemanagerfactory_servant,
-		&ev);
-	
-	if (ev._major != CORBA_NO_EXCEPTION){
-		CORBA_exception_free (&ev);
-		printf ("Can not initialize FileManagerFactory object\n");
-		return;
-	}
-
-	/* Activate the object */
-	CORBA_free (PortableServer_POA_activate_object
-		    (poa, &poa_filemanagerfactory_servant, &ev));
-
-	/* Get a refeerence to te object */
-	filemanagerfactory_server = PortableServer_POA_servant_to_reference (
-		poa, &poa_filemanagerfactory_servant, &ev);
-
-	v = goad_server_register (
-		NULL, filemanagerfactory_server,
-		"gmc_filemanager_factory", "server", &ev);
+	mc_get_current_wd (cwd, MC_MAXPATHLEN);
 
+	CORBA_exception_init (&ev);
+	GNOME_FileManagerFactory_create_window (gmc_server, cwd, &ev);
 	CORBA_exception_free (&ev);
-	if (v != 0)
-		return;
-	
 }
diff -ruN old/mc-4.5.28/gnome/gcorba.h new/mc-4.5.29/gnome/gcorba.h
--- old/mc-4.5.28/gnome/gcorba.h	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gcorba.h	Tue Mar 30 01:34:46 1999
@@ -1,8 +1,24 @@
+/* CORBA support for the Midhignt Commander
+ *
+ * Copyright (C) 1999 The Free Sofware Foundation
+ *
+ * Authors: Miguel de Icaza <miguel@nuclecu.unam.mx>
+ *          Federico Mena <federico@nuclecu.unam.mx>
+ *          Elliot Lee <sopwith@cuc.edu>
+ */
+
 #ifndef __GCORBA_H
 #define __GCORBA_H
 
+#include <orb/orbit.h>
+
+
+/* The ORB */
 extern CORBA_ORB orb;
 
-void corba_register_server (void);
+
+int corba_init_server (void);
+void corba_create_window (void);
+
 
 #endif
diff -ruN old/mc-4.5.28/gnome/gdesktop-icon.c new/mc-4.5.29/gnome/gdesktop-icon.c
--- old/mc-4.5.28/gnome/gdesktop-icon.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gdesktop-icon.c	Tue Mar 30 01:34:44 1999
@@ -157,6 +157,14 @@
 
 	gdk_window_set_decorations (widget->window, 0);
 	gdk_window_set_functions (widget->window, 0);
+
+	/* Remove the client leader property so that the window manager will not
+	 * save SM information for icons.
+	 */
+
+	gdk_property_delete (widget->window, gdk_atom_intern ("WM_CLIENT_LEADER", FALSE));
+
+	/* Set the proper GNOME hints */
 	
 	gnome_win_hints_init ();
 
diff -ruN old/mc-4.5.28/gnome/gdesktop-init.c new/mc-4.5.29/gnome/gdesktop-init.c
--- old/mc-4.5.28/gnome/gdesktop-init.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gdesktop-init.c	Tue Mar 30 01:34:44 1999
@@ -82,8 +82,7 @@
 	DIR *d;
 	struct dirent *dent;
 	const int links_extlen = sizeof (".links")-1;
-	struct stat s;
-	
+
 	d = opendir (dir);
 	if (!d)
 		return;
@@ -100,7 +99,7 @@
 		if (access (fname, X_OK) == 0){
 			char *desktop_quoted;
 			char *command;
-			
+
 			desktop_quoted = name_quote (desktop_directory, 0);
 			command = g_strconcat (fname, " --desktop-dir", desktop_quoted, NULL);
 			g_free (desktop_quoted);
@@ -115,12 +114,12 @@
 			g_free (fname);
 			continue;
 		}
-		
+
 		if (strcmp (dent->d_name + len - links_extlen, ".links")){
 			g_free (fname);
 			continue;
 		}
-		
+
 		desktop_load_init_from (fname);
 	}
 }
diff -ruN old/mc-4.5.28/gnome/gdesktop.c new/mc-4.5.29/gnome/gdesktop.c
--- old/mc-4.5.28/gnome/gdesktop.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gdesktop.c	Tue Mar 30 01:34:44 1999
@@ -20,6 +20,7 @@
 #include "gconf.h"
 #include "gdesktop.h"
 #include "gdesktop-icon.h"
+#include "gdesktop-init.h"
 #include "gicon.h"
 #include "gmain.h"
 #include "gmetadata.h"
@@ -1364,6 +1365,7 @@
 	panel->total = total;
 	panel->selected = selected_index;
 	panel->is_a_desktop_panel = TRUE;
+	panel->id = -1;
 
 	return panel;
 }
@@ -2066,7 +2068,7 @@
 			message (FALSE,
 				 _("Warning"),
 				 _("Could not symlink %s to %s; "
-				   "will not have initial desktop icons."),
+				   "will not have initial home desktop icon."),
 				 gnome_user_home_dir, home_link_name);
 		}
 		g_free (home_link_name);
@@ -2399,19 +2401,22 @@
 {
 	gchar *bg_capplet;
 	gchar *argv[1];
+	GtkWidget *msg_box;
+
 	bg_capplet = gnome_is_program_in_path ("background-properties-capplet");
+
 	if (bg_capplet) {
 		argv[0] = bg_capplet;
 		gnome_execute_async (bg_capplet, 1, argv);
 		g_free (bg_capplet);
 	} else {
-		GtkWidget *msg_box;
-		msg_box = gnome_message_box_new (_("Unable to locate the file:\nbackground-properties-capplet\n"
-						   "in your path.\n\nWe are unable to set the background."),
-						 GNOME_MESSAGE_BOX_WARNING,
-						 GNOME_STOCK_BUTTON_OK,
-						 NULL);
-		gnome_dialog_run (msg_box);
+		msg_box = gnome_message_box_new (
+			_("Unable to locate the file:\nbackground-properties-capplet\n"
+			  "in your path.\n\nWe are unable to set the background."),
+			GNOME_MESSAGE_BOX_WARNING,
+			GNOME_STOCK_BUTTON_OK,
+			NULL);
+		gnome_dialog_run (GNOME_DIALOG (msg_box));
 	}
 }
 static GnomeUIInfo gnome_panel_new_menu [] = {
diff -ruN old/mc-4.5.28/gnome/gdesktop.h new/mc-4.5.29/gnome/gdesktop.h
--- old/mc-4.5.28/gnome/gdesktop.h	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gdesktop.h	Tue Mar 30 01:34:46 1999
@@ -1,6 +1,6 @@
 /* Desktop management for the Midnight Commander
  *
- * Copyright (C) 1998 The Free Software Foundation
+ * Copyright (C) 1998-1999 The Free Software Foundation
  *
  * Authors: Federico Mena <federico@nuclecu.unam.mx>
  *          Miguel de Icaza <miguel@nuclecu.unam.mx>
@@ -66,6 +66,8 @@
 void desktop_arrange_icons (void);
 void desktop_rescan_devices (void);
 void desktop_reload_icons (int user_pos, int xpos, int ypos);
+void desktop_create_url (const char *filename, const char *title, const char *url, const char *icon);
 
 extern int desktop_wm_is_gnome_compliant;
+
 #endif
diff -ruN old/mc-4.5.28/gnome/gdnd.c new/mc-4.5.29/gnome/gdnd.c
--- old/mc-4.5.28/gnome/gdnd.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gdnd.c	Tue Mar 30 01:34:44 1999
@@ -18,6 +18,7 @@
 #include "gscreen.h"
 #include "../vfs/vfs.h"
 #include <gdk/gdkprivate.h>
+#include "gdesktop.h"
 #include "gdnd.h"
 
 
diff -ruN old/mc-4.5.28/gnome/glayout.c new/mc-4.5.29/gnome/glayout.c
--- old/mc-4.5.28/gnome/glayout.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/glayout.c	Tue Mar 30 01:34:44 1999
@@ -26,6 +26,7 @@
 #include "setup.h"
 #include "../vfs/vfs.h"
 #include "gprefs.h"
+#include "gsession.h"
 #include "listing-iconic.xpm"
 #include "listing-brief-list.xpm"
 #include "listing-list.xpm"
@@ -333,11 +334,11 @@
 		GNOME_STOCK_BUTTON_CANCEL,
 		NULL);
 	v = gnome_dialog_run (GNOME_DIALOG (w));
-	if (v == 0){
+	if (v == 0) {
 		/*
 		 * We do not want to be restarted by the session manager now
 		 */
-		gnome_client_set_restart_style (session_client, GNOME_RESTART_NEVER);
+		session_set_restart (FALSE);
 		gmc_do_quit ();
 	}
 }
@@ -705,17 +706,19 @@
 WPanel *
 create_container (Dlg_head *h, char *name, char *geometry)
 {
-	PanelContainer *container = g_new (PanelContainer, 1);
-	WPanel     *panel;
-	GtkWidget  *app, *vbox;
-	int        xpos, ypos, width, height;
+	PanelContainer *container;
+	WPanel *panel;
+	GtkWidget *app, *vbox;
+	int xpos, ypos, width, height;
 	GnomeUIInfo *uiinfo;
+	char buf[50];
+
+	container = g_new (PanelContainer, 1);
 
 	gnome_parse_geometry (geometry, &xpos, &ypos, &width, &height);
-	
+
 	container->splitted = 0;
 	app = gnome_app_new ("gmc", name);
-	gtk_window_set_wmclass (GTK_WINDOW (app), "gmc", "gmc");
 
 	/* Geometry configuration */
 	if (width != -1 && height != -1)
@@ -727,7 +730,13 @@
 
 	panel = panel_new (name);
 
-	
+	/* Set the unique name for session management */
+
+	sprintf (buf, "%d", panel->id);
+	gtk_window_set_wmclass (GTK_WINDOW (app), "gmc", buf);
+
+	/* Create the holder for the contents */
+
 	vbox = gtk_vbox_new (FALSE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
 	gnome_app_set_contents (GNOME_APP (app), vbox);
@@ -739,7 +748,7 @@
 
 	my_app_create_menus (GNOME_APP (app), uiinfo, panel);
 	copy_uiinfo_widgets (panel_view_menu_uiinfo, &panel->view_menu_items);
-	
+
 	create_new_menu (GNOME_APP (app), panel);
 
 	panel->ministatus = GNOME_APPBAR(gnome_appbar_new(FALSE, TRUE, GNOME_PREFERENCES_NEVER));
@@ -749,7 +758,7 @@
 		gnome_app_install_menu_hints (GNOME_APP (app), gnome_panel_menu_without_desktop);
 	else
 		gnome_app_install_menu_hints (GNOME_APP (app), gnome_panel_menu_with_desktop);
-	
+
 	gtk_signal_connect (GTK_OBJECT (app),
 			    "enter_notify_event",
 			    GTK_SIGNAL_FUNC (panel_enter_event),
@@ -766,7 +775,7 @@
 	 */
 	panel->widget.wdata = (widget_data) vbox;
 	container->panel = panel;
-	
+
 	containers = g_list_append (containers, container);
 
 	if (!current_panel_ptr){
@@ -787,7 +796,9 @@
 	panel = create_container (desktop_dlg, dir, geometry);
 	add_widget (desktop_dlg, panel);
 	set_current_panel (panel);
+#if 0
 	x_flush_events ();
+#endif
 
 	return panel;
 }
diff -ruN old/mc-4.5.28/gnome/gmain.c new/mc-4.5.29/gnome/gmain.c
--- old/mc-4.5.28/gnome/gmain.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gmain.c	Tue Mar 30 01:34:44 1999
@@ -21,9 +21,11 @@
 #include "panel.h"
 #include "gscreen.h"
 #include "gcmd.h"
+#include "gcorba.h"
+#include "gdesktop.h"
+#include "gsession.h"
 #include "command.h"
 #include "cmd.h"
-#include "gdesktop.h"
 
 GdkColorContext *mc_cc;
 
@@ -52,14 +54,15 @@
 /* The Dlg_head for the whole desktop */
 Dlg_head *desktop_dlg;
 
-int run_desktop = 1;
-
 /* Session client */
 GnomeClient *session_client;
 
 /* Used during argument processing */
 extern int finish_program;
 
+/* Whether the gmc server was present or not */
+int corba_have_server = FALSE;
+
 /* This is only used by the editor, so we provide a dummy implementation */
 void
 try_alloc_color_pair (char *str, char *str2)
@@ -453,52 +456,48 @@
 	return 0;
 }
 
-extern char *cmdline_geometry;
+/* Ugly function to support the hack described in non_corba_create_panels() */
+static gint
+idle_destroy_panel (gpointer data)
+{
+	WPanel *panel;
 
-typedef struct {
-	char *dir; char *geometry;
-} dir_and_geometry;
+	panel = data;
+	gnome_close_panel (GTK_WIDGET (panel->widget.wdata), panel);
+	return FALSE;
+}
 
-static int
-idle_create_panel (void *data)
+/* Initializes the desktop and creates the initial panels.  This is to be used
+ * when we do not have a CORBA server.
+ */
+static void
+non_corba_create_panels (void)
 {
-	dir_and_geometry *dg = data;
+	WPanel *panel;
 
-	new_panel_with_geometry_at (dg->dir, dg->geometry);
-	g_free (data);
+	desktop_init ();
+	gnome_init_panels ();
 
-	return 0;
-}
+	cmdline = command_new (0, 0, 0);
+	the_hint = label_new (0, 0, 0, NULL);
+	desktop_dlg = create_dlg (0, 0, 24, 80, 0,
+				  dialog_panel_callback, "[panel]", "midnight", DLG_NO_TED);
 
-static int
-idle_destroy_window (void *data)
-{
-	WPanel *panel = data;
+	session_load ();
 
-	gnome_close_panel (GTK_WIDGET (panel->widget.wdata), panel);
-	return 0;
-}
+	/* The following is a hack.  We have to have at least one panel for
+	 * run_dlg() to be happy.  So we destroy it in the idle loop if we
+	 * didn't need it in the first place.  This idle function is to be run
+	 * at a higher priority than the one used in session_load().
+	 */
 
-/*
- * wrapper for new_panel_with_geometry_at.
- * first invocation is called directly, further calls use
- * the idle handler
- */
-static WPanel *
-create_one_panel (char *dir, char *geometry)
-{
-	static int first = 1;
-	
-	if (first){
-		first = 0;
-		return new_panel_with_geometry_at (dir, geometry);
-	} else {
-		dir_and_geometry *dg = g_new (dir_and_geometry, 1);
-		dg->dir = dir;
-		dg->geometry = geometry;
-		gtk_idle_add (idle_create_panel, dg);
-		return NULL;
-	}
+	panel = new_panel_at (".");
+	gtk_idle_add_priority (GTK_PRIORITY_DEFAULT, idle_destroy_panel, panel);
+	panel->widget.options |= W_PANEL_HIDDEN;
+
+	run_dlg (desktop_dlg);
+
+	desktop_destroy ();
 }
 
 /*
@@ -511,46 +510,14 @@
 void
 create_panels (void)
 {
-	WPanel *panel;
-
-	if (run_desktop)
-		desktop_init ();
-	
-	cmdline = command_new (0, 0, 0);
-	the_hint = label_new (0, 0, 0, NULL);
-
-	gnome_init_panels ();
-	
-	desktop_dlg = create_dlg (0, 0, 24, 80, 0, dialog_panel_callback, "[panel]", "midnight", DLG_NO_TED);
-
-#if 0
-	if (directory_list){
-
-		for (p = directory_list; p; p = p->next){
-			create_one_panel (p->data, cmdline_geometry);
-		}
-		panel = NULL;
-	} else
-#endif
-	  {
-		panel = create_one_panel (".", cmdline_geometry);
+	if (!corba_have_server)
+		non_corba_create_panels ();
+	else {
+		if (!nowindows)
+			corba_create_window ();
 
-		if (nowindows){
-			gtk_idle_add (idle_destroy_window, panel);
-			panel->widget.options |= W_PANEL_HIDDEN;
-		}
+		session_set_restart (FALSE);
 	}
-#if 0
-	g_list_free (directory_list);
-#endif
-
-	main_corba_register_server ();
-
-	run_dlg (desktop_dlg);
-
-	/* shutdown gnome specific bits of midnight commander */
-
-	desktop_destroy ();
 }
 
 void
@@ -561,7 +528,7 @@
 	quit = 1;
 	dlg_stop (desktop_dlg);
 }
-
+#if 0
 static void
 session_die (void)
 {
@@ -632,7 +599,7 @@
 				    GTK_SIGNAL_FUNC (session_die), NULL);
 	}
 }
-
+#endif
 /*
  * Configures the GtkWindow/GnomeDialog from a WPanel.
  *
@@ -644,4 +611,29 @@
 {
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
 	gnome_dialog_set_parent (dialog, GTK_WINDOW (panel->xwindow));
+}
+
+/**
+ * gnome_check_super_user:
+ * @void: 
+ * 
+ * Puts out a warning if the user is running gmc as root.  If the user selects
+ * Cancel, then gmc will terminate.
+ **/
+void
+gnome_check_super_user (void)
+{
+	GtkWidget *warning_dlg;
+	GnomeClient *client;
+
+	if (geteuid () != 0)
+		return;
+
+	warning_dlg = gnome_message_box_new (
+		_("You are running the GNOME Midnight Commander as root. \n\n"
+		  "You will not be protected from severly damaging your system."),
+		GNOME_MESSAGE_BOX_WARNING,
+		GNOME_STOCK_BUTTON_OK, NULL);
+
+	gnome_dialog_run (GNOME_DIALOG (warning_dlg));
 }
diff -ruN old/mc-4.5.28/gnome/gmain.h new/mc-4.5.29/gnome/gmain.h
--- old/mc-4.5.28/gnome/gmain.h	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gmain.h	Tue Mar 30 01:34:46 1999
@@ -10,6 +10,7 @@
 
 extern Dlg_head *desktop_dlg;
 extern int nowindows;
+extern int corba_have_server;
 
 /* Required by the standard code */
 widget_data xtoolkit_create_dialog   (Dlg_head *h, int with_grid);
@@ -44,6 +45,8 @@
 int gmc_view (char *filename, int start_line);
 void x_show_info (WInfo *info, struct my_statfs *s, struct stat *b);
 void x_create_info (Dlg_head *h, widget_data parent, WInfo *info);
+void gnome_check_super_user (void);
+gint create_new_menu_from (char *file, GtkWidget *shell, gint pos);
 
 /*
  * stuff from gaction.c
@@ -60,7 +63,9 @@
 };
 
 void gmc_do_quit (void);
+#if 0
 extern GnomeClient *session_client;
+#endif
 
 extern struct gmc_color_pairs_s gmc_color_pairs [];
 #endif
diff -ruN old/mc-4.5.28/gnome/gnome-file-property-dialog.c new/mc-4.5.29/gnome/gnome-file-property-dialog.c
--- old/mc-4.5.28/gnome/gnome-file-property-dialog.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gnome-file-property-dialog.c	Tue Mar 30 01:34:45 1999
@@ -434,7 +434,7 @@
 generate_icon_sel (GnomeFilePropertyDialog *fp_dlg)
 {
 	GtkWidget *retval;
-	const gchar *icon;
+	gchar *icon;
 	
 	retval = gnome_icon_entry_new ("gmc_file_icon", "Select an Icon");
 	icon = g_strdup (gicon_get_filename_for_icon (fp_dlg->im));
@@ -911,7 +911,7 @@
 	GtkWidget *frame;
 	GtkWidget *table;
 
-	frame = gtk_frame_new ("File ownership");
+	frame = gtk_frame_new (_("File ownership"));
 
 	table = gtk_table_new (2, 2, FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (table), 6);
diff -ruN old/mc-4.5.28/gnome/gnome-open-dialog.c new/mc-4.5.29/gnome/gnome-open-dialog.c
--- old/mc-4.5.28/gnome/gnome-open-dialog.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gnome-open-dialog.c	Tue Mar 30 01:34:45 1999
@@ -17,12 +17,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "util.h"
 #include <gnome.h>
 #include "gnome-open-dialog.h"
 #include <sys/types.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#include <string.h>
 #include <unistd.h>
+
 static void gnome_open_dialog_init		   (GnomeOpenDialog *open_dialog);
 static void gnome_open_dialog_class_init           (GnomeOpenDialogClass *klass);
 static void gnome_open_dialog_destroy              (GtkObject *object);
diff -ruN old/mc-4.5.28/gnome/gscreen.c new/mc-4.5.29/gnome/gscreen.c
--- old/mc-4.5.28/gnome/gscreen.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gscreen.c	Tue Mar 30 01:34:45 1999
@@ -2022,10 +2022,11 @@
 panel_tree_check_auto_expand (WPanel *panel, GtkCTreeNode *current)
 {
 	GtkDTree *dtree = GTK_DTREE (panel->tree);
-	GtkCList *clist = GTK_CLIST (dtree);
 	GList *tmp_list = dtree->auto_expanded_nodes;
-	GList *free_list;
+#if 0
+	GtkCList *clist = GTK_CLIST (dtree);
 	gint row, old_y, new_y;
+#endif
 
 	if (current) {
 		while (tmp_list) {
diff -ruN old/mc-4.5.28/gnome/gsession.c new/mc-4.5.29/gnome/gsession.c
--- old/mc-4.5.28/gnome/gsession.c	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.29/gnome/gsession.c	Tue Mar 30 01:34:45 1999
@@ -0,0 +1,241 @@
+/* Session management for the Midnight Commander
+ *
+ * Copyright (C) 1999 the Free Software Foundation
+ *
+ * Authors: Federico Mena <federico@nuclecu.unam.mx>
+ *          Miguel de Icaza <miguel@nuclecu.unam.mx>
+ */
+
+#include <config.h>
+#include "main.h"
+#include "../vfs/vfs.h"
+#include "gmain.h"
+#include "gscreen.h"
+#include "gsession.h"
+#include <gnome.h>
+
+
+/* Whether we are session managed or not */
+int session_have_sm = FALSE;
+
+/* The master SM client */
+static GnomeClient *master_client;
+
+/* Structure to hold information for a panel to be created */
+typedef struct {
+	char *cwd;
+} PanelInfo;
+
+
+/* Saves the SM info for a panel */
+static void
+save_panel_info (WPanel *panel)
+{
+	char section[50];
+	char *key;
+
+	sprintf (section, "panel %d", panel->id);
+
+	key = g_strconcat (section, "/cwd", NULL);
+	gnome_config_set_string (key, panel->cwd);
+	g_free (key);
+
+	/* FIXME: save information about list column sizes, etc. */
+}
+
+/* Loads a panel from the information in the specified gnome-config file/section */
+static PanelInfo *
+load_panel_info (char *file, char *section)
+{
+	PanelInfo *pi;
+	char *prefix;
+	char *cwd;
+
+	pi = NULL;
+
+	prefix = g_strconcat (file, section, "/", NULL);
+	printf ("Prefix is \"%s\"\n", prefix);
+	gnome_config_push_prefix (prefix);
+
+	cwd = gnome_config_get_string ("cwd");
+	if (cwd) {
+		pi = g_new (PanelInfo, 1);
+		pi->cwd = cwd;
+	} else
+		g_warning ("Could not read panel data for \"%s\"", prefix);
+
+	gnome_config_pop_prefix ();
+	g_free (prefix);
+
+	return pi;
+}
+
+/* Frees a panel info structure */
+static void
+free_panel_info (PanelInfo *pi)
+{
+	g_free (pi->cwd);
+	g_free (pi);
+}
+
+/* Idle handler to create the list of panels loaded from the session info file */
+static gint
+idle_create_panels (gpointer data)
+{
+	GSList *panels, *p;
+	PanelInfo *pi;
+
+	panels = data;
+
+	for (p = panels; p; p = p->next) {
+		pi = p->data;
+		new_panel_at (pi->cwd);
+		free_panel_info (pi);
+	}
+
+	g_slist_free (panels);
+	return FALSE;
+}
+
+/* Loads session information from the specified gnome-config file */
+static void
+load_session_info (char *filename)
+{
+	void *iterator;
+	char *key, *value;
+	GSList *panels;
+	PanelInfo *pi;
+
+	/* Slurp the list of panels to create */
+
+	iterator = gnome_config_init_iterator_sections (filename);
+	panels = NULL;
+
+	while ((iterator = gnome_config_iterator_next (iterator, &key, &value)) != NULL)
+		if (key && strncmp (key, "panel ", 6) == 0) {
+			pi = load_panel_info (filename, key);
+			panels = g_slist_prepend (panels, pi);
+			g_free (key);
+		}
+
+	/* Create the panels in the idle loop to keep run_dlg() happy.  See the
+	 * comment in gmain.c:non_corba_create_panels().
+	 */
+
+	gtk_idle_add_priority (GTK_PRIORITY_DEFAULT + 1, idle_create_panels, panels);
+}
+
+/* Idle handler to create the default panel */
+static gint
+idle_create_default_panel (gpointer data)
+{
+	char *cwd;
+
+	cwd = data;
+	new_panel_with_geometry_at (cwd, cmdline_geometry);
+	g_free (cwd);
+
+	return FALSE;
+}
+
+/* Queues the creation of the default panel */
+static void
+create_default_panel (void)
+{
+	char buf[MC_MAXPATHLEN];
+
+	mc_get_current_wd (buf, MC_MAXPATHLEN);
+
+	gtk_idle_add_priority (GTK_PRIORITY_DEFAULT + 1, idle_create_default_panel, g_strdup (buf));
+}
+
+/* Callback from the master client to save the session */
+static gint
+session_save (GnomeClient *client, gint phase, GnomeSaveStyle save_style, gint shutdown,
+	      GnomeInteractStyle interact_style, gint fast, gpointer data)
+{
+	char *prefix;
+	GList *l;
+	PanelContainer *pc;
+
+	prefix = gnome_client_get_config_prefix (client);
+	gnome_config_push_prefix (prefix);
+
+	/* Save the panels */
+
+	for (l = containers; l; l = l->next) {
+		pc = l->data;
+		if (!is_a_desktop_panel (pc->panel))
+			save_panel_info (pc->panel);
+	}
+
+	gnome_config_pop_prefix ();
+	gnome_config_sync ();
+
+	return TRUE;
+}
+
+/* Callback from the master client to terminate the session */
+static void
+session_die (GnomeClient *client, gpointer data)
+{
+	gmc_do_quit ();
+}
+
+/**
+ * session_init:
+ * @void:
+ * 
+ * Initializes session management.  Contacts the master client and
+ * connects the appropriate signals.
+ **/
+void
+session_init ()
+{
+	master_client = gnome_master_client ();
+
+	session_have_sm = (gnome_client_get_flags (master_client) & GNOME_CLIENT_IS_CONNECTED) != 0;
+
+	gtk_signal_connect (GTK_OBJECT (master_client), "save_yourself",
+			    (GtkSignalFunc) session_save,
+			    NULL);
+	gtk_signal_connect (GTK_OBJECT (master_client), "die",
+			    (GtkSignalFunc) session_die,
+			    NULL);
+
+	session_set_restart (TRUE);
+}
+
+/**
+ * session_load:
+ * @void: 
+ * 
+ * Loads the saved session.
+ **/
+void
+session_load (void)
+{
+	char *filename;
+
+	if (gnome_client_get_flags (master_client) & GNOME_CLIENT_RESTORED) {
+		filename = gnome_client_get_config_prefix (master_client);
+		load_session_info (filename);
+	} else if (!nowindows)
+		create_default_panel ();
+}
+
+/**
+ * session_set_restart:
+ * @restart: TRUE if it should restart immediately, FALSE if it should restart
+ * never.
+ * 
+ * Sets the restart style of the session-managed client.
+ **/
+void
+session_set_restart (int restart)
+{
+	gnome_client_set_restart_style (master_client,
+					(restart
+					 ? GNOME_RESTART_IMMEDIATELY
+					 : GNOME_RESTART_NEVER));
+}
diff -ruN old/mc-4.5.28/gnome/gsession.h new/mc-4.5.29/gnome/gsession.h
--- old/mc-4.5.28/gnome/gsession.h	Wed Dec 31 19:00:00 1969
+++ new/mc-4.5.29/gnome/gsession.h	Tue Mar 30 01:34:46 1999
@@ -0,0 +1,20 @@
+/* Session management for the Midnight Commander
+ *
+ * Copyright (C) 1999 the Free Software Foundation
+ *
+ * Authors: Federico Mena <federico@nuclecu.unam.mx>
+ *          Miguel de Icaza <miguel@nuclecu.unam.mx>
+ */
+
+#ifndef GSESSION_H
+#define GSESSION_H
+
+
+extern int session_have_sm;
+
+void session_init (void);
+void session_load (void);
+void session_set_restart (int restart);
+
+
+#endif
diff -ruN old/mc-4.5.28/gnome/gtkdtree.c new/mc-4.5.29/gnome/gtkdtree.c
--- old/mc-4.5.28/gnome/gtkdtree.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gtkdtree.c	Tue Mar 30 01:34:45 1999
@@ -18,6 +18,7 @@
 #include "main.h"
 #include "treestore.h"
 #include "gtkdtree.h"
+#include "../vfs/vfs.h"
 
 #ifdef HACK
 # define mc_opendir opendir
diff -ruN old/mc-4.5.28/gnome/gtools.c new/mc-4.5.29/gnome/gtools.c
--- old/mc-4.5.28/gnome/gtools.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gtools.c	Tue Mar 30 01:34:45 1999
@@ -20,26 +20,20 @@
 #include "color.h"
 #include "gmain.h"
 #include "gwidget.h"
+
 Dlg_head *last_query_dlg;
 static int sel_pos;
 
-void query_set_sel (int new_sel)
+void
+query_set_sel (int new_sel)
 {
 	sel_pos = new_sel;
 }
 
-static void
-pack_button (WButton *button, GtkBox *box)
-{
-	if (!button)
-		return;
-	gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (button->widget.wdata), 0, 0, 0);
-}
-
-int query_dialog (char *header, char *text, int flags, int count, ...)
+int
+query_dialog (char *header, char *text, int flags, int count, ...)
 {
 	va_list ap;
-	WLabel    *label;
 	GtkWidget *dialog;
 	int i, result = -1;
 	const gchar **buttons;
@@ -94,7 +88,8 @@
 }
 
 /* To show nice messages to the users */
-Dlg_head *message (int error, char *header, char *text, ...)
+Dlg_head *
+message (int error, char *header, char *text, ...)
 {
 	va_list  args;
 	char     buffer [4096];
diff -ruN old/mc-4.5.28/gnome/gwidget.c new/mc-4.5.29/gnome/gwidget.c
--- old/mc-4.5.28/gnome/gwidget.c	Fri Mar 26 15:30:43 1999
+++ new/mc-4.5.29/gnome/gwidget.c	Tue Mar 30 01:34:45 1999
@@ -326,7 +326,9 @@
 void
 x_update_input (WInput *in)
 {
+#ifdef USE_GNOME_ENTRY
 	GnomeEntry *gnome_entry;
+#endif
 	GtkEntry   *entry;
 	char       *text;
 	int        draw = 0;
@@ -545,6 +547,7 @@
 		gtk_label_set (GTK_LABEL (label->widget.wdata), text);
 }
 
+#if 0
 /* Buttonbar */
 static void
 buttonbar_clicked (GtkWidget *widget, WButtonBar *bb)
@@ -563,12 +566,15 @@
 	}
 	printf ("Mhm, should not happen or The Cow is out\n");
 }
+#endif
 
 int
 x_create_buttonbar (Dlg_head *h, widget_data parent, WButtonBar *bb)
 {
 	GtkWidget *hbox;
+#if 0
 	int i;
+#endif
 	
 	hbox = gtk_hbox_new (0, 0);
 #if 0
diff -ruN old/mc-4.5.28/intl/ChangeLog new/mc-4.5.29/intl/ChangeLog
--- old/mc-4.5.28/intl/ChangeLog	Fri Feb  5 13:50:10 1999
+++ new/mc-4.5.29/intl/ChangeLog	Tue Mar 30 01:13:14 1999
@@ -1,3 +1,8 @@
+Sun Mar 28 16:32:00 1999  ape@spacetec.no  (Asbjorn Pettersen)
+
+	* loadmsgcat.c: include <sys/types.h> before <fcntl.h>
+	OS/2 version fails if not.
+
 1997-09-06 02:10  Ulrich Drepper  <drepper@cygnus.com>
 
 	* intlh.inst.in: Reformat copyright.
diff -ruN old/mc-4.5.28/intl/loadmsgcat.c new/mc-4.5.29/intl/loadmsgcat.c
--- old/mc-4.5.28/intl/loadmsgcat.c	Fri Feb  5 13:50:34 1999
+++ new/mc-4.5.29/intl/loadmsgcat.c	Tue Mar 30 01:13:14 1999
@@ -19,8 +19,8 @@
 # include <config.h>
 #endif
 
-#include <fcntl.h>
 #include <sys/types.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
 #if defined STDC_HEADERS || defined _LIBC
diff -ruN old/mc-4.5.28/macros/gnome-vfs.m4 new/mc-4.5.29/macros/gnome-vfs.m4
--- old/mc-4.5.28/macros/gnome-vfs.m4	Fri Mar 26 15:30:47 1999
+++ new/mc-4.5.29/macros/gnome-vfs.m4	Tue Mar 30 01:34:48 1999
@@ -5,9 +5,12 @@
 dnl     Sets termnet  to true or false depending on whether it is required.
 dnl        If yes, defines USE_TERMNET.
 dnl     Sets vfs_flags to "pretty" list of vfs implementations we include.
+dnl     Sets shell variable use_vfs to yes (default, --with-vfs) or
+dnl        "no" (--without-vfs).
 dnl     Calls AC_SUBST(mcserv), which is either empty or "mcserv".
 
-AC_DEFUN([GNOME_VFS_CHECKS],[
+dnl Private define
+AC_DEFUN([GNOME_WITH_VFS],[
   dnl FIXME: network checks should probably be in their own macro.
   AC_CHECK_LIB(nsl, t_accept)
   AC_CHECK_LIB(socket, socket)
@@ -34,7 +37,6 @@
     done
   fi
 
-
   vfs_flags="tarfs"
   use_net_code=false
   if test $have_socket = yes; then
@@ -75,6 +77,27 @@
 	TERMNET="-ltermnet"
      fi
   fi
+
   AC_SUBST(TERMNET)
   AC_SUBST(mcserv)
+
+dnl FIXME:
+dnl GNOME_VFS_LIBS=
+
 ])
+
+AC_DEFUN([GNOME_VFS_CHECKS],[
+	use_vfs=yes
+	AC_ARG_WITH(vfs,
+		[--with-vfs		   Compile with the VFS code],
+		use_vfs=$withval
+	)
+	case $use_vfs in
+		yes) 	GNOME_WITH_VFS;;
+		no) 	use_vfs=no;;
+		*)   	use_vfs=no;;
+			dnl Should we issue a warning?
+	esac
+])
+
+
diff -ruN old/mc-4.5.28/mc.spec new/mc-4.5.29/mc.spec
--- old/mc-4.5.28/mc.spec	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/mc.spec	Tue Mar 30 01:34:33 1999
@@ -1,5 +1,5 @@
 # Note that this is NOT a relocatable package
-%define ver     4.5.28
+%define ver     4.5.29
 %define rel     1
 %define prefix  /usr
 
diff -ruN old/mc-4.5.28/po/cat-id-tbl.c new/mc-4.5.29/po/cat-id-tbl.c
--- old/mc-4.5.28/po/cat-id-tbl.c	Fri Mar 26 15:30:48 1999
+++ new/mc-4.5.29/po/cat-id-tbl.c	Tue Mar 30 01:34:51 1999
@@ -73,7 +73,7 @@
   {"While running the eject command", 60},
   {"Error", 61},
   {"Home directory", 62},
-  {"Could not symlink %s to %s; will not have initial desktop icons.", 63},
+  {"Could not symlink %s to %s; will not have initial home desktop icon.", 63},
   {"\
 Unable to locate the file:\n\
 background-properties-capplet\n\
@@ -255,270 +255,271 @@
   {"Set UID", 218},
   {"Set GID", 219},
   {"Sticky", 220},
-  {"URL", 221},
-  {"Statistics", 222},
-  {"Options", 223},
-  {"Permissions", 224},
-  {" Properties", 225},
-  {"You entered an invalid username", 226},
-  {"You must rename your file to something", 227},
-  {"You cannot rename a file to something containing a '/' character", 228},
-  {"Select an application to open \"", 229},
-  {"Select a file to run with", 230},
-  {"Applications", 231},
-  {"Program to run", 232},
-  {"Mount device", 233},
-  {"Unmount device", 234},
-  {"Eject device", 235},
-  {"Open with...", 236},
-  {"View Unfiltered", 237},
-  {"Copy...", 238},
-  {"Delete", 239},
-  {"Move...", 240},
-  {"Hard Link...", 241},
-  {"Symlink...", 242},
-  {"Edit Symlink...", 243},
-  {"Properties...", 244},
-  {"Show backup files", 245},
-  {"Show hidden files", 246},
-  {"Mix files and directories", 247},
-  {"Use shell patterns instead of regular expressions", 248},
-  {"Confirm when deleting file", 249},
-  {"Confirm when overwriting files", 250},
-  {"Confirm when executing files", 251},
-  {"Show progress while operations are being performed", 252},
-  {"VFS Timeout:", 253},
-  {"Seconds", 254},
-  {"Anonymous FTP password:", 255},
-  {"Always use FTP proxy", 256},
-  {"Fast directory reload", 257},
-  {"Compute totals before copying files", 258},
-  {"FTP directory cache timeout :", 259},
-  {"Allow customization of icons in icon view", 260},
-  {"File display", 261},
-  {"Confirmation", 262},
-  {"VFS", 263},
-  {"Caching", 264},
-  {"Preferences", 265},
-  {"Filename", 266},
-  {"Full name: ", 267},
-  {"Command", 268},
-  {"Command:", 269},
-  {"Use terminal", 270},
-  {"File mode (permissions)", 271},
-  {"<Unknown>", 272},
-  {"General", 273},
-  {"Title", 274},
-  {"Select icon", 275},
-  {"Rescan Directory", 276},
-  {"Reloads the current directory", 277},
-  {"New folder", 278},
-  {"Creates a new folder here", 279},
-  {"All files", 280},
-  {"Archives and compressed files", 281},
-  {"RPM/DEB files", 282},
-  {"Text/Document files", 283},
-  {"HTML and SGML files", 284},
-  {"Postscript and PDF files", 285},
-  {"Spreadsheet files", 286},
-  {"Image files", 287},
-  {"Video/animation files", 288},
-  {"Audio files", 289},
-  {"C program files", 290},
-  {"C++ program files", 291},
-  {"Objective-C program files", 292},
-  {"Scheme program files", 293},
-  {"Assembler program files", 294},
-  {"Misc. program files", 295},
-  {"Font files", 296},
-  {"Search: %s", 297},
-  {"%s bytes in %d file", 298},
-  {"%s bytes in %d files", 299},
-  {"<readlink failed>", 300},
-  {"Filter", 301},
-  {"Back", 302},
-  {"Go to the previously visited directory", 303},
-  {"Up", 304},
-  {"Go up a level in the directory heirarchy", 305},
-  {"Forward", 306},
-  {"Go to the next directory", 307},
-  {"Rescan", 308},
-  {"Rescan the current directory", 309},
-  {"Home", 310},
-  {"Go to your home directory", 311},
-  {"Location:", 312},
-  {"&Ok", 313},
-  {"Offset 0x%08x", 314},
-  {"Col %d", 315},
-  {"%s bytes", 316},
-  {"_Goto line", 317},
-  {"Jump to a specified line number", 318},
-  {"_Monitor file", 319},
-  {"Monitor file growing", 320},
-  {"Regexp search", 321},
-  {"Regular expression search", 322},
-  {"_Wrap", 323},
-  {"Wrap the text", 324},
-  {"_Parsed view", 325},
-  {"_Formatted", 326},
-  {"_Hex", 327},
-  {"_Search", 328},
-  {"ok", 329},
-  {"cancel", 330},
-  {"help", 331},
-  {"yes", 332},
-  {"no", 333},
-  {"exit", 334},
-  {"abort", 335},
-  {" Error ", 336},
-  {" Failed trying to open file for reading: ", 337},
-  {" Cannot get size/permissions info on file: ", 338},
-  {" Not an ordinary file: ", 339},
-  {" File is too large: ", 340},
+  {"File ownership", 221},
+  {"URL", 222},
+  {"Statistics", 223},
+  {"Options", 224},
+  {"Permissions", 225},
+  {" Properties", 226},
+  {"You entered an invalid username", 227},
+  {"You must rename your file to something", 228},
+  {"You cannot rename a file to something containing a '/' character", 229},
+  {"Select an application to open \"", 230},
+  {"Select a file to run with", 231},
+  {"Applications", 232},
+  {"Program to run", 233},
+  {"Mount device", 234},
+  {"Unmount device", 235},
+  {"Eject device", 236},
+  {"Open with...", 237},
+  {"View Unfiltered", 238},
+  {"Copy...", 239},
+  {"Delete", 240},
+  {"Move...", 241},
+  {"Hard Link...", 242},
+  {"Symlink...", 243},
+  {"Edit Symlink...", 244},
+  {"Properties...", 245},
+  {"Show backup files", 246},
+  {"Show hidden files", 247},
+  {"Mix files and directories", 248},
+  {"Use shell patterns instead of regular expressions", 249},
+  {"Confirm when deleting file", 250},
+  {"Confirm when overwriting files", 251},
+  {"Confirm when executing files", 252},
+  {"Show progress while operations are being performed", 253},
+  {"VFS Timeout:", 254},
+  {"Seconds", 255},
+  {"Anonymous FTP password:", 256},
+  {"Always use FTP proxy", 257},
+  {"Fast directory reload", 258},
+  {"Compute totals before copying files", 259},
+  {"FTP directory cache timeout :", 260},
+  {"Allow customization of icons in icon view", 261},
+  {"File display", 262},
+  {"Confirmation", 263},
+  {"VFS", 264},
+  {"Caching", 265},
+  {"Preferences", 266},
+  {"Filename", 267},
+  {"Full name: ", 268},
+  {"Command", 269},
+  {"Command:", 270},
+  {"Use terminal", 271},
+  {"File mode (permissions)", 272},
+  {"<Unknown>", 273},
+  {"General", 274},
+  {"Title", 275},
+  {"Select icon", 276},
+  {"Rescan Directory", 277},
+  {"Reloads the current directory", 278},
+  {"New folder", 279},
+  {"Creates a new folder here", 280},
+  {"All files", 281},
+  {"Archives and compressed files", 282},
+  {"RPM/DEB files", 283},
+  {"Text/Document files", 284},
+  {"HTML and SGML files", 285},
+  {"Postscript and PDF files", 286},
+  {"Spreadsheet files", 287},
+  {"Image files", 288},
+  {"Video/animation files", 289},
+  {"Audio files", 290},
+  {"C program files", 291},
+  {"C++ program files", 292},
+  {"Objective-C program files", 293},
+  {"Scheme program files", 294},
+  {"Assembler program files", 295},
+  {"Misc. program files", 296},
+  {"Font files", 297},
+  {"Search: %s", 298},
+  {"%s bytes in %d file", 299},
+  {"%s bytes in %d files", 300},
+  {"<readlink failed>", 301},
+  {"Filter", 302},
+  {"Back", 303},
+  {"Go to the previously visited directory", 304},
+  {"Up", 305},
+  {"Go up a level in the directory heirarchy", 306},
+  {"Forward", 307},
+  {"Go to the next directory", 308},
+  {"Rescan", 309},
+  {"Rescan the current directory", 310},
+  {"Home", 311},
+  {"Go to your home directory", 312},
+  {"Location:", 313},
+  {"&Ok", 314},
+  {"Offset 0x%08x", 315},
+  {"Col %d", 316},
+  {"%s bytes", 317},
+  {"_Goto line", 318},
+  {"Jump to a specified line number", 319},
+  {"_Monitor file", 320},
+  {"Monitor file growing", 321},
+  {"Regexp search", 322},
+  {"Regular expression search", 323},
+  {"_Wrap", 324},
+  {"Wrap the text", 325},
+  {"_Parsed view", 326},
+  {"_Formatted", 327},
+  {"_Hex", 328},
+  {"_Search", 329},
+  {"ok", 330},
+  {"cancel", 331},
+  {"help", 332},
+  {"yes", 333},
+  {"no", 334},
+  {"exit", 335},
+  {"abort", 336},
+  {" Error ", 337},
+  {" Failed trying to open file for reading: ", 338},
+  {" Cannot get size/permissions info on file: ", 339},
+  {" Not an ordinary file: ", 340},
+  {" File is too large: ", 341},
   {"\
  \n\
- Increase edit.h:MAXBUF and recompile the editor. ", 341},
-  {" Error allocating memory ", 342},
-  {"Quick save ", 343},
-  {"Safe save ", 344},
-  {"Do backups -->", 345},
-  {"&Cancel", 346},
-  {"Extension:", 347},
-  {" Edit Save Mode ", 348},
-  {" Save As ", 349},
-  {" Warning ", 350},
-  {" A file already exists with this name. ", 351},
-  {"Overwrite", 352},
-  {"Cancel", 353},
-  {" Save as ", 354},
-  {" Error trying to save file. ", 355},
-  {" Delete macro ", 356},
-  {" Error trying to open temp file ", 357},
-  {" Error trying to open macro file ", 358},
-  {"key '%d 0': ", 359},
-  {" Error trying to overwrite macro file ", 360},
-  {" Macro ", 361},
-  {" Press the macro's new hotkey: ", 362},
-  {" Save macro ", 363},
-  {" Delete Macro ", 364},
-  {" Load macro ", 365},
-  {" Confirm save file? : ", 366},
-  {" Save file ", 367},
-  {"Save", 368},
+ Increase edit.h:MAXBUF and recompile the editor. ", 342},
+  {" Error allocating memory ", 343},
+  {"Quick save ", 344},
+  {"Safe save ", 345},
+  {"Do backups -->", 346},
+  {"&Cancel", 347},
+  {"Extension:", 348},
+  {" Edit Save Mode ", 349},
+  {" Save As ", 350},
+  {" Warning ", 351},
+  {" A file already exists with this name. ", 352},
+  {"Overwrite", 353},
+  {"Cancel", 354},
+  {" Save as ", 355},
+  {" Error trying to save file. ", 356},
+  {" Delete macro ", 357},
+  {" Error trying to open temp file ", 358},
+  {" Error trying to open macro file ", 359},
+  {"key '%d 0': ", 360},
+  {" Error trying to overwrite macro file ", 361},
+  {" Macro ", 362},
+  {" Press the macro's new hotkey: ", 363},
+  {" Save macro ", 364},
+  {" Delete Macro ", 365},
+  {" Load macro ", 366},
+  {" Confirm save file? : ", 367},
+  {" Save file ", 368},
+  {"Save", 369},
   {"\
  Current text was modified without a file save. \n\
- Continue discards these changes. ", 369},
-  {"Continue", 370},
-  {" Load ", 371},
-  {" Error trying to open file for reading ", 372},
-  {" Block is large, you may not be able to undo this action. ", 373},
-  {" Continue ", 374},
-  {" Cancel ", 375},
-  {"al&L", 376},
-  {"&Skip", 377},
-  {"&Replace", 378},
-  {" Replace with: ", 379},
-  {" Confirm replace ", 380},
-  {"scanf &Expression", 381},
-  {"replace &All", 382},
-  {"pr&Ompt on replace", 383},
-  {"&Backwards", 384},
-  {"&Regular expression", 385},
-  {"&Whole words only", 386},
-  {"case &Sensitive", 387},
-  {" Enter replacement argument order eg. 3,2,1,4 ", 388},
-  {" Enter replacement string:", 389},
-  {" Enter search string:", 390},
-  {" Replace ", 391},
-  {" Search ", 392},
-  {" Enter search text : ", 393},
-  {" Enter replace text : ", 394},
+ Continue discards these changes. ", 370},
+  {"Continue", 371},
+  {" Load ", 372},
+  {" Error trying to open file for reading ", 373},
+  {" Block is large, you may not be able to undo this action. ", 374},
+  {" Continue ", 375},
+  {" Cancel ", 376},
+  {"al&L", 377},
+  {"&Skip", 378},
+  {"&Replace", 379},
+  {" Replace with: ", 380},
+  {" Confirm replace ", 381},
+  {"scanf &Expression", 382},
+  {"replace &All", 383},
+  {"pr&Ompt on replace", 384},
+  {"&Backwards", 385},
+  {"&Regular expression", 386},
+  {"&Whole words only", 387},
+  {"case &Sensitive", 388},
+  {" Enter replacement argument order eg. 3,2,1,4 ", 389},
+  {" Enter replacement string:", 390},
+  {" Enter search string:", 391},
+  {" Replace ", 392},
+  {" Search ", 393},
+  {" Enter search text : ", 394},
+  {" Enter replace text : ", 395},
   {"\
 You can enter regexp substrings with %s (not \\1, \\2 like sed) then use \
-\"Enter...order\"", 395},
-  {" Enter argument (or substring) order : ", 396},
+\"Enter...order\"", 396},
+  {" Enter argument (or substring) order : ", 397},
   {"\
 Enter the order of replacement of your scanf format specifiers or regexp \
-substrings", 397},
-  {" Whole words only ", 398},
-  {" Case sensitive ", 399},
-  {" Regular expression ", 400},
-  {"See the regex man page for how to compose a regular expression", 401},
-  {" Backwards ", 402},
-  {"Warning: Searching backward can be slow", 403},
-  {" Prompt on replace ", 404},
-  {"Ask before making each replacement", 405},
-  {" Replace all ", 406},
-  {" Scanf expression ", 407},
-  {"Allows entering of a C format string, see the scanf man page", 408},
-  {"Begin search, Enter", 409},
-  {"Abort this dialog, Esc", 410},
-  {"Replace", 411},
-  {"Skip", 412},
-  {"Replace all", 413},
-  {"\
- Invalid regular expression, or scanf expression with to many conversions ", 414},
-  {" Error in replacement format string. ", 415},
-  {" %ld replacements made. ", 416},
-  {" Search string not found. ", 417},
-  {" Quit ", 418},
+substrings", 398},
+  {" Whole words only ", 399},
+  {" Case sensitive ", 400},
+  {" Regular expression ", 401},
+  {"See the regex man page for how to compose a regular expression", 402},
+  {" Backwards ", 403},
+  {"Warning: Searching backward can be slow", 404},
+  {" Prompt on replace ", 405},
+  {"Ask before making each replacement", 406},
+  {" Replace all ", 407},
+  {" Scanf expression ", 408},
+  {"Allows entering of a C format string, see the scanf man page", 409},
+  {"Begin search, Enter", 410},
+  {"Abort this dialog, Esc", 411},
+  {"Replace", 412},
+  {"Skip", 413},
+  {"Replace all", 414},
+  {"\
+ Invalid regular expression, or scanf expression with to many conversions ", 415},
+  {" Error in replacement format string. ", 416},
+  {" %ld replacements made. ", 417},
+  {" Search string not found. ", 418},
+  {" Quit ", 419},
   {"\
  Current text was modified without a file save. \n\
- Save with exit? ", 419},
-  {" File was modified, Save with exit? ", 420},
-  {"Cancel quit", 421},
-  {" &Cancel quit ", 422},
-  {" &Yes ", 423},
-  {" &No ", 424},
-  {" Copy to clipboard ", 425},
-  {" Unable to save to file. ", 426},
-  {" Cut to clipboard ", 427},
-  {" Goto line ", 428},
-  {" Enter line: ", 429},
-  {" Save Block ", 430},
-  {" Insert File ", 431},
-  {" Insert file ", 432},
-  {" Error trying to insert file. ", 433},
-  {" Sort block ", 434},
-  {" You must first highlight a block of text. ", 435},
-  {" Run Sort ", 436},
-  {" Enter sort options (see manpage) separated by whitespace: ", 437},
-  {" Sort ", 438},
-  {" Error trying to execute sort command ", 439},
-  {" Sort returned non-zero: ", 440},
-  {" Process block ", 441},
-  {" Error trying to stat file ", 442},
-  {" Mail ", 443},
-  {" Copies to", 444},
-  {" Subject", 445},
-  {" To", 446},
-  {" mail -s <subject> -c <cc> <to>", 447},
-  {"Intuitive", 448},
-  {"Emacs", 449},
-  {"None", 450},
-  {"Dynamic paragraphing", 451},
-  {"Type writer wrap", 452},
-  {"Word wrap line length : ", 453},
-  {"Tab spacing : ", 454},
-  {"synta&X highlighting", 455},
-  {"confir&M before saving", 456},
-  {"fill tabs with &Spaces", 457},
-  {"&Return does autoindent", 458},
-  {"&Backspace through tabs", 459},
-  {"&Fake half tabs", 460},
-  {"Wrap mode", 461},
-  {"Key emulation", 462},
-  {" Editor options ", 463},
-  {"Error initialising editor.\n", 464},
-  {"Help", 465},
-  {"Mark", 466},
-  {"Replac", 467},
-  {"Search", 468},
-  {"PullDn", 469},
-  {"Quit", 470},
-  {" Word wrap ", 471},
-  {" Enter line length, 0 for off: ", 472},
-  {" About ", 473},
+ Save with exit? ", 420},
+  {" File was modified, Save with exit? ", 421},
+  {"Cancel quit", 422},
+  {" &Cancel quit ", 423},
+  {" &Yes ", 424},
+  {" &No ", 425},
+  {" Copy to clipboard ", 426},
+  {" Unable to save to file. ", 427},
+  {" Cut to clipboard ", 428},
+  {" Goto line ", 429},
+  {" Enter line: ", 430},
+  {" Save Block ", 431},
+  {" Insert File ", 432},
+  {" Insert file ", 433},
+  {" Error trying to insert file. ", 434},
+  {" Sort block ", 435},
+  {" You must first highlight a block of text. ", 436},
+  {" Run Sort ", 437},
+  {" Enter sort options (see manpage) separated by whitespace: ", 438},
+  {" Sort ", 439},
+  {" Error trying to execute sort command ", 440},
+  {" Sort returned non-zero: ", 441},
+  {" Process block ", 442},
+  {" Error trying to stat file ", 443},
+  {" Mail ", 444},
+  {" Copies to", 445},
+  {" Subject", 446},
+  {" To", 447},
+  {" mail -s <subject> -c <cc> <to>", 448},
+  {"Intuitive", 449},
+  {"Emacs", 450},
+  {"None", 451},
+  {"Dynamic paragraphing", 452},
+  {"Type writer wrap", 453},
+  {"Word wrap line length : ", 454},
+  {"Tab spacing : ", 455},
+  {"synta&X highlighting", 456},
+  {"confir&M before saving", 457},
+  {"fill tabs with &Spaces", 458},
+  {"&Return does autoindent", 459},
+  {"&Backspace through tabs", 460},
+  {"&Fake half tabs", 461},
+  {"Wrap mode", 462},
+  {"Key emulation", 463},
+  {" Editor options ", 464},
+  {"Error initialising editor.\n", 465},
+  {"Help", 466},
+  {"Mark", 467},
+  {"Replac", 468},
+  {"Search", 469},
+  {"PullDn", 470},
+  {"Quit", 471},
+  {" Word wrap ", 472},
+  {" Enter line length, 0 for off: ", 473},
+  {" About ", 474},
   {"\
 \n\
                  Cooledit  v2.1\n\
@@ -526,616 +527,616 @@
  Copyright (C) 1996 the Free Software Foundation\n\
 \n\
        A user friendly text editor written\n\
-           for the Midnight Commander.\n", 474},
-  {"&Open/load...     C-o", 475},
-  {"&New              C-n", 476},
-  {"&Save              F2", 477},
-  {"save &As...       F12", 478},
-  {"&Insert file...   F15", 479},
-  {"copy to &File...  C-f", 480},
-  {"a&Bout...            ", 481},
-  {"&Quit             F10", 482},
-  {"&New            C-x k", 483},
-  {"copy to &File...     ", 484},
-  {"&Toggle Mark       F3", 485},
-  {"&Mark Columns    S-F3", 486},
-  {"toggle &Ins/overw Ins", 487},
-  {"&Copy              F5", 488},
-  {"&Move              F6", 489},
-  {"&Delete            F8", 490},
-  {"&Undo             C-u", 491},
-  {"&Beginning     C-PgUp", 492},
-  {"&End           C-PgDn", 493},
-  {"&Search...         F7", 494},
-  {"search &Again     F17", 495},
-  {"&Replace...        F4", 496},
-  {"&Goto line...            M-l", 497},
-  {"insert &Literal...       C-q", 498},
-  {"&Refresh screen          C-l", 499},
-  {"&Start record macro      C-r", 500},
-  {"&Finish record macro...  C-r", 501},
-  {"&Execute macro...   C-a, KEY", 502},
-  {"delete macr&O...            ", 503},
-  {"insert &Date/time           ", 504},
-  {"format p&Aragraph        M-p", 505},
-  {"'ispell' s&Pell check    C-p", 506},
-  {"sor&T...                 M-t", 507},
-  {"'indent' &C Formatter    F19", 508},
-  {"&Mail...                    ", 509},
-  {"&Execute macro... C-x e, KEY", 510},
-  {"'ispell' s&Pell check    M-$", 511},
-  {"&General...  ", 512},
-  {"&Save mode...", 513},
-  {"&Layout...", 514},
-  {" File ", 515},
-  {" Edit ", 516},
-  {" Sear/Repl ", 517},
-  {" Command ", 518},
-  {" Options ", 519},
-  {"Open...\tC-o", 520},
-  {"New\tC-n", 521},
-  {"Save\tF2", 522},
-  {"Save as...\tF12", 523},
-  {"Insert file...\tF15", 524},
-  {"Copy to file...\tC-f", 525},
-  {"Disk operations", 526},
-  {"Toggle mark\tF3", 527},
-  {"Toggle mark columns\tC-b", 528},
-  {"Toggle book mark\tC-M-Ins", 529},
-  {"Previous book mark\tC-M-Up", 530},
-  {"Next book mark\tC-M-Down", 531},
-  {"Flush book marks", 532},
-  {"Toggle insert/overwrite\tIns", 533},
-  {"Copy block to cursor\tF5", 534},
-  {"Move block to cursor\tF6", 535},
-  {"Delete block\tF8/C-Del", 536},
-  {"Copy block to clipbrd\tC-Ins", 537},
-  {"Cut block to clipbrd\tS-Del", 538},
-  {"Paste block from clipbrd\tS-Ins", 539},
-  {"Selection history\tM-Ins", 540},
-  {"Undo\tC-BackSpace", 541},
-  {"Manipulating blocks of text", 542},
-  {" Srch/Replce ", 543},
-  {"Search...\tF7", 544},
-  {"Search again\tF17", 545},
-  {"Replace...\tF4", 546},
-  {"Replace again\tF14", 547},
-  {"Search for and replace text", 548},
-  {"Goto line...\tM-l", 549},
-  {"Start record macro\tC-r", 550},
-  {"Finish record macro...\tC-r", 551},
-  {"Execute macro...\tC-a, KEY", 552},
-  {"Delete macro...\t", 553},
-  {"Insert date/time\tC-d", 554},
-  {"Format paragraph\tM-p", 555},
-  {"Refresh display\tC-l", 556},
-  {"Macros and internal commands", 557},
-  {"&Dismiss", 558},
-  {" Enter file name: ", 559},
-  {"The Quick Brown Fox Jumps Over The Lazy Dog", 560},
-  {"\
-gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 561},
-  {"Clear the edit buffer", 562},
-  {"Insert File", 563},
-  {"Insert text from a file", 564},
-  {"Copy to file", 565},
-  {"copy a block to a file", 566},
-  {"Search/Replace", 567},
-  {" Load syntax file ", 568},
-  {" File access error ", 569},
-  {" Error in file %s on line %d ", 570},
-  {"&Set", 571},
-  {"S&kip", 572},
-  {"Set &all", 573},
-  {"owner", 574},
-  {"group", 575},
-  {"other", 576},
-  {"On", 577},
-  {"Flag", 578},
-  {"%6d of %d", 579},
-  {" Chown advanced command ", 580},
+           for the Midnight Commander.\n", 475},
+  {"&Open/load...     C-o", 476},
+  {"&New              C-n", 477},
+  {"&Save              F2", 478},
+  {"save &As...       F12", 479},
+  {"&Insert file...   F15", 480},
+  {"copy to &File...  C-f", 481},
+  {"a&Bout...            ", 482},
+  {"&Quit             F10", 483},
+  {"&New            C-x k", 484},
+  {"copy to &File...     ", 485},
+  {"&Toggle Mark       F3", 486},
+  {"&Mark Columns    S-F3", 487},
+  {"toggle &Ins/overw Ins", 488},
+  {"&Copy              F5", 489},
+  {"&Move              F6", 490},
+  {"&Delete            F8", 491},
+  {"&Undo             C-u", 492},
+  {"&Beginning     C-PgUp", 493},
+  {"&End           C-PgDn", 494},
+  {"&Search...         F7", 495},
+  {"search &Again     F17", 496},
+  {"&Replace...        F4", 497},
+  {"&Goto line...            M-l", 498},
+  {"insert &Literal...       C-q", 499},
+  {"&Refresh screen          C-l", 500},
+  {"&Start record macro      C-r", 501},
+  {"&Finish record macro...  C-r", 502},
+  {"&Execute macro...   C-a, KEY", 503},
+  {"delete macr&O...            ", 504},
+  {"insert &Date/time           ", 505},
+  {"format p&Aragraph        M-p", 506},
+  {"'ispell' s&Pell check    C-p", 507},
+  {"sor&T...                 M-t", 508},
+  {"'indent' &C Formatter    F19", 509},
+  {"&Mail...                    ", 510},
+  {"&Execute macro... C-x e, KEY", 511},
+  {"'ispell' s&Pell check    M-$", 512},
+  {"&General...  ", 513},
+  {"&Save mode...", 514},
+  {"&Layout...", 515},
+  {" File ", 516},
+  {" Edit ", 517},
+  {" Sear/Repl ", 518},
+  {" Command ", 519},
+  {" Options ", 520},
+  {"Open...\tC-o", 521},
+  {"New\tC-n", 522},
+  {"Save\tF2", 523},
+  {"Save as...\tF12", 524},
+  {"Insert file...\tF15", 525},
+  {"Copy to file...\tC-f", 526},
+  {"Disk operations", 527},
+  {"Toggle mark\tF3", 528},
+  {"Toggle mark columns\tC-b", 529},
+  {"Toggle book mark\tC-M-Ins", 530},
+  {"Previous book mark\tC-M-Up", 531},
+  {"Next book mark\tC-M-Down", 532},
+  {"Flush book marks", 533},
+  {"Toggle insert/overwrite\tIns", 534},
+  {"Copy block to cursor\tF5", 535},
+  {"Move block to cursor\tF6", 536},
+  {"Delete block\tF8/C-Del", 537},
+  {"Copy block to clipbrd\tC-Ins", 538},
+  {"Cut block to clipbrd\tS-Del", 539},
+  {"Paste block from clipbrd\tS-Ins", 540},
+  {"Selection history\tM-Ins", 541},
+  {"Undo\tC-BackSpace", 542},
+  {"Manipulating blocks of text", 543},
+  {" Srch/Replce ", 544},
+  {"Search...\tF7", 545},
+  {"Search again\tF17", 546},
+  {"Replace...\tF4", 547},
+  {"Replace again\tF14", 548},
+  {"Search for and replace text", 549},
+  {"Goto line...\tM-l", 550},
+  {"Start record macro\tC-r", 551},
+  {"Finish record macro...\tC-r", 552},
+  {"Execute macro...\tC-a, KEY", 553},
+  {"Delete macro...\t", 554},
+  {"Insert date/time\tC-d", 555},
+  {"Format paragraph\tM-p", 556},
+  {"Refresh display\tC-l", 557},
+  {"Macros and internal commands", 558},
+  {"&Dismiss", 559},
+  {" Enter file name: ", 560},
+  {"The Quick Brown Fox Jumps Over The Lazy Dog", 561},
+  {"\
+gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 562},
+  {"Clear the edit buffer", 563},
+  {"Insert File", 564},
+  {"Insert text from a file", 565},
+  {"Copy to file", 566},
+  {"copy a block to a file", 567},
+  {"Search/Replace", 568},
+  {" Load syntax file ", 569},
+  {" File access error ", 570},
+  {" Error in file %s on line %d ", 571},
+  {"&Set", 572},
+  {"S&kip", 573},
+  {"Set &all", 574},
+  {"owner", 575},
+  {"group", 576},
+  {"other", 577},
+  {"On", 578},
+  {"Flag", 579},
+  {"%6d of %d", 580},
+  {" Chown advanced command ", 581},
   {"\
  Couldn't chmod \"%s\" \n\
- %s ", 581},
+ %s ", 582},
   {"\
  Couldn't chown \"%s\" \n\
- %s ", 582},
-  {" Oops... ", 583},
-  {" I can't run the Advanced Chown command on an extfs ", 584},
-  {" I can't run the Advanced Chown command on a tarfs ", 585},
-  {"Background process:", 586},
-  {" Background process error ", 587},
-  {" Child died unexpectedly ", 588},
-  {" Unknown error in child ", 589},
-  {" Background protocol error ", 590},
+ %s ", 583},
+  {" Oops... ", 584},
+  {" I can't run the Advanced Chown command on an extfs ", 585},
+  {" I can't run the Advanced Chown command on a tarfs ", 586},
+  {"Background process:", 587},
+  {" Background process error ", 588},
+  {" Child died unexpectedly ", 589},
+  {" Unknown error in child ", 590},
+  {" Background protocol error ", 591},
   {"\
  Background process sent us a request for more arguments \n\
- than we can handle. \n", 591},
-  {" Listing mode ", 592},
-  {"&Full file list", 593},
-  {"&Brief file list", 594},
-  {"&Long file list", 595},
-  {"&User defined:", 596},
-  {"&Icon view", 597},
-  {"user &Mini status", 598},
-  {"Listing mode", 599},
-  {"&Reverse", 600},
-  {"case sensi&tive", 601},
-  {"Sort order", 602},
-  {" confirm &Exit ", 603},
-  {" confirm e&Xecute ", 604},
-  {" confirm o&Verwrite ", 605},
-  {" confirm &Delete ", 606},
-  {" Confirmation ", 607},
-  {"Full 8 bits output", 608},
-  {"ISO 8859-1", 609},
-  {"7 bits", 610},
-  {"F&ull 8 bits input", 611},
-  {" Display bits ", 612},
-  {"&Always use ftp proxy", 613},
-  {"sec", 614},
-  {"ftpfs directory cache timeout:", 615},
-  {"ftp anonymous password:", 616},
-  {"Timeout for freeing VFSs:", 617},
-  {" Virtual File System Setting ", 618},
-  {"Quick cd", 619},
-  {"cd", 620},
-  {"Symbolic link", 621},
-  {"Running ", 622},
-  {"Stopped", 623},
-  {"&Stop", 624},
-  {"&Resume", 625},
-  {"&Kill", 626},
-  {"Background Jobs", 627},
-  {"execute/search by others", 628},
-  {"write by others", 629},
-  {"read by others", 630},
-  {"execute/search by group", 631},
-  {"write by group", 632},
-  {"read by group", 633},
-  {"execute/search by owner", 634},
-  {"write by owner", 635},
-  {"read by owner", 636},
-  {"sticky bit", 637},
-  {"set group ID on execution", 638},
-  {"set user ID on execution", 639},
-  {"C&lear marked", 640},
-  {"S&et marked", 641},
-  {"&Marked all", 642},
-  {"Permissions (Octal)", 643},
-  {"Owner name", 644},
-  {"Group name", 645},
-  {" Chmod command ", 646},
-  {" Permission ", 647},
-  {"Use SPACE to change", 648},
-  {"an option, ARROW KEYS", 649},
-  {"to move between options", 650},
-  {"and T or INS to mark", 651},
-  {"Chmod command", 652},
-  {" I can't run the Chmod command on an extfs ", 653},
-  {"Set &users", 654},
-  {"Set &groups", 655},
-  {" Name ", 656},
-  {" Owner name ", 657},
-  {" Group name ", 658},
-  {" Size ", 659},
-  {" Chown command ", 660},
-  {" User name ", 661},
-  {"<Unknown user>", 662},
-  {"<Unknown group>", 663},
-  {" I can't run the Chown command on an extfs ", 664},
-  {" I can't run the Chown command on a tarfs ", 665},
-  {" Can not fetch a local copy of %s ", 666},
-  {" CD ", 667},
-  {"Files tagged, want to cd?", 668},
-  {"Could not change directory", 669},
-  {" View file ", 670},
-  {" Filename:", 671},
-  {" Filtered view ", 672},
-  {" Filter command and arguments:", 673},
-  {"Create a new Directory", 674},
-  {" Enter directory name:", 675},
-  {" Filter ", 676},
-  {" Set expression for filtering filenames", 677},
-  {" Select ", 678},
-  {"  Malformed regular expression  ", 679},
-  {" Unselect ", 680},
-  {"Extension file edit", 681},
-  {" Which extension file you want to edit? ", 682},
-  {"&User", 683},
-  {"&System Wide", 684},
-  {"Menu file edit", 685},
-  {" Which menu file will you edit? ", 686},
-  {"&Local", 687},
-  {"&Home", 688},
-  {" Compare directories ", 689},
-  {" Select compare method: ", 690},
-  {"&Quick", 691},
-  {"&Size only", 692},
-  {"&Thorough", 693},
-  {" Both panels should be on the listing view mode to use this command ", 694},
-  {" The command history is empty ", 695},
-  {" Command history ", 696},
+ than we can handle. \n", 592},
+  {" Listing mode ", 593},
+  {"&Full file list", 594},
+  {"&Brief file list", 595},
+  {"&Long file list", 596},
+  {"&User defined:", 597},
+  {"&Icon view", 598},
+  {"user &Mini status", 599},
+  {"Listing mode", 600},
+  {"&Reverse", 601},
+  {"case sensi&tive", 602},
+  {"Sort order", 603},
+  {" confirm &Exit ", 604},
+  {" confirm e&Xecute ", 605},
+  {" confirm o&Verwrite ", 606},
+  {" confirm &Delete ", 607},
+  {" Confirmation ", 608},
+  {"Full 8 bits output", 609},
+  {"ISO 8859-1", 610},
+  {"7 bits", 611},
+  {"F&ull 8 bits input", 612},
+  {" Display bits ", 613},
+  {"&Always use ftp proxy", 614},
+  {"sec", 615},
+  {"ftpfs directory cache timeout:", 616},
+  {"ftp anonymous password:", 617},
+  {"Timeout for freeing VFSs:", 618},
+  {" Virtual File System Setting ", 619},
+  {"Quick cd", 620},
+  {"cd", 621},
+  {"Symbolic link", 622},
+  {"Running ", 623},
+  {"Stopped", 624},
+  {"&Stop", 625},
+  {"&Resume", 626},
+  {"&Kill", 627},
+  {"Background Jobs", 628},
+  {"execute/search by others", 629},
+  {"write by others", 630},
+  {"read by others", 631},
+  {"execute/search by group", 632},
+  {"write by group", 633},
+  {"read by group", 634},
+  {"execute/search by owner", 635},
+  {"write by owner", 636},
+  {"read by owner", 637},
+  {"sticky bit", 638},
+  {"set group ID on execution", 639},
+  {"set user ID on execution", 640},
+  {"C&lear marked", 641},
+  {"S&et marked", 642},
+  {"&Marked all", 643},
+  {"Permissions (Octal)", 644},
+  {"Owner name", 645},
+  {"Group name", 646},
+  {" Chmod command ", 647},
+  {" Permission ", 648},
+  {"Use SPACE to change", 649},
+  {"an option, ARROW KEYS", 650},
+  {"to move between options", 651},
+  {"and T or INS to mark", 652},
+  {"Chmod command", 653},
+  {" I can't run the Chmod command on an extfs ", 654},
+  {"Set &users", 655},
+  {"Set &groups", 656},
+  {" Name ", 657},
+  {" Owner name ", 658},
+  {" Group name ", 659},
+  {" Size ", 660},
+  {" Chown command ", 661},
+  {" User name ", 662},
+  {"<Unknown user>", 663},
+  {"<Unknown group>", 664},
+  {" I can't run the Chown command on an extfs ", 665},
+  {" I can't run the Chown command on a tarfs ", 666},
+  {" Can not fetch a local copy of %s ", 667},
+  {" CD ", 668},
+  {"Files tagged, want to cd?", 669},
+  {"Could not change directory", 670},
+  {" View file ", 671},
+  {" Filename:", 672},
+  {" Filtered view ", 673},
+  {" Filter command and arguments:", 674},
+  {"Create a new Directory", 675},
+  {" Enter directory name:", 676},
+  {" Filter ", 677},
+  {" Set expression for filtering filenames", 678},
+  {" Select ", 679},
+  {"  Malformed regular expression  ", 680},
+  {" Unselect ", 681},
+  {"Extension file edit", 682},
+  {" Which extension file you want to edit? ", 683},
+  {"&User", 684},
+  {"&System Wide", 685},
+  {"Menu file edit", 686},
+  {" Which menu file will you edit? ", 687},
+  {"&Local", 688},
+  {"&Home", 689},
+  {" Compare directories ", 690},
+  {" Select compare method: ", 691},
+  {"&Quick", 692},
+  {"&Size only", 693},
+  {"&Thorough", 694},
+  {" Both panels should be on the listing view mode to use this command ", 695},
+  {" The command history is empty ", 696},
+  {" Command history ", 697},
   {"\
  Not an xterm or Linux console; \n\
- the panels cannot be toggled. ", 697},
-  {"Type `exit' to return to the Midnight Commander", 698},
+ the panels cannot be toggled. ", 698},
+  {"Type `exit' to return to the Midnight Commander", 699},
   {"\
  Couldn't stat %s \n\
- %s ", 699},
-  {" Link ", 700},
-  {" to:", 701},
-  {" link: %s ", 702},
-  {" symlink: %s ", 703},
-  {" Symlink `%s' points to: ", 704},
-  {" Edit symlink ", 705},
-  {" edit symlink, unable to remove %s: %s ", 706},
-  {" edit symlink: %s ", 707},
-  {" Link symbolically ", 708},
-  {" Relative symlink ", 709},
-  {" relative symlink: %s ", 710},
-  {" Enter machine name (F1 for details): ", 711},
-  {" Could not chdir to %s ", 712},
-  {" Link to a remote machine ", 713},
-  {" FTP to machine ", 714},
-  {" Socket source routing setup ", 715},
-  {" Enter host name to use as a source routing hop: ", 716},
-  {" Host name ", 717},
-  {" Error while looking up IP address ", 718},
-  {" Undelete files on an ext2 file system ", 719},
+ %s ", 700},
+  {" Link ", 701},
+  {" to:", 702},
+  {" link: %s ", 703},
+  {" symlink: %s ", 704},
+  {" Symlink `%s' points to: ", 705},
+  {" Edit symlink ", 706},
+  {" edit symlink, unable to remove %s: %s ", 707},
+  {" edit symlink: %s ", 708},
+  {" Link symbolically ", 709},
+  {" Relative symlink ", 710},
+  {" relative symlink: %s ", 711},
+  {" Enter machine name (F1 for details): ", 712},
+  {" Could not chdir to %s ", 713},
+  {" Link to a remote machine ", 714},
+  {" FTP to machine ", 715},
+  {" Socket source routing setup ", 716},
+  {" Enter host name to use as a source routing hop: ", 717},
+  {" Host name ", 718},
+  {" Error while looking up IP address ", 719},
+  {" Undelete files on an ext2 file system ", 720},
   {"\
  Enter device (without /dev/) to undelete\n\
-   files on: (F1 for details)", 720},
-  {" Setup saved to ~/", 721},
-  {" Setup ", 722},
+   files on: (F1 for details)", 721},
+  {" Setup saved to ~/", 722},
+  {" Setup ", 723},
   {"\
  Can't chdir to '%s' \n\
- %s ", 723},
-  {" You can not execute commands on non-local filesystems", 724},
+ %s ", 724},
+  {" You can not execute commands on non-local filesystems", 725},
   {"\
 \n\
 \n\
 \n\
 refresh stack underflow!\n\
 \n\
-\n", 725},
-  {"&Unsorted", 726},
-  {"&Name", 727},
-  {"&Extension", 728},
-  {"&Modify time", 729},
-  {"&Access time", 730},
-  {"&Change time", 731},
-  {"&Size", 732},
-  {"&Inode", 733},
-  {"&Type", 734},
-  {"&Links", 735},
-  {"N&GID", 736},
-  {"N&UID", 737},
-  {"&Owner", 738},
-  {"&Group", 739},
-  {"File exists but can not be stat-ed: %s %s", 740},
-  {"Unknown", 741},
+\n", 726},
+  {"&Unsorted", 727},
+  {"&Name", 728},
+  {"&Extension", 729},
+  {"&Modify time", 730},
+  {"&Access time", 731},
+  {"&Change time", 732},
+  {"&Size", 733},
+  {"&Inode", 734},
+  {"&Type", 735},
+  {"&Links", 736},
+  {"N&GID", 737},
+  {"N&UID", 738},
+  {"&Owner", 739},
+  {"&Group", 740},
+  {"File exists but can not be stat-ed: %s %s", 741},
+  {"Unknown", 742},
   {"\
  Can't create temporary command file \n\
- %s ", 742},
-  {" Parameter ", 743},
-  {" Can't execute commands on a Virtual File System directory ", 744},
-  {" file error", 745},
-  {"Format of the ", 746},
-  {" file error ", 747},
-  {"Format of the ~/", 748},
+ %s ", 743},
+  {" Parameter ", 744},
+  {" Can't execute commands on a Virtual File System directory ", 745},
+  {" file error", 746},
+  {"Format of the ", 747},
+  {" file error ", 748},
+  {"Format of the ~/", 749},
   {"\
  file has changed\n\
 with version 3.0. You may want either to\n\
-copy it from ", 749},
+copy it from ", 750},
   {"\
 mc.ext or use that\n\
-file as an example of how to write it.\n", 750},
-  {"mc.ext will be used for this moment.", 751},
-  {" Copy ", 752},
-  {" Move ", 753},
-  {" Delete ", 754},
-  {" Invalid target mask ", 755},
-  {" Could not make the hardlink ", 756},
+file as an example of how to write it.\n", 751},
+  {"mc.ext will be used for this moment.", 752},
+  {" Copy ", 753},
+  {" Move ", 754},
+  {" Delete ", 755},
+  {" Invalid target mask ", 756},
+  {" Could not make the hardlink ", 757},
   {"\
  Cannot read source link \"%s\" \n\
- %s ", 757},
+ %s ", 758},
   {"\
  Cannot make stable symlinks across non-local filesystems: \n\
 \n\
- Option Stable Symlinks will be disabled ", 758},
+ Option Stable Symlinks will be disabled ", 759},
   {"\
  Cannot create target symlink \"%s\" \n\
- %s ", 759},
+ %s ", 760},
   {"\
  Cannot overwrite directory \"%s\" \n\
- %s ", 760},
+ %s ", 761},
   {"\
  Cannot stat source file \"%s\" \n\
- %s ", 761},
-  {" `%s' and `%s' are the same file. ", 762},
+ %s ", 762},
+  {" `%s' and `%s' are the same file. ", 763},
   {"\
  Cannot create special file \"%s\" \n\
- %s ", 763},
+ %s ", 764},
   {"\
  Cannot chown target file \"%s\" \n\
- %s ", 764},
+ %s ", 765},
   {"\
  Cannot chmod target file \"%s\" \n\
- %s ", 765},
+ %s ", 766},
   {"\
  Cannot open source file \"%s\" \n\
- %s ", 766},
-  {" Reget failed, about to overwrite file ", 767},
+ %s ", 767},
+  {" Reget failed, about to overwrite file ", 768},
   {"\
  Cannot fstat source file \"%s\" \n\
- %s ", 768},
+ %s ", 769},
   {"\
  Cannot create target file \"%s\" \n\
- %s ", 769},
+ %s ", 770},
   {"\
  Cannot fstat target file \"%s\" \n\
- %s ", 770},
+ %s ", 771},
   {"\
  Cannot read source file \"%s\" \n\
- %s ", 771},
+ %s ", 772},
   {"\
  Cannot write target file \"%s\" \n\
- %s ", 772},
-  {"(stalled)", 773},
+ %s ", 773},
+  {"(stalled)", 774},
   {"\
  Cannot close source file \"%s\" \n\
- %s ", 774},
+ %s ", 775},
   {"\
  Cannot close target file \"%s\" \n\
- %s ", 775},
-  {"Incomplete file was retrieved. Keep it?", 776},
-  {"&Delete", 777},
-  {"&Keep", 778},
+ %s ", 776},
+  {"Incomplete file was retrieved. Keep it?", 777},
+  {"&Delete", 778},
+  {"&Keep", 779},
   {"\
  Cannot stat source directory \"%s\" \n\
- %s ", 779},
+ %s ", 780},
   {"\
  Source directory \"%s\" is not a directory \n\
- %s ", 780},
+ %s ", 781},
   {"\
  Cannot copy cyclic symbolic link \n\
- `%s' ", 781},
+ `%s' ", 782},
   {"\
  Cannot create target directory \"%s\" \n\
- %s ", 782},
+ %s ", 783},
   {"\
  Cannot chown target directory \"%s\" \n\
- %s ", 783},
+ %s ", 784},
   {"\
  Cannot stat file \"%s\" \n\
- %s ", 784},
-  {" `%s' and `%s' are the same file ", 785},
-  {" Cannot overwrite directory `%s' ", 786},
+ %s ", 785},
+  {" `%s' and `%s' are the same file ", 786},
+  {" Cannot overwrite directory `%s' ", 787},
   {"\
  Cannot move file \"%s\" to \"%s\" \n\
- %s ", 787},
+ %s ", 788},
   {"\
  Cannot remove file \"%s\" \n\
- %s ", 788},
-  {" Cannot overwrite directory \"%s\" %s ", 789},
-  {" Cannot overwrite file \"%s\" %s ", 790},
+ %s ", 789},
+  {" Cannot overwrite directory \"%s\" %s ", 790},
+  {" Cannot overwrite file \"%s\" %s ", 791},
   {"\
  Cannot move directory \"%s\" to \"%s\" \n\
- %s ", 791},
+ %s ", 792},
   {"\
  Cannot delete file \"%s\" \n\
- %s ", 792},
+ %s ", 793},
   {"\
  Cannot remove directory \"%s\" \n\
- %s ", 793},
-  {" Internal error: get_file \n", 794},
-  {"1Copy", 795},
-  {"1Move", 796},
-  {"1Delete", 797},
-  {"%o %f \"%s\"%m", 798},
-  {"%o %d %f%m", 799},
-  {"%o %f \"%s\"%e", 800},
-  {"%o %d %f%e", 801},
-  {"file", 802},
-  {"files", 803},
-  {"directory", 804},
-  {"directories", 805},
-  {"files/directories", 806},
-  {" with source mask:", 807},
-  {" Can't operate on \"..\"! ", 808},
-  {"Yes", 809},
-  {"No", 810},
-  {" Sorry, I could not put the job in background ", 811},
-  {" Internal failure ", 812},
-  {" Unknown file operation ", 813},
+ %s ", 794},
+  {" Internal error: get_file \n", 795},
+  {"1Copy", 796},
+  {"1Move", 797},
+  {"1Delete", 798},
+  {"%o %f \"%s\"%m", 799},
+  {"%o %d %f%m", 800},
+  {"%o %f \"%s\"%e", 801},
+  {"%o %d %f%e", 802},
+  {"file", 803},
+  {"files", 804},
+  {"directory", 805},
+  {"directories", 806},
+  {"files/directories", 807},
+  {" with source mask:", 808},
+  {" Can't operate on \"..\"! ", 809},
+  {"Yes", 810},
+  {"No", 811},
+  {" Sorry, I could not put the job in background ", 812},
+  {" Internal failure ", 813},
+  {" Unknown file operation ", 814},
   {"\
  Destination \"%s\" must be a directory \n\
- %s ", 814},
-  {"&Retry", 815},
-  {"&Abort", 816},
+ %s ", 815},
+  {"&Retry", 816},
+  {"&Abort", 817},
   {"\
 \n\
    Directory not empty.   \n\
-   Delete it recursively? ", 817},
+   Delete it recursively? ", 818},
   {"\
 \n\
    Background process: Directory not empty \n\
-   Delete it recursively? ", 818},
-  {"a&ll", 819},
-  {"non&E", 820},
-  {" Type 'yes' if you REALLY want to delete ", 821},
-  {"all the directories ", 822},
-  {" Recursive Delete ", 823},
-  {" Background process: Recursive Delete ", 824},
-  {"File", 825},
-  {"Count", 826},
-  {"Bytes", 827},
-  {"Source", 828},
-  {"Target", 829},
-  {"Deleting", 830},
-  {"Target file \"%s\" already exists!", 831},
-  {"if &Size differs", 832},
-  {"&Update", 833},
-  {"Overwrite all targets?", 834},
-  {"&Reget", 835},
-  {"ap&Pend", 836},
-  {"Overwrite this target?", 837},
-  {"Target date: %s, size %d", 838},
-  {"Source date: %s, size %d", 839},
-  {" File exists ", 840},
-  {" Background process: File exists ", 841},
-  {"preserve &Attributes", 842},
-  {"follow &Links", 843},
-  {"to:", 844},
-  {"&Using shell patterns", 845},
-  {"&Background", 846},
-  {"&Stable Symlinks", 847},
-  {"&Dive into subdir if exists", 848},
+   Delete it recursively? ", 819},
+  {"a&ll", 820},
+  {"non&E", 821},
+  {" Type 'yes' if you REALLY want to delete ", 822},
+  {"all the directories ", 823},
+  {" Recursive Delete ", 824},
+  {" Background process: Recursive Delete ", 825},
+  {"File", 826},
+  {"Count", 827},
+  {"Bytes", 828},
+  {"Source", 829},
+  {"Target", 830},
+  {"Deleting", 831},
+  {"Target file \"%s\" already exists!", 832},
+  {"if &Size differs", 833},
+  {"&Update", 834},
+  {"Overwrite all targets?", 835},
+  {"&Reget", 836},
+  {"ap&Pend", 837},
+  {"Overwrite this target?", 838},
+  {"Target date: %s, size %d", 839},
+  {"Source date: %s, size %d", 840},
+  {" File exists ", 841},
+  {" Background process: File exists ", 842},
+  {"preserve &Attributes", 843},
+  {"follow &Links", 844},
+  {"to:", 845},
+  {"&Using shell patterns", 846},
+  {"&Background", 847},
+  {"&Stable Symlinks", 848},
+  {"&Dive into subdir if exists", 849},
   {"\
 Invalid source pattern `%s' \n\
- %s ", 849},
-  {"&Suspend", 850},
-  {"Con&tinue", 851},
-  {"&Chdir", 852},
-  {"&Again", 853},
-  {"&Quit", 854},
-  {"Pane&lize", 855},
-  {"&View - F3", 856},
-  {"&Edit - F4", 857},
-  {"Start at:", 858},
-  {"Filename:", 859},
-  {"Content: ", 860},
-  {"&Tree", 861},
-  {"Find File", 862},
-  {"Grepping in %s", 863},
-  {" Find/read ", 864},
-  {" Problem reading from child ", 865},
-  {"Finished", 866},
-  {"Searching %s", 867},
-  {"Suspend", 868},
-  {"Restart", 869},
-  {"Searching", 870},
-  {"Find file", 871},
-  {"Change to this directory", 872},
-  {"Search again", 873},
-  {"View this file", 874},
-  {"Edit this file", 875},
-  {"Send the results to a Panel", 876},
-  {"Usage: fixhlp <width> <tocname>\n", 877},
-  {"fixhlp: Cannot open toc for writing", 878},
+ %s ", 850},
+  {"&Suspend", 851},
+  {"Con&tinue", 852},
+  {"&Chdir", 853},
+  {"&Again", 854},
+  {"&Quit", 855},
+  {"Pane&lize", 856},
+  {"&View - F3", 857},
+  {"&Edit - F4", 858},
+  {"Start at:", 859},
+  {"Filename:", 860},
+  {"Content: ", 861},
+  {"&Tree", 862},
+  {"Find File", 863},
+  {"Grepping in %s", 864},
+  {" Find/read ", 865},
+  {" Problem reading from child ", 866},
+  {"Finished", 867},
+  {"Searching %s", 868},
+  {"Suspend", 869},
+  {"Restart", 870},
+  {"Searching", 871},
+  {"Find file", 872},
+  {"Change to this directory", 873},
+  {"Search again", 874},
+  {"View this file", 875},
+  {"Edit this file", 876},
+  {"Send the results to a Panel", 877},
+  {"Usage: fixhlp <width> <tocname>\n", 878},
+  {"fixhlp: Cannot open toc for writing", 879},
   {"\
 [Contents]\n\
  Topics:\n\
-\n", 879},
+\n", 880},
   {"\
  Help file format error\n\
-", 880},
-  {" Internal bug: Double start of link area ", 881},
-  {" Can't find node [Contents] in help file ", 882},
-  {" Help ", 883},
+", 881},
+  {" Internal bug: Double start of link area ", 882},
+  {" Can't find node [Contents] in help file ", 883},
+  {" Help ", 884},
   {"\
  Can't open file %s \n\
- %s ", 884},
-  {" Can't find node %s in help file ", 885},
-  {"Index", 886},
-  {"Prev", 887},
-  {"&Move", 888},
-  {"&Remove", 889},
-  {"&Append", 890},
-  {"&Insert", 891},
-  {"New &Entry", 892},
-  {"New &Group", 893},
-  {"&Up", 894},
-  {"&Add current", 895},
-  {"Change &To", 896},
-  {"Subgroup - press ENTER to see list", 897},
-  {"Active VFS directories", 898},
-  {"Directory hotlist", 899},
-  {" Directory path ", 900},
-  {" Directory label ", 901},
-  {"Moving ", 902},
-  {"New hotlist entry", 903},
-  {"Directory label", 904},
-  {"Directory path", 905},
-  {" New hotlist group ", 906},
-  {"Name of new group", 907},
-  {"Label for \"%s\":", 908},
-  {" Add to hotlist ", 909},
-  {" Remove: ", 910},
+ %s ", 885},
+  {" Can't find node %s in help file ", 886},
+  {"Index", 887},
+  {"Prev", 888},
+  {"&Move", 889},
+  {"&Remove", 890},
+  {"&Append", 891},
+  {"&Insert", 892},
+  {"New &Entry", 893},
+  {"New &Group", 894},
+  {"&Up", 895},
+  {"&Add current", 896},
+  {"Change &To", 897},
+  {"Subgroup - press ENTER to see list", 898},
+  {"Active VFS directories", 899},
+  {"Directory hotlist", 900},
+  {" Directory path ", 901},
+  {" Directory label ", 902},
+  {"Moving ", 903},
+  {"New hotlist entry", 904},
+  {"Directory label", 905},
+  {"Directory path", 906},
+  {" New hotlist group ", 907},
+  {"Name of new group", 908},
+  {"Label for \"%s\":", 909},
+  {" Add to hotlist ", 910},
+  {" Remove: ", 911},
   {"\
 \n\
  Group not empty.\n\
- Remove it?", 911},
-  {" Top level group ", 912},
-  {"Hotlist is now kept in file ~/", 913},
-  {"MC will load hotlist from ~/", 914},
-  {"and then delete [Hotlist] section there", 915},
-  {" Hotlist Load ", 916},
-  {"MC was unable to write ~/", 917},
-  {" file, your old hotlist entries were not deleted", 918},
-  {"You have ~/", 919},
-  {" file and [Hotlist] section in ~/", 920},
-  {"Your ~/", 921},
-  {" most probably was created\n", 922},
+ Remove it?", 912},
+  {" Top level group ", 913},
+  {"Hotlist is now kept in file ~/", 914},
+  {"MC will load hotlist from ~/", 915},
+  {"and then delete [Hotlist] section there", 916},
+  {" Hotlist Load ", 917},
+  {"MC was unable to write ~/", 918},
+  {" file, your old hotlist entries were not deleted", 919},
+  {"You have ~/", 920},
+  {" file and [Hotlist] section in ~/", 921},
+  {"Your ~/", 922},
+  {" most probably was created\n", 923},
   {"\
 by an earlier development version of MC\n\
-and is more actual than ~/", 923},
+and is more actual than ~/", 924},
   {"\
  entries\n\
-\n", 924},
+\n", 925},
   {"\
 You can choose between\n\
 \n\
-  Remove - remove old hotlist entries from ~/", 925},
+  Remove - remove old hotlist entries from ~/", 926},
   {"\
   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 ~/", 926},
-  {"&Merge", 927},
-  {" Entries from ~/", 928},
-  {" file your old hotlist entries were not deleted", 929},
-  {"Midnight Commander %s", 930},
-  {"Free nodes %d (%d%%) of %d", 931},
-  {"No node information", 932},
-  {"Free space ", 933},
-  {" (%d%%) of ", 934},
-  {"No space information", 935},
-  {"Type:      %s ", 936},
-  {"non-local vfs", 937},
-  {"Device:    %s", 938},
-  {"Filesystem: %s", 939},
-  {"Accessed:  %s", 940},
-  {"Modified:  %s", 941},
-  {"Created:   %s", 942},
-  {"Size:      ", 943},
-  {" (%d blocks)", 944},
-  {"Owner:     %s/%s", 945},
-  {"Links:     %d", 946},
-  {"Mode:      %s (%04o)", 947},
-  {"Location:  %Xh:%Xh", 948},
-  {"File:       %s", 949},
-  {"File:       None", 950},
-  {"&Vertical", 951},
-  {"&Horizontal", 952},
-  {"&Xterm hintbar", 953},
-  {"h&Intbar visible", 954},
-  {"&Keybar visible", 955},
-  {"command &Prompt", 956},
-  {"show &Mini status", 957},
-  {"menu&Bar visible", 958},
-  {"&Equal split", 959},
-  {"pe&Rmissions", 960},
-  {"&File types", 961},
-  {"&Save", 962},
-  {" Layout ", 963},
-  {" Panel split ", 964},
-  {" Highlight... ", 965},
-  {" Other options ", 966},
-  {"output lines", 967},
-  {"Layout", 968},
-  {" Learn keys ", 969},
-  {" Teach me a key ", 970},
+  Merge  - add old entries to hotlist as group \"Entries from ~/", 927},
+  {"&Merge", 928},
+  {" Entries from ~/", 929},
+  {" file your old hotlist entries were not deleted", 930},
+  {"Midnight Commander %s", 931},
+  {"Free nodes %d (%d%%) of %d", 932},
+  {"No node information", 933},
+  {"Free space ", 934},
+  {" (%d%%) of ", 935},
+  {"No space information", 936},
+  {"Type:      %s ", 937},
+  {"non-local vfs", 938},
+  {"Device:    %s", 939},
+  {"Filesystem: %s", 940},
+  {"Accessed:  %s", 941},
+  {"Modified:  %s", 942},
+  {"Created:   %s", 943},
+  {"Size:      ", 944},
+  {" (%d blocks)", 945},
+  {"Owner:     %s/%s", 946},
+  {"Links:     %d", 947},
+  {"Mode:      %s (%04o)", 948},
+  {"Location:  %Xh:%Xh", 949},
+  {"File:       %s", 950},
+  {"File:       None", 951},
+  {"&Vertical", 952},
+  {"&Horizontal", 953},
+  {"&Xterm hintbar", 954},
+  {"h&Intbar visible", 955},
+  {"&Keybar visible", 956},
+  {"command &Prompt", 957},
+  {"show &Mini status", 958},
+  {"menu&Bar visible", 959},
+  {"&Equal split", 960},
+  {"pe&Rmissions", 961},
+  {"&File types", 962},
+  {"&Save", 963},
+  {" Layout ", 964},
+  {" Panel split ", 965},
+  {" Highlight... ", 966},
+  {" Other options ", 967},
+  {"output lines", 968},
+  {"Layout", 969},
+  {" Learn keys ", 970},
+  {" Teach me a key ", 971},
   {"\
 Please press the %s\n\
 and then wait until this message disappears.\n\
@@ -1144,383 +1145,377 @@
 next to its button.\n\
 \n\
 If you want to escape, press a single Escape key\n\
-and wait as well.", 971},
-  {" Cannot accept this key ", 972},
-  {" You have entered \"%s\"", 973},
-  {"OK", 974},
+and wait as well.", 972},
+  {" Cannot accept this key ", 973},
+  {" You have entered \"%s\"", 974},
+  {"OK", 975},
   {"\
 It seems that all your keys already\n\
-work fine. That's great.", 975},
-  {"&Discard", 976},
+work fine. That's great.", 976},
+  {"&Discard", 977},
   {"\
 Great! You have a complete terminal database!\n\
-All your keys work well.", 977},
-  {"Learn keys", 978},
-  {"Press all the keys mentioned here. After you have done it, check", 979},
-  {"which keys are not marked with OK.  Press space on the missing", 980},
-  {"key, or click with the mouse to define it. Move around with Tab.", 981},
+All your keys work well.", 978},
+  {"Learn keys", 979},
+  {"Press all the keys mentioned here. After you have done it, check", 980},
+  {"which keys are not marked with OK.  Press space on the missing", 981},
+  {"key, or click with the mouse to define it. Move around with Tab.", 982},
   {"\
  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? ", 982},
-  {"Press any key to continue...", 983},
-  {" The shell is already running a command ", 984},
-  {"&Listing mode...", 985},
-  {"&Quick view     C-x q", 986},
-  {"&Info           C-x i", 987},
-  {"&Sort order...", 988},
-  {"&Filter...", 989},
-  {"&Network link...", 990},
-  {"FT&P link...", 991},
-  {"&Drive...       M-d", 992},
-  {"&Rescan         C-r", 993},
-  {"&User menu          F2", 994},
-  {"&View               F3", 995},
-  {"Vie&w file...         ", 996},
-  {"&Filtered view     M-!", 997},
-  {"&Edit               F4", 998},
-  {"&Copy               F5", 999},
-  {"c&Hmod           C-x c", 1000},
-  {"&Link            C-x l", 1001},
-  {"&SymLink         C-x s", 1002},
-  {"edit s&Ymlink  C-x C-s", 1003},
-  {"ch&Own           C-x o", 1004},
-  {"&Advanced chown       ", 1005},
-  {"&Rename/Move        F6", 1006},
-  {"&Mkdir              F7", 1007},
-  {"&Delete             F8", 1008},
-  {"&Quick cd          M-c", 1009},
-  {"select &Group      M-+", 1010},
-  {"u&Nselect group    M-\\", 1011},
-  {"reverse selec&Tion M-*", 1012},
-  {"e&Xit              F10", 1013},
-  {"&Directory tree", 1014},
-  {"&Find file            M-?", 1015},
-  {"s&Wap panels          C-u", 1016},
-  {"switch &Panels on/off C-o", 1017},
-  {"&Compare directories  C-x d", 1018},
-  {"e&Xternal panelize    C-x !", 1019},
-  {"show directory s&Izes", 1020},
-  {"command &History", 1021},
-  {"di&Rectory hotlist    C-\\", 1022},
-  {"&Active VFS list      C-x a", 1023},
-  {"&Background jobs      C-x j", 1024},
-  {"&Undelete files (ext2fs only)", 1025},
-  {"&Listing format edit", 1026},
-  {"&Extension file edit", 1027},
-  {"&Menu file edit", 1028},
-  {"&Configuration...", 1029},
-  {"c&Onfirmation...", 1030},
-  {"&Display bits...", 1031},
-  {"learn &Keys...", 1032},
-  {"&Virtual FS...", 1033},
-  {"&Save setup", 1034},
-  {" &Left ", 1035},
-  {" &Above ", 1036},
-  {" &File ", 1037},
-  {" &Command ", 1038},
-  {" &Options ", 1039},
-  {" &Right ", 1040},
-  {" &Below ", 1041},
-  {" Information ", 1042},
+ extra access permissions with the \"su\" command? ", 983},
+  {"Press any key to continue...", 984},
+  {" The shell is already running a command ", 985},
+  {"&Listing mode...", 986},
+  {"&Quick view     C-x q", 987},
+  {"&Info           C-x i", 988},
+  {"&Sort order...", 989},
+  {"&Filter...", 990},
+  {"&Network link...", 991},
+  {"FT&P link...", 992},
+  {"&Drive...       M-d", 993},
+  {"&Rescan         C-r", 994},
+  {"&User menu          F2", 995},
+  {"&View               F3", 996},
+  {"Vie&w file...         ", 997},
+  {"&Filtered view     M-!", 998},
+  {"&Edit               F4", 999},
+  {"&Copy               F5", 1000},
+  {"c&Hmod           C-x c", 1001},
+  {"&Link            C-x l", 1002},
+  {"&SymLink         C-x s", 1003},
+  {"edit s&Ymlink  C-x C-s", 1004},
+  {"ch&Own           C-x o", 1005},
+  {"&Advanced chown       ", 1006},
+  {"&Rename/Move        F6", 1007},
+  {"&Mkdir              F7", 1008},
+  {"&Delete             F8", 1009},
+  {"&Quick cd          M-c", 1010},
+  {"select &Group      M-+", 1011},
+  {"u&Nselect group    M-\\", 1012},
+  {"reverse selec&Tion M-*", 1013},
+  {"e&Xit              F10", 1014},
+  {"&Directory tree", 1015},
+  {"&Find file            M-?", 1016},
+  {"s&Wap panels          C-u", 1017},
+  {"switch &Panels on/off C-o", 1018},
+  {"&Compare directories  C-x d", 1019},
+  {"e&Xternal panelize    C-x !", 1020},
+  {"show directory s&Izes", 1021},
+  {"command &History", 1022},
+  {"di&Rectory hotlist    C-\\", 1023},
+  {"&Active VFS list      C-x a", 1024},
+  {"&Background jobs      C-x j", 1025},
+  {"&Undelete files (ext2fs only)", 1026},
+  {"&Listing format edit", 1027},
+  {"&Extension file edit", 1028},
+  {"&Menu file edit", 1029},
+  {"&Configuration...", 1030},
+  {"c&Onfirmation...", 1031},
+  {"&Display bits...", 1032},
+  {"learn &Keys...", 1033},
+  {"&Virtual FS...", 1034},
+  {"&Save setup", 1035},
+  {" &Left ", 1036},
+  {" &Above ", 1037},
+  {" &File ", 1038},
+  {" &Command ", 1039},
+  {" &Options ", 1040},
+  {" &Right ", 1041},
+  {" &Below ", 1042},
+  {" Information ", 1043},
   {"\
  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.                                           ", 1043},
-  {"Menu", 1044},
-  {"Thank you for using GNU Midnight Commander", 1045},
-  {"with mouse support on xterm%s.\n", 1046},
-  {" and the Linux console", 1047},
-  {"The TERM environment variable is unset!\n", 1048},
-  {"Library directory for the Midnight Commander: %s\n", 1049},
-  {"\
-Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1050},
-  {"Use to debug the background code", 1051},
-  {"Request to run in color mode", 1052},
-  {"Specifies a color configuration", 1053},
-  {"Edits one file", 1054},
-  {"Displays this help message", 1055},
-  {"Displays a help screen on how to change the color scheme", 1056},
-  {"Log ftp dialog to specified file", 1057},
-  {"Obsolete", 1058},
-  {"Requests to run in black and white", 1059},
-  {"Disable mouse support in text version", 1060},
-  {"Disables subshell support", 1061},
-  {"Prints working directory at program exit", 1062},
-  {"Resets soft keys on HP terminals", 1063},
-  {"To run on slow terminals", 1064},
-  {"Use stickchars to draw", 1065},
-  {"Enables subshell support (default)", 1066},
-  {"Tries to use termcap instead of terminfo", 1067},
-  {"Displays the current version", 1068},
-  {"Launches the file viewer on a file", 1069},
-  {"Forces xterm features", 1070},
-  {"Geometry for the window", 1071},
-  {"GEOMETRY", 1072},
-  {"No windows opened at startup", 1073},
-  {"Force activation even if a server is already running", 1074},
-  {"Displays the directory that holds the .links startup files", 1075},
+ the details.                                           ", 1044},
+  {"Menu", 1045},
+  {"Thank you for using GNU Midnight Commander", 1046},
+  {"with mouse support on xterm%s.\n", 1047},
+  {" and the Linux console", 1048},
+  {"The TERM environment variable is unset!\n", 1049},
+  {"Library directory for the Midnight Commander: %s\n", 1050},
+  {"\
+Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1051},
+  {"Use to debug the background code", 1052},
+  {"Request to run in color mode", 1053},
+  {"Specifies a color configuration", 1054},
+  {"Edits one file", 1055},
+  {"Displays this help message", 1056},
+  {"Displays a help screen on how to change the color scheme", 1057},
+  {"Log ftp dialog to specified file", 1058},
+  {"Obsolete", 1059},
+  {"Requests to run in black and white", 1060},
+  {"Disable mouse support in text version", 1061},
+  {"Disables subshell support", 1062},
+  {"Prints working directory at program exit", 1063},
+  {"Resets soft keys on HP terminals", 1064},
+  {"To run on slow terminals", 1065},
+  {"Use stickchars to draw", 1066},
+  {"Enables subshell support (default)", 1067},
+  {"Tries to use termcap instead of terminfo", 1068},
+  {"Displays the current version", 1069},
+  {"Launches the file viewer on a file", 1070},
+  {"Forces xterm features", 1071},
+  {"Geometry for the window", 1072},
+  {"GEOMETRY", 1073},
+  {"No windows opened at startup", 1074},
+  {"Display the directory that holds the .links startup files and exit", 1075},
   {"\
 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", 1076},
-  {"\
-You are running the GNOME Midnight Commander as root. \n\
-\n\
-You will not be protected from severly damaging your system\n\
-if you continue.", 1077},
-  {" Notice ", 1078},
+  {" Notice ", 1077},
   {"\
  The Midnight Commander configuration files \n\
  are now stored in the ~/.mc directory, the \n\
- files have been moved now\n", 1079},
-  {"safe de&Lete", 1080},
-  {"cd follows lin&Ks", 1081},
-  {"advanced cho&Wn", 1082},
-  {"l&Ynx-like motion", 1083},
-  {"Animation", 1084},
-  {"rotatin&G dash", 1085},
-  {"co&Mplete: show all", 1086},
-  {"&Use internal view", 1087},
-  {"use internal ed&It", 1088},
-  {"auto m&Enus", 1089},
-  {"&Auto save setup", 1090},
-  {"shell &Patterns", 1091},
-  {"Compute &Totals", 1092},
-  {"&Verbose operation", 1093},
-  {"&Fast dir reload", 1094},
-  {"mi&X all files", 1095},
-  {"&Drop down menus", 1096},
-  {"ma&Rk moves down", 1097},
-  {"show &Hidden files", 1098},
-  {"show &Backup files", 1099},
-  {"&Never", 1100},
-  {"on dumb &Terminals", 1101},
-  {"alwa&Ys", 1102},
-  {" Configure options ", 1103},
-  {" Panel options ", 1104},
-  {" Pause after run... ", 1105},
-  {"Configure options", 1106},
-  {"&Add new", 1107},
-  {" External panelize ", 1108},
-  {"External panelize", 1109},
-  {"Other command", 1110},
-  {" Add to external panelize ", 1111},
-  {" Enter command label: ", 1112},
-  {" I can't run external panelize while logged on a non local directory ", 1113},
-  {"Find *.orig after patching", 1114},
-  {"Find SUID and SGID programs", 1115},
-  {"Cannot invoke command.", 1116},
-  {"Pipe close failed", 1117},
-  {"Show this help message", 1118},
-  {"Display brief usage message", 1119},
-  {"MTime", 1120},
-  {"ATime", 1121},
-  {"CTime", 1122},
-  {"Perm", 1123},
-  {"Nl", 1124},
-  {"Inode", 1125},
-  {"UID", 1126},
-  {"GID", 1127},
-  {"  %s bytes in %d file%s", 1128},
-  {"Unknow tag on display format: ", 1129},
-  {" Do you really want to execute? ", 1130},
-  {" No action taken ", 1131},
-  {"RenMov", 1132},
-  {"Mkdir", 1133},
+ files have been moved now\n", 1078},
+  {"safe de&Lete", 1079},
+  {"cd follows lin&Ks", 1080},
+  {"advanced cho&Wn", 1081},
+  {"l&Ynx-like motion", 1082},
+  {"Animation", 1083},
+  {"rotatin&G dash", 1084},
+  {"co&Mplete: show all", 1085},
+  {"&Use internal view", 1086},
+  {"use internal ed&It", 1087},
+  {"auto m&Enus", 1088},
+  {"&Auto save setup", 1089},
+  {"shell &Patterns", 1090},
+  {"Compute &Totals", 1091},
+  {"&Verbose operation", 1092},
+  {"&Fast dir reload", 1093},
+  {"mi&X all files", 1094},
+  {"&Drop down menus", 1095},
+  {"ma&Rk moves down", 1096},
+  {"show &Hidden files", 1097},
+  {"show &Backup files", 1098},
+  {"&Never", 1099},
+  {"on dumb &Terminals", 1100},
+  {"alwa&Ys", 1101},
+  {" Configure options ", 1102},
+  {" Panel options ", 1103},
+  {" Pause after run... ", 1104},
+  {"Configure options", 1105},
+  {"&Add new", 1106},
+  {" External panelize ", 1107},
+  {"External panelize", 1108},
+  {"Other command", 1109},
+  {" Add to external panelize ", 1110},
+  {" Enter command label: ", 1111},
+  {" I can't run external panelize while logged on a non local directory ", 1112},
+  {"Find *.orig after patching", 1113},
+  {"Find SUID and SGID programs", 1114},
+  {"Cannot invoke command.", 1115},
+  {"Pipe close failed", 1116},
+  {"Show this help message", 1117},
+  {"Display brief usage message", 1118},
+  {"MTime", 1119},
+  {"ATime", 1120},
+  {"CTime", 1121},
+  {"Perm", 1122},
+  {"Nl", 1123},
+  {"Inode", 1124},
+  {"UID", 1125},
+  {"GID", 1126},
+  {"  %s bytes in %d file%s", 1127},
+  {"Unknow tag on display format: ", 1128},
+  {" Do you really want to execute? ", 1129},
+  {" No action taken ", 1130},
+  {"RenMov", 1131},
+  {"Mkdir", 1132},
   {"\
  Can't chdir to %s \n\
- %s ", 1134},
-  {"Couldn't open named pipe %s\n", 1135},
-  {" The shell is still active. Quit anyway? ", 1136},
-  {" There are stopped jobs.", 1137},
-  {" Quit anyway? ", 1138},
-  {"Warning: Couldn't change to %s.\n", 1139},
+ %s ", 1133},
+  {"Couldn't open named pipe %s\n", 1134},
+  {" The shell is still active. Quit anyway? ", 1135},
+  {" There are stopped jobs.", 1136},
+  {" Quit anyway? ", 1137},
+  {"Warning: Couldn't change to %s.\n", 1138},
   {"\
 Can't open the %s file for writing:\n\
-%s\n", 1140},
-  {"Copy \"%s\" directory to:", 1141},
-  {"Move \"%s\" directory to:", 1142},
+%s\n", 1139},
+  {"Copy \"%s\" directory to:", 1140},
+  {"Move \"%s\" directory to:", 1141},
   {"\
  Can't stat the destination \n\
- %s ", 1143},
-  {" The destination isn't a directory ", 1144},
-  {"  Delete %s?  ", 1145},
-  {"Static", 1146},
-  {"Dynamc", 1147},
+ %s ", 1142},
+  {" The destination isn't a directory ", 1143},
+  {"  Delete %s?  ", 1144},
+  {"Static", 1145},
+  {"Dynamc", 1146},
   {"\
  Can't chdir to \"%s\" \n\
- %s ", 1148},
-  {"Forget", 1149},
-  {"Rmdir", 1150},
+ %s ", 1147},
+  {"Forget", 1148},
+  {"Rmdir", 1149},
   {"\
 Can't write to the %s file:\n\
-%s\n", 1151},
-  {" Invalid shell pattern defination \"%c\". ", 1152},
-  {" Debug ", 1153},
-  {" ERROR: ", 1154},
-  {" True:  ", 1155},
-  {" False: ", 1156},
-  {" Warning -- ignoring file ", 1157},
+%s\n", 1150},
+  {" Invalid shell pattern defination \"%c\". ", 1151},
+  {" Debug ", 1152},
+  {" ERROR: ", 1153},
+  {" True:  ", 1154},
+  {" False: ", 1155},
+  {" Warning -- ignoring file ", 1156},
   {"\
 File %s is not owned by root or you or is world writable.\n\
-Using it may compromise your security", 1158},
-  {" I can't run programs while logged on a non local directory ", 1159},
-  {" User menu ", 1160},
-  {"name_trunc: too big", 1161},
-  {" Pipe failed ", 1162},
-  {" Dup failed ", 1163},
+Using it may compromise your security", 1157},
+  {" I can't run programs while logged on a non local directory ", 1158},
+  {" User menu ", 1159},
+  {"name_trunc: too big", 1160},
+  {" Pipe failed ", 1161},
+  {" Dup failed ", 1162},
   {"\
 File: \n\
 \n\
-    ", 1164},
+    ", 1163},
   {"\
 \n\
 \n\
-has been modified, do you want to save the changes?\n", 1165},
-  {" Save changes ", 1166},
-  {" Can't spawn child program ", 1167},
-  {" Empty output from child filter ", 1168},
-  {" Could not open file ", 1169},
-  {" Can't open file \"", 1170},
+has been modified, do you want to save the changes?\n", 1164},
+  {" Save changes ", 1165},
+  {" Can't spawn child program ", 1166},
+  {" Empty output from child filter ", 1167},
+  {" Could not open file ", 1168},
+  {" Can't open file \"", 1169},
   {"\
  Can't stat file \n\
- ", 1171},
-  {" Can't view: not a regular file ", 1172},
-  {"File: %s", 1173},
-  {"  [grow]", 1174},
-  {"Searching for `%s'", 1175},
-  {" Search string not found ", 1176},
-  {" Invalid regular expression ", 1177},
+ ", 1170},
+  {" Can't view: not a regular file ", 1171},
+  {"File: %s", 1172},
+  {"  [grow]", 1173},
+  {"Searching for `%s'", 1174},
+  {" Search string not found ", 1175},
+  {" Invalid regular expression ", 1176},
   {"\
  The current line number is %d.\n\
- Enter the new line number:", 1178},
-  {" Enter regexp:", 1179},
-  {"Ascii", 1180},
-  {"Hex", 1181},
-  {"Line", 1182},
-  {"RxSrch", 1183},
-  {"EdText", 1184},
-  {"EdHex", 1185},
-  {"UnWrap", 1186},
-  {"Wrap", 1187},
-  {"HxSrch", 1188},
-  {"Raw", 1189},
-  {"Parse", 1190},
-  {"Unform", 1191},
-  {"Format", 1192},
-  {"Function key 1", 1193},
-  {"Function key 2", 1194},
-  {"Function key 3", 1195},
-  {"Function key 4", 1196},
-  {"Function key 5", 1197},
-  {"Function key 6", 1198},
-  {"Function key 7", 1199},
-  {"Function key 8", 1200},
-  {"Function key 9", 1201},
-  {"Function key 10", 1202},
-  {"Function key 11", 1203},
-  {"Function key 12", 1204},
-  {"Function key 13", 1205},
-  {"Function key 14", 1206},
-  {"Function key 15", 1207},
-  {"Function key 16", 1208},
-  {"Function key 17", 1209},
-  {"Function key 18", 1210},
-  {"Function key 19", 1211},
-  {"Function key 20", 1212},
-  {"Backspace key", 1213},
-  {"End key", 1214},
-  {"Up arrow key", 1215},
-  {"Down arrow key", 1216},
-  {"Left arrow key", 1217},
-  {"Right arrow key", 1218},
-  {"Home key", 1219},
-  {"Page Down key", 1220},
-  {"Page Up key", 1221},
-  {"Insert key", 1222},
-  {"Delete key", 1223},
-  {"Completion/M-tab", 1224},
-  {"+ on keypad", 1225},
-  {"- on keypad", 1226},
-  {"* on keypad", 1227},
-  {"Left arrow keypad", 1228},
-  {"Right arrow keypad", 1229},
-  {"Up arrow keypad", 1230},
-  {"Down arrow keypad", 1231},
-  {"Home on keypad", 1232},
-  {"End on keypad", 1233},
-  {"Page Down keypad", 1234},
-  {"Page Up keypad", 1235},
-  {"Insert on keypad", 1236},
-  {"Delete on keypad", 1237},
-  {"Enter on keypad", 1238},
-  {"Slash on keypad", 1239},
-  {"NumLock on keypad", 1240},
+ Enter the new line number:", 1177},
+  {" Enter regexp:", 1178},
+  {"Ascii", 1179},
+  {"Hex", 1180},
+  {"Line", 1181},
+  {"RxSrch", 1182},
+  {"EdText", 1183},
+  {"EdHex", 1184},
+  {"UnWrap", 1185},
+  {"Wrap", 1186},
+  {"HxSrch", 1187},
+  {"Raw", 1188},
+  {"Parse", 1189},
+  {"Unform", 1190},
+  {"Format", 1191},
+  {"Function key 1", 1192},
+  {"Function key 2", 1193},
+  {"Function key 3", 1194},
+  {"Function key 4", 1195},
+  {"Function key 5", 1196},
+  {"Function key 6", 1197},
+  {"Function key 7", 1198},
+  {"Function key 8", 1199},
+  {"Function key 9", 1200},
+  {"Function key 10", 1201},
+  {"Function key 11", 1202},
+  {"Function key 12", 1203},
+  {"Function key 13", 1204},
+  {"Function key 14", 1205},
+  {"Function key 15", 1206},
+  {"Function key 16", 1207},
+  {"Function key 17", 1208},
+  {"Function key 18", 1209},
+  {"Function key 19", 1210},
+  {"Function key 20", 1211},
+  {"Backspace key", 1212},
+  {"End key", 1213},
+  {"Up arrow key", 1214},
+  {"Down arrow key", 1215},
+  {"Left arrow key", 1216},
+  {"Right arrow key", 1217},
+  {"Home key", 1218},
+  {"Page Down key", 1219},
+  {"Page Up key", 1220},
+  {"Insert key", 1221},
+  {"Delete key", 1222},
+  {"Completion/M-tab", 1223},
+  {"+ on keypad", 1224},
+  {"- on keypad", 1225},
+  {"* on keypad", 1226},
+  {"Left arrow keypad", 1227},
+  {"Right arrow keypad", 1228},
+  {"Up arrow keypad", 1229},
+  {"Down arrow keypad", 1230},
+  {"Home on keypad", 1231},
+  {"End on keypad", 1232},
+  {"Page Down keypad", 1233},
+  {"Page Up keypad", 1234},
+  {"Insert on keypad", 1235},
+  {"Delete on keypad", 1236},
+  {"Enter on keypad", 1237},
+  {"Slash on keypad", 1238},
+  {"NumLock on keypad", 1239},
   {"\
 Couldn't open %s archive\n\
-%s", 1241},
-  {"Inconsistent extfs archive", 1242},
-  {"Sorry, we can not do password authenticated connections for now.", 1243},
-  {"ftpfs: Disconnecting from %s", 1244},
-  {" FTP: Password required for ", 1245},
-  {" Proxy: Password required for ", 1246},
-  {"ftpfs: sending proxy login name", 1247},
-  {"ftpfs: sending proxy user password", 1248},
-  {"ftpfs: proxy authentication succeeded", 1249},
-  {"ftpfs: connected to %s", 1250},
-  {"ftpfs: sending login name", 1251},
-  {"ftpfs: sending user password", 1252},
-  {"ftpfs: logged in", 1253},
-  {"ftpfs: Login incorrect for user %s ", 1254},
-  {" Could not set source routing (%s)", 1255},
-  {"ftpfs: Invalid host name.", 1256},
-  {"ftpfs: Invalid host address.", 1257},
-  {"ftpfs: making connection to %s", 1258},
-  {"ftpfs: connection interrupted by user", 1259},
-  {"ftpfs: connection to server failed: %s", 1260},
-  {"Waiting to retry... %d (Control-C to cancel)", 1261},
-  {"ftpfs: could not setup passive mode for source routing", 1262},
-  {"ftpfs: could not setup passive mode", 1263},
-  {"ftpfs: aborting transfer.", 1264},
-  {"ftpfs: abort error: %s", 1265},
-  {"ftpfs: abort failed", 1266},
-  {"ftpfs: CWD failed.", 1267},
-  {"ftpfs: couldn't resolve symlink", 1268},
-  {"Resolving symlink...", 1269},
-  {"ftpfs: Reading FTP directory %s... (don't use UNIX ls options)", 1270},
-  {"ftpfs: Reading FTP directory %s...", 1271},
-  {"ftpfs: FAIL", 1272},
-  {"ftpfs: reading FTP directory interrupt by user", 1273},
-  {"ftpfs: got listing", 1274},
-  {"ftpfs: failed", 1275},
-  {"ftpfs: failed; nowhere to fallback to", 1276},
-  {"ftpfs: storing file %d (%d)", 1277},
+%s", 1240},
+  {"Inconsistent extfs archive", 1241},
+  {"Sorry, we can not do password authenticated connections for now.", 1242},
+  {"ftpfs: Disconnecting from %s", 1243},
+  {" FTP: Password required for ", 1244},
+  {" Proxy: Password required for ", 1245},
+  {"ftpfs: sending proxy login name", 1246},
+  {"ftpfs: sending proxy user password", 1247},
+  {"ftpfs: proxy authentication succeeded", 1248},
+  {"ftpfs: connected to %s", 1249},
+  {"ftpfs: sending login name", 1250},
+  {"ftpfs: sending user password", 1251},
+  {"ftpfs: logged in", 1252},
+  {"ftpfs: Login incorrect for user %s ", 1253},
+  {" Could not set source routing (%s)", 1254},
+  {"ftpfs: Invalid host name.", 1255},
+  {"ftpfs: Invalid host address.", 1256},
+  {"ftpfs: making connection to %s", 1257},
+  {"ftpfs: connection interrupted by user", 1258},
+  {"ftpfs: connection to server failed: %s", 1259},
+  {"Waiting to retry... %d (Control-C to cancel)", 1260},
+  {"ftpfs: could not setup passive mode for source routing", 1261},
+  {"ftpfs: could not setup passive mode", 1262},
+  {"ftpfs: aborting transfer.", 1263},
+  {"ftpfs: abort error: %s", 1264},
+  {"ftpfs: abort failed", 1265},
+  {"ftpfs: CWD failed.", 1266},
+  {"ftpfs: couldn't resolve symlink", 1267},
+  {"Resolving symlink...", 1268},
+  {"ftpfs: Reading FTP directory %s... (don't use UNIX ls options)", 1269},
+  {"ftpfs: Reading FTP directory %s...", 1270},
+  {"ftpfs: FAIL", 1271},
+  {"ftpfs: reading FTP directory interrupt by user", 1272},
+  {"ftpfs: got listing", 1273},
+  {"ftpfs: failed", 1274},
+  {"ftpfs: failed; nowhere to fallback to", 1275},
+  {"ftpfs: storing file %d (%d)", 1276},
   {"\
 ~/.netrc file has not correct mode.\n\
-Remove password or correct mode.", 1278},
-  {" MCFS ", 1279},
-  {" The server does not support this version ", 1280},
+Remove password or correct mode.", 1277},
+  {" MCFS ", 1278},
+  {" The server does not support this version ", 1279},
   {"\
  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", 1281},
-  {" Yes ", 1282},
-  {" No ", 1283},
-  {" The remote server is running on strange port. Giving up.\n", 1284},
-  {" MCFS Password required ", 1285},
-  {" Invalid password ", 1286},
-  {" Too many open connections ", 1287},
+ not be safe on the remote side.  Continue? \n", 1280},
+  {" Yes ", 1281},
+  {" No ", 1282},
+  {" The remote server is running on strange port. Giving up.\n", 1283},
+  {" MCFS Password required ", 1284},
+  {" Invalid password ", 1285},
+  {" Too many open connections ", 1286},
   {"\
 Couldn't open tar archive\n\
-%s", 1288},
-  {"Unexpected EOF on archive file", 1289},
-  {"Inconsistent tar archive", 1290},
+%s", 1287},
+  {"Unexpected EOF on archive file", 1288},
+  {"Inconsistent tar archive", 1289},
   {"\
 Hmm,...\n\
 %s\n\
-doesn't look like a tar archive.", 1291},
+doesn't look like a tar archive.", 1290},
 };
 
-int _msg_tbl_length = 1291;
+int _msg_tbl_length = 1290;
Binary files old/mc-4.5.28/po/ko.gmo and new/mc-4.5.29/po/ko.gmo differ
diff -ruN old/mc-4.5.28/po/ko.po new/mc-4.5.29/po/ko.po
--- old/mc-4.5.28/po/ko.po	Fri Mar 26 15:30:48 1999
+++ new/mc-4.5.29/po/ko.po	Tue Mar 30 01:34:50 1999
@@ -3,9 +3,9 @@
 # Sung-Hyun Nam <namsh@lgic.co.kr>, 1998
 msgid ""
 msgstr ""
-"Project-Id-Version: mc 4.5.21\n"
-"POT-Creation-Date: 1999-03-05 18:47+0900\n"
-"PO-Revision-Date: 1999-03-06 04:00:12+0900\n"
+"Project-Id-Version: mc 4.5.28\n"
+"POT-Creation-Date: 1999-03-29 22:00+0900\n"
+"PO-Revision-Date: 1999-03-29 13:47:21+0900\n"
 "Last-Translator: Sung-Hyun Nam <namsh@lgic.co.kr>\n"
 "Language-Team: Korean <ko@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,12 +16,13 @@
 msgid " Emacs key: "
 msgstr " Emacs ±ÛŒè: "
 
-#: edit/edit_key_translator.c:133
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
 msgid " Execute Macro "
 msgstr " žÅÅ©·Î œÇÇà "
 
 #. Input line for a single key press follows the ':'
-#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
+#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:718
 msgid " Press macro hotkey: "
 msgstr " žÅÅ©·Î ŽÜÃà±ÛŒèžŠ Ž©ž£œÊœÃ¿À: "
 
@@ -33,133 +34,135 @@
 msgid " Press any key: "
 msgstr " ŸÆ¹« ±ÛŒè³ª Ž©ž£œÊœÃ¿À: "
 
-#: gnome/gcmd.c:56
+#: gnome/gcmd.c:57
 msgid " There is no other panel to compare contents to "
 msgstr " There is no other panel to compare contents to "
 
-#: gnome/gcmd.c:106
+#: gnome/gcmd.c:113
 msgid "GNU Midnight Commander"
 msgstr "GNU Midnight Commander"
 
-#: gnome/gcmd.c:109
+#: gnome/gcmd.c:116
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr "The GNOME edition of the Midnight Commander file manager."
 
-#: gnome/gcmd.c:121 src/main.c:844 src/screen.c:2047
+#: gnome/gcmd.c:128 src/main.c:847 src/screen.c:2060
 msgid " The Midnight Commander "
 msgstr " The Midnight Commander "
 
-#: gnome/gcmd.c:122 src/main.c:845
+#: gnome/gcmd.c:129 src/main.c:848
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr " Á€ž»·Î Midnight CommanderžŠ ÁŸ·áÇϜðÚÀŸŽÏ±î? "
 
-#: gnome/gcmd.c:123 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813
-#: src/file.c:2195 src/filegui.c:573 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:602 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
 #: src/view.c:404
 msgid "&Yes"
 msgstr "¿¹(&Y)"
 
-#: gnome/gcmd.c:123 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813
-#: src/file.c:2195 src/filegui.c:572 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:601 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
 #: src/view.c:404
 msgid "&No"
 msgstr "ŸÆŽÏ¿À(&N)"
 
-#: gnome/gcmd.c:220
+#: gnome/gcmd.c:269
 msgid "Sort By"
 msgstr "Á€·Ä"
 
 #. we define this up here so we can pass it in to our callback
-#: gnome/gcmd.c:225
+#: gnome/gcmd.c:274
 msgid "Ignore case sensitivity."
 msgstr "ŽëŒÒ¹®ÀÚ ¹«œÃ"
 
-#: gnome/gcmd.c:233 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:282 gnome/gcustom-layout.c:43 src/chmod.c:150 src/screen.c:395
 msgid "Name"
 msgstr "ÀÌž§"
 
-#: gnome/gcmd.c:240
+#: gnome/gcmd.c:289
 msgid "File Type"
 msgstr "ÆÄÀÏ ÁŸ·ù"
 
-#: gnome/gcmd.c:246 src/screen.c:426 src/screen.c:427
+#: gnome/gcmd.c:295 gnome/gcustom-layout.c:47 src/screen.c:396
+#: src/screen.c:397
 msgid "Size"
 msgstr "Å©±â"
 
-#: gnome/gcmd.c:252
+#: gnome/gcmd.c:301
 msgid "Time Last Accessed"
 msgstr "ž¶Áöž· Ÿ×ŒŒœº œÃ°£"
 
-#: gnome/gcmd.c:258
+#: gnome/gcmd.c:307
 msgid "Time Last Modified"
 msgstr "ž¶Áöž· ŒöÁ€ œÃ°£"
 
-#: gnome/gcmd.c:264
+#: gnome/gcmd.c:313
 msgid "Time Last Changed"
 msgstr "ž¶Áöž· °íÃÄÁø œÃ°£"
 
-#: gnome/gcmd.c:278
+#: gnome/gcmd.c:327
 msgid "Reverse the order."
 msgstr "ŒøŒ­ µÚÁý±â."
 
-#: gnome/gcmd.c:340
+#: gnome/gcmd.c:390
 msgid "Enter name."
 msgstr "ÀÌž§ ÀÔ·Â."
 
-#: gnome/gcmd.c:346
+#: gnome/gcmd.c:396
 msgid "Enter label for command:"
 msgstr "ží·ÉŸî ²¿ž®Ç¥ ÀÔ·Â:"
 
-#: gnome/gcmd.c:441
+#: gnome/gcmd.c:495
 msgid "Find all core files"
 msgstr "žðµç core ÆÄÀÏ Ã£±â"
 
-#: gnome/gcmd.c:444 src/panelize.c:350
+#: gnome/gcmd.c:498 src/panelize.c:350
 msgid "Find rejects after patching"
 msgstr "±â¿î ÈÄ °ÅºÎÆÄÀÏÀÌ »ý°åœÀŽÏŽÙ"
 
-#: gnome/gcmd.c:486
+#: gnome/gcmd.c:542
 msgid "Run Command"
 msgstr "ží·É œÇÇà"
 
 #. Frame 1
-#: gnome/gcmd.c:491
+#: gnome/gcmd.c:547
 msgid "Preset Commands"
 msgstr "ží·É ¹Ìž® Á¶Àý"
 
-#: gnome/gcmd.c:508
+#. add add/remove buttons in center
+#: gnome/gcmd.c:564 gnome/gcustom-layout.c:185
 msgid "Add"
 msgstr "Ãß°¡"
 
-#: gnome/gcmd.c:512
+#: gnome/gcmd.c:568 gnome/gcustom-layout.c:186
 msgid "Remove"
 msgstr "»èÁŠ"
 
 #. Frame 2
-#: gnome/gcmd.c:520
+#: gnome/gcmd.c:576
 msgid "Run this Command"
 msgstr "ÀÌ ží·É œÇÇà"
 
-#: gnome/gcmd.c:527
+#: gnome/gcmd.c:583
 msgid "Command: "
 msgstr "ží·É: "
 
-#: gnome/gcmd.c:588
+#: gnome/gcmd.c:646
 msgid "Set Filter"
 msgstr "ÇÊÅÍ Œ³Á€"
 
-#: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643
-#: gnome/gscreen.c:2582
+#: gnome/gcmd.c:651 gnome/gcmd.c:692 gnome/gcmd.c:697 gnome/gcmd.c:701
+#: gnome/gscreen.c:2525
 msgid "Show all files"
 msgstr "žðµç ÆÄÀÏ ºž¿©ÁÖ±â"
 
-#: gnome/gcmd.c:600
+#: gnome/gcmd.c:658
 msgid "."
 msgstr "."
 
-#: gnome/gcmd.c:616
+#: gnome/gcmd.c:674
 msgid ""
 "Enter a filter here for files in the panel view.\n"
 "\n"
@@ -171,159 +174,276 @@
 "¿¹žŠ µéžé:\n"
 "*.gifŽÂ gif ±×ž²žžÀ» ºž¿©ÁÙ °ÍÀÔŽÏŽÙ"
 
-#: gnome/gcmd.c:618
+#: gnome/gcmd.c:676
 msgid "Enter a Regular Expression to filter files in the panel view."
 msgstr "ÆгΠºž±â¿¡Œ­ ÆÄÀÏ ÇÊÅÍžµÀ» À§ÇÑ Á€±Ô Ç¥ÇöœÄ ÀÔ·Â."
 
-#: gnome/gcmd.c:675 gnome/gpopup.c:53
+#: gnome/gcmd.c:733
 msgid " Open with..."
 msgstr " Open with..."
 
-#: gnome/gcmd.c:676 gnome/gpopup.c:54
+#: gnome/gcmd.c:734
 msgid "Enter extra arguments:"
 msgstr "extra ÀÎÀÚ ÀÔ·Â:"
 
-#: gnome/gdesktop.c:392 gnome/gdesktop.c:1841
+#: gnome/gcmd.c:796
+msgid "Desktop entry properties"
+msgstr "µ¥œºÅ©ÅŸ ¿£Æ®ž® ŒÓŒº"
+
+#: gnome/gcustom-layout.c:36
+msgid "Access Time"
+msgstr "Á¢±Ù œÃ°£"
+
+#: gnome/gcustom-layout.c:37
+msgid "Creation Time"
+msgstr "»ýŒº œÃ°£"
+
+#. Group
+#: gnome/gcustom-layout.c:38 gnome/gnome-file-property-dialog.c:776
+#: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
+#: src/screen.c:409
+msgid "Group"
+msgstr "ÁýŽÜ"
+
+#: gnome/gcustom-layout.c:39
+msgid "Group ID"
+msgstr "ÁýŽÜ ID"
+
+#: gnome/gcustom-layout.c:40
+msgid "Inode Number"
+msgstr "Inode ŒýÀÚ"
+
+#: gnome/gcustom-layout.c:41 src/achown.c:378
+msgid "Mode"
+msgstr "žðµå"
+
+#: gnome/gcustom-layout.c:42
+msgid "Modification Time"
+msgstr "ŒöÁ€ œÃ°£"
+
+#: gnome/gcustom-layout.c:44
+msgid "Number of Hard Links"
+msgstr "ÇÏµå žµÅ© °¹Œö"
+
+#. Owner
+#: gnome/gcustom-layout.c:45 gnome/gnome-file-property-dialog.c:925
+#: gnome/gprop.c:390 src/screen.c:408
+msgid "Owner"
+msgstr "ŒÒÀ¯ÀÚ"
+
+#: gnome/gcustom-layout.c:46 src/screen.c:402
+msgid "Permission"
+msgstr "Çã¿ë"
+
+#: gnome/gcustom-layout.c:48
+msgid "Size (short)"
+msgstr "Å©±â (ªÀœ)"
+
+#: gnome/gcustom-layout.c:49
+msgid "Type"
+msgstr "Type"
+
+#: gnome/gcustom-layout.c:50
+msgid "User ID"
+msgstr "»ç¿ëÀÚ ID"
+
+#: gnome/gcustom-layout.c:144
+msgid "Possible Columns"
+msgstr "°¡ŽÉÇÑ Çà"
+
+#: gnome/gcustom-layout.c:164
+msgid "Displayed Columns"
+msgstr "Ç¥œÃµÉ Çà"
+
+#: gnome/gcustom-layout.c:306
+msgid "Custom View"
+msgstr "»ç¿ëÀÚ ºž±â"
+
+#: gnome/gdesktop.c:416 gnome/gdesktop.c:2067
 msgid "Warning"
 msgstr "°æ°í"
 
-#: gnome/gdesktop.c:393
+#: gnome/gdesktop.c:417
 #, c-format
 msgid "Could not open %s; will not have desktop icons"
 msgstr "%s ¿­ Œö ŸøÀœ; Ãʱ⠵¥œºÅ©ÅŸ ŸÆÀÌÄÜÀ» °¡Áú Œö ŸøÀ» °ÍÀÓ"
 
-#: gnome/gdesktop.c:983
+#: gnome/gdesktop.c:1010
 msgid "While running the mount/umount command"
 msgstr "mount/unmount ží·ÉÀ» œÇÇàÇÏŽÂ µµÁß"
 
-#: gnome/gdesktop.c:1032
+#: gnome/gdesktop.c:1079
 msgid "While running the eject command"
 msgstr "eject ží·ÉÀ» œÇÇàÇÏŽÂ µµÁß"
 
-#: gnome/gdesktop.c:1072 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1132 gnome/gicon.c:154 gnome/gtools.c:52
 msgid "Error"
 msgstr "¿¡·¯"
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:1837
+#: gnome/gdesktop.c:2063
 msgid "Home directory"
 msgstr "Home directory"
 
-#: gnome/gdesktop.c:1842
+#: gnome/gdesktop.c:2068
 #, c-format
 msgid "Could not symlink %s to %s; will not have initial desktop icons."
-msgstr "%sžŠ %s·Î œÉºŒž¯žµÅ© žžµé Œö ŸøÀœ; Ãʱ⠵¥œºÅ©ÅŸ ŸÆÀÌÄÜÀ» °¡Áú Œö ŸøÀ» °ÍÀÓ"
+msgstr ""
+"%sžŠ %s·Î œÉºŒž¯žµÅ© žžµé Œö ŸøÀœ; Ãʱ⠵¥œºÅ©ÅŸ ŸÆÀÌÄÜÀ» °¡Áú Œö ŸøÀ» °ÍÀÓ"
+
+#: gnome/gdesktop.c:2409
+msgid ""
+"Unable to locate the file:\n"
+"background-properties-capplet\n"
+"in your path.\n"
+"\n"
+"We are unable to set the background."
+msgstr ""
+"background-properties-cappletÀ»\n"
+"°æ·Î¿¡Œ­ ãÀ» Œö ŸøœÀŽÏŽÙ.\n"
+"\n"
+"¹è°æÀ» Œ³Á€ÇÒ Œö ŸøœÀŽÏŽÙ."
+
+#: gnome/gdesktop.c:2418 gnome/glayout.c:361
+msgid "_Terminal"
+msgstr "Å͹̳Î(_T)"
+
+#: gnome/gdesktop.c:2418 gnome/glayout.c:361
+msgid "Launch a new terminal in the current directory"
+msgstr "ÇöÀç ÀÚ·á¹æ¿¡Œ­ »õ Å͹̳Π¿­±â"
+
+#. If this ever changes, make sure you update create_new_menu accordingly.
+#: gnome/gdesktop.c:2420 gnome/glayout.c:363
+msgid "_Directory..."
+msgstr "ÀÚ·á¹æ(_D)..."
+
+#: gnome/gdesktop.c:2420 gnome/glayout.c:363
+msgid "Creates a new directory"
+msgstr "»õ·Î¿î ÀÚ·á¹æÀ» »ýŒº"
+
+#: gnome/gdesktop.c:2421
+msgid "_Launcher..."
+msgstr ""
 
-#: gnome/gdesktop.c:2173 gnome/glayout.c:410
+#: gnome/gdesktop.c:2421
+msgid "Creates a new launcher"
+msgstr "»õ·Î¿î launcher »ýŒº"
+
+#: gnome/gdesktop.c:2429 gnome/glayout.c:448
 msgid "Arrange Icons"
 msgstr "ŸÆÀÌÄÜ Á€·Ä"
 
-#: gnome/gdesktop.c:2175
+#: gnome/gdesktop.c:2430
 msgid "Create New Window"
 msgstr "»õ â »ýŒº"
 
-#: gnome/gdesktop.c:2177
-msgid "Rescan Mountable Devices"
-msgstr "mount °¡ŽÉÇÑ ÀåÄ¡ ŽÙœÃ ã±â"
+#: gnome/gdesktop.c:2432
+msgid "Recreate Desktop Shortcuts"
+msgstr "µ¥œºÅ©ÅŸ Áöž§±æ Àç»ýŒº"
 
-#: gnome/gdesktop.c:2178 gnome/glayout.c:413
+#: gnome/gdesktop.c:2433 gnome/glayout.c:451
 msgid "Rescan Desktop"
 msgstr "µ¥œºÅ©ÅŸ ŽÙœÃ Àбâ"
 
-#: gnome/gdialogs.c:58
+#: gnome/gdesktop.c:2434
+msgid "Configure Background Image"
+msgstr "¹è°æ ±×ž² Œ³Á€"
+
+#: gnome/gdialogs.c:60
 msgid "To: "
 msgstr "...·Î:"
 
-#: gnome/gdialogs.c:59
+#: gnome/gdialogs.c:61
 msgid "Copying from: "
 msgstr "...·ÎºÎÅÍ º¹»ç: "
 
-#: gnome/gdialogs.c:60
+#: gnome/gdialogs.c:62
 msgid "Deleting file: "
 msgstr "ÆÄÀÏ Áö¿ò: "
 
-#: gnome/gdialogs.c:340
+#: gnome/gdialogs.c:370
 msgid "Files Exist"
 msgstr "ÆÄÀÏ ÀÖÀœ"
 
-#: gnome/gdialogs.c:352
+#: gnome/gdialogs.c:385
 msgid ""
 "Some of the files you are trying to copy already exist in the destination "
-"folder."
+"folder.  Please select the action to be performed."
 msgstr ""
 "ŽçœÅÀÌ º¹»çÇÏ°íÀÚ ÇÏŽÂ ÆÄÀϵé Áß žî°³ŽÂ ÀÌ¹Ì Žë»ó ÆúŽõ¿¡ ÁžÀçÇÏ°í ÀÖœÀŽÏŽÙ."
+"ŒöÇàµÉ ÇמñÀ» Œ±ÅÃÇϜʜÿÀ."
 
-#: gnome/gdialogs.c:361
+#: gnome/gdialogs.c:398
 msgid "Prompt me before overwriting any file."
 msgstr "ÆÄÀÏÀ» µ€ŸîŸ²±âÀü¿¡ ¹°Ÿîºž±â."
 
-#: gnome/gdialogs.c:368
+#: gnome/gdialogs.c:405
 msgid "Don't overwrite any files."
 msgstr "Ÿî¶² ÆÄÀϵµ °ãÃÄŸµ Œö ŸøœÀŽÏŽÙ."
 
-#: gnome/gdialogs.c:380
+#: gnome/gdialogs.c:421
 msgid "Overwrite:"
 msgstr "°ãÃÄŸ²±â:"
 
-#: gnome/gdialogs.c:387
+#: gnome/gdialogs.c:428
 msgid "Older files."
 msgstr "¿À·¡µÈ ÆÄÀÏ."
 
-#: gnome/gdialogs.c:393
+#: gnome/gdialogs.c:434
 msgid "Files only if size differs."
 msgstr "Å©±â°¡ ŽÙž¥ ÆÄÀÏžž."
 
-#: gnome/gdialogs.c:399
+#: gnome/gdialogs.c:440
 msgid "All files."
 msgstr "žðµç ÆÄÀÏ."
 
-#: gnome/gdialogs.c:448
+#: gnome/gdialogs.c:480
 msgid "File Exists"
 msgstr "ÆÄÀÏ ÀÖÀœ"
 
-#: gnome/gdialogs.c:454
+#: gnome/gdialogs.c:486
 #, c-format
 msgid "The target file already exists: %s"
 msgstr "Žë»ó ÆÄÀÏÀÌ ÀÌ¹Ì ÀÖœÀŽÏŽÙ: %s"
 
-#: gnome/gdialogs.c:461
+#: gnome/gdialogs.c:493
 msgid "Replace it?"
 msgstr "¹Ù²Ü±î¿ä?"
 
-#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1067 src/file.c:789
-#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024
+#: gnome/gdialogs.c:567 gtkedit/editwidget.c:1069 src/file.c:802
+#: src/screen.c:2301 src/screen.c:2331 src/tree.c:1024
 msgid "Copy"
 msgstr "º¹»ç"
 
-#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1068
+#: gnome/gdialogs.c:570 gtkedit/editwidget.c:1070
 msgid "Move"
 msgstr "À̵¿"
 
-#: gnome/gdialogs.c:552
+#: gnome/gdialogs.c:587
 msgid "Destination"
 msgstr "Žë»ó"
 
-#: gnome/gdialogs.c:556
+#: gnome/gdialogs.c:591
 msgid "Find Destination Folder"
 msgstr "Žë»ó ÆúŽõ ã±â"
 
-#: gnome/gdialogs.c:561
+#: gnome/gdialogs.c:596
 msgid "Copy as a background process"
 msgstr "Background·Î º¹»ç"
 
-#: gnome/gdialogs.c:581
+#: gnome/gdialogs.c:616
 msgid "Advanced Options"
 msgstr "Advanced ¿ÉŒÇ"
 
-#: gnome/gdialogs.c:585
+#: gnome/gdialogs.c:620
 msgid "Preserve symlinks"
 msgstr "œÉºŒž¯žµÅ© ºžÁž"
 
-#: gnome/gdialogs.c:595
+#: gnome/gdialogs.c:630
 msgid "Follow links."
 msgstr "žµÅ© µûž£±â."
 
-#: gnome/gdialogs.c:600
+#: gnome/gdialogs.c:636
 msgid ""
 "Selecting this will copy the files that symlinks point to instead of just "
 "copying the link."
@@ -331,23 +451,23 @@
 "ÀÌ°ÍÀ» Œ±ÅÃÇÏžé ŽÜÁö žµÅ©žŠ º¹»çÇÏŽÂ °ÍÀÌ ŸÆŽÏ¶ó œÉºŒžµ žµÅ©°¡ °¡ž®Å°ŽÂ "
 "ÆÄÀÏÀ» º¹»çÇÏ°Ô µËŽÏŽÙ."
 
-#: gnome/gdialogs.c:604
+#: gnome/gdialogs.c:641
 msgid "Preserve file attributes."
 msgstr "ÆÄÀÏ ŒÓŒº ºžÁž"
 
-#: gnome/gdialogs.c:608
+#: gnome/gdialogs.c:646
 msgid "Preserves the permissions and the UID/GID if possible"
 msgstr "°¡ŽÉÇÏžé ÆÛ¹ÌŒÇ ¹× UID/GIDžŠ ºžÁž"
 
-#: gnome/gdialogs.c:613
+#: gnome/gdialogs.c:652
 msgid "Recursively copy subdirectories."
 msgstr "ÇÏÀ§µð·ºÅäž®±îÁö º¹»ç"
 
-#: gnome/gdialogs.c:617
+#: gnome/gdialogs.c:657
 msgid "If set, this will copy the directories recursively"
 msgstr "ÀÌ°ÍÀÌ Œ³Á€µÇžé ÀÚ·á¹æÀ» ¹ØÀÇ ÀÚ·á¹æ±îÁö º¹»çÇÕŽÏŽÙ"
 
-#: gnome/gdialogs.c:720
+#: gnome/gdialogs.c:761
 #, c-format
 msgid ""
 "%s\n"
@@ -358,37 +478,60 @@
 "\n"
 "ºó ÀÚ·á¹æÀÌ ŸÆŽÑµ¥¿ä. ±×·¡µµ Áö¿ï±î¿ä?"
 
-#: gnome/gdialogs.c:729 src/file.c:2190
+#: gnome/gdialogs.c:770 src/file.c:2228
 msgid " Delete: "
 msgstr " Áö¿ì±â: "
 
-#: gnome/gdialogs.c:733
+#: gnome/gdialogs.c:774
 msgid "Do the same for the rest"
 msgstr "³ªžÓÁö¿¡ ŽëÇØŒ­µµ °°Àº µ¿ÀÛ ŒöÇà"
 
-#: gnome/gdialogs.c:802
+#: gnome/gdialogs.c:843
 msgid "Move Progress"
 msgstr "À̵¿Áß"
 
-#: gnome/gdialogs.c:805
+#: gnome/gdialogs.c:846
 msgid "Copy Progress"
 msgstr "º¹»çÁß"
 
-#: gnome/gdialogs.c:808
+#: gnome/gdialogs.c:849
 msgid "Delete Progress"
 msgstr "»èÁŠÁß"
 
-#: gnome/gdialogs.c:853
+#: gnome/gdialogs.c:894
 msgid "File "
 msgstr "ÆÄÀÏ "
 
-#: gnome/gdialogs.c:857
-msgid " is "
-msgstr " is "
-
-#: gnome/gdialogs.c:860
-msgid " Done."
-msgstr " Done."
+#: gnome/gdialogs.c:898
+msgid "is "
+msgstr "is "
+
+#: gnome/gdialogs.c:901
+msgid "done."
+msgstr "done."
+
+#. Translators should take care as "Password" or its translations
+#. are used to identify password boxes and hide characters with "*"
+#: gnome/gdialogs.c:961 src/wtools.c:587 vfs/vfs.c:1808
+msgid "Password:"
+msgstr "ºñ¹Ð¹øÈ£:"
+
+#: gnome/gdialogs.c:961
+msgid "Password"
+msgstr "ºñ¹Ð¹øÈ£"
+
+#. Create the dialog
+#: gnome/gdialogs.c:993
+msgid "Symbolic Link"
+msgstr "œÉºŒž¯ žµÅ©"
+
+#: gnome/gdialogs.c:1009 src/boxes.c:803
+msgid "Existing filename (filename symlink will point to):"
+msgstr "Žë»ó ÆÄÀÏží (œÉºŒž¯žµÅ© ÆÄÀÏÀÌ °¡ž®Å³ ÆÄÀÏ):"
+
+#: gnome/gdialogs.c:1023 src/boxes.c:801
+msgid "Symbolic link filename:"
+msgstr "œÉºŒž¯žµÅ© ÆÄÀÏží:"
 
 #: gnome/gdnd.c:51
 msgid "_Move here"
@@ -420,23 +563,71 @@
 msgid "Default set of icons not found, please check your installation"
 msgstr "±âº» ŸÆÀÌÄÜ ŒŒÆ®žŠ ãÀ» Œö ŸøÀœ. ÀÎœºÆ²ÀÌ ÁŠŽë·Î µÇŸúŽÂ Áö È®ÀÎÇϜÿÀ"
 
-#: gnome/glayout.c:264
+#: gnome/glayout.c:40
+msgid "_Icon View"
+msgstr "ŸÆÀÌÄÜ ºž±â(_I)"
+
+#: gnome/glayout.c:41 gnome/glayout.c:57
+msgid "Switch view to an icon display"
+msgstr "ŸÆÀÌÄÜ ºž±â·Î Àüȯ"
+
+#: gnome/glayout.c:43
+msgid "_Brief View"
+msgstr "°£ŽÜÈ÷ ºž±â(_B)"
+
+#: gnome/glayout.c:44 gnome/glayout.c:60
+msgid "Switch view to show just file name and type"
+msgstr "ÆÄÀÏ ÀÌž§°ú ÇüœÄ ºž±â·Î Àüȯ"
+
+#: gnome/glayout.c:46
+msgid "_Detailed View"
+msgstr "ÀÚŒŒÈ÷ ºž±â(_D)"
+
+#: gnome/glayout.c:47 gnome/glayout.c:63
+msgid "Switch view to show detailed file statistics"
+msgstr "ÆÄÀÏ »óÅžŠ ÀÚŒŒÈ÷ ºž±â·Î Àüȯ"
+
+#: gnome/glayout.c:49
+msgid "_Custom View"
+msgstr "»ç¿ëÀÚ ºž±â(_C)"
+
+#: gnome/glayout.c:50 gnome/glayout.c:66
+msgid "Switch view to show user-defined statistics"
+msgstr "»ç¿ëÀÚ°¡ Œ³Á€ÇÑ »óÅ·Πºž±â Àüȯ"
+
+#: gnome/glayout.c:56
+msgid "Icons"
+msgstr "ŸÆÀÌÄÜ"
+
+#: gnome/glayout.c:59
+msgid "Brief"
+msgstr "°£ŽÜÈ÷"
+
+#: gnome/glayout.c:62
+msgid "Detailed"
+msgstr "ÀÚŒŒÈ÷"
+
+#: gnome/glayout.c:65
+msgid "Custom"
+msgstr "»ç¿ëÀÚ ºž±â"
+
+#: gnome/glayout.c:302
 msgid "Enter command to run"
 msgstr "œÇÇàÇÒ ží·É ÀÔ·Â"
 
-#: gnome/glayout.c:277
+#: gnome/glayout.c:315
 msgid ""
 "Notice that if you choose to terminate the file manager, you will\n"
 "also terminate the GNOME desktop handler.\n"
 "\n"
-"Are you sure you want to quit?"
+"Are you sure you want to exit?"
 msgstr ""
-"ŽçœÅÀÇ ÆÄÀÏ °üž®ÀÚ ÁŸ·ážŠ Œ±ÅÃÇÏžé ±×³ð µ¥œºÅ©ÅŸ žÅŽÏÁ®µµ"
+"ŽçœÅÀÇ ÆÄÀÏ °üž®ÀÚ ÁŸ·ážŠ Œ±ÅÃÇÏžé ±×³ð µ¥œºÅ©ÅŸ žÅŽÏÁ®µµ\n"
 "ÁŸ·áÇÏ°Ô µÊÀ» ŸËŸÆ µÎœÊœÃ¿À.\n"
 "\n"
 "Á€ž»·Î ÁŸ·áÇϱ➊ ¿øÇϜʎϱî?"
 
-#: gnome/glayout.c:289
+#: gnome/glayout.c:327
 msgid ""
 "The file manager and the desktop handler are now terminating\n"
 "\n"
@@ -453,246 +644,454 @@
 "ÀÀ¿ëÇÁ·Î±×·¥À» ÁŸ·áÇϱâ À§ÇØ È®ÀÎ ¹öÆ°À» Ž©ž£°Å³ª °èŒÓ »ç¿ëÇϜ÷Ážé\n"
 "ÃëŒÒ ¹öÆ°À» Ž©ž£œÊœÃ¿À."
 
-#: gnome/glayout.c:317
-msgid "_Terminal"
-msgstr "Å͹̳Î(_T)"
-
-#: gnome/glayout.c:317
-msgid "Launch a new terminal in the current directory"
-msgstr "ÇöÀç ÀÚ·á¹æ¿¡Œ­ »õ Å͹̳Π¿­±â"
-
-#. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/glayout.c:319
-msgid "_Directory..."
-msgstr "ÀÚ·á¹æ(_D)..."
-
-#: gnome/glayout.c:319
-msgid "Creates a new directory"
-msgstr "»õ·Î¿î ÀÚ·á¹æÀ» »ýŒº"
-
-#. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:340
+#. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },
+#: gnome/glayout.c:384
 msgid "_Copy..."
 msgstr "º¹»ç(_C)..."
 
-#: gnome/glayout.c:340
+#: gnome/glayout.c:384
 msgid "Copy files"
 msgstr "ÆÄÀÏ º¹»ç"
 
-#: gnome/glayout.c:341
+#: gnome/glayout.c:385
 msgid "_Delete..."
 msgstr "Áö¿ì±â(_D)..."
 
-#: gnome/glayout.c:341
+#: gnome/glayout.c:385
 msgid "Delete files"
 msgstr "ÆÄÀÏ Áö¿ò"
 
-#: gnome/glayout.c:342
+#: gnome/glayout.c:386
 msgid "_Move..."
 msgstr "À̵¿(_M)..."
 
-#: gnome/glayout.c:342
+#: gnome/glayout.c:386
 msgid "Rename or move files"
 msgstr "ÆÄÀÏ ÀÌž§À» ¹Ù²Ù°Å³ª À̵¿"
 
-#: gnome/glayout.c:344
+#: gnome/glayout.c:388
 msgid "Show directory sizes"
 msgstr "ÀÚ·á¹æ Å©±â ºž±â"
 
-#: gnome/glayout.c:344
+#: gnome/glayout.c:388
 msgid "Shows the disk space used by each directory"
 msgstr "°¢ ÀÚ·á¹æÀÌ »ç¿ëÇÏ°í ÀÖŽÂ µðœºÅ© ¿ë·®À» ºž¿©ÁÜ"
 
-#: gnome/glayout.c:351
+#: gnome/glayout.c:395
 msgid "Select _All"
 msgstr "žðµÎ Œ±ÅÃ(_A)"
 
-#: gnome/glayout.c:351
+#: gnome/glayout.c:395
 msgid "Select all files in the current Panel"
 msgstr "ÇöÀç ÆгÎÀÇ žðµç ÆÄÀÏ Œ±ÅÃ"
 
-#: gnome/glayout.c:353
+#: gnome/glayout.c:397
 msgid "_Select Files..."
 msgstr "ÆÄÀÏ Œ±ÅÃ(_S)..."
 
-#: gnome/glayout.c:353
+#: gnome/glayout.c:397
 msgid "Select a group of files"
 msgstr "ÆÄÀÏÀ» ¹­ŸîŒ­ Œ±ÅÃ"
 
-#: gnome/glayout.c:354
+#: gnome/glayout.c:398
 msgid "_Invert Selection"
 msgstr "Œ±Åà ¹ÝÀü(_I)"
 
-#: gnome/glayout.c:354
+#: gnome/glayout.c:398
 msgid "Reverses the list of tagged files"
 msgstr "Œ±ÅÃµÈ ÆÄÀÏ°ú Œ±ÅõÇÁö ŸÊÀº ÆÄÀÏÀ» ¹ÝÀüœÃÅŽ"
 
-#: gnome/glayout.c:356
+#: gnome/glayout.c:400
 msgid "_Rescan Directory"
 msgstr "ÀÚ·á¹æ ŽÙœÃ Àбâ(_R)"
 
-#: gnome/glayout.c:356
+#: gnome/glayout.c:400
 msgid "Rescan the directory contents"
 msgstr "ÀÚ·á¹æ ŽÙœÃ Àбâ"
 
-#: gnome/glayout.c:363
-msgid "Icon View"
-msgstr "ŸÆÀÌÄÜ ºž±â"
-
-#: gnome/glayout.c:364
-msgid "Partial View"
-msgstr "ºÎºÐ ºž±â"
-
-#: gnome/glayout.c:365
-msgid "Full View"
-msgstr "ÀüÃŒ ºž±â"
-
-#: gnome/glayout.c:366
-msgid "Custom View"
-msgstr "»ç¿ëÀÚ ºž±â"
-
-#: gnome/glayout.c:371
+#: gnome/glayout.c:407
 msgid "_Sort By..."
 msgstr "Á€·Ä(_S)..."
 
-#: gnome/glayout.c:371
+#: gnome/glayout.c:407
 msgid "Confirmation settings"
 msgstr "È®ÀÎ ³»¿ë Œ³Á€"
 
-#: gnome/glayout.c:372
+#: gnome/glayout.c:408
 msgid "_Filter View..."
 msgstr "ÇÊÅÍ ºž±â(_F)..."
 
-#: gnome/glayout.c:372
+#: gnome/glayout.c:408
 msgid "Global option settings"
 msgstr "ÀüÃŒ Œ±ÅÃÇמñ Œ³Á€"
 
-#: gnome/glayout.c:379
+#: gnome/glayout.c:415
 msgid "_Find File..."
 msgstr "ÆÄÀÏ Ã£±â(_F)"
 
-#: gnome/glayout.c:379
+#: gnome/glayout.c:415
 msgid "Locate files on disk"
 msgstr "µðœºÅ©¿¡Œ­ÀÇ ÆÄÀÏ À§Ä¡"
 
 #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },
-#: gnome/glayout.c:382
+#: gnome/glayout.c:418
+msgid "_Edit mime types..."
+msgstr "mime ÇüœÄ ÆíÁý(_E)..."
+
+#: gnome/glayout.c:418
+msgid "Edits the MIME type bindings"
+msgstr "MIME ÇüœÄ ¹ÙÀεù ÆíÁý"
+
+#: gnome/glayout.c:420
 msgid "_Run Command..."
 msgstr "ží·É œÇÇà(_R)"
 
-#: gnome/glayout.c:382
+#: gnome/glayout.c:420
 msgid "Runs a command"
 msgstr "ží·É œÇÇà"
 
-#: gnome/glayout.c:384
+#: gnome/glayout.c:422
 msgid "_Run Command in panel..."
 msgstr "Æгο¡Œ­ ží·É œÇÇà(_R)..."
 
-#: gnome/glayout.c:384
+#: gnome/glayout.c:422
 msgid "Run a command and put the results in a panel"
 msgstr "ží·ÉÀ» œÇÇàÇÏ¿© ±× °á°úžŠ Æгο¡ Ç¥œÃ"
 
-#: gnome/glayout.c:394
+#: gnome/glayout.c:432
 msgid "_Background jobs..."
 msgstr "Background jobs(_B)..."
 
-#: gnome/glayout.c:394
+#: gnome/glayout.c:432
 msgid "List of background operations"
 msgstr "background operations žñ·Ï"
 
-#: gnome/glayout.c:397
+#: gnome/glayout.c:435
 msgid "Exit"
 msgstr "ÁŸ·á"
 
-#: gnome/glayout.c:397
+#: gnome/glayout.c:435
 msgid "Terminates the file manager and the desktop"
 msgstr "ÆÄÀÏ °üž®ÀÚ¿Í µ¥œºÅ©ÅŸ ÁŸ·á"
 
-#: gnome/glayout.c:412
+#: gnome/glayout.c:450
 msgid "Rescan System Devices"
 msgstr "œÃœºÅÛ ÀåÄ¡žŠ ŽÙœÃ ã±â"
 
-#: gnome/glayout.c:420 gnome/glayout.c:430
+#: gnome/glayout.c:458 gnome/glayout.c:468
 msgid "_Layout"
 msgstr "¹èÄ¡(_L)"
 
-#: gnome/glayout.c:421 gnome/glayout.c:431
+#: gnome/glayout.c:459 gnome/glayout.c:469
 msgid "_Commands"
 msgstr "ží·É(_C)"
 
-#: gnome/glayout.c:422
+#: gnome/glayout.c:460
 msgid "_Desktop"
 msgstr "µ¥œºÅ©ÅŸ(_D)"
 
-#: gnome/glayout.c:423 gnome/glayout.c:432
+#: gnome/glayout.c:461 gnome/glayout.c:470
 msgid "_Help"
 msgstr "µµ¿òž»(_H)"
 
-#: gnome/glayout.c:484
+#: gnome/glayout.c:610
 msgid "File/New/Directory..."
 msgstr "ÆÄÀÏ/»õ °Í/ÀÚ·á¹æ..."
 
-#: gnome/gpopup.c:258 gnome/gpopup.c:259
-msgid "Properties"
-msgstr "ŒÓŒº"
-
-#: gnome/gpopup.c:260
-msgid "Mount device"
-msgstr "ÀåÄ¡ ž¶¿îÆ®"
+#. we set the file part
+#: gnome/gnome-file-property-dialog.c:170
+msgid "Full Name: "
+msgstr "ÀüÃŒ ÀÌž§: "
 
-#: gnome/gpopup.c:261
-msgid "Unmount device"
-msgstr "ÀåÄ¡ Ÿðž¶¿îÆ®"
+#: gnome/gnome-file-property-dialog.c:178
+msgid "File Name"
+msgstr "ÆÄÀÏží"
 
-#: gnome/gpopup.c:262
-msgid "Eject device"
-msgstr "ÀåÄ¡ ÃßÃâ"
+#: gnome/gnome-file-property-dialog.c:201
+msgid "File Type: "
+msgstr "ÆÄÀÏ ÁŸ·ù: "
+
+#: gnome/gnome-file-property-dialog.c:207
+msgid "File Type: Symbolic Link"
+msgstr "ÆÄÀÏ ÁŸ·ù: œÉºŒž¯ žµÅ©"
+
+#: gnome/gnome-file-property-dialog.c:212
+msgid "Target Name: INVALID LINK"
+msgstr "Žë»ó ÀÌž§: À¯È¿ÇÏÁö ŸÊÀº žµÅ©"
+
+#: gnome/gnome-file-property-dialog.c:215
+msgid "Target Name: "
+msgstr "Žë»ó ÀÌž§: "
+
+#: gnome/gnome-file-property-dialog.c:220
+msgid "File Type: Directory"
+msgstr "ÆÄÀÏ ÁŸ·ù: ÀÚ·á¹æ"
+
+#: gnome/gnome-file-property-dialog.c:222
+msgid "File Type: Character Device"
+msgstr "ÆÄÀÏ ÁŸ·ù: ¹®ÀÚ ÀåÄ¡"
+
+#: gnome/gnome-file-property-dialog.c:224
+msgid "File Type: Block Device"
+msgstr "ÆÄÀÏ ÁŸ·ù: ºí·° ÀåÄ¡"
+
+#: gnome/gnome-file-property-dialog.c:226
+msgid "File Type: Socket"
+msgstr "ÆÄÀÏ ÁŸ·ù: ŒÒÄÏ"
+
+#: gnome/gnome-file-property-dialog.c:228
+msgid "File Type: FIFO"
+msgstr "ÆÄÀÏ ÁŸ·ù: ÇÇÆ÷"
+
+#: gnome/gnome-file-property-dialog.c:238
+#: gnome/gnome-file-property-dialog.c:242
+#: gnome/gnome-file-property-dialog.c:248
+msgid "File Size: "
+msgstr "ÆÄÀÏ Å©±â: "
+
+#: gnome/gnome-file-property-dialog.c:238
+msgid " bytes"
+msgstr " ¹ÙÀÌÆ®"
+
+#: gnome/gnome-file-property-dialog.c:242
+msgid " KBytes  ("
+msgstr " ų·Î¹ÙÀÌÆ®  ("
+
+#: gnome/gnome-file-property-dialog.c:243
+#: gnome/gnome-file-property-dialog.c:249
+msgid " bytes)"
+msgstr " ¹ÙÀÌÆ®)"
+
+#: gnome/gnome-file-property-dialog.c:248
+msgid " MBytes  ("
+msgstr " žÞ°¡¹ÙÀÌÆ®  ("
+
+#: gnome/gnome-file-property-dialog.c:256
+msgid "File Size: N/A"
+msgstr "ÆÄÀÏ Å©±â: N/A"
+
+#: gnome/gnome-file-property-dialog.c:267
+msgid "File Created on: "
+msgstr "ÆÄÀÏ »ýŒºÀÏ: "
+
+#: gnome/gnome-file-property-dialog.c:276
+msgid "Last Modified on: "
+msgstr "ž¶Áöž· ŒöÁ€ œÃ°£: "
+
+#: gnome/gnome-file-property-dialog.c:285
+msgid "Last Accessed on: "
+msgstr "ž¶Áöž· Ÿ×ŒŒœº œÃ°£: "
+
+#: gnome/gnome-file-property-dialog.c:303
+msgid "URL:"
+msgstr "URL:"
+
+#: gnome/gnome-file-property-dialog.c:310
+msgid "Caption:"
+msgstr "ÄžŒÇ:"
 
-#: gnome/gpopup.c:264 gnome/gpopup.c:265
+#. we do open first
+#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187
 msgid "Open"
 msgstr "¿­±â"
 
-#: gnome/gpopup.c:266
-msgid "Open with"
-msgstr "Open with"
+#: gnome/gnome-file-property-dialog.c:479
+msgid "Use default Open action"
+msgstr "±âº»ÀûÀÎ ¿­±â µ¿ÀÛ »ç¿ë"
+
+#: gnome/gnome-file-property-dialog.c:489
+msgid "Drop Action"
+msgstr "Drop µ¿ÀÛ"
 
-#: gnome/gpopup.c:267 src/screen.c:2286 src/screen.c:2316
+#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
+#: src/screen.c:2299 src/screen.c:2329
 msgid "View"
 msgstr "ºž±â"
 
-#: gnome/gpopup.c:268
-msgid "View unfiltered"
-msgstr "ÇÊÅÍŸøÀÌ ºž±â"
+#: gnome/gnome-file-property-dialog.c:502
+msgid "Use default Drop action"
+msgstr "±âº»ÀûÀÎ Drop µ¿ÀÛ »ç¿ë"
+
+#: gnome/gnome-file-property-dialog.c:504
+msgid "Use default View action"
+msgstr "±âº»ÀûÀÎ ºž±â µ¿ÀÛ »ç¿ë"
 
-#: gnome/gpopup.c:269 src/screen.c:2287 src/screen.c:2317 src/view.c:1996
+#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
+#: src/screen.c:2300 src/screen.c:2330 src/view.c:1991
 msgid "Edit"
 msgstr "ÆíÁý"
 
-#: gnome/gpopup.c:271
-msgid "Link..."
-msgstr "žµÅ©..."
+#: gnome/gnome-file-property-dialog.c:523
+msgid "Use default Edit action"
+msgstr "±âº»ÀûÀÎ ÆíÁý µ¿ÀÛ »ç¿ë"
 
-#: gnome/gpopup.c:272
-msgid "Symlink..."
-msgstr "œÉºŒž¯žµÅ©..."
+#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521
+msgid "Icon"
+msgstr "ŸÆÀÌÄÜ"
 
-#: gnome/gpopup.c:273
-msgid "Edit symlink..."
-msgstr "œÉºŒž¯žµÅ© ŒöÁ€..."
+#. We must be a file or a link to a file.
+#: gnome/gnome-file-property-dialog.c:611
+msgid "File Actions"
+msgstr "ÆÄÀÏ µ¿ÀÛ"
+
+#: gnome/gnome-file-property-dialog.c:616
+msgid "Open action"
+msgstr "¿­±â µ¿ÀÛ"
+
+#: gnome/gnome-file-property-dialog.c:617
+msgid "Needs terminal to run"
+msgstr "œÇÇàœÃ ŽÜž» »ç¿ë"
+
+#: gnome/gnome-file-property-dialog.c:742
+msgid "File Permissions"
+msgstr "ÆÄÀÏ Çã¿ë"
+
+#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259
+msgid "Current mode: "
+msgstr "ÇöÀç žðµå: "
+
+#. Headings
+#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272
+msgid "Read"
+msgstr "Àбâ"
+
+#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273
+msgid "Write"
+msgstr "Ÿ²±â"
+
+#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274
+msgid "Exec"
+msgstr "œÇÇà"
+
+#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275
+msgid "Special"
+msgstr "œºÆäŒÈ"
+
+#. Permissions
+#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279
+msgid "User"
+msgstr "»ç¿ëÀÚ"
+
+#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281
+msgid "Other"
+msgstr "ŽÙž¥ »ç¿ëÀÚ"
+
+#. Special
+#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285
+msgid "Set UID"
+msgstr "UID Œ³Á€"
+
+#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286
+msgid "Set GID"
+msgstr "GID Œ³Á€"
+
+#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287
+msgid "Sticky"
+msgstr "Sticky"
+
+#: gnome/gnome-file-property-dialog.c:914
+msgid "File ownership"
+msgstr "ÆÄÀÏ ŒÒÀ¯°ü°è"
+
+#: gnome/gnome-file-property-dialog.c:1074
+msgid "URL"
+msgstr "URL"
+
+#: gnome/gnome-file-property-dialog.c:1077
+msgid "Statistics"
+msgstr "Åë°è"
+
+#: gnome/gnome-file-property-dialog.c:1083
+msgid "Options"
+msgstr "Œ±ÅÃÇמñ"
+
+#: gnome/gnome-file-property-dialog.c:1086
+msgid "Permissions"
+msgstr "Çã¿ë"
+
+#: gnome/gnome-file-property-dialog.c:1089
+msgid " Properties"
+msgstr " ŒÓŒº"
 
-#: gnome/gpopup.c:280 gnome/gpopup.c:291
-msgid "Move/rename..."
-msgstr "À̵¿/ÀÌž§¹Ù²Ù±â..."
+#: gnome/gnome-file-property-dialog.c:1140
+msgid "You entered an invalid username"
+msgstr "À¯È¿ÇÏÁö ŸÊÀº »ç¿ëÀÚÀÌž§À» ÀÔ·ÂÇό̜ÀŽÏŽÙ"
 
-#: gnome/gpopup.c:281 gnome/gpopup.c:292
+#: gnome/gnome-file-property-dialog.c:1185
+msgid "You must rename your file to something"
+msgstr "ŽÙž¥ ÀÌž§Àž·Î ÆÄÀÏžíÀ» ¹Ù²ÙŸîŸß ÇÕŽÏŽÙ"
+
+#: gnome/gnome-file-property-dialog.c:1191
+msgid "You cannot rename a file to something containing a '/' character"
+msgstr "'/' ¹®ÀÚžŠ Æ÷ÇÔÇÏŽÂ ÆÄÀÏžíÀž·ÎŽÂ ¹Ù²Ü Œö ŸøœÀŽÏŽÙ"
+
+#. the first label
+#: gnome/gnome-open-dialog.c:379
+msgid "Select an application to open \""
+msgstr ""
+
+#: gnome/gnome-open-dialog.c:390
+msgid "Select a file to run with"
+msgstr ""
+
+#. the file tree
+#: gnome/gnome-open-dialog.c:401
+msgid "Applications"
+msgstr "ÀÀ¿ëÇÁ·Î±×·¥"
+
+#: gnome/gnome-open-dialog.c:417
+msgid "Program to run"
+msgstr "œÇÇàÇÒ ÇÁ·Î±×·¥"
+
+#: gnome/gpopup2.c:188
+msgid "Mount device"
+msgstr "ÀåÄ¡ ž¶¿îÆ®"
+
+#: gnome/gpopup2.c:189
+msgid "Unmount device"
+msgstr "ÀåÄ¡ Ÿðž¶¿îÆ®"
+
+#: gnome/gpopup2.c:190
+msgid "Eject device"
+msgstr "ÀåÄ¡ ÃßÃâ"
+
+#: gnome/gpopup2.c:193
+msgid "Open with..."
+msgstr "Open with..."
+
+#: gnome/gpopup2.c:195
+msgid "View Unfiltered"
+msgstr "ÇÊÅÍŸøÀÌ ºž±â"
+
+#: gnome/gpopup2.c:198
 msgid "Copy..."
 msgstr "º¹»ç..."
 
-#: gnome/gpopup.c:282 gnome/gpopup.c:294 gtkedit/editwidget.c:1070
-#: src/screen.c:2291 src/screen.c:2321
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2304
+#: src/screen.c:2334
 msgid "Delete"
 msgstr "Áö¿ì±â"
 
+#: gnome/gpopup2.c:200
+msgid "Move..."
+msgstr "À̵¿..."
+
+#: gnome/gpopup2.c:201
+msgid "Hard Link..."
+msgstr "ÇÏµå žµÅ©..."
+
+#: gnome/gpopup2.c:202
+msgid "Symlink..."
+msgstr "œÉºŒž¯žµÅ©..."
+
+#: gnome/gpopup2.c:203
+msgid "Edit Symlink..."
+msgstr "œÉºŒž¯žµÅ© ŒöÁ€..."
+
+#: gnome/gpopup2.c:205
+msgid "Properties..."
+msgstr "ŒÓŒº..."
+
 #: gnome/gprefs.c:81
 msgid "Show backup files"
 msgstr "¹éŸ÷ ÆÄÀÏ ºž±â"
@@ -801,63 +1200,10 @@
 msgid "File mode (permissions)"
 msgstr "ÆÄÀÏ žðµå (Çã¿ë)"
 
-#: gnome/gprop.c:259
-msgid "Current mode: "
-msgstr "ÇöÀç žðµå: "
-
-#. Headings
-#: gnome/gprop.c:272
-msgid "Read"
-msgstr "Àбâ"
-
-#: gnome/gprop.c:273
-msgid "Write"
-msgstr "Ÿ²±â"
-
-#: gnome/gprop.c:274
-msgid "Exec"
-msgstr "œÇÇà"
-
-#: gnome/gprop.c:275
-msgid "Special"
-msgstr "œºÆäŒÈ"
-
-#. Permissions
-#: gnome/gprop.c:279
-msgid "User"
-msgstr "»ç¿ëÀÚ"
-
-#. Group
-#: gnome/gprop.c:280 gnome/gprop.c:405 src/screen.c:439
-msgid "Group"
-msgstr "ÁýŽÜ"
-
-#: gnome/gprop.c:281
-msgid "Other"
-msgstr "ŽÙž¥ »ç¿ëÀÚ"
-
-#. Special
-#: gnome/gprop.c:285
-msgid "Set UID"
-msgstr "UID Œ³Á€"
-
-#: gnome/gprop.c:286
-msgid "Set GID"
-msgstr "GID Œ³Á€"
-
-#: gnome/gprop.c:287
-msgid "Sticky"
-msgstr "Sticky"
-
 #: gnome/gprop.c:321 gnome/gprop.c:347
 msgid "<Unknown>"
 msgstr "<Unknown>"
 
-#. Owner
-#: gnome/gprop.c:390 src/screen.c:438
-msgid "Owner"
-msgstr "ŒÒÀ¯ÀÚ"
-
 #: gnome/gprop.c:494
 msgid "General"
 msgstr "ÀϹÝ"
@@ -866,262 +1212,232 @@
 msgid "Title"
 msgstr "ÁŠžñ"
 
-#: gnome/gprop.c:521 gnome/gscreen.c:2369
-msgid "Icon"
-msgstr "ŸÆÀÌÄÜ"
-
 #: gnome/gprop.c:535
 msgid "Select icon"
 msgstr "ŸÆÀÌÄÜ Œ±ÅÃ"
 
-#: gnome/gscreen.c:1452
+#: gnome/gscreen.c:1472
 msgid "Rescan Directory"
 msgstr "ÀÚ·á¹æ ŽÙœÃ Àбâ"
 
-#: gnome/gscreen.c:1452
+#: gnome/gscreen.c:1472
 msgid "Reloads the current directory"
 msgstr "ÇöÀç ÀÚ·á¹æ ŽÙœÃ Àбâ"
 
-#: gnome/gscreen.c:1454
+#: gnome/gscreen.c:1474
 msgid "New folder"
 msgstr "»õ ÆúŽõ"
 
-#: gnome/gscreen.c:1454
+#: gnome/gscreen.c:1474
 msgid "Creates a new folder here"
 msgstr "»õ·Î¿î ÀÚ·á¹æÀ» »ýŒº"
 
-#: gnome/gscreen.c:1632
+#: gnome/gscreen.c:1652
 msgid "All files"
 msgstr "žðµç ÆÄÀÏ"
 
-#: gnome/gscreen.c:1634
+#: gnome/gscreen.c:1654
 msgid "Archives and compressed files"
 msgstr "Archives¿Í ŸÐÃà ÆÄÀÏ"
 
-#: gnome/gscreen.c:1636
+#: gnome/gscreen.c:1656
 msgid "RPM/DEB files"
 msgstr "RPM/DEB ÆÄÀÏ"
 
-#: gnome/gscreen.c:1638
+#: gnome/gscreen.c:1658
 msgid "Text/Document files"
 msgstr "Text/Document ÆÄÀÏ"
 
-#: gnome/gscreen.c:1640
+#: gnome/gscreen.c:1660
 msgid "HTML and SGML files"
 msgstr "HTML°ú SGML ÆÄÀÏ"
 
-#: gnome/gscreen.c:1642
+#: gnome/gscreen.c:1662
 msgid "Postscript and PDF files"
 msgstr "Postscript¿Í PDF ÆÄÀÏ"
 
-#: gnome/gscreen.c:1644
+#: gnome/gscreen.c:1664
 msgid "Spreadsheet files"
 msgstr "ŒÀÆÇ ÆÄÀÏ"
 
-#: gnome/gscreen.c:1646
+#: gnome/gscreen.c:1666
 msgid "Image files"
 msgstr "¿µ»ó ÆÄÀÏ"
 
-#: gnome/gscreen.c:1649
+#: gnome/gscreen.c:1669
 msgid "Video/animation files"
 msgstr "µ¿¿µ»ó/¿òÁ÷²Ã ÆÄÀÏ"
 
-#: gnome/gscreen.c:1651
+#: gnome/gscreen.c:1671
 msgid "Audio files"
 msgstr "µéž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1653
+#: gnome/gscreen.c:1673
 msgid "C program files"
 msgstr "C Ç®±×ž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1655
+#: gnome/gscreen.c:1675
 msgid "C++ program files"
 msgstr "C++ Ç®±×ž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1657
+#: gnome/gscreen.c:1677
 msgid "Objective-C program files"
 msgstr "Objective-C Ç®±×ž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1659
+#: gnome/gscreen.c:1679
 msgid "Scheme program files"
 msgstr "œºÅŽ(scheme) Ç®±×ž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1661
+#: gnome/gscreen.c:1681
 msgid "Assembler program files"
 msgstr "Â¥žÂÃß°³ Ç®±×ž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1663
+#: gnome/gscreen.c:1683
 msgid "Misc. program files"
 msgstr "±âÅž Ç®±×ž² ÆÄÀÏ"
 
-#: gnome/gscreen.c:1665
+#: gnome/gscreen.c:1685
 msgid "Font files"
 msgstr "±ÛÀÚÃŒ ÆÄÀÏ"
 
-#: gnome/gscreen.c:1792
+#: gnome/gscreen.c:1812
 #, c-format
 msgid "Search: %s"
 msgstr "ã±â: %s"
 
-#: gnome/gscreen.c:1802
+#: gnome/gscreen.c:1822
 #, c-format
 msgid "%s bytes in %d file"
 msgstr "%s bytes in %d file"
 
-#: gnome/gscreen.c:1802
+#: gnome/gscreen.c:1822
 #, c-format
 msgid "%s bytes in %d files"
 msgstr "%s bytes in %d files"
 
-#: gnome/gscreen.c:1828 src/screen.c:677
+#: gnome/gscreen.c:1848 src/screen.c:670
 msgid "<readlink failed>"
 msgstr "<readlink œÇÆÐ>"
 
-#: gnome/gscreen.c:1882
+#: gnome/gscreen.c:1902
 msgid "Filter"
 msgstr "ÇÊÅÍ"
 
-#: gnome/gscreen.c:2369
-msgid "Switch view to an Icon view"
-msgstr "ŸÆÀÌÄÜ ºž±â·Î Àüȯ"
-
-#: gnome/gscreen.c:2371
-msgid "Brief"
-msgstr "°£ŽÜÈ÷"
-
-#: gnome/gscreen.c:2371
-msgid "Switch view to show just file name and type"
-msgstr "ÆÄÀÏ ÀÌž§°ú ÇüœÄ ºž±â·Î Àüȯ"
-
-#: gnome/gscreen.c:2373
-msgid "Detailed"
-msgstr "ÀÚŒŒÈ÷"
-
-#: gnome/gscreen.c:2373
-msgid "Switch view to show detailed file statistics"
-msgstr "ÆÄÀÏ »óÅžŠ ÀÚŒŒÈ÷ ºž±â·Î Àüȯ"
-
-#: gnome/gscreen.c:2375
-msgid "Custom"
-msgstr "»ç¿ëÀÚ ºž±â"
-
-#: gnome/gscreen.c:2375
-msgid "Switch view to show custom determined statistics."
-msgstr "»ç¿ëÀÚ°¡ Œ³Á€ÇÑ »óÅ·Πºž±â Àüȯ"
-
-#: gnome/gscreen.c:2383
+#: gnome/gscreen.c:2347
 msgid "Back"
 msgstr "µÚ·Î"
 
-#: gnome/gscreen.c:2383
+#: gnome/gscreen.c:2347
 msgid "Go to the previously visited directory"
 msgstr "¹Ù·Î Àü ÀÚ·á¹æÀž·Î °¡±â"
 
-#: gnome/gscreen.c:2385
+#: gnome/gscreen.c:2349
 msgid "Up"
 msgstr "À§·Î"
 
-#: gnome/gscreen.c:2385
+#: gnome/gscreen.c:2349
 msgid "Go up a level in the directory heirarchy"
 msgstr "À­ ÀÚ·á¹æÀž·Î °¡±â"
 
-#: gnome/gscreen.c:2387
+#: gnome/gscreen.c:2351
 msgid "Forward"
 msgstr "ŸÕÀž·Î"
 
-#: gnome/gscreen.c:2387
+#: gnome/gscreen.c:2351
 msgid "Go to the next directory"
 msgstr "ŽÙÀœ ÀÚ·á¹æÀž·Î °¡±â"
 
-#: gnome/gscreen.c:2390 src/tree.c:1020
+#: gnome/gscreen.c:2354 src/tree.c:1020
 msgid "Rescan"
 msgstr "Rescan"
 
-#: gnome/gscreen.c:2390
+#: gnome/gscreen.c:2354
 msgid "Rescan the current directory"
 msgstr "ÇöÀç ÀÚ·á¹æ ŽÙœÃ Àбâ"
 
-#: gnome/gscreen.c:2393
+#: gnome/gscreen.c:2357
 msgid "Home"
 msgstr "Èš"
 
-#: gnome/gscreen.c:2393
+#: gnome/gscreen.c:2357
 msgid "Go to your home directory"
 msgstr "Èš ÀÚ·á¹æÀž·Î °¡±â"
 
-#: gnome/gscreen.c:2527
+#: gnome/gscreen.c:2503
 msgid "Location:"
 msgstr "À§Ä¡:"
 
-#: gnome/gtools.c:110 gtkedit/editcmd.c:342 gtkedit/editcmd.c:1183
-#: gtkedit/editcmd.c:1268 src/boxes.c:138 src/boxes.c:278 src/boxes.c:378
-#: src/boxes.c:466 src/boxes.c:646 src/boxes.c:728 src/boxes.c:783
-#: src/boxes.c:897 src/filegui.c:807 src/find.c:171 src/layout.c:369
-#: src/option.c:144 src/wtools.c:289 src/wtools.c:561
+#. 1
+#: gnome/gtools.c:110 gtkedit/editcmd.c:344 gtkedit/editcmd.c:1187
+#: gtkedit/editcmd.c:1272 gtkedit/editcmd.c:2868 gtkedit/editoptions.c:71
+#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
+#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
+#: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144
+#: src/wtools.c:289 src/wtools.c:563
 msgid "&Ok"
 msgstr "È®ÀÎ(&O)"
 
-#: gnome/gview.c:122 src/view.c:683
+#: gnome/gview.c:135 src/view.c:683
 #, c-format
 msgid "Offset 0x%08x"
 msgstr "¿ÉŒÂ 0x%08x"
 
-#: gnome/gview.c:124 src/view.c:685
+#: gnome/gview.c:137 src/view.c:685
 #, c-format
 msgid "Col %d"
 msgstr "Col %d"
 
-#: gnome/gview.c:128 src/view.c:689
+#: gnome/gview.c:141 src/view.c:689
 #, c-format
 msgid "%s bytes"
 msgstr "%s ¹ÙÀÌÆ®"
 
-#: gnome/gview.c:292
+#: gnome/gview.c:305
 msgid "_Goto line"
 msgstr "¶óÀΠãŸÆ°¡±â(_G)"
 
-#: gnome/gview.c:293
+#: gnome/gview.c:306
 msgid "Jump to a specified line number"
 msgstr "ÁÖŸîÁø ÁÙ·Î Á¡ÇÁ"
 
-#: gnome/gview.c:295
+#: gnome/gview.c:308
 msgid "_Monitor file"
 msgstr "ÆÄÀÏ °šœÃ(_M)"
 
-#: gnome/gview.c:295
+#: gnome/gview.c:308
 msgid "Monitor file growing"
 msgstr "ÆÄÀÏÀÌ Ä¿ÁöŽÂÁö °šœÃ"
 
-#: gnome/gview.c:302
+#: gnome/gview.c:315
 msgid "Regexp search"
 msgstr "Á€±ÔÇ¥ÇöœÄ ã±â"
 
-#: gnome/gview.c:303
+#: gnome/gview.c:316
 msgid "Regular expression search"
 msgstr "Á€±ÔÇ¥ÇöœÄ ã±â"
 
-#: gnome/gview.c:312
+#: gnome/gview.c:325
 msgid "_Wrap"
 msgstr "_Wrap"
 
-#: gnome/gview.c:313
+#: gnome/gview.c:326
 msgid "Wrap the text"
 msgstr "Wrap the text"
 
 #. Can not use this one yet, as it destroys the viewer, need to fix that
-#: gnome/gview.c:316
+#: gnome/gview.c:329
 msgid "_Parsed view"
 msgstr ""
 
-#: gnome/gview.c:319
+#: gnome/gview.c:332
 msgid "_Formatted"
 msgstr "_Formatted"
 
-#: gnome/gview.c:321
+#: gnome/gview.c:334
 msgid "_Hex"
 msgstr "œÊÀ°Áø(_H)"
 
-#: gnome/gview.c:327
+#: gnome/gview.c:340
 msgid "_Search"
 msgstr "ã±â(_S)"
 
@@ -1137,11 +1453,11 @@
 msgid "help"
 msgstr "µµ¿òž»"
 
-#: gnome/gwidget.c:96 src/file.c:2214
+#: gnome/gwidget.c:96 src/file.c:2252
 msgid "yes"
 msgstr "¿¹"
 
-#: gnome/gwidget.c:98 src/file.c:2212
+#: gnome/gwidget.c:98 src/file.c:2250
 msgid "no"
 msgstr "ŸÆŽÏ¿À"
 
@@ -1154,31 +1470,31 @@
 msgstr "ÁßÁö"
 
 #. The file-name is printed after the ':'
-#: 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:1943 gtkedit/editwidget.c:950 src/dir.c:386
-#: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240
+#: gtkedit/edit.c:247 gtkedit/edit.c:253 gtkedit/edit.c:310 gtkedit/edit.c:346
+#: gtkedit/editcmd.c:1954 gtkedit/editwidget.c:952 src/dir.c:386
+#: src/screen.c:2319 src/tree.c:692 src/tree.c:698 src/wtools.c:222
 #: vfs/fish.c:224
 msgid " Error "
 msgstr " ¿¡·¯ "
 
-#: gtkedit/edit.c:129 gtkedit/edit.c:231
+#: gtkedit/edit.c:131 gtkedit/edit.c:233
 msgid " Failed trying to open file for reading: "
 msgstr " ÆÄÀÏ ¿­±â œÇÆÐ: "
 
-#: gtkedit/edit.c:238
+#: gtkedit/edit.c:240
 msgid " Cannot get size/permissions info on file: "
 msgstr " ÆÄÀÏ Å©±â/Çã¿ë Á€ºž Ÿò±â œÇÆÐ: "
 
-#: gtkedit/edit.c:245
+#: gtkedit/edit.c:247
 msgid " Not an ordinary file: "
 msgstr " ÀÏ¹Ý ÆÄÀÏ ŸÆŽÔ: "
 
-#: gtkedit/edit.c:251
+#: gtkedit/edit.c:253
 msgid " File is too large: "
 msgstr " ÆÄÀÏ Å©±â°¡ ³Ê¹« Å­: "
 
-#: gtkedit/edit.c:252
+#: gtkedit/edit.c:254
 msgid ""
 " \n"
 " Increase edit.h:MAXBUF and recompile the editor. "
@@ -1186,140 +1502,142 @@
 " \n"
 " edit.hÀÇ MAXBUF °ªÀ» Å°¿î ÈÄ ŽÙœÃ ÄÄÆÄÀÏÇϜʜÿÀ. "
 
-#: gtkedit/edit.c:308 gtkedit/edit.c:344
+#: gtkedit/edit.c:310 gtkedit/edit.c:346
 msgid " Error allocating memory "
 msgstr " ±âŸïÀåÄ¡ ¹èÁ€ ¿¡·¯ "
 
-#: gtkedit/editcmd.c:335
+#: gtkedit/editcmd.c:337
 msgid "Quick save "
 msgstr "ºüž¥ ÀúÀå "
 
-#: gtkedit/editcmd.c:336
+#: gtkedit/editcmd.c:338
 msgid "Safe save "
 msgstr "ŸÈÀüÇÑ ÀúÀå "
 
-#: gtkedit/editcmd.c:337
+#: gtkedit/editcmd.c:339
 msgid "Do backups -->"
 msgstr "¹éŸ÷ -->"
 
-#: gtkedit/editcmd.c:340 gtkedit/editcmd.c:1181 gtkedit/editcmd.c:1266
+#. NLS  for hotkeys?
+#: gtkedit/editcmd.c:342 gtkedit/editcmd.c:1139 gtkedit/editcmd.c:1185
+#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2866 gtkedit/editoptions.c:68
 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376
 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781
-#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:790
+#: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821
 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911
 #: src/layout.c:370 src/learn.c:59 src/option.c:145 src/panelize.c:86
-#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:559
-#: src/wtools.c:640
+#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561
 msgid "&Cancel"
 msgstr "ÃëŒÒ(&C)"
 
-#: gtkedit/editcmd.c:346
+#: gtkedit/editcmd.c:348
 msgid "Extension:"
 msgstr "È®ÀåÀÚ:"
 
 #. NLS ?
-#: gtkedit/editcmd.c:353
+#: gtkedit/editcmd.c:355
 msgid " Edit Save Mode "
 msgstr " ÆíÁý ÀúÀå žðµå "
 
-#: gtkedit/editcmd.c:477
+#: gtkedit/editcmd.c:479
 msgid " Save As "
 msgstr " »õÀÌž§Àž·Î ÀúÀå "
 
 #. Warning message with a query to continue or cancel the operation
-#: gtkedit/editcmd.c:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:606
-#: src/help.c:318 src/main.c:691 src/screen.c:2063 src/subshell.c:700
-#: src/subshell.c:726 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458
+#: gtkedit/editcmd.c:493 gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086 src/ext.c:301 src/file.c:619
+#: src/help.c:318 src/main.c:694 src/screen.c:2076 src/subshell.c:705
+#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
 #: vfs/mcfs.c:170
 msgid " Warning "
 msgstr " °æ°í "
 
-#: gtkedit/editcmd.c:492
+#: gtkedit/editcmd.c:494
 msgid " A file already exists with this name. "
 msgstr " °°Àº ÀÌž§ÀÇ ÆÄÀÏÀÌ ÀÌ¹Ì ÀÖœÀŽÏŽÙ. "
 
 #. Push buttons to over-write the current file, or cancel the operation
-#: gtkedit/editcmd.c:494
+#: gtkedit/editcmd.c:496
 msgid "Overwrite"
 msgstr "°ãÃÄŸ²±â"
 
-#: gtkedit/editcmd.c:494 gtkedit/editcmd.c:783 gtkedit/editcmd.c:810
-#: gtkedit/editcmd.c:840 gtkedit/editcmd.c:987 gtkedit/editcmd.c:1576
+#: gtkedit/editcmd.c:496 gtkedit/editcmd.c:558 gtkedit/editcmd.c:785
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: gtkedit/editcmd.c:1581
 msgid "Cancel"
 msgstr "ÃëŒÒ"
 
-#: gtkedit/editcmd.c:510
+#: gtkedit/editcmd.c:512
 msgid " Save as "
 msgstr " »õÀÌž§Àž·Î ÀúÀå "
 
-#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2613
+#: gtkedit/editcmd.c:512 gtkedit/editcmd.c:2636
 msgid " Error trying to save file. "
 msgstr " ÆÄÀÏ ÀúÀå ¿¡·¯. "
 
 #. This heads the delete macro error dialog box
-#: gtkedit/editcmd.c:626 gtkedit/editcmd.c:634 gtkedit/editcmd.c:659
+#: gtkedit/editcmd.c:628 gtkedit/editcmd.c:636 gtkedit/editcmd.c:661
 msgid " Delete macro "
 msgstr " žÅÅ©·Î Áö¿ì±â "
 
 #. 'Open' = load temp file
-#: gtkedit/editcmd.c:628
+#: gtkedit/editcmd.c:630
 msgid " Error trying to open temp file "
 msgstr " ÀӜà ÆÄÀÏ ¿­±â ¿¡·¯ "
 
 #. 'Open' = load temp file
-#: gtkedit/editcmd.c:636 gtkedit/editcmd.c:697 gtkedit/editcmd.c:765
+#: gtkedit/editcmd.c:638 gtkedit/editcmd.c:699 gtkedit/editcmd.c:767
 msgid " Error trying to open macro file "
 msgstr " žÅÅ©·Î ÆÄÀÏ ¿­±â ¿¡·¯ "
 
-#: gtkedit/editcmd.c:641 gtkedit/editcmd.c:649 gtkedit/editcmd.c:685
-#: gtkedit/editcmd.c:740
+#: gtkedit/editcmd.c:643 gtkedit/editcmd.c:651 gtkedit/editcmd.c:687
+#: gtkedit/editcmd.c:742
 #, c-format
 msgid "key '%d 0': "
 msgstr "±ÛŒè '%d 0': "
 
-#: gtkedit/editcmd.c:660
+#: gtkedit/editcmd.c:662
 msgid " Error trying to overwrite macro file "
 msgstr " žÅÅ©·Î ÆÄÀÏ °ãÃÄŸ²±â ¿¡·¯ "
 
 #. This heads the 'Macro' dialog box
-#: gtkedit/editcmd.c:677
+#: gtkedit/editcmd.c:679
 msgid " Macro "
 msgstr " žÅÅ©·Î "
 
 #. Input line for a single key press follows the ':'
-#: gtkedit/editcmd.c:679
+#: gtkedit/editcmd.c:681
 msgid " Press the macro's new hotkey: "
 msgstr " »õ·Î¿î žÅÅ©·Î ŽÜÃà±ÛŒèžŠ Ž©ž£œÊœÃ¿À: "
 
 #. This heads the 'Save Macro' dialog box
-#: gtkedit/editcmd.c:697
+#: gtkedit/editcmd.c:699
 msgid " Save macro "
 msgstr " žÅÅ©·Î ÀúÀå "
 
-#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:714
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:716
 msgid " Delete Macro "
 msgstr " žÅÅ©·Î Áö¿ì±â "
 
 #. This heads the 'Load Macro' dialog box
-#: gtkedit/editcmd.c:764
+#: gtkedit/editcmd.c:766
 msgid " Load macro "
 msgstr " žÅÅ©·Î ºÒ·¯¿À±â "
 
-#: gtkedit/editcmd.c:778 gtkedit/editcmd.c:780
+#: gtkedit/editcmd.c:780 gtkedit/editcmd.c:782
 msgid " Confirm save file? : "
 msgstr " ÀúÀåÇϜðڜÀŽÏ±î? "
 
 #. Buttons to 'Confirm save file' query
-#: gtkedit/editcmd.c:783
+#: gtkedit/editcmd.c:785
 msgid " Save file "
 msgstr " ÆÄÀÏ ÀúÀå "
 
-#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1992
+#: gtkedit/editcmd.c:785 gtkedit/editwidget.c:1066 src/view.c:1987
 msgid "Save"
 msgstr "ÀúÀå"
 
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
 msgid ""
 " Current text was modified without a file save. \n"
 " Continue discards these changes. "
@@ -1327,204 +1645,229 @@
 " ÆÄÀÏÀÌ ¹Ù²îŸúœÀŽÏŽÙ. \n"
 " ÀúÀå ŸÊÇÏ°í °èŒÓÇÏœÇ °ÌŽÏ±î? "
 
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: src/main.c:3076
 msgid "Continue"
 msgstr "°èŒÓ"
 
 #. Heads the 'Load' file dialog box
-#: gtkedit/editcmd.c:829 gtkedit/editcmd.c:843
+#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:845
 msgid " Load "
 msgstr " ºÒ·¯¿À±â "
 
-#: gtkedit/editcmd.c:829
+#: gtkedit/editcmd.c:831
 msgid " Error trying to open file for reading "
 msgstr " ÆÄÀÏ ¿­±â ¿¡·¯ "
 
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086
 msgid " Block is large, you may not be able to undo this action. "
 msgstr " ±ž¿ªÀÌ ³Ê¹« Ä¿Œ­ ³ªÁß¿¡ ¹«žŠ Œö ŸøœÀŽÏŽÙ. "
 
-#: gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:1086
 msgid " Continue "
 msgstr " °èŒÓ "
 
-#: gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:1086
 msgid " Cancel "
 msgstr " ÃëŒÒ "
 
+#: gtkedit/editcmd.c:1141 src/filegui.c:596
+msgid "al&L"
+msgstr "žðµÎ(&L)"
+
+#: gtkedit/editcmd.c:1143 src/file.c:2174 src/filegui.c:266
+msgid "&Skip"
+msgstr "°Ç³Ê¶Ü(&S)"
+
+#: gtkedit/editcmd.c:1145
+msgid "&Replace"
+msgstr "¹Ù²Þ(&R)"
+
 #. This is for the confirm replace dialog box. The replaced string comes after the ':'
-#: gtkedit/editcmd.c:1147 gtkedit/editcmd.c:1574
+#: gtkedit/editcmd.c:1151 gtkedit/editcmd.c:1579
 msgid " Replace with: "
 msgstr " ...·Î ¹Ù²Þ: "
 
-#. Heads the 'Replace' dialog box
-#: gtkedit/editcmd.c:1151 gtkedit/editcmd.c:1228 gtkedit/editcmd.c:1478
-#: gtkedit/editcmd.c:1572 gtkedit/editcmd.c:2105 gtkedit/editcmd.c:2136
-#: gtkedit/editcmd.c:2138
-msgid " Replace "
-msgstr " ¹Ù²Þ "
+#: gtkedit/editcmd.c:1155
+msgid " Confirm replace "
+msgstr " ¹Ù²Ù±â È®ÀÎ "
 
-#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1270
+#: gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1274
 msgid "scanf &Expression"
 msgstr "scanf Ç¥Çö(&E)"
 
-#: gtkedit/editcmd.c:1187
+#: gtkedit/editcmd.c:1191
 msgid "replace &All"
 msgstr "žðµÎ ¹Ù²Þ(&A)"
 
-#: gtkedit/editcmd.c:1189
+#: gtkedit/editcmd.c:1193
 msgid "pr&Ompt on replace"
 msgstr "¹Ù²Ü ¶§ž¶ŽÙ ¹°Ÿîºœ(&O)"
 
-#: gtkedit/editcmd.c:1191 gtkedit/editcmd.c:1272
+#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
 msgid "&Backwards"
 msgstr "µÚ·Î(&B)"
 
-#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274
+#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
 msgid "&Regular expression"
 msgstr "Á€±ÔÇ¥ÇöœÄ(&R)"
 
-#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
+#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280
 msgid "&Whole words only"
 msgstr "ŽÜŸî ŽÜÀ§·Î(&W)"
 
-#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
+#: gtkedit/editcmd.c:1201 gtkedit/editcmd.c:1282
 msgid "case &Sensitive"
 msgstr "ŽëŒÒ¹®ÀÚ ±žºÐ(&S)"
 
-#: gtkedit/editcmd.c:1201
+#: gtkedit/editcmd.c:1205
 msgid " Enter replacement argument order eg. 3,2,1,4 "
 msgstr " ÀÎÀÚ ŒøŒ­ ÀÔ·Â (°¡·É: 3,2,1,4): "
 
-#: gtkedit/editcmd.c:1205
+#: gtkedit/editcmd.c:1209
 msgid " Enter replacement string:"
 msgstr " ¹Ù²Ü ±Û¿ù ÀÔ·Â:"
 
-#: gtkedit/editcmd.c:1209 gtkedit/editcmd.c:1282 src/view.c:1917
+#: gtkedit/editcmd.c:1213 gtkedit/editcmd.c:1286 src/view.c:1912
 msgid " Enter search string:"
 msgstr " ãÀ» ±Û¿ù ÀÔ·Â:"
 
+#. Heads the 'Replace' dialog box
+#: gtkedit/editcmd.c:1232 gtkedit/editcmd.c:1483 gtkedit/editcmd.c:1577
+#: gtkedit/editcmd.c:2128 gtkedit/editcmd.c:2159 gtkedit/editcmd.c:2161
+msgid " Replace "
+msgstr " ¹Ù²Þ "
+
 #. Heads the 'Search' dialog box
-#: gtkedit/editcmd.c:1296 gtkedit/editcmd.c:1472 gtkedit/editcmd.c:2207
-#: src/view.c:1465 src/view.c:1564 src/view.c:1686 src/view.c:1885
-#: src/view.c:1917
+#: gtkedit/editcmd.c:1300 gtkedit/editcmd.c:1477 gtkedit/editcmd.c:2230
+#: src/view.c:1467 src/view.c:1566 src/view.c:1688 src/view.c:1880
+#: src/view.c:1912
 msgid " Search "
 msgstr " ã±â "
 
 #. An input line comes after the ':'
-#: gtkedit/editcmd.c:1346
+#: gtkedit/editcmd.c:1349
 msgid " Enter search text : "
 msgstr " ãÀ» ±Û¿ùÀº : "
 
-#: gtkedit/editcmd.c:1353
+#: gtkedit/editcmd.c:1356
 msgid " Enter replace text : "
 msgstr " ¹Ù²Ü ±Û¿ùÀº : "
 
-#: gtkedit/editcmd.c:1357
-msgid " Enter argument order : "
-msgstr " ÀÎÀÚ ŒøŒ­ ÀÔ·Â : "
+#: gtkedit/editcmd.c:1359 gtkedit/editcmd.c:1360
+#, c-format
+msgid ""
+"You can enter regexp substrings with %s (not \\1, \\2 like sed) then use "
+"\"Enter...order\""
+msgstr ""
+
+#: gtkedit/editcmd.c:1362
+msgid " Enter argument (or substring) order : "
+msgstr " ÀÎÀÚ (È€Àº ¹®ÀÚ¿­) ŒøŒ­ ÀÔ·Â : "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1361 gtkedit/editcmd.c:1362
-msgid "Enter the order of replacement of your scanf format specifiers"
-msgstr "scanf ÇüœÄÀ» ¹Ù²Ü ŒøŒ­ ÀÔ·Â"
+#: gtkedit/editcmd.c:1366 gtkedit/editcmd.c:1367
+msgid ""
+"Enter the order of replacement of your scanf format specifiers or regexp "
+"substrings"
+msgstr ""
 
 #. The following are check boxes
-#: gtkedit/editcmd.c:1367
+#: gtkedit/editcmd.c:1372
 msgid " Whole words only "
 msgstr " ŽÜŸî ŽÜÀ§·Î "
 
-#: gtkedit/editcmd.c:1369
+#: gtkedit/editcmd.c:1374
 msgid " Case sensitive "
 msgstr " ŽëŒÒ¹®ÀÚ ±žº° "
 
-#: gtkedit/editcmd.c:1372
+#: gtkedit/editcmd.c:1377
 msgid " Regular expression "
 msgstr " Á€±ÔÇ¥ÇöœÄ "
 
-#: gtkedit/editcmd.c:1373 gtkedit/editcmd.c:1374
+#: gtkedit/editcmd.c:1378 gtkedit/editcmd.c:1379
 msgid "See the regex man page for how to compose a regular expression"
 msgstr " regex(Á€±ÔÇ¥ÇöœÄ) Œ³žíŒ­žŠ ºžœÊœÃ¿À "
 
-#: gtkedit/editcmd.c:1380
+#: gtkedit/editcmd.c:1385
 msgid " Backwards "
 msgstr " µÚ·Î "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1382 gtkedit/editcmd.c:1383
+#: gtkedit/editcmd.c:1387 gtkedit/editcmd.c:1388
 msgid "Warning: Searching backward can be slow"
 msgstr "°æ°í: µÚ·Î ã±âŽÂ ³Ê¹« ŽÀž³ŽÏŽÙ"
 
-#: gtkedit/editcmd.c:1396
+#: gtkedit/editcmd.c:1401
 msgid " Prompt on replace "
 msgstr " ¹Ù²Ü ¶§ž¶ŽÙ ¹°Ÿîºœ "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1398
+#: gtkedit/editcmd.c:1403
 msgid "Ask before making each replacement"
 msgstr "¹Ù²Ü ¶§ž¶ŽÙ ¹°ŸîºŒ±î¿ä"
 
-#: gtkedit/editcmd.c:1400
+#: gtkedit/editcmd.c:1405
 msgid " Replace all "
 msgstr " žðµÎ ¹Ù²Ù±â "
 
-#: gtkedit/editcmd.c:1403
+#: gtkedit/editcmd.c:1408
 msgid " Scanf expression "
 msgstr " scanf Ç¥Çö "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1405
+#: gtkedit/editcmd.c:1410
 msgid "Allows entering of a C format string, see the scanf man page"
 msgstr "C ÇüœÄ ¹®ÀÚ¿­À» ÀÔ·ÂÇÒ Œö ÀÖœÀŽÏŽÙ. scanf Œ³žíŒ­žŠ ºžœÊœÃ¿À"
 
 #. Tool hint
-#: gtkedit/editcmd.c:1410
+#: gtkedit/editcmd.c:1415
 msgid "Begin search, Enter"
 msgstr "ã±â œÃÀÛ, Enter"
 
 #. Tool hint
-#: gtkedit/editcmd.c:1413
+#: gtkedit/editcmd.c:1418
 msgid "Abort this dialog, Esc"
 msgstr "ŽëÈ­»óÀÚ ÃëŒÒ, Esc"
 
 #. Buttons for the confirm replace dialog box.
-#: gtkedit/editcmd.c:1576
+#: gtkedit/editcmd.c:1581
 msgid "Replace"
 msgstr "¹Ù²Þ"
 
-#: gtkedit/editcmd.c:1576
+#: gtkedit/editcmd.c:1581
 msgid "Skip"
 msgstr "°Ç³Ê¶Ü"
 
-#: gtkedit/editcmd.c:1576
+#: gtkedit/editcmd.c:1581
 msgid "Replace all"
 msgstr "žðµÎ ¹Ù²Þ"
 
-#: gtkedit/editcmd.c:1943
+#: gtkedit/editcmd.c:1954
 msgid ""
 " Invalid regular expression, or scanf expression with to many conversions "
 msgstr " ÀÌ»óÇÑ Á€±ÔÇ¥ÇöœÄ È€Àº ³Ê¹« ž¹ÀÌ ¹Ù²ãŸß ÇÏŽÂ scanf Ç¥Çö "
 
 #. "Invalid regexp string or scanf string"
-#: gtkedit/editcmd.c:2107
+#: gtkedit/editcmd.c:2130
 msgid " Error in replacement format string. "
 msgstr " ¹Ù²Ü ÇüœÄ ¹®ÀÚ¿­ ¿¡·¯. "
 
-#: gtkedit/editcmd.c:2135
+#: gtkedit/editcmd.c:2158
 #, c-format
 msgid " %ld replacements made. "
 msgstr " %ld °³°¡ ¹Ù²îŸúœÀŽÏŽÙ. "
 
-#: gtkedit/editcmd.c:2138 gtkedit/editcmd.c:2207
+#: gtkedit/editcmd.c:2161 gtkedit/editcmd.c:2230
 msgid " Search string not found. "
 msgstr " ãŽÂ ¹®ÀÚ¿­ÀÌ ŸøœÀŽÏŽÙ. "
 
 #. Confirm 'Quit' dialog box
-#: gtkedit/editcmd.c:2231 gtkedit/editcmd.c:2246 gtkedit/editcmd.c:2249
+#: gtkedit/editcmd.c:2254 gtkedit/editcmd.c:2269 gtkedit/editcmd.c:2272
 msgid " Quit "
 msgstr " ÁŸ·á "
 
-#: gtkedit/editcmd.c:2232 gtkedit/editcmd.c:2250
+#: gtkedit/editcmd.c:2255 gtkedit/editcmd.c:2273
 msgid ""
 " Current text was modified without a file save. \n"
 " Save with exit? "
@@ -1532,179 +1875,246 @@
 " ÇöÀç ¹®Œ­°¡ ¹Ù²îŸúœÀŽÏŽÙ. \n"
 " ÀúÀåÇÏ°í ÁŸ·áÇÒ±î¿ä? "
 
-#: gtkedit/editcmd.c:2246
+#: gtkedit/editcmd.c:2269
 msgid " File was modified, Save with exit? "
 msgstr " ÆÄÀÏÀÌ ¹Ù²îŸúŽÂ µ¥, ÀúÀåÇÏ°í ÁŸ·áÇÒ±î¿ä? "
 
-#: gtkedit/editcmd.c:2246
+#: gtkedit/editcmd.c:2269
 msgid "Cancel quit"
 msgstr "ÁŸ·á ÃëŒÒ"
 
-#: gtkedit/editcmd.c:2250
+#: gtkedit/editcmd.c:2273
 msgid " &Cancel quit "
 msgstr " ÁŸ·á ÃëŒÒ(&C) "
 
-#: gtkedit/editcmd.c:2250
+#: gtkedit/editcmd.c:2273
 msgid " &Yes "
 msgstr " ¿¹(&Y) "
 
-#: gtkedit/editcmd.c:2250
+#: gtkedit/editcmd.c:2273
 msgid " &No "
 msgstr " ŸÆŽÏ¿À(&N) "
 
-#: gtkedit/editcmd.c:2453 gtkedit/editcmd.c:2528
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2551
 msgid " Copy to clipboard "
 msgstr " Ŭž³ºžµå·Î º¹»çÇϱâ "
 
-#: gtkedit/editcmd.c:2453 gtkedit/editcmd.c:2475 gtkedit/editcmd.c:2528
-#: gtkedit/editcmd.c:2541
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2551
+#: gtkedit/editcmd.c:2564
 msgid " Unable to save to file. "
 msgstr " ÆÄÀÏ ÀúÀå œÇÆÐ. "
 
-#: gtkedit/editcmd.c:2475 gtkedit/editcmd.c:2541
+#: gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2564
 msgid " Cut to clipboard "
 msgstr " Ŭž³ºžµå·Î ¿À·ÁµÎ±â "
 
-#: gtkedit/editcmd.c:2563 gtkedit/editcmd.c:2567 gtkedit/editcmd.c:2572
-#: gtkedit/editcmd.c:2575 src/view.c:1857
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598 src/view.c:1852
 msgid " Goto line "
 msgstr " ÁÙã±â "
 
-#: gtkedit/editcmd.c:2563 gtkedit/editcmd.c:2567 gtkedit/editcmd.c:2572
-#: gtkedit/editcmd.c:2575
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598
 msgid " Enter line: "
 msgstr " ÁÙ ¹øÈ£ ÀÔ·Â: "
 
-#: gtkedit/editcmd.c:2596 gtkedit/editcmd.c:2613
+#: gtkedit/editcmd.c:2619 gtkedit/editcmd.c:2636
 msgid " Save Block "
 msgstr " ±ž¿ª ÀúÀå "
 
-#: gtkedit/editcmd.c:2647
+#: gtkedit/editcmd.c:2670
 msgid " Insert File "
 msgstr " ÆÄÀÏ ³¢¿ö³Ö±â "
 
-#: gtkedit/editcmd.c:2662
+#: gtkedit/editcmd.c:2685
 msgid " Insert file "
 msgstr " ÆÄÀÏ ³¢¿ö³Ö±â "
 
-#: gtkedit/editcmd.c:2662
+#: gtkedit/editcmd.c:2685
 msgid " Error trying to insert file. "
 msgstr " ÆÄÀÏ ³¢¿ö³Ö±â œÇÆÐ "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2682
+#: gtkedit/editcmd.c:2705
 msgid " Sort block "
 msgstr " ±ž¿ª Á€·Ä "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2682 gtkedit/editcmd.c:2736
+#: gtkedit/editcmd.c:2705 gtkedit/editcmd.c:2759
 msgid " You must first highlight a block of text. "
 msgstr " You must first highlight a block of text. "
 
-#: gtkedit/editcmd.c:2689
+#: gtkedit/editcmd.c:2712
 msgid " Run Sort "
 msgstr " Á€·Ä œÃÀÛ "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2691
+#: gtkedit/editcmd.c:2714
 msgid " Enter sort options (see manpage) separated by whitespace: "
 msgstr " °ø¹é¹®ÀÚ·Î ±žºÐµÈ Á€·Ä Œ±ÅÃÇמñ ÀÔ·Â: "
 
-#: gtkedit/editcmd.c:2702 gtkedit/editcmd.c:2708
+#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2731
 msgid " Sort "
 msgstr " Á€·Ä "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2704
+#: gtkedit/editcmd.c:2727
 msgid " Error trying to execute sort command "
 msgstr " Á€·ÄÁß ¿À·ù ¹ß»ý "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2710
+#: gtkedit/editcmd.c:2733
 msgid " Sort returned non-zero: "
 msgstr " Sort returned non-zero: "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2734 gtkedit/editcmd.c:2764
+#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2787
 msgid " Process block "
 msgstr " Process block "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2766
+#: gtkedit/editcmd.c:2789
 msgid " Error trying to stat file "
 msgstr " Error trying to stat file "
 
-#: gtkedit/editcmd.c:2836
+#: gtkedit/editcmd.c:2859
 msgid " Mail "
 msgstr " ÀüÀÚ¿ìÆí "
 
-#: gtkedit/editoptions.c:37
-msgid "None"
+#: gtkedit/editcmd.c:2872
+msgid " Copies to"
 msgstr ""
 
-#: gtkedit/editoptions.c:37
+#: gtkedit/editcmd.c:2876
+msgid " Subject"
+msgstr " ÁŠžñ"
+
+#: gtkedit/editcmd.c:2880
+msgid " To"
+msgstr ""
+
+#: gtkedit/editcmd.c:2882
+msgid " mail -s <subject> -c <cc> <to>"
+msgstr ""
+
+#: gtkedit/editoptions.c:36
+msgid "Intuitive"
+msgstr "Á÷°üÀû"
+
+#: gtkedit/editoptions.c:36
+msgid "Emacs"
+msgstr "À̞Ɯº"
+
+#: gtkedit/editoptions.c:39
+msgid "None"
+msgstr "ŸøÀœ"
+
+#: gtkedit/editoptions.c:39
 msgid "Dynamic paragraphing"
 msgstr ""
 
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
 msgid "Type writer wrap"
 msgstr ""
 
-#. 13
+#. 2
+#: gtkedit/editoptions.c:74
+msgid "Word wrap line length : "
+msgstr ""
+
+#. 4
+#: gtkedit/editoptions.c:80
+msgid "Tab spacing : "
+msgstr "ÅÇ °£°Ý : "
+
+#: gtkedit/editoptions.c:88
+msgid "synta&X highlighting"
+msgstr ""
+
+#. 7
+#: gtkedit/editoptions.c:94
+msgid "confir&M before saving"
+msgstr "ÀúÀå Àü È®ÀÎ(&M)"
+
+#. 8
+#: gtkedit/editoptions.c:97
+msgid "fill tabs with &Spaces"
+msgstr "ÅÇÀ» °ø¹éÀž·Î À¿ò(&S)"
+
+#. 9
 #: gtkedit/editoptions.c:100
+msgid "&Return does autoindent"
+msgstr "ž®ÅÏÅ° ÀԷœà autoindent(&R)"
+
+#. 10
+#: gtkedit/editoptions.c:103
+msgid "&Backspace through tabs"
+msgstr "¹éœºÆäÀÌœº¿¡ ÅÇ°£°Ý »ç¿ë(&B)"
+
+#. 11
+#: gtkedit/editoptions.c:106
+msgid "&Fake half tabs"
+msgstr ""
+
+#. 13
+#: gtkedit/editoptions.c:112
 msgid "Wrap mode"
 msgstr "Wrap žðµå"
 
 #. 15
-#: gtkedit/editoptions.c:106
+#: gtkedit/editoptions.c:118
 msgid "Key emulation"
 msgstr "±ÛŒè ¿¡¹Ä·¹ÀÌŒÇ"
 
+#: gtkedit/editoptions.c:159
+msgid " Editor options "
+msgstr " ÆíÁý±â Œ±ÅÃÇמñ "
+
 #. Not essential to translate
-#: gtkedit/editwidget.c:310
+#: gtkedit/editwidget.c:312
 msgid "Error initialising editor.\n"
 msgstr "Error initialising editor.\n"
 
-#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2284
-#: src/screen.c:2314 src/tree.c:1018 src/view.c:1987
+#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1691 src/screen.c:2297
+#: src/screen.c:2327 src/tree.c:1018 src/view.c:1982
 msgid "Help"
 msgstr "µµ¿òž»"
 
-#: gtkedit/editwidget.c:1065
+#: gtkedit/editwidget.c:1067
 msgid "Mark"
 msgstr "Œ±ÅÃ"
 
-#: gtkedit/editwidget.c:1066
+#: gtkedit/editwidget.c:1068
 msgid "Replac"
 msgstr "¹Ù²Þ"
 
-#: gtkedit/editwidget.c:1069 src/view.c:2000
+#: gtkedit/editwidget.c:1071 src/view.c:1995
 msgid "Search"
 msgstr "ã±â"
 
-#: gtkedit/editwidget.c:1072 src/main.c:1690
+#: gtkedit/editwidget.c:1074 src/main.c:1693
 msgid "PullDn"
 msgstr "Ç®ŽÙ¿î"
 
-#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1691 src/view.c:1989
-#: src/view.c:2009
+#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1694 src/view.c:1984
+#: src/view.c:2004
 msgid "Quit"
 msgstr "ÁŸ·á"
 
-#: gtkedit/editmenu.c:56
+#: gtkedit/editmenu.c:57
 msgid " Word wrap "
 msgstr " Word wrap "
 
 #. Not essential to translate
-#: gtkedit/editmenu.c:58
+#: gtkedit/editmenu.c:59
 msgid " Enter line length, 0 for off: "
 msgstr " ¶óÀÎ ±æÀÌžŠ ÀÔ·Â, 0Àº off: "
 
-#: gtkedit/editmenu.c:69
+#: gtkedit/editmenu.c:70
 msgid " About "
 msgstr " ÀÌ ÇÁ·Î±×·¥Àº "
 
-#: gtkedit/editmenu.c:70
+#: gtkedit/editmenu.c:71
 msgid ""
 "\n"
 "                 Cooledit  v2.1\n"
@@ -1722,325 +2132,341 @@
 "         Midnight CommanderžŠ À§ÇØ °³¹ßµÈ\n"
 "          »ç¿ëÀÚ¿Í Ä£±ÙÇÑ ÅØœºÆ® ÆíÁý±â.\n"
 
-#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134
+#: gtkedit/editmenu.c:119 gtkedit/editmenu.c:135
 msgid "&Open/load...     C-o"
 msgstr "¿­±â/ºÒ·¯¿À±â(&O)...      C-o"
 
-#: gtkedit/editmenu.c:119
+#: gtkedit/editmenu.c:120
 msgid "&New              C-n"
 msgstr "»õ ÆÄÀÏ(&N)               C-n"
 
-#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137
+#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
 msgid "&Save              F2"
 msgstr "ÀúÀå(_S)                   F3"
 
-#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
+#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139
 msgid "save &As...       F12"
 msgstr "ŽÙž¥ ÀÌž§Àž·Î ÀúÀå(&A)... M-d"
 
-#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140
+#: gtkedit/editmenu.c:125 gtkedit/editmenu.c:141
 msgid "&Insert file...   F15"
 msgstr "ÆÄÀÏ ³¢¿ö³Ö±â(&I)...      F15"
 
-#: gtkedit/editmenu.c:125
+#: gtkedit/editmenu.c:126
 msgid "copy to &File...  C-f"
 msgstr "ÆÄÀÏ·Î º¹»ç(&F)...        C-f"
 
-#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143
+#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144
 msgid "a&Bout...            "
 msgstr "ÀÌ ÇÁ·Î±×·¥Àº(&B)...         "
 
-#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145
+#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146
 msgid "&Quit             F10"
 msgstr "ÁŸ·á(&Q)                  F10"
 
-#: gtkedit/editmenu.c:135
+#: gtkedit/editmenu.c:136
 msgid "&New            C-x k"
 msgstr "»õ ÆÄÀÏ(&N)             C-x l"
 
-#: gtkedit/editmenu.c:141
+#: gtkedit/editmenu.c:142
 msgid "copy to &File...     "
 msgstr "ÆÄÀÏ·Î º¹»ç(&F)...           "
 
-#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167
+#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
 msgid "&Toggle Mark       F3"
 msgstr "ž¶Å© Åä±Û(&T)              F3"
 
-#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
+#: gtkedit/editmenu.c:152 gtkedit/editmenu.c:169
 msgid "&Mark Columns    S-F3"
 msgstr "Ä÷³ ž¶Å©(&M)            S-F3"
 
-#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170
+#: gtkedit/editmenu.c:154 gtkedit/editmenu.c:171
 msgid "toggle &Ins/overw Ins"
 msgstr "»ðÀÔ/°ãħ Åä±Û(&I)        Ins"
 
-#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172
+#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
 msgid "&Copy              F5"
 msgstr "º¹»ç(&C)                   F5"
 
-#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
+#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
 msgid "&Move              F6"
 msgstr "À̵¿(&M)                   F6"
 
-#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
+#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175
 msgid "&Delete            F8"
 msgstr "Áö¿ì±â(&D)                 F8"
 
-#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176
+#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177
 msgid "&Undo             C-u"
 msgstr "ÃëŒÒ(&U)                  C-u"
 
-#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178
+#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
 msgid "&Beginning     C-PgUp"
 msgstr "ÆÄÀÏ Ã³Àœ(&B)          C-PgUp"
 
-#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
+#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180
 msgid "&End           C-PgDn"
 msgstr "ÆÄÀÏ ³¡(&E)            C-PgDn"
 
-#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191
+#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
 msgid "&Search...         F7"
 msgstr "ã±â(&S)...                F7"
 
-#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
+#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
 msgid "search &Again     F17"
 msgstr "ŽÙœÃ ã±â(&A)             F17"
 
-#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
+#: gtkedit/editmenu.c:187 gtkedit/editmenu.c:194
 msgid "&Replace...        F4"
 msgstr "¹Ù²Ù±â(&R)...              F4"
 
-#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220
+#: gtkedit/editmenu.c:199 gtkedit/editmenu.c:221
 msgid "&Goto line...            M-l"
 msgstr "¶óÀΠãŸÆ°¡±â(&G)...      M-l"
 
-#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222
+#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:223
 msgid "insert &Literal...       C-q"
 msgstr "Literal ÀÔ·Â(&L)          C-q"
 
-#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224
+#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225
 msgid "&Refresh screen          C-l"
 msgstr "È­žé °»œÅ(&R)             C-l"
 
-#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226
+#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
 msgid "&Start record macro      C-r"
 msgstr "žÅÅ©·Î ÀúÀå œÃÀÛ(&S)      C-r"
 
-#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
+#: gtkedit/editmenu.c:206 gtkedit/editmenu.c:228
 msgid "&Finish record macro...  C-r"
 msgstr "žÅÅ©·Î ÀúÀå ³¡(&F)        C-r"
 
-#: gtkedit/editmenu.c:206
+#: gtkedit/editmenu.c:207
 msgid "&Execute macro...   C-a, KEY"
 msgstr "žÅÅ©·Î œÇÇà(&E)...   C-a, KEY"
 
-#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229
+#: gtkedit/editmenu.c:208 gtkedit/editmenu.c:230
 msgid "delete macr&O...            "
 msgstr "žÅÅ©·Î »èÁŠ(&O)...           "
 
-#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231
+#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232
 msgid "insert &Date/time           "
 msgstr "³¯Â¥/œÃ°£ »ðÀÔ(&D)           "
 
-#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233
+#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234
 msgid "format p&Aragraph        M-p"
 msgstr "format p&Aragraph         M-p"
 
-#: gtkedit/editmenu.c:212
+#: gtkedit/editmenu.c:213
 msgid "'ispell' s&Pell check    C-p"
 msgstr "'ispell' öÀÚ °Ë»ç(&P)    C-p"
 
-#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235
+#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
 msgid "sor&T...                 M-t"
 msgstr "Á€·Ä(&T)                  M-t"
 
-#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
+#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:237
 msgid "'indent' &C Formatter    F19"
 msgstr "'indent' &C Formatter     F19"
 
-#: gtkedit/editmenu.c:215
+#: gtkedit/editmenu.c:216
 msgid "&Mail...                    "
 msgstr "ÀüÀÚ¿ìÆí(&M)...              "
 
-#: gtkedit/editmenu.c:228
+#: gtkedit/editmenu.c:229
 msgid "&Execute macro... C-x e, KEY"
 msgstr "žÅÅ©·Î œÇÇà(&E)... C-x e, KEY"
 
-#: gtkedit/editmenu.c:234
+#: gtkedit/editmenu.c:235
 msgid "'ispell' s&Pell check    M-$"
 msgstr "'ispell' öÀÚ °Ë»ç(&P)    M-$"
 
-#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252
+#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
 msgid "&General...  "
 msgstr "ÀϹÝ(&G)...  "
 
-#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
+#: gtkedit/editmenu.c:245 gtkedit/editmenu.c:254
 msgid "&Save mode..."
 msgstr "žðµå ÀúÀå(&S)..."
 
-#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1322
+#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1325
 msgid "&Layout..."
 msgstr "¹èÄ¡(&L)..."
 
 #. 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
+#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:392
 #: src/chmod.c:164 src/chown.c:130
 msgid " File "
 msgstr " ÆÄÀÏ "
 
-#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407
+#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 gtkedit/editmenu.c:408
 msgid " Edit "
 msgstr " ÆíÁý "
 
-#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276
+#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277
 msgid " Sear/Repl "
 msgstr " ã±â/¹Ù²Þ "
 
-#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442
+#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 gtkedit/editmenu.c:448
 msgid " Command "
 msgstr " ží·É "
 
-#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278
+#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279
 msgid " Options "
 msgstr " Œ±ÅÃÇמñ "
 
-#: gtkedit/editmenu.c:392
+#: gtkedit/editmenu.c:393
 msgid "Open...\tC-o"
 msgstr "¿­±â...\tC-o"
 
-#: gtkedit/editmenu.c:393
+#: gtkedit/editmenu.c:394
 msgid "New\tC-n"
 msgstr "»õ ±Û\tC-n"
 
-#: gtkedit/editmenu.c:395
+#: gtkedit/editmenu.c:396
 msgid "Save\tF2"
 msgstr "ÀúÀå\tF2"
 
-#: gtkedit/editmenu.c:396
+#: gtkedit/editmenu.c:397
 msgid "Save as...\tF12"
 msgstr "»õÀÌž§Àž·Î ÀúÀå\tF12"
 
-#: gtkedit/editmenu.c:398
+#: gtkedit/editmenu.c:399
 msgid "Insert file...\tF15"
 msgstr "ÆÄÀÏ ³¢¿ö³Ö±â...\tF15"
 
-#: gtkedit/editmenu.c:399
+#: gtkedit/editmenu.c:400
 msgid "Copy to file...\tC-f"
 msgstr "ÆÄÀÏ·Î º¹»ç...\tC-f"
 
 #. Tool hint
-#: gtkedit/editmenu.c:402
+#: gtkedit/editmenu.c:403
 msgid "Disk operations"
 msgstr "µðœºÅ© Á¶ÀÛ"
 
-#: gtkedit/editmenu.c:408
+#: gtkedit/editmenu.c:409
 msgid "Toggle mark\tF3"
 msgstr "ž¶Å© Åä±Û\tF3"
 
-#: gtkedit/editmenu.c:409
+#: gtkedit/editmenu.c:410
 msgid "Toggle mark columns\tC-b"
 msgstr "Ä÷³ ž¶Å© Åä±Û\tC-b"
 
-#: gtkedit/editmenu.c:411
+#: gtkedit/editmenu.c:412
+msgid "Toggle book mark\tC-M-Ins"
+msgstr "Ã¥°¥ÇÇ Åä±Û\tC-M-Ins"
+
+#: gtkedit/editmenu.c:413
+msgid "Previous book mark\tC-M-Up"
+msgstr "ÀÌÀü Ã¥°¥ÇÇ\tC-M-Up"
+
+#: gtkedit/editmenu.c:414
+msgid "Next book mark\tC-M-Down"
+msgstr "ŽÙÀœ Ã¥°¥ÇÇ\tC-M-Down"
+
+#: gtkedit/editmenu.c:415
+msgid "Flush book marks"
+msgstr "žðµç Ã¥°¥ÇÇ »èÁŠ"
+
+#: gtkedit/editmenu.c:417
 msgid "Toggle insert/overwrite\tIns"
 msgstr "»ðÀÔ/°ãħ Åä±Û\tIns"
 
-#: gtkedit/editmenu.c:413
+#: gtkedit/editmenu.c:419
 msgid "Copy block to cursor\tF5"
 msgstr "ºí·°À» Ä¿Œ­À§Ä¡·Î º¹»ç\tF5"
 
-#: gtkedit/editmenu.c:414
+#: gtkedit/editmenu.c:420
 msgid "Move block to cursor\tF6"
 msgstr "ºí·°À» Ä¿Œ­À§Ä¡·Î À̵¿\tF6"
 
-#: gtkedit/editmenu.c:415
+#: gtkedit/editmenu.c:421
 msgid "Delete block\tF8/C-Del"
 msgstr "ºí·° »èÁŠ\tF8/C-Del"
 
-#: gtkedit/editmenu.c:417
+#: gtkedit/editmenu.c:423
 msgid "Copy block to clipbrd\tC-Ins"
 msgstr "ºí·°À» Ŭž³ºžµå·Î º¹»ç\tC-Ins"
 
-#: gtkedit/editmenu.c:418
+#: gtkedit/editmenu.c:424
 msgid "Cut block to clipbrd\tS-Del"
 msgstr "ºí·°À» Ŭž³ºžµå·Î ¿À·ÁµÎ±â\tS-Del"
 
-#: gtkedit/editmenu.c:419
+#: gtkedit/editmenu.c:425
 msgid "Paste block from clipbrd\tS-Ins"
 msgstr "Ŭž³ºžµå¿¡Œ­ ºí·° ºÙÀ̱â\tS-Ins"
 
-#: gtkedit/editmenu.c:420
+#: gtkedit/editmenu.c:426
 msgid "Selection history\tM-Ins"
 msgstr "Œ±Åà È÷œºÅäž®\tM-Ins"
 
-#: gtkedit/editmenu.c:422
+#: gtkedit/editmenu.c:428
 msgid "Undo\tC-BackSpace"
 msgstr "ÃëŒÒ\tC-BackSpace"
 
 #. Tool hint
-#: gtkedit/editmenu.c:425
+#: gtkedit/editmenu.c:431
 msgid "Manipulating blocks of text"
 msgstr "ÅØœºÆ® ºí·° Á¶ÀÛ"
 
-#: gtkedit/editmenu.c:430
+#: gtkedit/editmenu.c:436
 msgid " Srch/Replce "
 msgstr " ã±â/¹Ù²Þ "
 
-#: gtkedit/editmenu.c:431
+#: gtkedit/editmenu.c:437
 msgid "Search...\tF7"
 msgstr "ã±â...\tF7"
 
-#: gtkedit/editmenu.c:432
+#: gtkedit/editmenu.c:438
 msgid "Search again\tF17"
 msgstr "ŽÙœÃ ã±â\tF17"
 
-#: gtkedit/editmenu.c:433
+#: gtkedit/editmenu.c:439
 msgid "Replace...\tF4"
 msgstr "¹Ù²Þ...\tF4"
 
-#: gtkedit/editmenu.c:434
+#: gtkedit/editmenu.c:440
 msgid "Replace again\tF14"
 msgstr "žðµÎ ¹Ù²Þ\tF14"
 
 #. Tool hint
-#: gtkedit/editmenu.c:437
+#: gtkedit/editmenu.c:443
 msgid "Search for and replace text"
 msgstr "ãŸÆŒ­ ¹Ù²Ü ¹®ÀÚ¿­"
 
-#: gtkedit/editmenu.c:443
+#: gtkedit/editmenu.c:449
 msgid "Goto line...\tM-l"
 msgstr "¶óÀΠãŸÆ°¡±â...\tM-l"
 
-#: gtkedit/editmenu.c:445
+#: gtkedit/editmenu.c:451
 msgid "Start record macro\tC-r"
 msgstr "žÅÅ©·Î ÀúÀå œÃÀÛ\tC-r"
 
-#: gtkedit/editmenu.c:446
+#: gtkedit/editmenu.c:452
 msgid "Finish record macro...\tC-r"
 msgstr "žÅÅ©·Î ÀúÀå ³¡...\tC-r"
 
-#: gtkedit/editmenu.c:447
+#: gtkedit/editmenu.c:453
 msgid "Execute macro...\tC-a, KEY"
 msgstr "žÅÅ©·Î œÇÇà...\tC-a, KEY"
 
-#: gtkedit/editmenu.c:448
+#: gtkedit/editmenu.c:454
 msgid "Delete macro...\t"
 msgstr "žÅÅ©·Î »èÁŠ...\t"
 
-#: gtkedit/editmenu.c:450
+#: gtkedit/editmenu.c:456
 msgid "Insert date/time\tC-d"
 msgstr "³¯Â¥/œÃ°£ »ðÀÔ\tC-d"
 
-#: gtkedit/editmenu.c:451
+#: gtkedit/editmenu.c:457
 msgid "Format paragraph\tM-p"
 msgstr "Format paragraph\tM-p"
 
-#: gtkedit/editmenu.c:453
+#: gtkedit/editmenu.c:459
 msgid "Refresh display\tC-l"
 msgstr "È­žé °»œÅ\tC-l"
 
 #. Tool hint
-#: gtkedit/editmenu.c:456
+#: gtkedit/editmenu.c:462
 msgid "Macros and internal commands"
 msgstr "žÅÅ©·Î¿Í ³»Àå ží·É"
 
@@ -2086,18 +2512,18 @@
 msgid "Search/Replace"
 msgstr "ã±â/¹Ù²Þ"
 
-#: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
+#: gtkedit/syntax.c:1339 gtkedit/syntax.c:1346
 msgid " Load syntax file "
 msgstr " ±ž¹® ÆÄÀÏ ÀПî¿À±â "
 
-#: gtkedit/syntax.c:3180
+#: gtkedit/syntax.c:1339
 msgid " File access error "
 msgstr " ÆÄÀÏ Ÿ×ŒŒœº ¿¡·¯ "
 
-#: gtkedit/syntax.c:3186
+#: gtkedit/syntax.c:1345
 #, c-format
-msgid " Syntax error in file %s on line %d "
-msgstr " ÆÄÀÏ %sÀÇ %d ¶óÀο¡ ±ž¹® ¿¡·¯ "
+msgid " Error in file %s on line %d "
+msgstr " ÆÄÀÏ %sÀÇ %d ¶óÀο¡ ¿¡·¯ "
 
 #: src/achown.c:72 src/chmod.c:115 src/chown.c:80
 msgid "&Set"
@@ -2131,10 +2557,6 @@
 msgid "Flag"
 msgstr "Flag"
 
-#: src/achown.c:378
-msgid "Mode"
-msgstr "Mode"
-
 #: src/achown.c:383
 #, c-format
 msgid "%6d of %d"
@@ -2177,27 +2599,27 @@
 msgid " I can't run the Advanced Chown command on a tarfs "
 msgstr " tarfs¿¡Œ­ŽÂ °í±Þ chown ží·ÉÀ» œÇÇàÇÒ Œö ŸøœÀŽÏŽÙ "
 
-#: src/background.c:178
+#: src/background.c:181
 msgid "Background process:"
 msgstr "Background ÇÁ·ÎŒŒœº:"
 
-#: src/background.c:284 src/file.c:2135
+#: src/background.c:287 src/file.c:2173
 msgid " Background process error "
 msgstr " Background ÇÁ·ÎŒŒœº ¿¡·¯ "
 
-#: src/background.c:291
+#: src/background.c:294
 msgid " Child died unexpectedly "
 msgstr " ¿¹±âÄ¡ ŸÊÀº ÀÚœÄ(child) ÇÁ·ÎŒŒœºÀÇ Á×Àœ "
 
-#: src/background.c:293
+#: src/background.c:296
 msgid " Unknown error in child "
 msgstr " ÀÚœÄ(child) ÇÁ·ÎŒŒœº¿¡Œ­ žðž£ŽÂ ¿À·ù ¹ß»ý "
 
-#: src/background.c:308
+#: src/background.c:311
 msgid " Background protocol error "
 msgstr " Background ÇÁ·ÎÅäÄÝ ¿¡·¯ "
 
-#: src/background.c:309
+#: src/background.c:312
 msgid ""
 " Background process sent us a request for more arguments \n"
 " than we can handle. \n"
@@ -2326,35 +2748,27 @@
 msgid "Symbolic link"
 msgstr "œÉºŒž¯žµÅ©"
 
-#: src/boxes.c:801
-msgid "Symbolic link filename:"
-msgstr "œÉºŒž¯žµÅ© ÆÄÀÏží:"
-
-#: src/boxes.c:803
-msgid "Existing filename (filename symlink will point to):"
-msgstr "Žë»ó ÆÄÀÏží (œÉºŒž¯žµÅ© ÆÄÀÏÀÌ °¡ž®Å³ ÆÄÀÏ):"
-
-#: src/boxes.c:832
+#: src/boxes.c:833
 msgid "Running "
 msgstr "œÇÇàÁß "
 
-#: src/boxes.c:833 src/find.c:716 src/find.c:957
+#: src/boxes.c:834 src/find.c:716 src/find.c:957
 msgid "Stopped"
 msgstr "žØÃã"
 
-#: src/boxes.c:894
+#: src/boxes.c:895
 msgid "&Stop"
 msgstr "žØÃã(&S)"
 
-#: src/boxes.c:895
+#: src/boxes.c:896
 msgid "&Resume"
 msgstr "°èŒÓ(&R)"
 
-#: src/boxes.c:896
+#: src/boxes.c:897
 msgid "&Kill"
 msgstr "Á×ÀÓ(&K)"
 
-#: src/boxes.c:935
+#: src/boxes.c:936
 msgid "Background Jobs"
 msgstr "Background Jobs"
 
@@ -2661,7 +3075,7 @@
 msgid " Link "
 msgstr " žµÅ© "
 
-#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1639
+#: src/cmd.c:1032 src/cmd.c:1171 src/file.c:1685
 msgid " to:"
 msgstr " Žë»ó:"
 
@@ -2675,74 +3089,76 @@
 msgid " symlink: %s "
 msgstr " œÉºŒž¯žµÅ©: %s "
 
-#: src/cmd.c:1102
-msgid " Symlink "
-msgstr " œÉºŒž¯žµÅ© "
-
-#: src/cmd.c:1102
-msgid " points to:"
-msgstr " °¡ °¡ž®Å³ ÆÄÀÏ:"
+#: src/cmd.c:1130
+#, c-format
+msgid " Symlink `%s' points to: "
+msgstr ""
 
-#: src/cmd.c:1107
+#: src/cmd.c:1135
 msgid " Edit symlink "
 msgstr " œÉºŒž¯žµÅ© ŒöÁ€ "
 
-#: src/cmd.c:1113
+#: src/cmd.c:1140
+#, c-format
+msgid " edit symlink, unable to remove %s: %s "
+msgstr " œÉºŒž¯žµÅ© ÆíÁý, %s »èÁŠ ºÒ°¡: %s "
+
+#: src/cmd.c:1144
 #, c-format
 msgid " edit symlink: %s "
 msgstr " œÉºŒž¯žµÅ© ŒöÁ€: %s "
 
-#: src/cmd.c:1137
+#: src/cmd.c:1171
 msgid " Link symbolically "
 msgstr " Link symbolically "
 
-#: src/cmd.c:1138
+#: src/cmd.c:1172
 msgid " Relative symlink "
 msgstr " Relative symlink "
 
-#: src/cmd.c:1149
+#: src/cmd.c:1183
 #, c-format
 msgid " relative symlink: %s "
 msgstr " relative symlink: %s "
 
-#: src/cmd.c:1252
+#: src/cmd.c:1286
 msgid " Enter machine name (F1 for details): "
 msgstr " È£œºÆ® ÀÌž§ ÀÔ·Â (µµ¿òž» F1): "
 
-#: src/cmd.c:1276
+#: src/cmd.c:1310
 #, c-format
 msgid " Could not chdir to %s "
 msgstr " %s·Î ÀÚ·á¹æÀ» ¹Ù²Ü Œö ŸøÀœ "
 
-#: src/cmd.c:1283
+#: src/cmd.c:1317
 msgid " Link to a remote machine "
 msgstr " ¿ø°Ý È£œºÆ®¿¡ ¿¬°á "
 
-#: src/cmd.c:1289
+#: src/cmd.c:1323
 msgid " FTP to machine "
 msgstr " FTP ¿¬°á "
 
-#: src/cmd.c:1299
+#: src/cmd.c:1333
 msgid " Socket source routing setup "
 msgstr " ŒÒÄÏ ŒÒœº ¶ó¿ìÆà Œ³Á€ "
 
-#: src/cmd.c:1300
+#: src/cmd.c:1334
 msgid " Enter host name to use as a source routing hop: "
 msgstr " ¿øõ ¶ó¿ìÆà ȩÀ» »ç¿ëÇϱâ À§ÇÑ È£œºÆ® ÀÌž§: "
 
-#: src/cmd.c:1307
+#: src/cmd.c:1341
 msgid " Host name "
 msgstr " È£œºÆ® ÀÌž§ "
 
-#: src/cmd.c:1307
+#: src/cmd.c:1341
 msgid " Error while looking up IP address "
 msgstr " IP ÁÖŒÒ Ã£ŽÂ Áß ¿À·ù ¹ß»ý "
 
-#: src/cmd.c:1318
+#: src/cmd.c:1352
 msgid " Undelete files on an ext2 file system "
 msgstr " ext2 ÆÄÀÏÃŒ°è¿¡Œ­ ÆÄÀÏ µÇ»ìž² "
 
-#: src/cmd.c:1319
+#: src/cmd.c:1353
 msgid ""
 " Enter device (without /dev/) to undelete\n"
 "   files on: (F1 for details)"
@@ -2750,11 +3166,11 @@
 " ÆÄÀÏÀ» º¹±žÇϱâ À§ÇØ '/dev/'žŠ »ý·«ÇÑ µð¹ÙÀÌœºží\n"
 "   ÀÔ·Â: (ÀÚŒŒÈ÷ ŸË±â ¿øÇÏžé F1)"
 
-#: src/cmd.c:1369
+#: src/cmd.c:1403
 msgid " Setup saved to ~/"
 msgstr " Setup saved to ~/"
 
-#: src/cmd.c:1374
+#: src/cmd.c:1408
 msgid " Setup "
 msgstr " ȯ°æŒ³Á€ "
 
@@ -2956,7 +3372,7 @@
 " œÉºŒž¯žµÅ© \"%s\"žŠ »ýŒºÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:510
+#: src/file.c:509
 #, c-format
 msgid ""
 " Cannot overwrite directory \"%s\" \n"
@@ -2965,7 +3381,7 @@
 " \"%s\" ÀÚ·á¹æžŠ µ€ŸîŸµ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:519
+#: src/file.c:518
 #, c-format
 msgid ""
 " Cannot stat source file \"%s\" \n"
@@ -2974,12 +3390,12 @@
 " \"%s\" ÆÄÀÏ Á€ºžžŠ ŸòÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:532
+#: src/file.c:531
 #, c-format
 msgid " `%s' and `%s' are the same file. "
 msgstr " `%s'¿Í `%s'°¡ °°Àº ÆÄÀÏÀÔŽÏŽÙ. "
 
-#: src/file.c:565
+#: src/file.c:574
 #, c-format
 msgid ""
 " Cannot create special file \"%s\" \n"
@@ -2988,7 +3404,7 @@
 " ƯŒö(special) ÆÄÀÏ \"%s\"À» »ýŒºÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:574 src/file.c:799
+#: src/file.c:583 src/file.c:812
 #, c-format
 msgid ""
 " Cannot chown target file \"%s\" \n"
@@ -2997,7 +3413,7 @@
 " \"%s\" ÆÄÀÏÀÇ ŒÒÀ¯ÀÚžŠ ¹Ù²Ü Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:583 src/file.c:817
+#: src/file.c:592 src/file.c:831
 #, c-format
 msgid ""
 " Cannot chmod target file \"%s\" \n"
@@ -3006,7 +3422,7 @@
 " Žë»óÆÄÀÏ \"%s\"ÀÇ žðµåžŠ ¹Ù²Ü Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:596
+#: src/file.c:609
 #, c-format
 msgid ""
 " Cannot open source file \"%s\" \n"
@@ -3015,11 +3431,11 @@
 " \"%s\" ÆÄÀÏÀ» ¿­ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:606
+#: src/file.c:619
 msgid " Reget failed, about to overwrite file "
 msgstr " ÀÌŸî¹Þ±â œÇÆÐ, ÆÄÀÏÀ» µ€ŸîŸµ ¿¹Á€ÀÓ "
 
-#: src/file.c:612
+#: src/file.c:625
 #, c-format
 msgid ""
 " Cannot fstat source file \"%s\" \n"
@@ -3028,7 +3444,7 @@
 " ŒÒœºÆÄÀÏ \"%s\"ÀÇ ÆÄÀÏÁ€ºžžŠ ŸòÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:638
+#: src/file.c:651
 #, c-format
 msgid ""
 " Cannot create target file \"%s\" \n"
@@ -3037,7 +3453,7 @@
 " \"%s\" ÆÄÀÏÀ» »ýŒºÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:652
+#: src/file.c:665
 #, c-format
 msgid ""
 " Cannot fstat target file \"%s\" \n"
@@ -3046,7 +3462,7 @@
 " Žë»óÆÄÀÏ \"%s\"ÀÇ ÆÄÀÏÁ€ºžžŠ ŸòÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:683
+#: src/file.c:696
 #, c-format
 msgid ""
 " Cannot read source file \"%s\" \n"
@@ -3055,7 +3471,7 @@
 " ¹ÙÅÁÆÄÀÏ \"%s\"À» ÀÐÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:713
+#: src/file.c:726
 #, c-format
 msgid ""
 " Cannot write target file \"%s\" \n"
@@ -3064,11 +3480,11 @@
 " Žë»óÆÄÀÏ \"%s\"¿¡ Ÿµ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:732
+#: src/file.c:745
 msgid "(stalled)"
 msgstr "(stalled)"
 
-#: src/file.c:770
+#: src/file.c:783
 #, c-format
 msgid ""
 " Cannot close source file \"%s\" \n"
@@ -3077,7 +3493,7 @@
 " ¹ÙÅÁÆÄÀÏ \"%s\"À» ŽÝÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:779
+#: src/file.c:792
 #, c-format
 msgid ""
 " Cannot close target file \"%s\" \n"
@@ -3086,19 +3502,19 @@
 " Žë»óÆÄÀÏ \"%s\"žŠ ŽÝÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:789
+#: src/file.c:802
 msgid "Incomplete file was retrieved. Keep it?"
 msgstr "¿ÏÀüÇÏÁö ŸÊÀº ÆÄÀÏÀÌ ¹ÞŸÆÁ³œÀŽÏŽÙ. ºžÁžÇÒ±î¿ä?"
 
-#: src/file.c:790
+#: src/file.c:803
 msgid "&Delete"
 msgstr "Áö¿ì±â(&D)"
 
-#: src/file.c:790 src/hotlist.c:1443
+#: src/file.c:803 src/hotlist.c:1443
 msgid "&Keep"
 msgstr "ºžÁž(&K)"
 
-#: src/file.c:862
+#: src/file.c:876
 #, c-format
 msgid ""
 " Cannot stat source directory \"%s\" \n"
@@ -3107,7 +3523,7 @@
 " ¿øº» ÀÚ·á¹æ \"%s\"ÀÇ Á€ºžžŠ ŸòÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:885
+#: src/file.c:899
 #, c-format
 msgid ""
 " Source directory \"%s\" is not a directory \n"
@@ -3117,7 +3533,7 @@
 " %s "
 
 #. we found a cyclic symbolic link
-#: src/file.c:893
+#: src/file.c:907
 #, c-format
 msgid ""
 " Cannot copy cyclic symbolic link \n"
@@ -3126,7 +3542,7 @@
 " Cyclic œÉºŒž¯žµÅ©ŽÂ º¹»çÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " `%s' "
 
-#: src/file.c:946
+#: src/file.c:964
 #, c-format
 msgid ""
 " Cannot create target directory \"%s\" \n"
@@ -3135,7 +3551,7 @@
 " Žë»ó ÀÚ·á¹æ \"%s\"žŠ »ýŒºÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:964
+#: src/file.c:987
 #, c-format
 msgid ""
 " Cannot chown target directory \"%s\" \n"
@@ -3145,7 +3561,7 @@
 " %s "
 
 #. Source doesn't exist
-#: src/file.c:1074
+#: src/file.c:1100
 #, c-format
 msgid ""
 " Cannot stat file \"%s\" \n"
@@ -3154,17 +3570,17 @@
 " \"%s\" ÆÄÀÏÀÇ Á€ºžžŠ ŸòÀ» Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:1096
+#: src/file.c:1122
 #, c-format
 msgid " `%s' and `%s' are the same file "
 msgstr " `%s'¿Í `%s'ŽÂ °°Àº ÆÄÀÏÀÔŽÏŽÙ "
 
-#: src/file.c:1103
+#: src/file.c:1129
 #, c-format
 msgid " Cannot overwrite directory `%s' "
 msgstr " `%s' ÀÚ·á¹æÀ» µ€ŸîŸµ Œö ŸøœÀŽÏŽÙ "
 
-#: src/file.c:1140
+#: src/file.c:1172
 #, c-format
 msgid ""
 " Cannot move file \"%s\" to \"%s\" \n"
@@ -3173,7 +3589,7 @@
 " \"%s\" ÆÄÀÏÀ» \"%s\"·Î À̵¿ÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:1160
+#: src/file.c:1192
 #, c-format
 msgid ""
 " Cannot remove file \"%s\" \n"
@@ -3182,17 +3598,17 @@
 " \"%s\" ÆÄÀÏÀ» Áö¿ï Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:1213
+#: src/file.c:1246
 #, c-format
 msgid " Cannot overwrite directory \"%s\" %s "
 msgstr " \"%s\" ÀÚ·á¹æÀ» µ€ŸîŸµ Œö ŸøœÀŽÏŽÙ. %s "
 
-#: src/file.c:1215
+#: src/file.c:1248
 #, c-format
 msgid " Cannot overwrite file \"%s\" %s "
 msgstr " \"%s\" ÆÄÀÏÀ» °ãÃÄŸµ Œö ŸøœÀŽÏŽÙ. %s "
 
-#: src/file.c:1238
+#: src/file.c:1275
 #, c-format
 msgid ""
 " Cannot move directory \"%s\" to \"%s\" \n"
@@ -3201,7 +3617,7 @@
 " \"%s\" ÀÚ·á¹æÀ» \"%s\"·Î À̵¿ÇÒ Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:1301
+#: src/file.c:1338
 #, c-format
 msgid ""
 " Cannot delete file \"%s\" \n"
@@ -3210,7 +3626,7 @@
 " \"%s\" ÆÄÀÏÀ» Áö¿ï Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:1362 src/file.c:1429 src/file.c:1458
+#: src/file.c:1399 src/file.c:1469 src/file.c:1501
 #, c-format
 msgid ""
 " Cannot remove directory \"%s\" \n"
@@ -3219,7 +3635,7 @@
 " \"%s\" ÀÚ·á¹æÀ» Áö¿ï Œö ŸøœÀŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:1494
+#: src/file.c:1540
 msgid " Internal error: get_file \n"
 msgstr " ³»ºÎ ¿À·ù: get_file \n"
 
@@ -3232,87 +3648,87 @@
 #. * (I don't use spaces around the words, because someday they could be
 #. * dropped, when widgets get smarter)
 #.
-#: src/file.c:1615
+#: src/file.c:1661
 msgid "1Copy"
 msgstr "1Copy"
 
-#: src/file.c:1615
+#: src/file.c:1661
 msgid "1Move"
 msgstr "1Move"
 
-#: src/file.c:1615
+#: src/file.c:1661
 msgid "1Delete"
 msgstr "1Delete"
 
-#: src/file.c:1630
+#: src/file.c:1676
 #, c-format
 msgid "%o %f \"%s\"%m"
 msgstr "%o %f \"%s\"%m"
 
-#: src/file.c:1631
+#: src/file.c:1677
 #, c-format
 msgid "%o %d %f%m"
 msgstr "%o %d %f%m"
 
-#: src/file.c:1633
+#: src/file.c:1679
 #, c-format
 msgid "%o %f \"%s\"%e"
 msgstr "%o %f \"%s\"%e"
 
-#: src/file.c:1634
+#: src/file.c:1680
 #, c-format
 msgid "%o %d %f%e"
 msgstr "%o %d %f%e"
 
-#: src/file.c:1638
+#: src/file.c:1684
 msgid "file"
 msgstr "file"
 
-#: src/file.c:1638
+#: src/file.c:1684
 msgid "files"
 msgstr "files"
 
-#: src/file.c:1638
+#: src/file.c:1684
 msgid "directory"
 msgstr "directory"
 
-#: src/file.c:1638
+#: src/file.c:1684
 msgid "directories"
 msgstr "directories"
 
-#: src/file.c:1639
+#: src/file.c:1685
 msgid "files/directories"
 msgstr "files/directories"
 
-#: src/file.c:1639
+#: src/file.c:1685
 msgid " with source mask:"
 msgstr " with source mask:"
 
-#: src/file.c:1791
+#: src/file.c:1837
 msgid " Can't operate on \"..\"! "
 msgstr " \"..\"¿¡ ŽëÇØŒ­ŽÂ ÀÛŸ÷ÇÒ Œö ŸøœÀŽÏŽÙ! "
 
-#: src/file.c:1810
+#: src/file.c:1856
 msgid "Yes"
 msgstr "¿¹"
 
-#: src/file.c:1810
+#: src/file.c:1856
 msgid "No"
 msgstr "ŸÆŽÏ¿À"
 
-#: src/file.c:1863
+#: src/file.c:1909
 msgid " Sorry, I could not put the job in background "
 msgstr " ¹ÌŸÈ, ¹é±×¶ó¿îµå·Î ÀÏÀ» ŒöÇàÇÒ Œö Ÿø³×¿ä "
 
-#: src/file.c:1946 src/file.c:2051
+#: src/file.c:1997 src/file.c:2081
 msgid " Internal failure "
 msgstr " ³»ºÎ ¿À·ù "
 
-#: src/file.c:1946 src/file.c:2051
+#: src/file.c:1997 src/file.c:2081
 msgid " Unknown file operation "
 msgstr " ŸË·ÁÁöÁö ŸÊÀº ÆÄÀÏ Á¶ÀÛ "
 
-#: src/file.c:1965
+#: src/file.c:2012
 #, c-format
 msgid ""
 " Destination \"%s\" must be a directory \n"
@@ -3321,19 +3737,15 @@
 " Žë»ó \"%s\"ŽÂ ÀÚ·á¹æÀÌŸîŸß ÇÕŽÏŽÙ \n"
 " %s "
 
-#: src/file.c:2136 src/filegui.c:263
-msgid "&Skip"
-msgstr "°Ç³Ê¶Ü(&S)"
-
-#: src/file.c:2136
+#: src/file.c:2174
 msgid "&Retry"
 msgstr "ÀçœÃµµ(&R)"
 
-#: src/file.c:2136 src/file.c:2197 src/filegui.c:260 src/filegui.c:562
+#: src/file.c:2174 src/file.c:2235 src/filegui.c:263 src/filegui.c:591
 msgid "&Abort"
 msgstr "ÁߎÜ(&A)"
 
-#: src/file.c:2188
+#: src/file.c:2226
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -3343,7 +3755,7 @@
 "   ºó ÀÚ·á¹æÀÌ ŸÆŽÑµ¥¿ä.  \n"
 "   ±×·¡µµ Áö¿ï±î¿ä? "
 
-#: src/file.c:2189
+#: src/file.c:2227
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
@@ -3353,138 +3765,134 @@
 "   ¹é±×¶ó¿îµå ÇÁ·ÎŒŒœº: ÀÚ·á¹æÀÌ ºñÁö ŸÊŸÒÀœ \n"
 "   ±×·¡µµ Áö¿ï±î¿ä? "
 
-#: src/file.c:2196
+#: src/file.c:2234
 msgid "a&ll"
 msgstr "žðµÎ(&l)"
 
-#: src/file.c:2196 src/filegui.c:565
+#: src/file.c:2234 src/filegui.c:594
 msgid "non&E"
 msgstr "non&E"
 
-#: src/file.c:2206
+#: src/file.c:2244
 msgid " Type 'yes' if you REALLY want to delete "
 msgstr " Á€ž»·Î Áö¿ì±âžŠ ¿øÇϜÞé 'yes'žŠ ÀÔ·ÂÇϜʜÿÀ "
 
-#: src/file.c:2208
+#: src/file.c:2246
 msgid "all the directories "
 msgstr "žðµç ÀÚ·á¹æ "
 
-#: src/file.c:2210
+#: src/file.c:2248
 msgid " Recursive Delete "
 msgstr " Recursive Áö¿ì±â "
 
-#: src/file.c:2211
+#: src/file.c:2249
 msgid " Background process: Recursive Delete "
 msgstr " ¹é±×¶ó¿îµå ÇÁ·ÎŒŒœº: Recursive Áö¿ì±â "
 
-#: src/filegui.c:404
+#: src/filegui.c:423
 msgid "File"
 msgstr "ÆÄÀÏ"
 
-#: src/filegui.c:425
+#: src/filegui.c:446
 msgid "Count"
 msgstr "°¹Œö"
 
-#: src/filegui.c:444
+#: src/filegui.c:467
 msgid "Bytes"
 msgstr "¹ÙÀÌÆ®"
 
-#: src/filegui.c:479
+#: src/filegui.c:504
 msgid "Source"
 msgstr "¿øº»"
 
-#: src/filegui.c:500
+#: src/filegui.c:527
 msgid "Target"
 msgstr "Žë»ó"
 
-#: src/filegui.c:520
+#: src/filegui.c:549
 msgid "Deleting"
 msgstr "Áö¿ì±â"
 
-#: src/filegui.c:560
+#: src/filegui.c:589
 #, c-format
 msgid "Target file \"%s\" already exists!"
 msgstr "Žë»ó ÆÄÀÏ \"%s\"ÀÌ ÀÌ¹Ì À֎µ¥¿ä!"
 
-#: src/filegui.c:563
+#: src/filegui.c:592
 msgid "if &Size differs"
 msgstr "Å©±â(&S)°¡ Ʋž®žé"
 
-#: src/filegui.c:566
+#: src/filegui.c:595
 msgid "&Update"
 msgstr "°»œÅ(&U)"
 
-#: src/filegui.c:567
-msgid "al&L"
-msgstr "žðµÎ(&L)"
-
-#: src/filegui.c:568
+#: src/filegui.c:597
 msgid "Overwrite all targets?"
 msgstr "žðµÎ µ€ŸîŸµ±î¿ä?"
 
-#: src/filegui.c:570
+#: src/filegui.c:599
 msgid "&Reget"
 msgstr "&Reget"
 
-#: src/filegui.c:571
+#: src/filegui.c:600
 msgid "ap&Pend"
 msgstr "ap&Pend"
 
-#: src/filegui.c:574
+#: src/filegui.c:603
 msgid "Overwrite this target?"
 msgstr "ÀÌ ÆÄÀÏÀ» µ€ŸîŸµ±î¿ä?"
 
-#: src/filegui.c:576
+#: src/filegui.c:605
 #, c-format
 msgid "Target date: %s, size %d"
 msgstr "Žë»ó ³¯Â¥: %s, Å©±â %d"
 
-#: src/filegui.c:578
+#: src/filegui.c:607
 #, c-format
 msgid "Source date: %s, size %d"
 msgstr "¿øº» ³¯Â¥: %s, Å©±â %d"
 
-#: src/filegui.c:662
+#: src/filegui.c:691
 msgid " File exists "
 msgstr " ÆÄÀÏ ÀÖÀœ "
 
-#: src/filegui.c:663
+#: src/filegui.c:692
 msgid " Background process: File exists "
 msgstr " ¹é±×¶ó¿îµå ÇÁ·ÎŒŒœº: ÆÄÀÏ ÀÖÀœ "
 
 #. follow symlinks and preserve Attributes must be the first
-#: src/filegui.c:773
+#: src/filegui.c:804
 msgid "preserve &Attributes"
 msgstr "ÆÄÀÏ ŒÓŒº ºžÁž(&A)"
 
 #. &op_preserve
-#: src/filegui.c:775
+#: src/filegui.c:806
 msgid "follow &Links"
 msgstr "žµÅ© µûž£±â(&L)"
 
 #. &file_mask_op_follow_links
-#: src/filegui.c:777
+#: src/filegui.c:808
 msgid "to:"
 msgstr "Žë»ó:"
 
-#: src/filegui.c:778
+#: src/filegui.c:809
 msgid "&Using shell patterns"
 msgstr "ží·ÉÇØŒ®±â ÆÐÅÏ »ç¿ë(&U)"
 
-#: src/filegui.c:799
+#: src/filegui.c:830
 msgid "&Background"
 msgstr "&Background"
 
-#: src/filegui.c:808
+#: src/filegui.c:839
 msgid "&Stable Symlinks"
 msgstr "&Stable œÉºŒž¯žµÅ©"
 
 #. &file_mask_stable_symlinks
-#: src/filegui.c:810
+#: src/filegui.c:841
 msgid "&Dive into subdir if exists"
 msgstr "°°Àº ÀÚ·á¹æ ÁžÀçœÃ ±× ¹ØÀž·Î(&D)"
 
-#: src/filegui.c:969
+#: src/filegui.c:1000
 #, c-format
 msgid ""
 "Invalid source pattern `%s' \n"
@@ -3537,7 +3945,7 @@
 msgid "Content: "
 msgstr "³»¿ë: "
 
-#: src/find.c:171 src/main.c:1219 src/main.c:1240
+#: src/find.c:171 src/main.c:1222 src/main.c:1243
 msgid "&Tree"
 msgstr "³ª¹«²Ã(&T)"
 
@@ -3562,7 +3970,7 @@
 msgid "Finished"
 msgstr "³¡³µŸî¿ä"
 
-#: src/find.c:561 src/view.c:1465
+#: src/find.c:561 src/view.c:1467
 #, c-format
 msgid "Searching %s"
 msgstr "%s ãŽÂ Áß"
@@ -3844,8 +4252,8 @@
 "           the same question next time\n"
 "  Merge  - add old entries to hotlist as group \"Entries from ~/"
 msgstr ""
-"  ºžÁž   - ÀÌÀü žñ·ÏÀ» ºžÁž. ŽÙÀœ ¹ø¿¡µµ ¶È°°Àº Áú¹®À» ¹Þ°Ô"
-"           µÉ °ÍÀÔŽÏŽÙ\n"
+"  ºžÁž   - ÀÌÀü žñ·ÏÀ» ºžÁž. ŽÙÀœ ¹ø¿¡µµ ¶È°°Àº Áú¹®À» ¹Þ°Ô           µÉ "
+"°ÍÀÔŽÏŽÙ\n"
 "  ÇÕÄ¡±â - ÀÌÀü žñ·ÏÀ» Ãß°¡. ±×·ìÀÌž§Àº \"Entries from ~/"
 
 #: src/hotlist.c:1443
@@ -4108,7 +4516,7 @@
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr "³ª ž¶¿ìœº·Î Ŭž¯ÇÑ ÈÄ ±ÛŒèžŠ Á€ÀÇÇϜʜÿÀ. ÅDZیè·Î À̵¿ÇϜʜÿÀ"
 
-#: src/main.c:692
+#: src/main.c:695
 msgid ""
 " The Commander can't change to the directory that \n"
 " the subshell claims you are in.  Perhaps you have \n"
@@ -4120,247 +4528,247 @@
 " ÀÛŸ÷ ÀÚ·á¹æÀ» Áö¿ü°Å³ª, ŸÆŽÏžé \"su\" ží·ÉÀ»\n"
 " »ç¿ëÇÏ¿© Ưº°ÇÑ Ÿ×ŒŒœº ±ÇÇÑÀ» °¡Áø °Í ŸÆ³é¿ä? "
 
-#: src/main.c:767
+#: src/main.c:770
 msgid "Press any key to continue..."
 msgstr "°èŒÓÇÏ·Ážé ŸÆ¹« ±ÛŒè³ª Ž©ž£œÊœÃ¿À..."
 
-#: src/main.c:817
+#: src/main.c:820
 msgid " The shell is already running a command "
 msgstr " ží·ÉÇØŒ®±â°¡ ÀÌ¹Ì ží·ÉÀ» ŒöÇàÁßÀÔŽÏŽÙ "
 
-#: src/main.c:1216 src/main.c:1237
+#: src/main.c:1219 src/main.c:1240
 msgid "&Listing mode..."
 msgstr "ÆÄÀÏžñ·Ïºž±â Œ³Á€(&L)..."
 
-#: src/main.c:1217 src/main.c:1238
+#: src/main.c:1220 src/main.c:1241
 msgid "&Quick view     C-x q"
 msgstr "ºüž£°Ô ºž±â(&Q)        C-x q"
 
-#: src/main.c:1218 src/main.c:1239
+#: src/main.c:1221 src/main.c:1242
 msgid "&Info           C-x i"
 msgstr "Á€ºž(&I)               C-x i"
 
-#: src/main.c:1221 src/main.c:1242
+#: src/main.c:1224 src/main.c:1245
 msgid "&Sort order..."
 msgstr "Á€·Ä ŒøŒ­(&S)..."
 
-#: src/main.c:1223 src/main.c:1244
+#: src/main.c:1226 src/main.c:1247
 msgid "&Filter..."
 msgstr "ÇÊÅÍ(&F)..."
 
-#: src/main.c:1226 src/main.c:1247
+#: src/main.c:1229 src/main.c:1250
 msgid "&Network link..."
 msgstr "³×Æ®¿öÅ© ¿¬°á(&N)..."
 
-#: src/main.c:1227 src/main.c:1248
+#: src/main.c:1230 src/main.c:1251
 msgid "FT&P link..."
 msgstr "FTP ¿¬°á(&P)..."
 
-#: src/main.c:1231 src/main.c:1252
+#: src/main.c:1234 src/main.c:1255
 msgid "&Drive...       M-d"
 msgstr "µå¶óÀ̺ê(&D)...          M-d"
 
-#: src/main.c:1233 src/main.c:1254
+#: src/main.c:1236 src/main.c:1257
 msgid "&Rescan         C-r"
 msgstr "ŽÙœÃ Àбâ(&R)            C-r"
 
-#: src/main.c:1258
+#: src/main.c:1261
 msgid "&User menu          F2"
 msgstr "»ç¿ëÀÚ žÞŽº(&U)            F2"
 
-#: src/main.c:1259
+#: src/main.c:1262
 msgid "&View               F3"
 msgstr "ºž±â(&V)                   F3"
 
-#: src/main.c:1260
+#: src/main.c:1263
 msgid "Vie&w file...         "
 msgstr "ÆÄÀÏ ºž±â(&w)...      "
 
-#: src/main.c:1261
+#: src/main.c:1264
 msgid "&Filtered view     M-!"
 msgstr "ÇÊÅÍ·Î ºž±â(&F)           M-!"
 
-#: src/main.c:1262
+#: src/main.c:1265
 msgid "&Edit               F4"
 msgstr "ÆíÁý(&E)                   F4"
 
-#: src/main.c:1263
+#: src/main.c:1266
 msgid "&Copy               F5"
 msgstr "º¹»ç(&C)                   F5"
 
-#: src/main.c:1264
+#: src/main.c:1267
 msgid "c&Hmod           C-x c"
 msgstr "ÆÄÀÏ žðµå ¹Ù²Ù±â(&H)    C-x c"
 
-#: src/main.c:1266
+#: src/main.c:1269
 msgid "&Link            C-x l"
 msgstr "žµÅ©(&L)                C-x l"
 
-#: src/main.c:1267
+#: src/main.c:1270
 msgid "&SymLink         C-x s"
 msgstr "œÉºŒž¯žµÅ©(&S)          C-x s"
 
-#: src/main.c:1268
+#: src/main.c:1271
 msgid "edit s&Ymlink  C-x C-s"
 msgstr "œÉºŒž¯žµÅ© ŒöÁ€(&Y)   C-x C-s"
 
-#: src/main.c:1269
+#: src/main.c:1272
 msgid "ch&Own           C-x o"
 msgstr "ŒÒÀ¯ÀÚ ¹Ù²Ù±â(&O)       C-x o"
 
-#: src/main.c:1270
+#: src/main.c:1273
 msgid "&Advanced chown       "
 msgstr "°í±Þ ŒÒÀ¯ÀÚ ¹Ù²Ù±â(&A)       "
 
-#: src/main.c:1272
+#: src/main.c:1275
 msgid "&Rename/Move        F6"
 msgstr "¹Ù²Ù±â/À̵¿(&R)            F6"
 
-#: src/main.c:1273
+#: src/main.c:1276
 msgid "&Mkdir              F7"
 msgstr "ÀÚ·á¹æ »ýŒº(&M)            F7"
 
-#: src/main.c:1274
+#: src/main.c:1277
 msgid "&Delete             F8"
 msgstr "Áö¿ì±â(&D)                 F8"
 
-#: src/main.c:1275
+#: src/main.c:1278
 msgid "&Quick cd          M-c"
 msgstr "ÀÚ·á¹æ »¡ž® ¹Ù²Ù±â(&Q)    M-c"
 
-#: src/main.c:1277
+#: src/main.c:1280
 msgid "select &Group      M-+"
 msgstr "ÁýŽÜŒ±ÅÃ(&G)              M-+"
 
-#: src/main.c:1278
+#: src/main.c:1281
 msgid "u&Nselect group    M-\\"
 msgstr "ÁýŽÜŒ±Åà ÇØÁŠ(&N)         M-\\"
 
-#: src/main.c:1279
+#: src/main.c:1282
 msgid "reverse selec&Tion M-*"
 msgstr "Œ±ÅùÝÀü(&T)              M-*"
 
-#: src/main.c:1281
+#: src/main.c:1284
 msgid "e&Xit              F10"
 msgstr "ÁŸ·á(&X)                  F10"
 
-#: src/main.c:1291
+#: src/main.c:1294
 msgid "&Directory tree"
 msgstr "ÀÚ·á¹æ ³ª¹«²Ã(&D)"
 
-#: src/main.c:1293
+#: src/main.c:1296
 msgid "&Find file            M-?"
 msgstr "ÆÄÀÏ Ã£±â(&F)              M-?"
 
-#: src/main.c:1294
+#: src/main.c:1297
 msgid "s&Wap panels          C-u"
 msgstr "ÆгΠ¹Ù²Ù±â(&W)            C-u"
 
-#: src/main.c:1295
+#: src/main.c:1298
 msgid "switch &Panels on/off C-o"
 msgstr "ÆгΠ¿­±â/ŽÝ±â(&P)         C-o"
 
-#: src/main.c:1296
+#: src/main.c:1299
 msgid "&Compare directories  C-x d"
 msgstr "ÀÚ·á¹æ ºñ±³(&C)          C-x d"
 
-#: src/main.c:1297
+#: src/main.c:1300
 msgid "e&Xternal panelize    C-x !"
 msgstr "¿ÜºÎží·É ÆгÎÈ­Çϱâ(&X)  C-x !"
 
-#: src/main.c:1298
+#: src/main.c:1301
 msgid "show directory s&Izes"
 msgstr "ÀÚ·á¹æ Å©±â ºž±â(&I)"
 
-#: src/main.c:1300
+#: src/main.c:1303
 msgid "command &History"
 msgstr "ží·É È÷œºÅäž®(&H)"
 
-#: src/main.c:1301
+#: src/main.c:1304
 msgid "di&Rectory hotlist    C-\\"
 msgstr "ÀÚ·á¹æ ŽÜÃàžñ·Ï(&R)        C-\\"
 
-#: src/main.c:1303
+#: src/main.c:1306
 msgid "&Active VFS list      C-x a"
 msgstr "È°Œº VFS žñ·Ï(&A)        C-x a"
 
-#: src/main.c:1306
+#: src/main.c:1309
 msgid "&Background jobs      C-x j"
 msgstr "¹é±×¶ó¿îµå jobs(&B)      C-x j"
 
-#: src/main.c:1310
+#: src/main.c:1313
 msgid "&Undelete files (ext2fs only)"
 msgstr "ÆÄÀÏ µÇ»ìž² (est2fsžž °¡ŽÉ)"
 
-#: src/main.c:1313
+#: src/main.c:1316
 msgid "&Listing format edit"
 msgstr "ÆÄÀÏ žñ·Ï ÇüœÄ ¹Ù²Ù±â(&L)"
 
-#: src/main.c:1315
+#: src/main.c:1318
 msgid "&Extension file edit"
 msgstr "È®ÀåÀÚ ÆÄÀÏ ŒöÁ€(&E)"
 
-#: src/main.c:1316
+#: src/main.c:1319
 msgid "&Menu file edit"
 msgstr "žÞŽº ÆÄÀÏ ŒöÁ€(&M)"
 
-#: src/main.c:1321
+#: src/main.c:1324
 msgid "&Configuration..."
 msgstr "ȯ°æŒ³Á€(&C)..."
 
-#: src/main.c:1323
+#: src/main.c:1326
 msgid "c&Onfirmation..."
 msgstr "È®ÀÎ(&O)..."
 
-#: src/main.c:1324
+#: src/main.c:1327
 msgid "&Display bits..."
 msgstr "Ãâ·Â ºñÆ®(&D)..."
 
-#: src/main.c:1326
+#: src/main.c:1329
 msgid "learn &Keys..."
 msgstr "±ÛŒè ¹è¿ì±â(&K)..."
 
-#: src/main.c:1329
+#: src/main.c:1332
 msgid "&Virtual FS..."
 msgstr "°¡»ó ÆÄÀÏÃŒ°è(&V)..."
 
-#: src/main.c:1332
+#: src/main.c:1335
 msgid "&Save setup"
 msgstr "ȯ°æ ÀúÀå(&S)"
 
-#: src/main.c:1348 src/main.c:1350
+#: src/main.c:1351 src/main.c:1353
 msgid " &Left "
 msgstr " ¿ÞÂÊ(&L) "
 
-#: src/main.c:1350
+#: src/main.c:1353
 msgid " &Above "
 msgstr " ˤ(&A) "
 
-#: src/main.c:1353
+#: src/main.c:1356
 msgid " &File "
 msgstr " ÆÄÀÏ(&F) "
 
-#: src/main.c:1354
+#: src/main.c:1357
 msgid " &Command "
 msgstr " ží·É(&C) "
 
-#: src/main.c:1355
+#: src/main.c:1358
 msgid " &Options "
 msgstr " Œ±ÅÃÇמñ(&O) "
 
-#: src/main.c:1357 src/main.c:1359
+#: src/main.c:1360 src/main.c:1362
 msgid " &Right "
 msgstr " ¿Àž¥ÂÊ(&R) "
 
-#: src/main.c:1359
+#: src/main.c:1362
 msgid " &Below "
 msgstr " ŸÆ·¡(&B) "
 
-#: src/main.c:1414
+#: src/main.c:1417
 msgid " Information "
 msgstr " Á€ºž "
 
-#: src/main.c:1415
+#: src/main.c:1418
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -4372,55 +4780,139 @@
 " ŽçœÅÀº Œöµ¿Àž·Î ÀÚ·á¹æÀ» ŽÙœÃ ÀПîŸßžž ÇÕŽÏŽÙ.         \n"
 " ÀÚŒŒÇÑ ³»¿ëÀ» ŸË°í œÍÀžœÃžé Œ³žíŒ­žŠ ºžœÊœÃ¿À.         "
 
-#: src/main.c:1689 src/screen.c:2285 src/screen.c:2315
+#: src/main.c:1692 src/screen.c:2298 src/screen.c:2328
 msgid "Menu"
 msgstr "žÞŽº"
 
-#: src/main.c:1894
+#: src/main.c:1897
 msgid "Thank you for using GNU Midnight Commander"
 msgstr "GNU Midnight CommanderžŠ »ç¿ëÇØÁ֌Ō­ °š»çÇÕŽÏŽÙ"
 
-#: src/main.c:2253
+#: src/main.c:2256
 #, c-format
 msgid "with mouse support on xterm%s.\n"
 msgstr "with mouse support on xterm%s.\n"
 
-#: src/main.c:2254
+#: src/main.c:2257
 msgid " and the Linux console"
 msgstr " and the Linux console"
 
-#: src/main.c:2349
+#: src/main.c:2352
 msgid "The TERM environment variable is unset!\n"
 msgstr "TERM ȯ°æº¯Œö°¡ Œ³Á€µÇŸîÀÖÁö ŸÊœÀŽÏŽÙ!\n"
 
-#: src/main.c:2556
+#: src/main.c:2559
 #, c-format
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr "Midnight Commander¿ë ¶óÀ̺귯ž® ÀÚ·á¹æ: %s\n"
 
-#: src/main.c:2567
+#: src/main.c:2570
 msgid ""
 "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 "-m Œ±ÅÃÇמñÀº Àǹ̰¡ ŸøœÀŽÏŽÙ. Œ±ÅÃÇמñ žÞŽºÀÇ 'Ãâ·Â ºñÆ®'žŠ ºžœÊœÃ¿À\n"
 
-#: src/main.c:2693
+#: src/main.c:2649
+msgid "Use to debug the background code"
+msgstr ""
+
+#: src/main.c:2655
+msgid "Request to run in color mode"
+msgstr ""
+
+#: src/main.c:2657
+msgid "Specifies a color configuration"
+msgstr ""
+
+#: src/main.c:2662
+msgid "Edits one file"
+msgstr "ÇÑ ÆÄÀÏ ÆíÁý"
+
+#: src/main.c:2666
+msgid "Displays this help message"
+msgstr "ÀÌ µµ¿òž» ºž¿©ÁÖ±â"
+
+#: src/main.c:2669
+msgid "Displays a help screen on how to change the color scheme"
+msgstr ""
+
+#: src/main.c:2672
+msgid "Log ftp dialog to specified file"
+msgstr ""
+
+#: src/main.c:2679
+msgid "Obsolete"
+msgstr ""
+
+#: src/main.c:2681
+msgid "Requests to run in black and white"
+msgstr ""
+
+#: src/main.c:2683
+msgid "Disable mouse support in text version"
+msgstr "ÅØœºÅ© ¹öÁ¯¿¡Œ­ ž¶¿ìœº »ç¿ëŸÊÇÔ"
+
+#: src/main.c:2686
+msgid "Disables subshell support"
+msgstr ""
+
+#: src/main.c:2690
+msgid "Prints working directory at program exit"
+msgstr "ÇÁ·Î±×·¥ ÁŸ·áœÃ ÀÛŸ÷ µð·ºÅäž® Ãâ·Â"
+
+#: src/main.c:2692
+msgid "Resets soft keys on HP terminals"
+msgstr "HP Å͹̳ο¡Œ­ ŒÒÇÁÆ® ±ÛŒè ž®ŒÂ"
+
+#: src/main.c:2694
+msgid "To run on slow terminals"
+msgstr "ŽÀž° Å͹̳ο¡Œ­ œÇÇà œÃ"
+
+#: src/main.c:2697
+msgid "Use stickchars to draw"
+msgstr ""
+
+#: src/main.c:2701
+msgid "Enables subshell support (default)"
+msgstr ""
+
+#: src/main.c:2706
+msgid "Tries to use termcap instead of terminfo"
+msgstr ""
+
+#: src/main.c:2710
+msgid "Displays the current version"
+msgstr "ÇöÀç ¹öÁ¯ Ãâ·Â"
+
+#: src/main.c:2712
+msgid "Launches the file viewer on a file"
+msgstr ""
+
+#: src/main.c:2714
+msgid "Forces xterm features"
+msgstr "xterm ±âŽÉÀ» ¹«Á¶°Ç »ç¿ë"
+
+#: src/main.c:2716
 msgid "Geometry for the window"
 msgstr "âÀÇ Å©±â/À§Ä¡"
 
-#: src/main.c:2693
+#: src/main.c:2716
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/main.c:2694
+#: src/main.c:2717
 msgid "No windows opened at startup"
 msgstr "œÃÀÛÇÒ ¶§ âÀ» ¿­Áö ŸÊŸÆ¿ä"
 
-#: src/main.c:2695
+#: src/main.c:2718
 msgid "Force activation even if a server is already running"
 msgstr "Œ­¹ö°¡ ÀÌ¹Ì œÇÇà ÁßÀÌŽõ¶óµµ ¹«Á¶°Ç È°ŒºÈ­Çϱâ"
 
-#: src/main.c:2967
+#: src/main.c:2720
+msgid "Displays the directory that holds the .links startup files"
+msgstr ".links œÃÀÛÆÄÀÏÀ» °¡Áø ÀÚ·á¹æ Ãâ·Â"
+
+#: src/main.c:2996
 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"
@@ -4428,11 +4920,23 @@
 "tty Œ±À» ¿­Œö Ÿø³×¿ä. ŽçœÅÀº -P Œ±ÅÃÇמñŸøÀÌ MCžŠ œÇÇàÇØŸß ÇÕŽÏŽÙ.\n"
 "ƯÁ€ ÃŒ°è¿¡Œ­ŽÂ # `which mc` ¿Í °°ÀÌ œÇÇàÇÒ Œöµµ ÀÖœÀŽÏŽÙ.\n"
 
-#: src/main.c:3041
+#: src/main.c:3072
+msgid ""
+"You are running the GNOME Midnight Commander as root. \n"
+"\n"
+"You will not be protected from severly damaging your system\n"
+"if you continue."
+msgstr ""
+"ŒöÆÛ¹ÙÀÌÁ®·ÎŒ­ GNOME Midnight CommanderžŠ œÇÇàÇÏ°í ÀÖœÀŽÏŽÙ.\n"
+"\n"
+"°èŒÓÇÑŽÙžé ŽçœÅÀÇ œÃœºÅÛÀº œÉ°¢ÇÑ ŒÕ»óÀ» ÀÔÀ» ¿ì·Á°¡\n"
+"ÀÖœÀŽÏŽÙ."
+
+#: src/main.c:3087
 msgid " Notice "
 msgstr " Notice "
 
-#: src/main.c:3042
+#: src/main.c:3088
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -4577,7 +5081,8 @@
 
 #: src/panelize.c:301
 msgid " I can't run external panelize while logged on a non local directory "
-msgstr " ¿ø°Ý ÀÚ·á¹æÀž·Î ·Î±×ÇÑ °æ¿ì¿¡ŽÂ ¿ÜºÎ ÆгÎÈ­ ží·ÉÀ» œÇÇàÇÒ Œö ŸøœÀŽÏŽÙ "
+msgstr ""
+" ¿ø°Ý ÀÚ·á¹æÀž·Î ·Î±×ÇÑ °æ¿ì¿¡ŽÂ ¿ÜºÎ ÆгÎÈ­ ží·ÉÀ» œÇÇàÇÒ Œö ŸøœÀŽÏŽÙ "
 
 #: src/panelize.c:351
 msgid "Find *.orig after patching"
@@ -4603,68 +5108,64 @@
 msgid "Display brief usage message"
 msgstr "°£ŽÜÇÑ »ç¿ë žÞœÃÁö Ãâ·Â"
 
-#: src/screen.c:429
+#: src/screen.c:399
 msgid "MTime"
 msgstr "MTime"
 
-#: src/screen.c:430
+#: src/screen.c:400
 msgid "ATime"
 msgstr "ATime"
 
-#: src/screen.c:431
+#: src/screen.c:401
 msgid "CTime"
 msgstr "CTime"
 
-#: src/screen.c:432
-msgid "Permission"
-msgstr "Çã¿ë"
-
-#: src/screen.c:433
+#: src/screen.c:403
 msgid "Perm"
 msgstr "Perm"
 
-#: src/screen.c:434
+#: src/screen.c:404
 msgid "Nl"
 msgstr "Nl"
 
-#: src/screen.c:435
+#: src/screen.c:405
 msgid "Inode"
 msgstr "Inode"
 
-#: src/screen.c:436
+#: src/screen.c:406
 msgid "UID"
 msgstr "UID"
 
-#: src/screen.c:437
+#: src/screen.c:407
 msgid "GID"
 msgstr "GID"
 
-#: src/screen.c:650
+#: src/screen.c:643
 #, c-format
 msgid "  %s bytes in %d file%s"
 msgstr "  %s bytes in %d file%s"
 
-#: src/screen.c:1289
+#: src/screen.c:1299
 msgid "Unknow tag on display format: "
 msgstr "Unknow tag on display format: "
 
-#: src/screen.c:2048
+#: src/screen.c:2061
 msgid " Do you really want to execute? "
 msgstr " Á€ž»·Î œÇÇàÇϜðÚÀŸŽÏ±î? "
 
-#: src/screen.c:2063
+#: src/screen.c:2076
 msgid " No action taken "
 msgstr " No action taken "
 
-#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026
+#: src/screen.c:2302 src/screen.c:2332 src/tree.c:1026
 msgid "RenMov"
 msgstr "RenMov"
 
-#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030
+#: src/screen.c:2303 src/screen.c:2333 src/tree.c:1030
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/screen.c:2306
+#: src/screen.c:2319
 #, c-format
 msgid ""
 " Can't chdir to %s \n"
@@ -4678,19 +5179,19 @@
 msgid "Couldn't open named pipe %s\n"
 msgstr "%s ÆÄÀÌÇÁžŠ ¿­ Œö ŸøŸî¿ä\n"
 
-#: src/subshell.c:700
+#: src/subshell.c:705
 msgid " The shell is still active. Quit anyway? "
 msgstr " ží·ÉÇØŒ®±â°¡ ŸÆÁ÷ È°Œº»óÅÂÀÔŽÏŽÙ. ±×·¡µµ ÁŸ·áÇϜǷ¡¿ä? "
 
-#: src/subshell.c:726
+#: src/subshell.c:731
 msgid " There are stopped jobs."
 msgstr " stopped jobs°¡ ÀÖœÀŽÏŽÙ."
 
-#: src/subshell.c:727
+#: src/subshell.c:732
 msgid " Quit anyway? "
 msgstr " ±×·¡µµ ÁŸ·áÇϜǷ¡¿ä? "
 
-#: src/subshell.c:780
+#: src/subshell.c:785
 #, c-format
 msgid "Warning: Couldn't change to %s.\n"
 msgstr "°æ°í: %s·Î ¹Ù²Ü Œö ŸøœÀŽÏŽÙ.\n"
@@ -4809,7 +5310,7 @@
 msgid " User menu "
 msgstr " »ç¿ëÀÚ žÞŽº "
 
-#: src/util.c:222
+#: src/util.c:228
 msgid "name_trunc: too big"
 msgstr "name_trunc: ³Ê¹« ±æŸîŒ­"
 
@@ -4882,20 +5383,20 @@
 msgid "  [grow]"
 msgstr "  [grow]"
 
-#: src/view.c:1457
+#: src/view.c:1459
 #, c-format
 msgid "Searching for `%s'"
 msgstr "`%s' ãŽÂ Áß"
 
-#: src/view.c:1564 src/view.c:1686
+#: src/view.c:1566 src/view.c:1688
 msgid " Search string not found "
 msgstr " ±Û¿ùÀ» ãÀ» Œö Ÿø±º¿ä "
 
-#: src/view.c:1725
+#: src/view.c:1727
 msgid " Invalid regular expression "
 msgstr " ŸËŒö ŸøŽÂ Á€±Ô Ç¥ÇöœÄ "
 
-#: src/view.c:1855
+#: src/view.c:1850
 #, c-format
 msgid ""
 " The current line number is %d.\n"
@@ -4904,59 +5405,59 @@
 " ÇöÀç ÁÙ ¹øÈ£ŽÂ %dÀÔŽÏŽÙ.\n"
 " »õ·Î¿î ÁÙ ¹øÈ£À» ÀÔ·Â:"
 
-#: src/view.c:1885
+#: src/view.c:1880
 msgid " Enter regexp:"
 msgstr " Á€±ÔÇ¥ÇöœÄ ÀÔ·Â:"
 
-#: src/view.c:1990
+#: src/view.c:1985
 msgid "Ascii"
 msgstr "ŸÆœºÅ°"
 
-#: src/view.c:1990
+#: src/view.c:1985
 msgid "Hex"
 msgstr "œÊÀ°Áø"
 
-#: src/view.c:1991
+#: src/view.c:1986
 msgid "Line"
 msgstr "ÁÙ"
 
-#: src/view.c:1992
+#: src/view.c:1987
 msgid "RxSrch"
 msgstr "RxSrch"
 
-#: src/view.c:1995
+#: src/view.c:1990
 msgid "EdText"
 msgstr "EdText"
 
-#: src/view.c:1995
+#: src/view.c:1990
 msgid "EdHex"
 msgstr "EdHex"
 
-#: src/view.c:1997
+#: src/view.c:1992
 msgid "UnWrap"
 msgstr "UnWrap"
 
-#: src/view.c:1997
+#: src/view.c:1992
 msgid "Wrap"
 msgstr "Wrap"
 
-#: src/view.c:2000
+#: src/view.c:1995
 msgid "HxSrch"
 msgstr "HxSrch"
 
-#: src/view.c:2003
+#: src/view.c:1998
 msgid "Raw"
 msgstr "Raw"
 
-#: src/view.c:2003
+#: src/view.c:1998
 msgid "Parse"
 msgstr "Parse"
 
-#: src/view.c:2007
+#: src/view.c:2002
 msgid "Unform"
 msgstr "Unform"
 
-#: src/view.c:2007
+#: src/view.c:2002
 msgid "Format"
 msgstr "Format"
 
@@ -5155,18 +5656,6 @@
 msgid "NumLock on keypad"
 msgstr "NumLock on keypad"
 
-#: src/wtools.c:587 vfs/vfs.c:1806
-msgid "Password:"
-msgstr "ºñ¹Ð¹øÈ£:"
-
-#: src/wtools.c:587
-msgid "Password"
-msgstr "ºñ¹Ð¹øÈ£"
-
-#: src/wtools.c:642
-msgid "Ok"
-msgstr "Ok"
-
 #: vfs/extfs.c:266
 #, c-format
 msgid ""
@@ -5184,10 +5673,152 @@
 msgid "Sorry, we can not do password authenticated connections for now."
 msgstr "¹ÌŸÈÇÕŽÏŽÙ. ŸÆÁ÷ ºñ¹Ð¹øÈ£ ÀÎÁõ ¿¬°áÀº ÇÒ Œö ŸøœÀŽÏŽÙ."
 
+#: vfs/ftpfs.c:326
+#, c-format
+msgid "ftpfs: Disconnecting from %s"
+msgstr "ftpfs: %s·ÎºÎÅÍ ¿¬°á ²÷ŸîÁü"
+
+#: vfs/ftpfs.c:377
+msgid " FTP: Password required for "
+msgstr ""
+
+#: vfs/ftpfs.c:409
+msgid " Proxy: Password required for "
+msgstr ""
+
+#: vfs/ftpfs.c:435
+msgid "ftpfs: sending proxy login name"
+msgstr "ftpfs: ÇÁ·ÏœÃ ·Î±×ÀÎ ÀÌž§ ºž³¿"
+
+#: vfs/ftpfs.c:439
+msgid "ftpfs: sending proxy user password"
+msgstr "ftpfs: ÇÁ·ÏœÃ »ç¿ëÀÚ ºñ¹Ð¹øÈ£ ºž³¿"
+
+#: vfs/ftpfs.c:443
+msgid "ftpfs: proxy authentication succeeded"
+msgstr "ftpfs: ÇÁ·ÏœÃ ÀÎÁõ Œº°ø"
+
+#: vfs/ftpfs.c:447
+#, c-format
+msgid "ftpfs: connected to %s"
+msgstr "ftpfs: %s·Î ¿¬°áµÊ"
+
+#: vfs/ftpfs.c:464
+msgid "ftpfs: sending login name"
+msgstr "ftpfs: ·Î±×ÀÎ ÀÌž§ ºž³¿"
+
+#: vfs/ftpfs.c:469
+msgid "ftpfs: sending user password"
+msgstr "ftpfs: »ç¿ëÀÚ ºñ¹Ð¹øÈ£ ºž³¿"
+
+#: vfs/ftpfs.c:474
+msgid "ftpfs: logged in"
+msgstr "ftpfs: ·Î±× ÀÎ"
+
+#: vfs/ftpfs.c:489
+#, c-format
+msgid "ftpfs: Login incorrect for user %s "
+msgstr ""
+
 #: vfs/ftpfs.c:521
 #, c-format
 msgid " Could not set source routing (%s)"
 msgstr " ŒÒœº ¶ó¿ìÆà (%s)žŠ Œ³Á€ÇÒ Œö ŸøœÀŽÏŽÙ"
+
+#: vfs/ftpfs.c:650
+msgid "ftpfs: Invalid host name."
+msgstr "ftpfs: À¯È¿ÇÏÁö ŸÊÀº È£œºÆ® ÀÌž§."
+
+#: vfs/ftpfs.c:670
+msgid "ftpfs: Invalid host address."
+msgstr "ftpfs: À¯È¿ÇÏÁö ŸÊÀº È£œºÆ® ÁÖŒÒ."
+
+#: vfs/ftpfs.c:695
+#, c-format
+msgid "ftpfs: making connection to %s"
+msgstr "ftpfs: %s·Î ¿¬°á œÃµµÁß"
+
+#: vfs/ftpfs.c:705
+msgid "ftpfs: connection interrupted by user"
+msgstr "ftpfs: »ç¿ëÀÚ¿¡ ÀÇÇØ ¿¬°á ÁߎܵÊ"
+
+#: vfs/ftpfs.c:707
+#, c-format
+msgid "ftpfs: connection to server failed: %s"
+msgstr "ftpfs: Œ­¹ö·Î ¿¬°á œÇÆÐ: %s"
+
+#: vfs/ftpfs.c:791
+#, c-format
+msgid "Waiting to retry... %d (Control-C to cancel)"
+msgstr "ÀçœÃµµ ±âŽÙž²... %d (ÃëŒÒÇÏ·Ážé Control-C)"
+
+#: vfs/ftpfs.c:985
+msgid "ftpfs: could not setup passive mode for source routing"
+msgstr ""
+
+#: vfs/ftpfs.c:995
+msgid "ftpfs: could not setup passive mode"
+msgstr ""
+
+#: vfs/ftpfs.c:1066
+msgid "ftpfs: aborting transfer."
+msgstr "ftpfs: ŒÛœÅ ÁߎܵÊ."
+
+#: vfs/ftpfs.c:1068
+#, c-format
+msgid "ftpfs: abort error: %s"
+msgstr ""
+
+#: vfs/ftpfs.c:1073
+msgid "ftpfs: abort failed"
+msgstr ""
+
+#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1333
+msgid "ftpfs: CWD failed."
+msgstr "ftpfs: CWD œÇÆÐ."
+
+#: vfs/ftpfs.c:1169 vfs/ftpfs.c:1176
+msgid "ftpfs: couldn't resolve symlink"
+msgstr "ftpfs: œÉºŒž¯žµÅ©žŠ ÇØŒ®ÇÒ Œö ŸøœÀŽÏŽÙ"
+
+#: vfs/ftpfs.c:1221
+msgid "Resolving symlink..."
+msgstr "œÉºŒž¯žµÅ© ÇØŒ®..."
+
+#: vfs/ftpfs.c:1324
+#, c-format
+msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"
+msgstr "ftpfs: FTP ÀÚ·á¹æ %s ÀÐŽÂ Áß... (UNIX ls ¿ÉŒÇ »ç¿ëŸÊÇÔ)"
+
+#: vfs/ftpfs.c:1326
+#, c-format
+msgid "ftpfs: Reading FTP directory %s..."
+msgstr "ftpfs: FTP ÀÚ·á¹æ %s ÀÐŽÂ Áß..."
+
+#: vfs/ftpfs.c:1345
+msgid "ftpfs: FAIL"
+msgstr "ftpfs: œÇÆÐ"
+
+#: vfs/ftpfs.c:1436
+msgid "ftpfs: reading FTP directory interrupt by user"
+msgstr "ftpfs: FTP ÀÚ·á¹æ ÀбⰡ »ç¿ëÀÚ¿¡ ÀÇÇØ ÁߎܵǟúœÀŽÏŽÙ"
+
+#: vfs/ftpfs.c:1465
+msgid "ftpfs: got listing"
+msgstr "ftpfs: žñ·Ï ŸòŸî¿È"
+
+#: vfs/ftpfs.c:1478
+msgid "ftpfs: failed"
+msgstr "ftpfs: œÇÆÐ"
+
+#: vfs/ftpfs.c:1495
+msgid "ftpfs: failed; nowhere to fallback to"
+msgstr ""
+
+#: vfs/ftpfs.c:1559
+#, c-format
+msgid "ftpfs: storing file %d (%d)"
+msgstr ""
 
 #: vfs/ftpfs.c:1995 vfs/ftpfs.c:2010
 msgid ""
diff -ruN old/mc-4.5.28/po/mc.pot new/mc-4.5.29/po/mc.pot
--- old/mc-4.5.28/po/mc.pot	Fri Mar 26 15:30:48 1999
+++ new/mc-4.5.29/po/mc.pot	Tue Mar 30 01:34:51 1999
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-03-26 12:19-0500\n"
+"POT-Creation-Date: 1999-03-30 01:30-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -48,24 +48,24 @@
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr ""
 
-#: gnome/gcmd.c:128 src/main.c:847 src/screen.c:2060
+#: gnome/gcmd.c:128 src/main.c:852 src/screen.c:2064
 msgid " The Midnight Commander "
 msgstr ""
 
-#: gnome/gcmd.c:129 src/main.c:848
+#: gnome/gcmd.c:129 src/main.c:853
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr ""
 
 #: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
-#: src/file.c:2233 src/filegui.c:602 src/hotlist.c:1035 src/main.c:849
-#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: src/file.c:2233 src/filegui.c:602 src/hotlist.c:1035 src/main.c:854
+#: src/screen.c:2066 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
 #: src/view.c:404
 msgid "&Yes"
 msgstr ""
 
 #: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
-#: src/file.c:2233 src/filegui.c:601 src/hotlist.c:1035 src/main.c:849
-#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: src/file.c:2233 src/filegui.c:601 src/hotlist.c:1035 src/main.c:854
+#: src/screen.c:2066 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
 #: src/view.c:404
 msgid "&No"
 msgstr ""
@@ -156,7 +156,7 @@
 msgstr ""
 
 #: gnome/gcmd.c:651 gnome/gcmd.c:692 gnome/gcmd.c:697 gnome/gcmd.c:701
-#: gnome/gscreen.c:2525
+#: gnome/gscreen.c:2526
 msgid "Show all files"
 msgstr ""
 
@@ -257,38 +257,38 @@
 msgid "Custom View"
 msgstr ""
 
-#: gnome/gdesktop.c:416 gnome/gdesktop.c:2067
+#: gnome/gdesktop.c:417 gnome/gdesktop.c:2069
 msgid "Warning"
 msgstr ""
 
-#: gnome/gdesktop.c:417
+#: gnome/gdesktop.c:418
 #, c-format
 msgid "Could not open %s; will not have desktop icons"
 msgstr ""
 
-#: gnome/gdesktop.c:1010
+#: gnome/gdesktop.c:1011
 msgid "While running the mount/umount command"
 msgstr ""
 
-#: gnome/gdesktop.c:1079
+#: gnome/gdesktop.c:1080
 msgid "While running the eject command"
 msgstr ""
 
-#: gnome/gdesktop.c:1132 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1133 gnome/gicon.c:154 gnome/gtools.c:46
 msgid "Error"
 msgstr ""
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:2063
+#: gnome/gdesktop.c:2065
 msgid "Home directory"
 msgstr ""
 
-#: gnome/gdesktop.c:2068
+#: gnome/gdesktop.c:2070
 #, c-format
-msgid "Could not symlink %s to %s; will not have initial desktop icons."
+msgid "Could not symlink %s to %s; will not have initial home desktop icon."
 msgstr ""
 
-#: gnome/gdesktop.c:2409
+#: gnome/gdesktop.c:2414
 msgid ""
 "Unable to locate the file:\n"
 "background-properties-capplet\n"
@@ -297,48 +297,48 @@
 "We are unable to set the background."
 msgstr ""
 
-#: gnome/gdesktop.c:2418 gnome/glayout.c:361
+#: gnome/gdesktop.c:2423 gnome/glayout.c:362
 msgid "_Terminal"
 msgstr ""
 
-#: gnome/gdesktop.c:2418 gnome/glayout.c:361
+#: gnome/gdesktop.c:2423 gnome/glayout.c:362
 msgid "Launch a new terminal in the current directory"
 msgstr ""
 
 #. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/gdesktop.c:2420 gnome/glayout.c:363
+#: gnome/gdesktop.c:2425 gnome/glayout.c:364
 msgid "_Directory..."
 msgstr ""
 
-#: gnome/gdesktop.c:2420 gnome/glayout.c:363
+#: gnome/gdesktop.c:2425 gnome/glayout.c:364
 msgid "Creates a new directory"
 msgstr ""
 
-#: gnome/gdesktop.c:2421
+#: gnome/gdesktop.c:2426
 msgid "_Launcher..."
 msgstr ""
 
-#: gnome/gdesktop.c:2421
+#: gnome/gdesktop.c:2426
 msgid "Creates a new launcher"
 msgstr ""
 
-#: gnome/gdesktop.c:2429 gnome/glayout.c:448
+#: gnome/gdesktop.c:2434 gnome/glayout.c:449
 msgid "Arrange Icons"
 msgstr ""
 
-#: gnome/gdesktop.c:2430
+#: gnome/gdesktop.c:2435
 msgid "Create New Window"
 msgstr ""
 
-#: gnome/gdesktop.c:2432
+#: gnome/gdesktop.c:2437
 msgid "Recreate Desktop Shortcuts"
 msgstr ""
 
-#: gnome/gdesktop.c:2433 gnome/glayout.c:451
+#: gnome/gdesktop.c:2438 gnome/glayout.c:452
 msgid "Rescan Desktop"
 msgstr ""
 
-#: gnome/gdesktop.c:2434
+#: gnome/gdesktop.c:2439
 msgid "Configure Background Image"
 msgstr ""
 
@@ -402,7 +402,7 @@
 msgstr ""
 
 #: gnome/gdialogs.c:567 gtkedit/editwidget.c:1069 src/file.c:802
-#: src/screen.c:2301 src/screen.c:2331 src/tree.c:1024
+#: src/screen.c:2305 src/screen.c:2335 src/tree.c:1024
 msgid "Copy"
 msgstr ""
 
@@ -498,7 +498,7 @@
 
 #. Translators should take care as "Password" or its translations
 #. are used to identify password boxes and hide characters with "*"
-#: gnome/gdialogs.c:961 src/wtools.c:587 vfs/vfs.c:1762
+#: gnome/gdialogs.c:961 src/wtools.c:587 vfs/vfs.c:1768
 msgid "Password:"
 msgstr ""
 
@@ -519,24 +519,24 @@
 msgid "Symbolic link filename:"
 msgstr ""
 
-#: gnome/gdnd.c:51
+#: gnome/gdnd.c:52
 msgid "_Move here"
 msgstr ""
 
-#: gnome/gdnd.c:52
+#: gnome/gdnd.c:53
 msgid "_Copy here"
 msgstr ""
 
-#: gnome/gdnd.c:53
+#: gnome/gdnd.c:54
 msgid "_Link here"
 msgstr ""
 
-#: gnome/gdnd.c:55
+#: gnome/gdnd.c:56
 msgid "Cancel drag"
 msgstr ""
 
 #. FIXME: this error message sucks
-#: gnome/gdnd.c:191
+#: gnome/gdnd.c:192
 #, c-format
 msgid ""
 "Could not stat %s\n"
@@ -547,59 +547,59 @@
 msgid "Default set of icons not found, please check your installation"
 msgstr ""
 
-#: gnome/glayout.c:40
+#: gnome/glayout.c:41
 msgid "_Icon View"
 msgstr ""
 
-#: gnome/glayout.c:41 gnome/glayout.c:57
+#: gnome/glayout.c:42 gnome/glayout.c:58
 msgid "Switch view to an icon display"
 msgstr ""
 
-#: gnome/glayout.c:43
+#: gnome/glayout.c:44
 msgid "_Brief View"
 msgstr ""
 
-#: gnome/glayout.c:44 gnome/glayout.c:60
+#: gnome/glayout.c:45 gnome/glayout.c:61
 msgid "Switch view to show just file name and type"
 msgstr ""
 
-#: gnome/glayout.c:46
+#: gnome/glayout.c:47
 msgid "_Detailed View"
 msgstr ""
 
-#: gnome/glayout.c:47 gnome/glayout.c:63
+#: gnome/glayout.c:48 gnome/glayout.c:64
 msgid "Switch view to show detailed file statistics"
 msgstr ""
 
-#: gnome/glayout.c:49
+#: gnome/glayout.c:50
 msgid "_Custom View"
 msgstr ""
 
-#: gnome/glayout.c:50 gnome/glayout.c:66
+#: gnome/glayout.c:51 gnome/glayout.c:67
 msgid "Switch view to show user-defined statistics"
 msgstr ""
 
-#: gnome/glayout.c:56
+#: gnome/glayout.c:57
 msgid "Icons"
 msgstr ""
 
-#: gnome/glayout.c:59
+#: gnome/glayout.c:60
 msgid "Brief"
 msgstr ""
 
-#: gnome/glayout.c:62
+#: gnome/glayout.c:63
 msgid "Detailed"
 msgstr ""
 
-#: gnome/glayout.c:65
+#: gnome/glayout.c:66
 msgid "Custom"
 msgstr ""
 
-#: gnome/glayout.c:302
+#: gnome/glayout.c:303
 msgid "Enter command to run"
 msgstr ""
 
-#: gnome/glayout.c:315
+#: gnome/glayout.c:316
 msgid ""
 "Notice that if you choose to terminate the file manager, you will\n"
 "also terminate the GNOME desktop handler.\n"
@@ -607,7 +607,7 @@
 "Are you sure you want to exit?"
 msgstr ""
 
-#: gnome/glayout.c:327
+#: gnome/glayout.c:328
 msgid ""
 "The file manager and the desktop handler are now terminating\n"
 "\n"
@@ -618,156 +618,156 @@
 msgstr ""
 
 #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:384
+#: gnome/glayout.c:385
 msgid "_Copy..."
 msgstr ""
 
-#: gnome/glayout.c:384
+#: gnome/glayout.c:385
 msgid "Copy files"
 msgstr ""
 
-#: gnome/glayout.c:385
+#: gnome/glayout.c:386
 msgid "_Delete..."
 msgstr ""
 
-#: gnome/glayout.c:385
+#: gnome/glayout.c:386
 msgid "Delete files"
 msgstr ""
 
-#: gnome/glayout.c:386
+#: gnome/glayout.c:387
 msgid "_Move..."
 msgstr ""
 
-#: gnome/glayout.c:386
+#: gnome/glayout.c:387
 msgid "Rename or move files"
 msgstr ""
 
-#: gnome/glayout.c:388
+#: gnome/glayout.c:389
 msgid "Show directory sizes"
 msgstr ""
 
-#: gnome/glayout.c:388
+#: gnome/glayout.c:389
 msgid "Shows the disk space used by each directory"
 msgstr ""
 
-#: gnome/glayout.c:395
+#: gnome/glayout.c:396
 msgid "Select _All"
 msgstr ""
 
-#: gnome/glayout.c:395
+#: gnome/glayout.c:396
 msgid "Select all files in the current Panel"
 msgstr ""
 
-#: gnome/glayout.c:397
+#: gnome/glayout.c:398
 msgid "_Select Files..."
 msgstr ""
 
-#: gnome/glayout.c:397
+#: gnome/glayout.c:398
 msgid "Select a group of files"
 msgstr ""
 
-#: gnome/glayout.c:398
+#: gnome/glayout.c:399
 msgid "_Invert Selection"
 msgstr ""
 
-#: gnome/glayout.c:398
+#: gnome/glayout.c:399
 msgid "Reverses the list of tagged files"
 msgstr ""
 
-#: gnome/glayout.c:400
+#: gnome/glayout.c:401
 msgid "_Rescan Directory"
 msgstr ""
 
-#: gnome/glayout.c:400
+#: gnome/glayout.c:401
 msgid "Rescan the directory contents"
 msgstr ""
 
-#: gnome/glayout.c:407
+#: gnome/glayout.c:408
 msgid "_Sort By..."
 msgstr ""
 
-#: gnome/glayout.c:407
+#: gnome/glayout.c:408
 msgid "Confirmation settings"
 msgstr ""
 
-#: gnome/glayout.c:408
+#: gnome/glayout.c:409
 msgid "_Filter View..."
 msgstr ""
 
-#: gnome/glayout.c:408
+#: gnome/glayout.c:409
 msgid "Global option settings"
 msgstr ""
 
-#: gnome/glayout.c:415
+#: gnome/glayout.c:416
 msgid "_Find File..."
 msgstr ""
 
-#: gnome/glayout.c:415
+#: gnome/glayout.c:416
 msgid "Locate files on disk"
 msgstr ""
 
 #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },
-#: gnome/glayout.c:418
+#: gnome/glayout.c:419
 msgid "_Edit mime types..."
 msgstr ""
 
-#: gnome/glayout.c:418
+#: gnome/glayout.c:419
 msgid "Edits the MIME type bindings"
 msgstr ""
 
-#: gnome/glayout.c:420
+#: gnome/glayout.c:421
 msgid "_Run Command..."
 msgstr ""
 
-#: gnome/glayout.c:420
+#: gnome/glayout.c:421
 msgid "Runs a command"
 msgstr ""
 
-#: gnome/glayout.c:422
+#: gnome/glayout.c:423
 msgid "_Run Command in panel..."
 msgstr ""
 
-#: gnome/glayout.c:422
+#: gnome/glayout.c:423
 msgid "Run a command and put the results in a panel"
 msgstr ""
 
-#: gnome/glayout.c:432
+#: gnome/glayout.c:433
 msgid "_Background jobs..."
 msgstr ""
 
-#: gnome/glayout.c:432
+#: gnome/glayout.c:433
 msgid "List of background operations"
 msgstr ""
 
-#: gnome/glayout.c:435
+#: gnome/glayout.c:436
 msgid "Exit"
 msgstr ""
 
-#: gnome/glayout.c:435
+#: gnome/glayout.c:436
 msgid "Terminates the file manager and the desktop"
 msgstr ""
 
-#: gnome/glayout.c:450
+#: gnome/glayout.c:451
 msgid "Rescan System Devices"
 msgstr ""
 
-#: gnome/glayout.c:458 gnome/glayout.c:468
+#: gnome/glayout.c:459 gnome/glayout.c:469
 msgid "_Layout"
 msgstr ""
 
-#: gnome/glayout.c:459 gnome/glayout.c:469
+#: gnome/glayout.c:460 gnome/glayout.c:470
 msgid "_Commands"
 msgstr ""
 
-#: gnome/glayout.c:460
+#: gnome/glayout.c:461
 msgid "_Desktop"
 msgstr ""
 
-#: gnome/glayout.c:461 gnome/glayout.c:470
+#: gnome/glayout.c:462 gnome/glayout.c:471
 msgid "_Help"
 msgstr ""
 
-#: gnome/glayout.c:610
+#: gnome/glayout.c:611
 msgid "File/New/Directory..."
 msgstr ""
 
@@ -877,7 +877,7 @@
 msgstr ""
 
 #: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
-#: src/screen.c:2299 src/screen.c:2329
+#: src/screen.c:2303 src/screen.c:2333
 msgid "View"
 msgstr ""
 
@@ -890,7 +890,7 @@
 msgstr ""
 
 #: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
-#: src/screen.c:2300 src/screen.c:2330 src/view.c:1991
+#: src/screen.c:2304 src/screen.c:2334 src/view.c:1991
 msgid "Edit"
 msgstr ""
 
@@ -962,6 +962,10 @@
 msgid "Sticky"
 msgstr ""
 
+#: gnome/gnome-file-property-dialog.c:914
+msgid "File ownership"
+msgstr ""
+
 #: gnome/gnome-file-property-dialog.c:1074
 msgid "URL"
 msgstr ""
@@ -995,20 +999,20 @@
 msgstr ""
 
 #. the first label
-#: gnome/gnome-open-dialog.c:379
+#: gnome/gnome-open-dialog.c:382
 msgid "Select an application to open \""
 msgstr ""
 
-#: gnome/gnome-open-dialog.c:390
+#: gnome/gnome-open-dialog.c:393
 msgid "Select a file to run with"
 msgstr ""
 
 #. the file tree
-#: gnome/gnome-open-dialog.c:401
+#: gnome/gnome-open-dialog.c:404
 msgid "Applications"
 msgstr ""
 
-#: gnome/gnome-open-dialog.c:417
+#: gnome/gnome-open-dialog.c:420
 msgid "Program to run"
 msgstr ""
 
@@ -1036,8 +1040,8 @@
 msgid "Copy..."
 msgstr ""
 
-#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2304
-#: src/screen.c:2334
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2308
+#: src/screen.c:2338
 msgid "Delete"
 msgstr ""
 
@@ -1292,52 +1296,52 @@
 msgid "Filter"
 msgstr ""
 
-#: gnome/gscreen.c:2347
+#: gnome/gscreen.c:2348
 msgid "Back"
 msgstr ""
 
-#: gnome/gscreen.c:2347
+#: gnome/gscreen.c:2348
 msgid "Go to the previously visited directory"
 msgstr ""
 
-#: gnome/gscreen.c:2349
+#: gnome/gscreen.c:2350
 msgid "Up"
 msgstr ""
 
-#: gnome/gscreen.c:2349
+#: gnome/gscreen.c:2350
 msgid "Go up a level in the directory heirarchy"
 msgstr ""
 
-#: gnome/gscreen.c:2351
+#: gnome/gscreen.c:2352
 msgid "Forward"
 msgstr ""
 
-#: gnome/gscreen.c:2351
+#: gnome/gscreen.c:2352
 msgid "Go to the next directory"
 msgstr ""
 
-#: gnome/gscreen.c:2354 src/tree.c:1020
+#: gnome/gscreen.c:2355 src/tree.c:1020
 msgid "Rescan"
 msgstr ""
 
-#: gnome/gscreen.c:2354
+#: gnome/gscreen.c:2355
 msgid "Rescan the current directory"
 msgstr ""
 
-#: gnome/gscreen.c:2357
+#: gnome/gscreen.c:2358
 msgid "Home"
 msgstr ""
 
-#: gnome/gscreen.c:2357
+#: gnome/gscreen.c:2358
 msgid "Go to your home directory"
 msgstr ""
 
-#: gnome/gscreen.c:2503
+#: gnome/gscreen.c:2504
 msgid "Location:"
 msgstr ""
 
 #. 1
-#: gnome/gtools.c:110 gtkedit/editcmd.c:344 gtkedit/editcmd.c:1187
+#: gnome/gtools.c:105 gtkedit/editcmd.c:344 gtkedit/editcmd.c:1187
 #: gtkedit/editcmd.c:1272 gtkedit/editcmd.c:2868 gtkedit/editoptions.c:71
 #: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
 #: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
@@ -1442,7 +1446,7 @@
 #: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240
 #: gtkedit/edit.c:247 gtkedit/edit.c:253 gtkedit/edit.c:310 gtkedit/edit.c:346
 #: gtkedit/editcmd.c:1954 gtkedit/editwidget.c:952 src/dir.c:386
-#: src/screen.c:2319 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: src/screen.c:2323 src/tree.c:692 src/tree.c:698 src/wtools.c:222
 #: vfs/fish.c:224
 msgid " Error "
 msgstr ""
@@ -1513,7 +1517,7 @@
 #. Warning message with a query to continue or cancel the operation
 #: gtkedit/editcmd.c:493 gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
 #: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086 src/ext.c:301 src/file.c:619
-#: src/help.c:318 src/main.c:694 src/screen.c:2076 src/subshell.c:705
+#: src/help.c:318 src/main.c:699 src/screen.c:2080 src/subshell.c:705
 #: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
 #: vfs/mcfs.c:170
 msgid " Warning "
@@ -1611,7 +1615,6 @@
 msgstr ""
 
 #: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
-#: src/main.c:3076
 msgid "Continue"
 msgstr ""
 
@@ -2038,8 +2041,8 @@
 msgid "Error initialising editor.\n"
 msgstr ""
 
-#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1691 src/screen.c:2297
-#: src/screen.c:2327 src/tree.c:1018 src/view.c:1982
+#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1696 src/screen.c:2301
+#: src/screen.c:2331 src/tree.c:1018 src/view.c:1982
 msgid "Help"
 msgstr ""
 
@@ -2055,11 +2058,11 @@
 msgid "Search"
 msgstr ""
 
-#: gtkedit/editwidget.c:1074 src/main.c:1693
+#: gtkedit/editwidget.c:1074 src/main.c:1698
 msgid "PullDn"
 msgstr ""
 
-#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1694 src/view.c:1984
+#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1699 src/view.c:1984
 #: src/view.c:2004
 msgid "Quit"
 msgstr ""
@@ -2244,7 +2247,7 @@
 msgid "&Save mode..."
 msgstr ""
 
-#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1325
+#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1330
 msgid "&Layout..."
 msgstr ""
 
@@ -3808,7 +3811,7 @@
 msgid "Content: "
 msgstr ""
 
-#: src/find.c:171 src/main.c:1222 src/main.c:1243
+#: src/find.c:171 src/main.c:1227 src/main.c:1248
 msgid "&Tree"
 msgstr ""
 
@@ -4347,7 +4350,7 @@
 msgid "key, or click with the mouse to define it. Move around with Tab."
 msgstr ""
 
-#: src/main.c:695
+#: src/main.c:700
 msgid ""
 " The Commander can't change to the directory that \n"
 " the subshell claims you are in.  Perhaps you have \n"
@@ -4355,247 +4358,247 @@
 " extra access permissions with the \"su\" command? "
 msgstr ""
 
-#: src/main.c:770
+#: src/main.c:775
 msgid "Press any key to continue..."
 msgstr ""
 
-#: src/main.c:820
+#: src/main.c:825
 msgid " The shell is already running a command "
 msgstr ""
 
-#: src/main.c:1219 src/main.c:1240
+#: src/main.c:1224 src/main.c:1245
 msgid "&Listing mode..."
 msgstr ""
 
-#: src/main.c:1220 src/main.c:1241
+#: src/main.c:1225 src/main.c:1246
 msgid "&Quick view     C-x q"
 msgstr ""
 
-#: src/main.c:1221 src/main.c:1242
+#: src/main.c:1226 src/main.c:1247
 msgid "&Info           C-x i"
 msgstr ""
 
-#: src/main.c:1224 src/main.c:1245
+#: src/main.c:1229 src/main.c:1250
 msgid "&Sort order..."
 msgstr ""
 
-#: src/main.c:1226 src/main.c:1247
+#: src/main.c:1231 src/main.c:1252
 msgid "&Filter..."
 msgstr ""
 
-#: src/main.c:1229 src/main.c:1250
+#: src/main.c:1234 src/main.c:1255
 msgid "&Network link..."
 msgstr ""
 
-#: src/main.c:1230 src/main.c:1251
+#: src/main.c:1235 src/main.c:1256
 msgid "FT&P link..."
 msgstr ""
 
-#: src/main.c:1234 src/main.c:1255
+#: src/main.c:1239 src/main.c:1260
 msgid "&Drive...       M-d"
 msgstr ""
 
-#: src/main.c:1236 src/main.c:1257
+#: src/main.c:1241 src/main.c:1262
 msgid "&Rescan         C-r"
 msgstr ""
 
-#: src/main.c:1261
+#: src/main.c:1266
 msgid "&User menu          F2"
 msgstr ""
 
-#: src/main.c:1262
+#: src/main.c:1267
 msgid "&View               F3"
 msgstr ""
 
-#: src/main.c:1263
+#: src/main.c:1268
 msgid "Vie&w file...         "
 msgstr ""
 
-#: src/main.c:1264
+#: src/main.c:1269
 msgid "&Filtered view     M-!"
 msgstr ""
 
-#: src/main.c:1265
+#: src/main.c:1270
 msgid "&Edit               F4"
 msgstr ""
 
-#: src/main.c:1266
+#: src/main.c:1271
 msgid "&Copy               F5"
 msgstr ""
 
-#: src/main.c:1267
+#: src/main.c:1272
 msgid "c&Hmod           C-x c"
 msgstr ""
 
-#: src/main.c:1269
+#: src/main.c:1274
 msgid "&Link            C-x l"
 msgstr ""
 
-#: src/main.c:1270
+#: src/main.c:1275
 msgid "&SymLink         C-x s"
 msgstr ""
 
-#: src/main.c:1271
+#: src/main.c:1276
 msgid "edit s&Ymlink  C-x C-s"
 msgstr ""
 
-#: src/main.c:1272
+#: src/main.c:1277
 msgid "ch&Own           C-x o"
 msgstr ""
 
-#: src/main.c:1273
+#: src/main.c:1278
 msgid "&Advanced chown       "
 msgstr ""
 
-#: src/main.c:1275
+#: src/main.c:1280
 msgid "&Rename/Move        F6"
 msgstr ""
 
-#: src/main.c:1276
+#: src/main.c:1281
 msgid "&Mkdir              F7"
 msgstr ""
 
-#: src/main.c:1277
+#: src/main.c:1282
 msgid "&Delete             F8"
 msgstr ""
 
-#: src/main.c:1278
+#: src/main.c:1283
 msgid "&Quick cd          M-c"
 msgstr ""
 
-#: src/main.c:1280
+#: src/main.c:1285
 msgid "select &Group      M-+"
 msgstr ""
 
-#: src/main.c:1281
+#: src/main.c:1286
 msgid "u&Nselect group    M-\\"
 msgstr ""
 
-#: src/main.c:1282
+#: src/main.c:1287
 msgid "reverse selec&Tion M-*"
 msgstr ""
 
-#: src/main.c:1284
+#: src/main.c:1289
 msgid "e&Xit              F10"
 msgstr ""
 
-#: src/main.c:1294
+#: src/main.c:1299
 msgid "&Directory tree"
 msgstr ""
 
-#: src/main.c:1296
+#: src/main.c:1301
 msgid "&Find file            M-?"
 msgstr ""
 
-#: src/main.c:1297
+#: src/main.c:1302
 msgid "s&Wap panels          C-u"
 msgstr ""
 
-#: src/main.c:1298
+#: src/main.c:1303
 msgid "switch &Panels on/off C-o"
 msgstr ""
 
-#: src/main.c:1299
+#: src/main.c:1304
 msgid "&Compare directories  C-x d"
 msgstr ""
 
-#: src/main.c:1300
+#: src/main.c:1305
 msgid "e&Xternal panelize    C-x !"
 msgstr ""
 
-#: src/main.c:1301
+#: src/main.c:1306
 msgid "show directory s&Izes"
 msgstr ""
 
-#: src/main.c:1303
+#: src/main.c:1308
 msgid "command &History"
 msgstr ""
 
-#: src/main.c:1304
+#: src/main.c:1309
 msgid "di&Rectory hotlist    C-\\"
 msgstr ""
 
-#: src/main.c:1306
+#: src/main.c:1311
 msgid "&Active VFS list      C-x a"
 msgstr ""
 
-#: src/main.c:1309
+#: src/main.c:1314
 msgid "&Background jobs      C-x j"
 msgstr ""
 
-#: src/main.c:1313
+#: src/main.c:1318
 msgid "&Undelete files (ext2fs only)"
 msgstr ""
 
-#: src/main.c:1316
+#: src/main.c:1321
 msgid "&Listing format edit"
 msgstr ""
 
-#: src/main.c:1318
+#: src/main.c:1323
 msgid "&Extension file edit"
 msgstr ""
 
-#: src/main.c:1319
+#: src/main.c:1324
 msgid "&Menu file edit"
 msgstr ""
 
-#: src/main.c:1324
+#: src/main.c:1329
 msgid "&Configuration..."
 msgstr ""
 
-#: src/main.c:1326
+#: src/main.c:1331
 msgid "c&Onfirmation..."
 msgstr ""
 
-#: src/main.c:1327
+#: src/main.c:1332
 msgid "&Display bits..."
 msgstr ""
 
-#: src/main.c:1329
+#: src/main.c:1334
 msgid "learn &Keys..."
 msgstr ""
 
-#: src/main.c:1332
+#: src/main.c:1337
 msgid "&Virtual FS..."
 msgstr ""
 
-#: src/main.c:1335
+#: src/main.c:1340
 msgid "&Save setup"
 msgstr ""
 
-#: src/main.c:1351 src/main.c:1353
+#: src/main.c:1356 src/main.c:1358
 msgid " &Left "
 msgstr ""
 
-#: src/main.c:1353
+#: src/main.c:1358
 msgid " &Above "
 msgstr ""
 
-#: src/main.c:1356
+#: src/main.c:1361
 msgid " &File "
 msgstr ""
 
-#: src/main.c:1357
+#: src/main.c:1362
 msgid " &Command "
 msgstr ""
 
-#: src/main.c:1358
+#: src/main.c:1363
 msgid " &Options "
 msgstr ""
 
-#: src/main.c:1360 src/main.c:1362
+#: src/main.c:1365 src/main.c:1367
 msgid " &Right "
 msgstr ""
 
-#: src/main.c:1362
+#: src/main.c:1367
 msgid " &Below "
 msgstr ""
 
-#: src/main.c:1417
+#: src/main.c:1422
 msgid " Information "
 msgstr ""
 
-#: src/main.c:1418
+#: src/main.c:1423
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -4603,156 +4606,144 @@
 " the details.                                           "
 msgstr ""
 
-#: src/main.c:1692 src/screen.c:2298 src/screen.c:2328
+#: src/main.c:1697 src/screen.c:2302 src/screen.c:2332
 msgid "Menu"
 msgstr ""
 
-#: src/main.c:1897
+#: src/main.c:1902
 msgid "Thank you for using GNU Midnight Commander"
 msgstr ""
 
-#: src/main.c:2256
+#: src/main.c:2261
 #, c-format
 msgid "with mouse support on xterm%s.\n"
 msgstr ""
 
-#: src/main.c:2257
+#: src/main.c:2262
 msgid " and the Linux console"
 msgstr ""
 
-#: src/main.c:2352
+#: src/main.c:2357
 msgid "The TERM environment variable is unset!\n"
 msgstr ""
 
-#: src/main.c:2559
+#: src/main.c:2564
 #, c-format
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr ""
 
-#: src/main.c:2570
+#: src/main.c:2575
 msgid ""
 "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n"
 msgstr ""
 
-#: src/main.c:2649
+#: src/main.c:2652
 msgid "Use to debug the background code"
 msgstr ""
 
-#: src/main.c:2655
+#: src/main.c:2658
 msgid "Request to run in color mode"
 msgstr ""
 
-#: src/main.c:2657
+#: src/main.c:2660
 msgid "Specifies a color configuration"
 msgstr ""
 
-#: src/main.c:2662
+#: src/main.c:2665
 msgid "Edits one file"
 msgstr ""
 
-#: src/main.c:2666
+#: src/main.c:2669
 msgid "Displays this help message"
 msgstr ""
 
-#: src/main.c:2669
+#: src/main.c:2672
 msgid "Displays a help screen on how to change the color scheme"
 msgstr ""
 
-#: src/main.c:2672
+#: src/main.c:2675
 msgid "Log ftp dialog to specified file"
 msgstr ""
 
-#: src/main.c:2679
+#: src/main.c:2682
 msgid "Obsolete"
 msgstr ""
 
-#: src/main.c:2681
+#: src/main.c:2684
 msgid "Requests to run in black and white"
 msgstr ""
 
-#: src/main.c:2683
+#: src/main.c:2686
 msgid "Disable mouse support in text version"
 msgstr ""
 
-#: src/main.c:2686
+#: src/main.c:2689
 msgid "Disables subshell support"
 msgstr ""
 
-#: src/main.c:2690
+#: src/main.c:2693
 msgid "Prints working directory at program exit"
 msgstr ""
 
-#: src/main.c:2692
+#: src/main.c:2695
 msgid "Resets soft keys on HP terminals"
 msgstr ""
 
-#: src/main.c:2694
+#: src/main.c:2697
 msgid "To run on slow terminals"
 msgstr ""
 
-#: src/main.c:2697
+#: src/main.c:2700
 msgid "Use stickchars to draw"
 msgstr ""
 
-#: src/main.c:2701
+#: src/main.c:2704
 msgid "Enables subshell support (default)"
 msgstr ""
 
-#: src/main.c:2706
+#: src/main.c:2709
 msgid "Tries to use termcap instead of terminfo"
 msgstr ""
 
-#: src/main.c:2710
+#: src/main.c:2713
 msgid "Displays the current version"
 msgstr ""
 
-#: src/main.c:2712
+#: src/main.c:2715
 msgid "Launches the file viewer on a file"
 msgstr ""
 
-#: src/main.c:2714
+#: src/main.c:2717
 msgid "Forces xterm features"
 msgstr ""
 
-#: src/main.c:2716
+#: src/main.c:2719
 msgid "Geometry for the window"
 msgstr ""
 
-#: src/main.c:2716
+#: src/main.c:2719
 msgid "GEOMETRY"
 msgstr ""
 
-#: src/main.c:2717
+#: src/main.c:2720
 msgid "No windows opened at startup"
 msgstr ""
 
-#: src/main.c:2718
-msgid "Force activation even if a server is already running"
-msgstr ""
-
-#: src/main.c:2720
-msgid "Displays the directory that holds the .links startup files"
+#: src/main.c:2722
+msgid "Display the directory that holds the .links startup files and exit"
 msgstr ""
 
-#: src/main.c:2996
+#: src/main.c:3022
 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:3072
-msgid ""
-"You are running the GNOME Midnight Commander as root. \n"
-"\n"
-"You will not be protected from severly damaging your system\n"
-"if you continue."
-msgstr ""
-
-#: src/main.c:3087
+#: src/main.c:3100
 msgid " Notice "
 msgstr ""
 
-#: src/main.c:3088
+#: src/main.c:3101
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -4957,27 +4948,27 @@
 msgid "  %s bytes in %d file%s"
 msgstr ""
 
-#: src/screen.c:1299
+#: src/screen.c:1303
 msgid "Unknow tag on display format: "
 msgstr ""
 
-#: src/screen.c:2061
+#: src/screen.c:2065
 msgid " Do you really want to execute? "
 msgstr ""
 
-#: src/screen.c:2076
+#: src/screen.c:2080
 msgid " No action taken "
 msgstr ""
 
-#: src/screen.c:2302 src/screen.c:2332 src/tree.c:1026
+#: src/screen.c:2306 src/screen.c:2336 src/tree.c:1026
 msgid "RenMov"
 msgstr ""
 
-#: src/screen.c:2303 src/screen.c:2333 src/tree.c:1030
+#: src/screen.c:2307 src/screen.c:2337 src/tree.c:1030
 msgid "Mkdir"
 msgstr ""
 
-#: src/screen.c:2319
+#: src/screen.c:2323
 #, c-format
 msgid ""
 " Can't chdir to %s \n"
@@ -5561,7 +5552,7 @@
 msgid "ftpfs: abort failed"
 msgstr ""
 
-#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1333
+#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1332
 msgid "ftpfs: CWD failed."
 msgstr ""
 
@@ -5573,42 +5564,42 @@
 msgid "Resolving symlink..."
 msgstr ""
 
-#: vfs/ftpfs.c:1324
+#: vfs/ftpfs.c:1323
 #, c-format
 msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"
 msgstr ""
 
-#: vfs/ftpfs.c:1326
+#: vfs/ftpfs.c:1325
 #, c-format
 msgid "ftpfs: Reading FTP directory %s..."
 msgstr ""
 
-#: vfs/ftpfs.c:1345
+#: vfs/ftpfs.c:1344
 msgid "ftpfs: FAIL"
 msgstr ""
 
-#: vfs/ftpfs.c:1436
+#: vfs/ftpfs.c:1435
 msgid "ftpfs: reading FTP directory interrupt by user"
 msgstr ""
 
-#: vfs/ftpfs.c:1465
+#: vfs/ftpfs.c:1464
 msgid "ftpfs: got listing"
 msgstr ""
 
-#: vfs/ftpfs.c:1478
+#: vfs/ftpfs.c:1477
 msgid "ftpfs: failed"
 msgstr ""
 
-#: vfs/ftpfs.c:1495
+#: vfs/ftpfs.c:1494
 msgid "ftpfs: failed; nowhere to fallback to"
 msgstr ""
 
-#: vfs/ftpfs.c:1559
+#: vfs/ftpfs.c:1558
 #, c-format
 msgid "ftpfs: storing file %d (%d)"
 msgstr ""
 
-#: vfs/ftpfs.c:1995 vfs/ftpfs.c:2010
+#: vfs/ftpfs.c:1994 vfs/ftpfs.c:2009
 msgid ""
 "~/.netrc file has not correct mode.\n"
 "Remove password or correct mode."
Binary files old/mc-4.5.28/po/no.gmo and new/mc-4.5.29/po/no.gmo differ
diff -ruN old/mc-4.5.28/po/no.po new/mc-4.5.29/po/no.po
--- old/mc-4.5.28/po/no.po	Fri Mar 26 15:30:48 1999
+++ new/mc-4.5.29/po/no.po	Tue Mar 30 01:34:50 1999
@@ -1,13 +1,13 @@
 # Norwegian translation of Midnight Commander (bokmål dialect)
 # Copyright (C) 1998, 1999 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@fib.hl.no>, 1998, 1999.
+# Kjartan Maraas <kmaraas@online.no>, 1998, 1999.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mc 4.5.27\n"
-"POT-Creation-Date: 1999-03-19 10:22+0100\n"
-"PO-Revision-Date: 1999-03-19 10:30+0100\n"
-"Last-Translator: Kjartan Maraas <kmaraas@fib.hl.no>\n"
+"Project-Id-Version: mc 4.5.28\n"
+"POT-Creation-Date: 1999-03-28 23:52+0200\n"
+"PO-Revision-Date: 1999-03-29 00:04+0100\n"
+"Last-Translator: Kjartan Maraas <kmaraas@online.no>\n"
 "Language-Team: Norwegian <no@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
@@ -23,7 +23,7 @@
 
 #. Input line for a single key press follows the ':'
 #: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148
-#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:716
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:718
 msgid " Press macro hotkey: "
 msgstr " Trykk hurtigtast for makro: "
 
@@ -35,135 +35,135 @@
 msgid " Press any key: "
 msgstr " Trykk en tast: "
 
-#: gnome/gcmd.c:56
+#: gnome/gcmd.c:57
 msgid " There is no other panel to compare contents to "
 msgstr " Det er ingen andre paneler å sammenligne innholdet med "
 
-#: gnome/gcmd.c:112
+#: gnome/gcmd.c:113
 msgid "GNU Midnight Commander"
 msgstr "GNU Midnight Commander"
 
-#: gnome/gcmd.c:115
+#: gnome/gcmd.c:116
 msgid "The GNOME edition of the Midnight Commander file manager."
 msgstr "GNOME utgaven av Midnight Commander filbehandleren."
 
-#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2067
+#: gnome/gcmd.c:128 src/main.c:847 src/screen.c:2060
 msgid " The Midnight Commander "
 msgstr " Midnight Commander "
 
-#: gnome/gcmd.c:128 src/main.c:845
+#: gnome/gcmd.c:129 src/main.c:848
 msgid " Do you really want to quit the Midnight Commander? "
 msgstr " Vil du virkelig avslutte Midnight Commander? "
 
-#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
-#: src/file.c:2231 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:602 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
 #: src/view.c:404
 msgid "&Yes"
 msgstr "&Ja"
 
-#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1859
-#: src/file.c:2231 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846
-#: src/screen.c:2069 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
+#: gnome/gcmd.c:130 gtkedit/editcmd.c:2269 src/cmd.c:251 src/file.c:1859
+#: src/file.c:2233 src/filegui.c:601 src/hotlist.c:1035 src/main.c:849
+#: src/screen.c:2062 src/subshell.c:706 src/subshell.c:732 src/tree.c:755
 #: src/view.c:404
 msgid "&No"
 msgstr "&Nei"
 
-#: gnome/gcmd.c:268
+#: gnome/gcmd.c:269
 msgid "Sort By"
 msgstr "Sorter etter"
 
 #. we define this up here so we can pass it in to our callback
-#: gnome/gcmd.c:273
+#: gnome/gcmd.c:274
 msgid "Ignore case sensitivity."
-msgstr "Ikke skill mellom s&tore/små tegn"
+msgstr "Ikke skill mellom store/små tegn"
 
-#: gnome/gcmd.c:281 gnome/gcustom-layout.c:42 src/chmod.c:150 src/screen.c:425
+#: gnome/gcmd.c:282 gnome/gcustom-layout.c:43 src/chmod.c:150 src/screen.c:395
 msgid "Name"
 msgstr "Navn"
 
-#: gnome/gcmd.c:288
+#: gnome/gcmd.c:289
 msgid "File Type"
 msgstr "Filtype"
 
-#: gnome/gcmd.c:294 gnome/gcustom-layout.c:46 src/screen.c:426
-#: src/screen.c:427
+#: gnome/gcmd.c:295 gnome/gcustom-layout.c:47 src/screen.c:396
+#: src/screen.c:397
 msgid "Size"
 msgstr "Størrelse"
 
-#: gnome/gcmd.c:300
+#: gnome/gcmd.c:301
 msgid "Time Last Accessed"
 msgstr "Tid for siste aksess"
 
-#: gnome/gcmd.c:306
+#: gnome/gcmd.c:307
 msgid "Time Last Modified"
 msgstr "Tid for siste modifikasjon"
 
-#: gnome/gcmd.c:312
+#: gnome/gcmd.c:313
 msgid "Time Last Changed"
 msgstr "Tid for siste endring"
 
-#: gnome/gcmd.c:326
+#: gnome/gcmd.c:327
 msgid "Reverse the order."
 msgstr "Reverser rekkefølgen."
 
-#: gnome/gcmd.c:389
+#: gnome/gcmd.c:390
 msgid "Enter name."
 msgstr "Skriv inn navn."
 
-#: gnome/gcmd.c:395
+#: gnome/gcmd.c:396
 msgid "Enter label for command:"
 msgstr "Skriv inn kommandomerkelapp:"
 
-#: gnome/gcmd.c:494
+#: gnome/gcmd.c:495
 msgid "Find all core files"
 msgstr "Finn alle core-filer"
 
-#: gnome/gcmd.c:497 src/panelize.c:350
+#: gnome/gcmd.c:498 src/panelize.c:350
 msgid "Find rejects after patching"
 msgstr "Finn avviste etter patching"
 
-#: gnome/gcmd.c:541
+#: gnome/gcmd.c:542
 msgid "Run Command"
 msgstr "Kjør kommando"
 
 #. Frame 1
-#: gnome/gcmd.c:546
+#: gnome/gcmd.c:547
 msgid "Preset Commands"
 msgstr "Forhåndsinnstilte kommandoer"
 
 #. add add/remove buttons in center
-#: gnome/gcmd.c:563 gnome/gcustom-layout.c:181
+#: gnome/gcmd.c:564 gnome/gcustom-layout.c:185
 msgid "Add"
 msgstr "Legg til"
 
-#: gnome/gcmd.c:567 gnome/gcustom-layout.c:182
+#: gnome/gcmd.c:568 gnome/gcustom-layout.c:186
 msgid "Remove"
 msgstr "Fjern"
 
 #. Frame 2
-#: gnome/gcmd.c:575
+#: gnome/gcmd.c:576
 msgid "Run this Command"
 msgstr "Kjør denne kommandoen"
 
-#: gnome/gcmd.c:582
+#: gnome/gcmd.c:583
 msgid "Command: "
 msgstr "Kommando: "
 
-#: gnome/gcmd.c:645
+#: gnome/gcmd.c:646
 msgid "Set Filter"
 msgstr "Sett filter"
 
-#: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700
-#: gnome/gscreen.c:2516
+#: gnome/gcmd.c:651 gnome/gcmd.c:692 gnome/gcmd.c:697 gnome/gcmd.c:701
+#: gnome/gscreen.c:2525
 msgid "Show all files"
 msgstr "Vis alle filer"
 
-#: gnome/gcmd.c:657
+#: gnome/gcmd.c:658
 msgid "."
 msgstr "."
 
-#: gnome/gcmd.c:673
+#: gnome/gcmd.c:674
 msgid ""
 "Enter a filter here for files in the panel view.\n"
 "\n"
@@ -175,169 +175,199 @@
 "For eksempel:\n"
 "*.gif vil kun vise gif bilder"
 
-#: gnome/gcmd.c:675
+#: gnome/gcmd.c:676
 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/gcmd.c:732
+#: gnome/gcmd.c:733
 msgid " Open with..."
 msgstr " Åpne med..."
 
-#: gnome/gcmd.c:733
+#: gnome/gcmd.c:734
 msgid "Enter extra arguments:"
 msgstr "Skriv inn ekstra argumenter:"
 
-#: gnome/gcustom-layout.c:35
+#: gnome/gcmd.c:796
+msgid "Desktop entry properties"
+msgstr "Egenskaper for skrivebordsoppføring"
+
+#: gnome/gcustom-layout.c:36
 msgid "Access Time"
 msgstr "Aksesstid"
 
-#: gnome/gcustom-layout.c:36
+#: gnome/gcustom-layout.c:37
 msgid "Creation Time"
 msgstr "Opprettelsestid"
 
 #. Group
-#: gnome/gcustom-layout.c:37 gnome/gnome-file-property-dialog.c:776
+#: gnome/gcustom-layout.c:38 gnome/gnome-file-property-dialog.c:776
 #: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405
-#: src/screen.c:439
+#: src/screen.c:409
 msgid "Group"
 msgstr "Gruppe"
 
-#: gnome/gcustom-layout.c:38
+#: gnome/gcustom-layout.c:39
 msgid "Group ID"
 msgstr "Gruppe-ID"
 
-#: gnome/gcustom-layout.c:39
+#: gnome/gcustom-layout.c:40
 msgid "Inode Number"
 msgstr "Inode nummer"
 
-#: gnome/gcustom-layout.c:40 src/achown.c:378
+#: gnome/gcustom-layout.c:41 src/achown.c:378
 msgid "Mode"
 msgstr "Modus"
 
-#: gnome/gcustom-layout.c:41
+#: gnome/gcustom-layout.c:42
 msgid "Modification Time"
 msgstr "Modifikasjonstid"
 
-#: gnome/gcustom-layout.c:43
+#: gnome/gcustom-layout.c:44
 msgid "Number of Hard Links"
 msgstr "Antall harde lenker"
 
 #. Owner
-#: gnome/gcustom-layout.c:44 gnome/gnome-file-property-dialog.c:925
-#: gnome/gprop.c:390 src/screen.c:438
+#: gnome/gcustom-layout.c:45 gnome/gnome-file-property-dialog.c:925
+#: gnome/gprop.c:390 src/screen.c:408
 msgid "Owner"
 msgstr "Eier"
 
-#: gnome/gcustom-layout.c:45 src/screen.c:432
+#: gnome/gcustom-layout.c:46 src/screen.c:402
 msgid "Permission"
 msgstr "Rettighet"
 
-#: gnome/gcustom-layout.c:47
+#: gnome/gcustom-layout.c:48
 msgid "Size (short)"
 msgstr "Størrelse (kort)"
 
-#: gnome/gcustom-layout.c:48
+#: gnome/gcustom-layout.c:49
 msgid "Type"
 msgstr "Type"
 
-#: gnome/gcustom-layout.c:49
+#: gnome/gcustom-layout.c:50
 msgid "User ID"
 msgstr "Bruker-ID"
 
-#: gnome/gcustom-layout.c:140
+#: gnome/gcustom-layout.c:144
 msgid "Possible Columns"
 msgstr "Mulige kolonner"
 
-#: gnome/gcustom-layout.c:160
+#: gnome/gcustom-layout.c:164
 msgid "Displayed Columns"
 msgstr "Synlige kolonner"
 
-#: gnome/gcustom-layout.c:299
+#: gnome/gcustom-layout.c:306
 msgid "Custom View"
 msgstr "Egendefinert visning"
 
-#: gnome/gdesktop.c:420 gnome/gdesktop.c:2070
+#: gnome/gdesktop.c:416 gnome/gdesktop.c:2067
 msgid "Warning"
 msgstr "Advarsel"
 
-#: gnome/gdesktop.c:421
+#: gnome/gdesktop.c:417
 #, c-format
 msgid "Could not open %s; will not have desktop icons"
 msgstr "Kunne ikke åpne %s; vil ikke ha skrivebordsikoner"
 
-#: gnome/gdesktop.c:1014
+#: gnome/gdesktop.c:1010
 msgid "While running the mount/umount command"
 msgstr "Under kjøring av mount/umount kommandoen"
 
-#: gnome/gdesktop.c:1083
+#: gnome/gdesktop.c:1079
 msgid "While running the eject command"
 msgstr "Under kjøring av eject kommandoen"
 
-#: gnome/gdesktop.c:1136 gnome/gicon.c:154 gnome/gtools.c:52
+#: gnome/gdesktop.c:1132 gnome/gicon.c:154 gnome/gtools.c:52
 msgid "Error"
 msgstr "Feil"
 
 #. Create the link to the user's home directory so that he will have an icon
-#: gnome/gdesktop.c:2066
+#: gnome/gdesktop.c:2063
 msgid "Home directory"
 msgstr "Hjemmekatalog"
 
-#: gnome/gdesktop.c:2071
+#: gnome/gdesktop.c:2068
 #, 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/gdesktop.c:2400 gnome/glayout.c:355
+#: gnome/gdesktop.c:2409
+msgid ""
+"Unable to locate the file:\n"
+"background-properties-capplet\n"
+"in your path.\n"
+"\n"
+"We are unable to set the background."
+msgstr ""
+"Kan ikke finne filen:\n"
+"background-properties-capplet\n"
+"i stien din.\n"
+"\n"
+"Kan ikke sette bakgrunnen."
+
+#: gnome/gdesktop.c:2418 gnome/glayout.c:361
 msgid "_Terminal"
 msgstr "_Terminal"
 
-#: gnome/gdesktop.c:2400 gnome/glayout.c:355
+#: gnome/gdesktop.c:2418 gnome/glayout.c:361
 msgid "Launch a new terminal in the current directory"
 msgstr "Starter en ny terminal i aktiv katalog"
 
 #. If this ever changes, make sure you update create_new_menu accordingly.
-#: gnome/gdesktop.c:2402 gnome/glayout.c:357
+#: gnome/gdesktop.c:2420 gnome/glayout.c:363
 msgid "_Directory..."
 msgstr "Katalog..."
 
-#: gnome/gdesktop.c:2402 gnome/glayout.c:357
+#: gnome/gdesktop.c:2420 gnome/glayout.c:363
 msgid "Creates a new directory"
 msgstr "Oppretter en ny katalog"
 
-#: gnome/gdesktop.c:2410 gnome/glayout.c:440
+#: gnome/gdesktop.c:2421
+msgid "_Launcher..."
+msgstr "_Oppstarter..."
+
+#: gnome/gdesktop.c:2421
+msgid "Creates a new launcher"
+msgstr "Oppretter en ny oppstarter"
+
+#: gnome/gdesktop.c:2429 gnome/glayout.c:448
 msgid "Arrange Icons"
 msgstr "Plasser ikonene"
 
-#: gnome/gdesktop.c:2411
+#: gnome/gdesktop.c:2430
 msgid "Create New Window"
 msgstr "Opprett nytt vindu"
 
-#: gnome/gdesktop.c:2413
-msgid "Rescan Mountable Devices"
-msgstr "Oppdater moterbare enheter"
+#: gnome/gdesktop.c:2432
+msgid "Recreate Desktop Shortcuts"
+msgstr "Lag skrivebordsnarveiene på nytt"
 
-#: gnome/gdesktop.c:2414 gnome/glayout.c:443
+#: gnome/gdesktop.c:2433 gnome/glayout.c:451
 msgid "Rescan Desktop"
 msgstr "Oppdater skrivebordet"
 
-#: gnome/gdialogs.c:59
+#: gnome/gdesktop.c:2434
+msgid "Configure Background Image"
+msgstr "Konfigurer bakgrunnsbilde"
+
+#: gnome/gdialogs.c:60
 msgid "To: "
 msgstr "Til: "
 
-#: gnome/gdialogs.c:60
+#: gnome/gdialogs.c:61
 msgid "Copying from: "
 msgstr "Kopierer fra: "
 
-#: gnome/gdialogs.c:61
+#: gnome/gdialogs.c:62
 msgid "Deleting file: "
 msgstr "Sletter fil: "
 
-#: gnome/gdialogs.c:368
+#: gnome/gdialogs.c:370
 msgid "Files Exist"
 msgstr "Filene eksisterer"
 
-#: gnome/gdialogs.c:383
+#: gnome/gdialogs.c:385
 msgid ""
 "Some of the files you are trying to copy already exist in the destination "
 "folder.  Please select the action to be performed."
@@ -345,77 +375,77 @@
 "Noen av filene du forsøker å kopiere eksisterer allerede i målkatalogen.Vær "
 "snill og velg handling som skal utføres."
 
-#: gnome/gdialogs.c:396
+#: gnome/gdialogs.c:398
 msgid "Prompt me before overwriting any file."
 msgstr "Spør meg før filer overskrives."
 
-#: gnome/gdialogs.c:403
+#: gnome/gdialogs.c:405
 msgid "Don't overwrite any files."
 msgstr "Ikke overskriv filer."
 
-#: gnome/gdialogs.c:419
+#: gnome/gdialogs.c:421
 msgid "Overwrite:"
 msgstr "Overskriv:"
 
-#: gnome/gdialogs.c:426
+#: gnome/gdialogs.c:428
 msgid "Older files."
 msgstr "Eldre filer."
 
-#: gnome/gdialogs.c:432
+#: gnome/gdialogs.c:434
 msgid "Files only if size differs."
 msgstr "Filer bare hvis størrelsen er forskjellig."
 
-#: gnome/gdialogs.c:438
+#: gnome/gdialogs.c:440
 msgid "All files."
 msgstr "Alle filer."
 
-#: gnome/gdialogs.c:478
+#: gnome/gdialogs.c:480
 msgid "File Exists"
 msgstr "Filen eksisterer"
 
-#: gnome/gdialogs.c:484
+#: gnome/gdialogs.c:486
 #, c-format
 msgid "The target file already exists: %s"
 msgstr "Målfilen eksisterer allerede: %s"
 
-#: gnome/gdialogs.c:491
+#: gnome/gdialogs.c:493
 msgid "Replace it?"
 msgstr "Erstatt den?"
 
-#: gnome/gdialogs.c:565 gtkedit/editwidget.c:1067 src/file.c:802
-#: src/screen.c:2308 src/screen.c:2338 src/tree.c:1024
+#: gnome/gdialogs.c:567 gtkedit/editwidget.c:1069 src/file.c:802
+#: src/screen.c:2301 src/screen.c:2331 src/tree.c:1024
 msgid "Copy"
 msgstr "Kopier"
 
-#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1068
+#: gnome/gdialogs.c:570 gtkedit/editwidget.c:1070
 msgid "Move"
 msgstr "Flytt"
 
-#: gnome/gdialogs.c:585
+#: gnome/gdialogs.c:587
 msgid "Destination"
 msgstr "Mål"
 
-#: gnome/gdialogs.c:589
+#: gnome/gdialogs.c:591
 msgid "Find Destination Folder"
 msgstr "Finn målkatalog"
 
-#: gnome/gdialogs.c:594
+#: gnome/gdialogs.c:596
 msgid "Copy as a background process"
 msgstr "Kopier i bakgrunnen"
 
-#: gnome/gdialogs.c:614
+#: gnome/gdialogs.c:616
 msgid "Advanced Options"
 msgstr "Avanserte alternativer"
 
-#: gnome/gdialogs.c:618
+#: gnome/gdialogs.c:620
 msgid "Preserve symlinks"
 msgstr "Behold symbolske lenker"
 
-#: gnome/gdialogs.c:628
+#: gnome/gdialogs.c:630
 msgid "Follow links."
 msgstr "Følg lenker"
 
-#: gnome/gdialogs.c:634
+#: gnome/gdialogs.c:636
 msgid ""
 "Selecting this will copy the files that symlinks point to instead of just "
 "copying the link."
@@ -423,23 +453,23 @@
 "Dette valget vil kopiere filene som symlenken peker til i stedet for bare å "
 "kopiere lenken."
 
-#: gnome/gdialogs.c:639
+#: gnome/gdialogs.c:641
 msgid "Preserve file attributes."
 msgstr "Behold filattributter."
 
-#: gnome/gdialogs.c:644
+#: gnome/gdialogs.c:646
 msgid "Preserves the permissions and the UID/GID if possible"
 msgstr "Tar vare på rettighetene og UID/GID hvis mulig"
 
-#: gnome/gdialogs.c:650
+#: gnome/gdialogs.c:652
 msgid "Recursively copy subdirectories."
 msgstr "Kopier kataloger rekursivt."
 
-#: gnome/gdialogs.c:655
+#: gnome/gdialogs.c:657
 msgid "If set, this will copy the directories recursively"
 msgstr "Hvis satt, vil dette kopiere katalogen rekursivt"
 
-#: gnome/gdialogs.c:759
+#: gnome/gdialogs.c:761
 #, c-format
 msgid ""
 "%s\n"
@@ -450,56 +480,58 @@
 "\n"
 "Katalogen er ikke tom. Slett den rekursivt?"
 
-#: gnome/gdialogs.c:768 src/file.c:2226
+#: gnome/gdialogs.c:770 src/file.c:2228
 msgid " Delete: "
 msgstr " Slett: "
 
-#: gnome/gdialogs.c:772
+#: gnome/gdialogs.c:774
 msgid "Do the same for the rest"
 msgstr "Gjør det samme for resten"
 
-#: gnome/gdialogs.c:841
+#: gnome/gdialogs.c:843
 msgid "Move Progress"
 msgstr "Fremgang for flytting"
 
-#: gnome/gdialogs.c:844
+#: gnome/gdialogs.c:846
 msgid "Copy Progress"
 msgstr "Fremgang for kopiering"
 
-#: gnome/gdialogs.c:847
+#: gnome/gdialogs.c:849
 msgid "Delete Progress"
 msgstr "Fremgang for sletting"
 
-#: gnome/gdialogs.c:892
+#: gnome/gdialogs.c:894
 msgid "File "
 msgstr "Fil "
 
-#: gnome/gdialogs.c:896
-msgid " is "
-msgstr " er "
-
-#: gnome/gdialogs.c:899
-msgid " Done."
-msgstr " Ferdig."
-
-#: gnome/gdialogs.c:959 src/wtools.c:585 vfs/vfs.c:1762
+#: gnome/gdialogs.c:898
+msgid "is "
+msgstr "er "
+
+#: gnome/gdialogs.c:901
+msgid "done."
+msgstr "ferdig."
+
+#. Translators should take care as "Password" or its translations
+#. are used to identify password boxes and hide characters with "*"
+#: gnome/gdialogs.c:961 src/wtools.c:587 vfs/vfs.c:1762
 msgid "Password:"
 msgstr "Passord:"
 
-#: gnome/gdialogs.c:959 src/wtools.c:585
+#: gnome/gdialogs.c:961
 msgid "Password"
 msgstr "Passord"
 
 #. Create the dialog
-#: gnome/gdialogs.c:991
+#: gnome/gdialogs.c:993
 msgid "Symbolic Link"
 msgstr "Symbolsk lenke"
 
-#: gnome/gdialogs.c:1007 src/boxes.c:803
+#: gnome/gdialogs.c:1009 src/boxes.c:803
 msgid "Existing filename (filename symlink will point to):"
 msgstr "Eksisterende filnavn (filnavnet symlinken skal peke til):"
 
-#: gnome/gdialogs.c:1021 src/boxes.c:801
+#: gnome/gdialogs.c:1023 src/boxes.c:801
 msgid "Symbolic link filename:"
 msgstr "Filnavn for symbolsk lenke:"
 
@@ -614,148 +646,156 @@
 "Trykk OK for å terminere applikasjonen, eller avbryt for å fortsette."
 
 #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"),  N_("Opens an FTP site"), ftplink_cmd },
-#: gnome/glayout.c:378
+#: gnome/glayout.c:384
 msgid "_Copy..."
 msgstr "Kopier..."
 
-#: gnome/glayout.c:378
+#: gnome/glayout.c:384
 msgid "Copy files"
 msgstr "Kopier filer"
 
-#: gnome/glayout.c:379
+#: gnome/glayout.c:385
 msgid "_Delete..."
 msgstr "Slett..."
 
-#: gnome/glayout.c:379
+#: gnome/glayout.c:385
 msgid "Delete files"
 msgstr "Slett filer"
 
-#: gnome/glayout.c:380
+#: gnome/glayout.c:386
 msgid "_Move..."
 msgstr "Flytt..."
 
-#: gnome/glayout.c:380
+#: gnome/glayout.c:386
 msgid "Rename or move files"
 msgstr "Omdøp eller flytt filer"
 
-#: gnome/glayout.c:382
+#: gnome/glayout.c:388
 msgid "Show directory sizes"
 msgstr "Vis katalogstørrelser"
 
-#: gnome/glayout.c:382
+#: gnome/glayout.c:388
 msgid "Shows the disk space used by each directory"
 msgstr "Viser hvor mye diskplass som brukes av hver katalog"
 
-#: gnome/glayout.c:389
+#: gnome/glayout.c:395
 msgid "Select _All"
 msgstr "Velg alle"
 
-#: gnome/glayout.c:389
+#: gnome/glayout.c:395
 msgid "Select all files in the current Panel"
 msgstr "Velg alle filer i aktivt panel"
 
-#: gnome/glayout.c:391
+#: gnome/glayout.c:397
 msgid "_Select Files..."
 msgstr "Velg filer..."
 
-#: gnome/glayout.c:391
+#: gnome/glayout.c:397
 msgid "Select a group of files"
 msgstr "Velg en gruppe av filer"
 
-#: gnome/glayout.c:392
+#: gnome/glayout.c:398
 msgid "_Invert Selection"
-msgstr "Reverser valg"
+msgstr "_Reverser valg"
 
-#: gnome/glayout.c:392
+#: gnome/glayout.c:398
 msgid "Reverses the list of tagged files"
 msgstr "Reverserer listen med merkede filer"
 
-#: gnome/glayout.c:394
+#: gnome/glayout.c:400
 msgid "_Rescan Directory"
 msgstr "Oppdater kataloginnholdet"
 
-#: gnome/glayout.c:394
+#: gnome/glayout.c:400
 msgid "Rescan the directory contents"
 msgstr "Oppdater kataloginnholdet"
 
-#: gnome/glayout.c:401
+#: gnome/glayout.c:407
 msgid "_Sort By..."
 msgstr "Sorter etter..."
 
-#: gnome/glayout.c:401
+#: gnome/glayout.c:407
 msgid "Confirmation settings"
 msgstr "Innstillinger for bekreftelse"
 
-#: gnome/glayout.c:402
+#: gnome/glayout.c:408
 msgid "_Filter View..."
 msgstr "Filtrert visning..."
 
-#: gnome/glayout.c:402
+#: gnome/glayout.c:408
 msgid "Global option settings"
 msgstr "Innstillinger for globale alternativer"
 
-#: gnome/glayout.c:409
+#: gnome/glayout.c:415
 msgid "_Find File..."
 msgstr "Finn fil..."
 
-#: gnome/glayout.c:409
+#: gnome/glayout.c:415
 msgid "Locate files on disk"
 msgstr "Lokaliser filer på disken"
 
 #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels },
-#: gnome/glayout.c:412
+#: gnome/glayout.c:418
+msgid "_Edit mime types..."
+msgstr "R_ediger mime-typer..."
+
+#: gnome/glayout.c:418
+msgid "Edits the MIME type bindings"
+msgstr "Redigerer MIME-type bindingene"
+
+#: gnome/glayout.c:420
 msgid "_Run Command..."
-msgstr "Kjør kommando..."
+msgstr "_Kjør kommando..."
 
-#: gnome/glayout.c:412
+#: gnome/glayout.c:420
 msgid "Runs a command"
 msgstr "Kjører en kommando"
 
-#: gnome/glayout.c:414
+#: gnome/glayout.c:422
 msgid "_Run Command in panel..."
-msgstr "Kjør kommando i panelet..."
+msgstr "_Kjør kommando i panelet..."
 
-#: gnome/glayout.c:414
+#: gnome/glayout.c:422
 msgid "Run a command and put the results in a panel"
 msgstr "Kjør en kommando og legg resultatene i panelet"
 
-#: gnome/glayout.c:424
+#: gnome/glayout.c:432
 msgid "_Background jobs..."
-msgstr "Bakgrunnsjobber..."
+msgstr "_Bakgrunnsjobber..."
 
-#: gnome/glayout.c:424
+#: gnome/glayout.c:432
 msgid "List of background operations"
 msgstr "Liste over bakgrunnsjobber"
 
-#: gnome/glayout.c:427
+#: gnome/glayout.c:435
 msgid "Exit"
 msgstr "Avslutt"
 
-#: gnome/glayout.c:427
+#: gnome/glayout.c:435
 msgid "Terminates the file manager and the desktop"
 msgstr "Terminerer filbehandleren og skrivebordet"
 
-#: gnome/glayout.c:442
+#: gnome/glayout.c:450
 msgid "Rescan System Devices"
 msgstr "Oppdater systemenhetene"
 
-#: gnome/glayout.c:450 gnome/glayout.c:460
+#: gnome/glayout.c:458 gnome/glayout.c:468
 msgid "_Layout"
 msgstr "_Utseende"
 
-#: gnome/glayout.c:451 gnome/glayout.c:461
+#: gnome/glayout.c:459 gnome/glayout.c:469
 msgid "_Commands"
 msgstr "_Kommandoer"
 
-#: gnome/glayout.c:452
+#: gnome/glayout.c:460
 msgid "_Desktop"
 msgstr "S_krivebord"
 
-#: gnome/glayout.c:453 gnome/glayout.c:462
+#: gnome/glayout.c:461 gnome/glayout.c:470
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: gnome/glayout.c:600
+#: gnome/glayout.c:610
 msgid "File/New/Directory..."
 msgstr "Fil/Ny/Katalog..."
 
@@ -866,7 +906,7 @@
 msgstr "Handlig ved slipp"
 
 #: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194
-#: src/screen.c:2306 src/screen.c:2336
+#: src/screen.c:2299 src/screen.c:2329
 msgid "View"
 msgstr "Se på"
 
@@ -879,7 +919,7 @@
 msgstr "Bruk standard handling for visning"
 
 #: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196
-#: src/screen.c:2307 src/screen.c:2337 src/view.c:1991
+#: src/screen.c:2300 src/screen.c:2330 src/view.c:1991
 msgid "Edit"
 msgstr "Rediger"
 
@@ -951,6 +991,10 @@
 msgid "Sticky"
 msgstr "Sticky"
 
+#: gnome/gnome-file-property-dialog.c:914
+msgid "File ownership"
+msgstr "Eierskap for fil"
+
 #: gnome/gnome-file-property-dialog.c:1074
 msgid "URL"
 msgstr "URL"
@@ -1025,8 +1069,8 @@
 msgid "Copy..."
 msgstr "Kopier..."
 
-#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1070 src/screen.c:2311
-#: src/screen.c:2341
+#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2304
+#: src/screen.c:2334
 msgid "Delete"
 msgstr "Slett"
 
@@ -1040,7 +1084,7 @@
 
 #: gnome/gpopup2.c:202
 msgid "Symlink..."
-msgstr "Symlenken..."
+msgstr "Symlenke..."
 
 #: gnome/gpopup2.c:203
 msgid "Edit Symlink..."
@@ -1174,160 +1218,160 @@
 msgid "Select icon"
 msgstr "Velg ikon"
 
-#: gnome/gscreen.c:1468
+#: gnome/gscreen.c:1472
 msgid "Rescan Directory"
 msgstr "Oppdater kataloginnholdet"
 
-#: gnome/gscreen.c:1468
+#: gnome/gscreen.c:1472
 msgid "Reloads the current directory"
 msgstr "Leser aktiv katalog på nytt"
 
-#: gnome/gscreen.c:1470
+#: gnome/gscreen.c:1474
 msgid "New folder"
 msgstr "Ny katalog"
 
-#: gnome/gscreen.c:1470
+#: gnome/gscreen.c:1474
 msgid "Creates a new folder here"
 msgstr "Oppretter en ny katalog her"
 
-#: gnome/gscreen.c:1648
+#: gnome/gscreen.c:1652
 msgid "All files"
 msgstr "Alle filer"
 
-#: gnome/gscreen.c:1650
+#: gnome/gscreen.c:1654
 msgid "Archives and compressed files"
 msgstr "Arkiver og komprimerte filer"
 
-#: gnome/gscreen.c:1652
+#: gnome/gscreen.c:1656
 msgid "RPM/DEB files"
 msgstr "RPM/DEB filer"
 
-#: gnome/gscreen.c:1654
+#: gnome/gscreen.c:1658
 msgid "Text/Document files"
 msgstr "Tekst-/dokumentfiler"
 
-#: gnome/gscreen.c:1656
+#: gnome/gscreen.c:1660
 msgid "HTML and SGML files"
 msgstr "HTML- og SGML-filer"
 
-#: gnome/gscreen.c:1658
+#: gnome/gscreen.c:1662
 msgid "Postscript and PDF files"
 msgstr "Postscript- of PDF-filer"
 
-#: gnome/gscreen.c:1660
+#: gnome/gscreen.c:1664
 msgid "Spreadsheet files"
 msgstr "Regnearkfiler"
 
-#: gnome/gscreen.c:1662
+#: gnome/gscreen.c:1666
 msgid "Image files"
 msgstr "Bildefiler"
 
-#: gnome/gscreen.c:1665
+#: gnome/gscreen.c:1669
 msgid "Video/animation files"
 msgstr "Video-/animasjonsfiler"
 
-#: gnome/gscreen.c:1667
+#: gnome/gscreen.c:1671
 msgid "Audio files"
 msgstr "Lydfiler"
 
-#: gnome/gscreen.c:1669
+#: gnome/gscreen.c:1673
 msgid "C program files"
 msgstr "C programfiler"
 
-#: gnome/gscreen.c:1671
+#: gnome/gscreen.c:1675
 msgid "C++ program files"
 msgstr "C++ programfiler"
 
-#: gnome/gscreen.c:1673
+#: gnome/gscreen.c:1677
 msgid "Objective-C program files"
 msgstr "Objektiv-C programfiler"
 
-#: gnome/gscreen.c:1675
+#: gnome/gscreen.c:1679
 msgid "Scheme program files"
 msgstr "Scheme programfiler"
 
-#: gnome/gscreen.c:1677
+#: gnome/gscreen.c:1681
 msgid "Assembler program files"
 msgstr "Assembler programfiler"
 
-#: gnome/gscreen.c:1679
+#: gnome/gscreen.c:1683
 msgid "Misc. program files"
 msgstr "Forskj. programfiler"
 
-#: gnome/gscreen.c:1681
+#: gnome/gscreen.c:1685
 msgid "Font files"
 msgstr "Skrifttypefiler"
 
-#: gnome/gscreen.c:1808
+#: gnome/gscreen.c:1812
 #, c-format
 msgid "Search: %s"
 msgstr "Søk: %s"
 
-#: gnome/gscreen.c:1818
+#: gnome/gscreen.c:1822
 #, c-format
 msgid "%s bytes in %d file"
 msgstr "%s bytes i %d fil"
 
-#: gnome/gscreen.c:1818
+#: gnome/gscreen.c:1822
 #, c-format
 msgid "%s bytes in %d files"
 msgstr "%s bytes i %d filer"
 
-#: gnome/gscreen.c:1844 src/screen.c:677
+#: gnome/gscreen.c:1848 src/screen.c:670
 msgid "<readlink failed>"
 msgstr "<readlink feilet>"
 
-#: gnome/gscreen.c:1898
+#: gnome/gscreen.c:1902
 msgid "Filter"
 msgstr "Filter"
 
-#: gnome/gscreen.c:2338
+#: gnome/gscreen.c:2347
 msgid "Back"
 msgstr "Tilbake"
 
-#: gnome/gscreen.c:2338
+#: gnome/gscreen.c:2347
 msgid "Go to the previously visited directory"
 msgstr "Gå til tidligere vist katalog"
 
-#: gnome/gscreen.c:2340
+#: gnome/gscreen.c:2349
 msgid "Up"
 msgstr "Opp"
 
-#: gnome/gscreen.c:2340
+#: gnome/gscreen.c:2349
 msgid "Go up a level in the directory heirarchy"
 msgstr "Gå opp ett nivå i kataloghierarkiet"
 
-#: gnome/gscreen.c:2342
+#: gnome/gscreen.c:2351
 msgid "Forward"
 msgstr "Fremover"
 
-#: gnome/gscreen.c:2342
+#: gnome/gscreen.c:2351
 msgid "Go to the next directory"
 msgstr "Gå til neste katalog"
 
-#: gnome/gscreen.c:2345 src/tree.c:1020
+#: gnome/gscreen.c:2354 src/tree.c:1020
 msgid "Rescan"
 msgstr "Oppdater"
 
-#: gnome/gscreen.c:2345
+#: gnome/gscreen.c:2354
 msgid "Rescan the current directory"
 msgstr "Oppdater aktiv katalog"
 
-#: gnome/gscreen.c:2348
+#: gnome/gscreen.c:2357
 msgid "Home"
 msgstr "Hjemme"
 
-#: gnome/gscreen.c:2348
+#: gnome/gscreen.c:2357
 msgid "Go to your home directory"
 msgstr "Gå til din hjemmekatalog"
 
-#: gnome/gscreen.c:2494
+#: gnome/gscreen.c:2503
 msgid "Location:"
 msgstr "Sted:"
 
 #. 1
-#: gnome/gtools.c:110 gtkedit/editcmd.c:342 gtkedit/editcmd.c:1185
-#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69
+#: gnome/gtools.c:110 gtkedit/editcmd.c:344 gtkedit/editcmd.c:1187
+#: gtkedit/editcmd.c:1272 gtkedit/editcmd.c:2868 gtkedit/editoptions.c:71
 #: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466
 #: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898
 #: src/filegui.c:838 src/find.c:171 src/layout.c:369 src/option.c:144
@@ -1411,11 +1455,11 @@
 msgid "help"
 msgstr "hjelp"
 
-#: gnome/gwidget.c:96 src/file.c:2250
+#: gnome/gwidget.c:96 src/file.c:2252
 msgid "yes"
 msgstr "ja"
 
-#: gnome/gwidget.c:98 src/file.c:2248
+#: gnome/gwidget.c:98 src/file.c:2250
 msgid "no"
 msgstr "nei"
 
@@ -1428,31 +1472,31 @@
 msgstr "avbryt"
 
 #. The file-name is printed after the ':'
-#: 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:1945 gtkedit/editwidget.c:950 src/dir.c:386
-#: src/screen.c:2326 src/tree.c:692 src/tree.c:698 src/wtools.c:222
+#: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240
+#: gtkedit/edit.c:247 gtkedit/edit.c:253 gtkedit/edit.c:310 gtkedit/edit.c:346
+#: gtkedit/editcmd.c:1954 gtkedit/editwidget.c:952 src/dir.c:386
+#: src/screen.c:2319 src/tree.c:692 src/tree.c:698 src/wtools.c:222
 #: vfs/fish.c:224
 msgid " Error "
 msgstr " Feil "
 
-#: gtkedit/edit.c:129 gtkedit/edit.c:231
+#: gtkedit/edit.c:131 gtkedit/edit.c:233
 msgid " Failed trying to open file for reading: "
 msgstr " Feil under åpning av fil for lesing: "
 
-#: gtkedit/edit.c:238
+#: gtkedit/edit.c:240
 msgid " Cannot get size/permissions info on file: "
 msgstr " Kan ikke finne størrelse-/rettighetsinformasjon for filen: "
 
-#: gtkedit/edit.c:245
+#: gtkedit/edit.c:247
 msgid " Not an ordinary file: "
 msgstr " Ikke en vanlig fil: "
 
-#: gtkedit/edit.c:251
+#: gtkedit/edit.c:253
 msgid " File is too large: "
 msgstr " Filen er for stor: "
 
-#: gtkedit/edit.c:252
+#: gtkedit/edit.c:254
 msgid ""
 " \n"
 " Increase edit.h:MAXBUF and recompile the editor. "
@@ -1460,25 +1504,25 @@
 " \n"
 " Gjør edit.h:MAXBUF større og rekompiler editoren. "
 
-#: gtkedit/edit.c:308 gtkedit/edit.c:344
+#: gtkedit/edit.c:310 gtkedit/edit.c:346
 msgid " Error allocating memory "
 msgstr " Feil under minneallokering "
 
-#: gtkedit/editcmd.c:335
+#: gtkedit/editcmd.c:337
 msgid "Quick save "
 msgstr "Hurtiglagring"
 
-#: gtkedit/editcmd.c:336
+#: gtkedit/editcmd.c:338
 msgid "Safe save "
 msgstr "Trygg lagring"
 
-#: gtkedit/editcmd.c:337
+#: gtkedit/editcmd.c:339
 msgid "Do backups -->"
 msgstr "Lag sikkerhetskopi -->"
 
 #. NLS  for hotkeys?
-#: gtkedit/editcmd.c:340 gtkedit/editcmd.c:1137 gtkedit/editcmd.c:1183
-#: gtkedit/editcmd.c:1268 gtkedit/editcmd.c:2845 gtkedit/editoptions.c:66
+#: gtkedit/editcmd.c:342 gtkedit/editcmd.c:1139 gtkedit/editcmd.c:1185
+#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2866 gtkedit/editoptions.c:68
 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376
 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781
 #: src/chmod.c:114 src/chown.c:79 src/cmd.c:856 src/filegui.c:821
@@ -1488,114 +1532,114 @@
 msgid "&Cancel"
 msgstr "&Avbryt"
 
-#: gtkedit/editcmd.c:346
+#: gtkedit/editcmd.c:348
 msgid "Extension:"
 msgstr "Utvidelse:"
 
 #. NLS ?
-#: gtkedit/editcmd.c:353
+#: gtkedit/editcmd.c:355
 msgid " Edit Save Mode "
 msgstr " Rediger lagringsmodus "
 
-#: gtkedit/editcmd.c:477
+#: gtkedit/editcmd.c:479
 msgid " Save As "
 msgstr " Lagre som "
 
 #. Warning message with a query to continue or cancel the operation
-#: gtkedit/editcmd.c:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:619
-#: src/help.c:318 src/main.c:691 src/screen.c:2083 src/subshell.c:705
+#: gtkedit/editcmd.c:493 gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086 src/ext.c:301 src/file.c:619
+#: src/help.c:318 src/main.c:694 src/screen.c:2076 src/subshell.c:705
 #: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:463
 #: vfs/mcfs.c:170
 msgid " Warning "
 msgstr " Advarsel "
 
-#: gtkedit/editcmd.c:492
+#: gtkedit/editcmd.c:494
 msgid " A file already exists with this name. "
 msgstr " En fil med dette navnet eksisterer allerede. "
 
 #. Push buttons to over-write the current file, or cancel the operation
-#: gtkedit/editcmd.c:494
+#: gtkedit/editcmd.c:496
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: gtkedit/editcmd.c:494 gtkedit/editcmd.c:556 gtkedit/editcmd.c:783
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:496 gtkedit/editcmd.c:558 gtkedit/editcmd.c:785
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: gtkedit/editcmd.c:1581
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: gtkedit/editcmd.c:510
+#: gtkedit/editcmd.c:512
 msgid " Save as "
 msgstr " Lagre som "
 
-#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2615
+#: gtkedit/editcmd.c:512 gtkedit/editcmd.c:2636
 msgid " Error trying to save file. "
 msgstr " Feil under lagring av fil. "
 
 #. This heads the delete macro error dialog box
-#: gtkedit/editcmd.c:626 gtkedit/editcmd.c:634 gtkedit/editcmd.c:659
+#: gtkedit/editcmd.c:628 gtkedit/editcmd.c:636 gtkedit/editcmd.c:661
 msgid " Delete macro "
 msgstr " Slett makro "
 
 #. 'Open' = load temp file
-#: gtkedit/editcmd.c:628
+#: gtkedit/editcmd.c:630
 msgid " Error trying to open temp file "
 msgstr " Feil under åpning av midlertidig fil "
 
 #. 'Open' = load temp file
-#: gtkedit/editcmd.c:636 gtkedit/editcmd.c:697 gtkedit/editcmd.c:765
+#: gtkedit/editcmd.c:638 gtkedit/editcmd.c:699 gtkedit/editcmd.c:767
 msgid " Error trying to open macro file "
 msgstr " Feil under åpning av makrofil "
 
-#: gtkedit/editcmd.c:641 gtkedit/editcmd.c:649 gtkedit/editcmd.c:685
-#: gtkedit/editcmd.c:740
+#: gtkedit/editcmd.c:643 gtkedit/editcmd.c:651 gtkedit/editcmd.c:687
+#: gtkedit/editcmd.c:742
 #, c-format
 msgid "key '%d 0': "
 msgstr "tast '%d 0': "
 
-#: gtkedit/editcmd.c:660
+#: gtkedit/editcmd.c:662
 msgid " Error trying to overwrite macro file "
 msgstr " Feil under overskriving av makrofil "
 
 #. This heads the 'Macro' dialog box
-#: gtkedit/editcmd.c:677
+#: gtkedit/editcmd.c:679
 msgid " Macro "
 msgstr " Makro "
 
 #. Input line for a single key press follows the ':'
-#: gtkedit/editcmd.c:679
+#: gtkedit/editcmd.c:681
 msgid " Press the macro's new hotkey: "
 msgstr " Trykk makroens nye hurtigtast: "
 
 #. This heads the 'Save Macro' dialog box
-#: gtkedit/editcmd.c:697
+#: gtkedit/editcmd.c:699
 msgid " Save macro "
 msgstr " Lagre makro "
 
-#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:714
+#: gtkedit/editcmd.c:709 gtkedit/editcmd.c:716
 msgid " Delete Macro "
 msgstr " Slett makro "
 
 #. This heads the 'Load Macro' dialog box
-#: gtkedit/editcmd.c:764
+#: gtkedit/editcmd.c:766
 msgid " Load macro "
 msgstr " Last makro "
 
-#: gtkedit/editcmd.c:778 gtkedit/editcmd.c:780
+#: gtkedit/editcmd.c:780 gtkedit/editcmd.c:782
 msgid " Confirm save file? : "
 msgstr " Bekreft lagre fil? : "
 
 #. Buttons to 'Confirm save file' query
-#: gtkedit/editcmd.c:783
+#: gtkedit/editcmd.c:785
 msgid " Save file "
 msgstr " Lagre fil "
 
-#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1987
+#: gtkedit/editcmd.c:785 gtkedit/editwidget.c:1066 src/view.c:1987
 msgid "Save"
 msgstr "Lagre"
 
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842
 msgid ""
 " Current text was modified without a file save. \n"
 " Continue discards these changes. "
@@ -1603,223 +1647,234 @@
 " Teksten er endret uten å ha vært lagret. \n"
 " Fortsett forkaster disse endringene. "
 
-#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987
-#: src/main.c:3067
+#: gtkedit/editcmd.c:812 gtkedit/editcmd.c:842 gtkedit/editcmd.c:989
+#: src/main.c:3076
 msgid "Continue"
 msgstr "Fortsett"
 
 #. Heads the 'Load' file dialog box
-#: gtkedit/editcmd.c:829 gtkedit/editcmd.c:843
+#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:845
 msgid " Load "
 msgstr " Last "
 
-#: gtkedit/editcmd.c:829
+#: gtkedit/editcmd.c:831
 msgid " Error trying to open file for reading "
 msgstr " Feil under åpning av fil for lesing "
 
-#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:989 gtkedit/editcmd.c:1086
 msgid " Block is large, you may not be able to undo this action. "
 msgstr " Blokken er for stor, du kan kanskje ikke angre denne handlingen. "
 
-#: gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:1086
 msgid " Continue "
 msgstr " Fortsett "
 
-#: gtkedit/editcmd.c:1084
+#: gtkedit/editcmd.c:1086
 msgid " Cancel "
 msgstr " Avbryt "
 
-#: gtkedit/editcmd.c:1139 src/filegui.c:596
+#: gtkedit/editcmd.c:1141 src/filegui.c:596
 msgid "al&L"
 msgstr "alle"
 
-#: gtkedit/editcmd.c:1141 src/file.c:2172 src/filegui.c:266
+#: gtkedit/editcmd.c:1143 src/file.c:2174 src/filegui.c:266
 msgid "&Skip"
 msgstr "&Hopp over"
 
-#: gtkedit/editcmd.c:1143
+#: gtkedit/editcmd.c:1145
 msgid "&Replace"
 msgstr "E&rstatt"
 
 #. This is for the confirm replace dialog box. The replaced string comes after the ':'
-#: gtkedit/editcmd.c:1149 gtkedit/editcmd.c:1576
+#: gtkedit/editcmd.c:1151 gtkedit/editcmd.c:1579
 msgid " Replace with: "
 msgstr " Erstatt med: "
 
-#: gtkedit/editcmd.c:1153
+#: gtkedit/editcmd.c:1155
 msgid " Confirm replace "
 msgstr " Bekreft erstatt "
 
-#: gtkedit/editcmd.c:1187 gtkedit/editcmd.c:1272
+#: gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1274
 msgid "scanf &Expression"
 msgstr "scanf uttrykk"
 
-#: gtkedit/editcmd.c:1189
+#: gtkedit/editcmd.c:1191
 msgid "replace &All"
 msgstr "erstatt alle"
 
-#: gtkedit/editcmd.c:1191
+#: gtkedit/editcmd.c:1193
 msgid "pr&Ompt on replace"
 msgstr "spør ved erstatning"
 
-#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274
+#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
 msgid "&Backwards"
 msgstr "Bakover"
 
-#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276
+#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
 msgid "&Regular expression"
 msgstr "Vanlig uttrykk"
 
-#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278
+#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280
 msgid "&Whole words only"
 msgstr "Kun hele ord"
 
-#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280
+#: gtkedit/editcmd.c:1201 gtkedit/editcmd.c:1282
 msgid "case &Sensitive"
 msgstr "skill mellom &store/små tegn"
 
-#: gtkedit/editcmd.c:1203
+#: gtkedit/editcmd.c:1205
 msgid " Enter replacement argument order eg. 3,2,1,4 "
 msgstr " Skriv inn argumentrekkefølge f.eks. 3,2,1,4 "
 
-#: gtkedit/editcmd.c:1207
+#: gtkedit/editcmd.c:1209
 msgid " Enter replacement string:"
 msgstr " Skriv inn erstatningsstreng:"
 
-#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1912
+#: gtkedit/editcmd.c:1213 gtkedit/editcmd.c:1286 src/view.c:1912
 msgid " Enter search string:"
 msgstr " Skriv inn søkestreng:"
 
 #. Heads the 'Replace' dialog box
-#: gtkedit/editcmd.c:1230 gtkedit/editcmd.c:1480 gtkedit/editcmd.c:1574
-#: gtkedit/editcmd.c:2107 gtkedit/editcmd.c:2138 gtkedit/editcmd.c:2140
+#: gtkedit/editcmd.c:1232 gtkedit/editcmd.c:1483 gtkedit/editcmd.c:1577
+#: gtkedit/editcmd.c:2128 gtkedit/editcmd.c:2159 gtkedit/editcmd.c:2161
 msgid " Replace "
 msgstr " Erstatt "
 
 #. Heads the 'Search' dialog box
-#: gtkedit/editcmd.c:1298 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2209
+#: gtkedit/editcmd.c:1300 gtkedit/editcmd.c:1477 gtkedit/editcmd.c:2230
 #: src/view.c:1467 src/view.c:1566 src/view.c:1688 src/view.c:1880
 #: src/view.c:1912
 msgid " Search "
 msgstr " Søk "
 
 #. An input line comes after the ':'
-#: gtkedit/editcmd.c:1348
+#: gtkedit/editcmd.c:1349
 msgid " Enter search text : "
 msgstr " Skriv inn søketekst : "
 
-#: gtkedit/editcmd.c:1355
+#: gtkedit/editcmd.c:1356
 msgid " Enter replace text : "
 msgstr " Skriv inn erstatningstekst : "
 
-#: gtkedit/editcmd.c:1359
-msgid " Enter argument order : "
-msgstr " Skriv inn argumentrekkefølge : "
+#: gtkedit/editcmd.c:1359 gtkedit/editcmd.c:1360
+#, c-format
+msgid ""
+"You can enter regexp substrings with %s (not \\1, \\2 like sed) then use "
+"\"Enter...order\""
+msgstr ""
+"Du kan skrive inn regexp understrenger med %s (ikke \\1, \\2 som sed) siden "
+"brukes \"Enter...order\""
+
+#: gtkedit/editcmd.c:1362
+msgid " Enter argument (or substring) order : "
+msgstr " Skriv inn argument- (eller understreng) rekkefølge : "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364
-msgid "Enter the order of replacement of your scanf format specifiers"
+#: gtkedit/editcmd.c:1366 gtkedit/editcmd.c:1367
+msgid ""
+"Enter the order of replacement of your scanf format specifiers or regexp "
+"substrings"
 msgstr "Skriv inn rekkefølgen for erstatningen av scanf ????"
 
 #. The following are check boxes
-#: gtkedit/editcmd.c:1369
+#: gtkedit/editcmd.c:1372
 msgid " Whole words only "
 msgstr " Bare hele ord "
 
-#: gtkedit/editcmd.c:1371
+#: gtkedit/editcmd.c:1374
 msgid " Case sensitive "
 msgstr " Skill mellom store og små bokstaver "
 
-#: gtkedit/editcmd.c:1374
+#: gtkedit/editcmd.c:1377
 msgid " Regular expression "
 msgstr " Vanlig uttrykk "
 
-#: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376
+#: gtkedit/editcmd.c:1378 gtkedit/editcmd.c:1379
 msgid "See the regex man page for how to compose a regular expression"
 msgstr ""
 "Se manualsiden for regex for eksempel på hvordan et vanlig uttrykk er satt "
 "sammen"
 
-#: gtkedit/editcmd.c:1382
+#: gtkedit/editcmd.c:1385
 msgid " Backwards "
 msgstr " Bakover "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385
+#: gtkedit/editcmd.c:1387 gtkedit/editcmd.c:1388
 msgid "Warning: Searching backward can be slow"
 msgstr "Advarsel: Søking bakover kan være tidkrevende"
 
-#: gtkedit/editcmd.c:1398
+#: gtkedit/editcmd.c:1401
 msgid " Prompt on replace "
 msgstr " Spør ved erstatning "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1400
+#: gtkedit/editcmd.c:1403
 msgid "Ask before making each replacement"
 msgstr "Spør før utførelse av hver erstatning"
 
-#: gtkedit/editcmd.c:1402
+#: gtkedit/editcmd.c:1405
 msgid " Replace all "
 msgstr " Erstatt alle "
 
-#: gtkedit/editcmd.c:1405
+#: gtkedit/editcmd.c:1408
 msgid " Scanf expression "
 msgstr " Scanf uttrykk "
 
 #. Tool hint
-#: gtkedit/editcmd.c:1407
+#: gtkedit/editcmd.c:1410
 msgid "Allows entering of a C format string, see the scanf man page"
 msgstr "Tillater inntasting av en streng i C format, se manualsiden for scanf"
 
 #. Tool hint
-#: gtkedit/editcmd.c:1412
+#: gtkedit/editcmd.c:1415
 msgid "Begin search, Enter"
 msgstr "Begynn søk, Linjeskift"
 
 #. Tool hint
-#: gtkedit/editcmd.c:1415
+#: gtkedit/editcmd.c:1418
 msgid "Abort this dialog, Esc"
 msgstr "Avbryt denne dialogen, Esc"
 
 #. Buttons for the confirm replace dialog box.
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:1581
 msgid "Replace"
 msgstr "Erstatt"
 
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:1581
 msgid "Skip"
 msgstr "Hopp over"
 
-#: gtkedit/editcmd.c:1578
+#: gtkedit/editcmd.c:1581
 msgid "Replace all"
 msgstr "Erstatt alle"
 
-#: gtkedit/editcmd.c:1945
+#: gtkedit/editcmd.c:1954
 msgid ""
 " Invalid regular expression, or scanf expression with to many conversions "
 msgstr ""
 " Ugyldig vanlig uttrykk, eller scanf uttrykk med for mange omsettinger "
 
 #. "Invalid regexp string or scanf string"
-#: gtkedit/editcmd.c:2109
+#: gtkedit/editcmd.c:2130
 msgid " Error in replacement format string. "
 msgstr " Feil i erstatningsstrengen for format. "
 
-#: gtkedit/editcmd.c:2137
+#: gtkedit/editcmd.c:2158
 #, c-format
 msgid " %ld replacements made. "
 msgstr " %ld erstatninger utført. "
 
-#: gtkedit/editcmd.c:2140 gtkedit/editcmd.c:2209
+#: gtkedit/editcmd.c:2161 gtkedit/editcmd.c:2230
 msgid " Search string not found. "
 msgstr " Søkestrengen ikke funnet. "
 
 #. Confirm 'Quit' dialog box
-#: gtkedit/editcmd.c:2233 gtkedit/editcmd.c:2248 gtkedit/editcmd.c:2251
+#: gtkedit/editcmd.c:2254 gtkedit/editcmd.c:2269 gtkedit/editcmd.c:2272
 msgid " Quit "
 msgstr " Avslutt "
 
-#: gtkedit/editcmd.c:2234 gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2255 gtkedit/editcmd.c:2273
 msgid ""
 " Current text was modified without a file save. \n"
 " Save with exit? "
@@ -1827,246 +1882,246 @@
 " Teksten er endret uten å ha vært lagret. \n"
 " Lagre ved avslutting? "
 
-#: gtkedit/editcmd.c:2248
+#: gtkedit/editcmd.c:2269
 msgid " File was modified, Save with exit? "
 msgstr " Filen ble endret, Lagre ved avslutting? "
 
-#: gtkedit/editcmd.c:2248
+#: gtkedit/editcmd.c:2269
 msgid "Cancel quit"
 msgstr "Avbryt avslutt"
 
-#: gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2273
 msgid " &Cancel quit "
 msgstr " &Avbryt avslutt "
 
-#: gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2273
 msgid " &Yes "
 msgstr " &Ja "
 
-#: gtkedit/editcmd.c:2252
+#: gtkedit/editcmd.c:2273
 msgid " &No "
 msgstr " &Nei "
 
-#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2530
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2551
 msgid " Copy to clipboard "
 msgstr " Kopier til utklippstavlen "
 
-#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2530
-#: gtkedit/editcmd.c:2543
+#: gtkedit/editcmd.c:2476 gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2551
+#: gtkedit/editcmd.c:2564
 msgid " Unable to save to file. "
 msgstr " Ute av stand til å lagre filen. "
 
-#: gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2543
+#: gtkedit/editcmd.c:2498 gtkedit/editcmd.c:2564
 msgid " Cut to clipboard "
 msgstr " Klipp ut til utklippstavlen "
 
-#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574
-#: gtkedit/editcmd.c:2577 src/view.c:1852
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598 src/view.c:1852
 msgid " Goto line "
 msgstr " Gå til linje "
 
-#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574
-#: gtkedit/editcmd.c:2577
+#: gtkedit/editcmd.c:2586 gtkedit/editcmd.c:2590 gtkedit/editcmd.c:2595
+#: gtkedit/editcmd.c:2598
 msgid " Enter line: "
 msgstr " Skriv inn linje: "
 
-#: gtkedit/editcmd.c:2598 gtkedit/editcmd.c:2615
+#: gtkedit/editcmd.c:2619 gtkedit/editcmd.c:2636
 msgid " Save Block "
 msgstr " Lagre blokk "
 
-#: gtkedit/editcmd.c:2649
+#: gtkedit/editcmd.c:2670
 msgid " Insert File "
 msgstr " Sett inn fil "
 
-#: gtkedit/editcmd.c:2664
+#: gtkedit/editcmd.c:2685
 msgid " Insert file "
 msgstr " Sett inn fil "
 
-#: gtkedit/editcmd.c:2664
+#: gtkedit/editcmd.c:2685
 msgid " Error trying to insert file. "
 msgstr " Feil under innsetting av fil. "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2684
+#: gtkedit/editcmd.c:2705
 msgid " Sort block "
 msgstr " Sorter blokk "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2684 gtkedit/editcmd.c:2738
+#: gtkedit/editcmd.c:2705 gtkedit/editcmd.c:2759
 msgid " You must first highlight a block of text. "
 msgstr " Du må først merke en tekstblokk. "
 
-#: gtkedit/editcmd.c:2691
+#: gtkedit/editcmd.c:2712
 msgid " Run Sort "
 msgstr " Kjør sortering "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2693
+#: gtkedit/editcmd.c:2714
 msgid " Enter sort options (see manpage) separated by whitespace: "
 msgstr " Skriv inn flagg for sortering (se manualside), skilt av tomrom: "
 
-#: gtkedit/editcmd.c:2704 gtkedit/editcmd.c:2710
+#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2731
 msgid " Sort "
 msgstr " Sorter "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2706
+#: gtkedit/editcmd.c:2727
 msgid " Error trying to execute sort command "
 msgstr " Feil under kjøring av sorteringskommando "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2712
+#: gtkedit/editcmd.c:2733
 msgid " Sort returned non-zero: "
 msgstr " Sortering returnerte ikke-null: "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2736 gtkedit/editcmd.c:2766
+#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2787
 msgid " Process block "
 msgstr " Prosesser blokk "
 
 #. Not essential to translate
-#: gtkedit/editcmd.c:2768
+#: gtkedit/editcmd.c:2789
 msgid " Error trying to stat file "
 msgstr " Feil under stat av fil "
 
-#: gtkedit/editcmd.c:2838
+#: gtkedit/editcmd.c:2859
 msgid " Mail "
 msgstr " Send "
 
-#: gtkedit/editcmd.c:2851
+#: gtkedit/editcmd.c:2872
 msgid " Copies to"
 msgstr " Kopier til:"
 
-#: gtkedit/editcmd.c:2855
+#: gtkedit/editcmd.c:2876
 msgid " Subject"
 msgstr " Emne "
 
-#: gtkedit/editcmd.c:2859
+#: gtkedit/editcmd.c:2880
 msgid " To"
 msgstr " Til"
 
-#: gtkedit/editcmd.c:2861
+#: gtkedit/editcmd.c:2882
 msgid " mail -s <subject> -c <cc> <to>"
 msgstr " mail -s <emne> -c <cc> <til>"
 
-#: gtkedit/editoptions.c:34
+#: gtkedit/editoptions.c:36
 msgid "Intuitive"
 msgstr "Intuitiv"
 
-#: gtkedit/editoptions.c:34
+#: gtkedit/editoptions.c:36
 msgid "Emacs"
 msgstr "Emacs"
 
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
 msgid "None"
 msgstr "Ingen"
 
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
 msgid "Dynamic paragraphing"
 msgstr "Dynamiske paragrafer"
 
-#: gtkedit/editoptions.c:37
+#: gtkedit/editoptions.c:39
 msgid "Type writer wrap"
 msgstr "Skrivemaskinsbryting"
 
 #. 2
-#: gtkedit/editoptions.c:72
+#: gtkedit/editoptions.c:74
 msgid "Word wrap line length : "
 msgstr "Linjelengde for ordbryting : "
 
 #. 4
-#: gtkedit/editoptions.c:78
+#: gtkedit/editoptions.c:80
 msgid "Tab spacing : "
 msgstr "Tabulatormellomrom : "
 
-#: gtkedit/editoptions.c:86
+#: gtkedit/editoptions.c:88
 msgid "synta&X highlighting"
 msgstr "syntaksutheving"
 
 #. 7
-#: gtkedit/editoptions.c:92
+#: gtkedit/editoptions.c:94
 msgid "confir&M before saving"
 msgstr "bekreft før lagring"
 
 #. 8
-#: gtkedit/editoptions.c:95
+#: gtkedit/editoptions.c:97
 msgid "fill tabs with &Spaces"
 msgstr "fyll tabulatorer med mellomrom"
 
 #. 9
-#: gtkedit/editoptions.c:98
+#: gtkedit/editoptions.c:100
 msgid "&Return does autoindent"
 msgstr "Linjeskift utfører autoindentering"
 
 #. 10
-#: gtkedit/editoptions.c:101
+#: gtkedit/editoptions.c:103
 msgid "&Backspace through tabs"
 msgstr "&Tilbake gjennom tabulatorer"
 
 #. 11
-#: gtkedit/editoptions.c:104
+#: gtkedit/editoptions.c:106
 msgid "&Fake half tabs"
 msgstr "&Falske halvtabulatorer"
 
 #. 13
-#: gtkedit/editoptions.c:110
+#: gtkedit/editoptions.c:112
 msgid "Wrap mode"
 msgstr "Brytningsmodus"
 
 #. 15
-#: gtkedit/editoptions.c:116
+#: gtkedit/editoptions.c:118
 msgid "Key emulation"
 msgstr "Tasteemulering"
 
-#: gtkedit/editoptions.c:157
+#: gtkedit/editoptions.c:159
 msgid " Editor options "
 msgstr " Alternativer for redigerer "
 
 #. Not essential to translate
-#: gtkedit/editwidget.c:310
+#: gtkedit/editwidget.c:312
 msgid "Error initialising editor.\n"
 msgstr "Feil under initialisering av editor.\n"
 
-#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2304
-#: src/screen.c:2334 src/tree.c:1018 src/view.c:1982
+#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1691 src/screen.c:2297
+#: src/screen.c:2327 src/tree.c:1018 src/view.c:1982
 msgid "Help"
 msgstr "Hjelp"
 
-#: gtkedit/editwidget.c:1065
+#: gtkedit/editwidget.c:1067
 msgid "Mark"
 msgstr "Marker"
 
-#: gtkedit/editwidget.c:1066
+#: gtkedit/editwidget.c:1068
 msgid "Replac"
 msgstr "Erstatt"
 
-#: gtkedit/editwidget.c:1069 src/view.c:1995
+#: gtkedit/editwidget.c:1071 src/view.c:1995
 msgid "Search"
 msgstr "Søk"
 
-#: gtkedit/editwidget.c:1072 src/main.c:1690
+#: gtkedit/editwidget.c:1074 src/main.c:1693
 msgid "PullDn"
 msgstr "Trekk ned"
 
-#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1691 src/view.c:1984
+#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1694 src/view.c:1984
 #: src/view.c:2004
 msgid "Quit"
 msgstr "Avslutt"
 
-#: gtkedit/editmenu.c:56
+#: gtkedit/editmenu.c:57
 msgid " Word wrap "
 msgstr " Ordbryting "
 
 #. Not essential to translate
-#: gtkedit/editmenu.c:58
+#: gtkedit/editmenu.c:59
 msgid " Enter line length, 0 for off: "
 msgstr " Skriv inn linjelengden, 0 for av: "
 
-#: gtkedit/editmenu.c:69
+#: gtkedit/editmenu.c:70
 msgid " About "
 msgstr " Om "
 
-#: gtkedit/editmenu.c:70
+#: gtkedit/editmenu.c:71
 msgid ""
 "\n"
 "                 Cooledit  v2.1\n"
@@ -2084,325 +2139,341 @@
 "       En brukervennlig tekst editor skrevet\n"
 "           for Midnight Commander.\n"
 
-#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134
+#: gtkedit/editmenu.c:119 gtkedit/editmenu.c:135
 msgid "&Open/load...     C-o"
 msgstr "&Åpne/laste...    C-o"
 
-#: gtkedit/editmenu.c:119
+#: gtkedit/editmenu.c:120
 msgid "&New              C-n"
 msgstr "&Ny               C-n"
 
-#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137
+#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
 msgid "&Save              F2"
 msgstr "&Lagre             F2"
 
-#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138
+#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139
 msgid "save &As...       F12"
 msgstr "l&Agre som...     F12"
 
-#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140
+#: gtkedit/editmenu.c:125 gtkedit/editmenu.c:141
 msgid "&Insert file...   F15"
 msgstr "sett &Inn fil...  F15"
 
-#: gtkedit/editmenu.c:125
+#: gtkedit/editmenu.c:126
 msgid "copy to &File...  C-f"
 msgstr "kopier til &Fil...C-f"
 
-#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143
+#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144
 msgid "a&Bout...            "
 msgstr "Om                   "
 
-#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145
+#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146
 msgid "&Quit             F10"
 msgstr "avslutt           F10"
 
-#: gtkedit/editmenu.c:135
+#: gtkedit/editmenu.c:136
 msgid "&New            C-x k"
 msgstr "&Ny             C-x k"
 
-#: gtkedit/editmenu.c:141
+#: gtkedit/editmenu.c:142
 msgid "copy to &File...     "
 msgstr "kopier til &Fil...   "
 
-#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167
+#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
 msgid "&Toggle Mark       F3"
 msgstr "slå av/på merking  F3"
 
-#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168
+#: gtkedit/editmenu.c:152 gtkedit/editmenu.c:169
 msgid "&Mark Columns    S-F3"
 msgstr "&Merk kolonner   S-F3"
 
-#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170
+#: gtkedit/editmenu.c:154 gtkedit/editmenu.c:171
 msgid "toggle &Ins/overw Ins"
 msgstr "slå av/på sett inn/overskriv Ins"
 
-#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172
+#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
 msgid "&Copy              F5"
 msgstr "Kopier             F5"
 
-#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173
+#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
 msgid "&Move              F6"
 msgstr "Flytt              F6"
 
-#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174
+#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175
 msgid "&Delete            F8"
 msgstr "Slett              F8"
 
-#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176
+#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177
 msgid "&Undo             C-u"
 msgstr "Angre             C-u"
 
-#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178
+#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
 msgid "&Beginning     C-PgUp"
 msgstr "&Begynnelsen   C-PgUp"
 
-#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179
+#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180
 msgid "&End           C-PgDn"
 msgstr "Slutt          C-PgDn"
 
-#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191
+#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
 msgid "&Search...         F7"
 msgstr "Søk...             F7"
 
-#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192
+#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
 msgid "search &Again     F17"
 msgstr "søk igjen         F17"
 
-#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193
+#: gtkedit/editmenu.c:187 gtkedit/editmenu.c:194
 msgid "&Replace...        F4"
 msgstr "Erstatt...         F4"
 
-#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220
+#: gtkedit/editmenu.c:199 gtkedit/editmenu.c:221
 msgid "&Goto line...            M-l"
 msgstr "Gå til linje...          M-l"
 
-#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222
+#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:223
 msgid "insert &Literal...       C-q"
 msgstr "sett inn &Literal...     C-q"
 
-#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224
+#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225
 msgid "&Refresh screen          C-l"
 msgstr "Oppdater skjermen        C-l"
 
-#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226
+#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
 msgid "&Start record macro      C-r"
 msgstr "&Start makroinnspilling  C-r"
 
-#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227
+#: gtkedit/editmenu.c:206 gtkedit/editmenu.c:228
 msgid "&Finish record macro...  C-r"
 msgstr "stopp makroinnspilling...C-r"
 
-#: gtkedit/editmenu.c:206
+#: gtkedit/editmenu.c:207
 msgid "&Execute macro...   C-a, KEY"
 msgstr "Kjør makro...       C-a, TAST"
 
-#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229
+#: gtkedit/editmenu.c:208 gtkedit/editmenu.c:230
 msgid "delete macr&O...            "
 msgstr "slett makro...              "
 
-#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231
+#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232
 msgid "insert &Date/time           "
 msgstr "sett inn dato/klokke        "
 
-#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233
+#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234
 msgid "format p&Aragraph        M-p"
 msgstr "formater p&Aragraf       M-p"
 
-#: gtkedit/editmenu.c:212
+#: gtkedit/editmenu.c:213
 msgid "'ispell' s&Pell check    C-p"
 msgstr "'ispell' stavekontroll   C-p"
 
-#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235
+#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
 msgid "sor&T...                 M-t"
 msgstr "sor&Ter...               M-t"
 
-#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236
+#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:237
 msgid "'indent' &C Formatter    F19"
 msgstr "'indent' C formatering   F19"
 
-#: gtkedit/editmenu.c:215
+#: gtkedit/editmenu.c:216
 msgid "&Mail...                    "
 msgstr "Send...                     "
 
-#: gtkedit/editmenu.c:228
+#: gtkedit/editmenu.c:229
 msgid "&Execute macro... C-x e, KEY"
 msgstr "Kjør makro...     C-x e, TAST"
 
-#: gtkedit/editmenu.c:234
+#: gtkedit/editmenu.c:235
 msgid "'ispell' s&Pell check    M-$"
 msgstr "'ispell' stavekontroll   M-$"
 
-#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252
+#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
 msgid "&General...  "
 msgstr "Generelt...  "
 
-#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253
+#: gtkedit/editmenu.c:245 gtkedit/editmenu.c:254
 msgid "&Save mode..."
 msgstr "Lagringsmodus..."
 
-#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1322
+#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1325
 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
+#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:392
 #: src/chmod.c:164 src/chown.c:130
 msgid " File "
 msgstr " Fil "
 
-#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407
+#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 gtkedit/editmenu.c:408
 msgid " Edit "
 msgstr " Rediger "
 
-#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276
+#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277
 msgid " Sear/Repl "
 msgstr " Søk/Erstatt "
 
-#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442
+#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 gtkedit/editmenu.c:448
 msgid " Command "
 msgstr " Kommando "
 
-#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278
+#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279
 msgid " Options "
 msgstr " Alternativer "
 
-#: gtkedit/editmenu.c:392
+#: gtkedit/editmenu.c:393
 msgid "Open...\tC-o"
 msgstr "Åpne...\tC-o"
 
-#: gtkedit/editmenu.c:393
+#: gtkedit/editmenu.c:394
 msgid "New\tC-n"
 msgstr "Ny\tC-n"
 
-#: gtkedit/editmenu.c:395
+#: gtkedit/editmenu.c:396
 msgid "Save\tF2"
 msgstr "Lagre\tF2"
 
-#: gtkedit/editmenu.c:396
+#: gtkedit/editmenu.c:397
 msgid "Save as...\tF12"
 msgstr "Lagre som...\tF12"
 
-#: gtkedit/editmenu.c:398
+#: gtkedit/editmenu.c:399
 msgid "Insert file...\tF15"
 msgstr "Sett inn fil...\tF15"
 
-#: gtkedit/editmenu.c:399
+#: gtkedit/editmenu.c:400
 msgid "Copy to file...\tC-f"
 msgstr "Kopier til fil...\tC-f"
 
 #. Tool hint
-#: gtkedit/editmenu.c:402
+#: gtkedit/editmenu.c:403
 msgid "Disk operations"
 msgstr "Diskoperasjoner"
 
-#: gtkedit/editmenu.c:408
+#: gtkedit/editmenu.c:409
 msgid "Toggle mark\tF3"
 msgstr "Slå av/på marker\tF3"
 
-#: gtkedit/editmenu.c:409
+#: gtkedit/editmenu.c:410
 msgid "Toggle mark columns\tC-b"
 msgstr "Slå av/på marker kolonner\tC-b"
 
-#: gtkedit/editmenu.c:411
+#: gtkedit/editmenu.c:412
+msgid "Toggle book mark\tC-M-Ins"
+msgstr "Slå av/på bokmerker\tC-M-Ins"
+
+#: gtkedit/editmenu.c:413
+msgid "Previous book mark\tC-M-Up"
+msgstr "Forrige bokmerke\tC-M-Opp"
+
+#: gtkedit/editmenu.c:414
+msgid "Next book mark\tC-M-Down"
+msgstr "Neste bokmerke\tC-M-Ned"
+
+#: gtkedit/editmenu.c:415
+msgid "Flush book marks"
+msgstr "Fjern bokmerker"
+
+#: gtkedit/editmenu.c:417
 msgid "Toggle insert/overwrite\tIns"
 msgstr "Slå av/på overskriv\tIns"
 
-#: gtkedit/editmenu.c:413
+#: gtkedit/editmenu.c:419
 msgid "Copy block to cursor\tF5"
 msgstr "Kopier blokk til markøren\tF5"
 
-#: gtkedit/editmenu.c:414
+#: gtkedit/editmenu.c:420
 msgid "Move block to cursor\tF6"
 msgstr "Flytt blokk til markøren\tF6"
 
-#: gtkedit/editmenu.c:415
+#: gtkedit/editmenu.c:421
 msgid "Delete block\tF8/C-Del"
 msgstr "Slett blokk\tF8/C-Del"
 
-#: gtkedit/editmenu.c:417
+#: gtkedit/editmenu.c:423
 msgid "Copy block to clipbrd\tC-Ins"
 msgstr "Kopier blokk til utklippstavle\tC-Ins"
 
-#: gtkedit/editmenu.c:418
+#: gtkedit/editmenu.c:424
 msgid "Cut block to clipbrd\tS-Del"
 msgstr "Klipp ut blokk til utklippstavle\tS-Del"
 
-#: gtkedit/editmenu.c:419
+#: gtkedit/editmenu.c:425
 msgid "Paste block from clipbrd\tS-Ins"
 msgstr "Lim inn blokk fra utklippstavlen\tS-Ins"
 
-#: gtkedit/editmenu.c:420
+#: gtkedit/editmenu.c:426
 msgid "Selection history\tM-Ins"
 msgstr "Utvalgshistorikk\tM-Ins"
 
-#: gtkedit/editmenu.c:422
+#: gtkedit/editmenu.c:428
 msgid "Undo\tC-BackSpace"
 msgstr "Angre\tC-Tilbake"
 
 #. Tool hint
-#: gtkedit/editmenu.c:425
+#: gtkedit/editmenu.c:431
 msgid "Manipulating blocks of text"
 msgstr "Manipulering av tekstblokker"
 
-#: gtkedit/editmenu.c:430
+#: gtkedit/editmenu.c:436
 msgid " Srch/Replce "
 msgstr " Søk/Erstatt "
 
-#: gtkedit/editmenu.c:431
+#: gtkedit/editmenu.c:437
 msgid "Search...\tF7"
 msgstr "Søk...\tF7"
 
-#: gtkedit/editmenu.c:432
+#: gtkedit/editmenu.c:438
 msgid "Search again\tF17"
 msgstr "Søk igjen\tF17"
 
-#: gtkedit/editmenu.c:433
+#: gtkedit/editmenu.c:439
 msgid "Replace...\tF4"
 msgstr "Erstatt...\tF4"
 
-#: gtkedit/editmenu.c:434
+#: gtkedit/editmenu.c:440
 msgid "Replace again\tF14"
 msgstr "Erstatt igjen\tF14"
 
 #. Tool hint
-#: gtkedit/editmenu.c:437
+#: gtkedit/editmenu.c:443
 msgid "Search for and replace text"
 msgstr "Søk etter og erstatt tekst"
 
-#: gtkedit/editmenu.c:443
+#: gtkedit/editmenu.c:449
 msgid "Goto line...\tM-l"
 msgstr "Gå til linje...\tM-l"
 
-#: gtkedit/editmenu.c:445
+#: gtkedit/editmenu.c:451
 msgid "Start record macro\tC-r"
 msgstr "Start makroinnspilling\tC-r"
 
-#: gtkedit/editmenu.c:446
+#: gtkedit/editmenu.c:452
 msgid "Finish record macro...\tC-r"
 msgstr "Avslutt makroinnspilling...\tC-r"
 
-#: gtkedit/editmenu.c:447
+#: gtkedit/editmenu.c:453
 msgid "Execute macro...\tC-a, KEY"
 msgstr "Kjør makro...\tC-a, TAST"
 
-#: gtkedit/editmenu.c:448
+#: gtkedit/editmenu.c:454
 msgid "Delete macro...\t"
 msgstr "Slett makro...\t"
 
-#: gtkedit/editmenu.c:450
+#: gtkedit/editmenu.c:456
 msgid "Insert date/time\tC-d"
 msgstr "Sett inn dato/klokkeslett\tC-d"
 
-#: gtkedit/editmenu.c:451
+#: gtkedit/editmenu.c:457
 msgid "Format paragraph\tM-p"
 msgstr "Formater paragraf\tM-p"
 
-#: gtkedit/editmenu.c:453
+#: gtkedit/editmenu.c:459
 msgid "Refresh display\tC-l"
 msgstr "Oppdater skjermen\tC-l"
 
 #. Tool hint
-#: gtkedit/editmenu.c:456
+#: gtkedit/editmenu.c:462
 msgid "Macros and internal commands"
 msgstr "Makroer og interne kommandoer"
 
@@ -2449,18 +2520,18 @@
 msgid "Search/Replace"
 msgstr "Søk/Erstatt"
 
-#: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187
+#: gtkedit/syntax.c:1339 gtkedit/syntax.c:1346
 msgid " Load syntax file "
 msgstr " Les syntaksfil "
 
-#: gtkedit/syntax.c:3180
+#: gtkedit/syntax.c:1339
 msgid " File access error "
 msgstr " Tilgangsfeil for fil "
 
-#: gtkedit/syntax.c:3186
+#: gtkedit/syntax.c:1345
 #, c-format
-msgid " Syntax error in file %s on line %d "
-msgstr " Syntaksfeil i filen %s ved linje %d "
+msgid " Error in file %s on line %d "
+msgstr " Feil i filen %s ved linje %d "
 
 #: src/achown.c:72 src/chmod.c:115 src/chown.c:80
 msgid "&Set"
@@ -2540,7 +2611,7 @@
 msgid "Background process:"
 msgstr "Bakgrunnsprosess:"
 
-#: src/background.c:287 src/file.c:2171
+#: src/background.c:287 src/file.c:2173
 msgid " Background process error "
 msgstr " Feil i bakgrunnsprosess "
 
@@ -3659,15 +3730,15 @@
 msgid " Sorry, I could not put the job in background "
 msgstr " Beklager, Jeg kunne ikke plassere jobben i bakgrunnen "
 
-#: src/file.c:1996 src/file.c:2080
+#: src/file.c:1997 src/file.c:2081
 msgid " Internal failure "
 msgstr " Intern feil "
 
-#: src/file.c:1996 src/file.c:2080
+#: src/file.c:1997 src/file.c:2081
 msgid " Unknown file operation "
 msgstr " Ukjent filoperasjon "
 
-#: src/file.c:2011
+#: src/file.c:2012
 #, c-format
 msgid ""
 " Destination \"%s\" must be a directory \n"
@@ -3676,15 +3747,15 @@
 " Målet \"%s\" må være en katalog \n"
 " %s "
 
-#: src/file.c:2172
+#: src/file.c:2174
 msgid "&Retry"
 msgstr "&Prøv igjen"
 
-#: src/file.c:2172 src/file.c:2233 src/filegui.c:263 src/filegui.c:591
+#: src/file.c:2174 src/file.c:2235 src/filegui.c:263 src/filegui.c:591
 msgid "&Abort"
 msgstr "&Avbryt"
 
-#: src/file.c:2224
+#: src/file.c:2226
 msgid ""
 "\n"
 "   Directory not empty.   \n"
@@ -3694,7 +3765,7 @@
 "   Katalogen er ikke tom. \n"
 "   Slett den rekursivt? "
 
-#: src/file.c:2225
+#: src/file.c:2227
 msgid ""
 "\n"
 "   Background process: Directory not empty \n"
@@ -3704,27 +3775,27 @@
 "   Bakgrunnsprosess: Katalogen er ikke tom. \n"
 "   Slett den rekursivt? "
 
-#: src/file.c:2232
+#: src/file.c:2234
 msgid "a&ll"
 msgstr "a&lle"
 
-#: src/file.c:2232 src/filegui.c:594
+#: src/file.c:2234 src/filegui.c:594
 msgid "non&E"
 msgstr "ing&En"
 
-#: src/file.c:2242
+#: src/file.c:2244
 msgid " Type 'yes' if you REALLY want to delete "
 msgstr " Skriv 'ja' hvis du VIRKELIG vil slette "
 
-#: src/file.c:2244
+#: src/file.c:2246
 msgid "all the directories "
 msgstr "alle katalogene "
 
-#: src/file.c:2246
+#: src/file.c:2248
 msgid " Recursive Delete "
 msgstr " Rekursiv sletting "
 
-#: src/file.c:2247
+#: src/file.c:2249
 msgid " Background process: Recursive Delete "
 msgstr " Bakgrunnsprosess: Rekursiv sletting "
 
@@ -3884,7 +3955,7 @@
 msgid "Content: "
 msgstr "Innhold: "
 
-#: src/find.c:171 src/main.c:1219 src/main.c:1240
+#: src/find.c:171 src/main.c:1222 src/main.c:1243
 msgid "&Tree"
 msgstr "Tre"
 
@@ -4455,7 +4526,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:692
+#: src/main.c:695
 msgid ""
 " The Commander can't change to the directory that \n"
 " the subshell claims you are in.  Perhaps you have \n"
@@ -4467,247 +4538,247 @@
 " arbeidskatalogen, eller gitt deg selv ekstra tilgangs- \n"
 " rettigheter med \"su\" kommandoen? "
 
-#: src/main.c:767
+#: src/main.c:770
 msgid "Press any key to continue..."
 msgstr "Trykk en tast for å fortsette..."
 
-#: src/main.c:817
+#: src/main.c:820
 msgid " The shell is already running a command "
 msgstr " Skallet kjører allerede en kommando "
 
-#: src/main.c:1216 src/main.c:1237
+#: src/main.c:1219 src/main.c:1240
 msgid "&Listing mode..."
 msgstr "Listemodus..."
 
-#: src/main.c:1217 src/main.c:1238
+#: src/main.c:1220 src/main.c:1241
 msgid "&Quick view     C-x q"
 msgstr "Rask visning   C-x q"
 
-#: src/main.c:1218 src/main.c:1239
+#: src/main.c:1221 src/main.c:1242
 msgid "&Info           C-x i"
 msgstr "Info           C-x i"
 
-#: src/main.c:1221 src/main.c:1242
+#: src/main.c:1224 src/main.c:1245
 msgid "&Sort order..."
 msgstr "Sorteringsrekkefølge..."
 
-#: src/main.c:1223 src/main.c:1244
+#: src/main.c:1226 src/main.c:1247
 msgid "&Filter..."
 msgstr "Filter..."
 
-#: src/main.c:1226 src/main.c:1247
+#: src/main.c:1229 src/main.c:1250
 msgid "&Network link..."
 msgstr "Nettverkskobling..."
 
-#: src/main.c:1227 src/main.c:1248
+#: src/main.c:1230 src/main.c:1251
 msgid "FT&P link..."
 msgstr "FTP kobling..."
 
-#: src/main.c:1231 src/main.c:1252
+#: src/main.c:1234 src/main.c:1255
 msgid "&Drive...       M-d"
 msgstr "Disk...        M-d"
 
-#: src/main.c:1233 src/main.c:1254
+#: src/main.c:1236 src/main.c:1257
 msgid "&Rescan         C-r"
 msgstr "Gjenles         C-r"
 
-#: src/main.c:1258
+#: src/main.c:1261
 msgid "&User menu          F2"
 msgstr "Brukermeny         F2"
 
-#: src/main.c:1259
+#: src/main.c:1262
 msgid "&View               F3"
 msgstr "Vis                F3"
 
-#: src/main.c:1260
+#: src/main.c:1263
 msgid "Vie&w file...         "
 msgstr "Vis fil...            "
 
-#: src/main.c:1261
+#: src/main.c:1264
 msgid "&Filtered view     M-!"
 msgstr "Filtrert visning  M-!"
 
-#: src/main.c:1262
+#: src/main.c:1265
 msgid "&Edit               F4"
 msgstr "Rediger            F4"
 
-#: src/main.c:1263
+#: src/main.c:1266
 msgid "&Copy               F5"
 msgstr "Kopier             F5"
 
-#: src/main.c:1264
+#: src/main.c:1267
 msgid "c&Hmod           C-x c"
 msgstr "chmod           C-x c"
 
-#: src/main.c:1266
+#: src/main.c:1269
 msgid "&Link            C-x l"
 msgstr "Lenke           C-x l"
 
-#: src/main.c:1267
+#: src/main.c:1270
 msgid "&SymLink         C-x s"
 msgstr "Symlenke        C-x s"
 
-#: src/main.c:1268
+#: src/main.c:1271
 msgid "edit s&Ymlink  C-x C-s"
 msgstr "rediger symlenke C-x C-s"
 
-#: src/main.c:1269
+#: src/main.c:1272
 msgid "ch&Own           C-x o"
 msgstr "chown           C-x o"
 
-#: src/main.c:1270
+#: src/main.c:1273
 msgid "&Advanced chown       "
 msgstr "Avansert chown       "
 
-#: src/main.c:1272
+#: src/main.c:1275
 msgid "&Rename/Move        F6"
 msgstr "Gi nytt navn/flytt F6"
 
-#: src/main.c:1273
+#: src/main.c:1276
 msgid "&Mkdir              F7"
 msgstr "Lag katalog        F7"
 
-#: src/main.c:1274
+#: src/main.c:1277
 msgid "&Delete             F8"
 msgstr "Slett              F8"
 
-#: src/main.c:1275
+#: src/main.c:1278
 msgid "&Quick cd          M-c"
 msgstr "rask cd            M-c"
 
-#: src/main.c:1277
+#: src/main.c:1280
 msgid "select &Group      M-+"
 msgstr "velg gruppe        M-+"
 
-#: src/main.c:1278
+#: src/main.c:1281
 msgid "u&Nselect group    M-\\"
 msgstr "velg bort gruppe   M-\\"
 
-#: src/main.c:1279
+#: src/main.c:1282
 msgid "reverse selec&Tion M-*"
 msgstr "reverser valg      M-*"
 
-#: src/main.c:1281
+#: src/main.c:1284
 msgid "e&Xit              F10"
 msgstr "avslutt            F10"
 
-#: src/main.c:1291
+#: src/main.c:1294
 msgid "&Directory tree"
 msgstr "Katalogtre"
 
-#: src/main.c:1293
+#: src/main.c:1296
 msgid "&Find file            M-?"
 msgstr "Finn fil             M-?"
 
-#: src/main.c:1294
+#: src/main.c:1297
 msgid "s&Wap panels          C-u"
 msgstr "bytt paneler          C-u"
 
-#: src/main.c:1295
+#: src/main.c:1298
 msgid "switch &Panels on/off C-o"
 msgstr "slå paneler på/av     C-o"
 
-#: src/main.c:1296
+#: src/main.c:1299
 msgid "&Compare directories  C-x d"
 msgstr "Sammenlign kataloger C-x d"
 
-#: src/main.c:1297
+#: src/main.c:1300
 msgid "e&Xternal panelize    C-x !"
 msgstr "eksternt panel  C-x !"
 
-#: src/main.c:1298
+#: src/main.c:1301
 msgid "show directory s&Izes"
 msgstr "vis katalogstørrelser"
 
-#: src/main.c:1300
+#: src/main.c:1303
 msgid "command &History"
 msgstr "kommandohistorikk"
 
-#: src/main.c:1301
+#: src/main.c:1304
 msgid "di&Rectory hotlist    C-\\"
 msgstr "kataloghurtigliste    C-\\"
 
-#: src/main.c:1303
+#: src/main.c:1306
 msgid "&Active VFS list      C-x a"
 msgstr "Aktivt VFS liste     C-x a"
 
-#: src/main.c:1306
+#: src/main.c:1309
 msgid "&Background jobs      C-x j"
 msgstr "Bakgrunnsjobber      C-x j"
 
-#: src/main.c:1310
+#: src/main.c:1313
 msgid "&Undelete files (ext2fs only)"
 msgstr "Gjenopprett filer (kun ext2fs)"
 
-#: src/main.c:1313
+#: src/main.c:1316
 msgid "&Listing format edit"
 msgstr "Redigering av listeformat"
 
-#: src/main.c:1315
+#: src/main.c:1318
 msgid "&Extension file edit"
 msgstr "Redigering av utvidelsesfil"
 
-#: src/main.c:1316
+#: src/main.c:1319
 msgid "&Menu file edit"
 msgstr "Menyfilredigering"
 
-#: src/main.c:1321
+#: src/main.c:1324
 msgid "&Configuration..."
 msgstr "Konfigurasjon..."
 
-#: src/main.c:1323
+#: src/main.c:1326
 msgid "c&Onfirmation..."
 msgstr "bekreftelse..."
 
-#: src/main.c:1324
+#: src/main.c:1327
 msgid "&Display bits..."
 msgstr "Tastaturdefinisjon..."
 
-#: src/main.c:1326
+#: src/main.c:1329
 msgid "learn &Keys..."
 msgstr "lær taster..."
 
-#: src/main.c:1329
+#: src/main.c:1332
 msgid "&Virtual FS..."
 msgstr "Virtuelt FS..."
 
-#: src/main.c:1332
+#: src/main.c:1335
 msgid "&Save setup"
 msgstr "Lagre oppsett"
 
-#: src/main.c:1348 src/main.c:1350
+#: src/main.c:1351 src/main.c:1353
 msgid " &Left "
 msgstr " Venstre "
 
-#: src/main.c:1350
+#: src/main.c:1353
 msgid " &Above "
 msgstr " Over "
 
-#: src/main.c:1353
+#: src/main.c:1356
 msgid " &File "
 msgstr " Fil "
 
-#: src/main.c:1354
+#: src/main.c:1357
 msgid " &Command "
 msgstr " Kommando "
 
-#: src/main.c:1355
+#: src/main.c:1358
 msgid " &Options "
 msgstr " Alternativer "
 
-#: src/main.c:1357 src/main.c:1359
+#: src/main.c:1360 src/main.c:1362
 msgid " &Right "
 msgstr " Høyre "
 
-#: src/main.c:1359
+#: src/main.c:1362
 msgid " &Below "
 msgstr " Under "
 
-#: src/main.c:1414
+#: src/main.c:1417
 msgid " Information "
 msgstr " Informasjon "
 
-#: src/main.c:1415
+#: src/main.c:1418
 msgid ""
 " Using the fast reload option may not reflect the exact \n"
 " directory contents. In this cases you'll need to do a  \n"
@@ -4719,136 +4790,140 @@
 " du utføre en manuell gjenlesing av katalogen. Se manualsiden for \n"
 " detaljene."
 
-#: src/main.c:1689 src/screen.c:2305 src/screen.c:2335
+#: src/main.c:1692 src/screen.c:2298 src/screen.c:2328
 msgid "Menu"
 msgstr "Meny"
 
-#: src/main.c:1894
+#: src/main.c:1897
 msgid "Thank you for using GNU Midnight Commander"
 msgstr "Takk for at du bruker GNU Midnight Commander"
 
-#: src/main.c:2253
+#: src/main.c:2256
 #, c-format
 msgid "with mouse support on xterm%s.\n"
 msgstr "med musstøtte i xterm%s.\n"
 
-#: src/main.c:2254
+#: src/main.c:2257
 msgid " and the Linux console"
 msgstr " og Linux konsollet"
 
-#: src/main.c:2349
+#: src/main.c:2352
 msgid "The TERM environment variable is unset!\n"
 msgstr "TERM miljøvariabelen er ikke satt!\n"
 
-#: src/main.c:2556
+#: src/main.c:2559
 #, c-format
 msgid "Library directory for the Midnight Commander: %s\n"
 msgstr "Bibliotekkatalog for Midnight Commander: %s\n"
 
-#: src/main.c:2567
+#: src/main.c:2570
 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:2646
+#: src/main.c:2649
 msgid "Use to debug the background code"
 msgstr "Bruk til å avluse bakgrunnskoden"
 
-#: src/main.c:2652
+#: src/main.c:2655
 msgid "Request to run in color mode"
 msgstr "Be om å kjøre i fargemodus"
 
-#: src/main.c:2654
+#: src/main.c:2657
 msgid "Specifies a color configuration"
 msgstr "Spesifiserer en fargekonfigurasjon"
 
-#: src/main.c:2659
+#: src/main.c:2662
 msgid "Edits one file"
 msgstr "Redigerer en fil"
 
-#: src/main.c:2663
+#: src/main.c:2666
 msgid "Displays this help message"
 msgstr "Viser denne hjelpeteksten"
 
-#: src/main.c:2666
+#: src/main.c:2669
 msgid "Displays a help screen on how to change the color scheme"
 msgstr "Viser en hjelpskjerm for endring av fargeplanen"
 
-#: src/main.c:2669
+#: src/main.c:2672
 msgid "Log ftp dialog to specified file"
 msgstr "Logg ftp dialogen til spesifisert fil"
 
-#: src/main.c:2676
+#: src/main.c:2679
 msgid "Obsolete"
 msgstr "Utgått"
 
-#: src/main.c:2678
+#: src/main.c:2681
 msgid "Requests to run in black and white"
 msgstr "Be om å kjøre i sort-hvitt"
 
-#: src/main.c:2680
+#: src/main.c:2683
 msgid "Disable mouse support in text version"
 msgstr "Slå av musstøtte i tekstversjonen"
 
-#: src/main.c:2683
+#: src/main.c:2686
 msgid "Disables subshell support"
 msgstr "Slå av støtte for underskall"
 
-#: src/main.c:2687
+#: src/main.c:2690
 msgid "Prints working directory at program exit"
 msgstr "Skriv ut arbeidskatalogen ved avslutting av programmet"
 
-#: src/main.c:2689
+#: src/main.c:2692
 msgid "Resets soft keys on HP terminals"
 msgstr "Setter tilbake myke taster på HP terminaler"
 
-#: src/main.c:2691
+#: src/main.c:2694
 msgid "To run on slow terminals"
 msgstr "For kjøring på trege terminaler"
 
-#: src/main.c:2694
+#: src/main.c:2697
 msgid "Use stickchars to draw"
-msgstr ""
+msgstr "Tegn med klebende tegn"
 
-#: src/main.c:2698
+#: src/main.c:2701
 msgid "Enables subshell support (default)"
 msgstr "Slår på støtte for underskall (standard)"
 
-#: src/main.c:2703
+#: src/main.c:2706
 msgid "Tries to use termcap instead of terminfo"
 msgstr "Prøver å bruke termcap i stedet for terminfo"
 
-#: src/main.c:2707
+#: src/main.c:2710
 msgid "Displays the current version"
 msgstr "Viser nåværende versjon"
 
-#: src/main.c:2709
+#: src/main.c:2712
 msgid "Launches the file viewer on a file"
 msgstr "Starter filvisning for en fil"
 
-#: src/main.c:2711
+#: src/main.c:2714
 msgid "Forces xterm features"
 msgstr "Tvungen bruk av xterm funksjoner"
 
-#: src/main.c:2713
+#: src/main.c:2716
 msgid "Geometry for the window"
 msgstr "Geometri for vinduet"
 
-#: src/main.c:2713
+#: src/main.c:2716
 msgid "GEOMETRY"
 msgstr "GEOMETRI"
 
-#: src/main.c:2714
+#: src/main.c:2717
 msgid "No windows opened at startup"
 msgstr "Ingen vinduer åpnet ved oppstart"
 
-#: src/main.c:2715
+#: src/main.c:2718
 msgid "Force activation even if a server is already running"
 msgstr "Tvungen aktivisering hvis en tjener allerede kjører"
 
-#: src/main.c:2987
+#: src/main.c:2720
+msgid "Displays the directory that holds the .links startup files"
+msgstr "Viser katalogen som inneholder .links oppstartsfilene"
+
+#: src/main.c:2996
 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"
@@ -4856,7 +4931,7 @@
 "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:3063
+#: src/main.c:3072
 msgid ""
 "You are running the GNOME Midnight Commander as root. \n"
 "\n"
@@ -4868,11 +4943,11 @@
 "Du vil ikke være beskyttet fra å gjøre betydelig skade mot\n"
 "systemet ditt hvis du fortsetter."
 
-#: src/main.c:3073
+#: src/main.c:3087
 msgid " Notice "
 msgstr " Notis "
 
-#: src/main.c:3074
+#: src/main.c:3088
 msgid ""
 " The Midnight Commander configuration files \n"
 " are now stored in the ~/.mc directory, the \n"
@@ -5043,64 +5118,64 @@
 msgid "Display brief usage message"
 msgstr "Vis kort bruksmelding"
 
-#: src/screen.c:429
+#: src/screen.c:399
 msgid "MTime"
 msgstr "MTime"
 
-#: src/screen.c:430
+#: src/screen.c:400
 msgid "ATime"
 msgstr "ATime"
 
-#: src/screen.c:431
+#: src/screen.c:401
 msgid "CTime"
 msgstr "CTime"
 
-#: src/screen.c:433
+#: src/screen.c:403
 msgid "Perm"
 msgstr "Rett"
 
-#: src/screen.c:434
+#: src/screen.c:404
 msgid "Nl"
 msgstr "Nl"
 
-#: src/screen.c:435
+#: src/screen.c:405
 msgid "Inode"
 msgstr "Inode"
 
-#: src/screen.c:436
+#: src/screen.c:406
 msgid "UID"
 msgstr "UID"
 
-#: src/screen.c:437
+#: src/screen.c:407
 msgid "GID"
 msgstr "GID"
 
-#: src/screen.c:650
+#: src/screen.c:643
 #, c-format
 msgid "  %s bytes in %d file%s"
 msgstr "  %s bytes i %d file%s"
 
-#: src/screen.c:1306
+#: src/screen.c:1299
 msgid "Unknow tag on display format: "
 msgstr "Ukjent merke på skjermformatet: "
 
-#: src/screen.c:2068
+#: src/screen.c:2061
 msgid " Do you really want to execute? "
 msgstr " Vil du virkelig kjøre? "
 
-#: src/screen.c:2083
+#: src/screen.c:2076
 msgid " No action taken "
 msgstr " Ingen handling utført "
 
-#: src/screen.c:2309 src/screen.c:2339 src/tree.c:1026
+#: src/screen.c:2302 src/screen.c:2332 src/tree.c:1026
 msgid "RenMov"
 msgstr "RenMov"
 
-#: src/screen.c:2310 src/screen.c:2340 src/tree.c:1030
+#: src/screen.c:2303 src/screen.c:2333 src/tree.c:1030
 msgid "Mkdir"
 msgstr "Mkdir"
 
-#: src/screen.c:2326
+#: src/screen.c:2319
 #, c-format
 msgid ""
 " Can't chdir to %s \n"
@@ -5609,11 +5684,153 @@
 msgid "Sorry, we can not do password authenticated connections for now."
 msgstr "Beklager, vi kan ikke gjøre passordautentiserte forbindelser ennå."
 
+#: vfs/ftpfs.c:326
+#, c-format
+msgid "ftpfs: Disconnecting from %s"
+msgstr "ftpfs: Kobler fra %s"
+
+#: vfs/ftpfs.c:377
+msgid " FTP: Password required for "
+msgstr " FTP: Passord nødvendig for "
+
+#: vfs/ftpfs.c:409
+msgid " Proxy: Password required for "
+msgstr " Proxy: Passord nødvendig for "
+
+#: vfs/ftpfs.c:435
+msgid "ftpfs: sending proxy login name"
+msgstr "ftpfs: sender innloggingsnavn for proxy"
+
+#: vfs/ftpfs.c:439
+msgid "ftpfs: sending proxy user password"
+msgstr "ftpfs: sender brukers passord til proxy"
+
+#: vfs/ftpfs.c:443
+msgid "ftpfs: proxy authentication succeeded"
+msgstr "ftpfs: autentisering mot proxy i orden"
+
+#: vfs/ftpfs.c:447
+#, c-format
+msgid "ftpfs: connected to %s"
+msgstr "ftpfs: tilkoblet til %s"
+
+#: vfs/ftpfs.c:464
+msgid "ftpfs: sending login name"
+msgstr "ftpfs: sender innloggingsnavn"
+
+#: vfs/ftpfs.c:469
+msgid "ftpfs: sending user password"
+msgstr "ftpfs: sender brukers passord"
+
+#: vfs/ftpfs.c:474
+msgid "ftpfs: logged in"
+msgstr "ftpfs: logget inn"
+
+#: vfs/ftpfs.c:489
+#, c-format
+msgid "ftpfs: Login incorrect for user %s "
+msgstr "ftpfs: Innlogging ukorrekt for bruker %s "
+
 #: vfs/ftpfs.c:521
 #, c-format
 msgid " Could not set source routing (%s)"
 msgstr " Kunne ikke sette opp kilderuting (%s)"
 
+#: vfs/ftpfs.c:650
+msgid "ftpfs: Invalid host name."
+msgstr "ftpfs: Ugyldig vertsnavn."
+
+#: vfs/ftpfs.c:670
+msgid "ftpfs: Invalid host address."
+msgstr "ftpfs: Ugyldig vertsadresse."
+
+#: vfs/ftpfs.c:695
+#, c-format
+msgid "ftpfs: making connection to %s"
+msgstr "ftpfs: setter opp forbindelse til %s"
+
+#: vfs/ftpfs.c:705
+msgid "ftpfs: connection interrupted by user"
+msgstr "ftpfs: tilkobling avbrutt av bruker"
+
+#: vfs/ftpfs.c:707
+#, c-format
+msgid "ftpfs: connection to server failed: %s"
+msgstr "ftpfs: tilkobling til tjener feilet: %s"
+
+#: vfs/ftpfs.c:791
+#, c-format
+msgid "Waiting to retry... %d (Control-C to cancel)"
+msgstr "Venter på nytt forsøk... %d (Ctrl-C for å avbryte)"
+
+#: vfs/ftpfs.c:985
+msgid "ftpfs: could not setup passive mode for source routing"
+msgstr "ftpfs: kunne ikke sette opp passiv modus for kilderuting"
+
+#: vfs/ftpfs.c:995
+msgid "ftpfs: could not setup passive mode"
+msgstr "ftpfs: kunne ikke sette opp passiv modus"
+
+#: vfs/ftpfs.c:1066
+msgid "ftpfs: aborting transfer."
+msgstr "ftpfs: avbryter overføring."
+
+#: vfs/ftpfs.c:1068
+#, c-format
+msgid "ftpfs: abort error: %s"
+msgstr "ftpfs: avbrytlsesfeil: %s"
+
+#: vfs/ftpfs.c:1073
+msgid "ftpfs: abort failed"
+msgstr "ftpfs: avbrudd feilet"
+
+#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1333
+msgid "ftpfs: CWD failed."
+msgstr "ftpfs: CWD feilet."
+
+#: vfs/ftpfs.c:1169 vfs/ftpfs.c:1176
+msgid "ftpfs: couldn't resolve symlink"
+msgstr "ftpfs: kunne ikke følge symbolsk lenke"
+
+#: vfs/ftpfs.c:1221
+msgid "Resolving symlink..."
+msgstr "Finner symlink..."
+
+#: vfs/ftpfs.c:1324
+#, c-format
+msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"
+msgstr "ftpfs: Leser FTP katalog %s... (ikke bruk UNIX ls flagg)"
+
+#: vfs/ftpfs.c:1326
+#, c-format
+msgid "ftpfs: Reading FTP directory %s..."
+msgstr "ftpfs: Leser FTP katalog %s..."
+
+#: vfs/ftpfs.c:1345
+msgid "ftpfs: FAIL"
+msgstr "ftpfs: FEIL"
+
+#: vfs/ftpfs.c:1436
+msgid "ftpfs: reading FTP directory interrupt by user"
+msgstr "ftpfs: lesing av FTP katalog avbrutt av bruker"
+
+#: vfs/ftpfs.c:1465
+msgid "ftpfs: got listing"
+msgstr "ftpfs: hentet liste"
+
+#: vfs/ftpfs.c:1478
+msgid "ftpfs: failed"
+msgstr "ftpfs: feilet"
+
+#: vfs/ftpfs.c:1495
+msgid "ftpfs: failed; nowhere to fallback to"
+msgstr "ftpfs: feilet; ingen steder å falle tilbake til"
+
+#: vfs/ftpfs.c:1559
+#, c-format
+msgid "ftpfs: storing file %d (%d)"
+msgstr "ftpfs: lagrer fil %d (%d)"
+
 #: vfs/ftpfs.c:1995 vfs/ftpfs.c:2010
 msgid ""
 "~/.netrc file has not correct mode.\n"
@@ -5691,4 +5908,3 @@
 "Hmm,...\n"
 "%s\n"
 "ser ikke ut som et tar-arkiv."
-
diff -ruN old/mc-4.5.28/src/ChangeLog new/mc-4.5.29/src/ChangeLog
--- old/mc-4.5.28/src/ChangeLog	Fri Mar 26 15:30:42 1999
+++ new/mc-4.5.29/src/ChangeLog	Tue Mar 30 01:34:42 1999
@@ -1,3 +1,43 @@
+1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* dlg.c (dlg_run_done): Do not call the callback of a NULL current
+	widget.
+
+	* setup.h: Added missing prototype for setup_init().
+
+	* filegui.c (check_progress_buttons): Added a missing return
+	value.
+
+	* dlg.c (remove_widget): Added a missing return value.
+
+	* main.c: Removed the global directory_list variable.
+	Removed the main_corba_register_server() function.
+
+	* main.h: Removed the global run_desktop variable.
+
+	* panel.h: Now the panel structure has a unique numerical ID used
+	for session management.
+
+	* screen.c (panel_new): Maintain a unique ID for each panel.
+
+	* main.c (maybe_display_linksdir): Handle display of the desktop
+	init dir here.
+	(main): Call gnome_check_super_user().
+	(init_corba_with_args): Call corba_init_server().
+
+	* main.c (init_corba_with_args): Do CORBA initialization here.  Also
+	removed the global force_activation option.
+
+1999-03-29  Jonathan Blandford  <jrb@redhat.com>
+
+	* main.c (main): updated message.
+
+Sun Mar 28 23:52:08 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* util.c (is_printable): Character 155 is non printable even when 
+	full eight bit output is enabled (on the linux console 155 is
+	interpreted as "ESC [").
+
 1999-03-26  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	Patch courtesy of John Bley (jbb6@acpub.duke.edu):
diff -ruN old/mc-4.5.28/src/dlg.c new/mc-4.5.29/src/dlg.c
--- old/mc-4.5.28/src/dlg.c	Fri Mar 26 15:30:42 1999
+++ new/mc-4.5.29/src/dlg.c	Tue Mar 30 01:34:40 1999
@@ -17,7 +17,7 @@
  */
 
 #include <config.h>
-/* "$Id: dlg.c,v 1.25 1999/03/14 23:18:42 unammx Exp $" */
+/* "$Id: dlg.c,v 1.26 1999/03/30 06:10:19 unammx Exp $" */
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -341,7 +341,7 @@
     Widget_Item *first, *p;
 
     if (!h->current)
-	    return;
+	    return 0;
     
     first = p = h->current;
 
@@ -866,7 +866,9 @@
 /* Shutdown the run_dlg */
 void dlg_run_done (Dlg_head *h)
 {
-    (*h->callback) (h, h->current->dlg_id, DLG_END);
+    if (h->current)
+	(*h->callback) (h, h->current->dlg_id, DLG_END);
+
     current_dlg = (Dlg_head *) h->previous_dialog;
     if (current_dlg){
 
diff -ruN old/mc-4.5.28/src/filegui.c new/mc-4.5.29/src/filegui.c
--- old/mc-4.5.28/src/filegui.c	Fri Mar 26 15:30:42 1999
+++ new/mc-4.5.29/src/filegui.c	Tue Mar 30 01:34:42 1999
@@ -179,7 +179,7 @@
     FileOpContextUI *ui;
 
     if (ctx->ui == NULL)
-	    return;
+	    return FILE_CONT;
     
     ui = ctx->ui;
 
diff -ruN old/mc-4.5.28/src/main.c new/mc-4.5.29/src/main.c
--- old/mc-4.5.28/src/main.c	Fri Mar 26 15:30:41 1999
+++ new/mc-4.5.29/src/main.c	Tue Mar 30 01:34:39 1999
@@ -81,7 +81,6 @@
 
 #ifdef HAVE_CORBA
 #    include <libgnorba/gnorba.h>
-#    include "gcorba.h"
 #endif
 
 #include <glib.h>
@@ -139,7 +138,13 @@
 
 #include "popt.h"
 
-/* "$Id: main.c,v 1.88 1999/03/20 18:09:11 unammx Exp $" */
+#ifdef HAVE_GNOME
+#include "gcorba.h"
+#include "gmain.h"
+#include "gsession.h"
+#endif
+
+/* "$Id: main.c,v 1.90 1999/03/30 06:10:21 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 */
@@ -2637,8 +2642,6 @@
 #endif
 
 char *cmdline_geometry = NULL;
-char **directory_list = NULL;
-int   force_activation = 0;
 
 static struct poptOption argument_table [] = {
 #ifdef HAVE_GNOME
@@ -2715,21 +2718,58 @@
 #ifdef HAVE_GNOME
     { "geometry", '\0', POPT_ARG_STRING, &cmdline_geometry, 0, N_("Geometry for the window"), N_("GEOMETRY")},
     {"nowindows", '\0', POPT_ARG_NONE, &nowindows, 0, N_("No windows opened at startup"), NULL},
-    {"force-activation",0,POPT_ARG_NONE, &force_activation, 0, N_("Force activation even if a server is already running"), NULL},
     {"desktop-linksdir", '\0', POPT_ARG_NONE, &display_linksdir, 0,
-     N_("Displays the directory that holds the .links startup files")},
+     N_("Display the directory that holds the .links startup files and exit")},
 #endif
 
     { NULL, 		0,			0, NULL, 0 }
 };
 
-void
-main_corba_register_server (void)
+/* Convenience function to display the desktop initialization directory and exit */
+static void
+maybe_display_linksdir (void)
 {
+	if (display_linksdir) {
+		puts (DESKTOP_INIT_DIR);
+		exit (1);
+	}
+}
+
 #ifdef HAVE_CORBA
-	corba_register_server ();
+/* Initializes the ORB and does the initial argument processing */
+static void
+init_corba_with_args (int *argc, char **argv, poptContext *ctx)
+{
+    CORBA_Environment ev;
+
+    CORBA_exception_init (&ev);
+    orb = gnome_CORBA_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, ctx,
+					    GNORBA_INIT_SERVER_FUNC, &ev);
+
+    maybe_display_linksdir ();
+
+    if (ev._major != CORBA_NO_EXCEPTION) {
+	    CORBA_exception_free (&ev);
+	    g_warning ("Could not initialize CORBA");
+	    exit (1);
+    }
+
+    CORBA_exception_free (&ev);
+
+    if (!corba_init_server ()) {
+	    g_warning ("Could not initialize the CORBA server");
+	    exit (1);
+    }
+}
 #endif
+
+#ifndef HAVE_CORBA
+void
+corba_create_window (void)
+{
+	/* nothing */
 }
+#endif
 
 static void
 handle_args (int argc, char *argv [])
@@ -2740,28 +2780,12 @@
 
 #ifdef HAVE_GNOME
 #ifdef HAVE_CORBA
-    CORBA_Environment ev;
-
-    CORBA_exception_init (&ev);
-    orb = gnome_CORBA_init_with_popt_table (
-	    "gmc", VERSION, &argc, argv, argument_table, 0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
-
-    if (display_linksdir){
-	    puts (DESKTOP_INIT_DIR);
-	    exit (1);
-    }
-
-    corba_init ();
-    if (!force_activation)
-	    if (try_to_activate_running_copy ())
-		    exit (1);
+    init_corba_with_args (&argc, argv, &ctx);
 #else
     gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx);
 #endif
-    if (display_linksdir){
-	    puts (DESKTOP_INIT_DIR);
-	    exit (1);
-    }
+    maybe_display_linksdir ();
+
     gtk_widget_push_visual (gdk_imlib_get_visual ());
     gtk_widget_push_colormap (gdk_imlib_get_colormap ());
 	
@@ -2913,15 +2937,17 @@
     setlocale (LC_ALL, "");
     bindtextdomain ("mc", LOCALEDIR);
     textdomain ("mc");
-
-    /* This is here to debug the CORBA async invocations */
+#if 0
+    /* This is here to debug startup stuff */
     {
-	    volatile  int i = 1;
+	    volatile int i = 0;
 
+	    printf ("GMC IS WAITING %d\n", getpid ());
 	    while (!i)
 		    ;
 
     }
+#endif
     /* Initialize list of all user group for timur_clr_mode */
     init_groups ();
     
@@ -2956,7 +2982,7 @@
 
     mc_tree_store_load ();
 
-    session_management_setup (argv [0]);
+    session_init ();
     probably_finish_program ();
 #endif
     
@@ -3065,24 +3091,11 @@
     if (alternate_plus_minus)
         application_keypad_mode ();
 #   endif
-/* INSERT ROOT DIALOG HERE */
+
 #ifdef HAVE_GNOME
-    if (geteuid () == 0) {
-	    GtkWidget *warning_dlg;
-	    warning_dlg = gnome_message_box_new (_("You are running the GNOME Midnight Commander as root. \n\n"
-					   "You will not be protected from severly damaging your system\n"
-					   "if you continue."),
-					   GNOME_MESSAGE_BOX_WARNING,
-					   _("Continue"), GNOME_STOCK_BUTTON_CANCEL, NULL);
-	    if (gnome_dialog_run (GNOME_DIALOG (warning_dlg)) != 0) {
-		    GnomeClient *client = NULL;
-		    
-		    client = gnome_master_client ();
-		    gnome_client_set_restart_style (client, GNOME_RESTART_NEVER);
-		    exit (0);
-	    }
-    }
+    gnome_check_super_user ();
 #endif
+
     if (show_change_notice){
 	message (1, _(" Notice "),
 		 _(" The Midnight Commander configuration files \n"
diff -ruN old/mc-4.5.28/src/main.h new/mc-4.5.29/src/main.h
--- old/mc-4.5.28/src/main.h	Fri Mar 26 15:30:40 1999
+++ new/mc-4.5.29/src/main.h	Tue Mar 30 01:34:38 1999
@@ -99,7 +99,7 @@
 extern int midnight_shutdown;
 extern char search_buffer [256];
 extern char cmd_buf [512];
-extern int run_desktop;
+extern char *cmdline_geometry;
 
 #if HAVE_GNOME
 #define MENU_PANEL get_current_panel ()
@@ -187,8 +187,6 @@
 void done_menu (void);
 void init_menu (void);
 void exec_shell (void);
-
-void main_corba_register_server (void);
 
 #ifdef OS2_NT
 #    define MC_BASE ""
diff -ruN old/mc-4.5.28/src/panel.h new/mc-4.5.29/src/panel.h
--- old/mc-4.5.28/src/panel.h	Fri Mar 26 15:30:41 1999
+++ new/mc-4.5.29/src/panel.h	Tue Mar 30 01:34:38 1999
@@ -158,6 +158,9 @@
 
     int dragging;
 
+    /* Unique numerical ID for session management */
+    int id;
+
     /* Used for scrolling nicely during drags */
     int timer_id;
     int drag_motion_x;
diff -ruN old/mc-4.5.28/src/screen.c new/mc-4.5.29/src/screen.c
--- old/mc-4.5.28/src/screen.c	Fri Mar 26 15:30:41 1999
+++ new/mc-4.5.29/src/screen.c	Tue Mar 30 01:34:39 1999
@@ -955,12 +955,15 @@
 WPanel *
 panel_new (char *panel_name)
 {
+#ifdef HAVE_GNOME
+    static int panel_id = 0;
+#endif
     WPanel *panel;
     char *section;
     int i, err;
 
     panel = g_new0 (WPanel, 1);
-    
+
     /* No know sizes of the panel at startup */
     init_widget (&panel->widget, 0, 0, 0, 0, (callback_fn)
 		 panel_callback, (destroy_fn) panel_destroy,
@@ -968,7 +971,7 @@
 
     /* We do not want the cursor */
     widget_want_cursor (panel->widget, 0);
-    
+
     mc_get_current_wd (panel->cwd, sizeof (panel->cwd)-2);
     strcpy (panel->lwd, ".");
 
@@ -995,14 +998,15 @@
     panel->format_modified  = 1;
 #ifdef HAVE_GNOME
     panel->is_a_desktop_panel = FALSE;
+    panel->id = panel_id++;
 #endif
-    
+
     panel->panel_name = g_strdup (panel_name);
     panel->user_format = g_strdup (DEFAULT_USER_FORMAT);
-    
+
     for(i = 0; i < LIST_TYPES; i++)
 	panel->user_status_format [i] = g_strdup (DEFAULT_USER_FORMAT);
-    
+
     panel->search_buffer [0] = 0;
     panel->frame_size = frame_half;
     section = g_strconcat ("Temporal:", panel->panel_name, NULL);
@@ -1026,7 +1030,7 @@
 	}
 	set_panel_formats (panel);
     }
-    
+
     /* Load the default format */
     panel->count = do_load_dir (&panel->dir, panel->sort_type,
 				panel->reverse, panel->case_sensitive, panel->filter);
diff -ruN old/mc-4.5.28/src/setup.c new/mc-4.5.29/src/setup.c
--- old/mc-4.5.28/src/setup.c	Fri Mar 26 15:30:42 1999
+++ new/mc-4.5.29/src/setup.c	Tue Mar 30 01:34:40 1999
@@ -69,7 +69,7 @@
 extern int we_can_afford_the_speed;
 #endif
 
-/* "$Id: setup.c,v 1.25 1999/02/18 21:43:19 unammx Exp $" */
+/* "$Id: setup.c,v 1.26 1999/03/27 19:00:18 unammx Exp $" */
 
 #ifdef USE_VFS
 extern int vfs_timeout;
@@ -380,8 +380,9 @@
     save_string ("Dirs", "other_dir",
 			       get_other_type () == view_listing
 			       ? opanel->cwd : ".", profile);
-    WritePrivateProfileString ("Dirs", "current_is_left",
-			       get_current_index () == 0 ? "1" : "0", profile);
+    if (get_current_panel () != NULL)
+	    WritePrivateProfileString ("Dirs", "current_is_left",
+				       get_current_index () == 0 ? "1" : "0", profile);
     save_hotlist ();
     save_panelize ();
     save_panel_types ();
diff -ruN old/mc-4.5.28/src/setup.h new/mc-4.5.29/src/setup.h
--- old/mc-4.5.28/src/setup.h	Fri Mar 26 15:30:41 1999
+++ new/mc-4.5.29/src/setup.h	Tue Mar 30 01:34:39 1999
@@ -1,6 +1,7 @@
 #ifndef __SETUP_H
 #define __SETUP_H
 
+char *setup_init (void);
 void save_layout (void);
 void save_configure (void);
 void load_setup (void);
diff -ruN old/mc-4.5.28/src/util.c new/mc-4.5.29/src/util.c
--- old/mc-4.5.28/src/util.c	Fri Mar 26 15:30:41 1999
+++ new/mc-4.5.29/src/util.c	Tue Mar 30 01:34:39 1999
@@ -76,7 +76,7 @@
 #include "user.h"		/* expand_format */
 #include "../vfs/vfs.h"
 
-/* "$Id: util.c,v 1.22 1999/03/18 13:40:26 timur Exp $" */
+/* "$Id: util.c,v 1.23 1999/03/29 05:07:03 norbert Exp $" */
 
 char app_text [] = "Midnight-Commander";
 
@@ -110,7 +110,7 @@
 	    if (xterm_flag)
 	        return xterm_printable [c];
 	    else
-	        return (c > 31 && c != 127);
+	        return (c > 31 && c != 127 && c != 155);
 	} else
 	    return ((c >31 && c < 127) || c >= 160);
     } else
diff -ruN old/mc-4.5.28/vfs/ChangeLog new/mc-4.5.29/vfs/ChangeLog
--- old/mc-4.5.28/vfs/ChangeLog	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/ChangeLog	Tue Mar 30 01:34:34 1999
@@ -1,3 +1,24 @@
+1999-03-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
+
+	* vfs.c (vfs_add_current_stamps): Only do stamping of the panels
+	if they exist.
+
+	* mcserv.c: #include <sys/wait.h>
+	(get_client): Put `#ifdef __EMX__' around an otherwise-unused
+	variable.
+
+	* utilvfs.c (vfs_split_url): Fix NULL <-> 0 confusion when
+	comparing characters.
+
+	* ftpfs.c (retrieve_dir): Removed unused variable dot_dot_found.
+
+	* extfs.c (extfs_init): Assign `key' to c, not `&key'.
+
+Sun Mar 28 23:50:47 1999  Norbert Warmuth  <nwarmuth@privat.circular.de>
+
+	* vfs.h (vfs_translate_url): Fixed the macro which is used when 
+	compiling without vfs.
+
 1999-03-22  David Martin <dmartina@mailexcite.com>
 	
 	* ftpfs.c: Internationalize the messages that are displayed as
diff -ruN old/mc-4.5.28/vfs/extfs.c new/mc-4.5.29/vfs/extfs.c
--- old/mc-4.5.28/vfs/extfs.c	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/extfs.c	Tue Mar 30 01:34:34 1999
@@ -918,12 +918,12 @@
 
 	if ((c = strchr (key, '\n'))){
 	    *c = 0;
-	    c = &key [strlen (key)-1];
+	    c = &key [strlen (key) - 1];
 	} else {
-	    c = &key;
+	    c = key;
 	}
-	extfs_need_archive [extfs_no] = !(*c==':');
-	if (*c==':')
+	extfs_need_archive [extfs_no] = !(*c == ':');
+	if (*c == ':')
 		*c = 0;
 	if (!(*key))
 	    continue;
diff -ruN old/mc-4.5.28/vfs/ftpfs.c new/mc-4.5.29/vfs/ftpfs.c
--- old/mc-4.5.28/vfs/ftpfs.c	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/ftpfs.c	Tue Mar 30 01:34:34 1999
@@ -1292,7 +1292,6 @@
     struct dir *dcache;
     int got_intr = 0;
     int dot_found = 0;
-    int dot_dot_found = 0;
     int has_spaces = (strchr (remote_path, ' ') != NULL);
 
     canonicalize_pathname (remote_path);
diff -ruN old/mc-4.5.28/vfs/mcserv.c new/mc-4.5.29/vfs/mcserv.c
--- old/mc-4.5.28/vfs/mcserv.c	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/mcserv.c	Tue Mar 30 01:34:34 1999
@@ -63,6 +63,7 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <errno.h>
 #include <signal.h>
 #ifdef SCO_FLAVOR
@@ -1109,7 +1110,9 @@
     struct hostent *hp;
     char hostname [255];
     int yes = 1;
+#ifdef __EMX__
     char *me;
+#endif
     
     if ((sock = socket (AF_INET, SOCK_STREAM, 0)) < 0)
 	return "Can't create socket";
diff -ruN old/mc-4.5.28/vfs/utilvfs.c new/mc-4.5.29/vfs/utilvfs.c
--- old/mc-4.5.28/vfs/utilvfs.c	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/utilvfs.c	Tue Mar 30 01:34:34 1999
@@ -102,7 +102,7 @@
 	    else
 		*pass = g_strdup (inner_colon);
 	}
-	if (*pcopy != NULL)
+	if (*pcopy != 0)
 	    *user = g_strdup (pcopy);
 	else
 	    default_is_anon = 0;
diff -ruN old/mc-4.5.28/vfs/vfs.c new/mc-4.5.29/vfs/vfs.c
--- old/mc-4.5.28/vfs/vfs.c	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/vfs.c	Tue Mar 30 01:34:34 1999
@@ -865,10 +865,16 @@
 vfs_add_current_stamps (void)
 {
     vfs_stamp_path (current_dir);
-    if (get_current_type () == view_listing)
-        vfs_stamp_path (cpanel->cwd);
-    if (get_other_type () == view_listing)
-	vfs_stamp_path (opanel->cwd);
+
+    if (cpanel) {
+	if (get_current_type () == view_listing)
+	    vfs_stamp_path (cpanel->cwd);
+    }
+
+    if (opanel) {
+	if (get_other_type () == view_listing)
+	    vfs_stamp_path (opanel->cwd);
+    }
 }
 #endif
 
diff -ruN old/mc-4.5.28/vfs/vfs.h new/mc-4.5.29/vfs/vfs.h
--- old/mc-4.5.28/vfs/vfs.h	Fri Mar 26 15:30:38 1999
+++ new/mc-4.5.29/vfs/vfs.h	Tue Mar 30 01:34:35 1999
@@ -280,7 +280,7 @@
 
 #   define mc_ctl(a,b,c) 0
 #   define mc_setctl(a,b,c) 0
-#   define vfs_translate_url g_strdup(s)
+#   define vfs_translate_url(s) g_strdup(s)
 
 #   define mc_stat stat
 #   define mc_mknod mknod