diff -ruN old/mc-4.5.24/Specfile new/mc-4.5.25/Specfile --- old/mc-4.5.24/Specfile Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/Specfile Fri Mar 12 21:02:29 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.24 +%define ver 4.5.25 %define rel 1 %define prefix /usr diff -ruN old/mc-4.5.24/VERSION new/mc-4.5.25/VERSION --- old/mc-4.5.24/VERSION Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/VERSION Fri Mar 12 21:02:29 1999 @@ -1 +1 @@ -#define VERSION "4.5.24" +#define VERSION "4.5.25" diff -ruN old/mc-4.5.24/aclocal.m4 new/mc-4.5.25/aclocal.m4 --- old/mc-4.5.24/aclocal.m4 Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/aclocal.m4 Fri Mar 12 21:02:29 1999 @@ -2200,20 +2200,18 @@ fi]) dnl -dnl GNOME_INIT_HOOK (script-if-gnome-enabled, failflag) +dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) dnl dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh dnl is not found. dnl -AC_DEFUN([GNOME_INIT_HOOK], -[ +AC_DEFUN([GNOME_INIT_HOOK],[ AC_SUBST(GNOME_LIBS) AC_SUBST(GNOMEUI_LIBS) AC_SUBST(GNOMEGNORBA_LIBS) AC_SUBST(GTKXMHTML_LIBS) AC_SUBST(ZVT_LIBS) - AC_SUBST(GNOME_APPLET_LIBS) AC_SUBST(GNOME_LIBDIR) AC_SUBST(GNOME_INCLUDEDIR) @@ -2262,7 +2260,6 @@ GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_APPLET_LIBS="`$GNOME_CONFIG --libs-only-l applets`" GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" $1 @@ -2298,10 +2295,33 @@ fi fi fi + + if test -n "$3"; then + n="$3" + for i in $n; do + AC_MSG_CHECKING(extra library $i) + case $i in + applets) + AC_SUBST(GNOME_APPLETS_LIBS) + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + capplet) + AC_SUBST(GNOME_CAPPLET_LIBS) + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; + *) + AC_MSG_RESULT(unknown library) + esac + done + fi ]) +dnl +dnl GNOME_INIT ([additional-inits]) +dnl + AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail) + GNOME_INIT_HOOK([],fail,$1) ]) dnl diff -ruN old/mc-4.5.24/configure new/mc-4.5.25/configure --- old/mc-4.5.24/configure Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/configure Fri Mar 12 21:02:29 1999 @@ -586,7 +586,7 @@ PACKAGE=mc -VERSION=4.5.24 +VERSION=4.5.25 cat >> confdefs.h <&6 -echo "configure:9192: checking for $ac_word" >&5 +echo "configure:9191: 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 @@ -9225,7 +9224,7 @@ no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:9229: checking if $GNOME_CONFIG works" >&5 +echo "configure:9228: checking if $GNOME_CONFIG works" >&5 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 @@ -9233,7 +9232,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:9237: checking for $ac_word" >&5 +echo "configure:9236: 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 @@ -9269,7 +9268,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:9273: checking for $ac_word" >&5 +echo "configure:9272: 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 @@ -9303,7 +9302,7 @@ fi echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 -echo "configure:9307: checking for working ORBit environment" >&5 +echo "configure:9306: 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 @@ -9339,7 +9338,7 @@ fi echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 -echo "configure:9343: checking for gnorba libraries" >&5 +echo "configure:9342: 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 @@ -9382,7 +9381,6 @@ GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_APPLET_LIBS="`$GNOME_CONFIG --libs-only-l applets`" GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" @@ -9415,7 +9413,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:9419: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:9417: 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" \ @@ -9442,6 +9440,26 @@ fi fi + if test -n ""; then + 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 + case $i in + applets) + + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + echo "$ac_t""$GNOME_APPLETS_LIBS" 1>&6;; + capplet) + + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + echo "$ac_t""$GNOME_CAPPLET_LIBS" 1>&6;; + *) + echo "$ac_t""unknown library" 1>&6 + esac + done + fi + @@ -9451,7 +9469,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:9455: checking for $ac_word" >&5 +echo "configure:9473: 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 @@ -9480,7 +9498,7 @@ if $HAVE_nroff; then echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6 -echo "configure:9484: checking for manual formatting macros" >&5 +echo "configure:9502: 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 @@ -9504,7 +9522,7 @@ if $HAVE_nroff; then echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6 -echo "configure:9508: checking If nroff accepts -Tascii" >&5 +echo "configure:9526: 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 @@ -9528,7 +9546,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:9532: checking for $ac_word" >&5 +echo "configure:9550: 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 @@ -9557,7 +9575,7 @@ if $HAVE_FILECMD; then echo $ac_n "checking for - option to file command""... $ac_c" 1>&6 -echo "configure:9561: checking for - option to file command" >&5 +echo "configure:9579: 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 @@ -9600,7 +9618,7 @@ echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6 -echo "configure:9604: checking for -L option to file command" >&5 +echo "configure:9622: 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 @@ -9626,7 +9644,7 @@ fi echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6 -echo "configure:9630: checking for - option to grep command" >&5 +echo "configure:9648: 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,7 +9684,7 @@ echo $ac_n "checking for subshell support""... $ac_c" 1>&6 -echo "configure:9670: checking for subshell support" >&5 +echo "configure:9688: checking for subshell support" >&5 # Check whether --with-subshell or --without-subshell was given. if test "${with_subshell+set}" = set; then withval="$with_subshell" @@ -9808,7 +9826,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:9812: checking for SLang_init_tty in -lslang" >&5 +echo "configure:9830: 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 @@ -9816,7 +9834,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9849: \"$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 @@ -9846,17 +9864,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9850: checking for $ac_hdr" >&5 +echo "configure:9868: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9878: \"$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* @@ -9891,17 +9909,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9895: checking for $ac_hdr" >&5 +echo "configure:9913: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9923: \"$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* @@ -9971,7 +9989,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:9975: checking for tgoto in -ltermcap" >&5 +echo "configure:9993: 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 @@ -9979,7 +9997,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10012: \"$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 @@ -10061,7 +10079,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10097: \"$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 @@ -10094,7 +10112,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10098: checking for tgoto in -ltermcap" >&5 +echo "configure:10116: 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 @@ -10102,7 +10120,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10135: \"$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 @@ -10175,7 +10193,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10179: checking for tgoto in -ltermcap" >&5 +echo "configure:10197: 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 @@ -10183,7 +10201,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10216: \"$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 @@ -10369,17 +10387,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10373: checking for $ac_hdr" >&5 +echo "configure:10391: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10401: \"$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* @@ -10432,7 +10450,7 @@ fi else echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6 -echo "configure:10436: checking for ext2fs_close in -lext2fs" >&5 +echo "configure:10454: 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 @@ -10440,7 +10458,7 @@ ac_save_LIBS="$LIBS" LIBS="-lext2fs -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10473: \"$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 @@ -10472,17 +10490,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10476: checking for $ac_hdr" >&5 +echo "configure:10494: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10504: \"$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* @@ -10547,7 +10565,7 @@ if $search_ncurses then echo "checking "location of ncurses.h file"" 1>&6 -echo "configure:10551: checking "location of ncurses.h file"" >&5 +echo "configure:10569: checking "location of ncurses.h file"" >&5 if $search_ncurses @@ -10687,7 +10705,7 @@ if $search_ncurses then cat > conftest.$ac_ext < EOF @@ -10713,7 +10731,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -10773,10 +10791,10 @@ else # check for ncurses version, to properly ifdef mouse-fix echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10777: checking for ncurses version" >&5 +echo "configure:10795: checking for ncurses version" >&5 ncurses_version=unknown cat > conftest.$ac_ext < @@ -10820,12 +10838,12 @@ for ac_func in resizeterm keyok do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10824: checking for $ac_func" >&5 +echo "configure:10842: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10870: \"$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 @@ -10896,7 +10914,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10932: \"$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 @@ -10929,7 +10947,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10933: checking for tgoto in -ltermcap" >&5 +echo "configure:10951: 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 @@ -10937,7 +10955,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10970: \"$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 @@ -11010,7 +11028,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11014: checking for tgoto in -ltermcap" >&5 +echo "configure:11032: 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 @@ -11018,7 +11036,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11051: \"$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 @@ -11069,7 +11087,7 @@ install_saver="yes" echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:11073: checking for pam_start in -lpam" >&5 +echo "configure:11091: 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 @@ -11077,7 +11095,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam -ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11110: \"$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 @@ -11131,7 +11149,7 @@ else echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 -echo "configure:11135: checking for -lXpm" >&5 +echo "configure:11153: checking for -lXpm" >&5 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11147,7 +11165,7 @@ has_xpm_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11157,7 +11175,7 @@ XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:11161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_xpm=yes else @@ -11179,7 +11197,7 @@ echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6 -echo "configure:11183: checking for X11 non-rectangular shape extension" >&5 +echo "configure:11201: 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 @@ -11195,7 +11213,7 @@ has_shape_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11210,7 +11228,7 @@ ; return 0; } EOF -if { (eval echo configure:11214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_shape=yes else @@ -11246,7 +11264,7 @@ echo else echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6 -echo "configure:11250: checking for setupterm in -lcurses" >&5 +echo "configure:11268: 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 @@ -11254,7 +11272,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11287: \"$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 @@ -11282,7 +11300,7 @@ echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -11295,7 +11313,7 @@ ; return 0; } EOF -if { (eval echo configure:11299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* LIBS="$LIBS -lcurses" @@ -11591,7 +11609,6 @@ s%@GNOMEGNORBA_LIBS@%$GNOMEGNORBA_LIBS%g s%@GTKXMHTML_LIBS@%$GTKXMHTML_LIBS%g s%@ZVT_LIBS@%$ZVT_LIBS%g -s%@GNOME_APPLET_LIBS@%$GNOME_APPLET_LIBS%g s%@GNOME_LIBDIR@%$GNOME_LIBDIR%g s%@GNOME_INCLUDEDIR@%$GNOME_INCLUDEDIR%g s%@GNOME_CONFIG@%$GNOME_CONFIG%g @@ -11605,6 +11622,8 @@ s%@HAVE_GNORBA_FALSE@%$HAVE_GNORBA_FALSE%g s%@GNORBA_CFLAGS@%$GNORBA_CFLAGS%g s%@GNORBA_LIBS@%$GNORBA_LIBS%g +s%@GNOME_APPLETS_LIBS@%$GNOME_APPLETS_LIBS%g +s%@GNOME_CAPPLET_LIBS@%$GNOME_CAPPLET_LIBS%g s%@gnomeicondir@%$gnomeicondir%g s%@mx@%$mx%g s%@gmcdep@%$gmcdep%g diff -ruN old/mc-4.5.24/configure.in new/mc-4.5.25/configure.in --- old/mc-4.5.24/configure.in Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/configure.in Fri Mar 12 21:02:29 1999 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.24 +VERSION=4.5.25 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) diff -ruN old/mc-4.5.24/gnome/ChangeLog new/mc-4.5.25/gnome/ChangeLog --- old/mc-4.5.24/gnome/ChangeLog Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/ChangeLog Fri Mar 12 21:02:38 1999 @@ -1,3 +1,170 @@ +1999-03-12 Miguel de Icaza + + * gview.c (scrollbar_moved): Better, but still shaggy when you + drag with the scrollbar. + +1999-03-12 Federico Mena Quintero + + * gdesktop.c (create_panel_from_desktop): Do not assert that + panel->count > 0, because we may actually not have any icons in + the desktop. + (desktop_popup): Reload the desktop once the popup menu is done. + (create_panel_from_desktop): Be consistent with the way totals are + computed in screen.c:do_file_mark(). + + * gnome-file-property-dialog.c (gnome_file_property_dialog_init): + Set the dialog to not destroy-on-close. + + * gpopup2.c (gpopup_do_popup2): Fixed Miguel's code. + +1999-03-11 Miguel de Icaza + + * gpopup2.c (gpopup_do_popup2): Until Federico look over this, I + am fixing this crash. + +1999-03-11 Miguel de Icaza + + * gpopup2.c: Sigh. It happened again. More features killed by + the merge. + + If a file does not have any metadata/mime way of viewing it, the + viewer will always work. + +1999-03-11 Federico Mena Quintero + + * gdesktop.c (text_changed): Rename the metadata and refresh the + desktop. This also fixes bug #573. + +1999-03-11 Jonathan Blandford + + * gnome-file-property-dialog.c (create_settings_pane): change the + wording to be a tad clearer. + (apply_metadata_change): only set the icon if it has changed. + +1999-03-11 Federico Mena Quintero + + * gpopup2.c (create_mime_actions): Do not free the file name here, + since it is passed on to the callback. It will be freed on the + destroy handler instead. + + * gpopup2.c (escape_underlines): New function to escape the + underlines in a string so that GtkLabel will include them in the + final result. + (create_mime_actions): Escape the underlines from the MIME action + descriptions. + +1999-03-11 Federico Mena Quintero + + Fix bug #261: inconsistent labels in view menu and toolbar, + unsynchronized items. + + * glayout.c (panel_view_menu_uiinfo panel_view_toolbar_uiinfo): + Made the view names consistent with the toolbar names. Also, + added underscore accelerators to the menu items. + (copy_uiinfo_widgets): New function to copy the widgets from an + uiinfo array into a widget array. + (create_container): Copy the uiinfo widgets to the panel + structure. + + * gcmd.c (set_view_type): New function to set the list view type + and synchronize the menu and toolbar items. + (gnome_close_panel): Free the view menu/toolbar item arrays. + +1999-03-11 Federico Mena Quintero + + * gpopup2.c (perform_mount_unmount): Set the icon's cursor while it is + being operated on. + (handle_mount): Use perform_mount_unmount(). + (handle_unmount): Likewise. + (handle_eject): Set the icon's cursor while it is being ejected. + + * gdesktop.c (desktop_icon_set_busy): New function to set a watch + or normal cursor for a desktop icon. + + * gdesktop.c (desktop_icon_info_open): Set the cursor to a watch + while the icon is being opened. Also, fixed memory leaks. + (do_eject): Added a missing return value. + +1999-03-11 Miguel de Icaza + + * gmount.c (setup_devices): Use new tigert icon. + + * gdesktop.c (do_mount_umount): Use g_readlink here. + + * gpopup2.c (handle_eject): Small tuning. And use g_readlink :-). + + * gmount.c (mount_point_to_device): New function. Mapes a mount + point to its device. Required since we are now using the mount + point (as this is not ambiguous) as the key for the devices and + the eject command needs the device name, not the mount point. + + * gdesktop.c (desktop_icon_info_open): First try to see if + filename is mountable. Then do the directory tests and the file + launching tests. Fixes mount-by-double click. + +1999-03-10 Federico Mena Quintero + + * glayout.c (save_panel_types): Do not save the setup of a desktop + panel. + + * gpopup2.c (handle_mount): Use get_full_filename(). + (handle_unmount): Likewise. + (handle_eject): Likewise. + (handle_open): Likewise. + + * gdesktop.c (update_url): Made static. + (desktop_reload_icons): Call update_url() when updating an + existing icon. + + * gpopup2.c (handle_properties): Do not update the icon url here. + +1999-03-10 Federico Mena Quintero + + This is a semi-big slew of changes to integrate the DESKTOP_BRANCH + into the main trunk. Now the gdesktop code creates a temprary + WPanel structure and passes it on to the core file management + functions. Also, the menu code is improved (we now use gpopup2; + gpopup should go away shortly and gpopup2 should replace it). + This makes the desktop act consistently with the file panels. + Thanks to Jonathan for his help with this branch. + + * gdnd.c (perform_action): Use mc_lstat(), not mc_stat(). + + * glayout.c (update_panels): Do not update the panels that are + desktop panels. + + * gdesktop.c (icon_is_in_area): An icon is not considered to be in + a 0x0 area. + + * gpopup2.c (handle_open): Fetch the desktop icon from the + filename and call desktop_icon_info_open(). + + * gdesktop.c (desktop_icon_info_get_by_filename): New function to + look up a desktop icon by its filename. + + * glayout.c (create_new_menu_from): Test for the ".desktop" suffix + correctly. + + * gpopup2.c (handle_properties): If the file comes from a desktop + panel, always allow edition of the icon image. + +1999-03-10 Miguel de Icaza + + * gdialogs.c: Support ui->ctx to be NULL, as file.c will set this + to NULL for background operations. + +1999-03-09 Miguel de Icaza + + * gdesktop.c (icon_drag_data_received): Pass the full directory + name to gdnd_perform_drop. + + * gpopup.c (create_regexp_actions): This routine no longer creates + the default copy/move/delete context menu entries. + + (file_actions): Include the copy/move/delete options here. This + also enabled me to reorder things to put "Delete" closer to the + top, as it is a pretty common operation. + 1999-03-08 Miguel de Icaza * gmain.c (session_save_state): Add call to gnome_config_sync(). @@ -7,6 +174,7 @@ (my_system_get_child_pid): Close also stdin/stdout/stderr * gdesktop.c (is_mountable): Allow user-nfs devices to be mounted + 1999-03-08 Federico Mena Quintero * gscreen.c (can_drop_on_clist): New function to figure out if the @@ -61,6 +229,14 @@ * gnome-file-property-dialog.c (create_settings_pane): Add Needs terminal check box +1999-02-25 Jonathan Blandford + + * gpopup2.c: even more bug-fixes. Plenty more left to do, but now + all the menu code seems to work other then the + select-and-popup-menu problem. + + * gaction.c (gmc_can_view_file): new function. Can we view the file? + 1999-02-25 Miguel de Icaza * gaction.c (gmc_open_filename): Add support for needsterminal. @@ -141,6 +317,13 @@ * gnome-file-property-dialog.c (apply_metadata_change): Fix memory leak. +1999-02-23 Jonathan Blandford + + * gpopup2.c (handle_open_with): use the new dialog. Doesn't quite + work -- I'll make sure it does tonight. + + * gnome-open-dialog.c: new widget -- an "Open with..." dialog. + 1999-02-22 Miguel de Icaza * gdesktop.c (desktop_reload_icons): Fix memory leak. @@ -159,6 +342,10 @@ * gdesktop.c (setup_motif_dnd_proxy): Use Window instead of gint32, fix from George Lebl. (setup_xdnd_proxy): ditto. + +1999-02-19 Federico Mena Quintero + + * gdesktop.c (file_entry_fill): Initialize fe->f.dir_size_computed. 1999-02-18 Federico Mena Quintero diff -ruN old/mc-4.5.24/gnome/Makefile.in new/mc-4.5.25/gnome/Makefile.in --- old/mc-4.5.24/gnome/Makefile.in Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/Makefile.in Fri Mar 12 21:02:38 1999 @@ -55,6 +55,7 @@ gprint.c \ gprop.c \ gnome-file-property-dialog.c \ + gnome-open-dialog.c \ gscreen.c \ gtools.c \ gtkdtree.c \ @@ -82,8 +83,10 @@ gpopup.h \ gpopup2.h \ gprefs.h \ + gprint.h \ gprop.h \ gnome-file-property-dialog.h \ + gnome-open-dialog.h \ gscreen.h \ gtkdtree.h \ gtree.h \ @@ -100,6 +103,7 @@ i-executable.png \ i-fifo.png \ i-floppy.png \ + i-nfs.png \ i-printer.png \ i-regular.png \ i-sock.png \ @@ -158,6 +162,7 @@ gprint.o \ gprop.o \ gnome-file-property-dialog.o \ + gnome-open-dialog.o \ gscreen.o \ gtools.o \ gtree.o \ diff -ruN old/mc-4.5.24/gnome/gaction.c new/mc-4.5.25/gnome/gaction.c --- old/mc-4.5.24/gnome/gaction.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gaction.c Fri Mar 12 21:02:39 1999 @@ -13,9 +13,12 @@ #include "ext.h" /* regex_command */ #include "cmd.h" /* copy_cmd, ren_cmd, delete_cmd, ... */ #include "gscreen.h" +#include "gmain.h" #include "dir.h" #include "dialog.h" +#include "gcmd.h" #include "../vfs/vfs.h" +#include "gnome-open-dialog.h" static void gmc_execute (const char *fname, const char *buf, int needs_terminal) @@ -86,12 +89,12 @@ gnome_desktop_entry_free (entry); } } - + return 0; } int -gmc_edit_filename (char *fname) +gmc_edit (char *fname) { const char *mime_type; const char *cmd; @@ -115,7 +118,7 @@ return 1; } } - + gnome_config_push_prefix( "/editor/Editor/"); type = gnome_config_get_string ("EDITOR_TYPE=executable"); @@ -125,7 +128,7 @@ return 1; } g_free (type); - + editor = gnome_config_get_string ("EDITOR=emacs"); on_terminal = gnome_config_get_bool ("NEEDS_TERM=false"); @@ -147,54 +150,98 @@ return 0; } - int gmc_open (file_entry *fe) { return gmc_open_filename (fe->fname, NULL); } +int +gmc_open_with (gchar *filename) +{ + GtkWidget *dialog; + gchar *command = NULL; + gchar *real_command; + WPanel *panel = cpanel; + + dialog = gnome_open_dialog_new (filename); + if (!is_a_desktop_panel (panel)) + gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (panel->xwindow)); + + switch (gnome_dialog_run (GNOME_DIALOG (dialog))) { + case 0: + command = gtk_entry_get_text (GTK_ENTRY (gnome_entry_gtk_entry (GNOME_ENTRY ( + GNOME_FILE_ENTRY (GNOME_OPEN_DIALOG (dialog)->entry)->gentry)))); + /* Assume COMMAND %f */ + if (command) { + /* FIXME: these need the needs_terminal argument to be set correctly */ + if (strchr (command, '%')) + exec_extension (filename, command, NULL, NULL, 0, FALSE); + else { + /* This prolly isn't perfect, but it will do. */ + real_command = g_strconcat (command, " %f", NULL); + exec_extension (filename, real_command, NULL, NULL, 0, FALSE); + g_free (real_command); + } + } + if (command) { + gtk_widget_destroy (dialog); + return 1; + } + gtk_widget_destroy (dialog); + return 0; + case 1: + gtk_widget_destroy (dialog); + default: + return 0; + } +} static void gmc_run_view (const char *filename, const char *buf) { exec_extension (filename, buf, NULL, NULL, 0, 0); } - -int -gmc_view (char *filename, int start_line) +static gchar * +gmc_view_command (gchar *filename) { const char *mime_type, *cmd; char *buf; int size; - if (gnome_metadata_get (filename, "fm-view", &size, &buf) == 0){ - gmc_run_view (filename, buf); - g_free (buf); - return 1; - } + if (gnome_metadata_get (filename, "fm-view", &size, &buf) == 0) + return buf; - if (gnome_metadata_get (filename, "view", &size, &buf) == 0){ - gmc_run_view (filename, buf); - g_free (buf); - return 1; - } + if (gnome_metadata_get (filename, "view", &size, &buf) == 0) + return buf; mime_type = gnome_mime_type_or_default (filename, NULL); if (!mime_type) - return 0; + return NULL; cmd = gnome_mime_get_value (mime_type, "fm-view"); - if (cmd){ - gmc_run_view (filename, cmd); - return 1; - } + if (cmd) + return g_strdup (cmd); cmd = gnome_mime_get_value (mime_type, "view"); if (cmd){ + return g_strdup (cmd); + } + return NULL; +} + +int +gmc_view (char *filename, int start_line) +{ + char *cmd; + + cmd = gmc_view_command (filename); + if (cmd) { gmc_run_view (filename, cmd); + g_free (cmd); return 1; - } + } else + view (NULL, filename, 0, 0); return 0; } diff -ruN old/mc-4.5.24/gnome/gcmd.c new/mc-4.5.25/gnome/gcmd.c --- old/mc-4.5.24/gnome/gcmd.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gcmd.c Fri Mar 12 21:02:39 1999 @@ -143,7 +143,6 @@ gnome_close_panel (GtkWidget *widget, WPanel *panel) { Dlg_head *h = panel->widget.parent; - g_print ("closing the panel\n"); if (panel->timer_id){ gtk_timeout_remove (panel->timer_id); panel->timer_id = -1; @@ -161,49 +160,91 @@ layout_panel_gone (panel); + g_free (panel->view_menu_items); + g_free (panel->view_toolbar_items); + mc_chdir ("/"); } -void -gnome_icon_view_cmd (GtkWidget *widget, WPanel *panel) +static void +set_view_type (GtkWidget *widget, WPanel *panel, enum list_types type) { - if (panel->list_type == list_icons) + int i; + + /* This is kind of a hack to see whether we need to do something or not. + * This function (or at least the callback that calls it) can refer to a + * radio menu item or a radio button, so we need to see if it is active. + */ + + if (GTK_OBJECT_TYPE (widget) == gtk_radio_menu_item_get_type ()) { + if (!GTK_CHECK_MENU_ITEM (widget)->active) + return; + } else if (GTK_OBJECT_TYPE (widget) == gtk_radio_button_get_type ()) { + if (!GTK_TOGGLE_BUTTON (widget)->active) + return; + } else + g_assert_not_reached (); + + /* Worth the effort? */ + + if (panel->list_type == type) return; - panel->list_type = list_icons; + + /* Set the list type */ + + panel->list_type = type; set_panel_formats (panel); paint_panel (panel); do_refresh (); + + /* Synchronize the widgets */ + + for (i = 0; ; i++) + if (widget == panel->view_menu_items[i]) { + gtk_signal_handler_block_by_data ( + GTK_OBJECT (panel->view_toolbar_items[i]), panel); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (panel->view_toolbar_items[i]), TRUE); + gtk_signal_handler_unblock_by_data ( + GTK_OBJECT (panel->view_toolbar_items[i]), panel); + return; + } else if (widget == panel->view_toolbar_items[i]) { + gtk_signal_handler_block_by_data ( + GTK_OBJECT (panel->view_menu_items[i]), panel); + gtk_check_menu_item_set_active ( + GTK_CHECK_MENU_ITEM (panel->view_menu_items[i]), TRUE); + gtk_signal_handler_unblock_by_data ( + GTK_OBJECT (panel->view_menu_items[i]), panel); + return; + } + + g_assert_not_reached (); } + void -gnome_partial_view_cmd (GtkWidget *widget, WPanel *panel) +gnome_icon_view_cmd (GtkWidget *widget, WPanel *panel) { - if (panel->list_type == list_brief) - return; - panel->list_type = list_brief; - set_panel_formats (panel); - paint_panel (panel); - do_refresh (); + set_view_type (widget, panel, list_icons); } + void -gnome_full_view_cmd (GtkWidget *widget, WPanel *panel) +gnome_brief_view_cmd (GtkWidget *widget, WPanel *panel) { - if (panel->list_type == list_full) - return; - panel->list_type = list_full; - set_panel_formats (panel); - paint_panel (panel); - do_refresh (); + set_view_type (widget, panel, list_brief); } + +void +gnome_detailed_view_cmd (GtkWidget *widget, WPanel *panel) +{ + set_view_type (widget, panel, list_full); +} + void gnome_custom_view_cmd (GtkWidget *widget, WPanel *panel) { - if (panel->list_type == list_user) - return; - panel->list_type = list_user; - set_panel_formats (panel); - paint_panel (panel); - do_refresh (); + set_view_type (widget, panel, list_user); } + static void sort_callback (GtkWidget *menu_item, GtkWidget *cbox1) { @@ -212,6 +253,7 @@ else gtk_widget_set_sensitive (cbox1, FALSE); } + void gnome_sort_cmd (GtkWidget *widget, WPanel *panel) { @@ -325,6 +367,7 @@ } gtk_widget_destroy (sort_box); } + typedef struct ep_dlg_data { GtkWidget *ep_dlg; GtkWidget *clist; @@ -366,6 +409,7 @@ gtk_widget_destroy (dlg); return retval; } + static void ep_add_callback (GtkWidget *widget, ep_dlg_data *data) { @@ -383,6 +427,7 @@ gtk_widget_set_sensitive (data->add_button, FALSE); gtk_entry_set_text (GTK_ENTRY (data->entry), ""); } + static void ep_remove_callback (GtkWidget *widget, ep_dlg_data *data) { @@ -420,6 +465,7 @@ gtk_widget_set_sensitive (data->add_button, FALSE); } } + static void ep_text_changed_callback (GtkWidget *widget, ep_dlg_data *data) { @@ -433,6 +479,7 @@ gtk_widget_set_sensitive (data->remove_button, FALSE); gtk_widget_set_sensitive (data->add_button, TRUE); } + static void load_settings (GtkCList *clist) { @@ -459,6 +506,7 @@ } } } + static void save_settings (GtkCList *clist) { @@ -475,6 +523,7 @@ } sync_profiles (); } + void gnome_external_panelize (GtkWidget *widget, WPanel *panel) { @@ -554,6 +603,7 @@ gtk_widget_destroy (GTK_WIDGET (data->ep_dlg)); g_free (data); } + void gnome_select_all_cmd (GtkWidget *widget, WPanel *panel) { @@ -567,6 +617,7 @@ paint_panel (panel); do_refresh (); } + void gnome_reverse_selection_cmd_panel (WPanel *panel) { diff -ruN old/mc-4.5.24/gnome/gcmd.h new/mc-4.5.25/gnome/gcmd.h --- old/mc-4.5.24/gnome/gcmd.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gcmd.h Fri Mar 12 21:02:39 1999 @@ -9,10 +9,12 @@ void gnome_quit_cmd (void); void gnome_open_panel (GtkWidget *widget, WPanel *panel); void gnome_close_panel (GtkWidget *widget, WPanel *panel); + void gnome_icon_view_cmd (GtkWidget *widget, WPanel *panel); -void gnome_partial_view_cmd (GtkWidget *widget, WPanel *panel); -void gnome_full_view_cmd (GtkWidget *widget, WPanel *panel); +void gnome_brief_view_cmd (GtkWidget *widget, WPanel *panel); +void gnome_detailed_view_cmd (GtkWidget *widget, WPanel *panel); void gnome_custom_view_cmd (GtkWidget *widget, WPanel *panel); + void gnome_sort_cmd (GtkWidget *widget, WPanel *panel); void gnome_select_all_cmd (GtkWidget *widget, WPanel *panel); void gnome_filter_cmd (GtkWidget *widget, WPanel *panel); diff -ruN old/mc-4.5.24/gnome/gdesktop.c new/mc-4.5.25/gnome/gdesktop.c --- old/mc-4.5.24/gnome/gdesktop.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gdesktop.c Fri Mar 12 21:02:39 1999 @@ -23,9 +23,12 @@ #include "gicon.h" #include "gmain.h" #include "gmetadata.h" +#include "gcmd.h" #include "gdnd.h" #include "gmount.h" #include "gpopup.h" +#include "gprint.h" +#include "gscreen.h" #include "../vfs/vfs.h" #include "main.h" @@ -180,7 +183,7 @@ get_slot_from_pos (*x, *y, &u, &v); start = u * layout_rows + v; - end = layout_rows * layout_cols; + end = layout_cols * layout_rows; /* Look forwards until the end of the grid. If we could not find an * empty spot, find the second best. @@ -361,6 +364,31 @@ return NULL; } +/* Loads from the metadata updated versions of the caption and the url */ +static void +update_url (DesktopIconInfo *dii) +{ + char *fullname = g_concat_dir_and_file (desktop_directory, dii->filename); + char *caption = NULL; + char *url = NULL; + int size; + + gnome_metadata_get (fullname, "icon-caption", &size, &caption); + if (caption){ + desktop_icon_set_text (DESKTOP_ICON (dii->dicon), caption); + g_free (caption); + } + + gnome_metadata_get (fullname, "desktop-url", &size, &url); + if (url){ + if (dii->url) + g_free (dii->url); + dii->url = url; + } + + g_free (fullname); +} + typedef struct { char *filename; char *url; @@ -434,6 +462,8 @@ dii = l->data; desktop_icon_set_icon (DESKTOP_ICON (dii->dicon), im); + update_url (dii); + /* Leave the icon in the desktop by removing it from the list */ all_icons = g_list_remove_link (all_icons, l); @@ -699,27 +729,19 @@ select_range (dii, TRUE); } -/* Creates a file entry structure and fills it with information appropriate to the specified file. */ -file_entry * -file_entry_from_file (char *filename) +/* Convenience function to fill a file entry */ +static void +file_entry_fill (file_entry *fe, struct stat *s, char *filename) { - file_entry *fe; - struct stat s; - - if (mc_lstat (filename, &s) == -1) { - g_warning ("Could not stat %s, bad things will happen", filename); - return NULL; - } - - fe = g_new (file_entry, 1); fe->fname = g_strdup (x_basename (filename)); fe->fnamelen = strlen (fe->fname); - fe->buf = s; + fe->buf = *s; fe->f.marked = FALSE; fe->f.link_to_dir = FALSE; fe->f.stalled_link = FALSE; + fe->f.dir_size_computed = FALSE; - if (S_ISLNK (s.st_mode)) { + if (S_ISLNK (s->st_mode)) { struct stat s2; if (mc_stat (filename, &s2) == 0) @@ -727,7 +749,22 @@ else fe->f.stalled_link = TRUE; } +} + +/* Creates a file entry structure and fills it with information appropriate to the specified file. */ +file_entry * +file_entry_from_file (char *filename) +{ + file_entry *fe; + struct stat s; + + if (mc_lstat (filename, &s) == -1) { + g_warning ("Could not stat %s, bad things will happen", filename); + return NULL; + } + fe = g_new (file_entry, 1); + file_entry_fill (fe, &s, filename); return fe; } @@ -762,8 +799,11 @@ dest = g_concat_dir_and_file (desktop_directory, new_name); if (mc_rename (source, dest) == 0) { + gnome_metadata_delete (dest); + gnome_metadata_rename (source, dest); g_free (dii->filename); dii->filename = g_strdup (new_name); + desktop_reload_icons (FALSE, 0, 0); retval = TRUE; } else retval = FALSE; /* FIXME: maybe pop up a warning/query dialog? */ @@ -788,6 +828,7 @@ fullname = g_concat_dir_and_file (desktop_directory, dii->filename); new_text = gnome_icon_text_item_get_text (iti); gnome_metadata_set (fullname, "icon-caption", strlen (new_text) + 1, new_text); + desktop_reload_icons (FALSE, 0, 0); return TRUE; } @@ -912,8 +953,6 @@ is_mountable (char *filename, file_entry *fe, int *is_mounted, char **point) { char buffer [128], *p; - umode_t mode; - struct stat s; int len; if (point) @@ -947,8 +986,7 @@ static char *mount_command; static char *umount_command; char *op; - char buffer [128]; - int count; + char *buffer; if (is_mount){ if (!mount_command) @@ -960,10 +998,9 @@ op = umount_command; } - count = readlink (filename, buffer, sizeof (buffer)); - if (count == -1) + buffer = g_readlink (filename); + if (buffer == NULL) return FALSE; - buffer [count] = 0; if (op){ char *command; @@ -978,8 +1015,10 @@ close_error_pipe (0, 0); pclose (f); + g_free (buffer); return TRUE; } + g_free (buffer); return FALSE; } @@ -1026,13 +1065,17 @@ do_eject (char *filename) { char *eject_command = find_command (eject_known_locations); - char *command; + char *command, *device; FILE *f; if (!eject_command) return FALSE; - command = g_strconcat (eject_command, " ", filename, NULL); + device = mount_point_to_device (filename); + if (!device) + return FALSE; + + command = g_strconcat (eject_command, " ", device, NULL); open_error_pipe (); f = popen (command, "r"); if (f == NULL) @@ -1067,60 +1110,69 @@ { char *filename; file_entry *fe; + int is_mounted; + char *point; + int launch; + + filename = NULL; + fe = NULL; + launch = FALSE; + + /* Set the cursor */ + + desktop_icon_set_busy (dii, TRUE); - if (dii->url){ + /* Open the icon */ + + if (dii->url) { gnome_url_show (dii->url); - return; + goto out; } - filename = g_concat_dir_and_file (desktop_directory, dii->filename); + filename = g_concat_dir_and_file (desktop_directory, dii->filename); fe = file_entry_from_file (filename); if (!fe){ message (1, _("Error"), "I could not fetch the information from the file"); - return; + goto out; } - - if (S_ISDIR (fe->buf.st_mode) || link_isdir (fe)) - new_panel_at (filename); - else { - int is_mounted; - char *point; - int launch = FALSE; - - if (is_mountable (filename, fe, &is_mounted, &point)){ - if (!is_mounted){ - if (try_to_mount (filename, fe)) - launch = TRUE; - } else - launch = TRUE; - if (launch) - new_panel_at (point); - g_free (point); - } else { + if (is_mountable (filename, fe, &is_mounted, &point)){ + if (!is_mounted){ + if (try_to_mount (filename, fe)) + launch = TRUE; + } else + launch = TRUE; + + if (launch) + new_panel_at (point); + g_free (point); + } else { + if (S_ISDIR (fe->buf.st_mode) || link_isdir (fe)) + new_panel_at (filename); + else { int size; char *buf; - + if (gnome_metadata_get (filename,"fm-open", &size, &buf) == 0){ g_free (buf); gmc_open_filename (filename, NULL); - return; + goto out; } - + if (gnome_metadata_get (filename, "open", &size, &buf) == 0){ g_free (buf); gmc_open_filename (filename, NULL); - return; + goto out; } if (is_exe (fe->buf.st_mode) && if_link_is_exe (desktop_directory, fe)){ int needs_terminal = 0; - + if (gnome_metadata_get (filename, "flags", &size, &buf) == 0){ needs_terminal = strstr (buf, "needsterminal") != 0; - g_free (buf); } + if (needs_terminal) gnome_open_terminal_with_cmd (filename); else @@ -1130,8 +1182,17 @@ } } - file_entry_free (fe); - g_free (filename); + out: + + if (fe) + file_entry_free (fe); + + if (filename) + g_free (filename); + + /* Reset the cursor */ + + desktop_icon_set_busy (dii, FALSE); } void @@ -1170,18 +1231,207 @@ desktop_icon_info_destroy (dii); } +/** + * desktop_icon_set_busy: + * @dii: A desktop icon + * @busy: TRUE to set a watch cursor, FALSE to reset the normal arrow cursor + * + * Sets a wait/normal cursor for a desktop icon. + **/ +void +desktop_icon_set_busy (DesktopIconInfo *dii, int busy) +{ + GdkCursor *cursor; + + g_return_if_fail (dii != NULL); + + if (!GTK_WIDGET_REALIZED (dii->dicon)) + return; + + cursor = gdk_cursor_new (busy ? GDK_WATCH : GDK_TOP_LEFT_ARROW); + gdk_window_set_cursor (dii->dicon->window, cursor); + gdk_cursor_destroy (cursor); + gdk_flush (); +} + +/** + * desktop_icon_info_get_by_filename: + * @filename: A filename relative to the desktop directory + * + * Returns the desktop icon structure that corresponds to the specified filename, + * which should be relative to the desktop directory. + * + * Return value: The sought desktop icon, or NULL if it is not found. + **/ +DesktopIconInfo * +desktop_icon_info_get_by_filename (char *filename) +{ + int i; + GList *l; + DesktopIconInfo *dii; + + g_return_val_if_fail (filename != NULL, NULL); + + for (i = 0; i < layout_cols * layout_rows; i++) + for (l = layout_slots[i].icons; l; l = l->next) { + dii = l->data; + + if (strcmp (dii->filename, filename) == 0) + return dii; + } + + return NULL; +} + +/* This is a HORRIBLE HACK. It creates a temporary panel structure for gpopup's + * perusal. Once gmc is rewritten, all file lists including panels will be a + * single data structure, and the world will be happy again. + */ +static WPanel * +create_panel_from_desktop (void) +{ + WPanel *panel; + int nicons, count; + int marked_count, dir_marked_count; + long total; + int selected_index; + int i; + file_entry *fe; + GList *l; + struct stat s; + + panel = g_new0 (WPanel, 1); + + /* Count the number of desktop icons */ + + nicons = 0; + for (i = 0; i < layout_cols * layout_rows; i++) + nicons += layout_slots[i].num_icons; + + /* Create the file entry list */ + + panel->dir.size = nicons; + + count = 0; + marked_count = 0; + dir_marked_count = 0; + total = 0; + selected_index = -1; + + if (nicons != 0) { + panel->dir.list = g_new (file_entry, nicons); + + fe = panel->dir.list; + + for (i = 0; i < layout_cols * layout_rows; i++) + for (l = layout_slots[i].icons; l; l = l->next) { + DesktopIconInfo *dii; + char *full_name; + + dii = l->data; + full_name = g_concat_dir_and_file (desktop_directory, dii->filename); + if (mc_lstat (full_name, &s) == -1) { + g_warning ("Could not stat %s, bad things will happen", + full_name); + continue; + } + + file_entry_fill (fe, &s, full_name); + if (dii->selected) { + marked_count++; + fe->f.marked = TRUE; + + if (S_ISDIR (fe->buf.st_mode)) { + dir_marked_count++; + if (fe->f.dir_size_computed) + total += fe->buf.st_size; + } else + total += fe->buf.st_size; + } + + g_free (full_name); + fe++; + count++; + } + } + + /* Fill the rest of the panel structure */ + + panel->list_type = list_icons; + strncpy (panel->cwd, desktop_directory, sizeof (panel->cwd)); + panel->count = count; /* the actual number of lstat()ed files */ + panel->marked = marked_count; + panel->dirs_marked = dir_marked_count; + panel->total = total; + panel->selected = selected_index; + panel->is_a_desktop_panel = TRUE; + + return panel; +} + +WPanel * +push_desktop_panel_hack (void) +{ + WPanel *panel; + PanelContainer *container; + + panel = create_panel_from_desktop (); + container = g_new (PanelContainer, 1); + container->splitted = FALSE; + container->panel = panel; + + containers = g_list_append (containers, container); + + if (!current_panel_ptr) + current_panel_ptr = container; + else if (!other_panel_ptr) + other_panel_ptr = container; + + /* Set it as the current panel and invoke the menu */ + + set_current_panel (panel); + mc_chdir (desktop_directory); + return panel; +} + + +/* Frees our hacked-up panel created in the function above */ +static void +free_panel_from_desktop (WPanel *panel) +{ + int i; + + for (i = 0; i < panel->count; i++) + g_free (panel->dir.list[i].fname); + + if (panel->dir.list) + g_free (panel->dir.list); + + g_free (panel); +} + /* Used to execute the popup menu for desktop icons */ static void do_popup_menu (DesktopIconInfo *dii, GdkEventButton *event) { char *filename; + WPanel *panel; + DesktopIconInfo *dii_temp; + + /* Create the panel and the container structure */ + panel = push_desktop_panel_hack (); + dii_temp = NULL; + if (panel->marked == 1) + dii_temp = dii; filename = g_concat_dir_and_file (desktop_directory, dii->filename); - if (gpopup_do_popup (event, NULL, dii, 0, filename) != -1) + if (gpopup_do_popup2 (event, panel, dii_temp) != -1) desktop_reload_icons (FALSE, 0, 0); g_free (filename); + layout_panel_gone (panel); + free_panel_from_desktop (panel); } /* Idle handler that opens a desktop icon. See below for information on why we @@ -1255,6 +1505,9 @@ retval = TRUE; } } else if (event->button.button == 3) { + if (!dii->selected) + select_icon (dii, event->button.state); + do_popup_menu (dii, (GdkEventButton *) event); retval = TRUE; } @@ -1654,14 +1907,16 @@ full_name = g_concat_dir_and_file (desktop_directory, dii->filename); fe = file_entry_from_file (full_name); - g_free (full_name); - if (!fe) - return; /* eeeek */ + if (!fe){ + g_free (full_name); + return; + } - if (gdnd_perform_drop (context, data, desktop_directory, fe)) + if (gdnd_perform_drop (context, data, full_name, fe)) desktop_reload_icons (FALSE, 0, 0); file_entry_free (fe); + g_free (full_name); } } @@ -1780,37 +2035,6 @@ return dii; } -/** - * desktop_icon_update_url: - * @dii: the desktop icon - * - * Loads from the metadata updated versions of the caption - * and the url - */ -void -desktop_icon_update_url (DesktopIconInfo *dii) -{ - char *fullname = g_concat_dir_and_file (desktop_directory, dii->filename); - char *caption = NULL; - char *url = NULL; - int size; - - gnome_metadata_get (fullname, "icon-caption", &size, &caption); - if (caption){ - desktop_icon_set_text (DESKTOP_ICON (dii->dicon), caption); - g_free (caption); - } - - gnome_metadata_get (fullname, "desktop-url", &size, &url); - if (url){ - if (dii->url) - g_free (dii->url); - dii->url = url; - } - - g_free (fullname); -} - /* Creates the layout information array */ static void create_layout_info (void) @@ -2174,11 +2398,18 @@ { desktop_reload_icons (FALSE, 0, 0); } +static GnomeUIInfo gnome_panel_new_menu [] = { + GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal), + /* If this ever changes, make sure you update create_new_menu accordingly. */ + GNOMEUIINFO_ITEM_NONE( N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd ), + GNOMEUIINFO_END +}; /* The popup menu for the desktop */ GnomeUIInfo desktop_popup_items[] = { - GNOMEUIINFO_ITEM_NONE (N_("Arrange Icons"), NULL, handle_arrange_icons), + GNOMEUIINFO_MENU_NEW_SUBTREE(gnome_panel_new_menu), GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_ITEM_NONE (N_("Arrange Icons"), NULL, handle_arrange_icons), GNOMEUIINFO_ITEM_NONE (N_("Create New Window"), NULL, handle_new_window), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_ITEM_NONE (N_("Rescan Mountable Devices"), NULL, handle_rescan_devices), @@ -2190,11 +2421,38 @@ static void desktop_popup (GdkEventButton *event) { + GtkWidget *shell; GtkWidget *popup; + GList *child_list; + gchar *file, *file2; + WPanel *panel; + gint i; popup = gnome_popup_menu_new (desktop_popup_items); + /* First thing we want to do is strip off the STUPID tear off menu... S-: */ + shell = gnome_panel_new_menu[0].widget->parent; + child_list = gtk_container_children (GTK_CONTAINER (shell)); + if (GTK_IS_TEAROFF_MENU_ITEM (child_list->data)) + gtk_widget_hide (GTK_WIDGET (child_list->data)); + i = g_list_length (child_list); + g_list_free (child_list); + file = gnome_unconditional_datadir_file ("mc/templates"); + i = create_new_menu_from (file, shell, i); + file2 = gnome_datadir_file ("mc/templates"); + if (file2 != NULL){ + if (strcmp (file, file2) != 0) + create_new_menu_from (file2, shell, i); + } + g_free (file); + g_free (file2); + + panel = push_desktop_panel_hack (); gnome_popup_menu_do_popup_modal (popup, NULL, NULL, event, NULL); + layout_panel_gone (panel); + free_panel_from_desktop (panel); gtk_widget_destroy (popup); + + desktop_reload_icons (FALSE, 0, 0); } /* Draws the rubberband rectangle for selecting icons on the desktop */ @@ -2259,6 +2517,9 @@ y1 -= dii->y; x2 -= dii->x; y2 -= dii->y; + + if (x1 == x2 && y1 == y2) + return FALSE; if (x1 < dicon->icon_x + dicon->icon_w - 1 && x2 > dicon->icon_x diff -ruN old/mc-4.5.24/gnome/gdesktop.h new/mc-4.5.25/gnome/gdesktop.h --- old/mc-4.5.24/gnome/gdesktop.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gdesktop.h Fri Mar 12 21:02:39 1999 @@ -48,12 +48,17 @@ void desktop_icon_info_open (DesktopIconInfo *dii); void desktop_icon_info_delete (DesktopIconInfo *dii); +void desktop_icon_set_busy (DesktopIconInfo *dii, int busy); + +DesktopIconInfo *desktop_icon_info_get_by_filename (char *filename); file_entry *file_entry_from_file (char *filename); void file_entry_free (file_entry *fe); gboolean is_mountable (char *filename, file_entry *fe, int *is_mounted, char **mount_point); +gboolean is_ejectable (char *filename); gboolean do_mount_umount (char *filename, gboolean is_mount); +gboolean do_eject (char *filename); void desktop_arrange_icons (void); void desktop_rescan_devices (void); diff -ruN old/mc-4.5.24/gnome/gdialogs.c new/mc-4.5.25/gnome/gdialogs.c --- old/mc-4.5.24/gnome/gdialogs.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gdialogs.c Fri Mar 12 21:02:39 1999 @@ -105,7 +105,10 @@ gchar *path_copy = NULL; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -146,7 +149,9 @@ gchar *path_copy = NULL; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -184,7 +189,10 @@ gchar *path_copy = NULL; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -220,8 +228,11 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; + ui = ctx->ui; if (ui->aborting) @@ -241,8 +252,11 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; + ui = ctx->ui; if (ui->aborting) @@ -261,7 +275,10 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -316,6 +333,7 @@ GtkWidget *qrp_dlg; GtkWidget *radio; GtkWidget *vbox; + GtkWidget *vbox2; GtkWidget *hbox; GtkWidget *icon; GtkWidget *label; @@ -326,7 +344,10 @@ GtkWidget *menu_item; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + /* ctx->ui might be NULL for background processes */ + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -342,15 +363,19 @@ GNOME_STOCK_BUTTON_CANCEL, NULL); gtk_window_set_position (GTK_WINDOW (qrp_dlg), GTK_WIN_POS_MOUSE); - vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); + hbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL); - icon = gnome_stock_pixmap_widget (hbox, GNOME_STOCK_PIXMAP_HELP); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (qrp_dlg)->vbox), hbox, FALSE, FALSE, 0); + icon = gnome_stock_pixmap_widget (hbox, GNOME_STOCK_PIXMAP_HELP); gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0); + + vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, GNOME_PAD_SMALL); label = gtk_label_new (_("Some of the files you are trying to copy already " - "exist in the destination folder.")); + "exist in the destination folder. Please select " + "the action to be performed.")); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); @@ -358,25 +383,32 @@ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, FALSE, 0); + vbox2 = gtk_vbox_new (TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0); + radio = gtk_radio_button_new_with_label (group, _("Prompt me before overwriting any file.")); gtk_object_set_user_data (GTK_OBJECT (radio), GINT_TO_POINTER (REPLACE_PROMPT)); gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (policy_callback), ui); - gtk_box_pack_start (GTK_BOX (vbox), radio, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox2), radio, FALSE, FALSE, 0); group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio)); radio = gtk_radio_button_new_with_label (group, _("Don't overwrite any files.")); gtk_object_set_user_data (GTK_OBJECT (radio), GINT_TO_POINTER (REPLACE_NEVER)); gtk_signal_connect (GTK_OBJECT (radio), "toggled", GTK_SIGNAL_FUNC (policy_callback), ui); - gtk_box_pack_start (GTK_BOX (vbox), radio, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox2), radio, FALSE, FALSE, 0); group = gtk_radio_button_group (GTK_RADIO_BUTTON (radio)); ui->op_radio = gtk_radio_button_new (group); gtk_object_set_user_data (GTK_OBJECT (ui->op_radio), GINT_TO_POINTER (REPLACE_OPTION_MENU)); gtk_signal_connect (GTK_OBJECT (ui->op_radio), "toggled", GTK_SIGNAL_FUNC (policy_callback), ui); + gtk_box_pack_start (GTK_BOX (vbox2), ui->op_radio, FALSE, FALSE, 0); + hrbox = gtk_hbox_new (FALSE, GNOME_PAD_SMALL); + gtk_container_add (GTK_CONTAINER (ui->op_radio), hrbox); + gtk_box_pack_start (GTK_BOX (hrbox), gtk_label_new (_("Overwrite:")), FALSE, FALSE, 0); /* we set up the option menu. */ @@ -405,15 +437,6 @@ gtk_widget_show_all (menu); gtk_option_menu_set_menu (GTK_OPTION_MENU (omenu), menu); - gtk_signal_connect (GTK_OBJECT (ui->op_radio), "toggled", - GTK_SIGNAL_FUNC (policy_callback), (gpointer) REPLACE_ALWAYS); - gtk_box_pack_start (GTK_BOX (vbox), ui->op_radio, FALSE, FALSE, 0); - group = gtk_radio_button_group (GTK_RADIO_BUTTON (ui->op_radio)); - gtk_container_add (GTK_CONTAINER (ui->op_radio), hrbox); - - gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (qrp_dlg)->vbox), - hbox, FALSE, FALSE, 0); - gtk_widget_show_all (GTK_WIDGET (GNOME_DIALOG (qrp_dlg)->vbox)); switch (gnome_dialog_run_and_close (GNOME_DIALOG (qrp_dlg))) { case 0: @@ -499,13 +522,16 @@ file_progress_set_stalled_label (FileOpContext *ctx, char *stalled_msg) { g_return_if_fail (ctx != NULL); - g_return_if_fail (ctx->ui != NULL); + + if (ctx->ui == NULL) + return; if (!stalled_msg || !*stalled_msg) return; /* FIXME */ g_warning ("FIXME: file_progress_set_stalled_label!\nmsg\t%s\n",stalled_msg); } + char * file_mask_dialog (FileOpContext *ctx, FileOperation operation, char *text, char *def_text, int only_one, int *do_background) @@ -596,16 +622,20 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), ctx->follow_links); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &ctx->follow_links); +#if 0 gnome_widget_add_help (cbox, _("Selecting this will copy the files that symlinks point " "to instead of just copying the link.")); +#endif gtk_box_pack_start (GTK_BOX (vbox), cbox, FALSE, FALSE, 0); cbox = gtk_check_button_new_with_label (_("Preserve file attributes.")); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), ctx->op_preserve); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &ctx->op_preserve); +#if 0 gnome_widget_add_help (cbox, _("Preserves the permissions and the UID/GID if possible")); +#endif gtk_box_pack_start (GTK_BOX (vbox), cbox, FALSE, FALSE, 0); vbox = gtk_vbox_new (FALSE, GNOME_PAD_SMALL); @@ -614,7 +644,9 @@ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (cbox), ctx->dive_into_subdirs); gtk_signal_connect (GTK_OBJECT (cbox), "toggled", (GtkSignalFunc) fmd_check_box_callback, &ctx->dive_into_subdirs); +#if 0 gnome_widget_add_help (cbox, _("If set, this will copy the directories recursively")); +#endif gtk_box_pack_start (GTK_BOX (vbox), cbox, FALSE, FALSE, 0); } @@ -879,8 +911,10 @@ FileOpContextUI *ui; g_return_if_fail (ctx != NULL); - g_return_if_fail (ctx->ui != NULL); + if (ctx->ui == NULL) + return; + ui = ctx->ui; gtk_widget_destroy (ui->op_win); diff -ruN old/mc-4.5.24/gnome/gdnd.c new/mc-4.5.25/gnome/gdnd.c --- old/mc-4.5.24/gnome/gdnd.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gdnd.c Fri Mar 12 21:02:39 1999 @@ -184,7 +184,7 @@ dest_name = g_concat_dir_and_file (destdir, x_basename (name)); do { - result = mc_stat (name, &s); + result = mc_lstat (name, &s); if (result != 0) { /* FIXME: this error message sucks */ diff -ruN old/mc-4.5.24/gnome/gkey.c new/mc-4.5.25/gnome/gkey.c --- old/mc-4.5.24/gnome/gkey.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gkey.c Fri Mar 12 21:02:39 1999 @@ -76,6 +76,6 @@ gdk_input_remove (tclosure->tag); g_free (tclosure); } else { - fprintf (stderr, "PANIC: could not find closure for %d\n", fd); + g_warning ("could not find closure for %d\n", fd); } } diff -ruN old/mc-4.5.24/gnome/glayout.c new/mc-4.5.25/gnome/glayout.c --- old/mc-4.5.24/gnome/glayout.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/glayout.c Fri Mar 12 21:02:39 1999 @@ -26,11 +26,48 @@ #include "setup.h" #include "../vfs/vfs.h" #include "gprefs.h" - +#include "listing-iconic.xpm" +#include "listing-brief-list.xpm" +#include "listing-list.xpm" +#include "listing-custom.xpm" #define UNDEFINED_INDEX -1 +/* Keep these two arrays in sync! */ + +GnomeUIInfo panel_view_menu_uiinfo[] = { + GNOMEUIINFO_RADIOITEM (N_("_Icon View"), + N_("Switch view to an icon display"), + gnome_icon_view_cmd, NULL), + GNOMEUIINFO_RADIOITEM (N_("_Brief View"), + N_("Switch view to show just file name and type"), + gnome_brief_view_cmd, NULL), + GNOMEUIINFO_RADIOITEM (N_("_Detailed View"), + N_("Switch view to show detailed file statistics"), + gnome_detailed_view_cmd, NULL), + GNOMEUIINFO_RADIOITEM (N_("_Custom View"), + N_("Switch view to show user-defined statistics"), + gnome_custom_view_cmd, NULL), + GNOMEUIINFO_END +}; + +GnomeUIInfo panel_view_toolbar_uiinfo[] = { + GNOMEUIINFO_RADIOITEM (N_("Icons"), + N_("Switch view to an icon display"), + gnome_icon_view_cmd, listing_iconic_xpm), + GNOMEUIINFO_RADIOITEM (N_("Brief"), + N_("Switch view to show just file name and type"), + gnome_brief_view_cmd, listing_brief_list_xpm), + GNOMEUIINFO_RADIOITEM (N_("Detailed"), + N_("Switch view to show detailed file statistics"), + gnome_detailed_view_cmd, listing_list_xpm), + GNOMEUIINFO_RADIOITEM (N_("Custom"), + N_("Switch view to show user-defined statistics"), + gnome_custom_view_cmd, listing_custom_xpm), + GNOMEUIINFO_END +}; + GList *containers = 0; int output_lines = 0; @@ -88,7 +125,7 @@ return UNDEFINED_INDEX; } -static void +void set_current_panel (WPanel *panel) { GList *p; @@ -99,6 +136,7 @@ for (p = containers; p; p = p->next){ if (((PanelContainer *)p->data)->panel == panel){ current_panel_ptr = p->data; + break; } } } @@ -115,7 +153,6 @@ for (p = containers; p; p = p->next) if (p->data != current_panel_ptr){ other_panel_ptr = p->data; - printf ("PANEL: Found another other\n"); break; } } @@ -252,7 +289,8 @@ for (p = containers; p; p = p->next){ PanelContainer *pc = p->data; - panel_save_setup (pc->panel, pc->panel->panel_name); + if (!is_a_desktop_panel (pc->panel)) + panel_save_setup (pc->panel, pc->panel->panel_name); } } @@ -276,7 +314,7 @@ w = gnome_message_box_new ( _("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?"), GNOME_MESSAGE_BOX_WARNING, GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO, @@ -313,10 +351,10 @@ void configure_box (void); GtkCheckMenuItem *gnome_toggle_snap (void); -GnomeUIInfo gnome_panel_new_menu [] = { +static GnomeUIInfo gnome_panel_new_menu [] = { GNOMEUIINFO_ITEM_NONE(N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal), /* If this ever changes, make sure you update create_new_menu accordingly. */ - GNOMEUIINFO_ITEM_NONE( N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd ), + GNOMEUIINFO_ITEM_NONE(N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd), GNOMEUIINFO_END }; @@ -335,8 +373,8 @@ /* etc... */ GNOMEUIINFO_MENU_NEW_SUBTREE(gnome_panel_new_menu), GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_MENU_OPEN_ITEM( gnome_open_files, NULL), -/* GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },*/ + GNOMEUIINFO_MENU_OPEN_ITEM(gnome_open_files, NULL), +/* GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },*/ GNOMEUIINFO_ITEM_STOCK(N_("_Copy..."), N_("Copy files"), copy_cmd, GNOME_STOCK_PIXMAP_COPY), GNOMEUIINFO_ITEM_STOCK(N_("_Delete..."), N_("Delete files"), delete_cmd, GNOME_STOCK_PIXMAP_REMOVE), GNOMEUIINFO_ITEM_NONE(N_("_Move..."), N_("Rename or move files"), ren_cmd), @@ -350,28 +388,20 @@ GnomeUIInfo gnome_panel_edit_menu [] = { { GNOME_APP_UI_ITEM, N_("Select _All"), N_("Select all files in the current Panel"), gnome_select_all_cmd, NULL, NULL, 0, NULL, 'a', GDK_CONTROL_MASK }, - GNOMEUIINFO_ITEM_NONE( N_("_Select Files..."), N_("Select a group of files"), select_cmd ), - GNOMEUIINFO_ITEM_NONE( N_("_Invert Selection"), N_("Reverses the list of tagged files"), reverse_selection_cmd ), + GNOMEUIINFO_ITEM_NONE(N_("_Select Files..."), N_("Select a group of files"), select_cmd), + GNOMEUIINFO_ITEM_NONE(N_("_Invert Selection"), N_("Reverses the list of tagged files"), reverse_selection_cmd), GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_ITEM_NONE( N_("_Rescan Directory"), N_("Rescan the directory contents"), reread_cmd ), + GNOMEUIINFO_ITEM_NONE(N_("_Rescan Directory"), N_("Rescan the directory contents"), reread_cmd), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_MENU_PREFERENCES_ITEM(gnome_configure_box, NULL), GNOMEUIINFO_END }; -GnomeUIInfo gnome_panel_view_menu [] = { - GNOMEUIINFO_RADIOITEM(N_("Icon View"), NULL, gnome_icon_view_cmd,NULL), - GNOMEUIINFO_RADIOITEM(N_("Partial View"), NULL, gnome_partial_view_cmd,NULL), - GNOMEUIINFO_RADIOITEM(N_("Full View"), NULL, gnome_full_view_cmd,NULL), - GNOMEUIINFO_RADIOITEM(N_("Custom View"), NULL, gnome_custom_view_cmd,NULL), - GNOMEUIINFO_END -}; - GnomeUIInfo gnome_panel_layout_menu [] = { - GNOMEUIINFO_ITEM_NONE( N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd ), - GNOMEUIINFO_ITEM_NONE( N_("_Filter View..."), N_("Global option settings"), gnome_filter_cmd ), + GNOMEUIINFO_ITEM_NONE(N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd), + GNOMEUIINFO_ITEM_NONE(N_("_Filter View..."), N_("Global option settings"), gnome_filter_cmd), GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_RADIOLIST( gnome_panel_view_menu), + GNOMEUIINFO_RADIOLIST(panel_view_menu_uiinfo), GNOMEUIINFO_END }; @@ -388,10 +418,10 @@ #endif #ifdef USE_EXT2FSLIB /*does this do anything?*/ -/* GNOMEUIINFO_ITEM_NONE(N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd ),*/ +/* GNOMEUIINFO_ITEM_NONE(N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd),*/ #endif #ifdef WITH_BACKGROUND - GNOMEUIINFO_ITEM_NONE( N_("_Background jobs..."), N_("List of background operations"), jobs_cmd ), + GNOMEUIINFO_ITEM_NONE(N_("_Background jobs..."), N_("List of background operations"), jobs_cmd), #endif GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_ITEM_STOCK (N_("Exit"), N_("Terminates the file manager and the desktop"), @@ -402,7 +432,7 @@ GnomeUIInfo gnome_panel_about_menu [] = { /* GNOMEUIINFO_HELP ("midnight-commander"), */ - GNOMEUIINFO_MENU_ABOUT_ITEM( gnome_about_cmd,NULL), + GNOMEUIINFO_MENU_ABOUT_ITEM(gnome_about_cmd, NULL), GNOMEUIINFO_END }; @@ -465,30 +495,32 @@ send_message (panel->widget.parent, (Widget *) panel, WIDGET_FOCUS, 0); } -static void -create_new_menu_from (GnomeApp *app, WPanel *panel, char *file) +void +destroy_gde (GtkWidget *unused, void *data) +{ + gnome_desktop_entry_free ((GnomeDesktopEntry *) (data)); +} + +gint +create_new_menu_from (char *file, GtkWidget *shell, gint pos) { - gint pos; - GtkWidget *shell = NULL; DIR *dir; struct stat filedata; + gboolean add_separator = TRUE; struct dirent *dirstruc; GnomeDesktopEntry *gde; GtkWidget *menu; char *file2; - + + g_return_val_if_fail (shell != NULL, pos); + dir = opendir (file); if (dir == NULL) - return; - - shell = gnome_app_find_menu_pos (app->menubar, _("File/New/Directory..."), &pos); - menu = gtk_menu_item_new (); - gtk_widget_show (menu); - gtk_menu_shell_insert (GTK_MENU_SHELL (shell), menu, pos++); + return pos; if (shell == NULL){ closedir (dir); - return; + return pos; } while ((dirstruc = readdir (dir)) != NULL){ @@ -499,13 +531,17 @@ if ((stat (file2, &filedata) != -1) && (S_ISREG (filedata.st_mode))){ char *path; - char *test; - - gde = gnome_desktop_entry_load (file2); + int len; + const int desktoplen = sizeof (".desktop") - 1; - test = strrchr(dirstruc->d_name, '.'); + len = strlen (dirstruc->d_name); + if (strcmp (dirstruc->d_name + len - desktoplen, ".desktop") != 0) { + g_free (file2); + continue; + } - if (test == NULL || gde == NULL || strcmp (test, ".desktop")){ + gde = gnome_desktop_entry_load (file2); + if (gde == NULL) { g_free (file2); continue; } @@ -513,23 +549,40 @@ path = gnome_is_program_in_path (gde->tryexec); g_free (path); if (!path){ + gnome_desktop_entry_free (gde); g_free (file2); continue; } - + + if (add_separator) { + menu = gtk_menu_item_new (); + gtk_widget_show (menu); + gtk_menu_shell_insert (GTK_MENU_SHELL (shell), menu, pos++); + add_separator = !add_separator; + } + menu = gtk_menu_item_new_with_label (gde->name); gtk_widget_show (menu); gtk_menu_shell_insert (GTK_MENU_SHELL (shell), menu, pos++); /* This is really bad, but it works. */ + /* FIXME: it doesn't work if we free the gde below. -- + * need to do this right sometime -jrb + */ if (gde->comment) - gtk_object_set_data (GTK_OBJECT (menu), "apphelper_statusbar_hint", + gtk_object_set_data (GTK_OBJECT (menu), + "apphelper_statusbar_hint", gde->comment); - gtk_signal_connect (GTK_OBJECT (menu), "activate", GTK_SIGNAL_FUNC (gnome_run_new), + gtk_signal_connect (GTK_OBJECT (menu), "activate", + GTK_SIGNAL_FUNC (gnome_run_new), + gde); + gtk_signal_connect (GTK_OBJECT (menu), "destroy", + GTK_SIGNAL_FUNC (destroy_gde), gde); } g_free (file2); } + return pos; } /** @@ -541,15 +594,20 @@ create_new_menu (GnomeApp *app, WPanel *panel) { gchar *file, *file2; + gint pos; + GtkWidget *shell; + + shell = gnome_app_find_menu_pos (app->menubar, _("File/New/Directory..."), &pos); file = gnome_unconditional_datadir_file ("mc/templates"); - create_new_menu_from (app, panel, file); - + pos = create_new_menu_from (file, shell, pos); + file2 = gnome_datadir_file ("mc/templates"); if (file2 != NULL){ if (strcmp (file, file2) != 0) - create_new_menu_from (app, panel, file2); + create_new_menu_from (file2, shell, pos); } + g_free (file); g_free (file2); } @@ -603,6 +661,37 @@ gnome_app_create_menus_custom (app, uiinfo, &uibdata); } +/** + * copy_uiinfo_widgets: + * @uiinfo: A GnomeUIInfo array + * @dest: The destination array will be placed here + * + * Allocates an array of widgets and copies the widgets from the uiinfo array to + * it. The array will be NULL-terminated. + **/ +void +copy_uiinfo_widgets (GnomeUIInfo *uiinfo, gpointer **dest) +{ + int n; + int i; + + g_return_if_fail (uiinfo != NULL); + g_return_if_fail (dest != NULL); + + /* Count number of items */ + + for (n = 0; uiinfo[n].type != GNOME_APP_UI_ENDOFINFO; n++); + + /* Copy the widgets */ + + *dest = g_new (gpointer, n + 1); + + for (i = 0; i < n; i++) + (*dest)[i] = uiinfo[i].widget; + + (*dest)[i] = NULL; +} + WPanel * create_container (Dlg_head *h, char *name, char *geometry) { @@ -638,8 +727,8 @@ else uiinfo = gnome_panel_menu_with_desktop; - 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); @@ -718,7 +807,8 @@ if (!cpanel) return; - update_one_panel_widget (cpanel, force_update, current_file); + if (!is_a_desktop_panel (cpanel)) + update_one_panel_widget (cpanel, force_update, current_file); if (reload_others){ for (p = containers; p; p = p->next){ @@ -727,7 +817,8 @@ if (p->data == current_panel_ptr) continue; - update_one_panel_widget (pc->panel, force_update, UP_KEEPSEL); + if (!is_a_desktop_panel (pc->panel)) + update_one_panel_widget (pc->panel, force_update, UP_KEEPSEL); } } mc_chdir (cpanel->cwd); diff -ruN old/mc-4.5.24/gnome/gmain.c new/mc-4.5.25/gnome/gmain.c --- old/mc-4.5.24/gnome/gmain.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gmain.c Fri Mar 12 21:02:39 1999 @@ -412,7 +412,6 @@ int dialog_panel_callback (struct Dlg_head *h, int id, int msg) { - WPanel *p; WInput *in; Widget_Item *dh; void *current_widget; /* The current widget */ @@ -566,8 +565,6 @@ static void session_die (void) { - extern int quit; - gmc_do_quit (); } @@ -588,7 +585,6 @@ argv [0] = client_data; for (i = 1, l = containers; l; l = l->next){ PanelContainer *pc = l->data; - int x, y, w, h; char *geom; geom = gnome_geometry_string (GTK_WIDGET (pc->panel->widget.wdata)->window); diff -ruN old/mc-4.5.24/gnome/gmain.h new/mc-4.5.25/gnome/gmain.h --- old/mc-4.5.24/gnome/gmain.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gmain.h Fri Mar 12 21:02:39 1999 @@ -33,9 +33,15 @@ void bind_gtk_keys (GtkWidget *w, Dlg_head *h); WPanel *new_panel_at (char *dir); WPanel *new_panel_with_geometry_at (char *dir, char *geometry); +void set_current_panel (WPanel *panel); void layout_panel_gone (WPanel *panel); void gtkrundlg_event (Dlg_head *h); - +int gmc_open (file_entry *fe); +int gmc_open_with (char *filename); +int gmc_open_filename (char *fname, GList *args); +int gmc_edit (char *fname); +int gmc_can_view_file (char *filename); +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); diff -ruN old/mc-4.5.24/gnome/gmount.c new/mc-4.5.25/gnome/gmount.c --- old/mc-4.5.24/gnome/gmount.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gmount.c Fri Mar 12 21:02:39 1999 @@ -213,6 +213,29 @@ return list; } +char * +mount_point_to_device (char *mount_point) +{ + FILE *f; + struct mntent *mnt; + + f = setmntent ("/etc/fstab", "r"); + if (f == NULL) + return NULL; + + while ((mnt = getmntent (f))){ + if (strcmp (mnt->mnt_dir, mount_point) == 0){ + char *v; + + v = g_strdup (mnt->mnt_fsname); + endmntent (f); + return v; + } + } + endmntent (f); + return NULL; +} + #else char * @@ -233,6 +256,11 @@ return TRUE; } +char * +mount_point_to_device (char *mount_point) +{ + return NULL; +} #endif @@ -330,7 +358,6 @@ gboolean release_format; gboolean ejectable; - dev_name = dit->devname; short_dev_name = x_basename (dev_name); @@ -361,7 +388,7 @@ } else if (dit->type == TYPE_NFS){ release_format = TRUE; format = g_strdup_printf (_("NFS dir %s"), dit->mount_point); - icon = "i-blockdev.png"; + icon = "i-nfs.png"; count = nfs_count++; } else { format = _("Device %d"); diff -ruN old/mc-4.5.24/gnome/gmount.h new/mc-4.5.25/gnome/gmount.h --- old/mc-4.5.24/gnome/gmount.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gmount.h Fri Mar 12 21:02:39 1999 @@ -14,7 +14,8 @@ void gmount_setup_devices (void); void desktop_cleanup_devices (void); -char *is_block_device_mountable (char *devname); -gboolean is_block_device_mounted (char *devname); +char *is_block_device_mountable (char *mount_point); +gboolean is_block_device_mounted (char *mount_point); +char *mount_point_to_device (char *mount_point); #endif diff -ruN old/mc-4.5.24/gnome/gnome-file-property-dialog.c new/mc-4.5.25/gnome/gnome-file-property-dialog.c --- old/mc-4.5.24/gnome/gnome-file-property-dialog.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gnome-file-property-dialog.c Fri Mar 12 21:02:39 1999 @@ -1,5 +1,5 @@ /* gnome-file-property-dialog.c - * Copyright (C) 1999 J. Arthur Random + * Copyright (C) 1999 Free Software Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -81,6 +81,8 @@ static void gnome_file_property_dialog_init (GnomeFilePropertyDialog *file_property_dialog) { + gnome_dialog_close_hides (GNOME_DIALOG (file_property_dialog), TRUE); + file_property_dialog->file_name = NULL; file_property_dialog->file_entry = NULL; file_property_dialog->group_name = NULL; @@ -437,14 +439,15 @@ const gchar *icon; retval = gnome_icon_entry_new ("gmc_file_icon", "Select an Icon"); - icon = gicon_get_filename_for_icon (fp_dlg->im); - if (!icon) + icon = g_strdup (gicon_get_filename_for_icon (fp_dlg->im)); + if (icon) return retval; - if (!icon[0]){ + if (icon[0]){ return retval; } gnome_icon_entry_set_icon (GNOME_ICON_ENTRY (retval), icon); + fp_dlg->icon_filename = g_strdup (icon); return retval; } @@ -478,7 +481,7 @@ gtk_table_attach_defaults (GTK_TABLE (table), fp_dlg->open_entry, 1, 2, 0, 1); - fp_dlg->open_cbox = gtk_check_button_new_with_label (_("Use default Open options")); + fp_dlg->open_cbox = gtk_check_button_new_with_label (_("Use default Open action")); gtk_signal_connect (GTK_OBJECT (fp_dlg->open_cbox), "toggled", metadata_toggled, fp_dlg); gtk_table_attach_defaults (GTK_TABLE (table), fp_dlg->open_cbox, 0, 2, 1, 2); @@ -501,9 +504,9 @@ fp_dlg->prop1_entry, 1, 2, 3, 4); if (fp_dlg->executable) - fp_dlg->prop1_cbox = gtk_check_button_new_with_label (_("Use default Drop action options")); + fp_dlg->prop1_cbox = gtk_check_button_new_with_label (_("Use default Drop action")); else - fp_dlg->prop1_cbox = gtk_check_button_new_with_label (_("Use default View options")); + fp_dlg->prop1_cbox = gtk_check_button_new_with_label (_("Use default View action")); gtk_signal_connect (GTK_OBJECT (fp_dlg->prop1_cbox), "toggled", metadata_toggled, fp_dlg); gtk_table_attach_defaults (GTK_TABLE (table), fp_dlg->prop1_cbox, 0, 2, 4, 5); @@ -522,7 +525,7 @@ gtk_table_attach_defaults (GTK_TABLE (table), fp_dlg->prop2_entry, 1, 2, 6, 7); - fp_dlg->prop2_cbox = gtk_check_button_new_with_label (_("Use default Edit options")); + fp_dlg->prop2_cbox = gtk_check_button_new_with_label (_("Use default Edit action")); gtk_signal_connect (GTK_OBJECT (fp_dlg->prop2_cbox), "toggled", metadata_toggled, fp_dlg); gtk_table_attach_defaults (GTK_TABLE (table), fp_dlg->prop2_cbox, 0, 2, 7, 8); @@ -610,7 +613,7 @@ } /* We must be a file or a link to a file. */ - frame = gtk_frame_new (_("Actions")); + frame = gtk_frame_new (_("File Actions")); gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); table = generate_actions_box (fp_dlg); gtk_container_add (GTK_CONTAINER (frame), table); @@ -1024,11 +1027,6 @@ fp_dlg->mime_fm_view = gnome_mime_get_value (mime_type, "view"); fp_dlg->mime_edit = gnome_mime_get_value (mime_type, "edit"); fp_dlg->mime_drop_target = gnome_mime_get_value (mime_type, "drop-action"); - - gnome_metadata_get (fp_dlg->file_name, "icon-filename", &size, &fp_dlg->icon_filename); - if (fp_dlg->icon_filename) - g_print ("we have an icon-filename:%s:\n", fp_dlg->icon_filename); - } GtkWidget * @@ -1230,8 +1228,6 @@ apply_metadata_change (GnomeFilePropertyDialog *fpd) { gchar *text; - gchar *icon_name; - char *filename; /* If we don't have an open_cbox, that means we have no metadata * to set. @@ -1372,9 +1368,10 @@ /* And finally, we set the metadata on the icon filename */ text = gnome_icon_entry_get_filename (GNOME_ICON_ENTRY (fpd->button)); /*gtk_entry_get_text (GTK_ENTRY (gnome_icon_entry_gtk_entry (GNOME_ICON_ENTRY (fpd->button))));*/ - + if (text) { - gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text); + if (fpd->icon_filename == NULL || (!strcmp (fpd->icon_filename, text))) + gnome_metadata_set (fpd->file_name, "icon-filename", strlen (text) + 1, text); g_free (text); } /* I suppose we should only do this if we know there's been a change -- I'll try to figure it diff -ruN old/mc-4.5.24/gnome/gnome-file-property-dialog.h new/mc-4.5.25/gnome/gnome-file-property-dialog.h --- old/mc-4.5.24/gnome/gnome-file-property-dialog.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gnome-file-property-dialog.h Fri Mar 12 21:02:39 1999 @@ -1,5 +1,5 @@ /* gnome-file-property-dialog.h - * Copyright (C) 1999 J. Arthur Random + * Copyright (C) 1999 Free Software Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public diff -ruN old/mc-4.5.24/gnome/gnome-open-dialog.c new/mc-4.5.25/gnome/gnome-open-dialog.c --- old/mc-4.5.24/gnome/gnome-open-dialog.c Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.25/gnome/gnome-open-dialog.c Fri Mar 12 21:02:39 1999 @@ -0,0 +1,332 @@ +/* gnome-open-dialog.c + * Copyright (C) 1999 Red Hat Software. Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#include +#include "gnome-open-dialog.h" +#include +#include +#include +#include +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); +static void gnome_open_dialog_generate_tree_helper (GtkCTree *ctree, GtkCTreeNode *parent, GNode *node); +static void gnome_open_dialog_destroy_func (GtkCTree *ctree, GtkCTreeNode *node, gpointer data); + +static GnomeDialogClass *parent_class = NULL; +#define SMALL_ICON_SIZE 20 + + +GtkType +gnome_open_dialog_get_type (void) +{ + static GtkType open_dialog_type = 0; + + if (!open_dialog_type) + { + static const GtkTypeInfo open_dialog_info = + { + "GnomeOpenDialog", + sizeof (GnomeOpenDialog), + sizeof (GnomeOpenDialogClass), + (GtkClassInitFunc) gnome_open_dialog_class_init, + (GtkObjectInitFunc) gnome_open_dialog_init, + /* reserved_1 */ NULL, + /* reserved_2 */ NULL, + (GtkClassInitFunc) NULL, + }; + + open_dialog_type = gtk_type_unique (gnome_dialog_get_type (), &open_dialog_info); + } + + return open_dialog_type; +} + +static void +gnome_open_dialog_class_init (GnomeOpenDialogClass *klass) +{ + GtkObjectClass *object_class; + + object_class = (GtkObjectClass*) klass; + + parent_class = gtk_type_class (gnome_dialog_get_type ()); + object_class->destroy = gnome_open_dialog_destroy; + +} +static void +gnome_open_dialog_destroy_func (GtkCTree *ctree, + GtkCTreeNode *node, + gpointer data) +{ + GnomeDesktopEntry *gde; + if (ctree == NULL || node == NULL) + return; + + gde = (GnomeDesktopEntry *)gtk_ctree_node_get_row_data (GTK_CTREE (ctree),node); + if (gde) + gnome_desktop_entry_free (gde); +} +static void +gnome_open_dialog_destroy (GtkObject *object) +{ + g_return_if_fail (object != NULL); + g_return_if_fail (GNOME_IS_OPEN_DIALOG (object)); + g_free (GNOME_OPEN_DIALOG (object)->file_name); + gtk_ctree_post_recursive (GTK_CTREE (GNOME_OPEN_DIALOG (object)->ctree), + NULL, + gnome_open_dialog_destroy_func, + NULL); + gtk_widget_unref (GNOME_OPEN_DIALOG (object)->ctree); + gtk_widget_unref (GNOME_OPEN_DIALOG (object)->entry); + (* GTK_OBJECT_CLASS (parent_class)->destroy) (object); +} +static void +gnome_open_dialog_init (GnomeOpenDialog *open_dialog) +{ + +} +/* Private internal functions */ +/* Stolen from gnomecc:tree.c */ +static GNode * +read_directory (gchar *directory) +{ + DIR *parent_dir; + struct dirent *child_dir; + struct stat filedata; + GNode *retval = g_node_new(NULL); + + parent_dir = opendir (directory); + if (parent_dir == NULL) + return NULL; + + while ((child_dir = readdir (parent_dir)) != NULL) { + if (child_dir->d_name[0] != '.') { + + /* we check to see if it is interesting. */ + GString *name = g_string_new (directory); + g_string_append (name, "/"); + g_string_append (name, child_dir->d_name); + + if (stat (name->str, &filedata) != -1) { + gchar* test; + if (S_ISDIR (filedata.st_mode)) { + /* it might be interesting... */ + GNode *next_dir = read_directory (name->str); + if (next_dir) + /* it is interesting!!! */ + g_node_prepend (retval, next_dir); + } + test = rindex(child_dir->d_name, '.'); + if (test && !strcmp (".desktop", test)) { + /* it's a .desktop file -- it's interesting for sure! */ + GNode *new_node = g_node_new (gnome_desktop_entry_load (name->str)); + g_node_prepend (retval, new_node); + } + } + g_string_free (name, TRUE); + } + else if (!strcmp (child_dir->d_name, ".directory")) { + GString *name = g_string_new (directory); + g_string_append (name, "/.directory"); + retval->data = gnome_desktop_entry_load (name->str); + g_string_free (name, TRUE); + } + } +#if 0 + if (!retval->data) { + /* no .directory file. Well, I guess we abort. */ + /* FIXME: i guess we should free memory now... */ + return NULL; + } +#endif + if (retval->children == NULL) { + if (retval->data) + gnome_desktop_entry_free (retval->data); + return NULL; + } + return retval; +} +static void +gnome_open_dialog_generate_tree_helper (GtkCTree *ctree, GtkCTreeNode *parent, GNode *node) +{ + GNode *i; + GtkCTreeNode *child = NULL; + static char *text[2]; + GnomePixmap *icon_gpixmap; + gchar *icon; + GdkPixmap *icon_pixmap, *icon_mask; + + + text[0] = NULL; + text[1] = NULL; + + for (i = node;i;i = i->next) { + icon_pixmap=NULL; + icon_mask=NULL; + icon=NULL; + icon_gpixmap = NULL; + + if (i->data && ((GnomeDesktopEntry *)i->data)->name) { + text[0] = ((GnomeDesktopEntry *)i->data)->name; + } else + text[0] = NULL; + if ((i->data) && ((GnomeDesktopEntry *)i->data)->icon) + icon = ((GnomeDesktopEntry *)i->data)->icon; + if (icon && g_file_exists (icon)) + icon_gpixmap = (GnomePixmap *)gnome_pixmap_new_from_file_at_size(icon, + SMALL_ICON_SIZE, + SMALL_ICON_SIZE); + if (icon_gpixmap) { + icon_pixmap = icon_gpixmap->pixmap; + icon_mask = icon_gpixmap->mask; + } + + if (i->data && text[0]) { + if (((GnomeDesktopEntry *)i->data)->type && !strcmp(((GnomeDesktopEntry *)i->data)->type,"Directory")) + child = gtk_ctree_insert_node (ctree,parent,NULL, text, 3, icon_pixmap, icon_mask, icon_pixmap, icon_mask,FALSE,FALSE); + else + child = gtk_ctree_insert_node (ctree,parent,NULL, text, 3, icon_pixmap, icon_mask, icon_pixmap, icon_mask,TRUE,FALSE); + gtk_ctree_node_set_row_data (ctree, child, i->data); + } else + gnome_desktop_entry_free (i->data); + if (i->children) + gnome_open_dialog_generate_tree_helper (ctree, child, i->children); +/* + if (parent == NULL) + gtk_ctree_expand_recursive (ctree, child); +*/ + } +} +static void +gnome_open_dialog_selected_row_callback (GtkWidget *widget, GtkCTreeNode *node, gint column, gpointer *data) +{ + GnomeDesktopEntry *gde = NULL; + GnomeOpenDialog *dialog = NULL; + GtkWidget *entry; + + if (column < 0) + return; + + dialog = GNOME_OPEN_DIALOG (data); + gde = (GnomeDesktopEntry *)gtk_ctree_node_get_row_data (GTK_CTREE (widget),node); + + g_return_if_fail (dialog != NULL); + g_return_if_fail (gde != NULL); + + if (gde->exec) { + entry = gnome_file_entry_gtk_entry (GNOME_FILE_ENTRY (dialog->entry)); + gtk_entry_set_text (GTK_ENTRY (entry), gde->exec[0]); + } +} +GtkWidget * +gnome_open_dialog_get_tree (GnomeOpenDialog *dialog) +{ + GtkWidget *retval; + gchar *prefix; + GNode *node; + + /* widget stuff */ + retval = gtk_ctree_new (1, 0); + gtk_clist_set_row_height(GTK_CLIST (retval),20); + gtk_ctree_set_line_style (GTK_CTREE (retval), GTK_CTREE_LINES_DOTTED); + gtk_ctree_set_expander_style (GTK_CTREE (retval), GTK_CTREE_EXPANDER_SQUARE); + gtk_clist_set_column_width(GTK_CLIST (retval), 0, 150); + gtk_signal_connect( GTK_OBJECT (retval), + "tree_select_row", + GTK_SIGNAL_FUNC (gnome_open_dialog_selected_row_callback), + dialog); + + gtk_ctree_set_indent (GTK_CTREE (retval), 15); + gtk_clist_set_column_auto_resize (GTK_CLIST (retval), 0, TRUE); + + /* set up the apps */ + prefix = gnome_unconditional_datadir_file ("gnome/apps"); + node = read_directory (prefix); + gnome_open_dialog_generate_tree_helper (GTK_CTREE (retval), NULL, node); + g_node_destroy (node); + g_free (prefix); + return retval; +} +/* Public functions */ +GtkWidget * +gnome_open_dialog_new (gchar *file_name) +{ + GnomeOpenDialog *dialog; + GtkWidget *label; + GtkWidget *frame; + GtkWidget *sw; + gchar *label_string; + + g_return_val_if_fail (file_name != NULL, NULL); + dialog = gtk_type_new (gnome_open_dialog_get_type ()); + + /* the first label */ + label_string = g_strconcat (_("Select an application to open \""), + file_name, "\" with.", NULL); + label = gtk_label_new (label_string); + gtk_widget_set_usize (label, 300, -1); + gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); + g_free (label_string); + gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); + + /* The entry */ + dialog->file_name = g_strdup (file_name); + dialog->entry = gnome_file_entry_new ("GNOME_OPEN_DIALOG", + _("Select a file to run with")); + gtk_widget_ref (dialog->entry); + /* Watch me do something evil... (-: */ + label_string = gnome_unconditional_libdir_file (""); + strcpy (label_string + strlen (label_string) - 4, "bin"); + g_print ("%s\n", label_string); + + gnome_file_entry_set_default_path (GNOME_FILE_ENTRY (dialog->entry), + label_string); + g_free (label_string); + + /* the file tree */ + frame = gtk_frame_new (_("Applications")); + dialog->ctree = gnome_open_dialog_get_tree (dialog); + gtk_widget_ref (dialog->ctree); + sw = gtk_scrolled_window_new (GTK_CLIST (dialog->ctree)->hadjustment, + GTK_CLIST (dialog->ctree)->vadjustment); + gtk_widget_set_usize (sw, 300, 170); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_container_set_border_width (GTK_CONTAINER (sw), GNOME_PAD_SMALL); + gtk_container_add (GTK_CONTAINER (sw), dialog->ctree); + gtk_container_add (GTK_CONTAINER (frame), sw); + + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), + label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), + frame, FALSE, FALSE, 0); + + frame = gtk_frame_new (_("Program to run")); + gtk_container_set_border_width (GTK_CONTAINER (dialog->entry), GNOME_PAD_SMALL); + gtk_container_add (GTK_CONTAINER (frame), dialog->entry); + gtk_box_pack_start (GTK_BOX (GNOME_DIALOG (dialog)->vbox), + frame, FALSE, FALSE, 0); + gnome_dialog_append_button (GNOME_DIALOG(dialog), + GNOME_STOCK_BUTTON_OK); + gnome_dialog_append_button (GNOME_DIALOG(dialog), + GNOME_STOCK_BUTTON_CANCEL); + gtk_widget_show_all (GNOME_DIALOG (dialog)->vbox); + return GTK_WIDGET (dialog); +} + + diff -ruN old/mc-4.5.24/gnome/gnome-open-dialog.h new/mc-4.5.25/gnome/gnome-open-dialog.h --- old/mc-4.5.24/gnome/gnome-open-dialog.h Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.25/gnome/gnome-open-dialog.h Fri Mar 12 21:02:39 1999 @@ -0,0 +1,61 @@ +/* gnome-open-dialog.h + * Copyright (C) 1999 Red Hat Software. Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ +#ifndef __GNOME_OPEN_DIALOG_H__ +#define __GNOME_OPEN_DIALOG_H__ + +#include + +#ifdef __cplusplus +extern "C" { +#pragma } +#endif /* __cplusplus */ + +#define GNOME_TYPE_OPEN_DIALOG (gnome_open_dialog_get_type ()) +#define GNOME_OPEN_DIALOG(obj) (GTK_CHECK_CAST ((obj), GNOME_TYPE_OPEN_DIALOG, GnomeOpenDialog)) +#define GNOME_OPEN_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), GNOME_TYPE_OPEN_DIALOG, GnomeOpenDialogClass)) +#define GNOME_IS_OPEN_DIALOG(obj) (GTK_CHECK_TYPE ((obj), GNOME_TYPE_OPEN_DIALOG)) +#define GNOME_IS_OPEN_DIALOG_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((obj), GNOME_TYPE_OPEN_DIALOG)) + + +typedef struct _GnomeOpenDialog GnomeOpenDialog; +typedef struct _GnomeOpenDialogClass GnomeOpenDialogClass; + +struct _GnomeOpenDialog +{ + GnomeDialog parent; + + gchar *file_name; + GtkWidget *ctree; + GtkWidget *entry; +}; +struct _GnomeOpenDialogClass +{ + GnomeDialogClass parent_class; +}; + + +GtkType gnome_open_dialog_get_type (void); +GtkWidget *gnome_open_dialog_new (gchar *file_name); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + + +#endif /* __GNOME_OPEN_DIALOG_H__ */ diff -ruN old/mc-4.5.24/gnome/gpopup.c new/mc-4.5.25/gnome/gpopup.c --- old/mc-4.5.24/gnome/gpopup.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gpopup.c Fri Mar 12 21:02:39 1999 @@ -83,7 +83,7 @@ { char *full = g_concat_dir_and_file (panel->cwd, selection (panel)->fname); - gmc_edit_filename (full); + gmc_edit (full); g_free (full); } @@ -102,12 +102,6 @@ if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0) retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg)); - /* - * Apply: desktop icon name change and url change - */ - if (dii->url) - desktop_icon_update_url (dii); - gtk_widget_destroy (dlg); g_free(path); @@ -161,7 +155,7 @@ /* if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0) reread_cmd ();*/ dlg = gnome_file_property_dialog_new (full_name, we_can_afford_the_speed); - gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (gtk_widget_get_toplevel (panel->ministatus))); + gnome_dialog_set_parent (GNOME_DIALOG (dlg), GTK_WINDOW (panel->xwindow)); if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0) retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg)); gtk_widget_destroy (dlg); @@ -256,6 +250,8 @@ */ static struct action file_actions[] = { { N_("Properties"), F_SINGLE | F_PANEL, (GtkSignalFunc) panel_action_properties }, + { N_("Delete"), F_PANEL | F_ALL, (GtkSignalFunc) delete_cmd }, + { N_("Delete"), F_DICON | F_ALL, (GtkSignalFunc) dicon_delete }, { N_("Properties"), F_SINGLE | F_DICON, (GtkSignalFunc) dicon_properties }, { N_("Mount device"), F_SINGLE|F_MOUNTABLE|F_DICON, (GtkSignalFunc) dicon_mount }, { N_("Unmount device"), F_SINGLE|F_UNMOUNTABLE|F_DICON, (GtkSignalFunc) dicon_unmount }, @@ -268,34 +264,15 @@ { N_("View unfiltered"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_view_unfiltered }, { N_("Edit"), F_PANEL | F_NOTDIR, (GtkSignalFunc) panel_action_edit }, { "", 0, NULL }, + { N_("Move/rename..."), F_PANEL | F_ALL, (GtkSignalFunc) ren_cmd }, + { N_("Copy..."), F_PANEL | F_ALL, (GtkSignalFunc) copy_cmd }, + { "", 0, NULL }, { N_("Link..."), F_PANEL | F_REGULAR | F_SINGLE, (GtkSignalFunc) link_cmd }, { N_("Symlink..."), F_PANEL | F_SINGLE, (GtkSignalFunc) symlink_cmd }, { N_("Edit symlink..."), F_PANEL | F_SYMLINK, (GtkSignalFunc) edit_symlink_cmd }, { NULL, 0, NULL }, }; -/* Menu entries for files from a panel window */ -static GnomeUIInfo panel_actions[] = { - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_ITEM_NONE (N_("Move/rename..."), NULL, ren_cmd), - GNOMEUIINFO_ITEM_NONE (N_("Copy..."), NULL, copy_cmd), - GNOMEUIINFO_ITEM_NONE (N_("Delete"), NULL, delete_cmd), - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_END -}; - -/* Menu entries for files from desktop icons */ -static GnomeUIInfo dicon_actions[] = { - GNOMEUIINFO_SEPARATOR, -#if 0 - GNOMEUIINFO_ITEM_NONE (N_("Move/rename..."), NULL, dicon_move), - GNOMEUIINFO_ITEM_NONE (N_("Copy..."), NULL, dicon_copy), -#endif - GNOMEUIINFO_ITEM_NONE (N_("Delete"), NULL, dicon_delete), - GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_END -}; - /* Creates the menu items for the standard actions. Returns the position at which additional menu * items should be inserted. @@ -528,7 +505,6 @@ int panel_row, char *filename, int insert_pos) { gpointer closure, regex_closure; - GnomeUIInfo *a_uiinfo; int i; GtkSignalFunc regex_callback; const char *mime_type; @@ -538,25 +514,14 @@ GNOMEUIINFO_END }; + regex_callback = mime_command_from_desktop_icon; if (panel) { - a_uiinfo = panel_actions; closure = panel; - regex_callback = mime_command_from_desktop_icon; regex_closure = filename; } else { - a_uiinfo = dicon_actions; closure = dii; - regex_callback = mime_command_from_desktop_icon; regex_closure = filename; } - - /* Fill in the common part of the menus */ - - for (i = 0; a_uiinfo [i].type != GNOME_APP_UI_ENDOFINFO; i++) - a_uiinfo[i].user_data = closure; - - fill_menu (GTK_MENU_SHELL (menu), a_uiinfo, insert_pos); - insert_pos += 5; /* the number of items from the common menus */ /* Fill in the regex command part */ diff -ruN old/mc-4.5.24/gnome/gpopup.h new/mc-4.5.25/gnome/gpopup.h --- old/mc-4.5.24/gnome/gpopup.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gpopup.h Fri Mar 12 21:02:39 1999 @@ -14,7 +14,7 @@ #include "panel.h" #include "gdesktop.h" -int gpopup_do_popup2 (GdkEventButton *event, WPanel *panel); +int gpopup_do_popup2 (GdkEventButton *event, WPanel *panel, DesktopIconInfo *dii); int gpopup_do_popup (GdkEventButton *event, WPanel *from_panel, DesktopIconInfo *dii, diff -ruN old/mc-4.5.24/gnome/gpopup2.c new/mc-4.5.25/gnome/gpopup2.c --- old/mc-4.5.24/gnome/gpopup2.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gpopup2.c Fri Mar 12 21:02:39 1999 @@ -23,6 +23,9 @@ #include "gpageprop.h" #include "gpopup.h" #include "gnome-file-property-dialog.h" +#include "gnome-open-dialog.h" +#include "gmain.h" +#include "gmount.h" #define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child) @@ -40,16 +43,23 @@ F_MIME_ACTIONS = 1 << 7 /* Special marker for the position of MIME actions */ }; -/* typedefs */ +/* An entry in the actions menu */ + +typedef gboolean (*menu_func) (WPanel *panel, DesktopIconInfo *dii); + struct action { char *text; /* Menu item text */ int flags; /* Flags from the above enum */ gpointer callback; /* Callback for menu item */ + menu_func func; /* NULL if item is always present; a predicate otherwise */ }; /* Multiple File commands */ static void handle_open (GtkWidget *widget, WPanel *panel); +static void handle_mount (GtkWidget *widget, WPanel *panel); +static void handle_unmount (GtkWidget *widget, WPanel *panel); +static void handle_eject (GtkWidget *widget, WPanel *panel); static void handle_view (GtkWidget *widget, WPanel *panel); static void handle_view_unfiltered (GtkWidget *widget, WPanel *panel); static void handle_edit (GtkWidget *widget, WPanel *panel); @@ -60,46 +70,141 @@ /* F_SINGLE file commands */ static void handle_properties (GtkWidget *widget, WPanel *panel); static void handle_open_with (GtkWidget *widget, WPanel *panel); -static void handle_hard_link (GtkWidget *widget, WPanel *panel); static void handle_symlink (GtkWidget *widget, WPanel *panel); +static void handle_hard_link (GtkWidget *widget, WPanel *panel); static void handle_edit_symlink (GtkWidget *widget, WPanel *panel); +/* Helper funcs and testing funcs. */ +static gboolean check_mount_func (WPanel *panel, DesktopIconInfo *dii); +static gboolean check_unmount_func (WPanel *panel, DesktopIconInfo *dii); +static gboolean check_eject_func (WPanel *panel, DesktopIconInfo *dii); + +static gchar * get_full_filename (WPanel *panel); + +/* Now, the actual code */ +static gchar * +get_full_filename (WPanel *panel) +{ + if (is_a_desktop_panel (panel)) { + gint i; + for (i = 0; i < panel->count; i++) + if (panel->dir.list [i].f.marked) { + return concat_dir_and_file (panel->cwd, + panel->dir.list [i].fname); + } + g_return_val_if_fail (FALSE, NULL); + } else + return concat_dir_and_file (panel->cwd, selection (panel)->fname); + +} + +static gboolean +check_mount_umount (DesktopIconInfo *dii, int mount) +{ + char *full_name; + file_entry *fe; + int v; + int is_mounted; + + full_name = g_concat_dir_and_file (desktop_directory, dii->filename); + fe = file_entry_from_file (full_name); + if (!fe) { + g_free (full_name); + return FALSE; + } + + v = is_mountable (full_name, fe, &is_mounted, NULL); + file_entry_free (fe); + g_free (full_name); + + if (!v) + return FALSE; + + if (is_mounted && mount) + return FALSE; + + if (!is_mounted && !mount) + return FALSE; + + return TRUE; +} + +static gboolean +check_mount_func (WPanel *panel, DesktopIconInfo *dii) +{ + if (!dii) + return FALSE; + + return check_mount_umount (dii, TRUE); +} + +static gboolean +check_unmount_func (WPanel *panel, DesktopIconInfo *dii) +{ + if (!dii) + return FALSE; + + return check_mount_umount (dii, FALSE); +} + +static gboolean +check_eject_func (WPanel *panel, DesktopIconInfo *dii) +{ + char *full_name; + file_entry *fe; + int v; + int is_mounted; + int retval; + + if (!dii) + return FALSE; + + full_name = g_concat_dir_and_file (desktop_directory, dii->filename); + fe = file_entry_from_file (full_name); + if (!fe) { + g_free (full_name); + return FALSE; + } + + v = is_mountable (full_name, fe, &is_mounted, NULL); + file_entry_free (fe); + + if (!v) + retval = FALSE; + else if (!is_ejectable (full_name)) + retval = FALSE; + else + retval = TRUE; + + g_free (full_name); + return retval; +} /* global vars */ extern int we_can_afford_the_speed; static struct action file_actions[] = { - { N_("Open"), F_NOTDEV, handle_open }, - { "", F_NOTDEV, NULL }, - { "", F_MIME_ACTIONS, NULL }, - { N_("Open with..."), F_REGULAR | F_SINGLE, handle_open_with }, - { N_("View"), F_REGULAR | F_SINGLE, handle_view }, - { N_("View Unfiltered"), F_REGULAR | F_ADVANCED | F_SINGLE, handle_view_unfiltered }, - { N_("Edit"), F_REGULAR | F_SINGLE, handle_edit }, - { "", F_REGULAR | F_SINGLE, NULL }, - { N_("Copy..."), F_ALL, handle_copy }, - { N_("Delete"), F_ALL, handle_delete }, - { N_("Move..."), F_ALL, handle_move }, - { N_("Hard Link..."), F_ADVANCED | F_SINGLE, handle_hard_link }, - { N_("Symlink..."), F_SINGLE, handle_symlink }, - { N_("Edit Symlink..."), F_SYMLINK | F_SINGLE, handle_edit_symlink }, - { "", F_SINGLE | F_ALL, NULL }, - { N_("Properties..."), F_SINGLE | F_ALL, handle_properties }, - { NULL, 0, NULL } -}; - -#if 0 -static action generic_actions[] = { - { N_("NEW(FIXME)"), F_ALL, NULL }, - { "", F_ALL, NULL }, - { N_("Change Background"), F_DICON, handle_display_properties }, - { N_("Rescan Directory"), F_ALL, handle_rescan }, - { N_("Arrange Icons"), F_DICON, handle_arrange_icons }, - { N_(""), F_DICON, NULL }, - { N_("Logout"), F_DICON, handle_logout }, - { NULL, 0, NULL } + { N_("Open"), F_NOTDEV | F_SINGLE, handle_open, NULL }, + { N_("Mount device"), F_ALL | F_SINGLE, handle_mount, check_mount_func }, + { N_("Unmount device"), F_ALL | F_SINGLE, handle_unmount, check_unmount_func }, + { N_("Eject device"), F_ALL | F_SINGLE, handle_eject, check_eject_func }, + { "", F_NOTDEV | F_SINGLE, NULL, NULL }, + { "", F_MIME_ACTIONS | F_SINGLE, NULL, NULL }, + { N_("Open with..."), F_REGULAR | F_SINGLE, handle_open_with, NULL }, + { N_("View"), F_REGULAR | F_SINGLE, handle_view, NULL }, + { N_("View Unfiltered"), F_REGULAR | F_ADVANCED | F_SINGLE, handle_view_unfiltered, NULL }, + { N_("Edit"), F_REGULAR | F_SINGLE, handle_edit, NULL }, + { "", F_REGULAR | F_SINGLE, NULL, NULL }, + { N_("Copy..."), F_ALL, handle_copy, NULL }, + { N_("Delete"), F_ALL, handle_delete, NULL }, + { N_("Move..."), F_ALL, handle_move, NULL }, + { N_("Hard Link..."), F_ADVANCED | F_SINGLE, handle_hard_link, NULL }, + { N_("Symlink..."), F_SINGLE, handle_symlink, NULL }, + { N_("Edit Symlink..."), F_SYMLINK | F_SINGLE, handle_edit_symlink, NULL }, + { "", F_SINGLE | F_ALL, NULL, NULL }, + { N_("Properties..."), F_SINGLE | F_ALL, handle_properties, NULL }, + { NULL, 0, NULL, NULL } }; -#endif /* This is our custom signal connection function for popup menu items -- see below for the * marshaller information. We pass the original callback function as the data pointer for the @@ -184,7 +289,7 @@ const char *value; int needs_terminal = 0; int size; - + filename = data; key = gtk_object_get_user_data (GTK_OBJECT (widget)); @@ -215,26 +320,54 @@ exec_extension (filename, value, NULL, NULL, 0, needs_terminal); } +/* Escapes the underlines in the specified string for use by GtkLabel */ +static char * +escape_underlines (char *str) +{ + char *buf; + char *p; + + buf = g_new (char, 2 * strlen (str) + 1); + + for (p = buf; *str; str++) { + if (*str == '_') + *p++ = '_'; + + *p++ = *str; + } + + *p = '\0'; + + return buf; +} + /* Creates the menu items for actions based on the MIME type of the selected * file in the panel. */ static int -create_mime_actions (GtkWidget *menu, WPanel *panel, int pos) +create_mime_actions (GtkWidget *menu, WPanel *panel, int pos, DesktopIconInfo *dii) { char *full_name; const char *mime_type; GList *keys, *l; + gint pos_init = pos; GnomeUIInfo uiinfo[] = { { 0 }, GNOMEUIINFO_END }; - full_name = g_concat_dir_and_file (panel->cwd, panel->dir.list[panel->selected].fname); + if (is_a_desktop_panel (panel)) { + g_assert (dii != NULL); + full_name = g_concat_dir_and_file (panel->cwd, dii->filename); + } else + full_name = g_concat_dir_and_file (panel->cwd, + panel->dir.list[panel->selected].fname); mime_type = gnome_mime_type_or_default (full_name, NULL); - g_free (full_name); - if (!mime_type) + if (!mime_type) { + g_free (full_name); return pos; + } keys = gnome_mime_get_keys (mime_type); for (l = keys; l; l = l->next) { @@ -258,6 +391,8 @@ /* Create the item for that entry */ + str = escape_underlines (str); + uiinfo[0].type = GNOME_APP_UI_ITEM; uiinfo[0].label = str; uiinfo[0].hint = NULL; @@ -271,6 +406,8 @@ uiinfo[0].widget = NULL; fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos++); + g_free (str); + gtk_object_set_user_data (GTK_OBJECT (uiinfo[0].widget), key); /* Remember to free this memory */ @@ -280,7 +417,12 @@ full_name); } - g_list_free (keys); + if (pos_init != pos) { + uiinfo[0].type = GNOME_APP_UI_SEPARATOR; + fill_menu (GTK_MENU_SHELL (menu), uiinfo, pos++); + g_list_free (keys); + } + return pos; } @@ -288,7 +430,7 @@ * which additional menu items should be inserted. */ static void -create_actions (GtkWidget *menu, gint flags, WPanel *panel) +create_actions (GtkWidget *menu, gint flags, WPanel *panel, DesktopIconInfo *dii) { struct action *action; int pos; @@ -302,7 +444,7 @@ for (action = file_actions; action->text; action++) { /* Insert the MIME actions if appropriate */ if ((action->flags & F_MIME_ACTIONS) && (flags & F_SINGLE)) { - pos = create_mime_actions (menu, panel, pos); + pos = create_mime_actions (menu, panel, pos, dii); continue; } @@ -310,6 +452,9 @@ if ((action->flags & flags) != action->flags) continue; + if (action->func && !((action->func)(panel, dii))) + continue; + /* Create the menu item for this action */ if (action->text[0]) { uiinfo[0].type = GNOME_APP_UI_ITEM; @@ -357,7 +502,7 @@ #define REMOVE(x,f) x &= ~f int -gpopup_do_popup2 (GdkEventButton *event, WPanel *panel) +gpopup_do_popup2 (GdkEventButton *event, WPanel *panel, DesktopIconInfo *dii) { GtkWidget *menu; gint flags = F_ALL | F_REGULAR | F_SYMLINK | F_SINGLE | F_NOTDEV | F_NOTDIR; @@ -403,13 +548,14 @@ REMOVE (flags, F_NOTDEV); } - g_assert (marked > 0); + if (marked == 0) + return 1; if (marked > 1) REMOVE (flags, F_SINGLE); /* Fill the menu */ - create_actions (menu, flags, panel); + create_actions (menu, flags, panel, dii); /* Run it */ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, event->button, event->time); @@ -420,35 +566,121 @@ gtk_signal_disconnect (GTK_OBJECT (menu), id); i = get_active_index (GTK_MENU (menu)); - gtk_widget_destroy (menu); - return i; + gtk_widget_unref (menu); + return 1; } static void handle_open (GtkWidget *widget, WPanel *panel) { - if (do_enter (panel)) + gchar *full_name; + DesktopIconInfo *dii; + + full_name = get_full_filename (panel); + + if (is_a_desktop_panel (panel)) { + dii = desktop_icon_info_get_by_filename (x_basename (full_name)); + g_assert (dii != NULL); + + desktop_icon_info_open (dii); + g_free (full_name); + return; + } + + if (gmc_open_filename (full_name, 0)) return; + gmc_open_with (full_name); + g_free (full_name); +} + +static void +perform_mount_unmount (WPanel *panel, int mount) +{ + char *full_name; + DesktopIconInfo *dii; + + g_assert (is_a_desktop_panel (panel)); + + full_name = get_full_filename (panel); + dii = desktop_icon_info_get_by_filename (x_basename (full_name)); + g_assert (dii != NULL); + + desktop_icon_set_busy (dii, TRUE); + do_mount_umount (full_name, mount); + desktop_icon_set_busy (dii, FALSE); + g_free (full_name); +} + +static void +handle_mount (GtkWidget *widget, WPanel *panel) +{ + perform_mount_unmount (panel, TRUE); +} - handle_open_with (widget, panel); +static void +handle_unmount (GtkWidget *widget, WPanel *panel) +{ + perform_mount_unmount (panel, FALSE); +} + +static void +handle_eject (GtkWidget *widget, WPanel *panel) +{ + char *full_name; + char *lname; + DesktopIconInfo *dii; + + g_assert (is_a_desktop_panel (panel)); + + full_name = get_full_filename (panel); + dii = desktop_icon_info_get_by_filename (x_basename (full_name)); + g_assert (dii != NULL); + + desktop_icon_set_busy (dii, TRUE); + + lname = g_readlink (full_name); + if (!lname){ + g_free (full_name); + desktop_icon_set_busy (dii, FALSE); + return; + } + + if (is_block_device_mounted (lname)) + do_mount_umount (full_name, FALSE); + + do_eject (lname); + + desktop_icon_set_busy (dii, FALSE); + g_free (lname); + g_free (full_name); } static void handle_view (GtkWidget *widget, WPanel *panel) { - view_cmd (panel); + gchar *full_name; + + full_name = get_full_filename (panel); + gmc_view (full_name, 0); + g_free (full_name); } static void handle_view_unfiltered (GtkWidget *widget, WPanel *panel) { - view_simple_cmd (panel); + /* We need it to do the right thing later. */ + /*view_simple_cmd (panel);*/ + return; } static void handle_edit (GtkWidget *widget, WPanel *panel) { - edit_cmd (panel); + gchar *full_name; + + full_name = get_full_filename (panel); + gmc_edit (full_name); + g_free (full_name); } static void @@ -473,40 +705,36 @@ static void handle_properties (GtkWidget *widget, WPanel *panel) { - gint retval; - file_entry *fe; - char *full_name; - GtkWidget *dlg; - - fe = &panel->dir.list [panel->selected]; - full_name = concat_dir_and_file (panel->cwd, fe->fname); + gint retval = 0; + GtkWidget *dialog; + gchar *full_name = NULL; + + full_name = get_full_filename (panel); + dialog = gnome_file_property_dialog_new (full_name, + (is_a_desktop_panel (panel) + ? TRUE + : we_can_afford_the_speed)); + + if (!is_a_desktop_panel (panel)) + gnome_dialog_set_parent (GNOME_DIALOG (dialog), GTK_WINDOW (panel->xwindow)); + + if (gnome_dialog_run (GNOME_DIALOG (dialog)) == 0) + retval = gnome_file_property_dialog_make_changes ( + GNOME_FILE_PROPERTY_DIALOG (dialog)); - dlg = gnome_file_property_dialog_new (full_name, we_can_afford_the_speed); - gnome_dialog_set_parent (GNOME_DIALOG (dlg), - GTK_WINDOW (gtk_widget_get_toplevel (panel->ministatus))); - - if (gnome_dialog_run (GNOME_DIALOG (dlg)) == 0) - retval = gnome_file_property_dialog_make_changes (GNOME_FILE_PROPERTY_DIALOG (dlg)); - - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); g_free (full_name); - if (retval) + if (retval && !is_a_desktop_panel (panel)) reread_cmd (); } static void handle_open_with (GtkWidget *widget, WPanel *panel) { - char *command; - - command = input_expand_dialog (_("Open with"), - _("Enter extra arguments:"), - panel->dir.list [panel->selected].fname); - if (!command) - return; - - execute (command); - g_free (command); + gchar *full_name; + full_name = get_full_filename (panel); + gmc_open_with (full_name); + g_free (full_name); } static void @@ -528,8 +756,3 @@ edit_symlink_cmd (); } -static void -handle_rescan (GtkWidget *widget, WPanel *panel) -{ - reread_cmd (); -} diff -ruN old/mc-4.5.24/gnome/gprint.c new/mc-4.5.25/gnome/gprint.c --- old/mc-4.5.24/gnome/gprint.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gprint.c Fri Mar 12 21:02:39 1999 @@ -10,6 +10,7 @@ #include "util.h" #include #include "gdesktop.h" +#include "gprint.h" void gprint_setup_devices (void) diff -ruN old/mc-4.5.24/gnome/gprint.h new/mc-4.5.25/gnome/gprint.h --- old/mc-4.5.24/gnome/gprint.h Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.25/gnome/gprint.h Fri Mar 12 21:02:39 1999 @@ -0,0 +1,15 @@ +/* Printing support for the Midnight Commander + * + * Copyright (C) 1998-1999 The Free Software Foundation + * + * Author: Miguel de Icaza + */ + +#ifndef GPRINT_H +#define GPRINT_H + + +void gprint_setup_devices (void); + + +#endif diff -ruN old/mc-4.5.24/gnome/gscreen.c new/mc-4.5.25/gnome/gscreen.c --- old/mc-4.5.24/gnome/gscreen.c Tue Mar 9 13:45:24 1999 +++ new/mc-4.5.25/gnome/gscreen.c Fri Mar 12 21:02:39 1999 @@ -44,10 +44,6 @@ #include "dir-close.xpm" #include "link.xpm" #include "dev.xpm" -#include "listing-list.xpm" -#include "listing-iconic.xpm" -#include "listing-custom.xpm" -#include "listing-brief-list.xpm" /* This is used to initialize our pixmaps */ @@ -309,6 +305,9 @@ void x_select_item (WPanel *panel) { + if (is_a_desktop_panel (panel)) + return; + do_file_mark (panel, panel->selected, 1); display_mini_info (panel); @@ -469,8 +468,8 @@ event->button.x, event->button.y, &row, &column)) { gtk_clist_select_row (GTK_CLIST (file_list), row, 0); -#if 0 - gpopup_do_popup2 ((GdkEventButton *) event, panel); +#if 1 + gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL); #else gpopup_do_popup ((GdkEventButton *) event, panel, NULL, row, panel->dir.list[row].fname); @@ -1403,8 +1402,8 @@ switch (event->type){ case GDK_BUTTON_PRESS: if (event->button.button == 3) { -#if 0 - gpopup_do_popup2 ((GdkEventButton *) event, panel); +#if 1 + gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL); #else gpopup_do_popup ((GdkEventButton *) event, panel, NULL, index, panel->dir.list[index].fname); @@ -1931,6 +1930,7 @@ cursor = gdk_cursor_new (type); gdk_window_set_cursor (GTK_WIDGET (panel->xwindow)->window, cursor); gdk_cursor_destroy (cursor); + gdk_flush (); } static void @@ -2322,54 +2322,6 @@ } static void -do_switch_to_iconic (GtkWidget *widget, WPanel *panel) -{ - if (GTK_TOGGLE_BUTTON (widget)->active == FALSE) - return; - if (panel->list_type == list_icons) - return; - panel->list_type = list_icons; - set_panel_formats (panel); - panel_update_contents (panel); -} - -static void -do_switch_to_brief_listing (GtkWidget *widget, WPanel *panel) -{ - if (GTK_TOGGLE_BUTTON (widget)->active == FALSE) - return; - if (panel->list_type == list_brief) - return; - panel->list_type = list_brief; - set_panel_formats (panel); - panel_update_contents (panel); -} - -static void -do_switch_to_full_listing (GtkWidget *widget, WPanel *panel) -{ - if (GTK_TOGGLE_BUTTON (widget)->active == FALSE) - return; - if (panel->list_type == list_full) - return; - panel->list_type = list_full; - set_panel_formats (panel); - panel_update_contents (panel); -} - -static void -do_switch_to_custom_listing (GtkWidget *widget, WPanel *panel) -{ - if (GTK_TOGGLE_BUTTON (widget)->active == FALSE) - return; - if (panel->list_type == list_user) - return; - panel->list_type = list_user; - set_panel_formats (panel); - panel_update_contents (panel); -} - -static void rescan_panel (GtkWidget *widget, gpointer data) { reread_cmd (); @@ -2381,20 +2333,6 @@ do_panel_cd (panel, "~", cd_exact); } -/* View mode radio buttons for toolbar */ - -static GnomeUIInfo viewbar[] = { - { GNOME_APP_UI_ITEM, N_("Icon"), N_("Switch view to an Icon view"), do_switch_to_iconic, NULL, NULL, \ - GNOME_APP_PIXMAP_DATA, listing_iconic_xpm, 0, (GdkModifierType) 0, NULL }, - { GNOME_APP_UI_ITEM, N_("Brief"), N_("Switch view to show just file name and type"), do_switch_to_brief_listing, NULL, NULL, \ - GNOME_APP_PIXMAP_DATA, listing_brief_list_xpm, 0, (GdkModifierType) 0, NULL }, - { GNOME_APP_UI_ITEM, N_("Detailed"), N_("Switch view to show detailed file statistics"), do_switch_to_full_listing, NULL, NULL, \ - GNOME_APP_PIXMAP_DATA, listing_list_xpm, 0, (GdkModifierType) 0, NULL }, - { GNOME_APP_UI_ITEM, N_("Custom"), N_("Switch view to show custom determined statistics."), do_switch_to_custom_listing, NULL, NULL, \ - GNOME_APP_PIXMAP_DATA, listing_custom_xpm, 0, (GdkModifierType) 0, NULL }, - GNOMEUIINFO_END -}; - /* The toolbar */ static GnomeUIInfo toolbar[] = { @@ -2411,9 +2349,10 @@ GNOMEUIINFO_ITEM_STOCK (N_("Home"), N_("Go to your home directory"), go_home, GNOME_STOCK_PIXMAP_HOME), GNOMEUIINFO_SEPARATOR, - GNOMEUIINFO_RADIOLIST(viewbar), + GNOMEUIINFO_RADIOLIST(panel_view_toolbar_uiinfo), GNOMEUIINFO_END }; + static void do_ui_signal_connect (GnomeUIInfo *uiinfo, gchar *signal_name, GnomeUIBuilderData *uibdata) @@ -2424,8 +2363,6 @@ uibdata->data : uiinfo->user_data); } - - static void tree_size_allocate (GtkWidget *widget, GtkAllocation *allocation, WPanel *panel) { @@ -2466,7 +2403,7 @@ panel->notebook = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (panel->notebook), FALSE); gtk_widget_show (panel->notebook); - + panel->icons = panel_create_icon_display (panel); gtk_widget_show (panel->icons); @@ -2486,7 +2423,7 @@ gtk_widget_show (panel->icons); gtk_widget_show (panel->list); gtk_widget_show (panel->notebook); - + /* * Pane */ @@ -2494,7 +2431,7 @@ gtk_paned_add1 (GTK_PANED (panel->pane), panel->tree_scrolled_window); gtk_signal_connect (GTK_OBJECT (panel->tree_scrolled_window), "size_allocate", GTK_SIGNAL_FUNC (tree_size_allocate), panel); - + /* * Filter */ @@ -2507,7 +2444,7 @@ /* We do not want the focus by default (and the previos add_widget just gave it to us) */ h->current = h->current->prev; - + /* * We go through a lot of pain, wrestling with gnome_app* and gmc's @#$&*#$ internal structure and * make the #@$*&@#$ toolbars here... @@ -2527,17 +2464,30 @@ GNOME_DOCK_ITEM_BEH_EXCLUSIVE, GNOME_DOCK_TOP, 2, 0, 0); - + copy_uiinfo_widgets (panel_view_toolbar_uiinfo, &panel->view_toolbar_items); + panel->back_b = toolbar[0].widget; panel->up_b = toolbar[1].widget; panel->fwd_b = toolbar[2].widget; panel_update_marks (panel); + + /* Set the list type by poking a toolbar item. Yes, this is hackish. + * We fall back to icon view if a certain listing type is not supported. + * Be sure to keep this in sync with the uiinfo arrays in glayout.c. + */ + if (panel->list_type == list_brief) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (viewbar[1].widget), TRUE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (panel_view_toolbar_uiinfo[1].widget), TRUE); else if (panel->list_type == list_full) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (viewbar[2].widget), TRUE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (panel_view_toolbar_uiinfo[2].widget), TRUE); else if (panel->list_type == list_user) - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (viewbar[3].widget), TRUE); + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (panel_view_toolbar_uiinfo[3].widget), TRUE); + else + gtk_toggle_button_set_active ( + GTK_TOGGLE_BUTTON (panel_view_toolbar_uiinfo[0].widget), TRUE); status_line = gtk_hbox_new (FALSE, 2); gtk_container_set_border_width (GTK_CONTAINER (status_line), 3); @@ -2545,65 +2495,32 @@ gtk_label_new (_("Location:")), FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (status_line), cwd, TRUE, TRUE, 0); - + dock = gnome_dock_item_new ("gmc-toolbar1", (GNOME_DOCK_ITEM_BEH_EXCLUSIVE | GNOME_DOCK_ITEM_BEH_NEVER_VERTICAL)); gtk_container_add (GTK_CONTAINER(dock), status_line); gnome_dock_add_item (GNOME_DOCK(GNOME_APP (panel->xwindow)->dock), GNOME_DOCK_ITEM (dock), GNOME_DOCK_TOP, 1, 0, 0, FALSE); - + gtk_widget_show_all (dock); -#if 0 - status_line = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - panel->back_b, - "Go to the previous directory", NULL); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - panel->up_b, - "Go up a level in the directory heirarchy", NULL); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - panel->fwd_b, - "Go to the next directory", NULL); - gtk_toolbar_append_space (GTK_TOOLBAR (status_line)); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - button_switch_to_icon (panel), - "Icon view", NULL); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - button_switch_to_brief_listing (panel), - "Brief view", NULL); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - button_switch_to_full_listing (panel), - "Detailed view", NULL); - gtk_toolbar_append_widget (GTK_TOOLBAR (status_line), - button_switch_to_custom_listing (panel), - "Custom view", NULL); - gnome_app_add_toolbar (GNOME_APP (panel->xwindow), - GTK_TOOLBAR (status_line), - "gmc-toolbar2", - GNOME_DOCK_ITEM_BEH_EXCLUSIVE, - GNOME_DOCK_TOP, - 2, 0, 0); - gtk_widget_show_all (status_line); -#endif panel->view_table = gtk_table_new (1, 1, 0); gtk_widget_show (panel->view_table); - /* * The status bar. */ ministatus_box = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME(ministatus_box), GTK_SHADOW_IN); - + panel->status = gtk_label_new (_("Show all files")); gtk_misc_set_alignment (GTK_MISC (panel->status), 0.0, 0.0); gtk_misc_set_padding (GTK_MISC (panel->status), 2, 0); - + gtk_box_pack_start (GTK_BOX (panel->ministatus), ministatus_box, FALSE, FALSE, 0); gtk_container_add (GTK_CONTAINER(ministatus_box), panel->status); - + gtk_widget_show (ministatus_box); gtk_widget_show (panel->status); @@ -2624,10 +2541,6 @@ gtk_paned_add2 (GTK_PANED (panel->pane), panel->view_table); -#if 0 - gtk_table_attach (GTK_TABLE (panel->table), status_line, 0, 1, 0, 1, - GTK_EXPAND | GTK_FILL, GTK_SHRINK, 0, 0); -#endif /* * ministatus_box is a container created just to put the * panel->ministatus inside. diff -ruN old/mc-4.5.24/gnome/gscreen.h new/mc-4.5.25/gnome/gscreen.h --- old/mc-4.5.24/gnome/gscreen.h Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gscreen.h Fri Mar 12 21:02:39 1999 @@ -2,8 +2,14 @@ #define __GSCREEN_H +/* GnomeUIInfo information for view types */ +extern GnomeUIInfo panel_view_menu_uiinfo[]; +extern GnomeUIInfo panel_view_toolbar_uiinfo[]; + WPanel *create_container (Dlg_head *h, char *str, char *geometry); +void copy_uiinfo_widgets (GnomeUIInfo *uiinfo, gpointer **dest); + typedef struct { int splitted; @@ -15,5 +21,6 @@ extern PanelContainer *current_panel_ptr, *other_panel_ptr; extern GList *containers; + #endif /* __GSCREEN_H */ diff -ruN old/mc-4.5.24/gnome/gutil.c new/mc-4.5.25/gnome/gutil.c --- old/mc-4.5.24/gnome/gutil.c Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gutil.c Fri Mar 12 21:02:39 1999 @@ -132,7 +132,6 @@ } if ((*pid = fork ()) < 0){ - fprintf (stderr, "\n\nfork () = -1\n"); return -1; } if (*pid == 0){ diff -ruN old/mc-4.5.24/gnome/gview.c new/mc-4.5.25/gnome/gview.c --- old/mc-4.5.24/gnome/gview.c Tue Mar 9 13:45:25 1999 +++ new/mc-4.5.25/gnome/gview.c Fri Mar 12 21:02:39 1999 @@ -74,6 +74,19 @@ view_move_forward (view, 1); } + /* Update the ajd->value */ + gtk_signal_handler_block_by_func ( + GTK_OBJECT (view->sadj), + GTK_SIGNAL_FUNC (scrollbar_moved), + view); + + gtk_adjustment_set_value (adj, view->start_display); + + gtk_signal_handler_unblock_by_func ( + GTK_OBJECT (view->sadj), + GTK_SIGNAL_FUNC (scrollbar_moved), + view); + /* To force a display */ view->dirty = max_dirt_limit + 1; view_update (view, 0); Binary files old/mc-4.5.24/gnome/i-nfs.png and new/mc-4.5.25/gnome/i-nfs.png differ diff -ruN old/mc-4.5.24/gtkedit/editcmd.c new/mc-4.5.25/gtkedit/editcmd.c --- old/mc-4.5.24/gtkedit/editcmd.c Tue Mar 9 13:45:20 1999 +++ new/mc-4.5.25/gtkedit/editcmd.c Fri Mar 12 21:02:31 1999 @@ -352,7 +352,7 @@ /* NLS ? */ {DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]", "esm", widgets}; - static int i18n_flag; + static int i18n_flag = 0; if (!i18n_flag) { int i; @@ -553,7 +553,7 @@ x_set_dialog_title (raw_dlg, heading); raw_dlg->raw = 1; /* to return even a tab key */ if (cancel) - add_widget (raw_dlg, button_new (4, w / 2 - 5, B_CANCEL, NORMAL_BUTTON, "Cancel", 0, 0, 0)); + add_widget (raw_dlg, button_new (4, w / 2 - 5, B_CANCEL, NORMAL_BUTTON, _("Cancel"), 0, 0, 0)); add_widget (raw_dlg, label_new (3 - cancel, 2, query, 0)); add_widget (raw_dlg, input_new (3 - cancel, w - 5, INPUT_COLOR, 2, "", 0)); run_dlg (raw_dlg); @@ -807,7 +807,7 @@ { edit->force |= REDRAW_COMPLETELY; if (edit->modified) - if (edit_query_dialog2 (_ (" Warning "), _ (" Current text was modified without a file save. \n Continue discards these changes. "), _ ("Continue"), _ ("Cancel"))) + if (edit_query_dialog2 (_(" Warning "), _(" Current text was modified without a file save. \n Continue discards these changes. "), _("Continue"), _("Cancel"))) return 0; edit->modified = 0; return edit_renew (edit); /* if this gives an error, something has really screwed up */ @@ -826,7 +826,7 @@ return 0; } else { /* Heads the 'Load' file dialog box */ - edit_error_dialog (_ (" Load "), get_sys_error (_ (" Error trying to open file for reading "))); + edit_error_dialog (_(" Load "), get_sys_error (_(" Error trying to open file for reading "))); } return 1; } @@ -837,10 +837,10 @@ edit->force |= REDRAW_COMPLETELY; if (edit->modified) - if (edit_query_dialog2 (_ (" Warning "), _ (" Current text was modified without a file save. \n Continue discards these changes. "), _ ("Continue"), _ ("Cancel"))) + if (edit_query_dialog2 (_(" Warning "), _(" Current text was modified without a file save. \n Continue discards these changes. "), _("Continue"), _("Cancel"))) return 0; - exp = edit_get_load_file (edit->dir, edit->filename, _ (" Load ")); + exp = edit_get_load_file (edit->dir, edit->filename, _(" Load ")); if (exp) { if (*exp) @@ -984,7 +984,7 @@ return; if ((end_mark - start_mark) > option_max_undo / 2) - if (edit_query_dialog2 (_ (" Warning "), _ (" Block is large, you may not be able to undo this action. "), _ ("Continue"), _ ("Cancel"))) + if (edit_query_dialog2 (_(" Warning "), _(" Block is large, you may not be able to undo this action. "), _("Continue"), _("Cancel"))) return; edit_push_markers (edit); @@ -1081,7 +1081,7 @@ edit_mark_cmd (edit, 0); if ((end_mark - start_mark) > option_max_undo / 2) /* Warning message with a query to continue or cancel the operation */ - if (edit_query_dialog2 (_ (" Warning "), _ (" Block is large, you may not be able to undo this action. "), _ (" Continue "), _ (" Cancel "))) + if (edit_query_dialog2 (_(" Warning "), _(" Block is large, you may not be able to undo this action. "), _(" Continue "), _(" Cancel "))) return 1; edit_push_markers (edit); edit_cursor_move (edit, start_mark - edit->curs1); @@ -1123,6 +1123,8 @@ #define SEARCH_DLG_HEIGHT 10 #define REPLACE_DLG_WIDTH 58 #define REPLACE_DLG_HEIGHT 15 +#define CONFIRM_DLG_WIDTH 66 +#define CONFIRM_DLG_HEIGTH 6 #define B_REPLACE_ALL B_USER+1 #define B_SKIP_REPLACE B_USER+2 @@ -1132,15 +1134,15 @@ QuickWidget quick_widgets[] = { /* NLS for hotkeys? */ - {quick_button, 14, 18, 3, 6, "&Cancel", 0, B_CANCEL, 0, - 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 9, 18, 3, 6, "Replace &all", 0, B_REPLACE_ALL, 0, - 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 6, 18, 3, 6, "&Skip", 0, B_SKIP_REPLACE, 0, - 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 2, 18, 3, 6, "&Replace", 0, B_ENTER, 0, - 0, XV_WLAY_DONTCARE, NULL}, - {quick_label, 2, 50, 2, 6, 0, + {quick_button, 50, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("&Cancel"), + 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 37, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("al&L"), + 0, B_REPLACE_ALL, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 21, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("&Skip"), + 0, B_SKIP_REPLACE, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 4, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("&Replace"), + 0, B_ENTER, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_label, 2, CONFIRM_DLG_WIDTH, 2, CONFIRM_DLG_HEIGTH, 0, 0, 0, 0, XV_WLAY_DONTCARE, 0}, {0}}; @@ -1148,7 +1150,7 @@ { QuickDialog Quick_input = - {66, 6, 0, 0, N_(" Replace "), + {CONFIRM_DLG_WIDTH, CONFIRM_DLG_HEIGTH, 0, 0, N_(" Confirm replace "), "[Input Line Keys]", "quick_input", 0 /*quick_widgets */ }; Quick_input.widgets = quick_widgets; @@ -2228,8 +2230,8 @@ if (edit->modified) { #ifdef GTK char *r; - r = gtk_dialog_cauldron (_ (" Quit "), GTK_CAULDRON_TOPLEVEL | GTK_CAULDRON_GRAB, " [ ( %Lxf )xf ]xf / ( %Bgxfq || %Bgxfq || %Bgxfq ) ", - _ (" Current text was modified without a file save. \n Save with exit? "), GNOME_STOCK_BUTTON_CANCEL, GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO); + r = gtk_dialog_cauldron (_(" Quit "), GTK_CAULDRON_TOPLEVEL | GTK_CAULDRON_GRAB, " [ ( %Lxf )xf ]xf / ( %Bgxfq || %Bgxfq || %Bgxfq ) ", + _(" Current text was modified without a file save. \n Save with exit? "), GNOME_STOCK_BUTTON_CANCEL, GNOME_STOCK_BUTTON_YES, GNOME_STOCK_BUTTON_NO); if (!strcmp (r, GNOME_STOCK_BUTTON_YES)) { edit_push_markers (edit); edit_set_markers (edit, 0, 0, 0, 0); @@ -2243,11 +2245,11 @@ } #else #ifdef MIDNIGHT - switch (edit_query_dialog3 (_ (" Quit "), _ (" File was modified, Save with exit? "), _ ("Cancel quit"), _ ("&Yes"), _ ("&No"))) { + switch (edit_query_dialog3 (_(" Quit "), _(" File was modified, Save with exit? "), _("Cancel quit"), _("&Yes"), _("&No"))) { #else /* Confirm 'Quit' dialog box */ - switch (edit_query_dialog3 (_ (" Quit "), - _ (" Current text was modified without a file save. \n Save with exit? "), _ (" &Cancel quit "), _ (" &Yes "), _ (" &No "))) { + switch (edit_query_dialog3 (_(" Quit "), + _(" Current text was modified without a file save. \n Save with exit? "), _(" &Cancel quit "), _(" &Yes "), _(" &No "))) { #endif case 1: edit_push_markers (edit); @@ -2472,7 +2474,7 @@ return 0; edit_XStore_block (edit, start_mark, end_mark); if (!edit_save_block_to_clip_file (edit, start_mark, end_mark)) { - edit_error_dialog (_ (" Cut to clipboard "), _ (" Unable to save to file. ")); + edit_error_dialog (_(" Cut to clipboard "), _(" Unable to save to file. ")); return 1; } edit_block_delete_cmd (edit); @@ -2840,23 +2842,23 @@ QuickWidget quick_widgets[] = { /* NLS ? */ - {quick_button, 6, 10, 9, MAIL_DLG_HEIGHT, "&Cancel", 0, B_CANCEL, 0, + {quick_button, 6, 10, 9, MAIL_DLG_HEIGHT, N_("&Cancel"), 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 2, 10, 9, MAIL_DLG_HEIGHT, "&Ok", 0, B_ENTER, 0, + {quick_button, 2, 10, 9, MAIL_DLG_HEIGHT, N_("&Ok"), 0, B_ENTER, 0, 0, XV_WLAY_DONTCARE, NULL}, {quick_input, 3, 50, 8, MAIL_DLG_HEIGHT, "", 44, 0, 0, 0, XV_WLAY_BELOWCLOSE, "mail-dlg-input"}, - {quick_label, 2, 50, 7, MAIL_DLG_HEIGHT, " Copies to", 0, 0, 0, + {quick_label, 2, 50, 7, MAIL_DLG_HEIGHT, N_(" Copies to"), 0, 0, 0, 0, XV_WLAY_DONTCARE, 0}, {quick_input, 3, 50, 6, MAIL_DLG_HEIGHT, "", 44, 0, 0, 0, XV_WLAY_BELOWCLOSE, "mail-dlg-input-2"}, - {quick_label, 2, 50, 5, MAIL_DLG_HEIGHT, " Subject", 0, 0, 0, + {quick_label, 2, 50, 5, MAIL_DLG_HEIGHT, N_(" Subject"), 0, 0, 0, 0, XV_WLAY_DONTCARE, 0}, {quick_input, 3, 50, 4, MAIL_DLG_HEIGHT, "", 44, 0, 0, 0, XV_WLAY_BELOWCLOSE, "mail-dlg-input-3"}, - {quick_label, 2, 50, 3, MAIL_DLG_HEIGHT, " To", 0, 0, 0, + {quick_label, 2, 50, 3, MAIL_DLG_HEIGHT, N_(" To"), 0, 0, 0, 0, XV_WLAY_DONTCARE, 0}, - {quick_label, 2, 50, 2, MAIL_DLG_HEIGHT, " mail -s -c ", 0, 0, 0, + {quick_label, 2, 50, 2, MAIL_DLG_HEIGHT, N_(" mail -s -c "), 0, 0, 0, 0, XV_WLAY_DONTCARE, 0}, {0}}; diff -ruN old/mc-4.5.24/gtkedit/editoptions.c new/mc-4.5.25/gtkedit/editoptions.c --- old/mc-4.5.24/gtkedit/editoptions.c Tue Mar 9 13:45:20 1999 +++ new/mc-4.5.25/gtkedit/editoptions.c Fri Mar 12 21:02:32 1999 @@ -31,13 +31,23 @@ #include "../src/main.h" /* extern int option_this_and_that ... */ char *key_emu_str[] = -{"Intuitive", "Emacs"}; +{N_("Intuitive"), N_("Emacs"), NULL}; char *wrap_str[] = -{N_("None"), N_("Dynamic paragraphing"), N_("Type writer wrap")}; +{N_("None"), N_("Dynamic paragraphing"), N_("Type writer wrap"), NULL}; extern int option_syntax_highlighting; +void i18n_translate_array (char *array[]) +{ + size_t maxlen = 0; + + while (*array!=NULL) { + *array = _(*array); + array++; + } +} + void edit_options_dialog (void) { char wrap_length[32], tab_spacing[32], *p, *q; @@ -53,19 +63,19 @@ QuickWidget quick_widgets[] = { /*0 */ - {quick_button, 6, 10, OPT_DLG_H - 3, OPT_DLG_H, "&Cancel", 0, B_CANCEL, 0, + {quick_button, 6, 10, OPT_DLG_H - 3, OPT_DLG_H, N_("&Cancel"), 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, NULL}, /*1 */ - {quick_button, 2, 10, OPT_DLG_H - 3, OPT_DLG_H, "&Ok", 0, B_ENTER, 0, + {quick_button, 2, 10, OPT_DLG_H - 3, OPT_DLG_H, N_("&Ok"), 0, B_ENTER, 0, 0, XV_WLAY_DONTCARE, NULL}, /*2 */ - {quick_label, OPT_DLG_W / 2, OPT_DLG_W, OPT_DLG_H - 4, OPT_DLG_H, "Word wrap line length : ", 0, 0, + {quick_label, OPT_DLG_W / 2, OPT_DLG_W, OPT_DLG_H - 4, OPT_DLG_H, N_("Word wrap line length : "), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*3 */ {quick_input, OPT_DLG_W / 2 + 24, OPT_DLG_W, OPT_DLG_H - 4, OPT_DLG_H, "", OPT_DLG_W / 2 - 4 - 24, 0, 0, 0, XV_WLAY_DONTCARE, "i"}, /*4 */ - {quick_label, OPT_DLG_W / 2, OPT_DLG_W, OPT_DLG_H - 5, OPT_DLG_H, "Tab spacing : ", 0, 0, + {quick_label, OPT_DLG_W / 2, OPT_DLG_W, OPT_DLG_H - 5, OPT_DLG_H, N_("Tab spacing : "), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*5 */ {quick_input, OPT_DLG_W / 2 + 24, OPT_DLG_W, OPT_DLG_H - 5, OPT_DLG_H, "", OPT_DLG_W / 2 - 4 - 24, 0, @@ -73,25 +83,25 @@ /*6 */ #if !defined(MIDNIGHT) || defined(HAVE_SYNTAXH) #define OA 1 - {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 7, OPT_DLG_H, "syntax h&Ighlighting", 8, 0, + {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 7, OPT_DLG_H, N_("synta&X highlighting"), 8, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, #else #define OA 0 #endif /*7 */ - {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 8, OPT_DLG_H, "confir&M before saving", 6, 0, + {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 8, OPT_DLG_H, N_("confir&M before saving"), 6, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*8 */ - {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 9, OPT_DLG_H, "&Fill tabs with spaces", 0, 0, + {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 9, OPT_DLG_H, N_("fill tabs with &Spaces"), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*9 */ - {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 10, OPT_DLG_H, "&Return does auto indent", 0, 0, + {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 10, OPT_DLG_H, N_("&Return does autoindent"), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*10 */ - {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 11, OPT_DLG_H, "&Backspace through tabs", 0, 0, + {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 11, OPT_DLG_H, N_("&Backspace through tabs"), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*11 */ - {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 12, OPT_DLG_H, "&Fake half tabs", 0, 0, + {quick_checkbox, OPT_DLG_W / 2 + 1, OPT_DLG_W, OPT_DLG_H - 12, OPT_DLG_H, N_("&Fake half tabs"), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*12 */ {quick_radio, 5, OPT_DLG_W, OPT_DLG_H - 6, OPT_DLG_H, "", 3, 0, @@ -100,13 +110,21 @@ {quick_label, 4, OPT_DLG_W, OPT_DLG_H - 7, OPT_DLG_H, N_("Wrap mode"), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, /*14 */ - {quick_radio, 5, OPT_DLG_W, OPT_DLG_H - 11, OPT_DLG_H, "", 2, 0, + {quick_radio, 5, OPT_DLG_W, OPT_DLG_H - 11, OPT_DLG_H, "", 2, 0, 0, key_emu_str, XV_WLAY_DONTCARE, "keyemu"}, /*15 */ {quick_label, 4, OPT_DLG_W, OPT_DLG_H - 12, OPT_DLG_H, N_("Key emulation"), 0, 0, 0, 0, XV_WLAY_DONTCARE, NULL}, {0}}; + static int i18n_flag = 0; + + if (!i18n_flag) { + i18n_translate_array (key_emu_str); + i18n_translate_array (wrap_str); + i18n_flag = 1; + } + sprintf (wrap_length, "%d", option_word_wrap_line_length); sprintf (tab_spacing, "%d", option_tab_spacing); @@ -136,7 +154,7 @@ { QuickDialog Quick_options = - {OPT_DLG_W, OPT_DLG_H, -1, 0, " Editor Options ", + {OPT_DLG_W, OPT_DLG_H, -1, 0, N_(" Editor options "), "", "quick_input", 0}; Quick_options.widgets = quick_widgets; diff -ruN old/mc-4.5.24/macros/gnome.m4 new/mc-4.5.25/macros/gnome.m4 --- old/mc-4.5.24/macros/gnome.m4 Tue Mar 9 13:45:29 1999 +++ new/mc-4.5.25/macros/gnome.m4 Fri Mar 12 21:02:40 1999 @@ -1,18 +1,16 @@ dnl -dnl GNOME_INIT_HOOK (script-if-gnome-enabled, failflag) +dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) dnl dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh dnl is not found. dnl -AC_DEFUN([GNOME_INIT_HOOK], -[ +AC_DEFUN([GNOME_INIT_HOOK],[ AC_SUBST(GNOME_LIBS) AC_SUBST(GNOMEUI_LIBS) AC_SUBST(GNOMEGNORBA_LIBS) AC_SUBST(GTKXMHTML_LIBS) AC_SUBST(ZVT_LIBS) - AC_SUBST(GNOME_APPLET_LIBS) AC_SUBST(GNOME_LIBDIR) AC_SUBST(GNOME_INCLUDEDIR) @@ -61,7 +59,6 @@ GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_APPLET_LIBS="`$GNOME_CONFIG --libs-only-l applets`" GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" $1 @@ -97,8 +94,31 @@ fi fi fi + + if test -n "$3"; then + n="$3" + for i in $n; do + AC_MSG_CHECKING(extra library $i) + case $i in + applets) + AC_SUBST(GNOME_APPLETS_LIBS) + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + capplet) + AC_SUBST(GNOME_CAPPLET_LIBS) + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; + *) + AC_MSG_RESULT(unknown library) + esac + done + fi ]) +dnl +dnl GNOME_INIT ([additional-inits]) +dnl + AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail) + GNOME_INIT_HOOK([],fail,$1) ]) diff -ruN old/mc-4.5.24/mc.spec new/mc-4.5.25/mc.spec --- old/mc-4.5.24/mc.spec Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/mc.spec Fri Mar 12 21:02:29 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.24 +%define ver 4.5.25 %define rel 1 %define prefix /usr diff -ruN old/mc-4.5.24/mcfn_install.in new/mc-4.5.25/mcfn_install.in --- old/mc-4.5.24/mcfn_install.in Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/mcfn_install.in Fri Mar 12 21:02:29 1999 @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh # prefix=@prefix@ if test -n `echo $prefix | grep prefix`; then diff -ruN old/mc-4.5.24/po/cat-id-tbl.c new/mc-4.5.25/po/cat-id-tbl.c --- old/mc-4.5.24/po/cat-id-tbl.c Tue Mar 9 13:45:36 1999 +++ new/mc-4.5.25/po/cat-id-tbl.c Fri Mar 12 21:02:46 1999 @@ -57,369 +57,389 @@ {"Error", 44}, {"Home directory", 45}, {"Could not symlink %s to %s; will not have initial desktop icons.", 46}, - {"Arrange Icons", 47}, - {"Create New Window", 48}, - {"Rescan Mountable Devices", 49}, - {"Rescan Desktop", 50}, - {"To: ", 51}, - {"Copying from: ", 52}, - {"Deleting file: ", 53}, - {"Files Exist", 54}, + {"_Terminal", 47}, + {"Launch a new terminal in the current directory", 48}, + {"_Directory...", 49}, + {"Creates a new directory", 50}, + {"Arrange Icons", 51}, + {"Create New Window", 52}, + {"Rescan Mountable Devices", 53}, + {"Rescan Desktop", 54}, + {"To: ", 55}, + {"Copying from: ", 56}, + {"Deleting file: ", 57}, + {"Files Exist", 58}, {"\ Some of the files you are trying to copy already exist in the destination \ -folder.", 55}, - {"Prompt me before overwriting any file.", 56}, - {"Don't overwrite any files.", 57}, - {"Overwrite:", 58}, - {"Older files.", 59}, - {"Files only if size differs.", 60}, - {"All files.", 61}, - {"File Exists", 62}, - {"The target file already exists: %s", 63}, - {"Replace it?", 64}, - {"Copy", 65}, - {"Move", 66}, - {"Destination", 67}, - {"Find Destination Folder", 68}, - {"Copy as a background process", 69}, - {"Advanced Options", 70}, - {"Preserve symlinks", 71}, - {"Follow links.", 72}, +folder. Please select the action to be performed.", 59}, + {"Prompt me before overwriting any file.", 60}, + {"Don't overwrite any files.", 61}, + {"Overwrite:", 62}, + {"Older files.", 63}, + {"Files only if size differs.", 64}, + {"All files.", 65}, + {"File Exists", 66}, + {"The target file already exists: %s", 67}, + {"Replace it?", 68}, + {"Copy", 69}, + {"Move", 70}, + {"Destination", 71}, + {"Find Destination Folder", 72}, + {"Copy as a background process", 73}, + {"Advanced Options", 74}, + {"Preserve symlinks", 75}, + {"Follow links.", 76}, {"\ Selecting this will copy the files that symlinks point to instead of just \ -copying the link.", 73}, - {"Preserve file attributes.", 74}, - {"Preserves the permissions and the UID/GID if possible", 75}, - {"Recursively copy subdirectories.", 76}, - {"If set, this will copy the directories recursively", 77}, +copying the link.", 77}, + {"Preserve file attributes.", 78}, + {"Preserves the permissions and the UID/GID if possible", 79}, + {"Recursively copy subdirectories.", 80}, + {"If set, this will copy the directories recursively", 81}, {"\ %s\n\ \n\ -Directory not empty. Delete it recursively?", 78}, - {" Delete: ", 79}, - {"Do the same for the rest", 80}, - {"Move Progress", 81}, - {"Copy Progress", 82}, - {"Delete Progress", 83}, - {"File ", 84}, - {" is ", 85}, - {" Done.", 86}, - {"_Move here", 87}, - {"_Copy here", 88}, - {"_Link here", 89}, - {"Cancel drag", 90}, +Directory not empty. Delete it recursively?", 82}, + {" Delete: ", 83}, + {"Do the same for the rest", 84}, + {"Move Progress", 85}, + {"Copy Progress", 86}, + {"Delete Progress", 87}, + {"File ", 88}, + {" is ", 89}, + {" Done.", 90}, + {"_Move here", 91}, + {"_Copy here", 92}, + {"_Link here", 93}, + {"Cancel drag", 94}, {"\ Could not stat %s\n\ -%s", 91}, - {"Default set of icons not found, please check your installation", 92}, - {"Enter command to run", 93}, +%s", 95}, + {"Default set of icons not found, please check your installation", 96}, + {"_Icon View", 97}, + {"Switch view to an icon display", 98}, + {"_Brief View", 99}, + {"Switch view to show just file name and type", 100}, + {"_Detailed View", 101}, + {"Switch view to show detailed file statistics", 102}, + {"_Custom View", 103}, + {"Switch view to show user-defined statistics", 104}, + {"Icons", 105}, + {"Brief", 106}, + {"Detailed", 107}, + {"Custom", 108}, + {"Enter command to run", 109}, {"\ 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?", 94}, +Are you sure you want to exit?", 110}, {"\ The file manager and the desktop handler are now terminating\n\ \n\ If you want to start up again the desktop handler or the file manager\n\ you can launch it from the Panel, or you can run the UNIX command `gmc'\n\ \n\ -Press OK to terminate the application, or cancel to continue using it.", 95}, - {"_Terminal", 96}, - {"Launch a new terminal in the current directory", 97}, - {"_Directory...", 98}, - {"Creates a new directory", 99}, - {"_Copy...", 100}, - {"Copy files", 101}, - {"_Delete...", 102}, - {"Delete files", 103}, - {"_Move...", 104}, - {"Rename or move files", 105}, - {"Show directory sizes", 106}, - {"Shows the disk space used by each directory", 107}, - {"Select _All", 108}, - {"Select all files in the current Panel", 109}, - {"_Select Files...", 110}, - {"Select a group of files", 111}, - {"_Invert Selection", 112}, - {"Reverses the list of tagged files", 113}, - {"_Rescan Directory", 114}, - {"Rescan the directory contents", 115}, - {"Icon View", 116}, - {"Partial View", 117}, - {"Full View", 118}, - {"Custom View", 119}, - {"_Sort By...", 120}, - {"Confirmation settings", 121}, - {"_Filter View...", 122}, - {"Global option settings", 123}, - {"_Find File...", 124}, - {"Locate files on disk", 125}, - {"_Run Command...", 126}, - {"Runs a command", 127}, - {"_Run Command in panel...", 128}, - {"Run a command and put the results in a panel", 129}, - {"_Background jobs...", 130}, - {"List of background operations", 131}, - {"Exit", 132}, - {"Terminates the file manager and the desktop", 133}, - {"Rescan System Devices", 134}, - {"_Layout", 135}, - {"_Commands", 136}, - {"_Desktop", 137}, - {"_Help", 138}, - {"File/New/Directory...", 139}, - {"Properties", 140}, - {"Mount device", 141}, - {"Unmount device", 142}, - {"Eject device", 143}, - {"Open", 144}, - {"Open with", 145}, - {"View", 146}, - {"View unfiltered", 147}, - {"Edit", 148}, - {"Link...", 149}, - {"Symlink...", 150}, - {"Edit symlink...", 151}, - {"Move/rename...", 152}, - {"Copy...", 153}, - {"Delete", 154}, - {"Show backup files", 155}, - {"Show hidden files", 156}, - {"Mix files and directories", 157}, - {"Use shell patterns instead of regular expressions", 158}, - {"Confirm when deleting file", 159}, - {"Confirm when overwriting files", 160}, - {"Confirm when executing files", 161}, - {"Show progress while operations are being performed", 162}, - {"VFS Timeout:", 163}, - {"Seconds", 164}, - {"Anonymous FTP password:", 165}, - {"Always use FTP proxy", 166}, - {"Fast directory reload", 167}, - {"Compute totals before copying files", 168}, - {"FTP directory cache timeout :", 169}, - {"Allow customization of icons in icon view", 170}, - {"File display", 171}, - {"Confirmation", 172}, - {"VFS", 173}, - {"Caching", 174}, - {"Preferences", 175}, - {"Filename", 176}, - {"Full name: ", 177}, - {"Command", 178}, - {"Command:", 179}, - {"Use terminal", 180}, - {"File mode (permissions)", 181}, - {"Current mode: ", 182}, - {"Read", 183}, - {"Write", 184}, - {"Exec", 185}, - {"Special", 186}, - {"User", 187}, - {"Group", 188}, - {"Other", 189}, - {"Set UID", 190}, - {"Set GID", 191}, - {"Sticky", 192}, - {"", 193}, - {"Owner", 194}, - {"General", 195}, - {"Title", 196}, - {"Icon", 197}, - {"Select icon", 198}, - {"Rescan Directory", 199}, - {"Reloads the current directory", 200}, - {"New folder", 201}, - {"Creates a new folder here", 202}, - {"All files", 203}, - {"Archives and compressed files", 204}, - {"RPM/DEB files", 205}, - {"Text/Document files", 206}, - {"HTML and SGML files", 207}, - {"Postscript and PDF files", 208}, - {"Spreadsheet files", 209}, - {"Image files", 210}, - {"Video/animation files", 211}, - {"Audio files", 212}, - {"C program files", 213}, - {"C++ program files", 214}, - {"Objective-C program files", 215}, - {"Scheme program files", 216}, - {"Assembler program files", 217}, - {"Misc. program files", 218}, - {"Font files", 219}, - {"Search: %s", 220}, - {"%s bytes in %d file", 221}, - {"%s bytes in %d files", 222}, - {"", 223}, - {"Filter", 224}, - {"Switch view to an Icon view", 225}, - {"Brief", 226}, - {"Switch view to show just file name and type", 227}, - {"Detailed", 228}, - {"Switch view to show detailed file statistics", 229}, - {"Custom", 230}, - {"Switch view to show custom determined statistics.", 231}, - {"Back", 232}, - {"Go to the previously visited directory", 233}, - {"Up", 234}, - {"Go up a level in the directory heirarchy", 235}, - {"Forward", 236}, - {"Go to the next directory", 237}, - {"Rescan", 238}, - {"Rescan the current directory", 239}, - {"Home", 240}, - {"Go to your home directory", 241}, - {"Location:", 242}, - {"&Ok", 243}, - {"Offset 0x%08x", 244}, - {"Col %d", 245}, - {"%s bytes", 246}, - {"_Goto line", 247}, - {"Jump to a specified line number", 248}, - {"_Monitor file", 249}, - {"Monitor file growing", 250}, - {"Regexp search", 251}, - {"Regular expression search", 252}, - {"_Wrap", 253}, - {"Wrap the text", 254}, - {"_Parsed view", 255}, - {"_Formatted", 256}, - {"_Hex", 257}, - {"_Search", 258}, - {"ok", 259}, - {"cancel", 260}, - {"help", 261}, - {"yes", 262}, - {"no", 263}, - {"exit", 264}, - {"abort", 265}, - {" Error ", 266}, - {" Failed trying to open file for reading: ", 267}, - {" Cannot get size/permissions info on file: ", 268}, - {" Not an ordinary file: ", 269}, - {" File is too large: ", 270}, +Press OK to terminate the application, or cancel to continue using it.", 111}, + {"_Copy...", 112}, + {"Copy files", 113}, + {"_Delete...", 114}, + {"Delete files", 115}, + {"_Move...", 116}, + {"Rename or move files", 117}, + {"Show directory sizes", 118}, + {"Shows the disk space used by each directory", 119}, + {"Select _All", 120}, + {"Select all files in the current Panel", 121}, + {"_Select Files...", 122}, + {"Select a group of files", 123}, + {"_Invert Selection", 124}, + {"Reverses the list of tagged files", 125}, + {"_Rescan Directory", 126}, + {"Rescan the directory contents", 127}, + {"_Sort By...", 128}, + {"Confirmation settings", 129}, + {"_Filter View...", 130}, + {"Global option settings", 131}, + {"_Find File...", 132}, + {"Locate files on disk", 133}, + {"_Run Command...", 134}, + {"Runs a command", 135}, + {"_Run Command in panel...", 136}, + {"Run a command and put the results in a panel", 137}, + {"_Background jobs...", 138}, + {"List of background operations", 139}, + {"Exit", 140}, + {"Terminates the file manager and the desktop", 141}, + {"Rescan System Devices", 142}, + {"_Layout", 143}, + {"_Commands", 144}, + {"_Desktop", 145}, + {"_Help", 146}, + {"File/New/Directory...", 147}, + {"Properties", 148}, + {"Delete", 149}, + {"Mount device", 150}, + {"Unmount device", 151}, + {"Eject device", 152}, + {"Open", 153}, + {"Open with", 154}, + {"View", 155}, + {"View unfiltered", 156}, + {"Edit", 157}, + {"Move/rename...", 158}, + {"Copy...", 159}, + {"Link...", 160}, + {"Symlink...", 161}, + {"Edit symlink...", 162}, + {"Show backup files", 163}, + {"Show hidden files", 164}, + {"Mix files and directories", 165}, + {"Use shell patterns instead of regular expressions", 166}, + {"Confirm when deleting file", 167}, + {"Confirm when overwriting files", 168}, + {"Confirm when executing files", 169}, + {"Show progress while operations are being performed", 170}, + {"VFS Timeout:", 171}, + {"Seconds", 172}, + {"Anonymous FTP password:", 173}, + {"Always use FTP proxy", 174}, + {"Fast directory reload", 175}, + {"Compute totals before copying files", 176}, + {"FTP directory cache timeout :", 177}, + {"Allow customization of icons in icon view", 178}, + {"File display", 179}, + {"Confirmation", 180}, + {"VFS", 181}, + {"Caching", 182}, + {"Preferences", 183}, + {"Filename", 184}, + {"Full name: ", 185}, + {"Command", 186}, + {"Command:", 187}, + {"Use terminal", 188}, + {"File mode (permissions)", 189}, + {"Current mode: ", 190}, + {"Read", 191}, + {"Write", 192}, + {"Exec", 193}, + {"Special", 194}, + {"User", 195}, + {"Group", 196}, + {"Other", 197}, + {"Set UID", 198}, + {"Set GID", 199}, + {"Sticky", 200}, + {"", 201}, + {"Owner", 202}, + {"General", 203}, + {"Title", 204}, + {"Icon", 205}, + {"Select icon", 206}, + {"Rescan Directory", 207}, + {"Reloads the current directory", 208}, + {"New folder", 209}, + {"Creates a new folder here", 210}, + {"All files", 211}, + {"Archives and compressed files", 212}, + {"RPM/DEB files", 213}, + {"Text/Document files", 214}, + {"HTML and SGML files", 215}, + {"Postscript and PDF files", 216}, + {"Spreadsheet files", 217}, + {"Image files", 218}, + {"Video/animation files", 219}, + {"Audio files", 220}, + {"C program files", 221}, + {"C++ program files", 222}, + {"Objective-C program files", 223}, + {"Scheme program files", 224}, + {"Assembler program files", 225}, + {"Misc. program files", 226}, + {"Font files", 227}, + {"Search: %s", 228}, + {"%s bytes in %d file", 229}, + {"%s bytes in %d files", 230}, + {"", 231}, + {"Filter", 232}, + {"Back", 233}, + {"Go to the previously visited directory", 234}, + {"Up", 235}, + {"Go up a level in the directory heirarchy", 236}, + {"Forward", 237}, + {"Go to the next directory", 238}, + {"Rescan", 239}, + {"Rescan the current directory", 240}, + {"Home", 241}, + {"Go to your home directory", 242}, + {"Location:", 243}, + {"&Ok", 244}, + {"Offset 0x%08x", 245}, + {"Col %d", 246}, + {"%s bytes", 247}, + {"_Goto line", 248}, + {"Jump to a specified line number", 249}, + {"_Monitor file", 250}, + {"Monitor file growing", 251}, + {"Regexp search", 252}, + {"Regular expression search", 253}, + {"_Wrap", 254}, + {"Wrap the text", 255}, + {"_Parsed view", 256}, + {"_Formatted", 257}, + {"_Hex", 258}, + {"_Search", 259}, + {"ok", 260}, + {"cancel", 261}, + {"help", 262}, + {"yes", 263}, + {"no", 264}, + {"exit", 265}, + {"abort", 266}, + {" Error ", 267}, + {" Failed trying to open file for reading: ", 268}, + {" Cannot get size/permissions info on file: ", 269}, + {" Not an ordinary file: ", 270}, + {" File is too large: ", 271}, {"\ \n\ - Increase edit.h:MAXBUF and recompile the editor. ", 271}, - {" Error allocating memory ", 272}, - {"Quick save ", 273}, - {"Safe save ", 274}, - {"Do backups -->", 275}, - {"&Cancel", 276}, - {"Extension:", 277}, - {" Edit Save Mode ", 278}, - {" Save As ", 279}, - {" Warning ", 280}, - {" A file already exists with this name. ", 281}, - {"Overwrite", 282}, - {"Cancel", 283}, - {" Save as ", 284}, - {" Error trying to save file. ", 285}, - {" Delete macro ", 286}, - {" Error trying to open temp file ", 287}, - {" Error trying to open macro file ", 288}, - {"key '%d 0': ", 289}, - {" Error trying to overwrite macro file ", 290}, - {" Macro ", 291}, - {" Press the macro's new hotkey: ", 292}, - {" Save macro ", 293}, - {" Delete Macro ", 294}, - {" Load macro ", 295}, - {" Confirm save file? : ", 296}, - {" Save file ", 297}, - {"Save", 298}, + Increase edit.h:MAXBUF and recompile the editor. ", 272}, + {" Error allocating memory ", 273}, + {"Quick save ", 274}, + {"Safe save ", 275}, + {"Do backups -->", 276}, + {"&Cancel", 277}, + {"Extension:", 278}, + {" Edit Save Mode ", 279}, + {" Save As ", 280}, + {" Warning ", 281}, + {" A file already exists with this name. ", 282}, + {"Overwrite", 283}, + {"Cancel", 284}, + {" Save as ", 285}, + {" Error trying to save file. ", 286}, + {" Delete macro ", 287}, + {" Error trying to open temp file ", 288}, + {" Error trying to open macro file ", 289}, + {"key '%d 0': ", 290}, + {" Error trying to overwrite macro file ", 291}, + {" Macro ", 292}, + {" Press the macro's new hotkey: ", 293}, + {" Save macro ", 294}, + {" Delete Macro ", 295}, + {" Load macro ", 296}, + {" Confirm save file? : ", 297}, + {" Save file ", 298}, + {"Save", 299}, {"\ Current text was modified without a file save. \n\ - Continue discards these changes. ", 299}, - {"Continue", 300}, - {" Load ", 301}, - {" Error trying to open file for reading ", 302}, - {" Block is large, you may not be able to undo this action. ", 303}, - {" Continue ", 304}, - {" Cancel ", 305}, - {" Replace with: ", 306}, - {" Replace ", 307}, - {"scanf &Expression", 308}, - {"replace &All", 309}, - {"pr&Ompt on replace", 310}, - {"&Backwards", 311}, - {"&Regular expression", 312}, - {"&Whole words only", 313}, - {"case &Sensitive", 314}, - {" Enter replacement argument order eg. 3,2,1,4 ", 315}, - {" Enter replacement string:", 316}, - {" Enter search string:", 317}, - {" Search ", 318}, - {" Enter search text : ", 319}, - {" Enter replace text : ", 320}, - {" Enter argument order : ", 321}, - {"Enter the order of replacement of your scanf format specifiers", 322}, - {" Whole words only ", 323}, - {" Case sensitive ", 324}, - {" Regular expression ", 325}, - {"See the regex man page for how to compose a regular expression", 326}, - {" Backwards ", 327}, - {"Warning: Searching backward can be slow", 328}, - {" Prompt on replace ", 329}, - {"Ask before making each replacement", 330}, - {" Replace all ", 331}, - {" Scanf expression ", 332}, - {"Allows entering of a C format string, see the scanf man page", 333}, - {"Begin search, Enter", 334}, - {"Abort this dialog, Esc", 335}, - {"Replace", 336}, - {"Skip", 337}, - {"Replace all", 338}, - {"\ - Invalid regular expression, or scanf expression with to many conversions ", 339}, - {" Error in replacement format string. ", 340}, - {" %ld replacements made. ", 341}, - {" Search string not found. ", 342}, - {" Quit ", 343}, + Continue discards these changes. ", 300}, + {"Continue", 301}, + {" Load ", 302}, + {" Error trying to open file for reading ", 303}, + {" Block is large, you may not be able to undo this action. ", 304}, + {" Continue ", 305}, + {" Cancel ", 306}, + {"al&L", 307}, + {"&Skip", 308}, + {"&Replace", 309}, + {" Replace with: ", 310}, + {" Confirm replace ", 311}, + {"scanf &Expression", 312}, + {"replace &All", 313}, + {"pr&Ompt on replace", 314}, + {"&Backwards", 315}, + {"&Regular expression", 316}, + {"&Whole words only", 317}, + {"case &Sensitive", 318}, + {" Enter replacement argument order eg. 3,2,1,4 ", 319}, + {" Enter replacement string:", 320}, + {" Enter search string:", 321}, + {" Replace ", 322}, + {" Search ", 323}, + {" Enter search text : ", 324}, + {" Enter replace text : ", 325}, + {" Enter argument order : ", 326}, + {"Enter the order of replacement of your scanf format specifiers", 327}, + {" Whole words only ", 328}, + {" Case sensitive ", 329}, + {" Regular expression ", 330}, + {"See the regex man page for how to compose a regular expression", 331}, + {" Backwards ", 332}, + {"Warning: Searching backward can be slow", 333}, + {" Prompt on replace ", 334}, + {"Ask before making each replacement", 335}, + {" Replace all ", 336}, + {" Scanf expression ", 337}, + {"Allows entering of a C format string, see the scanf man page", 338}, + {"Begin search, Enter", 339}, + {"Abort this dialog, Esc", 340}, + {"Replace", 341}, + {"Skip", 342}, + {"Replace all", 343}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 344}, + {" Error in replacement format string. ", 345}, + {" %ld replacements made. ", 346}, + {" Search string not found. ", 347}, + {" Quit ", 348}, {"\ Current text was modified without a file save. \n\ - Save with exit? ", 344}, - {" File was modified, Save with exit? ", 345}, - {"Cancel quit", 346}, - {" &Cancel quit ", 347}, - {" &Yes ", 348}, - {" &No ", 349}, - {" Copy to clipboard ", 350}, - {" Unable to save to file. ", 351}, - {" Cut to clipboard ", 352}, - {" Goto line ", 353}, - {" Enter line: ", 354}, - {" Save Block ", 355}, - {" Insert File ", 356}, - {" Insert file ", 357}, - {" Error trying to insert file. ", 358}, - {" Sort block ", 359}, - {" You must first highlight a block of text. ", 360}, - {" Run Sort ", 361}, - {" Enter sort options (see manpage) separated by whitespace: ", 362}, - {" Sort ", 363}, - {" Error trying to execute sort command ", 364}, - {" Sort returned non-zero: ", 365}, - {" Process block ", 366}, - {" Error trying to stat file ", 367}, - {" Mail ", 368}, - {"None", 369}, - {"Dynamic paragraphing", 370}, - {"Type writer wrap", 371}, - {"Wrap mode", 372}, - {"Key emulation", 373}, - {"Error initialising editor.\n", 374}, - {"Help", 375}, - {"Mark", 376}, - {"Replac", 377}, - {"Search", 378}, - {"PullDn", 379}, - {"Quit", 380}, - {" Word wrap ", 381}, - {" Enter line length, 0 for off: ", 382}, - {" About ", 383}, + Save with exit? ", 349}, + {" File was modified, Save with exit? ", 350}, + {"Cancel quit", 351}, + {" &Cancel quit ", 352}, + {" &Yes ", 353}, + {" &No ", 354}, + {" Copy to clipboard ", 355}, + {" Unable to save to file. ", 356}, + {" Cut to clipboard ", 357}, + {" Goto line ", 358}, + {" Enter line: ", 359}, + {" Save Block ", 360}, + {" Insert File ", 361}, + {" Insert file ", 362}, + {" Error trying to insert file. ", 363}, + {" Sort block ", 364}, + {" You must first highlight a block of text. ", 365}, + {" Run Sort ", 366}, + {" Enter sort options (see manpage) separated by whitespace: ", 367}, + {" Sort ", 368}, + {" Error trying to execute sort command ", 369}, + {" Sort returned non-zero: ", 370}, + {" Process block ", 371}, + {" Error trying to stat file ", 372}, + {" Mail ", 373}, + {" Copies to", 374}, + {" Subject", 375}, + {" To", 376}, + {" mail -s -c ", 377}, + {"Intuitive", 378}, + {"Emacs", 379}, + {"None", 380}, + {"Dynamic paragraphing", 381}, + {"Type writer wrap", 382}, + {"Word wrap line length : ", 383}, + {"Tab spacing : ", 384}, + {"synta&X highlighting", 385}, + {"confir&M before saving", 386}, + {"fill tabs with &Spaces", 387}, + {"&Return does autoindent", 388}, + {"&Backspace through tabs", 389}, + {"&Fake half tabs", 390}, + {"Wrap mode", 391}, + {"Key emulation", 392}, + {" Editor options ", 393}, + {"Error initialising editor.\n", 394}, + {"Help", 395}, + {"Mark", 396}, + {"Replac", 397}, + {"Search", 398}, + {"PullDn", 399}, + {"Quit", 400}, + {" Word wrap ", 401}, + {" Enter line length, 0 for off: ", 402}, + {" About ", 403}, {"\ \n\ Cooledit v2.1\n\ @@ -427,618 +447,616 @@ Copyright (C) 1996 the Free Software Foundation\n\ \n\ A user friendly text editor written\n\ - for the Midnight Commander.\n", 384}, - {"&Open/load... C-o", 385}, - {"&New C-n", 386}, - {"&Save F2", 387}, - {"save &As... F12", 388}, - {"&Insert file... F15", 389}, - {"copy to &File... C-f", 390}, - {"a&Bout... ", 391}, - {"&Quit F10", 392}, - {"&New C-x k", 393}, - {"copy to &File... ", 394}, - {"&Toggle Mark F3", 395}, - {"&Mark Columns S-F3", 396}, - {"toggle &Ins/overw Ins", 397}, - {"&Copy F5", 398}, - {"&Move F6", 399}, - {"&Delete F8", 400}, - {"&Undo C-u", 401}, - {"&Beginning C-PgUp", 402}, - {"&End C-PgDn", 403}, - {"&Search... F7", 404}, - {"search &Again F17", 405}, - {"&Replace... F4", 406}, - {"&Goto line... M-l", 407}, - {"insert &Literal... C-q", 408}, - {"&Refresh screen C-l", 409}, - {"&Start record macro C-r", 410}, - {"&Finish record macro... C-r", 411}, - {"&Execute macro... C-a, KEY", 412}, - {"delete macr&O... ", 413}, - {"insert &Date/time ", 414}, - {"format p&Aragraph M-p", 415}, - {"'ispell' s&Pell check C-p", 416}, - {"sor&T... M-t", 417}, - {"'indent' &C Formatter F19", 418}, - {"&Mail... ", 419}, - {"&Execute macro... C-x e, KEY", 420}, - {"'ispell' s&Pell check M-$", 421}, - {"&General... ", 422}, - {"&Save mode...", 423}, - {"&Layout...", 424}, - {" File ", 425}, - {" Edit ", 426}, - {" Sear/Repl ", 427}, - {" Command ", 428}, - {" Options ", 429}, - {"Open...\tC-o", 430}, - {"New\tC-n", 431}, - {"Save\tF2", 432}, - {"Save as...\tF12", 433}, - {"Insert file...\tF15", 434}, - {"Copy to file...\tC-f", 435}, - {"Disk operations", 436}, - {"Toggle mark\tF3", 437}, - {"Toggle mark columns\tC-b", 438}, - {"Toggle insert/overwrite\tIns", 439}, - {"Copy block to cursor\tF5", 440}, - {"Move block to cursor\tF6", 441}, - {"Delete block\tF8/C-Del", 442}, - {"Copy block to clipbrd\tC-Ins", 443}, - {"Cut block to clipbrd\tS-Del", 444}, - {"Paste block from clipbrd\tS-Ins", 445}, - {"Selection history\tM-Ins", 446}, - {"Undo\tC-BackSpace", 447}, - {"Manipulating blocks of text", 448}, - {" Srch/Replce ", 449}, - {"Search...\tF7", 450}, - {"Search again\tF17", 451}, - {"Replace...\tF4", 452}, - {"Replace again\tF14", 453}, - {"Search for and replace text", 454}, - {"Goto line...\tM-l", 455}, - {"Start record macro\tC-r", 456}, - {"Finish record macro...\tC-r", 457}, - {"Execute macro...\tC-a, KEY", 458}, - {"Delete macro...\t", 459}, - {"Insert date/time\tC-d", 460}, - {"Format paragraph\tM-p", 461}, - {"Refresh display\tC-l", 462}, - {"Macros and internal commands", 463}, - {"&Dismiss", 464}, - {" Enter file name: ", 465}, - {"The Quick Brown Fox Jumps Over The Lazy Dog", 466}, - {"\ -gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 467}, - {"Clear the edit buffer", 468}, - {"Insert File", 469}, - {"Insert text from a file", 470}, - {"Copy to file", 471}, - {"copy a block to a file", 472}, - {"Search/Replace", 473}, - {" Load syntax file ", 474}, - {" File access error ", 475}, - {" Syntax error in file %s on line %d ", 476}, - {"&Set", 477}, - {"S&kip", 478}, - {"Set &all", 479}, - {"owner", 480}, - {"group", 481}, - {"other", 482}, - {"On", 483}, - {"Flag", 484}, - {"Mode", 485}, - {"%6d of %d", 486}, - {" Chown advanced command ", 487}, + for the Midnight Commander.\n", 404}, + {"&Open/load... C-o", 405}, + {"&New C-n", 406}, + {"&Save F2", 407}, + {"save &As... F12", 408}, + {"&Insert file... F15", 409}, + {"copy to &File... C-f", 410}, + {"a&Bout... ", 411}, + {"&Quit F10", 412}, + {"&New C-x k", 413}, + {"copy to &File... ", 414}, + {"&Toggle Mark F3", 415}, + {"&Mark Columns S-F3", 416}, + {"toggle &Ins/overw Ins", 417}, + {"&Copy F5", 418}, + {"&Move F6", 419}, + {"&Delete F8", 420}, + {"&Undo C-u", 421}, + {"&Beginning C-PgUp", 422}, + {"&End C-PgDn", 423}, + {"&Search... F7", 424}, + {"search &Again F17", 425}, + {"&Replace... F4", 426}, + {"&Goto line... M-l", 427}, + {"insert &Literal... C-q", 428}, + {"&Refresh screen C-l", 429}, + {"&Start record macro C-r", 430}, + {"&Finish record macro... C-r", 431}, + {"&Execute macro... C-a, KEY", 432}, + {"delete macr&O... ", 433}, + {"insert &Date/time ", 434}, + {"format p&Aragraph M-p", 435}, + {"'ispell' s&Pell check C-p", 436}, + {"sor&T... M-t", 437}, + {"'indent' &C Formatter F19", 438}, + {"&Mail... ", 439}, + {"&Execute macro... C-x e, KEY", 440}, + {"'ispell' s&Pell check M-$", 441}, + {"&General... ", 442}, + {"&Save mode...", 443}, + {"&Layout...", 444}, + {" File ", 445}, + {" Edit ", 446}, + {" Sear/Repl ", 447}, + {" Command ", 448}, + {" Options ", 449}, + {"Open...\tC-o", 450}, + {"New\tC-n", 451}, + {"Save\tF2", 452}, + {"Save as...\tF12", 453}, + {"Insert file...\tF15", 454}, + {"Copy to file...\tC-f", 455}, + {"Disk operations", 456}, + {"Toggle mark\tF3", 457}, + {"Toggle mark columns\tC-b", 458}, + {"Toggle insert/overwrite\tIns", 459}, + {"Copy block to cursor\tF5", 460}, + {"Move block to cursor\tF6", 461}, + {"Delete block\tF8/C-Del", 462}, + {"Copy block to clipbrd\tC-Ins", 463}, + {"Cut block to clipbrd\tS-Del", 464}, + {"Paste block from clipbrd\tS-Ins", 465}, + {"Selection history\tM-Ins", 466}, + {"Undo\tC-BackSpace", 467}, + {"Manipulating blocks of text", 468}, + {" Srch/Replce ", 469}, + {"Search...\tF7", 470}, + {"Search again\tF17", 471}, + {"Replace...\tF4", 472}, + {"Replace again\tF14", 473}, + {"Search for and replace text", 474}, + {"Goto line...\tM-l", 475}, + {"Start record macro\tC-r", 476}, + {"Finish record macro...\tC-r", 477}, + {"Execute macro...\tC-a, KEY", 478}, + {"Delete macro...\t", 479}, + {"Insert date/time\tC-d", 480}, + {"Format paragraph\tM-p", 481}, + {"Refresh display\tC-l", 482}, + {"Macros and internal commands", 483}, + {"&Dismiss", 484}, + {" Enter file name: ", 485}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 486}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 487}, + {"Clear the edit buffer", 488}, + {"Insert File", 489}, + {"Insert text from a file", 490}, + {"Copy to file", 491}, + {"copy a block to a file", 492}, + {"Search/Replace", 493}, + {" Load syntax file ", 494}, + {" File access error ", 495}, + {" Syntax error in file %s on line %d ", 496}, + {"&Set", 497}, + {"S&kip", 498}, + {"Set &all", 499}, + {"owner", 500}, + {"group", 501}, + {"other", 502}, + {"On", 503}, + {"Flag", 504}, + {"Mode", 505}, + {"%6d of %d", 506}, + {" Chown advanced command ", 507}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 488}, + %s ", 508}, {"\ Couldn't chown \"%s\" \n\ - %s ", 489}, - {" Oops... ", 490}, - {" I can't run the Advanced Chown command on an extfs ", 491}, - {" I can't run the Advanced Chown command on a tarfs ", 492}, - {"Background process:", 493}, - {" Background process error ", 494}, - {" Child died unexpectedly ", 495}, - {" Unknown error in child ", 496}, - {" Background protocol error ", 497}, + %s ", 509}, + {" Oops... ", 510}, + {" I can't run the Advanced Chown command on an extfs ", 511}, + {" I can't run the Advanced Chown command on a tarfs ", 512}, + {"Background process:", 513}, + {" Background process error ", 514}, + {" Child died unexpectedly ", 515}, + {" Unknown error in child ", 516}, + {" Background protocol error ", 517}, {"\ Background process sent us a request for more arguments \n\ - than we can handle. \n", 498}, - {" Listing mode ", 499}, - {"&Full file list", 500}, - {"&Brief file list", 501}, - {"&Long file list", 502}, - {"&User defined:", 503}, - {"&Icon view", 504}, - {"user &Mini status", 505}, - {"Listing mode", 506}, - {"&Reverse", 507}, - {"case sensi&tive", 508}, - {"Sort order", 509}, - {" confirm &Exit ", 510}, - {" confirm e&Xecute ", 511}, - {" confirm o&Verwrite ", 512}, - {" confirm &Delete ", 513}, - {" Confirmation ", 514}, - {"Full 8 bits output", 515}, - {"ISO 8859-1", 516}, - {"7 bits", 517}, - {"F&ull 8 bits input", 518}, - {" Display bits ", 519}, - {"&Always use ftp proxy", 520}, - {"sec", 521}, - {"ftpfs directory cache timeout:", 522}, - {"ftp anonymous password:", 523}, - {"Timeout for freeing VFSs:", 524}, - {" Virtual File System Setting ", 525}, - {"Quick cd", 526}, - {"cd", 527}, - {"Symbolic link", 528}, - {"Symbolic link filename:", 529}, - {"Existing filename (filename symlink will point to):", 530}, - {"Running ", 531}, - {"Stopped", 532}, - {"&Stop", 533}, - {"&Resume", 534}, - {"&Kill", 535}, - {"Background Jobs", 536}, - {"execute/search by others", 537}, - {"write by others", 538}, - {"read by others", 539}, - {"execute/search by group", 540}, - {"write by group", 541}, - {"read by group", 542}, - {"execute/search by owner", 543}, - {"write by owner", 544}, - {"read by owner", 545}, - {"sticky bit", 546}, - {"set group ID on execution", 547}, - {"set user ID on execution", 548}, - {"C&lear marked", 549}, - {"S&et marked", 550}, - {"&Marked all", 551}, - {"Permissions (Octal)", 552}, - {"Owner name", 553}, - {"Group name", 554}, - {" Chmod command ", 555}, - {" Permission ", 556}, - {"Use SPACE to change", 557}, - {"an option, ARROW KEYS", 558}, - {"to move between options", 559}, - {"and T or INS to mark", 560}, - {"Chmod command", 561}, - {" I can't run the Chmod command on an extfs ", 562}, - {"Set &users", 563}, - {"Set &groups", 564}, - {" Name ", 565}, - {" Owner name ", 566}, - {" Group name ", 567}, - {" Size ", 568}, - {" Chown command ", 569}, - {" User name ", 570}, - {"", 571}, - {"", 572}, - {" I can't run the Chown command on an extfs ", 573}, - {" I can't run the Chown command on a tarfs ", 574}, - {" Can not fetch a local copy of %s ", 575}, - {" CD ", 576}, - {"Files tagged, want to cd?", 577}, - {"Could not change directory", 578}, - {" View file ", 579}, - {" Filename:", 580}, - {" Filtered view ", 581}, - {" Filter command and arguments:", 582}, - {"Create a new Directory", 583}, - {" Enter directory name:", 584}, - {" Filter ", 585}, - {" Set expression for filtering filenames", 586}, - {" Select ", 587}, - {" Malformed regular expression ", 588}, - {" Unselect ", 589}, - {"Extension file edit", 590}, - {" Which extension file you want to edit? ", 591}, - {"&User", 592}, - {"&System Wide", 593}, - {"Menu file edit", 594}, - {" Which menu file will you edit? ", 595}, - {"&Local", 596}, - {"&Home", 597}, - {" Compare directories ", 598}, - {" Select compare method: ", 599}, - {"&Quick", 600}, - {"&Size only", 601}, - {"&Thorough", 602}, - {" Both panels should be on the listing view mode to use this command ", 603}, - {" The command history is empty ", 604}, - {" Command history ", 605}, + than we can handle. \n", 518}, + {" Listing mode ", 519}, + {"&Full file list", 520}, + {"&Brief file list", 521}, + {"&Long file list", 522}, + {"&User defined:", 523}, + {"&Icon view", 524}, + {"user &Mini status", 525}, + {"Listing mode", 526}, + {"&Reverse", 527}, + {"case sensi&tive", 528}, + {"Sort order", 529}, + {" confirm &Exit ", 530}, + {" confirm e&Xecute ", 531}, + {" confirm o&Verwrite ", 532}, + {" confirm &Delete ", 533}, + {" Confirmation ", 534}, + {"Full 8 bits output", 535}, + {"ISO 8859-1", 536}, + {"7 bits", 537}, + {"F&ull 8 bits input", 538}, + {" Display bits ", 539}, + {"&Always use ftp proxy", 540}, + {"sec", 541}, + {"ftpfs directory cache timeout:", 542}, + {"ftp anonymous password:", 543}, + {"Timeout for freeing VFSs:", 544}, + {" Virtual File System Setting ", 545}, + {"Quick cd", 546}, + {"cd", 547}, + {"Symbolic link", 548}, + {"Symbolic link filename:", 549}, + {"Existing filename (filename symlink will point to):", 550}, + {"Running ", 551}, + {"Stopped", 552}, + {"&Stop", 553}, + {"&Resume", 554}, + {"&Kill", 555}, + {"Background Jobs", 556}, + {"execute/search by others", 557}, + {"write by others", 558}, + {"read by others", 559}, + {"execute/search by group", 560}, + {"write by group", 561}, + {"read by group", 562}, + {"execute/search by owner", 563}, + {"write by owner", 564}, + {"read by owner", 565}, + {"sticky bit", 566}, + {"set group ID on execution", 567}, + {"set user ID on execution", 568}, + {"C&lear marked", 569}, + {"S&et marked", 570}, + {"&Marked all", 571}, + {"Permissions (Octal)", 572}, + {"Owner name", 573}, + {"Group name", 574}, + {" Chmod command ", 575}, + {" Permission ", 576}, + {"Use SPACE to change", 577}, + {"an option, ARROW KEYS", 578}, + {"to move between options", 579}, + {"and T or INS to mark", 580}, + {"Chmod command", 581}, + {" I can't run the Chmod command on an extfs ", 582}, + {"Set &users", 583}, + {"Set &groups", 584}, + {" Name ", 585}, + {" Owner name ", 586}, + {" Group name ", 587}, + {" Size ", 588}, + {" Chown command ", 589}, + {" User name ", 590}, + {"", 591}, + {"", 592}, + {" I can't run the Chown command on an extfs ", 593}, + {" I can't run the Chown command on a tarfs ", 594}, + {" Can not fetch a local copy of %s ", 595}, + {" CD ", 596}, + {"Files tagged, want to cd?", 597}, + {"Could not change directory", 598}, + {" View file ", 599}, + {" Filename:", 600}, + {" Filtered view ", 601}, + {" Filter command and arguments:", 602}, + {"Create a new Directory", 603}, + {" Enter directory name:", 604}, + {" Filter ", 605}, + {" Set expression for filtering filenames", 606}, + {" Select ", 607}, + {" Malformed regular expression ", 608}, + {" Unselect ", 609}, + {"Extension file edit", 610}, + {" Which extension file you want to edit? ", 611}, + {"&User", 612}, + {"&System Wide", 613}, + {"Menu file edit", 614}, + {" Which menu file will you edit? ", 615}, + {"&Local", 616}, + {"&Home", 617}, + {" Compare directories ", 618}, + {" Select compare method: ", 619}, + {"&Quick", 620}, + {"&Size only", 621}, + {"&Thorough", 622}, + {" Both panels should be on the listing view mode to use this command ", 623}, + {" The command history is empty ", 624}, + {" Command history ", 625}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 606}, - {"Type `exit' to return to the Midnight Commander", 607}, + the panels cannot be toggled. ", 626}, + {"Type `exit' to return to the Midnight Commander", 627}, {"\ Couldn't stat %s \n\ - %s ", 608}, - {" Link ", 609}, - {" to:", 610}, - {" link: %s ", 611}, - {" symlink: %s ", 612}, - {" Symlink ", 613}, - {" points to:", 614}, - {" Edit symlink ", 615}, - {" edit symlink, unable to remove %s: %s ", 616}, - {" edit symlink: %s ", 617}, - {" Link symbolically ", 618}, - {" Relative symlink ", 619}, - {" relative symlink: %s ", 620}, - {" Enter machine name (F1 for details): ", 621}, - {" Could not chdir to %s ", 622}, - {" Link to a remote machine ", 623}, - {" FTP to machine ", 624}, - {" Socket source routing setup ", 625}, - {" Enter host name to use as a source routing hop: ", 626}, - {" Host name ", 627}, - {" Error while looking up IP address ", 628}, - {" Undelete files on an ext2 file system ", 629}, + %s ", 628}, + {" Link ", 629}, + {" to:", 630}, + {" link: %s ", 631}, + {" symlink: %s ", 632}, + {" Symlink ", 633}, + {" points to:", 634}, + {" Edit symlink ", 635}, + {" edit symlink, unable to remove %s: %s ", 636}, + {" edit symlink: %s ", 637}, + {" Link symbolically ", 638}, + {" Relative symlink ", 639}, + {" relative symlink: %s ", 640}, + {" Enter machine name (F1 for details): ", 641}, + {" Could not chdir to %s ", 642}, + {" Link to a remote machine ", 643}, + {" FTP to machine ", 644}, + {" Socket source routing setup ", 645}, + {" Enter host name to use as a source routing hop: ", 646}, + {" Host name ", 647}, + {" Error while looking up IP address ", 648}, + {" Undelete files on an ext2 file system ", 649}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 630}, - {" Setup saved to ~/", 631}, - {" Setup ", 632}, + files on: (F1 for details)", 650}, + {" Setup saved to ~/", 651}, + {" Setup ", 652}, {"\ Can't chdir to '%s' \n\ - %s ", 633}, - {" You can not execute commands on non-local filesystems", 634}, + %s ", 653}, + {" You can not execute commands on non-local filesystems", 654}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\n", 635}, - {"&Unsorted", 636}, - {"&Name", 637}, - {"&Extension", 638}, - {"&Modify time", 639}, - {"&Access time", 640}, - {"&Change time", 641}, - {"&Size", 642}, - {"&Inode", 643}, - {"&Type", 644}, - {"&Links", 645}, - {"N&GID", 646}, - {"N&UID", 647}, - {"&Owner", 648}, - {"&Group", 649}, - {"File exists but can not be stat-ed: %s %s", 650}, - {"Unknown", 651}, +\n", 655}, + {"&Unsorted", 656}, + {"&Name", 657}, + {"&Extension", 658}, + {"&Modify time", 659}, + {"&Access time", 660}, + {"&Change time", 661}, + {"&Size", 662}, + {"&Inode", 663}, + {"&Type", 664}, + {"&Links", 665}, + {"N&GID", 666}, + {"N&UID", 667}, + {"&Owner", 668}, + {"&Group", 669}, + {"File exists but can not be stat-ed: %s %s", 670}, + {"Unknown", 671}, {"\ Can't create temporary command file \n\ - %s ", 652}, - {" Parameter ", 653}, - {" Can't execute commands on a Virtual File System directory ", 654}, - {" file error", 655}, - {"Format of the ", 656}, - {" file error ", 657}, - {"Format of the ~/", 658}, + %s ", 672}, + {" Parameter ", 673}, + {" Can't execute commands on a Virtual File System directory ", 674}, + {" file error", 675}, + {"Format of the ", 676}, + {" file error ", 677}, + {"Format of the ~/", 678}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 659}, +copy it from ", 679}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 660}, - {"mc.ext will be used for this moment.", 661}, - {" Copy ", 662}, - {" Move ", 663}, - {" Delete ", 664}, - {" Invalid target mask ", 665}, - {" Could not make the hardlink ", 666}, +file as an example of how to write it.\n", 680}, + {"mc.ext will be used for this moment.", 681}, + {" Copy ", 682}, + {" Move ", 683}, + {" Delete ", 684}, + {" Invalid target mask ", 685}, + {" Could not make the hardlink ", 686}, {"\ Cannot read source link \"%s\" \n\ - %s ", 667}, + %s ", 687}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 668}, + Option Stable Symlinks will be disabled ", 688}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 669}, + %s ", 689}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 670}, + %s ", 690}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 671}, - {" `%s' and `%s' are the same file. ", 672}, + %s ", 691}, + {" `%s' and `%s' are the same file. ", 692}, {"\ Cannot create special file \"%s\" \n\ - %s ", 673}, + %s ", 693}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 674}, + %s ", 694}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 675}, + %s ", 695}, {"\ Cannot open source file \"%s\" \n\ - %s ", 676}, - {" Reget failed, about to overwrite file ", 677}, + %s ", 696}, + {" Reget failed, about to overwrite file ", 697}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 678}, + %s ", 698}, {"\ Cannot create target file \"%s\" \n\ - %s ", 679}, + %s ", 699}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 680}, + %s ", 700}, {"\ Cannot read source file \"%s\" \n\ - %s ", 681}, + %s ", 701}, {"\ Cannot write target file \"%s\" \n\ - %s ", 682}, - {"(stalled)", 683}, + %s ", 702}, + {"(stalled)", 703}, {"\ Cannot close source file \"%s\" \n\ - %s ", 684}, + %s ", 704}, {"\ Cannot close target file \"%s\" \n\ - %s ", 685}, - {"Incomplete file was retrieved. Keep it?", 686}, - {"&Delete", 687}, - {"&Keep", 688}, + %s ", 705}, + {"Incomplete file was retrieved. Keep it?", 706}, + {"&Delete", 707}, + {"&Keep", 708}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 689}, + %s ", 709}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 690}, + %s ", 710}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 691}, + `%s' ", 711}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 692}, + %s ", 712}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 693}, + %s ", 713}, {"\ Cannot stat file \"%s\" \n\ - %s ", 694}, - {" `%s' and `%s' are the same file ", 695}, - {" Cannot overwrite directory `%s' ", 696}, + %s ", 714}, + {" `%s' and `%s' are the same file ", 715}, + {" Cannot overwrite directory `%s' ", 716}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 697}, + %s ", 717}, {"\ Cannot remove file \"%s\" \n\ - %s ", 698}, - {" Cannot overwrite directory \"%s\" %s ", 699}, - {" Cannot overwrite file \"%s\" %s ", 700}, + %s ", 718}, + {" Cannot overwrite directory \"%s\" %s ", 719}, + {" Cannot overwrite file \"%s\" %s ", 720}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 701}, + %s ", 721}, {"\ Cannot delete file \"%s\" \n\ - %s ", 702}, + %s ", 722}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 703}, - {" Internal error: get_file \n", 704}, - {"1Copy", 705}, - {"1Move", 706}, - {"1Delete", 707}, - {"%o %f \"%s\"%m", 708}, - {"%o %d %f%m", 709}, - {"%o %f \"%s\"%e", 710}, - {"%o %d %f%e", 711}, - {"file", 712}, - {"files", 713}, - {"directory", 714}, - {"directories", 715}, - {"files/directories", 716}, - {" with source mask:", 717}, - {" Can't operate on \"..\"! ", 718}, - {"Yes", 719}, - {"No", 720}, - {" Sorry, I could not put the job in background ", 721}, - {" Internal failure ", 722}, - {" Unknown file operation ", 723}, + %s ", 723}, + {" Internal error: get_file \n", 724}, + {"1Copy", 725}, + {"1Move", 726}, + {"1Delete", 727}, + {"%o %f \"%s\"%m", 728}, + {"%o %d %f%m", 729}, + {"%o %f \"%s\"%e", 730}, + {"%o %d %f%e", 731}, + {"file", 732}, + {"files", 733}, + {"directory", 734}, + {"directories", 735}, + {"files/directories", 736}, + {" with source mask:", 737}, + {" Can't operate on \"..\"! ", 738}, + {"Yes", 739}, + {"No", 740}, + {" Sorry, I could not put the job in background ", 741}, + {" Internal failure ", 742}, + {" Unknown file operation ", 743}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 724}, - {"&Skip", 725}, - {"&Retry", 726}, - {"&Abort", 727}, + %s ", 744}, + {"&Retry", 745}, + {"&Abort", 746}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 728}, + Delete it recursively? ", 747}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 729}, - {"a&ll", 730}, - {"non&E", 731}, - {" Type 'yes' if you REALLY want to delete ", 732}, - {"all the directories ", 733}, - {" Recursive Delete ", 734}, - {" Background process: Recursive Delete ", 735}, - {"File", 736}, - {"Count", 737}, - {"Bytes", 738}, - {"Source", 739}, - {"Target", 740}, - {"Deleting", 741}, - {"Target file \"%s\" already exists!", 742}, - {"if &Size differs", 743}, - {"&Update", 744}, - {"al&L", 745}, - {"Overwrite all targets?", 746}, - {"&Reget", 747}, - {"ap&Pend", 748}, - {"Overwrite this target?", 749}, - {"Target date: %s, size %d", 750}, - {"Source date: %s, size %d", 751}, - {" File exists ", 752}, - {" Background process: File exists ", 753}, - {"preserve &Attributes", 754}, - {"follow &Links", 755}, - {"to:", 756}, - {"&Using shell patterns", 757}, - {"&Background", 758}, - {"&Stable Symlinks", 759}, - {"&Dive into subdir if exists", 760}, + Delete it recursively? ", 748}, + {"a&ll", 749}, + {"non&E", 750}, + {" Type 'yes' if you REALLY want to delete ", 751}, + {"all the directories ", 752}, + {" Recursive Delete ", 753}, + {" Background process: Recursive Delete ", 754}, + {"File", 755}, + {"Count", 756}, + {"Bytes", 757}, + {"Source", 758}, + {"Target", 759}, + {"Deleting", 760}, + {"Target file \"%s\" already exists!", 761}, + {"if &Size differs", 762}, + {"&Update", 763}, + {"Overwrite all targets?", 764}, + {"&Reget", 765}, + {"ap&Pend", 766}, + {"Overwrite this target?", 767}, + {"Target date: %s, size %d", 768}, + {"Source date: %s, size %d", 769}, + {" File exists ", 770}, + {" Background process: File exists ", 771}, + {"preserve &Attributes", 772}, + {"follow &Links", 773}, + {"to:", 774}, + {"&Using shell patterns", 775}, + {"&Background", 776}, + {"&Stable Symlinks", 777}, + {"&Dive into subdir if exists", 778}, {"\ Invalid source pattern `%s' \n\ - %s ", 761}, - {"&Suspend", 762}, - {"Con&tinue", 763}, - {"&Chdir", 764}, - {"&Again", 765}, - {"&Quit", 766}, - {"Pane&lize", 767}, - {"&View - F3", 768}, - {"&Edit - F4", 769}, - {"Start at:", 770}, - {"Filename:", 771}, - {"Content: ", 772}, - {"&Tree", 773}, - {"Find File", 774}, - {"Grepping in %s", 775}, - {" Find/read ", 776}, - {" Problem reading from child ", 777}, - {"Finished", 778}, - {"Searching %s", 779}, - {"Suspend", 780}, - {"Restart", 781}, - {"Searching", 782}, - {"Find file", 783}, - {"Change to this directory", 784}, - {"Search again", 785}, - {"View this file", 786}, - {"Edit this file", 787}, - {"Send the results to a Panel", 788}, - {"Usage: fixhlp \n", 789}, - {"fixhlp: Cannot open toc for writing", 790}, + %s ", 779}, + {"&Suspend", 780}, + {"Con&tinue", 781}, + {"&Chdir", 782}, + {"&Again", 783}, + {"&Quit", 784}, + {"Pane&lize", 785}, + {"&View - F3", 786}, + {"&Edit - F4", 787}, + {"Start at:", 788}, + {"Filename:", 789}, + {"Content: ", 790}, + {"&Tree", 791}, + {"Find File", 792}, + {"Grepping in %s", 793}, + {" Find/read ", 794}, + {" Problem reading from child ", 795}, + {"Finished", 796}, + {"Searching %s", 797}, + {"Suspend", 798}, + {"Restart", 799}, + {"Searching", 800}, + {"Find file", 801}, + {"Change to this directory", 802}, + {"Search again", 803}, + {"View this file", 804}, + {"Edit this file", 805}, + {"Send the results to a Panel", 806}, + {"Usage: fixhlp \n", 807}, + {"fixhlp: Cannot open toc for writing", 808}, {"\ [Contents]\n\ Topics:\n\ -\n", 791}, +\n", 809}, {"\ Help file format error\n\ -", 792}, - {" Internal bug: Double start of link area ", 793}, - {" Can't find node [Contents] in help file ", 794}, - {" Help ", 795}, +", 810}, + {" Internal bug: Double start of link area ", 811}, + {" Can't find node [Contents] in help file ", 812}, + {" Help ", 813}, {"\ Can't open file %s \n\ - %s ", 796}, - {" Can't find node %s in help file ", 797}, - {"Index", 798}, - {"Prev", 799}, - {"&Move", 800}, - {"&Remove", 801}, - {"&Append", 802}, - {"&Insert", 803}, - {"New &Entry", 804}, - {"New &Group", 805}, - {"&Up", 806}, - {"&Add current", 807}, - {"Change &To", 808}, - {"Subgroup - press ENTER to see list", 809}, - {"Active VFS directories", 810}, - {"Directory hotlist", 811}, - {" Directory path ", 812}, - {" Directory label ", 813}, - {"Moving ", 814}, - {"New hotlist entry", 815}, - {"Directory label", 816}, - {"Directory path", 817}, - {" New hotlist group ", 818}, - {"Name of new group", 819}, - {"Label for \"%s\":", 820}, - {" Add to hotlist ", 821}, - {" Remove: ", 822}, + %s ", 814}, + {" Can't find node %s in help file ", 815}, + {"Index", 816}, + {"Prev", 817}, + {"&Move", 818}, + {"&Remove", 819}, + {"&Append", 820}, + {"&Insert", 821}, + {"New &Entry", 822}, + {"New &Group", 823}, + {"&Up", 824}, + {"&Add current", 825}, + {"Change &To", 826}, + {"Subgroup - press ENTER to see list", 827}, + {"Active VFS directories", 828}, + {"Directory hotlist", 829}, + {" Directory path ", 830}, + {" Directory label ", 831}, + {"Moving ", 832}, + {"New hotlist entry", 833}, + {"Directory label", 834}, + {"Directory path", 835}, + {" New hotlist group ", 836}, + {"Name of new group", 837}, + {"Label for \"%s\":", 838}, + {" Add to hotlist ", 839}, + {" Remove: ", 840}, {"\ \n\ Group not empty.\n\ - Remove it?", 823}, - {" Top level group ", 824}, - {"Hotlist is now kept in file ~/", 825}, - {"MC will load hotlist from ~/", 826}, - {"and then delete [Hotlist] section there", 827}, - {" Hotlist Load ", 828}, - {"MC was unable to write ~/", 829}, - {" file, your old hotlist entries were not deleted", 830}, - {"You have ~/", 831}, - {" file and [Hotlist] section in ~/", 832}, - {"Your ~/", 833}, - {" most probably was created\n", 834}, + Remove it?", 841}, + {" Top level group ", 842}, + {"Hotlist is now kept in file ~/", 843}, + {"MC will load hotlist from ~/", 844}, + {"and then delete [Hotlist] section there", 845}, + {" Hotlist Load ", 846}, + {"MC was unable to write ~/", 847}, + {" file, your old hotlist entries were not deleted", 848}, + {"You have ~/", 849}, + {" file and [Hotlist] section in ~/", 850}, + {"Your ~/", 851}, + {" most probably was created\n", 852}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 835}, +and is more actual than ~/", 853}, {"\ entries\n\ -\n", 836}, +\n", 854}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 837}, + Remove - remove old hotlist entries from ~/", 855}, {"\ 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 ~/", 838}, - {"&Merge", 839}, - {" Entries from ~/", 840}, - {" file your old hotlist entries were not deleted", 841}, - {"Midnight Commander %s", 842}, - {"Free nodes %d (%d%%) of %d", 843}, - {"No node information", 844}, - {"Free space ", 845}, - {" (%d%%) of ", 846}, - {"No space information", 847}, - {"Type: %s ", 848}, - {"non-local vfs", 849}, - {"Device: %s", 850}, - {"Filesystem: %s", 851}, - {"Accessed: %s", 852}, - {"Modified: %s", 853}, - {"Created: %s", 854}, - {"Size: ", 855}, - {" (%d blocks)", 856}, - {"Owner: %s/%s", 857}, - {"Links: %d", 858}, - {"Mode: %s (%04o)", 859}, - {"Location: %Xh:%Xh", 860}, - {"File: %s", 861}, - {"File: None", 862}, - {"&Vertical", 863}, - {"&Horizontal", 864}, - {"&Xterm hintbar", 865}, - {"h&Intbar visible", 866}, - {"&Keybar visible", 867}, - {"command &Prompt", 868}, - {"show &Mini status", 869}, - {"menu&Bar visible", 870}, - {"&Equal split", 871}, - {"pe&Rmissions", 872}, - {"&File types", 873}, - {"&Save", 874}, - {" Layout ", 875}, - {" Panel split ", 876}, - {" Highlight... ", 877}, - {" Other options ", 878}, - {"output lines", 879}, - {"Layout", 880}, - {" Learn keys ", 881}, - {" Teach me a key ", 882}, + Merge - add old entries to hotlist as group \"Entries from ~/", 856}, + {"&Merge", 857}, + {" Entries from ~/", 858}, + {" file your old hotlist entries were not deleted", 859}, + {"Midnight Commander %s", 860}, + {"Free nodes %d (%d%%) of %d", 861}, + {"No node information", 862}, + {"Free space ", 863}, + {" (%d%%) of ", 864}, + {"No space information", 865}, + {"Type: %s ", 866}, + {"non-local vfs", 867}, + {"Device: %s", 868}, + {"Filesystem: %s", 869}, + {"Accessed: %s", 870}, + {"Modified: %s", 871}, + {"Created: %s", 872}, + {"Size: ", 873}, + {" (%d blocks)", 874}, + {"Owner: %s/%s", 875}, + {"Links: %d", 876}, + {"Mode: %s (%04o)", 877}, + {"Location: %Xh:%Xh", 878}, + {"File: %s", 879}, + {"File: None", 880}, + {"&Vertical", 881}, + {"&Horizontal", 882}, + {"&Xterm hintbar", 883}, + {"h&Intbar visible", 884}, + {"&Keybar visible", 885}, + {"command &Prompt", 886}, + {"show &Mini status", 887}, + {"menu&Bar visible", 888}, + {"&Equal split", 889}, + {"pe&Rmissions", 890}, + {"&File types", 891}, + {"&Save", 892}, + {" Layout ", 893}, + {" Panel split ", 894}, + {" Highlight... ", 895}, + {" Other options ", 896}, + {"output lines", 897}, + {"Layout", 898}, + {" Learn keys ", 899}, + {" Teach me a key ", 900}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1047,328 +1065,348 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 883}, - {" Cannot accept this key ", 884}, - {" You have entered \"%s\"", 885}, - {"OK", 886}, +and wait as well.", 901}, + {" Cannot accept this key ", 902}, + {" You have entered \"%s\"", 903}, + {"OK", 904}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 887}, - {"&Discard", 888}, +work fine. That's great.", 905}, + {"&Discard", 906}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 889}, - {"Learn keys", 890}, - {"Press all the keys mentioned here. After you have done it, check", 891}, - {"which keys are not marked with OK. Press space on the missing", 892}, - {"key, or click with the mouse to define it. Move around with Tab.", 893}, +All your keys work well.", 907}, + {"Learn keys", 908}, + {"Press all the keys mentioned here. After you have done it, check", 909}, + {"which keys are not marked with OK. Press space on the missing", 910}, + {"key, or click with the mouse to define it. Move around with Tab.", 911}, {"\ 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? ", 894}, - {"Press any key to continue...", 895}, - {" The shell is already running a command ", 896}, - {"&Listing mode...", 897}, - {"&Quick view C-x q", 898}, - {"&Info C-x i", 899}, - {"&Sort order...", 900}, - {"&Filter...", 901}, - {"&Network link...", 902}, - {"FT&P link...", 903}, - {"&Drive... M-d", 904}, - {"&Rescan C-r", 905}, - {"&User menu F2", 906}, - {"&View F3", 907}, - {"Vie&w file... ", 908}, - {"&Filtered view M-!", 909}, - {"&Edit F4", 910}, - {"&Copy F5", 911}, - {"c&Hmod C-x c", 912}, - {"&Link C-x l", 913}, - {"&SymLink C-x s", 914}, - {"edit s&Ymlink C-x C-s", 915}, - {"ch&Own C-x o", 916}, - {"&Advanced chown ", 917}, - {"&Rename/Move F6", 918}, - {"&Mkdir F7", 919}, - {"&Delete F8", 920}, - {"&Quick cd M-c", 921}, - {"select &Group M-+", 922}, - {"u&Nselect group M-\\", 923}, - {"reverse selec&Tion M-*", 924}, - {"e&Xit F10", 925}, - {"&Directory tree", 926}, - {"&Find file M-?", 927}, - {"s&Wap panels C-u", 928}, - {"switch &Panels on/off C-o", 929}, - {"&Compare directories C-x d", 930}, - {"e&Xternal panelize C-x !", 931}, - {"show directory s&Izes", 932}, - {"command &History", 933}, - {"di&Rectory hotlist C-\\", 934}, - {"&Active VFS list C-x a", 935}, - {"&Background jobs C-x j", 936}, - {"&Undelete files (ext2fs only)", 937}, - {"&Listing format edit", 938}, - {"&Extension file edit", 939}, - {"&Menu file edit", 940}, - {"&Configuration...", 941}, - {"c&Onfirmation...", 942}, - {"&Display bits...", 943}, - {"learn &Keys...", 944}, - {"&Virtual FS...", 945}, - {"&Save setup", 946}, - {" &Left ", 947}, - {" &Above ", 948}, - {" &File ", 949}, - {" &Command ", 950}, - {" &Options ", 951}, - {" &Right ", 952}, - {" &Below ", 953}, - {" Information ", 954}, + extra access permissions with the \"su\" command? ", 912}, + {"Press any key to continue...", 913}, + {" The shell is already running a command ", 914}, + {"&Listing mode...", 915}, + {"&Quick view C-x q", 916}, + {"&Info C-x i", 917}, + {"&Sort order...", 918}, + {"&Filter...", 919}, + {"&Network link...", 920}, + {"FT&P link...", 921}, + {"&Drive... M-d", 922}, + {"&Rescan C-r", 923}, + {"&User menu F2", 924}, + {"&View F3", 925}, + {"Vie&w file... ", 926}, + {"&Filtered view M-!", 927}, + {"&Edit F4", 928}, + {"&Copy F5", 929}, + {"c&Hmod C-x c", 930}, + {"&Link C-x l", 931}, + {"&SymLink C-x s", 932}, + {"edit s&Ymlink C-x C-s", 933}, + {"ch&Own C-x o", 934}, + {"&Advanced chown ", 935}, + {"&Rename/Move F6", 936}, + {"&Mkdir F7", 937}, + {"&Delete F8", 938}, + {"&Quick cd M-c", 939}, + {"select &Group M-+", 940}, + {"u&Nselect group M-\\", 941}, + {"reverse selec&Tion M-*", 942}, + {"e&Xit F10", 943}, + {"&Directory tree", 944}, + {"&Find file M-?", 945}, + {"s&Wap panels C-u", 946}, + {"switch &Panels on/off C-o", 947}, + {"&Compare directories C-x d", 948}, + {"e&Xternal panelize C-x !", 949}, + {"show directory s&Izes", 950}, + {"command &History", 951}, + {"di&Rectory hotlist C-\\", 952}, + {"&Active VFS list C-x a", 953}, + {"&Background jobs C-x j", 954}, + {"&Undelete files (ext2fs only)", 955}, + {"&Listing format edit", 956}, + {"&Extension file edit", 957}, + {"&Menu file edit", 958}, + {"&Configuration...", 959}, + {"c&Onfirmation...", 960}, + {"&Display bits...", 961}, + {"learn &Keys...", 962}, + {"&Virtual FS...", 963}, + {"&Save setup", 964}, + {" &Left ", 965}, + {" &Above ", 966}, + {" &File ", 967}, + {" &Command ", 968}, + {" &Options ", 969}, + {" &Right ", 970}, + {" &Below ", 971}, + {" Information ", 972}, {"\ 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. ", 955}, - {"Menu", 956}, - {"Thank you for using GNU Midnight Commander", 957}, - {"with mouse support on xterm%s.\n", 958}, - {" and the Linux console", 959}, - {"The TERM environment variable is unset!\n", 960}, - {"Library directory for the Midnight Commander: %s\n", 961}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 962}, - {"Geometry for the window", 963}, - {"GEOMETRY", 964}, - {"No windows opened at startup", 965}, - {"Force activation even if a server is already running", 966}, + the details. ", 973}, + {"Menu", 974}, + {"Thank you for using GNU Midnight Commander", 975}, + {"with mouse support on xterm%s.\n", 976}, + {" and the Linux console", 977}, + {"The TERM environment variable is unset!\n", 978}, + {"Library directory for the Midnight Commander: %s\n", 979}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 980}, + {"Use to debug the background code", 981}, + {"Request to run in color mode", 982}, + {"Specifies a color configuration", 983}, + {"Edits one file", 984}, + {"Displays this help message", 985}, + {"Displays a help screen on how to change the color scheme", 986}, + {"Log ftp dialog to specified file", 987}, + {"Obsolete", 988}, + {"Requests to run in black and white", 989}, + {"Disable mouse support in text version", 990}, + {"Disables subshell support", 991}, + {"Prints working directory at program exit", 992}, + {"Resets soft keys on HP terminals", 993}, + {"To run on slow terminals", 994}, + {"Use stickchars to draw", 995}, + {"Enables subshell support (default)", 996}, + {"Tries to use termcap instead of terminfo", 997}, + {"Displays the current version", 998}, + {"Launches the file viewer on a file", 999}, + {"Forces xterm features", 1000}, + {"Geometry for the window", 1001}, + {"GEOMETRY", 1002}, + {"No windows opened at startup", 1003}, + {"Force activation even if a server is already running", 1004}, {"\ 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", 967}, - {" Notice ", 968}, +On some systems you may want to run # `which mc`\n", 1005}, + {" Notice ", 1006}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 969}, - {"safe de&Lete", 970}, - {"cd follows lin&Ks", 971}, - {"advanced cho&Wn", 972}, - {"l&Ynx-like motion", 973}, - {"Animation", 974}, - {"rotatin&G dash", 975}, - {"co&Mplete: show all", 976}, - {"&Use internal view", 977}, - {"use internal ed&It", 978}, - {"auto m&Enus", 979}, - {"&Auto save setup", 980}, - {"shell &Patterns", 981}, - {"Compute &Totals", 982}, - {"&Verbose operation", 983}, - {"&Fast dir reload", 984}, - {"mi&X all files", 985}, - {"&Drop down menus", 986}, - {"ma&Rk moves down", 987}, - {"show &Hidden files", 988}, - {"show &Backup files", 989}, - {"&Never", 990}, - {"on dumb &Terminals", 991}, - {"alwa&Ys", 992}, - {" Configure options ", 993}, - {" Panel options ", 994}, - {" Pause after run... ", 995}, - {"Configure options", 996}, - {"&Add new", 997}, - {" External panelize ", 998}, - {"External panelize", 999}, - {"Other command", 1000}, - {" Add to external panelize ", 1001}, - {" Enter command label: ", 1002}, - {" I can't run external panelize while logged on a non local directory ", 1003}, - {"Find *.orig after patching", 1004}, - {"Find SUID and SGID programs", 1005}, - {"Cannot invoke command.", 1006}, - {"Pipe close failed", 1007}, - {"Show this help message", 1008}, - {"Display brief usage message", 1009}, - {"MTime", 1010}, - {"ATime", 1011}, - {"CTime", 1012}, - {"Permission", 1013}, - {"Perm", 1014}, - {"Nl", 1015}, - {"Inode", 1016}, - {"UID", 1017}, - {"GID", 1018}, - {" %s bytes in %d file%s", 1019}, - {"Unknow tag on display format: ", 1020}, - {" Do you really want to execute? ", 1021}, - {" No action taken ", 1022}, - {"RenMov", 1023}, - {"Mkdir", 1024}, + files have been moved now\n", 1007}, + {"safe de&Lete", 1008}, + {"cd follows lin&Ks", 1009}, + {"advanced cho&Wn", 1010}, + {"l&Ynx-like motion", 1011}, + {"Animation", 1012}, + {"rotatin&G dash", 1013}, + {"co&Mplete: show all", 1014}, + {"&Use internal view", 1015}, + {"use internal ed&It", 1016}, + {"auto m&Enus", 1017}, + {"&Auto save setup", 1018}, + {"shell &Patterns", 1019}, + {"Compute &Totals", 1020}, + {"&Verbose operation", 1021}, + {"&Fast dir reload", 1022}, + {"mi&X all files", 1023}, + {"&Drop down menus", 1024}, + {"ma&Rk moves down", 1025}, + {"show &Hidden files", 1026}, + {"show &Backup files", 1027}, + {"&Never", 1028}, + {"on dumb &Terminals", 1029}, + {"alwa&Ys", 1030}, + {" Configure options ", 1031}, + {" Panel options ", 1032}, + {" Pause after run... ", 1033}, + {"Configure options", 1034}, + {"&Add new", 1035}, + {" External panelize ", 1036}, + {"External panelize", 1037}, + {"Other command", 1038}, + {" Add to external panelize ", 1039}, + {" Enter command label: ", 1040}, + {" I can't run external panelize while logged on a non local directory ", 1041}, + {"Find *.orig after patching", 1042}, + {"Find SUID and SGID programs", 1043}, + {"Cannot invoke command.", 1044}, + {"Pipe close failed", 1045}, + {"Show this help message", 1046}, + {"Display brief usage message", 1047}, + {"MTime", 1048}, + {"ATime", 1049}, + {"CTime", 1050}, + {"Permission", 1051}, + {"Perm", 1052}, + {"Nl", 1053}, + {"Inode", 1054}, + {"UID", 1055}, + {"GID", 1056}, + {" %s bytes in %d file%s", 1057}, + {"Unknow tag on display format: ", 1058}, + {" Do you really want to execute? ", 1059}, + {" No action taken ", 1060}, + {"RenMov", 1061}, + {"Mkdir", 1062}, {"\ Can't chdir to %s \n\ - %s ", 1025}, - {"Couldn't open named pipe %s\n", 1026}, - {" The shell is still active. Quit anyway? ", 1027}, - {" There are stopped jobs.", 1028}, - {" Quit anyway? ", 1029}, - {"Warning: Couldn't change to %s.\n", 1030}, + %s ", 1063}, + {"Couldn't open named pipe %s\n", 1064}, + {" The shell is still active. Quit anyway? ", 1065}, + {" There are stopped jobs.", 1066}, + {" Quit anyway? ", 1067}, + {"Warning: Couldn't change to %s.\n", 1068}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1031}, - {"Copy \"%s\" directory to:", 1032}, - {"Move \"%s\" directory to:", 1033}, +%s\n", 1069}, + {"Copy \"%s\" directory to:", 1070}, + {"Move \"%s\" directory to:", 1071}, {"\ Can't stat the destination \n\ - %s ", 1034}, - {" The destination isn't a directory ", 1035}, - {" Delete %s? ", 1036}, - {"Static", 1037}, - {"Dynamc", 1038}, + %s ", 1072}, + {" The destination isn't a directory ", 1073}, + {" Delete %s? ", 1074}, + {"Static", 1075}, + {"Dynamc", 1076}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1039}, - {"Forget", 1040}, - {"Rmdir", 1041}, + %s ", 1077}, + {"Forget", 1078}, + {"Rmdir", 1079}, {"\ Can't write to the %s file:\n\ -%s\n", 1042}, - {" Invalid shell pattern defination \"%c\". ", 1043}, - {" Debug ", 1044}, - {" ERROR: ", 1045}, - {" True: ", 1046}, - {" False: ", 1047}, - {" Warning -- ignoring file ", 1048}, +%s\n", 1080}, + {" Invalid shell pattern defination \"%c\". ", 1081}, + {" Debug ", 1082}, + {" ERROR: ", 1083}, + {" True: ", 1084}, + {" False: ", 1085}, + {" Warning -- ignoring file ", 1086}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1049}, - {" I can't run programs while logged on a non local directory ", 1050}, - {" User menu ", 1051}, - {"name_trunc: too big", 1052}, - {" Pipe failed ", 1053}, - {" Dup failed ", 1054}, +Using it may compromise your security", 1087}, + {" I can't run programs while logged on a non local directory ", 1088}, + {" User menu ", 1089}, + {"name_trunc: too big", 1090}, + {" Pipe failed ", 1091}, + {" Dup failed ", 1092}, {"\ File: \n\ \n\ - ", 1055}, + ", 1093}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1056}, - {" Save changes ", 1057}, - {" Can't spawn child program ", 1058}, - {" Empty output from child filter ", 1059}, - {" Could not open file ", 1060}, - {" Can't open file \"", 1061}, +has been modified, do you want to save the changes?\n", 1094}, + {" Save changes ", 1095}, + {" Can't spawn child program ", 1096}, + {" Empty output from child filter ", 1097}, + {" Could not open file ", 1098}, + {" Can't open file \"", 1099}, {"\ Can't stat file \n\ - ", 1062}, - {" Can't view: not a regular file ", 1063}, - {"File: %s", 1064}, - {" [grow]", 1065}, - {"Searching for `%s'", 1066}, - {" Search string not found ", 1067}, - {" Invalid regular expression ", 1068}, + ", 1100}, + {" Can't view: not a regular file ", 1101}, + {"File: %s", 1102}, + {" [grow]", 1103}, + {"Searching for `%s'", 1104}, + {" Search string not found ", 1105}, + {" Invalid regular expression ", 1106}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1069}, - {" Enter regexp:", 1070}, - {"Ascii", 1071}, - {"Hex", 1072}, - {"Line", 1073}, - {"RxSrch", 1074}, - {"EdText", 1075}, - {"EdHex", 1076}, - {"UnWrap", 1077}, - {"Wrap", 1078}, - {"HxSrch", 1079}, - {"Raw", 1080}, - {"Parse", 1081}, - {"Unform", 1082}, - {"Format", 1083}, - {"Function key 1", 1084}, - {"Function key 2", 1085}, - {"Function key 3", 1086}, - {"Function key 4", 1087}, - {"Function key 5", 1088}, - {"Function key 6", 1089}, - {"Function key 7", 1090}, - {"Function key 8", 1091}, - {"Function key 9", 1092}, - {"Function key 10", 1093}, - {"Function key 11", 1094}, - {"Function key 12", 1095}, - {"Function key 13", 1096}, - {"Function key 14", 1097}, - {"Function key 15", 1098}, - {"Function key 16", 1099}, - {"Function key 17", 1100}, - {"Function key 18", 1101}, - {"Function key 19", 1102}, - {"Function key 20", 1103}, - {"Backspace key", 1104}, - {"End key", 1105}, - {"Up arrow key", 1106}, - {"Down arrow key", 1107}, - {"Left arrow key", 1108}, - {"Right arrow key", 1109}, - {"Home key", 1110}, - {"Page Down key", 1111}, - {"Page Up key", 1112}, - {"Insert key", 1113}, - {"Delete key", 1114}, - {"Completion/M-tab", 1115}, - {"+ on keypad", 1116}, - {"- on keypad", 1117}, - {"* on keypad", 1118}, - {"Left arrow keypad", 1119}, - {"Right arrow keypad", 1120}, - {"Up arrow keypad", 1121}, - {"Down arrow keypad", 1122}, - {"Home on keypad", 1123}, - {"End on keypad", 1124}, - {"Page Down keypad", 1125}, - {"Page Up keypad", 1126}, - {"Insert on keypad", 1127}, - {"Delete on keypad", 1128}, - {"Enter on keypad", 1129}, - {"Slash on keypad", 1130}, - {"NumLock on keypad", 1131}, - {"Password:", 1132}, - {"Password", 1133}, - {"Ok", 1134}, + Enter the new line number:", 1107}, + {" Enter regexp:", 1108}, + {"Ascii", 1109}, + {"Hex", 1110}, + {"Line", 1111}, + {"RxSrch", 1112}, + {"EdText", 1113}, + {"EdHex", 1114}, + {"UnWrap", 1115}, + {"Wrap", 1116}, + {"HxSrch", 1117}, + {"Raw", 1118}, + {"Parse", 1119}, + {"Unform", 1120}, + {"Format", 1121}, + {"Function key 1", 1122}, + {"Function key 2", 1123}, + {"Function key 3", 1124}, + {"Function key 4", 1125}, + {"Function key 5", 1126}, + {"Function key 6", 1127}, + {"Function key 7", 1128}, + {"Function key 8", 1129}, + {"Function key 9", 1130}, + {"Function key 10", 1131}, + {"Function key 11", 1132}, + {"Function key 12", 1133}, + {"Function key 13", 1134}, + {"Function key 14", 1135}, + {"Function key 15", 1136}, + {"Function key 16", 1137}, + {"Function key 17", 1138}, + {"Function key 18", 1139}, + {"Function key 19", 1140}, + {"Function key 20", 1141}, + {"Backspace key", 1142}, + {"End key", 1143}, + {"Up arrow key", 1144}, + {"Down arrow key", 1145}, + {"Left arrow key", 1146}, + {"Right arrow key", 1147}, + {"Home key", 1148}, + {"Page Down key", 1149}, + {"Page Up key", 1150}, + {"Insert key", 1151}, + {"Delete key", 1152}, + {"Completion/M-tab", 1153}, + {"+ on keypad", 1154}, + {"- on keypad", 1155}, + {"* on keypad", 1156}, + {"Left arrow keypad", 1157}, + {"Right arrow keypad", 1158}, + {"Up arrow keypad", 1159}, + {"Down arrow keypad", 1160}, + {"Home on keypad", 1161}, + {"End on keypad", 1162}, + {"Page Down keypad", 1163}, + {"Page Up keypad", 1164}, + {"Insert on keypad", 1165}, + {"Delete on keypad", 1166}, + {"Enter on keypad", 1167}, + {"Slash on keypad", 1168}, + {"NumLock on keypad", 1169}, + {"Password:", 1170}, + {"Password", 1171}, + {"Ok", 1172}, {"\ Couldn't open %s archive\n\ -%s", 1135}, - {"Inconsistent extfs archive", 1136}, - {"Sorry, we can not do password authenticated connections for now.", 1137}, - {" Could not set source routing (%s)", 1138}, +%s", 1173}, + {"Inconsistent extfs archive", 1174}, + {"Sorry, we can not do password authenticated connections for now.", 1175}, + {" Could not set source routing (%s)", 1176}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1139}, - {" MCFS ", 1140}, - {" The server does not support this version ", 1141}, +Remove password or correct mode.", 1177}, + {" MCFS ", 1178}, + {" The server does not support this version ", 1179}, {"\ 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", 1142}, - {" Yes ", 1143}, - {" No ", 1144}, - {" The remote server is running on strange port. Giving up.\n", 1145}, - {" MCFS Password required ", 1146}, - {" Invalid password ", 1147}, - {" Too many open connections ", 1148}, + not be safe on the remote side. Continue? \n", 1180}, + {" Yes ", 1181}, + {" No ", 1182}, + {" The remote server is running on strange port. Giving up.\n", 1183}, + {" MCFS Password required ", 1184}, + {" Invalid password ", 1185}, + {" Too many open connections ", 1186}, {"\ Couldn't open tar archive\n\ -%s", 1149}, - {"Unexpected EOF on archive file", 1150}, - {"Inconsistent tar archive", 1151}, +%s", 1187}, + {"Unexpected EOF on archive file", 1188}, + {"Inconsistent tar archive", 1189}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1152}, +doesn't look like a tar archive.", 1190}, }; -int _msg_tbl_length = 1152; +int _msg_tbl_length = 1190; Binary files old/mc-4.5.24/po/es.gmo and new/mc-4.5.25/po/es.gmo differ diff -ruN old/mc-4.5.24/po/es.po new/mc-4.5.25/po/es.po --- old/mc-4.5.24/po/es.po Tue Mar 9 13:45:35 1999 +++ new/mc-4.5.25/po/es.po Fri Mar 12 21:02:45 1999 @@ -2,6 +2,10 @@ # Copyright (C) 1999 Free Software Foundation, Inc. # David Martín , 1998. # +# DHMA 19990307: +# Added last messages in editcmd.c. Some refinements as file dates and +# translated "stat" as "identificar" +# # DHMA 19990302: # Merged with mc.pot in 4.5.23. Minor GNOME "fuzzy" tweaks. 54 "fuzzy" left. # @@ -15,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: 4.5.23\n" -"POT-Creation-Date: 1999-02-28 19:38-0600\n" -"PO-Revision-Date: 1999-03-02 02:00+0100\n" +"POT-Creation-Date: 1999-03-07 15:56+0100\n" +"PO-Revision-Date: 1999-03-07 15:56+0100\n" "Last-Translator: David Martín \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -64,14 +68,14 @@ msgid " Do you really want to quit the Midnight Commander? " msgstr " ¿Realmente quiere salir del Midnight Commander? " -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1813 #: src/file.c:2195 src/filegui.c:573 src/hotlist.c:1035 src/main.c:829 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "&Sí" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 +#: gnome/gcmd.c:123 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1813 #: src/file.c:2195 src/filegui.c:572 src/hotlist.c:1035 src/main.c:829 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 @@ -438,7 +442,7 @@ "Could not stat %s\n" "%s" msgstr "" -"No puedo hacer stat al archivo %s\n" +"No puedo identificar archivo %s\n" "%s" #: gnome/gicon.c:154 @@ -1093,11 +1097,13 @@ msgid "Location:" msgstr "Ubicación:" -#: 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:342 gtkedit/editcmd.c:1185 +#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:68 +#: 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 msgid "&Ok" msgstr "&Aceptar" @@ -1199,7 +1205,7 @@ #. 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 +#: gtkedit/editcmd.c:1945 gtkedit/editwidget.c:950 src/dir.c:386 #: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " @@ -1245,7 +1251,9 @@ msgid "Do backups -->" msgstr "Dejar copias->" -#: gtkedit/editcmd.c:340 gtkedit/editcmd.c:1181 gtkedit/editcmd.c:1266 +#. 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:65 #: 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 @@ -1288,7 +1296,7 @@ msgstr "Sobrescribir" #: 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:840 gtkedit/editcmd.c:987 gtkedit/editcmd.c:1578 msgid "Cancel" msgstr "Cancelar" @@ -1296,7 +1304,7 @@ msgid " Save as " msgstr " Guardar como" -#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2613 +#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2615 msgid " Error trying to save file. " msgstr " Error al guardar el archivo. " @@ -1395,157 +1403,172 @@ msgid " Cancel " msgstr " Cancelar " +#: gtkedit/editcmd.c:1139 src/filegui.c:567 +msgid "al&L" +msgstr "&Todos" + +#: gtkedit/editcmd.c:1141 src/file.c:2136 src/filegui.c:263 +msgid "&Skip" +msgstr "&Ignorar" + +#: gtkedit/editcmd.c:1143 +msgid "&Replace" +msgstr "&Reemplazar" + #. 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:1149 gtkedit/editcmd.c:1576 msgid " Replace with: " msgstr " Reemplazar con: " -#. 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 " Reemplazar " +#: gtkedit/editcmd.c:1153 +msgid " Confirm replace " +msgstr " Confirmar cambios " -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1270 +#: gtkedit/editcmd.c:1187 gtkedit/editcmd.c:1272 msgid "scanf &Expression" msgstr "&Expresión scanf" -#: gtkedit/editcmd.c:1187 +#: gtkedit/editcmd.c:1189 msgid "replace &All" msgstr "reemplazar &Todos" -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1191 msgid "pr&Ompt on replace" msgstr "c&Onfirmar cambios" -#: gtkedit/editcmd.c:1191 gtkedit/editcmd.c:1272 +#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274 msgid "&Backwards" msgstr "&Hacia atrás" -#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274 +#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276 msgid "&Regular expression" msgstr "expresión &Regular" -#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276 +#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278 msgid "&Whole words only" msgstr "&Sólo palabras completas" -#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278 +#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280 msgid "case &Sensitive" msgstr "distinguir ma&Yúsculas" -#: gtkedit/editcmd.c:1201 +#: gtkedit/editcmd.c:1203 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " Teclee el orden de los argumentos ej. 3,2,1,4 " -#: gtkedit/editcmd.c:1205 +#: gtkedit/editcmd.c:1207 msgid " Enter replacement string:" msgstr " Teclee el cambio a realizar:" -#: gtkedit/editcmd.c:1209 gtkedit/editcmd.c:1282 src/view.c:1917 +#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1917 msgid " Enter search string:" msgstr " Teclee el texto a buscar:" +#. 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 +msgid " Replace " +msgstr " Reemplazar " + #. Heads the 'Search' dialog box -#: gtkedit/editcmd.c:1296 gtkedit/editcmd.c:1472 gtkedit/editcmd.c:2207 +#: gtkedit/editcmd.c:1298 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2209 #: src/view.c:1465 src/view.c:1564 src/view.c:1686 src/view.c:1885 #: src/view.c:1917 msgid " Search " msgstr " Buscar " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1346 +#: gtkedit/editcmd.c:1348 msgid " Enter search text : " msgstr " Teclee el texto a buscar: " -#: gtkedit/editcmd.c:1353 +#: gtkedit/editcmd.c:1355 msgid " Enter replace text : " msgstr " Teclee el reemplazo: " -#: gtkedit/editcmd.c:1357 +#: gtkedit/editcmd.c:1359 msgid " Enter argument order : " msgstr " Teclee el orden de los argumentos: " #. Tool hint -#: gtkedit/editcmd.c:1361 gtkedit/editcmd.c:1362 +#: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364 msgid "Enter the order of replacement of your scanf format specifiers" msgstr "Teclee el orden de reemplazo de sus formatos de scanf" #. The following are check boxes -#: gtkedit/editcmd.c:1367 +#: gtkedit/editcmd.c:1369 msgid " Whole words only " msgstr " Sólo palabras completas " -#: gtkedit/editcmd.c:1369 +#: gtkedit/editcmd.c:1371 msgid " Case sensitive " msgstr " Distinguir Mayúsculas" -#: gtkedit/editcmd.c:1372 +#: gtkedit/editcmd.c:1374 msgid " Regular expression " msgstr " Expresión regular " -#: gtkedit/editcmd.c:1373 gtkedit/editcmd.c:1374 +#: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376 msgid "See the regex man page for how to compose a regular expression" msgstr "" "Vea la página de manual de regex para más información sobre cómo escribir " "expresiones regulares" -#: gtkedit/editcmd.c:1380 +#: gtkedit/editcmd.c:1382 msgid " Backwards " msgstr " Reversa " #. Tool hint -#: gtkedit/editcmd.c:1382 gtkedit/editcmd.c:1383 +#: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385 msgid "Warning: Searching backward can be slow" msgstr "Cuidado: la búsqueda en reversa puede ser lenta " -#: gtkedit/editcmd.c:1396 +#: gtkedit/editcmd.c:1398 msgid " Prompt on replace " msgstr "Preguntar antes de reemplazar" #. Tool hint -#: gtkedit/editcmd.c:1398 +#: gtkedit/editcmd.c:1400 msgid "Ask before making each replacement" msgstr "Preguntar antes de cada reemplazo" -#: gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1402 msgid " Replace all " msgstr " Reemplazar todos " -#: gtkedit/editcmd.c:1403 +#: gtkedit/editcmd.c:1405 msgid " Scanf expression " msgstr " Expresión scanf " #. Tool hint -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1407 msgid "Allows entering of a C format string, see the scanf man page" msgstr "Permite teclear una expresión de formato scanf de C" #. Tool hint -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1412 msgid "Begin search, Enter" msgstr "Empezar búsqueda, Enter" #. Tool hint -#: gtkedit/editcmd.c:1413 +#: gtkedit/editcmd.c:1415 msgid "Abort this dialog, Esc" msgstr "Abortar este diálogo, Esc" #. Buttons for the confirm replace dialog box. -#: gtkedit/editcmd.c:1576 +#: gtkedit/editcmd.c:1578 msgid "Replace" msgstr "Reemplazar" -#: gtkedit/editcmd.c:1576 +#: gtkedit/editcmd.c:1578 msgid "Skip" msgstr "Ignorar" -#: gtkedit/editcmd.c:1576 +#: gtkedit/editcmd.c:1578 msgid "Replace all" msgstr "Reemplazar todos" -#: gtkedit/editcmd.c:1943 +#: gtkedit/editcmd.c:1945 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" @@ -1553,25 +1576,25 @@ "conversiones " #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2107 +#: gtkedit/editcmd.c:2109 msgid " Error in replacement format string. " msgstr " Error en cadena de formato al reemplazar. " -#: gtkedit/editcmd.c:2135 +#: gtkedit/editcmd.c:2137 #, c-format msgid " %ld replacements made. " msgstr " %ld reemplazos hechos. " -#: gtkedit/editcmd.c:2138 gtkedit/editcmd.c:2207 +#: gtkedit/editcmd.c:2140 gtkedit/editcmd.c:2209 msgid " Search string not found. " msgstr " El texto buscado no fue encontrado " #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2231 gtkedit/editcmd.c:2246 gtkedit/editcmd.c:2249 +#: gtkedit/editcmd.c:2233 gtkedit/editcmd.c:2248 gtkedit/editcmd.c:2251 msgid " Quit " msgstr " Salir " -#: gtkedit/editcmd.c:2232 gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2234 gtkedit/editcmd.c:2252 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -1579,112 +1602,136 @@ " El texto actual fue modificado sin ser guardado. \n" " ¿Guardar al salir? " -#: gtkedit/editcmd.c:2246 +#: gtkedit/editcmd.c:2248 msgid " File was modified, Save with exit? " msgstr " El archivo fue modificado. ¿Guardar al salir? " -#: gtkedit/editcmd.c:2246 +#: gtkedit/editcmd.c:2248 msgid "Cancel quit" msgstr "Cancelar salida" -#: gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2252 msgid " &Cancel quit " msgstr " &Cancelar salida " -#: gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2252 msgid " &Yes " msgstr " &Sí " -#: gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2252 msgid " &No " msgstr " &No " -#: gtkedit/editcmd.c:2453 gtkedit/editcmd.c:2528 +#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2530 msgid " Copy to clipboard " msgstr " Copiar al portapapeles " -#: gtkedit/editcmd.c:2453 gtkedit/editcmd.c:2475 gtkedit/editcmd.c:2528 -#: gtkedit/editcmd.c:2541 +#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2530 +#: gtkedit/editcmd.c:2543 msgid " Unable to save to file. " msgstr " No pude guardar el archivo. " -#: gtkedit/editcmd.c:2475 gtkedit/editcmd.c:2541 +#: gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2543 msgid " Cut to clipboard " msgstr " Cortar al portapapeles " -#: gtkedit/editcmd.c:2563 gtkedit/editcmd.c:2567 gtkedit/editcmd.c:2572 -#: gtkedit/editcmd.c:2575 src/view.c:1857 +#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574 +#: gtkedit/editcmd.c:2577 src/view.c:1857 msgid " Goto line " msgstr " Ir a la línea " -#: gtkedit/editcmd.c:2563 gtkedit/editcmd.c:2567 gtkedit/editcmd.c:2572 -#: gtkedit/editcmd.c:2575 +#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574 +#: gtkedit/editcmd.c:2577 msgid " Enter line: " msgstr " Línea: " -#: gtkedit/editcmd.c:2596 gtkedit/editcmd.c:2613 +#: gtkedit/editcmd.c:2598 gtkedit/editcmd.c:2615 msgid " Save Block " msgstr " Guardar bloque " -#: gtkedit/editcmd.c:2647 +#: gtkedit/editcmd.c:2649 msgid " Insert File " msgstr " Insertar archivo " -#: gtkedit/editcmd.c:2662 +#: gtkedit/editcmd.c:2664 msgid " Insert file " msgstr " Insertar archivo " -#: gtkedit/editcmd.c:2662 +#: gtkedit/editcmd.c:2664 msgid " Error trying to insert file. " msgstr " Error al tratar de insertar el archivo " #. Not essential to translate -#: gtkedit/editcmd.c:2682 +#: gtkedit/editcmd.c:2684 msgid " Sort block " msgstr " Ordenar bloque de texto " #. Not essential to translate -#: gtkedit/editcmd.c:2682 gtkedit/editcmd.c:2736 +#: gtkedit/editcmd.c:2684 gtkedit/editcmd.c:2738 msgid " You must first highlight a block of text. " msgstr " Es necesario tener un bloque seleccionado " -#: gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2691 msgid " Run Sort " msgstr " Ordenar bloque de texto " #. Not essential to translate -#: gtkedit/editcmd.c:2691 +#: gtkedit/editcmd.c:2693 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Opciones para \"sort\" (ver manual), separadas por espacios: " -#: gtkedit/editcmd.c:2702 gtkedit/editcmd.c:2708 +#: gtkedit/editcmd.c:2704 gtkedit/editcmd.c:2710 msgid " Sort " msgstr " Ordenar " #. Not essential to translate -#: gtkedit/editcmd.c:2704 +#: gtkedit/editcmd.c:2706 msgid " Error trying to execute sort command " msgstr " Error al tratar de ejectuar el comando \"sort\" " #. Not essential to translate -#: gtkedit/editcmd.c:2710 +#: gtkedit/editcmd.c:2712 msgid " Sort returned non-zero: " msgstr " \"sort\" regresó un valor distinto de cero " #. Not essential to translate -#: gtkedit/editcmd.c:2734 gtkedit/editcmd.c:2764 +#: gtkedit/editcmd.c:2736 gtkedit/editcmd.c:2766 msgid " Process block " msgstr " Procesar bloque " #. Not essential to translate -#: gtkedit/editcmd.c:2766 +#: gtkedit/editcmd.c:2768 msgid " Error trying to stat file " -msgstr " Error al tratar de solicitar información sobre el archivo " +msgstr " Error al tratar de identificar el archivo " -#: gtkedit/editcmd.c:2836 +#: gtkedit/editcmd.c:2838 msgid " Mail " msgstr " Correo " +#: gtkedit/editcmd.c:2851 +msgid " Copies to" +msgstr " Cursar Copias a" + +#: gtkedit/editcmd.c:2855 +msgid " Subject" +msgstr " Tema" + +#: gtkedit/editcmd.c:2859 +msgid " To" +msgstr " Para" + +#: gtkedit/editcmd.c:2861 +msgid " mail -s -c " +msgstr " mail -s -c " + +#: gtkedit/editoptions.c:34 +msgid "Intuitive" +msgstr "Intuitivo" + +#: gtkedit/editoptions.c:34 +msgid "Emacs" +msgstr "Emacs" + #: gtkedit/editoptions.c:37 msgid "None" msgstr "Ninguno" @@ -1695,18 +1742,61 @@ #: gtkedit/editoptions.c:37 msgid "Type writer wrap" -msgstr "Envolver como máquina de escribir" +msgstr "Máquina de escribir" -#. 13 +#. 2 +#: gtkedit/editoptions.c:71 +msgid "Word wrap line length : " +msgstr "Ancho del parrafo auto: " + +#. 4 +#: gtkedit/editoptions.c:77 +msgid "Tab spacing : " +msgstr "Tamaño de tabulaciones: " + +#: gtkedit/editoptions.c:85 +msgid "synta&X highlighting" +msgstr "sinta&Xis coloreada" + +#. 7 +#: gtkedit/editoptions.c:91 +msgid "confir&M before saving" +msgstr "confir&Mar al guardar" + +#. 8 +#: gtkedit/editoptions.c:94 +msgid "fill tabs with &Spaces" +msgstr "tabulaciones x e&Spacios" + +#. 9 +#: gtkedit/editoptions.c:97 +msgid "&Return does autoindent" +msgstr "autoindenta&R" + +#. 10 #: gtkedit/editoptions.c:100 +msgid "&Backspace through tabs" +msgstr "&Borrar en tabulaciones" + +#. 11 +#: gtkedit/editoptions.c:103 +msgid "&Fake half tabs" +msgstr "&Fingir medias tabulaciones" + +#. 13 +#: gtkedit/editoptions.c:109 msgid "Wrap mode" -msgstr "Modo de envoltura" +msgstr "Autoajuste de párrafo" #. 15 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:115 msgid "Key emulation" msgstr "Emulación de teclas" +#: gtkedit/editoptions.c:156 +msgid " Editor options " +msgstr " Opciones del editor " + #. Not essential to translate #: gtkedit/editwidget.c:310 msgid "Error initialising editor.\n" @@ -2702,7 +2792,7 @@ " Couldn't stat %s \n" " %s " msgstr "" -" No puedo hacer stat al archivo %s \n" +" No puedo identificar el archivo %s \n" " %s " #: src/cmd.c:1031 src/cmd.c:1033 @@ -2895,7 +2985,7 @@ #: src/dir.c:386 #, c-format msgid "File exists but can not be stat-ed: %s %s" -msgstr "El archivo existe pero no se pudo hacer un stat(): %s %s" +msgstr "El archivo existe pero no se pudo identificar: %s %s" #: src/dir.c:662 msgid "Unknown" @@ -3020,7 +3110,7 @@ " Cannot stat source file \"%s\" \n" " %s " msgstr "" -" Fallo al solicitar la información sobre el archivo fuente \"%s\" \n" +" No se pudo identificar el archivo origen \"%s\" \n" " %s " #: src/file.c:532 @@ -3076,7 +3166,7 @@ " Cannot fstat source file \"%s\" \n" " %s " msgstr "" -" No puedo solicitar información sobre el archivo origen \"%s\" \n" +" No se puede identificar el archivo origen \"%s\" \n" " %s " #: src/file.c:638 @@ -3085,7 +3175,7 @@ " Cannot create target file \"%s\" \n" " %s " msgstr "" -" No puedo crear el archivo destino \"%s\" \n" +" No se puede crear el archivo destino \"%s\" \n" " %s " #: src/file.c:652 @@ -3094,7 +3184,7 @@ " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -" No puedo solicitar información sobre el archivo destino \"%s\" \n" +" No se puede identificar el archivo destino \"%s\" \n" " %s" #: src/file.c:683 @@ -3103,7 +3193,7 @@ " Cannot read source file \"%s\" \n" " %s " msgstr "" -" No puedo leer el archivo fuente \"%s\" \n" +" No se puede leer el archivo origen \"%s\" \n" " %s" #: src/file.c:713 @@ -3112,7 +3202,7 @@ " Cannot write target file \"%s\" \n" " %s " msgstr "" -" No puedo escribir el archivo destino \"%s\" \n" +" No se puede escribir el archivo destino \"%s\" \n" " %s" #: src/file.c:732 @@ -3125,7 +3215,7 @@ " Cannot close source file \"%s\" \n" " %s " msgstr "" -" No puedo cerrar el archivo fuente \"%s\" \n" +" No se puede cerrar el archivo origen \"%s\" \n" " %s" #: src/file.c:779 @@ -3134,7 +3224,7 @@ " Cannot close target file \"%s\" \n" " %s " msgstr "" -" No puedo cerrar el archivo destino \"%s\" \n" +" No se puede cerrar el archivo destino \"%s\" \n" " %s" #: src/file.c:789 @@ -3155,7 +3245,7 @@ " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -" No puedo solicitar información sobre el directorio fuente \"%s\" \n" +" No se puede identificar el directorio de origen \"%s\" \n" " %s" #: src/file.c:885 @@ -3202,7 +3292,7 @@ " Cannot stat file \"%s\" \n" " %s " msgstr "" -" No puedo solicitar información sobre el archivo \"%s\" \n" +" No se puede identificar el archivo \"%s\" \n" " %s " #: src/file.c:1096 @@ -3213,7 +3303,7 @@ #: src/file.c:1103 #, c-format msgid " Cannot overwrite directory `%s' " -msgstr " No puedo sobrescribir el directorio \"%s\" " +msgstr " No se puede sobrescribir el directorio \"%s\" " #: src/file.c:1140 #, c-format @@ -3372,10 +3462,6 @@ " El destino \"%s\" debe ser un directorio \n" " %s " -#: src/file.c:2136 src/filegui.c:263 -msgid "&Skip" -msgstr "&Ignorar" - #: src/file.c:2136 msgid "&Retry" msgstr "&Reintentar" @@ -3465,10 +3551,6 @@ msgid "&Update" msgstr "actuali&Zar" -#: src/filegui.c:567 -msgid "al&L" -msgstr "&Todos" - #: src/filegui.c:568 msgid "Overwrite all targets?" msgstr "¿Sobrescribir todos los archivos?" @@ -3921,15 +4003,15 @@ #: src/info.c:112 msgid "Free nodes %d (%d%%) of %d" -msgstr "Nodos libres %d (%d%%) de %d" +msgstr " y %d (%d%%) de %d inodos" #: src/info.c:118 msgid "No node information" -msgstr "No hay información sobre nodos" +msgstr "Sin información sobre inodos" #: src/info.c:123 msgid "Free space " -msgstr "Espacio " +msgstr "Disponible " #: src/info.c:125 msgid " (%d%%) of " @@ -3937,12 +4019,12 @@ #: src/info.c:129 msgid "No space information" -msgstr "No hay información sobre espacio" +msgstr "Espacio libre desconocido" #: src/info.c:133 #, c-format msgid "Type: %s " -msgstr "Tipo: %s" +msgstr " Tipo: %s" #: src/info.c:133 msgid "non-local vfs" @@ -3951,12 +4033,12 @@ #: src/info.c:139 #, c-format msgid "Device: %s" -msgstr "Ubicación: %s" +msgstr " Origen: %s" #: src/info.c:143 #, c-format msgid "Filesystem: %s" -msgstr "Sistema: %s" +msgstr "Sistema en %s" #: src/info.c:148 #, c-format @@ -3971,7 +4053,7 @@ #: src/info.c:156 #, c-format msgid "Created: %s" -msgstr "Creado: %s" +msgstr "Cambiado: %s" #: src/info.c:169 msgid "Size: " @@ -3980,7 +4062,7 @@ #: src/info.c:172 #, c-format msgid " (%d blocks)" -msgstr "(%d bloques)" +msgstr " (%d bloques)" #: src/info.c:178 #, c-format @@ -3990,7 +4072,7 @@ #: src/info.c:183 #, c-format msgid "Links: %d" -msgstr "Enlaces: %d" +msgstr "Nº enlaces: %d" #: src/info.c:187 #, c-format @@ -4000,7 +4082,7 @@ #: src/info.c:192 #, c-format msgid "Location: %Xh:%Xh" -msgstr "Lugar: %Xh:%Xh" +msgstr "Ubicado: %Xh:%Xh" #: src/info.c:198 #, c-format @@ -4661,19 +4743,19 @@ #: src/screen.c:429 msgid "MTime" -msgstr "TiempoM" +msgstr "FechaMod" #: src/screen.c:430 msgid "ATime" -msgstr "TiAcceso" +msgstr "FechaAcc" #: src/screen.c:431 msgid "CTime" -msgstr "TiCambio" +msgstr "FechaCmb" #: src/screen.c:432 msgid "Permission" -msgstr "Permiso" +msgstr "Permisos" #: src/screen.c:433 msgid "Perm" @@ -4681,7 +4763,7 @@ #: src/screen.c:434 msgid "Nl" -msgstr "Nl" +msgstr "Ne" #: src/screen.c:435 msgid "Inode" @@ -4776,7 +4858,7 @@ " Can't stat the destination \n" " %s " msgstr "" -" No puedo solicitar información sobre el destino \n" +" No se puede identificar el destino \n" " %s " #: src/tree.c:698 @@ -4922,12 +5004,14 @@ " Can't stat file \n" " " msgstr "" -" No puedo solicitar información sobre el archivo \n" +" No se puede identificar el archivo \n" " " #: src/view.c:488 msgid " Can't view: not a regular file " -msgstr " No se puede ver: no es un archivo normal " +msgstr "" +" No se puede ver: \n" +" no es un archivo ordinario " #: src/view.c:678 #, c-format diff -ruN old/mc-4.5.24/po/mc.pot new/mc-4.5.25/po/mc.pot --- old/mc-4.5.24/po/mc.pot Tue Mar 9 13:45:36 1999 +++ new/mc-4.5.25/po/mc.pot Fri Mar 12 21:02:46 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-03-09 12:45-0600\n" +"POT-Creation-Date: 1999-03-12 20:02-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,7 +47,7 @@ msgid "The GNOME edition of the Midnight Commander file manager." msgstr "" -#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2047 +#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2053 msgid " The Midnight Commander " msgstr "" @@ -55,113 +55,113 @@ msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: gnome/gcmd.c:129 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 -#: src/file.c:2193 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:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860 +#: src/file.c:2232 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846 +#: src/screen.c:2055 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" -#: gnome/gcmd.c:129 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 -#: src/file.c:2193 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:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860 +#: src/file.c:2232 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846 +#: src/screen.c:2055 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "" -#: gnome/gcmd.c:226 +#: gnome/gcmd.c:268 msgid "Sort By" msgstr "" #. we define this up here so we can pass it in to our callback -#: gnome/gcmd.c:231 +#: gnome/gcmd.c:273 msgid "Ignore case sensitivity." msgstr "" -#: gnome/gcmd.c:239 src/chmod.c:150 src/screen.c:425 +#: gnome/gcmd.c:281 src/chmod.c:150 src/screen.c:425 msgid "Name" msgstr "" -#: gnome/gcmd.c:246 +#: gnome/gcmd.c:288 msgid "File Type" msgstr "" -#: gnome/gcmd.c:252 src/screen.c:426 src/screen.c:427 +#: gnome/gcmd.c:294 src/screen.c:426 src/screen.c:427 msgid "Size" msgstr "" -#: gnome/gcmd.c:258 +#: gnome/gcmd.c:300 msgid "Time Last Accessed" msgstr "" -#: gnome/gcmd.c:264 +#: gnome/gcmd.c:306 msgid "Time Last Modified" msgstr "" -#: gnome/gcmd.c:270 +#: gnome/gcmd.c:312 msgid "Time Last Changed" msgstr "" -#: gnome/gcmd.c:284 +#: gnome/gcmd.c:326 msgid "Reverse the order." msgstr "" -#: gnome/gcmd.c:346 +#: gnome/gcmd.c:389 msgid "Enter name." msgstr "" -#: gnome/gcmd.c:352 +#: gnome/gcmd.c:395 msgid "Enter label for command:" msgstr "" -#: gnome/gcmd.c:447 +#: gnome/gcmd.c:494 msgid "Find all core files" msgstr "" -#: gnome/gcmd.c:450 src/panelize.c:350 +#: gnome/gcmd.c:497 src/panelize.c:350 msgid "Find rejects after patching" msgstr "" -#: gnome/gcmd.c:492 +#: gnome/gcmd.c:541 msgid "Run Command" msgstr "" #. Frame 1 -#: gnome/gcmd.c:497 +#: gnome/gcmd.c:546 msgid "Preset Commands" msgstr "" -#: gnome/gcmd.c:514 +#: gnome/gcmd.c:563 msgid "Add" msgstr "" -#: gnome/gcmd.c:518 +#: gnome/gcmd.c:567 msgid "Remove" msgstr "" #. Frame 2 -#: gnome/gcmd.c:526 +#: gnome/gcmd.c:575 msgid "Run this Command" msgstr "" -#: gnome/gcmd.c:533 +#: gnome/gcmd.c:582 msgid "Command: " msgstr "" -#: gnome/gcmd.c:594 +#: gnome/gcmd.c:645 msgid "Set Filter" msgstr "" -#: gnome/gcmd.c:599 gnome/gcmd.c:640 gnome/gcmd.c:645 gnome/gcmd.c:649 -#: gnome/gscreen.c:2600 +#: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700 +#: gnome/gscreen.c:2517 msgid "Show all files" msgstr "" -#: gnome/gcmd.c:606 +#: gnome/gcmd.c:657 msgid "." msgstr "" -#: gnome/gcmd.c:622 +#: gnome/gcmd.c:673 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -169,62 +169,79 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:624 +#: gnome/gcmd.c:675 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:681 gnome/gpopup.c:53 +#: gnome/gcmd.c:732 gnome/gpopup.c:53 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:682 gnome/gpopup.c:54 +#: gnome/gcmd.c:733 gnome/gpopup.c:54 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:392 gnome/gdesktop.c:1848 +#: gnome/gdesktop.c:420 gnome/gdesktop.c:2072 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:393 +#: gnome/gdesktop.c:421 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:976 +#: gnome/gdesktop.c:1013 msgid "While running the mount/umount command" msgstr "" -#: gnome/gdesktop.c:1039 +#: gnome/gdesktop.c:1082 msgid "While running the eject command" msgstr "" -#: gnome/gdesktop.c:1079 gnome/gicon.c:154 gnome/gtools.c:52 +#: gnome/gdesktop.c:1135 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:1844 +#: gnome/gdesktop.c:2068 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1849 +#: gnome/gdesktop.c:2073 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" -#: gnome/gdesktop.c:2180 gnome/glayout.c:410 +#: gnome/gdesktop.c:2402 gnome/glayout.c:355 +msgid "_Terminal" +msgstr "" + +#: gnome/gdesktop.c:2402 gnome/glayout.c:355 +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:2404 gnome/glayout.c:357 +msgid "_Directory..." +msgstr "" + +#: gnome/gdesktop.c:2404 gnome/glayout.c:357 +msgid "Creates a new directory" +msgstr "" + +#: gnome/gdesktop.c:2412 gnome/glayout.c:440 msgid "Arrange Icons" msgstr "" -#: gnome/gdesktop.c:2182 +#: gnome/gdesktop.c:2413 msgid "Create New Window" msgstr "" -#: gnome/gdesktop.c:2184 +#: gnome/gdesktop.c:2415 msgid "Rescan Mountable Devices" msgstr "" -#: gnome/gdesktop.c:2185 gnome/glayout.c:413 +#: gnome/gdesktop.c:2416 gnome/glayout.c:443 msgid "Rescan Desktop" msgstr "" @@ -240,109 +257,109 @@ msgid "Deleting file: " msgstr "" -#: gnome/gdialogs.c:340 +#: gnome/gdialogs.c:361 msgid "Files Exist" msgstr "" -#: gnome/gdialogs.c:352 +#: gnome/gdialogs.c:376 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:389 msgid "Prompt me before overwriting any file." msgstr "" -#: gnome/gdialogs.c:368 +#: gnome/gdialogs.c:396 msgid "Don't overwrite any files." msgstr "" -#: gnome/gdialogs.c:380 +#: gnome/gdialogs.c:412 msgid "Overwrite:" msgstr "" -#: gnome/gdialogs.c:387 +#: gnome/gdialogs.c:419 msgid "Older files." msgstr "" -#: gnome/gdialogs.c:393 +#: gnome/gdialogs.c:425 msgid "Files only if size differs." msgstr "" -#: gnome/gdialogs.c:399 +#: gnome/gdialogs.c:431 msgid "All files." msgstr "" -#: gnome/gdialogs.c:448 +#: gnome/gdialogs.c:471 msgid "File Exists" msgstr "" -#: gnome/gdialogs.c:454 +#: gnome/gdialogs.c:477 #, c-format msgid "The target file already exists: %s" msgstr "" -#: gnome/gdialogs.c:461 +#: gnome/gdialogs.c:484 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:558 gtkedit/editwidget.c:1067 src/file.c:803 +#: src/screen.c:2294 src/screen.c:2324 src/tree.c:1024 msgid "Copy" msgstr "" -#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1068 +#: gnome/gdialogs.c:561 gtkedit/editwidget.c:1068 msgid "Move" msgstr "" -#: gnome/gdialogs.c:552 +#: gnome/gdialogs.c:578 msgid "Destination" msgstr "" -#: gnome/gdialogs.c:556 +#: gnome/gdialogs.c:582 msgid "Find Destination Folder" msgstr "" -#: gnome/gdialogs.c:561 +#: gnome/gdialogs.c:587 msgid "Copy as a background process" msgstr "" -#: gnome/gdialogs.c:581 +#: gnome/gdialogs.c:607 msgid "Advanced Options" msgstr "" -#: gnome/gdialogs.c:585 +#: gnome/gdialogs.c:611 msgid "Preserve symlinks" msgstr "" -#: gnome/gdialogs.c:595 +#: gnome/gdialogs.c:621 msgid "Follow links." msgstr "" -#: gnome/gdialogs.c:600 +#: gnome/gdialogs.c:627 msgid "" "Selecting this will copy the files that symlinks point to instead of just " "copying the link." msgstr "" -#: gnome/gdialogs.c:604 +#: gnome/gdialogs.c:632 msgid "Preserve file attributes." msgstr "" -#: gnome/gdialogs.c:608 +#: gnome/gdialogs.c:637 msgid "Preserves the permissions and the UID/GID if possible" msgstr "" -#: gnome/gdialogs.c:613 +#: gnome/gdialogs.c:643 msgid "Recursively copy subdirectories." msgstr "" -#: gnome/gdialogs.c:617 +#: gnome/gdialogs.c:648 msgid "If set, this will copy the directories recursively" msgstr "" -#: gnome/gdialogs.c:720 +#: gnome/gdialogs.c:752 #, c-format msgid "" "%s\n" @@ -350,35 +367,35 @@ "Directory not empty. Delete it recursively?" msgstr "" -#: gnome/gdialogs.c:729 src/file.c:2188 +#: gnome/gdialogs.c:761 src/file.c:2227 msgid " Delete: " msgstr "" -#: gnome/gdialogs.c:733 +#: gnome/gdialogs.c:765 msgid "Do the same for the rest" msgstr "" -#: gnome/gdialogs.c:802 +#: gnome/gdialogs.c:834 msgid "Move Progress" msgstr "" -#: gnome/gdialogs.c:805 +#: gnome/gdialogs.c:837 msgid "Copy Progress" msgstr "" -#: gnome/gdialogs.c:808 +#: gnome/gdialogs.c:840 msgid "Delete Progress" msgstr "" -#: gnome/gdialogs.c:853 +#: gnome/gdialogs.c:885 msgid "File " msgstr "" -#: gnome/gdialogs.c:857 +#: gnome/gdialogs.c:889 msgid " is " msgstr "" -#: gnome/gdialogs.c:860 +#: gnome/gdialogs.c:892 msgid " Done." msgstr "" @@ -410,19 +427,67 @@ msgid "Default set of icons not found, please check your installation" msgstr "" -#: gnome/glayout.c:264 +#: gnome/glayout.c:40 +msgid "_Icon View" +msgstr "" + +#: gnome/glayout.c:41 gnome/glayout.c:57 +msgid "Switch view to an icon display" +msgstr "" + +#: gnome/glayout.c:43 +msgid "_Brief View" +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" -#: gnome/glayout.c:289 +#: gnome/glayout.c:327 msgid "" "The file manager and the desktop handler are now terminating\n" "\n" @@ -432,244 +497,211 @@ "Press OK to terminate the application, or cancel to continue using it." msgstr "" -#: gnome/glayout.c:317 -msgid "_Terminal" -msgstr "" - -#: 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 "" - -#: 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:378 msgid "_Copy..." msgstr "" -#: gnome/glayout.c:340 +#: gnome/glayout.c:378 msgid "Copy files" msgstr "" -#: gnome/glayout.c:341 +#: gnome/glayout.c:379 msgid "_Delete..." msgstr "" -#: gnome/glayout.c:341 +#: gnome/glayout.c:379 msgid "Delete files" msgstr "" -#: gnome/glayout.c:342 +#: gnome/glayout.c:380 msgid "_Move..." msgstr "" -#: gnome/glayout.c:342 +#: gnome/glayout.c:380 msgid "Rename or move files" msgstr "" -#: gnome/glayout.c:344 +#: gnome/glayout.c:382 msgid "Show directory sizes" msgstr "" -#: gnome/glayout.c:344 +#: gnome/glayout.c:382 msgid "Shows the disk space used by each directory" msgstr "" -#: gnome/glayout.c:351 +#: gnome/glayout.c:389 msgid "Select _All" msgstr "" -#: gnome/glayout.c:351 +#: gnome/glayout.c:389 msgid "Select all files in the current Panel" msgstr "" -#: gnome/glayout.c:353 +#: gnome/glayout.c:391 msgid "_Select Files..." msgstr "" -#: gnome/glayout.c:353 +#: gnome/glayout.c:391 msgid "Select a group of files" msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:392 msgid "_Invert Selection" msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:392 msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:356 +#: gnome/glayout.c:394 msgid "_Rescan Directory" msgstr "" -#: gnome/glayout.c:356 +#: gnome/glayout.c:394 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:401 msgid "_Sort By..." msgstr "" -#: gnome/glayout.c:371 +#: gnome/glayout.c:401 msgid "Confirmation settings" msgstr "" -#: gnome/glayout.c:372 +#: gnome/glayout.c:402 msgid "_Filter View..." msgstr "" -#: gnome/glayout.c:372 +#: gnome/glayout.c:402 msgid "Global option settings" msgstr "" -#: gnome/glayout.c:379 +#: gnome/glayout.c:409 msgid "_Find File..." msgstr "" -#: gnome/glayout.c:379 +#: gnome/glayout.c:409 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:412 msgid "_Run Command..." msgstr "" -#: gnome/glayout.c:382 +#: gnome/glayout.c:412 msgid "Runs a command" msgstr "" -#: gnome/glayout.c:384 +#: gnome/glayout.c:414 msgid "_Run Command in panel..." msgstr "" -#: gnome/glayout.c:384 +#: gnome/glayout.c:414 msgid "Run a command and put the results in a panel" msgstr "" -#: gnome/glayout.c:394 +#: gnome/glayout.c:424 msgid "_Background jobs..." msgstr "" -#: gnome/glayout.c:394 +#: gnome/glayout.c:424 msgid "List of background operations" msgstr "" -#: gnome/glayout.c:397 +#: gnome/glayout.c:427 msgid "Exit" msgstr "" -#: gnome/glayout.c:397 +#: gnome/glayout.c:427 msgid "Terminates the file manager and the desktop" msgstr "" -#: gnome/glayout.c:412 +#: gnome/glayout.c:442 msgid "Rescan System Devices" msgstr "" -#: gnome/glayout.c:420 gnome/glayout.c:430 +#: gnome/glayout.c:450 gnome/glayout.c:460 msgid "_Layout" msgstr "" -#: gnome/glayout.c:421 gnome/glayout.c:431 +#: gnome/glayout.c:451 gnome/glayout.c:461 msgid "_Commands" msgstr "" -#: gnome/glayout.c:422 +#: gnome/glayout.c:452 msgid "_Desktop" msgstr "" -#: gnome/glayout.c:423 gnome/glayout.c:432 +#: gnome/glayout.c:453 gnome/glayout.c:462 msgid "_Help" msgstr "" -#: gnome/glayout.c:484 +#: gnome/glayout.c:600 msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:258 gnome/gpopup.c:259 +#: gnome/gpopup.c:252 gnome/gpopup.c:255 msgid "Properties" msgstr "" -#: gnome/gpopup.c:260 +#: gnome/gpopup.c:253 gnome/gpopup.c:254 gtkedit/editwidget.c:1070 +#: src/screen.c:2297 src/screen.c:2327 +msgid "Delete" +msgstr "" + +#: gnome/gpopup.c:256 msgid "Mount device" msgstr "" -#: gnome/gpopup.c:261 +#: gnome/gpopup.c:257 msgid "Unmount device" msgstr "" -#: gnome/gpopup.c:262 +#: gnome/gpopup.c:258 msgid "Eject device" msgstr "" -#: gnome/gpopup.c:264 gnome/gpopup.c:265 +#: gnome/gpopup.c:260 gnome/gpopup.c:261 msgid "Open" msgstr "" -#: gnome/gpopup.c:266 +#: gnome/gpopup.c:262 msgid "Open with" msgstr "" -#: gnome/gpopup.c:267 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:263 src/screen.c:2292 src/screen.c:2322 msgid "View" msgstr "" -#: gnome/gpopup.c:268 +#: gnome/gpopup.c:264 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:269 src/screen.c:2287 src/screen.c:2317 src/view.c:1996 +#: gnome/gpopup.c:265 src/screen.c:2293 src/screen.c:2323 src/view.c:1991 msgid "Edit" msgstr "" -#: gnome/gpopup.c:271 -msgid "Link..." -msgstr "" - -#: gnome/gpopup.c:272 -msgid "Symlink..." +#: gnome/gpopup.c:267 +msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:273 -msgid "Edit symlink..." +#: gnome/gpopup.c:268 +msgid "Copy..." msgstr "" -#: gnome/gpopup.c:280 gnome/gpopup.c:291 -msgid "Move/rename..." +#: gnome/gpopup.c:270 +msgid "Link..." msgstr "" -#: gnome/gpopup.c:281 gnome/gpopup.c:292 -msgid "Copy..." +#: gnome/gpopup.c:271 +msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:282 gnome/gpopup.c:294 gtkedit/editwidget.c:1070 -#: src/screen.c:2291 src/screen.c:2321 -msgid "Delete" +#: gnome/gpopup.c:272 +msgid "Edit symlink..." msgstr "" #: gnome/gprefs.c:81 @@ -845,7 +877,7 @@ msgid "Title" msgstr "" -#: gnome/gprop.c:521 gnome/gscreen.c:2387 +#: gnome/gprop.c:521 msgid "Icon" msgstr "" @@ -853,254 +885,228 @@ msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1470 +#: gnome/gscreen.c:1469 msgid "Rescan Directory" msgstr "" -#: gnome/gscreen.c:1470 +#: gnome/gscreen.c:1469 msgid "Reloads the current directory" msgstr "" -#: gnome/gscreen.c:1472 +#: gnome/gscreen.c:1471 msgid "New folder" msgstr "" -#: gnome/gscreen.c:1472 +#: gnome/gscreen.c:1471 msgid "Creates a new folder here" msgstr "" -#: gnome/gscreen.c:1650 +#: gnome/gscreen.c:1649 msgid "All files" msgstr "" -#: gnome/gscreen.c:1652 +#: gnome/gscreen.c:1651 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1654 +#: gnome/gscreen.c:1653 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1656 +#: gnome/gscreen.c:1655 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1658 +#: gnome/gscreen.c:1657 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1660 +#: gnome/gscreen.c:1659 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1662 +#: gnome/gscreen.c:1661 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1664 +#: gnome/gscreen.c:1663 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1667 +#: gnome/gscreen.c:1666 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1669 +#: gnome/gscreen.c:1668 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1671 +#: gnome/gscreen.c:1670 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1673 +#: gnome/gscreen.c:1672 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1675 +#: gnome/gscreen.c:1674 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1677 +#: gnome/gscreen.c:1676 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1679 +#: gnome/gscreen.c:1678 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1681 +#: gnome/gscreen.c:1680 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1683 +#: gnome/gscreen.c:1682 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1810 +#: gnome/gscreen.c:1809 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1820 +#: gnome/gscreen.c:1819 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1820 +#: gnome/gscreen.c:1819 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1846 src/screen.c:677 +#: gnome/gscreen.c:1845 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1900 +#: gnome/gscreen.c:1899 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2387 -msgid "Switch view to an Icon view" -msgstr "" - -#: gnome/gscreen.c:2389 -msgid "Brief" -msgstr "" - -#: gnome/gscreen.c:2389 -msgid "Switch view to show just file name and type" -msgstr "" - -#: gnome/gscreen.c:2391 -msgid "Detailed" -msgstr "" - -#: gnome/gscreen.c:2391 -msgid "Switch view to show detailed file statistics" -msgstr "" - -#: gnome/gscreen.c:2393 -msgid "Custom" -msgstr "" - -#: gnome/gscreen.c:2393 -msgid "Switch view to show custom determined statistics." -msgstr "" - -#: gnome/gscreen.c:2401 +#: gnome/gscreen.c:2339 msgid "Back" msgstr "" -#: gnome/gscreen.c:2401 +#: gnome/gscreen.c:2339 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2403 +#: gnome/gscreen.c:2341 msgid "Up" msgstr "" -#: gnome/gscreen.c:2403 +#: gnome/gscreen.c:2341 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2405 +#: gnome/gscreen.c:2343 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2405 +#: gnome/gscreen.c:2343 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2408 src/tree.c:1020 +#: gnome/gscreen.c:2346 src/tree.c:1020 msgid "Rescan" msgstr "" -#: gnome/gscreen.c:2408 +#: gnome/gscreen.c:2346 msgid "Rescan the current directory" msgstr "" -#: gnome/gscreen.c:2411 +#: gnome/gscreen.c:2349 msgid "Home" msgstr "" -#: gnome/gscreen.c:2411 +#: gnome/gscreen.c:2349 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2545 +#: gnome/gscreen.c:2495 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:342 gtkedit/editcmd.c:1185 +#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69 +#: 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:838 src/find.c:171 src/layout.c:369 src/option.c:144 +#: src/wtools.c:289 src/wtools.c:561 msgid "&Ok" msgstr "" -#: gnome/gview.c:122 src/view.c:683 +#: gnome/gview.c:135 src/view.c:683 #, c-format msgid "Offset 0x%08x" msgstr "" -#: gnome/gview.c:124 src/view.c:685 +#: gnome/gview.c:137 src/view.c:685 #, c-format msgid "Col %d" msgstr "" -#: gnome/gview.c:128 src/view.c:689 +#: gnome/gview.c:141 src/view.c:689 #, c-format msgid "%s bytes" msgstr "" -#: gnome/gview.c:292 +#: gnome/gview.c:305 msgid "_Goto line" msgstr "" -#: 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 "" -#: 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 "" -#: gnome/gview.c:313 +#: gnome/gview.c:326 msgid "Wrap the text" msgstr "" #. 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 "" -#: gnome/gview.c:321 +#: gnome/gview.c:334 msgid "_Hex" msgstr "" -#: gnome/gview.c:327 +#: gnome/gview.c:340 msgid "_Search" msgstr "" @@ -1116,11 +1122,11 @@ msgid "help" msgstr "" -#: gnome/gwidget.c:96 src/file.c:2212 +#: gnome/gwidget.c:96 src/file.c:2251 msgid "yes" msgstr "" -#: gnome/gwidget.c:98 src/file.c:2210 +#: gnome/gwidget.c:98 src/file.c:2249 msgid "no" msgstr "" @@ -1135,8 +1141,8 @@ #. 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/editcmd.c:1945 gtkedit/editwidget.c:950 src/dir.c:386 +#: src/screen.c:2312 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " msgstr "" @@ -1179,10 +1185,12 @@ msgid "Do backups -->" msgstr "" -#: gtkedit/editcmd.c:340 gtkedit/editcmd.c:1181 gtkedit/editcmd.c:1266 +#. 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 #: 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 @@ -1205,9 +1213,9 @@ #. 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:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:620 +#: src/help.c:318 src/main.c:691 src/screen.c:2069 src/subshell.c:705 +#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 #: vfs/mcfs.c:170 msgid " Warning " msgstr "" @@ -1221,8 +1229,9 @@ 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: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 msgid "Cancel" msgstr "" @@ -1230,7 +1239,7 @@ msgid " Save as " msgstr "" -#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2613 +#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2615 msgid " Error trying to save file. " msgstr "" @@ -1292,7 +1301,7 @@ msgid " Save file " msgstr "" -#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1992 +#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1987 msgid "Save" msgstr "" @@ -1327,290 +1336,329 @@ msgid " Cancel " msgstr "" +#: gtkedit/editcmd.c:1139 src/filegui.c:596 +msgid "al&L" +msgstr "" + +#: gtkedit/editcmd.c:1141 src/file.c:2173 src/filegui.c:266 +msgid "&Skip" +msgstr "" + +#: gtkedit/editcmd.c:1143 +msgid "&Replace" +msgstr "" + #. 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:1149 gtkedit/editcmd.c:1576 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 " +#: gtkedit/editcmd.c:1153 +msgid " Confirm replace " msgstr "" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1270 +#: gtkedit/editcmd.c:1187 gtkedit/editcmd.c:1272 msgid "scanf &Expression" msgstr "" -#: gtkedit/editcmd.c:1187 +#: gtkedit/editcmd.c:1189 msgid "replace &All" msgstr "" -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1191 msgid "pr&Ompt on replace" msgstr "" -#: gtkedit/editcmd.c:1191 gtkedit/editcmd.c:1272 +#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274 msgid "&Backwards" msgstr "" -#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274 +#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276 msgid "&Regular expression" msgstr "" -#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276 +#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278 msgid "&Whole words only" msgstr "" -#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278 +#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280 msgid "case &Sensitive" msgstr "" -#: gtkedit/editcmd.c:1201 +#: gtkedit/editcmd.c:1203 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr "" -#: gtkedit/editcmd.c:1205 +#: gtkedit/editcmd.c:1207 msgid " Enter replacement string:" msgstr "" -#: gtkedit/editcmd.c:1209 gtkedit/editcmd.c:1282 src/view.c:1917 +#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1912 msgid " Enter search string:" msgstr "" +#. 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 +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:1298 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2209 +#: 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:1348 msgid " Enter search text : " msgstr "" -#: gtkedit/editcmd.c:1353 +#: gtkedit/editcmd.c:1355 msgid " Enter replace text : " msgstr "" -#: gtkedit/editcmd.c:1357 +#: gtkedit/editcmd.c:1359 msgid " Enter argument order : " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1361 gtkedit/editcmd.c:1362 +#: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364 msgid "Enter the order of replacement of your scanf format specifiers" msgstr "" #. The following are check boxes -#: gtkedit/editcmd.c:1367 +#: gtkedit/editcmd.c:1369 msgid " Whole words only " msgstr "" -#: gtkedit/editcmd.c:1369 +#: gtkedit/editcmd.c:1371 msgid " Case sensitive " msgstr "" -#: gtkedit/editcmd.c:1372 +#: gtkedit/editcmd.c:1374 msgid " Regular expression " msgstr "" -#: gtkedit/editcmd.c:1373 gtkedit/editcmd.c:1374 +#: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376 msgid "See the regex man page for how to compose a regular expression" msgstr "" -#: gtkedit/editcmd.c:1380 +#: gtkedit/editcmd.c:1382 msgid " Backwards " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1382 gtkedit/editcmd.c:1383 +#: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385 msgid "Warning: Searching backward can be slow" msgstr "" -#: gtkedit/editcmd.c:1396 +#: gtkedit/editcmd.c:1398 msgid " Prompt on replace " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1398 +#: gtkedit/editcmd.c:1400 msgid "Ask before making each replacement" msgstr "" -#: gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1402 msgid " Replace all " msgstr "" -#: gtkedit/editcmd.c:1403 +#: gtkedit/editcmd.c:1405 msgid " Scanf expression " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1407 msgid "Allows entering of a C format string, see the scanf man page" msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1412 msgid "Begin search, Enter" msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1413 +#: gtkedit/editcmd.c:1415 msgid "Abort this dialog, Esc" msgstr "" #. Buttons for the confirm replace dialog box. -#: gtkedit/editcmd.c:1576 +#: gtkedit/editcmd.c:1578 msgid "Replace" msgstr "" -#: gtkedit/editcmd.c:1576 +#: gtkedit/editcmd.c:1578 msgid "Skip" msgstr "" -#: gtkedit/editcmd.c:1576 +#: gtkedit/editcmd.c:1578 msgid "Replace all" msgstr "" -#: gtkedit/editcmd.c:1943 +#: gtkedit/editcmd.c:1945 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2107 +#: gtkedit/editcmd.c:2109 msgid " Error in replacement format string. " msgstr "" -#: gtkedit/editcmd.c:2135 +#: gtkedit/editcmd.c:2137 #, c-format msgid " %ld replacements made. " msgstr "" -#: gtkedit/editcmd.c:2138 gtkedit/editcmd.c:2207 +#: gtkedit/editcmd.c:2140 gtkedit/editcmd.c:2209 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:2233 gtkedit/editcmd.c:2248 gtkedit/editcmd.c:2251 msgid " Quit " msgstr "" -#: gtkedit/editcmd.c:2232 gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2234 gtkedit/editcmd.c:2252 msgid "" " Current text was modified without a file save. \n" " Save with exit? " msgstr "" -#: gtkedit/editcmd.c:2246 +#: gtkedit/editcmd.c:2248 msgid " File was modified, Save with exit? " msgstr "" -#: gtkedit/editcmd.c:2246 +#: gtkedit/editcmd.c:2248 msgid "Cancel quit" msgstr "" -#: gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2252 msgid " &Cancel quit " msgstr "" -#: gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2252 msgid " &Yes " msgstr "" -#: gtkedit/editcmd.c:2250 +#: gtkedit/editcmd.c:2252 msgid " &No " msgstr "" -#: gtkedit/editcmd.c:2453 gtkedit/editcmd.c:2528 +#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2530 msgid " Copy to clipboard " msgstr "" -#: gtkedit/editcmd.c:2453 gtkedit/editcmd.c:2475 gtkedit/editcmd.c:2528 -#: gtkedit/editcmd.c:2541 +#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2530 +#: gtkedit/editcmd.c:2543 msgid " Unable to save to file. " msgstr "" -#: gtkedit/editcmd.c:2475 gtkedit/editcmd.c:2541 +#: gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2543 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:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574 +#: gtkedit/editcmd.c:2577 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:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574 +#: gtkedit/editcmd.c:2577 msgid " Enter line: " msgstr "" -#: gtkedit/editcmd.c:2596 gtkedit/editcmd.c:2613 +#: gtkedit/editcmd.c:2598 gtkedit/editcmd.c:2615 msgid " Save Block " msgstr "" -#: gtkedit/editcmd.c:2647 +#: gtkedit/editcmd.c:2649 msgid " Insert File " msgstr "" -#: gtkedit/editcmd.c:2662 +#: gtkedit/editcmd.c:2664 msgid " Insert file " msgstr "" -#: gtkedit/editcmd.c:2662 +#: gtkedit/editcmd.c:2664 msgid " Error trying to insert file. " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2682 +#: gtkedit/editcmd.c:2684 msgid " Sort block " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2682 gtkedit/editcmd.c:2736 +#: gtkedit/editcmd.c:2684 gtkedit/editcmd.c:2738 msgid " You must first highlight a block of text. " msgstr "" -#: gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2691 msgid " Run Sort " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2691 +#: gtkedit/editcmd.c:2693 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr "" -#: gtkedit/editcmd.c:2702 gtkedit/editcmd.c:2708 +#: gtkedit/editcmd.c:2704 gtkedit/editcmd.c:2710 msgid " Sort " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2704 +#: gtkedit/editcmd.c:2706 msgid " Error trying to execute sort command " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2710 +#: gtkedit/editcmd.c:2712 msgid " Sort returned non-zero: " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2734 gtkedit/editcmd.c:2764 +#: gtkedit/editcmd.c:2736 gtkedit/editcmd.c:2766 msgid " Process block " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2766 +#: gtkedit/editcmd.c:2768 msgid " Error trying to stat file " msgstr "" -#: gtkedit/editcmd.c:2836 +#: gtkedit/editcmd.c:2838 msgid " Mail " msgstr "" +#: gtkedit/editcmd.c:2851 +msgid " Copies to" +msgstr "" + +#: gtkedit/editcmd.c:2855 +msgid " Subject" +msgstr "" + +#: gtkedit/editcmd.c:2859 +msgid " To" +msgstr "" + +#: gtkedit/editcmd.c:2861 +msgid " mail -s -c " +msgstr "" + +#: gtkedit/editoptions.c:34 +msgid "Intuitive" +msgstr "" + +#: gtkedit/editoptions.c:34 +msgid "Emacs" +msgstr "" + #: gtkedit/editoptions.c:37 msgid "None" msgstr "" @@ -1623,23 +1671,66 @@ msgid "Type writer wrap" msgstr "" +#. 2 +#: gtkedit/editoptions.c:72 +msgid "Word wrap line length : " +msgstr "" + +#. 4 +#: gtkedit/editoptions.c:78 +msgid "Tab spacing : " +msgstr "" + +#: gtkedit/editoptions.c:86 +msgid "synta&X highlighting" +msgstr "" + +#. 7 +#: gtkedit/editoptions.c:92 +msgid "confir&M before saving" +msgstr "" + +#. 8 +#: gtkedit/editoptions.c:95 +msgid "fill tabs with &Spaces" +msgstr "" + +#. 9 +#: gtkedit/editoptions.c:98 +msgid "&Return does autoindent" +msgstr "" + +#. 10 +#: gtkedit/editoptions.c:101 +msgid "&Backspace through tabs" +msgstr "" + +#. 11 +#: gtkedit/editoptions.c:104 +msgid "&Fake half tabs" +msgstr "" + #. 13 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "" #. 15 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "" +#: gtkedit/editoptions.c:157 +msgid " Editor options " +msgstr "" + #. Not essential to translate #: gtkedit/editwidget.c:310 msgid "Error initialising editor.\n" msgstr "" -#: 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:1063 src/help.c:806 src/main.c:1688 src/screen.c:2290 +#: src/screen.c:2320 src/tree.c:1018 src/view.c:1982 msgid "Help" msgstr "" @@ -1651,7 +1742,7 @@ msgid "Replac" msgstr "" -#: gtkedit/editwidget.c:1069 src/view.c:2000 +#: gtkedit/editwidget.c:1069 src/view.c:1995 msgid "Search" msgstr "" @@ -1659,8 +1750,8 @@ 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:1073 src/help.c:818 src/main.c:1691 src/view.c:1984 +#: src/view.c:2004 msgid "Quit" msgstr "" @@ -2138,27 +2229,27 @@ msgid " I can't run the Advanced Chown command on a tarfs " msgstr "" -#: src/background.c:178 +#: src/background.c:181 msgid "Background process:" msgstr "" -#: src/background.c:284 src/file.c:2133 +#: src/background.c:287 src/file.c:2172 msgid " Background process error " msgstr "" -#: src/background.c:291 +#: src/background.c:294 msgid " Child died unexpectedly " msgstr "" -#: src/background.c:293 +#: src/background.c:296 msgid " Unknown error in child " msgstr "" -#: src/background.c:308 +#: src/background.c:311 msgid " Background protocol error " msgstr "" -#: src/background.c:309 +#: src/background.c:312 msgid "" " Background process sent us a request for more arguments \n" " than we can handle. \n" @@ -2616,7 +2707,7 @@ msgid " Link " msgstr "" -#: src/cmd.c:1032 src/cmd.c:1141 src/file.c:1639 +#: src/cmd.c:1032 src/cmd.c:1168 src/file.c:1686 msgid " to:" msgstr "" @@ -2630,89 +2721,89 @@ msgid " symlink: %s " msgstr "" -#: src/cmd.c:1102 +#: src/cmd.c:1117 msgid " Symlink " msgstr "" -#: src/cmd.c:1102 +#: src/cmd.c:1117 msgid " points to:" msgstr "" -#: src/cmd.c:1107 +#: src/cmd.c:1132 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1112 +#: src/cmd.c:1137 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr "" -#: src/cmd.c:1116 +#: src/cmd.c:1141 #, c-format msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1141 +#: src/cmd.c:1168 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1142 +#: src/cmd.c:1169 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1153 +#: src/cmd.c:1180 #, c-format msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1256 +#: src/cmd.c:1283 msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1280 +#: src/cmd.c:1307 #, c-format msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1287 +#: src/cmd.c:1314 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1293 +#: src/cmd.c:1320 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1303 +#: src/cmd.c:1330 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1304 +#: src/cmd.c:1331 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1311 +#: src/cmd.c:1338 msgid " Host name " msgstr "" -#: src/cmd.c:1311 +#: src/cmd.c:1338 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1322 +#: src/cmd.c:1349 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1323 +#: src/cmd.c:1350 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1373 +#: src/cmd.c:1400 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1378 +#: src/cmd.c:1405 msgid " Setup " msgstr "" @@ -2911,111 +3002,111 @@ msgid " `%s' and `%s' are the same file. " msgstr "" -#: src/file.c:565 +#: src/file.c:575 #, c-format msgid "" " Cannot create special file \"%s\" \n" " %s " msgstr "" -#: src/file.c:574 src/file.c:799 +#: src/file.c:584 src/file.c:813 #, c-format msgid "" " Cannot chown target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:583 src/file.c:817 +#: src/file.c:593 src/file.c:832 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:596 +#: src/file.c:610 #, c-format msgid "" " Cannot open source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:606 +#: src/file.c:620 msgid " Reget failed, about to overwrite file " msgstr "" -#: src/file.c:612 +#: src/file.c:626 #, c-format msgid "" " Cannot fstat source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:638 +#: src/file.c:652 #, c-format msgid "" " Cannot create target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:652 +#: src/file.c:666 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:683 +#: src/file.c:697 #, c-format msgid "" " Cannot read source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:713 +#: src/file.c:727 #, c-format msgid "" " Cannot write target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:732 +#: src/file.c:746 msgid "(stalled)" msgstr "" -#: src/file.c:770 +#: src/file.c:784 #, c-format msgid "" " Cannot close source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:779 +#: src/file.c:793 #, c-format msgid "" " Cannot close target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:789 +#: src/file.c:803 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/file.c:790 +#: src/file.c:804 msgid "&Delete" msgstr "" -#: src/file.c:790 src/hotlist.c:1443 +#: src/file.c:804 src/hotlist.c:1443 msgid "&Keep" msgstr "" -#: src/file.c:862 +#: src/file.c:877 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:885 +#: src/file.c:900 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -3023,21 +3114,21 @@ msgstr "" #. we found a cyclic symbolic link -#: src/file.c:893 +#: src/file.c:908 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" -#: src/file.c:946 +#: src/file.c:965 #, c-format msgid "" " Cannot create target directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:964 +#: src/file.c:988 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -3045,69 +3136,69 @@ msgstr "" #. Source doesn't exist -#: src/file.c:1074 +#: src/file.c:1101 #, c-format msgid "" " Cannot stat file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1096 +#: src/file.c:1123 #, c-format msgid " `%s' and `%s' are the same file " msgstr "" -#: src/file.c:1103 +#: src/file.c:1130 #, c-format msgid " Cannot overwrite directory `%s' " msgstr "" -#: src/file.c:1140 +#: src/file.c:1173 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1160 +#: src/file.c:1193 #, c-format msgid "" " Cannot remove file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1213 +#: src/file.c:1247 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr "" -#: src/file.c:1215 +#: src/file.c:1249 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr "" -#: src/file.c:1238 +#: src/file.c:1276 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1301 +#: src/file.c:1339 #, c-format msgid "" " Cannot delete file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1362 src/file.c:1429 src/file.c:1458 +#: src/file.c:1400 src/file.c:1470 src/file.c:1502 #, c-format msgid "" " Cannot remove directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:1494 +#: src/file.c:1541 msgid " Internal error: get_file \n" msgstr "" @@ -3120,251 +3211,243 @@ #. * (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:1662 msgid "1Copy" msgstr "" -#: src/file.c:1615 +#: src/file.c:1662 msgid "1Move" msgstr "" -#: src/file.c:1615 +#: src/file.c:1662 msgid "1Delete" msgstr "" -#: src/file.c:1630 +#: src/file.c:1677 #, c-format msgid "%o %f \"%s\"%m" msgstr "" -#: src/file.c:1631 +#: src/file.c:1678 #, c-format msgid "%o %d %f%m" msgstr "" -#: src/file.c:1633 +#: src/file.c:1680 #, c-format msgid "%o %f \"%s\"%e" msgstr "" -#: src/file.c:1634 +#: src/file.c:1681 #, c-format msgid "%o %d %f%e" msgstr "" -#: src/file.c:1638 +#: src/file.c:1685 msgid "file" msgstr "" -#: src/file.c:1638 +#: src/file.c:1685 msgid "files" msgstr "" -#: src/file.c:1638 +#: src/file.c:1685 msgid "directory" msgstr "" -#: src/file.c:1638 +#: src/file.c:1685 msgid "directories" msgstr "" -#: src/file.c:1639 +#: src/file.c:1686 msgid "files/directories" msgstr "" -#: src/file.c:1639 +#: src/file.c:1686 msgid " with source mask:" msgstr "" -#: src/file.c:1791 +#: src/file.c:1838 msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1810 +#: src/file.c:1857 msgid "Yes" msgstr "" -#: src/file.c:1810 +#: src/file.c:1857 msgid "No" msgstr "" -#: src/file.c:1863 +#: src/file.c:1910 msgid " Sorry, I could not put the job in background " msgstr "" -#: src/file.c:1947 src/file.c:2049 +#: src/file.c:1997 src/file.c:2081 msgid " Internal failure " msgstr "" -#: src/file.c:1947 src/file.c:2049 +#: src/file.c:1997 src/file.c:2081 msgid " Unknown file operation " msgstr "" -#: src/file.c:1966 +#: src/file.c:2012 #, c-format msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: src/file.c:2134 src/filegui.c:263 -msgid "&Skip" -msgstr "" - -#: src/file.c:2134 +#: src/file.c:2173 msgid "&Retry" msgstr "" -#: src/file.c:2134 src/file.c:2195 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2173 src/file.c:2234 src/filegui.c:263 src/filegui.c:591 msgid "&Abort" msgstr "" -#: src/file.c:2186 +#: src/file.c:2225 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: src/file.c:2187 +#: src/file.c:2226 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: src/file.c:2194 +#: src/file.c:2233 msgid "a&ll" msgstr "" -#: src/file.c:2194 src/filegui.c:565 +#: src/file.c:2233 src/filegui.c:594 msgid "non&E" msgstr "" -#: src/file.c:2204 +#: src/file.c:2243 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: src/file.c:2206 +#: src/file.c:2245 msgid "all the directories " msgstr "" -#: src/file.c:2208 +#: src/file.c:2247 msgid " Recursive Delete " msgstr "" -#: src/file.c:2209 +#: src/file.c:2248 msgid " Background process: Recursive Delete " msgstr "" -#: 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 "" -#: src/filegui.c:563 +#: src/filegui.c:592 msgid "if &Size differs" msgstr "" -#: src/filegui.c:566 +#: src/filegui.c:595 msgid "&Update" msgstr "" -#: src/filegui.c:567 -msgid "al&L" -msgstr "" - -#: src/filegui.c:568 +#: src/filegui.c:597 msgid "Overwrite all targets?" msgstr "" -#: src/filegui.c:570 +#: src/filegui.c:599 msgid "&Reget" msgstr "" -#: src/filegui.c:571 +#: src/filegui.c:600 msgid "ap&Pend" msgstr "" -#: 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 "" -#: src/filegui.c:578 +#: src/filegui.c:607 #, c-format msgid "Source date: %s, size %d" msgstr "" -#: 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 "" #. &op_preserve -#: src/filegui.c:775 +#: src/filegui.c:806 msgid "follow &Links" msgstr "" #. &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 "" -#: src/filegui.c:799 +#: src/filegui.c:830 msgid "&Background" msgstr "" -#: src/filegui.c:808 +#: src/filegui.c:839 msgid "&Stable Symlinks" msgstr "" #. &file_mask_stable_symlinks -#: src/filegui.c:810 +#: src/filegui.c:841 msgid "&Dive into subdir if exists" msgstr "" -#: src/filegui.c:969 +#: src/filegui.c:1000 #, c-format msgid "" "Invalid source pattern `%s' \n" @@ -3440,7 +3523,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 "" @@ -4210,7 +4293,7 @@ " the details. " msgstr "" -#: src/main.c:1689 src/screen.c:2285 src/screen.c:2315 +#: src/main.c:1689 src/screen.c:2291 src/screen.c:2321 msgid "Menu" msgstr "" @@ -4241,33 +4324,113 @@ "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" -#: src/main.c:2693 +#: src/main.c:2646 +msgid "Use to debug the background code" +msgstr "" + +#: src/main.c:2652 +msgid "Request to run in color mode" +msgstr "" + +#: src/main.c:2654 +msgid "Specifies a color configuration" +msgstr "" + +#: src/main.c:2659 +msgid "Edits one file" +msgstr "" + +#: src/main.c:2663 +msgid "Displays this help message" +msgstr "" + +#: src/main.c:2666 +msgid "Displays a help screen on how to change the color scheme" +msgstr "" + +#: src/main.c:2669 +msgid "Log ftp dialog to specified file" +msgstr "" + +#: src/main.c:2676 +msgid "Obsolete" +msgstr "" + +#: src/main.c:2678 +msgid "Requests to run in black and white" +msgstr "" + +#: src/main.c:2680 +msgid "Disable mouse support in text version" +msgstr "" + +#: src/main.c:2683 +msgid "Disables subshell support" +msgstr "" + +#: src/main.c:2687 +msgid "Prints working directory at program exit" +msgstr "" + +#: src/main.c:2689 +msgid "Resets soft keys on HP terminals" +msgstr "" + +#: src/main.c:2691 +msgid "To run on slow terminals" +msgstr "" + +#: src/main.c:2694 +msgid "Use stickchars to draw" +msgstr "" + +#: src/main.c:2698 +msgid "Enables subshell support (default)" +msgstr "" + +#: src/main.c:2703 +msgid "Tries to use termcap instead of terminfo" +msgstr "" + +#: src/main.c:2707 +msgid "Displays the current version" +msgstr "" + +#: src/main.c:2709 +msgid "Launches the file viewer on a file" +msgstr "" + +#: src/main.c:2711 +msgid "Forces xterm features" +msgstr "" + +#: src/main.c:2713 msgid "Geometry for the window" msgstr "" -#: src/main.c:2693 +#: src/main.c:2713 msgid "GEOMETRY" msgstr "" -#: src/main.c:2694 +#: src/main.c:2714 msgid "No windows opened at startup" msgstr "" -#: src/main.c:2695 +#: src/main.c:2715 msgid "Force activation even if a server is already running" msgstr "" -#: src/main.c:2967 +#: src/main.c:2987 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:3041 +#: src/main.c:3061 msgid " Notice " msgstr "" -#: src/main.c:3042 +#: src/main.c:3062 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -4476,27 +4639,27 @@ msgid " %s bytes in %d file%s" msgstr "" -#: src/screen.c:1289 +#: src/screen.c:1292 msgid "Unknow tag on display format: " msgstr "" -#: src/screen.c:2048 +#: src/screen.c:2054 msgid " Do you really want to execute? " msgstr "" -#: src/screen.c:2063 +#: src/screen.c:2069 msgid " No action taken " msgstr "" -#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026 +#: src/screen.c:2295 src/screen.c:2325 src/tree.c:1026 msgid "RenMov" msgstr "" -#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030 +#: src/screen.c:2296 src/screen.c:2326 src/tree.c:1030 msgid "Mkdir" msgstr "" -#: src/screen.c:2306 +#: src/screen.c:2312 #, c-format msgid "" " Can't chdir to %s \n" @@ -4508,19 +4671,19 @@ msgid "Couldn't open named pipe %s\n" msgstr "" -#: 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 "" -#: 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 "" @@ -4694,79 +4857,79 @@ msgid " [grow]" msgstr "" -#: src/view.c:1457 +#: src/view.c:1459 #, c-format msgid "Searching for `%s'" msgstr "" -#: 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" " Enter the new line number:" msgstr "" -#: 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 "" -#: src/view.c:1995 +#: src/view.c:1990 msgid "EdText" msgstr "" -#: src/view.c:1995 +#: src/view.c:1990 msgid "EdHex" msgstr "" -#: src/view.c:1997 +#: src/view.c:1992 msgid "UnWrap" msgstr "" -#: src/view.c:1997 +#: src/view.c:1992 msgid "Wrap" msgstr "" -#: src/view.c:2000 +#: src/view.c:1995 msgid "HxSrch" msgstr "" -#: src/view.c:2003 +#: src/view.c:1998 msgid "Raw" msgstr "" -#: src/view.c:2003 +#: src/view.c:1998 msgid "Parse" msgstr "" -#: src/view.c:2007 +#: src/view.c:2002 msgid "Unform" msgstr "" -#: src/view.c:2007 +#: src/view.c:2002 msgid "Format" msgstr "" Binary files old/mc-4.5.24/po/no.gmo and new/mc-4.5.25/po/no.gmo differ diff -ruN old/mc-4.5.24/po/no.po new/mc-4.5.25/po/no.po --- old/mc-4.5.24/po/no.po Tue Mar 9 13:45:35 1999 +++ new/mc-4.5.25/po/no.po Fri Mar 12 21:02:45 1999 @@ -1,12 +1,12 @@ # Norwegian translation of Midnight Commander (bokmål dialect) -# Copyright (C) 1998,1999 Free Software Foundation, Inc. -# Kjartan Maraas , 1998,1999. +# Copyright (C) 1998, 1999 Free Software Foundation, Inc. +# Kjartan Maraas , 1998, 1999. # msgid "" msgstr "" -"Project-Id-Version: mc 4.5.17\n" -"POT-Creation-Date: 1999-02-18 21:41+0100\n" -"PO-Revision-Date: 1999-02-18 21:52+0100\n" +"Project-Id-Version: mc 4.5.24\n" +"POT-Creation-Date: 1999-03-12 03:11+0100\n" +"PO-Revision-Date: 1999-03-10 01:52+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ msgstr " Kjør makro " #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:698 gtkedit/editcmd.c:707 +#: edit/edit_key_translator.c:133 gtkedit/editcmd.c:707 gtkedit/editcmd.c:716 msgid " Press macro hotkey: " msgstr " Trykk hurtigtast for makro: " @@ -38,129 +38,129 @@ msgid " There is no other panel to compare contents to " msgstr " Det er ingen andre paneler å sammenligne innholdet med " -#: gnome/gcmd.c:106 +#: gnome/gcmd.c:112 msgid "GNU Midnight Commander" msgstr "GNU Midnight Commander" -#: gnome/gcmd.c:109 +#: gnome/gcmd.c:115 msgid "The GNOME edition of the Midnight Commander file manager." msgstr "GNOME utgaven av Midnight Commander filbehandleren." -#: gnome/gcmd.c:121 src/main.c:821 src/screen.c:2047 +#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2050 msgid " The Midnight Commander " msgstr " Midnight Commander " -#: gnome/gcmd.c:122 src/main.c:822 +#: gnome/gcmd.c:128 src/main.c:845 msgid " Do you really want to quit the Midnight Commander? " msgstr " Vil du virkelig avslutte Midnight Commander? " -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809 -#: src/file.c:2189 src/filegui.c:573 src/hotlist.c:1035 src/main.c:823 -#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 +#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860 +#: src/file.c:2232 src/filegui.c:602 src/hotlist.c:1035 src/main.c:846 +#: src/screen.c:2052 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "&Ja" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1809 -#: src/file.c:2189 src/filegui.c:572 src/hotlist.c:1035 src/main.c:823 -#: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 +#: gnome/gcmd.c:129 gtkedit/editcmd.c:2248 src/cmd.c:251 src/file.c:1860 +#: src/file.c:2232 src/filegui.c:601 src/hotlist.c:1035 src/main.c:846 +#: src/screen.c:2052 src/subshell.c:706 src/subshell.c:732 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "&Nei" -#: gnome/gcmd.c:220 +#: gnome/gcmd.c:268 msgid "Sort By" msgstr "Sorter etter" #. we define this up here so we can pass it in to our callback -#: gnome/gcmd.c:225 +#: gnome/gcmd.c:273 msgid "Ignore case sensitivity." msgstr "Ikke skill mellom s&tore/små tegn" -#: gnome/gcmd.c:233 src/chmod.c:150 src/screen.c:425 +#: gnome/gcmd.c:281 src/chmod.c:150 src/screen.c:425 msgid "Name" msgstr "Navn" -#: gnome/gcmd.c:240 +#: gnome/gcmd.c:288 msgid "File Type" msgstr "Filtype" -#: gnome/gcmd.c:246 src/screen.c:426 src/screen.c:427 +#: gnome/gcmd.c:294 src/screen.c:426 src/screen.c:427 msgid "Size" msgstr "Størrelse" -#: gnome/gcmd.c:252 +#: gnome/gcmd.c:300 msgid "Time Last Accessed" msgstr "Tid for siste aksess" -#: gnome/gcmd.c:258 +#: gnome/gcmd.c:306 msgid "Time Last Modified" msgstr "Tid for siste modifikasjon" -#: gnome/gcmd.c:264 +#: gnome/gcmd.c:312 msgid "Time Last Changed" msgstr "Tid for siste endring" -#: gnome/gcmd.c:278 +#: gnome/gcmd.c:326 msgid "Reverse the order." msgstr "Reverser rekkefølgen." -#: gnome/gcmd.c:340 +#: gnome/gcmd.c:389 msgid "Enter name." msgstr "Skriv inn navn." -#: gnome/gcmd.c:346 +#: gnome/gcmd.c:395 msgid "Enter label for command:" msgstr "Skriv inn kommandomerkelapp:" -#: gnome/gcmd.c:441 +#: gnome/gcmd.c:494 msgid "Find all core files" msgstr "Finn alle core-filer" -#: gnome/gcmd.c:444 src/panelize.c:350 +#: gnome/gcmd.c:497 src/panelize.c:350 msgid "Find rejects after patching" msgstr "Finn avviste etter patching" -#: gnome/gcmd.c:486 +#: gnome/gcmd.c:541 msgid "Run Command" msgstr "Kjør kommando" #. Frame 1 -#: gnome/gcmd.c:491 +#: gnome/gcmd.c:546 msgid "Preset Commands" msgstr "Forhåndsinnstilte kommandoer" -#: gnome/gcmd.c:508 +#: gnome/gcmd.c:563 msgid "Add" msgstr "Legg til" -#: gnome/gcmd.c:512 +#: gnome/gcmd.c:567 msgid "Remove" msgstr "Fjern" #. Frame 2 -#: gnome/gcmd.c:520 +#: gnome/gcmd.c:575 msgid "Run this Command" msgstr "Kjør denne kommandoen" -#: gnome/gcmd.c:527 +#: gnome/gcmd.c:582 msgid "Command: " msgstr "Kommando: " -#: gnome/gcmd.c:588 +#: gnome/gcmd.c:645 msgid "Set Filter" msgstr "Sett filter" -#: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643 -#: gnome/gscreen.c:2567 +#: gnome/gcmd.c:650 gnome/gcmd.c:691 gnome/gcmd.c:696 gnome/gcmd.c:700 +#: gnome/gscreen.c:2517 msgid "Show all files" msgstr "Vis alle filer" -#: gnome/gcmd.c:600 +#: gnome/gcmd.c:657 msgid "." msgstr "." -#: gnome/gcmd.c:616 +#: gnome/gcmd.c:673 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -172,70 +172,80 @@ "For eksempel:\n" "*.gif vil kun vise gif bilder" -#: gnome/gcmd.c:618 +#: gnome/gcmd.c:675 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:675 gnome/gpopup.c:52 +#: gnome/gcmd.c:732 gnome/gpopup.c:53 msgid " Open with..." msgstr " Åpne med..." -#: gnome/gcmd.c:676 gnome/gpopup.c:53 +#: gnome/gcmd.c:733 gnome/gpopup.c:54 msgid "Enter extra arguments:" msgstr "Skriv inn ekstra argumenter:" -#: gnome/gdesktop.c:377 gnome/gdesktop.c:1881 +#: gnome/gdesktop.c:420 gnome/gdesktop.c:2071 msgid "Warning" msgstr "Advarsel" -#: gnome/gdesktop.c:378 +#: gnome/gdesktop.c:421 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "Kunne ikke åpne %s; vil ikke ha skrivebordsikoner" -#: gnome/gdesktop.c:949 +#: gnome/gdesktop.c:1013 msgid "While running the mount/umount command" msgstr "Under kjøring av mount/umount kommandoen" -#: gnome/gdesktop.c:998 +#: gnome/gdesktop.c:1082 msgid "While running the eject command" msgstr "Under kjøring av eject kommandoen" -#: gnome/gdesktop.c:1762 -msgid "Trashcan" -msgstr "Søppelkurv" - -#: gnome/gdesktop.c:1798 -#, c-format -msgid "floppy %d" -msgstr "diskett %d" - -#: gnome/gdesktop.c:1801 -#, c-format -msgid "disk %d" -msgstr "disk %d" - -#: gnome/gdesktop.c:1804 -#, c-format -msgid "device %d" -msgstr "enhet %d" +#: gnome/gdesktop.c:1135 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:1877 +#: gnome/gdesktop.c:2067 msgid "Home directory" msgstr "Hjemmekatalog" -#: gnome/gdesktop.c:1882 +#: gnome/gdesktop.c:2072 #, 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:2197 +#: gnome/gdesktop.c:2401 gnome/glayout.c:355 +msgid "_Terminal" +msgstr "_Terminal" + +#: gnome/gdesktop.c:2401 gnome/glayout.c:355 +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:2403 gnome/glayout.c:357 +msgid "_Directory..." +msgstr "Katalog..." + +#: gnome/gdesktop.c:2403 gnome/glayout.c:357 +msgid "Creates a new directory" +msgstr "Oppretter en ny katalog" + +#: gnome/gdesktop.c:2411 gnome/glayout.c:440 msgid "Arrange Icons" msgstr "Plasser ikonene" -#: gnome/gdesktop.c:2198 +#: gnome/gdesktop.c:2412 +msgid "Create New Window" +msgstr "Opprett nytt vindu" + +#: gnome/gdesktop.c:2414 +msgid "Rescan Mountable Devices" +msgstr "Oppdater moterbare enheter" + +#: gnome/gdesktop.c:2415 gnome/glayout.c:443 msgid "Rescan Desktop" msgstr "Oppdater skrivebordet" @@ -251,88 +261,89 @@ msgid "Deleting file: " msgstr "Sletter fil: " -#: gnome/gdialogs.c:340 +#: gnome/gdialogs.c:361 msgid "Files Exist" msgstr "Filene eksisterer" -#: gnome/gdialogs.c:352 +#: gnome/gdialogs.c:376 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 "" "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:361 +#: gnome/gdialogs.c:389 msgid "Prompt me before overwriting any file." msgstr "Spør meg før filer overskrives." -#: gnome/gdialogs.c:368 +#: gnome/gdialogs.c:396 msgid "Don't overwrite any files." msgstr "Ikke overskriv filer." -#: gnome/gdialogs.c:380 +#: gnome/gdialogs.c:412 msgid "Overwrite:" msgstr "Overskriv:" -#: gnome/gdialogs.c:387 +#: gnome/gdialogs.c:419 msgid "Older files." msgstr "Eldre filer." -#: gnome/gdialogs.c:393 +#: gnome/gdialogs.c:425 msgid "Files only if size differs." msgstr "Filer bare hvis størrelsen er forskjellig." -#: gnome/gdialogs.c:399 +#: gnome/gdialogs.c:431 msgid "All files." msgstr "Alle filer." -#: gnome/gdialogs.c:448 +#: gnome/gdialogs.c:471 msgid "File Exists" msgstr "Filen eksisterer" -#: gnome/gdialogs.c:454 +#: gnome/gdialogs.c:477 #, c-format msgid "The target file already exists: %s" msgstr "Målfilen eksisterer allerede: %s" -#: gnome/gdialogs.c:461 +#: gnome/gdialogs.c:484 msgid "Replace it?" msgstr "Erstatt den?" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:789 -#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:558 gtkedit/editwidget.c:1067 src/file.c:803 +#: src/screen.c:2291 src/screen.c:2321 src/tree.c:1024 msgid "Copy" msgstr "Kopier" -#: gnome/gdialogs.c:535 gtkedit/editwidget.c:1065 +#: gnome/gdialogs.c:561 gtkedit/editwidget.c:1068 msgid "Move" msgstr "Flytt" -#: gnome/gdialogs.c:552 +#: gnome/gdialogs.c:578 msgid "Destination" msgstr "Mål" -#: gnome/gdialogs.c:556 +#: gnome/gdialogs.c:582 msgid "Find Destination Folder" msgstr "Finn målkatalog" -#: gnome/gdialogs.c:561 +#: gnome/gdialogs.c:587 msgid "Copy as a background process" msgstr "Kopier i bakgrunnen" -#: gnome/gdialogs.c:581 +#: gnome/gdialogs.c:607 msgid "Advanced Options" msgstr "Avanserte alternativer" -#: gnome/gdialogs.c:585 +#: gnome/gdialogs.c:611 msgid "Preserve symlinks" msgstr "Behold symbolske lenker" -#: gnome/gdialogs.c:595 +#: gnome/gdialogs.c:621 msgid "Follow links." msgstr "Følg lenker" -#: gnome/gdialogs.c:600 +#: gnome/gdialogs.c:627 msgid "" "Selecting this will copy the files that symlinks point to instead of just " "copying the link." @@ -340,43 +351,62 @@ "Dette valget vil kopiere filene som symlenken peker til i stedet for bare å " "kopiere lenken." -#: gnome/gdialogs.c:604 +#: gnome/gdialogs.c:632 msgid "Preserve file attributes." msgstr "Behold filattributter." -#: gnome/gdialogs.c:608 +#: gnome/gdialogs.c:637 msgid "Preserves the permissions and the UID/GID if possible" msgstr "Tar vare på rettighetene og UID/GID hvis mulig" -#: gnome/gdialogs.c:613 +#: gnome/gdialogs.c:643 msgid "Recursively copy subdirectories." msgstr "Kopier kataloger rekursivt." -#: gnome/gdialogs.c:617 +#: gnome/gdialogs.c:648 msgid "If set, this will copy the directories recursively" msgstr "Hvis satt, vil dette kopiere katalogen rekursivt" -#: gnome/gdialogs.c:733 +#: gnome/gdialogs.c:752 +#, c-format +msgid "" +"%s\n" +"\n" +"Directory not empty. Delete it recursively?" +msgstr "" +"%s\n" +"\n" +"Katalogen er ikke tom. Slett den rekursivt?" + +#: gnome/gdialogs.c:761 src/file.c:2227 +msgid " Delete: " +msgstr " Slett: " + +#: gnome/gdialogs.c:765 +msgid "Do the same for the rest" +msgstr "Gjør det samme for resten" + +#: gnome/gdialogs.c:834 msgid "Move Progress" msgstr "Fremgang for flytting" -#: gnome/gdialogs.c:736 +#: gnome/gdialogs.c:837 msgid "Copy Progress" msgstr "Fremgang for kopiering" -#: gnome/gdialogs.c:739 +#: gnome/gdialogs.c:840 msgid "Delete Progress" msgstr "Fremgang for sletting" -#: gnome/gdialogs.c:784 +#: gnome/gdialogs.c:885 msgid "File " msgstr "Fil " -#: gnome/gdialogs.c:788 +#: gnome/gdialogs.c:889 msgid " is " msgstr " er " -#: gnome/gdialogs.c:791 +#: gnome/gdialogs.c:892 msgid " Done." msgstr " Ferdig." @@ -406,229 +436,285 @@ " Kunne ikke kjøre stat på %s \n" " %s " -#: gnome/gicon.c:154 gnome/gtools.c:52 -msgid "Error" -msgstr "Feil" - #: gnome/gicon.c:154 msgid "Default set of icons not found, please check your installation" msgstr "Standard ikonsett ikke funnet, vennligst sjekk installasjonen" -#: gnome/glayout.c:274 -msgid "Enter command to run" -msgstr "Skriv inn kommando som skal kjøres" +#: gnome/glayout.c:40 +msgid "_Icon View" +msgstr "_Ikonvisning" -#: gnome/glayout.c:284 -msgid "_Terminal" -msgstr "Terminal" +#: gnome/glayout.c:41 gnome/glayout.c:57 +msgid "Switch view to an icon display" +msgstr "Bytt til ikonvisning" -#: gnome/glayout.c:284 -msgid "Launch a new terminal in the current directory" -msgstr "Starter en ny terminal i aktiv katalog" +#: gnome/glayout.c:43 +msgid "_Brief View" +msgstr "Udetaljert visning" -#. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/glayout.c:286 -msgid "_Directory..." -msgstr "Katalog..." +#: gnome/glayout.c:44 gnome/glayout.c:60 +msgid "Switch view to show just file name and type" +msgstr "Bytt visning til kun filnavn og type" -#: gnome/glayout.c:286 -msgid "Creates a new directory" -msgstr "Oppretter en ny katalog" +#: gnome/glayout.c:46 +msgid "_Detailed View" +msgstr "Detaljert visning" + +#: gnome/glayout.c:47 gnome/glayout.c:63 +msgid "Switch view to show detailed file statistics" +msgstr "Bytt visning til detaljert filstatistikk" + +#: gnome/glayout.c:49 +msgid "_Custom View" +msgstr "Egendefinert visning" + +#: gnome/glayout.c:50 gnome/glayout.c:66 +msgid "Switch view to show user-defined statistics" +msgstr "Bytt visning til å vise egendefinert statistikk" + +#: gnome/glayout.c:56 +msgid "Icons" +msgstr "Ikoner" + +#: gnome/glayout.c:59 +msgid "Brief" +msgstr "Udetaljert" + +#: gnome/glayout.c:62 +msgid "Detailed" +msgstr "Detaljert" + +#: gnome/glayout.c:65 +msgid "Custom" +msgstr "Egendefinert" + +#: gnome/glayout.c:302 +msgid "Enter command to run" +msgstr "Skriv inn kommando som skal kjøres" -#. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:307 +#: 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?" +msgstr "" +"Vær oppmerksom på at hvis du velger å terminere filbehandleren, så\n" +"vil dette også terminere GNOME's skrivebordshåndtering.\n" +"\n" +"Er du sikker på at du vil avslutte?" + +#: gnome/glayout.c:327 +msgid "" +"The file manager and the desktop handler are now terminating\n" +"\n" +"If you want to start up again the desktop handler or the file manager\n" +"you can launch it from the Panel, or you can run the UNIX command `gmc'\n" +"\n" +"Press OK to terminate the application, or cancel to continue using it." +msgstr "" +"Filbehandleren og skrivebordsbehandleren terminerer nå\n" +"\n" +"Hvis du vil starte opp skrivebordsbehandlingen eller filbehandleren,\n" +"så kan du starte dem fra panelet eller du kan kjøre UNIX kommandoen `gmc'\n" +"\n" +"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 msgid "_Copy..." msgstr "Kopier..." -#: gnome/glayout.c:307 +#: gnome/glayout.c:378 msgid "Copy files" msgstr "Kopier filer" -#: gnome/glayout.c:308 +#: gnome/glayout.c:379 msgid "_Delete..." msgstr "Slett..." -#: gnome/glayout.c:308 +#: gnome/glayout.c:379 msgid "Delete files" msgstr "Slett filer" -#: gnome/glayout.c:309 +#: gnome/glayout.c:380 msgid "_Move..." msgstr "Flytt..." -#: gnome/glayout.c:309 +#: gnome/glayout.c:380 msgid "Rename or move files" msgstr "Omdøp eller flytt filer" -#: gnome/glayout.c:311 +#: gnome/glayout.c:382 msgid "Show directory sizes" msgstr "Vis katalogstørrelser" -#: gnome/glayout.c:311 +#: gnome/glayout.c:382 msgid "Shows the disk space used by each directory" msgstr "Viser hvor mye diskplass som brukes av hver katalog" -#: gnome/glayout.c:318 +#: gnome/glayout.c:389 msgid "Select _All" msgstr "Velg alle" -#: gnome/glayout.c:318 +#: gnome/glayout.c:389 msgid "Select all files in the current Panel" msgstr "Velg alle filer i aktivt panel" -#: gnome/glayout.c:320 +#: gnome/glayout.c:391 msgid "_Select Files..." msgstr "Velg filer..." -#: gnome/glayout.c:320 +#: gnome/glayout.c:391 msgid "Select a group of files" msgstr "Velg en gruppe av filer" -#: gnome/glayout.c:321 +#: gnome/glayout.c:392 msgid "_Invert Selection" msgstr "Reverser valg" -#: gnome/glayout.c:321 +#: gnome/glayout.c:392 msgid "Reverses the list of tagged files" msgstr "Reverserer listen med merkede filer" -#: gnome/glayout.c:323 +#: gnome/glayout.c:394 msgid "_Rescan Directory" msgstr "Oppdater kataloginnholdet" -#: gnome/glayout.c:323 +#: gnome/glayout.c:394 msgid "Rescan the directory contents" msgstr "Oppdater kataloginnholdet" -#: gnome/glayout.c:330 -msgid "Icon View" -msgstr "Ikonvisning" - -#: gnome/glayout.c:331 -msgid "Partial View" -msgstr "Delvis visning" - -#: gnome/glayout.c:332 -msgid "Full View" -msgstr "Detaljert visning" - -#: gnome/glayout.c:333 -msgid "Custom View" -msgstr "Egendefinert visning" - -#: gnome/glayout.c:338 +#: gnome/glayout.c:401 msgid "_Sort By..." msgstr "Sorter etter..." -#: gnome/glayout.c:338 +#: gnome/glayout.c:401 msgid "Confirmation settings" msgstr "Innstillinger for bekreftelse" -#: gnome/glayout.c:339 +#: gnome/glayout.c:402 msgid "_Filter View..." msgstr "Filtrert visning..." -#: gnome/glayout.c:339 +#: gnome/glayout.c:402 msgid "Global option settings" msgstr "Innstillinger for globale alternativer" -#: gnome/glayout.c:346 +#: gnome/glayout.c:409 msgid "_Find File..." msgstr "Finn fil..." -#: gnome/glayout.c:346 +#: gnome/glayout.c:409 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:349 +#: gnome/glayout.c:412 msgid "_Run Command..." msgstr "Kjør kommando..." -#: gnome/glayout.c:349 +#: gnome/glayout.c:412 msgid "Runs a command" msgstr "Kjører en kommando" -#: gnome/glayout.c:351 +#: gnome/glayout.c:414 msgid "_Run Command in panel..." msgstr "Kjør kommando i panelet..." -#: gnome/glayout.c:351 +#: gnome/glayout.c:414 msgid "Run a command and put the results in a panel" msgstr "Kjør en kommando og legg resultatene i panelet" -#: gnome/glayout.c:354 -msgid "_Active VFS list..." -msgstr "Liste over aktive VFS..." - -#: gnome/glayout.c:354 -msgid "List of active virtual file systems" -msgstr "Liste over aktive virtuelle filsystemer" - -#: gnome/glayout.c:361 +#: gnome/glayout.c:424 msgid "_Background jobs..." msgstr "Bakgrunnsjobber..." -#: gnome/glayout.c:361 +#: gnome/glayout.c:424 msgid "List of background operations" msgstr "Liste over bakgrunnsjobber" -#: gnome/glayout.c:364 -msgid "Recreate desktop devices" -msgstr "Lag skrivebordsenhetene på nytt" - -#: gnome/glayout.c:364 -msgid "Recreates the devices shown on the desktop" -msgstr "Oppretter enhetene som vises på skrivebordet på nytt" +#: gnome/glayout.c:427 +msgid "Exit" +msgstr "Avslutt" -#: gnome/glayout.c:378 +#: gnome/glayout.c:427 +msgid "Terminates the file manager and the desktop" +msgstr "Terminerer filbehandleren og skrivebordet" + +#: gnome/glayout.c:442 +msgid "Rescan System Devices" +msgstr "Oppdater systemenhetene" + +#: gnome/glayout.c:450 gnome/glayout.c:460 msgid "_Layout" msgstr "Utseende" -#: gnome/glayout.c:379 +#: gnome/glayout.c:451 gnome/glayout.c:461 msgid "_Commands" msgstr "Kommandoer" -#: gnome/glayout.c:476 +#: gnome/glayout.c:452 +msgid "_Desktop" +msgstr "Skrivebord" + +#: gnome/glayout.c:453 gnome/glayout.c:462 +msgid "_Help" +msgstr "Hjelp" + +#: gnome/glayout.c:600 msgid "File/New/Directory..." msgstr "Fil/Ny/Katalog..." -#: gnome/gpopup.c:257 gnome/gpopup.c:258 +#: gnome/gpopup.c:252 gnome/gpopup.c:255 msgid "Properties" msgstr "Egenskaper" -#: gnome/gpopup.c:259 +#: gnome/gpopup.c:253 gnome/gpopup.c:254 gtkedit/editwidget.c:1070 +#: src/screen.c:2294 src/screen.c:2324 +msgid "Delete" +msgstr "Slett" + +#: gnome/gpopup.c:256 msgid "Mount device" msgstr "Monter enhet" -#: gnome/gpopup.c:260 +#: gnome/gpopup.c:257 msgid "Unmount device" msgstr "Avmonter enhet" -#: gnome/gpopup.c:261 +#: gnome/gpopup.c:258 msgid "Eject device" msgstr "Utløs enhet" -#: gnome/gpopup.c:263 gnome/gpopup.c:264 +#: gnome/gpopup.c:260 gnome/gpopup.c:261 msgid "Open" msgstr "Åpne" -#: gnome/gpopup.c:265 +#: gnome/gpopup.c:262 msgid "Open with" msgstr "Åpne med" -#: gnome/gpopup.c:266 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:263 src/screen.c:2289 src/screen.c:2319 msgid "View" msgstr "Se på" -#: gnome/gpopup.c:267 +#: gnome/gpopup.c:264 msgid "View unfiltered" msgstr "Se på ufiltrert" -#: gnome/gpopup.c:268 src/screen.c:2287 src/screen.c:2317 src/view.c:1996 +#: gnome/gpopup.c:265 src/screen.c:2290 src/screen.c:2320 src/view.c:1991 msgid "Edit" msgstr "Rediger" +#: gnome/gpopup.c:267 +msgid "Move/rename..." +msgstr "Flytt/gi nytt navn..." + +#: gnome/gpopup.c:268 +msgid "Copy..." +msgstr "Kopier..." + #: gnome/gpopup.c:270 msgid "Link..." msgstr "Finn..." @@ -641,100 +727,87 @@ msgid "Edit symlink..." msgstr "Rediger symlenke..." -#: gnome/gpopup.c:279 gnome/gpopup.c:290 -msgid "Move/rename..." -msgstr "Flytt/gi nytt navn..." - -#: gnome/gpopup.c:280 gnome/gpopup.c:291 -msgid "Copy..." -msgstr "Kopier..." - -#: gnome/gpopup.c:281 gnome/gpopup.c:293 gtkedit/editwidget.c:1067 -#: src/screen.c:2291 src/screen.c:2321 -msgid "Delete" -msgstr "Slett" - -#: gnome/gprefs.c:78 +#: gnome/gprefs.c:81 msgid "Show backup files" msgstr "Vis sikkerhetskopier" -#: gnome/gprefs.c:82 +#: gnome/gprefs.c:85 msgid "Show hidden files" msgstr "Vis skjulte filer" -#: gnome/gprefs.c:86 +#: gnome/gprefs.c:89 msgid "Mix files and directories" msgstr "Bland filer og kataloger" -#: gnome/gprefs.c:90 +#: gnome/gprefs.c:93 msgid "Use shell patterns instead of regular expressions" msgstr "Bruk skall-uttrykk i stedet for regulære uttrykk" -#: gnome/gprefs.c:99 +#: gnome/gprefs.c:102 msgid "Confirm when deleting file" msgstr "Bekreft ved sletting av fil" -#: gnome/gprefs.c:103 +#: gnome/gprefs.c:106 msgid "Confirm when overwriting files" msgstr "Bekreft ved overskriving av filer" -#: gnome/gprefs.c:107 +#: gnome/gprefs.c:110 msgid "Confirm when executing files" msgstr "Bekreft ved kjøring av filer" -#: gnome/gprefs.c:111 +#: gnome/gprefs.c:114 msgid "Show progress while operations are being performed" msgstr "Vis fremgang mens operasjoner utføres" -#: gnome/gprefs.c:120 +#: gnome/gprefs.c:123 msgid "VFS Timeout:" msgstr "VFS tidsavbrudd:" -#: gnome/gprefs.c:121 gnome/gprefs.c:146 +#: gnome/gprefs.c:124 gnome/gprefs.c:149 msgid "Seconds" msgstr "Sekunder" -#: gnome/gprefs.c:124 +#: gnome/gprefs.c:127 msgid "Anonymous FTP password:" msgstr "Passord for anonym FTP:" -#: gnome/gprefs.c:128 +#: gnome/gprefs.c:131 msgid "Always use FTP proxy" msgstr "Alltid bruk FTP stedfortreder" -#: gnome/gprefs.c:137 +#: gnome/gprefs.c:140 msgid "Fast directory reload" msgstr "Rask katalogoppfrisking" -#: gnome/gprefs.c:141 +#: gnome/gprefs.c:144 msgid "Compute totals before copying files" msgstr "Beregn totaler før filer kopieres" -#: gnome/gprefs.c:145 +#: gnome/gprefs.c:148 msgid "FTP directory cache timeout :" msgstr "Katalog cache tidsavbrudd for FTP :" -#: gnome/gprefs.c:149 +#: gnome/gprefs.c:152 msgid "Allow customization of icons in icon view" msgstr "Tillat egendefinerte ikoner i ikonvisning" -#: gnome/gprefs.c:158 +#: gnome/gprefs.c:161 msgid "File display" msgstr "Filvisning" -#: gnome/gprefs.c:162 +#: gnome/gprefs.c:165 msgid "Confirmation" msgstr "Bekreftelse" -#: gnome/gprefs.c:166 +#: gnome/gprefs.c:169 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:170 +#: gnome/gprefs.c:173 msgid "Caching" msgstr "Mellomlagring" -#: gnome/gprefs.c:447 +#: gnome/gprefs.c:452 msgid "Preferences" msgstr "Innstillinger" @@ -827,7 +900,7 @@ msgid "Title" msgstr "Tittel" -#: gnome/gprop.c:521 gnome/gscreen.c:2354 +#: gnome/gprop.c:521 msgid "Icon" msgstr "Ikon" @@ -835,245 +908,228 @@ msgid "Select icon" msgstr "Velg ikon" -#: gnome/gscreen.c:1439 +#: gnome/gscreen.c:1469 msgid "Rescan Directory" msgstr "Oppdater kataloginnholdet" -#: gnome/gscreen.c:1439 +#: gnome/gscreen.c:1469 msgid "Reloads the current directory" msgstr "Leser aktiv katalog på nytt" -#: gnome/gscreen.c:1617 +#: gnome/gscreen.c:1471 +msgid "New folder" +msgstr "Ny katalog" + +#: gnome/gscreen.c:1471 +msgid "Creates a new folder here" +msgstr "Oppretter en ny katalog her" + +#: gnome/gscreen.c:1649 msgid "All files" msgstr "Alle filer" -#: gnome/gscreen.c:1619 +#: gnome/gscreen.c:1651 msgid "Archives and compressed files" msgstr "Arkiver og komprimerte filer" -#: gnome/gscreen.c:1621 +#: gnome/gscreen.c:1653 msgid "RPM/DEB files" msgstr "RPM/DEB filer" -#: gnome/gscreen.c:1623 +#: gnome/gscreen.c:1655 msgid "Text/Document files" msgstr "Tekst-/dokumentfiler" -#: gnome/gscreen.c:1625 +#: gnome/gscreen.c:1657 msgid "HTML and SGML files" msgstr "HTML- og SGML-filer" -#: gnome/gscreen.c:1627 +#: gnome/gscreen.c:1659 msgid "Postscript and PDF files" msgstr "Postscript- of PDF-filer" -#: gnome/gscreen.c:1629 +#: gnome/gscreen.c:1661 msgid "Spreadsheet files" msgstr "Regnearkfiler" -#: gnome/gscreen.c:1631 +#: gnome/gscreen.c:1663 msgid "Image files" msgstr "Bildefiler" -#: gnome/gscreen.c:1634 +#: gnome/gscreen.c:1666 msgid "Video/animation files" msgstr "Video-/animasjonsfiler" -#: gnome/gscreen.c:1636 +#: gnome/gscreen.c:1668 msgid "Audio files" msgstr "Lydfiler" -#: gnome/gscreen.c:1638 +#: gnome/gscreen.c:1670 msgid "C program files" msgstr "C programfiler" -#: gnome/gscreen.c:1640 +#: gnome/gscreen.c:1672 msgid "C++ program files" msgstr "C++ programfiler" -#: gnome/gscreen.c:1642 +#: gnome/gscreen.c:1674 msgid "Objective-C program files" msgstr "Objektiv-C programfiler" -#: gnome/gscreen.c:1644 +#: gnome/gscreen.c:1676 msgid "Scheme program files" msgstr "Scheme programfiler" -#: gnome/gscreen.c:1646 +#: gnome/gscreen.c:1678 msgid "Assembler program files" msgstr "Assembler programfiler" -#: gnome/gscreen.c:1648 +#: gnome/gscreen.c:1680 msgid "Misc. program files" msgstr "Forskj. programfiler" -#: gnome/gscreen.c:1650 +#: gnome/gscreen.c:1682 msgid "Font files" msgstr "Skrifttypefiler" -#: gnome/gscreen.c:1777 +#: gnome/gscreen.c:1809 #, c-format msgid "Search: %s" msgstr "Søk: %s" -#: gnome/gscreen.c:1787 +#: gnome/gscreen.c:1819 #, c-format msgid "%s bytes in %d file" msgstr "%s bytes i %d fil" -#: gnome/gscreen.c:1787 +#: gnome/gscreen.c:1819 #, c-format msgid "%s bytes in %d files" msgstr "%s bytes i %d filer" -#: gnome/gscreen.c:1813 src/screen.c:677 +#: gnome/gscreen.c:1845 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1867 +#: gnome/gscreen.c:1899 msgid "Filter" msgstr "Filter" -#: gnome/gscreen.c:2354 -msgid "Switch view to an Icon view" -msgstr "Bytt til ikonvisning" - -#: gnome/gscreen.c:2356 -msgid "Brief" -msgstr "Kort" - -#: gnome/gscreen.c:2356 -msgid "Switch view to show just file name and type" -msgstr "Bytt visning til kun filnavn og type" - -#: gnome/gscreen.c:2358 -msgid "Detailed" -msgstr "Detaljert" - -#: gnome/gscreen.c:2358 -msgid "Switch view to show detailed file statistics" -msgstr "Bytt visning til detaljert filstatistikk" - -#: gnome/gscreen.c:2360 -msgid "Custom" -msgstr "Egendefinert" - -#: gnome/gscreen.c:2360 -msgid "Switch view to show custom determined statistics." -msgstr "Bytt visning til å vise egendefinert statistikk." - -#: gnome/gscreen.c:2368 +#: gnome/gscreen.c:2339 msgid "Back" msgstr "Tilbake" -#: gnome/gscreen.c:2368 +#: gnome/gscreen.c:2339 msgid "Go to the previously visited directory" msgstr "Gå til tidligere vist katalog" -#: gnome/gscreen.c:2370 +#: gnome/gscreen.c:2341 msgid "Up" msgstr "Opp" -#: gnome/gscreen.c:2370 +#: gnome/gscreen.c:2341 msgid "Go up a level in the directory heirarchy" msgstr "Gå opp ett nivå i kataloghierarkiet" -#: gnome/gscreen.c:2372 +#: gnome/gscreen.c:2343 msgid "Forward" msgstr "Fremover" -#: gnome/gscreen.c:2372 +#: gnome/gscreen.c:2343 msgid "Go to the next directory" msgstr "Gå til neste katalog" -#: gnome/gscreen.c:2375 src/tree.c:1020 +#: gnome/gscreen.c:2346 src/tree.c:1020 msgid "Rescan" msgstr "Oppdater" -#: gnome/gscreen.c:2375 +#: gnome/gscreen.c:2346 msgid "Rescan the current directory" msgstr "Oppdater aktiv katalog" -#: gnome/gscreen.c:2378 +#: gnome/gscreen.c:2349 msgid "Home" msgstr "Hjemme" -#: gnome/gscreen.c:2378 +#: gnome/gscreen.c:2349 msgid "Go to your home directory" msgstr "Gå til din hjemmekatalog" -#: gnome/gscreen.c:2512 +#: gnome/gscreen.c:2495 msgid "Location:" msgstr "Sted:" -#: gnome/gtools.c:110 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:342 gtkedit/editcmd.c:1185 +#: gtkedit/editcmd.c:1270 gtkedit/editcmd.c:2847 gtkedit/editoptions.c:69 +#: 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:838 src/find.c:171 src/layout.c:369 src/option.c:144 +#: src/wtools.c:289 src/wtools.c:561 msgid "&Ok" msgstr "&Ok" -#: gnome/gview.c:119 src/view.c:683 +#: gnome/gview.c:122 src/view.c:683 #, c-format msgid "Offset 0x%08x" msgstr "Offset 0x%08x" -#: gnome/gview.c:121 src/view.c:685 +#: gnome/gview.c:124 src/view.c:685 #, c-format msgid "Col %d" msgstr "Kol %d" -#: gnome/gview.c:125 src/view.c:689 +#: gnome/gview.c:128 src/view.c:689 #, c-format msgid "%s bytes" msgstr "%s bytes" -#: gnome/gview.c:289 +#: gnome/gview.c:292 msgid "_Goto line" msgstr "Gå til linje" -#: gnome/gview.c:290 +#: gnome/gview.c:293 msgid "Jump to a specified line number" msgstr "Hopp til et spesifisert linjenummer" -#: gnome/gview.c:292 +#: gnome/gview.c:295 msgid "_Monitor file" msgstr "Hold øye med fil" -#: gnome/gview.c:292 +#: gnome/gview.c:295 msgid "Monitor file growing" msgstr "Hold øye med filvekst" -#: gnome/gview.c:299 +#: gnome/gview.c:302 msgid "Regexp search" msgstr "Regexp-søk" -#: gnome/gview.c:300 +#: gnome/gview.c:303 msgid "Regular expression search" msgstr "Søk etter vanlig uttrykk" -#: gnome/gview.c:309 +#: gnome/gview.c:312 msgid "_Wrap" msgstr "Bryt" -#: gnome/gview.c:310 +#: gnome/gview.c:313 msgid "Wrap the text" msgstr "Bryt teksten" #. Can not use this one yet, as it destroys the viewer, need to fix that -#: gnome/gview.c:313 +#: gnome/gview.c:316 msgid "_Parsed view" msgstr "Fortolket visning" -#: gnome/gview.c:316 +#: gnome/gview.c:319 msgid "_Formatted" msgstr "Formatert" -#: gnome/gview.c:318 +#: gnome/gview.c:321 msgid "_Hex" msgstr "Hex" -#: gnome/gview.c:324 +#: gnome/gview.c:327 msgid "_Search" msgstr "Søk" @@ -1089,11 +1145,11 @@ msgid "help" msgstr "hjelp" -#: gnome/gwidget.c:96 src/file.c:2208 +#: gnome/gwidget.c:96 src/file.c:2251 msgid "yes" msgstr "ja" -#: gnome/gwidget.c:98 src/file.c:2206 +#: gnome/gwidget.c:98 src/file.c:2249 msgid "no" msgstr "nei" @@ -1108,8 +1164,8 @@ #. 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:1932 gtkedit/editwidget.c:947 src/dir.c:386 -#: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222 +#: gtkedit/editcmd.c:1945 gtkedit/editwidget.c:950 src/dir.c:386 +#: src/screen.c:2309 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " msgstr " Feil " @@ -1142,104 +1198,139 @@ msgid " Error allocating memory " msgstr " Feil under minneallokering " -#: gtkedit/editcmd.c:468 +#: gtkedit/editcmd.c:335 +msgid "Quick save " +msgstr "Hurtiglagring" + +#: gtkedit/editcmd.c:336 +msgid "Safe save " +msgstr "Trygg lagring" + +#: gtkedit/editcmd.c:337 +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 +#: 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 +#: 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 +msgid "&Cancel" +msgstr "&Avbryt" + +#: gtkedit/editcmd.c:346 +msgid "Extension:" +msgstr "Utvidelse:" + +#. NLS ? +#: gtkedit/editcmd.c:353 +msgid " Edit Save Mode " +msgstr " Rediger lagringsmodus " + +#: gtkedit/editcmd.c:477 msgid " Save As " msgstr " Lagre som " #. Warning message with a query to continue or cancel the operation -#: gtkedit/editcmd.c:482 gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 -#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 src/ext.c:294 src/file.c:606 -#: src/help.c:318 src/main.c:668 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:491 gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 +#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 src/ext.c:301 src/file.c:620 +#: src/help.c:318 src/main.c:691 src/screen.c:2066 src/subshell.c:705 +#: src/subshell.c:731 src/utilunix.c:388 src/utilunix.c:392 src/utilunix.c:458 #: vfs/mcfs.c:170 msgid " Warning " msgstr " Advarsel " -#: gtkedit/editcmd.c:483 +#: gtkedit/editcmd.c:492 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:485 +#: gtkedit/editcmd.c:494 msgid "Overwrite" msgstr "Overskriv" -#: gtkedit/editcmd.c:485 gtkedit/editcmd.c:774 gtkedit/editcmd.c:801 -#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 gtkedit/editcmd.c:1565 +#: gtkedit/editcmd.c: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 msgid "Cancel" msgstr "Avbryt" -#: gtkedit/editcmd.c:501 +#: gtkedit/editcmd.c:510 msgid " Save as " msgstr " Lagre som " -#: gtkedit/editcmd.c:501 gtkedit/editcmd.c:2602 +#: gtkedit/editcmd.c:510 gtkedit/editcmd.c:2615 msgid " Error trying to save file. " msgstr " Feil under lagring av fil. " #. This heads the delete macro error dialog box -#: gtkedit/editcmd.c:617 gtkedit/editcmd.c:625 gtkedit/editcmd.c:650 +#: gtkedit/editcmd.c:626 gtkedit/editcmd.c:634 gtkedit/editcmd.c:659 msgid " Delete macro " msgstr " Slett makro " #. 'Open' = load temp file -#: gtkedit/editcmd.c:619 +#: gtkedit/editcmd.c:628 msgid " Error trying to open temp file " msgstr " Feil under åpning av midlertidig fil " #. 'Open' = load temp file -#: gtkedit/editcmd.c:627 gtkedit/editcmd.c:688 gtkedit/editcmd.c:756 +#: gtkedit/editcmd.c:636 gtkedit/editcmd.c:697 gtkedit/editcmd.c:765 msgid " Error trying to open macro file " msgstr " Feil under åpning av makrofil " -#: gtkedit/editcmd.c:632 gtkedit/editcmd.c:640 gtkedit/editcmd.c:676 -#: gtkedit/editcmd.c:731 +#: gtkedit/editcmd.c:641 gtkedit/editcmd.c:649 gtkedit/editcmd.c:685 +#: gtkedit/editcmd.c:740 #, c-format msgid "key '%d 0': " msgstr "tast '%d 0': " -#: gtkedit/editcmd.c:651 +#: gtkedit/editcmd.c:660 msgid " Error trying to overwrite macro file " msgstr " Feil under overskriving av makrofil " #. This heads the 'Macro' dialog box -#: gtkedit/editcmd.c:668 +#: gtkedit/editcmd.c:677 msgid " Macro " msgstr " Makro " #. Input line for a single key press follows the ':' -#: gtkedit/editcmd.c:670 +#: gtkedit/editcmd.c:679 msgid " Press the macro's new hotkey: " msgstr " Trykk makroens nye hurtigtast: " #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:688 +#: gtkedit/editcmd.c:697 msgid " Save macro " msgstr " Lagre makro " -#: gtkedit/editcmd.c:698 gtkedit/editcmd.c:705 +#: gtkedit/editcmd.c:707 gtkedit/editcmd.c:714 msgid " Delete Macro " msgstr " Slett makro " #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:755 +#: gtkedit/editcmd.c:764 msgid " Load macro " msgstr " Last makro " -#: gtkedit/editcmd.c:769 gtkedit/editcmd.c:771 +#: gtkedit/editcmd.c:778 gtkedit/editcmd.c:780 msgid " Confirm save file? : " msgstr " Bekreft lagre fil? : " #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:774 +#: gtkedit/editcmd.c:783 msgid " Save file " msgstr " Lagre fil " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1992 +#: gtkedit/editcmd.c:783 gtkedit/editwidget.c:1064 src/view.c:1987 msgid "Save" msgstr "Lagre" -#: gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 +#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 msgid "" " Current text was modified without a file save. \n" " Continue discards these changes. " @@ -1247,167 +1338,222 @@ " Teksten er endret uten å ha vært lagret. \n" " Fortsett forkaster disse endringene. " -#: gtkedit/editcmd.c:801 gtkedit/editcmd.c:831 gtkedit/editcmd.c:978 +#: gtkedit/editcmd.c:810 gtkedit/editcmd.c:840 gtkedit/editcmd.c:987 msgid "Continue" msgstr "Fortsett" #. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:820 gtkedit/editcmd.c:834 +#: gtkedit/editcmd.c:829 gtkedit/editcmd.c:843 msgid " Load " msgstr " Last " -#: gtkedit/editcmd.c:820 +#: gtkedit/editcmd.c:829 msgid " Error trying to open file for reading " msgstr " Feil under åpning av fil for lesing " -#: gtkedit/editcmd.c:978 gtkedit/editcmd.c:1075 +#: gtkedit/editcmd.c:987 gtkedit/editcmd.c:1084 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:1075 +#: gtkedit/editcmd.c:1084 msgid " Continue " msgstr " Fortsett " -#: gtkedit/editcmd.c:1075 +#: gtkedit/editcmd.c:1084 msgid " Cancel " msgstr " Avbryt " +#: gtkedit/editcmd.c:1139 src/filegui.c:596 +msgid "al&L" +msgstr "alle" + +#: gtkedit/editcmd.c:1141 src/file.c:2173 src/filegui.c:266 +msgid "&Skip" +msgstr "&Hopp over" + +#: gtkedit/editcmd.c:1143 +msgid "&Replace" +msgstr "E&rstatt" + #. This is for the confirm replace dialog box. The replaced string comes after the ':' -#: gtkedit/editcmd.c:1136 gtkedit/editcmd.c:1563 +#: gtkedit/editcmd.c:1149 gtkedit/editcmd.c:1576 msgid " Replace with: " msgstr " Erstatt med: " +#: gtkedit/editcmd.c:1153 +msgid " Confirm replace " +msgstr " Bekreft erstatt " + +#: gtkedit/editcmd.c:1187 gtkedit/editcmd.c:1272 +msgid "scanf &Expression" +msgstr "scanf uttrykk" + +#: gtkedit/editcmd.c:1189 +msgid "replace &All" +msgstr "erstatt alle" + +#: gtkedit/editcmd.c:1191 +msgid "pr&Ompt on replace" +msgstr "spør ved erstatning" + +#: gtkedit/editcmd.c:1193 gtkedit/editcmd.c:1274 +msgid "&Backwards" +msgstr "Bakover" + +#: gtkedit/editcmd.c:1195 gtkedit/editcmd.c:1276 +msgid "&Regular expression" +msgstr "Vanlig uttrykk" + +#: gtkedit/editcmd.c:1197 gtkedit/editcmd.c:1278 +msgid "&Whole words only" +msgstr "Kun hele ord" + +#: gtkedit/editcmd.c:1199 gtkedit/editcmd.c:1280 +msgid "case &Sensitive" +msgstr "skill mellom &store/små tegn" + +#: gtkedit/editcmd.c:1203 +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 +msgid " Enter replacement string:" +msgstr " Skriv inn erstatningsstreng:" + +#: gtkedit/editcmd.c:1211 gtkedit/editcmd.c:1284 src/view.c:1912 +msgid " Enter search string:" +msgstr " Skriv inn søkestreng:" + #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1140 gtkedit/editcmd.c:1217 gtkedit/editcmd.c:1467 -#: gtkedit/editcmd.c:1561 gtkedit/editcmd.c:2094 gtkedit/editcmd.c:2125 -#: gtkedit/editcmd.c:2127 +#: gtkedit/editcmd.c:1230 gtkedit/editcmd.c:1480 gtkedit/editcmd.c:1574 +#: gtkedit/editcmd.c:2107 gtkedit/editcmd.c:2138 gtkedit/editcmd.c:2140 msgid " Replace " msgstr " Erstatt " #. Heads the 'Search' dialog box -#: gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196 -#: src/view.c:1465 src/view.c:1564 src/view.c:1686 src/view.c:1885 -#: src/view.c:1917 +#: gtkedit/editcmd.c:1298 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2209 +#: 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:1335 +#: gtkedit/editcmd.c:1348 msgid " Enter search text : " msgstr " Skriv inn søketekst : " -#: gtkedit/editcmd.c:1342 +#: gtkedit/editcmd.c:1355 msgid " Enter replace text : " msgstr " Skriv inn erstatningstekst : " -#: gtkedit/editcmd.c:1346 +#: gtkedit/editcmd.c:1359 msgid " Enter argument order : " msgstr " Skriv inn argumentrekkefølge : " #. Tool hint -#: gtkedit/editcmd.c:1350 gtkedit/editcmd.c:1351 +#: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364 msgid "Enter the order of replacement of your scanf format specifiers" msgstr "Skriv inn rekkefølgen for erstatningen av scanf ????" #. The following are check boxes -#: gtkedit/editcmd.c:1356 +#: gtkedit/editcmd.c:1369 msgid " Whole words only " msgstr " Bare hele ord " -#: gtkedit/editcmd.c:1358 +#: gtkedit/editcmd.c:1371 msgid " Case sensitive " msgstr " Skill mellom store og små bokstaver " -#: gtkedit/editcmd.c:1361 +#: gtkedit/editcmd.c:1374 msgid " Regular expression " msgstr " Vanlig uttrykk " -#: gtkedit/editcmd.c:1362 gtkedit/editcmd.c:1363 +#: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376 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:1369 +#: gtkedit/editcmd.c:1382 msgid " Backwards " msgstr " Bakover " #. Tool hint -#: gtkedit/editcmd.c:1371 gtkedit/editcmd.c:1372 +#: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385 msgid "Warning: Searching backward can be slow" msgstr "Advarsel: Søking bakover kan være tidkrevende" -#: gtkedit/editcmd.c:1385 +#: gtkedit/editcmd.c:1398 msgid " Prompt on replace " msgstr " Spør ved erstatning " #. Tool hint -#: gtkedit/editcmd.c:1387 +#: gtkedit/editcmd.c:1400 msgid "Ask before making each replacement" msgstr "Spør før utførelse av hver erstatning" -#: gtkedit/editcmd.c:1389 +#: gtkedit/editcmd.c:1402 msgid " Replace all " msgstr " Erstatt alle " -#: gtkedit/editcmd.c:1392 +#: gtkedit/editcmd.c:1405 msgid " Scanf expression " msgstr " Scanf uttrykk " #. Tool hint -#: gtkedit/editcmd.c:1394 +#: gtkedit/editcmd.c:1407 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:1399 +#: gtkedit/editcmd.c:1412 msgid "Begin search, Enter" msgstr "Begynn søk, Linjeskift" #. Tool hint -#: gtkedit/editcmd.c:1402 +#: gtkedit/editcmd.c:1415 msgid "Abort this dialog, Esc" msgstr "Avbryt denne dialogen, Esc" #. Buttons for the confirm replace dialog box. -#: gtkedit/editcmd.c:1565 +#: gtkedit/editcmd.c:1578 msgid "Replace" msgstr "Erstatt" -#: gtkedit/editcmd.c:1565 +#: gtkedit/editcmd.c:1578 msgid "Skip" msgstr "Hopp over" -#: gtkedit/editcmd.c:1565 +#: gtkedit/editcmd.c:1578 msgid "Replace all" msgstr "Erstatt alle" -#: gtkedit/editcmd.c:1932 +#: gtkedit/editcmd.c:1945 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:2096 +#: gtkedit/editcmd.c:2109 msgid " Error in replacement format string. " msgstr " Feil i erstatningsstrengen for format. " -#: gtkedit/editcmd.c:2124 +#: gtkedit/editcmd.c:2137 #, c-format msgid " %ld replacements made. " msgstr " %ld erstatninger utført. " -#: gtkedit/editcmd.c:2127 gtkedit/editcmd.c:2196 +#: gtkedit/editcmd.c:2140 gtkedit/editcmd.c:2209 msgid " Search string not found. " msgstr " Søkestrengen ikke funnet. " #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2220 gtkedit/editcmd.c:2235 gtkedit/editcmd.c:2238 +#: gtkedit/editcmd.c:2233 gtkedit/editcmd.c:2248 gtkedit/editcmd.c:2251 msgid " Quit " msgstr " Avslutt " -#: gtkedit/editcmd.c:2221 gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2234 gtkedit/editcmd.c:2252 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -1415,112 +1561,136 @@ " Teksten er endret uten å ha vært lagret. \n" " Lagre ved avslutting? " -#: gtkedit/editcmd.c:2235 +#: gtkedit/editcmd.c:2248 msgid " File was modified, Save with exit? " msgstr " Filen ble endret, Lagre ved avslutting? " -#: gtkedit/editcmd.c:2235 +#: gtkedit/editcmd.c:2248 msgid "Cancel quit" msgstr "Avbryt avslutt" -#: gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2252 msgid " &Cancel quit " msgstr " &Avbryt avslutt " -#: gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2252 msgid " &Yes " msgstr " &Ja " -#: gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2252 msgid " &No " msgstr " &Nei " -#: gtkedit/editcmd.c:2442 gtkedit/editcmd.c:2517 +#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2530 msgid " Copy to clipboard " msgstr " Kopier til utklippstavlen " -#: gtkedit/editcmd.c:2442 gtkedit/editcmd.c:2464 gtkedit/editcmd.c:2517 -#: gtkedit/editcmd.c:2530 +#: gtkedit/editcmd.c:2455 gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2530 +#: gtkedit/editcmd.c:2543 msgid " Unable to save to file. " msgstr " Ute av stand til å lagre filen. " -#: gtkedit/editcmd.c:2464 gtkedit/editcmd.c:2530 +#: gtkedit/editcmd.c:2477 gtkedit/editcmd.c:2543 msgid " Cut to clipboard " msgstr " Klipp ut til utklippstavlen " -#: gtkedit/editcmd.c:2552 gtkedit/editcmd.c:2556 gtkedit/editcmd.c:2561 -#: gtkedit/editcmd.c:2564 src/view.c:1857 +#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574 +#: gtkedit/editcmd.c:2577 src/view.c:1852 msgid " Goto line " msgstr " Gå til linje " -#: gtkedit/editcmd.c:2552 gtkedit/editcmd.c:2556 gtkedit/editcmd.c:2561 -#: gtkedit/editcmd.c:2564 +#: gtkedit/editcmd.c:2565 gtkedit/editcmd.c:2569 gtkedit/editcmd.c:2574 +#: gtkedit/editcmd.c:2577 msgid " Enter line: " msgstr " Skriv inn linje: " -#: gtkedit/editcmd.c:2585 gtkedit/editcmd.c:2602 +#: gtkedit/editcmd.c:2598 gtkedit/editcmd.c:2615 msgid " Save Block " msgstr " Lagre blokk " -#: gtkedit/editcmd.c:2636 +#: gtkedit/editcmd.c:2649 msgid " Insert File " msgstr " Sett inn fil " -#: gtkedit/editcmd.c:2651 +#: gtkedit/editcmd.c:2664 msgid " Insert file " msgstr " Sett inn fil " -#: gtkedit/editcmd.c:2651 +#: gtkedit/editcmd.c:2664 msgid " Error trying to insert file. " msgstr " Feil under innsetting av fil. " #. Not essential to translate -#: gtkedit/editcmd.c:2671 +#: gtkedit/editcmd.c:2684 msgid " Sort block " msgstr " Sorter blokk " #. Not essential to translate -#: gtkedit/editcmd.c:2671 gtkedit/editcmd.c:2725 +#: gtkedit/editcmd.c:2684 gtkedit/editcmd.c:2738 msgid " You must first highlight a block of text. " msgstr " Du må først merke en tekstblokk. " -#: gtkedit/editcmd.c:2678 +#: gtkedit/editcmd.c:2691 msgid " Run Sort " msgstr " Kjør sortering " #. Not essential to translate -#: gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2693 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Skriv inn flagg for sortering (se manualside), skilt av tomrom: " -#: gtkedit/editcmd.c:2691 gtkedit/editcmd.c:2697 +#: gtkedit/editcmd.c:2704 gtkedit/editcmd.c:2710 msgid " Sort " msgstr " Sorter " #. Not essential to translate -#: gtkedit/editcmd.c:2693 +#: gtkedit/editcmd.c:2706 msgid " Error trying to execute sort command " msgstr " Feil under kjøring av sorteringskommando " #. Not essential to translate -#: gtkedit/editcmd.c:2699 +#: gtkedit/editcmd.c:2712 msgid " Sort returned non-zero: " msgstr " Sortering returnerte ikke-null: " #. Not essential to translate -#: gtkedit/editcmd.c:2723 gtkedit/editcmd.c:2753 +#: gtkedit/editcmd.c:2736 gtkedit/editcmd.c:2766 msgid " Process block " msgstr " Prosesser blokk " #. Not essential to translate -#: gtkedit/editcmd.c:2755 +#: gtkedit/editcmd.c:2768 msgid " Error trying to stat file " msgstr " Feil under stat av fil " -#: gtkedit/editcmd.c:2825 +#: gtkedit/editcmd.c:2838 msgid " Mail " msgstr " Send " +#: gtkedit/editcmd.c:2851 +msgid " Copies to" +msgstr " Kopier til:" + +#: gtkedit/editcmd.c:2855 +msgid " Subject" +msgstr " Emne " + +#: gtkedit/editcmd.c:2859 +msgid " To" +msgstr " Til" + +#: gtkedit/editcmd.c:2861 +msgid " mail -s -c " +msgstr " mail -s -c " + +#: gtkedit/editoptions.c:34 +msgid "Intuitive" +msgstr "Intuitiv" + +#: gtkedit/editoptions.c:34 +msgid "Emacs" +msgstr "" + #: gtkedit/editoptions.c:37 msgid "None" msgstr "Ingen" @@ -1533,44 +1703,87 @@ msgid "Type writer wrap" msgstr "Skrivemaskinsbryting" +#. 2 +#: gtkedit/editoptions.c:72 +msgid "Word wrap line length : " +msgstr "Linjelengde for ordbryting : " + +#. 4 +#: gtkedit/editoptions.c:78 +msgid "Tab spacing : " +msgstr "Tabulatormellomrom : " + +#: gtkedit/editoptions.c:86 +msgid "synta&X highlighting" +msgstr "syntaksutheving" + +#. 7 +#: gtkedit/editoptions.c:92 +msgid "confir&M before saving" +msgstr "bekreft før lagring" + +#. 8 +#: gtkedit/editoptions.c:95 +msgid "fill tabs with &Spaces" +msgstr "fyll tabulatorer med mellomrom" + +#. 9 +#: gtkedit/editoptions.c:98 +msgid "&Return does autoindent" +msgstr "Linjeskift utfører autoindentering" + +#. 10 +#: gtkedit/editoptions.c:101 +msgid "&Backspace through tabs" +msgstr "" + +#. 11 +#: gtkedit/editoptions.c:104 +msgid "&Fake half tabs" +msgstr "" + #. 13 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Brytningsmodus" #. 15 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "Tasteemulering" +#: gtkedit/editoptions.c:157 +msgid " Editor options " +msgstr " Alternativer for redigerer " + #. Not essential to translate #: gtkedit/editwidget.c:310 msgid "Error initialising editor.\n" msgstr "Feil under initialisering av editor.\n" -#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1671 src/screen.c:2284 -#: src/screen.c:2314 src/tree.c:1018 src/view.c:1987 +#: gtkedit/editwidget.c:1063 src/help.c:806 src/main.c:1688 src/screen.c:2287 +#: src/screen.c:2317 src/tree.c:1018 src/view.c:1982 msgid "Help" msgstr "Hjelp" -#: gtkedit/editwidget.c:1062 +#: gtkedit/editwidget.c:1065 msgid "Mark" msgstr "Marker" -#: gtkedit/editwidget.c:1063 +#: gtkedit/editwidget.c:1066 msgid "Replac" msgstr "Erstatt" -#: gtkedit/editwidget.c:1066 src/view.c:2000 +#: gtkedit/editwidget.c:1069 src/view.c:1995 msgid "Search" msgstr "Søk" -#: gtkedit/editwidget.c:1069 src/main.c:1673 +#: gtkedit/editwidget.c:1072 src/main.c:1690 msgid "PullDn" msgstr "Trekk ned" -#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1674 src/view.c:1989 -#: src/view.c:2009 +#: gtkedit/editwidget.c:1073 src/help.c:818 src/main.c:1691 src/view.c:1984 +#: src/view.c:2004 msgid "Quit" msgstr "Avslutt" @@ -1761,7 +1974,7 @@ msgid "&Save mode..." msgstr "Lagringsmodus..." -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1305 +#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1322 msgid "&Layout..." msgstr "Utseende." @@ -1983,16 +2196,6 @@ msgid " Syntax error in file %s on line %d " msgstr " Syntaksfeil i filen %s ved linje %d " -#: 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/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 -msgid "&Cancel" -msgstr "&Avbryt" - #: src/achown.c:72 src/chmod.c:115 src/chown.c:80 msgid "&Set" msgstr "&Sett" @@ -2071,27 +2274,27 @@ msgid " I can't run the Advanced Chown command on a tarfs " msgstr " Kan ikke kjøre avansert chown kommando på et tarfs " -#: src/background.c:178 +#: src/background.c:181 msgid "Background process:" msgstr "Bakgrunnsprosess:" -#: src/background.c:284 src/file.c:2131 +#: src/background.c:287 src/file.c:2172 msgid " Background process error " msgstr " Feil i bakgrunnsprosess " -#: src/background.c:291 +#: src/background.c:294 msgid " Child died unexpectedly " msgstr " Barn døde uventet " -#: src/background.c:293 +#: src/background.c:296 msgid " Unknown error in child " msgstr " Ukjent feil i barn " -#: src/background.c:308 +#: src/background.c:311 msgid " Background protocol error " msgstr " Feil i bakgrunnsprotkoll " -#: src/background.c:309 +#: src/background.c:312 msgid "" " Background process sent us a request for more arguments \n" " than we can handle. \n" @@ -2557,7 +2760,7 @@ msgid " Link " msgstr " Lenke " -#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1639 +#: src/cmd.c:1032 src/cmd.c:1168 src/file.c:1686 msgid " to:" msgstr " til:" @@ -2571,74 +2774,79 @@ msgid " symlink: %s " msgstr " symlink: %s " -#: src/cmd.c:1102 +#: src/cmd.c:1117 msgid " Symlink " msgstr " Symlinken " -#: src/cmd.c:1102 +#: src/cmd.c:1117 msgid " points to:" msgstr " peker til:" -#: src/cmd.c:1107 +#: src/cmd.c:1132 msgid " Edit symlink " msgstr " Rediger symlink " -#: src/cmd.c:1113 +#: src/cmd.c:1137 +#, c-format +msgid " edit symlink, unable to remove %s: %s " +msgstr " rediger symlink, kan ikke fjerne %s: %s " + +#: src/cmd.c:1141 #, c-format msgid " edit symlink: %s " msgstr " rediger symlink: %s " -#: src/cmd.c:1137 +#: src/cmd.c:1168 msgid " Link symbolically " msgstr " Lag symbolsk lenke " -#: src/cmd.c:1138 +#: src/cmd.c:1169 msgid " Relative symlink " msgstr " Relativ symlink " -#: src/cmd.c:1149 +#: src/cmd.c:1180 #, c-format msgid " relative symlink: %s " msgstr " relativ symlink: %s " -#: src/cmd.c:1252 +#: src/cmd.c:1283 msgid " Enter machine name (F1 for details): " msgstr " Skriv inn maskinnavn (F1 for detaljer): " -#: src/cmd.c:1276 +#: src/cmd.c:1307 #, c-format msgid " Could not chdir to %s " msgstr " Kunne ikke skifte katalog til %s " -#: src/cmd.c:1283 +#: src/cmd.c:1314 msgid " Link to a remote machine " msgstr " Lenke til en fjern maskin " -#: src/cmd.c:1289 +#: src/cmd.c:1320 msgid " FTP to machine " msgstr " FTP til maskin " -#: src/cmd.c:1299 +#: src/cmd.c:1330 msgid " Socket source routing setup " msgstr " Oppsett av kontaktens kilderuting" -#: src/cmd.c:1300 +#: src/cmd.c:1331 msgid " Enter host name to use as a source routing hop: " msgstr " Skriv inn vertsnavnet som skal brukes som kilderutingshop: " -#: src/cmd.c:1307 +#: src/cmd.c:1338 msgid " Host name " msgstr " Vertsnavn " -#: src/cmd.c:1307 +#: src/cmd.c:1338 msgid " Error while looking up IP address " msgstr " Feil under oppslag av IP-adresse " -#: src/cmd.c:1318 +#: src/cmd.c:1349 msgid " Undelete files on an ext2 file system " msgstr " Gjenopprett filer på et ext2 filsystem " -#: src/cmd.c:1319 +#: src/cmd.c:1350 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -2646,11 +2854,11 @@ " Skriv inn enhet (uten /dev/) som det skal gjenopprettes\n" " filer på: (F1 for detaljer)" -#: src/cmd.c:1369 +#: src/cmd.c:1400 msgid " Setup saved to ~/" msgstr " Oppsett lagret til ~/" -#: src/cmd.c:1374 +#: src/cmd.c:1405 msgid " Setup " msgstr " Oppsett " @@ -2745,7 +2953,7 @@ msgid "File exists but can not be stat-ed: %s %s" msgstr "Filen eksisterer men kan ikke kjøre stat på den: %s %s" -#: src/dir.c:660 +#: src/dir.c:662 msgid "Unknown" msgstr "Ukjent" @@ -2762,27 +2970,27 @@ msgid " Parameter " msgstr " Parameter " -#: src/ext.c:294 +#: src/ext.c:301 msgid " Can't execute commands on a Virtual File System directory " msgstr " Kan ikke kjøre kommandoer i en katalog på et virtuelt filsystem " -#: src/ext.c:391 +#: src/ext.c:398 msgid " file error" msgstr " filfeil" -#: src/ext.c:392 +#: src/ext.c:399 msgid "Format of the " msgstr "Formatet til " -#: src/ext.c:410 +#: src/ext.c:417 msgid " file error " msgstr " filfeil " -#: src/ext.c:411 +#: src/ext.c:418 msgid "Format of the ~/" msgstr "Formatet til ~/" -#: src/ext.c:411 +#: src/ext.c:418 msgid "" " file has changed\n" "with version 3.0. You may want either to\n" @@ -2792,7 +3000,7 @@ "siden versjon 3.0. Du kan enten \n" "kopiere den fra " -#: src/ext.c:413 +#: src/ext.c:420 msgid "" "mc.ext or use that\n" "file as an example of how to write it.\n" @@ -2800,7 +3008,7 @@ "mc.ext eller bruke denne\n" "filen som et eksempel for hvordan den skal skrives.\n" -#: src/ext.c:415 +#: src/ext.c:422 msgid "mc.ext will be used for this moment." msgstr "mc.ext vil bli brukt foreløpig." @@ -2875,7 +3083,7 @@ msgid " `%s' and `%s' are the same file. " msgstr " `%s' og `%s' er samme fil. " -#: src/file.c:565 +#: src/file.c:575 #, c-format msgid "" " Cannot create special file \"%s\" \n" @@ -2884,7 +3092,7 @@ " Kan ikke opprette den spesielle filen \"%s\" \n" " %s " -#: src/file.c:574 src/file.c:799 +#: src/file.c:584 src/file.c:813 #, c-format msgid "" " Cannot chown target file \"%s\" \n" @@ -2893,7 +3101,7 @@ " Kan ikke kjøre chown på målfilen \"%s\" \n" " %s " -#: src/file.c:583 src/file.c:817 +#: src/file.c:593 src/file.c:832 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" @@ -2902,7 +3110,7 @@ " Kan ikke kjøre chmod på målfilen \"%s\" \n" " %s " -#: src/file.c:596 +#: src/file.c:610 #, c-format msgid "" " Cannot open source file \"%s\" \n" @@ -2911,11 +3119,11 @@ " Kan ikke åpne kildefilen \"%s\" \n" " %s " -#: src/file.c:606 +#: src/file.c:620 msgid " Reget failed, about to overwrite file " msgstr " Gjenhenting feilet, kommer til å overskrive filen " -#: src/file.c:612 +#: src/file.c:626 #, c-format msgid "" " Cannot fstat source file \"%s\" \n" @@ -2924,7 +3132,7 @@ " Kan ikke kjøre fstat på kildefilen \"%s\" \n" " %s " -#: src/file.c:638 +#: src/file.c:652 #, c-format msgid "" " Cannot create target file \"%s\" \n" @@ -2933,7 +3141,7 @@ " Kan ikke opprette målfilen \"%s\" \n" " %s " -#: src/file.c:652 +#: src/file.c:666 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" @@ -2942,7 +3150,7 @@ " Kan ikke kjøre fstat på målfilen \"%s\" \n" " %s " -#: src/file.c:683 +#: src/file.c:697 #, c-format msgid "" " Cannot read source file \"%s\" \n" @@ -2951,7 +3159,7 @@ " Kan ikke lese kildefilen \"%s\" \n" " %s " -#: src/file.c:713 +#: src/file.c:727 #, c-format msgid "" " Cannot write target file \"%s\" \n" @@ -2960,11 +3168,11 @@ " Kan ikke skrive til målfilen \"%s\" \n" " %s " -#: src/file.c:732 +#: src/file.c:746 msgid "(stalled)" msgstr "(venter)" -#: src/file.c:770 +#: src/file.c:784 #, c-format msgid "" " Cannot close source file \"%s\" \n" @@ -2973,7 +3181,7 @@ " Kan ikke lukke kildefilen \"%s\" \n" " %s " -#: src/file.c:779 +#: src/file.c:793 #, c-format msgid "" " Cannot close target file \"%s\" \n" @@ -2982,19 +3190,19 @@ " Kan ikke lukke målfilen \"%s\" \n" " %s " -#: src/file.c:789 +#: src/file.c:803 msgid "Incomplete file was retrieved. Keep it?" msgstr "Ikke komplett fil ble hentet. Beholde den?" -#: src/file.c:790 +#: src/file.c:804 msgid "&Delete" msgstr "&Slett" -#: src/file.c:790 src/hotlist.c:1443 +#: src/file.c:804 src/hotlist.c:1443 msgid "&Keep" msgstr "&Behold" -#: src/file.c:862 +#: src/file.c:877 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" @@ -3003,7 +3211,7 @@ " Kan ikke kjøre stat på kildekatalogen \"%s\" \n" " %s " -#: src/file.c:885 +#: src/file.c:900 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -3013,7 +3221,7 @@ " %s " #. we found a cyclic symbolic link -#: src/file.c:893 +#: src/file.c:908 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" @@ -3022,7 +3230,7 @@ " Kan ikke kopiere en sirkulær symbolsk lenke \n" " `%s' " -#: src/file.c:946 +#: src/file.c:965 #, c-format msgid "" " Cannot create target directory \"%s\" \n" @@ -3031,7 +3239,7 @@ " Kan ikke opprette målkatalogen \"%s\" \n" " %s " -#: src/file.c:964 +#: src/file.c:988 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -3041,7 +3249,7 @@ " %s " #. Source doesn't exist -#: src/file.c:1074 +#: src/file.c:1101 #, c-format msgid "" " Cannot stat file \"%s\" \n" @@ -3050,17 +3258,17 @@ " Kan ikke kjøre stat på filen \"%s\" \n" " %s " -#: src/file.c:1096 +#: src/file.c:1123 #, c-format msgid " `%s' and `%s' are the same file " msgstr " `%s' og `%s' er samme fil " -#: src/file.c:1103 +#: src/file.c:1130 #, c-format msgid " Cannot overwrite directory `%s' " msgstr " Kan ikke overskrive katalogen `%s' " -#: src/file.c:1140 +#: src/file.c:1173 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" @@ -3069,7 +3277,7 @@ " Kan ikke flytte filen \"%s\" til \"%s\" \n" " %s " -#: src/file.c:1160 +#: src/file.c:1193 #, c-format msgid "" " Cannot remove file \"%s\" \n" @@ -3078,17 +3286,17 @@ " Kan ikke fjerne filen \"%s\" \n" " %s " -#: src/file.c:1213 +#: src/file.c:1247 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr " Kan ikke overskrive katalogen \"%s\" %s " -#: src/file.c:1215 +#: src/file.c:1249 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr " Kan ikke overskrive filen \"%s\" %s " -#: src/file.c:1238 +#: src/file.c:1276 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" @@ -3097,7 +3305,7 @@ " Kan ikke flytte katalogen \"%s\" til \"%s\" \n" " %s " -#: src/file.c:1301 +#: src/file.c:1339 #, c-format msgid "" " Cannot delete file \"%s\" \n" @@ -3106,7 +3314,7 @@ " Kan ikke slette filen \"%s\" \n" " %s " -#: src/file.c:1362 src/file.c:1429 src/file.c:1458 +#: src/file.c:1400 src/file.c:1470 src/file.c:1502 #, c-format msgid "" " Cannot remove directory \"%s\" \n" @@ -3115,7 +3323,7 @@ " Kan ikke fjerne katalogen \"%s\" \n" " %s " -#: src/file.c:1494 +#: src/file.c:1541 msgid " Internal error: get_file \n" msgstr " Intern feil: get_file \n" @@ -3128,87 +3336,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:1662 msgid "1Copy" msgstr "1Kopier" -#: src/file.c:1615 +#: src/file.c:1662 msgid "1Move" msgstr "1Flytt" -#: src/file.c:1615 +#: src/file.c:1662 msgid "1Delete" msgstr "1Slett" -#: src/file.c:1630 +#: src/file.c:1677 #, c-format msgid "%o %f \"%s\"%m" msgstr "%o %f \"%s\"%m" -#: src/file.c:1631 +#: src/file.c:1678 #, c-format msgid "%o %d %f%m" msgstr "%o %d %f%m" -#: src/file.c:1633 +#: src/file.c:1680 #, c-format msgid "%o %f \"%s\"%e" msgstr "%o %f \"%s\"%e" -#: src/file.c:1634 +#: src/file.c:1681 #, c-format msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1638 +#: src/file.c:1685 msgid "file" msgstr "fil" -#: src/file.c:1638 +#: src/file.c:1685 msgid "files" msgstr "filer" -#: src/file.c:1638 +#: src/file.c:1685 msgid "directory" msgstr "katalog" -#: src/file.c:1638 +#: src/file.c:1685 msgid "directories" msgstr "kataloger" -#: src/file.c:1639 +#: src/file.c:1686 msgid "files/directories" msgstr "filer/kataloger" -#: src/file.c:1639 +#: src/file.c:1686 msgid " with source mask:" msgstr " med kildemaske:" -#: src/file.c:1787 +#: src/file.c:1838 msgid " Can't operate on \"..\"! " msgstr " Kan ikke arbeide på \"..\"! " -#: src/file.c:1806 +#: src/file.c:1857 msgid "Yes" msgstr "Ja" -#: src/file.c:1806 +#: src/file.c:1857 msgid "No" msgstr "Nei" -#: src/file.c:1859 +#: src/file.c:1910 msgid " Sorry, I could not put the job in background " msgstr " Beklager, Jeg kunne ikke plassere jobben i bakgrunnen " -#: src/file.c:1942 src/file.c:2047 +#: src/file.c:1997 src/file.c:2081 msgid " Internal failure " msgstr " Intern feil " -#: src/file.c:1942 src/file.c:2047 +#: src/file.c:1997 src/file.c:2081 msgid " Unknown file operation " msgstr " Ukjent filoperasjon " -#: src/file.c:1961 +#: src/file.c:2012 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -3217,19 +3425,15 @@ " Målet \"%s\" må være en katalog \n" " %s " -#: src/file.c:2132 src/filegui.c:263 -msgid "&Skip" -msgstr "&Hopp over" - -#: src/file.c:2132 +#: src/file.c:2173 msgid "&Retry" msgstr "&Prøv igjen" -#: src/file.c:2132 src/file.c:2191 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2173 src/file.c:2234 src/filegui.c:263 src/filegui.c:591 msgid "&Abort" msgstr "&Avbryt" -#: src/file.c:2182 +#: src/file.c:2225 msgid "" "\n" " Directory not empty. \n" @@ -3239,7 +3443,7 @@ " Katalogen er ikke tom. \n" " Slett den rekursivt? " -#: src/file.c:2183 +#: src/file.c:2226 msgid "" "\n" " Background process: Directory not empty \n" @@ -3249,142 +3453,134 @@ " Bakgrunnsprosess: Katalogen er ikke tom. \n" " Slett den rekursivt? " -#: src/file.c:2184 -msgid " Delete: " -msgstr " Slett: " - -#: src/file.c:2190 +#: src/file.c:2233 msgid "a&ll" msgstr "a&lle" -#: src/file.c:2190 src/filegui.c:565 +#: src/file.c:2233 src/filegui.c:594 msgid "non&E" msgstr "ing&En" -#: src/file.c:2200 +#: src/file.c:2243 msgid " Type 'yes' if you REALLY want to delete " msgstr " Skriv 'ja' hvis du VIRKELIG vil slette " -#: src/file.c:2202 +#: src/file.c:2245 msgid "all the directories " msgstr "alle katalogene " -#: src/file.c:2204 +#: src/file.c:2247 msgid " Recursive Delete " msgstr " Rekursiv sletting " -#: src/file.c:2205 +#: src/file.c:2248 msgid " Background process: Recursive Delete " msgstr " Bakgrunnsprosess: Rekursiv sletting " -#: src/filegui.c:404 +#: src/filegui.c:423 msgid "File" msgstr "Fil" -#: src/filegui.c:425 +#: src/filegui.c:446 msgid "Count" msgstr "Tall" -#: src/filegui.c:444 +#: src/filegui.c:467 msgid "Bytes" msgstr "Bytes" -#: src/filegui.c:479 +#: src/filegui.c:504 msgid "Source" msgstr "Kilde" -#: src/filegui.c:500 +#: src/filegui.c:527 msgid "Target" msgstr "Mål" -#: src/filegui.c:520 +#: src/filegui.c:549 msgid "Deleting" msgstr "Sletter" -#: src/filegui.c:560 +#: src/filegui.c:589 #, c-format msgid "Target file \"%s\" already exists!" msgstr "Målfilen \"%s\" eksisterer allerede!" -#: src/filegui.c:563 +#: src/filegui.c:592 msgid "if &Size differs" msgstr "hvis størrelsen er forskjellig" -#: src/filegui.c:566 +#: src/filegui.c:595 msgid "&Update" msgstr "Oppdater" -#: src/filegui.c:567 -msgid "al&L" -msgstr "alle" - -#: src/filegui.c:568 +#: src/filegui.c:597 msgid "Overwrite all targets?" msgstr "Overskriv alle mål?" -#: src/filegui.c:570 +#: src/filegui.c:599 msgid "&Reget" msgstr "Hent igjen" -#: src/filegui.c:571 +#: src/filegui.c:600 msgid "ap&Pend" msgstr "legg til" -#: src/filegui.c:574 +#: src/filegui.c:603 msgid "Overwrite this target?" msgstr "Overskriv dette målet?" -#: src/filegui.c:576 +#: src/filegui.c:605 #, c-format msgid "Target date: %s, size %d" msgstr "Målfilens dato: %s, størrelse %d" -#: src/filegui.c:578 +#: src/filegui.c:607 #, c-format msgid "Source date: %s, size %d" msgstr "Kildefilens dato: %s, størrelse %d" -#: src/filegui.c:662 +#: src/filegui.c:691 msgid " File exists " msgstr " Filen eksisterer " -#: src/filegui.c:663 +#: src/filegui.c:692 msgid " Background process: File exists " msgstr " Bakgrunnsprosess: Filen eksisterer " #. follow symlinks and preserve Attributes must be the first -#: src/filegui.c:773 +#: src/filegui.c:804 msgid "preserve &Attributes" msgstr "behold attributter" #. &op_preserve -#: src/filegui.c:775 +#: src/filegui.c:806 msgid "follow &Links" msgstr "følg lenker" #. &file_mask_op_follow_links -#: src/filegui.c:777 +#: src/filegui.c:808 msgid "to:" msgstr "til:" -#: src/filegui.c:778 +#: src/filegui.c:809 msgid "&Using shell patterns" msgstr "bruker skallmønstre" -#: src/filegui.c:799 +#: src/filegui.c:830 msgid "&Background" msgstr "Bakgrunn" -#: src/filegui.c:808 +#: src/filegui.c:839 msgid "&Stable Symlinks" msgstr "Stabile symlenker" #. &file_mask_stable_symlinks -#: src/filegui.c:810 +#: src/filegui.c:841 msgid "&Dive into subdir if exists" msgstr "Gå inn ned underkatalog hvis den eksisterer" -#: src/filegui.c:969 +#: src/filegui.c:1000 #, c-format msgid "" "Invalid source pattern `%s' \n" @@ -3437,7 +3633,7 @@ msgid "Content: " msgstr "Innhold: " -#: src/find.c:171 src/main.c:1202 src/main.c:1223 +#: src/find.c:171 src/main.c:1219 src/main.c:1240 msgid "&Tree" msgstr "Tre" @@ -3462,7 +3658,7 @@ msgid "Finished" msgstr "Ferdig" -#: src/find.c:561 src/view.c:1465 +#: src/find.c:561 src/view.c:1467 #, c-format msgid "Searching %s" msgstr "Søker i %s" @@ -4008,7 +4204,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:669 +#: src/main.c:692 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4020,247 +4216,247 @@ " arbeidskatalogen, eller gitt deg selv ekstra tilgangs- \n" " rettigheter med \"su\" kommandoen? " -#: src/main.c:744 +#: src/main.c:767 msgid "Press any key to continue..." msgstr "Trykk en tast for å fortsette..." -#: src/main.c:794 +#: src/main.c:817 msgid " The shell is already running a command " msgstr " Skallet kjører allerede en kommando " -#: src/main.c:1199 src/main.c:1220 +#: src/main.c:1216 src/main.c:1237 msgid "&Listing mode..." msgstr "Listemodus..." -#: src/main.c:1200 src/main.c:1221 +#: src/main.c:1217 src/main.c:1238 msgid "&Quick view C-x q" msgstr "Rask visning C-x q" -#: src/main.c:1201 src/main.c:1222 +#: src/main.c:1218 src/main.c:1239 msgid "&Info C-x i" msgstr "Info C-x i" -#: src/main.c:1204 src/main.c:1225 +#: src/main.c:1221 src/main.c:1242 msgid "&Sort order..." msgstr "Sorteringsrekkefølge..." -#: src/main.c:1206 src/main.c:1227 +#: src/main.c:1223 src/main.c:1244 msgid "&Filter..." msgstr "Filter..." -#: src/main.c:1209 src/main.c:1230 +#: src/main.c:1226 src/main.c:1247 msgid "&Network link..." msgstr "Nettverkskobling..." -#: src/main.c:1210 src/main.c:1231 +#: src/main.c:1227 src/main.c:1248 msgid "FT&P link..." msgstr "FTP kobling..." -#: src/main.c:1214 src/main.c:1235 +#: src/main.c:1231 src/main.c:1252 msgid "&Drive... M-d" msgstr "Disk... M-d" -#: src/main.c:1216 src/main.c:1237 +#: src/main.c:1233 src/main.c:1254 msgid "&Rescan C-r" msgstr "Gjenles C-r" -#: src/main.c:1241 +#: src/main.c:1258 msgid "&User menu F2" msgstr "Brukermeny F2" -#: src/main.c:1242 +#: src/main.c:1259 msgid "&View F3" msgstr "Vis F3" -#: src/main.c:1243 +#: src/main.c:1260 msgid "Vie&w file... " msgstr "Vis fil... " -#: src/main.c:1244 +#: src/main.c:1261 msgid "&Filtered view M-!" msgstr "Filtrert visning M-!" -#: src/main.c:1245 +#: src/main.c:1262 msgid "&Edit F4" msgstr "Rediger F4" -#: src/main.c:1246 +#: src/main.c:1263 msgid "&Copy F5" msgstr "Kopier F5" -#: src/main.c:1247 +#: src/main.c:1264 msgid "c&Hmod C-x c" msgstr "chmod C-x c" -#: src/main.c:1249 +#: src/main.c:1266 msgid "&Link C-x l" msgstr "Lenke C-x l" -#: src/main.c:1250 +#: src/main.c:1267 msgid "&SymLink C-x s" msgstr "Symlenke C-x s" -#: src/main.c:1251 +#: src/main.c:1268 msgid "edit s&Ymlink C-x C-s" msgstr "rediger symlenke C-x C-s" -#: src/main.c:1252 +#: src/main.c:1269 msgid "ch&Own C-x o" msgstr "chown C-x o" -#: src/main.c:1253 +#: src/main.c:1270 msgid "&Advanced chown " msgstr "Avansert chown " -#: src/main.c:1255 +#: src/main.c:1272 msgid "&Rename/Move F6" msgstr "Gi nytt navn/flytt F6" -#: src/main.c:1256 +#: src/main.c:1273 msgid "&Mkdir F7" msgstr "Lag katalog F7" -#: src/main.c:1257 +#: src/main.c:1274 msgid "&Delete F8" msgstr "Slett F8" -#: src/main.c:1258 +#: src/main.c:1275 msgid "&Quick cd M-c" msgstr "rask cd M-c" -#: src/main.c:1260 +#: src/main.c:1277 msgid "select &Group M-+" msgstr "velg gruppe M-+" -#: src/main.c:1261 +#: src/main.c:1278 msgid "u&Nselect group M-\\" msgstr "velg bort gruppe M-\\" -#: src/main.c:1262 +#: src/main.c:1279 msgid "reverse selec&Tion M-*" msgstr "reverser valg M-*" -#: src/main.c:1264 +#: src/main.c:1281 msgid "e&Xit F10" msgstr "avslutt F10" -#: src/main.c:1274 +#: src/main.c:1291 msgid "&Directory tree" msgstr "Katalogtre" -#: src/main.c:1276 +#: src/main.c:1293 msgid "&Find file M-?" msgstr "Finn fil M-?" -#: src/main.c:1277 +#: src/main.c:1294 msgid "s&Wap panels C-u" msgstr "bytt paneler C-u" -#: src/main.c:1278 +#: src/main.c:1295 msgid "switch &Panels on/off C-o" msgstr "slå paneler på/av C-o" -#: src/main.c:1279 +#: src/main.c:1296 msgid "&Compare directories C-x d" msgstr "Sammenlign kataloger C-x d" -#: src/main.c:1280 +#: src/main.c:1297 msgid "e&Xternal panelize C-x !" msgstr "eksternt panel C-x !" -#: src/main.c:1281 +#: src/main.c:1298 msgid "show directory s&Izes" msgstr "vis katalogstørrelser" -#: src/main.c:1283 +#: src/main.c:1300 msgid "command &History" msgstr "kommandohistorikk" -#: src/main.c:1284 +#: src/main.c:1301 msgid "di&Rectory hotlist C-\\" msgstr "kataloghurtigliste C-\\" -#: src/main.c:1286 +#: src/main.c:1303 msgid "&Active VFS list C-x a" msgstr "Aktivt VFS liste C-x a" -#: src/main.c:1289 +#: src/main.c:1306 msgid "&Background jobs C-x j" msgstr "Bakgrunnsjobber C-x j" -#: src/main.c:1293 +#: src/main.c:1310 msgid "&Undelete files (ext2fs only)" msgstr "Gjenopprett filer (kun ext2fs)" -#: src/main.c:1296 +#: src/main.c:1313 msgid "&Listing format edit" msgstr "Redigering av listeformat" -#: src/main.c:1298 +#: src/main.c:1315 msgid "&Extension file edit" msgstr "Redigering av utvidelsesfil" -#: src/main.c:1299 +#: src/main.c:1316 msgid "&Menu file edit" msgstr "Menyfilredigering" -#: src/main.c:1304 +#: src/main.c:1321 msgid "&Configuration..." msgstr "Konfigurasjon..." -#: src/main.c:1306 +#: src/main.c:1323 msgid "c&Onfirmation..." msgstr "bekreftelse..." -#: src/main.c:1307 +#: src/main.c:1324 msgid "&Display bits..." msgstr "Tastaturdefinisjon..." -#: src/main.c:1309 +#: src/main.c:1326 msgid "learn &Keys..." msgstr "lær taster..." -#: src/main.c:1312 +#: src/main.c:1329 msgid "&Virtual FS..." msgstr "Virtuelt FS..." -#: src/main.c:1315 +#: src/main.c:1332 msgid "&Save setup" msgstr "Lagre oppsett" -#: src/main.c:1331 src/main.c:1333 +#: src/main.c:1348 src/main.c:1350 msgid " &Left " msgstr " Venstre " -#: src/main.c:1333 +#: src/main.c:1350 msgid " &Above " msgstr " Over " -#: src/main.c:1336 +#: src/main.c:1353 msgid " &File " msgstr " Fil " -#: src/main.c:1337 +#: src/main.c:1354 msgid " &Command " msgstr " Kommando " -#: src/main.c:1338 +#: src/main.c:1355 msgid " &Options " msgstr " Alternativer " -#: src/main.c:1340 src/main.c:1342 +#: src/main.c:1357 src/main.c:1359 msgid " &Right " msgstr " Høyre " -#: src/main.c:1342 +#: src/main.c:1359 msgid " &Below " msgstr " Under " -#: src/main.c:1397 +#: src/main.c:1414 msgid " Information " msgstr " Informasjon " -#: src/main.c:1398 +#: src/main.c:1415 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -4272,56 +4468,136 @@ " du utføre en manuell gjenlesing av katalogen. Se manualsiden for \n" " detaljene." -#: src/main.c:1672 src/screen.c:2285 src/screen.c:2315 +#: src/main.c:1689 src/screen.c:2288 src/screen.c:2318 msgid "Menu" msgstr "Meny" -#: src/main.c:1877 +#: src/main.c:1894 msgid "Thank you for using GNU Midnight Commander" msgstr "Takk for at du bruker GNU Midnight Commander" -#: src/main.c:2236 +#: src/main.c:2253 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "med musstøtte i xterm%s.\n" -#: src/main.c:2237 +#: src/main.c:2254 msgid " and the Linux console" msgstr " og Linux konsollet" -#: src/main.c:2332 +#: src/main.c:2349 msgid "The TERM environment variable is unset!\n" msgstr "TERM miljøvariabelen er ikke satt!\n" -#: src/main.c:2541 +#: src/main.c:2556 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Bibliotekkatalog for Midnight Commander: %s\n" -#: src/main.c:2552 +#: src/main.c:2567 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 +msgid "Use to debug the background code" +msgstr "Bruk til å avluse bakgrunnskoden" + +#: src/main.c:2652 +msgid "Request to run in color mode" +msgstr "Be om å kjøre i fargemodus" + +#: src/main.c:2654 +msgid "Specifies a color configuration" +msgstr "Spesifiserer en fargekonfigurasjon" + +#: src/main.c:2659 +msgid "Edits one file" +msgstr "Redigerer en fil" + +#: src/main.c:2663 +msgid "Displays this help message" +msgstr "Viser denne hjelpeteksten" + +#: src/main.c:2666 +msgid "Displays a help screen on how to change the color scheme" +msgstr "Viser en hjelpskjerm for endring av fargeplanen" + +#: src/main.c:2669 +msgid "Log ftp dialog to specified file" +msgstr "Logg ftp dialogen til spesifisert fil" + +#: src/main.c:2676 +msgid "Obsolete" +msgstr "Utgått" + #: src/main.c:2678 +msgid "Requests to run in black and white" +msgstr "Be om å kjøre i sort-hvitt" + +#: src/main.c:2680 +msgid "Disable mouse support in text version" +msgstr "Slå av musstøtte i tekstversjonen" + +#: src/main.c:2683 +msgid "Disables subshell support" +msgstr "Slå av støtte for underskall" + +#: src/main.c:2687 +msgid "Prints working directory at program exit" +msgstr "Skriv ut arbeidskatalogen ved avslutting av programmet" + +#: src/main.c:2689 +msgid "Resets soft keys on HP terminals" +msgstr "Setter tilbake myke taster på HP terminaler" + +#: src/main.c:2691 +msgid "To run on slow terminals" +msgstr "For kjøring på trege terminaler" + +#: src/main.c:2694 +msgid "Use stickchars to draw" +msgstr "" + +#: src/main.c:2698 +msgid "Enables subshell support (default)" +msgstr "" + +#: src/main.c:2703 +msgid "Tries to use termcap instead of terminfo" +msgstr "" + +#: src/main.c:2707 +msgid "Displays the current version" +msgstr "Viser nåværende versjon" + +#: src/main.c:2709 +msgid "Launches the file viewer on a file" +msgstr "" + +#: src/main.c:2711 +msgid "Forces xterm features" +msgstr "" + +#: src/main.c:2713 msgid "Geometry for the window" msgstr "Geometri for vinduet" -#: src/main.c:2678 +#: src/main.c:2713 msgid "GEOMETRY" msgstr "GEOMETRI" -#: src/main.c:2679 +#: src/main.c:2714 msgid "No windows opened at startup" msgstr "Ingen vinduer åpnet ved oppstart" -#: src/main.c:2680 +#: src/main.c:2715 msgid "Force activation even if a server is already running" msgstr "Tvungen aktivisering hvis en tjener allerede kjører" -#: src/main.c:2952 +#: src/main.c:2987 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" @@ -4329,11 +4605,11 @@ "Kunne ikke åpne tty linjen. Du må kjøre mc uten -P flagget.\n" "På noen systemer vil du kanskje bruke # `which mc`\n" -#: src/main.c:3026 +#: src/main.c:3061 msgid " Notice " msgstr " Notis " -#: src/main.c:3027 +#: src/main.c:3062 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -4460,7 +4736,7 @@ msgid " External panelize " msgstr " Ekstert panel " -#: src/panelize.c:194 src/panelize.c:462 +#: src/panelize.c:194 src/panelize.c:458 msgid "External panelize" msgstr "Eksternt panel" @@ -4492,7 +4768,7 @@ msgid "Cannot invoke command." msgstr "Kan ikke utføre kommando." -#: src/panelize.c:462 +#: src/panelize.c:458 msgid "Pipe close failed" msgstr "Feil under lukking av rør" @@ -4545,27 +4821,27 @@ msgid " %s bytes in %d file%s" msgstr " %s bytes i %d file%s" -#: src/screen.c:1289 +#: src/screen.c:1292 msgid "Unknow tag on display format: " msgstr "Ukjent merke på skjermformatet: " -#: src/screen.c:2048 +#: src/screen.c:2051 msgid " Do you really want to execute? " msgstr " Vil du virkelig kjøre? " -#: src/screen.c:2063 +#: src/screen.c:2066 msgid " No action taken " msgstr " Ingen handling utført " -#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026 +#: src/screen.c:2292 src/screen.c:2322 src/tree.c:1026 msgid "RenMov" msgstr "RenMov" -#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030 +#: src/screen.c:2293 src/screen.c:2323 src/tree.c:1030 msgid "Mkdir" msgstr "Mkdir" -#: src/screen.c:2306 +#: src/screen.c:2309 #, c-format msgid "" " Can't chdir to %s \n" @@ -4579,19 +4855,19 @@ msgid "Couldn't open named pipe %s\n" msgstr "Kunne ikke åpne navngitt rør %s\n" -#: src/subshell.c:700 +#: src/subshell.c:705 msgid " The shell is still active. Quit anyway? " msgstr " Skallet er fremdeles aktivt. Avslutt likevel?" -#: src/subshell.c:726 +#: src/subshell.c:731 msgid " There are stopped jobs." msgstr " Der er stoppete jobber." -#: src/subshell.c:727 +#: src/subshell.c:732 msgid " Quit anyway? " msgstr " Avslutt likevel? " -#: src/subshell.c:780 +#: src/subshell.c:785 #, c-format msgid "Warning: Couldn't change to %s.\n" msgstr "Advarsel: Kunne ikke skifte til %s.\n" @@ -4711,7 +4987,7 @@ msgid " User menu " msgstr " Brukermeny " -#: src/util.c:220 +#: src/util.c:222 msgid "name_trunc: too big" msgstr "name_trunc: for stor" @@ -4784,20 +5060,20 @@ msgid " [grow]" msgstr " [voks]" -#: src/view.c:1457 +#: src/view.c:1459 #, c-format msgid "Searching for `%s'" msgstr "Søker etter `%s'" -#: src/view.c:1564 src/view.c:1686 +#: src/view.c:1566 src/view.c:1688 msgid " Search string not found " msgstr " Søkestrengen ikke funnet " -#: src/view.c:1725 +#: src/view.c:1727 msgid " Invalid regular expression " msgstr " Ugyldig vanlig uttrykk " -#: src/view.c:1855 +#: src/view.c:1850 #, c-format msgid "" " The current line number is %d.\n" @@ -4806,63 +5082,59 @@ " Det nåværende linjenummeret er %d.\n" " Skriv inn det nye linjenummeret:" -#: src/view.c:1885 +#: src/view.c:1880 msgid " Enter regexp:" msgstr " Skriv inn vanlig uttrykk:" -#: src/view.c:1917 -msgid " Enter search string:" -msgstr " Skriv inn søkestreng:" - -#: src/view.c:1990 +#: src/view.c:1985 msgid "Ascii" msgstr "Ascii" -#: src/view.c:1990 +#: src/view.c:1985 msgid "Hex" msgstr "Hex" -#: src/view.c:1991 +#: src/view.c:1986 msgid "Line" msgstr "Linje" -#: src/view.c:1992 +#: src/view.c:1987 msgid "RxSrch" msgstr "VanUtSøk" -#: src/view.c:1995 +#: src/view.c:1990 msgid "EdText" msgstr "RedTekst" -#: src/view.c:1995 +#: src/view.c:1990 msgid "EdHex" msgstr "RedHeks" -#: src/view.c:1997 +#: src/view.c:1992 msgid "UnWrap" msgstr "Fjern bryting" -#: src/view.c:1997 +#: src/view.c:1992 msgid "Wrap" msgstr "Bryt" -#: src/view.c:2000 +#: src/view.c:1995 msgid "HxSrch" msgstr "HexSøk" -#: src/view.c:2003 +#: src/view.c:1998 msgid "Raw" msgstr "Rått" -#: src/view.c:2003 +#: src/view.c:1998 msgid "Parse" msgstr "Tolk" -#: src/view.c:2007 +#: src/view.c:2002 msgid "Unform" msgstr "Fjern format" -#: src/view.c:2007 +#: src/view.c:2002 msgid "Format" msgstr "Format" @@ -5061,7 +5333,7 @@ msgid "NumLock on keypad" msgstr "NumLock på numerisk tastatur" -#: src/wtools.c:587 vfs/vfs.c:1760 +#: src/wtools.c:587 vfs/vfs.c:1762 msgid "Password:" msgstr "Passord:" Binary files old/mc-4.5.24/po/ru.gmo and new/mc-4.5.25/po/ru.gmo differ diff -ruN old/mc-4.5.24/po/ru.po new/mc-4.5.25/po/ru.po --- old/mc-4.5.24/po/ru.po Tue Mar 9 13:45:36 1999 +++ new/mc-4.5.25/po/ru.po Fri Mar 12 21:02:46 1999 @@ -77,7 +77,7 @@ #. we define this up here so we can pass it in to our callback #: gnome/gcmd.c:225 msgid "Ignore case sensitivity." -msgstr "âÅÚ ÕÞ£ÔÁ ÒÅÇÉÓÔÒÁ" +msgstr "âÅÚ ÕÞÅÔÁ ÒÅÇÉÓÔÒÁ" #: gnome/gcmd.c:233 gnome/gcustom-layout.c:40 src/chmod.c:150 src/screen.c:425 msgid "Name" @@ -106,7 +106,7 @@ #: gnome/gcmd.c:278 msgid "Reverse the order." -msgstr "ïÂÒÁÔÉÔØ ÐÏÌÑÄÏË." +msgstr "ïÂÒÁÔÉÔØ ÐÏÒÑÄÏË." #: gnome/gcmd.c:340 msgid "Enter name." @@ -224,7 +224,6 @@ msgstr "óÏÚÄÁÔØ ÎÏ×ÏÅ ÏËÎÏ" #: gnome/gdesktop.c:2177 -#, fuzzy msgid "Rescan Mountable Devices" msgstr "ðÅÒÅÓËÁÎÉÒÏ×ÁÔØ ÐÏÄÓÏÅÄÉÎÑÅÍÙÅ ÕÓÔÒÏÊÓÔ×Á" @@ -483,7 +482,7 @@ #: gnome/glayout.c:342 msgid "Rename or move files" -msgstr "ðÅÒÅÄ×ÉÎÕÔØ ÉÌÉ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÆÁÊÌÙ" +msgstr "ðÅÒÅÍÅÓÔÉÔØ ÉÌÉ ÐÅÒÅÉÍÅÎÏ×ÁÔØ ÆÁÊÌÙ" #: gnome/glayout.c:344 msgid "Show directory sizes" @@ -499,7 +498,7 @@ #: gnome/glayout.c:351 msgid "Select all files in the current Panel" -msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÆÁÊÌÙ ×Á ÄÁÎÎÏÊ ÐÁÎÅÌÉ" +msgstr "÷ÙÄÅÌÉÔØ ×ÓÅ ÆÁÊÌÙ ÎÁ ÄÁÎÎÏÊ ÐÁÎÅÌÉ" #: gnome/glayout.c:353 msgid "_Select Files..." @@ -555,7 +554,7 @@ #: gnome/glayout.c:372 msgid "Global option settings" -msgstr "ó×ÏÊÓÔ×Á ÇÌÏÂÁÌØÎÙÈ ÐÁÒÁÍÅÔÒÏ×" +msgstr "úÎÁÞÅÎÉÑ ÇÌÏÂÁÌØÎÙÈ ÐÁÒÁÍÅÔÒÏ×" #: gnome/glayout.c:379 msgid "_Find File..." @@ -580,7 +579,7 @@ #: gnome/glayout.c:384 msgid "Run a command and put the results in a panel" -msgstr "úÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ É ÐÏÌÏÖÉÔØ ÒÅÚÕÌØÔÁÔ ÎÁ ÐÁÎÅÌØ" +msgstr "úÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ É ÐÏÍÅÓÔÉÔØ ÒÅÚÕÌØÔÁÔ ÎÁ ÐÁÎÅÌØ" #: gnome/glayout.c:394 msgid "_Background jobs..." @@ -591,9 +590,8 @@ msgstr "óÐÉÓÏË ÆÏÎÏ×ÙÈ ÏÐÅÒÁÃÉÊ" #: gnome/glayout.c:397 -#, fuzzy msgid "Exit" -msgstr "ðÒÁ×ËÁ" +msgstr "÷ÙÈÏÄ" #: gnome/glayout.c:397 msgid "Terminates the file manager and the desktop" @@ -696,11 +694,11 @@ #: gnome/gprefs.c:89 msgid "Mix files and directories" -msgstr "æÁÊÌÙ É ËÁÔÁÌÏÇÉ × ÐÅÒÅÍÅÛËÕ" +msgstr "æÁÊÌÙ É ËÁÔÁÌÏÇÉ ×ÐÅÒÅÍÅÛËÕ" #: gnome/gprefs.c:93 msgid "Use shell patterns instead of regular expressions" -msgstr "ïÂÒÁÚÃÙ ËÏÍÍÁÎÄÎÏÊ ÓÔÒÏËÉ ×ÍÅÓÔÏ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" +msgstr "ïÂÒÁÚÃÙ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ×ÍÅÓÔÏ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" #: gnome/gprefs.c:102 msgid "Confirm when deleting file" @@ -926,7 +924,7 @@ #: gnome/gscreen.c:1452 msgid "Reloads the current directory" -msgstr "ðÅÒÅÇÒÕÄÁÅÔ ÔÅËÕÝÉÊ ËÁÔÁÌÏÇ" +msgstr "ðÅÒÅÇÒÕÖÁÅÔ ÔÅËÕÝÉÊ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:1454 msgid "New folder" @@ -1129,7 +1127,7 @@ #: gnome/gview.c:293 msgid "Jump to a specified line number" -msgstr "ðÅÒÅÊÔÉ ÎÁ ÓÔÒÏËÕ Ó ÚÁÄÁÎÙÍ ÎÏÍÅÒÏÍ" +msgstr "ðÅÒÅÊÔÉ ÎÁ ÓÔÒÏËÕ Ó ÚÁÄÁÎÎÙÍ ÎÏÍÅÒÏÍ" #: gnome/gview.c:295 msgid "_Monitor file" @@ -1162,7 +1160,7 @@ #: gnome/gview.c:319 msgid "_Formatted" -msgstr "óÆÏÒÍÁÔÉÒÏ×ÁÎÎÙÊ" +msgstr "æÏÒÍÁÔÉÒÏ×ÁÎÎÙÊ" #: gnome/gview.c:321 msgid "_Hex" diff -ruN old/mc-4.5.24/slang/sltermin.c new/mc-4.5.25/slang/sltermin.c --- old/mc-4.5.24/slang/sltermin.c Tue Mar 9 13:45:19 1999 +++ new/mc-4.5.25/slang/sltermin.c Fri Mar 12 21:02:31 1999 @@ -235,7 +235,7 @@ char *tidir; int i; FILE *fp = NULL; - char file[256]; + char *file; Terminfo_Type *ti; if ( @@ -269,8 +269,14 @@ tidir = Terminfo_Dirs[i]; if (tidir != NULL) { - g_snprintf (file, sizeof (file), "%s/%c/%s", tidir, *term, term); - if (NULL != (fp = open_terminfo (file, ti))) break; + file = SLMALLOC (strlen (tidir) + 3 + strlen (term) + 1); + if (!file) + continue; + sprintf (file, "%s/%c/%s", tidir, *term, term); + fp = open_terminfo (file, ti); + SLFREE (file); + if (fp) + break; } i++; } diff -ruN old/mc-4.5.24/src/ChangeLog new/mc-4.5.25/src/ChangeLog --- old/mc-4.5.24/src/ChangeLog Tue Mar 9 13:45:23 1999 +++ new/mc-4.5.25/src/ChangeLog Fri Mar 12 21:02:36 1999 @@ -1,3 +1,60 @@ +1999-03-12 Federico Mena Quintero + + * file.c (erase_file): Here we need to mc_lstat(), not mc_stat(). + Since we use the resulting buf.st_size to update the progress, we + need the size of unresolved links. This also makes it consistent + with screen.c:do_file_mark(). + + * screen.c (select_item): Return immediately if this is a desktop + panel. + +1999-03-12 Miguel de Icaza + + * subshell.c (pty_open_slave): Glibc-2.1-based Linux kernels have + grantpt() but they do lack SysV streams. Handle this. Noticed by + Jakub Jelinek + +1999-03-11 Federico Mena Quintero + + * util.h: Added prototype for g_readlink(). Miggie boy should add + prototypes when he adds public functions. + +1999-03-11 Miguel de Icaza + + * utilunix.c (g_readlink): Fixed two bugs spotted by Morten + Wellinder. Boy, Morten has such a good eye! + +1999-03-10 Federico Mena Quintero + + * file.c (erase_dir): Erase metadata for directories as well. + (erase_dir_iff_empty): Likewise. + (copy_file_file): Delete/copy the metadata even for + char/block/sock/fifo files. Same thing for when copying symlinks. + (copy_dir_dir): Delete/copy the metadata. + (move_dir_dir): Delete/move the metadata. + (recursive_erase): Delete the metadata. + +1999-03-08 Federico Mena Quintero + + * file.c (real_query_recursive): Removed an unused variable. + +1999-03-10 Miguel de Icaza + + * utilunix.c (g_readlink): New function. Wraps all the nonsense + of readlink into a nice routine. + + * filegui.c: Support ui->ctx to be NULL, as file.c will set this + to NULL for background operations. + + * background.c (do_background): Handle EINTR in dup2. + +Wed Mar 10 22:21:19 1999 David Martin + + * util.c (my_putenv): char* was used to store the length of a string + + * info.c (info_show_info): cast st_dev and st_ino when passing + to printw. + 1999-03-08 Miguel de Icaza * file.c (panel_operate): Always create the ctx->ui. Federico, @@ -29,6 +86,11 @@ * view.c (view_percent, view_update): Take an extra argument: update_gui, which controls whether we want to update the displayed region in the GUI version. + +1999-02-25 Jonathan Blandford + + * cmd.c (symlink_cmd): little change to handle the case when a + desktop panel is passed in. 1999-02-25 Owen Taylor diff -ruN old/mc-4.5.24/src/background.c new/mc-4.5.25/src/background.c --- old/mc-4.5.24/src/background.c Tue Mar 9 13:45:22 1999 +++ new/mc-4.5.25/src/background.c Fri Mar 12 21:02:35 1999 @@ -147,9 +147,12 @@ close (2); if ((nullfd = open ("/dev/null", O_RDONLY)) != -1){ - dup2 (nullfd, 0); - dup2 (nullfd, 1); - dup2 (nullfd, 2); + while (dup2 (nullfd, 0) == -1 && errno == EINTR) + ; + while (dup2 (nullfd, 1) == -1 && errno == EINTR) + ; + while (dup2 (nullfd, 2) == -1 && errno == EINTR) + ; } /* To make it obvious if it fails, there is a bug report on this */ diff -ruN old/mc-4.5.24/src/cmd.c new/mc-4.5.25/src/cmd.c --- old/mc-4.5.24/src/cmd.c Tue Mar 9 13:45:22 1999 +++ new/mc-4.5.25/src/cmd.c Fri Mar 12 21:02:35 1999 @@ -1091,16 +1091,41 @@ void symlink_cmd (void) { - do_link (1, selection (cpanel)->fname); + char *filename; + if (is_a_desktop_panel (cpanel)) { + gint i; + for (i = 0; i < cpanel->count; i++) + if (cpanel->dir.list [i].f.marked) { + filename = cpanel->dir.list [i].fname; + break; + } + } else { + filename = selection (cpanel)->fname; + } + do_link (1, filename); } void edit_symlink_cmd (void) { +#ifndef HAVE_GNOME +/* GNOME already checks this, and selection(cpanel) does bbad things */ if (S_ISLNK (selection (cpanel)->buf.st_mode)) { - char buffer [MC_MAXPATHLEN], *p = selection (cpanel)->fname; +#endif + char buffer [MC_MAXPATHLEN]; + char *p = NULL; int i; char *dest, *q = g_strconcat (_(" Symlink "), name_trunc (p, 32), _(" points to:"), NULL); - + + if (is_a_desktop_panel (cpanel)) { + gint i; + for (i = 0; i < cpanel->count; i++) + if (cpanel->dir.list [i].f.marked) { + p = cpanel->dir.list [i].fname; + break; + } + } else { + p = selection (cpanel)->fname; + } i = readlink (p, buffer, MC_MAXPATHLEN); if (i > 0) { buffer [i] = 0; @@ -1123,7 +1148,9 @@ } } g_free (q); +#ifndef HAVE_GNOME } +#endif } void other_symlink_cmd (void) diff -ruN old/mc-4.5.24/src/file.c new/mc-4.5.25/src/file.c --- old/mc-4.5.24/src/file.c Tue Mar 9 13:45:21 1999 +++ new/mc-4.5.25/src/file.c Fri Mar 12 21:02:33 1999 @@ -107,7 +107,7 @@ /* }}} */ -/* rcsid [] = "$Id: file.c,v 1.50 1999/03/09 04:55:50 unammx Exp $" */ +/* rcsid [] = "$Id: file.c,v 1.53 1999/03/13 01:02:36 unammx Exp $" */ int verbose = 1; @@ -554,9 +554,19 @@ return return_status; } - if (S_ISLNK (sb.st_mode)) - return make_symlink (ctx, src_path, dst_path); - + if (S_ISLNK (sb.st_mode)) { + int retval; + + retval = make_symlink (ctx, src_path, dst_path); +#ifdef HAVE_GNOME + if (retval == FILE_CONT) { + gnome_metadata_delete (dst_path); + gnome_metadata_copy (src_path, dst_path); + } +#endif + return retval; + } + #endif /* !OS_NT */ if (S_ISCHR (sb.st_mode) || S_ISBLK (sb.st_mode) || S_ISFIFO (sb.st_mode) @@ -586,6 +596,10 @@ return temp_status; } #endif +#ifdef HAVE_GNOME + gnome_metadata_delete (dst_path); + gnome_metadata_copy (src_path, dst_path); +#endif return FILE_CONT; } } @@ -806,7 +820,8 @@ #endif #ifdef HAVE_GNOME - gnome_metadata_copy (src_path, dst_path); + gnome_metadata_delete (dst_path); + gnome_metadata_copy (src_path, dst_path); #endif /* * .ado: according to the XPG4 standard, the file must be closed before @@ -907,6 +922,10 @@ if (move_over){ if (mc_rename (s, d) == 0){ +#ifdef HAVE_GNOME + gnome_metadata_delete (d); + gnome_metadata_copy (s, d); +#endif g_free (parent_dirs); return FILE_CONT; } @@ -949,6 +968,11 @@ goto ret; } +#ifdef HAVE_GNOME + gnome_metadata_delete (dest_dir); + gnome_metadata_copy (s, dest_dir); +#endif + lp = g_new (struct link, 1); mc_stat (dest_dir, &buf); lp->vfs = vfs_type (dest_dir); @@ -1061,6 +1085,9 @@ { struct stat src_stats, dst_stats; int return_status = FILE_CONT; +#ifdef HAVE_GNOME + int delete_metadata = TRUE; +#endif if (file_progress_show_source (ctx, s) == FILE_ABORT || file_progress_show_target (ctx, d) == FILE_ABORT) @@ -1115,14 +1142,20 @@ if (!ctx->do_append) { if (S_ISLNK (src_stats.st_mode) && ctx->stable_symlinks) { - if ((return_status = make_symlink (ctx, s, d)) == FILE_CONT) + if ((return_status = make_symlink (ctx, s, d)) == FILE_CONT) { +#ifdef HAVE_GNOME + gnome_metadata_delete (d); + gnome_metadata_rename (s, d); + delete_metadata = FALSE; +#endif goto retry_src_remove; - else + } else return return_status; } if (mc_rename (s, d) == 0){ #ifdef HAVE_GNOME + gnome_metadata_delete (d); gnome_metadata_rename (s, d); #endif return FILE_CONT; @@ -1163,7 +1196,8 @@ return return_status; } #ifdef HAVE_GNOME - gnome_metadata_delete (s); + if (delete_metadata) + gnome_metadata_delete (s); #endif if (return_status == FILE_CONT) @@ -1222,6 +1256,10 @@ retry_rename: if (mc_rename (s, destdir) == 0){ +#ifdef HAVE_GNOME + gnome_metadata_delete (destdir); + gnome_metadata_rename (s, destdir); +#endif return_status = FILE_CONT; goto ret; } @@ -1292,7 +1330,7 @@ return FILE_ABORT; mc_refresh (); - if (progress_count && mc_stat (s, &buf)) { + if (progress_count && mc_lstat (s, &buf)) { /* ignore, most likely the mc_unlink fails, too */ buf.st_size = 0; } @@ -1364,6 +1402,9 @@ goto retry_rmdir; return return_status; } +#ifdef HAVE_GNOME + gnome_metadata_delete (s); +#endif return FILE_CONT; } @@ -1431,6 +1472,9 @@ goto retry_rmdir; return error; } +#ifdef HAVE_GNOME + gnome_metadata_delete (s); +#endif return FILE_CONT; } @@ -1460,6 +1504,9 @@ goto retry_rmdir; return error; } +#ifdef HAVE_GNOME + gnome_metadata_delete (s); +#endif return FILE_CONT; } @@ -1479,7 +1526,7 @@ mc_stat (tree->selected_ptr->name, stat_buf); return tree->selected_ptr->name; - } + } if (panel->marked){ for (i = 0; i < panel->count; i++) @@ -1890,7 +1937,10 @@ /* Now, let's do the job */ - file_op_context_create_ui (ctx, operation, 1); + if (do_bg) + ctx->ui = NULL; + else + file_op_context_create_ui (ctx, operation, 1); /* This code is only called by the tree and panel code */ if (only_one){ @@ -1949,14 +1999,10 @@ } } /* Copy or move operation */ - if (value == FILE_CONT) + if (value == FILE_CONT && !(is_a_desktop_panel(panel))) unmark_files (panel); } else { /* Many files */ - /* Need to determine this.*/ -#ifdef HAVE_GNOME - int policy_over_write_necessary = 1; -#endif /* Check destination for copy or move operation */ if (operation != OP_DELETE){ @@ -1980,27 +2026,13 @@ ctx->progress_bytes = panel->total; } -#ifdef HAVE_GNOME - if (operation != OP_DELETE){ - /* FIXME: we need to determine if this dialog is actually needed. */ - /* We need to pre-copy all the files and see if there are any - * over-writes. Ugh, this sounds yucky. )-: */ - if (policy_over_write_necessary) { - if (file_progress_query_replace_policy (ctx, TRUE) == FILE_ABORT) - goto clean_up; - else - /* this will initialize some variables */ - file_progress_query_replace_policy (ctx, FALSE); - } - } -#endif /* Loop for every file, perform the actual copy operation */ for (i = 0; i < panel->count; i++) { if (!panel->dir.list [i].f.marked) continue; /* Skip the unmarked ones */ source = panel->dir.list [i].fname; - src_stat = panel->dir.list [i].buf; /* Inefficient, should we use pointers? */ + src_stat = panel->dir.list [i].buf; #ifdef WITH_FULL_PATHS if (source_with_path) @@ -2055,9 +2087,16 @@ if (value == FILE_ABORT) goto clean_up; +#ifdef HAVE_GNOME + /* if panel->selection is -1, then we have a desktop panel. */ + if (value == FILE_CONT && !(is_a_desktop_panel(panel))) + do_file_mark (panel, i, 0); +#else if (value == FILE_CONT) - do_file_mark (panel, i, 0); + do_file_mark (panel, i, 0); +#endif + if (file_progress_show_count (ctx, count, ctx->progress_count) == FILE_ABORT) goto clean_up; @@ -2112,7 +2151,7 @@ if (we_are_background) { vfs_shut (); tell_parent (MSG_CHILD_EXITING); - exit (1); + _exit (1); } #endif @@ -2178,7 +2217,7 @@ static int real_query_recursive (FileOpContext *ctx, enum OperationMode mode, char *s) { - char *confirm, *textb; + char *confirm; gchar *text; if (ctx->recursive_result < RECURSIVE_ALWAYS){ diff -ruN old/mc-4.5.24/src/filegui.c new/mc-4.5.25/src/filegui.c --- old/mc-4.5.24/src/filegui.c Tue Mar 9 13:45:23 1999 +++ new/mc-4.5.25/src/filegui.c Fri Mar 12 21:02:36 1999 @@ -178,6 +178,9 @@ Gpm_Event event; FileOpContextUI *ui; + if (ctx->ui == NULL) + return; + ui = ctx->ui; x_flush_events (); @@ -302,17 +305,19 @@ FileOpContextUI *ui; g_return_if_fail (ctx != NULL); - g_return_if_fail (ctx->ui != NULL); - ui = ctx->ui; + if (ctx->ui){ + ui = ctx->ui; + + dlg_run_done (ui->op_dlg); + destroy_dlg (ui->op_dlg); + g_free (ui); + } - dlg_run_done (ui->op_dlg); - destroy_dlg (ui->op_dlg); #ifndef HAVE_X - the_hint->widget.y = last_hint_line; + the_hint->widget.y = last_hint_line; #endif - g_free (ui); ctx->ui = NULL; } @@ -321,6 +326,9 @@ { FileOpContextUI *ui; + if (ctx->ui == NULL) + return FILE_CONT; + ui = ctx->ui; if (n >= 0) { @@ -335,6 +343,9 @@ { FileOpContextUI *ui; + if (ctx->ui == NULL) + return FILE_CONT; + ui = ctx->ui; gauge_set_value (ui->progress_gauge[n], (int) total, (int) done); @@ -349,6 +360,9 @@ char eta_buffer [BUF_TINY]; FileOpContextUI *ui; + if (ctx->ui == NULL) + return; + ui = ctx->ui; if (!ui->showing_eta) @@ -371,6 +385,9 @@ char bps_buffer [BUF_TINY]; FileOpContextUI *ui; + if (ctx->ui == NULL) + return; + ui = ctx->ui; if (!ui->showing_bps) @@ -394,7 +411,9 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -415,7 +434,9 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -434,7 +455,9 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -461,7 +484,9 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -492,7 +517,9 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -513,7 +540,9 @@ FileOpContextUI *ui; g_return_val_if_fail (ctx != NULL, FILE_CONT); - g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); + + if (ctx->ui == NULL) + return FILE_CONT; ui = ctx->ui; @@ -694,7 +723,9 @@ FileOpContextUI *ui; g_return_if_fail (ctx != NULL); - g_return_if_fail (ctx->ui != NULL); + + if (ctx->ui == NULL) + return; ui = ctx->ui; @@ -710,7 +741,7 @@ g_return_val_if_fail (ctx != NULL, FILE_CONT); g_return_val_if_fail (ctx->ui != NULL, FILE_CONT); - + ui = ctx->ui; if (ui->replace_result < REPLACE_ALWAYS){ diff -ruN old/mc-4.5.24/src/info.c new/mc-4.5.25/src/info.c --- old/mc-4.5.24/src/info.c Tue Mar 9 13:45:22 1999 +++ new/mc-4.5.25/src/info.c Fri Mar 12 21:02:34 1999 @@ -189,7 +189,7 @@ case 4: widget_move (&info->widget, 4, 3); - printw (_("Location: %Xh:%Xh"), buf.st_dev, buf.st_ino); + printw (_("Location: %Xh:%Xh"), (int)buf.st_dev, (int)buf.st_ino); case 3: widget_move (&info->widget, 3, 2); diff -ruN old/mc-4.5.24/src/main.c new/mc-4.5.25/src/main.c --- old/mc-4.5.24/src/main.c Tue Mar 9 13:45:21 1999 +++ new/mc-4.5.25/src/main.c Fri Mar 12 21:02:33 1999 @@ -139,7 +139,7 @@ #include "popt.h" -/* "$Id: main.c,v 1.83 1999/03/02 21:33:50 norbert Exp $" */ +/* "$Id: main.c,v 1.84 1999/03/11 02:00:33 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 */ @@ -2642,53 +2642,73 @@ { NULL, '\0', POPT_ARG_CALLBACK, parse_an_arg, 0}, #endif #ifdef WITH_BACKGROUND - { "background", 'B', POPT_ARG_NONE, &background_wait, 0 }, + { "background", 'B', POPT_ARG_NONE, &background_wait, 0, + N_("Use to debug the background code") }, #endif #if defined(HAVE_SLANG) && defined(OS2_NT) { "createcmdfile", 'S', POPT_ARG_STRING, NULL, 'S' }, #endif - { "color", 'c', POPT_ARG_NONE, NULL, 'c' }, - { "colors", 'C', POPT_ARG_STRING, &command_line_colors, 0 }, + { "color", 'c', POPT_ARG_NONE, NULL, 'c', + N_("Request to run in color mode") }, + { "colors", 'C', POPT_ARG_STRING, &command_line_colors, 0, + N_("Specifies a color configuration") }, #ifdef HAVE_SUBSHELL_SUPPORT { "dbgsubshell", 'X', POPT_ARG_NONE, &debug_subshell, 0 }, #endif - { "edit", 'e', POPT_ARG_STRING, &edit_one_file, 0 }, + { "edit", 'e', POPT_ARG_STRING, &edit_one_file, 0, + N_("Edits one file") }, #ifndef HAVE_GNOME - { "help", 'h', POPT_ARG_NONE, NULL, 'h' }, + { "help", 'h', POPT_ARG_NONE, NULL, 'h', + N_("Displays this help message") }, #endif - { "help-colors", 'H', POPT_ARG_NONE, NULL, 'H' }, + { "help-colors", 'H', POPT_ARG_NONE, NULL, 'H', + N_("Displays a help screen on how to change the color scheme") }, #ifdef USE_NETCODE - { "ftplog", 'l', POPT_ARG_STRING, NULL, 'l' }, + { "ftplog", 'l', POPT_ARG_STRING, NULL, 'l', + N_("Log ftp dialog to specified file") }, #endif #ifdef HAVE_MAD - { "memory", 'M', POPT_ARG_STRING, NULL, 'M' }, + { "memory", 'M', POPT_ARG_STRING, NULL, 'M', }, #endif { "libdir", 'f', POPT_ARG_NONE, NULL, 'f' }, - { NULL, 'm', POPT_ARG_NONE, NULL, 'm' }, - { "nocolor", 'b', POPT_ARG_NONE, &disable_colors, 0 }, - { "nomouse", 'd', POPT_ARG_NONE, NULL, 'd' }, + { NULL, 'm', POPT_ARG_NONE, NULL, 'm', + N_("Obsolete") }, + { "nocolor", 'b', POPT_ARG_NONE, &disable_colors, 0, + N_("Requests to run in black and white") }, + { "nomouse", 'd', POPT_ARG_NONE, NULL, 'd', + N_("Disable mouse support in text version") }, #ifdef HAVE_SUBSHELL_SUPPORT - { "nosubshell", 'u', POPT_ARG_NONE, NULL, 'u' }, + { "nosubshell", 'u', POPT_ARG_NONE, NULL, 'u', + N_("Disables subshell support") }, { "forceexec", 'r', POPT_ARG_NONE, NULL, 'r' }, #endif - { "printwd", 'P', POPT_ARG_NONE, &print_last_wd, 0 }, - { "resetsoft", 'k', POPT_ARG_NONE, &reset_hp_softkeys, 0 }, - { "slow", 's', POPT_ARG_NONE, &slow_terminal, 0 }, + { "printwd", 'P', POPT_ARG_NONE, &print_last_wd, 0, + N_("Prints working directory at program exit") }, + { "resetsoft", 'k', POPT_ARG_NONE, &reset_hp_softkeys, 0, + N_("Resets soft keys on HP terminals") }, + { "slow", 's', POPT_ARG_NONE, &slow_terminal, 0, + N_("To run on slow terminals") }, #if defined(HAVE_SLANG) && !defined(OS2_NT) - { "stickchars", 'a', 0, &force_ugly_line_drawing, 0 }, + { "stickchars", 'a', 0, &force_ugly_line_drawing, 0, + N_("Use stickchars to draw") }, #endif #ifdef HAVE_SUBSHELL_SUPPORT - { "subshell", 'U', POPT_ARG_NONE, NULL, 'U' }, + { "subshell", 'U', POPT_ARG_NONE, NULL, 'U', + N_("Enables subshell support (default)")}, #endif #if !defined(HAVE_X) #if defined(HAVE_SLANG) && !defined(OS2_NT) - { "termcap", 't', 0, &SLtt_Try_Termcap, 0 }, + { "termcap", 't', 0, &SLtt_Try_Termcap, 0, + N_("Tries to use termcap instead of terminfo") }, #endif #endif - { "version", 'V', POPT_ARG_NONE, NULL, 'V'}, - { "view", 'v', POPT_ARG_STRING, &view_one_file, 0 }, - { "xterm", 'x', POPT_ARG_NONE, &force_xterm, 0}, + { "version", 'V', POPT_ARG_NONE, NULL, 'V', + N_("Displays the current version") }, + { "view", 'v', POPT_ARG_STRING, &view_one_file, 0, + N_("Launches the file viewer on a file") }, + { "xterm", 'x', POPT_ARG_NONE, &force_xterm, 0, + N_("Forces xterm features") }, #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}, diff -ruN old/mc-4.5.24/src/panel.h new/mc-4.5.25/src/panel.h --- old/mc-4.5.24/src/panel.h Tue Mar 9 13:45:20 1999 +++ new/mc-4.5.25/src/panel.h Fri Mar 12 21:02:32 1999 @@ -151,6 +151,10 @@ int maybe_start_drag; int click_x, click_y; + /* View menu and toolbar items */ + void **view_menu_items; + void **view_toolbar_items; + int dragging; /* Used for scrolling nicely during drags */ @@ -158,6 +162,7 @@ int drag_motion_x; int drag_motion_y; void *panel_listbox; /* container for the list */ + int is_a_desktop_panel; #endif } WPanel; @@ -176,7 +181,11 @@ extern int panel_scroll_pages; #define selection(p) (&(p->dir.list [p->selected])) - +#ifdef HAVE_GNOME +#define is_a_desktop_panel(p) ((p->is_a_desktop_panel)) +#else +#define is_a_desktop_panel(p) FALSE +#endif extern int fast_reload; extern int extra_info; diff -ruN old/mc-4.5.24/src/screen.c new/mc-4.5.25/src/screen.c --- old/mc-4.5.24/src/screen.c Tue Mar 9 13:45:21 1999 +++ new/mc-4.5.25/src/screen.c Fri Mar 12 21:02:33 1999 @@ -1000,6 +1000,9 @@ panel->format = 0; panel->status_format = 0; panel->format_modified = 1; +#ifdef HAVE_GNOME + panel->is_a_desktop_panel = FALSE; +#endif panel->panel_name = g_strdup (panel_name); panel->user_format = g_strdup (DEFAULT_USER_FORMAT); @@ -1491,6 +1494,9 @@ int old_top; old_top = panel->top_file; #endif + + if (is_a_desktop_panel (panel)) + return; if (panel->top_file < 0){ repaint = 1; diff -ruN old/mc-4.5.24/src/subshell.c new/mc-4.5.25/src/subshell.c --- old/mc-4.5.24/src/subshell.c Tue Mar 9 13:45:22 1999 +++ new/mc-4.5.25/src/subshell.c Fri Mar 12 21:02:34 1999 @@ -454,7 +454,12 @@ break; case ZSH: - execl (shell, "zsh", "+Z", NULL); + /* change from "+Z" to "-Z" by Michael Bramer + * (Debian-mc-maintainer) from a patch from + * Radovan Garabik + */ + execl (shell, "zsh", "-Z", NULL); + break; } @@ -1115,6 +1120,7 @@ } #if !defined(__osf__) +#if defined (I_FIND) && defined (I_PUSH) if (!ioctl (pty_slave, I_FIND, "ptem")) if (ioctl (pty_slave, I_PUSH, "ptem") == -1) { @@ -1140,6 +1146,7 @@ return -1; } #endif /* sgi || __sgi */ +#endif /* I_FIND && I_PUSH */ #endif /* __osf__ */ return pty_slave; diff -ruN old/mc-4.5.24/src/util.c new/mc-4.5.25/src/util.c --- old/mc-4.5.24/src/util.c Tue Mar 9 13:45:21 1999 +++ new/mc-4.5.25/src/util.c Fri Mar 12 21:02:33 1999 @@ -76,7 +76,7 @@ #include "user.h" /* expand_format */ #include "../vfs/vfs.h" -/* "$Id: util.c,v 1.20 1999/03/02 21:49:04 norbert Exp $" */ +/* "$Id: util.c,v 1.21 1999/03/10 21:56:21 norbert Exp $" */ char app_text [] = "Midnight-Commander"; @@ -661,9 +661,8 @@ void my_putenv (char *name, char *data) { char *full; - char *len = strlen (name) + strlen (data) + 2; - full = malloc (len); + full = malloc (strlen (name) + strlen (data) + 2); strcpy (full, name); strcat (full, "="); strcat (full, data); diff -ruN old/mc-4.5.24/src/util.h new/mc-4.5.25/src/util.h --- old/mc-4.5.24/src/util.h Tue Mar 9 13:45:20 1999 +++ new/mc-4.5.25/src/util.h Fri Mar 12 21:02:32 1999 @@ -37,6 +37,7 @@ int set_nonblocking (int fd); char *x_basename (char *s); +char *g_readlink (char *path); extern int align_extensions; diff -ruN old/mc-4.5.24/src/utilunix.c new/mc-4.5.25/src/utilunix.c --- old/mc-4.5.24/src/utilunix.c Tue Mar 9 13:45:22 1999 +++ new/mc-4.5.25/src/utilunix.c Fri Mar 12 21:02:35 1999 @@ -945,3 +945,45 @@ #endif /* ifdef USE_NETCODE */ #endif /* SCO_FLAVOR */ #endif /* VFS_STANDALONE */ + +char * +g_readlink (char *path) +{ + char small_buffer [80]; + char *str; + int n, size; + + n = readlink (path, small_buffer, sizeof (small_buffer)-1); + if (n == -1) + return NULL; + + if (n < sizeof (small_buffer)-1){ + small_buffer [n] = 0; + return g_strdup (small_buffer); + } + + str = NULL; + for (size = 256; size < 8192; size += 128){ + if (str) + g_free (str); + + str = g_malloc (size); + + n = readlink (path, str, size-1); + if (n == -1){ + g_free (str); + return NULL; + } + + if (n < size-1){ + char *s; + + str [n] = 0; + s = g_strdup (str); + g_free (str); + return s; + } + } + str [n] = 0; + return str; +} diff -ruN old/mc-4.5.24/src/view.c new/mc-4.5.25/src/view.c --- old/mc-4.5.24/src/view.c Tue Mar 9 13:45:22 1999 +++ new/mc-4.5.25/src/view.c Fri Mar 12 21:02:34 1999 @@ -121,7 +121,7 @@ int altered_nroff_flag = 0; /* }}} */ -/* "$Id: view.c,v 1.28 1999/02/26 07:26:45 unammx Exp $" */ +/* "$Id: view.c,v 1.29 1999/03/11 02:41:26 unammx Exp $" */ static char hex_char[] = "0123456789ABCDEF"; @@ -1441,7 +1441,9 @@ Dlg_head *d = 0; int search_status; int abort; - void *gd; +#ifdef HAVE_GNOME + GtkWidget *gd; +#endif /* Used to keep track of where the line starts, when looking forward */ /* is the index before transfering the line; the reverse case uses */ @@ -1831,13 +1833,6 @@ view_labels (view); view->dirty++; view_update (view, TRUE); -} - -/* Both views */ -static void -toggle_hexedit_mode(WView *view) -{ - view->hexedit_mode = 1 - view->hexedit_mode; } /* Both views */ diff -ruN old/mc-4.5.24/vfs/ChangeLog new/mc-4.5.25/vfs/ChangeLog --- old/mc-4.5.24/vfs/ChangeLog Tue Mar 9 13:45:17 1999 +++ new/mc-4.5.25/vfs/ChangeLog Fri Mar 12 21:02:30 1999 @@ -1,3 +1,18 @@ +1999-03-12 Miguel de Icaza + + * vfs.c (vfs_parse_ls_lga): Handle stupid servers that send n_link + set to zero. + +1999-03-11 Miguel de Icaza + + * vfs.h: Make it compile in AIX. Boy do those guys polute the + name space. + +1999-03-09 Shooby Ban + + * extfs/extfs.ini: Corrected rpms -> rpms: + by Balazs Nagy + 1999-03-09 Miguel de Icaza * vfs.c (parse_ls_lga): kill the messages on each error. diff -ruN old/mc-4.5.24/vfs/extfs/deb.in new/mc-4.5.25/vfs/extfs/deb.in --- old/mc-4.5.24/vfs/extfs/deb.in Tue Mar 9 13:45:18 1999 +++ new/mc-4.5.25/vfs/extfs/deb.in Fri Mar 12 21:02:31 1999 @@ -8,6 +8,11 @@ # Modified by Fernando Alegre 1997 # (to handle both new and old tar formats) # +# Modified by Patrik Rak 1998 +# (add by Michael Bramer Debian-mc-maintainer ) +# (to allow access to package control files) +# +# # # Copyright (C) 1997 Free Software Foundation # @@ -24,6 +29,8 @@ $install_size=length($pressinstall); print "dr-xr-xr-x 1 root root 0 $date CONTENTS\n"; + # from Patrik Rak + print "dr-xr-xr-x 1 root root 0 $date DEBIAN\n"; print "-r--r--r-- 1 root root $info_size $date INFO\n"; print "-r-xr--r-- 1 root root $install_size $date INSTALL\n"; @@ -71,6 +78,30 @@ print "$perm 1 $owgr $size $month $day $year $time CONTENTS/$path$arrow$link\n"; } } + # begin from Patrik Rak + if ( open(PIPEIN, "dpkg-deb -I $archivename |") ) + { + while() + { + split; + $size=$_[0]; + last if $size =~ /:/; + next if $size !~ /\d+/; + if($_[4] eq '*') + { + $perm='-r-xr-xr-x'; + $name=$_[5]; + } + else + { + $perm='-r--r--r--'; + $name=$_[4]; + } + print "$perm 1 root root $size $date DEBIAN/$name\n"; + } + } + # end from Patrik Rak + } sub mcdebfs_copyout @@ -80,6 +111,14 @@ if($filename eq "INFO") { system("dpkg-deb -I $archive > $destfile"); + # begin from Patrik Rak + } + elsif($filename =~ /^DEBIAN/) + { + $filename=~s!^DEBIAN/!!; + system("dpkg-deb -I $archive $filename > $destfile"); + # end from Patrik Rak + } elsif($filename eq "INSTALL") { diff -ruN old/mc-4.5.24/vfs/extfs/extfs.ini new/mc-4.5.25/vfs/extfs/extfs.ini --- old/mc-4.5.24/vfs/extfs/extfs.ini Tue Mar 9 13:45:18 1999 +++ new/mc-4.5.25/vfs/extfs/extfs.ini Fri Mar 12 21:02:30 1999 @@ -37,5 +37,5 @@ mailfs # Lists the rpms on the system -rpms +rpms: trpm diff -ruN old/mc-4.5.24/vfs/vfs.c new/mc-4.5.25/vfs/vfs.c --- old/mc-4.5.24/vfs/vfs.c Tue Mar 9 13:45:18 1999 +++ new/mc-4.5.25/vfs/vfs.c Fri Mar 12 21:02:30 1999 @@ -1607,7 +1607,7 @@ num_cols = vfs_split_text (p); s->st_nlink = atol (columns [0]); - if (s->st_nlink <= 0) + if (s->st_nlink < 0) goto error; if (!is_num (1)) diff -ruN old/mc-4.5.24/vfs/vfs.h new/mc-4.5.25/vfs/vfs.h --- old/mc-4.5.24/vfs/vfs.h Tue Mar 9 13:45:18 1999 +++ new/mc-4.5.25/vfs/vfs.h Fri Mar 12 21:02:30 1999 @@ -36,6 +36,12 @@ */ #endif +/* + * The following line is needed, because as usual, AIX polutes every single + * name space they can get their hands on + */ +#undef vfs_type + /* Our virtual file system layer */ typedef void * vfsid;