diff -ruN old/mc-4.5.12/Make.common.in new/mc-4.5.13/Make.common.in --- old/mc-4.5.12/Make.common.in Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/Make.common.in Wed Feb 10 19:41:11 1999 @@ -1,6 +1,6 @@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ # This variable makes it possible to move the installation root to another # directory. This is useful when you're creating a binary distribution of mc. diff -ruN old/mc-4.5.12/Makefile.in new/mc-4.5.13/Makefile.in --- old/mc-4.5.12/Makefile.in Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/Makefile.in Wed Feb 10 19:41:11 1999 @@ -43,7 +43,7 @@ config.h.in: configure.in acconfig.h cd $(srcdir); autoheader -install: installdirs @vcs@ +install: installdirs @for I in $(unixdirs); do cd $$I; $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1; cd ..; done $(INSTALL_DATA) $(srcdir)/FAQ $(DESTDIR)$(libdir)/FAQ $(INSTALL_PROGRAM) mcfn_install $(DESTDIR)$(suppbindir)/mcfn_install diff -ruN old/mc-4.5.12/README.QNX new/mc-4.5.13/README.QNX --- old/mc-4.5.12/README.QNX Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/README.QNX Wed Feb 10 19:41:11 1999 @@ -141,20 +141,16 @@ 'Z' on 'tar.Z' and 'tar.z' files: '%f' -> '$1'. mc.ext.in.qnx.diff: - mc.menu.qnx.diff: QNX: modified 'mc.ext.in'. [tar -t: output to stderr,...] - QNX: modified 'mc.menu'. [tar is not GNU tar: doesn't know '-z',...] - - Support for '*.tar.F': 'freeze'-compressed tar files... - (No automatic install implemented: patches must be applied before + (No automatic install implemented: patch must be applied before running 'configure' [->mc.ext.in.qnx.diff!]; this patch can be not only QNX-specific...) Makefile.in: - 'mc.ext.in.qnx.diff' and 'mc.menu.qnx.diff' added to DISTLIB. + 'mc.ext.in.qnx.diff' added to DISTLIB. slang/ diff -ruN old/mc-4.5.12/Specfile new/mc-4.5.13/Specfile --- old/mc-4.5.12/Specfile Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/Specfile Wed Feb 10 19:41:11 1999 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.12 +%define ver 4.5.13 %define prefix /usr Summary: Midnight Commander visual shell diff -ruN old/mc-4.5.12/VERSION new/mc-4.5.13/VERSION --- old/mc-4.5.12/VERSION Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/VERSION Wed Feb 10 19:41:11 1999 @@ -1 +1 @@ -#define VERSION "4.5.12" +#define VERSION "4.5.13" diff -ruN old/mc-4.5.12/aclocal.m4 new/mc-4.5.13/aclocal.m4 --- old/mc-4.5.12/aclocal.m4 Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/aclocal.m4 Wed Feb 10 19:41:11 1999 @@ -1,7 +1,7 @@ -dnl aclocal.m4 generated automatically by aclocal 1.3 +dnl aclocal.m4 generated automatically by aclocal 1.4 -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. diff -ruN old/mc-4.5.12/configure new/mc-4.5.13/configure --- old/mc-4.5.12/configure Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/configure Wed Feb 10 19:41:11 1999 @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -111,6 +111,7 @@ # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -394,7 +395,7 @@ verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -564,9 +565,11 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -583,7 +586,7 @@ PACKAGE=mc -VERSION=4.5.12 +VERSION=4.5.13 cat >> confdefs.h <&6 -# Extract the first word of "mc", so it can be a program name with args. -set dummy mc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:611: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$MC" in - /*) - ac_cv_path_MC="$MC" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_MC="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" - ;; -esac -fi -MC="$ac_cv_path_MC" -if test -n "$MC"; then - echo "$ac_t""$MC" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - - if test -n "$ac_cv_path_MC"; then - prefix=`echo $ac_cv_path_MC|sed 's%/[^/][^/]*//*[^/][^/]*$%%'` - fi -fi - - echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:646: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:610: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -671,15 +635,16 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:675: checking for $ac_word" >&5 +echo "configure:639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -700,16 +665,17 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:704: checking for $ac_word" >&5 +echo "configure:669: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -744,6 +710,40 @@ echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:720: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi @@ -754,15 +754,17 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 763 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -776,18 +778,24 @@ ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:786: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:794: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:791: checking whether we are using GNU C" >&5 +echo "configure:799: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -796,7 +804,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -807,11 +815,15 @@ if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:815: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:827: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -826,20 +838,24 @@ fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:843: checking how to run the C preprocessor" >&5 +echo "configure:859: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -854,14 +870,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:880: \"$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 : else @@ -871,14 +887,31 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:897: \"$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 + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:914: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -891,6 +924,8 @@ rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -902,15 +937,16 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:906: checking for $ac_word" >&5 +echo "configure:941: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -929,7 +965,7 @@ fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:933: checking whether ln -s works" >&5 +echo "configure:969: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -954,15 +990,16 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:958: checking for $ac_word" >&5 +echo "configure:994: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_AWK="$ac_prog" @@ -999,7 +1036,7 @@ echo $ac_n "checking whether we are using GNU make""... $ac_c" 1>&6 -echo "configure:1003: checking whether we are using GNU make" >&5 +echo "configure:1040: checking whether we are using GNU make" >&5 set dummy ${MAKE-make}; ac_make=$2 if eval "test \"`echo '$''{'ac_cv_prog_gnu_make'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1025,9 +1062,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1029: checking for AIX" >&5 +echo "configure:1066: checking for AIX" >&5 cat > conftest.$ac_ext <&6 -echo "configure:1054: checking for minix/config.h" >&5 +echo "configure:1091: checking for minix/config.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1101: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -1098,7 +1135,7 @@ fi echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:1102: checking for POSIXized ISC" >&5 +echo "configure:1139: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1119,7 +1156,7 @@ fi echo $ac_n "checking for ${CC-cc} option to accept ANSI C""... $ac_c" 1>&6 -echo "configure:1123: checking for ${CC-cc} option to accept ANSI C" >&5 +echo "configure:1160: checking for ${CC-cc} option to accept ANSI C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1129,7 +1166,7 @@ do CFLAGS="$ac_save_CFLAGS $ac_arg" cat > conftest.$ac_ext < #if !defined(__STDC__) || __STDC__ != 1 @@ -1143,7 +1180,7 @@ struct s2 {int (*f) (double a);}; ; return 0; } EOF -if { (eval echo configure:1147: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_cc_stdc="$ac_arg"; break else @@ -1163,19 +1200,19 @@ esac echo $ac_n "checking whether sys/types.h defines makedev""... $ac_c" 1>&6 -echo "configure:1167: checking whether sys/types.h defines makedev" >&5 +echo "configure:1204: checking whether sys/types.h defines makedev" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_types_h_makedev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return makedev(0, 0); ; return 0; } EOF -if { (eval echo configure:1179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_sys_types_h_makedev=yes else @@ -1193,18 +1230,18 @@ if test $ac_cv_header_sys_types_h_makedev = no; then ac_safe=`echo "sys/mkdev.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/mkdev.h""... $ac_c" 1>&6 -echo "configure:1197: checking for sys/mkdev.h" >&5 +echo "configure:1234: checking for sys/mkdev.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1244: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -1231,18 +1268,18 @@ if test $ac_cv_header_sys_mkdev_h = no; then ac_safe=`echo "sys/sysmacros.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for sys/sysmacros.h""... $ac_c" 1>&6 -echo "configure:1235: checking for sys/sysmacros.h" >&5 +echo "configure:1272: checking for sys/sysmacros.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1282: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -1269,12 +1306,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1273: checking for working const" >&5 +echo "configure:1310: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1346,7 +1383,7 @@ # Extract the first word of "mv", so it can be a program name with args. set dummy mv; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1350: checking for $ac_word" >&5 +echo "configure:1387: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1354,9 +1391,13 @@ /*) ac_cv_path_MV="$MV" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_MV="$MV" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_MV="$ac_dir/$ac_word" @@ -1378,7 +1419,7 @@ # Extract the first word of "cp", so it can be a program name with args. set dummy cp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1382: checking for $ac_word" >&5 +echo "configure:1423: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,9 +1427,13 @@ /*) ac_cv_path_CP="$CP" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_CP="$CP" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_CP="$ac_dir/$ac_word" @@ -1410,7 +1455,7 @@ # Extract the first word of "rm", so it can be a program name with args. set dummy rm; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1414: checking for $ac_word" >&5 +echo "configure:1459: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_RM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1418,9 +1463,13 @@ /*) ac_cv_path_RM="$RM" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_RM="$RM" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_RM="$ac_dir/$ac_word" @@ -1442,7 +1491,7 @@ # Extract the first word of "chmod", so it can be a program name with args. set dummy chmod; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1446: checking for $ac_word" >&5 +echo "configure:1495: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_CHMOD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1450,9 +1499,13 @@ /*) ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_CHMOD="$CHMOD" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_CHMOD="$ac_dir/$ac_word" @@ -1474,7 +1527,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1478: checking for $ac_word" >&5 +echo "configure:1531: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1482,9 +1535,13 @@ /*) ac_cv_path_AR="$AR" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_AR="$AR" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_AR="$ac_dir/$ac_word" @@ -1507,15 +1564,16 @@ # Extract the first word of "uname", so it can be a program name with args. set dummy uname; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1511: checking for $ac_word" >&5 +echo "configure:1568: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_system'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$system"; then ac_cv_prog_system="$system" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_system="`uname`" @@ -1538,15 +1596,16 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1542: checking for $ac_word" >&5 +echo "configure:1600: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_X11_WWW'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$X11_WWW"; then ac_cv_prog_X11_WWW="$X11_WWW" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_X11_WWW="$ac_prog" @@ -1570,14 +1629,14 @@ X11_WWW=lynx fi -ALL_LINGUAS="es fr ru ko it de pl no" +ALL_LINGUAS="es cs fr ru ko it de pl no" echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1576: checking for ANSI C header files" >&5 +echo "configure:1635: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1585,8 +1644,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1589: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1648: \"$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* ac_cv_header_stdc=yes @@ -1602,7 +1661,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1620,7 +1679,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1641,7 +1700,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1652,7 +1711,7 @@ exit (0); } EOF -if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1676,21 +1735,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1680: checking for inline" >&5 +echo "configure:1739: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1753: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1716,12 +1775,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1720: checking for off_t" >&5 +echo "configure:1779: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1730,7 +1789,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes else @@ -1749,12 +1808,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1753: checking for size_t" >&5 +echo "configure:1812: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1763,7 +1822,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else @@ -1784,19 +1843,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1788: checking for working alloca.h" >&5 +echo "configure:1847: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1817,25 +1876,30 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1821: checking for alloca" >&5 +echo "configure:1880: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca /* predefined by HP cc +Olibcalls */ +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif @@ -1845,7 +1909,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1870,19 +1934,19 @@ # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.o + ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1881: checking whether alloca needs Cray hooks" >&5 +echo "configure:1945: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:1911: checking for $ac_func" >&5 +echo "configure:1975: 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; then +if { (eval echo configure:2003: \"$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 @@ -1962,7 +2026,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:1966: checking stack direction for C alloca" >&5 +echo "configure:2030: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1970,7 +2034,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2014,18 +2078,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2018: checking for $ac_hdr" >&5 +echo "configure:2082: 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:2028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2092: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -2053,12 +2117,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2057: checking for $ac_func" >&5 +echo "configure:2121: 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; then +if { (eval echo configure:2149: \"$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 @@ -2106,7 +2170,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2110: checking for working mmap" >&5 +echo "configure:2174: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2114,7 +2178,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2282,18 +2346,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2286: checking for $ac_hdr" >&5 +echo "configure:2350: 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:2296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2360: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -2322,12 +2386,12 @@ __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2326: checking for $ac_func" >&5 +echo "configure:2390: 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; then +if { (eval echo configure:2418: \"$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 @@ -2379,12 +2443,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2383: checking for $ac_func" >&5 +echo "configure:2447: 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; then +if { (eval echo configure:2475: \"$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 @@ -2441,19 +2505,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2445: checking for LC_MESSAGES" >&5 +echo "configure:2509: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2474,7 +2538,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2478: checking whether NLS is requested" >&5 +echo "configure:2542: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2494,7 +2558,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2498: checking whether included gettext is requested" >&5 +echo "configure:2562: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2513,18 +2577,18 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2517: checking for libintl.h" >&5 +echo "configure:2581: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2527: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2591: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -2540,19 +2604,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2544: checking for gettext in libc" >&5 +echo "configure:2608: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2568,7 +2632,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2572: checking for bindtextdomain in -lintl" >&5 +echo "configure:2636: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2576,7 +2640,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2655: \"$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 @@ -2603,19 +2667,19 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2607: checking for gettext in libintl" >&5 +echo "configure:2671: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -2643,7 +2707,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2647: checking for $ac_word" >&5 +echo "configure:2711: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2677,12 +2741,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2681: checking for $ac_func" >&5 +echo "configure:2745: 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; then +if { (eval echo configure:2773: \"$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 @@ -2732,7 +2796,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2736: checking for $ac_word" >&5 +echo "configure:2800: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2740,9 +2804,13 @@ /*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" @@ -2764,7 +2832,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2768: checking for $ac_word" >&5 +echo "configure:2836: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2796,7 +2864,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2827,7 +2895,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2831: checking whether catgets can be used" >&5 +echo "configure:2899: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -2840,7 +2908,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2844: checking for main in -li" >&5 +echo "configure:2912: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2848,14 +2916,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2927: \"$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 @@ -2883,12 +2951,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:2887: checking for catgets" >&5 +echo "configure:2955: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -2933,7 +3001,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2937: checking for $ac_word" >&5 +echo "configure:3005: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2941,9 +3009,13 @@ /*) ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GENCAT="$ac_dir/$ac_word" @@ -2965,7 +3037,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2969: checking for $ac_word" >&5 +echo "configure:3041: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2973,9 +3045,13 @@ /*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" @@ -2998,7 +3074,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3002: checking for $ac_word" >&5 +echo "configure:3078: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3033,7 +3109,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3037: checking for $ac_word" >&5 +echo "configure:3113: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3091,7 +3167,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3095: checking for $ac_word" >&5 +echo "configure:3171: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3125,7 +3201,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3129: checking for $ac_word" >&5 +echo "configure:3205: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3133,9 +3209,13 @@ /*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" @@ -3157,7 +3237,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3161: checking for $ac_word" >&5 +echo "configure:3241: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3247,7 +3327,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3251: checking for catalogs to be installed" >&5 +echo "configure:3331: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3275,18 +3355,18 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3279: checking for linux/version.h" >&5 +echo "configure:3359: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3369: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -3445,7 +3525,7 @@ # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3449: checking for $ac_word" >&5 +echo "configure:3529: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3453,9 +3533,13 @@ /*) ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GLIB_CONFIG="$GLIB_CONFIG" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GLIB_CONFIG="$ac_dir/$ac_word" @@ -3476,7 +3560,7 @@ min_glib_version=0.99.7 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:3480: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:3564: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -3499,7 +3583,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -3575,7 +3659,7 @@ } EOF -if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -3609,7 +3693,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -3619,7 +3703,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:3623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -3697,28 +3781,30 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3705: checking for a BSD compatible install" >&5 +echo "configure:3790: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -3748,24 +3834,26 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' for ac_hdr in unistd.h string.h memory.h crypt.h grp.h limits.h malloc.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3758: checking for $ac_hdr" >&5 +echo "configure:3846: 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:3768: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3856: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -3794,18 +3882,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3798: checking for $ac_hdr" >&5 +echo "configure:3886: 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:3808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3896: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -3836,12 +3924,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:3840: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:3928: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -3857,7 +3945,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:3861: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3949: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3882,12 +3970,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:3886: checking for $ac_hdr that defines DIR" >&5 +echo "configure:3974: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -3895,7 +3983,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:3899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -3920,7 +4008,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:3924: checking for opendir in -ldir" >&5 +echo "configure:4012: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3928,7 +4016,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4031: \"$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 @@ -3961,7 +4049,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:3965: checking for opendir in -lx" >&5 +echo "configure:4053: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3969,7 +4057,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4072: \"$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 @@ -4004,7 +4092,7 @@ echo $ac_n "checking filename fits on dirent.d_name""... $ac_c" 1>&6 -echo "configure:4008: checking filename fits on dirent.d_name" >&5 +echo "configure:4096: checking filename fits on dirent.d_name" >&5 if eval "test \"`echo '$''{'ac_cv_dnamesize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4018,7 +4106,7 @@ else cat > conftest.$ac_ext < @@ -4035,7 +4123,7 @@ EOF -if { (eval echo configure:4039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_dnamesize="no" @@ -4064,12 +4152,12 @@ echo "$ac_t""$ac_cv_dnamesize" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:4068: checking for ANSI C header files" >&5 +echo "configure:4156: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4077,8 +4165,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:4169: \"$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* ac_cv_header_stdc=yes @@ -4094,7 +4182,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4112,7 +4200,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -4133,7 +4221,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -4144,7 +4232,7 @@ exit (0); } EOF -if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -4176,12 +4264,12 @@ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:4180: checking for st_blksize in struct stat" >&5 +echo "configure:4268: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4189,7 +4277,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:4193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -4210,12 +4298,12 @@ fi echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6 -echo "configure:4214: checking for st_blocks in struct stat" >&5 +echo "configure:4302: checking for st_blocks in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blocks'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4223,7 +4311,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF -if { (eval echo configure:4227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else @@ -4242,16 +4330,16 @@ EOF else - LIBOBJS="$LIBOBJS fileblocks.o" + LIBOBJS="$LIBOBJS fileblocks.${ac_objext}" fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 -echo "configure:4250: checking for st_rdev in struct stat" >&5 +echo "configure:4338: checking for st_rdev in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -4259,7 +4347,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF -if { (eval echo configure:4263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else @@ -4284,12 +4372,12 @@ for ac_func in strerror statfs getwd strcasecmp strncasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4288: checking for $ac_func" >&5 +echo "configure:4376: 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; then +if { (eval echo configure:4404: \"$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 @@ -4339,12 +4427,12 @@ for ac_func in strdup memmove pwdauth truncate initgroups putenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4343: checking for $ac_func" >&5 +echo "configure:4431: 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; then +if { (eval echo configure:4459: \"$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 @@ -4394,12 +4482,12 @@ for ac_func in memset memcpy tcsetattr tcgetattr cfgetospeed do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4398: checking for $ac_func" >&5 +echo "configure:4486: 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; then +if { (eval echo configure:4514: \"$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 @@ -4449,12 +4537,12 @@ for ac_func in sigaction sigemptyset sigprocmask sigaddset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4453: checking for $ac_func" >&5 +echo "configure:4541: 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; then +if { (eval echo configure:4569: \"$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 @@ -4504,12 +4592,12 @@ for ac_func in sysconf setuid setreuid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4508: checking for $ac_func" >&5 +echo "configure:4596: 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; then +if { (eval echo configure:4624: \"$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 @@ -4560,7 +4648,7 @@ SHADOWLIB= if test x$system = xLinux; then echo $ac_n "checking for pw_encrypt in -lshadow""... $ac_c" 1>&6 -echo "configure:4564: checking for pw_encrypt in -lshadow" >&5 +echo "configure:4652: checking for pw_encrypt in -lshadow" >&5 ac_lib_var=`echo shadow'_'pw_encrypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4568,7 +4656,7 @@ ac_save_LIBS="$LIBS" LIBS="-lshadow $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4671: \"$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 @@ -4600,18 +4688,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4604: checking for $ac_hdr" >&5 +echo "configure:4692: 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:4614: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:4702: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -4643,18 +4731,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4647: checking for $ac_hdr" >&5 +echo "configure:4735: 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:4657: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:4745: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -4701,7 +4789,7 @@ NEED_CRYPT_PROTOTYPE=yes if test x$ac_cv_header_crypt_h = xyes; then cat > conftest.$ac_ext < int main() { return 0; } @@ -4722,7 +4810,7 @@ else if test x$ac_cv_header_unistd_h = xyes; then cat > conftest.$ac_ext < int main() { return 0; } @@ -4753,18 +4841,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4757: checking for $ac_hdr" >&5 +echo "configure:4845: 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:4767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:4855: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -4794,12 +4882,12 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4798: checking for $ac_func" >&5 +echo "configure:4886: 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; then +if { (eval echo configure:4914: \"$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 @@ -4844,7 +4932,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:4848: checking for crypt in -lcrypt" >&5 +echo "configure:4936: checking for crypt in -lcrypt" >&5 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4852,7 +4940,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4955: \"$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 @@ -4883,7 +4971,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for crypt in -lcrypt_i""... $ac_c" 1>&6 -echo "configure:4887: checking for crypt in -lcrypt_i" >&5 +echo "configure:4975: checking for crypt in -lcrypt_i" >&5 ac_lib_var=`echo crypt_i'_'crypt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4891,7 +4979,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcrypt_i $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4994: \"$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 @@ -4932,12 +5020,12 @@ for ac_func in grantpt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4936: checking for $ac_func" >&5 +echo "configure:5024: 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; then +if { (eval echo configure:5052: \"$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 @@ -4988,7 +5076,7 @@ : else echo $ac_n "checking for grantpt in -lpt""... $ac_c" 1>&6 -echo "configure:4992: checking for grantpt in -lpt" >&5 +echo "configure:5080: checking for grantpt in -lpt" >&5 ac_lib_var=`echo pt'_'grantpt | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4996,7 +5084,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5099: \"$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 @@ -5038,7 +5126,7 @@ if test x$GCC = xyes; then echo $ac_n "checking for tolower in -lintl""... $ac_c" 1>&6 -echo "configure:5042: checking for tolower in -lintl" >&5 +echo "configure:5130: checking for tolower in -lintl" >&5 ac_lib_var=`echo intl'_'tolower | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5046,7 +5134,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5149: \"$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 @@ -5089,12 +5177,12 @@ for ac_func in statlstat do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5093: checking for $ac_func" >&5 +echo "configure:5181: 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; then +if { (eval echo configure:5209: \"$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 @@ -5143,9 +5231,9 @@ echo $ac_n "checking for AIX defines""... $ac_c" 1>&6 -echo "configure:5147: checking for AIX defines" >&5 +echo "configure:5235: checking for AIX defines" >&5 cat > conftest.$ac_ext <&6 -echo "configure:5174: checking for getmntent in -lgen" >&5 +echo "configure:5262: checking for getmntent in -lgen" >&5 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5178,7 +5266,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5281: \"$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 @@ -5215,18 +5303,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5219: checking for $ac_hdr" >&5 +echo "configure:5307: 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:5229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5317: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -5255,18 +5343,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5259: checking for $ac_hdr" >&5 +echo "configure:5347: 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:5269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5357: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -5295,18 +5383,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5299: checking for $ac_hdr" >&5 +echo "configure:5387: 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:5309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5397: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -5334,12 +5422,12 @@ for ac_func in getmntinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5338: checking for $ac_func" >&5 +echo "configure:5426: 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; then +if { (eval echo configure:5454: \"$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 @@ -5389,12 +5477,12 @@ echo $ac_n "checking for d_ino member in directory struct""... $ac_c" 1>&6 -echo "configure:5393: checking for d_ino member in directory struct" >&5 +echo "configure:5481: checking for d_ino member in directory struct" >&5 if eval "test \"`echo '$''{'fu_cv_sys_d_ino_in_dirent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5417,7 +5505,7 @@ struct dirent dp; dp.d_ino = 0; ; return 0; } EOF -if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_d_ino_in_dirent=yes else @@ -5444,7 +5532,7 @@ # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). # getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX, -lgen on Unixware. echo $ac_n "checking for getmntent in -lsun""... $ac_c" 1>&6 -echo "configure:5448: checking for getmntent in -lsun" >&5 +echo "configure:5536: checking for getmntent in -lsun" >&5 ac_lib_var=`echo sun'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5452,7 +5540,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsun $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5555: \"$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 @@ -5482,7 +5570,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getmntent in -lseq""... $ac_c" 1>&6 -echo "configure:5486: checking for getmntent in -lseq" >&5 +echo "configure:5574: checking for getmntent in -lseq" >&5 ac_lib_var=`echo seq'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5490,7 +5578,7 @@ ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5593: \"$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 @@ -5520,7 +5608,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for getmntent in -lgen""... $ac_c" 1>&6 -echo "configure:5524: checking for getmntent in -lgen" >&5 +echo "configure:5612: checking for getmntent in -lgen" >&5 ac_lib_var=`echo gen'_'getmntent | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5528,7 +5616,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgen $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5631: \"$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 @@ -5564,12 +5652,12 @@ fi echo $ac_n "checking for getmntent""... $ac_c" 1>&6 -echo "configure:5568: checking for getmntent" >&5 +echo "configure:5656: checking for getmntent" >&5 if eval "test \"`echo '$''{'ac_cv_func_getmntent'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_getmntent=yes" else @@ -5623,12 +5711,12 @@ if test -z "$list_mounted_fs"; then # SVR4 echo $ac_n "checking for two-argument getmntent function""... $ac_c" 1>&6 -echo "configure:5627: checking for two-argument getmntent function" >&5 +echo "configure:5715: checking for two-argument getmntent function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -5657,7 +5745,7 @@ if test -z "$list_mounted_fs"; then # 4.3BSD, SunOS, HP-UX, Dynix, Irix echo $ac_n "checking for one-argument getmntent function""... $ac_c" 1>&6 -echo "configure:5661: checking for one-argument getmntent function" >&5 +echo "configure:5749: checking for one-argument getmntent function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntent1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5686,12 +5774,12 @@ if test -z "$list_mounted_fs"; then # DEC Alpha running OSF/1. echo $ac_n "checking for getfsstat function""... $ac_c" 1>&6 -echo "configure:5690: checking for getfsstat function" >&5 +echo "configure:5778: checking for getfsstat function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getsstat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5702,7 +5790,7 @@ numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ; return 0; } EOF -if { (eval echo configure:5706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* fu_cv_sys_mounted_getsstat=yes else @@ -5727,18 +5815,18 @@ if test -z "$list_mounted_fs"; then # AIX. echo $ac_n "checking for mntctl function and struct vmount""... $ac_c" 1>&6 -echo "configure:5731: checking for mntctl function and struct vmount" >&5 +echo "configure:5819: checking for mntctl function and struct vmount" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_vmount'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5741: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5829: \"$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* fu_cv_sys_mounted_vmount=yes @@ -5765,12 +5853,12 @@ if test -z "$list_mounted_fs"; then # SVR3 echo $ac_n "checking for existence of three headers""... $ac_c" 1>&6 -echo "configure:5769: checking for existence of three headers" >&5 +echo "configure:5857: checking for existence of three headers" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread_fstyp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -5778,8 +5866,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5870: \"$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* fu_cv_sys_mounted_fread_fstyp=yes @@ -5806,7 +5894,7 @@ if test -z "$list_mounted_fs"; then # 4.4BSD and DEC OSF/1. echo $ac_n "checking for getmntinfo function""... $ac_c" 1>&6 -echo "configure:5810: checking for getmntinfo function" >&5 +echo "configure:5898: checking for getmntinfo function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmntinfo'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5814,7 +5902,7 @@ ok= if test $ac_cv_func_getmntinfo = yes; then cat > conftest.$ac_ext < EOF @@ -5847,20 +5935,20 @@ if test -z "$list_mounted_fs"; then # Ultrix echo $ac_n "checking for getmnt function""... $ac_c" 1>&6 -echo "configure:5851: checking for getmnt function" >&5 +echo "configure:5939: checking for getmnt function" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_getmnt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5863: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5951: \"$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* fu_cv_sys_mounted_getmnt=yes @@ -5887,18 +5975,18 @@ if test -z "$list_mounted_fs"; then # SVR2 echo $ac_n "checking whether it is possible to resort to fread on /etc/mnttab""... $ac_c" 1>&6 -echo "configure:5891: checking whether it is possible to resort to fread on /etc/mnttab" >&5 +echo "configure:5979: checking whether it is possible to resort to fread on /etc/mnttab" >&5 if eval "test \"`echo '$''{'fu_cv_sys_mounted_fread'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:5989: \"$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* fu_cv_sys_mounted_fread=yes @@ -5931,7 +6019,7 @@ echo "checking how to get filesystem space usage" 1>&6 -echo "configure:5935: checking how to get filesystem space usage" >&5 +echo "configure:6023: checking how to get filesystem space usage" >&5 space=no # Here we'll compromise a little (and perform only the link test) @@ -5941,12 +6029,12 @@ for ac_func in statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5945: checking for $ac_func" >&5 +echo "configure:6033: 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; then +if { (eval echo configure:6061: \"$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 @@ -6005,7 +6093,7 @@ if test $space = no; then # DEC Alpha running OSF/1 echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6 -echo "configure:6009: checking for 3-argument statfs function (DEC OSF/1)" >&5 +echo "configure:6097: checking for 3-argument statfs function (DEC OSF/1)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6013,7 +6101,7 @@ fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext < @@ -6026,7 +6114,7 @@ exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:6030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs3_osf1=yes else @@ -6053,7 +6141,7 @@ if test $space = no; then # AIX echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6 -echo "configure:6057: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 +echo "configure:6145: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6061,7 +6149,7 @@ fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_bsize=yes else @@ -6107,7 +6195,7 @@ if test $space = no; then # SVR3 echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6 -echo "configure:6111: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 +echo "configure:6199: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6115,7 +6203,7 @@ fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext < #include @@ -6125,7 +6213,7 @@ exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:6129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs4=yes else @@ -6152,7 +6240,7 @@ if test $space = no; then # 4.4BSD and NetBSD echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6 -echo "configure:6156: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 +echo "configure:6244: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6160,7 +6248,7 @@ fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext < #ifdef HAVE_SYS_PARAM_H @@ -6176,7 +6264,7 @@ exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_statfs2_fsize=yes else @@ -6203,7 +6291,7 @@ if test $space = no; then # Ultrix echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6 -echo "configure:6207: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 +echo "configure:6295: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6211,7 +6299,7 @@ fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext < @@ -6232,7 +6320,7 @@ exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:6236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then fu_cv_sys_stat_fs_data=yes else @@ -6260,12 +6348,12 @@ echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6264: checking for mode_t" >&5 +echo "configure:6352: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6274,7 +6362,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])mode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_mode_t=yes else @@ -6293,12 +6381,12 @@ fi echo $ac_n "checking for umode_t""... $ac_c" 1>&6 -echo "configure:6297: checking for umode_t" >&5 +echo "configure:6385: checking for umode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_umode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6307,7 +6395,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "umode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])umode_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_umode_t=yes else @@ -6326,12 +6414,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6330: checking for off_t" >&5 +echo "configure:6418: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6340,7 +6428,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes else @@ -6359,12 +6447,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6363: checking for pid_t" >&5 +echo "configure:6451: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6373,7 +6461,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_pid_t=yes else @@ -6392,12 +6480,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6396: checking for uid_t in sys/types.h" >&5 +echo "configure:6484: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -6426,12 +6514,12 @@ fi echo $ac_n "checking for nlink_t""... $ac_c" 1>&6 -echo "configure:6430: checking for nlink_t" >&5 +echo "configure:6518: checking for nlink_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_nlink_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6440,7 +6528,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "nlink_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])nlink_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_nlink_t=yes else @@ -6463,18 +6551,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6467: checking for $ac_hdr" >&5 +echo "configure:6555: 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:6477: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:6565: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -6502,12 +6590,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6506: checking for $ac_func" >&5 +echo "configure:6594: 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; then +if { (eval echo configure:6622: \"$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 @@ -6555,7 +6643,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:6559: checking for working mmap" >&5 +echo "configure:6647: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6563,7 +6651,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -6728,19 +6816,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6732: checking for working alloca.h" >&5 +echo "configure:6820: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6761,25 +6849,30 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6765: checking for alloca" >&5 +echo "configure:6853: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca /* predefined by HP cc +Olibcalls */ +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif @@ -6789,7 +6882,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6814,19 +6907,19 @@ # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.o + ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6825: checking whether alloca needs Cray hooks" >&5 +echo "configure:6918: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:6855: checking for $ac_func" >&5 +echo "configure:6948: 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; then +if { (eval echo configure:6976: \"$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 @@ -6906,7 +6999,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6910: checking stack direction for C alloca" >&5 +echo "configure:7003: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6914,7 +7007,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6961,7 +7054,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:6965: checking for X" >&5 +echo "configure:7058: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7023,13 +7116,13 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:7125: \"$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* # We can compile using X headers with no special include directory. @@ -7097,14 +7190,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -7210,17 +7303,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:7214: checking whether -R must be followed by a space" >&5 +echo "configure:7307: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7236,14 +7329,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7275,7 +7368,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:7279: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7372: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7283,7 +7376,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7391: \"$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 @@ -7316,7 +7409,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:7320: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7413: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7324,7 +7417,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7432: \"$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 @@ -7364,12 +7457,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:7368: checking for gethostbyname" >&5 +echo "configure:7461: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -7413,7 +7506,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7417: checking for gethostbyname in -lnsl" >&5 +echo "configure:7510: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7421,7 +7514,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7529: \"$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 @@ -7462,12 +7555,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:7466: checking for connect" >&5 +echo "configure:7559: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -7511,7 +7604,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7515: checking for connect in -lsocket" >&5 +echo "configure:7608: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7519,7 +7612,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7627: \"$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 @@ -7554,12 +7647,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7558: checking for remove" >&5 +echo "configure:7651: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -7603,7 +7696,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7607: checking for remove in -lposix" >&5 +echo "configure:7700: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7611,7 +7704,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7719: \"$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 @@ -7646,12 +7739,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7650: checking for shmat" >&5 +echo "configure:7743: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -7695,7 +7788,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7699: checking for shmat in -lipc" >&5 +echo "configure:7792: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7703,7 +7796,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7811: \"$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 @@ -7747,15 +7840,15 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:7751: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7844: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-lICE $LIBS" +LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7863: \"$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 @@ -7793,7 +7886,7 @@ echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6 -echo "configure:7797: checking for t_accept in -lnsl" >&5 +echo "configure:7890: checking for t_accept in -lnsl" >&5 ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7801,7 +7894,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7840,7 +7933,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:7844: checking for socket in -lsocket" >&5 +echo "configure:7937: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7848,7 +7941,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7956: \"$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 @@ -7891,12 +7984,12 @@ for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7895: checking for $ac_func" >&5 +echo "configure:7988: 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; then +if { (eval echo configure:8016: \"$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 @@ -7947,7 +8040,7 @@ # socket is not in the default libraries. See if it's in some other. for lib in bsd socket inet; do echo $ac_n "checking for socket in -l$lib""... $ac_c" 1>&6 -echo "configure:7951: checking for socket in -l$lib" >&5 +echo "configure:8044: checking for socket in -l$lib" >&5 ac_lib_var=`echo $lib'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7955,7 +8048,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8063: \"$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 @@ -7998,12 +8091,12 @@ have_gethostbyname=no echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:8002: checking for gethostbyname" >&5 +echo "configure:8095: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -8049,7 +8142,7 @@ # gethostbyname is not in the default libraries. See if it's in some other. for lib in bsd socket inet; do echo $ac_n "checking for gethostbyname in -l$lib""... $ac_c" 1>&6 -echo "configure:8053: checking for gethostbyname in -l$lib" >&5 +echo "configure:8146: checking for gethostbyname in -l$lib" >&5 ac_lib_var=`echo $lib'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8057,7 +8150,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8165: \"$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 @@ -8094,12 +8187,12 @@ for ac_func in socketpair do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8098: checking for $ac_func" >&5 +echo "configure:8191: 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; then +if { (eval echo configure:8219: \"$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 @@ -8148,7 +8241,7 @@ echo $ac_n "checking for get_process_stats in -lseq""... $ac_c" 1>&6 -echo "configure:8152: checking for get_process_stats in -lseq" >&5 +echo "configure:8245: checking for get_process_stats in -lseq" >&5 ac_lib_var=`echo seq'_'get_process_stats | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8156,7 +8249,7 @@ ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8195,7 +8288,7 @@ echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6 -echo "configure:8199: checking for t_accept in -lnsl" >&5 +echo "configure:8292: checking for t_accept in -lnsl" >&5 ac_lib_var=`echo nsl'_'t_accept | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8203,7 +8296,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8311: \"$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 @@ -8242,7 +8335,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8246: checking for socket in -lsocket" >&5 +echo "configure:8339: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8250,7 +8343,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8358: \"$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 @@ -8293,12 +8386,12 @@ for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8297: checking for $ac_func" >&5 +echo "configure:8390: 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; then +if { (eval echo configure:8418: \"$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 @@ -8349,7 +8442,7 @@ # socket is not in the default libraries. See if it's in some other. for lib in bsd socket inet; do echo $ac_n "checking for socket in -l$lib""... $ac_c" 1>&6 -echo "configure:8353: checking for socket in -l$lib" >&5 +echo "configure:8446: checking for socket in -l$lib" >&5 ac_lib_var=`echo $lib'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8357,7 +8450,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8465: \"$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 @@ -8400,12 +8493,12 @@ have_gethostbyname=no echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:8404: checking for gethostbyname" >&5 +echo "configure:8497: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -8451,7 +8544,7 @@ # gethostbyname is not in the default libraries. See if it's in some other. for lib in bsd socket inet; do echo $ac_n "checking for gethostbyname in -l$lib""... $ac_c" 1>&6 -echo "configure:8455: checking for gethostbyname in -l$lib" >&5 +echo "configure:8548: checking for gethostbyname in -l$lib" >&5 ac_lib_var=`echo $lib'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8459,7 +8552,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8567: \"$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 @@ -8500,14 +8593,14 @@ av_struct_linger=no echo $ac_n "checking struct linger is available""... $ac_c" 1>&6 -echo "configure:8504: checking struct linger is available" >&5 +echo "configure:8597: checking struct linger is available" >&5 if test "$cross_compiling" = yes; then av_struct_linger=no else cat > conftest.$ac_ext < @@ -8523,7 +8616,7 @@ } EOF -if { (eval echo configure:8527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8620: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -8548,12 +8641,12 @@ for ac_func in pmap_set do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8552: checking for $ac_func" >&5 +echo "configure:8645: 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; then +if { (eval echo configure:8673: \"$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 @@ -8598,7 +8691,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pmap_set in -lrpc""... $ac_c" 1>&6 -echo "configure:8602: checking for pmap_set in -lrpc" >&5 +echo "configure:8695: checking for pmap_set in -lrpc" >&5 ac_lib_var=`echo rpc'_'pmap_set | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8606,7 +8699,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrpc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8714: \"$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 @@ -8649,12 +8742,12 @@ for ac_func in pmap_getport pmap_getmaps rresvport do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8653: checking for $ac_func" >&5 +echo "configure:8746: 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; then +if { (eval echo configure:8774: \"$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 @@ -8705,18 +8798,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8709: checking for $ac_hdr" >&5 +echo "configure:8802: 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:8719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:8812: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -8934,7 +9027,7 @@ else echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6 -echo "configure:8938: checking for Gpm_Repeat in -lgpm" >&5 +echo "configure:9031: checking for Gpm_Repeat in -lgpm" >&5 ac_lib_var=`echo gpm'_'Gpm_Repeat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8942,7 +9035,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9050: \"$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 @@ -9092,7 +9185,7 @@ # Extract the first word of "gnome-config", so it can be a program name with args. set dummy gnome-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9096: checking for $ac_word" >&5 +echo "configure:9189: 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 @@ -9100,9 +9193,13 @@ /*) ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GNOME_CONFIG="$GNOME_CONFIG" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GNOME_CONFIG="$ac_dir/$ac_word" @@ -9125,7 +9222,7 @@ no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:9129: checking if $GNOME_CONFIG works" >&5 +echo "configure:9226: checking if $GNOME_CONFIG works" >&5 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 @@ -9133,7 +9230,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:9137: checking for $ac_word" >&5 +echo "configure:9234: 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 @@ -9141,9 +9238,13 @@ /*) ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_ORBIT_CONFIG="$ORBIT_CONFIG" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_ORBIT_CONFIG="$ac_dir/$ac_word" @@ -9165,7 +9266,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:9169: checking for $ac_word" >&5 +echo "configure:9270: 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 @@ -9173,9 +9274,13 @@ /*) ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_ORBIT_IDL="$ORBIT_IDL" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_ORBIT_IDL="$ac_dir/$ac_word" @@ -9195,7 +9300,7 @@ fi echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 -echo "configure:9199: checking for working ORBit environment" >&5 +echo "configure:9304: 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 @@ -9231,7 +9336,7 @@ fi echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 -echo "configure:9235: checking for gnorba libraries" >&5 +echo "configure:9340: 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 @@ -9305,7 +9410,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:9309: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:9414: 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" \ @@ -9339,15 +9444,16 @@ # 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:9343: checking for $ac_word" >&5 +echo "configure:9448: 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 if test -n "$HAVE_nroff"; then ac_cv_prog_HAVE_nroff="$HAVE_nroff" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_HAVE_nroff="true" @@ -9367,7 +9473,7 @@ if $HAVE_nroff; then echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6 -echo "configure:9371: checking for manual formatting macros" >&5 +echo "configure:9477: 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 @@ -9391,7 +9497,7 @@ if $HAVE_nroff; then echo $ac_n "checking If nroff accepts -Tascii""... $ac_c" 1>&6 -echo "configure:9395: checking If nroff accepts -Tascii" >&5 +echo "configure:9501: 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 @@ -9415,15 +9521,16 @@ # 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:9419: checking for $ac_word" >&5 +echo "configure:9525: 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 if test -n "$HAVE_FILECMD"; then ac_cv_prog_HAVE_FILECMD="$HAVE_FILECMD" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_HAVE_FILECMD="true" @@ -9443,7 +9550,7 @@ if $HAVE_FILECMD; then echo $ac_n "checking for - option to file command""... $ac_c" 1>&6 -echo "configure:9447: checking for - option to file command" >&5 +echo "configure:9554: 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 @@ -9486,7 +9593,7 @@ echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6 -echo "configure:9490: checking for -L option to file command" >&5 +echo "configure:9597: 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 @@ -9512,7 +9619,7 @@ fi echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6 -echo "configure:9516: checking for - option to grep command" >&5 +echo "configure:9623: 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 @@ -9552,7 +9659,7 @@ echo $ac_n "checking for subshell support""... $ac_c" 1>&6 -echo "configure:9556: checking for subshell support" >&5 +echo "configure:9663: checking for subshell support" >&5 # Check whether --with-subshell or --without-subshell was given. if test "${with_subshell+set}" = set; then withval="$with_subshell" @@ -9694,7 +9801,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:9698: checking for SLang_init_tty in -lslang" >&5 +echo "configure:9805: 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 @@ -9702,7 +9809,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9824: \"$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 @@ -9732,18 +9839,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9736: checking for $ac_hdr" >&5 +echo "configure:9843: 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:9746: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:9853: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -9777,18 +9884,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9781: checking for $ac_hdr" >&5 +echo "configure:9888: 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:9791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:9898: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -9857,7 +9964,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:9861: checking for tgoto in -ltermcap" >&5 +echo "configure:9968: 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 @@ -9865,7 +9972,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9987: \"$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 @@ -9938,9 +10045,93 @@ EOF LSLANG="-lslang" - screen_manager="SLang (using system-installed library)" + screen_manager="SLang (system-installed library)" echo "$ac_t""Using system installed SLang library" 1>&6 rm slang/slang.h + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LSLANG" + if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +else + cat > conftest.$ac_ext < + #else + #include + #endif + int main(void){ + SLtt_initialize(""); + SLtt_tgetflag(""); + return 0; + } +EOF +if { (eval echo configure:10072: \"$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 +EOF + + echo "$ac_t""Using SLang screen manager/terminfo" 1>&6 + slang_term=" with terminfo" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + LIBS="$ac_save_LIBS"; echo "$ac_t""Using SLang screen manager/termcap" 1>&6 + cat >> confdefs.h <<\EOF +#define USE_TERMCAP 1 +EOF + + echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 +echo "configure:10091: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -ltermcap" +else + echo "$ac_t""no" 1>&6 +fi + + slang_term=" with termcap" + +fi +rm -fr conftest* +fi + else MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)" LIBSLANG="libmcslang.a" @@ -9954,24 +10145,14 @@ if $slang_check_lib then use_terminfo=false - if test -d /usr/lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/share/lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/local/lib/terminfo; then - use_terminfo=true; - fi - if test -d /lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/local/share/terminfo; then - use_terminfo=true; - fi - if test -d /usr/share/terminfo; then - use_terminfo=true; - fi + for dir in /usr/lib /usr/share/lib /usr/local/lib /lib \ + /usr/local/share /usr/share + do + if test -d $dir/terminfo; then + use_terminfo=true; + break + fi + done if $use_terminfo; then cat >> confdefs.h <<\EOF #define SLANG_TERMINFO 1 @@ -9987,7 +10168,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:9991: checking for tgoto in -ltermcap" >&5 +echo "configure:10172: 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 @@ -9995,7 +10176,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10191: \"$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 @@ -10181,18 +10362,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10185: checking for $ac_hdr" >&5 +echo "configure:10366: 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:10195: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:10376: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -10244,7 +10425,7 @@ fi else echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6 -echo "configure:10248: checking for ext2fs_close in -lext2fs" >&5 +echo "configure:10429: 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 @@ -10252,7 +10433,7 @@ ac_save_LIBS="$LIBS" LIBS="-lext2fs -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:10448: \"$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 @@ -10284,18 +10465,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10288: checking for $ac_hdr" >&5 +echo "configure:10469: 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:10298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:10479: \"$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* eval "ac_cv_header_$ac_safe=yes" @@ -10359,7 +10540,7 @@ if $search_ncurses then echo "checking "location of ncurses.h file"" 1>&6 -echo "configure:10363: checking "location of ncurses.h file"" >&5 +echo "configure:10544: checking "location of ncurses.h file"" >&5 if $search_ncurses @@ -10499,7 +10680,7 @@ if $search_ncurses then cat > conftest.$ac_ext < EOF @@ -10525,7 +10706,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -10585,10 +10766,10 @@ else # check for ncurses version, to properly ifdef mouse-fix echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10589: checking for ncurses version" >&5 +echo "configure:10770: checking for ncurses version" >&5 ncurses_version=unknown cat > conftest.$ac_ext < @@ -10632,12 +10813,12 @@ for ac_func in resizeterm keyok do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:10636: checking for $ac_func" >&5 +echo "configure:10817: 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; then +if { (eval echo configure:10845: \"$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 @@ -10699,9 +10880,93 @@ EOF LSLANG="-lslang" - screen_manager="SLang (using system-installed library)" + screen_manager="SLang (system-installed library)" echo "$ac_t""Using system installed SLang library" 1>&6 rm slang/slang.h + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LSLANG" + if test "$cross_compiling" = yes; then + { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +else + cat > conftest.$ac_ext < + #else + #include + #endif + int main(void){ + SLtt_initialize(""); + SLtt_tgetflag(""); + return 0; + } +EOF +if { (eval echo configure:10907: \"$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 +EOF + + echo "$ac_t""Using SLang screen manager/terminfo" 1>&6 + slang_term=" with terminfo" + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -fr conftest* + LIBS="$ac_save_LIBS"; echo "$ac_t""Using SLang screen manager/termcap" 1>&6 + cat >> confdefs.h <<\EOF +#define USE_TERMCAP 1 +EOF + + echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 +echo "configure:10926: 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 +else + ac_save_LIBS="$LIBS" +LIBS="-ltermcap $LIBS $LIBS" +cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=yes" +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBS -ltermcap" +else + echo "$ac_t""no" 1>&6 +fi + + slang_term=" with termcap" + +fi +rm -fr conftest* +fi + else MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)" LIBSLANG="libmcslang.a" @@ -10715,24 +10980,14 @@ if $slang_check_lib then use_terminfo=false - if test -d /usr/lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/share/lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/local/lib/terminfo; then - use_terminfo=true; - fi - if test -d /lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/local/share/terminfo; then - use_terminfo=true; - fi - if test -d /usr/share/terminfo; then - use_terminfo=true; - fi + for dir in /usr/lib /usr/share/lib /usr/local/lib /lib \ + /usr/local/share /usr/share + do + if test -d $dir/terminfo; then + use_terminfo=true; + break + fi + done if $use_terminfo; then cat >> confdefs.h <<\EOF #define SLANG_TERMINFO 1 @@ -10748,7 +11003,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10752: checking for tgoto in -ltermcap" >&5 +echo "configure:11007: 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 @@ -10756,7 +11011,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11026: \"$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 @@ -10807,7 +11062,7 @@ install_saver="yes" echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:10811: checking for pam_start in -lpam" >&5 +echo "configure:11066: 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 @@ -10815,7 +11070,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam -ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11085: \"$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 @@ -10869,7 +11124,7 @@ else echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 -echo "configure:10873: checking for -lXpm" >&5 +echo "configure:11128: checking for -lXpm" >&5 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10885,7 +11140,7 @@ has_xpm_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -10895,7 +11150,7 @@ XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:10899: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_xpm=yes else @@ -10917,7 +11172,7 @@ echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6 -echo "configure:10921: checking for X11 non-rectangular shape extension" >&5 +echo "configure:11176: 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 @@ -10933,7 +11188,7 @@ has_shape_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -10948,7 +11203,7 @@ ; return 0; } EOF -if { (eval echo configure:10952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_shape=yes else @@ -10984,7 +11239,7 @@ echo else echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6 -echo "configure:10988: checking for setupterm in -lcurses" >&5 +echo "configure:11243: 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 @@ -10992,7 +11247,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:11262: \"$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 @@ -11020,7 +11275,7 @@ echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -11033,7 +11288,7 @@ ; return 0; } EOF -if { (eval echo configure:11037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* LIBS="$LIBS -lcurses" @@ -11099,6 +11354,9 @@ builddir=`pwd` +SHELL=${SHELL-"/bin/sh"} + + trap '' 1 2 15 cat > confcache <<\EOF @@ -11123,7 +11381,7 @@ # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -11190,7 +11448,7 @@ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -11237,9 +11495,11 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -11260,7 +11520,6 @@ s%@mandir@%$mandir%g s%@VERSION@%$VERSION%g s%@PACKAGE@%$PACKAGE%g -s%@MC@%$MC%g s%@SET_MAKE@%$SET_MAKE%g s%@CC@%$CC%g s%@CPP@%$CPP%g @@ -11303,6 +11562,7 @@ s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g s%@GLIB_LIBS@%$GLIB_LIBS%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@REGEX_O@%$REGEX_O%g s%@LIBOBJS@%$LIBOBJS%g @@ -11673,7 +11933,7 @@ fi fi -if test "x$screen_manager" = xSLang; then +if echo "$screen_manager" | grep -q "SLang" ; then screen_manager="${screen_manager}${slang_term}" fi diff -ruN old/mc-4.5.12/configure.in new/mc-4.5.13/configure.in --- old/mc-4.5.12/configure.in Sun Feb 7 02:53:24 1999 +++ new/mc-4.5.13/configure.in Wed Feb 10 19:41:11 1999 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.12 +VERSION=4.5.13 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) @@ -24,9 +24,6 @@ CCOPTS="$CFLAGS" unset CFLAGS -dnl Find out, if we should default to /usr/local or /usr -AC_PREFIX_PROGRAM(mc) - AC_PROG_MAKE_SET AC_PROG_CC AC_PROG_CPP @@ -69,7 +66,7 @@ X11_WWW=lynx fi -ALL_LINGUAS="es fr ru ko it de pl no" +ALL_LINGUAS="es cs fr ru ko it de pl no" AM_GNU_GETTEXT AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) @@ -818,9 +815,25 @@ then AC_DEFINE(HAVE_SYSTEM_SLANG) LSLANG="-lslang" - screen_manager="SLang (using system-installed library)" + screen_manager="SLang (system-installed library)" AC_MSG_RESULT(Using system installed SLang library) rm slang/slang.h + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LSLANG" + AC_TRY_RUN( + [ + #ifdef SLANG_H_INSIDE_SLANG_DIR + #include + #else + #include + #endif + int main(void){ + SLtt_initialize(""); + SLtt_tgetflag(""); + return 0; + } ], + [LIBS="$ac_save_LIBS"; AC_USE_TERMINFO], + [LIBS="$ac_save_LIBS"; AC_USE_TERMCAP]) else MCCPPFLAGS="$MCCPPFLAGS -I\$(slangdir)" LIBSLANG="libmcslang.a" @@ -834,24 +847,14 @@ if $slang_check_lib then use_terminfo=false - if test -d /usr/lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/share/lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/local/lib/terminfo; then - use_terminfo=true; - fi - if test -d /lib/terminfo; then - use_terminfo=true; - fi - if test -d /usr/local/share/terminfo; then - use_terminfo=true; - fi - if test -d /usr/share/terminfo; then - use_terminfo=true; - fi + for dir in /usr/lib /usr/share/lib /usr/local/lib /lib \ + /usr/local/share /usr/share + do + if test -d $dir/terminfo; then + use_terminfo=true; + break + fi + done if $use_terminfo; then AC_USE_TERMINFO else @@ -1217,6 +1220,9 @@ AC_SUBST(builddir) builddir=`pwd` +SHELL=${SHELL-"/bin/sh"} +AC_SUBST(SHELL) + dnl dnl Output configuration filesn dnl @@ -1259,7 +1265,7 @@ fi fi -if test "x$screen_manager" = xSLang; then +if echo "$screen_manager" | grep -q "SLang" ; then screen_manager="${screen_manager}${slang_term}" fi diff -ruN old/mc-4.5.12/gnome/ChangeLog new/mc-4.5.13/gnome/ChangeLog --- old/mc-4.5.12/gnome/ChangeLog Sun Feb 7 02:53:31 1999 +++ new/mc-4.5.13/gnome/ChangeLog Wed Feb 10 19:41:17 1999 @@ -1,3 +1,83 @@ +1999-02-10 Federico Mena Quintero + + * Makefile.in (ICONS): Added i-fifo.png to the list of icons. + + * gicon.c (gicon_init): Load the proper FIFO and socket icons. + (gnome_file_entry_color): Return the proper icon for FIFOs. + + * i-fifo.png: Added this file, and made i-sock.png be the right + image (thanks, Tigert!). + + * gscreen.c (ILIST_FROM_SW): New macro to extract the icon list + from the scrolled window. + (panel_create_icon_display): Create a scrolled window and put the + icon list inside it. Changed the rest of the code to know about + this. + + * gcorba.c (do_window_close): It turns out that we *do* need to + call CORBA_free(). It was a bug in ORBit which was causing this + to crash. + +1999-02-09 Federico Mena Quintero + + * gdesktop.c (drag_end): Reload the desktop when a drag from the + desktop terminates (the user may have moved something away). + +1999-02-09 Miguel de Icaza + + * gcorba.c (do_window_close): Removed call to CORBA_free, as + PortableServer_POA_deactivate_object already calls CORBA_free on + the object. + +1999-02-09 Federico Mena Quintero + + * glayout.c (gnome_close_panel_event): This function should return + FALSE. + + * gcorba.c (corba_init): Cast poa to PortableServer_POA. + (impl_GNOME_FileManagerWindow_close): Call gnome_close_panel(); do + not destroy the widget by hand. + + * gcmd.c (gnome_close_panel): This function should be void. + + * gpopup2.c (popup_handle_rescan): Call reread_cmd(). + + * gscreen.c (panel_icon_list_button_press): Return TRUE if we + handled a popup menu. + +1999-02-09 Miguel de Icaza + + (impl_GNOME_FileManagerFactory_create_window): Fix bug + spooted by federico. I was connecting to the wrong signal. + +1999-02-09 Federico Mena Quintero + + * gtkdtree.c (gtk_dtree_class_init): Added two new signals, + scan_begin and scan_end. + (gtk_dtree_expand): Call scan_begin() and scan_end(). + (gtk_dtree_select_row): Call scan_begin() and scan_end(). + (gtk_dtree_expand): Use gtk_ctree_select(), not gtk_dtree_select_row(). + (gtk_dtree_collapse): Select the node when it is collapsed. + + * gscreen.c (panel_create_tree_view): Added handlers for the + scan_begin and scan_end signals of the tree -- these will set the + cursor to a watch while the tree is being scanned. + +>>>>>>> 1.321 +1999-02-08 Miguel de Icaza + + * gdesktop.c (desktop_icon_info_destroy): Delete the metadata + associated with this icon. + +1999-02-07 Miguel de Icaza + + * gwidget.c (entry_click): On mouse clicks, mark the input as + changed-without destroy. + +1999-02-07 Federico Mena Quintero + + * gscreen.c (x_create_panel): Removed a couple unused variables. + 1999-02-07 Miguel de Icaza * gtkdtree.c (gtk_dtree_select_row): Disable row selection when diff -ruN old/mc-4.5.12/gnome/Makefile.in new/mc-4.5.13/gnome/Makefile.in --- old/mc-4.5.12/gnome/Makefile.in Sun Feb 7 02:53:31 1999 +++ new/mc-4.5.13/gnome/Makefile.in Wed Feb 10 19:41:17 1999 @@ -93,6 +93,7 @@ i-regular.png \ i-core.png \ i-sock.png \ + i-fifo.png \ i-chardev.png \ i-blockdev.png \ i-stalled.png diff -ruN old/mc-4.5.12/gnome/gcmd.c new/mc-4.5.13/gnome/gcmd.c --- old/mc-4.5.12/gnome/gcmd.c Sun Feb 7 02:53:33 1999 +++ new/mc-4.5.13/gnome/gcmd.c Wed Feb 10 19:41:18 1999 @@ -118,7 +118,7 @@ new_panel_at (panel->cwd); } -int +void gnome_close_panel (GtkWidget *widget, WPanel *panel) { Dlg_head *h = panel->widget.parent; @@ -127,7 +127,7 @@ gtk_timeout_remove (panel->timer_id); panel->timer_id = -1; } - + /* Remove the widgets from the dialog head */ remove_widget (h, panel->current_dir); remove_widget (h, panel->filter_w); @@ -136,12 +136,11 @@ /* Kill them */ destroy_widget (panel->current_dir); destroy_widget (panel->filter_w); - destroy_widget ((void *)panel); + destroy_widget ((Widget *)panel); layout_panel_gone (panel); mc_chdir ("/"); - return TRUE; } void diff -ruN old/mc-4.5.12/gnome/gcmd.h new/mc-4.5.13/gnome/gcmd.h --- old/mc-4.5.12/gnome/gcmd.h Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gcmd.h Wed Feb 10 19:41:20 1999 @@ -7,7 +7,7 @@ void gnome_about_cmd (void); void gnome_quit_cmd (void); void gnome_open_panel (GtkWidget *widget, WPanel *panel); -int gnome_close_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); diff -ruN old/mc-4.5.12/gnome/gcorba.c new/mc-4.5.13/gnome/gcorba.c --- old/mc-4.5.12/gnome/gcorba.c Sun Feb 7 02:53:33 1999 +++ new/mc-4.5.13/gnome/gcorba.c Wed Feb 10 19:41:18 1999 @@ -19,6 +19,7 @@ #include "gscreen.h" #include "main.h" #include "gmain.h" +#include "gcmd.h" #include "gcorba.h" PortableServer_POA poa; @@ -124,7 +125,12 @@ CORBA_exception_init(&ev); objid = PortableServer_POA_servant_to_id (servant->poa, _servant, &ev); PortableServer_POA_deactivate_object (servant->poa, objid, &ev); - CORBA_free(objid); +#if 1 +#warning Remove this ifdef when the new ORBit is released. + g_warning ("Developer Warning: when a new ORBIt is released, remove this code\n"); +#else + CORBA_free (objid); +#endif POA_GNOME_FileManagerWindow__fini(_servant, &ev); g_free(servant); @@ -134,7 +140,7 @@ static void impl_GNOME_FileManagerWindow_close (impl_POA_GNOME_FileManagerWindow * servant, CORBA_Environment * ev) { - gtk_widget_destroy(servant->mywin->xwindow); + gnome_close_panel (GTK_WIDGET (servant->mywin->widget.wdata), servant->mywin); } GNOME_FileManagerWindow @@ -152,7 +158,7 @@ newservant->mywin = new_panel_at ((dir && *dir) ? dir : home_dir); gtk_signal_connect(GTK_OBJECT(newservant->mywin->xwindow), - "destroy", impl_GNOME_FileManagerWindow_close, + "destroy", do_window_close, newservant); POA_GNOME_FileManagerWindow__init((PortableServer_Servant) newservant, ev); @@ -235,7 +241,7 @@ orb = gnome_CORBA_ORB (); - poa = CORBA_ORB_resolve_initial_references (orb, "RootPOA", &ev); + poa = (PortableServer_POA) CORBA_ORB_resolve_initial_references (orb, "RootPOA", &ev); if (ev._major != CORBA_NO_EXCEPTION){ printf ("Can not resolve initial reference to RootPOA"); return; diff -ruN old/mc-4.5.12/gnome/gdesktop.c new/mc-4.5.13/gnome/gdesktop.c --- old/mc-4.5.12/gnome/gdesktop.c Sun Feb 7 02:53:33 1999 +++ new/mc-4.5.13/gnome/gdesktop.c Wed Feb 10 19:41:18 1999 @@ -1178,6 +1178,15 @@ g_free (filelist); } +/* Callback used when a drag from the desktop is finished. We need to reload + * the desktop. + */ +static void +drag_end (GtkWidget *widget, GdkDragContext *context, gpointer data) +{ + reload_desktop_icons (FALSE, 0, 0); +} + /* Set up a desktop icon as a DnD source */ static void setup_icon_dnd_source (DesktopIconInfo *dii) @@ -1190,6 +1199,9 @@ gtk_signal_connect (GTK_OBJECT (DESKTOP_ICON (dii->dicon)->canvas), "drag_data_get", GTK_SIGNAL_FUNC (drag_data_get), dii); + gtk_signal_connect (GTK_OBJECT (DESKTOP_ICON (dii->dicon)->canvas), "drag_end", + GTK_SIGNAL_FUNC (drag_end), + dii); } /* Callback used when we get a drag_motion event from a desktop icon. We have @@ -1494,6 +1506,7 @@ gtk_widget_destroy (dii->dicon); remove_from_slot (dii); + gnome_metadata_delete (dii->filename); g_free (dii->url); g_free (dii->filename); g_free (dii); diff -ruN old/mc-4.5.12/gnome/gicon.c new/mc-4.5.13/gnome/gicon.c --- old/mc-4.5.12/gnome/gicon.c Sun Feb 7 02:53:33 1999 +++ new/mc-4.5.13/gnome/gicon.c Wed Feb 10 19:41:18 1999 @@ -28,6 +28,7 @@ static GdkImlibImage *icon_view_regular; static GdkImlibImage *icon_view_core; static GdkImlibImage *icon_view_sock; +static GdkImlibImage *icon_view_fifo; static GdkImlibImage *icon_view_char_dev; static GdkImlibImage *icon_view_block_dev; static GdkImlibImage *icon_view_stalled; @@ -66,6 +67,7 @@ icon_view_regular = gicon_stock_load ("i-regular.png"); icon_view_core = gicon_stock_load ("i-core.png"); icon_view_sock = gicon_stock_load ("i-sock.png"); + icon_view_fifo = gicon_stock_load ("i-fifo.png"); icon_view_char_dev = gicon_stock_load ("i-chardev.png"); icon_view_block_dev = gicon_stock_load ("i-blockdev.png"); icon_view_stalled = gicon_stock_load ("i-stalled.png"); @@ -77,6 +79,7 @@ icon_view_regular == NULL || icon_view_core == NULL || icon_view_sock == NULL || + icon_view_fifo == NULL || icon_view_char_dev == NULL || icon_view_block_dev == NULL || icon_view_stalled == NULL){ @@ -155,7 +158,7 @@ return icon_view_block_dev; if (S_ISFIFO (mode)) - return icon_view_sock; + return icon_view_fifo; if (is_exe (mode)) return icon_view_executable; diff -ruN old/mc-4.5.12/gnome/glayout.c new/mc-4.5.13/gnome/glayout.c --- old/mc-4.5.12/gnome/glayout.c Sun Feb 7 02:53:33 1999 +++ new/mc-4.5.13/gnome/glayout.c Wed Feb 10 19:41:18 1999 @@ -183,7 +183,7 @@ set_hintbar (char *str) { /*gtk_label_set (GTK_LABEL (current_panel_ptr->panel->status), str);*/ - x_flush_events (); +/* x_flush_events (); */ } void @@ -281,10 +281,10 @@ GtkCheckMenuItem *gnome_toggle_snap (void); GnomeUIInfo gnome_panel_new_menu [] = { - { GNOME_APP_UI_ITEM, N_("_Terminal"), N_("Launch a new terminal in the current directory"), gnome_open_terminal}, + 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. */ - { GNOME_APP_UI_ITEM, N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd }, - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_ITEM_NONE( N_("_Directory..."), N_("Creates a new directory"), gnome_mkdir_cmd ), + GNOMEUIINFO_END }; @@ -299,46 +299,44 @@ /* Gnumeric Spreadsheet */ /* Text Document */ /* etc... */ - { GNOME_APP_UI_SUBTREE, N_("_New"), NULL, gnome_panel_new_menu}, - { GNOME_APP_UI_SEPARATOR }, - { GNOME_APP_UI_ITEM, N_("_Open"), N_("Opens the selected files"), gnome_open_files }, -/* { GNOME_APP_UI_ITEM, N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd },*/ - { GNOME_APP_UI_ITEM, N_("_Copy..."), N_("Copy files"), copy_cmd, NULL}, - { GNOME_APP_UI_ITEM, N_("_Delete..."), N_("Delete files from disk"), delete_cmd, NULL, NULL, 0, NULL, 'd', GDK_CONTROL_MASK}, - { GNOME_APP_UI_ITEM, N_("_Move..."), N_("Rename or move files"), ren_cmd }, - { GNOME_APP_UI_SEPARATOR }, - { GNOME_APP_UI_ITEM, N_("C_lose"), N_("Close this panel"), gnome_close_panel, NULL, - NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CLOSE, - GNOME_KEY_NAME_CLOSE, GNOME_KEY_MOD_CLOSE, NULL }, - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_MENU_NEW_SUBTREE(gnome_panel_new_menu), + GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_MENU_OPEN_ITEM( gnome_open_files, GNOME_STOCK_PIXMAP_OPEN), +/* 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), + GNOMEUIINFO_SEPARATOR, + GNOMEUIINFO_MENU_CLOSE_ITEM(gnome_close_panel, NULL), + GNOMEUIINFO_END }; 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 }, - { GNOME_APP_UI_ITEM, N_("_Select Files..."), N_("Select a group of files"), select_cmd }, - { GNOME_APP_UI_ITEM, N_("_Invert Selection"), N_("Reverses the list of tagged files"), reverse_selection_cmd }, - { GNOME_APP_UI_SEPARATOR }, - { GNOME_APP_UI_ITEM, N_("_Rescan Directory"), N_("Rescan the directory contents"), reread_cmd }, - { GNOME_APP_UI_SEPARATOR }, + { GNOME_APP_UI_ITEM, N_("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_SEPARATOR, + GNOMEUIINFO_ITEM_NONE( N_("_Rescan Directory"), N_("Rescan the directory contents"), reread_cmd ), + GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_MENU_PREFERENCES_ITEM(gnome_configure_box, NULL), - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_END }; GnomeUIInfo gnome_panel_view_menu [] = { - { GNOME_APP_UI_ITEM, N_("Icon View"), NULL, gnome_icon_view_cmd, NULL}, - { GNOME_APP_UI_ITEM, N_("Partial View"), NULL, gnome_partial_view_cmd, NULL}, - { GNOME_APP_UI_ITEM, N_("Full View"), NULL, gnome_full_view_cmd, NULL}, - { GNOME_APP_UI_ITEM, N_("Custom View"), NULL, gnome_custom_view_cmd, NULL}, - {GNOME_APP_UI_ENDOFINFO, NULL, NULL, NULL, NULL, NULL, - GNOME_APP_PIXMAP_NONE, NULL, 0, 0, NULL} + 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 [] = { - { GNOME_APP_UI_ITEM, N_("_Sort By..."), N_("Confirmation settings"), gnome_sort_cmd }, - { GNOME_APP_UI_ITEM, N_("_Filter View..."), N_("Global option settings"), gnome_filter_cmd }, - { GNOME_APP_UI_SEPARATOR }, - { GNOME_APP_UI_RADIOITEMS, NULL , NULL, gnome_panel_view_menu}, - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + 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_END }; GnomeUIInfo gnome_panel_commands_menu [] = { @@ -351,33 +349,32 @@ { GNOME_APP_UI_ITEM, N_("_Run Command in panel..."),N_("Run a command and put the results in a panel"), gnome_external_panelize }, #ifdef USE_VFS - { GNOME_APP_UI_ITEM, N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs }, + GNOMEUIINFO_ITEM_NONE(N_("_Active VFS list..."),N_("List of active virtual file systems"), reselect_vfs), #endif #ifdef USE_EXT2FSLIB /*does this do anything?*/ /* { GNOME_APP_UI_ITEM, N_("_Undelete files (ext2fs only)..."), N_("Recover deleted files"), undelete_cmd },*/ #endif #ifdef WITH_BACKGROUND - { GNOME_APP_UI_ITEM, N_("_Background jobs..."), N_("List of background operations"), jobs_cmd }, + GNOMEUIINFO_ITEM_NONE( N_("_Background jobs..."), N_("List of background operations"), jobs_cmd ), #endif - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_END }; GnomeUIInfo gnome_panel_about_menu [] = { /* GNOMEUIINFO_HELP ("midnight-commander"), */ - { GNOME_APP_UI_ITEM, N_("_About"), N_("Information on this program"), gnome_about_cmd, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT }, + GNOMEUIINFO_MENU_ABOUT_ITEM( gnome_about_cmd,NULL), GNOMEUIINFO_END }; GnomeUIInfo gnome_panel_menu [] = { - { GNOME_APP_UI_SUBTREE, N_("_File"), NULL, &gnome_panel_file_menu }, - { GNOME_APP_UI_SUBTREE, N_("_Edit"), NULL, &gnome_panel_edit_menu }, - { GNOME_APP_UI_SUBTREE, N_("_Layout"), NULL, &gnome_panel_layout_menu }, - { GNOME_APP_UI_SUBTREE, N_("_Commands"), NULL, &gnome_panel_commands_menu }, - { GNOME_APP_UI_SUBTREE, N_("_Help"), NULL, &gnome_panel_about_menu }, - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_MENU_FILE_TREE(gnome_panel_file_menu), + GNOMEUIINFO_MENU_EDIT_TREE(gnome_panel_edit_menu), + GNOMEUIINFO_SUBTREE(N_("_Layout"),gnome_panel_layout_menu), + GNOMEUIINFO_SUBTREE(N_("_Commands"),gnome_panel_commands_menu), + GNOMEUIINFO_MENU_HELP_TREE(gnome_panel_about_menu), + GNOMEUIINFO_END }; GtkCheckMenuItem * @@ -393,10 +390,11 @@ other_panel_ptr = NULL; } -static void +static int gnome_close_panel_event (GtkWidget *widget, GdkEvent *event, WPanel *panel) { gnome_close_panel (widget, panel); + return TRUE; } static void diff -ruN old/mc-4.5.12/gnome/gmain.c new/mc-4.5.13/gnome/gmain.c --- old/mc-4.5.12/gnome/gmain.c Sun Feb 7 02:53:33 1999 +++ new/mc-4.5.13/gnome/gmain.c Wed Feb 10 19:41:18 1999 @@ -20,6 +20,7 @@ #include "dir.h" #include "panel.h" #include "gscreen.h" +#include "gcmd.h" #include "command.h" #include "cmd.h" #include "gdesktop.h" @@ -502,15 +503,9 @@ void create_panels (void) { - GList *p, *g; - char *geo; WPanel *panel; -#if 1 desktop_init (); -#else - start_desktop (); -#endif cmdline = command_new (0, 0, 0); the_hint = label_new (0, 0, 0, NULL); @@ -544,11 +539,8 @@ run_dlg (desktop_dlg); /* shutdown gnome specific bits of midnight commander */ -#if 1 + desktop_destroy (); -#else - stop_desktop (); -#endif } static void diff -ruN old/mc-4.5.12/gnome/gpopup2.c new/mc-4.5.13/gnome/gpopup2.c --- old/mc-4.5.12/gnome/gpopup2.c Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gpopup2.c Wed Feb 10 19:41:20 1999 @@ -41,69 +41,68 @@ typedef struct action { char *text; /* Menu item text */ int flags; /* Flags from the above enum */ - GtkSignalFunc callback; /* Callback for menu item */ + gpointer callback; /* Callback for menu item */ } action; /* Prototypes */ /* Multiple File commands */ -static void panel_action_open_with (GtkWidget *widget, WPanel *panel); -static void popup_handle_open (GtkWidget *widget, WPanel *panel); -static void popup_handle_view (GtkWidget *widget, WPanel *panel); -static void popup_handle_view_unfiltered (GtkWidget *widget, WPanel *panel); -static void popup_handle_edit (GtkWidget *widget, WPanel *panel); -static void popup_handle_copy (GtkWidget *widget, WPanel *panel); -static void popup_handle_delete (GtkWidget *widget, WPanel *panel); -static void popup_handle_move (GtkWidget *widget, WPanel *panel); +static void panel_action_with (GtkWidget *widget, WPanel *panel); +static void handle_open (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); +static void handle_copy (GtkWidget *widget, WPanel *panel); +static void handle_delete (GtkWidget *widget, WPanel *panel); +static void handle_move (GtkWidget *widget, WPanel *panel); /* F_SINGLE file commands */ -static void popup_handle_properties (GtkWidget *widget, WPanel *panel); -static void popup_handle_open_with (GtkWidget *widget, WPanel *panel); -static void popup_handle_hard_link (GtkWidget *widget, WPanel *panel); -static void popup_handle_symlink (GtkWidget *widget, WPanel *panel); -static void popup_handle_edit_symlink (GtkWidget *widget, WPanel *panel); +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_edit_symlink (GtkWidget *widget, WPanel *panel); /* Generic Options */ -static void popup_handle_display_properties (GtkWidget *widget, WPanel *panel); -static void popup_handle_refresh (GtkWidget *widget, WPanel *panel); -static void popup_handle_arrange_icons (GtkWidget *widget, WPanel *panel); -static void popup_handle_logout (GtkWidget *widget, WPanel *panel); +static void handle_display_properties (GtkWidget *widget, WPanel *panel); +static void handle_rescan (GtkWidget *widget, WPanel *panel); +static void handle_arrange_icons (GtkWidget *widget, WPanel *panel); +static void handle_logout (GtkWidget *widget, WPanel *panel); /* global vars */ extern int we_can_afford_the_speed; static action file_actions[] = { - { N_("Properties"), F_SINGLE | F_ALL, (GtkSignalFunc) popup_handle_properties }, - { "", F_SINGLE | F_ALL, NULL }, - { N_("Open"), F_NOTDEV, (GtkSignalFunc) popup_handle_open }, - { "", F_NOTDEV, NULL }, - { N_("Open with..."), F_REGULAR | F_SINGLE, (GtkSignalFunc) popup_handle_open_with }, - { N_("View"), F_REGULAR | F_SINGLE, (GtkSignalFunc) popup_handle_view }, - { N_("View unfiltered"), F_REGULAR | F_ADVANCED | F_SINGLE, (GtkSignalFunc) popup_handle_view_unfiltered }, - { N_("Edit"), F_REGULAR | F_SINGLE, (GtkSignalFunc) popup_handle_edit }, - { "", F_REGULAR | F_SINGLE, NULL }, - { N_("Copy..."), F_ALL, (GtkSignalFunc) popup_handle_copy }, - { N_("Delete"), F_ALL, (GtkSignalFunc) popup_handle_delete }, - { N_("Move..."), F_ALL, (GtkSignalFunc) popup_handle_move }, - { "", F_SINGLE, NULL }, - { N_("Hard Link..."), F_ADVANCED | F_SINGLE, (GtkSignalFunc) popup_handle_hard_link }, /* UGH. I can't believe this exists. */ - { N_("Link..."), F_SINGLE, (GtkSignalFunc) popup_handle_symlink }, - { N_("Edit symlink..."), F_SYMLINK | F_SINGLE, (GtkSignalFunc) popup_handle_edit_symlink }, + { N_("Properties"), F_SINGLE | F_ALL, handle_properties }, + { "", F_SINGLE | F_ALL, NULL }, + { N_("Open"), F_NOTDEV, handle_open }, + { "", F_NOTDEV, 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 }, + { "", F_SINGLE, NULL }, + { N_("Hard Link..."), F_ADVANCED | F_SINGLE, handle_hard_link }, + { N_("Link..."), F_SINGLE, handle_symlink }, + { N_("Edit Symlink..."), F_SYMLINK | F_SINGLE, handle_edit_symlink }, { NULL, 0, NULL } }; static action generic_actions[] = { - { N_("NEW(FIXME)"), F_ALL, NULL }, - { "", F_ALL, NULL }, - { N_("Change Background"),F_DICON, (GtkSignalFunc) popup_handle_display_properties }, - { N_("Refresh"), F_ALL, (GtkSignalFunc) popup_handle_refresh }, - { N_("Arrange Icons"), F_DICON, (GtkSignalFunc) popup_handle_arrange_icons }, - { N_(""), F_DICON, NULL }, - { N_("Logout"), F_DICON, (GtkSignalFunc) popup_handle_logout }, + { 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 } }; - /* 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 * marshaller (uiinfo->moreinfo). @@ -114,7 +113,8 @@ g_assert (uibdata->is_interp); if (uiinfo->moreinfo) { - gtk_object_set_data (GTK_OBJECT (uiinfo->widget), "popup_user_data", uiinfo->user_data); + gtk_object_set_data (GTK_OBJECT (uiinfo->widget), "popup_user_data", + uiinfo->user_data); gtk_signal_connect_full (GTK_OBJECT (uiinfo->widget), signal_name, NULL, uibdata->relay_func, @@ -125,9 +125,10 @@ } } -/* Our custom marshaller for menu items. We need it so that it can extract the per-attachment - * user_data pointer from the parent menu shell and pass it to the callback. This overrides the - * user-specified data from the GnomeUIInfo structures. +/* Our custom marshaller for menu items. We need it so that it can extract the + * per-attachment user_data pointer from the parent menu shell and pass it to + * the callback. This overrides the user-specified data from the GnomeUIInfo + * structures. */ typedef void (* ActivateFunc) (GtkObject *object, WPanel *panel); @@ -145,16 +146,18 @@ (* func) (object, user_data); } -/* Fills the menu with the specified uiinfo at the specified position, using our magic marshallers - * to be able to fetch the active item. The code is shamelessly ripped from gnome-popup-menu. +/* Fills the menu with the specified uiinfo at the specified position, using our + * magic marshallers to be able to fetch the active item. The code is + * shamelessly ripped from gnome-popup-menu. */ static void fill_menu (GtkMenuShell *menu_shell, GnomeUIInfo *uiinfo, int pos) { GnomeUIBuilderData uibdata; - /* We use our own callback marshaller so that it can fetch the popup user data - * from the popup menu and pass it on to the user-defined callbacks. + /* We use our own callback marshaller so that it can fetch the popup + * user data from the popup menu and pass it on to the user-defined + * callbacks. */ uibdata.connect_func = popup_connect_func; @@ -167,13 +170,13 @@ } -/* The context menu: text displayed, condition that must be met and the routine that gets invoked - * upon activation. +/* The context menu: text displayed, condition that must be met and the routine + * that gets invoked upon activation. */ -/* Creates the menu items for the standard actions. Returns the position at which additional menu - * items should be inserted. +/* Creates the menu items for the standard actions. Returns the position at + * which additional menu items should be inserted. */ static int create_actions (GtkWidget *menu, gint flags, gboolean on_selected, WPanel *panel) @@ -235,7 +238,6 @@ return pos; } - /* Convenience callback to exit the main loop of a modal popup menu when it is deactivated*/ static void menu_shell_deactivated (GtkMenuShell *menu_shell, WPanel *panel) @@ -260,16 +262,15 @@ return -1; } -/* - * Create a context menu - * It can take either a WPanel or a GnomeDesktopEntry. One of them should - * be set to NULL. +/* Create a context menu. It can take either a WPanel or a GnomeDesktopEntry. + * One of them should be set to NULL. */ -#define REMOVE(x,f) if (x&f)x-=f +#define REMOVE(x,f) x &= ~f -int gpopup_do_popup2 (GdkEventButton *event, - WPanel *panel, GList *file_list, - gboolean on_selected) +int +gpopup_do_popup2 (GdkEventButton *event, + WPanel *panel, GList *file_list, + gboolean on_selected) { GtkWidget *menu; GList *list; @@ -354,107 +355,143 @@ char *command; command = input_expand_dialog (_(" Open with..."), - _("Enter extra arguments:"), panel->dir.list [panel->selected].fname); + _("Enter extra arguments:"), + panel->dir.list [panel->selected].fname); if (!command) return; + execute (command); - g_free (command); + g_free (command); } + static void -popup_handle_open (GtkWidget *widget, WPanel *panel) +handle_open (GtkWidget *widget, WPanel *panel) { if (do_enter (panel)) return; + panel_action_open_with (widget, panel); } + static void -popup_handle_view (GtkWidget *widget, WPanel *panel) +handle_view (GtkWidget *widget, WPanel *panel) { view_cmd (panel); } + static void -popup_handle_view_unfiltered (GtkWidget *widget, WPanel *panel) +handle_view_unfiltered (GtkWidget *widget, WPanel *panel) { view_simple_cmd (panel); } + static void -popup_handle_edit (GtkWidget *widget, WPanel *panel) +handle_edit (GtkWidget *widget, WPanel *panel) { edit_cmd (panel); } + static void -popup_handle_copy (GtkWidget *widget, WPanel *panel) +handle_copy (GtkWidget *widget, WPanel *panel) { copy_cmd (); } + static void -popup_handle_delete (GtkWidget *widget, WPanel *panel) +handle_delete (GtkWidget *widget, WPanel *panel) { delete_cmd (); } + static void -popup_handle_move (GtkWidget *widget, WPanel *panel) +handle_move (GtkWidget *widget, WPanel *panel) { ren_cmd (); } /* F_SINGLE file commands */ -static void popup_handle_properties (GtkWidget *widget, WPanel *panel) +static void +handle_properties (GtkWidget *widget, WPanel *panel) { gint retval; file_entry *fe = &panel->dir.list [panel->selected]; char *full_name = concat_dir_and_file (panel->cwd, fe->fname); GtkWidget *dlg; -/* if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0) - reread_cmd ();*/ +#if 0 + if (item_properties (GTK_WIDGET (CLIST_FROM_SW (panel->list)), full_name, NULL) != 0) + reread_cmd (); +#endif 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 (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); - g_free (full_name); + g_free (full_name); if (retval) reread_cmd (); } -static void popup_handle_open_with (GtkWidget *widget, WPanel *panel) + +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); + _("Enter extra arguments:"), + panel->dir.list [panel->selected].fname); if (!command) return; + execute (command); g_free (command); } -static void popup_handle_hard_link (GtkWidget *widget, WPanel *panel) + +static void +handle_hard_link (GtkWidget *widget, WPanel *panel) { /* yeah right d: -jrb */ link_cmd (); } -static void popup_handle_symlink (GtkWidget *widget, WPanel *panel) + +static void +handle_symlink (GtkWidget *widget, WPanel *panel) { symlink_cmd (); } -static void popup_handle_edit_symlink (GtkWidget *widget, WPanel *panel) + +static void +handle_edit_symlink (GtkWidget *widget, WPanel *panel) { edit_symlink_cmd (); } -static void popup_handle_display_properties (GtkWidget *widget, WPanel *panel) -{ -} -static void popup_handle_refresh (GtkWidget *widget, WPanel *panel) +static void +handle_display_properties (GtkWidget *widget, WPanel *panel) { - + /* FIXME */ + g_warning ("FIXME: implement popup_handle_display_properties()"); } -static void popup_handle_arrange_icons (GtkWidget *widget, WPanel *panel) -{ +static void +handle_rescan (GtkWidget *widget, WPanel *panel) +{ + reread_cmd (); } -static void popup_handle_logout (GtkWidget *widget, WPanel *panel) + +static void +handle_arrange_icons (GtkWidget *widget, WPanel *panel) { + /* FIXME */ + g_warning ("FIXME: implement popup_handle_arrange_icons()"); +} +static void +handle_logout (GtkWidget *widget, WPanel *panel) +{ + /* FIXME */ + g_warning ("FIXME: implement popup_handle_logout()"); } diff -ruN old/mc-4.5.12/gnome/gscreen.c new/mc-4.5.13/gnome/gscreen.c --- old/mc-4.5.12/gnome/gscreen.c Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gscreen.c Wed Feb 10 19:41:20 1999 @@ -79,6 +79,9 @@ #define CLIST_FROM_SW(panel_list) GTK_CLIST (GTK_BIN (panel_list)->child) +#ifdef NEW_GNOME_LIBS +#define ILIST_FROM_SW(panel_list) GNOME_ICON_LIST (GTK_BIN (panel_list)->child) +#endif void @@ -220,7 +223,11 @@ static void panel_fill_panel_icons (WPanel *panel) { +#ifdef NEW_GNOME_LIBS + GnomeIconList *icons = ILIST_FROM_SW (panel->icons); +#else GnomeIconList *icons = GNOME_ICON_LIST (panel->icons); +#endif const int top = panel->count; const int selected = panel->selected; int i; @@ -313,7 +320,11 @@ display_mini_info (panel); if (panel->list_type == list_icons){ +#ifdef NEW_GNOME_LIBS + GnomeIconList *list = ILIST_FROM_SW (panel->icons); +#else GnomeIconList *list = GNOME_ICON_LIST (panel->icons); +#endif gnome_icon_list_select_icon (list, panel->selected); @@ -340,7 +351,11 @@ int selected = panel->selected; if (panel->list_type == list_icons) +#ifdef NEW_GNOME_LIBS + gnome_icon_list_unselect_all (ILIST_FROM_SW (panel->icons), NULL, NULL); +#else gnome_icon_list_unselect_all (GNOME_ICON_LIST (panel->icons), NULL, NULL); +#endif else gtk_clist_unselect_all (CLIST_FROM_SW (panel->list)); @@ -1023,7 +1038,7 @@ { GtkAdjustment *va; - va = scrolled_window_get_vadjustment (panel->list); + va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->list)); if (y < 10){ if (va->value > va->lower) @@ -1146,13 +1161,21 @@ { GtkAdjustment *va; +#ifdef NEW_GNOME_LIBS + va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->icons)); +#else va = GNOME_ICON_LIST (panel->icons)->adj; +#endif - if (y < 10){ + if (y < 10) { if (va->value > va->lower) return TRUE; } else { - if (y > (GTK_WIDGET (panel->icons)->allocation.height - 10)){ +#ifdef NEW_GNOME_LIBS + if (y > (GTK_WIDGET (ILIST_FROM_SW (panel->icons))->allocation.height - 10)) { +#else + if (y > (GTK_WIDGET (panel->icons)->allocation.height - 10)) { +#endif if (va->value < va->upper - va->page_size) return TRUE; } @@ -1174,7 +1197,11 @@ GtkAdjustment *va; double v; +#ifdef NEW_GNOME_LIBS + va = scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (panel->icons)); +#else va = GNOME_ICON_LIST (panel->icons)->adj; +#endif if (panel->drag_motion_y < 10) { v = va->value - va->step_increment; @@ -1268,7 +1295,8 @@ titles [i++] = format->title; sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); file_list = gtk_clist_new_with_titles (items, titles); gtk_container_add (GTK_CONTAINER (sw), file_list); @@ -1430,12 +1458,12 @@ icon = gnome_icon_list_get_icon_at (gil, event->x, event->y); if (icon == -1) { - if (event->button == 3) + if (event->button == 3) { gpopup_do_popup2 ((GdkEventButton *) event, panel, NULL, FALSE); - } else { - if (event->button != 3) - panel->maybe_start_drag = event->button; - } + return TRUE; + } + } else if (event->button == 1) + panel->maybe_start_drag = event->button; panel->click_x = event->x; panel->click_y = event->y; @@ -1453,13 +1481,25 @@ static GtkWidget * panel_create_icon_display (WPanel *panel) { +#ifdef NEW_GNOME_LIBS + GtkWidget *sw; +#endif GnomeIconList *ilist; - + +#ifdef NEW_GNOME_LIBS + sw = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), + GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); +#endif + ilist = GNOME_ICON_LIST ( - gnome_icon_list_new_flags ( - 90, NULL, - GNOME_ICON_LIST_IS_EDITABLE| - GNOME_ICON_LIST_STATIC_TEXT)); + gnome_icon_list_new_flags (90, NULL, + (GNOME_ICON_LIST_IS_EDITABLE + | GNOME_ICON_LIST_STATIC_TEXT))); +#ifdef NEW_GNOME_LIBS + gtk_container_add (GTK_CONTAINER (sw), GTK_WIDGET (ilist)); + gtk_widget_show (GTK_WIDGET (ilist)); +#endif gnome_icon_list_set_separators (ilist, " /-_."); gnome_icon_list_set_row_spacing (ilist, 2); @@ -1515,16 +1555,19 @@ GTK_SIGNAL_FUNC (panel_widget_motion), panel); - /* - * This signal is provide for scrolling the main window if - * data is being dragged + /* This signal is provide for scrolling the main window if data is being + * dragged. */ gtk_signal_connect (GTK_OBJECT (ilist), "drag_motion", GTK_SIGNAL_FUNC (panel_icon_list_drag_motion), panel); gtk_signal_connect (GTK_OBJECT (ilist), "drag_leave", GTK_SIGNAL_FUNC (panel_icon_list_drag_leave), panel); - + +#ifdef NEW_GNOME_LIBS + return sw; +#else return GTK_WIDGET (ilist); +#endif } static void @@ -1842,6 +1885,28 @@ do_panel_cd (panel, path, cd_exact); } +static void +set_cursor (WPanel *panel, GdkCursorType type) +{ + GdkCursor *cursor; + + cursor = gdk_cursor_new (type); + gdk_window_set_cursor (GTK_WIDGET (panel->xwindow)->window, cursor); + gdk_cursor_destroy (cursor); +} + +static void +panel_tree_scan_begin (GtkWidget *widget, gpointer data) +{ + set_cursor (data, GDK_WATCH); +} + +static void +panel_tree_scan_end (GtkWidget *widget, gpointer data) +{ + set_cursor (data, GDK_TOP_LEFT_ARROW); +} + /** * tree_drag_open_directory: * @@ -2125,7 +2190,11 @@ gtk_ctree_set_indent (GTK_CTREE (tree), 10); gtk_signal_connect (GTK_OBJECT (tree), "directory_changed", - GTK_SIGNAL_FUNC (panel_chdir), panel); + (GtkSignalFunc) panel_chdir, panel); + gtk_signal_connect (GTK_OBJECT (tree), "scan_begin", + (GtkSignalFunc) panel_tree_scan_begin, panel); + gtk_signal_connect (GTK_OBJECT (tree), "scan_end", + (GtkSignalFunc) panel_tree_scan_end, panel); gtk_drag_dest_set (GTK_WIDGET (tree), GTK_DEST_DEFAULT_ALL, drop_types, ELEMENTS (drop_types), @@ -2320,10 +2389,13 @@ { GtkWidget *status_line, *filter, *vbox, *ministatus_box; GtkWidget *cwd; - GtkWidget *hbox, *evbox, *dock, *box; + GtkWidget *dock; +#ifdef NEW_GNOME_LIBS +#else + GtkWidget *box; +#endif GnomeUIBuilderData uibdata; - panel->xwindow = gtk_widget_get_toplevel (GTK_WIDGET (panel->widget.wdata)); panel->table = gtk_table_new (2, 1, 0); @@ -2348,27 +2420,40 @@ panel->icons = panel_create_icon_display (panel); gtk_widget_show (panel->icons); +#ifdef NEW_GNOME_LIBS +#else panel->scrollbar = gtk_vscrollbar_new (GNOME_ICON_LIST (panel->icons)->adj); gtk_widget_show (panel->scrollbar); - +#endif + panel->list = panel_create_file_list (panel); gtk_widget_ref (panel->icons); gtk_widget_ref (panel->list); +#ifdef NEW_GNOME_LIBS +#else box = gtk_hbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (box), panel->icons, TRUE, TRUE, 0); gtk_box_pack_end (GTK_BOX (box), panel->scrollbar, FALSE, TRUE, 0); gtk_widget_show (box); - +#endif + panel->panel_listbox = gtk_event_box_new (); gtk_widget_show (panel->panel_listbox); gtk_container_add (GTK_CONTAINER (panel->panel_listbox), panel->list); - +#ifdef NEW_GNOME_LIBS + gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), panel->icons, NULL); +#else gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), box, NULL); +#endif gtk_notebook_append_page (GTK_NOTEBOOK (panel->notebook), panel->panel_listbox, NULL); gtk_notebook_set_page (GTK_NOTEBOOK (panel->notebook), panel->list_type == list_icons ? 0 : 1); +#ifdef NEW_GNOME_LIBS + gtk_widget_show (panel->icons); +#else gtk_widget_show_all (box); +#endif gtk_widget_show (panel->list); gtk_widget_show (panel->notebook); diff -ruN old/mc-4.5.12/gnome/gtkdtree.c new/mc-4.5.13/gnome/gtkdtree.c --- old/mc-4.5.12/gnome/gtkdtree.c Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gtkdtree.c Wed Feb 10 19:41:20 1999 @@ -32,6 +32,8 @@ enum { DIRECTORY_CHANGED, + SCAN_BEGIN, + SCAN_END, LAST_SIGNAL }; @@ -158,6 +160,26 @@ } static void +scan_begin (GtkDTree *dtree) +{ + if (++dtree->scan_level == 1) { + gtk_clist_freeze (GTK_CLIST (dtree)); + gtk_signal_emit (GTK_OBJECT (dtree), gtk_dtree_signals[SCAN_BEGIN]); + } +} + +static void +scan_end (GtkDTree *dtree) +{ + g_assert (dtree->scan_level > 0); + + if (--dtree->scan_level == 0) { + gtk_signal_emit (GTK_OBJECT (dtree), gtk_dtree_signals[SCAN_END]); + gtk_clist_thaw (GTK_CLIST (dtree)); + } +} + +static void gtk_dtree_select_row (GtkCTree *ctree, GtkCTreeNode *row, gint column) { GtkDTree *dtree = GTK_DTREE (ctree); @@ -174,7 +196,7 @@ dtree->loading_dir++; dtree->last_node = row; - gtk_clist_freeze (GTK_CLIST (ctree)); + scan_begin (dtree); path = gtk_dtree_get_row_path (GTK_DTREE (ctree), row, 0); if (dtree->current_path) @@ -202,7 +224,7 @@ #endif dtree->loading_dir--; - gtk_clist_thaw (GTK_CLIST (ctree)); + scan_end (dtree); } static GtkCTreeNode * @@ -367,8 +389,19 @@ static void gtk_dtree_expand (GtkCTree *ctree, GtkCTreeNode *node) { + scan_begin (GTK_DTREE (ctree)); + parent_class->tree_expand (ctree, node); - gtk_dtree_select_row (ctree, node, 0); + gtk_ctree_select (ctree, node); + + scan_end (GTK_DTREE (ctree)); +} + +static void +gtk_dtree_collapse (GtkCTree *ctree, GtkCTreeNode *node) +{ + parent_class->tree_collapse (ctree, node); + gtk_ctree_select (ctree, node); } /* @@ -445,6 +478,21 @@ g_free (dirname); } +/* + * Callback routine invoked from the treestore to hint us + * about the progress of the freezing + */ +static void +tree_set_freeze (int state, void *data) +{ + GtkDTree *dtree = GTK_DTREE (data); + + if (state) + gtk_clist_freeze (GTK_CLIST (dtree)); + else + gtk_clist_thaw (GTK_CLIST (dtree)); +} + static void gtk_dtree_destroy (GtkObject *object) { @@ -452,6 +500,8 @@ tree_store_remove_entry_remove_hook (entry_removed_callback); tree_store_remove_entry_add_hook (entry_added_callback); + tree_store_remove_freeze_hook (tree_set_freeze); + gdk_pixmap_unref (dtree->pixmap_open); gdk_pixmap_unref (dtree->pixmap_close); gdk_bitmap_unref (dtree->bitmap_open); @@ -469,24 +519,38 @@ parent_class = gtk_type_class (GTK_TYPE_CTREE); - gtk_dtree_signals [DIRECTORY_CHANGED] = - gtk_signal_new ( - "directory_changed", - GTK_RUN_FIRST, object_class->type, - GTK_SIGNAL_OFFSET (GtkDTreeClass, directory_changed), - gtk_marshal_NONE__POINTER, - GTK_TYPE_NONE, - 1, - GTK_TYPE_POINTER); + gtk_dtree_signals[DIRECTORY_CHANGED] = + gtk_signal_new ("directory_changed", + GTK_RUN_FIRST, object_class->type, + GTK_SIGNAL_OFFSET (GtkDTreeClass, directory_changed), + gtk_marshal_NONE__POINTER, + GTK_TYPE_NONE, + 1, + GTK_TYPE_POINTER); + gtk_dtree_signals[SCAN_BEGIN] = + gtk_signal_new ("scan_begin", + GTK_RUN_FIRST, object_class->type, + GTK_SIGNAL_OFFSET (GtkDTreeClass, scan_begin), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, + 0); + gtk_dtree_signals[SCAN_END] = + gtk_signal_new ("scan_end", + GTK_RUN_FIRST, object_class->type, + GTK_SIGNAL_OFFSET (GtkDTreeClass, scan_end), + gtk_marshal_NONE__NONE, + GTK_TYPE_NONE, + 0); gtk_object_class_add_signals (object_class, gtk_dtree_signals, LAST_SIGNAL); object_class->destroy = gtk_dtree_destroy; widget_class->size_allocate = gtk_dtree_size_allocate; - + ctree_class->tree_select_row = gtk_dtree_select_row; ctree_class->tree_expand = gtk_dtree_expand; + ctree_class->tree_collapse = gtk_dtree_collapse; } static void @@ -601,6 +665,7 @@ tree_store_add_entry_remove_hook (entry_removed_callback, dtree); tree_store_add_entry_add_hook (entry_added_callback, dtree); + tree_store_add_freeze_hook (tree_set_freeze, dtree); } void diff -ruN old/mc-4.5.12/gnome/gtkdtree.h new/mc-4.5.13/gnome/gtkdtree.h --- old/mc-4.5.12/gnome/gtkdtree.h Sun Feb 7 02:53:35 1999 +++ new/mc-4.5.13/gnome/gtkdtree.h Wed Feb 10 19:41:20 1999 @@ -16,6 +16,7 @@ char *requested_path; int visible; + int scan_level; char *drag_dir; GList *auto_expanded_nodes; @@ -41,6 +42,8 @@ GtkCTreeClass parent_class; void (* directory_changed) (GtkDTree *dtree, char *directory); + void (* scan_begin) (GtkDTree *dtree); + void (* scan_end) (GtkDTree *dtree); } GtkDTreeClass; guint gtk_dtree_get_type (void); diff -ruN old/mc-4.5.12/gnome/gutil.c new/mc-4.5.13/gnome/gutil.c --- old/mc-4.5.12/gnome/gutil.c Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gutil.c Wed Feb 10 19:41:20 1999 @@ -84,8 +84,10 @@ _exit (127); /* Exec error */ } else { int status; + + if (flags & (EXECUTE_WAIT|EXECUTE_TEMPFILE)) + waitpid (*pid, &status, 0); - waitpid (*pid, &status, 0); if (flags & EXECUTE_TEMPFILE) unlink (command); } diff -ruN old/mc-4.5.12/gnome/gview.c new/mc-4.5.13/gnome/gview.c --- old/mc-4.5.12/gnome/gview.c Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gview.c Wed Feb 10 19:41:20 1999 @@ -291,7 +291,7 @@ &gnome_goto_line, GNOME_STOCK_PIXMAP_JUMP_TO), GNOMEUIINFO_ITEM (N_("_Monitor file"), N_("Monitor file growing"), &gnome_monitor, NULL), GNOMEUIINFO_MENU_CLOSE_ITEM(gview_quit, NULL), - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_END }; GnomeUIInfo gview_search_menu [] = { @@ -301,29 +301,29 @@ gnome_regexp_search_cmd, GNOME_STOCK_MENU_SEARCH), GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_MENU_FIND_AGAIN_ITEM(gnome_continue_search, NULL), - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_END }; GnomeUIInfo gview_mode_menu [] = { #define WRAP_POS 0 - GNOMEUIINFO_TOGGLEITEM (N_("_Wrap"), N_("Wrap the text"), gnome_toggle_wrap, NULL), + GNOMEUIINFO_TOGGLEITEM (N_("_Wrap"), + N_("Wrap the text"), gnome_toggle_wrap, NULL), #if 0 /* Can not use this one yet, as it destroys the viewer, need to fix that */ - GNOMEUIINFO_TOGGLEITEM ("_Parsed view", NULL, gnome_toggle_parse, NULL), + GNOMEUIINFO_TOGGLEITEM (N_("_Parsed view"), NULL, gnome_toggle_parse, NULL), #endif #define FORMAT_POS 1 GNOMEUIINFO_TOGGLEITEM (N_("_Formatted"), NULL, gnome_toggle_format, NULL), #define HEX_POS 2 GNOMEUIINFO_TOGGLEITEM (N_("_Hex"), NULL, gnome_toggle_hex, NULL), - - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_END }; GnomeUIInfo gview_top_menu [] = { - { GNOME_APP_UI_SUBTREE, N_("_File"), NULL, &gview_file_menu }, - { GNOME_APP_UI_SUBTREE, N_("_Search"), NULL, &gview_search_menu }, - { GNOME_APP_UI_SUBTREE, N_("_Mode"), NULL, &gview_mode_menu }, - { GNOME_APP_UI_ENDOFINFO, 0, 0 } + GNOMEUIINFO_MENU_FILE_TREE( &gview_file_menu ), + GNOMEUIINFO_SUBTREE (N_ ("_Search"), &gview_search_menu), + GNOMEUIINFO_MENU_SETTINGS_TREE( &gview_mode_menu), + GNOMEUIINFO_END }; static int diff -ruN old/mc-4.5.12/gnome/gwidget.c new/mc-4.5.13/gnome/gwidget.c --- old/mc-4.5.12/gnome/gwidget.c Sun Feb 7 02:53:34 1999 +++ new/mc-4.5.13/gnome/gwidget.c Wed Feb 10 19:41:20 1999 @@ -262,6 +262,7 @@ entry_click (GtkWidget *widget, GdkEvent *event, WInput *in) { dlg_select_widget (in->widget.parent, in); + in->first = 0; } static void Binary files old/mc-4.5.12/gnome/i-fifo.png and new/mc-4.5.13/gnome/i-fifo.png differ Binary files old/mc-4.5.12/gnome/i-sock.png and new/mc-4.5.13/gnome/i-sock.png differ Binary files old/mc-4.5.12/gnome/i-stalled.png and new/mc-4.5.13/gnome/i-stalled.png differ diff -ruN old/mc-4.5.12/gnome/mc.keys.in.in new/mc-4.5.13/gnome/mc.keys.in.in --- old/mc-4.5.12/gnome/mc.keys.in.in Sun Feb 7 02:53:32 1999 +++ new/mc-4.5.13/gnome/mc.keys.in.in Wed Feb 10 19:41:18 1999 @@ -11,6 +11,12 @@ application/x-compressed-tar fm-open=%cd %p#utar fm-view=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf - + icon-filename=@icondir@/gnome-package.png + +application/x-bzip-compressed-tar + fm-open=%cd %p#utar + fm-view=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - + icon-filename=@icondir@/gnome-package.png application/x-bzip: icon-filename=@icondir@/compressed.xpm @@ -21,6 +27,7 @@ fm-open=%cd %p#utar fm-view=%view{ascii} tar tvvf %f open.extract.Extract=tar xf %f + icon-filename=@icondir@/gnome-package.png application/x-rpm: fm-open=%cd %p#rpm @@ -34,7 +41,7 @@ icon-filename=@icondir@/gnome-pack-deb.png application/zip: - icon-filename=@icondir@/zip.xpm + icon-filename=@icondir@/gnome-package.png fm-open=%cd %p#uzip fm-view=%view{ascii} unzip -v %f open.extract.Extract=unzip %f @@ -44,18 +51,21 @@ fm-open=%cd %p#uzoo fm-view=%view{ascii} zoo l %f open.extract.Extract=zoo x %f '*' + icon-filename=@icondir@/gnome-package.png application/x-lha: fm-open=%cd %p#ulha fm-view=%view{ascii} lharc l %f open.extract.Extract=lharc x %f '*' open.extractf.Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi + icon-filename=@icondir@/gnome-package.png application/x-arj: fm-open=%cd %p#uarj fm-view=%view{ascii} unarj l %f open.extract.Extract=unarj x %f '*' open.extractf.Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi + icon-filename=@icondir@/gnome-package.png application/x-unix-archive: fm-open=%cd %p#uar diff -ruN old/mc-4.5.12/gtkedit/gtkedit.c new/mc-4.5.13/gtkedit/gtkedit.c --- old/mc-4.5.12/gtkedit/gtkedit.c Sun Feb 7 02:53:26 1999 +++ new/mc-4.5.13/gtkedit/gtkedit.c Wed Feb 10 19:41:13 1999 @@ -1285,74 +1285,43 @@ { GnomeUIInfo file_menu[] = { - { - GNOME_APP_UI_ITEM, N_ ("Open/Load"), N_ ("Load a different/new file"), gtk_edit_load_file, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, 'O', GDK_CONTROL_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("New"), N_ ("Clear the edit buffer"), gtk_edit_new_file, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'N', GDK_CONTROL_MASK, 0 - }, + GNOMEUIINFO_MENU_OPEN_ITEM( gtk_edit_load_file, edit), + GNOMEUIINFO_MENU_NEW_ITEM( "_New", N_ ("Clear the edit buffer"), gtk_edit_new_file, edit), GNOMEUIINFO_SEPARATOR, - { - GNOME_APP_UI_ITEM, N_ ("Save"), N_ ("Save the current edit buffer to filename"), gtk_edit_save_file, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 'S', GDK_CONTROL_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("Save As"), N_ ("Save the current edit buffer as filename"), gtk_edit_save_as_file, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE_AS, 'A', GDK_CONTROL_MASK, 0 - }, + GNOMEUIINFO_MENU_SAVE_ITEM( gtk_edit_save_file, edit), + GNOMEUIINFO_MENU_SAVE_AS_ITEM( gtk_edit_save_as_file, edit), GNOMEUIINFO_SEPARATOR, - { - GNOME_APP_UI_ITEM, N_ ("Insert File"), N_ ("Insert text from a file"), gtk_edit_insert_file, edit, 0, 0, 0, 'I', GDK_CONTROL_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("Copy to file"), N_ ("copy a block to a file"), gtk_edit_copy_to_file, edit, 0, 0, 0, 'C', GDK_CONTROL_MASK, 0 - }, + GNOMEUIINFO_ITEM_DATA( N_ ("Insert File"), N_ ("Insert text from a file"), + gtk_edit_insert_file, edit, NULL), + GNOMEUIINFO_ITEM_DATA( N_ ("Copy to file"), N_ ("copy a block to a file"), + gtk_edit_copy_to_file, edit, NULL), GNOMEUIINFO_SEPARATOR, - { - GNOME_APP_UI_ITEM, N_ ("Exit"), N_ ("Quit editor"), gtk_edit_quit, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_QUIT, 'Q', GDK_CONTROL_MASK, NULL - }, + GNOMEUIINFO_MENU_EXIT_ITEM(gtk_edit_quit,edit), GNOMEUIINFO_END + }; GnomeUIInfo edit_menu[] = { - { - GNOME_APP_UI_ITEM, N_ ("Copy"), N_ ("Copy selection to clipboard"), gtk_edit_clip_copy, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_COPY, 'C', GDK_CONTROL_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("Cut"), N_ ("Cut selection to clipboard"), gtk_edit_clip_cut, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_CUT, 'X', GDK_CONTROL_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("Paste"), N_ ("Paste clipboard"), gtk_edit_clip_paste, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PASTE, 'V', GDK_CONTROL_MASK, 0 - }, + GNOMEUIINFO_MENU_COPY_ITEM(gtk_edit_clip_copy, edit), + GNOMEUIINFO_MENU_CUT_ITEM( gtk_edit_clip_cut, edit), + GNOMEUIINFO_MENU_PASTE_ITEM( gtk_edit_clip_paste, edit), GNOMEUIINFO_SEPARATOR, - { - GNOME_APP_UI_ITEM, N_ ("Undo"), N_ ("Go back in time one key press"), gtk_edit_undo, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_PASTE, 'U', GDK_CONTROL_MASK, 0 - }, + GNOMEUIINFO_MENU_UNDO_ITEM(gtk_edit_undo, edit), GNOMEUIINFO_END }; GnomeUIInfo search_menu[] = { - { - GNOME_APP_UI_ITEM, N_ ("Find"), N_ ("Find string/regular expression"), gtk_edit_search, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_OPEN, 'F', GDK_MOD1_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("Find again"), N_ ("Repeat most recent search"), gtk_edit_search_again, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_NEW, 'A', GDK_MOD1_MASK, 0 - }, - { - GNOME_APP_UI_ITEM, N_ ("Search/Replace"), N_ ("Find and replace text/regular expressions"), gtk_edit_replace, edit, 0, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_SAVE, 'R', GDK_MOD1_MASK, 0 - }, + GNOMEUIINFO_MENU_FIND_ITEM(gtk_edit_search, edit), + GNOMEUIINFO_MENU_FIND_AGAIN_ITEM(gtk_edit_search_again, edit), + GNOMEUIINFO_MENU_REPLACE_ITEM(gtk_edit_replace, edit), GNOMEUIINFO_END }; GnomeUIInfo help_menu[] = { - { - GNOME_APP_UI_ITEM, - N_ ("About..."), N_ ("Info about Mcedit"), - about_cb, NULL, NULL, - GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, - 0, (GdkModifierType) 0, NULL - }, + GNOMEUIINFO_MENU_ABOUT_ITEM(about_cb, NULL), #if 0 GNOMEUIINFO_SEPARATOR, GNOMEUIINFO_HELP ("hello"), @@ -1362,10 +1331,10 @@ GnomeUIInfo main_menu[] = { - GNOMEUIINFO_SUBTREE (N_ ("File"), file_menu), - GNOMEUIINFO_SUBTREE (N_ ("Edit"), edit_menu), + GNOMEUIINFO_MENU_FILE_TREE(file_menu), + GNOMEUIINFO_MENU_EDIT_TREE(edit_menu), GNOMEUIINFO_SUBTREE (N_ ("Search/Replace"), search_menu), - GNOMEUIINFO_SUBTREE (N_ ("Help"), help_menu), + GNOMEUIINFO_MENU_HELP_TREE(help_menu), GNOMEUIINFO_END }; diff -ruN old/mc-4.5.12/icons/Makefile.in new/mc-4.5.13/icons/Makefile.in --- old/mc-4.5.12/icons/Makefile.in Sun Feb 7 02:53:35 1999 +++ new/mc-4.5.13/icons/Makefile.in Wed Feb 10 19:41:21 1999 @@ -35,7 +35,7 @@ # DECENTICONS = \ c.xpm h.xpm calendar.xpm compressed.xpm html.xpm o.xpm \ - sound.xpm makefile.xpm word.xpm zip.xpm tex.xpm cc.xpm man.xpm \ + sound.xpm makefile.xpm word.xpm tex.xpm cc.xpm man.xpm \ postscript.xpm tex.xpm text.xpm trash.xpm all: diff -ruN old/mc-4.5.12/intl/Makefile.in new/mc-4.5.13/intl/Makefile.in --- old/mc-4.5.12/intl/Makefile.in Fri Feb 5 18:49:23 1999 +++ new/mc-4.5.13/intl/Makefile.in Tue Feb 9 15:49:56 1999 @@ -18,7 +18,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ diff -ruN old/mc-4.5.12/lib/Makefile.in new/mc-4.5.13/lib/Makefile.in --- old/mc-4.5.12/lib/Makefile.in Sun Feb 7 02:53:25 1999 +++ new/mc-4.5.13/lib/Makefile.in Wed Feb 10 19:41:13 1999 @@ -18,7 +18,7 @@ TIFILES = README.xterm linux.ti xterm.ad xterm.ti ansi.ti vt100.ti xterm.tcap DISTLIB = $(LIBFILES_IN) $(LIBFILES_CONST) $(TIFILES) \ Makefile.in tdiff xnc.hlp ncurses.h mc.sh mc.csh mcserv.init \ - mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff mc.menu.qnx.diff + mcserv.pamd tkmc.wmconfig mc.ext.in.qnx.diff all: diff -ruN old/mc-4.5.12/lib/mc.menu new/mc-4.5.13/lib/mc.menu --- old/mc-4.5.12/lib/mc.menu Sun Feb 7 02:53:25 1999 +++ new/mc-4.5.13/lib/mc.menu Wed Feb 10 19:41:13 1999 @@ -26,7 +26,7 @@ info = t d -3 Make a release of the current subdirectory +3 Make a release of the current subdirectory (tar.gz) Pwd=`basename %d /` echo -n "Name of the distribution file (without extension) [$Pwd]: " read tar @@ -35,6 +35,15 @@ echo ../${tar}.tar.gz created. # tar=%{Name of the distribution file (without extension)} +4 Make a release of the current subdirectory (tar.bz2) + Pwd=`basename %d /` + echo -n "Name of the distribution file (without extension) [$Pwd]: " + read tar + if [ "$tar"x = x ]; then tar=$Pwd; fi + cd .. && tar chf - $Pwd | bzip2 -f --repetitive-best > $tar.tar.bz2 + echo ../${tar}.tar.bz2 created. +# tar=%{Name of the distribution file (without extension)} + = f \.c$ & t r + f \.c$ & t r & ! t t 5 Compile and link current .c file @@ -177,9 +186,15 @@ fi echo "Please test the output file before deleting anything" -=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$ & t r +=+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$| f \.tar\.bz2$ & t r x Extract the contents of a compressed tar file - tar xzvf %f + unset EXT + echo %f|egrep -q "\.tar.bz2$" && EXT=tar_bz2 + if [ "$EXT" = "tar_bz2" ]; then + bunzip2 -c %f | tar xvf - + else + gzip -dc %f | tar xvf - + fi = t r + ! t t @@ -197,7 +212,22 @@ gzip $DECOMP -v $i done -+ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ & t r & ! t t ++ ! t t +b Bzip2 or bunzip2 current file + unset DECOMP + echo %f|egrep -q "\.bz2$" && DECOMP=-d + bzip2 $DECOMP -v %f + ++ t t +B Bzip2 or bunzip2 tagged files + for i in %t + do + unset DECOMP + echo $i|egrep -q "\.bz2$" && DECOMP=-d + bzip2 $DECOMP -v $i + done + ++ f \.tar.gz$ | f \.tgz$ | f \.tpz$ | f \.tar.Z$ | f \.tar.z$ | f \.tar.bz2$ & t r & ! t t z Extract compressed tar file to subdirectory unset D echo %f|egrep -q "\.tar.gz$" && EXT=tar_gz @@ -205,14 +235,29 @@ echo %f|egrep -q "\.tpz$" && EXT=tpz echo %f|egrep -q "\.tar.Z$" && EXT=tar_Z echo %f|egrep -q "\.tar.z$" && EXT=tar_z + echo %f|egrep -q "\.tar.bz2$" && EXT=tar_bz2 case $EXT in tar_gz) D="`basename %f .tar.gz`";; tgz) D="`basename %f .tgz`";; tpz) D="`basename %f .tpz`";; tar_Z) D="`basename %f .tar.Z`";; tar_z) D="`basename %f .tar.z`";; + tar_bz2) D="`basename %f .tar.bz2`";; esac - mkdir $D; cd $D && tar xvzof ../%f + if [ "$EXT" = "tar_bz2" ]; then + mkdir $D; cd $D && (bunzip2 -c ../%f | tar xvf -) + else + mkdir $D; cd $D && (gzip -dc ../%f | tar xvf -) + fi + ++ f \.tar.F$ & t r & ! t t +z Extract compressed tar file to subdirectory + unset D + echo %f|egrep -q "\.tar.F$" && EXT=tar_F + case $EXT in + tar_F) D="`basename %f .tar.F`";; + esac + mkdir $D; cd $D && (freeze -dc ../%f | tar xvf -) + t t Z Extract compressed tar files to subdirectories @@ -225,13 +270,67 @@ echo $1|egrep -q "\.tpz$" && EXT=tpz echo $1|egrep -q "\.tar.Z$" && EXT=tar_Z echo $1|egrep -q "\.tar.z$" && EXT=tar_z + echo $1|egrep -q "\.tar.F$" && EXT=tar_F + echo $1|egrep -q "\.tar.bz2$" && EXT=tar_bz2 case $EXT in - tar_gz) D="`basename $1 .tar.gz`";; - tgz) D="`basename $1 .tgz`";; - tpz) D="`basename $1 .tpz`";; - tar_Z) D="`basename $1 .tar.Z`";; - tar_z) D="`basename $1 .tar.z`";; + tar_gz) D="`basename $1 .tar.gz`";; + tgz) D="`basename $1 .tgz`";; + tpz) D="`basename $1 .tpz`";; + tar_Z) D="`basename $1 .tar.Z`";; + tar_z) D="`basename $1 .tar.z`";; + tar_F) D="`basename $1 .tar.F`";; + tar_bz2) D="`basename $1 .tar.bz2`";; esac - mkdir $D; (cd $D && tar xvzof ../$1)||echo tag $1 >>$MC_CONTROL_FILE + case $EXT in + tar_gz|tgz|tpz|tar_Z|tar_z) mkdir $D; (cd $D && gzip -dc ../$1 | tar xvf -)||echo tag $1 >>$MC_CONTROL_FILE;; + tar_F) mkdir $D; (cd $D && freeze -dc ../$1 | tar xvf -)||echo tag $1 >>$MC_CONTROL_FILE;; + tar_bz2) mkdir $D; (cd $D && bunzip2 -c ../$1 | tar xvf -)||echo tag $1 >>$MC_CONTROL_FILE + shift + done + ++ f \.gz$ | f \.tgz$ | f \.tpz$ | f \.Z$ | f \.z$ | f \.bz2$ & t r & ! t t +c Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 + unset D + echo %f|egrep -q "\.tgz$" && EXT=tgz + echo %f|egrep -q "\.tpz$" && EXT=tpz + echo %f|egrep -q "\.Z$" && EXT=Z + echo %f|egrep -q "\.z$" && EXT=z + echo %f|egrep -q "\.gz$" && EXT=gz + echo %f|egrep -q "\.bz2$" && EXT=bz2 + case $EXT in + tgz) D="`basename %f .tgz`.tar";; + tpz) D="`basename %f .tpz`.tar";; + gz) D="`basename %f .gz`";; + bz2) D="`basename %f .bz2`";; + esac + if [ "$EXT" = "bz2" ]; then + bunzip2 -v %f ; gzip -f9 -v $D + else + gunzip -v %f ; bzip2 -v --repetitive-best $D + fi + ++ t t +C Convert gz<->bz2, tar.gz<->tar.bz2 & tgz->tar.bz2 + set %u + while [ -n "$1" ] + do + unset D + echo %f|egrep -q "\.tgz$" && EXT=tgz + echo %f|egrep -q "\.tpz$" && EXT=tpz + echo %f|egrep -q "\.Z$" && EXT=Z + echo %f|egrep -q "\.z$" && EXT=z + echo %f|egrep -q "\.gz$" && EXT=gz + echo %f|egrep -q "\.bz2$" && EXT=bz2 + case $EXT in + tgz) D="`basename $1 .tgz`.tar";; + tpz) D="`basename $1 .tpz`.tar";; + gz) D="`basename $1 .gz`";; + bz2) D="`basename $1 .bz2`";; + esac + if [ "$EXT" = "bz2" ]; then + (bunzip2 -v $1 ; gzip -f9 -v $D)||echo tag $1 >>$MC_CONTROL_FILE + else + (gunzip -v $1 ; bzip2 -v --repetitive-best $D)||echo tag $1 >>$MC_CONTROL_FILE + fi shift done diff -ruN old/mc-4.5.12/lib/mc.menu.qnx.diff new/mc-4.5.13/lib/mc.menu.qnx.diff --- old/mc-4.5.12/lib/mc.menu.qnx.diff Sun Feb 7 02:53:25 1999 +++ new/mc-4.5.13/lib/mc.menu.qnx.diff Wed Dec 31 19:00:00 1969 @@ -1,53 +0,0 @@ ---- mc.menu Mon May 18 13:27:26 1998 -+++ mc.menu.qnx Mon May 18 13:25:01 1998 -@@ -179,7 +179,11 @@ - - =+ f \.tar\.gz$ | f \.tar\.z$ | f \.tgz$ | f \.tpz$ | f \.tar\.Z$ & t r - x Extract the contents of a compressed tar file -- tar xzvf %f -+ gzip -dc %f | tar xvf - -+ -+=+ f \.tar\.F$ & t r -+x Extract the contents of a compressed tar file -+ freeze -dc %f | tar xvf - - - = t r - + ! t t -@@ -212,7 +216,16 @@ - tar_Z) D="`basename %f .tar.Z`";; - tar_z) D="`basename %f .tar.z`";; - esac -- mkdir $D; cd $D && tar xvzof ../%f -+ mkdir $D; cd $D && (gzip -dc ../%f | tar xvof -) -+ -++ f \.tar.F$ & t r & ! t t -+z Extract compressed tar file to subdirectory -+ unset D -+ echo %f|egrep -q "\.tar.F$" && EXT=tar_F -+ case $EXT in -+ tar_F) D="`basename %f .tar.F`";; -+ esac -+ mkdir $D; cd $D && (freeze -dc ../%f | tar xvof -) - - + t t - Z Extract compressed tar files to subdirectories -@@ -225,13 +238,18 @@ - echo $1|egrep -q "\.tpz$" && EXT=tpz - echo $1|egrep -q "\.tar.Z$" && EXT=tar_Z - echo $1|egrep -q "\.tar.z$" && EXT=tar_z -+ echo $1|egrep -q "\.tar.F$" && EXT=tar_F - case $EXT in - tar_gz) D="`basename $1 .tar.gz`";; - tgz) D="`basename $1 .tgz`";; - tpz) D="`basename $1 .tpz`";; - tar_Z) D="`basename $1 .tar.Z`";; - tar_z) D="`basename $1 .tar.z`";; -+ tar_F) D="`basename $1 .tar.F`";; -+ esac -+ case $EXT in -+ tar_gz|tgz|tpz|tar_Z|tar_z) mkdir $D; (cd $D && (gzip -dc ../$1 | tar xvof -))||echo tag $1 >>$MC_CONTROL_FILE;; -+ tar_F) mkdir $D; (cd $D && (freeze -dc ../$1 | tar xvof -))||echo tag $1 >>$MC_CONTROL_FILE;; - esac -- mkdir $D; (cd $D && tar xvzof ../$1)||echo tag $1 >>$MC_CONTROL_FILE - shift - done diff -ruN old/mc-4.5.12/new_icons/Makefile.in new/mc-4.5.13/new_icons/Makefile.in --- old/mc-4.5.12/new_icons/Makefile.in Sun Feb 7 02:53:35 1999 +++ new/mc-4.5.13/new_icons/Makefile.in Wed Feb 10 19:41:20 1999 @@ -42,11 +42,16 @@ gnome-application-x-c-header.png \ gnome-application-x-c-source.png \ gnome-application-x-cc-source.png \ + gnome-package.png \ gnome-core.png all: -install: @insticons@ +install: @insticons@ Makefile + +Makefile: Makefile.in ../config.status + (cd ..; CONFIG_FILES=new_icons/Makefile CONFIG_HEADERS= ./config.status) + install_icons: for I in $(ALLICONS); \ Binary files old/mc-4.5.12/new_icons/gnome-package.png and new/mc-4.5.13/new_icons/gnome-package.png differ diff -ruN old/mc-4.5.12/po/Makefile.in.in new/mc-4.5.13/po/Makefile.in.in --- old/mc-4.5.12/po/Makefile.in.in Sun Feb 7 02:53:42 1999 +++ new/mc-4.5.13/po/Makefile.in.in Wed Feb 10 19:41:21 1999 @@ -2,7 +2,7 @@ PACKAGE = mc VERSION = @VERSION@ -SHELL = /bin/sh +SHELL = @SHELL@ @SET_MAKE@ srcdir = @srcdir@ diff -ruN old/mc-4.5.12/po/POTFILES.in new/mc-4.5.13/po/POTFILES.in --- old/mc-4.5.12/po/POTFILES.in Sun Feb 7 02:53:42 1999 +++ new/mc-4.5.13/po/POTFILES.in Wed Feb 10 19:41:21 1999 @@ -15,7 +15,6 @@ gtkedit/edit.c gtkedit/edit.h gtkedit/editcmd.c -gtkedit/editmenu.c gtkedit/editoptions.c gtkedit/editwidget.c gtkedit/gtkedit.c diff -ruN old/mc-4.5.12/po/cat-id-tbl.c new/mc-4.5.13/po/cat-id-tbl.c --- old/mc-4.5.12/po/cat-id-tbl.c Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/cat-id-tbl.c Wed Feb 10 19:41:22 1999 @@ -108,910 +108,789 @@ {"Creates a new directory", 89}, {"New _Window", 90}, {"Opens a new window", 91}, - {"_New", 92}, - {"_Open", 93}, - {"Opens the selected files", 94}, - {"_Copy...", 95}, - {"Copy files", 96}, - {"_Delete...", 97}, - {"Delete files from disk", 98}, - {"_Move...", 99}, - {"Rename or move files", 100}, - {"C_lose", 101}, - {"Close this panel", 102}, - {"Select _All", 103}, - {"Select all files in the current Panel", 104}, - {"_Select Files...", 105}, - {"Select a group of files", 106}, - {"_Invert Selection", 107}, - {"Reverses the list of tagged files", 108}, - {"_Rescan Directory", 109}, - {"Rescan the directory contents", 110}, - {"Icon View", 111}, - {"Partial View", 112}, - {"Full View", 113}, - {"Custom View", 114}, - {"_Sort By...", 115}, - {"Confirmation settings", 116}, - {"_Filter View...", 117}, - {"Global option settings", 118}, - {"_Find File...", 119}, - {"Locate files on disk", 120}, - {"_Run Command...", 121}, - {"Runs a command", 122}, - {"_Run Command in panel...", 123}, - {"Run a command and put the results in a panel", 124}, - {"_Active VFS list...", 125}, - {"List of active virtual file systems", 126}, - {"_Background jobs...", 127}, - {"List of background operations", 128}, - {"_About", 129}, - {"Information on this program", 130}, - {"_File", 131}, - {"_Edit", 132}, - {"_Layout", 133}, - {"_Commands", 134}, - {"_Help", 135}, - {"File/New/Directory...", 136}, - {"Properties", 137}, - {"Open", 138}, - {"Open with", 139}, - {"View", 140}, - {"View unfiltered", 141}, - {"Edit", 142}, - {"Link...", 143}, - {"Symlink...", 144}, - {"Edit symlink...", 145}, - {"Move/rename...", 146}, - {"Copy...", 147}, - {"Delete", 148}, - {"Show backup files", 149}, - {"Show hidden files", 150}, - {"Mix files and directories", 151}, - {"Use shell patterns instead of regular expressions", 152}, - {"Confirm when deleting file", 153}, - {"Confirm when overwriting files", 154}, - {"Confirm when executing files", 155}, - {"Show progress while operations are being performed", 156}, - {"VFS Timeout :", 157}, - {"Seconds", 158}, - {"Anonymous FTP password :", 159}, - {"Always use FTP proxy", 160}, - {"Fast directory reload", 161}, - {"Compute totals before copying files", 162}, - {"FTP directory cache timeout :", 163}, - {"Allow customization of icons in icon view", 164}, - {"File display", 165}, - {"Confirmation", 166}, - {"VFS", 167}, - {"Caching", 168}, - {"Filename", 169}, - {"Full name: ", 170}, - {"Command", 171}, - {"Command:", 172}, - {"Use terminal", 173}, - {"File mode (permissions)", 174}, - {"Current mode: ", 175}, - {"Read", 176}, - {"Write", 177}, - {"Exec", 178}, - {"Special", 179}, - {"User", 180}, - {"Group", 181}, - {"Other", 182}, - {"Set UID", 183}, - {"Set GID", 184}, - {"Sticky", 185}, - {"", 186}, - {"Owner", 187}, - {"General", 188}, - {"Title", 189}, - {"Icon", 190}, - {"Select icon", 191}, - {"All files", 192}, - {"Archives and compressed files", 193}, - {"RPM/DEB files", 194}, - {"Text/Document files", 195}, - {"HTML and SGML files", 196}, - {"Postscript and PDF files", 197}, - {"Spreadsheet files", 198}, - {"Image files", 199}, - {"Video/animation files", 200}, - {"Audio files", 201}, - {"C program files", 202}, - {"C++ program files", 203}, - {"Objective-C program files", 204}, - {"Scheme program files", 205}, - {"Assembler program files", 206}, - {"Misc. program files", 207}, - {"Font files", 208}, - {"Search: %s", 209}, - {"%s bytes in %d file", 210}, - {"%s bytes in %d files", 211}, - {"", 212}, - {"Filter", 213}, - {"Switch view to an Icon view", 214}, - {"Brief", 215}, - {"Switch view to show just file name and type", 216}, - {"Detailed", 217}, - {"Switch view to show detailed file statistics", 218}, - {"Custom", 219}, - {"Switch view to show custom determined statistics.", 220}, - {"Back", 221}, - {"Go to the previously visited directory", 222}, - {"Up", 223}, - {"Go up a level in the directory heirarchy", 224}, - {"Forward", 225}, - {"Go to the next directory", 226}, - {"Home", 227}, - {"Go to your home directory", 228}, - {"Location:", 229}, - {"&Ok", 230}, - {"Offset 0x%08x", 231}, - {"Col %d", 232}, - {"%s bytes", 233}, - {"_Goto line", 234}, - {"Jump to a specified line number", 235}, - {"_Monitor file", 236}, - {"Monitor file growing", 237}, - {"Regexp search", 238}, - {"Regular expression search", 239}, - {"_Wrap", 240}, - {"Wrap the text", 241}, - {"_Formatted", 242}, - {"_Hex", 243}, - {"_Search", 244}, - {"_Mode", 245}, - {"ok", 246}, - {"cancel", 247}, - {"help", 248}, - {"yes", 249}, - {"no", 250}, - {"exit", 251}, - {"abort", 252}, - {" Error ", 253}, - {" Failed trying to open file for reading: ", 254}, - {" Cannot get size/permissions info on file: ", 255}, - {" Not an ordinary file: ", 256}, - {" File is too large: ", 257}, + {"_Copy...", 92}, + {"Copy files", 93}, + {"_Delete...", 94}, + {"Delete files", 95}, + {"_Move...", 96}, + {"Rename or move files", 97}, + {"Select _All", 98}, + {"Select all files in the current Panel", 99}, + {"_Select Files...", 100}, + {"Select a group of files", 101}, + {"_Invert Selection", 102}, + {"Reverses the list of tagged files", 103}, + {"_Rescan Directory", 104}, + {"Rescan the directory contents", 105}, + {"Icon View", 106}, + {"Partial View", 107}, + {"Full View", 108}, + {"Custom View", 109}, + {"_Sort By...", 110}, + {"Confirmation settings", 111}, + {"_Filter View...", 112}, + {"Global option settings", 113}, + {"_Find File...", 114}, + {"Locate files on disk", 115}, + {"_Run Command...", 116}, + {"Runs a command", 117}, + {"_Run Command in panel...", 118}, + {"Run a command and put the results in a panel", 119}, + {"_Active VFS list...", 120}, + {"List of active virtual file systems", 121}, + {"_Background jobs...", 122}, + {"List of background operations", 123}, + {"_Layout", 124}, + {"_Commands", 125}, + {"File/New/Directory...", 126}, + {"Properties", 127}, + {"Open", 128}, + {"Open with", 129}, + {"View", 130}, + {"View unfiltered", 131}, + {"Edit", 132}, + {"Link...", 133}, + {"Symlink...", 134}, + {"Edit symlink...", 135}, + {"Move/rename...", 136}, + {"Copy...", 137}, + {"Delete", 138}, + {"Show backup files", 139}, + {"Show hidden files", 140}, + {"Mix files and directories", 141}, + {"Use shell patterns instead of regular expressions", 142}, + {"Confirm when deleting file", 143}, + {"Confirm when overwriting files", 144}, + {"Confirm when executing files", 145}, + {"Show progress while operations are being performed", 146}, + {"VFS Timeout :", 147}, + {"Seconds", 148}, + {"Anonymous FTP password :", 149}, + {"Always use FTP proxy", 150}, + {"Fast directory reload", 151}, + {"Compute totals before copying files", 152}, + {"FTP directory cache timeout :", 153}, + {"Allow customization of icons in icon view", 154}, + {"File display", 155}, + {"Confirmation", 156}, + {"VFS", 157}, + {"Caching", 158}, + {"Filename", 159}, + {"Full name: ", 160}, + {"Command", 161}, + {"Command:", 162}, + {"Use terminal", 163}, + {"File mode (permissions)", 164}, + {"Current mode: ", 165}, + {"Read", 166}, + {"Write", 167}, + {"Exec", 168}, + {"Special", 169}, + {"User", 170}, + {"Group", 171}, + {"Other", 172}, + {"Set UID", 173}, + {"Set GID", 174}, + {"Sticky", 175}, + {"", 176}, + {"Owner", 177}, + {"General", 178}, + {"Title", 179}, + {"Icon", 180}, + {"Select icon", 181}, + {"All files", 182}, + {"Archives and compressed files", 183}, + {"RPM/DEB files", 184}, + {"Text/Document files", 185}, + {"HTML and SGML files", 186}, + {"Postscript and PDF files", 187}, + {"Spreadsheet files", 188}, + {"Image files", 189}, + {"Video/animation files", 190}, + {"Audio files", 191}, + {"C program files", 192}, + {"C++ program files", 193}, + {"Objective-C program files", 194}, + {"Scheme program files", 195}, + {"Assembler program files", 196}, + {"Misc. program files", 197}, + {"Font files", 198}, + {"Search: %s", 199}, + {"%s bytes in %d file", 200}, + {"%s bytes in %d files", 201}, + {"", 202}, + {"Filter", 203}, + {"Switch view to an Icon view", 204}, + {"Brief", 205}, + {"Switch view to show just file name and type", 206}, + {"Detailed", 207}, + {"Switch view to show detailed file statistics", 208}, + {"Custom", 209}, + {"Switch view to show custom determined statistics.", 210}, + {"Back", 211}, + {"Go to the previously visited directory", 212}, + {"Up", 213}, + {"Go up a level in the directory heirarchy", 214}, + {"Forward", 215}, + {"Go to the next directory", 216}, + {"Home", 217}, + {"Go to your home directory", 218}, + {"Location:", 219}, + {"&Ok", 220}, + {"Offset 0x%08x", 221}, + {"Col %d", 222}, + {"%s bytes", 223}, + {"_Goto line", 224}, + {"Jump to a specified line number", 225}, + {"_Monitor file", 226}, + {"Monitor file growing", 227}, + {"Regexp search", 228}, + {"Regular expression search", 229}, + {"_Wrap", 230}, + {"Wrap the text", 231}, + {"_Parsed view", 232}, + {"_Formatted", 233}, + {"_Hex", 234}, + {"_Search", 235}, + {"ok", 236}, + {"cancel", 237}, + {"help", 238}, + {"yes", 239}, + {"no", 240}, + {"exit", 241}, + {"abort", 242}, + {" Error ", 243}, + {" Failed trying to open file for reading: ", 244}, + {" Cannot get size/permissions info on file: ", 245}, + {" Not an ordinary file: ", 246}, + {" File is too large: ", 247}, {"\ \n\ - Increase edit.h:MAXBUF and recompile the editor. ", 258}, - {" Error allocating memory ", 259}, - {" Save As ", 260}, - {" Warning ", 261}, - {" A file already exists with this name. ", 262}, - {"Overwrite", 263}, - {"Cancel", 264}, - {" Save as ", 265}, - {" Error trying to save file. ", 266}, - {" Delete macro ", 267}, - {" Error trying to open temp file ", 268}, - {" Error trying to open macro file ", 269}, - {"key '%d 0': ", 270}, - {" Error trying to overwrite macro file ", 271}, - {" Macro ", 272}, - {" Press the macro's new hotkey: ", 273}, - {" Save macro ", 274}, - {" Delete Macro ", 275}, - {" Load macro ", 276}, - {" Confirm save file? : ", 277}, - {" Save file ", 278}, - {"Save", 279}, + Increase edit.h:MAXBUF and recompile the editor. ", 248}, + {" Error allocating memory ", 249}, + {" Save As ", 250}, + {" Warning ", 251}, + {" A file already exists with this name. ", 252}, + {"Overwrite", 253}, + {"Cancel", 254}, + {" Save as ", 255}, + {" Error trying to save file. ", 256}, + {" Delete macro ", 257}, + {" Error trying to open temp file ", 258}, + {" Error trying to open macro file ", 259}, + {"key '%d 0': ", 260}, + {" Error trying to overwrite macro file ", 261}, + {" Macro ", 262}, + {" Press the macro's new hotkey: ", 263}, + {" Save macro ", 264}, + {" Delete Macro ", 265}, + {" Load macro ", 266}, + {" Confirm save file? : ", 267}, + {" Save file ", 268}, + {"Save", 269}, {"\ Current text was modified without a file save. \n\ - Continue discards these changes. ", 280}, - {"Continue", 281}, - {" Load ", 282}, - {" Error trying to open file for reading ", 283}, - {" Block is large, you may not be able to undo this action. ", 284}, - {" Continue ", 285}, - {" Cancel ", 286}, - {" Replace with: ", 287}, - {" Replace ", 288}, - {" Search ", 289}, - {" Enter search text : ", 290}, - {" Enter replace text : ", 291}, - {" Enter argument order : ", 292}, - {"Enter the order of replacement of your scanf format specifiers", 293}, - {" Whole words only ", 294}, - {" Case sensitive ", 295}, - {" Regular expression ", 296}, - {"See the regex man page for how to compose a regular expression", 297}, - {" Backwards ", 298}, - {"Warning: Searching backward can be slow", 299}, - {" Prompt on replace ", 300}, - {"Ask before making each replacement", 301}, - {" Replace all ", 302}, - {" Scanf expression ", 303}, - {"Allows entering of a C format string, see the scanf man page", 304}, - {"Begin search, Enter", 305}, - {"Abort this dialog, Esc", 306}, - {"Replace", 307}, - {"Skip", 308}, - {"Replace all", 309}, - {"\ - Invalid regular expression, or scanf expression with to many conversions ", 310}, - {" Error in replacement format string. ", 311}, - {" %ld replacements made. ", 312}, - {" Search string not found. ", 313}, - {" Quit ", 314}, + Continue discards these changes. ", 270}, + {"Continue", 271}, + {" Load ", 272}, + {" Error trying to open file for reading ", 273}, + {" Block is large, you may not be able to undo this action. ", 274}, + {" Continue ", 275}, + {" Cancel ", 276}, + {" Replace with: ", 277}, + {" Replace ", 278}, + {" Search ", 279}, + {" Enter search text : ", 280}, + {" Enter replace text : ", 281}, + {" Enter argument order : ", 282}, + {"Enter the order of replacement of your scanf format specifiers", 283}, + {" Whole words only ", 284}, + {" Case sensitive ", 285}, + {" Regular expression ", 286}, + {"See the regex man page for how to compose a regular expression", 287}, + {" Backwards ", 288}, + {"Warning: Searching backward can be slow", 289}, + {" Prompt on replace ", 290}, + {"Ask before making each replacement", 291}, + {" Replace all ", 292}, + {" Scanf expression ", 293}, + {"Allows entering of a C format string, see the scanf man page", 294}, + {"Begin search, Enter", 295}, + {"Abort this dialog, Esc", 296}, + {"Replace", 297}, + {"Skip", 298}, + {"Replace all", 299}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 300}, + {" Error in replacement format string. ", 301}, + {" %ld replacements made. ", 302}, + {" Search string not found. ", 303}, + {" Quit ", 304}, {"\ Current text was modified without a file save. \n\ - Save with exit? ", 315}, - {" File was modified, Save with exit? ", 316}, - {"Cancel quit", 317}, - {" &Cancel quit ", 318}, - {" &Yes ", 319}, - {" &No ", 320}, - {" Copy to clipboard ", 321}, - {" Unable to save to file. ", 322}, - {" Cut to clipboard ", 323}, - {" Goto line ", 324}, - {" Enter line: ", 325}, - {" Save Block ", 326}, - {" Insert File ", 327}, - {" Insert file ", 328}, - {" Error trying to insert file. ", 329}, - {" Sort block ", 330}, - {" You must first highlight a block of text. ", 331}, - {" Run Sort ", 332}, - {" Enter sort options (see manpage) separated by whitespace: ", 333}, - {" Sort ", 334}, - {" Error trying to execute sort command ", 335}, - {" Sort returned non-zero: ", 336}, - {" Process block ", 337}, - {" Error trying to stat file ", 338}, - {" Mail ", 339}, - {" Word wrap ", 340}, - {" Enter line length, 0 for off: ", 341}, - {" About ", 342}, - {"\ -\n\ - Cooledit v2.1\n\ -\n\ - Copyright (C) 1996 the Free Software Foundation\n\ -\n\ - A user friendly text editor written\n\ - for the Midnight Commander.\n", 343}, - {"&Open/load... C-o", 344}, - {"&New C-n", 345}, - {"&Save F2", 346}, - {"save &As... F12", 347}, - {"&Insert file... F15", 348}, - {"copy to &File... C-f", 349}, - {"a&Bout... ", 350}, - {"&Quit F10", 351}, - {"&New C-x k", 352}, - {"copy to &File... ", 353}, - {"&Toggle Mark F3", 354}, - {"&Mark Columns S-F3", 355}, - {"toggle &Ins/overw Ins", 356}, - {"&Copy F5", 357}, - {"&Move F6", 358}, - {"&Delete F8", 359}, - {"&Undo C-u", 360}, - {"&Beginning C-PgUp", 361}, - {"&End C-PgDn", 362}, - {"&Search... F7", 363}, - {"search &Again F17", 364}, - {"&Replace... F4", 365}, - {"&Goto line... M-l", 366}, - {"insert &Literal... C-q", 367}, - {"&Refresh screen C-l", 368}, - {"&Start record macro C-r", 369}, - {"&Finish record macro... C-r", 370}, - {"&Execute macro... C-a, KEY", 371}, - {"delete macr&O... ", 372}, - {"insert &Date/time ", 373}, - {"format p&Aragraph M-p", 374}, - {"'ispell' s&Pell check C-p", 375}, - {"sor&T... M-t", 376}, - {"'indent' &C Formatter F19", 377}, - {"&Mail... ", 378}, - {"&Execute macro... C-x e, KEY", 379}, - {"'ispell' s&Pell check M-$", 380}, - {"&General... ", 381}, - {"&Save mode...", 382}, - {"&Layout...", 383}, - {" File ", 384}, - {" Edit ", 385}, - {" Sear/Repl ", 386}, - {" Command ", 387}, - {" Options ", 388}, - {"Open...\tC-o", 389}, - {"New\tC-n", 390}, - {"Save\tF2", 391}, - {"Save as...\tF12", 392}, - {"Insert file...\tF15", 393}, - {"Copy to file...\tC-f", 394}, - {"Disk operations", 395}, - {"Toggle mark\tF3", 396}, - {"Toggle mark columns\tC-b", 397}, - {"Toggle insert/overwrite\tIns", 398}, - {"Copy block to cursor\tF5", 399}, - {"Move block to cursor\tF6", 400}, - {"Delete block\tF8/C-Del", 401}, - {"Copy block to clipbrd\tC-Ins", 402}, - {"Cut block to clipbrd\tS-Del", 403}, - {"Paste block from clipbrd\tS-Ins", 404}, - {"Selection history\tM-Ins", 405}, - {"Undo\tC-BackSpace", 406}, - {"Manipulating blocks of text", 407}, - {" Srch/Replce ", 408}, - {"Search...\tF7", 409}, - {"Search again\tF17", 410}, - {"Replace...\tF4", 411}, - {"Replace again\tF14", 412}, - {"Search for and replace text", 413}, - {"Goto line...\tM-l", 414}, - {"Start record macro\tC-r", 415}, - {"Finish record macro...\tC-r", 416}, - {"Execute macro...\tC-a, KEY", 417}, - {"Delete macro...\t", 418}, - {"Insert date/time\tC-d", 419}, - {"Format paragraph\tM-p", 420}, - {"Refresh display\tC-l", 421}, - {"Macros and internal commands", 422}, - {"None", 423}, - {"Dynamic paragraphing", 424}, - {"Type writer wrap", 425}, - {"Wrap mode", 426}, - {"Key emulation", 427}, - {"Error initialising editor.\n", 428}, - {"Help", 429}, - {"Mark", 430}, - {"Replac", 431}, - {"Search", 432}, - {"PullDn", 433}, - {"Quit", 434}, - {"&Dismiss", 435}, - {"The Quick Brown Fox Jumps Over The Lazy Dog", 436}, - {"\ -gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 437}, - {"Open/Load", 438}, - {"Load a different/new file", 439}, - {"New", 440}, - {"Clear the edit buffer", 441}, - {"Save the current edit buffer to filename", 442}, - {"Save As", 443}, - {"Save the current edit buffer as filename", 444}, - {"Insert File", 445}, - {"Insert text from a file", 446}, - {"Copy to file", 447}, - {"copy a block to a file", 448}, - {"Exit", 449}, - {"Quit editor", 450}, - {"Copy selection to clipboard", 451}, - {"Cut", 452}, - {"Cut selection to clipboard", 453}, - {"Paste", 454}, - {"Paste clipboard", 455}, - {"Undo", 456}, - {"Go back in time one key press", 457}, - {"Find", 458}, - {"Find string/regular expression", 459}, - {"Find again", 460}, - {"Repeat most recent search", 461}, - {"Search/Replace", 462}, - {"Find and replace text/regular expressions", 463}, - {"About...", 464}, - {"Info about Mcedit", 465}, - {"File", 466}, - {" Load syntax file ", 467}, - {" File access error ", 468}, - {" Syntax error in file %s on line %d ", 469}, - {"&Cancel", 470}, - {"&Set", 471}, - {"S&kip", 472}, - {"Set &all", 473}, - {"owner", 474}, - {"group", 475}, - {"other", 476}, - {"On", 477}, - {"Flag", 478}, - {"Mode", 479}, - {"%6d of %d", 480}, - {" Chown advanced command ", 481}, + Save with exit? ", 305}, + {" File was modified, Save with exit? ", 306}, + {"Cancel quit", 307}, + {" &Cancel quit ", 308}, + {" &Yes ", 309}, + {" &No ", 310}, + {" Copy to clipboard ", 311}, + {" Unable to save to file. ", 312}, + {" Cut to clipboard ", 313}, + {" Goto line ", 314}, + {" Enter line: ", 315}, + {" Save Block ", 316}, + {" Insert File ", 317}, + {" Insert file ", 318}, + {" Error trying to insert file. ", 319}, + {" Sort block ", 320}, + {" You must first highlight a block of text. ", 321}, + {" Run Sort ", 322}, + {" Enter sort options (see manpage) separated by whitespace: ", 323}, + {" Sort ", 324}, + {" Error trying to execute sort command ", 325}, + {" Sort returned non-zero: ", 326}, + {" Process block ", 327}, + {" Error trying to stat file ", 328}, + {" Mail ", 329}, + {"None", 330}, + {"Dynamic paragraphing", 331}, + {"Type writer wrap", 332}, + {"Wrap mode", 333}, + {"Key emulation", 334}, + {"Error initialising editor.\n", 335}, + {"Help", 336}, + {"Mark", 337}, + {"Replac", 338}, + {"Search", 339}, + {"PullDn", 340}, + {"Quit", 341}, + {"&Dismiss", 342}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 343}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 344}, + {"Clear the edit buffer", 345}, + {"Insert File", 346}, + {"Insert text from a file", 347}, + {"Copy to file", 348}, + {"copy a block to a file", 349}, + {"Search/Replace", 350}, + {" Load syntax file ", 351}, + {" File access error ", 352}, + {" Syntax error in file %s on line %d ", 353}, + {"&Cancel", 354}, + {"&Set", 355}, + {"S&kip", 356}, + {"Set &all", 357}, + {"owner", 358}, + {"group", 359}, + {"other", 360}, + {"On", 361}, + {"Flag", 362}, + {"Mode", 363}, + {"%6d of %d", 364}, + {" Chown advanced command ", 365}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 482}, + %s ", 366}, {"\ Couldn't chown \"%s\" \n\ - %s ", 483}, - {" Oops... ", 484}, - {" I can't run the Advanced Chown command on an extfs ", 485}, - {" I can't run the Advanced Chown command on a tarfs ", 486}, - {"Background process:", 487}, - {" Background process error ", 488}, - {" Child died unexpectedly ", 489}, - {" Unknown error in child ", 490}, - {" Background protocol error ", 491}, + %s ", 367}, + {" Oops... ", 368}, + {" I can't run the Advanced Chown command on an extfs ", 369}, + {" I can't run the Advanced Chown command on a tarfs ", 370}, + {"Background process:", 371}, + {" Background process error ", 372}, + {" Child died unexpectedly ", 373}, + {" Unknown error in child ", 374}, + {" Background protocol error ", 375}, {"\ Background process sent us a request for more arguments \n\ - than we can handle. \n", 492}, - {" Listing mode ", 493}, - {"&Full file list", 494}, - {"&Brief file list", 495}, - {"&Long file list", 496}, - {"&User defined:", 497}, - {"&Icon view", 498}, - {"user &Mini status", 499}, - {"Listing mode", 500}, - {"&Reverse", 501}, - {"case sensi&tive", 502}, - {"Sort order", 503}, - {" confirm &Exit ", 504}, - {" confirm e&Xecute ", 505}, - {" confirm o&Verwrite ", 506}, - {" confirm &Delete ", 507}, - {" Confirmation ", 508}, - {"Full 8 bits output", 509}, - {"ISO 8859-1", 510}, - {"7 bits", 511}, - {"F&ull 8 bits input", 512}, - {" Display bits ", 513}, - {"&Always use ftp proxy", 514}, - {"sec", 515}, - {"ftpfs directory cache timeout:", 516}, - {"ftp anonymous password:", 517}, - {"Timeout for freeing VFSs:", 518}, - {" Virtual File System Setting ", 519}, - {"Quick cd", 520}, - {"cd", 521}, - {"Symbolic link", 522}, - {"Symbolic link filename:", 523}, - {"Existing filename (filename symlink will point to):", 524}, - {"Running ", 525}, - {"Stopped", 526}, - {"&Stop", 527}, - {"&Resume", 528}, - {"&Kill", 529}, - {"Background Jobs", 530}, - {"execute/search by others", 531}, - {"write by others", 532}, - {"read by others", 533}, - {"execute/search by group", 534}, - {"write by group", 535}, - {"read by group", 536}, - {"execute/search by owner", 537}, - {"write by owner", 538}, - {"read by owner", 539}, - {"sticky bit", 540}, - {"set group ID on execution", 541}, - {"set user ID on execution", 542}, - {"C&lear marked", 543}, - {"S&et marked", 544}, - {"&Marked all", 545}, - {"Permissions (Octal)", 546}, - {"Owner name", 547}, - {"Group name", 548}, - {" Chmod command ", 549}, - {" Permission ", 550}, - {"Use SPACE to change", 551}, - {"an option, ARROW KEYS", 552}, - {"to move between options", 553}, - {"and T or INS to mark", 554}, - {"Chmod command", 555}, - {" I can't run the Chmod command on an extfs ", 556}, - {"Set &users", 557}, - {"Set &groups", 558}, - {" Name ", 559}, - {" Owner name ", 560}, - {" Group name ", 561}, - {" Size ", 562}, - {" Chown command ", 563}, - {" User name ", 564}, - {"", 565}, - {"", 566}, - {" I can't run the Chown command on an extfs ", 567}, - {" I can't run the Chown command on a tarfs ", 568}, - {" Can not fetch a local copy of %s ", 569}, - {" CD ", 570}, - {"Files tagged, want to cd?", 571}, - {"Could not change directory", 572}, - {" View file ", 573}, - {" Filename:", 574}, - {" Filtered view ", 575}, - {" Filter command and arguments:", 576}, - {"Create a new Directory", 577}, - {" Enter directory name:", 578}, - {" Filter ", 579}, - {" Set expression for filtering filenames", 580}, - {" Select ", 581}, - {" Malformed regular expression ", 582}, - {" Unselect ", 583}, - {"Extension file edit", 584}, - {" Which extension file you want to edit? ", 585}, - {"&User", 586}, - {"&System Wide", 587}, - {"Menu file edit", 588}, - {" Which menu file will you edit? ", 589}, - {"&Local", 590}, - {"&Home", 591}, - {" Compare directories ", 592}, - {" Select compare method: ", 593}, - {"&Quick", 594}, - {"&Size only", 595}, - {"&Thorough", 596}, - {" Both panels should be on the listing view mode to use this command ", 597}, - {" The command history is empty ", 598}, - {" Command history ", 599}, + than we can handle. \n", 376}, + {" Listing mode ", 377}, + {"&Full file list", 378}, + {"&Brief file list", 379}, + {"&Long file list", 380}, + {"&User defined:", 381}, + {"&Icon view", 382}, + {"user &Mini status", 383}, + {"Listing mode", 384}, + {"&Reverse", 385}, + {"case sensi&tive", 386}, + {"Sort order", 387}, + {" confirm &Exit ", 388}, + {" confirm e&Xecute ", 389}, + {" confirm o&Verwrite ", 390}, + {" confirm &Delete ", 391}, + {" Confirmation ", 392}, + {"Full 8 bits output", 393}, + {"ISO 8859-1", 394}, + {"7 bits", 395}, + {"F&ull 8 bits input", 396}, + {" Display bits ", 397}, + {"&Always use ftp proxy", 398}, + {"sec", 399}, + {"ftpfs directory cache timeout:", 400}, + {"ftp anonymous password:", 401}, + {"Timeout for freeing VFSs:", 402}, + {" Virtual File System Setting ", 403}, + {"Quick cd", 404}, + {"cd", 405}, + {"Symbolic link", 406}, + {"Symbolic link filename:", 407}, + {"Existing filename (filename symlink will point to):", 408}, + {"Running ", 409}, + {"Stopped", 410}, + {"&Stop", 411}, + {"&Resume", 412}, + {"&Kill", 413}, + {"Background Jobs", 414}, + {"execute/search by others", 415}, + {"write by others", 416}, + {"read by others", 417}, + {"execute/search by group", 418}, + {"write by group", 419}, + {"read by group", 420}, + {"execute/search by owner", 421}, + {"write by owner", 422}, + {"read by owner", 423}, + {"sticky bit", 424}, + {"set group ID on execution", 425}, + {"set user ID on execution", 426}, + {"C&lear marked", 427}, + {"S&et marked", 428}, + {"&Marked all", 429}, + {"Permissions (Octal)", 430}, + {"Owner name", 431}, + {"Group name", 432}, + {" Chmod command ", 433}, + {" Permission ", 434}, + {" File ", 435}, + {"Use SPACE to change", 436}, + {"an option, ARROW KEYS", 437}, + {"to move between options", 438}, + {"and T or INS to mark", 439}, + {"Chmod command", 440}, + {" I can't run the Chmod command on an extfs ", 441}, + {"Set &users", 442}, + {"Set &groups", 443}, + {" Name ", 444}, + {" Owner name ", 445}, + {" Group name ", 446}, + {" Size ", 447}, + {" Chown command ", 448}, + {" User name ", 449}, + {"", 450}, + {"", 451}, + {" I can't run the Chown command on an extfs ", 452}, + {" I can't run the Chown command on a tarfs ", 453}, + {" Can not fetch a local copy of %s ", 454}, + {" CD ", 455}, + {"Files tagged, want to cd?", 456}, + {"Could not change directory", 457}, + {" View file ", 458}, + {" Filename:", 459}, + {" Filtered view ", 460}, + {" Filter command and arguments:", 461}, + {"Create a new Directory", 462}, + {" Enter directory name:", 463}, + {" Filter ", 464}, + {" Set expression for filtering filenames", 465}, + {" Select ", 466}, + {" Malformed regular expression ", 467}, + {" Unselect ", 468}, + {"Extension file edit", 469}, + {" Which extension file you want to edit? ", 470}, + {"&User", 471}, + {"&System Wide", 472}, + {"Menu file edit", 473}, + {" Which menu file will you edit? ", 474}, + {"&Local", 475}, + {"&Home", 476}, + {" Compare directories ", 477}, + {" Select compare method: ", 478}, + {"&Quick", 479}, + {"&Size only", 480}, + {"&Thorough", 481}, + {" Both panels should be on the listing view mode to use this command ", 482}, + {" The command history is empty ", 483}, + {" Command history ", 484}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 600}, - {"Type `exit' to return to the Midnight Commander", 601}, + the panels cannot be toggled. ", 485}, + {"Type `exit' to return to the Midnight Commander", 486}, {"\ Couldn't stat %s \n\ - %s ", 602}, - {" Link ", 603}, - {" to:", 604}, - {" link: %s ", 605}, - {" symlink: %s ", 606}, - {" Symlink ", 607}, - {" points to:", 608}, - {" Edit symlink ", 609}, - {" edit symlink: %s ", 610}, - {" Link symbolically ", 611}, - {" Relative symlink ", 612}, - {" relative symlink: %s ", 613}, - {" Enter machine name (F1 for details): ", 614}, - {" Could not chdir to %s ", 615}, - {" Link to a remote machine ", 616}, - {" FTP to machine ", 617}, - {" Socket source routing setup ", 618}, - {" Enter host name to use as a source routing hop: ", 619}, - {" Host name ", 620}, - {" Error while looking up IP address ", 621}, - {" Undelete files on an ext2 file system ", 622}, + %s ", 487}, + {" Link ", 488}, + {" to:", 489}, + {" link: %s ", 490}, + {" symlink: %s ", 491}, + {" Symlink ", 492}, + {" points to:", 493}, + {" Edit symlink ", 494}, + {" edit symlink: %s ", 495}, + {" Link symbolically ", 496}, + {" Relative symlink ", 497}, + {" relative symlink: %s ", 498}, + {" Enter machine name (F1 for details): ", 499}, + {" Could not chdir to %s ", 500}, + {" Link to a remote machine ", 501}, + {" FTP to machine ", 502}, + {" Socket source routing setup ", 503}, + {" Enter host name to use as a source routing hop: ", 504}, + {" Host name ", 505}, + {" Error while looking up IP address ", 506}, + {" Undelete files on an ext2 file system ", 507}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 623}, - {" Setup saved to ~/", 624}, - {" Setup ", 625}, + files on: (F1 for details)", 508}, + {" Setup saved to ~/", 509}, + {" Setup ", 510}, {"\ Can't chdir to '%s' \n\ - %s ", 626}, - {" You can not execute commands on non-local filesystems", 627}, + %s ", 511}, + {" You can not execute commands on non-local filesystems", 512}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\n", 628}, - {"&Unsorted", 629}, - {"&Name", 630}, - {"&Extension", 631}, - {"&Modify time", 632}, - {"&Access time", 633}, - {"&Change time", 634}, - {"&Size", 635}, - {"&Inode", 636}, - {"&Type", 637}, - {"&Links", 638}, - {"N&GID", 639}, - {"N&UID", 640}, - {"&Owner", 641}, - {"&Group", 642}, - {"File exists but can not be stat-ed: %s %s", 643}, - {"Unknown", 644}, +\n", 513}, + {"&Unsorted", 514}, + {"&Name", 515}, + {"&Extension", 516}, + {"&Modify time", 517}, + {"&Access time", 518}, + {"&Change time", 519}, + {"&Size", 520}, + {"&Inode", 521}, + {"&Type", 522}, + {"&Links", 523}, + {"N&GID", 524}, + {"N&UID", 525}, + {"&Owner", 526}, + {"&Group", 527}, + {"File exists but can not be stat-ed: %s %s", 528}, + {"Unknown", 529}, {"\ Can't create temporary command file \n\ - %s ", 645}, - {" Parameter ", 646}, - {" Can't execute commands on a Virtual File System directory ", 647}, - {" file error", 648}, - {"Format of the ", 649}, - {" file error ", 650}, - {"Format of the ~/", 651}, + %s ", 530}, + {" Parameter ", 531}, + {" Can't execute commands on a Virtual File System directory ", 532}, + {" file error", 533}, + {"Format of the ", 534}, + {" file error ", 535}, + {"Format of the ~/", 536}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 652}, +copy it from ", 537}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 653}, - {"mc.ext will be used for this moment.", 654}, - {" Copy ", 655}, - {" Move ", 656}, - {" Delete ", 657}, - {" Invalid target mask ", 658}, - {" Could not make the hardlink ", 659}, +file as an example of how to write it.\n", 538}, + {"mc.ext will be used for this moment.", 539}, + {" Copy ", 540}, + {" Move ", 541}, + {" Delete ", 542}, + {" Invalid target mask ", 543}, + {" Could not make the hardlink ", 544}, {"\ Cannot read source link \"%s\" \n\ - %s ", 660}, + %s ", 545}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 661}, + Option Stable Symlinks will be disabled ", 546}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 662}, + %s ", 547}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 663}, + %s ", 548}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 664}, - {" `%s' and `%s' are the same file. ", 665}, + %s ", 549}, + {" `%s' and `%s' are the same file. ", 550}, {"\ Cannot create special file \"%s\" \n\ - %s ", 666}, + %s ", 551}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 667}, + %s ", 552}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 668}, + %s ", 553}, {"\ Cannot open source file \"%s\" \n\ - %s ", 669}, - {" Reget failed, about to overwrite file ", 670}, + %s ", 554}, + {" Reget failed, about to overwrite file ", 555}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 671}, + %s ", 556}, {"\ Cannot create target file \"%s\" \n\ - %s ", 672}, + %s ", 557}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 673}, + %s ", 558}, {"\ Cannot read source file \"%s\" \n\ - %s ", 674}, + %s ", 559}, {"\ Cannot write target file \"%s\" \n\ - %s ", 675}, - {"(stalled)", 676}, + %s ", 560}, + {"(stalled)", 561}, {"\ Cannot close source file \"%s\" \n\ - %s ", 677}, + %s ", 562}, {"\ Cannot close target file \"%s\" \n\ - %s ", 678}, - {"Incomplete file was retrieved. Keep it?", 679}, - {"&Delete", 680}, - {"&Keep", 681}, + %s ", 563}, + {"Incomplete file was retrieved. Keep it?", 564}, + {"&Delete", 565}, + {"&Keep", 566}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 682}, + %s ", 567}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 683}, + %s ", 568}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 684}, + `%s' ", 569}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 685}, + %s ", 570}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 686}, + %s ", 571}, {"\ Cannot stat file \"%s\" \n\ - %s ", 687}, - {" `%s' and `%s' are the same file ", 688}, - {" Cannot overwrite directory `%s' ", 689}, + %s ", 572}, + {" `%s' and `%s' are the same file ", 573}, + {" Cannot overwrite directory `%s' ", 574}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 690}, + %s ", 575}, {"\ Cannot remove file \"%s\" \n\ - %s ", 691}, - {" Cannot overwrite directory \"%s\" %s ", 692}, - {" Cannot overwrite file \"%s\" %s ", 693}, + %s ", 576}, + {" Cannot overwrite directory \"%s\" %s ", 577}, + {" Cannot overwrite file \"%s\" %s ", 578}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 694}, + %s ", 579}, {"\ Cannot delete file \"%s\" \n\ - %s ", 695}, + %s ", 580}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 696}, - {" Internal error: get_file \n", 697}, - {"1Copy", 698}, - {"1Move", 699}, - {"1Delete", 700}, - {"%o %f \"%s\"%m", 701}, - {"%o %d %f%m", 702}, - {"%o %f \"%s\"%e", 703}, - {"%o %d %f%e", 704}, - {"file", 705}, - {"files", 706}, - {"directory", 707}, - {"directories", 708}, - {"files/directories", 709}, - {" with source mask:", 710}, - {" Can't operate on \"..\"! ", 711}, - {"Yes", 712}, - {"No", 713}, - {" Sorry, I could not put the job in background ", 714}, - {" Internal failure ", 715}, - {" Unknown file operation ", 716}, + %s ", 581}, + {" Internal error: get_file \n", 582}, + {"1Copy", 583}, + {"1Move", 584}, + {"1Delete", 585}, + {"%o %f \"%s\"%m", 586}, + {"%o %d %f%m", 587}, + {"%o %f \"%s\"%e", 588}, + {"%o %d %f%e", 589}, + {"file", 590}, + {"files", 591}, + {"directory", 592}, + {"directories", 593}, + {"files/directories", 594}, + {" with source mask:", 595}, + {" Can't operate on \"..\"! ", 596}, + {"Yes", 597}, + {"No", 598}, + {" Sorry, I could not put the job in background ", 599}, + {" Internal failure ", 600}, + {" Unknown file operation ", 601}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 717}, - {"&Skip", 718}, - {"&Retry", 719}, - {"&Abort", 720}, + %s ", 602}, + {"&Skip", 603}, + {"&Retry", 604}, + {"&Abort", 605}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 721}, + Delete it recursively? ", 606}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 722}, - {" Delete: ", 723}, - {"a&ll", 724}, - {"non&E", 725}, - {" Type 'yes' if you REALLY want to delete ", 726}, - {"all the directories ", 727}, - {" Recursive Delete ", 728}, - {" Background process: Recursive Delete ", 729}, - {"Count", 730}, - {"Bytes", 731}, - {"Source", 732}, - {"Target", 733}, - {"Deleting", 734}, - {"Target file \"%s\" already exists!", 735}, - {"if &Size differs", 736}, - {"&Update", 737}, - {"al&L", 738}, - {"Overwrite all targets?", 739}, - {"&Reget", 740}, - {"ap&Pend", 741}, - {"Overwrite this target?", 742}, - {"Target date: %s, size %d", 743}, - {"Source date: %s, size %d", 744}, - {" File exists ", 745}, - {" Background process: File exists ", 746}, - {"preserve &Attributes", 747}, - {"follow &Links", 748}, - {"to:", 749}, - {"&Using shell patterns", 750}, - {"&Background", 751}, - {"&Stable Symlinks", 752}, - {"&Dive into subdir if exists", 753}, + Delete it recursively? ", 607}, + {" Delete: ", 608}, + {"a&ll", 609}, + {"non&E", 610}, + {" Type 'yes' if you REALLY want to delete ", 611}, + {"all the directories ", 612}, + {" Recursive Delete ", 613}, + {" Background process: Recursive Delete ", 614}, + {"File", 615}, + {"Count", 616}, + {"Bytes", 617}, + {"Source", 618}, + {"Target", 619}, + {"Deleting", 620}, + {"Target file \"%s\" already exists!", 621}, + {"if &Size differs", 622}, + {"&Update", 623}, + {"al&L", 624}, + {"Overwrite all targets?", 625}, + {"&Reget", 626}, + {"ap&Pend", 627}, + {"Overwrite this target?", 628}, + {"Target date: %s, size %d", 629}, + {"Source date: %s, size %d", 630}, + {" File exists ", 631}, + {" Background process: File exists ", 632}, + {"preserve &Attributes", 633}, + {"follow &Links", 634}, + {"to:", 635}, + {"&Using shell patterns", 636}, + {"&Background", 637}, + {"&Stable Symlinks", 638}, + {"&Dive into subdir if exists", 639}, {"\ Invalid source pattern `%s' \n\ - %s ", 754}, - {"&Suspend", 755}, - {"Con&tinue", 756}, - {"&Chdir", 757}, - {"&Again", 758}, - {"&Quit", 759}, - {"Pane&lize", 760}, - {"&View - F3", 761}, - {"&Edit - F4", 762}, - {"Start at:", 763}, - {"Filename:", 764}, - {"Content: ", 765}, - {"&Tree", 766}, - {"Find File", 767}, - {"Grepping in %s", 768}, - {" Find/read ", 769}, - {" Problem reading from child ", 770}, - {"Finished", 771}, - {"Searching %s", 772}, - {"Searching", 773}, - {"Find file", 774}, - {"Usage: fixhlp \n", 775}, - {"fixhlp: Cannot open toc for writing", 776}, + %s ", 640}, + {"&Suspend", 641}, + {"Con&tinue", 642}, + {"&Chdir", 643}, + {"&Again", 644}, + {"&Quit", 645}, + {"Pane&lize", 646}, + {"&View - F3", 647}, + {"&Edit - F4", 648}, + {"Start at:", 649}, + {"Filename:", 650}, + {"Content: ", 651}, + {"&Tree", 652}, + {"Find File", 653}, + {"Grepping in %s", 654}, + {" Find/read ", 655}, + {" Problem reading from child ", 656}, + {"Finished", 657}, + {"Searching %s", 658}, + {"Searching", 659}, + {"Find file", 660}, + {"Usage: fixhlp \n", 661}, + {"fixhlp: Cannot open toc for writing", 662}, {"\ [Contents]\n\ Topics:\n\ -\n", 777}, +\n", 663}, {"\ Help file format error\n\ -", 778}, - {" Internal bug: Double start of link area ", 779}, - {" Can't find node [Contents] in help file ", 780}, - {" Help ", 781}, +", 664}, + {" Internal bug: Double start of link area ", 665}, + {" Can't find node [Contents] in help file ", 666}, + {" Help ", 667}, {"\ Can't open file %s \n\ - %s ", 782}, - {" Can't find node %s in help file ", 783}, - {"Index", 784}, - {"Prev", 785}, - {"&Move", 786}, - {"&Remove", 787}, - {"&Append", 788}, - {"&Insert", 789}, - {"New &Entry", 790}, - {"New &Group", 791}, - {"&Up", 792}, - {"&Add current", 793}, - {"Change &To", 794}, - {"Subgroup - press ENTER to see list", 795}, - {"Active VFS directories", 796}, - {"Directory hotlist", 797}, - {" Directory path ", 798}, - {" Directory label ", 799}, - {"Moving ", 800}, - {"New hotlist entry", 801}, - {"Directory label", 802}, - {"Directory path", 803}, - {" New hotlist group ", 804}, - {"Name of new group", 805}, - {"Label for \"%s\":", 806}, - {" Add to hotlist ", 807}, - {" Remove: ", 808}, + %s ", 668}, + {" Can't find node %s in help file ", 669}, + {"Index", 670}, + {"Prev", 671}, + {"&Move", 672}, + {"&Remove", 673}, + {"&Append", 674}, + {"&Insert", 675}, + {"New &Entry", 676}, + {"New &Group", 677}, + {"&Up", 678}, + {"&Add current", 679}, + {"Change &To", 680}, + {"Subgroup - press ENTER to see list", 681}, + {"Active VFS directories", 682}, + {"Directory hotlist", 683}, + {" Directory path ", 684}, + {" Directory label ", 685}, + {"Moving ", 686}, + {"New hotlist entry", 687}, + {"Directory label", 688}, + {"Directory path", 689}, + {" New hotlist group ", 690}, + {"Name of new group", 691}, + {"Label for \"%s\":", 692}, + {" Add to hotlist ", 693}, + {" Remove: ", 694}, {"\ \n\ Group not empty.\n\ - Remove it?", 809}, - {" Top level group ", 810}, - {"Hotlist is now kept in file ~/", 811}, - {"MC will load hotlist from ~/", 812}, - {"and then delete [Hotlist] section there", 813}, - {" Hotlist Load ", 814}, - {"MC was unable to write ~/", 815}, - {" file, your old hotlist entries were not deleted", 816}, - {"You have ~/", 817}, - {" file and [Hotlist] section in ~/", 818}, - {"Your ~/", 819}, - {" most probably was created\n", 820}, + Remove it?", 695}, + {" Top level group ", 696}, + {"Hotlist is now kept in file ~/", 697}, + {"MC will load hotlist from ~/", 698}, + {"and then delete [Hotlist] section there", 699}, + {" Hotlist Load ", 700}, + {"MC was unable to write ~/", 701}, + {" file, your old hotlist entries were not deleted", 702}, + {"You have ~/", 703}, + {" file and [Hotlist] section in ~/", 704}, + {"Your ~/", 705}, + {" most probably was created\n", 706}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 821}, +and is more actual than ~/", 707}, {"\ entries\n\ -\n", 822}, +\n", 708}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 823}, + Remove - remove old hotlist entries from ~/", 709}, {"\ 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 ~/", 824}, - {"&Merge", 825}, - {" Entries from ~/", 826}, - {" file your old hotlist entries were not deleted", 827}, - {"Midnight Commander %s", 828}, - {"Free nodes %d (%d%%) of %d", 829}, - {"No node information", 830}, - {"Free space ", 831}, - {" (%d%%) of ", 832}, - {"No space information", 833}, - {"Type: %s ", 834}, - {"non-local vfs", 835}, - {"Device: %s", 836}, - {"Filesystem: %s", 837}, - {"Accessed: %s", 838}, - {"Modified: %s", 839}, - {"Created: %s", 840}, - {"Size: ", 841}, - {" (%d blocks)", 842}, - {"Owner: %s/%s", 843}, - {"Links: %d", 844}, - {"Mode: %s (%04o)", 845}, - {"Location: %Xh:%Xh", 846}, - {"File: %s", 847}, - {"File: None", 848}, - {"&Vertical", 849}, - {"&Horizontal", 850}, - {"&Xterm hintbar", 851}, - {"h&Intbar visible", 852}, - {"&Keybar visible", 853}, - {"command &Prompt", 854}, - {"show &Mini status", 855}, - {"menu&Bar visible", 856}, - {"&Equal split", 857}, - {"pe&Rmissions", 858}, - {"&File types", 859}, - {"&Save", 860}, - {" Layout ", 861}, - {" Panel split ", 862}, - {" Highlight... ", 863}, - {" Other options ", 864}, - {"output lines", 865}, - {"Layout", 866}, - {" Learn keys ", 867}, - {" Teach me a key ", 868}, + Merge - add old entries to hotlist as group \"Entries from ~/", 710}, + {"&Merge", 711}, + {" Entries from ~/", 712}, + {" file your old hotlist entries were not deleted", 713}, + {"Midnight Commander %s", 714}, + {"Free nodes %d (%d%%) of %d", 715}, + {"No node information", 716}, + {"Free space ", 717}, + {" (%d%%) of ", 718}, + {"No space information", 719}, + {"Type: %s ", 720}, + {"non-local vfs", 721}, + {"Device: %s", 722}, + {"Filesystem: %s", 723}, + {"Accessed: %s", 724}, + {"Modified: %s", 725}, + {"Created: %s", 726}, + {"Size: ", 727}, + {" (%d blocks)", 728}, + {"Owner: %s/%s", 729}, + {"Links: %d", 730}, + {"Mode: %s (%04o)", 731}, + {"Location: %Xh:%Xh", 732}, + {"File: %s", 733}, + {"File: None", 734}, + {"&Vertical", 735}, + {"&Horizontal", 736}, + {"&Xterm hintbar", 737}, + {"h&Intbar visible", 738}, + {"&Keybar visible", 739}, + {"command &Prompt", 740}, + {"show &Mini status", 741}, + {"menu&Bar visible", 742}, + {"&Equal split", 743}, + {"pe&Rmissions", 744}, + {"&File types", 745}, + {"&Save", 746}, + {" Layout ", 747}, + {" Panel split ", 748}, + {" Highlight... ", 749}, + {" Other options ", 750}, + {"output lines", 751}, + {"Layout", 752}, + {" Learn keys ", 753}, + {" Teach me a key ", 754}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1020,329 +899,331 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 869}, - {" Cannot accept this key ", 870}, - {" You have entered \"%s\"", 871}, - {"OK", 872}, +and wait as well.", 755}, + {" Cannot accept this key ", 756}, + {" You have entered \"%s\"", 757}, + {"OK", 758}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 873}, - {"&Discard", 874}, +work fine. That's great.", 759}, + {"&Discard", 760}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 875}, - {"Learn keys", 876}, - {"Press all the keys mentioned here. After you have done it, check", 877}, - {"which keys are not marked with OK. Press space on the missing", 878}, - {"key, or click with the mouse to define it. Move around with Tab.", 879}, +All your keys work well.", 761}, + {"Learn keys", 762}, + {"Press all the keys mentioned here. After you have done it, check", 763}, + {"which keys are not marked with OK. Press space on the missing", 764}, + {"key, or click with the mouse to define it. Move around with Tab.", 765}, {"\ 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? ", 880}, - {"Press any key to continue...", 881}, - {" The shell is already running a command ", 882}, - {"&Listing mode...", 883}, - {"&Quick view C-x q", 884}, - {"&Info C-x i", 885}, - {"&Sort order...", 886}, - {"&Filter...", 887}, - {"&Network link...", 888}, - {"FT&P link...", 889}, - {"&Drive... M-d", 890}, - {"&Rescan C-r", 891}, - {"&User menu F2", 892}, - {"&View F3", 893}, - {"Vie&w file... ", 894}, - {"&Filtered view M-!", 895}, - {"&Edit F4", 896}, - {"&Copy F5", 897}, - {"c&Hmod C-x c", 898}, - {"&Link C-x l", 899}, - {"&SymLink C-x s", 900}, - {"edit s&Ymlink C-x C-s", 901}, - {"ch&Own C-x o", 902}, - {"&Advanced chown ", 903}, - {"&Rename/Move F6", 904}, - {"&Mkdir F7", 905}, - {"&Delete F8", 906}, - {"&Quick cd M-c", 907}, - {"select &Group M-+", 908}, - {"u&Nselect group M-\\", 909}, - {"reverse selec&Tion M-*", 910}, - {"e&Xit F10", 911}, - {"&Directory tree", 912}, - {"&Find file M-?", 913}, - {"s&Wap panels C-u", 914}, - {"switch &Panels on/off C-o", 915}, - {"&Compare directories C-x d", 916}, - {"e&Xternal panelize C-x !", 917}, - {"show directory s&Izes", 918}, - {"command &History", 919}, - {"di&Rectory hotlist C-\\", 920}, - {"&Active VFS list C-x a", 921}, - {"&Background jobs C-x j", 922}, - {"&Undelete files (ext2fs only)", 923}, - {"&Listing format edit", 924}, - {"&Extension file edit", 925}, - {"&Menu file edit", 926}, - {"&Configuration...", 927}, - {"c&Onfirmation...", 928}, - {"&Display bits...", 929}, - {"learn &Keys...", 930}, - {"&Virtual FS...", 931}, - {"&Save setup", 932}, - {" &Left ", 933}, - {" &Above ", 934}, - {" &File ", 935}, - {" &Command ", 936}, - {" &Options ", 937}, - {" &Right ", 938}, - {" &Below ", 939}, - {" Information ", 940}, + extra access permissions with the \"su\" command? ", 766}, + {"Press any key to continue...", 767}, + {" The shell is already running a command ", 768}, + {"&Listing mode...", 769}, + {"&Quick view C-x q", 770}, + {"&Info C-x i", 771}, + {"&Sort order...", 772}, + {"&Filter...", 773}, + {"&Network link...", 774}, + {"FT&P link...", 775}, + {"&Drive... M-d", 776}, + {"&Rescan C-r", 777}, + {"&User menu F2", 778}, + {"&View F3", 779}, + {"Vie&w file... ", 780}, + {"&Filtered view M-!", 781}, + {"&Edit F4", 782}, + {"&Copy F5", 783}, + {"c&Hmod C-x c", 784}, + {"&Link C-x l", 785}, + {"&SymLink C-x s", 786}, + {"edit s&Ymlink C-x C-s", 787}, + {"ch&Own C-x o", 788}, + {"&Advanced chown ", 789}, + {"&Rename/Move F6", 790}, + {"&Mkdir F7", 791}, + {"&Delete F8", 792}, + {"&Quick cd M-c", 793}, + {"select &Group M-+", 794}, + {"u&Nselect group M-\\", 795}, + {"reverse selec&Tion M-*", 796}, + {"e&Xit F10", 797}, + {"&Directory tree", 798}, + {"&Find file M-?", 799}, + {"s&Wap panels C-u", 800}, + {"switch &Panels on/off C-o", 801}, + {"&Compare directories C-x d", 802}, + {"e&Xternal panelize C-x !", 803}, + {"show directory s&Izes", 804}, + {"command &History", 805}, + {"di&Rectory hotlist C-\\", 806}, + {"&Active VFS list C-x a", 807}, + {"&Background jobs C-x j", 808}, + {"&Undelete files (ext2fs only)", 809}, + {"&Listing format edit", 810}, + {"&Extension file edit", 811}, + {"&Menu file edit", 812}, + {"&Configuration...", 813}, + {"&Layout...", 814}, + {"c&Onfirmation...", 815}, + {"&Display bits...", 816}, + {"learn &Keys...", 817}, + {"&Virtual FS...", 818}, + {"&Save setup", 819}, + {" &Left ", 820}, + {" &Above ", 821}, + {" &File ", 822}, + {" &Command ", 823}, + {" &Options ", 824}, + {" &Right ", 825}, + {" &Below ", 826}, + {" Information ", 827}, {"\ 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. ", 941}, - {"Menu", 942}, - {"Thank you for using GNU Midnight Commander", 943}, - {"with mouse support on xterm%s.\n", 944}, - {" and the Linux console", 945}, - {"The TERM environment variable is unset!\n", 946}, - {"Library directory for the Midnight Commander: %s\n", 947}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 948}, - {"Geometry for the window", 949}, - {"GEOMETRY", 950}, - {"No windows opened at startup", 951}, - {"Force activation even if a server is already running", 952}, + the details. ", 828}, + {"Menu", 829}, + {"Thank you for using GNU Midnight Commander", 830}, + {"with mouse support on xterm%s.\n", 831}, + {" and the Linux console", 832}, + {"The TERM environment variable is unset!\n", 833}, + {"Library directory for the Midnight Commander: %s\n", 834}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 835}, + {"Geometry for the window", 836}, + {"GEOMETRY", 837}, + {"No windows opened at startup", 838}, + {"Force activation even if a server is already running", 839}, {"\ 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", 953}, - {" Notice ", 954}, +On some systems you may want to run # `which mc`\n", 840}, + {" Notice ", 841}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 955}, - {"safe de&Lete", 956}, - {"cd follows lin&Ks", 957}, - {"advanced cho&Wn", 958}, - {"l&Ynx-like motion", 959}, - {"Animation", 960}, - {"rotatin&G dash", 961}, - {"co&Mplete: show all", 962}, - {"&Use internal view", 963}, - {"use internal ed&It", 964}, - {"auto m&Enus", 965}, - {"&Auto save setup", 966}, - {"shell &Patterns", 967}, - {"Compute &Totals", 968}, - {"&Verbose operation", 969}, - {"&Fast dir reload", 970}, - {"mi&X all files", 971}, - {"&Drop down menus", 972}, - {"ma&Rk moves down", 973}, - {"show &Hidden files", 974}, - {"show &Backup files", 975}, - {"&Never", 976}, - {"on dumb &Terminals", 977}, - {"alwa&Ys", 978}, - {" Configure options ", 979}, - {" Panel options ", 980}, - {" Pause after run... ", 981}, - {"Configure options", 982}, - {"&Add new", 983}, - {" External panelize ", 984}, - {"External panelize", 985}, - {"Other command", 986}, - {" Add to external panelize ", 987}, - {" Enter command label: ", 988}, - {" I can't run external panelize while logged on a non local directory ", 989}, - {"Find *.orig after patching", 990}, - {"Find SUID and SGID programs", 991}, - {"Cannot invoke command.", 992}, - {"Pipe close failed", 993}, - {"Show this help message", 994}, - {"Display brief usage message", 995}, - {"MTime", 996}, - {"ATime", 997}, - {"CTime", 998}, - {"Permission", 999}, - {"Perm", 1000}, - {"Nl", 1001}, - {"Inode", 1002}, - {"UID", 1003}, - {"GID", 1004}, - {" %s bytes in %d file%s", 1005}, - {"Unknow tag on display format: ", 1006}, - {" Do you really want to execute? ", 1007}, - {" No action taken ", 1008}, - {"RenMov", 1009}, - {"Mkdir", 1010}, + files have been moved now\n", 842}, + {"safe de&Lete", 843}, + {"cd follows lin&Ks", 844}, + {"advanced cho&Wn", 845}, + {"l&Ynx-like motion", 846}, + {"Animation", 847}, + {"rotatin&G dash", 848}, + {"co&Mplete: show all", 849}, + {"&Use internal view", 850}, + {"use internal ed&It", 851}, + {"auto m&Enus", 852}, + {"&Auto save setup", 853}, + {"shell &Patterns", 854}, + {"Compute &Totals", 855}, + {"&Verbose operation", 856}, + {"&Fast dir reload", 857}, + {"mi&X all files", 858}, + {"&Drop down menus", 859}, + {"ma&Rk moves down", 860}, + {"show &Hidden files", 861}, + {"show &Backup files", 862}, + {"&Never", 863}, + {"on dumb &Terminals", 864}, + {"alwa&Ys", 865}, + {" Configure options ", 866}, + {" Panel options ", 867}, + {" Pause after run... ", 868}, + {"Configure options", 869}, + {"&Add new", 870}, + {" External panelize ", 871}, + {"External panelize", 872}, + {"Other command", 873}, + {" Add to external panelize ", 874}, + {" Enter command label: ", 875}, + {" I can't run external panelize while logged on a non local directory ", 876}, + {"Find *.orig after patching", 877}, + {"Find SUID and SGID programs", 878}, + {"Cannot invoke command.", 879}, + {"Pipe close failed", 880}, + {"Show this help message", 881}, + {"Display brief usage message", 882}, + {"MTime", 883}, + {"ATime", 884}, + {"CTime", 885}, + {"Permission", 886}, + {"Perm", 887}, + {"Nl", 888}, + {"Inode", 889}, + {"UID", 890}, + {"GID", 891}, + {" %s bytes in %d file%s", 892}, + {"Unknow tag on display format: ", 893}, + {" Do you really want to execute? ", 894}, + {" No action taken ", 895}, + {"RenMov", 896}, + {"Mkdir", 897}, {"\ Can't chdir to %s \n\ - %s ", 1011}, - {"Couldn't open named pipe %s\n", 1012}, - {" The shell is still active. Quit anyway? ", 1013}, - {" There are stopped jobs.", 1014}, - {" Quit anyway? ", 1015}, - {"Warning: Couldn't change to %s.\n", 1016}, + %s ", 898}, + {"Couldn't open named pipe %s\n", 899}, + {" The shell is still active. Quit anyway? ", 900}, + {" There are stopped jobs.", 901}, + {" Quit anyway? ", 902}, + {"Warning: Couldn't change to %s.\n", 903}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1017}, - {"Copy \"%s\" directory to:", 1018}, - {"Move \"%s\" directory to:", 1019}, +%s\n", 904}, + {"Copy \"%s\" directory to:", 905}, + {"Move \"%s\" directory to:", 906}, {"\ Can't stat the destination \n\ - %s ", 1020}, - {" The destination isn't a directory ", 1021}, - {" Delete %s? ", 1022}, - {"Static", 1023}, - {"Dynamc", 1024}, + %s ", 907}, + {" The destination isn't a directory ", 908}, + {" Delete %s? ", 909}, + {"Static", 910}, + {"Dynamc", 911}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1025}, - {"Rescan", 1026}, - {"Forget", 1027}, - {"Rmdir", 1028}, + %s ", 912}, + {"Rescan", 913}, + {"Forget", 914}, + {"Rmdir", 915}, {"\ Can't write to the %s file:\n\ -%s\n", 1029}, - {" Invalid shell pattern defination \"%c\". ", 1030}, - {" Debug ", 1031}, - {" ERROR: ", 1032}, - {" True: ", 1033}, - {" False: ", 1034}, - {" Warning -- ignoring file ", 1035}, +%s\n", 916}, + {" Invalid shell pattern defination \"%c\". ", 917}, + {" Debug ", 918}, + {" ERROR: ", 919}, + {" True: ", 920}, + {" False: ", 921}, + {" Warning -- ignoring file ", 922}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1036}, - {" I can't run programs while logged on a non local directory ", 1037}, - {" User menu ", 1038}, - {"name_trunc: too big", 1039}, - {" Pipe failed ", 1040}, - {" Dup failed ", 1041}, +Using it may compromise your security", 923}, + {" I can't run programs while logged on a non local directory ", 924}, + {" User menu ", 925}, + {"name_trunc: too big", 926}, + {" Pipe failed ", 927}, + {" Dup failed ", 928}, {"\ File: \n\ \n\ - ", 1042}, + ", 929}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1043}, - {" Save changes ", 1044}, - {" Can't spawn child program ", 1045}, - {" Empty output from child filter ", 1046}, - {" Could not open file ", 1047}, - {" Can't open file \"", 1048}, +has been modified, do you want to save the changes?\n", 930}, + {" Save changes ", 931}, + {" Can't spawn child program ", 932}, + {" Empty output from child filter ", 933}, + {" Could not open file ", 934}, + {" Can't open file \"", 935}, {"\ Can't stat file \n\ - ", 1049}, - {" Can't view: not a regular file ", 1050}, - {"File: %s", 1051}, - {" [grow]", 1052}, - {" Search string not found ", 1053}, - {" Invalid regular expression ", 1054}, + ", 936}, + {" Can't view: not a regular file ", 937}, + {"File: %s", 938}, + {" [grow]", 939}, + {"Searching for `%s'", 940}, + {" Search string not found ", 941}, + {" Invalid regular expression ", 942}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1055}, - {" Enter regexp:", 1056}, - {" Enter search string:", 1057}, - {"Ascii", 1058}, - {"Hex", 1059}, - {"Line", 1060}, - {"RxSrch", 1061}, - {"EdText", 1062}, - {"EdHex", 1063}, - {"UnWrap", 1064}, - {"Wrap", 1065}, - {"HxSrch", 1066}, - {"Raw", 1067}, - {"Parse", 1068}, - {"Unform", 1069}, - {"Format", 1070}, - {"Function key 1", 1071}, - {"Function key 2", 1072}, - {"Function key 3", 1073}, - {"Function key 4", 1074}, - {"Function key 5", 1075}, - {"Function key 6", 1076}, - {"Function key 7", 1077}, - {"Function key 8", 1078}, - {"Function key 9", 1079}, - {"Function key 10", 1080}, - {"Function key 11", 1081}, - {"Function key 12", 1082}, - {"Function key 13", 1083}, - {"Function key 14", 1084}, - {"Function key 15", 1085}, - {"Function key 16", 1086}, - {"Function key 17", 1087}, - {"Function key 18", 1088}, - {"Function key 19", 1089}, - {"Function key 20", 1090}, - {"Backspace key", 1091}, - {"End key", 1092}, - {"Up arrow key", 1093}, - {"Down arrow key", 1094}, - {"Left arrow key", 1095}, - {"Right arrow key", 1096}, - {"Home key", 1097}, - {"Page Down key", 1098}, - {"Page Up key", 1099}, - {"Insert key", 1100}, - {"Delete key", 1101}, - {"Completion/M-tab", 1102}, - {"+ on keypad", 1103}, - {"- on keypad", 1104}, - {"* on keypad", 1105}, - {"Left arrow keypad", 1106}, - {"Right arrow keypad", 1107}, - {"Up arrow keypad", 1108}, - {"Down arrow keypad", 1109}, - {"Home on keypad", 1110}, - {"End on keypad", 1111}, - {"Page Down keypad", 1112}, - {"Page Up keypad", 1113}, - {"Insert on keypad", 1114}, - {"Delete on keypad", 1115}, - {"Enter on keypad", 1116}, - {"Slash on keypad", 1117}, - {"NumLock on keypad", 1118}, - {"Password:", 1119}, - {"Password", 1120}, - {"Ok", 1121}, + Enter the new line number:", 943}, + {" Enter regexp:", 944}, + {" Enter search string:", 945}, + {"Ascii", 946}, + {"Hex", 947}, + {"Line", 948}, + {"RxSrch", 949}, + {"EdText", 950}, + {"EdHex", 951}, + {"UnWrap", 952}, + {"Wrap", 953}, + {"HxSrch", 954}, + {"Raw", 955}, + {"Parse", 956}, + {"Unform", 957}, + {"Format", 958}, + {"Function key 1", 959}, + {"Function key 2", 960}, + {"Function key 3", 961}, + {"Function key 4", 962}, + {"Function key 5", 963}, + {"Function key 6", 964}, + {"Function key 7", 965}, + {"Function key 8", 966}, + {"Function key 9", 967}, + {"Function key 10", 968}, + {"Function key 11", 969}, + {"Function key 12", 970}, + {"Function key 13", 971}, + {"Function key 14", 972}, + {"Function key 15", 973}, + {"Function key 16", 974}, + {"Function key 17", 975}, + {"Function key 18", 976}, + {"Function key 19", 977}, + {"Function key 20", 978}, + {"Backspace key", 979}, + {"End key", 980}, + {"Up arrow key", 981}, + {"Down arrow key", 982}, + {"Left arrow key", 983}, + {"Right arrow key", 984}, + {"Home key", 985}, + {"Page Down key", 986}, + {"Page Up key", 987}, + {"Insert key", 988}, + {"Delete key", 989}, + {"Completion/M-tab", 990}, + {"+ on keypad", 991}, + {"- on keypad", 992}, + {"* on keypad", 993}, + {"Left arrow keypad", 994}, + {"Right arrow keypad", 995}, + {"Up arrow keypad", 996}, + {"Down arrow keypad", 997}, + {"Home on keypad", 998}, + {"End on keypad", 999}, + {"Page Down keypad", 1000}, + {"Page Up keypad", 1001}, + {"Insert on keypad", 1002}, + {"Delete on keypad", 1003}, + {"Enter on keypad", 1004}, + {"Slash on keypad", 1005}, + {"NumLock on keypad", 1006}, + {"Password:", 1007}, + {"Password", 1008}, + {"Ok", 1009}, {"\ Couldn't open %s archive\n\ -%s", 1122}, - {"Inconsistent extfs archive", 1123}, - {"Sorry, we can not do password authenticated connections for now.", 1124}, - {" Could not set source routing (%s)", 1125}, +%s", 1010}, + {"Inconsistent extfs archive", 1011}, + {"Sorry, we can not do password authenticated connections for now.", 1012}, + {" Could not set source routing (%s)", 1013}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1126}, - {" MCFS ", 1127}, - {" The server does not support this version ", 1128}, +Remove password or correct mode.", 1014}, + {" MCFS ", 1015}, + {" The server does not support this version ", 1016}, {"\ 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", 1129}, - {" Yes ", 1130}, - {" No ", 1131}, - {" The remote server is running on strange port. Giving up.\n", 1132}, - {" MCFS Password required ", 1133}, - {" Invalid password ", 1134}, - {" Too many open connections ", 1135}, + not be safe on the remote side. Continue? \n", 1017}, + {" Yes ", 1018}, + {" No ", 1019}, + {" The remote server is running on strange port. Giving up.\n", 1020}, + {" MCFS Password required ", 1021}, + {" Invalid password ", 1022}, + {" Too many open connections ", 1023}, {"\ Couldn't open tar archive\n\ -%s", 1136}, - {"Unexpected EOF on archive file", 1137}, - {"Inconsistent tar archive", 1138}, +%s", 1024}, + {"Unexpected EOF on archive file", 1025}, + {"Inconsistent tar archive", 1026}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1139}, +doesn't look like a tar archive.", 1027}, }; -int _msg_tbl_length = 1139; +int _msg_tbl_length = 1027; Binary files old/mc-4.5.12/po/cs.gmo and new/mc-4.5.13/po/cs.gmo differ diff -ruN old/mc-4.5.12/po/cs.po new/mc-4.5.13/po/cs.po --- old/mc-4.5.12/po/cs.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/cs.po Wed Feb 10 19:41:21 1999 @@ -1230,13 +1230,9 @@ #: src/cmd.c:937 msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" +"Type `exit' to return to the Midnight Commander" msgstr "" -"Napi╧ `exit' pro nАvrat do Midnight Commander-u\n" -"\r\n" -"\r" +"Napi╧ `exit' pro nАvrat do Midnight Commander-u" #: src/cmd.c:989 msgid "" Binary files old/mc-4.5.12/po/de.gmo and new/mc-4.5.13/po/de.gmo differ diff -ruN old/mc-4.5.12/po/de.po new/mc-4.5.13/po/de.po --- old/mc-4.5.12/po/de.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/de.po Wed Feb 10 19:41:21 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -158,22 +158,22 @@ msgid "Command: " msgstr "Befehl:" -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 #, fuzzy msgid "Set Filter" msgstr " Filter " -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 #, fuzzy msgid "Show all files" msgstr "Alle Dateien" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -181,39 +181,39 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr "жffnen mit..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "Weitere Argumente eingeben:" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 #, fuzzy msgid "Warning" msgstr " Warnung " -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 #, fuzzy msgid "Home directory" msgstr "Verzeichnis" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -286,8 +286,8 @@ msgid "Replace it?" msgstr " Ersetzen " -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "Kopieren" @@ -378,28 +378,28 @@ msgid " Done." msgstr "Nichts" -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 #, fuzzy msgid "_Move here" msgstr " Verschieben " -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 #, fuzzy msgid "_Copy here" msgstr " Kopieren " -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 #, fuzzy msgid "_Link here" msgstr " Link " -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 #, fuzzy msgid "Cancel drag" msgstr " Abbrechen " #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, fuzzy, c-format msgid "" "Could not stat %s\n" @@ -668,52 +668,51 @@ msgid "File/New/Directory..." msgstr "Neues Verzeichnis..." -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "жffnen" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "жffnen mit" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "Anzeigen" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "Ungefiltert betrachten" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "Bearbeiten" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "Link..." -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "Symbolischer Link..." -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "Symbolischer Link bearbeiten..." -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "Kopieren..." -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "LЖschen" @@ -787,7 +786,7 @@ msgstr "Timeout im ftpfs Verzeichnis-Cache:" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +msgid "Allow customization of icons in icon view" msgstr "" #: gnome/gprefs.c:176 @@ -1064,7 +1063,7 @@ msgid "Go to your home directory" msgstr "Verzeichnis" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 #, fuzzy msgid "Location:" msgstr "Ort: %Xh:%Xh" @@ -1301,8 +1300,7 @@ msgid " Save file " msgstr " Datei speichern " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr " Speichern " @@ -1588,356 +1586,6 @@ msgid " Mail " msgstr " Mail " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr " Automatischer Zeilenumbruch " - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr " ZeilenlДnge eingeben, 0 zum ausschalten: " - -#: gtkedit/editmenu.c:69 -#, fuzzy -msgid " About " -msgstr "эber" - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "&жffnen/Laden.. C-o" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "&Neu C-n" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "&Speichern F2" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "speichern &Unter F12" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "datei e&InfЭgen...F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "in Datei &Kopieren C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "Эber... " - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "&Beenden F10" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "&Neu C-x k" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "in datei &Kopieren..." - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "Markieren ein/aus F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "e&InfЭgen an/aus" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "&Kopieren F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "&Verschieben F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "&LЖschen F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "&RЭckgДngig C-u" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "&Anfang C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "&Ende C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "&Suchen... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "suche &Wiederholen F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "&Ersetzen... F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "gehe zu &Zeile... M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "buchstabe e&InfЭgen... C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "bildschirm neu &Darstellen C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "makroaufzeichnung &Starten C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "makroaufzeichnung &beenden C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "makro &AusfЭhren C-a, KEY" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "makro &LЖschen... " - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "&Datum/Zeit einfЭgen " - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "absatz &Formatiern M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "'ispell' &Rechtschreibkontrolle C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "sor&Tieren M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "'indent' &C Formathile F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "&Mail... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "makro &AusfЭhren. c-x e, KEY" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "'ispell' &Rechtschreibkontrolle M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "all&Gemein" - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "modus &Speichern..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "&Layout..." - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " Datei " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " Bearbeiten " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr " Suche/Ers. " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " Befehl " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr " Einstellungen " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "жffnen...\tC-o" - -#: gtkedit/editmenu.c:393 -#, fuzzy -msgid "New\tC-n" -msgstr "Neu\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "Speichern\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "Speichern unter...\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "Datei einfЭgen...\tF15" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "Kopie in Datei...\tC-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "Festplattenoperationen" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "Markierung umschalten\tF3" - -#: gtkedit/editmenu.c:409 -#, fuzzy -msgid "Toggle mark columns\tC-b" -msgstr "Markierung umschalten\tF3" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "EinfЭgen/эberschreiben umschalten\tIns" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "Block zum Cursor kopieren\tF5" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "Block zum Cursor verschieben\tF6" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "Block lЖschen\tF8/C-Del" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "Block in die Zwischenablage kopieren\tC-Ins" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "Block in die Zwischenablage ausschneiden\tS-Del" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "Block aus der Zwischenablage einfЭgen\tS-Ins" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "RЭckgДngig\tC-BackSpace" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "Textblock bearbeiten" - -#: gtkedit/editmenu.c:430 -#, fuzzy -msgid " Srch/Replce " -msgstr " Ersetzen " - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "Suchen...\tF7" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "Suche wiederholen\tF17" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "Ersetzen...\tF4" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "Ersetzen Wiederholen\tF14" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "Text suchen und ersetzen" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "Gehe zu Zeile...\tM-l" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "Makroaufnahme starten\tC-r" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "Makroaufnahme beenden...\tC-r" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "Makro ausfЭhren...\tC-a, KEY" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "Makro lЖschen...\t" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "Datum/Uhrzeit einfЭgen\tC-d" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "Absatz formatieren\tM-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "Makros und interne Befehle" - #: gtkedit/editoptions.c:37 #, fuzzy msgid "None" @@ -1966,9 +1614,8 @@ msgid "Error initialising editor.\n" msgstr "Fehler beim Initialisieren des Editors.\n" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "Hilfe" @@ -2007,138 +1654,33 @@ msgstr "" #: gtkedit/gtkedit.c:1289 -#, fuzzy -msgid "Open/Load" -msgstr "жffnen" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "" - -#: gtkedit/gtkedit.c:1292 -#, fuzzy -msgid "New" -msgstr "Neu\tC-n" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "" - -#: gtkedit/gtkedit.c:1299 -#, fuzzy -msgid "Save As" -msgstr " Speichern Unter " - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert File" msgstr " Datei EinfЭgen " -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert text from a file" msgstr " Datei einfЭgen " -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 #, fuzzy msgid "Copy to file" msgstr "Dateien Kopieren" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "Beenden" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "" - -#: gtkedit/gtkedit.c:1318 -#, fuzzy -msgid "Copy selection to clipboard" -msgstr " In die Zwischenablage kopieren " - -#: gtkedit/gtkedit.c:1321 -#, fuzzy -msgid "Cut" -msgstr "ZДhlen" - -#: gtkedit/gtkedit.c:1321 -#, fuzzy -msgid "Cut selection to clipboard" -msgstr " In die Zwischenablage ausschneiden " - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "" - -#: gtkedit/gtkedit.c:1324 -#, fuzzy -msgid "Paste clipboard" -msgstr " In die Zwischenablage ausschneiden " - -#: gtkedit/gtkedit.c:1328 -#, fuzzy -msgid "Undo" -msgstr "nein" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -#, fuzzy -msgid "Find" -msgstr "Suchen.." - #: gtkedit/gtkedit.c:1336 #, fuzzy -msgid "Find string/regular expression" -msgstr " UngЭltiger regulДrer Ausdruck " - -#: gtkedit/gtkedit.c:1339 -#, fuzzy -msgid "Find again" -msgstr "Datei suchen" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 -#, fuzzy msgid "Search/Replace" msgstr " Ersetzen " -#: gtkedit/gtkedit.c:1342 -#, fuzzy -msgid "Find and replace text/regular expressions" -msgstr " UngЭltiger regulДrer Ausdruck " - -#: gtkedit/gtkedit.c:1351 -#, fuzzy -msgid "About..." -msgstr "эber" - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "Datei" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 #, fuzzy msgid " Load syntax file " @@ -2508,6 +2050,10 @@ msgid " Permission " msgstr " Zugriffsrechte " +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " Datei " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "Zum дndern Leertaste drЭcken" @@ -2719,16 +2265,10 @@ " die Fenster kЖnnen nicht ausgetauscht werden. " #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"Geben Sie `exit' ein, um den Midnight Commander zu beenden\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" +msgstr "Geben Sie `exit' ein, um den Midnight Commander zu beenden" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" @@ -2737,92 +2277,92 @@ " Kann %s nicht untersuchen \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr " Link " -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr " an:" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr " link: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr " symbolischer link: %s " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr " Symbolischer Link " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr " zeigt auf:" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr " Symbolischen Link bearbeiten " -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr " symbolschen Link barbeiten: %s" -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr " Symbolischer Link " -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr " Relativer symbolischer Link " -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr " relativer symbolischer Link: %s " -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " Namen der Maschine eingeben (Details mit F1): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr " Kann nicht in Verzeichnis %s wechseln " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " Link auf eine entfernte Maschine" -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " FTP zu Maschine " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr " Socket Source-Routing Einstellungen " -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr " Rechnernamen eingeben, der als Zwischenstation dienen soll: " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr " Rechnername " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr " Fehler beim Herausfinden der IP-Nummer aufgetreten " -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr " LЖschen von Dateien auf einem ext2 Dateisystem rЭckgДngig machen " -#: src/cmd.c:1317 +#: src/cmd.c:1319 #, fuzzy msgid "" " Enter device (without /dev/) to undelete\n" @@ -2831,11 +2371,11 @@ " Name des Dateisystems angeben, auf dem das LЖschen von\n" " Dateien rЭckgДngig gemacht werden soll: (Details mit F1)" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Einstellungen in ~/ gespeichert" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " Einstellungen " @@ -3464,6 +3004,10 @@ msgid " Background process: Recursive Delete " msgstr " Hintergrundprozeъ: Rekursives LЖschen " +#: src/filegui.c:404 +msgid "File" +msgstr "Datei" + #: src/filegui.c:425 msgid "Count" msgstr "ZДhlen" @@ -4366,6 +3910,10 @@ msgid "&Configuration..." msgstr "" +#: src/main.c:1302 +msgid "&Layout..." +msgstr "&Layout..." + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "" @@ -5315,13 +4863,303 @@ msgid "Inconsistent tar archive" msgstr "" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" "%s\n" "doesn't look like a tar archive." msgstr "" + +#~ msgid " Word wrap " +#~ msgstr " Automatischer Zeilenumbruch " + +#~ msgid " Enter line length, 0 for off: " +#~ msgstr " ZeilenlДnge eingeben, 0 zum ausschalten: " + +#, fuzzy +#~ msgid " About " +#~ msgstr "эber" + +#~ msgid "&Open/load... C-o" +#~ msgstr "&жffnen/Laden.. C-o" + +#~ msgid "&New C-n" +#~ msgstr "&Neu C-n" + +#~ msgid "&Save F2" +#~ msgstr "&Speichern F2" + +#~ msgid "save &As... F12" +#~ msgstr "speichern &Unter F12" + +#~ msgid "&Insert file... F15" +#~ msgstr "datei e&InfЭgen...F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "in Datei &Kopieren C-f" + +#~ msgid "a&Bout... " +#~ msgstr "Эber... " + +#~ msgid "&Quit F10" +#~ msgstr "&Beenden F10" + +#~ msgid "&New C-x k" +#~ msgstr "&Neu C-x k" + +#~ msgid "copy to &File... " +#~ msgstr "in datei &Kopieren..." + +#~ msgid "&Toggle Mark F3" +#~ msgstr "Markieren ein/aus F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "e&InfЭgen an/aus" + +#~ msgid "&Copy F5" +#~ msgstr "&Kopieren F5" + +#~ msgid "&Move F6" +#~ msgstr "&Verschieben F6" + +#~ msgid "&Delete F8" +#~ msgstr "&LЖschen F8" + +#~ msgid "&Undo C-u" +#~ msgstr "&RЭckgДngig C-u" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "&Anfang C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "&Ende C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "&Suchen... F7" + +#~ msgid "search &Again F17" +#~ msgstr "suche &Wiederholen F17" + +#~ msgid "&Replace... F4" +#~ msgstr "&Ersetzen... F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "gehe zu &Zeile... M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "buchstabe e&InfЭgen... C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "bildschirm neu &Darstellen C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "makroaufzeichnung &Starten C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "makroaufzeichnung &beenden C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "makro &AusfЭhren C-a, KEY" + +#~ msgid "delete macr&O... " +#~ msgstr "makro &LЖschen... " + +#~ msgid "insert &Date/time " +#~ msgstr "&Datum/Zeit einfЭgen " + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "absatz &Formatiern M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "'ispell' &Rechtschreibkontrolle C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "sor&Tieren M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "'indent' &C Formathile F19" + +#~ msgid "&Mail... " +#~ msgstr "&Mail... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "makro &AusfЭhren. c-x e, KEY" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "'ispell' &Rechtschreibkontrolle M-$" + +#~ msgid "&General... " +#~ msgstr "all&Gemein" + +#~ msgid "&Save mode..." +#~ msgstr "modus &Speichern..." + +#~ msgid " Edit " +#~ msgstr " Bearbeiten " + +#~ msgid " Sear/Repl " +#~ msgstr " Suche/Ers. " + +#~ msgid " Command " +#~ msgstr " Befehl " + +#~ msgid " Options " +#~ msgstr " Einstellungen " + +#~ msgid "Open...\tC-o" +#~ msgstr "жffnen...\tC-o" + +#, fuzzy +#~ msgid "New\tC-n" +#~ msgstr "Neu\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "Speichern\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "Speichern unter...\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "Datei einfЭgen...\tF15" + +#~ msgid "Copy to file...\tC-f" +#~ msgstr "Kopie in Datei...\tC-f" + +#~ msgid "Disk operations" +#~ msgstr "Festplattenoperationen" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "Markierung umschalten\tF3" + +#, fuzzy +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "Markierung umschalten\tF3" + +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "EinfЭgen/эberschreiben umschalten\tIns" + +#~ msgid "Copy block to cursor\tF5" +#~ msgstr "Block zum Cursor kopieren\tF5" + +#~ msgid "Move block to cursor\tF6" +#~ msgstr "Block zum Cursor verschieben\tF6" + +#~ msgid "Delete block\tF8/C-Del" +#~ msgstr "Block lЖschen\tF8/C-Del" + +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr "Block in die Zwischenablage kopieren\tC-Ins" + +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr "Block in die Zwischenablage ausschneiden\tS-Del" + +#~ msgid "Paste block from clipbrd\tS-Ins" +#~ msgstr "Block aus der Zwischenablage einfЭgen\tS-Ins" + +#~ msgid "Undo\tC-BackSpace" +#~ msgstr "RЭckgДngig\tC-BackSpace" + +#~ msgid "Manipulating blocks of text" +#~ msgstr "Textblock bearbeiten" + +#, fuzzy +#~ msgid " Srch/Replce " +#~ msgstr " Ersetzen " + +#~ msgid "Search...\tF7" +#~ msgstr "Suchen...\tF7" + +#~ msgid "Search again\tF17" +#~ msgstr "Suche wiederholen\tF17" + +#~ msgid "Replace...\tF4" +#~ msgstr "Ersetzen...\tF4" + +#~ msgid "Replace again\tF14" +#~ msgstr "Ersetzen Wiederholen\tF14" + +#~ msgid "Search for and replace text" +#~ msgstr "Text suchen und ersetzen" + +#~ msgid "Goto line...\tM-l" +#~ msgstr "Gehe zu Zeile...\tM-l" + +#~ msgid "Start record macro\tC-r" +#~ msgstr "Makroaufnahme starten\tC-r" + +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "Makroaufnahme beenden...\tC-r" + +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "Makro ausfЭhren...\tC-a, KEY" + +#~ msgid "Delete macro...\t" +#~ msgstr "Makro lЖschen...\t" + +#~ msgid "Insert date/time\tC-d" +#~ msgstr "Datum/Uhrzeit einfЭgen\tC-d" + +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Absatz formatieren\tM-p" + +#~ msgid "Macros and internal commands" +#~ msgstr "Makros und interne Befehle" + +#, fuzzy +#~ msgid "Open/Load" +#~ msgstr "жffnen" + +#, fuzzy +#~ msgid "New" +#~ msgstr "Neu\tC-n" + +#, fuzzy +#~ msgid "Save As" +#~ msgstr " Speichern Unter " + +#~ msgid "Exit" +#~ msgstr "Beenden" + +#, fuzzy +#~ msgid "Copy selection to clipboard" +#~ msgstr " In die Zwischenablage kopieren " + +#, fuzzy +#~ msgid "Cut" +#~ msgstr "ZДhlen" + +#, fuzzy +#~ msgid "Cut selection to clipboard" +#~ msgstr " In die Zwischenablage ausschneiden " + +#, fuzzy +#~ msgid "Paste clipboard" +#~ msgstr " In die Zwischenablage ausschneiden " + +#, fuzzy +#~ msgid "Undo" +#~ msgstr "nein" + +#, fuzzy +#~ msgid "Find" +#~ msgstr "Suchen.." + +#, fuzzy +#~ msgid "Find string/regular expression" +#~ msgstr " UngЭltiger regulДrer Ausdruck " + +#, fuzzy +#~ msgid "Find again" +#~ msgstr "Datei suchen" + +#, fuzzy +#~ msgid "Find and replace text/regular expressions" +#~ msgstr " UngЭltiger regulДrer Ausdruck " + +#, fuzzy +#~ msgid "About..." +#~ msgstr "эber" #~ msgid "|" #~ msgstr "|" diff -ruN old/mc-4.5.12/po/es.po new/mc-4.5.13/po/es.po --- old/mc-4.5.12/po/es.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/es.po Wed Feb 10 19:41:21 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -165,22 +165,22 @@ msgid "Command: " msgstr " &Comando " -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 #, fuzzy msgid "Set Filter" msgstr "&Filtro..." -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 #, fuzzy msgid "Show all files" msgstr "me&Zclar todos los archivos" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -188,39 +188,39 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 #, fuzzy msgid " Open with..." msgstr "Abrir con..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 #, fuzzy msgid "Home directory" msgstr "Mover el directorio \"%s\" a:" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -287,8 +287,8 @@ msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 #, fuzzy msgid "Copy" msgstr "C_opiar" @@ -374,24 +374,24 @@ msgid " Done." msgstr "" -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 msgid "_Move here" msgstr "" -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 msgid "_Copy here" msgstr "" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Link here" msgstr "" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "Cancel drag" msgstr "" #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, c-format msgid "" "Could not stat %s\n" @@ -657,59 +657,58 @@ msgid "File/New/Directory..." msgstr "" -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 #, fuzzy msgid "Open with" msgstr "Abrir con..." -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 #, fuzzy msgid "View" msgstr "_Ver" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 #, fuzzy msgid "Edit" msgstr "Sali_r" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 #, fuzzy msgid "Link..." msgstr "Enlace" -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 #, fuzzy msgid "Symlink..." msgstr "ConexiСn por FTP..." -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 #, fuzzy msgid "Edit symlink..." msgstr "ConexiСn por FTP..." -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 #, fuzzy msgid "Copy..." msgstr "C_opiar" -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 #, fuzzy msgid "Delete" @@ -779,7 +778,7 @@ msgstr "" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +msgid "Allow customization of icons in icon view" msgstr "" #: gnome/gprefs.c:176 @@ -1063,7 +1062,7 @@ msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 #, fuzzy msgid "Location:" msgstr "Lugar: %Xh:%Xh" @@ -1314,8 +1313,7 @@ msgid " Save file " msgstr " Fallo en la tuberМa " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 #, fuzzy msgid "Save" msgstr "&Guardar" @@ -1620,384 +1618,6 @@ msgid " Mail " msgstr " &Archivo " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr "" - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr "" - -#: gtkedit/editmenu.c:69 -#, fuzzy -msgid " About " -msgstr " PresentaciСn " - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "" - -#: gtkedit/editmenu.c:119 -#, fuzzy -msgid "&New C-n" -msgstr "&Ver F3" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -#, fuzzy -msgid "&Save F2" -msgstr "&Ver F3" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -#, fuzzy -msgid "save &As... F12" -msgstr "&Disco... M-d" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -#, fuzzy -msgid "a&Bout... " -msgstr "&InformaciСn C-x i" - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -#, fuzzy -msgid "&Quit F10" -msgstr "sali&R F10" - -#: gtkedit/editmenu.c:135 -#, fuzzy -msgid "&New C-x k" -msgstr "crear en&Lace... C-x l" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "" - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -#, fuzzy -msgid "&Copy F5" -msgstr "&Copiar... F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -#, fuzzy -msgid "&Move F6" -msgstr "&Ver F3" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -#, fuzzy -msgid "&Delete F8" -msgstr "&Borrar F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -#, fuzzy -msgid "&Undo C-u" -msgstr "&InformaciСn C-x i" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -#, fuzzy -msgid "&End C-PgDn" -msgstr "&InformaciСn C-x i" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -#, fuzzy -msgid "&Search... F7" -msgstr "ver arc&Hivo..." - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -#, fuzzy -msgid "&Replace... F4" -msgstr "ver arc&Hivo..." - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -#, fuzzy -msgid "&Goto line... M-l" -msgstr "crear en&Lace... C-x l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -#, fuzzy -msgid "insert &Literal... C-q" -msgstr "ver arc&Hivo..." - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -#, fuzzy -msgid "&Refresh screen C-l" -msgstr "&Releer C-r" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -#, fuzzy -msgid "delete macr&O... " -msgstr "&Borrar F8" - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -#, fuzzy -msgid "insert &Date/time " -msgstr "me&NЗ de usuario F2" - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -#, fuzzy -msgid "sor&T... M-t" -msgstr "&Ver F3" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "" - -#: gtkedit/editmenu.c:215 -#, fuzzy -msgid "&Mail... " -msgstr "&Ver F3" - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "" - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -#, fuzzy -msgid "&Save mode..." -msgstr "&Ordenar..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -#, fuzzy -msgid "&Layout..." -msgstr "PresentaciСn" - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -#, fuzzy -msgid " File " -msgstr " &Archivo " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -#, fuzzy -msgid " Edit " -msgstr " Crear directorio " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr "" - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -#, fuzzy -msgid " Command " -msgstr " &Comando " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -#, fuzzy -msgid " Options " -msgstr " &Opciones " - -#: gtkedit/editmenu.c:392 -#, fuzzy -msgid "Open...\tC-o" -msgstr "Abrir con..." - -#: gtkedit/editmenu.c:393 -msgid "New\tC-n" -msgstr "" - -#: gtkedit/editmenu.c:395 -#, fuzzy -msgid "Save\tF2" -msgstr "&Guardar" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:402 -#, fuzzy -msgid "Disk operations" -msgstr "ope&RaciСn detallada" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "" - -#: gtkedit/editmenu.c:409 -msgid "Toggle mark columns\tC-b" -msgstr "" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "" - -#: gtkedit/editmenu.c:430 -msgid " Srch/Replce " -msgstr "" - -#: gtkedit/editmenu.c:431 -#, fuzzy -msgid "Search...\tF7" -msgstr "Buscar de nuevo..." - -#: gtkedit/editmenu.c:432 -#, fuzzy -msgid "Search again\tF17" -msgstr "Buscar de nuevo..." - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "" - #: gtkedit/editoptions.c:37 msgid "None" msgstr "" @@ -2026,9 +1646,8 @@ msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "" @@ -2068,132 +1687,31 @@ msgstr "" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "" - -#: gtkedit/gtkedit.c:1292 -msgid "New" -msgstr "" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "" - -#: gtkedit/gtkedit.c:1299 -#, fuzzy -msgid "Save As" -msgstr "Guardar configuraciСn" - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert File" msgstr "Tecla Ins" -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert text from a file" msgstr "" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 #, fuzzy msgid "Copy to file" msgstr " No puedo abrir el archivo " -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "" -#: gtkedit/gtkedit.c:1310 -#, fuzzy -msgid "Exit" -msgstr "Sali_r" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "" - -#: gtkedit/gtkedit.c:1318 -msgid "Copy selection to clipboard" -msgstr "" - -#: gtkedit/gtkedit.c:1321 -#, fuzzy -msgid "Cut" -msgstr "_Cortar" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut selection to clipboard" -msgstr "" - -#: gtkedit/gtkedit.c:1324 -#, fuzzy -msgid "Paste" -msgstr "_Pegar" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste clipboard" -msgstr "" - -#: gtkedit/gtkedit.c:1328 -#, fuzzy -msgid "Undo" -msgstr "SinForm" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -#, fuzzy -msgid "Find" -msgstr "Ventana" - #: gtkedit/gtkedit.c:1336 -#, fuzzy -msgid "Find string/regular expression" -msgstr " ExpresiСn regular invАlida " - -#: gtkedit/gtkedit.c:1339 -msgid "Find again" -msgstr "" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 msgid "Search/Replace" msgstr "" -#: gtkedit/gtkedit.c:1342 -#, fuzzy -msgid "Find and replace text/regular expressions" -msgstr " ExpresiСn regular invАlida " - -#: gtkedit/gtkedit.c:1351 -msgid "About..." -msgstr "" - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -#, fuzzy -msgid "File" -msgstr " &Archivo " - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 #, fuzzy msgid " Load syntax file " @@ -2579,6 +2097,11 @@ msgid " Permission " msgstr "Permiso" +#: src/chmod.c:164 src/chown.c:130 +#, fuzzy +msgid " File " +msgstr " &Archivo " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "" @@ -2805,13 +2328,10 @@ #: src/cmd.c:967 #, fuzzy -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" msgstr "Directorio para archivos del Midnight Commander: %s\n" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, fuzzy, c-format msgid "" " Couldn't stat %s \n" @@ -2820,110 +2340,110 @@ " No puedo cambiar al directorio '%s' \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 #, fuzzy msgid " Link " msgstr "Enlace" -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr "" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr "" -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr "" -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr "" -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr "" -#: src/cmd.c:1105 +#: src/cmd.c:1107 #, fuzzy msgid " Edit symlink " msgstr "edi&Tar enlace simbСlico C-x C-s" -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, fuzzy, c-format msgid " edit symlink: %s " msgstr "edi&Tar enlace simbСlico C-x C-s" -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, fuzzy, c-format msgid " Could not chdir to %s " msgstr "" " No puedo cambiar al directorio '%s' \n" " %s " -#: src/cmd.c:1281 +#: src/cmd.c:1283 #, fuzzy msgid " Link to a remote machine " msgstr "Conecta a una mАquina remota" -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1297 +#: src/cmd.c:1299 #, fuzzy msgid " Socket source routing setup " msgstr " No pude preestablecer la ruta (%s)" -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1305 +#: src/cmd.c:1307 #, fuzzy msgid " Host name " msgstr " Cargar favoritos " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1316 +#: src/cmd.c:1318 #, fuzzy msgid " Undelete files on an ext2 file system " msgstr "&Recuperar archivos (ext2fs)..." -#: src/cmd.c:1317 +#: src/cmd.c:1319 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr "" @@ -3553,6 +3073,11 @@ msgid " Background process: Recursive Delete " msgstr "" +#: src/filegui.c:404 +#, fuzzy +msgid "File" +msgstr " &Archivo " + #: src/filegui.c:425 #, fuzzy msgid "Count" @@ -4465,6 +3990,11 @@ msgid "&Configuration..." msgstr "&ConfiguraciСn..." +#: src/main.c:1302 +#, fuzzy +msgid "&Layout..." +msgstr "PresentaciСn" + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "c&OnfirmaciСn..." @@ -5418,7 +4948,7 @@ msgid "Inconsistent tar archive" msgstr "Archivo de tipo tar inconsistente" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" @@ -5428,6 +4958,158 @@ "Hmm,...\n" "%s\n" "no parece un archivo de tipo tar." + +#, fuzzy +#~ msgid " About " +#~ msgstr " PresentaciСn " + +#, fuzzy +#~ msgid "&New C-n" +#~ msgstr "&Ver F3" + +#, fuzzy +#~ msgid "&Save F2" +#~ msgstr "&Ver F3" + +#, fuzzy +#~ msgid "save &As... F12" +#~ msgstr "&Disco... M-d" + +#, fuzzy +#~ msgid "a&Bout... " +#~ msgstr "&InformaciСn C-x i" + +#, fuzzy +#~ msgid "&Quit F10" +#~ msgstr "sali&R F10" + +#, fuzzy +#~ msgid "&New C-x k" +#~ msgstr "crear en&Lace... C-x l" + +#, fuzzy +#~ msgid "&Copy F5" +#~ msgstr "&Copiar... F5" + +#, fuzzy +#~ msgid "&Move F6" +#~ msgstr "&Ver F3" + +#, fuzzy +#~ msgid "&Delete F8" +#~ msgstr "&Borrar F8" + +#, fuzzy +#~ msgid "&Undo C-u" +#~ msgstr "&InformaciСn C-x i" + +#, fuzzy +#~ msgid "&End C-PgDn" +#~ msgstr "&InformaciСn C-x i" + +#, fuzzy +#~ msgid "&Search... F7" +#~ msgstr "ver arc&Hivo..." + +#, fuzzy +#~ msgid "&Replace... F4" +#~ msgstr "ver arc&Hivo..." + +#, fuzzy +#~ msgid "&Goto line... M-l" +#~ msgstr "crear en&Lace... C-x l" + +#, fuzzy +#~ msgid "insert &Literal... C-q" +#~ msgstr "ver arc&Hivo..." + +#, fuzzy +#~ msgid "&Refresh screen C-l" +#~ msgstr "&Releer C-r" + +#, fuzzy +#~ msgid "delete macr&O... " +#~ msgstr "&Borrar F8" + +#, fuzzy +#~ msgid "insert &Date/time " +#~ msgstr "me&NЗ de usuario F2" + +#, fuzzy +#~ msgid "sor&T... M-t" +#~ msgstr "&Ver F3" + +#, fuzzy +#~ msgid "&Mail... " +#~ msgstr "&Ver F3" + +#, fuzzy +#~ msgid "&Save mode..." +#~ msgstr "&Ordenar..." + +#, fuzzy +#~ msgid " Edit " +#~ msgstr " Crear directorio " + +#, fuzzy +#~ msgid " Command " +#~ msgstr " &Comando " + +#, fuzzy +#~ msgid " Options " +#~ msgstr " &Opciones " + +#, fuzzy +#~ msgid "Open...\tC-o" +#~ msgstr "Abrir con..." + +#, fuzzy +#~ msgid "Save\tF2" +#~ msgstr "&Guardar" + +#, fuzzy +#~ msgid "Disk operations" +#~ msgstr "ope&RaciСn detallada" + +#, fuzzy +#~ msgid "Search...\tF7" +#~ msgstr "Buscar de nuevo..." + +#, fuzzy +#~ msgid "Search again\tF17" +#~ msgstr "Buscar de nuevo..." + +#, fuzzy +#~ msgid "Save As" +#~ msgstr "Guardar configuraciСn" + +#, fuzzy +#~ msgid "Exit" +#~ msgstr "Sali_r" + +#, fuzzy +#~ msgid "Cut" +#~ msgstr "_Cortar" + +#, fuzzy +#~ msgid "Paste" +#~ msgstr "_Pegar" + +#, fuzzy +#~ msgid "Undo" +#~ msgstr "SinForm" + +#, fuzzy +#~ msgid "Find" +#~ msgstr "Ventana" + +#, fuzzy +#~ msgid "Find string/regular expression" +#~ msgstr " ExpresiСn regular invАlida " + +#, fuzzy +#~ msgid "Find and replace text/regular expressions" +#~ msgstr " ExpresiСn regular invАlida " #~ msgid "|" #~ msgstr "|" Binary files old/mc-4.5.12/po/fr.gmo and new/mc-4.5.13/po/fr.gmo differ diff -ruN old/mc-4.5.12/po/fr.po new/mc-4.5.13/po/fr.po --- old/mc-4.5.12/po/fr.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/fr.po Wed Feb 10 19:41:21 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mc VERSION\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: 1998-03-27 01:22+0100\n" "Last-Translator: Vincent Renardias \n" "Language-Team: Vincent Renardias \n" @@ -148,21 +148,21 @@ msgid "Command: " msgstr "Commande: " -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 #, fuzzy msgid "Set Filter" msgstr " Filtre " -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 msgid "Show all files" msgstr "Montrer tous les fichiers" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -170,37 +170,37 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr " Ouvrir avec..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "Entrez les arguments supplИmentaires:" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 msgid "Warning" msgstr "Avertissement" -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 msgid "Home directory" msgstr "RИpertoire 'Home'" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -265,8 +265,8 @@ msgid "Replace it?" msgstr "Le remplacer?" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "Copier" @@ -347,27 +347,27 @@ msgid " Done." msgstr " TerminИ." -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 #, fuzzy msgid "_Move here" msgstr "DИplacer ici" -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 #, fuzzy msgid "_Copy here" msgstr "Copier ici" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 #, fuzzy msgid "_Link here" msgstr "Lier ici" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "Cancel drag" msgstr "" #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, c-format msgid "" "Could not stat %s\n" @@ -606,52 +606,51 @@ msgid "File/New/Directory..." msgstr "Fichier/Nouveau/RИpertoire..." -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "PropriИtИs" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "Ouvrir" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "Ouvrir avec" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "Voir" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "Vue non filtrИe" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "Editer" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "Lien..." -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "Lien Symbolique..." -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "Editer lien symbolique..." -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "DИplacer/renommer..." -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "Copier..." -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "Effacer" @@ -727,7 +726,7 @@ msgstr "dИlai d'expiration du cache pour ftpfs" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +msgid "Allow customization of icons in icon view" msgstr "" #: gnome/gprefs.c:176 @@ -1004,7 +1003,7 @@ msgid "Go to your home directory" msgstr "RИpertoire 'Home'" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 msgid "Location:" msgstr "Emplacement: " @@ -1237,8 +1236,7 @@ msgid " Save file " msgstr " Enregistrer fichier " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr "Sauver" @@ -1526,353 +1524,6 @@ msgid " Mail " msgstr " Mail " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr " CИsure automatique " - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr " Entrez la longueur de ligne, 0 pour dИsactiver: " - -#: gtkedit/editmenu.c:69 -#, fuzzy -msgid " About " -msgstr "_A Propos" - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "&Ouvrir/charger.. C-o" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "&Nouveau C-n" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "&Sauver F2" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "Enregistrer sous.. F12" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "&InsИrer fichier.. F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "copier vers &Fichier... C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "A Propos... " - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "&Quitter F10" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "&Nouveau C-x k" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "copier vers &Fichier..." - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "&Inverser Marque F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "&Marquer Colonnes S-F3" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "echange &InsИre/Иcrasemt" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "&Copier F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "&DИplacer F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "&Supprimer F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "&Undo C-u" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "dИ&But C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "&End C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "Rechercher... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "Chercher Ю nouve&Au F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "&Remplacer... F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "Aller Ю la ligne... M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "insИrer un &Literal... C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "&Rafraichir l'Иcran C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "Commencer Ю enregistrer une macro C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "Terminer l'enregistrement de macro... C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "&ExИcuter macro... C-a, TOUCHE" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "effacer macr&O... " - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "insИrer &Date/heure " - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "formater p&Aragraphe M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "correction orthographique 'is&Pell' C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "&Trier... M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "Formatteur &C 'indent' F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "&Mail... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "&ExИcuter macro... C-x e, TOUCHE" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "correction orthographique 'is&Pell' M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "&GИnИral... " - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "Mode &Sauvegarde..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "PrИsentation..." - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " Fichier " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " Editer " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr " Cherch/Rempl " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " Commande " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr " Options " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "Ouvrir...\tC-o" - -#: gtkedit/editmenu.c:393 -msgid "New\tC-n" -msgstr "Nouveau\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "Sauver\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "Enregistrer sous...\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "InsИrer fichier...\tF15" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "Copier vers fichier...\tC-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "OpИrations disque" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "Echange Marque\tF3" - -#: gtkedit/editmenu.c:409 -msgid "Toggle mark columns\tC-b" -msgstr "Echange Marque\tC-b" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "Echange insИre/Иcrasement\tIns" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "Effacer block\tF8/C-Del" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "Copier le block dans le presse-papier\tC-Ins" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "Couper le block vers le presse-papier\tS-Del" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "Coller le block du presse-papier\tS-Ins" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "Historique de la sИlection\tM-Ins" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "Manipulation de blocs de texte" - -#: gtkedit/editmenu.c:430 -msgid " Srch/Replce " -msgstr " Chercher/Remplacer " - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "Rechercher...\tF7" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "Chercher Ю nouveau\tF17" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "Remplacer...\tF4" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "Remplacer Ю nouveau\tF14" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "Chercher et remplacer texte" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "Aller Ю la ligne...\tM-l" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "Commencer Ю enregistrer une macro\tC-r" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "Terminer l'enregistrement de macro...\tC-r" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "ExИcuter macro...\tC-a, TOUCHE" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "Effacer macro...\t" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "InsИrer date/heure\tC-d" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "Formater paragraphe\tM-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "Rafraichir l'affichage\tC-l" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "Macros et commandes internes" - #: gtkedit/editoptions.c:37 msgid "None" msgstr "Aucun" @@ -1900,9 +1551,8 @@ msgid "Error initialising editor.\n" msgstr "Erreur lors de l'initialisation de l'Иditeur.\n" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "Aide" @@ -1943,121 +1593,29 @@ "a pas d'entrИes dans /etc/passwd - abandon\n" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "Ouvrir/Charger" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "Ouvrir un autre/nouveau fichier" - -#: gtkedit/gtkedit.c:1292 -msgid "New" -msgstr "Nouveau" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "Vider le tampon d'Иdition" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "Enregistrer le tampon d'Иdition courant dans un fichier" - -#: gtkedit/gtkedit.c:1299 -msgid "Save As" -msgstr "Enregistrer Sous" - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "Enregistrer le tampon d'Иdition courant dans un fichier" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert File" msgstr "InsИrer Fichier" -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert text from a file" msgstr "InsИrer du texte Ю partir d'un fichier" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "Copy to file" msgstr "Copier dans un fichier" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "copier un bloc dans un fichier" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "Quiter" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "Quiter l'Иditeur" - -#: gtkedit/gtkedit.c:1318 -msgid "Copy selection to clipboard" -msgstr "Copier dans le presse-papiers" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut" -msgstr "Couper" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut selection to clipboard" -msgstr "Couper vers le presse-papiers" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "Coller" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste clipboard" -msgstr "Coller le presse-papiers" - -#: gtkedit/gtkedit.c:1328 -msgid "Undo" -msgstr "Annuler" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -msgid "Find" -msgstr "Chercher" - #: gtkedit/gtkedit.c:1336 -msgid "Find string/regular expression" -msgstr "Rechercher chaine/expression rИguliХre" - -#: gtkedit/gtkedit.c:1339 -msgid "Find again" -msgstr "Chercher Ю nouveau" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "RИpИter la recherche la plus rИcente" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 msgid "Search/Replace" msgstr "Chercher/Remplacer" -#: gtkedit/gtkedit.c:1342 -msgid "Find and replace text/regular expressions" -msgstr "Rechercher et remplacer une chaine/expression rИguliХre" - -#: gtkedit/gtkedit.c:1351 -msgid "About..." -msgstr "A Propos..." - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "Information sur Mcedit" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "Fichier" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 msgid " Load syntax file " msgstr " Chargement du fichier de syntaxe " @@ -2419,6 +1977,10 @@ msgid " Permission " msgstr " Permission " +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " Fichier " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "Utilisez ESPACE pour changer" @@ -2625,16 +2187,10 @@ msgstr "" #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"Tapez `exit' pour retourner a Midnight Commander\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" +msgstr "Tapez `exit' pour retourner a Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" @@ -2643,102 +2199,102 @@ " Impossible d'ouvrir %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr " Lien " -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr " vers:" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr " lien: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr " lien symbolique: %s " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr " Lien Symbolique " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr " pointant vers:" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr " Editer le lien symbolique " -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr " editer le lien symbolique: %s " -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr " Lier symboliquement " -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr " Lien symbolique relatif " -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr " lien symbolique relatif: %s " -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " Entrez le nom de la machine (F1 pour les dИtails): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr " Impossible d'aller dans %s " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " Lien vers une machine distante " -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " FTP vers machine " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr " Nom de l'Hote " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr " Erreur lors de la recherche de l'adresse IP " -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1317 +#: src/cmd.c:1319 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Configuration sauvИe dans ~/" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " Configuration " @@ -3355,6 +2911,10 @@ msgid " Background process: Recursive Delete " msgstr " TБche de fond: DИlИtion RИcursive " +#: src/filegui.c:404 +msgid "File" +msgstr "Fichier" + #: src/filegui.c:425 msgid "Count" msgstr "Compter" @@ -4229,6 +3789,10 @@ msgid "&Configuration..." msgstr "&Configuration..." +#: src/main.c:1302 +msgid "&Layout..." +msgstr "PrИsentation..." + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "c&Onfirmation..." @@ -5171,7 +4735,7 @@ msgid "Inconsistent tar archive" msgstr "Archive tar inconsistante." -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" @@ -5181,6 +4745,301 @@ "Hmm,...\n" "%s\n" "ne ressemble pas Ю une archive tar." + +#~ msgid " Word wrap " +#~ msgstr " CИsure automatique " + +#~ msgid " Enter line length, 0 for off: " +#~ msgstr " Entrez la longueur de ligne, 0 pour dИsactiver: " + +#, fuzzy +#~ msgid " About " +#~ msgstr "_A Propos" + +#~ msgid "&Open/load... C-o" +#~ msgstr "&Ouvrir/charger.. C-o" + +#~ msgid "&New C-n" +#~ msgstr "&Nouveau C-n" + +#~ msgid "&Save F2" +#~ msgstr "&Sauver F2" + +#~ msgid "save &As... F12" +#~ msgstr "Enregistrer sous.. F12" + +#~ msgid "&Insert file... F15" +#~ msgstr "&InsИrer fichier.. F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "copier vers &Fichier... C-f" + +#~ msgid "a&Bout... " +#~ msgstr "A Propos... " + +#~ msgid "&Quit F10" +#~ msgstr "&Quitter F10" + +#~ msgid "&New C-x k" +#~ msgstr "&Nouveau C-x k" + +#~ msgid "copy to &File... " +#~ msgstr "copier vers &Fichier..." + +#~ msgid "&Toggle Mark F3" +#~ msgstr "&Inverser Marque F3" + +#~ msgid "&Mark Columns S-F3" +#~ msgstr "&Marquer Colonnes S-F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "echange &InsИre/Иcrasemt" + +#~ msgid "&Copy F5" +#~ msgstr "&Copier F5" + +#~ msgid "&Move F6" +#~ msgstr "&DИplacer F6" + +#~ msgid "&Delete F8" +#~ msgstr "&Supprimer F8" + +#~ msgid "&Undo C-u" +#~ msgstr "&Undo C-u" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "dИ&But C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "&End C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "Rechercher... F7" + +#~ msgid "search &Again F17" +#~ msgstr "Chercher Ю nouve&Au F17" + +#~ msgid "&Replace... F4" +#~ msgstr "&Remplacer... F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "Aller Ю la ligne... M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "insИrer un &Literal... C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "&Rafraichir l'Иcran C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "Commencer Ю enregistrer une macro C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "Terminer l'enregistrement de macro... C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "&ExИcuter macro... C-a, TOUCHE" + +#~ msgid "delete macr&O... " +#~ msgstr "effacer macr&O... " + +#~ msgid "insert &Date/time " +#~ msgstr "insИrer &Date/heure " + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "formater p&Aragraphe M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "correction orthographique 'is&Pell' C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "&Trier... M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "Formatteur &C 'indent' F19" + +#~ msgid "&Mail... " +#~ msgstr "&Mail... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "&ExИcuter macro... C-x e, TOUCHE" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "correction orthographique 'is&Pell' M-$" + +#~ msgid "&General... " +#~ msgstr "&GИnИral... " + +#~ msgid "&Save mode..." +#~ msgstr "Mode &Sauvegarde..." + +#~ msgid " Edit " +#~ msgstr " Editer " + +#~ msgid " Sear/Repl " +#~ msgstr " Cherch/Rempl " + +#~ msgid " Command " +#~ msgstr " Commande " + +#~ msgid " Options " +#~ msgstr " Options " + +#~ msgid "Open...\tC-o" +#~ msgstr "Ouvrir...\tC-o" + +#~ msgid "New\tC-n" +#~ msgstr "Nouveau\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "Sauver\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "Enregistrer sous...\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "InsИrer fichier...\tF15" + +#~ msgid "Copy to file...\tC-f" +#~ msgstr "Copier vers fichier...\tC-f" + +#~ msgid "Disk operations" +#~ msgstr "OpИrations disque" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "Echange Marque\tF3" + +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "Echange Marque\tC-b" + +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "Echange insИre/Иcrasement\tIns" + +#~ msgid "Delete block\tF8/C-Del" +#~ msgstr "Effacer block\tF8/C-Del" + +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr "Copier le block dans le presse-papier\tC-Ins" + +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr "Couper le block vers le presse-papier\tS-Del" + +#~ msgid "Paste block from clipbrd\tS-Ins" +#~ msgstr "Coller le block du presse-papier\tS-Ins" + +#~ msgid "Selection history\tM-Ins" +#~ msgstr "Historique de la sИlection\tM-Ins" + +#~ msgid "Manipulating blocks of text" +#~ msgstr "Manipulation de blocs de texte" + +#~ msgid " Srch/Replce " +#~ msgstr " Chercher/Remplacer " + +#~ msgid "Search...\tF7" +#~ msgstr "Rechercher...\tF7" + +#~ msgid "Search again\tF17" +#~ msgstr "Chercher Ю nouveau\tF17" + +#~ msgid "Replace...\tF4" +#~ msgstr "Remplacer...\tF4" + +#~ msgid "Replace again\tF14" +#~ msgstr "Remplacer Ю nouveau\tF14" + +#~ msgid "Search for and replace text" +#~ msgstr "Chercher et remplacer texte" + +#~ msgid "Goto line...\tM-l" +#~ msgstr "Aller Ю la ligne...\tM-l" + +#~ msgid "Start record macro\tC-r" +#~ msgstr "Commencer Ю enregistrer une macro\tC-r" + +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "Terminer l'enregistrement de macro...\tC-r" + +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "ExИcuter macro...\tC-a, TOUCHE" + +#~ msgid "Delete macro...\t" +#~ msgstr "Effacer macro...\t" + +#~ msgid "Insert date/time\tC-d" +#~ msgstr "InsИrer date/heure\tC-d" + +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Formater paragraphe\tM-p" + +#~ msgid "Refresh display\tC-l" +#~ msgstr "Rafraichir l'affichage\tC-l" + +#~ msgid "Macros and internal commands" +#~ msgstr "Macros et commandes internes" + +#~ msgid "Open/Load" +#~ msgstr "Ouvrir/Charger" + +#~ msgid "Load a different/new file" +#~ msgstr "Ouvrir un autre/nouveau fichier" + +#~ msgid "New" +#~ msgstr "Nouveau" + +#~ msgid "Save the current edit buffer to filename" +#~ msgstr "Enregistrer le tampon d'Иdition courant dans un fichier" + +#~ msgid "Save As" +#~ msgstr "Enregistrer Sous" + +#~ msgid "Save the current edit buffer as filename" +#~ msgstr "Enregistrer le tampon d'Иdition courant dans un fichier" + +#~ msgid "Exit" +#~ msgstr "Quiter" + +#~ msgid "Quit editor" +#~ msgstr "Quiter l'Иditeur" + +#~ msgid "Copy selection to clipboard" +#~ msgstr "Copier dans le presse-papiers" + +#~ msgid "Cut" +#~ msgstr "Couper" + +#~ msgid "Cut selection to clipboard" +#~ msgstr "Couper vers le presse-papiers" + +#~ msgid "Paste" +#~ msgstr "Coller" + +#~ msgid "Paste clipboard" +#~ msgstr "Coller le presse-papiers" + +#~ msgid "Undo" +#~ msgstr "Annuler" + +#~ msgid "Find" +#~ msgstr "Chercher" + +#~ msgid "Find string/regular expression" +#~ msgstr "Rechercher chaine/expression rИguliХre" + +#~ msgid "Find again" +#~ msgstr "Chercher Ю nouveau" + +#~ msgid "Repeat most recent search" +#~ msgstr "RИpИter la recherche la plus rИcente" + +#~ msgid "Find and replace text/regular expressions" +#~ msgstr "Rechercher et remplacer une chaine/expression rИguliХre" + +#~ msgid "About..." +#~ msgstr "A Propos..." + +#~ msgid "Info about Mcedit" +#~ msgstr "Information sur Mcedit" #~ msgid "|" #~ msgstr "|" Binary files old/mc-4.5.12/po/it.gmo and new/mc-4.5.13/po/it.gmo differ diff -ruN old/mc-4.5.12/po/it.po new/mc-4.5.13/po/it.po --- old/mc-4.5.12/po/it.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/it.po Wed Feb 10 19:41:21 1999 @@ -1,6 +1,6 @@ msgid "" msgstr "" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "Content-Type: text/plain; charset=\n" "Date: 1998-03-24 19:15:11-0600\n" "From: Miguel de Icaza,computo,622-4680 \n" @@ -161,22 +161,22 @@ msgid "Command: " msgstr "Comando" -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 #, fuzzy msgid "Set Filter" msgstr " Filtro " -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 #, fuzzy msgid "Show all files" msgstr "mostra i files random" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -184,39 +184,39 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr " Apri con..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "Inserisci argomenti extra:" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 #, fuzzy msgid "Warning" msgstr " Attenzione " -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 #, fuzzy msgid "Home directory" msgstr "directory" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -291,8 +291,8 @@ msgid "Replace it?" msgstr " Sostituisci " -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "Copia" @@ -383,28 +383,28 @@ msgid " Done." msgstr "Nessuno" -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 #, fuzzy msgid "_Move here" msgstr " Muovi " -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 #, fuzzy msgid "_Copy here" msgstr " Copia " -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 #, fuzzy msgid "_Link here" msgstr " Link " -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 #, fuzzy msgid "Cancel drag" msgstr " Annulla " #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, fuzzy, c-format msgid "" "Could not stat %s\n" @@ -676,52 +676,51 @@ msgid "File/New/Directory..." msgstr "directory" -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "Proprieta'" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "Apri" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "Apri con" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "Vista" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "Modif" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "Link..." -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "Link simbolici" -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "Modifica link simbolici" -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "Copia..." -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "Elimina" @@ -797,7 +796,7 @@ msgstr "Timeout della cache del ftpfs:" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +msgid "Allow customization of icons in icon view" msgstr "" #: gnome/gprefs.c:176 @@ -1077,7 +1076,7 @@ msgid "Go to your home directory" msgstr "directory" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 #, fuzzy msgid "Location:" msgstr "Posizione: %Xh:%Xh" @@ -1318,8 +1317,7 @@ msgid " Save file " msgstr " Salva il file " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr "Salva" @@ -1606,356 +1604,6 @@ msgid " Mail " msgstr " Posta " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr "word wrap " - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr " Inserisci lunghezza linea, 0 per disattivare " - -#: gtkedit/editmenu.c:69 -#, fuzzy -msgid " About " -msgstr "About" - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "&Apri/esegui... C-o" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "&Nuovo" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "&Salva F2" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "salva &Con nome... F12" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "&Inserisci file... F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "copia in un &File.... C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "a&Bout" - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "&Esci F10" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "&Nuovo C-x k" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "copia su un &File..." - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "Attiva/disattiva evidenziazione F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "Attiva &inserisci Ins" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "&Copia F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "&Rinomina F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "&Cancella F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "&Indietro C-" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "I&nizio file C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "&Fine file C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "&Cerca... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "cerca &Nuovamente F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "Sostituisci F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "Vai alla linea M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "Inserisci &Letteralmente... C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "Aggiorna schermo C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "&Inizia registrazione macro C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "&Finisci registrazione macro... C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "&Esegui macro C-a, Tasto" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "Elimina macro..." - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "inserisci data e ora" - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "formattazione paragrafo M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "Correzine testo(ispell) C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "&Ordina M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "formatta in C con `indent' F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "&Posta... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "&Esegui macro... C-x e, Tasto" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "'ispell' inizia correzione M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "&Generale..." - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "&Modalita' di salvataggio..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "&Layout" - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " File " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " Modifica " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr " Cerca/Sostituisci " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " Comando " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr " Opzioni " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "Apri...\tC-o" - -#: gtkedit/editmenu.c:393 -#, fuzzy -msgid "New\tC-n" -msgstr "Nuovo\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "Salva\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "Salva come......\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "Inserisci file...\tF15" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "Copia su un file...\tC-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "Operazioni sui files" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "Alterna evidenziazione\\tF3" - -#: gtkedit/editmenu.c:409 -#, fuzzy -msgid "Toggle mark columns\tC-b" -msgstr "Alterna evidenziazione\\tF3" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "Alterna inserisci/sovrascrivi \tIns" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "Copia il blocco sotto il cursore\tF5" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "Muovi il blocco sotto al cursore\tF6" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "Elimina blocco\\tF8/C-Del" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "Copia il blocco alla clipboard\\tC-Ins" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "Muovi il blocco alla clipboard\\tS-Del" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "Importa il blocco dalla clipboard\\tS-Ins" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "Storico selezioni\\tM-Ins" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "Undo\\tC-Backspace" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "Manipolazione blocchi di testo" - -#: gtkedit/editmenu.c:430 -#, fuzzy -msgid " Srch/Replce " -msgstr " Cerca/Sostituisci " - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "Cerca...\\tF7" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "Nuova ricerca\\tF17" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "Sostituisci...\\tF4" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "Sostituisci di nuovo\\tF14" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "Cerca e rimpiazza testo" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "Vai alla linea...\\tM-l" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "inizia registrazione macro\\tC-r" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "Fine registrazione macro...\\tC-r" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "Esegui macro...\\tC-a, TECLA" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "Elimina macro...\\t" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "Inserisci data/ora\\tC-d" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "Formatta paragrafo\tM-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "Macro e comandi interni" - #: gtkedit/editoptions.c:37 #, fuzzy msgid "None" @@ -1985,9 +1633,8 @@ msgid "Error initialising editor.\n" msgstr "Errore nell'inizializzazione dell'editor.\n" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "Aiuto" @@ -2027,139 +1674,33 @@ msgstr "" #: gtkedit/gtkedit.c:1289 -#, fuzzy -msgid "Open/Load" -msgstr "Apri" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "" - -#: gtkedit/gtkedit.c:1292 -#, fuzzy -msgid "New" -msgstr "Nuovo\tC-n" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "" - -#: gtkedit/gtkedit.c:1299 -#, fuzzy -msgid "Save As" -msgstr " Salva con nome " - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert File" msgstr " Inserisci file " -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert text from a file" msgstr " Inserisci letteralmente " -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 #, fuzzy msgid "Copy to file" msgstr "Copia files" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "Esci" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "" - -#: gtkedit/gtkedit.c:1318 -#, fuzzy -msgid "Copy selection to clipboard" -msgstr " Copia nella clipboard " - -#: gtkedit/gtkedit.c:1321 -#, fuzzy -msgid "Cut" -msgstr "Totale" - -#: gtkedit/gtkedit.c:1321 -#, fuzzy -msgid "Cut selection to clipboard" -msgstr " Taglia nella clipboard " - -#: gtkedit/gtkedit.c:1324 -#, fuzzy -msgid "Paste" -msgstr "Processa" - -#: gtkedit/gtkedit.c:1324 -#, fuzzy -msgid "Paste clipboard" -msgstr " Taglia nella clipboard " - -#: gtkedit/gtkedit.c:1328 -#, fuzzy -msgid "Undo" -msgstr "no" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -#, fuzzy -msgid "Find" -msgstr "Cerca" - #: gtkedit/gtkedit.c:1336 #, fuzzy -msgid "Find string/regular expression" -msgstr " Espressione regolare errata " - -#: gtkedit/gtkedit.c:1339 -#, fuzzy -msgid "Find again" -msgstr "Trova file" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 -#, fuzzy msgid "Search/Replace" msgstr " Cerca/Sostituisci " -#: gtkedit/gtkedit.c:1342 -#, fuzzy -msgid "Find and replace text/regular expressions" -msgstr " Espressione regolare errata " - -#: gtkedit/gtkedit.c:1351 -#, fuzzy -msgid "About..." -msgstr "About" - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "File" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 #, fuzzy msgid " Load syntax file " @@ -2526,6 +2067,10 @@ msgid " Permission " msgstr " Permessi " +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " File " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "Usa Barra Spazio per cambiare" @@ -2739,16 +2284,10 @@ " i pannelli non possono essere nascosti. " #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"Premi `exit' per tornare a Midnight Commander\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" +msgstr "Premi `exit' per tornare a Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" @@ -2757,94 +2296,94 @@ " Non riesco a verificare il file %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr " Link " -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr " a: " -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr " link: %s" -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr " link simbolico: %s " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr " Link simbolico " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr " punta a: " -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr " Modifica link simbolico " -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr " Modifica il link simbolico: %s " -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr " Linka simbolicamente " -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr " Link simbolici relativi " -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr " link simbolico relativo: %s " -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " Inserire nome macchina (F1 per help e dettagli): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, fuzzy, c-format msgid " Could not chdir to %s " msgstr "" " Impossibile eseguire chown su \"%s\" \n" " %s " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " Connessione remota " -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " Connessione FTP " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr " Configurazione del routing " -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr " " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr " Nome dell'host " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr " Errore nella determinazione dell'IP address " -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr " Ripristina file da un filesystem ext2 " -#: src/cmd.c:1317 +#: src/cmd.c:1319 #, fuzzy msgid "" " Enter device (without /dev/) to undelete\n" @@ -2853,11 +2392,11 @@ " Inserisci il nome del file system sul quale volete \n" " eseguire il comando di ripristino: (F1 per i dettagli) " -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Configurazione salvata su ~/" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " Configurazione " @@ -3482,6 +3021,10 @@ msgid " Background process: Recursive Delete " msgstr " Proceso en el fondo: Borrado recursivo " +#: src/filegui.c:404 +msgid "File" +msgstr "File" + #: src/filegui.c:425 msgid "Count" msgstr "Totale" @@ -4376,6 +3919,10 @@ msgid "&Configuration..." msgstr "&Configurazione.." +#: src/main.c:1302 +msgid "&Layout..." +msgstr "&Layout" + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "Conferma....." @@ -5332,13 +4879,310 @@ msgid "Inconsistent tar archive" msgstr "" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" "%s\n" "doesn't look like a tar archive." msgstr "" + +#~ msgid " Word wrap " +#~ msgstr "word wrap " + +#~ msgid " Enter line length, 0 for off: " +#~ msgstr " Inserisci lunghezza linea, 0 per disattivare " + +#, fuzzy +#~ msgid " About " +#~ msgstr "About" + +#~ msgid "&Open/load... C-o" +#~ msgstr "&Apri/esegui... C-o" + +#~ msgid "&New C-n" +#~ msgstr "&Nuovo" + +#~ msgid "&Save F2" +#~ msgstr "&Salva F2" + +#~ msgid "save &As... F12" +#~ msgstr "salva &Con nome... F12" + +#~ msgid "&Insert file... F15" +#~ msgstr "&Inserisci file... F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "copia in un &File.... C-f" + +#~ msgid "a&Bout... " +#~ msgstr "a&Bout" + +#~ msgid "&Quit F10" +#~ msgstr "&Esci F10" + +#~ msgid "&New C-x k" +#~ msgstr "&Nuovo C-x k" + +#~ msgid "copy to &File... " +#~ msgstr "copia su un &File..." + +#~ msgid "&Toggle Mark F3" +#~ msgstr "Attiva/disattiva evidenziazione F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "Attiva &inserisci Ins" + +#~ msgid "&Copy F5" +#~ msgstr "&Copia F5" + +#~ msgid "&Move F6" +#~ msgstr "&Rinomina F6" + +#~ msgid "&Delete F8" +#~ msgstr "&Cancella F8" + +#~ msgid "&Undo C-u" +#~ msgstr "&Indietro C-" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "I&nizio file C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "&Fine file C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "&Cerca... F7" + +#~ msgid "search &Again F17" +#~ msgstr "cerca &Nuovamente F17" + +#~ msgid "&Replace... F4" +#~ msgstr "Sostituisci F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "Vai alla linea M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "Inserisci &Letteralmente... C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "Aggiorna schermo C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "&Inizia registrazione macro C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "&Finisci registrazione macro... C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "&Esegui macro C-a, Tasto" + +#~ msgid "delete macr&O... " +#~ msgstr "Elimina macro..." + +#~ msgid "insert &Date/time " +#~ msgstr "inserisci data e ora" + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "formattazione paragrafo M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "Correzine testo(ispell) C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "&Ordina M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "formatta in C con `indent' F19" + +#~ msgid "&Mail... " +#~ msgstr "&Posta... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "&Esegui macro... C-x e, Tasto" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "'ispell' inizia correzione M-$" + +#~ msgid "&General... " +#~ msgstr "&Generale..." + +#~ msgid "&Save mode..." +#~ msgstr "&Modalita' di salvataggio..." + +#~ msgid " Edit " +#~ msgstr " Modifica " + +#~ msgid " Sear/Repl " +#~ msgstr " Cerca/Sostituisci " + +#~ msgid " Command " +#~ msgstr " Comando " + +#~ msgid " Options " +#~ msgstr " Opzioni " + +#~ msgid "Open...\tC-o" +#~ msgstr "Apri...\tC-o" + +#, fuzzy +#~ msgid "New\tC-n" +#~ msgstr "Nuovo\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "Salva\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "Salva come......\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "Inserisci file...\tF15" + +#~ msgid "Copy to file...\tC-f" +#~ msgstr "Copia su un file...\tC-f" + +#~ msgid "Disk operations" +#~ msgstr "Operazioni sui files" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "Alterna evidenziazione\\tF3" + +#, fuzzy +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "Alterna evidenziazione\\tF3" + +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "Alterna inserisci/sovrascrivi \tIns" + +#~ msgid "Copy block to cursor\tF5" +#~ msgstr "Copia il blocco sotto il cursore\tF5" + +#~ msgid "Move block to cursor\tF6" +#~ msgstr "Muovi il blocco sotto al cursore\tF6" + +#~ msgid "Delete block\tF8/C-Del" +#~ msgstr "Elimina blocco\\tF8/C-Del" + +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr "Copia il blocco alla clipboard\\tC-Ins" + +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr "Muovi il blocco alla clipboard\\tS-Del" + +#~ msgid "Paste block from clipbrd\tS-Ins" +#~ msgstr "Importa il blocco dalla clipboard\\tS-Ins" + +#~ msgid "Selection history\tM-Ins" +#~ msgstr "Storico selezioni\\tM-Ins" + +#~ msgid "Undo\tC-BackSpace" +#~ msgstr "Undo\\tC-Backspace" + +#~ msgid "Manipulating blocks of text" +#~ msgstr "Manipolazione blocchi di testo" + +#, fuzzy +#~ msgid " Srch/Replce " +#~ msgstr " Cerca/Sostituisci " + +#~ msgid "Search...\tF7" +#~ msgstr "Cerca...\\tF7" + +#~ msgid "Search again\tF17" +#~ msgstr "Nuova ricerca\\tF17" + +#~ msgid "Replace...\tF4" +#~ msgstr "Sostituisci...\\tF4" + +#~ msgid "Replace again\tF14" +#~ msgstr "Sostituisci di nuovo\\tF14" + +#~ msgid "Search for and replace text" +#~ msgstr "Cerca e rimpiazza testo" + +#~ msgid "Goto line...\tM-l" +#~ msgstr "Vai alla linea...\\tM-l" + +#~ msgid "Start record macro\tC-r" +#~ msgstr "inizia registrazione macro\\tC-r" + +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "Fine registrazione macro...\\tC-r" + +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "Esegui macro...\\tC-a, TECLA" + +#~ msgid "Delete macro...\t" +#~ msgstr "Elimina macro...\\t" + +#~ msgid "Insert date/time\tC-d" +#~ msgstr "Inserisci data/ora\\tC-d" + +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Formatta paragrafo\tM-p" + +#~ msgid "Macros and internal commands" +#~ msgstr "Macro e comandi interni" + +#, fuzzy +#~ msgid "Open/Load" +#~ msgstr "Apri" + +#, fuzzy +#~ msgid "New" +#~ msgstr "Nuovo\tC-n" + +#, fuzzy +#~ msgid "Save As" +#~ msgstr " Salva con nome " + +#~ msgid "Exit" +#~ msgstr "Esci" + +#, fuzzy +#~ msgid "Copy selection to clipboard" +#~ msgstr " Copia nella clipboard " + +#, fuzzy +#~ msgid "Cut" +#~ msgstr "Totale" + +#, fuzzy +#~ msgid "Cut selection to clipboard" +#~ msgstr " Taglia nella clipboard " + +#, fuzzy +#~ msgid "Paste" +#~ msgstr "Processa" + +#, fuzzy +#~ msgid "Paste clipboard" +#~ msgstr " Taglia nella clipboard " + +#, fuzzy +#~ msgid "Undo" +#~ msgstr "no" + +#, fuzzy +#~ msgid "Find" +#~ msgstr "Cerca" + +#, fuzzy +#~ msgid "Find string/regular expression" +#~ msgstr " Espressione regolare errata " + +#, fuzzy +#~ msgid "Find again" +#~ msgstr "Trova file" + +#, fuzzy +#~ msgid "Find and replace text/regular expressions" +#~ msgstr " Espressione regolare errata " + +#, fuzzy +#~ msgid "About..." +#~ msgstr "About" #~ msgid "|" #~ msgstr "|" Binary files old/mc-4.5.12/po/ko.gmo and new/mc-4.5.13/po/ko.gmo differ diff -ruN old/mc-4.5.12/po/ko.po new/mc-4.5.13/po/ko.po --- old/mc-4.5.12/po/ko.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/ko.po Wed Feb 10 19:41:21 1999 @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.6\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: 1999-02-04 14:20:02+0900\n" "Last-Translator: Sung-Hyun Nam \n" "Language-Team: Korean \n" @@ -146,20 +146,20 @@ msgid "Command: " msgstr "╦М╥и: " -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 msgid "Set Filter" msgstr "гйем ╪Ёа╓" -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 msgid "Show all files" msgstr "╦П╣Г фдюо ╨╦©╘аж╠Б" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "." -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -171,37 +171,37 @@ "©╧╦╕ ╣И╦И:\n" "*.gif╢б gif ╠в╦╡╦╦ю╩ ╨╦©╘аы ╟мют╢о╢ы" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "фпЁн ╨╦╠Б©║╪╜ фдюо гйем╦╣ю╩ ю╖гя а╓╠т г╔гЖ╫д ют╥б." -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr " Open with..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "extra юнюз ют╥б:" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 msgid "Warning" msgstr "╟Ф╟М" -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "%s ©╜ ╪Ж ╬Ью╫; цй╠Б ╣╔╫╨е╘е╬ ╬фюлдэю╩ ╟║аЗ ╪Ж ╬Ью╩ ╟мюс" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "хчаЖеК" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 msgid "Home directory" msgstr "х╗ юз╥А╧Ф" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -267,8 +267,8 @@ msgid "Replace it?" msgstr "╧ы╡э╠Н©Д?" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "╨╧╩Г" @@ -348,24 +348,24 @@ msgid " Done." msgstr " Done." -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 msgid "_Move here" msgstr "©╘╠Б╥н юл╣©(_M)" -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 msgid "_Copy here" msgstr "©╘╠Б╥н ╨╧╩Г(_C)" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Link here" msgstr "©╘╠Б╥н ©╛╟А(_L)" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "Cancel drag" msgstr "╣Е╥║╠в цК╪р" #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, c-format msgid "" "Could not stat %s\n" @@ -602,52 +602,51 @@ msgid "File/New/Directory..." msgstr "фдюо/╩У ╟м/юз╥А╧Ф..." -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "╪с╪╨" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "©╜╠Б" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "Open with" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "╨╦╠Б" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "гйем╬Ьюл ╨╦╠Б" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "фМаЩ" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "╦╣е╘..." -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "╫и╨╪╦╞╦╣е╘..." -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "╫и╨╪╦╞╦╣е╘ ╪Жа╓..." -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "юл╣©/юл╦╖╧ы╡ы╠Б..." -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "╨╧╩Г..." -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "аЖ©Л╠Б" @@ -713,7 +712,8 @@ msgstr "FTP юз╥А╧Ф дЁ╫╛ е╦юс╬ф©Т:" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +#, fuzzy +msgid "Allow customization of icons in icon view" msgstr "фпЁнюг ╬фюлдэ ╧ы╡ы╠Б гЦ©К" #: gnome/gprefs.c:176 @@ -980,7 +980,7 @@ msgid "Go to your home directory" msgstr "х╗ юз╥А╧Фю╦╥н ╟║╠Б" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 msgid "Location:" msgstr "ю╖д║:" @@ -1212,8 +1212,7 @@ msgid " Save file " msgstr " фдюо юЗюЕ " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr "юЗюЕ" @@ -1496,359 +1495,6 @@ msgid " Mail " msgstr " юЭюз©ЛфМ " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr " Word wrap " - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr " ╤Сюн ╠Фюл╦╕ ют╥б, 0ю╨ off: " - -#: gtkedit/editmenu.c:69 -msgid " About " -msgstr " юл га╥н╠в╥╔ю╨ " - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" Midnight Commander╦╕ ю╖гь ╟Ё╧ъ╣х\n" -" ╩Г©Кюз©м дё╠ыгя еь╫╨ф╝ фМаЩ╠Б.\n" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "©╜╠Б/╨р╥╞©ю╠Б(&O)... C-o" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "╩У фдюо(&N) C-n" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "юЗюЕ(_S) F3" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ(&A)... M-d" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "фдюо Ё╒©ЖЁж╠Б(&I)... F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "фдюо╥н ╨╧╩Г(&F)... C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "юл га╥н╠в╥╔ю╨(&B)... " - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "а╬╥А(&Q) F10" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "╩У фдюо(&N) C-x l" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "фдюо╥н ╨╧╩Г(&F)... " - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "╦╤е╘ еД╠ш(&T) F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "дц╥Ё ╦╤е╘(&M) S-F3" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "╩Пют/╟Цд╖ еД╠ш(&I) Ins" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "╨╧╩Г(&C) F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "юл╣©(&M) F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "аЖ©Л╠Б(&D) F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "цК╪р(&U) C-u" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "фдюо цЁю╫(&B) C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "фдюо Ё║(&E) C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "цё╠Б(&S)... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "╢ы╫ц цё╠Б(&A) F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "╧ы╡ы╠Б(&R)... F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "╤Сюн цё╬ф╟║╠Б(&G)... M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "Literal ют╥б(&L) C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "х╜╦И ╟╩╫е(&R) C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "╦ее╘╥н юЗюЕ ╫цюш(&S) C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "╦ее╘╥н юЗюЕ Ё║(&F) C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "╦ее╘╥н ╫ггЮ(&E)... C-a, KEY" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "╦ее╘╥н ╩Ха╕(&O)... " - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "Ё╞б╔/╫ц╟ё ╩Пют(&D) " - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "format p&Aragraph M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "'ispell' ц╤юз ╟к╩Г(&P) C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "а╓╥д(&T) M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "'indent' &C Formatter F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "юЭюз©ЛфМ(&M)... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "╦ее╘╥н ╫ггЮ(&E)... C-x e, KEY" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "'ispell' ц╤юз ╟к╩Г(&P) M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "юо╧щ(&G)... " - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "╦П╣Е юЗюЕ(&S)..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "╧Хд║(&L)..." - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " фдюо " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " фМаЩ " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr " цё╠Б/╧ы╡ч " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " ╦М╥и " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr " ╪╠ецгв╦Я " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "©╜╠Б...\tC-o" - -#: gtkedit/editmenu.c:393 -msgid "New\tC-n" -msgstr "╩У ╠ш\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "юЗюЕ\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "╩Уюл╦╖ю╦╥н юЗюЕ\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "фдюо Ё╒©ЖЁж╠Б...\tF15" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "фдюо╥н ╨╧╩Г...\tC-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "╣П╫╨е╘ а╤юш" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "╦╤е╘ еД╠ш\tF3" - -#: gtkedit/editmenu.c:409 -msgid "Toggle mark columns\tC-b" -msgstr "дц╥Ё ╦╤е╘ еД╠ш\tC-b" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "╩Пют/╟Цд╖ еД╠ш\tIns" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "╨М╥╟ю╩ д©╪╜ю╖д║╥н ╨╧╩Г\tF5" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "╨М╥╟ю╩ д©╪╜ю╖д║╥н юл╣©\tF6" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "╨М╥╟ ╩Ха╕\tF8/C-Del" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "╨М╥╟ю╩ е╛╦Ё╨╦╣Е╥н ╨╧╩Г\tC-Ins" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "╨М╥╟ю╩ е╛╦Ё╨╦╣Е╥н ©ю╥а╣н╠Б\tS-Del" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨М╥╟ ╨ыюл╠Б\tS-Ins" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "╪╠ец хВ╫╨еД╦╝\tM-Ins" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "цК╪р\tC-BackSpace" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "еь╫╨ф╝ ╨М╥╟ а╤юш" - -#: gtkedit/editmenu.c:430 -msgid " Srch/Replce " -msgstr " цё╠Б/╧ы╡ч " - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "цё╠Б...\tF7" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "╢ы╫ц цё╠Б\tF17" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "╧ы╡ч...\tF4" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "╦П╣н ╧ы╡ч\tF14" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "цё╬ф╪╜ ╧ы╡э ╧╝юз©╜" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "╤Сюн цё╬ф╟║╠Б...\tM-l" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "╦ее╘╥н юЗюЕ ╫цюш\tC-r" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "╦ее╘╥н юЗюЕ Ё║...\tC-r" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "╦ее╘╥н ╫ггЮ...\tC-a, KEY" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "╦ее╘╥н ╩Ха╕...\t" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "Ё╞б╔/╫ц╟ё ╩Пют\tC-d" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "Format paragraph\tM-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "х╜╦И ╟╩╫е\tC-l" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "╦ее╘╥н©м Ё╩юЕ ╦М╥и" - #: gtkedit/editoptions.c:37 msgid "None" msgstr "" @@ -1876,9 +1522,8 @@ msgid "Error initialising editor.\n" msgstr "Error initialising editor.\n" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "╣╣©Р╦╩" @@ -1918,121 +1563,29 @@ "gtkedit.c: HOME х╞╟Ф╨╞╪Ж╟║ ╪Ёа╓╣гаЖ ╬й╬р╟М, passwd фдюо©║╣╣ ╬Ью╫ - аъ╢э\n" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "©╜╠Б/╟║а╝©ю╠Б" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "╢ы╦╔ х╓ю╨ ╩У╥н©Н фдюо юп╬Н©ю╠Б" - -#: gtkedit/gtkedit.c:1292 -msgid "New" -msgstr "╩У ╠ш" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "фМаЩ ╧Жфш аЖ©Л╠Б" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "гЖюГюг фМаЩ ╧Жфш╦╕ фдюоюл╦╖ю╦╥н юЗюЕ" - -#: gtkedit/gtkedit.c:1299 -msgid "Save As" -msgstr "╩Уюл╦╖ю╦╥н юЗюЕ" - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "гЖюГюг фМаЩ ╧Жфш╦╕ фдюоюл╦╖ю╦╥н╪╜ юЗюЕ" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert File" msgstr "фдюо Ё╒©ЖЁж╠Б" -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert text from a file" msgstr "фдюо©║╪╜ ╠ш©Ы Ё╒©ЖЁж╠Б" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "Copy to file" msgstr "фдюо╥н ╨╧╩Г" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "╨М╥╟ю╩ фдюо╥н ╨╧╩Г" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "а╬╥А" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "фМаЩ╠Б а╬╥А" - -#: gtkedit/gtkedit.c:1318 -msgid "Copy selection to clipboard" -msgstr "╪╠ец╣х Ё╩©Кю╩ е╛╦Ё╨╦╣Е╥н ╨╧╩Г" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut" -msgstr "юз╦ё╠Б" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut selection to clipboard" -msgstr "╪╠ец╣х Ё╩©Кю╩ е╛╦Ё╨╦╣Е╥н ©ю╥а╣н╠Б" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "╨ыюл╠Б" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste clipboard" -msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ыюл╠Б" - -#: gtkedit/gtkedit.c:1328 -msgid "Undo" -msgstr "фМаЩ цК╪р" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "гоЁ╙юг ╠ш╪Хют╥бю╩ цК╪р" - -#: gtkedit/gtkedit.c:1336 -msgid "Find" -msgstr "цё╠Б" - #: gtkedit/gtkedit.c:1336 -msgid "Find string/regular expression" -msgstr "╧╝юз©╜/а╓╠т╫д цё╠Б" - -#: gtkedit/gtkedit.c:1339 -msgid "Find again" -msgstr "╢ы╫ц цё╠Б" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "╟║юЕ цж╠ыюг цё╠Б╦╕ ╧щ╨╧" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 msgid "Search/Replace" msgstr "цё╠Б/╧ы╡ч" -#: gtkedit/gtkedit.c:1342 -msgid "Find and replace text/regular expressions" -msgstr "╠ш©Ы/а╓╠т╫дю╩ цё╬ф╪╜ ╧ы╡ы╠Б" - -#: gtkedit/gtkedit.c:1351 -msgid "About..." -msgstr "юл га╥н╠в╥╔ю╨..." - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "Mcedit©║ ╢Кгя а╓╨╦" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "фдюо" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 msgid " Load syntax file " msgstr " ╠╦╧╝ фдюо юп╬Н©ю╠Б " @@ -2395,6 +1948,10 @@ msgid " Permission " msgstr " гЦ©К " +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " фдюо " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "╧ы╡э╥а╦И SPACE ╩Г©К" @@ -2602,16 +2159,11 @@ " фпЁню╩ ╪╜╥н ╧ы╡э ╪Ж ╬Ь╫ю╢о╢ы. " #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"The Midnight Commander╥н ╣╧╬ф╟║╥а╦И 'exit'ю╩ ют╥бго╫й╫ц©ю\n" -"\r\n" -"\r" +#, fuzzy +msgid "Type `exit' to return to the Midnight Commander" +msgstr "The Midnight Commander╥н ╣╧╬ф╟║╥а╦И 'exit'ю╩ ют╥бго╫й╫ц©ю" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" @@ -2620,92 +2172,92 @@ " %s фдюоа╓╨╦╦╕ ╬Рю╩ ╪Ж ╬Ь╬Н©Д \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr " ╦╣е╘ " -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr " ╢К╩С:" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr " ╦╣е╘: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr " ╫и╨╪╦╞╦╣е╘: %s " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr " ╫и╨╪╦╞╦╣е╘ " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr " ╟║ ╟║╦╝еЁ фдюо:" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr " ╫и╨╪╦╞╦╣е╘ ╪Жа╓ " -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr " ╫и╨╪╦╞╦╣е╘ ╪Жа╓: %s " -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr " Link symbolically " -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr " Relative symlink " -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr " relative symlink: %s " -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " хё╫╨ф╝ юл╦╖ ют╥б (╣╣©Р╦╩ F1): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr " %s╥н юз╥А╧Фю╩ ╧ы╡э ╪Ж ╬Ью╫ " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " ©Ь╟щ хё╫╨ф╝©║ ©╛╟А " -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " FTP ©╛╟А " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr " ╪рдо ╪р╫╨ ╤С©Лфц ╪Ёа╓ " -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr " ©Ьц╣ ╤С©Лфц х╘ю╩ ╩Г©Кго╠Б ю╖гя хё╫╨ф╝ юл╦╖: " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr " хё╫╨ф╝ юл╦╖ " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr " IP аж╪р цё╢б аъ ©ю╥Ы ╧ъ╩Щ " -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr " ext2 фдюоц╪╟Х©║╪╜ фдюо ╣г╩Л╦╡ " -#: src/cmd.c:1317 +#: src/cmd.c:1319 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -2713,11 +2265,11 @@ " фдюою╩ ╨╧╠╦го╠Б ю╖гь '/dev/'╦╕ ╩Щ╥╚гя ╣П╧ыюл╫╨╦М\n" " ют╥б: (юз╪╪хВ ╬к╠Б ©Ьго╦И F1)" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Setup saved to ~/" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " х╞╟Ф╪Ёа╓ " @@ -3344,6 +2896,10 @@ msgid " Background process: Recursive Delete " msgstr " ╧И╠в╤С©Н╣Е га╥н╪╪╫╨: Recursive аЖ©Л╠Б " +#: src/filegui.c:404 +msgid "File" +msgstr "фдюо" + #: src/filegui.c:425 msgid "Count" msgstr "╟╧╪Ж" @@ -4242,6 +3798,10 @@ msgid "&Configuration..." msgstr "х╞╟Ф╪Ёа╓(&C)..." +#: src/main.c:1302 +msgid "&Layout..." +msgstr "╧Хд║(&L)..." + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "х╝юн(&O)..." @@ -5194,7 +4754,7 @@ msgid "Inconsistent tar archive" msgstr "юъ╦Ь╣х евюы ╬фд╚юл╨Й" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" @@ -5204,3 +4764,326 @@ "хЛ,...\n" "%s\n" "евюы ╬фд╚юл╨Й фдюо╟╟аЖ ╬й╫ю╢о╢ы." + +#~ msgid " Word wrap " +#~ msgstr " Word wrap " + +#~ msgid " Enter line length, 0 for off: " +#~ msgstr " ╤Сюн ╠Фюл╦╕ ют╥б, 0ю╨ off: " + +#~ msgid " About " +#~ msgstr " юл га╥н╠в╥╔ю╨ " + +#~ msgid "" +#~ "\n" +#~ " Cooledit v2.1\n" +#~ "\n" +#~ " Copyright (C) 1996 the Free Software Foundation\n" +#~ "\n" +#~ " A user friendly text editor written\n" +#~ " for the Midnight Commander.\n" +#~ msgstr "" +#~ "\n" +#~ " Cooledit v2.1\n" +#~ "\n" +#~ " Copyright (C) 1996 the Free Software Foundation\n" +#~ "\n" +#~ " Midnight Commander╦╕ ю╖гь ╟Ё╧ъ╣х\n" +#~ " ╩Г©Кюз©м дё╠ыгя еь╫╨ф╝ фМаЩ╠Б.\n" + +#~ msgid "&Open/load... C-o" +#~ msgstr "©╜╠Б/╨р╥╞©ю╠Б(&O)... C-o" + +#~ msgid "&New C-n" +#~ msgstr "╩У фдюо(&N) C-n" + +#~ msgid "&Save F2" +#~ msgstr "юЗюЕ(_S) F3" + +#~ msgid "save &As... F12" +#~ msgstr "╢ы╦╔ юл╦╖ю╦╥н юЗюЕ(&A)... M-d" + +#~ msgid "&Insert file... F15" +#~ msgstr "фдюо Ё╒©ЖЁж╠Б(&I)... F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "фдюо╥н ╨╧╩Г(&F)... C-f" + +#~ msgid "a&Bout... " +#~ msgstr "юл га╥н╠в╥╔ю╨(&B)... " + +#~ msgid "&Quit F10" +#~ msgstr "а╬╥А(&Q) F10" + +#~ msgid "&New C-x k" +#~ msgstr "╩У фдюо(&N) C-x l" + +#~ msgid "copy to &File... " +#~ msgstr "фдюо╥н ╨╧╩Г(&F)... " + +#~ msgid "&Toggle Mark F3" +#~ msgstr "╦╤е╘ еД╠ш(&T) F3" + +#~ msgid "&Mark Columns S-F3" +#~ msgstr "дц╥Ё ╦╤е╘(&M) S-F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "╩Пют/╟Цд╖ еД╠ш(&I) Ins" + +#~ msgid "&Copy F5" +#~ msgstr "╨╧╩Г(&C) F5" + +#~ msgid "&Move F6" +#~ msgstr "юл╣©(&M) F6" + +#~ msgid "&Delete F8" +#~ msgstr "аЖ©Л╠Б(&D) F8" + +#~ msgid "&Undo C-u" +#~ msgstr "цК╪р(&U) C-u" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "фдюо цЁю╫(&B) C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "фдюо Ё║(&E) C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "цё╠Б(&S)... F7" + +#~ msgid "search &Again F17" +#~ msgstr "╢ы╫ц цё╠Б(&A) F17" + +#~ msgid "&Replace... F4" +#~ msgstr "╧ы╡ы╠Б(&R)... F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "╤Сюн цё╬ф╟║╠Б(&G)... M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "Literal ют╥б(&L) C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "х╜╦И ╟╩╫е(&R) C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "╦ее╘╥н юЗюЕ ╫цюш(&S) C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "╦ее╘╥н юЗюЕ Ё║(&F) C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "╦ее╘╥н ╫ггЮ(&E)... C-a, KEY" + +#~ msgid "delete macr&O... " +#~ msgstr "╦ее╘╥н ╩Ха╕(&O)... " + +#~ msgid "insert &Date/time " +#~ msgstr "Ё╞б╔/╫ц╟ё ╩Пют(&D) " + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "format p&Aragraph M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "'ispell' ц╤юз ╟к╩Г(&P) C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "а╓╥д(&T) M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "'indent' &C Formatter F19" + +#~ msgid "&Mail... " +#~ msgstr "юЭюз©ЛфМ(&M)... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "╦ее╘╥н ╫ггЮ(&E)... C-x e, KEY" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "'ispell' ц╤юз ╟к╩Г(&P) M-$" + +#~ msgid "&General... " +#~ msgstr "юо╧щ(&G)... " + +#~ msgid "&Save mode..." +#~ msgstr "╦П╣Е юЗюЕ(&S)..." + +#~ msgid " Edit " +#~ msgstr " фМаЩ " + +#~ msgid " Sear/Repl " +#~ msgstr " цё╠Б/╧ы╡ч " + +#~ msgid " Command " +#~ msgstr " ╦М╥и " + +#~ msgid " Options " +#~ msgstr " ╪╠ецгв╦Я " + +#~ msgid "Open...\tC-o" +#~ msgstr "©╜╠Б...\tC-o" + +#~ msgid "New\tC-n" +#~ msgstr "╩У ╠ш\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "юЗюЕ\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "╩Уюл╦╖ю╦╥н юЗюЕ\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "фдюо Ё╒©ЖЁж╠Б...\tF15" + +#~ msgid "Copy to file...\tC-f" +#~ msgstr "фдюо╥н ╨╧╩Г...\tC-f" + +#~ msgid "Disk operations" +#~ msgstr "╣П╫╨е╘ а╤юш" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "╦╤е╘ еД╠ш\tF3" + +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "дц╥Ё ╦╤е╘ еД╠ш\tC-b" + +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "╩Пют/╟Цд╖ еД╠ш\tIns" + +#~ msgid "Copy block to cursor\tF5" +#~ msgstr "╨М╥╟ю╩ д©╪╜ю╖д║╥н ╨╧╩Г\tF5" + +#~ msgid "Move block to cursor\tF6" +#~ msgstr "╨М╥╟ю╩ д©╪╜ю╖д║╥н юл╣©\tF6" + +#~ msgid "Delete block\tF8/C-Del" +#~ msgstr "╨М╥╟ ╩Ха╕\tF8/C-Del" + +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr "╨М╥╟ю╩ е╛╦Ё╨╦╣Е╥н ╨╧╩Г\tC-Ins" + +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr "╨М╥╟ю╩ е╛╦Ё╨╦╣Е╥н ©ю╥а╣н╠Б\tS-Del" + +#~ msgid "Paste block from clipbrd\tS-Ins" +#~ msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨М╥╟ ╨ыюл╠Б\tS-Ins" + +#~ msgid "Selection history\tM-Ins" +#~ msgstr "╪╠ец хВ╫╨еД╦╝\tM-Ins" + +#~ msgid "Undo\tC-BackSpace" +#~ msgstr "цК╪р\tC-BackSpace" + +#~ msgid "Manipulating blocks of text" +#~ msgstr "еь╫╨ф╝ ╨М╥╟ а╤юш" + +#~ msgid " Srch/Replce " +#~ msgstr " цё╠Б/╧ы╡ч " + +#~ msgid "Search...\tF7" +#~ msgstr "цё╠Б...\tF7" + +#~ msgid "Search again\tF17" +#~ msgstr "╢ы╫ц цё╠Б\tF17" + +#~ msgid "Replace...\tF4" +#~ msgstr "╧ы╡ч...\tF4" + +#~ msgid "Replace again\tF14" +#~ msgstr "╦П╣н ╧ы╡ч\tF14" + +#~ msgid "Search for and replace text" +#~ msgstr "цё╬ф╪╜ ╧ы╡э ╧╝юз©╜" + +#~ msgid "Goto line...\tM-l" +#~ msgstr "╤Сюн цё╬ф╟║╠Б...\tM-l" + +#~ msgid "Start record macro\tC-r" +#~ msgstr "╦ее╘╥н юЗюЕ ╫цюш\tC-r" + +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "╦ее╘╥н юЗюЕ Ё║...\tC-r" + +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "╦ее╘╥н ╫ггЮ...\tC-a, KEY" + +#~ msgid "Delete macro...\t" +#~ msgstr "╦ее╘╥н ╩Ха╕...\t" + +#~ msgid "Insert date/time\tC-d" +#~ msgstr "Ё╞б╔/╫ц╟ё ╩Пют\tC-d" + +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Format paragraph\tM-p" + +#~ msgid "Refresh display\tC-l" +#~ msgstr "х╜╦И ╟╩╫е\tC-l" + +#~ msgid "Macros and internal commands" +#~ msgstr "╦ее╘╥н©м Ё╩юЕ ╦М╥и" + +#~ msgid "Open/Load" +#~ msgstr "©╜╠Б/╟║а╝©ю╠Б" + +#~ msgid "Load a different/new file" +#~ msgstr "╢ы╦╔ х╓ю╨ ╩У╥н©Н фдюо юп╬Н©ю╠Б" + +#~ msgid "New" +#~ msgstr "╩У ╠ш" + +#~ msgid "Save the current edit buffer to filename" +#~ msgstr "гЖюГюг фМаЩ ╧Жфш╦╕ фдюоюл╦╖ю╦╥н юЗюЕ" + +#~ msgid "Save As" +#~ msgstr "╩Уюл╦╖ю╦╥н юЗюЕ" + +#~ msgid "Save the current edit buffer as filename" +#~ msgstr "гЖюГюг фМаЩ ╧Жфш╦╕ фдюоюл╦╖ю╦╥н╪╜ юЗюЕ" + +#~ msgid "Exit" +#~ msgstr "а╬╥А" + +#~ msgid "Quit editor" +#~ msgstr "фМаЩ╠Б а╬╥А" + +#~ msgid "Copy selection to clipboard" +#~ msgstr "╪╠ец╣х Ё╩©Кю╩ е╛╦Ё╨╦╣Е╥н ╨╧╩Г" + +#~ msgid "Cut" +#~ msgstr "юз╦ё╠Б" + +#~ msgid "Cut selection to clipboard" +#~ msgstr "╪╠ец╣х Ё╩©Кю╩ е╛╦Ё╨╦╣Е╥н ©ю╥а╣н╠Б" + +#~ msgid "Paste" +#~ msgstr "╨ыюл╠Б" + +#~ msgid "Paste clipboard" +#~ msgstr "е╛╦Ё╨╦╣Е©║╪╜ ╨ыюл╠Б" + +#~ msgid "Undo" +#~ msgstr "фМаЩ цК╪р" + +#~ msgid "Go back in time one key press" +#~ msgstr "гоЁ╙юг ╠ш╪Хют╥бю╩ цК╪р" + +#~ msgid "Find" +#~ msgstr "цё╠Б" + +#~ msgid "Find string/regular expression" +#~ msgstr "╧╝юз©╜/а╓╠т╫д цё╠Б" + +#~ msgid "Find again" +#~ msgstr "╢ы╫ц цё╠Б" + +#~ msgid "Repeat most recent search" +#~ msgstr "╟║юЕ цж╠ыюг цё╠Б╦╕ ╧щ╨╧" + +#~ msgid "Find and replace text/regular expressions" +#~ msgstr "╠ш©Ы/а╓╠т╫дю╩ цё╬ф╪╜ ╧ы╡ы╠Б" + +#~ msgid "About..." +#~ msgstr "юл га╥н╠в╥╔ю╨..." + +#~ msgid "Info about Mcedit" +#~ msgstr "Mcedit©║ ╢Кгя а╓╨╦" diff -ruN old/mc-4.5.12/po/mc.pot new/mc-4.5.13/po/mc.pot --- old/mc-4.5.12/po/mc.pot Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/mc.pot Wed Feb 10 19:41:22 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-02-07 01:53-0600\n" +"POT-Creation-Date: 1999-02-10 18:27-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -55,113 +55,113 @@ msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1791 -#: src/file.c:2171 src/filegui.c:573 src/hotlist.c:1035 src/main.c:820 +#: gnome/gcmd.c:108 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:820 #: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" -#: gnome/gcmd.c:108 gtkedit/editcmd.c:2235 src/cmd.c:251 src/file.c:1791 -#: src/file.c:2171 src/filegui.c:572 src/hotlist.c:1035 src/main.c:820 +#: gnome/gcmd.c:108 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:820 #: src/screen.c:2050 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "" -#: gnome/gcmd.c:206 +#: gnome/gcmd.c:205 msgid "Sort By" msgstr "" #. we define this up here so we can pass it in to our callback -#: gnome/gcmd.c:211 +#: gnome/gcmd.c:210 msgid "Ignore case sensitivity." msgstr "" -#: gnome/gcmd.c:219 src/chmod.c:150 src/screen.c:425 +#: gnome/gcmd.c:218 src/chmod.c:150 src/screen.c:425 msgid "Name" msgstr "" -#: gnome/gcmd.c:226 +#: gnome/gcmd.c:225 msgid "File Type" msgstr "" -#: gnome/gcmd.c:232 src/screen.c:426 src/screen.c:427 +#: gnome/gcmd.c:231 src/screen.c:426 src/screen.c:427 msgid "Size" msgstr "" -#: gnome/gcmd.c:238 +#: gnome/gcmd.c:237 msgid "Time Last Accessed" msgstr "" -#: gnome/gcmd.c:244 +#: gnome/gcmd.c:243 msgid "Time Last Modified" msgstr "" -#: gnome/gcmd.c:250 +#: gnome/gcmd.c:249 msgid "Time Last Changed" msgstr "" -#: gnome/gcmd.c:264 +#: gnome/gcmd.c:263 msgid "Reverse the order." msgstr "" -#: gnome/gcmd.c:326 +#: gnome/gcmd.c:325 msgid "Enter name." msgstr "" -#: gnome/gcmd.c:332 +#: gnome/gcmd.c:331 msgid "Enter label for command:" msgstr "" -#: gnome/gcmd.c:427 +#: gnome/gcmd.c:426 msgid "Find all core files" msgstr "" -#: gnome/gcmd.c:430 src/panelize.c:350 +#: gnome/gcmd.c:429 src/panelize.c:350 msgid "Find rejects after patching" msgstr "" -#: gnome/gcmd.c:472 +#: gnome/gcmd.c:471 msgid "Run Command" msgstr "" #. Frame 1 -#: gnome/gcmd.c:477 +#: gnome/gcmd.c:476 msgid "Preset Commands" msgstr "" -#: gnome/gcmd.c:494 +#: gnome/gcmd.c:493 msgid "Add" msgstr "" -#: gnome/gcmd.c:498 +#: gnome/gcmd.c:497 msgid "Remove" msgstr "" #. Frame 2 -#: gnome/gcmd.c:506 +#: gnome/gcmd.c:505 msgid "Run this Command" msgstr "" -#: gnome/gcmd.c:513 +#: gnome/gcmd.c:512 msgid "Command: " msgstr "" -#: gnome/gcmd.c:574 +#: gnome/gcmd.c:573 msgid "Set Filter" msgstr "" -#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 -#: gnome/gscreen.c:2485 +#: gnome/gcmd.c:578 gnome/gcmd.c:619 gnome/gcmd.c:624 gnome/gcmd.c:628 +#: gnome/gscreen.c:2570 msgid "Show all files" msgstr "" -#: gnome/gcmd.c:586 +#: gnome/gcmd.c:585 msgid "." msgstr "" -#: gnome/gcmd.c:602 +#: gnome/gcmd.c:601 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -169,19 +169,19 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:604 +#: gnome/gcmd.c:603 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:661 gnome/gpopup.c:49 +#: gnome/gcmd.c:660 gnome/gpopup.c:49 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:662 gnome/gpopup.c:50 +#: gnome/gcmd.c:661 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1566 msgid "Warning" msgstr "" @@ -190,16 +190,16 @@ msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1519 +#: gnome/gdesktop.c:1532 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1549 +#: gnome/gdesktop.c:1562 msgid "Home directory" msgstr "" -#: gnome/gdesktop.c:1554 +#: gnome/gdesktop.c:1567 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -263,8 +263,8 @@ msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:789 +#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1024 msgid "Copy" msgstr "" @@ -366,11 +366,11 @@ "%s" msgstr "" -#: gnome/gicon.c:83 gnome/gtools.c:50 +#: gnome/gicon.c:86 gnome/gtools.c:50 msgid "Error" msgstr "" -#: gnome/gicon.c:83 +#: gnome/gicon.c:86 msgid "Default set of icons not found, check your installation" msgstr "" @@ -403,27 +403,7 @@ msgid "Opens a new window" msgstr "" -#. We want to make a new menu entry here... -#. For example: -#. New-> -#. Command Prompt -#. Gimp Image -#. Gnumeric Spreadsheet -#. Text Document -#. etc... -#: gnome/glayout.c:302 -msgid "_New" -msgstr "" - -#: gnome/glayout.c:304 -msgid "_Open" -msgstr "" - -#: gnome/glayout.c:304 -msgid "Opens the selected files" -msgstr "" - -#. { GNOME_APP_UI_ITEM, N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, +#. GNOMEUIINFO_ITEM_NONE( N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, #: gnome/glayout.c:306 msgid "_Copy..." msgstr "" @@ -437,7 +417,7 @@ msgstr "" #: gnome/glayout.c:307 -msgid "Delete files from disk" +msgid "Delete files" msgstr "" #: gnome/glayout.c:308 @@ -448,149 +428,120 @@ msgid "Rename or move files" msgstr "" -#: gnome/glayout.c:310 -msgid "C_lose" -msgstr "" - -#: gnome/glayout.c:310 -msgid "Close this panel" -msgstr "" - -#: gnome/glayout.c:317 +#: gnome/glayout.c:315 msgid "Select _All" msgstr "" -#: gnome/glayout.c:317 +#: gnome/glayout.c:315 msgid "Select all files in the current Panel" msgstr "" -#: gnome/glayout.c:318 +#: gnome/glayout.c:317 msgid "_Select Files..." msgstr "" -#: gnome/glayout.c:318 +#: gnome/glayout.c:317 msgid "Select a group of files" msgstr "" -#: gnome/glayout.c:319 +#: gnome/glayout.c:318 msgid "_Invert Selection" msgstr "" -#: gnome/glayout.c:319 +#: gnome/glayout.c:318 msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:321 +#: gnome/glayout.c:320 msgid "_Rescan Directory" msgstr "" -#: gnome/glayout.c:321 +#: gnome/glayout.c:320 msgid "Rescan the directory contents" msgstr "" -#: gnome/glayout.c:328 +#: gnome/glayout.c:327 msgid "Icon View" msgstr "" -#: gnome/glayout.c:329 +#: gnome/glayout.c:328 msgid "Partial View" msgstr "" -#: gnome/glayout.c:330 +#: gnome/glayout.c:329 msgid "Full View" msgstr "" -#: gnome/glayout.c:331 +#: gnome/glayout.c:330 msgid "Custom View" msgstr "" -#: gnome/glayout.c:337 +#: gnome/glayout.c:335 msgid "_Sort By..." msgstr "" -#: gnome/glayout.c:337 +#: gnome/glayout.c:335 msgid "Confirmation settings" msgstr "" -#: gnome/glayout.c:338 +#: gnome/glayout.c:336 msgid "_Filter View..." msgstr "" -#: gnome/glayout.c:338 +#: gnome/glayout.c:336 msgid "Global option settings" msgstr "" -#: gnome/glayout.c:345 +#: gnome/glayout.c:343 msgid "_Find File..." msgstr "" -#: gnome/glayout.c:345 +#: gnome/glayout.c:343 msgid "Locate files on disk" msgstr "" #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, -#: gnome/glayout.c:349 +#: gnome/glayout.c:347 msgid "_Run Command..." msgstr "" -#: gnome/glayout.c:349 +#: gnome/glayout.c:347 msgid "Runs a command" msgstr "" -#: gnome/glayout.c:351 +#: gnome/glayout.c:349 msgid "_Run Command in panel..." msgstr "" -#: gnome/glayout.c:351 +#: gnome/glayout.c:349 msgid "Run a command and put the results in a panel" msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:352 msgid "_Active VFS list..." msgstr "" -#: gnome/glayout.c:354 +#: gnome/glayout.c:352 msgid "List of active virtual file systems" msgstr "" -#: gnome/glayout.c:361 +#: gnome/glayout.c:359 msgid "_Background jobs..." msgstr "" -#: gnome/glayout.c:361 +#: gnome/glayout.c:359 msgid "List of background operations" msgstr "" -#. GNOMEUIINFO_HELP ("midnight-commander"), -#: gnome/glayout.c:369 -msgid "_About" -msgstr "" - -#: gnome/glayout.c:369 -msgid "Information on this program" -msgstr "" - -#: gnome/glayout.c:375 gnome/gview.c:323 -msgid "_File" -msgstr "" - -#: gnome/glayout.c:376 -msgid "_Edit" -msgstr "" - -#: gnome/glayout.c:377 +#: gnome/glayout.c:374 msgid "_Layout" msgstr "" -#: gnome/glayout.c:378 +#: gnome/glayout.c:375 msgid "_Commands" msgstr "" -#: gnome/glayout.c:379 -msgid "_Help" -msgstr "" - -#: gnome/glayout.c:474 +#: gnome/glayout.c:472 msgid "File/New/Directory..." msgstr "" @@ -606,7 +557,7 @@ msgid "Open with" msgstr "" -#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2287 src/screen.c:2317 msgid "View" msgstr "" @@ -614,8 +565,7 @@ msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:230 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2288 src/screen.c:2318 src/view.c:1996 msgid "Edit" msgstr "" @@ -640,7 +590,7 @@ msgstr "" #: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 -#: src/screen.c:2291 src/screen.c:2321 +#: src/screen.c:2292 src/screen.c:2322 msgid "Delete" msgstr "" @@ -813,7 +763,7 @@ msgid "Title" msgstr "" -#: gnome/gprop.c:521 gnome/gscreen.c:2271 +#: gnome/gprop.c:521 gnome/gscreen.c:2340 msgid "Icon" msgstr "" @@ -821,158 +771,158 @@ msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1569 +#: gnome/gscreen.c:1612 msgid "All files" msgstr "" -#: gnome/gscreen.c:1571 +#: gnome/gscreen.c:1614 msgid "Archives and compressed files" msgstr "" -#: gnome/gscreen.c:1573 +#: gnome/gscreen.c:1616 msgid "RPM/DEB files" msgstr "" -#: gnome/gscreen.c:1575 +#: gnome/gscreen.c:1618 msgid "Text/Document files" msgstr "" -#: gnome/gscreen.c:1577 +#: gnome/gscreen.c:1620 msgid "HTML and SGML files" msgstr "" -#: gnome/gscreen.c:1579 +#: gnome/gscreen.c:1622 msgid "Postscript and PDF files" msgstr "" -#: gnome/gscreen.c:1581 +#: gnome/gscreen.c:1624 msgid "Spreadsheet files" msgstr "" -#: gnome/gscreen.c:1583 +#: gnome/gscreen.c:1626 msgid "Image files" msgstr "" -#: gnome/gscreen.c:1586 +#: gnome/gscreen.c:1629 msgid "Video/animation files" msgstr "" -#: gnome/gscreen.c:1588 +#: gnome/gscreen.c:1631 msgid "Audio files" msgstr "" -#: gnome/gscreen.c:1590 +#: gnome/gscreen.c:1633 msgid "C program files" msgstr "" -#: gnome/gscreen.c:1592 +#: gnome/gscreen.c:1635 msgid "C++ program files" msgstr "" -#: gnome/gscreen.c:1594 +#: gnome/gscreen.c:1637 msgid "Objective-C program files" msgstr "" -#: gnome/gscreen.c:1596 +#: gnome/gscreen.c:1639 msgid "Scheme program files" msgstr "" -#: gnome/gscreen.c:1598 +#: gnome/gscreen.c:1641 msgid "Assembler program files" msgstr "" -#: gnome/gscreen.c:1600 +#: gnome/gscreen.c:1643 msgid "Misc. program files" msgstr "" -#: gnome/gscreen.c:1602 +#: gnome/gscreen.c:1645 msgid "Font files" msgstr "" -#: gnome/gscreen.c:1729 +#: gnome/gscreen.c:1772 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1739 +#: gnome/gscreen.c:1782 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1739 +#: gnome/gscreen.c:1782 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1765 src/screen.c:677 +#: gnome/gscreen.c:1808 src/screen.c:677 msgid "" msgstr "" -#: gnome/gscreen.c:1819 +#: gnome/gscreen.c:1862 msgid "Filter" msgstr "" -#: gnome/gscreen.c:2271 +#: gnome/gscreen.c:2340 msgid "Switch view to an Icon view" msgstr "" -#: gnome/gscreen.c:2273 +#: gnome/gscreen.c:2342 msgid "Brief" msgstr "" -#: gnome/gscreen.c:2273 +#: gnome/gscreen.c:2342 msgid "Switch view to show just file name and type" msgstr "" -#: gnome/gscreen.c:2275 +#: gnome/gscreen.c:2344 msgid "Detailed" msgstr "" -#: gnome/gscreen.c:2275 +#: gnome/gscreen.c:2344 msgid "Switch view to show detailed file statistics" msgstr "" -#: gnome/gscreen.c:2277 +#: gnome/gscreen.c:2346 msgid "Custom" msgstr "" -#: gnome/gscreen.c:2277 +#: gnome/gscreen.c:2346 msgid "Switch view to show custom determined statistics." msgstr "" -#: gnome/gscreen.c:2282 +#: gnome/gscreen.c:2351 msgid "Back" msgstr "" -#: gnome/gscreen.c:2282 +#: gnome/gscreen.c:2351 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2284 +#: gnome/gscreen.c:2353 msgid "Up" msgstr "" -#: gnome/gscreen.c:2284 +#: gnome/gscreen.c:2353 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2286 +#: gnome/gscreen.c:2355 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2286 +#: gnome/gscreen.c:2355 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2289 +#: gnome/gscreen.c:2358 msgid "Home" msgstr "" -#: gnome/gscreen.c:2289 +#: gnome/gscreen.c:2358 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2430 +#: gnome/gscreen.c:2515 msgid "Location:" msgstr "" @@ -1026,15 +976,20 @@ msgid "_Wrap" msgstr "" -#: gnome/gview.c:309 +#: gnome/gview.c:310 msgid "Wrap the text" msgstr "" -#: gnome/gview.c:315 +#. Can not use this one yet, as it destroys the viewer, need to fix that +#: gnome/gview.c:313 +msgid "_Parsed view" +msgstr "" + +#: gnome/gview.c:316 msgid "_Formatted" msgstr "" -#: gnome/gview.c:317 +#: gnome/gview.c:318 msgid "_Hex" msgstr "" @@ -1042,10 +997,6 @@ msgid "_Search" msgstr "" -#: gnome/gview.c:325 -msgid "_Mode" -msgstr "" - #: gnome/gwidget.c:90 msgid "ok" msgstr "" @@ -1058,11 +1009,11 @@ msgid "help" msgstr "" -#: gnome/gwidget.c:96 src/file.c:2190 +#: gnome/gwidget.c:96 src/file.c:2208 msgid "yes" msgstr "" -#: gnome/gwidget.c:98 src/file.c:2188 +#: gnome/gwidget.c:98 src/file.c:2206 msgid "no" msgstr "" @@ -1077,8 +1028,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:375 -#: src/screen.c:2306 src/tree.c:692 src/tree.c:698 src/wtools.c:222 +#: gtkedit/editcmd.c:1932 gtkedit/editwidget.c:947 src/dir.c:383 +#: src/screen.c:2307 src/tree.c:692 src/tree.c:698 src/wtools.c:222 #: vfs/fish.c:224 msgid " Error " msgstr "" @@ -1202,8 +1153,7 @@ msgid " Save file " msgstr "" -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1992 msgid "Save" msgstr "" @@ -1252,8 +1202,8 @@ #. Heads the 'Search' dialog box #: gtkedit/editcmd.c:1285 gtkedit/editcmd.c:1461 gtkedit/editcmd.c:2196 -#: src/view.c:1446 src/view.c:1536 src/view.c:1658 src/view.c:1857 -#: src/view.c:1889 +#: src/view.c:1465 src/view.c:1564 src/view.c:1686 src/view.c:1885 +#: src/view.c:1917 msgid " Search " msgstr "" @@ -1410,7 +1360,7 @@ msgstr "" #: gtkedit/editcmd.c:2544 gtkedit/editcmd.c:2548 gtkedit/editcmd.c:2553 -#: gtkedit/editcmd.c:2556 src/view.c:1829 +#: gtkedit/editcmd.c:2556 src/view.c:1857 msgid " Goto line " msgstr "" @@ -1482,352 +1432,6 @@ msgid " Mail " msgstr "" -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr "" - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr "" - -#: gtkedit/editmenu.c:69 -msgid " About " -msgstr "" - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "" - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "" - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "" - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "" - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "" - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "" - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "" - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "" - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr "" - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr "" - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr "" - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr "" - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr "" - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "" - -#: gtkedit/editmenu.c:393 -msgid "New\tC-n" -msgstr "" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "" - -#: gtkedit/editmenu.c:409 -msgid "Toggle mark columns\tC-b" -msgstr "" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "" - -#: gtkedit/editmenu.c:430 -msgid " Srch/Replce " -msgstr "" - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "" - #: gtkedit/editoptions.c:37 msgid "None" msgstr "" @@ -1855,9 +1459,8 @@ msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2285 +#: src/screen.c:2315 src/tree.c:1018 src/view.c:1987 msgid "Help" msgstr "" @@ -1869,7 +1472,7 @@ msgid "Replac" msgstr "" -#: gtkedit/editwidget.c:1066 src/view.c:1972 +#: gtkedit/editwidget.c:1066 src/view.c:2000 msgid "Search" msgstr "" @@ -1877,8 +1480,8 @@ msgid "PullDn" msgstr "" -#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1671 src/view.c:1961 -#: src/view.c:1981 +#: gtkedit/editwidget.c:1070 src/help.c:818 src/main.c:1671 src/view.c:1989 +#: src/view.c:2009 msgid "Quit" msgstr "" @@ -1896,121 +1499,29 @@ msgstr "" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "" - -#: gtkedit/gtkedit.c:1292 -msgid "New" -msgstr "" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "" - -#: gtkedit/gtkedit.c:1299 -msgid "Save As" -msgstr "" - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert File" msgstr "" -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert text from a file" msgstr "" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "Copy to file" msgstr "" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "" - -#: gtkedit/gtkedit.c:1318 -msgid "Copy selection to clipboard" -msgstr "" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut" -msgstr "" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut selection to clipboard" -msgstr "" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste clipboard" -msgstr "" - -#: gtkedit/gtkedit.c:1328 -msgid "Undo" -msgstr "" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -msgid "Find" -msgstr "" - #: gtkedit/gtkedit.c:1336 -msgid "Find string/regular expression" -msgstr "" - -#: gtkedit/gtkedit.c:1339 -msgid "Find again" -msgstr "" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 msgid "Search/Replace" msgstr "" -#: gtkedit/gtkedit.c:1342 -msgid "Find and replace text/regular expressions" -msgstr "" - -#: gtkedit/gtkedit.c:1351 -msgid "About..." -msgstr "" - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 msgid " Load syntax file " msgstr "" @@ -2112,7 +1623,7 @@ msgid "Background process:" msgstr "" -#: src/background.c:284 src/file.c:2113 +#: src/background.c:284 src/file.c:2131 msgid " Background process error " msgstr "" @@ -2367,6 +1878,10 @@ msgid " Permission " msgstr "" +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr "" + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "" @@ -2586,7 +2101,7 @@ msgid " Link " msgstr "" -#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1639 msgid " to:" msgstr "" @@ -2702,69 +2217,69 @@ "\n" msgstr "" -#: src/dir.c:53 +#: src/dir.c:61 msgid "&Unsorted" msgstr "" -#: src/dir.c:54 +#: src/dir.c:62 msgid "&Name" msgstr "" -#: src/dir.c:55 +#: src/dir.c:63 msgid "&Extension" msgstr "" -#: src/dir.c:56 +#: src/dir.c:64 msgid "&Modify time" msgstr "" -#: src/dir.c:57 +#: src/dir.c:65 msgid "&Access time" msgstr "" -#: src/dir.c:58 +#: src/dir.c:66 msgid "&Change time" msgstr "" -#: src/dir.c:59 +#: src/dir.c:67 msgid "&Size" msgstr "" -#: src/dir.c:60 +#: src/dir.c:68 msgid "&Inode" msgstr "" #. New sort orders -#: src/dir.c:63 +#: src/dir.c:71 msgid "&Type" msgstr "" -#: src/dir.c:64 +#: src/dir.c:72 msgid "&Links" msgstr "" -#: src/dir.c:65 +#: src/dir.c:73 msgid "N&GID" msgstr "" -#: src/dir.c:66 +#: src/dir.c:74 msgid "N&UID" msgstr "" -#: src/dir.c:67 +#: src/dir.c:75 msgid "&Owner" msgstr "" -#: src/dir.c:68 +#: src/dir.c:76 msgid "&Group" msgstr "" -#: src/dir.c:375 +#: src/dir.c:383 #, c-format msgid "File exists but can not be stat-ed: %s %s" msgstr "" -#: src/dir.c:633 +#: src/dir.c:643 msgid "Unknown" msgstr "" @@ -2883,14 +2398,14 @@ " %s " msgstr "" -#: src/file.c:574 src/file.c:794 +#: src/file.c:574 src/file.c:799 #, c-format msgid "" " Cannot chown target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:583 src/file.c:809 +#: src/file.c:583 src/file.c:817 #, c-format msgid "" " Cannot chmod target file \"%s\" \n" @@ -2915,72 +2430,72 @@ " %s " msgstr "" -#: src/file.c:633 +#: src/file.c:638 #, c-format msgid "" " Cannot create target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:647 +#: src/file.c:652 #, c-format msgid "" " Cannot fstat target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:678 +#: src/file.c:683 #, c-format msgid "" " Cannot read source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:708 +#: src/file.c:713 #, c-format msgid "" " Cannot write target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:727 +#: src/file.c:732 msgid "(stalled)" msgstr "" -#: src/file.c:765 +#: src/file.c:770 #, c-format msgid "" " Cannot close source file \"%s\" \n" " %s " msgstr "" -#: src/file.c:774 +#: src/file.c:779 #, c-format msgid "" " Cannot close target file \"%s\" \n" " %s " msgstr "" -#: src/file.c:784 +#: src/file.c:789 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/file.c:785 +#: src/file.c:790 msgid "&Delete" msgstr "" -#: src/file.c:785 src/hotlist.c:1443 +#: src/file.c:790 src/hotlist.c:1443 msgid "&Keep" msgstr "" -#: src/file.c:854 +#: src/file.c:862 #, c-format msgid "" " Cannot stat source directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:877 +#: src/file.c:885 #, c-format msgid "" " Source directory \"%s\" is not a directory \n" @@ -2988,21 +2503,21 @@ msgstr "" #. we found a cyclic symbolic link -#: src/file.c:885 +#: src/file.c:893 #, c-format msgid "" " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" -#: src/file.c:938 +#: src/file.c:946 #, c-format msgid "" " Cannot create target directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:956 +#: src/file.c:964 #, c-format msgid "" " Cannot chown target directory \"%s\" \n" @@ -3010,69 +2525,69 @@ msgstr "" #. Source doesn't exist -#: src/file.c:1066 +#: src/file.c:1074 #, c-format msgid "" " Cannot stat file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1088 +#: src/file.c:1096 #, c-format msgid " `%s' and `%s' are the same file " msgstr "" -#: src/file.c:1095 +#: src/file.c:1103 #, c-format msgid " Cannot overwrite directory `%s' " msgstr "" -#: src/file.c:1128 +#: src/file.c:1140 #, c-format msgid "" " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1148 +#: src/file.c:1160 #, c-format msgid "" " Cannot remove file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1198 +#: src/file.c:1213 #, c-format msgid " Cannot overwrite directory \"%s\" %s " msgstr "" -#: src/file.c:1200 +#: src/file.c:1215 #, c-format msgid " Cannot overwrite file \"%s\" %s " msgstr "" -#: src/file.c:1223 +#: src/file.c:1238 #, c-format msgid "" " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" -#: src/file.c:1286 +#: src/file.c:1301 #, c-format msgid "" " Cannot delete file \"%s\" \n" " %s " msgstr "" -#: src/file.c:1344 src/file.c:1411 src/file.c:1440 +#: src/file.c:1362 src/file.c:1429 src/file.c:1458 #, c-format msgid "" " Cannot remove directory \"%s\" \n" " %s " msgstr "" -#: src/file.c:1476 +#: src/file.c:1494 msgid " Internal error: get_file \n" msgstr "" @@ -3085,147 +2600,151 @@ #. * (I don't use spaces around the words, because someday they could be #. * dropped, when widgets get smarter) #. -#: src/file.c:1597 +#: src/file.c:1615 msgid "1Copy" msgstr "" -#: src/file.c:1597 +#: src/file.c:1615 msgid "1Move" msgstr "" -#: src/file.c:1597 +#: src/file.c:1615 msgid "1Delete" msgstr "" -#: src/file.c:1612 +#: src/file.c:1630 #, c-format msgid "%o %f \"%s\"%m" msgstr "" -#: src/file.c:1613 +#: src/file.c:1631 #, c-format msgid "%o %d %f%m" msgstr "" -#: src/file.c:1615 +#: src/file.c:1633 #, c-format msgid "%o %f \"%s\"%e" msgstr "" -#: src/file.c:1616 +#: src/file.c:1634 #, c-format msgid "%o %d %f%e" msgstr "" -#: src/file.c:1620 +#: src/file.c:1638 msgid "file" msgstr "" -#: src/file.c:1620 +#: src/file.c:1638 msgid "files" msgstr "" -#: src/file.c:1620 +#: src/file.c:1638 msgid "directory" msgstr "" -#: src/file.c:1620 +#: src/file.c:1638 msgid "directories" msgstr "" -#: src/file.c:1621 +#: src/file.c:1639 msgid "files/directories" msgstr "" -#: src/file.c:1621 +#: src/file.c:1639 msgid " with source mask:" msgstr "" -#: src/file.c:1769 +#: src/file.c:1787 msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1788 +#: src/file.c:1806 msgid "Yes" msgstr "" -#: src/file.c:1788 +#: src/file.c:1806 msgid "No" msgstr "" -#: src/file.c:1841 +#: src/file.c:1859 msgid " Sorry, I could not put the job in background " msgstr "" -#: src/file.c:1924 src/file.c:2029 +#: src/file.c:1942 src/file.c:2047 msgid " Internal failure " msgstr "" -#: src/file.c:1924 src/file.c:2029 +#: src/file.c:1942 src/file.c:2047 msgid " Unknown file operation " msgstr "" -#: src/file.c:1943 +#: src/file.c:1961 #, c-format msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: src/file.c:2114 src/filegui.c:263 +#: src/file.c:2132 src/filegui.c:263 msgid "&Skip" msgstr "" -#: src/file.c:2114 +#: src/file.c:2132 msgid "&Retry" msgstr "" -#: src/file.c:2114 src/file.c:2173 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2132 src/file.c:2191 src/filegui.c:260 src/filegui.c:562 msgid "&Abort" msgstr "" -#: src/file.c:2164 +#: src/file.c:2182 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: src/file.c:2165 +#: src/file.c:2183 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: src/file.c:2166 +#: src/file.c:2184 msgid " Delete: " msgstr "" -#: src/file.c:2172 +#: src/file.c:2190 msgid "a&ll" msgstr "" -#: src/file.c:2172 src/filegui.c:565 +#: src/file.c:2190 src/filegui.c:565 msgid "non&E" msgstr "" -#: src/file.c:2182 +#: src/file.c:2200 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: src/file.c:2184 +#: src/file.c:2202 msgid "all the directories " msgstr "" -#: src/file.c:2186 +#: src/file.c:2204 msgid " Recursive Delete " msgstr "" -#: src/file.c:2187 +#: src/file.c:2205 msgid " Background process: Recursive Delete " msgstr "" +#: src/filegui.c:404 +msgid "File" +msgstr "" + #: src/filegui.c:425 msgid "Count" msgstr "" @@ -3405,7 +2924,7 @@ msgid "Finished" msgstr "" -#: src/find.c:539 src/view.c:1446 +#: src/find.c:539 src/view.c:1465 #, c-format msgid "Searching %s" msgstr "" @@ -4086,6 +3605,10 @@ msgid "&Configuration..." msgstr "" +#: src/main.c:1302 +msgid "&Layout..." +msgstr "" + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "" @@ -4146,7 +3669,7 @@ " the details. " msgstr "" -#: src/main.c:1669 src/screen.c:2285 src/screen.c:2315 +#: src/main.c:1669 src/screen.c:2286 src/screen.c:2316 msgid "Menu" msgstr "" @@ -4424,15 +3947,15 @@ msgid " No action taken " msgstr "" -#: src/screen.c:2289 src/screen.c:2319 src/tree.c:1026 +#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1026 msgid "RenMov" msgstr "" -#: src/screen.c:2290 src/screen.c:2320 src/tree.c:1030 +#: src/screen.c:2291 src/screen.c:2321 src/tree.c:1030 msgid "Mkdir" msgstr "" -#: src/screen.c:2306 +#: src/screen.c:2307 #, c-format msgid "" " Can't chdir to %s \n" @@ -4634,78 +4157,83 @@ msgid " [grow]" msgstr "" -#: src/view.c:1536 src/view.c:1658 +#: src/view.c:1457 +#, c-format +msgid "Searching for `%s'" +msgstr "" + +#: src/view.c:1564 src/view.c:1686 msgid " Search string not found " msgstr "" -#: src/view.c:1697 +#: src/view.c:1725 msgid " Invalid regular expression " msgstr "" -#: src/view.c:1827 +#: src/view.c:1855 #, c-format msgid "" " The current line number is %d.\n" " Enter the new line number:" msgstr "" -#: src/view.c:1857 +#: src/view.c:1885 msgid " Enter regexp:" msgstr "" -#: src/view.c:1889 +#: src/view.c:1917 msgid " Enter search string:" msgstr "" -#: src/view.c:1962 +#: src/view.c:1990 msgid "Ascii" msgstr "" -#: src/view.c:1962 +#: src/view.c:1990 msgid "Hex" msgstr "" -#: src/view.c:1963 +#: src/view.c:1991 msgid "Line" msgstr "" -#: src/view.c:1964 +#: src/view.c:1992 msgid "RxSrch" msgstr "" -#: src/view.c:1967 +#: src/view.c:1995 msgid "EdText" msgstr "" -#: src/view.c:1967 +#: src/view.c:1995 msgid "EdHex" msgstr "" -#: src/view.c:1969 +#: src/view.c:1997 msgid "UnWrap" msgstr "" -#: src/view.c:1969 +#: src/view.c:1997 msgid "Wrap" msgstr "" -#: src/view.c:1972 +#: src/view.c:2000 msgid "HxSrch" msgstr "" -#: src/view.c:1975 +#: src/view.c:2003 msgid "Raw" msgstr "" -#: src/view.c:1975 +#: src/view.c:2003 msgid "Parse" msgstr "" -#: src/view.c:1979 +#: src/view.c:2007 msgid "Unform" msgstr "" -#: src/view.c:1979 +#: src/view.c:2007 msgid "Format" msgstr "" Binary files old/mc-4.5.12/po/no.gmo and new/mc-4.5.13/po/no.gmo differ diff -ruN old/mc-4.5.12/po/no.po new/mc-4.5.13/po/no.po --- old/mc-4.5.12/po/no.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/no.po Wed Feb 10 19:41:21 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.10\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: 1999-02-02 23:51+0100\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" @@ -147,20 +147,20 @@ msgid "Command: " msgstr "Kommando: " -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 msgid "Set Filter" msgstr "Sett filter" -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 msgid "Show all files" msgstr "Vis alle filer" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "." -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -172,37 +172,37 @@ "For eksempel:\n" "*.gif vil kun vise gif bilder" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 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:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr " еpne med..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "Skriv inn ekstra argumenter:" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 msgid "Warning" msgstr "Advarsel" -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "Kunne ikke Еpne %s; vil ikke ha skrivebordsikoner" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "SЬppelkurv" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 msgid "Home directory" msgstr "Hjemmekatalog" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -268,8 +268,8 @@ msgid "Replace it?" msgstr "Erstatt den?" -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "Kopier" @@ -349,24 +349,24 @@ msgid " Done." msgstr " Ferdig." -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 msgid "_Move here" msgstr "Flytt hit" -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 msgid "_Copy here" msgstr "Kopier hit" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Link here" msgstr "Lag lenke her" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "Cancel drag" msgstr "Avbryt dra" #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, c-format msgid "" "Could not stat %s\n" @@ -603,52 +603,51 @@ msgid "File/New/Directory..." msgstr "Fil/Ny/Katalog..." -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "Egenskaper" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "еpne" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "еpne med" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "Se pЕ" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "Se pЕ ufiltrert" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "Rediger" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "Finn..." -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "Symlenken..." -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "Rediger symlenke..." -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "Flytt/gi nytt navn..." -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "Kopier..." -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "Slett" @@ -714,7 +713,8 @@ msgstr "Katalog cache tidsavbrudd for FTP :" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +#, fuzzy +msgid "Allow customization of icons in icon view" msgstr "Tillat egendefinerte ikoner i panelene" #: gnome/gprefs.c:176 @@ -981,7 +981,7 @@ msgid "Go to your home directory" msgstr "GЕ til din hjemmekatalog" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 msgid "Location:" msgstr "Sted:" @@ -1213,8 +1213,7 @@ msgid " Save file " msgstr " Lagre fil " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr "Lagre" @@ -1500,359 +1499,6 @@ msgid " Mail " msgstr " Send " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr " Ordbryting " - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr " Skriv inn linjelengden, 0 for av: " - -#: gtkedit/editmenu.c:69 -msgid " About " -msgstr " Om " - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" En brukervennlig tekst editor skrevet\n" -" for Midnight Commander.\n" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "&еpne/laste... C-o" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "&Ny C-n" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "&Lagre F2" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "l&Agre som... F12" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "sett &Inn fil... F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "kopier til &Fil...C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "Om " - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "avslutt F10" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "&Ny C-x k" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "kopier til &Fil... " - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "slЕ av/pЕ merking F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "&Merk kolonner S-F3" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "slЕ av/pЕ sett inn/overskriv Ins" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "Kopier F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "Flytt F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "Slett F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "Angre C-u" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "&Begynnelsen C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "Slutt C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "SЬk... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "sЬk igjen F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "Erstatt... F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "GЕ til linje... M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "sett inn &Literal... C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "Oppdater skjermen C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "&Start makroinnspilling C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "stopp makroinnspilling...C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "KjЬr makro... C-a, TAST" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "slett makro... " - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "sett inn dato/klokke " - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "formater p&Aragraf M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "'ispell' stavekontroll C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "sor&Ter... M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "'indent' C formatering F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "Send... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "KjЬr makro... C-x e, TAST" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "'ispell' stavekontroll M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "Generelt... " - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "Lagringsmodus..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "Utseende." - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " Fil " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " Rediger " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr " SЬk/Erstatt " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " Kommando " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr " Alternativer " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "еpne...\tC-o" - -#: gtkedit/editmenu.c:393 -msgid "New\tC-n" -msgstr "Ny\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "Lagre\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "Lagre som...\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "Sett inn fil...\tF15" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "Kopier til fil...\tC-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "Diskoperasjoner" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "SlЕ av/pЕ marker\tF3" - -#: gtkedit/editmenu.c:409 -msgid "Toggle mark columns\tC-b" -msgstr "SlЕ av/pЕ marker kolonner\tC-b" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "SlЕ av/pЕ overskriv\tIns" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "Kopier blokk til markЬren\tF5" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "Flytt blokk til markЬren\tF6" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "Slett blokk\tF8/C-Del" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "Kopier blokk til utklippstavle\tC-Ins" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "Klipp ut blokk til utklippstavle\tS-Del" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "Lim inn blokk fra utklippstavlen\tS-Ins" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "Utvalgshistorikk\tM-Ins" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "Angre\tC-Tilbake" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "Manipulering av tekstblokker" - -#: gtkedit/editmenu.c:430 -msgid " Srch/Replce " -msgstr " SЬk/Erstatt " - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "SЬk...\tF7" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "SЬk igjen\tF17" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "Erstatt...\tF4" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "Erstatt igjen\tF14" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "SЬk etter og erstatt tekst" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "GЕ til linje...\tM-l" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "Start makroinnspilling\tC-r" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "Avslutt makroinnspilling...\tC-r" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "KjЬr makro...\tC-a, TAST" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "Slett makro...\t" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "Sett inn dato/klokkeslett\tC-d" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "Formater paragraf\tM-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "Oppdater skjermen\tC-l" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "Makroer og interne kommandoer" - #: gtkedit/editoptions.c:37 msgid "None" msgstr "Ingen" @@ -1880,9 +1526,8 @@ msgid "Error initialising editor.\n" msgstr "Feil under initialisering av editor.\n" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "Hjelp" @@ -1923,121 +1568,29 @@ "avblyter\n" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "еpne/Last" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "Last en annen/ny fil" - -#: gtkedit/gtkedit.c:1292 -msgid "New" -msgstr "Ny" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "TЬm redigeringsbufferen" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "Lagre redigeringsbufferen til filnavn" - -#: gtkedit/gtkedit.c:1299 -msgid "Save As" -msgstr "Lagre som" - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "Lagre redigeringsbufferen som filnavn" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert File" msgstr "Sett inn fil" -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert text from a file" msgstr "Sett inn tekst fra en fil" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "Copy to file" msgstr "Kopier til fil" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "kopier en blokk til en fil" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "Avslutt" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "Avslutt editor" - -#: gtkedit/gtkedit.c:1318 -msgid "Copy selection to clipboard" -msgstr "Kopier valg til utklippstavle" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut" -msgstr "Klipp ut" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut selection to clipboard" -msgstr "Klipp ut valg til utklippstavle" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "Lim inn" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste clipboard" -msgstr "Lim in utklippstavle" - -#: gtkedit/gtkedit.c:1328 -msgid "Undo" -msgstr "Angre" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "GЕ tilbake i tid et tastetrykk" - -#: gtkedit/gtkedit.c:1336 -msgid "Find" -msgstr "Finn" - #: gtkedit/gtkedit.c:1336 -msgid "Find string/regular expression" -msgstr "Finn streng/vanlig uttrykk" - -#: gtkedit/gtkedit.c:1339 -msgid "Find again" -msgstr "Finn igjen" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "Gjenta siste sЬk" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 msgid "Search/Replace" msgstr "SЬk/Erstatt" -#: gtkedit/gtkedit.c:1342 -msgid "Find and replace text/regular expressions" -msgstr "Finn og erstatt tekst/vanlige uttrykk" - -#: gtkedit/gtkedit.c:1351 -msgid "About..." -msgstr "Om..." - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "Info om Mcedit" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "Fil" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 msgid " Load syntax file " msgstr " Les syntaksfil " @@ -2400,6 +1953,10 @@ msgid " Permission " msgstr " Rettighet " +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " Fil " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "Bruk SPACE for Е endre" @@ -2609,16 +2166,10 @@ " panelene kan ikke slЕs av og pЕ. " #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"Skriv `exit' for Е gЕ tilbake til Midnight Commander\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" +msgstr "Skriv `exit' for Е gЕ tilbake til Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" @@ -2627,92 +2178,92 @@ " Kunne ikke kjЬre stat pЕ %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr " Lenke " -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr " til:" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr " lenke: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr " symlink: %s " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr " Symlinken " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr " peker til:" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr " Rediger symlink " -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr " rediger symlink: %s " -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr " Lag symbolsk lenke " -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr " Relativ symlink " -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr " relativ symlink: %s " -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " Skriv inn maskinnavn (F1 for detaljer): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr " Kunne ikke skifte katalog til %s " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " Lenke til en fjern maskin " -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " FTP til maskin " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr " Oppsett av kontaktens kilderuting" -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr " Skriv inn vertsnavnet som skal brukes som kilderutingshop: " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr " Vertsnavn " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr " Feil under oppslag av IP-adresse " -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr " Gjenopprett filer pЕ et ext2 filsystem " -#: src/cmd.c:1317 +#: src/cmd.c:1319 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -2720,11 +2271,11 @@ " Skriv inn enhet (uten /dev/) som det skal gjenopprettes\n" " filer pЕ: (F1 for detaljer)" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Oppsett lagret til ~/" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " Oppsett " @@ -3351,6 +2902,10 @@ msgid " Background process: Recursive Delete " msgstr " Bakgrunnsprosess: Rekursiv sletting " +#: src/filegui.c:404 +msgid "File" +msgstr "Fil" + #: src/filegui.c:425 msgid "Count" msgstr "Tall" @@ -4249,6 +3804,10 @@ msgid "&Configuration..." msgstr "Konfigurasjon..." +#: src/main.c:1302 +msgid "&Layout..." +msgstr "Utseende." + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "bekreftelse..." @@ -5202,7 +4761,7 @@ msgid "Inconsistent tar archive" msgstr "Ukonsistent tar-arkiv" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" @@ -5212,3 +4771,326 @@ "Hmm,...\n" "%s\n" "ser ikke ut som et tar-arkiv." + +#~ msgid " Word wrap " +#~ msgstr " Ordbryting " + +#~ msgid " Enter line length, 0 for off: " +#~ msgstr " Skriv inn linjelengden, 0 for av: " + +#~ msgid " About " +#~ msgstr " Om " + +#~ msgid "" +#~ "\n" +#~ " Cooledit v2.1\n" +#~ "\n" +#~ " Copyright (C) 1996 the Free Software Foundation\n" +#~ "\n" +#~ " A user friendly text editor written\n" +#~ " for the Midnight Commander.\n" +#~ msgstr "" +#~ "\n" +#~ " Cooledit v2.1\n" +#~ "\n" +#~ " Copyright (C) 1996 the Free Software Foundation\n" +#~ "\n" +#~ " En brukervennlig tekst editor skrevet\n" +#~ " for Midnight Commander.\n" + +#~ msgid "&Open/load... C-o" +#~ msgstr "&еpne/laste... C-o" + +#~ msgid "&New C-n" +#~ msgstr "&Ny C-n" + +#~ msgid "&Save F2" +#~ msgstr "&Lagre F2" + +#~ msgid "save &As... F12" +#~ msgstr "l&Agre som... F12" + +#~ msgid "&Insert file... F15" +#~ msgstr "sett &Inn fil... F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "kopier til &Fil...C-f" + +#~ msgid "a&Bout... " +#~ msgstr "Om " + +#~ msgid "&Quit F10" +#~ msgstr "avslutt F10" + +#~ msgid "&New C-x k" +#~ msgstr "&Ny C-x k" + +#~ msgid "copy to &File... " +#~ msgstr "kopier til &Fil... " + +#~ msgid "&Toggle Mark F3" +#~ msgstr "slЕ av/pЕ merking F3" + +#~ msgid "&Mark Columns S-F3" +#~ msgstr "&Merk kolonner S-F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "slЕ av/pЕ sett inn/overskriv Ins" + +#~ msgid "&Copy F5" +#~ msgstr "Kopier F5" + +#~ msgid "&Move F6" +#~ msgstr "Flytt F6" + +#~ msgid "&Delete F8" +#~ msgstr "Slett F8" + +#~ msgid "&Undo C-u" +#~ msgstr "Angre C-u" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "&Begynnelsen C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "Slutt C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "SЬk... F7" + +#~ msgid "search &Again F17" +#~ msgstr "sЬk igjen F17" + +#~ msgid "&Replace... F4" +#~ msgstr "Erstatt... F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "GЕ til linje... M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "sett inn &Literal... C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "Oppdater skjermen C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "&Start makroinnspilling C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "stopp makroinnspilling...C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "KjЬr makro... C-a, TAST" + +#~ msgid "delete macr&O... " +#~ msgstr "slett makro... " + +#~ msgid "insert &Date/time " +#~ msgstr "sett inn dato/klokke " + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "formater p&Aragraf M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "'ispell' stavekontroll C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "sor&Ter... M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "'indent' C formatering F19" + +#~ msgid "&Mail... " +#~ msgstr "Send... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "KjЬr makro... C-x e, TAST" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "'ispell' stavekontroll M-$" + +#~ msgid "&General... " +#~ msgstr "Generelt... " + +#~ msgid "&Save mode..." +#~ msgstr "Lagringsmodus..." + +#~ msgid " Edit " +#~ msgstr " Rediger " + +#~ msgid " Sear/Repl " +#~ msgstr " SЬk/Erstatt " + +#~ msgid " Command " +#~ msgstr " Kommando " + +#~ msgid " Options " +#~ msgstr " Alternativer " + +#~ msgid "Open...\tC-o" +#~ msgstr "еpne...\tC-o" + +#~ msgid "New\tC-n" +#~ msgstr "Ny\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "Lagre\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "Lagre som...\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "Sett inn fil...\tF15" + +#~ msgid "Copy to file...\tC-f" +#~ msgstr "Kopier til fil...\tC-f" + +#~ msgid "Disk operations" +#~ msgstr "Diskoperasjoner" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "SlЕ av/pЕ marker\tF3" + +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "SlЕ av/pЕ marker kolonner\tC-b" + +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "SlЕ av/pЕ overskriv\tIns" + +#~ msgid "Copy block to cursor\tF5" +#~ msgstr "Kopier blokk til markЬren\tF5" + +#~ msgid "Move block to cursor\tF6" +#~ msgstr "Flytt blokk til markЬren\tF6" + +#~ msgid "Delete block\tF8/C-Del" +#~ msgstr "Slett blokk\tF8/C-Del" + +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr "Kopier blokk til utklippstavle\tC-Ins" + +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr "Klipp ut blokk til utklippstavle\tS-Del" + +#~ msgid "Paste block from clipbrd\tS-Ins" +#~ msgstr "Lim inn blokk fra utklippstavlen\tS-Ins" + +#~ msgid "Selection history\tM-Ins" +#~ msgstr "Utvalgshistorikk\tM-Ins" + +#~ msgid "Undo\tC-BackSpace" +#~ msgstr "Angre\tC-Tilbake" + +#~ msgid "Manipulating blocks of text" +#~ msgstr "Manipulering av tekstblokker" + +#~ msgid " Srch/Replce " +#~ msgstr " SЬk/Erstatt " + +#~ msgid "Search...\tF7" +#~ msgstr "SЬk...\tF7" + +#~ msgid "Search again\tF17" +#~ msgstr "SЬk igjen\tF17" + +#~ msgid "Replace...\tF4" +#~ msgstr "Erstatt...\tF4" + +#~ msgid "Replace again\tF14" +#~ msgstr "Erstatt igjen\tF14" + +#~ msgid "Search for and replace text" +#~ msgstr "SЬk etter og erstatt tekst" + +#~ msgid "Goto line...\tM-l" +#~ msgstr "GЕ til linje...\tM-l" + +#~ msgid "Start record macro\tC-r" +#~ msgstr "Start makroinnspilling\tC-r" + +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "Avslutt makroinnspilling...\tC-r" + +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "KjЬr makro...\tC-a, TAST" + +#~ msgid "Delete macro...\t" +#~ msgstr "Slett makro...\t" + +#~ msgid "Insert date/time\tC-d" +#~ msgstr "Sett inn dato/klokkeslett\tC-d" + +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Formater paragraf\tM-p" + +#~ msgid "Refresh display\tC-l" +#~ msgstr "Oppdater skjermen\tC-l" + +#~ msgid "Macros and internal commands" +#~ msgstr "Makroer og interne kommandoer" + +#~ msgid "Open/Load" +#~ msgstr "еpne/Last" + +#~ msgid "Load a different/new file" +#~ msgstr "Last en annen/ny fil" + +#~ msgid "New" +#~ msgstr "Ny" + +#~ msgid "Save the current edit buffer to filename" +#~ msgstr "Lagre redigeringsbufferen til filnavn" + +#~ msgid "Save As" +#~ msgstr "Lagre som" + +#~ msgid "Save the current edit buffer as filename" +#~ msgstr "Lagre redigeringsbufferen som filnavn" + +#~ msgid "Exit" +#~ msgstr "Avslutt" + +#~ msgid "Quit editor" +#~ msgstr "Avslutt editor" + +#~ msgid "Copy selection to clipboard" +#~ msgstr "Kopier valg til utklippstavle" + +#~ msgid "Cut" +#~ msgstr "Klipp ut" + +#~ msgid "Cut selection to clipboard" +#~ msgstr "Klipp ut valg til utklippstavle" + +#~ msgid "Paste" +#~ msgstr "Lim inn" + +#~ msgid "Paste clipboard" +#~ msgstr "Lim in utklippstavle" + +#~ msgid "Undo" +#~ msgstr "Angre" + +#~ msgid "Go back in time one key press" +#~ msgstr "GЕ tilbake i tid et tastetrykk" + +#~ msgid "Find" +#~ msgstr "Finn" + +#~ msgid "Find string/regular expression" +#~ msgstr "Finn streng/vanlig uttrykk" + +#~ msgid "Find again" +#~ msgstr "Finn igjen" + +#~ msgid "Repeat most recent search" +#~ msgstr "Gjenta siste sЬk" + +#~ msgid "Find and replace text/regular expressions" +#~ msgstr "Finn og erstatt tekst/vanlige uttrykk" + +#~ msgid "About..." +#~ msgstr "Om..." + +#~ msgid "Info about Mcedit" +#~ msgstr "Info om Mcedit" Binary files old/mc-4.5.12/po/pl.gmo and new/mc-4.5.13/po/pl.gmo differ diff -ruN old/mc-4.5.12/po/pl.po new/mc-4.5.13/po/pl.po --- old/mc-4.5.12/po/pl.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/pl.po Wed Feb 10 19:41:21 1999 @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.5.1\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: 1998-11-20 03:08+0200\n" "Last-Translator: Tomasz KЁoczko \n" "Language-Team: Polish \n" @@ -163,22 +163,22 @@ msgid "Command: " msgstr "Komenda:" -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 #, fuzzy msgid "Set Filter" msgstr " Filtr " -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 #, fuzzy msgid "Show all files" msgstr "mieszaj wszystkie pliki" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -186,39 +186,39 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr " OtwСrz przy u©yciu..." -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "Wprowad╪ dodatowe argumenty:" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 #, fuzzy msgid "Warning" msgstr " Ostrze©enie " -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 #, fuzzy msgid "Home directory" msgstr "katalog" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -291,8 +291,8 @@ msgid "Replace it?" msgstr " Zast╠p " -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "Kopiuj" @@ -383,28 +383,28 @@ msgid " Done." msgstr "Nic" -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 #, fuzzy msgid "_Move here" msgstr " Przenie╤ " -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 #, fuzzy msgid "_Copy here" msgstr " Kopiuj " -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 #, fuzzy msgid "_Link here" msgstr " Dowi╠zanie " -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 #, fuzzy msgid "Cancel drag" msgstr " Zaniechaj " #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, fuzzy, c-format msgid "" "Could not stat %s\n" @@ -673,52 +673,51 @@ msgid "File/New/Directory..." msgstr "Nowy katalog..." -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "WЁa╤ciwo╤ci" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "OtwСrz" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "OtwСrz przy u©yciu" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "Podgl╠d" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "Podgl╠d niefiltrowany" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "Edycja" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "Dowi╠zanie..." -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "Dowi╠zanie symboliczne..." -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "Edytuj dowi╠zanie symboliczne..." -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "Kopiuj..." -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "UsuЯ" @@ -794,7 +793,7 @@ msgstr "ftpfs timeout dla katalogu cache: " #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +msgid "Allow customization of icons in icon view" msgstr "" #: gnome/gprefs.c:176 @@ -1072,7 +1071,7 @@ msgid "Go to your home directory" msgstr "katalog" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 #, fuzzy msgid "Location:" msgstr "PoЁo©enie: %Xh:%Xh" @@ -1312,8 +1311,7 @@ msgid " Save file " msgstr " Zachowaj plik " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr "Zachowaj" @@ -1599,354 +1597,6 @@ msgid " Mail " msgstr " Poczta " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr " Zawijaj linie " - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr " Wpisz dЁugo╤Ф lini, 0 by wyЁ╠czyФ: " - -#: gtkedit/editmenu.c:69 -#, fuzzy -msgid " About " -msgstr "O programie" - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "&OtwСrz/zaЁaduj..." - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "&Nowy C-n" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "&Zachowaj F2" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "zachowaj &Jako... F12" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "&Wstaw plik... F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "skopiuj do &Pliku... C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "o programie... " - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "&Wyj╤cie" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "&Nowy" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "skopiuj do &Pliku" - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "&WЁ╠cz zaznaczanie F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "Zaznacz &kolumny S-F3" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "wЁ╠cz &Wstaw/nadpisz Ins" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "&Kopiuj F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "&PrzesuЯ F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "&UsuЯ F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "&Cofnij C-u" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "&Pocz╠tek C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "&Koniec C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "&Szukaj... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "szukaj &Ponownie F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "&Zast╠p... F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "&Id╪ do linii... M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "wstaw &LiteraЁ... C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "&Od╤wierz ekran C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "&Rozpocznij nagrywaФ makro C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "&ZakoЯcz nagrywaФ makro... C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "&Wykonaj makro... C-a, KLAWISZ" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "usuЯ makr&O... " - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "wstaw &DatЙ/czas\t " - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "formatuj &Akapit M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "'ispell' s&Prawdzanie pisowni C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "sor&Tuj... M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "'indent' &C Formatuj╠cy F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "&Poczta... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "&Wykonaj makro... C-x e, KLUCZ" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "'ispell' sprawdzanie &Pisowni M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "&Generalne... " - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "tryb zapi&Su..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "wyg&L╠d..." - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " Plik " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " Edycja " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -msgid " Sear/Repl " -msgstr " Szuk/Zast " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " Komendy " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -msgid " Options " -msgstr " Opcje " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "OtwСrz...\tC-o" - -#: gtkedit/editmenu.c:393 -msgid "New\tC-n" -msgstr "Nowy\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "Zachowaj\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "Zachowaj jako...\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "Wstaw plik...\tF15" - -#: gtkedit/editmenu.c:399 -msgid "Copy to file...\tC-f" -msgstr "Kopiuj do pliku...\tC-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "Operacje na dysku" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "WЁ╠cz zaznaczanie\tF3" - -#: gtkedit/editmenu.c:409 -#, fuzzy -msgid "Toggle mark columns\tC-b" -msgstr "WЁ╠cz zaznaczanie\tF3" - -#: gtkedit/editmenu.c:411 -msgid "Toggle insert/overwrite\tIns" -msgstr "WЁ╠cz wstawianie/nadpisywanie\tIns" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "Kopiuj blok do kursora\tF5" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "Przenie╤ blok do kursora\tF6" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "UsuЯ blok\tF8/C-Del" - -#: gtkedit/editmenu.c:417 -msgid "Copy block to clipbrd\tC-Ins" -msgstr "Kopiuj blok do schowka\tC-Ins" - -#: gtkedit/editmenu.c:418 -msgid "Cut block to clipbrd\tS-Del" -msgstr "Wytnij blok do schowka\tS-Del" - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "Wklej blok ze schowka\tS-Ins" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "WybСr historii\tM-Ins" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "Cofnij\tC-BackSpace" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "Manipulacja blokami tekstu" - -#: gtkedit/editmenu.c:430 -msgid " Srch/Replce " -msgstr " Szuk/Zast╠p " - -#: gtkedit/editmenu.c:431 -msgid "Search...\tF7" -msgstr "Szukaj...\tF7" - -#: gtkedit/editmenu.c:432 -msgid "Search again\tF17" -msgstr "Szukaj ponownie\tF17" - -#: gtkedit/editmenu.c:433 -msgid "Replace...\tF4" -msgstr "Zast╠p...\tF4" - -#: gtkedit/editmenu.c:434 -msgid "Replace again\tF14" -msgstr "Zast╠p ponownie\tF14" - -#. Tool hint -#: gtkedit/editmenu.c:437 -msgid "Search for and replace text" -msgstr "Szukaj i zast╠p tekst" - -#: gtkedit/editmenu.c:443 -msgid "Goto line...\tM-l" -msgstr "Id╪ do linii...\tM-l" - -#: gtkedit/editmenu.c:445 -msgid "Start record macro\tC-r" -msgstr "Rozpocznij nagrywaФ makro\tC-r" - -#: gtkedit/editmenu.c:446 -msgid "Finish record macro...\tC-r" -msgstr "ZakoЯcz nagrywaФ makro...\tC-r" - -#: gtkedit/editmenu.c:447 -msgid "Execute macro...\tC-a, KEY" -msgstr "Wykonaj makro...\tC-a, KLUCZ" - -#: gtkedit/editmenu.c:448 -msgid "Delete macro...\t" -msgstr "Skasuj makro...\t" - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "Wstaw datЙ/czas\tC-d" - -#: gtkedit/editmenu.c:451 -msgid "Format paragraph\tM-p" -msgstr "Format akapitСw\tM-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "Makra i komendy wewnЙtrzne" - #: gtkedit/editoptions.c:37 #, fuzzy msgid "None" @@ -1975,9 +1625,8 @@ msgid "Error initialising editor.\n" msgstr "BЁ╠d przy inicjowaniu edytora.\n" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "Pomoc" @@ -2016,121 +1665,29 @@ msgstr "" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "OtwС©/ZaЁaduj" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "" - -#: gtkedit/gtkedit.c:1292 -msgid "New" -msgstr "Nowy" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "Wyczy╤Ф bufor edycji" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "Zachowaj bierz╠cy bufor edycji do pliku o nazwie" - -#: gtkedit/gtkedit.c:1299 -msgid "Save As" -msgstr "Zachowaj jako" - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "Zachowaj bierz╠cy bufor edycji jako plik o nazwie" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert File" msgstr "Wstaw plik" -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 msgid "Insert text from a file" msgstr "Wstaw tekst z pliku" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "Copy to file" msgstr "Kopiuj do pliku" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "kopiuj blok do pliku" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "Wyj╤cie" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "" - -#: gtkedit/gtkedit.c:1318 -msgid "Copy selection to clipboard" -msgstr "Kopiuj zaznaczenie do schowaka" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut" -msgstr "Wytnij" - -#: gtkedit/gtkedit.c:1321 -msgid "Cut selection to clipboard" -msgstr "Wytnij zaznaczenie do schowka" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "Wstaw" - -#: gtkedit/gtkedit.c:1324 -msgid "Paste clipboard" -msgstr "Wstaw schowek" - -#: gtkedit/gtkedit.c:1328 -msgid "Undo" -msgstr "Cofnij" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -msgid "Find" -msgstr "Znajd╪" - #: gtkedit/gtkedit.c:1336 -msgid "Find string/regular expression" -msgstr "" - -#: gtkedit/gtkedit.c:1339 -msgid "Find again" -msgstr "Znajd╪ ponownie" - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 msgid "Search/Replace" msgstr "Znajd╪/Zast╠p" -#: gtkedit/gtkedit.c:1342 -msgid "Find and replace text/regular expressions" -msgstr "" - -#: gtkedit/gtkedit.c:1351 -msgid "About..." -msgstr "O..." - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "Plik" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 msgid " Load syntax file " msgstr " ZaЁaduj plik ze skЁadni╠ " @@ -2494,6 +2051,10 @@ msgid " Permission " msgstr " Atrybuty " +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " Plik " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "U©yj spacji do zmiany" @@ -2704,16 +2265,10 @@ " panele nie mog╠ byФ przeЁ╠czane. " #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"Wpisz `Exit' by wrСciФ do Midnight Commandera\n" -"\r\n" -"\r" +msgid "Type `exit' to return to the Midnight Commander" +msgstr "Wpisz `Exit' by wrСciФ do Midnight Commandera" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" @@ -2722,102 +2277,102 @@ " Nie mogЙ zlokalizowaФ %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr " Dowi╠zanie " -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr " do: " -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr " dowi╠zanie: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr " dowi╠zanie symboliczne: %s " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr " Dowi╠zanie symboliczne " -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr " wskazuje na:" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr " Edycja dowi╠zania symbolicznego " -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr " edytuj dowi╠zanie symboliczne: %s " -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr " Dowi╠zanie symboliczne " -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr " Relatywne dowi╠zanie symboliczne " -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr " relatywne dowi╠zanie symboliczne: %s " -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " Podaj nazwe komputera (F1 po szczegСЁy): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr " Nie mogЙ zmieniФ katalogu na %s " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " Link na zdaln╠ maszynЙ " -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " FTP na maszynЙ " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr " Ustawienia ╪rСdЁowego socket routingu " -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr " Wpisz nazwЙ hosta ktСry ma byФ hopem dla ╪rСdЁowego routingu: " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr " Nazwa hosta " -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr " BЁ╠d podczas wyszukiwania adresu IP " -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr " Odzyskaj pliki na systemie plikСw ext2 " -#: src/cmd.c:1317 +#: src/cmd.c:1319 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Ustawienia zapisane w ~/" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " Ustawienia " @@ -3455,6 +3010,10 @@ msgid " Background process: Recursive Delete " msgstr " Proces z tЁa: Kasowanie Rekursywne " +#: src/filegui.c:404 +msgid "File" +msgstr "Plik" + #: src/filegui.c:425 msgid "Count" msgstr "Ilo╤Ф" @@ -4347,6 +3906,10 @@ msgid "&Configuration..." msgstr "&Konfiguracja..." +#: src/main.c:1302 +msgid "&Layout..." +msgstr "wyg&L╠d..." + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "p&Otwierdzenia..." @@ -5293,13 +4856,297 @@ msgid "Inconsistent tar archive" msgstr "" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" "%s\n" "doesn't look like a tar archive." msgstr "" + +#~ msgid " Word wrap " +#~ msgstr " Zawijaj linie " + +#~ msgid " Enter line length, 0 for off: " +#~ msgstr " Wpisz dЁugo╤Ф lini, 0 by wyЁ╠czyФ: " + +#, fuzzy +#~ msgid " About " +#~ msgstr "O programie" + +#~ msgid "&Open/load... C-o" +#~ msgstr "&OtwСrz/zaЁaduj..." + +#~ msgid "&New C-n" +#~ msgstr "&Nowy C-n" + +#~ msgid "&Save F2" +#~ msgstr "&Zachowaj F2" + +#~ msgid "save &As... F12" +#~ msgstr "zachowaj &Jako... F12" + +#~ msgid "&Insert file... F15" +#~ msgstr "&Wstaw plik... F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "skopiuj do &Pliku... C-f" + +#~ msgid "a&Bout... " +#~ msgstr "o programie... " + +#~ msgid "&Quit F10" +#~ msgstr "&Wyj╤cie" + +#~ msgid "&New C-x k" +#~ msgstr "&Nowy" + +#~ msgid "copy to &File... " +#~ msgstr "skopiuj do &Pliku" + +#~ msgid "&Toggle Mark F3" +#~ msgstr "&WЁ╠cz zaznaczanie F3" + +#~ msgid "&Mark Columns S-F3" +#~ msgstr "Zaznacz &kolumny S-F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "wЁ╠cz &Wstaw/nadpisz Ins" + +#~ msgid "&Copy F5" +#~ msgstr "&Kopiuj F5" + +#~ msgid "&Move F6" +#~ msgstr "&PrzesuЯ F6" + +#~ msgid "&Delete F8" +#~ msgstr "&UsuЯ F8" + +#~ msgid "&Undo C-u" +#~ msgstr "&Cofnij C-u" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "&Pocz╠tek C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "&Koniec C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "&Szukaj... F7" + +#~ msgid "search &Again F17" +#~ msgstr "szukaj &Ponownie F17" + +#~ msgid "&Replace... F4" +#~ msgstr "&Zast╠p... F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "&Id╪ do linii... M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "wstaw &LiteraЁ... C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "&Od╤wierz ekran C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "&Rozpocznij nagrywaФ makro C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "&ZakoЯcz nagrywaФ makro... C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "&Wykonaj makro... C-a, KLAWISZ" + +#~ msgid "delete macr&O... " +#~ msgstr "usuЯ makr&O... " + +#~ msgid "insert &Date/time " +#~ msgstr "wstaw &DatЙ/czas\t " + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "formatuj &Akapit M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "'ispell' s&Prawdzanie pisowni C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "sor&Tuj... M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "'indent' &C Formatuj╠cy F19" + +#~ msgid "&Mail... " +#~ msgstr "&Poczta... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "&Wykonaj makro... C-x e, KLUCZ" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "'ispell' sprawdzanie &Pisowni M-$" + +#~ msgid "&General... " +#~ msgstr "&Generalne... " + +#~ msgid "&Save mode..." +#~ msgstr "tryb zapi&Su..." + +#~ msgid " Edit " +#~ msgstr " Edycja " + +#~ msgid " Sear/Repl " +#~ msgstr " Szuk/Zast " + +#~ msgid " Command " +#~ msgstr " Komendy " + +#~ msgid " Options " +#~ msgstr " Opcje " + +#~ msgid "Open...\tC-o" +#~ msgstr "OtwСrz...\tC-o" + +#~ msgid "New\tC-n" +#~ msgstr "Nowy\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "Zachowaj\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "Zachowaj jako...\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "Wstaw plik...\tF15" + +#~ msgid "Copy to file...\tC-f" +#~ msgstr "Kopiuj do pliku...\tC-f" + +#~ msgid "Disk operations" +#~ msgstr "Operacje na dysku" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "WЁ╠cz zaznaczanie\tF3" + +#, fuzzy +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "WЁ╠cz zaznaczanie\tF3" + +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "WЁ╠cz wstawianie/nadpisywanie\tIns" + +#~ msgid "Copy block to cursor\tF5" +#~ msgstr "Kopiuj blok do kursora\tF5" + +#~ msgid "Move block to cursor\tF6" +#~ msgstr "Przenie╤ blok do kursora\tF6" + +#~ msgid "Delete block\tF8/C-Del" +#~ msgstr "UsuЯ blok\tF8/C-Del" + +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr "Kopiuj blok do schowka\tC-Ins" + +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr "Wytnij blok do schowka\tS-Del" + +#~ msgid "Paste block from clipbrd\tS-Ins" +#~ msgstr "Wklej blok ze schowka\tS-Ins" + +#~ msgid "Selection history\tM-Ins" +#~ msgstr "WybСr historii\tM-Ins" + +#~ msgid "Undo\tC-BackSpace" +#~ msgstr "Cofnij\tC-BackSpace" + +#~ msgid "Manipulating blocks of text" +#~ msgstr "Manipulacja blokami tekstu" + +#~ msgid " Srch/Replce " +#~ msgstr " Szuk/Zast╠p " + +#~ msgid "Search...\tF7" +#~ msgstr "Szukaj...\tF7" + +#~ msgid "Search again\tF17" +#~ msgstr "Szukaj ponownie\tF17" + +#~ msgid "Replace...\tF4" +#~ msgstr "Zast╠p...\tF4" + +#~ msgid "Replace again\tF14" +#~ msgstr "Zast╠p ponownie\tF14" + +#~ msgid "Search for and replace text" +#~ msgstr "Szukaj i zast╠p tekst" + +#~ msgid "Goto line...\tM-l" +#~ msgstr "Id╪ do linii...\tM-l" + +#~ msgid "Start record macro\tC-r" +#~ msgstr "Rozpocznij nagrywaФ makro\tC-r" + +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "ZakoЯcz nagrywaФ makro...\tC-r" + +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "Wykonaj makro...\tC-a, KLUCZ" + +#~ msgid "Delete macro...\t" +#~ msgstr "Skasuj makro...\t" + +#~ msgid "Insert date/time\tC-d" +#~ msgstr "Wstaw datЙ/czas\tC-d" + +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Format akapitСw\tM-p" + +#~ msgid "Macros and internal commands" +#~ msgstr "Makra i komendy wewnЙtrzne" + +#~ msgid "Open/Load" +#~ msgstr "OtwС©/ZaЁaduj" + +#~ msgid "New" +#~ msgstr "Nowy" + +#~ msgid "Save the current edit buffer to filename" +#~ msgstr "Zachowaj bierz╠cy bufor edycji do pliku o nazwie" + +#~ msgid "Save As" +#~ msgstr "Zachowaj jako" + +#~ msgid "Save the current edit buffer as filename" +#~ msgstr "Zachowaj bierz╠cy bufor edycji jako plik o nazwie" + +#~ msgid "Exit" +#~ msgstr "Wyj╤cie" + +#~ msgid "Copy selection to clipboard" +#~ msgstr "Kopiuj zaznaczenie do schowaka" + +#~ msgid "Cut" +#~ msgstr "Wytnij" + +#~ msgid "Cut selection to clipboard" +#~ msgstr "Wytnij zaznaczenie do schowka" + +#~ msgid "Paste" +#~ msgstr "Wstaw" + +#~ msgid "Paste clipboard" +#~ msgstr "Wstaw schowek" + +#~ msgid "Undo" +#~ msgstr "Cofnij" + +#~ msgid "Find" +#~ msgstr "Znajd╪" + +#~ msgid "Find again" +#~ msgstr "Znajd╪ ponownie" + +#~ msgid "About..." +#~ msgstr "O..." #~ msgid "Opens a terminal" #~ msgstr "Otwiera terminal" Binary files old/mc-4.5.12/po/ru.gmo and new/mc-4.5.13/po/ru.gmo differ diff -ruN old/mc-4.5.12/po/ru.po new/mc-4.5.13/po/ru.po --- old/mc-4.5.12/po/ru.po Sun Feb 7 02:53:43 1999 +++ new/mc-4.5.13/po/ru.po Wed Feb 10 19:41:21 1999 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mc VERSION\n" -"POT-Creation-Date: 1999-02-03 21:58-0500\n" +"POT-Creation-Date: 1999-02-08 08:12-0500\n" "PO-Revision-Date: 1998-04-28 12:50+0300\n" "Last-Translator: Alex Tkachenko \n" "Language-Team: russian \n" @@ -157,22 +157,22 @@ msgid "Command: " msgstr "Команда" -#: gnome/gcmd.c:557 +#: gnome/gcmd.c:574 #, fuzzy msgid "Set Filter" msgstr " Фильтр " -#: gnome/gcmd.c:562 gnome/gcmd.c:603 gnome/gcmd.c:608 gnome/gcmd.c:612 -#: gnome/gscreen.c:2489 +#: gnome/gcmd.c:579 gnome/gcmd.c:620 gnome/gcmd.c:625 gnome/gcmd.c:629 +#: gnome/gscreen.c:2484 #, fuzzy msgid "Show all files" msgstr "Смешивать &файлы/каталоги" -#: gnome/gcmd.c:569 +#: gnome/gcmd.c:586 msgid "." msgstr "" -#: gnome/gcmd.c:585 +#: gnome/gcmd.c:602 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -180,39 +180,39 @@ "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:587 +#: gnome/gcmd.c:604 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:644 gnome/gpopup.c:49 +#: gnome/gcmd.c:661 gnome/gpopup.c:49 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:645 gnome/gpopup.c:50 +#: gnome/gcmd.c:662 gnome/gpopup.c:50 msgid "Enter extra arguments:" msgstr "" -#: gnome/gdesktop.c:347 gnome/gdesktop.c:1485 +#: gnome/gdesktop.c:350 gnome/gdesktop.c:1553 #, fuzzy msgid "Warning" msgstr " Предупреждение " -#: gnome/gdesktop.c:348 +#: gnome/gdesktop.c:351 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1451 +#: gnome/gdesktop.c:1519 msgid "Trashcan" msgstr "" #. Create the link to the user's home directory so that he will have an icon -#: gnome/gdesktop.c:1481 +#: gnome/gdesktop.c:1549 #, fuzzy msgid "Home directory" msgstr "каталог" -#: gnome/gdesktop.c:1486 +#: gnome/gdesktop.c:1554 #, c-format msgid "Could not symlink %s to %s; will not have initial desktop icons." msgstr "" @@ -284,8 +284,8 @@ msgid "Replace it?" msgstr " Заменить " -#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 gtkedit/gtkedit.c:1318 -#: src/file.c:784 src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 +#: gnome/gdialogs.c:532 gtkedit/editwidget.c:1064 src/file.c:784 +#: src/screen.c:2288 src/screen.c:2318 src/tree.c:1024 msgid "Copy" msgstr "Копия" @@ -373,28 +373,28 @@ msgid " Done." msgstr "" -#: gnome/gdnd.c:50 +#: gnome/gdnd.c:51 #, fuzzy msgid "_Move here" msgstr " Перемещение " -#: gnome/gdnd.c:51 +#: gnome/gdnd.c:52 #, fuzzy msgid "_Copy here" msgstr " Копирование " -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 #, fuzzy msgid "_Link here" msgstr "Строка" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 #, fuzzy msgid "Cancel drag" msgstr " Прервать " #. FIXME: this error message sucks -#: gnome/gdnd.c:190 +#: gnome/gdnd.c:191 #, fuzzy, c-format msgid "" "Could not stat %s\n" @@ -655,52 +655,51 @@ msgid "File/New/Directory..." msgstr "каталог" -#: gnome/gpopup.c:215 gnome/gpopup.c:216 +#: gnome/gpopup.c:222 gnome/gpopup.c:223 msgid "Properties" msgstr "" -#: gnome/gpopup.c:218 gnome/gpopup.c:219 +#: gnome/gpopup.c:225 gnome/gpopup.c:226 msgid "Open" msgstr "" -#: gnome/gpopup.c:220 +#: gnome/gpopup.c:227 msgid "Open with" msgstr "" -#: gnome/gpopup.c:221 src/screen.c:2286 src/screen.c:2316 +#: gnome/gpopup.c:228 src/screen.c:2286 src/screen.c:2316 msgid "View" msgstr "" -#: gnome/gpopup.c:222 +#: gnome/gpopup.c:229 msgid "View unfiltered" msgstr "" -#: gnome/gpopup.c:223 gtkedit/gtkedit.c:1366 src/screen.c:2287 -#: src/screen.c:2317 src/view.c:1968 +#: gnome/gpopup.c:230 src/screen.c:2287 src/screen.c:2317 src/view.c:1968 msgid "Edit" msgstr "Правка" -#: gnome/gpopup.c:225 +#: gnome/gpopup.c:232 msgid "Link..." msgstr "" -#: gnome/gpopup.c:226 +#: gnome/gpopup.c:233 msgid "Symlink..." msgstr "" -#: gnome/gpopup.c:227 +#: gnome/gpopup.c:234 msgid "Edit symlink..." msgstr "" -#: gnome/gpopup.c:234 gnome/gpopup.c:245 +#: gnome/gpopup.c:241 gnome/gpopup.c:252 msgid "Move/rename..." msgstr "" -#: gnome/gpopup.c:235 gnome/gpopup.c:246 +#: gnome/gpopup.c:242 gnome/gpopup.c:253 msgid "Copy..." msgstr "" -#: gnome/gpopup.c:236 gnome/gpopup.c:248 gtkedit/editwidget.c:1067 +#: gnome/gpopup.c:243 gnome/gpopup.c:255 gtkedit/editwidget.c:1067 #: src/screen.c:2291 src/screen.c:2321 msgid "Delete" msgstr "" @@ -772,7 +771,7 @@ msgstr "" #: gnome/gprefs.c:167 -msgid "Allow customization of icons in panels" +msgid "Allow customization of icons in icon view" msgstr "" #: gnome/gprefs.c:176 @@ -1049,7 +1048,7 @@ msgid "Go to your home directory" msgstr "каталог" -#: gnome/gscreen.c:2438 +#: gnome/gscreen.c:2429 msgid "Location:" msgstr "" @@ -1287,8 +1286,7 @@ msgid " Save file " msgstr " Сохранить файл " -#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 gtkedit/gtkedit.c:1296 -#: src/view.c:1964 +#: gtkedit/editcmd.c:774 gtkedit/editwidget.c:1061 src/view.c:1964 msgid "Save" msgstr "Запись" @@ -1573,373 +1571,6 @@ msgid " Mail " msgstr " Почта " -#: gtkedit/editmenu.c:56 -msgid " Word wrap " -msgstr "" - -#. Not essential to translate -#: gtkedit/editmenu.c:58 -msgid " Enter line length, 0 for off: " -msgstr "" - -#: gtkedit/editmenu.c:69 -#, fuzzy -msgid " About " -msgstr "&Прервать" - -#: gtkedit/editmenu.c:70 -msgid "" -"\n" -" Cooledit v2.1\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" A user friendly text editor written\n" -" for the Midnight Commander.\n" -msgstr "" - -#: gtkedit/editmenu.c:118 gtkedit/editmenu.c:134 -msgid "&Open/load... C-o" -msgstr "&Открыть файл... C-o" - -#: gtkedit/editmenu.c:119 -msgid "&New C-n" -msgstr "&Новый файл C-n" - -#: gtkedit/editmenu.c:121 gtkedit/editmenu.c:137 -msgid "&Save F2" -msgstr "&Сохранить F2" - -#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 -msgid "save &As... F12" -msgstr "Сохранить &как... F12" - -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 -msgid "&Insert file... F15" -msgstr "&Вставить файл... F15" - -#: gtkedit/editmenu.c:125 -msgid "copy to &File... C-f" -msgstr "&Копировать в файл... C-f" - -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 -msgid "a&Bout... " -msgstr "Об &авторах..." - -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 -msgid "&Quit F10" -msgstr "Вы&ход F10" - -#: gtkedit/editmenu.c:135 -msgid "&New C-x k" -msgstr "&Новый файл C-x k" - -#: gtkedit/editmenu.c:141 -msgid "copy to &File... " -msgstr "&Копировать в файл... " - -#: gtkedit/editmenu.c:150 gtkedit/editmenu.c:167 -msgid "&Toggle Mark F3" -msgstr "&Выделение блока F3" - -#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 -msgid "&Mark Columns S-F3" -msgstr "" - -#: gtkedit/editmenu.c:153 gtkedit/editmenu.c:170 -msgid "toggle &Ins/overw Ins" -msgstr "&Режим вставки/замены Ins" - -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 -msgid "&Copy F5" -msgstr "&Копировать блок F5" - -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 -msgid "&Move F6" -msgstr "&Переместить блок F6" - -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 -msgid "&Delete F8" -msgstr "&Удалить блок F8" - -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 -msgid "&Undo C-u" -msgstr "&Откат операции C-u" - -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 -msgid "&Beginning C-PgUp" -msgstr "&Начало файла C-PgUp" - -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 -msgid "&End C-PgDn" -msgstr "Конец &файла C-PgDn" - -#: gtkedit/editmenu.c:184 gtkedit/editmenu.c:191 -msgid "&Search... F7" -msgstr "&Поиск... F7" - -#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 -msgid "search &Again F17" -msgstr "&Искать дальше F17" - -#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 -msgid "&Replace... F4" -msgstr "&Замена... F4" - -#: gtkedit/editmenu.c:198 gtkedit/editmenu.c:220 -msgid "&Goto line... M-l" -msgstr "&Перейти к строке M-l" - -#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:222 -msgid "insert &Literal... C-q" -msgstr "Вставить &литерал... C-q" - -#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:224 -msgid "&Refresh screen C-l" -msgstr "Пере&рисовать экран C-l" - -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:226 -msgid "&Start record macro C-r" -msgstr "&Начать запись макроса C-r" - -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 -msgid "&Finish record macro... C-r" -msgstr "&Окончить запись макроса... C-r" - -#: gtkedit/editmenu.c:206 -msgid "&Execute macro... C-a, KEY" -msgstr "&Выполнить макрос... C-a, KEY" - -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 -msgid "delete macr&O... " -msgstr "&Удалить макрос" - -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 -msgid "insert &Date/time " -msgstr "Вставить &Дату/время" - -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:233 -msgid "format p&Aragraph M-p" -msgstr "Форматировать &абзац M-p" - -#: gtkedit/editmenu.c:212 -msgid "'ispell' s&Pell check C-p" -msgstr "&Контроль орфографии C-p" - -#: gtkedit/editmenu.c:213 gtkedit/editmenu.c:235 -msgid "sor&T... M-t" -msgstr "&Сортировка M-t" - -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 -msgid "'indent' &C Formatter F19" -msgstr "&Форматировать С-программу F19" - -#: gtkedit/editmenu.c:215 -msgid "&Mail... " -msgstr "&Электронная почта... " - -#: gtkedit/editmenu.c:228 -msgid "&Execute macro... C-x e, KEY" -msgstr "&Выполнить макро... C-x e, KEY" - -#: gtkedit/editmenu.c:234 -msgid "'ispell' s&Pell check M-$" -msgstr "&Контроль орфографии M-$" - -#: gtkedit/editmenu.c:243 gtkedit/editmenu.c:252 -msgid "&General... " -msgstr "&Разное..." - -#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 -msgid "&Save mode..." -msgstr "Режим &сохранения..." - -#: gtkedit/editmenu.c:246 gtkedit/editmenu.c:255 src/main.c:1302 -msgid "&Layout..." -msgstr "&Внешний вид" - -#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:265 gtkedit/editmenu.c:274 gtkedit/editmenu.c:391 -#: src/chmod.c:164 src/chown.c:130 -msgid " File " -msgstr " Файл " - -#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:407 -msgid " Edit " -msgstr " Редактирование " - -#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 -#, fuzzy -msgid " Sear/Repl " -msgstr " Поиск " - -#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 gtkedit/editmenu.c:442 -msgid " Command " -msgstr " Команда " - -#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 -#, fuzzy -msgid " Options " -msgstr " Настройка " - -#: gtkedit/editmenu.c:392 -msgid "Open...\tC-o" -msgstr "Открыть...\tC-o" - -#: gtkedit/editmenu.c:393 -#, fuzzy -msgid "New\tC-n" -msgstr "Новый\tC-n" - -#: gtkedit/editmenu.c:395 -msgid "Save\tF2" -msgstr "Сохранить\tF2" - -#: gtkedit/editmenu.c:396 -msgid "Save as...\tF12" -msgstr "Сохранить как...\tF12" - -#: gtkedit/editmenu.c:398 -msgid "Insert file...\tF15" -msgstr "Вставить файл...\tF15" - -#: gtkedit/editmenu.c:399 -#, fuzzy -msgid "Copy to file...\tC-f" -msgstr "&Копировать в файл... C-f" - -#. Tool hint -#: gtkedit/editmenu.c:402 -msgid "Disk operations" -msgstr "Дисковые операции" - -#: gtkedit/editmenu.c:408 -msgid "Toggle mark\tF3" -msgstr "Выделение блока\tF3" - -#: gtkedit/editmenu.c:409 -#, fuzzy -msgid "Toggle mark columns\tC-b" -msgstr "Выделение блока\tF3" - -#: gtkedit/editmenu.c:411 -#, fuzzy -msgid "Toggle insert/overwrite\tIns" -msgstr "&Режим вставки/замены Ins" - -#: gtkedit/editmenu.c:413 -msgid "Copy block to cursor\tF5" -msgstr "" - -#: gtkedit/editmenu.c:414 -msgid "Move block to cursor\tF6" -msgstr "" - -#: gtkedit/editmenu.c:415 -msgid "Delete block\tF8/C-Del" -msgstr "" - -#: gtkedit/editmenu.c:417 -#, fuzzy -msgid "Copy block to clipbrd\tC-Ins" -msgstr " Скопировать в буфер " - -#: gtkedit/editmenu.c:418 -#, fuzzy -msgid "Cut block to clipbrd\tS-Del" -msgstr " Вырезать в буфер " - -#: gtkedit/editmenu.c:419 -msgid "Paste block from clipbrd\tS-Ins" -msgstr "" - -#: gtkedit/editmenu.c:420 -msgid "Selection history\tM-Ins" -msgstr "" - -#: gtkedit/editmenu.c:422 -msgid "Undo\tC-BackSpace" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:425 -msgid "Manipulating blocks of text" -msgstr "" - -#: gtkedit/editmenu.c:430 -#, fuzzy -msgid " Srch/Replce " -msgstr " Поиск " - -#: gtkedit/editmenu.c:431 -#, fuzzy -msgid "Search...\tF7" -msgstr "Поиск" - -#: gtkedit/editmenu.c:432 -#, fuzzy -msgid "Search again\tF17" -msgstr "&Искать дальше F17" - -#: gtkedit/editmenu.c:433 -#, fuzzy -msgid "Replace...\tF4" -msgstr "&Замена... F4" - -#: gtkedit/editmenu.c:434 -#, fuzzy -msgid "Replace again\tF14" -msgstr "Заменить все" - -#. Tool hint -#: gtkedit/editmenu.c:437 -#, fuzzy -msgid "Search for and replace text" -msgstr " Введите текст для замены: " - -#: gtkedit/editmenu.c:443 -#, fuzzy -msgid "Goto line...\tM-l" -msgstr "&Перейти к строке M-l" - -#: gtkedit/editmenu.c:445 -#, fuzzy -msgid "Start record macro\tC-r" -msgstr "&Начать запись макроса C-r" - -#: gtkedit/editmenu.c:446 -#, fuzzy -msgid "Finish record macro...\tC-r" -msgstr "&Окончить запись макроса... C-r" - -#: gtkedit/editmenu.c:447 -#, fuzzy -msgid "Execute macro...\tC-a, KEY" -msgstr "&Выполнить макрос... C-a, KEY" - -#: gtkedit/editmenu.c:448 -#, fuzzy -msgid "Delete macro...\t" -msgstr " Удалить макрос " - -#: gtkedit/editmenu.c:450 -msgid "Insert date/time\tC-d" -msgstr "" - -#: gtkedit/editmenu.c:451 -#, fuzzy -msgid "Format paragraph\tM-p" -msgstr "Форматировать &абзац M-p" - -#: gtkedit/editmenu.c:453 -msgid "Refresh display\tC-l" -msgstr "" - -#. Tool hint -#: gtkedit/editmenu.c:456 -msgid "Macros and internal commands" -msgstr "" - #: gtkedit/editoptions.c:37 msgid "None" msgstr "" @@ -1967,9 +1598,8 @@ msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1060 gtkedit/gtkedit.c:1368 src/help.c:806 -#: src/main.c:1668 src/screen.c:2284 src/screen.c:2314 src/tree.c:1018 -#: src/view.c:1959 +#: gtkedit/editwidget.c:1060 src/help.c:806 src/main.c:1668 src/screen.c:2284 +#: src/screen.c:2314 src/tree.c:1018 src/view.c:1959 msgid "Help" msgstr "Помощь" @@ -2008,134 +1638,33 @@ msgstr "" #: gtkedit/gtkedit.c:1289 -msgid "Open/Load" -msgstr "" - -#: gtkedit/gtkedit.c:1289 -msgid "Load a different/new file" -msgstr "" - -#: gtkedit/gtkedit.c:1292 -#, fuzzy -msgid "New" -msgstr "Новый\tC-n" - -#: gtkedit/gtkedit.c:1292 msgid "Clear the edit buffer" msgstr "" -#: gtkedit/gtkedit.c:1296 -msgid "Save the current edit buffer to filename" -msgstr "" - -#: gtkedit/gtkedit.c:1299 -#, fuzzy -msgid "Save As" -msgstr " Сохранить как " - -#: gtkedit/gtkedit.c:1299 -msgid "Save the current edit buffer as filename" -msgstr "" - -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert File" msgstr " Вставить файл " -#: gtkedit/gtkedit.c:1303 +#: gtkedit/gtkedit.c:1294 #, fuzzy msgid "Insert text from a file" msgstr " Вставить литерал " -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 #, fuzzy msgid "Copy to file" msgstr "Копировать в файл...\tC-f" -#: gtkedit/gtkedit.c:1306 +#: gtkedit/gtkedit.c:1296 msgid "copy a block to a file" msgstr "" -#: gtkedit/gtkedit.c:1310 -msgid "Exit" -msgstr "" - -#: gtkedit/gtkedit.c:1310 -msgid "Quit editor" -msgstr "" - -#: gtkedit/gtkedit.c:1318 -#, fuzzy -msgid "Copy selection to clipboard" -msgstr " Скопировать в буфер " - -#: gtkedit/gtkedit.c:1321 -msgid "Cut" -msgstr "" - -#: gtkedit/gtkedit.c:1321 -#, fuzzy -msgid "Cut selection to clipboard" -msgstr " Вырезать в буфер " - -#: gtkedit/gtkedit.c:1324 -msgid "Paste" -msgstr "" - -#: gtkedit/gtkedit.c:1324 -#, fuzzy -msgid "Paste clipboard" -msgstr " Вырезать в буфер " - -#: gtkedit/gtkedit.c:1328 -msgid "Undo" -msgstr "" - -#: gtkedit/gtkedit.c:1328 -msgid "Go back in time one key press" -msgstr "" - -#: gtkedit/gtkedit.c:1336 -#, fuzzy -msgid "Find" -msgstr "&FTP-соединение" - #: gtkedit/gtkedit.c:1336 #, fuzzy -msgid "Find string/regular expression" -msgstr " Регулярные выражения " - -#: gtkedit/gtkedit.c:1339 -#, fuzzy -msgid "Find again" -msgstr " Поиск файла " - -#: gtkedit/gtkedit.c:1339 -msgid "Repeat most recent search" -msgstr "" - -#: gtkedit/gtkedit.c:1342 gtkedit/gtkedit.c:1367 -#, fuzzy msgid "Search/Replace" msgstr " Поиск " -#: gtkedit/gtkedit.c:1342 -msgid "Find and replace text/regular expressions" -msgstr "" - -#: gtkedit/gtkedit.c:1351 -#, fuzzy -msgid "About..." -msgstr "&Внешний вид" - -#: gtkedit/gtkedit.c:1351 -msgid "Info about Mcedit" -msgstr "" - -#: gtkedit/gtkedit.c:1365 src/filegui.c:404 -msgid "File" -msgstr "Файл" - #: gtkedit/syntax.c:3180 gtkedit/syntax.c:3187 #, fuzzy msgid " Load syntax file " @@ -2494,6 +2023,10 @@ msgid " Permission " msgstr "" +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " Файл " + #: src/chmod.c:169 msgid "Use SPACE to change" msgstr "" @@ -2705,108 +2238,103 @@ " Панели не могут быть отключены. " #: src/cmd.c:967 -msgid "" -"Type `exit' to return to the Midnight Commander\n" -"\r\n" -"\r" -msgstr "" -"Введите `exit' для возврата в Midnight Commander\n" -"\r\n" -"\r" +#, fuzzy +msgid "Type `exit' to return to the Midnight Commander" +msgstr "Введите `exit' для возврата в Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1022 #, c-format msgid "" " Couldn't stat %s \n" " %s " msgstr "" -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1031 src/cmd.c:1033 msgid " Link " msgstr "" -#: src/cmd.c:1030 src/cmd.c:1135 src/file.c:1621 +#: src/cmd.c:1032 src/cmd.c:1137 src/file.c:1621 msgid " to:" msgstr "" -#: src/cmd.c:1041 +#: src/cmd.c:1043 #, c-format msgid " link: %s " msgstr "" -#: src/cmd.c:1074 +#: src/cmd.c:1076 #, c-format msgid " symlink: %s " msgstr "" -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " Symlink " msgstr "" -#: src/cmd.c:1100 +#: src/cmd.c:1102 msgid " points to:" msgstr "" -#: src/cmd.c:1105 +#: src/cmd.c:1107 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1111 +#: src/cmd.c:1113 #, c-format msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1135 +#: src/cmd.c:1137 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1136 +#: src/cmd.c:1138 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1147 +#: src/cmd.c:1149 #, c-format msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1250 +#: src/cmd.c:1252 msgid " Enter machine name (F1 for details): " msgstr " Введите имя машины (детали по F1): " -#: src/cmd.c:1274 +#: src/cmd.c:1276 #, c-format msgid " Could not chdir to %s " msgstr " Не могу перейти в %s " -#: src/cmd.c:1281 +#: src/cmd.c:1283 msgid " Link to a remote machine " msgstr " Соединение с удаленной машиной " -#: src/cmd.c:1287 +#: src/cmd.c:1289 msgid " FTP to machine " msgstr " FTP-соединение с удаленной машиной " -#: src/cmd.c:1297 +#: src/cmd.c:1299 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1298 +#: src/cmd.c:1300 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Host name " msgstr "" -#: src/cmd.c:1305 +#: src/cmd.c:1307 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1316 +#: src/cmd.c:1318 msgid " Undelete files on an ext2 file system " msgstr " Восстановление файлов на файловой системе ext2 " -#: src/cmd.c:1317 +#: src/cmd.c:1319 #, fuzzy msgid "" " Enter device (without /dev/) to undelete\n" @@ -2815,11 +2343,11 @@ " Введите имя устройства, связанного с файловой системой,\n" " на которой Вы хотите восстановить файл: (детали по F1)" -#: src/cmd.c:1367 +#: src/cmd.c:1369 msgid " Setup saved to ~/" msgstr " Параметры сохранены в ~/" -#: src/cmd.c:1372 +#: src/cmd.c:1374 msgid " Setup " msgstr " Настройка " @@ -3379,6 +2907,10 @@ msgid " Background process: Recursive Delete " msgstr " Фоновый процесс: Рекурсивное удаление " +#: src/filegui.c:404 +msgid "File" +msgstr "Файл" + #: src/filegui.c:425 msgid "Count" msgstr "" @@ -4265,6 +3797,10 @@ msgid "&Configuration..." msgstr "&Конфигурация" +#: src/main.c:1302 +msgid "&Layout..." +msgstr "&Внешний вид" + #: src/main.c:1303 msgid "c&Onfirmation..." msgstr "&Подтверждение" @@ -5197,13 +4733,271 @@ msgid "Inconsistent tar archive" msgstr "" -#: vfs/tar.c:412 +#: vfs/tar.c:411 #, c-format msgid "" "Hmm,...\n" "%s\n" "doesn't look like a tar archive." msgstr "" + +#, fuzzy +#~ msgid " About " +#~ msgstr "&Прервать" + +#~ msgid "&Open/load... C-o" +#~ msgstr "&Открыть файл... C-o" + +#~ msgid "&New C-n" +#~ msgstr "&Новый файл C-n" + +#~ msgid "&Save F2" +#~ msgstr "&Сохранить F2" + +#~ msgid "save &As... F12" +#~ msgstr "Сохранить &как... F12" + +#~ msgid "&Insert file... F15" +#~ msgstr "&Вставить файл... F15" + +#~ msgid "copy to &File... C-f" +#~ msgstr "&Копировать в файл... C-f" + +#~ msgid "a&Bout... " +#~ msgstr "Об &авторах..." + +#~ msgid "&Quit F10" +#~ msgstr "Вы&ход F10" + +#~ msgid "&New C-x k" +#~ msgstr "&Новый файл C-x k" + +#~ msgid "copy to &File... " +#~ msgstr "&Копировать в файл... " + +#~ msgid "&Toggle Mark F3" +#~ msgstr "&Выделение блока F3" + +#~ msgid "toggle &Ins/overw Ins" +#~ msgstr "&Режим вставки/замены Ins" + +#~ msgid "&Copy F5" +#~ msgstr "&Копировать блок F5" + +#~ msgid "&Move F6" +#~ msgstr "&Переместить блок F6" + +#~ msgid "&Delete F8" +#~ msgstr "&Удалить блок F8" + +#~ msgid "&Undo C-u" +#~ msgstr "&Откат операции C-u" + +#~ msgid "&Beginning C-PgUp" +#~ msgstr "&Начало файла C-PgUp" + +#~ msgid "&End C-PgDn" +#~ msgstr "Конец &файла C-PgDn" + +#~ msgid "&Search... F7" +#~ msgstr "&Поиск... F7" + +#~ msgid "search &Again F17" +#~ msgstr "&Искать дальше F17" + +#~ msgid "&Replace... F4" +#~ msgstr "&Замена... F4" + +#~ msgid "&Goto line... M-l" +#~ msgstr "&Перейти к строке M-l" + +#~ msgid "insert &Literal... C-q" +#~ msgstr "Вставить &литерал... C-q" + +#~ msgid "&Refresh screen C-l" +#~ msgstr "Пере&рисовать экран C-l" + +#~ msgid "&Start record macro C-r" +#~ msgstr "&Начать запись макроса C-r" + +#~ msgid "&Finish record macro... C-r" +#~ msgstr "&Окончить запись макроса... C-r" + +#~ msgid "&Execute macro... C-a, KEY" +#~ msgstr "&Выполнить макрос... C-a, KEY" + +#~ msgid "delete macr&O... " +#~ msgstr "&Удалить макрос" + +#~ msgid "insert &Date/time " +#~ msgstr "Вставить &Дату/время" + +#~ msgid "format p&Aragraph M-p" +#~ msgstr "Форматировать &абзац M-p" + +#~ msgid "'ispell' s&Pell check C-p" +#~ msgstr "&Контроль орфографии C-p" + +#~ msgid "sor&T... M-t" +#~ msgstr "&Сортировка M-t" + +#~ msgid "'indent' &C Formatter F19" +#~ msgstr "&Форматировать С-программу F19" + +#~ msgid "&Mail... " +#~ msgstr "&Электронная почта... " + +#~ msgid "&Execute macro... C-x e, KEY" +#~ msgstr "&Выполнить макро... C-x e, KEY" + +#~ msgid "'ispell' s&Pell check M-$" +#~ msgstr "&Контроль орфографии M-$" + +#~ msgid "&General... " +#~ msgstr "&Разное..." + +#~ msgid "&Save mode..." +#~ msgstr "Режим &сохранения..." + +#~ msgid " Edit " +#~ msgstr " Редактирование " + +#, fuzzy +#~ msgid " Sear/Repl " +#~ msgstr " Поиск " + +#~ msgid " Command " +#~ msgstr " Команда " + +#, fuzzy +#~ msgid " Options " +#~ msgstr " Настройка " + +#~ msgid "Open...\tC-o" +#~ msgstr "Открыть...\tC-o" + +#, fuzzy +#~ msgid "New\tC-n" +#~ msgstr "Новый\tC-n" + +#~ msgid "Save\tF2" +#~ msgstr "Сохранить\tF2" + +#~ msgid "Save as...\tF12" +#~ msgstr "Сохранить как...\tF12" + +#~ msgid "Insert file...\tF15" +#~ msgstr "Вставить файл...\tF15" + +#, fuzzy +#~ msgid "Copy to file...\tC-f" +#~ msgstr "&Копировать в файл... C-f" + +#~ msgid "Disk operations" +#~ msgstr "Дисковые операции" + +#~ msgid "Toggle mark\tF3" +#~ msgstr "Выделение блока\tF3" + +#, fuzzy +#~ msgid "Toggle mark columns\tC-b" +#~ msgstr "Выделение блока\tF3" + +#, fuzzy +#~ msgid "Toggle insert/overwrite\tIns" +#~ msgstr "&Режим вставки/замены Ins" + +#, fuzzy +#~ msgid "Copy block to clipbrd\tC-Ins" +#~ msgstr " Скопировать в буфер " + +#, fuzzy +#~ msgid "Cut block to clipbrd\tS-Del" +#~ msgstr " Вырезать в буфер " + +#, fuzzy +#~ msgid " Srch/Replce " +#~ msgstr " Поиск " + +#, fuzzy +#~ msgid "Search...\tF7" +#~ msgstr "Поиск" + +#, fuzzy +#~ msgid "Search again\tF17" +#~ msgstr "&Искать дальше F17" + +#, fuzzy +#~ msgid "Replace...\tF4" +#~ msgstr "&Замена... F4" + +#, fuzzy +#~ msgid "Replace again\tF14" +#~ msgstr "Заменить все" + +#, fuzzy +#~ msgid "Search for and replace text" +#~ msgstr " Введите текст для замены: " + +#, fuzzy +#~ msgid "Goto line...\tM-l" +#~ msgstr "&Перейти к строке M-l" + +#, fuzzy +#~ msgid "Start record macro\tC-r" +#~ msgstr "&Начать запись макроса C-r" + +#, fuzzy +#~ msgid "Finish record macro...\tC-r" +#~ msgstr "&Окончить запись макроса... C-r" + +#, fuzzy +#~ msgid "Execute macro...\tC-a, KEY" +#~ msgstr "&Выполнить макрос... C-a, KEY" + +#, fuzzy +#~ msgid "Delete macro...\t" +#~ msgstr " Удалить макрос " + +#, fuzzy +#~ msgid "Format paragraph\tM-p" +#~ msgstr "Форматировать &абзац M-p" + +#, fuzzy +#~ msgid "New" +#~ msgstr "Новый\tC-n" + +#, fuzzy +#~ msgid "Save As" +#~ msgstr " Сохранить как " + +#, fuzzy +#~ msgid "Copy selection to clipboard" +#~ msgstr " Скопировать в буфер " + +#, fuzzy +#~ msgid "Cut selection to clipboard" +#~ msgstr " Вырезать в буфер " + +#, fuzzy +#~ msgid "Paste clipboard" +#~ msgstr " Вырезать в буфер " + +#, fuzzy +#~ msgid "Find" +#~ msgstr "&FTP-соединение" + +#, fuzzy +#~ msgid "Find string/regular expression" +#~ msgstr " Регулярные выражения " + +#, fuzzy +#~ msgid "Find again" +#~ msgstr " Поиск файла " + +#, fuzzy +#~ msgid "About..." +#~ msgstr "&Внешний вид" #, fuzzy #~ msgid "_View" diff -ruN old/mc-4.5.12/src/ChangeLog new/mc-4.5.13/src/ChangeLog --- old/mc-4.5.12/src/ChangeLog Sun Feb 7 02:53:31 1999 +++ new/mc-4.5.13/src/ChangeLog Wed Feb 10 19:41:17 1999 @@ -1,3 +1,26 @@ +1999-02-10 Miguel de Icaza + + * screen.c: Make delete key delete files. + + * dir.c (do_reload_dir): Add a couple of missing calls to tree_store_end_check. + +1999-02-10 Federico Mena Quintero + + * main.h: Added prototype for main_corba_register_server(). + +1999-02-09 Miguel de Icaza + + * view.c (search): Provide GNOME specific code for the search progress + + * treestore.c: Add a new hook system to hint a tree freeze/thaw. + + * setup.c: In the GNOME version, we do not show the dot files by default. + +1999-02-08 Miguel de Icaza + + * file.c (copy_file_file): Add support for the GNOME metadata here. + (move_file_file): Add support for the GNOME metadata here. + 1999-02-07 Miguel de Icaza * treestore.c (tree_store_add_entry): Use g_new0 to allocate the tree_entry. diff -ruN old/mc-4.5.12/src/Makefile.in new/mc-4.5.13/src/Makefile.in --- old/mc-4.5.12/src/Makefile.in Sun Feb 7 02:53:30 1999 +++ new/mc-4.5.13/src/Makefile.in Wed Feb 10 19:41:17 1999 @@ -1,7 +1,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ -SHELL = /bin/sh +SHELL = @SHELL@ rootdir = $(srcdir)/.. @MCFG@@MCF@ diff -ruN old/mc-4.5.12/src/dir.c new/mc-4.5.13/src/dir.c --- old/mc-4.5.12/src/dir.c Sun Feb 7 02:53:28 1999 +++ new/mc-4.5.13/src/dir.c Wed Feb 10 19:41:14 1999 @@ -30,10 +30,18 @@ #include "tree.h" #include "../vfs/vfs.h" -/* "$Id: dir.c,v 1.12 1999/01/27 01:08:47 timur Exp $" */ +/* "$Id: dir.c,v 1.14 1999/02/10 21:58:09 unammx Exp $" */ -/* If true show files starting with a dot */ +/* + * If true show files starting with a dot. + * + * In GNOME we default to not showing them. + */ +#ifdef HAVE_GNOME +int show_dot_files = 0; +#else int show_dot_files = 1; +#endif /* If true show files ending in ~ */ int show_backups = 0; @@ -552,6 +560,7 @@ dirp = mc_opendir ("."); if (!dirp) { clean_dir (list, count); + tree_store_end_check (); return set_zero_dir (list); } @@ -582,6 +591,7 @@ IMHO it's not worthwhile). clean_dir (&dir_copy, count); */ + tree_store_end_check (); return next_free; } diff -ruN old/mc-4.5.12/src/file.c new/mc-4.5.13/src/file.c --- old/mc-4.5.12/src/file.c Sun Feb 7 02:53:28 1999 +++ new/mc-4.5.13/src/file.c Wed Feb 10 19:41:15 1999 @@ -107,7 +107,7 @@ /* }}} */ -/* rcsid [] = "$Id: file.c,v 1.46 1999/01/31 19:15:49 unammx Exp $" */ +/* rcsid [] = "$Id: file.c,v 1.47 1999/02/09 00:32:02 unammx Exp $" */ int verbose = 1; @@ -628,6 +628,11 @@ do not create a security hole. FIXME: You have security hole here, btw. Imagine copying to /tmp and symlink attack :-( */ +#ifdef HAVE_GNOME + if (!ctx->do_append) + gnome_metadata_delete (dst_path); +#endif + while ((dest_desc = mc_open (dst_path, O_WRONLY | (ctx->do_append ? O_APPEND : (O_CREAT | O_TRUNC)), 0600)) < 0){ return_status = file_error (_(" Cannot create target file \"%s\" \n %s "), dst_path); @@ -800,6 +805,9 @@ } #endif +#ifdef HAVE_GNOME + gnome_metadata_copy (src_path, dst_path); +#endif /* * .ado: according to the XPG4 standard, the file must be closed before * chmod can be invoked @@ -1113,8 +1121,12 @@ return return_status; } - if (mc_rename (s, d) == 0) + if (mc_rename (s, d) == 0){ +#ifdef HAVE_GNOME + gnome_metadata_rename (s, d); +#endif return FILE_CONT; + } } #if 0 /* Comparison to EXDEV seems not to work in nfs if you're moving from @@ -1150,7 +1162,10 @@ goto retry_src_remove; return return_status; } - +#ifdef HAVE_GNOME + gnome_metadata_delete (s); +#endif + if (return_status == FILE_CONT) return_status = progress_update_one (ctx, progress_count, @@ -1287,6 +1302,9 @@ if (return_status != FILE_RETRY) return return_status; } +#ifdef HAVE_GNOME + gnome_metadata_delete (s); +#endif if (progress_count) return progress_update_one (ctx, progress_count, progress_bytes, buf.st_size, is_toplevel_file); diff -ruN old/mc-4.5.12/src/main.h new/mc-4.5.13/src/main.h --- old/mc-4.5.12/src/main.h Sun Feb 7 02:53:27 1999 +++ new/mc-4.5.13/src/main.h Wed Feb 10 19:41:14 1999 @@ -187,6 +187,8 @@ void init_menu (void); void exec_shell (void); +void main_corba_register_server (void); + #ifdef OS2_NT # define MC_BASE "" #else diff -ruN old/mc-4.5.12/src/panel.h new/mc-4.5.13/src/panel.h --- old/mc-4.5.12/src/panel.h Sun Feb 7 02:53:27 1999 +++ new/mc-4.5.13/src/panel.h Wed Feb 10 19:41:14 1999 @@ -135,10 +135,14 @@ void *tree; void *icons; void *notebook; - void *scrollbar; void *status; void *ministatus; void *tree_scrolled_window; + +#ifdef NEW_GNOME_LIBS +#else + void *scrollbar; +#endif void *filter_w; /* A WInput* */ void *current_dir; /* A WInput* */ diff -ruN old/mc-4.5.12/src/screen.c new/mc-4.5.13/src/screen.c --- old/mc-4.5.12/src/screen.c Sun Feb 7 02:53:28 1999 +++ new/mc-4.5.13/src/screen.c Wed Feb 10 19:41:15 1999 @@ -2221,6 +2221,7 @@ { KEY_F(6), ren_cmd }, { KEY_F(7), mkdir_panel_cmd }, { KEY_F(8), delete_cmd }, + { KEY_DC, delete_cmd }, #endif { 0, 0 } diff -ruN old/mc-4.5.12/src/setup.c new/mc-4.5.13/src/setup.c --- old/mc-4.5.12/src/setup.c Sun Feb 7 02:53:29 1999 +++ new/mc-4.5.13/src/setup.c Wed Feb 10 19:41:15 1999 @@ -68,7 +68,7 @@ extern int we_can_afford_the_speed; #endif -/* "$Id: setup.c,v 1.22 1999/02/03 23:22:54 jrb Exp $" */ +/* "$Id: setup.c,v 1.23 1999/02/09 22:07:12 unammx Exp $" */ #ifdef USE_VFS extern int vfs_timeout; @@ -166,7 +166,11 @@ int *opt_addr; } options [] = { { "show_backups", &show_backups }, +#ifdef HAVE_GNOME + { "gnome_show_dot_files", &show_dot_files }, +#else { "show_dot_files", &show_dot_files }, +#endif { "verbose", &verbose }, { "mark_moves_down", &mark_moves_down }, { "pause_after_run", &pause_after_run }, diff -ruN old/mc-4.5.12/src/treestore.c new/mc-4.5.13/src/treestore.c --- old/mc-4.5.12/src/treestore.c Sun Feb 7 02:53:30 1999 +++ new/mc-4.5.13/src/treestore.c Wed Feb 10 19:41:17 1999 @@ -594,9 +594,11 @@ if (!ts.loaded) return NULL; - g_assert (ts.check_name == NULL); + g_return_val_if_fail (ts.check_name == NULL, NULL); ts.check_start = NULL; + tree_store_set_freeze (TRUE); + /* Search for the start of subdirectories */ current = tree_store_whereis (path); if (!current){ @@ -653,7 +655,7 @@ if (!ts.loaded) return; - g_assert (ts.check_name != NULL); + g_return_if_fail (ts.check_name != NULL); /* Check delete marks and delete if found */ len = strlen (ts.check_name); @@ -681,6 +683,8 @@ } g_list_free (the_queue); + + tree_store_set_freeze (FALSE); } tree_entry * @@ -722,6 +726,7 @@ static Hook *remove_entry_hooks; static Hook *add_entry_hooks; +static Hook *freeze_hooks; void tree_store_add_entry_remove_hook (tree_store_remove_fn callback, void *data) @@ -748,7 +753,6 @@ p = p->next; } } - void tree_store_add_entry_add_hook (tree_store_add_fn callback, void *data) { @@ -770,6 +774,31 @@ while (p) { r = (tree_store_add_fn) p->hook_fn; r (directory, p->hook_data); + p = p->next; + } +} + +void +tree_store_add_freeze_hook (tree_freeze_fn callback, void *data) +{ + add_hook (&freeze_hooks, (void (*)(void *)) callback, data); +} + +void +tree_store_remove_freeze_hook (tree_freeze_fn callback) +{ + delete_hook (&freeze_hooks, (void (*)(void *))callback); +} + +void +tree_store_set_freeze (int freeze) +{ + Hook *p = freeze_hooks; + tree_freeze_fn f; + + while (p) { + f = (tree_freeze_fn) p->hook_fn; + f (freeze, p->hook_data); p = p->next; } } diff -ruN old/mc-4.5.12/src/treestore.h new/mc-4.5.13/src/treestore.h --- old/mc-4.5.12/src/treestore.h Sun Feb 7 02:53:28 1999 +++ new/mc-4.5.13/src/treestore.h Wed Feb 10 19:41:14 1999 @@ -62,10 +62,22 @@ void tree_store_remove_entry_add_hook (tree_store_add_fn callback); /* + * Register/unregister freeze/unfreeze functions for the tree + */ +typedef void (*tree_freeze_fn)(int freeze, void *data); +void tree_store_add_freeze_hook (tree_freeze_fn callback, void *data); +void tree_store_remove_freeze_hook (tree_freeze_fn); + +/* * Changes in the tree_entry are notified with these */ void tree_store_notify_remove (tree_entry *entry); void tree_store_notify_add (char *directory); + +/* + * Freeze unfreeze notification + */ +void tree_store_set_freeze (int freeze); tree_scan *tree_store_opendir (char *path); tree_entry *tree_store_readdir (tree_scan *scanner); diff -ruN old/mc-4.5.12/src/view.c new/mc-4.5.13/src/view.c --- old/mc-4.5.12/src/view.c Sun Feb 7 02:53:29 1999 +++ new/mc-4.5.13/src/view.c Wed Feb 10 19:41:15 1999 @@ -121,7 +121,7 @@ int altered_nroff_flag = 0; /* }}} */ -/* "$Id: view.c,v 1.26 1999/01/27 01:09:38 timur Exp $" */ +/* "$Id: view.c,v 1.27 1999/02/10 01:16:50 unammx Exp $" */ static char hex_char[] = "0123456789ABCDEF"; @@ -1421,6 +1421,14 @@ update_steps = 20000; } +#ifdef HAVE_GNOME +static void +cancel_pressed (GtkWidget *widget, int *abort) +{ + *abort = 1; +} +#endif + static void search (WView *view, char *text, int (*search)(WView *, char *, char *, int)) { @@ -1432,7 +1440,9 @@ int found_len, search_start; Dlg_head *d = 0; int search_status; - + int abort; + void *gd; + /* Used to keep track of where the line starts, when looking forward */ /* is the index before transfering the line; the reverse case uses */ /* the position returned after the line has been read */ @@ -1441,11 +1451,21 @@ long t; /* Clear interrupt status */ got_interrupt (); - + + abort = 0; +#ifdef HAVE_GNOME + gd = gnome_message_box_new (_("Searching for `%s'"), + GNOME_MESSAGE_BOX_INFO, + GNOME_STOCK_BUTTON_CANCEL, + NULL); + gnome_dialog_button_connect (GNOME_DIALOG (gd), 0, GTK_SIGNAL_FUNC (cancel_pressed), &abort); + gtk_widget_show (gd); +#else if (verbose){ d = message (D_INSERT, _(" Search "), _("Searching %s"), text); mc_refresh (); } +#endif ch = 0; if (view->direction == 1){ p = view->found_len ? view->search_start + 1 : view->search_start; @@ -1468,9 +1488,14 @@ if ((count++ % 32) == 0) x_flush_events (); +#ifdef HAVE_GNOME + if (abort) + break; +#else if (verbose && !d->running) break; #endif +#endif if (p >= update_activate){ update_activate += update_steps; if (verbose){ @@ -1527,11 +1552,14 @@ break; } disable_interrupt_key (); +#ifdef HAVE_GNOME + gtk_object_destroy (GTK_OBJECT (gd)); +#else if (verbose){ dlg_run_done (d); destroy_dlg (d); } - +#endif if (!s){ message (0, _(" Search "), _(" Search string not found ")); view->found_len = 0;