diff -ruN old/mc-4.5.42/Makefile.in new/mc-4.5.43/Makefile.in --- old/mc-4.5.42/Makefile.in Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/Makefile.in Sat Mar 18 08:43:43 2000 @@ -24,7 +24,7 @@ all: @for dir in @INTLSUB@ ${codedirs} @POSUB@; do \ - (cd $$dir; ${MAKE} all || exit 1) \ + (cd $$dir; ${MAKE} all || exit 1); \ done static: diff -ruN old/mc-4.5.42/VERSION new/mc-4.5.43/VERSION --- old/mc-4.5.42/VERSION Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/VERSION Sat Mar 18 08:43:43 2000 @@ -1 +1 @@ -#define VERSION "4.5.42" +#define VERSION "4.5.43" diff -ruN old/mc-4.5.42/acconfig.h new/mc-4.5.43/acconfig.h --- old/mc-4.5.42/acconfig.h Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/acconfig.h Sat Mar 18 08:43:43 2000 @@ -43,6 +43,7 @@ #undef STAT_STATFS3_OSF1 #undef STAT_STATFS4 #undef STAT_STATVFS +#undef HAVE_F_FSTYPENAME /* Define umode_t if your system does not provide it */ #undef umode_t diff -ruN old/mc-4.5.42/aclocal.m4 new/mc-4.5.43/aclocal.m4 --- old/mc-4.5.42/aclocal.m4 Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/aclocal.m4 Sat Mar 18 08:43:43 2000 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4a +dnl aclocal.m4 generated automatically by aclocal 1.4 dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -739,10 +739,20 @@ if test $fu_cv_sys_mounted_getmntinfo = yes; then list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTINFO) + AC_MSG_CHECKING([if struct statfs has f_fstypename]) + AC_CACHE_VAL(fu_cv_sys_mounted_f_fstypename, + [ + AC_EGREP_HEADER(f_type;, sys/mount.h, ok=yes, ok=) + test -n "$ok" \ + && fu_cv_sys_mounted_f_fstypename=yes \ + || fu_cv_sys_mounted_f_fstypename=no + ]) + AC_MSG_RESULT($fu_cv_sys_mounted_f_fstypename) + if test $fu_cv_sys_mounted_f_fstypename = yes; then + AC_DEFINE(HAVE_F_FSTYPENAME) + fi fi fi - - # FIXME: add a test for netbsd-1.1 here if test -z "$list_mounted_fs"; then # Ultrix diff -ruN old/mc-4.5.42/config.h.in new/mc-4.5.43/config.h.in --- old/mc-4.5.42/config.h.in Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/config.h.in Sat Mar 18 08:43:43 2000 @@ -136,6 +136,7 @@ #undef STAT_STATFS3_OSF1 #undef STAT_STATFS4 #undef STAT_STATVFS +#undef HAVE_F_FSTYPENAME /* Define umode_t if your system does not provide it */ #undef umode_t diff -ruN old/mc-4.5.42/configure new/mc-4.5.43/configure --- old/mc-4.5.42/configure Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/configure Sat Mar 18 08:43:43 2000 @@ -588,7 +588,7 @@ PACKAGE=mc -VERSION=4.5.42 +VERSION=4.5.43 cat >> confdefs.h <&6 echo "configure:1749: checking for ANSI C header files" >&5 @@ -6076,27 +6076,59 @@ #define MOUNTED_GETMNTINFO 1 EOF + echo $ac_n "checking if struct statfs has f_fstypename""... $ac_c" 1>&6 +echo "configure:6081: checking if struct statfs has f_fstypename" >&5 + if eval "test \"`echo '$''{'fu_cv_sys_mounted_f_fstypename'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + + cat > conftest.$ac_ext < +EOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + egrep "f_type;" >/dev/null 2>&1; then + rm -rf conftest* + ok=yes +else + rm -rf conftest* + ok= +fi +rm -f conftest* + + test -n "$ok" \ + && fu_cv_sys_mounted_f_fstypename=yes \ + || fu_cv_sys_mounted_f_fstypename=no + +fi + + echo "$ac_t""$fu_cv_sys_mounted_f_fstypename" 1>&6 + if test $fu_cv_sys_mounted_f_fstypename = yes; then + cat >> confdefs.h <<\EOF +#define HAVE_F_FSTYPENAME 1 +EOF + + fi fi fi - # FIXME: add a test for netbsd-1.1 here - if test -z "$list_mounted_fs"; then # Ultrix echo $ac_n "checking for getmnt function""... $ac_c" 1>&6 -echo "configure:6088: checking for getmnt function" >&5 +echo "configure:6120: 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:6100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6132: \"$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* @@ -6124,17 +6156,17 @@ if test -z "$list_mounted_fs"; then # SVR2 echo $ac_n "checking whether it is possible to resort to fread on /etc/mnttab""... $ac_c" 1>&6 -echo "configure:6128: checking whether it is possible to resort to fread on /etc/mnttab" >&5 +echo "configure:6160: 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:6138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6170: \"$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* @@ -6168,7 +6200,7 @@ echo "checking how to get filesystem space usage" 1>&6 -echo "configure:6172: checking how to get filesystem space usage" >&5 +echo "configure:6204: checking how to get filesystem space usage" >&5 space=no # Here we'll compromise a little (and perform only the link test) @@ -6178,12 +6210,12 @@ for ac_func in statvfs do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6182: checking for $ac_func" >&5 +echo "configure:6214: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6242: \"$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 @@ -6242,7 +6274,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:6246: checking for 3-argument statfs function (DEC OSF/1)" >&5 +echo "configure:6278: 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 @@ -6250,7 +6282,7 @@ fu_cv_sys_stat_statfs3_osf1=no else cat > conftest.$ac_ext < @@ -6263,7 +6295,7 @@ exit (statfs (".", &fsd, sizeof (struct statfs))); } EOF -if { (eval echo configure:6267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6299: \"$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 @@ -6290,7 +6322,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:6294: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5 +echo "configure:6326: 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 @@ -6298,7 +6330,7 @@ fu_cv_sys_stat_statfs2_bsize=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6353: \"$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 @@ -6344,7 +6376,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:6348: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5 +echo "configure:6380: 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 @@ -6352,7 +6384,7 @@ fu_cv_sys_stat_statfs4=no else cat > conftest.$ac_ext < #include @@ -6362,7 +6394,7 @@ exit (statfs (".", &fsd, sizeof fsd, 0)); } EOF -if { (eval echo configure:6366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6398: \"$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 @@ -6389,7 +6421,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:6393: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5 +echo "configure:6425: 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 @@ -6397,7 +6429,7 @@ fu_cv_sys_stat_statfs2_fsize=no else cat > conftest.$ac_ext < #ifdef HAVE_SYS_PARAM_H @@ -6413,7 +6445,7 @@ exit (statfs (".", &fsd)); } EOF -if { (eval echo configure:6417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6449: \"$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 @@ -6440,7 +6472,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:6444: checking for two-argument statfs with struct fs_data (Ultrix)" >&5 +echo "configure:6476: 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 @@ -6448,7 +6480,7 @@ fu_cv_sys_stat_fs_data=no else cat > conftest.$ac_ext < @@ -6469,7 +6501,7 @@ exit (statfs (".", &fsd) != 1); } EOF -if { (eval echo configure:6473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6505: \"$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 @@ -6497,12 +6529,12 @@ echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6501: checking for mode_t" >&5 +echo "configure:6533: 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 @@ -6530,12 +6562,12 @@ fi echo $ac_n "checking for umode_t""... $ac_c" 1>&6 -echo "configure:6534: checking for umode_t" >&5 +echo "configure:6566: 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 @@ -6563,12 +6595,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6567: checking for off_t" >&5 +echo "configure:6599: 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 @@ -6596,12 +6628,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6600: checking for pid_t" >&5 +echo "configure:6632: 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 @@ -6629,12 +6661,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:6633: checking for uid_t in sys/types.h" >&5 +echo "configure:6665: 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 @@ -6663,12 +6695,12 @@ fi echo $ac_n "checking for nlink_t""... $ac_c" 1>&6 -echo "configure:6667: checking for nlink_t" >&5 +echo "configure:6699: 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 @@ -6700,17 +6732,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6704: checking for $ac_hdr" >&5 +echo "configure:6736: 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:6714: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6746: \"$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* @@ -6739,12 +6771,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6743: checking for $ac_func" >&5 +echo "configure:6775: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6803: \"$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 @@ -6792,7 +6824,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:6796: checking for working mmap" >&5 +echo "configure:6828: 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 @@ -6800,7 +6832,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6976: \"$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 @@ -6965,19 +6997,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:6969: checking for working alloca.h" >&5 +echo "configure:7001: 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:6981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7013: \"$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 @@ -6998,12 +7030,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:7002: checking for alloca" >&5 +echo "configure:7034: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7067: \"$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 @@ -7063,12 +7095,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:7067: checking whether alloca needs Cray hooks" >&5 +echo "configure:7099: 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:7097: checking for $ac_func" >&5 +echo "configure:7129: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7157: \"$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 @@ -7148,7 +7180,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:7152: checking stack direction for C alloca" >&5 +echo "configure:7184: 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 @@ -7156,7 +7188,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7211: \"$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 @@ -7203,7 +7235,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:7207: checking for X" >&5 +echo "configure:7239: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -7265,12 +7297,12 @@ # 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:7274: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7306: \"$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* @@ -7339,14 +7371,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${ac_exeext}; then +if { (eval echo configure:7382: \"$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. @@ -7452,17 +7484,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:7456: checking whether -R must be followed by a space" >&5 +echo "configure:7488: 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${ac_exeext}; then +if { (eval echo configure:7498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -7478,14 +7510,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -7517,7 +7549,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:7521: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:7553: 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 @@ -7525,7 +7557,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7572: \"$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 @@ -7558,7 +7590,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:7562: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7594: 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 @@ -7566,7 +7598,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7613: \"$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 @@ -7606,12 +7638,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:7610: checking for gethostbyname" >&5 +echo "configure:7642: 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${ac_exeext}; then +if { (eval echo configure:7670: \"$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 @@ -7655,7 +7687,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7659: checking for gethostbyname in -lnsl" >&5 +echo "configure:7691: 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 @@ -7663,7 +7695,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7710: \"$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 @@ -7704,12 +7736,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:7708: checking for connect" >&5 +echo "configure:7740: 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${ac_exeext}; then +if { (eval echo configure:7768: \"$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 @@ -7753,7 +7785,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7757: checking for connect in -lsocket" >&5 +echo "configure:7789: 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 @@ -7761,7 +7793,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7808: \"$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 @@ -7796,12 +7828,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:7800: checking for remove" >&5 +echo "configure:7832: 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${ac_exeext}; then +if { (eval echo configure:7860: \"$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 @@ -7845,7 +7877,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7849: checking for remove in -lposix" >&5 +echo "configure:7881: 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 @@ -7853,7 +7885,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7900: \"$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 @@ -7888,12 +7920,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7892: checking for shmat" >&5 +echo "configure:7924: 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${ac_exeext}; then +if { (eval echo configure:7952: \"$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 @@ -7937,7 +7969,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7941: checking for shmat in -lipc" >&5 +echo "configure:7973: 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 @@ -7945,7 +7977,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7992: \"$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 @@ -7989,7 +8021,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:7993: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:8025: 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 @@ -7997,7 +8029,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8044: \"$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 @@ -8058,7 +8090,7 @@ echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6 -echo "configure:8062: checking for t_accept in -lnsl" >&5 +echo "configure:8094: 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 @@ -8066,7 +8098,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8113: \"$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 @@ -8105,7 +8137,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8109: checking for socket in -lsocket" >&5 +echo "configure:8141: 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 @@ -8113,7 +8145,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8160: \"$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 @@ -8156,12 +8188,12 @@ for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8160: checking for $ac_func" >&5 +echo "configure:8192: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8220: \"$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 @@ -8212,7 +8244,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:8216: checking for socket in -l$lib" >&5 +echo "configure:8248: 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 @@ -8220,7 +8252,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8267: \"$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 @@ -8263,12 +8295,12 @@ have_gethostbyname=no echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:8267: checking for gethostbyname" >&5 +echo "configure:8299: 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${ac_exeext}; then +if { (eval echo configure:8327: \"$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 @@ -8314,7 +8346,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:8318: checking for gethostbyname in -l$lib" >&5 +echo "configure:8350: 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 @@ -8322,7 +8354,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8369: \"$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 @@ -8359,12 +8391,12 @@ for ac_func in socketpair do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8363: checking for $ac_func" >&5 +echo "configure:8395: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8423: \"$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 @@ -8413,7 +8445,7 @@ echo $ac_n "checking for get_process_stats in -lseq""... $ac_c" 1>&6 -echo "configure:8417: checking for get_process_stats in -lseq" >&5 +echo "configure:8449: 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 @@ -8421,7 +8453,7 @@ ac_save_LIBS="$LIBS" LIBS="-lseq $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8468: \"$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 @@ -8470,7 +8502,7 @@ case $use_vfs in yes) echo $ac_n "checking for t_accept in -lnsl""... $ac_c" 1>&6 -echo "configure:8474: checking for t_accept in -lnsl" >&5 +echo "configure:8506: 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 @@ -8478,7 +8510,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; 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_lib_$ac_lib_var=yes" else @@ -8517,7 +8549,7 @@ fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8521: checking for socket in -lsocket" >&5 +echo "configure:8553: 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 @@ -8525,7 +8557,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8572: \"$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 @@ -8568,12 +8600,12 @@ for ac_func in socket do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8572: checking for $ac_func" >&5 +echo "configure:8604: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8632: \"$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 @@ -8624,7 +8656,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:8628: checking for socket in -l$lib" >&5 +echo "configure:8660: 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 @@ -8632,7 +8664,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8679: \"$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 @@ -8675,12 +8707,12 @@ have_gethostbyname=no echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:8679: checking for gethostbyname" >&5 +echo "configure:8711: 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${ac_exeext}; then +if { (eval echo configure:8739: \"$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 @@ -8726,7 +8758,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:8730: checking for gethostbyname in -l$lib" >&5 +echo "configure:8762: 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 @@ -8734,7 +8766,7 @@ ac_save_LIBS="$LIBS" LIBS="-l$lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8774,14 +8806,14 @@ av_struct_linger=no echo $ac_n "checking struct linger is available""... $ac_c" 1>&6 -echo "configure:8778: checking struct linger is available" >&5 +echo "configure:8810: checking struct linger is available" >&5 if test "$cross_compiling" = yes; then av_struct_linger=no else cat > conftest.$ac_ext < @@ -8797,7 +8829,7 @@ } EOF -if { (eval echo configure:8801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cat >> confdefs.h <<\EOF @@ -8822,12 +8854,12 @@ for ac_func in pmap_set do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8826: checking for $ac_func" >&5 +echo "configure:8858: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8886: \"$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 @@ -8872,7 +8904,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for pmap_set in -lrpc""... $ac_c" 1>&6 -echo "configure:8876: checking for pmap_set in -lrpc" >&5 +echo "configure:8908: 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 @@ -8880,7 +8912,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrpc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8927: \"$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 @@ -8923,12 +8955,12 @@ for ac_func in pmap_getport pmap_getmaps rresvport do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8927: checking for $ac_func" >&5 +echo "configure:8959: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8987: \"$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 @@ -8979,17 +9011,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8983: checking for $ac_hdr" >&5 +echo "configure:9015: 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:8993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9025: \"$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* @@ -9253,7 +9285,7 @@ else echo $ac_n "checking for Gpm_Repeat in -lgpm""... $ac_c" 1>&6 -echo "configure:9257: checking for Gpm_Repeat in -lgpm" >&5 +echo "configure:9289: 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 @@ -9261,7 +9293,7 @@ ac_save_LIBS="$LIBS" LIBS="-lgpm $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9308: \"$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 @@ -9413,7 +9445,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:9417: checking for $ac_word" >&5 +echo "configure:9449: 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 @@ -9450,7 +9482,7 @@ no_gnome_config="yes" else echo $ac_n "checking if $GNOME_CONFIG works""... $ac_c" 1>&6 -echo "configure:9454: checking if $GNOME_CONFIG works" >&5 +echo "configure:9486: checking if $GNOME_CONFIG works" >&5 if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 @@ -9458,7 +9490,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:9462: checking for $ac_word" >&5 +echo "configure:9494: 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 @@ -9494,7 +9526,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:9498: checking for $ac_word" >&5 +echo "configure:9530: 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 @@ -9528,7 +9560,7 @@ fi echo $ac_n "checking for working ORBit environment""... $ac_c" 1>&6 -echo "configure:9532: checking for working ORBit environment" >&5 +echo "configure:9564: 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 @@ -9564,7 +9596,7 @@ fi echo $ac_n "checking for gnorba libraries""... $ac_c" 1>&6 -echo "configure:9568: checking for gnorba libraries" >&5 +echo "configure:9600: 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 @@ -9639,7 +9671,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:9643: checking for gnomeConf.sh file in $gnome_prefix" >&5 +echo "configure:9675: 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" \ @@ -9670,7 +9702,7 @@ n="" for i in $n; do echo $ac_n "checking extra library \"$i\"""... $ac_c" 1>&6 -echo "configure:9674: checking extra library \"$i\"" >&5 +echo "configure:9706: checking extra library \"$i\"" >&5 case $i in applets) @@ -9695,7 +9727,7 @@ # Extract the first word of "nroff", so it can be a program name with args. set dummy nroff; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9699: checking for $ac_word" >&5 +echo "configure:9731: 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 @@ -9724,7 +9756,7 @@ if $HAVE_nroff; then echo $ac_n "checking for manual formatting macros""... $ac_c" 1>&6 -echo "configure:9728: checking for manual formatting macros" >&5 +echo "configure:9760: 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 @@ -9748,7 +9780,7 @@ if $HAVE_nroff; then echo $ac_n "checking if nroff accepts -Tlatin1 or -Tascii""... $ac_c" 1>&6 -echo "configure:9752: checking if nroff accepts -Tlatin1 or -Tascii" >&5 +echo "configure:9784: checking if nroff accepts -Tlatin1 or -Tascii" >&5 if eval "test \"`echo '$''{'ac_cv_nroff_tascii'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9779,7 +9811,7 @@ # Extract the first word of "file", so it can be a program name with args. set dummy file; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9783: checking for $ac_word" >&5 +echo "configure:9815: 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 @@ -9808,7 +9840,7 @@ if $HAVE_FILECMD; then echo $ac_n "checking for - option to file command""... $ac_c" 1>&6 -echo "configure:9812: checking for - option to file command" >&5 +echo "configure:9844: 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 @@ -9851,7 +9883,7 @@ echo $ac_n "checking for -L option to file command""... $ac_c" 1>&6 -echo "configure:9855: checking for -L option to file command" >&5 +echo "configure:9887: 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 @@ -9877,7 +9909,7 @@ fi echo $ac_n "checking for - option to grep command""... $ac_c" 1>&6 -echo "configure:9881: checking for - option to grep command" >&5 +echo "configure:9913: 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 @@ -9901,7 +9933,7 @@ echo $ac_n "checking for subshell support""... $ac_c" 1>&6 -echo "configure:9905: checking for subshell support" >&5 +echo "configure:9937: checking for subshell support" >&5 # Check whether --with-subshell or --without-subshell was given. if test "${with_subshell+set}" = set; then withval="$with_subshell" @@ -10043,7 +10075,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:10047: checking for SLang_init_tty in -lslang" >&5 +echo "configure:10079: 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 @@ -10051,7 +10083,7 @@ ac_save_LIBS="$LIBS" LIBS="-lslang $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10098: \"$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 @@ -10081,17 +10113,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10085: checking for $ac_hdr" >&5 +echo "configure:10117: 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:10095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10127: \"$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* @@ -10126,17 +10158,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10130: checking for $ac_hdr" >&5 +echo "configure:10162: 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:10140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10172: \"$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* @@ -10208,7 +10240,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10212: checking for tgoto in -ltermcap" >&5 +echo "configure:10244: 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 @@ -10216,7 +10248,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10263: \"$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 @@ -10300,7 +10332,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10350: \"$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 @@ -10333,7 +10365,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10337: checking for tgoto in -ltermcap" >&5 +echo "configure:10369: 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 @@ -10341,7 +10373,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10388: \"$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 @@ -10418,7 +10450,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:10422: checking for tgoto in -ltermcap" >&5 +echo "configure:10454: 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 @@ -10426,7 +10458,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10552,17 +10584,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10556: checking for $ac_hdr" >&5 +echo "configure:10588: 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:10566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10598: \"$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* @@ -10614,16 +10646,17 @@ fi else - echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6 -echo "configure:10619: checking for ext2fs_close in -lext2fs" >&5 + + echo $ac_n "checking for ext2fs_close in -lext2fs""... $ac_c" 1>&6 +echo "configure:10652: 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 else ac_save_LIBS="$LIBS" -LIBS="-lext2fs $LIBS" +LIBS="-lext2fs -lcom_err $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10671: \"$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 @@ -10655,17 +10688,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10659: checking for $ac_hdr" >&5 +echo "configure:10692: 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:10669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10702: \"$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* @@ -10708,16 +10741,15 @@ if test "$ext2fs_undel" = yes; then echo "$ac_t""With ext2fs file recovery code" 1>&6 - vfs_flags="${vfs_flags} -else - echo "$ac_t""no" 1>&6 -undelfs" + vfs_flags="${vfs_flags}, undelfs" undelfs_o="undelfs.o" LIBS="$LIBS $EXT2FS_UNDEL_LIBS" else echo "configure: warning: No ext2fs file recovery code" 1>&2 fi +else + echo "$ac_t""no" 1>&6 fi @@ -10731,7 +10763,7 @@ if $search_ncurses then echo "checking "location of ncurses.h file"" 1>&6 -echo "configure:10735: checking "location of ncurses.h file"" >&5 +echo "configure:10767: checking "location of ncurses.h file"" >&5 if $search_ncurses @@ -10871,7 +10903,7 @@ if $search_ncurses then cat > conftest.$ac_ext < EOF @@ -10897,7 +10929,7 @@ rm -f conftest* cat > conftest.$ac_ext < @@ -10957,10 +10989,10 @@ else # check for ncurses version, to properly ifdef mouse-fix echo $ac_n "checking for ncurses version""... $ac_c" 1>&6 -echo "configure:10961: checking for ncurses version" >&5 +echo "configure:10993: checking for ncurses version" >&5 ncurses_version=unknown cat > conftest.$ac_ext < @@ -11004,12 +11036,12 @@ for ac_func in resizeterm keyok do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11008: checking for $ac_func" >&5 +echo "configure:11040: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11068: \"$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 @@ -11081,7 +11113,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11131: \"$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 @@ -11114,7 +11146,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11118: checking for tgoto in -ltermcap" >&5 +echo "configure:11150: 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 @@ -11122,7 +11154,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11169: \"$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 @@ -11199,7 +11231,7 @@ EOF echo $ac_n "checking for tgoto in -ltermcap""... $ac_c" 1>&6 -echo "configure:11203: checking for tgoto in -ltermcap" >&5 +echo "configure:11235: 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 @@ -11207,7 +11239,7 @@ ac_save_LIBS="$LIBS" LIBS="-ltermcap $LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11254: \"$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 @@ -11258,7 +11290,7 @@ install_saver="yes" echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6 -echo "configure:11262: checking for pam_start in -lpam" >&5 +echo "configure:11294: 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 @@ -11266,7 +11298,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpam -ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11313: \"$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 @@ -11320,7 +11352,7 @@ else echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 -echo "configure:11324: checking for -lXpm" >&5 +echo "configure:11356: checking for -lXpm" >&5 if eval "test \"`echo '$''{'ac_cv_has_xpm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11336,7 +11368,7 @@ has_xpm_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11346,7 +11378,7 @@ XpmLibraryVersion(); ; return 0; } EOF -if { (eval echo configure:11350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_xpm=yes else @@ -11368,7 +11400,7 @@ echo $ac_n "checking for X11 non-rectangular shape extension""... $ac_c" 1>&6 -echo "configure:11372: checking for X11 non-rectangular shape extension" >&5 +echo "configure:11404: 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 @@ -11384,7 +11416,7 @@ has_shape_save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $X_CFLAGS" cat > conftest.$ac_ext < @@ -11399,7 +11431,7 @@ ; return 0; } EOF -if { (eval echo configure:11403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_has_shape=yes else @@ -11435,7 +11467,7 @@ echo else echo $ac_n "checking for setupterm in -lcurses""... $ac_c" 1>&6 -echo "configure:11439: checking for setupterm in -lcurses" >&5 +echo "configure:11471: 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 @@ -11443,7 +11475,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcurses $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11490: \"$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 @@ -11471,7 +11503,7 @@ echo "$ac_t""yes" 1>&6 cat > conftest.$ac_ext < @@ -11484,7 +11516,7 @@ ; return 0; } EOF -if { (eval echo configure:11488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* LIBS="$LIBS -lcurses" @@ -11551,7 +11583,6 @@ builddir=`pwd` SHELL=${SHELL-"/bin/sh"} - subdirs="vfs/samba" diff -ruN old/mc-4.5.42/configure.in new/mc-4.5.43/configure.in --- old/mc-4.5.42/configure.in Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/configure.in Sat Mar 18 08:43:43 2000 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.42 +VERSION=4.5.43 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) @@ -70,7 +70,7 @@ X11_WWW=lynx fi -ALL_LINGUAS="ca cs da de el es es_ES fi fr hu it ja ko nl no pl pt_BR ro ru sv uk wa zh_TW.Big5" +ALL_LINGUAS="ca cs da de el es es_ES fi fr hu it ja ko nl no pl pt_BR ro ru sv sk uk wa zh_TW.Big5 tr zh_CN.GB2312" dnl ultra ulgy hack to get MKINSTALLDIRS right AM_GNU_GETTEXT @@ -974,7 +974,7 @@ GNOME_UNDELFS_CHECKS if test "$ext2fs_undel" = yes; then AC_MSG_RESULT(With ext2fs file recovery code) - vfs_flags="${vfs_flags}, undelfs" + vfs_flags=["${vfs_flags}, undelfs"] undelfs_o="undelfs.o" LIBS="$LIBS $EXT2FS_UNDEL_LIBS" else @@ -992,10 +992,10 @@ CPPFLAGS="$CPPFLAGS -I$withval/include" fi AC_EXT2_UNDEL - fi], + fi],[ dnl Default: detect AC_CHECK_LIB(ext2fs, ext2fs_close, AC_EXT2_UNDEL,,-lcom_err) -) +]) AC_SUBST(undelfs_o) @@ -1245,9 +1245,8 @@ AC_SUBST(SHELL) dnl -dnl Output configuration filesn +dnl Output configuration files dnl - AC_CONFIG_SUBDIRS(vfs/samba) AC_OUTPUT([ diff -ruN old/mc-4.5.42/doc/mc.1.in new/mc-4.5.43/doc/mc.1.in --- old/mc-4.5.42/doc/mc.1.in Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/doc/mc.1.in Sat Mar 18 08:43:44 2000 @@ -81,7 +81,7 @@ I know the bash function could be shorter for zsh and bash but the backquotes on bash won't accept your suspension the program with C-z. The temporary file is created in the private directory ~/.mc/tmp -in order to avoid symlink attachs in a world writable /tmp. +in order to avoid symlink attacks in a world writable /tmp. .TP .I "\-s" Turns on the slow terminal mode, in this mode the program will not @@ -1461,7 +1461,7 @@ .PP .SH " Options Menu" The Midnight Commander has some options that may be toggled on and -off in several dialogs which are accessible from this menue. Options +off in several dialogs which are accessible from this menu. Options are enabled if they have an asterisk or "x" in front of them. .PP The @@ -1530,7 +1530,7 @@ By default when you mark a file (with either C-t or the Insert key) the selection bar will move down. .PP -.I Drop down menues. +.I Drop down menus. When this option is enabled, when you press the .B F9 key, the pull down menus will be activated, else, you will @@ -1686,7 +1686,7 @@ If this option is enabled, deleting files unintentionally will get more difficult. The default selection in the confirmation dialog changes from the "Yes" -to the "No" button and deletion of non empty direcories has to be +to the "No" button and deletion of non empty directories has to be confirmed by entering the word .I yes \&. @@ -1745,7 +1745,7 @@ directory listings fetched from ftp servers). .PP Moreover in order to access the contents of compressed files -(for eaxample, compressed tar files) the Midnight Commander +(for example, compressed tar files) the Midnight Commander has to create a temporary uncompressed file on your disk. .PP Since both the information in memory and the temporary files on @@ -2011,7 +2011,7 @@ .I nroff to tell the viewer that it should interpret the bold and underline sequences of nroff; -.I unformated +.I unformatted to tell the viewer to not interpret nroff commands for making the text bold or underlined. .PP @@ -2478,8 +2478,8 @@ and .B sprintf man pages to see what a format string is and how it works. An example is as follows: Suppose you want -to replace all occurences of say, an open bracket, three -comma seperated numbers, and a close bracket, with the +to replace all occurrences of say, an open bracket, three +comma separated numbers, and a close bracket, with the word .I apples, the third number, the word @@ -2601,8 +2601,8 @@ optional .I pass element, if present is the password used for the connection. This use -is not recomented (nor keeping this in your hotlist, unless you set -the appropiate permissions there, and then, it may not be entirely +is not recommended (nor keeping this in your hotlist, unless you set +the appropriate permissions there, and then, it may not be entirely safe anyways). .PP Examples: @@ -2771,7 +2771,7 @@ first scsi disk on Linux, you would use the following path name: .PP .nf - /#undel:/dev/sda2 + /#undel:sda2 .fi .PP It may take a while for the undelfs to load the required information @@ -2935,7 +2935,7 @@ .I ftpfs_use_passive_connections. .IP This option is by off default. This makes the ftpfs code use the -passive open mode for transfering files. This is used by people that +passive open mode for transferring files. This is used by people that are behind a filtering packet router. This option just works if you are not using an ftp proxy. .PP diff -ruN old/mc-4.5.42/doc/mc.sgml new/mc-4.5.43/doc/mc.sgml --- old/mc-4.5.42/doc/mc.sgml Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/doc/mc.sgml Sat Mar 18 08:43:44 2000 @@ -2321,7 +2321,7 @@ first scsi disk on Linux, you would use the following path name: - /#undel:/dev/sda2 + /#undel:sda2 It may take a while for the undelfs to load the required information diff -ruN old/mc-4.5.42/doc/mcedit.1.in new/mc-4.5.43/doc/mcedit.1.in --- old/mc-4.5.42/doc/mcedit.1.in Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/doc/mcedit.1.in Sat Mar 18 08:43:44 2000 @@ -5,7 +5,7 @@ .\"SKIP_SECTION" .SH USAGE .B mcedit -[ file [\-bcCdfhstVx?]] +[[+number] file [\-bcCdfhstVx?]] .SH DESCRIPTION .LP Mcedit is a link to @@ -18,6 +18,10 @@ .\".\"DONT_SPLIT" .SH OPTIONS .TP +.I "\+number" +Go to the line specified by number (do not insert +a space between the "+" sign and the number). +.TP .I "\-b" Forces black and white display. .TP @@ -167,7 +171,7 @@ The file \fB~/.cedit/syntax\fP is rescanned on opening of a any new editor file. The file contains rules for highlighting, each of which is -given on a seperate line, and define which keywords will be highlighted +given on a separate line, and define which keywords will be highlighted to what colour. The file is also divided into sections, each beginning with a line with the \fBfile\fP command, followed by a regular expression. The regular expression dictates the file name that that set @@ -244,7 +248,7 @@ set exactly to its default and could therefore have been omitted. To specify that a word must be whole on the left only, you can use the \fBwholeleft\fP option, and similarly on the right. The left and -right set of characters can be set seperately with, +right set of characters can be set separately with, .br \fBwholechars\fP [\fBleft\fP|\fBright\fP] \fIcharacters\fP @@ -260,7 +264,7 @@ Context or keyword strings are interpreted so that you can include tabs and spaces with the sequences \\t and \\s. Newlines and the \\ are specified with \\n and \\\\ respectively. Since whitespace is used as a -seperator, it may not be used explicitedly. Also, \\* must be used to +separator, it may not be used explicitedly. Also, \\* must be used to specify a *. The * itself is a wildcard that matches any length of characters. For example, .nf @@ -286,7 +290,7 @@ across multiple lines. The colours themselves are numbered 0 to 26 and are explained below in -\fBFURTHER BEHAVIOURAL OPTIONS\fP. You can also use \fBany\fP of the named +\fBFURTHER BEHAVIORAL OPTIONS\fP. You can also use \fBany\fP of the named colors specified in \fB/usr/lib/X11/rgb.txt\fP, though only one word versions of them. It is better to stick to the numerical colors to limit use of the color palette. @@ -306,7 +310,7 @@ A useful hint is to work with as much as possible with the things you \fIcan\fP do rather than try to do things that this -implimentation can't cope with. Also remember that the aim of +implementation can't cope with. Also remember that the aim of syntax highlighting is to make programming less prone to error, \fInot\fP to make code look pretty. .PP @@ -326,12 +330,12 @@ Most options can now be set from the editors options dialog box. See the \fBOptions\fP menu. The following options are defined in \fB.mc.ini\fP, and have obvious correspondences in the dialog box. -You can modifiy them to change the editor behaviour, by editing the file. +You can modify them to change the editor behavior, by editing the file. Unless specified, a 1 sets the option to on, and a 0 sets it to off, as is usual. .TP .I use_internal_edit -This option is ignored when envoking +This option is ignored when invoking .B mcedit. .TP .I editor_key_emulation @@ -403,8 +407,8 @@ .B sprintf man pages to see what a format string is and how it works. An example is as follows: Suppose you want -to replace all occurances of say, an open bracket, three -comma seperated numbers, and a close bracket, with the +to replace all occurrences of say, an open bracket, three +comma separated numbers, and a close bracket, with the word .I apples, the third number, the word diff -ruN old/mc-4.5.42/edit/edit_key_translator.c new/mc-4.5.43/edit/edit_key_translator.c --- old/mc-4.5.42/edit/edit_key_translator.c Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/edit/edit_key_translator.c Sat Mar 18 08:43:45 2000 @@ -59,7 +59,9 @@ XCTRL ('z'), CK_Word_Left, XCTRL ('x'), CK_Word_Right, KEY_F (4), CK_Replace, KEY_F (7), CK_Find, KEY_F (14), CK_Replace_Again, XCTRL ('h'), CK_BackSpace, ALT ('l'), CK_Goto, ALT ('L'), CK_Goto, XCTRL ('y'), CK_Delete_Line, - KEY_F (17), CK_Find_Again, ALT ('p'), CK_Paragraph_Format, 0}; + KEY_F (17), CK_Find_Again, ALT ('p'), CK_Paragraph_Format, + 0177, CK_BackSpace, + 0, 0}; static long emacs_key_map[] = {OUR_BACKSPACE_KEY, CK_BackSpace, OUR_DELETE_KEY, CK_Delete, '\n', CK_Enter, @@ -97,6 +99,7 @@ KEY_F (17), CK_Find_Again, ALT ('<'), CK_Beginning_Of_Text, ALT ('>'), CK_End_Of_Text, + 0177, CK_BackSpace, 0, 0}; diff -ruN old/mc-4.5.42/gnome/ChangeLog new/mc-4.5.43/gnome/ChangeLog --- old/mc-4.5.42/gnome/ChangeLog Mon Dec 6 18:50:03 1999 +++ new/mc-4.5.43/gnome/ChangeLog Sat Mar 18 08:43:47 2000 @@ -1,3 +1,47 @@ +2000-03-13 Miguel de Icaza + + * gaction.c (gmc_open_filename): Usae open.flags to determine + whether we need a terminal. + (gmc_open_filename): Fix the logic to make it work properly with + .desktop and .kdelnk files. + +2000-02-03 Pavel Machek + + * gicon.c (gicon_init): make missing icons back fatal (prevents + segfault) + +2000-02-01 Pavel Machek + + * gicon.c (gicon_init): make missing icons non-fatal error + + * gmain.c, gdesktop.c: added option not to display desktop icons + (desktop_popup): don't handle clicks when --nodesktop + +2000-01-26 Federico Mena Quintero + + * gmc-client.c (options): Added the --arrange-desktop-icons + option. + (arrange_desktop_icons): Implemented. + + * gcorba.c (Desktop_arrange_icons): Implemented. + (Desktop_class_init): Put the function in the desktop_epv. + + * gdesktop.c (desktop_arrange_icons): Made public. + + * gnome-file-property-dialog.c (align_label_new): Renamed from + label_new() to avoid a conflict with widget.h. + +2000-01-02 Federico Mena Quintero + + * gaction.c (gmc_open_filename): Use gnome_mime_needsterminal() + instead of gnome_mime_type_or_default(). This was a thinko. + Thanks to Aaron Lehmann for pointing this + out. + +1999-12-28 Matthias Warkus + + * mc.keys.in.in: Added a whole slew of new icons. + 1999-11-29 Federico Mena Quintero * gdesktop.c (desktop_arrange_icons): Return immediately if there diff -ruN old/mc-4.5.42/gnome/gaction.c new/mc-4.5.43/gnome/gaction.c --- old/mc-4.5.42/gnome/gaction.c Mon Dec 6 18:50:03 1999 +++ new/mc-4.5.43/gnome/gaction.c Sat Mar 18 08:43:47 2000 @@ -33,7 +33,7 @@ _("Unable to execute\n\"%s\".\n\n" "Please check it to see if it points to a valid command."), fname); - + } else { if (mime) fix = g_strdup_printf ( @@ -41,7 +41,7 @@ "in the GNOME Control Center, and edit the default %s" "-action for \"%s\"."), action, mime); - else + else fix = g_strdup_printf ( _("\".\n\nTo fix this error, bring up this file's properties " "and change the default %s-action."), @@ -50,7 +50,7 @@ msg = g_strdup_printf ( _("Unable to %s\n\"%s\"\nwith the command:\n\"%s\"%s"), action, fname, command, fix); - + g_free (fix); } msg_dialog = gnome_message_box_new (msg, @@ -81,7 +81,7 @@ gint retval, i; gchar *prog; gchar **argv; - + gnome_config_make_vector (buf, &argc, &argv); if (argc < 1) return FALSE; @@ -103,13 +103,19 @@ int gmc_open_filename (char *fname, GList *args) { + /* fname is a full name */ + const char *mime_type; const char *cmd; char *buf = NULL; int size; int needs_terminal = 0; - mime_type = gnome_mime_type_or_default (fname, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (fname, NULL); + else + mime_type = gnome_mime_type_or_default (fname, NULL); + /* * We accept needs_terminal as -1, which means our caller * did not want to do the work @@ -117,16 +123,13 @@ if (gnome_metadata_get (fname, "flags", &size, &buf) == 0){ needs_terminal = (strstr (buf, "needsterminal") != 0); g_free (buf); - } else if (mime_type){ - const char *flags; - - flags = gnome_mime_type_or_default (mime_type, "flags"); - needs_terminal = (strstr (flags, "needsterminal") != 0); - } - - if (gnome_metadata_get (fname, "fm-open", &size, &buf) != 0) { + buf = NULL; + } else if (mime_type) + needs_terminal = gnome_mime_needsterminal (mime_type, "open.flags"); + + if (gnome_metadata_get (fname, "fm-open", &size, &buf) != 0) gnome_metadata_get (fname, "open", &size, &buf); - } + if (buf) { if (gmc_check_exec_string (buf)) gmc_execute (fname, buf, needs_terminal); @@ -135,26 +138,29 @@ g_free (buf); return 1; } + if (!mime_type) return 0; - + cmd = gnome_mime_get_value (mime_type, "fm-open"); if (cmd == NULL) { cmd = gnome_mime_get_value (mime_type, "open"); } - + if (cmd){ if (gmc_check_exec_string (cmd)) gmc_execute (fname, cmd, needs_terminal); - else + else gmc_unable_to_execute_dlg (fname, cmd, _("open"), mime_type); return 1; } - if (strcmp (mime_type, "application/x-gnome-app-info") == 0){ + if ((strcmp (mime_type, "application/x-gnome-app-info") == 0) || + (strcmp (mime_type, "application/x-kde-app-info") == 0)){ GnomeDesktopEntry *entry; entry = gnome_desktop_entry_load (fname); + if (entry){ gnome_desktop_entry_launch (entry); gnome_desktop_entry_free (entry); @@ -164,6 +170,7 @@ return 1; } } + /* We just struck out. Prompt the user. */ return 0; } @@ -171,6 +178,8 @@ int gmc_edit (char *fname) { + /* fname is a full path */ + const char *mime_type; const char *cmd; char *buf; @@ -187,10 +196,14 @@ return 1; } - mime_type = gnome_mime_type_or_default (fname, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (fname, NULL); + else + mime_type = gnome_mime_type_or_default (fname, NULL); + if (mime_type){ cmd = gnome_mime_get_value (mime_type, "edit"); - + if (cmd){ if (gmc_check_exec_string (cmd)) gmc_execute (fname, cmd, 0); @@ -202,7 +215,7 @@ gnome_config_push_prefix( "/editor/Editor/"); type = gnome_config_get_string ("EDITOR_TYPE=executable"); - + if (strcmp (type, "mc-internal") == 0){ g_free (type); do_edit (fname); @@ -216,13 +229,13 @@ if (on_terminal){ char *quoted = name_quote (fname, 0); char *editor_cmd = g_strconcat (editor, " ", quoted, NULL); - + gnome_open_terminal_with_cmd (editor_cmd); g_free (quoted); g_free (editor_cmd); } else { char *cmd = g_strconcat (editor, " %s", NULL); - + gmc_execute (fname, cmd, 0); g_free (cmd); } @@ -300,29 +313,36 @@ if (gnome_metadata_get (filename, "view", &size, &buf) == 0) return buf; - mime_type = gnome_mime_type_or_default (filename, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (filename, NULL); + else + mime_type = gnome_mime_type_or_default (filename, NULL); + if (!mime_type) return NULL; - - + + cmd = gnome_mime_get_value (mime_type, "fm-view"); - + if (cmd) return g_strdup (cmd); - + cmd = gnome_mime_get_value (mime_type, "view"); if (cmd){ return g_strdup (cmd); } return NULL; } - + int gmc_view (char *filename, int start_line) { gchar *cmd; const gchar *mime_type; - mime_type = gnome_mime_type_or_default (filename, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (filename, NULL); + else + mime_type = gnome_mime_type_or_default (filename, NULL); cmd = gmc_view_command (filename); if (cmd) { if (gmc_check_exec_string (cmd)) diff -ruN old/mc-4.5.42/gnome/gcorba.c new/mc-4.5.43/gnome/gcorba.c --- old/mc-4.5.42/gnome/gcorba.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gcorba.c Sat Mar 18 08:43:47 2000 @@ -12,7 +12,6 @@ #include "../vfs/vfs.h" #include #include "FileManager.h" -#include "gcmd.h" #include "gcorba.h" #include "gdesktop.h" #include "global.h" @@ -85,6 +84,46 @@ desktop_rescan_devices (); } +/* Desktop::arrange_icons method */ +static void +Desktop_arrange_icons (PortableServer_Servant servant, + GNOME_FileManager_Desktop_ArrangeType type, + CORBA_Environment *ev) +{ + SortType sort_type; + + switch (type) { + case GNOME_FileManager_Desktop_BY_NAME: + sort_type = SORT_NAME; + break; + + case GNOME_FileManager_Desktop_BY_TYPE: + sort_type = SORT_EXTENSION; + break; + + case GNOME_FileManager_Desktop_BY_SIZE: + sort_type = SORT_SIZE; + break; + + case GNOME_FileManager_Desktop_BY_ATIME: + sort_type = SORT_ACCESS; + break; + + case GNOME_FileManager_Desktop_BY_MTIME: + sort_type = SORT_MODIFY; + break; + + case GNOME_FileManager_Desktop_BY_CTIME: + sort_type = SORT_CHANGE; + break; + + default: + return; /* Should we raise an exception instead? */ + } + + desktop_arrange_icons (sort_type); +} + /* Fills the vepv structure for the desktop object */ static void Desktop_class_init (void) @@ -98,6 +137,7 @@ desktop_epv.rescan = Desktop_rescan; desktop_epv.rescan_devices = Desktop_rescan_devices; + desktop_epv.arrange_icons = Desktop_arrange_icons; desktop_vepv._base_epv = &desktop_base_epv; desktop_vepv.GNOME_FileManager_Desktop_epv = &desktop_epv; diff -ruN old/mc-4.5.42/gnome/gdesktop-icon.c new/mc-4.5.43/gnome/gdesktop-icon.c --- old/mc-4.5.42/gnome/gdesktop-icon.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gdesktop-icon.c Sat Mar 18 08:43:47 2000 @@ -6,6 +6,7 @@ */ #include +#include "gdesktop.h" #include #include #include @@ -13,7 +14,6 @@ #include #include "gdesktop-icon.h" #include "dir.h" -#include "gdesktop.h" /* Spacing between icon and text */ diff -ruN old/mc-4.5.42/gnome/gdesktop-prefs.c new/mc-4.5.43/gnome/gdesktop-prefs.c --- old/mc-4.5.42/gnome/gdesktop-prefs.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gdesktop-prefs.c Sat Mar 18 08:43:47 2000 @@ -6,9 +6,9 @@ */ #include +#include "gdesktop.h" #include #include "gdesktop-prefs.h" -#include "gdesktop.h" /* Size of the icon position box */ diff -ruN old/mc-4.5.42/gnome/gdesktop.c new/mc-4.5.43/gnome/gdesktop.c --- old/mc-4.5.42/gnome/gdesktop.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gdesktop.c Sat Mar 18 08:43:47 2000 @@ -43,13 +43,24 @@ /* Configuration options for the desktop */ int desktop_use_shaped_icons = TRUE; -int desktop_use_shaped_text = FALSE; int desktop_auto_placement = FALSE; int desktop_snap_icons = FALSE; int desktop_arr_r2l = FALSE; int desktop_arr_b2t = FALSE; int desktop_arr_rows = FALSE; +/* + * Possible values for this one: + * + * 0 -- Enable shaped text only if window manager is GNOME compliant + * 1 -- Enable shaped text always + * 2 -- Disable shaped text + * + * This might seem a bit strange, but it is like that for compatibility reasons. + */ + +int desktop_use_shaped_text = 0; + /* The computed name of the user's desktop directory */ char *desktop_directory; @@ -661,7 +672,15 @@ /* If the file dropped was a .desktop file, pull the suggested * title and icon from there */ - mime = gnome_mime_type_or_default (fau->filename, NULL); + if (use_magic) + { + char *full_name; + full_name = g_concat_dir_and_file (desktop_directory, fau->filename); + mime = gnome_mime_type_or_default_of_file (full_name, NULL); + g_free (full_name); + } + else + mime = gnome_mime_type_or_default (fau->filename, NULL); if (mime && strcmp (mime, "application/x-gnome-app-info") == 0) { GnomeDesktopEntry *entry; char *fullname; @@ -710,7 +729,7 @@ static void free_panel_from_desktop(WPanel *panel); /* Perform automatic arrangement of the desktop icons */ -static void +void desktop_arrange_icons (SortType type) { WPanel *panel; @@ -2688,6 +2707,9 @@ /* Create the menu and then strip the tearoff menu items, sigh... */ + if (nodesktop) + return; + popup = gnome_popup_menu_new (desktop_popup_items); strip_tearoff_menu_item (desktop_arrange_icons_items); @@ -3169,11 +3191,13 @@ { icon_hash = g_hash_table_new (g_str_hash, g_str_equal); - gdnd_init (); - gicon_init (); - create_layout_info (); - create_desktop_dir (); - desktop_reload_icons (FALSE, 0, 0); + if (!nodesktop) { + gdnd_init (); + gicon_init (); + create_layout_info (); + create_desktop_dir (); + desktop_reload_icons (FALSE, 0, 0); + } /* Create the proxy window and initialize all proxying stuff */ diff -ruN old/mc-4.5.42/gnome/gdesktop.h new/mc-4.5.43/gnome/gdesktop.h --- old/mc-4.5.42/gnome/gdesktop.h Mon Dec 6 18:50:05 1999 +++ new/mc-4.5.43/gnome/gdesktop.h Sat Mar 18 08:43:48 2000 @@ -10,6 +10,7 @@ #define GDESKTOP_H #include "dir.h" +#include "gcmd.h" /* Snap granularity for desktop icons -- maybe these should be calculated in @@ -73,6 +74,7 @@ void desktop_rescan_devices (void); void desktop_recreate_default_icons (void); void desktop_reload_icons (int user_pos, int xpos, int ypos); +void desktop_arrange_icons (SortType type); void desktop_create_url (const char *filename, const char *title, const char *url, const char *icon); extern int desktop_wm_is_gnome_compliant; diff -ruN old/mc-4.5.42/gnome/gdnd.c new/mc-4.5.43/gnome/gdnd.c --- old/mc-4.5.42/gnome/gdnd.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gdnd.c Sat Mar 18 08:43:47 2000 @@ -20,6 +20,7 @@ #include #include "gdesktop.h" #include "gdnd.h" +#include "gmain.h" /* Atoms for the DnD target types */ @@ -304,6 +305,9 @@ static int file_has_drop_action (char *filename) { + /* This function should be called with a full name, + so no full_name is necessary */ + char *buf; int size; const char *mime_type; @@ -312,7 +316,11 @@ g_free (buf); return TRUE; } else { - mime_type = gnome_mime_type_or_default (filename, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (filename, NULL); + else + mime_type = gnome_mime_type_or_default (filename, NULL); + if (!mime_type) return FALSE; @@ -365,7 +373,11 @@ /* 2. Try a drop action from the MIME-type */ - mime_type = gnome_mime_type_or_default (dest_full_name, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (dest_full_name, NULL); + else + mime_type = gnome_mime_type_or_default (dest_full_name, NULL); + if (mime_type) { const char *action; diff -ruN old/mc-4.5.42/gnome/gicon.c new/mc-4.5.43/gnome/gicon.c --- old/mc-4.5.42/gnome/gicon.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gicon.c Sat Mar 18 08:43:47 2000 @@ -1,6 +1,6 @@ /* Icon loading support for the Midnight Commander * - * Copyright (C) 1998-1999 The Free Software Foundation + * Copyright (C) 1998-2000 The Free Software Foundation * * Authors: Miguel de Icaza * Federico Mena @@ -15,6 +15,7 @@ #include #include "gicon.h" +#include "gmain.h" /* What kinds of images can an icon set contain */ @@ -59,7 +60,6 @@ /* Whether we should always use (expensive) metadata lookups for file panels or not */ int we_can_afford_the_speed = 0; - /* Builds a composite of the plain image and the litle symlink icon */ static GdkImlibImage * build_overlay (GdkImlibImage *plain, GdkImlibImage *overlay) @@ -72,6 +72,8 @@ im = gdk_imlib_clone_image (plain); + g_return_val_if_fail(plain, NULL); + g_return_val_if_fail(overlay, NULL); rowstride = plain->rgb_width * 3; overlay_rowstride = overlay->rgb_width * 3; @@ -211,14 +213,6 @@ return iset; } -/* Die because the icon installation is wrong */ -static void -die_with_no_icons (void) -{ - message (1, _("Error"), _("Default set of icons not found, please check your installation")); - exit (1); -} - /* Convenience function to load one of the default icons and die if this fails */ static IconSet * get_stock_icon (char *name) @@ -230,9 +224,6 @@ iset = get_icon_set (filename); g_free (filename); - if (!iset) - die_with_no_icons (); - return iset; } @@ -247,9 +238,6 @@ im = gdk_imlib_load_image (filename); g_free (filename); - if (!im) - die_with_no_icons (); - return im; } @@ -288,6 +276,13 @@ symlink_overlay = get_stock_overlay ("i-symlink.png"); stalled_overlay = get_stock_overlay ("i-stalled.png"); + if (!iset_directory || !iset_dirclosed || !iset_executable || + !iset_regular || !iset_core || !iset_fifo || !iset_chardev || + !iset_blockdev || !symlink_overlay || !stalled_overlay) { + message (1, _("Error"), _("Default set of icons not found, check your installation")); + exit(1); + } + our_uid = getuid (); our_gid = getgid (); } @@ -474,7 +469,15 @@ /* 4. Try MIME-types */ - mime_type = gnome_mime_type_or_default (fe->fname, NULL); + if (use_magic) { + char *full_name; + full_name = g_concat_dir_and_file (directory, fe->fname); + mime_type = gnome_mime_type_or_default_of_file (full_name, NULL); + g_free (full_name); + } + else + mime_type = gnome_mime_type_or_default (fe->fname, NULL); + if (mime_type) { const char *icon_name; @@ -492,7 +495,7 @@ add_link: - g_assert (iset != NULL); + g_return_val_if_fail (iset, NULL); if (S_ISLNK (mode)) { if (fe->f.link_to_dir && !is_user_set) diff -ruN old/mc-4.5.42/gnome/gmain.h new/mc-4.5.43/gnome/gmain.h --- old/mc-4.5.42/gnome/gmain.h Mon Dec 6 18:50:06 1999 +++ new/mc-4.5.43/gnome/gmain.h Sat Mar 18 08:43:48 2000 @@ -9,8 +9,9 @@ void xtoolkit_end (void); extern Dlg_head *desktop_dlg; -extern int nowindows; +extern int nowindows, nodesktop, twopanel; extern int corba_have_server; +extern int use_magic; /* Required by the standard code */ widget_data xtoolkit_create_dialog (Dlg_head *h, int with_grid); diff -ruN old/mc-4.5.42/gnome/gmc-client.c new/mc-4.5.43/gnome/gmc-client.c --- old/mc-4.5.42/gnome/gmc-client.c Mon Dec 6 18:50:06 1999 +++ new/mc-4.5.43/gnome/gmc-client.c Sat Mar 18 08:43:48 2000 @@ -119,6 +119,39 @@ return TRUE; } +/* Arrange the desktop icons */ +static int +arrange_desktop_icons (const char *type, CORBA_Environment *ev) +{ + CORBA_Object obj; + GNOME_FileManager_Desktop_ArrangeType arr_type; + + if (strcmp (type, "name") == 0) + arr_type = GNOME_FileManager_Desktop_BY_NAME; + else if (strcmp (type, "type") == 0) + arr_type = GNOME_FileManager_Desktop_BY_TYPE; + else if (strcmp (type, "size") == 0) + arr_type = GNOME_FileManager_Desktop_BY_SIZE; + else if (strcmp (type, "atime") == 0) + arr_type = GNOME_FileManager_Desktop_BY_ATIME; + else if (strcmp (type, "mtime") == 0) + arr_type = GNOME_FileManager_Desktop_BY_MTIME; + else if (strcmp (type, "ctime") == 0) + arr_type = GNOME_FileManager_Desktop_BY_CTIME; + else { + fprintf (stderr, _("Unknown arrange type `%s'\n"), type); + return FALSE; + } + + obj = get_desktop (); + if (obj == CORBA_OBJECT_NIL) + return FALSE; + + GNOME_FileManager_Desktop_arrange_icons (obj, arr_type, ev); + CORBA_Object_release (obj, ev); + return TRUE; +} + /* Close invalid windows */ static int close_invalid_windows (CORBA_Environment *ev) @@ -143,11 +176,13 @@ ARG_RESCAN_DIRECTORY, ARG_RESCAN_DESKTOP, ARG_RESCAN_DESKTOP_DEVICES, + ARG_ARRANGE_DESKTOP_ICONS, ARG_CLOSE_INVALID_WINDOWS }; static int selected_option = -1; static char *directory; +static char *arrange_type; /* Parse an argument */ static void @@ -175,6 +210,9 @@ N_("Rescan the desktop icons"), NULL }, { "rescan-desktop-devices", '\0', POPT_ARG_NONE, NULL, ARG_RESCAN_DESKTOP_DEVICES, N_("Rescan the desktop device icons"), NULL }, + { "arrange-desktop-icons", '\0', POPT_ARG_STRING, &arrange_type, ARG_ARRANGE_DESKTOP_ICONS, + N_("Arrange the desktop icons"), + N_("name | type | size | atime | mtime | ctime") }, { "close-invalid-windows", '\0', POPT_ARG_NONE, NULL, ARG_CLOSE_INVALID_WINDOWS, N_("Close windows whose directories cannot be reached"), NULL }, { NULL, '\0', 0, NULL, 0, NULL, NULL } @@ -213,6 +251,10 @@ case ARG_RESCAN_DESKTOP_DEVICES: result = rescan_desktop_devices (&ev); + break; + + case ARG_ARRANGE_DESKTOP_ICONS: + result = arrange_desktop_icons (arrange_type, &ev); break; case ARG_CLOSE_INVALID_WINDOWS: diff -ruN old/mc-4.5.42/gnome/gmount.c new/mc-4.5.43/gnome/gmount.c --- old/mc-4.5.42/gnome/gmount.c Mon Dec 6 18:50:04 1999 +++ new/mc-4.5.43/gnome/gmount.c Sat Mar 18 08:43:47 2000 @@ -69,13 +69,6 @@ #include #endif -/* 4.4BSD2 derived systems */ -#if defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -# ifndef MOUNT_UFS -# define xBSD -# endif -#endif - /* void error (void); FIXME -- needed? */ #ifdef DOLPHIN diff -ruN old/mc-4.5.42/gnome/gnome-file-property-dialog.c new/mc-4.5.43/gnome/gnome-file-property-dialog.c --- old/mc-4.5.42/gnome/gnome-file-property-dialog.c Mon Dec 6 18:50:05 1999 +++ new/mc-4.5.43/gnome/gnome-file-property-dialog.c Sat Mar 18 08:43:47 2000 @@ -33,6 +33,7 @@ #include "../vfs/vfs.h" #include "gicon.h" #include "dialog.h" +#include "gmain.h" static void gnome_file_property_dialog_init (GnomeFilePropertyDialog *file_property_dialog); static void gnome_file_property_dialog_class_init (GnomeFilePropertyDialogClass *klass); @@ -198,9 +199,18 @@ /* File statistics */ /* File type first */ if (S_ISREG (fp_dlg->st.st_mode)) { - gen_string = g_strconcat (_("File Type: "), - gnome_mime_type (fp_dlg->file_name), - NULL); + if (use_magic) + { + gen_string = g_strconcat (_("File Type: "), + gnome_mime_type_or_default_of_file (fp_dlg->file_name, "text/plain"), + NULL); + } + else + { + gen_string = g_strconcat (_("File Type: "), + gnome_mime_type (fp_dlg->file_name), + NULL); + } label = gtk_label_new (gen_string); g_free (gen_string); } else if (S_ISLNK (fp_dlg->st.st_mode)) { @@ -624,8 +634,9 @@ } /* Permissions Pane */ + static GtkWidget * -label_new (char *text, double xalign, double yalign) +align_label_new (char *text, double xalign, double yalign) { GtkWidget *label; @@ -719,15 +730,15 @@ GTK_FILL | GTK_SHRINK, \ 0, 0); -#define PERMSET(name, r, w, x, rmask, wmask, xmask, y) do { \ - r = perm_check_new (NULL, fp_dlg->st.st_mode & rmask, fp_dlg); \ - w = perm_check_new (NULL, fp_dlg->st.st_mode & wmask, fp_dlg); \ - x = perm_check_new (NULL, fp_dlg->st.st_mode & xmask, fp_dlg); \ - \ - ATTACH (table, label_new (name, 0.0, 0.5), 0, 1, y, y + 1); \ - ATTACH (table, r, 1, 2, y, y + 1); \ - ATTACH (table, w, 2, 3, y, y + 1); \ - ATTACH (table, x, 3, 4, y, y + 1); \ +#define PERMSET(name, r, w, x, rmask, wmask, xmask, y) do { \ + r = perm_check_new (NULL, fp_dlg->st.st_mode & rmask, fp_dlg); \ + w = perm_check_new (NULL, fp_dlg->st.st_mode & wmask, fp_dlg); \ + x = perm_check_new (NULL, fp_dlg->st.st_mode & xmask, fp_dlg); \ + \ + ATTACH (table, align_label_new (name, 0.0, 0.5), 0, 1, y, y + 1); \ + ATTACH (table, r, 1, 2, y, y + 1); \ + ATTACH (table, w, 2, 3, y, y + 1); \ + ATTACH (table, x, 3, 4, y, y + 1); \ } while (0); static GtkWidget * @@ -750,9 +761,10 @@ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (hbox), label_new (_("Current mode: "), 0.0, 0.5), FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), align_label_new (_("Current mode: "), 0.0, 0.5), + FALSE, FALSE, 0); - fp_dlg->mode_label = label_new ("0000", 0.0, 0.5); + fp_dlg->mode_label = align_label_new ("0000", 0.0, 0.5); gtk_box_pack_start (GTK_BOX (hbox), fp_dlg->mode_label, FALSE, FALSE, 0); table = gtk_table_new (4, 5, FALSE); @@ -765,10 +777,10 @@ /* Headings */ - ATTACH (table, label_new (_("Read"), 0.0, 0.5), 1, 2, 0, 1); - ATTACH (table, label_new (_("Write"), 0.0, 0.5), 2, 3, 0, 1); - ATTACH (table, label_new (_("Exec"), 0.0, 0.5), 3, 4, 0, 1); - ATTACH (table, label_new (_("Special"), 0.0, 0.5), 4, 5, 0, 1); + ATTACH (table, align_label_new (_("Read"), 0.0, 0.5), 1, 2, 0, 1); + ATTACH (table, align_label_new (_("Write"), 0.0, 0.5), 2, 3, 0, 1); + ATTACH (table, align_label_new (_("Exec"), 0.0, 0.5), 3, 4, 0, 1); + ATTACH (table, align_label_new (_("Special"), 0.0, 0.5), 4, 5, 0, 1); /* Permissions */ @@ -927,7 +939,7 @@ /* Owner */ - gtk_table_attach (GTK_TABLE (table), label_new (_("Owner"), 0.0, 0.5), + gtk_table_attach (GTK_TABLE (table), align_label_new (_("Owner"), 0.0, 0.5), 0, 1, 0, 1, GTK_FILL | GTK_SHRINK, GTK_FILL | GTK_SHRINK, 0, 0); @@ -942,7 +954,7 @@ /* Group */ - gtk_table_attach (GTK_TABLE (table), label_new (_("Group"), 0.0, 0.5), + gtk_table_attach (GTK_TABLE (table), align_label_new (_("Group"), 0.0, 0.5), 0, 1, 1, 2, GTK_FILL | GTK_SHRINK, GTK_FILL | GTK_SHRINK, 0, 0); @@ -1016,7 +1028,13 @@ /* * Mime type. */ - mime_type = (char *) gnome_mime_type_or_default (file_name, NULL); + if (use_magic) + { + mime_type = (char *) gnome_mime_type_or_default_of_file (file_name, NULL); + } + else + mime_type = (char *) gnome_mime_type_or_default (file_name, NULL); + if (!mime_type) return; fp_dlg->mime_fm_open = gnome_mime_get_value (mime_type, "fm-open"); diff -ruN old/mc-4.5.42/gnome/gpopup2.c new/mc-4.5.43/gnome/gpopup2.c --- old/mc-4.5.42/gnome/gpopup2.c Mon Dec 6 18:50:05 1999 +++ new/mc-4.5.43/gnome/gpopup2.c Sat Mar 18 08:43:47 2000 @@ -305,7 +305,10 @@ g_assert (filename != NULL); g_assert (key != NULL); - mime_type = gnome_mime_type_or_default (filename, NULL); + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (filename, NULL); + else + mime_type = gnome_mime_type_or_default (filename, NULL); g_assert (mime_type != NULL); /* @@ -371,8 +374,10 @@ } else full_name = g_concat_dir_and_file (panel->cwd, panel->dir.list[panel->selected].fname); - mime_type = gnome_mime_type_or_default (full_name, NULL); - + if (use_magic) + mime_type = gnome_mime_type_or_default_of_file (full_name, NULL); + else + mime_type = gnome_mime_type_or_default (full_name, NULL); if (!mime_type) { g_free (full_name); return pos; diff -ruN old/mc-4.5.42/gnome/gprefs.c new/mc-4.5.43/gnome/gprefs.c --- old/mc-4.5.42/gnome/gprefs.c Mon Dec 6 18:50:05 1999 +++ new/mc-4.5.43/gnome/gprefs.c Sat Mar 18 08:43:47 2000 @@ -104,6 +104,10 @@ N_("Use shell patterns instead of regular expressions"), PROPERTY_BOOL, &easy_patterns, NULL, NULL, NULL }, + { + N_("Determine file types from file content instead of extensions"), PROPERTY_BOOL, + &use_magic, NULL, NULL, NULL + }, PROPERTIES_DONE }; diff -ruN old/mc-4.5.42/gnome/gscreen.c new/mc-4.5.43/gnome/gscreen.c --- old/mc-4.5.42/gnome/gscreen.c Mon Dec 6 18:50:05 1999 +++ new/mc-4.5.43/gnome/gscreen.c Sat Mar 18 08:43:47 2000 @@ -201,9 +201,19 @@ int i, col, type_col, color; int width, p; char **texts; + GtkAdjustment *va; + double clist_v_pos; texts = g_new (char *, items + 1); + /* CList doesn't restore its vertical scroll position when its cleared, + * so we need to do it manually. + */ + + /* Save the vertical position */ + va = scrolled_window_get_vadjustment (panel->list); + clist_v_pos = va->value; + gtk_clist_freeze (GTK_CLIST (cl)); gtk_clist_clear (GTK_CLIST (cl)); @@ -266,6 +276,9 @@ gtk_clist_set_column_width (cl, i, width); } + + /* Now restore the clist's vertical position */ + gtk_adjustment_set_value (va, clist_v_pos); gtk_clist_thaw (GTK_CLIST (cl)); } diff -ruN old/mc-4.5.42/gnome/mc.keys.in.in new/mc-4.5.43/gnome/mc.keys.in.in --- old/mc-4.5.42/gnome/mc.keys.in.in Mon Dec 6 18:50:03 1999 +++ new/mc-4.5.43/gnome/mc.keys.in.in Sat Mar 18 08:43:47 2000 @@ -1,5 +1,9 @@ application/pdf: open=xpdf %f + icon-filename=@icondir@/gnome-application-pdf.png + +application/pgp: + icon-filename=@icondir@/gnome-application-pgp.png application/postscript: open=gv %f @@ -13,7 +17,7 @@ open.extractf.Extract with flags=I=%{Enter any Unzip flags:}; if test -n "$I"; then unzip $I %f; fi application/x-e-theme: - icon-filename=@icondir@/gnome-compressed.png + icon-filename=@icondir@/gnome-application-x-e-theme.png application/x-theme: icon-filename=@icondir@/gnome-compressed.png @@ -32,6 +36,9 @@ application/x-troff-me: fm-view=%view{ascii,nroff} nroff @TROFFASCII@ -me %f +application/*spreadsheet*: + icon-filename=@icondir@/gnome-application-x-generic-spreadsheet.png + application/x-gzip: icon-filename=@icondir@/gnome-compressed.png @@ -65,12 +72,20 @@ icon-filename=@icondir@/gnome-text-html.png open=gnome-moz-remote file:%f +application/x-php: + icon-filename=@icondir@/gnome-application-x-php.png + open=gnome-moz-remote file:%f + application/x-cpio: fm-open=%cd %d/%p#ucpio/ fm-view=%view{ascii} cat %f | cpio -ictv application/x-backup: - icon-filename=/usr/share/pixmaps/gnome-default-dlg.png + icon-filename=@icondir@/../gnome-default-dlg.png + +application/x-reject: + icon-filename=@icondir@/gnome-application-x-reject.png + application/x-applix-spreadsheet open=applix %f @@ -149,6 +164,12 @@ view=xdvi %f open.convert.Convert file to Postscript=dvips %f -o `basename %f .dvi`.ps +application/x-gnome-app-info: + icon-filename=@icondir@/gnome-application-x-gnome-app-info.png + +application/x-kde-app-info: + icon-filename=@icondir@/gnome-application-x-kde-app-info.png + application/x-tex: open.tex."TeX this file"=tex %f flags.tex.flags=needsterminal @@ -177,6 +198,9 @@ audio/x-pn-realaudio: icon-filename=@icondir@/gnome-audio-x-pn-realaudio.png +audio/x-stm: + icon-filename=@icondir@/gnome-audio-x-stm.png + audio/x-voc: icon-filename=@icondir@/gnome-audio-x-voc.png @@ -196,13 +220,26 @@ view=xmms %f audio/x-s3m: + icon-filename=@icondir@/gnome-audio-x-s3m.png open=xmms %f view=xmms %f +audio/x-xi: + icon-filename=@icondir/gnome-audio-x-xi.png + audio/x-xm: + icon-filename=@icondir@/gnome-audio-x-xm.png open=xmms %f view=xmms %f +font/afm: + icon-filename=@icondir@/gnome-font-afm.png + +font/ttf: + icon-filename=@icondir@/gnome-font-ttf.png + +font/x-pcf: + icon-filename=@icondir@/gnome-font-x-pcf.png image/*: icon-filename=@icondir@/gnome-image-generic.png @@ -233,6 +270,7 @@ icon-filename=@icondir@/gnome-image-ief.png image/x-xfig: + icon-filename=@icondir@/gnome-image-x-xfig.png open=xfig %f view=xfig %f @@ -287,15 +325,41 @@ edit=gnome-edit %f fm-view=%view{ascii} +text/x-authors: + icon-filename=@icondir@/gnome-text-x-authors.png + +text/x-copying: + icon-filename=@icondir@/gnome-text-x-copying.png + +text/x-credits: + icon-filename=@icondir@/gnome-text-x-credits.png + +text/x-install: + icon-filename=@icondir@/gnome-text-x-install.png + +text/x-makefile: + icon-filename=@icondir@/gnome-text-x-makefile.png + +text/x-readme: + icon-filename=@icondir@/gnome-text-x-readme.png + text/x-vCard: icon-filename=@gnomeicons@/gnome-calendar.png - text/x-c: icon-filename=@icondir@/gnome-application-x-c-source.png text/x-C++: icon-filename=@icondir@/gnome-application-x-cc-source.png + +text/x-java: + icon-filename=@icondir@/gnome-application-x-java-source.png + +text/x-scheme: + icon-filename=@icondir@/gnome-application-x-scheme-source.png + +text/x-sql: + icon-filename=@icondir@/gnome-application-x-sql.png text/x-comma-separated-values: open=gnumeric %f diff -ruN old/mc-4.5.42/gtkedit/edit.c new/mc-4.5.43/gtkedit/edit.c --- old/mc-4.5.42/gtkedit/edit.c Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/gtkedit/edit.c Sat Mar 18 08:43:45 2000 @@ -73,6 +73,8 @@ Returns '\n' if out of bounds. */ +static int push_action_disabled = 0; + #ifndef NO_INLINE_GETBYTE int edit_get_byte (WEdit * edit, long byte_index) @@ -103,6 +105,25 @@ return t; } + +/* Note on CRLF->LF translation: */ + +#if MY_O_TEXT +#error MY_O_TEXT is depreciated. CR_LF_TRANSLATION must be defined which does CR-LF translation internally. See note in source. +#endif + +/* + The edit_open_file (previously edit_load_file) function uses + init_dynamic_edit_buffers to load a file. This is unnecessary + since you can just as well fopen the file and insert the + characters one by one. The real reason for + init_dynamic_edit_buffers (besides allocating the buffers) is + as an optimisation - it uses raw block reads and inserts large + chunks at a time. It is hence extremely fast at loading files. + Where we might not want to use it is if we were doing + CRLF->LF translation or if we were reading from a pipe. + */ + /* Initialisation routines */ /* returns 1 on error */ @@ -110,14 +131,6 @@ /* cursor set to start of file */ int init_dynamic_edit_buffers (WEdit * edit, const char *filename, const char *text) { - -#if defined CR_LF_TRANSLATION - /* Variables needed for safe handling of Translation from Microsoft CR/LF EOL to - Unix Style LF EOL - Franco */ - long bytes_wanted,bytes_read,bytes_missing; - char *p; -#endif - long buf; int j, file = -1, buf2; @@ -127,9 +140,9 @@ } if (filename) - if ((file = open ((char *) filename, O_RDONLY | MY_O_TEXT)) == -1) { + if ((file = open ((char *) filename, O_RDONLY)) == -1) { /* The file-name is printed after the ':' */ - edit_error_dialog (_(" Error "), get_sys_error (catstrs (_(" Failed trying to open file for reading: "), filename, " ", 0))); + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Failed trying to open file for reading: "), filename, " ", 0))); return 1; } edit->curs2 = edit->last_byte; @@ -138,59 +151,18 @@ edit->buffers2[buf2] = CMalloc (EDIT_BUF_SIZE); -/* -_read returns the number of bytes read, -which may be less than count if there are fewer than count bytes left in the file -or if the file was opened in text mode, -in which case each carriage return–linefeed (CR-LF) pair is replaced -with a single linefeed character. Only the single linefeed character is counted -in the return value. The replacement does not affect the file pointer. - -_eof returns 1 if the current position is end of file, or 0 if it is not. -A return value of -1 indicates an error; in this case, errno is set to EBADF, -which indicates an invalid file handle. -*/ - if (filename){ - -#if defined CR_LF_TRANSLATION - bytes_wanted=edit->curs2 & M_EDIT_BUF_SIZE; - p = (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE); - bytes_read = read (file, p , edit->curs2 & M_EDIT_BUF_SIZE); - bytes_missing = bytes_wanted - bytes_read ; - while(bytes_missing ){ - p += bytes_read; - bytes_read = read(file,p,bytes_missing); - if(bytes_read <= 0) break; - bytes_missing -= bytes_read ; - } -#else + if (filename) { read (file, (char *) edit->buffers2[buf2] + EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE), edit->curs2 & M_EDIT_BUF_SIZE); -#endif - } - else { + } else { memcpy (edit->buffers2[buf2] + EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE), text, edit->curs2 & M_EDIT_BUF_SIZE); text += edit->curs2 & M_EDIT_BUF_SIZE; } for (buf = buf2 - 1; buf >= 0; buf--) { edit->buffers2[buf] = CMalloc (EDIT_BUF_SIZE); - if (filename){ -#if defined CR_LF_TRANSLATION - bytes_wanted = EDIT_BUF_SIZE; - p = (char *) edit->buffers2[buf]; - bytes_read = read (file, p, EDIT_BUF_SIZE); - bytes_missing = bytes_wanted - bytes_read ; - while(bytes_missing ){ - p += bytes_read; - bytes_read = read(file,p,bytes_missing); - if(bytes_read <= 0) break; - bytes_missing -= bytes_read ; - } -#else + if (filename) { read (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE); -#endif - } - else { + } else { memcpy (edit->buffers2[buf], text, EDIT_BUF_SIZE); text += EDIT_BUF_SIZE; } @@ -199,81 +171,261 @@ edit->curs1 = 0; if (file != -1) close (file); - return 0; } -/* returns 1 on error */ -int edit_load_file (WEdit * edit, const char *filename, const char *text, unsigned long text_size) +/* detecting an error on save is easy: just check if every byte has been written. */ +/* detecting an error on read, is not so easy 'cos there is not way to tell + whether you read everything or not. */ +/* FIXME: add proper `triple_pipe_open' to read, write and check errors. */ +static struct edit_filters { + char *read, *write, *extension; +} all_filters[] = { + + { + "bzip2 -cd %s 2>&1", "bzip2 > %s", ".bz2" + }, + { + "gzip -cd %s 2>&1", "gzip > %s", ".gz" + }, + { + "compress -cd %s 2>&1", "compress > %s", ".Z" + } +}; + +static int edit_find_filter (const char *filename) { - struct stat s; - int file; + int i, l; + if (!filename) + return -1; + l = strlen (filename); + for (i = 0; i < sizeof (all_filters) / sizeof (struct edit_filters); i++) { + int e; + e = strlen (all_filters[i].extension); + if (l > e) + if (!strcmp (all_filters[i].extension, filename + l - e)) + return i; + } + return -1; +} -/* VARS for Lastbyte calculation in TEXT mode FRANCO */ -#if defined CR_LF_TRANSLATION - char tmp_buf[1024]; - long real_size,bytes_read; +char *edit_get_filter (const char *filename) +{ + int i, l; + char *p; + i = edit_find_filter (filename); + if (i < 0) + return 0; + l = strlen (filename); + p = malloc (strlen (all_filters[i].read) + l + 2); + sprintf (p, all_filters[i].read, filename); + return p; +} + +char *edit_get_write_filter (char *writename, char *filename) +{ + int i, l; + char *p; + i = edit_find_filter (filename); + if (i < 0) + return 0; + l = strlen (writename); + p = malloc (strlen (all_filters[i].write) + l + 2); + sprintf (p, all_filters[i].write, writename); + return p; +} + +#ifdef CR_LF_TRANSLATION +/* reads into buffer, replace \r\n with \n */ +long edit_insert_stream (WEdit * edit, FILE * f) +{ + int a = -1, b; + long i; + while ((b = fgetc (f))) { + if (a == '\r' && b == '\n') { + edit_insert (edit, '\n'); + i++; + a = -1; + continue; + } else if (a >= 0) { + edit_insert (edit, a); + i++; + } + a = b; + } + if (a >= 0) + edit_insert (edit, a); + return i; +} +/* writes buffer, replaces, replace \n with \r\n */ +long edit_write_stream (WEdit * edit, FILE * f) +{ + long i; + int c; + for (i = 0; i < edit->last_byte; i++) { + c = edit_get_byte (edit, i); + if (c == '\n') { + if (fputc ('\r', f) < 0) + break; + if (fputc ('\n', f) < 0) + break; + } else { + if (fputc (c, f) < 0) + break; + } + } + return i; +} +#else +long edit_insert_stream (WEdit * edit, FILE * f) +{ + int c; + long i = 0; + while ((c = fgetc (f)) >= 0) { + edit_insert (edit, c); + i++; + } + return i; +} +long edit_write_stream (WEdit * edit, FILE * f) +{ + long i; + for (i = 0; i < edit->last_byte; i++) + if (fputc (edit_get_byte (edit, i), f) < 0) + break; + return i; +} #endif - if (text) { - edit->last_byte = text_size; - filename = NULL; +#define TEMP_BUF_LEN 1024 + +/* inserts a file at the cursor, returns 1 on success */ +int edit_insert_file (WEdit * edit, const char *filename) +{ + char *p; + if ((p = edit_get_filter (filename))) { + FILE *f; + long current = edit->curs1; + f = (FILE *) popen (p, "r"); + if (f) { + edit_insert_stream (edit, f); + edit_cursor_move (edit, current - edit->curs1); + if (pclose (f) > 0) { + edit_error_dialog (_ (" Error "), catstrs (_ (" Error reading from pipe: "), p, " ", 0)); + free (p); + return 0; + } + } else { + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Failed trying to open pipe for reading: "), p, " ", 0))); + free (p); + return 0; + } + free (p); +#ifdef CR_LF_TRANSLATION } else { -#if defined(MIDNIGHT) || defined(GTK) - if ((file = open ((char *) filename, O_RDONLY | MY_O_TEXT )) < 0) - { - close(creat((char *) filename, 0666)); - if ((file = open ((char *) filename, O_RDONLY | MY_O_TEXT )) < 0) { - edit_error_dialog (_(" Error "), get_sys_error (catstrs (" Fail trying to open the file, ", filename, ", for reading ", 0))); - return 1; - } - edit->delete_file = 1; + FILE *f; + long current = edit->curs1; + f = fopen (filename, "r"); + if (f) { + edit_insert_stream (edit, f); + edit_cursor_move (edit, current - edit->curs1); + if (fclose (f)) { + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Error reading file: "), filename, " ", 0))); + return 0; + } + } else { + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Failed trying to open file for reading: "), filename, " ", 0))); + return 0; } #else + } else { + int i, file, blocklen; + long current = edit->curs1; + unsigned char *buf; + if ((file = open ((char *) filename, O_RDONLY)) == -1) + return 0; + buf = malloc (TEMP_BUF_LEN); + while ((blocklen = read (file, (char *) buf, TEMP_BUF_LEN)) > 0) { + for (i = 0; i < blocklen; i++) + edit_insert (edit, buf[i]); + } + edit_cursor_move (edit, current - edit->curs1); + free (buf); + close (file); + if (blocklen) + return 0; +#endif + } + return 1; +} + +static int check_file_access (WEdit *edit, const char *filename, struct stat *st) +{ + int file; +#if defined(MIDNIGHT) || defined(GTK) + if ((file = open ((char *) filename, O_RDONLY)) < 0) { + close (creat ((char *) filename, 0666)); if ((file = open ((char *) filename, O_RDONLY)) < 0) { - edit_error_dialog (_(" Error "), get_sys_error (catstrs (_(" Failed trying to open file for reading: "), filename, " ", 0))); - return 1; + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (" Fail trying to open the file, ", filename, ", for reading ", 0))); + return 2; } + } +#else + if ((file = open ((char *) filename, O_RDONLY)) < 0) { + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Failed trying to open file for reading: "), filename, " ", 0))); + return 1; + } #endif - if (stat ((char *) filename, &s) < 0) { - close (file); + if (stat ((char *) filename, st) < 0) { + close (file); /* The file-name is printed after the ':' */ - edit_error_dialog (_(" Error "), get_sys_error (catstrs (_(" Cannot get size/permissions info on file: "), filename, " ", 0))); - return 1; - } - if (S_ISDIR (s.st_mode) || S_ISSOCK (s.st_mode) - || S_ISFIFO (s.st_mode)) { - close (file); + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Cannot get size/permissions info on file: "), filename, " ", 0))); + return 1; + } + if (S_ISDIR (st->st_mode) || S_ISSOCK (st->st_mode) + || S_ISFIFO (st->st_mode)) { + close (file); /* The file-name is printed after the ':' */ - edit_error_dialog (_(" Error "), catstrs (_(" Not an ordinary file: "), filename, " ", 0)); - return 1; - } - if (s.st_size >= SIZE_LIMIT) { - close (file); + edit_error_dialog (_ (" Error "), catstrs (_ (" Not an ordinary file: "), filename, " ", 0)); + return 1; + } + if (st->st_size >= SIZE_LIMIT) { + close (file); /* The file-name is printed after the ':' */ - edit_error_dialog (_(" Error "), catstrs (_(" File is too large: "), \ - filename, _(" \n Increase edit.h:MAXBUF and recompile the editor. "), 0)); - return 1; - } - -/* Lastbyte calculation in TEXT mode FRANCO */ -#if defined CR_LF_TRANSLATION - if(file && (!text)){ - real_size=0; - tmp_buf[sizeof (tmp_buf) - 1] = 0; - while((bytes_read = read(file,tmp_buf,1024)) > 0){ - real_size += bytes_read; - } - s.st_size = real_size; - } + edit_error_dialog (_ (" Error "), catstrs (_ (" File is too large: "), \ + filename, _ (" \n Increase edit.h:MAXBUF and recompile the editor. "), 0)); + return 1; + } + close (file); + return 0; +} +/* returns 1 on error */ +int edit_open_file (WEdit * edit, const char *filename, const char *text, unsigned long text_size) +{ + struct stat st; + if (text) { + edit->last_byte = text_size; + filename = 0; + } else { + int r; + r = check_file_access (edit, filename, &st); +#if defined(MIDNIGHT) || defined(GTK) + if (r == 2) + return edit->delete_file = 1; +#endif + if (r) + return 1; + edit->stat = st; +#ifndef CR_LF_TRANSLATION + edit->last_byte = st.st_size; +#else +/* going to read the file into the buffer later byte by byte */ + edit->last_byte = 0; + filename = 0; + text = ""; #endif - - close (file); - edit->last_byte = s.st_size; - edit->stat = s; } - return init_dynamic_edit_buffers (edit, filename, text); } @@ -282,7 +434,6 @@ #else int space_width; extern int option_long_whitespace; -extern unsigned char per_char[256]; void edit_set_space_width (int s) { @@ -291,26 +442,25 @@ #endif +int (*edit_file_is_open) (char *) = 0; + /* fills in the edit struct. returns 0 on fail. Pass edit as NULL for this */ WEdit *edit_init (WEdit * edit, int lines, int columns, const char *filename, const char *text, const char *dir, unsigned long text_size) { char *f; int to_free = 0; + int use_filter = 0; #ifndef MIDNIGHT if (option_long_whitespace) - edit_set_space_width (per_char[' '] * 2); + edit_set_space_width (FONT_PER_CHAR[' '] * 2); else - edit_set_space_width (per_char[' ']); + edit_set_space_width (FONT_PER_CHAR[' ']); #endif if (!edit) { edit = malloc (sizeof (WEdit)); memset (edit, 0, sizeof (WEdit)); to_free = 1; } - if (!edit) { - edit_error_dialog (_(" Error "), _(" Error allocating memory ")); - return 0; - } memset (&(edit->from_here), 0, (unsigned long) &(edit->to_here) - (unsigned long) &(edit->from_here)); #ifndef MIDNIGHT edit->max_column = columns * FONT_MEAN_WIDTH; @@ -324,13 +474,32 @@ if (!dir) dir = ""; f = (char *) filename; - if (filename) + if (filename) { f = catstrs (dir, filename, 0); - if (edit_load_file (edit, f, text, text_size)) { + if (edit_file_is_open) + if ((*edit_file_is_open) (f)) { + if (to_free) + free (edit); + return 0; + } + } + if (edit_find_filter (f) < 0) { +#ifdef CR_LF_TRANSLATION + use_filter = 1; +#endif + if (edit_open_file (edit, f, text, text_size)) { /* edit_load_file already gives an error message */ - if (to_free) - free (edit); - return 0; + if (to_free) + free (edit); + return 0; + } + } else { + use_filter = 1; + if (edit_open_file (edit, 0, "", 0)) { + if (to_free) + free (edit); + return 0; + } } edit->force |= REDRAW_PAGE; if (filename) { @@ -338,18 +507,32 @@ edit_split_filename (edit, (char *) filename); } else { edit->filename = (char *) strdup (""); - edit->dir = (char *) strdup(dir); + edit->dir = (char *) strdup (dir); } edit->stack_size = START_STACK_SIZE; edit->stack_size_mask = START_STACK_SIZE - 1; edit->undo_stack = malloc ((edit->stack_size + 10) * sizeof (long)); - if (!edit->undo_stack) { - edit_error_dialog (_(" Error "), _(" Error allocating memory ")); - if (to_free) - free (edit); - return 0; - } edit->total_lines = edit_count_lines (edit, 0, edit->last_byte); + if (use_filter) { + struct stat st; + push_action_disabled = 1; + if (check_file_access (edit, filename, &st)) { + edit_clean (edit); + if (to_free) + free (edit); + return 0; + } + edit->stat = st; + if (!edit_insert_file (edit, f)) { + edit_clean (edit); + if (to_free) + free (edit); + return 0; + } +/* FIXME: this should be an unmodification() function */ + push_action_disabled = 0; + } + edit->modified = 0; edit_load_syntax (edit, 0, 0); { int fg, bg; @@ -358,7 +541,6 @@ return edit; } - /* clear the edit struct, freeing everything in it. returns 1 on success */ int edit_clean (WEdit * edit) { @@ -408,12 +590,20 @@ /* returns 1 on success, if returns 0, the edit struct would have been free'd */ int edit_reload (WEdit * edit, const char *filename, const char *text, const char *dir, unsigned long text_size) { + WEdit *e; int lines = edit->num_widget_lines; int columns = edit->num_widget_columns; - edit_clean (edit); - if (!edit_init (edit, lines, columns, filename, text, dir, text_size)) { + e = malloc (sizeof (WEdit)); + memset (e, 0, sizeof (WEdit)); + e->widget = edit->widget; + e->macro_i = -1; + if (!edit_init (e, lines, columns, filename, text, dir, text_size)) { + free (e); return 0; } + edit_clean (edit); + memcpy (edit, e, sizeof (WEdit)); + free (e); return 1; } @@ -458,8 +648,6 @@ */ -static int push_action_disabled = 0; - void edit_push_action (WEdit * edit, long c,...) { unsigned long sp = edit->stack_pointer; @@ -585,6 +773,7 @@ { edit->caches_valid = 0; edit->modified = 1; + edit->screen_modified = 1; } /* @@ -1054,8 +1243,10 @@ edit->start_display = edit_move_backward (edit, edit->start_display, i); edit->force |= REDRAW_PAGE; edit->force &= (0xfff - REDRAW_CHAR_ONLY); +#ifndef MIDNIGHT +#endif } - edit_update_curs_row(edit); + edit_update_curs_row (edit); } @@ -1071,8 +1262,10 @@ edit->start_display = edit_move_forward (edit, edit->start_display, i, 0); edit->force |= REDRAW_PAGE; edit->force &= (0xfff - REDRAW_CHAR_ONLY); +#ifndef MIDNIGHT +#endif } - edit_update_curs_row(edit); + edit_update_curs_row (edit); } void edit_scroll_right (WEdit * edit, int i) @@ -1192,7 +1385,7 @@ } if (m == 0) return edit->line_offsets[j]; /* know the offset exactly */ - if (m == 1) + if (m == 1 && j >= 3) i = j; /* one line different - caller might be looping, so stay in this cache */ else i = 3 + (rand () % (N_LINE_CACHES - 3)); @@ -1647,11 +1840,15 @@ edit_insert (edit, '\n'); } -static void insert_spaces_tab (WEdit * edit) +static void insert_spaces_tab (WEdit * edit, int half) { - int i = option_tab_spacing; - while (i--) + int i; + edit_update_curs_col (edit); + i = ((edit->curs_col / (option_tab_spacing * space_width / (half + 1))) + 1) * (option_tab_spacing * space_width / (half + 1)) - edit->curs_col; + while (i > 0) { edit_insert (edit, ' '); + i -= space_width; + } } static int is_aligned_on_a_tab (WEdit * edit) @@ -1738,23 +1935,18 @@ /*insert a half tab (usually four spaces) unless there is a half tab already behind, then delete it and insert a full tab. */ - if (right_of_four_spaces (edit)) { + if (!option_fill_tabs_with_spaces && right_of_four_spaces (edit)) { for (i = 1; i <= HALF_TAB_SIZE; i++) edit_backspace (edit); - if (option_fill_tabs_with_spaces) { - insert_spaces_tab (edit); - } else { - edit_insert (edit, '\t'); - } + edit_insert (edit, '\t'); } else { - for (i = 1; i <= HALF_TAB_SIZE; i++) - edit_insert (edit, ' '); + insert_spaces_tab (edit, 1); } return; } } if (option_fill_tabs_with_spaces) { - insert_spaces_tab (edit); + insert_spaces_tab (edit, 0); } else { edit_insert (edit, '\t'); } @@ -1771,10 +1963,14 @@ edit_update_curs_col (edit); #ifdef MIDNIGHT if (edit->curs_col < option_word_wrap_line_length) + return; #else - if (edit->curs_col < option_word_wrap_line_length * FONT_MEAN_WIDTH) -#endif + CPushFont ("editor", 0); + c = FONT_MEAN_WIDTH; + CPopFont (); + if (edit->curs_col < option_word_wrap_line_length * c) return; +#endif curs = edit->curs1; for (;;) { curs--; @@ -1823,43 +2019,75 @@ } /* this find the matching bracket in either direction, and sets edit->bracket */ -void edit_find_bracket (WEdit * edit) +static long edit_get_bracket (WEdit * edit, int in_screen, unsigned long furthest_bracket_search) { - if (option_find_bracket) { - const char *b = "{}{[][()(", *p; - static int last_bracket = -1; - int i = 1, a, inc = -1, c, d, n = 0, j = 0; - long q; - - edit->bracket = -1; - c = edit_get_byte (edit, edit->curs1); - p = strchr (b, c); - edit_update_curs_row (edit); - if (p) { - d = p[1]; - if (strchr ("{[(", c)) - inc = 1; - for (q = edit->curs1 + inc;; q += inc) { - if (q >= edit->last_byte || q < edit->start_display || j++ > 10000) - break; - a = edit_get_byte (edit, q); - if (inc > 0 && a == '\n') - n++; - if (n >= edit->num_widget_lines - edit->curs_row) /* out of screen */ - break; - i += (a == c) - (a == d); - if (!i) { - edit->bracket = q; + const char *b = "{}{[][()(", *p; + int i = 1, a, inc = -1, c, d, n = 0; + unsigned long j = 0; + long q; + edit_update_curs_row (edit); + c = edit_get_byte (edit, edit->curs1); + p = strchr (b, c); +/* no limit */ + if (!furthest_bracket_search) + furthest_bracket_search--; +/* not on a bracket at all */ + if (!p) + return -1; +/* the matching bracket */ + d = p[1]; +/* going left or right? */ + if (strchr ("{[(", c)) + inc = 1; + for (q = edit->curs1 + inc;; q += inc) { +/* out of buffer? */ + if (q >= edit->last_byte || q < 0) + break; + a = edit_get_byte (edit, q); +/* don't want to eat CPU */ + if (j++ > furthest_bracket_search) + break; +/* out of screen? */ + if (in_screen) { + if (q < edit->start_display) + break; +/* count lines if searching downward */ + if (inc > 0 && a == '\n') + if (n++ >= edit->num_widget_lines - edit->curs_row) /* out of screen */ break; - } - } } +/* count bracket depth */ + i += (a == c) - (a == d); +/* return if bracket depth is zero */ + if (!i) + return q; + } +/* no match */ + return -1; +} + +static long last_bracket = -1; + +static void edit_find_bracket (WEdit * edit) +{ + if (option_find_bracket) { + edit->bracket = edit_get_bracket (edit, 1, 10000); if (last_bracket != edit->bracket) edit->force |= REDRAW_PAGE; last_bracket = edit->bracket; } } +static void edit_goto_matching_bracket (WEdit *edit) +{ + long q; + q = edit_get_bracket (edit, 0, 0); + if (q < 0) + return; + edit->bracket = edit->curs1; + edit->force |= REDRAW_PAGE; + edit_cursor_move (edit, q - edit->curs1); +} /* this executes a command as though the user initiated it through a key press. */ /* callback with WIDGET_KEY as a message calls this after translating the key @@ -2179,6 +2407,7 @@ break; case CK_Toggle_Bookmark: + book_mark_clear (edit, edit->curs_line, BOOK_MARK_FOUND_COLOR); if (book_mark_query_color (edit, edit->curs_line, BOOK_MARK_COLOR)) book_mark_clear (edit, edit->curs_line, BOOK_MARK_COLOR); else @@ -2186,6 +2415,7 @@ break; case CK_Flush_Bookmarks: book_mark_flush (edit, BOOK_MARK_COLOR); + book_mark_flush (edit, BOOK_MARK_FOUND_COLOR); edit->force |= REDRAW_PAGE; break; case CK_Next_Bookmark: @@ -2305,12 +2535,17 @@ break; case CK_Date:{ - char s[1024]; - time_t t; +#ifdef HAVE_STRFTIME + char s[1024]; +#endif time (&t); +#ifdef HAVE_STRFTIME strftime (s, 1024, "%c", localtime (&t)); edit_printf (edit, s); +#else + edit_printf (edit, ctime (&t)); +#endif edit->force |= REDRAW_PAGE; break; } @@ -2324,6 +2559,9 @@ case CK_Delete_Macro: edit_delete_macro_cmd (edit); break; + case CK_Match_Bracket: + edit_goto_matching_bracket (edit); + break; #ifdef MIDNIGHT case CK_Sort: edit_sort_cmd (edit); @@ -2339,6 +2577,8 @@ case CK_Mail: case CK_Find_File: case CK_Ctags: + case CK_Terminal: + case CK_Terminal_App: #endif case CK_Complete: case CK_Cancel: diff -ruN old/mc-4.5.42/gtkedit/edit.h new/mc-4.5.43/gtkedit/edit.h --- old/mc-4.5.42/gtkedit/edit.h Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/edit.h Sat Mar 18 08:43:45 2000 @@ -172,6 +172,7 @@ #define SEARCH_DIALOG_OPTION_NO_REGEX 2 #define SEARCH_DIALOG_OPTION_NO_CASE 4 #define SEARCH_DIALOG_OPTION_BACKWARDS 8 +#define SEARCH_DIALOG_OPTION_BOOKMARK 16 #define SYNTAX_FILE "/.cedit/Syntax" #define CLIP_FILE "/.cedit/cooledit.clip" @@ -325,7 +326,9 @@ struct _book_mark { int line; /* line number */ -#define BOOK_MARK_COLOR ((0 << 8) | 26) /* black on white */ +// #define BOOK_MARK_COLOR ((0 << 8) | 26) /* black on white */ +#define BOOK_MARK_COLOR ((25 << 8) | 5) +#define BOOK_MARK_FOUND_COLOR ((26 << 8) | 4) int c; /* colour */ struct _book_mark *next; struct _book_mark *prev; @@ -374,6 +377,7 @@ unsigned char overwrite; unsigned char modified; /*has the file been changed?: 1 if char inserted or deleted at all since last load or save */ + unsigned char screen_modified; /* has the file been changed since the last screen draw? */ #if defined(MIDNIGHT) || defined(GTK) int delete_file; /* has the file been created in edit_load_file? Delete it at end of editing when it hasn't been modified @@ -484,7 +488,6 @@ #endif char *edit_get_buffer_as_text (WEdit * edit); -int edit_load_file (WEdit * edit, const char *filename, const char *text, unsigned long text_size); int edit_count_lines (WEdit * edit, long current, int upto); long edit_move_forward (WEdit * edit, long current, int lines, long upto); long edit_move_forward3 (WEdit * edit, long current, int cols, long upto); @@ -590,6 +593,10 @@ #ifdef MIDNIGHT +#define CPushFont(x,y) +#define CPopFont() +#define FIXED_FONT 1 + /* put OS2/NT/WIN95 defines here */ # ifdef USE_O_TEXT @@ -638,6 +645,9 @@ #else /* ! MIDNIGHT */ # ifdef GTK +# define CPushFont(x,y) +# define CPopFont() +# define FIXED_FONT gtk_edit_fixed_font # define get_sys_error(s) (s) # define open mc_open @@ -676,7 +686,7 @@ # define FONT_OFFSET_X 0 # define FONT_OFFSET_Y FONT_BASE_LINE -# define per_char gtk_edit_font_width_per_char +# define FONT_PER_CHAR gtk_edit_font_width_per_char # ifndef _GTK_EDIT_C extern guchar gtk_edit_font_width_per_char[256]; diff -ruN old/mc-4.5.42/gtkedit/editcmd.c new/mc-4.5.43/gtkedit/editcmd.c --- old/mc-4.5.42/gtkedit/editcmd.c Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/gtkedit/editcmd.c Sat Mar 18 08:43:45 2000 @@ -48,6 +48,7 @@ int replace_whole = 0; int replace_case = 0; int replace_backwards = 0; +int search_create_bookmark = 0; /* queries on a save */ #ifdef MIDNIGHT @@ -243,79 +244,122 @@ /* returns 0 on error */ int edit_save_file (WEdit * edit, const char *filename) { - long buf; + char *p; long filelen = 0; - int file; - char *savename = (char *) filename; - int this_save_mode; + FILE *file; + char *savename = 0; + int this_save_mode, fd; + + if (!filename) + return 0; + if (!*filename) + return 0; - if ((file = open (savename, O_WRONLY)) == -1) { - this_save_mode = 0; /* the file does not exists yet, so no safe save or backup necessary */ + savename = (char *) strdup ((char *) filename); + + if ((fd = open (savename, O_WRONLY)) == -1) { + this_save_mode = 0; /* the file does not exists yet, so no safe save or backup necessary */ } else { - close (file); + close (fd); this_save_mode = option_save_mode; } if (this_save_mode > 0) { - char *savedir = ".", *slashpos = strrchr (filename, '/'); - if (slashpos != 0) { + char *savedir, *slashpos; + savedir = (char *) strdup ("."); + slashpos = strrchr (filename, '/'); + if (slashpos) { + free (savedir); savedir = (char *) strdup (filename); - if (savedir == 0) - return 0; savedir[slashpos - filename + 1] = '\0'; } + if (savename) + free (savename); savename = (char *) tempnam (savedir, "cooledit"); - if (slashpos) - free (savedir); + free (savedir); if (!savename) - return 0; - } - if ((file = open (savename, O_CREAT | O_WRONLY | O_TRUNC | MY_O_TEXT, edit->stat.st_mode)) == -1) { - if (this_save_mode > 0) - free (savename); - return 0; + goto error_save; } + if ((file = fopen (savename, "w+")) == 0) + goto error_save; + chmod (savename, edit->stat.st_mode); chown (savename, edit->stat.st_uid, edit->stat.st_gid); - buf = 0; - while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) { - filelen += write (file, (char *) edit->buffers1[buf], EDIT_BUF_SIZE); - buf++; - } - filelen += write (file, (char *) edit->buffers1[buf], edit->curs1 & M_EDIT_BUF_SIZE); - - if (edit->curs2) { - edit->curs2--; - buf = (edit->curs2 >> S_EDIT_BUF_SIZE); - filelen += write (file, (char *) edit->buffers2[buf] + EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1, 1 + (edit->curs2 & M_EDIT_BUF_SIZE)); - buf--; - while (buf >= 0) { - filelen += write (file, (char *) edit->buffers2[buf], EDIT_BUF_SIZE); - buf--; - } - edit->curs2++; - } - close (file); - if (filelen == edit->last_byte) { - if (this_save_mode == 2) { - if (rename (filename, catstrs (filename, option_backup_ext, 0)) == -1) { /* catstrs free's automatically */ - free (savename); - return 0; +/* pipe save */ + if ((p = (char *) edit_get_write_filter (savename, filename))) { + fclose (file); + file = (FILE *) popen (p, "w"); + if (file) { + filelen = edit_write_stream (edit, file); +#if 1 + pclose (file); +#else + if (pclose (file) > 0) { + edit_error_dialog (_ (" Error "), catstrs (_ (" Error writing to pipe: "), p, " ", 0)); + free (p); + goto error_save; + } +#endif + } else { + edit_error_dialog (_ (" Error "), get_sys_error (catstrs (_ (" Failed trying to open pipe for writing: "), p, " ", 0))); + free (p); + goto error_save; + } + free (p); +#ifdef CR_LF_TRANSLATION + } else { /* optimised save */ + filelen = edit_write_stream (edit, f); + fclose (file); +#else + } else { + long buf; + buf = 0; + filelen = edit->last_byte; + while (buf <= (edit->curs1 >> S_EDIT_BUF_SIZE) - 1) { + if (fwrite ((char *) edit->buffers1[buf], EDIT_BUF_SIZE, 1, file) != 1) { + filelen = -1; + break; } + buf++; } - if (this_save_mode > 0) { - if (rename (savename, filename) == -1) { - free (savename); - return 0; + if (fwrite ((char *) edit->buffers1[buf], edit->curs1 & M_EDIT_BUF_SIZE, 1, file) == -1) { + filelen = -1; + } else if (edit->curs2) { + edit->curs2--; + buf = (edit->curs2 >> S_EDIT_BUF_SIZE); + if (fwrite ((char *) edit->buffers2[buf] + EDIT_BUF_SIZE - (edit->curs2 & M_EDIT_BUF_SIZE) - 1, 1 + (edit->curs2 & M_EDIT_BUF_SIZE), 1, file) != 1) { + filelen = -1; + } else { + buf--; + while (buf >= 0) { + if (fwrite ((char *) edit->buffers2[buf], EDIT_BUF_SIZE, 1, file) != 1) { + filelen = -1; + break; + } + buf--; + } } - free (savename); + edit->curs2++; } - return 1; - } else { - if (this_save_mode > 0) - free (savename); - return 0; + fclose (file); +#endif } + + if (filelen != edit->last_byte) + goto error_save; + if (this_save_mode == 2) + if (rename (filename, catstrs (filename, option_backup_ext, 0)) == -1) + goto error_save; + if (this_save_mode > 0) + if (rename (savename, filename) == -1) + goto error_save; + if (savename) + free (savename); + return 1; + error_save: + if (savename) + free (savename); + return 0; } #ifdef MIDNIGHT @@ -326,6 +370,7 @@ */ void menu_save_mode_cmd (void) { +#define DLG_X 38 #define DLG_Y 10 static char *str_result; static int save_mode_new; @@ -336,52 +381,29 @@ N_("Do backups -->")}; static QuickWidget widgets[] = { - {quick_button, 18, 0, 7, DLG_Y, N_("&Cancel"), 0, + {quick_button, 18, DLG_X, 7, DLG_Y, N_("&Cancel"), 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, "c"}, - {quick_button, 6, 0, 7, DLG_Y, N_("&Ok"), 0, + {quick_button, 6, DLG_X, 7, DLG_Y, N_("&Ok"), 0, B_ENTER, 0, 0, XV_WLAY_DONTCARE, "o"}, - {quick_input, 23, 0, 5, DLG_Y, 0, 9, + {quick_input, 23, DLG_X, 5, DLG_Y, 0, 9, 0, 0, &str_result, XV_WLAY_DONTCARE, "i"}, - {quick_label, 23, 0, 4, DLG_Y, N_("Extension:"), 0, + {quick_label, 22, DLG_X, 4, DLG_Y, N_("Extension:"), 0, 0, 0, 0, XV_WLAY_DONTCARE, "savemext"}, - {quick_radio, 4, 0, 3, DLG_Y, "", 3, + {quick_radio, 4, DLG_X, 3, DLG_Y, "", 3, 0, &save_mode_new, str, XV_WLAY_DONTCARE, "t"}, {0}}; static QuickDialog dialog = /* NLS ? */ - {0, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]", + {DLG_X, DLG_Y, -1, -1, N_(" Edit Save Mode "), "[Edit Save Mode]", "esm", widgets}; static int i18n_flag = 0; if (!i18n_flag) { int i; - int maxlen = 0; - int dlg_x; - int l1; - - /* Ok/Cancel buttons */ - l1 = strlen (_(widgets[0].text)) + strlen (_(widgets[1].text)) + 5; - maxlen = max (maxlen, l1); - for (i = 0; i < 3; i++ ) { + for (i = 0; i < 3; i++ ) str[i] = _(str[i]); - maxlen = max (maxlen, strlen (str[i]) + 7); - } i18n_flag = 1; - - dlg_x = maxlen + strlen (_(widgets[3].text)) + 5 + 1; - widgets[2].hotkey_pos = strlen (_(widgets[3].text)); /* input field length */ - dlg_x = min (COLS, dlg_x); - dialog.xlen = dlg_x; - - i = (dlg_x - l1)/3; - widgets[1].relative_x = i; - widgets[0].relative_x = i + strlen (_(widgets[1].text)) + i + 4; - - widgets[2].relative_x = widgets[3].relative_x = maxlen + 2; - - for (i = 0; i < sizeof (widgets)/sizeof (widgets[0]); i++) - widgets[i].x_divisions = dlg_x; } widgets[2].text = option_backup_ext; @@ -473,7 +495,11 @@ void edit_split_filename (WEdit * edit, char *longname) { char *exp, *p; - exp = canonicalize_pathname (longname); /* this ensures a full path */ +#if defined(MIDNIGHT) || defined(GTK) + exp = canonicalize_pathname (longname); +#else + exp = pathdup (longname); /* this ensures a full path */ +#endif if (edit->filename) free (edit->filename); if (edit->dir) @@ -844,21 +870,13 @@ } /* returns 1 on error */ -int edit_load_file_from_filename (WEdit *edit, char *exp) +int edit_load_file_from_filename (WEdit * edit, char *exp) { - int file; - if ((file = open ((char *) exp, O_RDONLY, MY_O_TEXT)) != -1) { - close (file); - if (!edit_reload (edit, exp, 0, "", 0)) - return 1; - edit_split_filename (edit, exp); - edit->modified = 0; - return 0; - } else { -/* Heads the 'Load' file dialog box */ - edit_error_dialog (_ (" Load "), get_sys_error (_ (" Error trying to open file for reading "))); - } - return 1; + if (!edit_reload (edit, exp, 0, "", 0)) + return 1; + edit_split_filename (edit, exp); + edit->modified = 0; + return 0; } int edit_load_cmd (WEdit * edit) @@ -1164,39 +1182,36 @@ int edit_replace_prompt (WEdit * edit, char *replace_text, int xpos, int ypos) { - if (replace_prompt) { - QuickWidget quick_widgets[] = - { + QuickWidget quick_widgets[] = + { /* NLS for hotkeys? */ - {quick_button, 63, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("&Cancel"), - 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 50, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("o&Ne"), - 0, B_REPLACE_ONE, 0, 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 37, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("al&L"), - 0, B_REPLACE_ALL, 0, 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 21, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("&Skip"), - 0, B_SKIP_REPLACE, 0, 0, XV_WLAY_DONTCARE, NULL}, - {quick_button, 4, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_("&Replace"), - 0, B_ENTER, 0, 0, XV_WLAY_DONTCARE, NULL}, - {quick_label, 2, CONFIRM_DLG_WIDTH, 2, CONFIRM_DLG_HEIGTH, 0, - 0, 0, 0, XV_WLAY_DONTCARE, 0}, - {0}}; - - quick_widgets[5].text = catstrs (_(" Replace with: "), replace_text, 0); - - { - QuickDialog Quick_input = - {CONFIRM_DLG_WIDTH, CONFIRM_DLG_HEIGTH, 0, 0, N_(" Confirm replace "), - "[Input Line Keys]", "quick_input", 0 /*quick_widgets */ }; - - Quick_input.widgets = quick_widgets; - - Quick_input.xpos = xpos; - Quick_input.ypos = ypos; - return quick_dialog (&Quick_input); - } - } else - return 0; + {quick_button, 63, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_ ("&Cancel"), + 0, B_CANCEL, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 50, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_ ("o&Ne"), + 0, B_REPLACE_ONE, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 37, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_ ("al&L"), + 0, B_REPLACE_ALL, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 21, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_ ("&Skip"), + 0, B_SKIP_REPLACE, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_button, 4, CONFIRM_DLG_WIDTH, 3, CONFIRM_DLG_HEIGTH, N_ ("&Replace"), + 0, B_ENTER, 0, 0, XV_WLAY_DONTCARE, NULL}, + {quick_label, 2, CONFIRM_DLG_WIDTH, 2, CONFIRM_DLG_HEIGTH, 0, + 0, 0, 0, 0, XV_WLAY_DONTCARE, 0}, + {0}}; + + quick_widgets[5].text = catstrs (_ (" Replace with: "), replace_text, 0); + + { + QuickDialog Quick_input = + {CONFIRM_DLG_WIDTH, CONFIRM_DLG_HEIGTH, 0, 0, N_ (" Confirm replace "), + "[Input Line Keys]", "quick_input", 0 /*quick_widgets */ }; + + Quick_input.widgets = quick_widgets; + + Quick_input.xpos = xpos; + Quick_input.ypos = ypos; + return quick_dialog (&Quick_input); + } } void edit_replace_dialog (WEdit * edit, char **search_text, char **replace_text, char **arg_order) @@ -1369,12 +1384,16 @@ CState s; int xh, yh, h, xb, ys, yc, yb, yr; CWidget *m; + int text_input_width ; CBackupState (&s); CDisable ("*"); win = CDrawHeadedDialog ("replace", parent, x, y, heading); CGetHintPos (&xh, &h); +#ifdef NEXT_LOOK + xh += NEXT_SPACING ; +#endif /* NLS hotkey ? */ CIdent ("replace")->position = WINDOW_ALWAYS_RAISED; @@ -1413,21 +1432,31 @@ yb = yh; CGetHintPos (0, &yh); CGetHintPos (&xb, 0); - +#ifdef NEXT_LOOK + xb += NEXT_SPACING ; +#endif if (option & SEARCH_DIALOG_OPTION_BACKWARDS) { CDrawSwitch ("replace.bkwd", win, xh, yh, replace_backwards, _(" Backwards "), 0); /* Tool hint */ CSetToolHint ("replace.bkwd", _("Warning: Searching backward can be slow")); CSetToolHint ("replace.bkwd.label", _("Warning: Searching backward can be slow")); - yb = yh; } if (replace_text) { + yr = ys; if (option & SEARCH_DIALOG_OPTION_BACKWARDS) yr = yc; - else - yr = ys; } else { - yr = yb; + if (option & SEARCH_DIALOG_OPTION_BACKWARDS) { + if (option & SEARCH_DIALOG_OPTION_BOOKMARK) + yr = yb; + else + yr = yh; + } else { + if (option & SEARCH_DIALOG_OPTION_BOOKMARK) + yr = yc; + else + yr = yb; + } } if (replace_text) { @@ -1436,6 +1465,15 @@ CSetToolHint ("replace.pr", _("Ask before making each replacement")); CGetHintPos (0, &yr); CDrawSwitch ("replace.all", win, xb, yr, replace_all, _(" Replace all "), 0); +/* Tool hint */ + CSetToolHint ("replace.all", _("Replace repeatedly")); + CGetHintPos (0, &yr); + } + if (option & SEARCH_DIALOG_OPTION_BOOKMARK) { + CDrawSwitch ("replace.bkmk", win, xb, yr, search_create_bookmark, _(" Bookmarks "), 0); +/* Tool hint */ + CSetToolHint ("replace.bkmk", _("Create bookmarks at all lines found")); + CSetToolHint ("replace.bkmk.label", _("Create bookmarks at all lines found")); CGetHintPos (0, &yr); } CDrawSwitch ("replace.scanf", win, xb, yr, replace_scanf, _(" Scanf expression "), 1); @@ -1443,20 +1481,43 @@ CSetToolHint ("replace.scanf", _("Allows entering of a C format string,\nsee the scanf man page")); get_hint_limits (&x, &y); +#ifdef NEXT_LOOK + { + int btn_width, x, y ; + CGetHintPos (&x, &y); + + y += NEXT_SPACING * 2 ; + x += NEXT_SPACING * 2 ; + CTextSize (&btn_width, 0, " Cancel "); + btn_width += 4 + BUTTON_RELIEF * 2; + x -= (btn_width + NEXT_SPACING) * 2 + NEXT_SPACING; + + CDrawButton ("replace.ok", win, x+btn_width + NEXT_SPACING * 2, y, AUTO_WIDTH, AUTO_HEIGHT, " Ok "); + CDrawButton ("replace.cancel", win, x, y, AUTO_WIDTH, AUTO_HEIGHT, " Cancel "); + CGetHintPos (0, &y); + x += (btn_width + NEXT_SPACING) * 2 + NEXT_SPACING; + reset_hint_pos (x, y + NEXT_SPACING*2); + } +#else CDrawPixmapButton ("replace.ok", win, x - WIDGET_SPACING - TICK_BUTTON_WIDTH, h, PIXMAP_BUTTON_TICK); -/* Tool hint */ - CSetToolHint ("replace.ok", _("Begin search, Enter")); CDrawPixmapButton ("replace.cancel", win, x - WIDGET_SPACING - TICK_BUTTON_WIDTH, h + WIDGET_SPACING + TICK_BUTTON_WIDTH, PIXMAP_BUTTON_CROSS); +#endif /* Tool hint */ + CSetToolHint ("replace.ok", _("Begin search, Enter")); CSetToolHint ("replace.cancel", _("Abort this dialog, Esc")); CSetSizeHintPos ("replace"); CMapDialog ("replace"); m = CIdent ("replace"); - CSetWidgetSize ("replace.sinp", m->width - WIDGET_SPACING * 3 - 4 - TICK_BUTTON_WIDTH, (CIdent ("replace.sinp"))->height); +#ifdef NEXT_LOOK + text_input_width = m->width - WIDGET_SPACING * 3 - 4 - NEXT_SPACING*2 ; +#else + text_input_width = m->width - WIDGET_SPACING * 3 - 4 - TICK_BUTTON_WIDTH ; +#endif + CSetWidgetSize ("replace.sinp", text_input_width, (CIdent ("replace.sinp"))->height); if (replace_text) { - CSetWidgetSize ("replace.rinp", m->width - WIDGET_SPACING * 3 - 4 - TICK_BUTTON_WIDTH, (CIdent ("replace.rinp"))->height); - CSetWidgetSize ("replace.ainp", m->width - WIDGET_SPACING * 3 - 4 - TICK_BUTTON_WIDTH, (CIdent ("replace.ainp"))->height); + CSetWidgetSize ("replace.rinp", text_input_width, (CIdent ("replace.rinp"))->height); + CSetWidgetSize ("replace.ainp", text_input_width, (CIdent ("replace.ainp"))->height); } CFocus (CIdent ("replace.sinp")); @@ -1497,6 +1558,12 @@ replace_backwards = 0; } + if (option & SEARCH_DIALOG_OPTION_BOOKMARK) { + search_create_bookmark = CIdent ("replace.bkmk")->keypressed; + } else { + search_create_bookmark = 0; + } + break; } } @@ -1507,7 +1574,7 @@ void edit_search_dialog (WEdit * edit, char **search_text) { /* Heads the 'Search' dialog box */ - edit_search_replace_dialog (WIN_MESSAGES, search_text, 0, 0, _(" Search "), SEARCH_DIALOG_OPTION_BACKWARDS); + edit_search_replace_dialog (WIN_MESSAGES, search_text, 0, 0, _(" Search "), SEARCH_DIALOG_OPTION_BACKWARDS | SEARCH_DIALOG_OPTION_BOOKMARK); } void edit_replace_dialog (WEdit * edit, char **search_text, char **replace_text, char **arg_order) @@ -1571,44 +1638,38 @@ int edit_replace_prompt (WEdit * edit, char *replace_text, int xpos, int ypos) { - if (replace_prompt) { - char *s; - s = gtk_dialog_cauldron ( - "Replace", GTK_CAULDRON_TOPLEVEL | GTK_CAULDRON_GRAB, - " ( (Replace with:)d %Ld )xf / ( %Bxfrq || %Bxfq || %Bxfq || %Bxfq || %Bxfgq )f", - replace_text, - "Replace", "Skip", "Replace all", "Replace one", - GNOME_STOCK_BUTTON_CANCEL - ); - if (s == GTK_CAULDRON_ESCAPE || !s || s == GNOME_STOCK_BUTTON_CANCEL) - return B_CANCEL; - if (!strcmp (s, "Replace all")) - return B_REPLACE_ALL; - if (!strcmp (s, "Replace one")) - return B_REPLACE_ONE; - if (!strcmp (s, "Skip")) - return B_SKIP_REPLACE; - if (!strcmp (s, "Replace")) - return B_ENTER; - } - return 0; + char *s; + s = gtk_dialog_cauldron ( + "Replace", GTK_CAULDRON_TOPLEVEL | GTK_CAULDRON_GRAB, + " ( (Replace with:)d %Ld )xf / ( %Bxfrq || %Bxfq || %Bxfq || %Bxfq || %Bxfgq )f", + replace_text, + "Replace", "Skip", "Replace all", "Replace one", + GNOME_STOCK_BUTTON_CANCEL + ); + if (s == GTK_CAULDRON_ESCAPE || !s || s == GNOME_STOCK_BUTTON_CANCEL) + return B_CANCEL; + if (!strcmp (s, "Replace all")) + return B_REPLACE_ALL; + if (!strcmp (s, "Replace one")) + return B_REPLACE_ONE; + if (!strcmp (s, "Skip")) + return B_SKIP_REPLACE; + if (!strcmp (s, "Replace")) + return B_ENTER; } #else int edit_replace_prompt (WEdit * edit, char *replace_text, int xpos, int ypos) { - if (replace_prompt) { - int q, x[] = - { - B_CANCEL, B_ENTER, B_SKIP_REPLACE, B_REPLACE_ALL, B_REPLACE_ONE, B_CANCEL - }; - q = CQueryDialog (WIN_MESSAGES + (edit->curs_line < 8 ? edit->num_widget_lines / 2 * FONT_PIX_PER_LINE + CYof (edit->widget) : 0), - _ (" Replace "), catstrs (_ (" Replace with: "), replace_text, 0), _ ("Replace"), _ ("Skip"), _ ("Replace all"), _ ("Replace one"), _ ("Cancel"), 0); - edit->force |= REDRAW_COMPLETELY; - return x[q + 1]; - } - return 0; + int q, x[] = + { + B_CANCEL, B_ENTER, B_SKIP_REPLACE, B_REPLACE_ALL, B_REPLACE_ONE, B_CANCEL + }; + q = CQueryDialog (WIN_MESSAGES + (edit->curs_line < 8 ? edit->num_widget_lines / 2 * FONT_PIX_PER_LINE + CYof (edit->widget) : 0), + _ (" Replace "), catstrs (_ (" Replace with: "), replace_text, 0), _ ("Replace"), _ ("Skip"), _ ("Replace all"), _ ("Replace one"), _ ("Cancel"), 0); + edit->force |= REDRAW_COMPLETELY; + return x[q + 1]; } #endif @@ -1981,10 +2042,10 @@ char *exp3 = ""; int replace_yes; int replace_continue; - int treplace_prompt = replace_prompt; + int treplace_prompt = 0; int i = 0; long times_replaced = 0, last_search; - char fin_string[32]; + char fin_string[64]; int argord[NUM_REPL_ARGS]; if (!edit) { @@ -2019,6 +2080,7 @@ } else { edit_push_action (edit, KEY_PRESS + edit->start_display); edit_replace_dialog (edit, &exp1, &exp2, &exp3); + treplace_prompt = replace_prompt; } if (!exp1 || !*exp1) { @@ -2103,7 +2165,7 @@ edit_push_key_press (edit); switch (edit_replace_prompt (edit, exp2, /*and prompt 2/3 down */ - edit->num_widget_columns / 2 - 39, edit->num_widget_lines * 2 / 3)) { + edit->num_widget_columns / 2 - 33, edit->num_widget_lines * 2 / 3)) { case B_ENTER: break; case B_SKIP_REPLACE: @@ -2204,7 +2266,6 @@ } return; } - exp = old ? old : exp; if (again) { /*ctrl-hotkey for search again. */ if (!old) @@ -2222,31 +2283,60 @@ free (old); old = (char *) strdup (exp); - if (edit->found_len && edit->search_start == edit->found_start + 1 && replace_backwards) - edit->search_start--; + if (search_create_bookmark) { + int found = 0, books = 0; + int l = 0, l_last = -1; + long p, q = 0; + for (;;) { + p = edit_find (q, (unsigned char *) exp, &len, edit->last_byte, + (int (*)(void *, long)) edit_get_byte, (void *) edit, 0); + if (p < 0) + break; + found++; + l += edit_count_lines (edit, q, p); + if (l != l_last) { + book_mark_insert (edit, l, BOOK_MARK_FOUND_COLOR); + books++; + } + l_last = l; + q = p + 1; + } + if (found) { + char fin_string[64]; +/* in response to number of bookmarks added because of string being found %d times */ + sprintf (fin_string, _ (" %d finds made, %d bookmarks added "), found, books); + edit_message_dialog (_ (" Search "), fin_string); + } else { + edit_error_dialog (_ (" Search "), _ (" Search string not found. ")); + } + } else { - if (edit->found_len && edit->search_start == edit->found_start - 1 && !replace_backwards) - edit->search_start++; + if (edit->found_len && edit->search_start == edit->found_start + 1 && replace_backwards) + edit->search_start--; - edit->search_start = edit_find (edit->search_start, (unsigned char *) exp, &len, edit->last_byte, - (int (*)(void *, long)) edit_get_byte, (void *) edit, 0); + if (edit->found_len && edit->search_start == edit->found_start - 1 && !replace_backwards) + edit->search_start++; - if (edit->search_start >= 0) { - edit->found_start = edit->search_start; - edit->found_len = len; + edit->search_start = edit_find (edit->search_start, (unsigned char *) exp, &len, edit->last_byte, + (int (*)(void *, long)) edit_get_byte, (void *) edit, 0); - edit_cursor_move (edit, edit->search_start - edit->curs1); - edit_scroll_screen_over_cursor (edit); - if (replace_backwards) - edit->search_start--; - else - edit->search_start++; - } else if (edit->search_start == -3) { - edit->search_start = edit->curs1; - regexp_error (edit); - } else { - edit->search_start = edit->curs1; - edit_error_dialog (_(" Search "), _(" Search string not found. ")); + if (edit->search_start >= 0) { + edit->found_start = edit->search_start; + edit->found_len = len; + + edit_cursor_move (edit, edit->search_start - edit->curs1); + edit_scroll_screen_over_cursor (edit); + if (replace_backwards) + edit->search_start--; + else + edit->search_start++; + } else if (edit->search_start == -3) { + edit->search_start = edit->curs1; + regexp_error (edit); + } else { + edit->search_start = edit->curs1; + edit_error_dialog (_ (" Search "), _ (" Search string not found. ")); + } } } free (exp); @@ -2685,29 +2775,6 @@ } edit->force |= REDRAW_COMPLETELY; return 0; -} - - -/* inserts a file at the cursor, returns 1 on success */ -int edit_insert_file (WEdit * edit, const char *filename) -{ - int i, file, blocklen; - long current = edit->curs1; - unsigned char *buf; - - if ((file = open ((char *) filename, O_RDONLY)) == -1) - return 0; - buf = malloc (TEMP_BUF_LEN); - while ((blocklen = read (file, (char *) buf, TEMP_BUF_LEN)) > 0) { - for (i = 0; i < blocklen; i++) - edit_insert (edit, buf[i]); - } - edit_cursor_move (edit, current - edit->curs1); - free (buf); - close (file); - if (blocklen) - return 0; - return 1; } diff -ruN old/mc-4.5.42/gtkedit/editcmddef.h new/mc-4.5.43/gtkedit/editcmddef.h --- old/mc-4.5.42/gtkedit/editcmddef.h Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/editcmddef.h Sat Mar 18 08:43:45 2000 @@ -88,6 +88,9 @@ #define CK_Type_Load_Python 418 #define CK_Find_File 419 #define CK_Ctags 420 +#define CK_Match_Bracket 421 +#define CK_Terminal 422 +#define CK_Terminal_App 423 /* application control */ #define CK_Save_Desktop 451 diff -ruN old/mc-4.5.42/gtkedit/editdraw.c new/mc-4.5.43/gtkedit/editdraw.c --- old/mc-4.5.42/gtkedit/editdraw.c Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/gtkedit/editdraw.c Sat Mar 18 08:43:45 2000 @@ -103,9 +103,6 @@ #else -#ifndef GTK -extern int fixed_font; -#endif void render_status (CWidget * wdt, int expose); @@ -154,6 +151,7 @@ end_mark = start_mark = 0; if ((COptionsOf (edit->widget) & EDITOR_NO_TEXT)) return; + CPushFont ("editor", 0); m = edit->stat.st_mode; p = edit->filename ? edit->filename : ""; sprintf (s, "\034%c%s\033\035 \034-%c%c%c%c%c%c%c%c%c\035 \034%s%s%s%c\035 \034\030%02ld\033\035 \034%-4ld+%2ld=\030%4ld\033/%3ld\035 \034*%-5ld/%5ldb=%c%3d\035%c \034\001%ld\033\035", @@ -183,6 +181,7 @@ wdt->text = (char *) strdup (s); CSetWidgetSize (id, CWidthOf (edit->widget), CHeightOf (wdt)); render_status (wdt, 0); + CPopFont (); } #endif @@ -220,7 +219,6 @@ } #ifndef MIDNIGHT -extern unsigned char per_char[256]; int edit_width_of_long_printable (int c); #endif @@ -464,9 +462,10 @@ #else -int edit_mouse_pending (Window win); #define edit_draw_this_line edit_draw_this_line_proportional +int option_smooth_scrolling = 0; + static int key_pending (WEdit * edit) { static int flush = 0, line = 0; @@ -475,7 +474,7 @@ #else if (!edit) { flush = line = 0; - } else if (!(edit->force & REDRAW_COMPLETELY) && !EditExposeRedraw) { + } else if (!(edit->force & REDRAW_COMPLETELY) && !EditExposeRedraw && !option_smooth_scrolling) { /* this flushes the display in logarithmic intervals - so both fast and slow machines will get good performance vs nice-refreshing */ if ((1 << flush) == ++line) { @@ -502,12 +501,14 @@ } /* cursor must be in screen for other than REDRAW_PAGE passed in force */ -void render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, long end_column) +void render_edit_text (WEdit * edit, long start_row, long start_column, long end_row, + long end_column) { long row = 0, curs_row; static int prev_curs_row = 0; static int prev_start_col = 0; static long prev_curs = 0; + static long prev_start = -1; #ifndef MIDNIGHT static unsigned long prev_win = 0; @@ -516,6 +517,8 @@ int force = edit->force; long b; + CPushFont ("editor", 0); + #ifndef MIDNIGHT key_pending (0); #endif @@ -533,6 +536,60 @@ #endif #endif ) { + int time_division = 5; +#if 0 + if (CPending ()) + time_division--; +#endif +#if !defined(MIDNIGHT) && !defined(GTK) + if (prev_start < 0) + prev_start = edit->start_line; + if (option_smooth_scrolling && prev_win == CWindowOf (edit->widget) && !edit->screen_modified) { + int i, t; + int pos1, pos2; + i = edit->start_line - prev_start; + if (i <= time_division && i > 0) { + edit_draw_proportional (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + for (pos2 = 0, t = 0; t < time_division; t++) { + int move; + pos1 = FONT_PIX_PER_LINE * i * (t + 1) / time_division; + move = pos1 - pos2; + pos2 += move; + XCopyArea (CDisplay, edit->widget->winid, edit->widget->winid, CGC, + EDIT_TEXT_HORIZONTAL_OFFSET, + EDIT_TEXT_VERTICAL_OFFSET + move, + edit->widget->width - EDIT_FRAME_W, + edit->widget->height - EDIT_FRAME_H - move, + EDIT_TEXT_HORIZONTAL_OFFSET, EDIT_TEXT_VERTICAL_OFFSET); + XClearArea (CDisplay, edit->widget->winid, EDIT_TEXT_HORIZONTAL_OFFSET, + edit->widget->height - EDIT_FRAME_H + + EDIT_TEXT_VERTICAL_OFFSET - move, + edit->widget->width - EDIT_FRAME_W, move, 0); + XFlush (CDisplay); + pause (); + } + } else if (i >= -time_division && i < 0) { + edit_draw_proportional (0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + i = -i; + for (pos2 = 0, t = 0; t < time_division; t++) { + int move; + pos1 = FONT_PIX_PER_LINE * i * (t + 1) / time_division; + move = pos1 - pos2; + pos2 += move; + XCopyArea (CDisplay, edit->widget->winid, edit->widget->winid, CGC, + EDIT_TEXT_HORIZONTAL_OFFSET, EDIT_TEXT_VERTICAL_OFFSET, + edit->widget->width - EDIT_FRAME_W, + edit->widget->height - EDIT_FRAME_H - + move, EDIT_TEXT_HORIZONTAL_OFFSET, EDIT_TEXT_VERTICAL_OFFSET + move); + XClearArea (CDisplay, edit->widget->winid, EDIT_TEXT_HORIZONTAL_OFFSET, + EDIT_TEXT_VERTICAL_OFFSET, + edit->widget->width - EDIT_FRAME_W, move, 0); + XFlush (CDisplay); + pause (); + } + } + } +#endif if (!(force & REDRAW_IN_BOUNDS)) { /* !REDRAW_IN_BOUNDS means to ignore bounds and redraw whole rows */ start_row = 0; end_row = edit->num_widget_lines - 1; @@ -569,7 +626,7 @@ } } } -/* if (force & REDRAW_LINE) { ---> default */ +/* if (force & REDRAW_LINE) ---> default */ b = edit_bol (edit, edit->curs1); if (curs_row >= start_row && curs_row <= end_row) { if (key_pending (edit)) @@ -632,6 +689,9 @@ #endif #endif exit_render: + edit->screen_modified = 0; + prev_start = edit->start_line; + CPopFont (); return; } @@ -664,15 +724,17 @@ win = wdt->winid; isfocussed = (win == CGetFocus ()); - CSetColor (COLOR_FLAT); - +#ifdef NEXT_LOOK + render_bevel (win, 0, 0, w - 1, h - 1, 1, 1); /*most outer border bevel */ +#else if (isfocussed) { render_bevel (win, 0, 0, w - 1, h - 1, 3, 1); /*most outer border bevel */ } else { render_bevel (win, 2, 2, w - 3, h - 3, 1, 1); /*border bevel */ render_bevel (win, 0, 0, w - 1, h - 1, 2, 0); /*most outer border bevel */ } +#endif } #endif @@ -697,9 +759,9 @@ redraw_labels (edit->widget.parent, (Widget *) edit); #else if (option_long_whitespace) - edit_set_space_width (per_char[' '] * 2); + edit_set_space_width (FONT_PER_CHAR[' '] * 2); else - edit_set_space_width (per_char[' ']); + edit_set_space_width (FONT_PER_CHAR[' ']); #ifdef GTK win = (GtkEdit *) edit->widget; #endif @@ -726,7 +788,6 @@ set_cursor_position (0, 0, 0, 0, 0, 0, 0, 0, 0); #endif #endif - render_edit_text (edit, row_start, col_start, row_end, col_end); if (edit->force) /* edit->force != 0 means a key was pending and the redraw was halted, so next time we must redraw everything in case stuff @@ -738,8 +799,10 @@ #ifdef GTK /* ***************** */ #else +#ifndef NEXT_LOOK CSetColor (edit_normal_background_color); CLine (CWindowOf (edit->widget), 3, 3, 3, CHeightOf (edit->widget) - 4); +#endif #endif } #endif @@ -749,6 +812,7 @@ void edit_render_expose (WEdit * edit, XExposeEvent * xexpose) { int row_start, col_start, row_end, col_end; + CPushFont ("editor", 0); EditExposeRedraw = 1; edit->num_widget_lines = (CHeightOf (edit->widget) - EDIT_FRAME_H) / FONT_PIX_PER_LINE; edit->num_widget_columns = (CWidthOf (edit->widget) - EDIT_FRAME_W) / FONT_MEAN_WIDTH; @@ -759,12 +823,15 @@ edit_convert_expose_to_area (xexpose, &row_start, &col_start, &row_end, &col_end); edit_render (edit, 1, row_start, col_start, row_end, col_end); } + CPopFont (); EditExposeRedraw = 0; } void edit_render_keypress (WEdit * edit) { + CPushFont ("editor", 0); edit_render (edit, 0, 0, 0, 0, 0); + CPopFont (); } #else diff -ruN old/mc-4.5.42/gtkedit/editmenu.c new/mc-4.5.43/gtkedit/editmenu.c --- old/mc-4.5.42/gtkedit/editmenu.c Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/editmenu.c Sat Mar 18 08:43:45 2000 @@ -113,6 +113,7 @@ void menu_end_cmd (void) { menu_cmd (CK_End_Of_Text); } void menu_refresh_cmd (void) { menu_cmd (CK_Refresh); } void menu_goto_line (void) { menu_cmd (CK_Goto); } +void menu_goto_bracket (void) { menu_cmd (CK_Match_Bracket); } void menu_lit_cmd (void) { menu_key (XCTRL ('q')); } void menu_format_paragraph (void) { menu_cmd (CK_Paragraph_Format); } void edit_options_dialog (void); @@ -201,6 +202,7 @@ static menu_entry CmdMenu[] = { {' ', N_("&Goto line... M-l"), 'G', menu_goto_line}, + {' ', N_("goto matching &Bracket M-b"), 'B', menu_goto_bracket}, {' ', "", ' ', 0}, {' ', N_("insert &Literal... C-q"), 'L', menu_lit_cmd}, {' ', "", ' ', 0}, @@ -223,6 +225,7 @@ static menu_entry CmdMenuEmacs[] = { {' ', N_("&Goto line... M-l"), 'G', menu_goto_line}, + {' ', N_("goto matching &Bracket M-b"), 'B', menu_goto_bracket}, {' ', "", ' ', 0}, {' ', N_("insert &Literal... C-q"), 'L', menu_lit_cmd}, {' ', "", ' ', 0}, @@ -448,9 +451,10 @@ CGetHintPos (&x, &d); - CDrawMenuButton (catstrs (ident, ".commandmenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 11, + CDrawMenuButton (catstrs (ident, ".commandmenu", 0), parent, focus_return, x, y, AUTO_WIDTH, AUTO_HEIGHT, 12, _(" Command "), _("Goto line...\tM-l"), '~', menu_cmd, (unsigned long) CK_Goto, + _("Goto matching bracket\tM-b"), '~', menu_cmd, (unsigned long) CK_Match_Bracket, "", ' ', (void *) 0, 0L, _("Start record macro\tC-r"), '~', menu_cmd, (unsigned long) CK_Begin_Record_Macro, _("Finish record macro...\tC-r"), '~', menu_cmd, (unsigned long) CK_End_Record_Macro, diff -ruN old/mc-4.5.42/gtkedit/editoptions.c new/mc-4.5.43/gtkedit/editoptions.c --- old/mc-4.5.42/gtkedit/editoptions.c Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/editoptions.c Sat Mar 18 08:43:45 2000 @@ -42,8 +42,6 @@ void i18n_translate_array (char *array[]) { - size_t maxlen = 0; - while (*array!=NULL) { *array = _(*array); array++; diff -ruN old/mc-4.5.42/gtkedit/editwidget.c new/mc-4.5.43/gtkedit/editwidget.c --- old/mc-4.5.42/gtkedit/editwidget.c Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/editwidget.c Sat Mar 18 08:43:45 2000 @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. -*/ + */ #include #include "edit.h" @@ -95,7 +95,7 @@ edit_translate_xy (x, y, x_return, y_return); } -static long cp (WEdit *edit, int x, int y) +static long cp (WEdit * edit, int x, int y) { return edit_get_click_pos (edit, x, y); } @@ -122,13 +122,13 @@ return (start <= click && click < end); } -static void fin_mark (WEdit *edit) +static void fin_mark (WEdit * edit) { if (edit->mark2 < 0) edit_mark_cmd (edit, 0); } -static void move_mark (WEdit *edit) +static void move_mark (WEdit * edit) { edit_mark_cmd (edit, 1); edit_mark_cmd (edit, 0); @@ -162,12 +162,12 @@ return t; } -static void move (WEdit *edit, long click, int y) +static void move (WEdit * edit, long click, int y) { edit_cursor_move (edit, click - edit->curs1); } -static void dclick (WEdit *edit, XEvent *event) +static void dclick (WEdit * edit, XEvent * event) { edit_mark_cmd (edit, 1); edit_right_word_move (edit, 1); @@ -176,7 +176,7 @@ release_mark (edit, event); } -static void redraw (WEdit *edit, long click) +static void redraw (WEdit * edit, long click) { mouse_redraw (edit, click); } @@ -246,7 +246,7 @@ } static char *mime_majors[2] = - {"text", 0}; +{"text", 0}; struct mouse_funcs edit_mouse_funcs = { @@ -269,25 +269,31 @@ mime_majors }; -static void render_book_marks (CWidget *w); +static void render_book_marks (CWidget * w); extern int option_editor_bg_normal; void edit_tri_cursor (Window win); /* starting_directory is for the filebrowser */ CWidget *CDrawEditor (const char *identifier, Window parent, int x, int y, int width, int height, const char *text, const char *filename, - const char *starting_directory, unsigned int options, unsigned long text_size) + const char *starting_directory, unsigned int options, unsigned long text_size) { static int made_directory = 0; int extra_space_for_hscroll = 0; CWidget *w; WEdit *e; + CPushFont ("editor", 0); +#ifdef NEXT_LOOK + x += NEXT_SPACING; + if (options & EDITOR_HORIZ_SCROLL) + extra_space_for_hscroll = 21; +#else if (options & EDITOR_HORIZ_SCROLL) extra_space_for_hscroll = 8; - +#endif wedit = w = CSetupWidget (identifier, parent, x, y, - width + EDIT_FRAME_W, height + EDIT_FRAME_H, C_EDITOR_WIDGET, + width + EDIT_FRAME_W, height + EDIT_FRAME_H, C_EDITOR_WIDGET, ExposureMask | ButtonPressMask | ButtonReleaseMask | \ KeyPressMask | KeyReleaseMask | ButtonMotionMask | \ PropertyChangeMask | StructureNotifyMask | \ @@ -315,6 +321,7 @@ if (!w->editor) { /* Not essential to translate */ CError (_ ("Error initialising editor.\n")); + CPopFont (); return 0; } w->editor->widget = w; @@ -323,25 +330,47 @@ if (!w->editor) { free (e); CDestroyWidget (w->ident); + CPopFont (); return 0; } e->macro_i = -1; e->widget = w; + if (!(options & EDITOR_NO_SCROLL)) { + w->vert_scrollbar = CDrawVerticalScrollbar (catstrs (identifier, ".vsc", 0), parent, + x + width + EDIT_FRAME_W + WIDGET_SPACING, y, height + EDIT_FRAME_H, +#ifdef NEXT_LOOK + AUTO_WIDTH, +#else + 20, +#endif + 0, 0); + CSetScrollbarCallback (w->vert_scrollbar->ident, w->ident, link_scrollbar_to_editor); + w->vert_scrollbar->scroll_bar_extra_render = render_book_marks; + } set_hint_pos (x + width + EDIT_FRAME_W + WIDGET_SPACING, y + height + EDIT_FRAME_H + WIDGET_SPACING + extra_space_for_hscroll); if (extra_space_for_hscroll) { w->hori_scrollbar = CDrawHorizontalScrollbar (catstrs (identifier, ".hsc", 0), parent, - x, y + height + EDIT_FRAME_H, width + EDIT_FRAME_W, 12, 0, 0); + x, y + height + EDIT_FRAME_H, width + EDIT_FRAME_W, +#ifdef NEXT_LOOK + AUTO_HEIGHT, +#else + 12, +#endif + 0, 0); CSetScrollbarCallback (w->hori_scrollbar->ident, w->ident, link_hscrollbar_to_editor); } - if (!(options & EDITOR_NO_TEXT)) - CDrawStatus (catstrs (identifier, ".text", 0), parent, x, y + height + 3 + EDIT_FRAME_H + WIDGET_SPACING + extra_space_for_hscroll, width + EDIT_FRAME_W, e->filename); - if (!(options & EDITOR_NO_SCROLL)) { - w->vert_scrollbar = CDrawVerticalScrollbar (catstrs (identifier, ".vsc", 0), parent, - x + width + EDIT_FRAME_W + WIDGET_SPACING, y, height + EDIT_FRAME_H, 20, 0, 0); - CSetScrollbarCallback (w->vert_scrollbar->ident, w->ident, link_scrollbar_to_editor); - w->vert_scrollbar->scroll_bar_extra_render = render_book_marks; + CGetHintPos (0, &y); + if (!(options & EDITOR_NO_TEXT)) { + CPushFont ("widget", 0); +#ifdef NEXT_LOOK + CDrawStatus (catstrs (identifier, ".text", 0), parent, x, y + WIDGET_SPACING + NEXT_SPACING, width + EDIT_FRAME_W, e->filename); +#else + CDrawStatus (catstrs (identifier, ".text", 0), parent, x, y, width + EDIT_FRAME_W, e->filename); +#endif + CPopFont (); } + CPopFont (); return w; } @@ -362,7 +391,7 @@ for (p = edit->book_mark; p->next; p = p->next); for (; p->prev; p = p->prev) { int y = (CWidthOf (w) + 2 * CWidthOf (w) / 3 + 4) + (int) ((double) l * p->line / edit->total_lines); - CSetColor (color_palette (p->c & 0xFF)); + CSetColor (color_palette (((p->c & 0xFF00) >> 8) ? ((p->c & 0xFF00) >> 8) : (p->c & 0xFF))); CLine (CWindowOf (w), 5, y, CWidthOf (w) - 6, y); } } @@ -371,6 +400,7 @@ { int i, x1, x2; CWidget *scroll; + CPushFont ("editor", 0); scroll = e->widget->vert_scrollbar; if (scroll) { i = e->total_lines - e->start_line + 1; @@ -406,10 +436,12 @@ EditExposeRedraw = 0; } } + CPopFont (); } void edit_mouse_mark (WEdit * edit, XEvent * event, int double_click) { + CPushFont ("editor", 0); edit_update_curs_row (edit); edit_update_curs_col (edit); if (event->type != MotionNotify) { @@ -422,10 +454,11 @@ edit->found_len = 0; } mouse_mark ( - event, - double_click, - edit->widget->funcs - ); + event, + double_click, + edit->widget->funcs + ); + CPopFont (); } void link_scrollbar_to_editor (CWidget * scrollbar, CWidget * editor, XEvent * xevent, CEvent * cwevent, int whichscrbutton) @@ -437,6 +470,7 @@ return; if (!e->widget->vert_scrollbar) return; + CPushFont ("editor", 0); start_line = e->start_line; if ((xevent->type == ButtonRelease || xevent->type == MotionNotify) && whichscrbutton == 3) { edit_move_display (e, (double) scrollbar->firstline * e->total_lines / 65535.0 + 1); @@ -470,13 +504,16 @@ if (start_line != e->start_line) { e->force |= REDRAW_PAGE | REDRAW_LINE; set_cursor_position (0, 0, 0, 0, 0, 0, 0, 0, 0); - if (CCheckWindowEvent (xevent->xany.window, ButtonReleaseMask | ButtonMotionMask, 0)) + if (CCheckWindowEvent (xevent->xany.window, ButtonReleaseMask | ButtonMotionMask, 0)) { + CPopFont (); return; + } } if (e->force) { edit_render_keypress (e); edit_status (e); } + CPopFont (); } void link_hscrollbar_to_editor (CWidget * scrollbar, CWidget * editor, XEvent * xevent, CEvent * cwevent, int whichscrbutton) @@ -488,6 +525,7 @@ return; if (!e->widget->hori_scrollbar) return; + CPushFont ("editor", 0); start_col = (-e->start_col); if ((xevent->type == ButtonRelease || xevent->type == MotionNotify) && whichscrbutton == 3) { e->start_col = (double) scrollbar->firstline * e->max_column / 65535.0 + 1; @@ -519,13 +557,16 @@ if (start_col != (-e->start_col)) { e->force |= REDRAW_PAGE | REDRAW_LINE; set_cursor_position (0, 0, 0, 0, 0, 0, 0, 0, 0); - if (CCheckWindowEvent (xevent->xany.window, ButtonReleaseMask | ButtonMotionMask, 0)) + if (CCheckWindowEvent (xevent->xany.window, ButtonReleaseMask | ButtonMotionMask, 0)) { + CPopFont (); return; + } } if (e->force) { edit_render_keypress (e); edit_status (e); } + CPopFont (); } /* @@ -559,7 +600,7 @@ * XXX: yes, but Xlib requires that you pass it 64 bits for 32bit * quantities on 64 bit archs. */ - /* typedef CARD32 Atom32; */ + /* typedef CARD32 Atom32; */ Atom target_list[2]; @@ -641,6 +682,7 @@ if (!e->force) return; + CPushFont ("editor", 0); edit_scroll_screen_over_cursor (e); edit_update_curs_row (e); edit_update_curs_col (e); @@ -656,10 +698,12 @@ } else if (CCheckWindowEvent (e->widget->winid, ButtonPressMask | ButtonReleaseMask | ButtonMotionMask, 0) || CKeyPending ()) { e->force |= REDRAW_PAGE; + CPopFont (); return; } else { edit_render_keypress (e); } + CPopFont (); } extern int space_width; @@ -959,11 +1003,10 @@ char *text = 0; if (option_backup_ext_int != -1) { - option_backup_ext = malloc (sizeof(int) + 1); - option_backup_ext[sizeof(int)] = '\0'; + option_backup_ext = malloc (sizeof (int) + 1); + option_backup_ext[sizeof (int)] = '\0'; memcpy (option_backup_ext, (char *) &option_backup_ext_int, sizeof (int)); } - if (!made_directory) { mkdir (catstrs (home_dir, EDIT_DIR, 0), 0700); made_directory = 1; @@ -977,7 +1020,7 @@ text = ""; if (!(wedit = edit_init (NULL, LINES - 2, COLS, _file, text, "", 0))) { - message (1, _(" Error "), get_error_msg ("")); + message (1, _ (" Error "), get_error_msg ("")); return 0; } wedit->macro_i = -1; @@ -1090,17 +1133,17 @@ { Dlg_head *h = edit->widget.parent; - edit_my_define (h, 1, _("Help"), cmd_F1, edit); - edit_my_define (h, 2, _("Save"), cmd_F2, edit); - edit_my_define (h, 3, _("Mark"), cmd_F3, edit); - edit_my_define (h, 4, _("Replac"), cmd_F4, edit); - edit_my_define (h, 5, _("Copy"), cmd_F5, edit); - edit_my_define (h, 6, _("Move"), cmd_F6, edit); - edit_my_define (h, 7, _("Search"), cmd_F7, edit); - edit_my_define (h, 8, _("Delete"), cmd_F8, edit); + edit_my_define (h, 1, _ ("Help"), cmd_F1, edit); + edit_my_define (h, 2, _ ("Save"), cmd_F2, edit); + edit_my_define (h, 3, _ ("Mark"), cmd_F3, edit); + edit_my_define (h, 4, _ ("Replac"), cmd_F4, edit); + edit_my_define (h, 5, _ ("Copy"), cmd_F5, edit); + edit_my_define (h, 6, _ ("Move"), cmd_F6, edit); + edit_my_define (h, 7, _ ("Search"), cmd_F7, edit); + edit_my_define (h, 8, _ ("Delete"), cmd_F8, edit); if (!edit->have_frame) - edit_my_define (h, 9, _("PullDn"), edit_menu_cmd, edit); - edit_my_define (h, 10, _("Quit"), cmd_F10, edit); + edit_my_define (h, 9, _ ("PullDn"), edit_menu_cmd, edit); + edit_my_define (h, 10, _ ("Quit"), cmd_F10, edit); redraw_labels (h, (Widget *) edit); } @@ -1123,7 +1166,7 @@ widget_set_size (&edit_menubar->widget, 0, 0, 1, COLS); #ifdef RESIZABLE_MENUBAR - menubar_arrange(edit_menubar); + menubar_arrange (edit_menubar); #endif } diff -ruN old/mc-4.5.42/gtkedit/propfont.c new/mc-4.5.43/gtkedit/propfont.c --- old/mc-4.5.42/gtkedit/propfont.c Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/gtkedit/propfont.c Sat Mar 18 08:43:45 2000 @@ -37,7 +37,6 @@ cache_type data[CACHE_WIDTH]; }; -extern unsigned char per_char[256]; /* background colors: marked is refers to mouse highlighting, highlighted refers to a found string. */ extern unsigned long edit_abnormal_color, edit_marked_abnormal_color; @@ -117,54 +116,54 @@ if (isgraph (c)) { t[0] = c; t[1] = 0; - return per_char[c]; + return FONT_PER_CHAR[c]; } if (c == ' ') { if (option_long_whitespace) { t[0] = ' '; t[1] = ' '; t[2] = 0; - return per_char[' '] + per_char[' ']; + return FONT_PER_CHAR[' '] + FONT_PER_CHAR[' ']; } else { t[0] = ' '; t[1] = 0; - return per_char[' ']; + return FONT_PER_CHAR[' ']; } } - if (option_international_characters && per_char[c]) { + if (option_international_characters && FONT_PER_CHAR[c]) { t[0] = c; t[1] = 0; - return per_char[c]; + return FONT_PER_CHAR[c]; } if (c > '~') { t[0] = ("0123456789ABCDEF")[c >> 4]; t[1] = ("0123456789ABCDEF")[c & 0xF]; t[2] = 'h'; t[3] = 0; - return per_char[t[0]] + per_char[t[1]] + per_char[t[2]]; + return FONT_PER_CHAR[t[0]] + FONT_PER_CHAR[t[1]] + FONT_PER_CHAR[t[2]]; } t[0] = '^'; t[1] = c + '@'; t[2] = 0; - return per_char[t[0]] + per_char[t[1]]; + return FONT_PER_CHAR[t[0]] + FONT_PER_CHAR[t[1]]; } /* same as above but just gets the length */ static inline int width_of_long_printable (int c) { if (isgraph (c)) - return per_char[c]; + return FONT_PER_CHAR[c]; if (c == ' ') { if (option_long_whitespace) - return per_char[' '] + per_char[' ']; + return FONT_PER_CHAR[' '] + FONT_PER_CHAR[' ']; else - return per_char[' ']; + return FONT_PER_CHAR[' ']; } - if (option_international_characters && per_char[c]) - return per_char[c]; + if (option_international_characters && FONT_PER_CHAR[c]) + return FONT_PER_CHAR[c]; if (c > '~') - return per_char[(unsigned char) ("0123456789ABCDEF")[c >> 4]] + per_char[(unsigned char) ("0123456789ABCDEF")[c & 0xF]] + per_char[(unsigned char) 'h']; - return per_char['^'] + per_char[c + '@']; + return FONT_PER_CHAR[(unsigned char) ("0123456789ABCDEF")[c >> 4]] + FONT_PER_CHAR[(unsigned char) ("0123456789ABCDEF")[c & 0xF]] + FONT_PER_CHAR[(unsigned char) 'h']; + return FONT_PER_CHAR['^'] + FONT_PER_CHAR[c + '@']; } int edit_width_of_long_printable (int c) @@ -173,7 +172,7 @@ } /* returns x pixel pos of char at offset *q with x not more than l */ -int calc_text_pos (WEdit * edit, long b, long *q, int l) +static int calc_text_pos (WEdit * edit, long b, long *q, int l) { int x = 0, c, xn; for (;;) { @@ -204,7 +203,7 @@ /* calcs pixel length of the line beginning at b up to upto */ -int calc_text_len (WEdit * edit, long b, long upto) +static int calc_text_len (WEdit * edit, long b, long upto) { int x = 0, c; for (;;) { @@ -235,13 +234,15 @@ /* If upto is zero returns index of pixels across from current. */ long edit_move_forward3 (WEdit * edit, long current, int pixels, long upto) { + CPushFont ("editor", 0); if (upto) { - return calc_text_len (edit, current, upto); + current = calc_text_len (edit, current, upto); } else if (pixels) { long q; calc_text_pos (edit, current, &q, pixels); - return q; + current = q; } + CPopFont (); return current; } @@ -252,7 +253,7 @@ { cache_type s = 0; unsigned int fg, bg; - if (!(isprint (c) || (option_international_characters && per_char[c]))) + if (!(isprint (c) || (option_international_characters && FONT_PER_CHAR[c]))) if (c != '\n' && c != '\t') s |= MOD_ABNORMAL * 256; edit_get_syntax_color (edit, q, (int *) &fg, (int *) &bg); @@ -279,14 +280,14 @@ s |= MOD_BOLD * 256; if (q >= edit->found_start && q < edit->found_start + edit->found_len) s |= MOD_HIGHLIGHTED * 256; - if (!(isprint (c) || (option_international_characters && per_char[c]))) + if (!(isprint (c) || (option_international_characters && FONT_PER_CHAR[c]))) if (c != '\n' && c != '\t') s |= MOD_ABNORMAL * 256; edit_get_syntax_color (edit, q, (int *) &fg, (int *) &bg); return s | ((fg & 0xFF) << 24) | ((bg & 0xFF) << 16); } -void convert_text (WEdit * edit, long q, cache_type * p, int x, int x_max, int row) +static void convert_text (WEdit * edit, long q, cache_type * p, int x, int x_max, int row) { int c; cache_type s; @@ -315,13 +316,13 @@ q--; goto the_default; case '\t': - if (fixed_font) { + if (FIXED_FONT) { int t; t = next_tab_pos (x); t = min (t, x_max); s = *p; while (x < t) { - x += per_char[' ']; + x += FONT_PER_CHAR[' ']; *p++ = s | ' '; } } else { @@ -361,13 +362,13 @@ edit->max_column = x; return; case '\t': - if (fixed_font) { + if (FIXED_FONT) { int t; t = next_tab_pos (x); t = min (t, x_max); s = *p; while (x < t) { - x += per_char[' ']; + x += FONT_PER_CHAR[' ']; *p++ = s | ' '; } } else { @@ -404,13 +405,13 @@ edit->max_column = x; return; case '\t': - if (fixed_font) { + if (FIXED_FONT) { int t; t = next_tab_pos (x); t = min (t, x_max); s = *p; while (x < t) { - x += per_char[' ']; + x += FONT_PER_CHAR[' ']; *p++ = s | ' '; } } else { @@ -461,7 +462,7 @@ return next_tab_pos (x - scroll_right - EDIT_TEXT_HORIZONTAL_OFFSET) - x + scroll_right + EDIT_TEXT_HORIZONTAL_OFFSET; } -int draw_tab (Window win, int x, int y, cache_type s, int scroll_right) +static int draw_tab (Window win, int x, int y, cache_type s, int scroll_right) { int l; #ifdef GTK @@ -476,14 +477,14 @@ gdk_draw_rectangle (win->text_area, win->gc, 1, x, y + FONT_OVERHEAD, l, FONT_HEIGHT); /* if we printed a cursor: */ if (s & (MOD_CURSOR * 256)) - edit_set_cursor (win, x, y, bg.pixel, fg.pixel, per_char[' '], ' '); + edit_set_cursor (win, x, y, bg.pixel, fg.pixel, FONT_PER_CHAR[' '], ' '); #else set_style_color (s, &fg, &bg); CSetColor (bg); CRectangle (win, x, y + FONT_OVERHEAD, l, FONT_HEIGHT); /* if we printed a cursor: */ if (s & (MOD_CURSOR * 256)) - edit_set_cursor (win, x, y, bg, fg, per_char[' '], ' '); + edit_set_cursor (win, x, y, bg, fg, FONT_PER_CHAR[' '], ' '); #endif return x + l; } @@ -509,7 +510,7 @@ CRectangle (win, x, y + FONT_OVERHEAD, l, FONT_HEIGHT); /* if we printed a cursor: */ if (s & (MOD_CURSOR * 256)) - edit_set_cursor (win, x, y, bg, fg, per_char[' '], ' '); + edit_set_cursor (win, x, y, bg, fg, FONT_PER_CHAR[' '], ' '); #endif } @@ -567,7 +568,7 @@ #endif -int draw_string (Window win, int x, int y, cache_type s, unsigned char *text, int length) +static int draw_string (Window win, int x, int y, cache_type s, unsigned char *text, int length) { #ifdef GTK GdkColor fg, bg; @@ -584,8 +585,8 @@ underlined = set_style_color (s, &fg, &bg); CSetBackgroundColor (bg); CSetColor (fg); - CImageString (win, x + FONT_OFFSET_X, y + FONT_OFFSET_Y, (char *) text, length); - l = CTextWidth (win, (char *) text, length); + CImageText (win, x + FONT_OFFSET_X, y + FONT_OFFSET_Y, (char *) text, length); + l = CTextWidth ((char *) text, length); if (underlined) { int i, h, inc; inc = FONT_MEAN_WIDTH * 2 / 3; @@ -602,11 +603,11 @@ /* if we printed a cursor: */ #ifdef GTK if (s & (MOD_CURSOR * 256)) - edit_set_cursor (win, x, y, bg.pixel, fg.pixel, per_char[*text], *text); + edit_set_cursor (win, x, y, bg.pixel, fg.pixel, FONT_PER_CHAR[*text], *text); return x + gdk_text_width (GTK_WIDGET (win)->style->font, text, length); #else if (s & (MOD_CURSOR * 256)) - edit_set_cursor (win, x, y, bg, fg, per_char[*text], *text); + edit_set_cursor (win, x, y, bg, fg, FONT_PER_CHAR[*text], *text); return x + l; #endif } @@ -669,7 +670,7 @@ gdk_draw_rectangle (win->text_area, win->gc, 1, x_new, y + FONT_OVERHEAD, x_old - x_new, FONT_HEIGHT); #else CSetColor (edit_normal_background_color); - CRectangle (win, x_new, y + FONT_OVERHEAD, x_old - x_new, FONT_HEIGHT + (FONT_OVERHEAD != 0 && !fixed_font)); + CRectangle (win, x_new, y + FONT_OVERHEAD, x_old - x_new, FONT_HEIGHT + (FONT_OVERHEAD != 0 && !FIXED_FONT)); #endif } else { #ifdef GTK @@ -679,7 +680,7 @@ #endif } /* true type fonts print stuff out of the bounding box (aaaaaaaaarrrgh!!) */ - if (!fixed_font) + if (!FIXED_FONT) if (FONT_OVERHEAD && x_new > EDIT_TEXT_HORIZONTAL_OFFSET) #ifdef GTK gdk_draw_line (win->text_area, win->gc, max (x_start, EDIT_TEXT_HORIZONTAL_OFFSET), y + FONT_HEIGHT + FONT_OVERHEAD, x_new - 1, y + FONT_HEIGHT + FONT_OVERHEAD); @@ -718,13 +719,16 @@ x_max -= 3; /* if its not the same window, reset the screen rememberer */ - if (last != win) { + if (last != win || !win) { last = win; for (i = 0; i < CACHE_HEIGHT; i++) { lines[i].x0 = NOT_VALID; lines[i].x1 = x_max; } + if (!win) + return; } + /* get point to start drawing */ x0 = (*calctextpos) (data, b, &q, -scroll_right + x_offset); /* q contains the offset in the edit buffer */ @@ -740,7 +744,7 @@ if (!EditExposeRedraw) { if (lines[row].x0 == x0 && row < CACHE_HEIGHT) { /* i.e. also && lines[row].x0 != NOT_VALID */ ignore_text = get_ignore_length (lines[row].data, line); - if (fixed_font) + if (FIXED_FONT) ignore_trailer = get_ignore_trailer (lines[row].data, line, ignore_text); } } @@ -790,7 +794,7 @@ #ifdef GTK x += gdk_text_width (GTK_WIDGET(win)->style->font, text, i); #else - x += CTextWidth (win, (char *) text, i); + x += CTextWidth ((char *) text, i); #endif } } @@ -833,7 +837,7 @@ (int (*) (void *, long, long *, int)) calc_text_pos, edit->start_col, CWindowOf (edit->widget), end_column, b, row, row * FONT_PIX_PER_LINE + EDIT_TEXT_VERTICAL_OFFSET, - EditExposeRedraw ? start_column : 0, per_char[' '] * TAB_SIZE); + EditExposeRedraw ? start_column : 0, FONT_PER_CHAR[' '] * TAB_SIZE); } @@ -847,7 +851,7 @@ } -int calc_text_pos_str (unsigned char *text, long b, long *q, int l) +static int calc_text_pos_str (unsigned char *text, long b, long *q, int l) { int x = 0, c = 0, xn = 0, d; for (;;) { @@ -865,12 +869,12 @@ break; case '\b': if (d) - xn = x - per_char[d]; + xn = x - FONT_PER_CHAR[d]; break; default: if (!nroff_printable (c)) c = ' '; - xn = x + per_char[c]; + xn = x + FONT_PER_CHAR[c]; break; } if (xn > l) @@ -885,7 +889,9 @@ int prop_font_strcolmove (unsigned char *str, int i, int column) { long q; + CPushFont ("editor", 0); calc_text_pos_str (str, i, &q, column * FONT_MEAN_WIDTH); + CPopFont (); return q; } @@ -896,42 +902,13 @@ *q and the characters pixel x pos from b is return'ed. */ int calc_text_pos2 (CWidget * w, long b, long *q, int l) { - return calc_text_pos_str ((unsigned char *) w->text, b, q, l); -} - -/* calcs pixel length of the line beginning at b up to upto */ -int calc_text_len2 (CWidget *w, long b, long upto) -{ - int x = 0, c = 0, d; - for (;;) { - if (b == upto) - return x; - d = c; - c = w->text[b]; - switch (c) { - case '\n': - case '\0': - return x; - case '\t': - x = next_tab_pos (x); - break; - case '\r': - break; - case '\b': - if (d) - x -= per_char[d]; - break; - default: - if (!nroff_printable (c)) - c = ' '; - x += per_char[c]; - break; - } - b++; - } + int r; + CPushFont ("editor", 0); + r = calc_text_pos_str ((unsigned char *) w->text, b, q, l); + CPopFont (); + return r; } - int highlight_this_line; /* this is for the text widget (i.e. nroff formatting) */ @@ -961,18 +938,18 @@ *p++ |= ' '; if (highlight_this_line) { q--; - x += per_char[' ']; + x += FONT_PER_CHAR[' ']; } else return; break; case '\t': - if (fixed_font) { + if (FIXED_FONT) { int i; i = next_tab_pos (x) - x; x += i; s = *p; while (i > 0) { - i -= per_char[' ']; + i -= FONT_PER_CHAR[' ']; *p++ = s | ' '; *p = 0; } @@ -986,7 +963,7 @@ case '\b': if (d) { --p; - x -= per_char[d]; + x -= FONT_PER_CHAR[d]; if (d == '_') *p |= MOD_ITALIC * 256; else @@ -998,7 +975,7 @@ c = ' '; *p |= MOD_ABNORMAL * 256; } - x += per_char[c]; + x += FONT_PER_CHAR[c]; *p &= 0xFFFFFF00UL; *p |= c; p++; diff -ruN old/mc-4.5.42/gtkedit/syntax.c new/mc-4.5.43/gtkedit/syntax.c --- old/mc-4.5.42/gtkedit/syntax.c Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/syntax.c Sat Mar 18 08:43:45 2000 @@ -55,10 +55,19 @@ void edit_free_syntax_rules (WEdit * edit); void edit_get_syntax_color (WEdit * edit, long byte_index, int *fg, int *bg); +#ifdef HAVE_MAD +static void *mad_syntax_malloc (size_t x, char *file, int line) +#define syntax_malloc(x) mad_syntax_malloc (x, __FILE__, __LINE__) +#else static void *syntax_malloc (size_t x) +#endif { void *p; +#ifdef HAVE_MAD + p = mad_alloc (x, file, line); +#else p = malloc (x); +#endif memset (p, 0, x); return p; } @@ -327,7 +336,7 @@ if (i > (edit->syntax_marker ? edit->syntax_marker->offset + SYNTAX_MARKER_DENSITY : SYNTAX_MARKER_DENSITY)) { struct _syntax_marker *s; s = edit->syntax_marker; - edit->syntax_marker = malloc (sizeof (struct _syntax_marker)); + edit->syntax_marker = syntax_malloc (sizeof (struct _syntax_marker)); edit->syntax_marker->next = s; edit->syntax_marker->offset = i; edit->syntax_marker->rule = edit->rule; @@ -384,11 +393,20 @@ Returns 0 on error/eof or a count of the number of bytes read including the newline. Result must be free'd. */ +#ifdef HAVE_MAD +static int mad_read_one_line (char **line, FILE * f, char *file, int line_) +#define read_one_line(a,b) mad_read_one_line(a,b,__FILE__,__LINE__) +#else static int read_one_line (char **line, FILE * f) +#endif { char *p; int len = 256, c, r = 0, i = 0; +#ifdef HAVE_MAD + p = mad_syntax_malloc (len, file, line_); +#else p = syntax_malloc (len); +#endif for (;;) { c = fgetc (f); if (c == -1) { @@ -631,7 +649,7 @@ line = save_line + 1; syntax_free (error_file_name); if (l) - free (l); + syntax_free (l); if (!read_one_line (&l, f)) break; } else { @@ -828,7 +846,7 @@ for (j = 1; c->keyword[j]; j++) *p++ = c->keyword[j]->first; *p = '\0'; - c->keyword_first_chars = malloc (strlen (first_chars) + 2); + c->keyword_first_chars = syntax_malloc (strlen (first_chars) + 2); strcpy (c->keyword_first_chars, first_chars); } } @@ -843,7 +861,7 @@ { char *t; int l; - strcpy (t = malloc ((l = strlen (s)) + 3), s); + strcpy (t = syntax_malloc ((l = strlen (s)) + 3), s); t[l] = c; t[l + 1] = '\0'; return t; @@ -860,11 +878,11 @@ s->rule.keyword = 0; else if (s->rule.keyword > j) s->rule.keyword--; - free (c->keyword[j]->keyword); - free (c->keyword[j]->whole_word_chars_left); - free (c->keyword[j]->whole_word_chars_right); - free (c->keyword[j]); - memcpy (&c->keyword[j], &c->keyword[j + 1], (MAX_WORDS_PER_CONTEXT - j) * sizeof (struct keyword *)); + syntax_free (c->keyword[j]->keyword); + syntax_free (c->keyword[j]->whole_word_chars_left); + syntax_free (c->keyword[j]->whole_word_chars_right); + syntax_free (c->keyword[j]); + memcpy (&c->keyword[j], &c->keyword[j + 1], (MAX_WORDS_PER_CONTEXT - j - 1) * sizeof (struct keyword *)); strcpy (&c->keyword_first_chars[j], &c->keyword_first_chars[j + 1]); } @@ -893,7 +911,7 @@ } } /* are we out of space? */ - if (j >= MAX_WORDS_PER_CONTEXT - 1) + if (j >= MAX_WORDS_PER_CONTEXT - 2) return 1; /* add the new keyword and date it */ c->keyword[j + 1] = 0; @@ -910,7 +928,7 @@ c->keyword[j]->whole_word_chars_right = (char *) strdup ("-'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ ¡¢£¤¥¦§§¨©©ª«¬­®®¯°±²³´µ¶¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ"); c->keyword[j]->time = t; s = strdupc (c->keyword_first_chars, c->keyword[j]->first); - free (c->keyword_first_chars); + syntax_free (c->keyword_first_chars); c->keyword_first_chars = s; return 0; } @@ -952,12 +970,12 @@ if (p2 <= p1) return 0; /* create string */ - q = p = malloc (p2 - p1 + 2); + q = p = syntax_malloc (p2 - p1 + 2); for (; p1 < p2; p1++) *p++ = edit_get_byte (edit, p1); *p = '\0'; if (q[0] == '-' || strlen ((char *) q) > 40) { /* if you are using words over 40 characters, you are on your own */ - free (q); + syntax_free (q); return 0; } time (&t); @@ -966,7 +984,7 @@ if (!strcmp (c->keyword[j]->keyword, (char *) q)) { if (c->keyword[j]->time) c->keyword[j]->time = t; - free (q); + syntax_free (q); return 0; } } @@ -978,11 +996,11 @@ r = fgetc (spelling_pipe_in); } while (r == -1 && errno == EINTR); if (r == -1) { - free (q); + syntax_free (q); return 1; } if (r == '\n') { /* ispell sometimes returns just blank line if it is given bad characters */ - free (q); + syntax_free (q); return 0; } /* now read ispell output untill we get two blanks lines - we are not intersted in this part */ @@ -991,7 +1009,7 @@ } while (c1 == -1 && errno == EINTR); for (;;) { if (c1 == -1) { - free (q); + syntax_free (q); return 1; } do { @@ -1003,12 +1021,12 @@ } /* spelled ok */ if (r == '*' || r == '+' || r == '-') { - free (q); + syntax_free (q); return 0; } /* not spelled ok - so add a syntax keyword for this word */ edit_syntax_add_keyword (edit, (char *) q, context, t); - free (q); + syntax_free (q); return 0; } @@ -1146,7 +1164,7 @@ syntax_free (edit->rules); } -#define CURRENT_SYNTAX_RULES_VERSION "61" +#define CURRENT_SYNTAX_RULES_VERSION "62" char *syntax_text[] = { "# syntax rules version " CURRENT_SYNTAX_RULES_VERSION, @@ -1178,12 +1196,9 @@ "context default", "", "", -"file ..\\*\\\\.diff$ Unified\\sDiff\\sOutput ^diff.\\*(-u|--unified)", +"file ..\\*\\\\.(diff|rej|patch)$ Diff\\sOutput ^diff", "include diff.syntax", "", -"file ..\\*\\\\.diff$ Context\\sDiff\\sOutput ^diff.\\*(-c|--context)", -"include diffc.syntax", -"", "file ..\\*\\\\.lsm$ LSM\\sFile", "include lsm.syntax", "", @@ -1205,7 +1220,7 @@ "file ..\\*\\\\.(pp|PP|pas|PAS)$ Pascal\\sProgram", "include pascal.syntax", "", -"file ..\\*\\\\.(ada|adb|ADA|ADB)$ Ada\\sProgram", +"file ..\\*\\\\.(ada|adb|ads|ADA|ADB|ADS)$ Ada\\sProgram", "include ada95.syntax", "", "file ..\\*\\\\.tex$ LaTeX\\s2.09\\sDocument", @@ -1217,6 +1232,9 @@ "file ..\\*\\\\.([chC]|CC|cxx|cc|cpp|CPP|CXX)$ C/C\\+\\+\\sProgram", "include c.syntax", "", +"file ..\\*\\\\.[fF]$ Fortran\\sProgram", +"include fortran.syntax", +"", "file ..\\*\\\\.i$ SWIG\\sSource", "include swig.syntax", "", @@ -1334,8 +1352,8 @@ fclose (f); return fopen (syntax_file, "r"); } - memset (line, 0, 79); - fread (line, 80, 1, f); + memset (line, 0, sizeof (line)); + fread (line, sizeof (line) - 1, 1, f); if (!strstr (line, "syntax rules version")) goto rename_rule_file; p = strstr (line, "version") + strlen ("version") + 1; @@ -1362,82 +1380,96 @@ static int edit_read_syntax_file (WEdit * edit, char **names, char *syntax_file, char *editor_file, char *first_line, char *type) { FILE *f; - regex_t r, r2; + regex_t r; regmatch_t pmatch[1]; - char *args[1024], *l; + char *args[1024], *l = 0; int line = 0; int argc; int result = 0; int count = 0; - f = upgrade_syntax_file (syntax_file); if (!f) return -1; args[0] = 0; - for (;;) { line++; + syntax_free (l); if (!read_one_line (&l, f)) break; get_args (l, args, &argc); - if (!args[0]) { - } else if (!strcmp (args[0], "file")) { - if (!args[1] || !args[2]) { - result = line; - break; - } + if (!args[0]) + continue; +/* looking for `file ...' lines only */ + if (strcmp (args[0], "file")) { + free_args (args); + continue; + } +/* must have two args or report error */ + if (!args[1] || !args[2]) { + result = line; + break; + } + if (names) { +/* 1: just collecting a list of names of rule sets */ + names[count++] = (char *) strdup (args[2]); + names[count] = 0; + } else if (type) { +/* 2: rule set was explicitly specified by the caller */ + if (!strcmp (type, args[2])) + goto found_type; + } else if (editor_file && edit) { +/* 3: auto-detect rule set from regular expressions */ + int q; if (regcomp (&r, args[1], REG_EXTENDED)) { result = line; break; } - if (regcomp (&r2, args[3] ? args[3] : "^nEvEr MaTcH aNyThInG$", REG_EXTENDED)) { - result = line; - break; - } - if (names) { - names[count++] = (char *) strdup (args[2]); - names[count] = 0; - } else if (type) { - if (!strcmp (type, args[2])) - goto found_type; - } else if (editor_file && edit) { - if (!regexec (&r, editor_file, 1, pmatch, 0) || !regexec (&r2, first_line, 1, pmatch, 0)) { - int line_error; - found_type: - line_error = edit_read_syntax_rules (edit, f); - if (line_error) { - if (!error_file_name) /* an included file */ - result = line + line_error; - else - result = line_error; - } else { - syntax_free (edit->syntax_type); - edit->syntax_type = (char *) strdup (args[2]); +/* does filename match arg 1 ? */ + q = !regexec (&r, editor_file, 1, pmatch, 0); + regfree (&r); + if (!q && args[3]) { + if (regcomp (&r, args[3], REG_EXTENDED)) { + result = line; + break; + } +/* does first line match arg 3 ? */ + q = !regexec (&r, first_line, 1, pmatch, 0); + regfree (&r); + } + if (q) { + int line_error; + found_type: + line_error = edit_read_syntax_rules (edit, f); + if (line_error) { + if (!error_file_name) /* an included file */ + result = line + line_error; + else + result = line_error; + } else { + syntax_free (edit->syntax_type); + edit->syntax_type = (char *) strdup (args[2]); /* if there are no rules then turn off syntax highlighting for speed */ - if (!edit->rules[1]) - if (!edit->rules[0]->keyword[1] && !edit->rules[0]->spelling) { - edit_free_syntax_rules (edit); - break; - } - if (syntax_change_callback) + if (!edit->rules[1]) + if (!edit->rules[0]->keyword[1] && !edit->rules[0]->spelling) { + edit_free_syntax_rules (edit); + break; + } +/* notify the callback of a change in rule set */ + if (syntax_change_callback) #ifdef MIDNIGHT - (*syntax_change_callback) (&edit->widget); + (*syntax_change_callback) (&edit->widget); #else - (*syntax_change_callback) (edit->widget); + (*syntax_change_callback) (edit->widget); #endif - } - break; } + break; } } free_args (args); - syntax_free (l); } free_args (args); syntax_free (l); - fclose (f); - return result; } diff -ruN old/mc-4.5.42/gtkedit/wordproc.c new/mc-4.5.43/gtkedit/wordproc.c --- old/mc-4.5.42/gtkedit/wordproc.c Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/gtkedit/wordproc.c Sat Mar 18 08:43:45 2000 @@ -107,9 +107,9 @@ return edit_eol (edit, edit_move_forward (edit, edit_bol (edit, edit->curs1), i - edit->curs_line, 0)); } -static char *get_paragraph (WEdit * edit, long p, long q, int indent, int *size) +static unsigned char *get_paragraph (WEdit * edit, long p, long q, int indent, int *size) { - char *s, *t; + unsigned char *s, *t; #if 0 t = malloc ((q - p) + 2 * (q - p) / option_word_wrap_line_length + 10); #else @@ -129,9 +129,9 @@ return t; } -static void strip_newlines (char *t, int size) +static void strip_newlines (unsigned char *t, int size) { - char *p = t; + unsigned char *p = t; while (size--) { *p = *p == '\n' ? ' ' : *p; p++; @@ -152,7 +152,7 @@ { return x += tab_width - x % tab_width; } -static int line_pixel_length (char *t, long b, int l) +static int line_pixel_length (unsigned char *t, long b, int l) { int x = 0, c, xn = 0; for (;;) { @@ -180,7 +180,7 @@ } /* find the start of a word */ -static int next_word_start (char *t, int q, int size) +static int next_word_start (unsigned char *t, int q, int size) { int i; for (i = q;; i++) { @@ -201,7 +201,7 @@ } /* find the start of a word */ -static int word_start (char *t, int q, int size) +static int word_start (unsigned char *t, int q, int size) { int i = q; if (t[q] == ' ' || t[q] == '\t') @@ -220,7 +220,7 @@ } /* replaces ' ' with '\n' to properly format a paragraph */ -static void format_this (char *t, int size, int indent) +static void format_this (unsigned char *t, int size, int indent) { int q = 0, ww; strip_newlines (t, size); @@ -258,7 +258,7 @@ void edit_insert_indent (WEdit * edit, int indent); /* replaces a block of text */ -static void put_paragraph (WEdit * edit, char *t, long p, long q, int indent, int size) +static void put_paragraph (WEdit * edit, unsigned char *t, long p, long q, int indent, int size) { long cursor; int i, c = 0; @@ -315,7 +315,7 @@ { long p, q; int size; - char *t; + unsigned char *t; int indent = 0; if (option_word_wrap_line_length < 2) return; diff -ruN old/mc-4.5.42/idl/FileManager.idl new/mc-4.5.43/idl/FileManager.idl --- old/mc-4.5.42/idl/FileManager.idl Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/idl/FileManager.idl Sat Mar 18 08:43:48 2000 @@ -5,8 +5,18 @@ exception POSIX_ERROR { string errorstr; }; interface Desktop { + enum ArrangeType { + BY_NAME, + BY_TYPE, + BY_SIZE, + BY_ATIME, + BY_MTIME, + BY_CTIME + }; + void rescan (); void rescan_devices (); + void arrange_icons (in ArrangeType type); }; interface Window { diff -ruN old/mc-4.5.42/lib/Makefile.in new/mc-4.5.43/lib/Makefile.in --- old/mc-4.5.42/lib/Makefile.in Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/lib/Makefile.in Sat Mar 18 08:43:44 2000 @@ -14,7 +14,7 @@ LIBFILES_IN = mc.ext.in mc-gnome.ext.in LIBFILES_OUT = mc.ext mc-gnome.ext mc.csh mc.sh -LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.lib mc.menu +LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu SUPPBIN_IN = mc.csh.in mc.sh.in SUPPBIN_OUT = mc.csh mc.sh DESKTOP_FILES = startup.links README.desktop diff -ruN old/mc-4.5.42/lib/mc.csh new/mc-4.5.43/lib/mc.csh --- old/mc-4.5.42/lib/mc.csh Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/lib/mc.csh Sat Mar 18 08:43:44 2000 @@ -1,2 +1,2 @@ -alias mc 'setenv MC `/opt/gnome/bin/mc -P \!*`; cd $MC; unsetenv MC' +alias mc 'setenv MC `/tmp/test/bin/mc -P \!*`; cd $MC; unsetenv MC' diff -ruN old/mc-4.5.42/lib/mc.hint.ru new/mc-4.5.43/lib/mc.hint.ru --- old/mc-4.5.42/lib/mc.hint.ru Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.43/lib/mc.hint.ru Sat Mar 18 08:43:44 2000 @@ -0,0 +1,49 @@ +Midnight Commander (c) 1995-1999 æÏÎÄ Ó×ÏÂÏÄÎÏÇÏ ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ. +óÏ×ÅÔ: éÓÐÏÌØÚÕÊÔÅ C-x t ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ ÐÏÍÅÞÅÎÎÙÈ ÆÁÊÌÏ× × ËÏÍÁÎÄÎÕÀ ÓÔÒÏËÕ. +óÏ×ÅÔ: éÓÐÏÌØÚÕÊÔÅ C-x p ÄÌÑ ËÏÐÉÒÏ×ÁÎÉÑ ÔÅËÕÝÅÇÏ ÐÕÔÉ × ËÏÍÁÎÄÎÕÀ ÓÔÒÏËÕ. +óÏ×ÅÔ: á×ÔÏÄÏÐÏÌÎÅÎÉÅ: M-Tab (ÉÌÉ Esc+Tab). äÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÉÓËÁ ÎÁÖÁÔØ Ä×ÁÖÄÙ. +óÏ×ÅÔ: éÓÐÏÌØÚÕÊÔÅ M-p É M-n ÄÌÑ ÄÏÓÔÕÐÁ Ë ÉÓÔÏÒÉÉ ËÏÍÁÎÄ. +óÏ×ÅÔ: ôÒÅÂÕÅÔÓÑ ×ÓÔÁ×ÉÔØ ÌÉÔÅÒÁÌ? îÁÖÍÉÔÅ Control-q É ÌÉÔÅÒÁÌ. +óÏ×ÅÔ: õÓÔÁÌÉ ÏÔ ÜÔÉÈ ÓÏÏÂÝÅÎÉÊ? ïÔËÌÀÞÉÔÅ ÉÈ × ÍÅÎÀ îÁÓÔÒÏÊËÉ/÷ÎÅÛÎÉÊ ×ÉÄ. +óÏ×ÅÔ: ïÔÍÅÔËÁ ËÁÔÁÌÏÇÏ×: ÄÏÂÁ×ØÔÅ ËÏÓÕÀ ÞÅÒÔÕ × ËÏÎÅà ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ ÛÁÂÌÏÎÁ. +óÏ×ÅÔ: åÓÌÉ ×ÁÛ ÔÅÒÍÉÎÁÌ ÂÅÚ ÆÕÎËÃ. ËÌÁ×ÉÛ, ×ÁÍ ÐÏÍÏÖÅÔ ESC+ÞÉÓÌ. ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ. +óÏ×ÅÔ: óÁÊÔ Midnight Commander × éÎÔÅÒÎÅÔÅ: http://www.gnome.org/mc/ +óÏ×ÅÔ: ðÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ Commander ÄÏÓÔÕÐÎÁ: ftp://ftp.gnome.org/pub/GNOME/sources/mc +óÏ×ÅÔ: ðÏÖÁÌÕÊÓÔÁ, ÛÌÉÔÅ ÌÀÂÙÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁÈ ÎÁ mc-bugs@nuclecu.unam.mx +óÏ×ÅÔ: äÏÍÁÛÎÑÑ ÓÔÒÁÎÉÃÁ Midnight Commander: http://www.gnome.org/mc +óÏ×ÅÔ: Tab ÓÍÅÎÑÅÔ ÔÅËÕÝÕÀ ÐÁÎÅÌØ. +óÏ×ÅÔ: õÄÏÂÓÔ×Ï ÷æó: ÎÁÖÁÔØ Enter ÎÁ ÆÁÊÌÅ TAR ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÅÇÏ ÓÏÄÅÒÖÉÍÏÇÏ. +óÏ×ÅÔ: õ ÎÁÓ ÔÁËÖÅ ÉÍÅÅÔÓÑ ÔÏÌËÏ×ÁÑ ÓÔÒÁÎÉÃÁ ÒÕËÏ×ÏÄÓÔ×Á. +óÏ×ÅÔ: ÷Ù ÈÏÔÉÔÅ ÎÁ×ÉÇÁÃÉÀ × ÓÔÉÌÅ lynx? õÓÔÁÎÏ×ÉÔÅ ÜÔÏ × ÄÉÁÌÏÇÅ ëÏÎÆÉÇÕÒÁÃÉÑ. +óÏ×ÅÔ: íÁËÒÏÓÙ % ÒÁÂÏÔÁÀÔ ÄÁÖÅ × ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÅ. +óÏ×ÅÔ: M-! ÐÏÚ×ÏÌÉÔ ×ÁÍ ×ÙÐÏÌÎÑÔØ ÐÒÏÇÒÁÍÍÙ É ×ÉÄÅÔØ ×Ù×ÏÄ × ÐÒÏÓÍÏÔÝÉËÅ. +óÏ×ÅÔ: æÏÒÍÁÔ ÓÐÉÓËÁ ÆÁÊÌÏ× ÍÏÖÅÔ ÂÙÔØ ÉÚÍÅÎÅÎ; ÎÁÂÅÒÉÔÅ "man mc" ÄÌÑ ÄÅÔÁÌÅÊ. +óÏ×ÅÔ: %D/%T expands to the tagged files in the opposite directory. +óÏ×ÅÔ: èÏÔÉÔÅ ÐÒÏÓÔÕÀ ÏÂÏÌÏÞËÕ? îÁÖÍÉÔÅ C-o, É ÓÎÏ×Á C-o ÄÌÑ ×ÏÚ×ÒÁÔÁ × íó. +óÏ×ÅÔ: õÓÔÁÎÏ×É× ÐÅÒÅÍÅÎÎÕÀ CDPATH, ×Ù ÓÂÅÒÅÖÅÔÅ ÕÓÉÌÉÑ ÐÒÉ ÎÁÂÏÒÅ ËÏÍÁÎÄÙ cd. +óÏ×ÅÔ: ÷Ù ÓÍÏÖÅÔÅ ×ÉÄÅÔØ ÓËÒÙÔÙÅ ÆÁÊÌÙ .*, ÕÓÔÁÎÏ×É× ÏÐÃÉÀ × ÍÅÎÀ ëÏÎÆÉÇÕÒÁÃÉÑ. +óÏ×ÅÔ: ÷Ù ÓÍÏÖÅÔÅ ×ÉÄÅÔØ ÒÅÚÅÒ×ÎÙÅ ÆÁÊÌÙ .~, ÕÓÔÁÎÏ×É× ÏÐÃÉÀ × ÍÅÎÀ ëÏÎÆÉÇÕÒÁÃÉÑ. +óÏ×ÅÔ: éÍÅÅÔÅ ÍÎÏÇÏ ïúõ/÷ÉÒÔ.ïúõ? õÓÔÁÎÏ×ÉÔÅ ÏÇÒÁÎÉÞÅÎÉÅ ÐÁÍÑÔÉ ÷æó tar × -1. +óÏ×ÅÔ: á×ÔÏÄÏÐÏÌÎÅÎÉÅ ÒÁÂÏÔÁÅÔ ×Ï ×ÓÅÈ ÓÔÒÏËÁÈ ××ÏÄÁ. ðÒÏÓÔÏ ÎÁÖÍÉÔÅ M-Tab. +óÏ×ÅÔ: îÁ ÍÅÄÌÅÎÎÙÈ ÔÅÒÍÉÎÁÌÁÈ ÍÏÖÅÔ ÐÏÍÏÞØ ÆÌÁÇ -s. +óÏ×ÅÔ: ðÏÉÓË ÆÁÊÌÁ: ×Ù ÍÏÖÅÔÅ ÒÁÂÏÔÁÔØ Ó ÎÁÊÄÅÎÎÙÍÉ ÆÁÊÌÁÍÉ ÐÒÉ ðÁÎÅÌÉÚÁÃÉÉ. +óÏ×ÅÔ: Want to do complex searches? Use the External Panelize command. +óÏ×ÅÔ: äÌÑ ÓÍÅÎÙ ËÁÔÁÌÏÇÁ ×Ï ×ÒÅÍÑ ÎÁÂÏÒÁ ËÏÍÁÎÄÙ, ÎÁÖÍÉÔÅ M-c (ÂÙÓÔÒÁÑ ÓÍÅÎÁ). +úÁÍÅÔËÁ: ëÏÍÁÎÄÙ ÏÂÏÌÏÞËÉ ÎÅ ×ÙÐÏÌÎÑÀÔÓÑ, ÅÓÌÉ ×Ù ÎÅ × ÌÏËÁÌØÎÏÊ ÆÁÊÌ. ÓÉÓÔÅÍÅ. +óÏ×ÅÔ: õÄÁÌÅÎÎÙÊ ÔÅËÓÔ ÍÏÖÎÏ ×ÅÒÎÕÔØ Ó ÐÏÍÏÝØÀ C-y. +óÏ×ÅÔ: îÅËÏÔÏÒÙÅ ËÌÁ×ÉÛÉ ÎÅ ÒÁÂÏÔÁÀÔ? ÷ÚÇÌÑÎÉÔÅ × îÁÓÔÒÏÊËÉ/òÁÓÐÏÚÎÁ×ÁÎÉÅ ËÌÁ×ÉÛ. +óÏ×ÅÔ: äÌÑ ÐÏÌÕÞÅÎÉÑ ×Ù×ÏÄÁ ËÏÍÁÎÄÙ × ÏËÎÅ ÐÒÏÓÍÏÔÒÁ, ÎÁÂÅÒÉÔÅ M-! +óÏ×ÅÔ: F13 (ÉÌÉ Shift-F3) ×ÙÚÙ×ÁÀÔ ÐÒÏÓÍÏÔÒÝÉË × ÒÅÖÉÍÅ ÎÅÏÂÒÁÂÏÔÁÎÎÙÈ ÄÁÎÎÙÈ. +óÏ×ÅÔ: îÅ ÒÁÂÏÔÁÀÔ ËÌÁ×ÉÛÉ × xterms? ðÏÐÒÏÂÕÊÔÅ ÎÁÛÉ ÆÁÊÌÙ xterm.ad,.ti É .tcap. +óÏ×ÅÔ: ÷Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ÒÅÄÁËÔÏÒ ÄÌÑ F4 Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÏÊ ÏÂÏÌÏÞËÉ EDITOR. +óÏ×ÅÔ: ÷Ù ÍÏÖÅÔÅ ×ÙÂÒÁÔØ ×ÎÅÛÎÉÊ ÐÒÏÓÍÏÔÒÝÉË Ó ÐÏÍÏÝØÀ ÐÅÒÅÍÅÎÎÏÊ ÏÂÏÌÏÞËÉ PAGER. +óÏ×ÅÔ: ÷Ù ÍÏÖÅÔÅ ÏÔÍÅÎÉÔØ ÚÁÐÒÏÓÙ ÎÁ ÐÏÄÔ×ÅÒÖÄÅÎÉÅ × îÁÓÔÒÏÊËÉ/ðÏÄÔ×ÅÒÖÄÅÎÉÅ. +óÏ×ÅÔ: ðÅÒÅÈÏÄÉÔÅ Ë ÞÁÓÔÏ ÉÓÐÏÌØÚÕÅÍÙÍ ËÁÔÁÌÏÇÁÍ ÉÚ ÓÐÒÁ×ÏÞÎÉËÁ, ÎÁÂÒÁ× C-\. +óÏ×ÅÔ: ÷Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÁÎÏÎÉÍÎÙÊ FTP Ó mc ÎÁÂÒÁ× 'cd /#ftp:machine.edu' +óÏ×ÅÔ: FTP ×ÓÔÒÏÅÎ × Midnight Commander, ÍÅÎÀ ðÁÎÅÌØ/FTP-ÓÏÅÄÉÎÅÎÉÅ. +óÏ×ÅÔ: M-t ÂÙÓÔÒÏ ÉÚÍÅÎÑÅÔ ÆÏÒÍÁÔ ÓÐÉÓËÁ ÐÁÎÅÌÉ. +óÏ×ÅÔ: ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ × ËÏÍÁÎÄÅ: 'cd /#ftp:user@machine.edu'. +óÏ×ÅÔ: ÷Ù ÍÏÖÅÔÅ ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÆÁÊÌÙ RPM ÎÁÖÁ× Enter ÎÁ ÆÁÊÌÅ RPM. +óÏ×ÅÔ: äÌÑ ÏÔÍÅÔËÉ ËÁÔÁÌÏÇÏ× × ÄÉÁÌÏÇÅ ×ÙÂÏÒÁ, ÄÏÂÁ×ØÔÅ ËÏÓÕÀ ÞÅÒÔÕ. +óÏ×ÅÔ: ÷ÙÒÅÚÁÎÉÅ É ×ÓÔÁ×ËÁ Ó ÐÏÍÏÝØÀ ÍÙÛÉ ÍÏÖÅÔ ÔÒÅÂÏ×ÁÔØ ÄÅÒÖÁÔØ ËÌÁ×ÉÛÕ Shift. +óÏ×ÅÔ: èÒÁÎÉÔÅ ÓÐÉÓÏË ÞÁÓÔÏ ÐÏÓÅÝÁÅÍÙÈ FTP × ÓÐÒÁ×ÏÞÎÉËÅ ËÁÔÁÌÏÇÏ×: ÎÁÖÍÉÔÅ C-\. diff -ruN old/mc-4.5.42/lib/mc.menu new/mc-4.5.43/lib/mc.menu --- old/mc-4.5.42/lib/mc.menu Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/lib/mc.menu Sat Mar 18 08:43:44 2000 @@ -285,6 +285,7 @@ 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 + esac shift done diff -ruN old/mc-4.5.42/lib/mc.sh new/mc-4.5.43/lib/mc.sh --- old/mc-4.5.42/lib/mc.sh Mon Dec 6 18:49:59 1999 +++ new/mc-4.5.43/lib/mc.sh Sat Mar 18 08:43:44 2000 @@ -3,7 +3,7 @@ mkdir -p ~/.mc/tmp 2> /dev/null chmod 700 ~/.mc/tmp MC=~/.mc/tmp/mc-$$ - /opt/gnome/bin/mc -P "$@" > "$MC" + /tmp/test/bin/mc -P "$@" > "$MC" cd "`cat $MC`" rm "$MC" unset MC; diff -ruN old/mc-4.5.42/mc-aclocal.m4 new/mc-4.5.43/mc-aclocal.m4 --- old/mc-4.5.42/mc-aclocal.m4 Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/mc-aclocal.m4 Sat Mar 18 08:43:43 2000 @@ -727,10 +727,20 @@ if test $fu_cv_sys_mounted_getmntinfo = yes; then list_mounted_fs=found AC_DEFINE(MOUNTED_GETMNTINFO) + AC_MSG_CHECKING([if struct statfs has f_fstypename]) + AC_CACHE_VAL(fu_cv_sys_mounted_f_fstypename, + [ + AC_EGREP_HEADER(f_type;, sys/mount.h, ok=yes, ok=) + test -n "$ok" \ + && fu_cv_sys_mounted_f_fstypename=yes \ + || fu_cv_sys_mounted_f_fstypename=no + ]) + AC_MSG_RESULT($fu_cv_sys_mounted_f_fstypename) + if test $fu_cv_sys_mounted_f_fstypename = yes; then + AC_DEFINE(HAVE_F_FSTYPENAME) + fi fi fi - - # FIXME: add a test for netbsd-1.1 here if test -z "$list_mounted_fs"; then # Ultrix diff -ruN old/mc-4.5.42/mc.spec new/mc-4.5.43/mc.spec --- old/mc-4.5.42/mc.spec Mon Dec 6 18:49:54 1999 +++ new/mc-4.5.43/mc.spec Sat Mar 18 08:43:43 2000 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.42 +%define ver 4.5.43 %define RELEASE 1 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix /usr diff -ruN old/mc-4.5.42/new_icons/Makefile.in new/mc-4.5.43/new_icons/Makefile.in --- old/mc-4.5.42/new_icons/Makefile.in Mon Dec 6 18:50:06 1999 +++ new/mc-4.5.43/new_icons/Makefile.in Sat Mar 18 08:43:48 2000 @@ -42,10 +42,20 @@ gnome-image-generic.png \ gnome-application-encapsulated_postscript.png \ gnome-application-pdf.png \ + gnome-application-pgp.png \ gnome-application-postscript.png \ gnome-application-x-c-header.png \ gnome-application-x-c-source.png \ gnome-application-x-cc-source.png \ + gnome-application-x-e-theme.png \ + gnome-application-x-kde-app-info.png \ + gnome-application-x-generic-spreadsheet.png \ + gnome-application-x-gnome-app-info.png \ + gnome-application-x-java-source.png \ + gnome-application-x-php.png \ + gnome-application-x-reject.png \ + gnome-application-x-scheme-source.png \ + gnome-application-x-sql.png \ gnome-package.png \ gnome-compressed.png \ gnome-core.png \ @@ -53,6 +63,12 @@ gnome-objectfile.png \ gnome-textfile.png \ gnome-tex.png \ + gnome-text-x-authors.png \ + gnome-text-x-copying.png \ + gnome-text-x-credits.png \ + gnome-text-x-install.png \ + gnome-text-x-makefile.png \ + gnome-text-x-readme.png \ gnome-audio.png \ gnome-audio-basic.png \ gnome-audio-midi.png \ @@ -61,10 +77,18 @@ gnome-audio-x-mod.png \ gnome-audio-x-mp3.png \ gnome-audio-x-pn-realaudio.png \ + gnome-audio-x-s3m.png \ + gnome-audio-x-stm.png \ gnome-audio-x-voc.png \ gnome-audio-x-wav.png \ + gnome-audio-x-xi.png \ + gnome-audio-x-xm.png \ + gnome-font-afm.png \ + gnome-font-ttf.png \ + gnome-font-x-pcf.png \ gnome-image-psd.png \ - gnome-image-xcf.png + gnome-image-xcf.png \ + gnome-image-x-xfig.png all: Binary files old/mc-4.5.42/new_icons/gnome-application-pgp.png and new/mc-4.5.43/new_icons/gnome-application-pgp.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-e-theme.png and new/mc-4.5.43/new_icons/gnome-application-x-e-theme.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-generic-spreadsheet.png and new/mc-4.5.43/new_icons/gnome-application-x-generic-spreadsheet.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-gnome-app-info.png and new/mc-4.5.43/new_icons/gnome-application-x-gnome-app-info.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-java-source.png and new/mc-4.5.43/new_icons/gnome-application-x-java-source.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-kde-app-info.png and new/mc-4.5.43/new_icons/gnome-application-x-kde-app-info.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-php.png and new/mc-4.5.43/new_icons/gnome-application-x-php.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-reject.png and new/mc-4.5.43/new_icons/gnome-application-x-reject.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-scheme-source.png and new/mc-4.5.43/new_icons/gnome-application-x-scheme-source.png differ Binary files old/mc-4.5.42/new_icons/gnome-application-x-sql.png and new/mc-4.5.43/new_icons/gnome-application-x-sql.png differ Binary files old/mc-4.5.42/new_icons/gnome-audio-x-s3m.png and new/mc-4.5.43/new_icons/gnome-audio-x-s3m.png differ Binary files old/mc-4.5.42/new_icons/gnome-audio-x-stm.png and new/mc-4.5.43/new_icons/gnome-audio-x-stm.png differ Binary files old/mc-4.5.42/new_icons/gnome-audio-x-xi.png and new/mc-4.5.43/new_icons/gnome-audio-x-xi.png differ Binary files old/mc-4.5.42/new_icons/gnome-audio-x-xm.png and new/mc-4.5.43/new_icons/gnome-audio-x-xm.png differ Binary files old/mc-4.5.42/new_icons/gnome-font-afm.png and new/mc-4.5.43/new_icons/gnome-font-afm.png differ Binary files old/mc-4.5.42/new_icons/gnome-font-ttf.png and new/mc-4.5.43/new_icons/gnome-font-ttf.png differ Binary files old/mc-4.5.42/new_icons/gnome-font-x-pcf.png and new/mc-4.5.43/new_icons/gnome-font-x-pcf.png differ Binary files old/mc-4.5.42/new_icons/gnome-image-x-xfig.png and new/mc-4.5.43/new_icons/gnome-image-x-xfig.png differ Binary files old/mc-4.5.42/new_icons/gnome-pack-deb.png and new/mc-4.5.43/new_icons/gnome-pack-deb.png differ Binary files old/mc-4.5.42/new_icons/gnome-text-x-authors.png and new/mc-4.5.43/new_icons/gnome-text-x-authors.png differ Binary files old/mc-4.5.42/new_icons/gnome-text-x-copying.png and new/mc-4.5.43/new_icons/gnome-text-x-copying.png differ Binary files old/mc-4.5.42/new_icons/gnome-text-x-credits.png and new/mc-4.5.43/new_icons/gnome-text-x-credits.png differ Binary files old/mc-4.5.42/new_icons/gnome-text-x-install.png and new/mc-4.5.43/new_icons/gnome-text-x-install.png differ Binary files old/mc-4.5.42/new_icons/gnome-text-x-makefile.png and new/mc-4.5.43/new_icons/gnome-text-x-makefile.png differ Binary files old/mc-4.5.42/new_icons/gnome-text-x-readme.png and new/mc-4.5.43/new_icons/gnome-text-x-readme.png differ diff -ruN old/mc-4.5.42/po/POTFILES.in new/mc-4.5.43/po/POTFILES.in --- old/mc-4.5.42/po/POTFILES.in Mon Dec 6 18:50:14 1999 +++ new/mc-4.5.43/po/POTFILES.in Sat Mar 18 08:43:50 2000 @@ -39,6 +39,7 @@ src/dialog.c src/dir.c src/ext.c +src/features.inc src/file.c src/filegui.c src/find.c @@ -66,6 +67,8 @@ src/widget.c src/win.c src/wtools.c +vfs/cpio.c +vfs/direntry.c vfs/extfs.c vfs/fish.c vfs/ftpfs.c @@ -73,3 +76,4 @@ vfs/smbfs.c vfs/tar.c vfs/vfs.c +vfs/undelfs.c Binary files old/mc-4.5.42/po/ca.gmo and new/mc-4.5.43/po/ca.gmo differ diff -ruN old/mc-4.5.42/po/ca.po new/mc-4.5.43/po/ca.po --- old/mc-4.5.42/po/ca.po Mon Dec 6 18:50:14 1999 +++ new/mc-4.5.43/po/ca.po Sat Mar 18 08:43:50 2000 @@ -1,7 +1,10 @@ +# +# Ivan Vilata i Balaguer 1999-2000 +# msgid "" msgstr "" "Project-Id-Version: mc 4.5.29\n" -"POT-Creation-Date: 1999-10-31 14:53+0100\n" +"POT-Creation-Date: 2000-03-13 21:03+0100\n" "PO-Revision-Date: 1999-07-19 21:52+02:00\n" "Last-Translator: Ivan Vilata i Balaguer \n" "Language-Team: Catalan \n" @@ -9,25 +12,25 @@ "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr " Tecla d'Emacs: " -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 msgid " Execute Macro " msgstr " Executar macro " #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:743 +#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr " Polseu la combinació per la macro: " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Insert Literal " msgstr " Inserir literal " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Press any key: " msgstr " Premeu una tecla: " @@ -67,15 +70,15 @@ "\"%s\"%s" msgstr "" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:135 gnome/gaction.c:151 msgid "open" msgstr "obrir" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:188 gnome/gaction.c:205 msgid "edit" msgstr "editar" -#: gnome/gaction.c:331 +#: gnome/gaction.c:345 msgid "view" msgstr "veure" @@ -192,7 +195,7 @@ msgstr "Establir filtre" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 -#: gnome/gscreen.c:2416 +#: gnome/gscreen.c:2429 msgid "Show all files" msgstr "Mostrar tots els fitxers" @@ -269,8 +272,8 @@ msgstr "Data de creació" #. Group -#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:776 -#: gnome/gnome-file-property-dialog.c:945 gnome/gprop.c:280 gnome/gprop.c:405 +#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:788 +#: gnome/gnome-file-property-dialog.c:957 gnome/gprop.c:280 gnome/gprop.c:405 #: src/screen.c:427 msgid "Group" msgstr "Grup" @@ -296,7 +299,7 @@ msgstr "Nombre d'enllaços forts" #. Owner -#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:930 +#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:942 #: gnome/gprop.c:390 src/screen.c:426 msgid "Owner" msgstr "Propietari" @@ -360,28 +363,28 @@ msgid "Desktop" msgstr "Escriptori" -#: gnome/gdesktop.c:521 gnome/gmount.c:389 +#: gnome/gdesktop.c:532 gnome/gmount.c:382 msgid "Warning" msgstr "Avís" -#: gnome/gdesktop.c:522 +#: gnome/gdesktop.c:533 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "No s'ha pogut obrir %s; no hi haurà icones a l'escriptori" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "Mentre s'executava la comanda de (des)muntage" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "Mentre s'executava la comanda d'expulsió" -#: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "Error" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2617 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -395,97 +398,97 @@ "\n" "No es pot penjar la imatge de fons." -#: gnome/gdesktop.c:2616 gnome/glayout.c:363 +#: gnome/gdesktop.c:2640 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Llança un nou terminal al directori actual" -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2642 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Crea un nou directori" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2618 gnome/glayout.c:365 +#: gnome/gdesktop.c:2642 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Directori..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2643 #, fuzzy msgid "Creates a new URL link" msgstr "Crea un nou llançador" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2643 #, fuzzy msgid "URL L_ink..." msgstr "Fer enllaç fort..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2644 msgid "Creates a new launcher" msgstr "Crea un nou llançador" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "_Llançador..." -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2650 #, fuzzy msgid "By _Name" msgstr " Nom " -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2651 #, fuzzy msgid "By File _Type" msgstr "Tipus de fitxer" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2652 #, fuzzy msgid "By _Size" msgstr " Tamany " -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2653 #, fuzzy msgid "By Time Last _Accessed" msgstr "Data d'accés" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2654 #, fuzzy msgid "By Time Last _Modified" msgstr "Data de modificació" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2655 #, fuzzy msgid "By Time Last _Changed" msgstr "Data de canvi" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 #, fuzzy msgid "_Arrange Icons" msgstr "Arranjar les icones" -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2664 #, fuzzy msgid "Create _New Window" msgstr "Crear una nova finestra" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 #, fuzzy msgid "Rescan _Desktop Directory" msgstr "Rellegir directori" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 #, fuzzy msgid "Rescan De_vices" msgstr "Rellegir dispositius sistema" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 #, fuzzy msgid "Recreate Default _Icons" msgstr "Refer les dreceres de l'escriptori" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2670 #, fuzzy msgid "Configure _Background Image" msgstr "Configurar la imatge de fons" @@ -551,12 +554,12 @@ msgid "Replace it?" msgstr "Reemplaçar-lo?" -#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1097 gtkedit/gtkedit.c:1250 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 #: src/file.c:802 src/screen.c:2399 src/screen.c:2429 src/tree.c:1014 msgid "Copy" msgstr "Copiar" -#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1098 gtkedit/gtkedit.c:1252 +#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1141 gtkedit/gtkedit.c:1252 msgid "Move" msgstr "Moure" @@ -619,7 +622,7 @@ "\n" "El directori no és buit. Esborrar-lo recursivament?" -#: gnome/gdialogs.c:790 src/file.c:2247 +#: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " msgstr " Esborrar: " @@ -657,7 +660,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1808 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1831 msgid "Password:" msgstr "Contrasenya:" @@ -674,25 +677,25 @@ msgid "Symbolic link filename:" msgstr "Nom de l'enllaç simbòlic:" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "_Moure ací" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "_Copiar ací" # «Enllaçar ací» sembla el contrari... iv -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "Crear-hi un en_llaç" -#: gnome/gdnd.c:56 +#: gnome/gdnd.c:57 msgid "Cancel drag" msgstr "Cancel·lar moviment" #. FIXME: this error message sucks -#: gnome/gdnd.c:192 +#: gnome/gdnd.c:193 #, c-format msgid "" "Could not stat %s\n" @@ -701,8 +704,9 @@ "No s'ha pogut estudiar %s\n" "%s" -#: gnome/gicon.c:218 -msgid "Default set of icons not found, please check your installation" +#: gnome/gicon.c:282 +#, fuzzy +msgid "Default set of icons not found, check your installation" msgstr "" "El joc d'icones per defecte no es troba, comproveu la vostra instal·lació" @@ -800,7 +804,7 @@ msgstr "Còpia fitxers" #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:389 gnome/gscreen.c:2085 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." msgstr "_Copiar..." @@ -808,7 +812,7 @@ msgid "Delete files" msgstr "Esborra fitxers" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "_Esborrar..." @@ -816,7 +820,7 @@ msgid "Rename or move files" msgstr "Mou o reanomena fitxers" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "_Moure..." @@ -861,7 +865,7 @@ msgid "_Invert Selection" msgstr "_Invertir selecció" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2088 msgid "Search" msgstr "Cercar" @@ -874,7 +878,7 @@ msgid "Rescan the directory contents" msgstr "Rellig els continguts del directori" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "_Rellegir directori" @@ -986,317 +990,332 @@ msgid "Could not get the desktop\n" msgstr " No s'ha pogut fer l'enllaç fort " -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "" + +#: gnome/gmc-client.c:206 msgid "Create window showing the specified directory" msgstr "" -#: gnome/gmc-client.c:171 gnome/gmc-client.c:173 +#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 msgid "DIRECTORY" msgstr "" -#: gnome/gmc-client.c:173 +#: gnome/gmc-client.c:208 #, fuzzy msgid "Rescan the specified directory" msgstr "Rellig el directori actual" -#: gnome/gmc-client.c:175 +#: gnome/gmc-client.c:210 #, fuzzy msgid "Rescan the desktop icons" msgstr "Rellig els continguts del directori" -#: gnome/gmc-client.c:177 +#: gnome/gmc-client.c:212 #, fuzzy msgid "Rescan the desktop device icons" msgstr "Rellig els continguts del directori" -#: gnome/gmc-client.c:179 +#: gnome/gmc-client.c:214 +#, fuzzy +msgid "Arrange the desktop icons" +msgstr "Rellig els continguts del directori" + +#: gnome/gmc-client.c:215 +msgid "name | type | size | atime | mtime | ctime" +msgstr "" + +#: gnome/gmc-client.c:217 msgid "Close windows whose directories cannot be reached" msgstr "" -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 #, fuzzy msgid "Could not open the /etc/fstab file" msgstr " No es pot obrir el fitxer " -#: gnome/gmount.c:390 +#: gnome/gmount.c:383 #, fuzzy, c-format msgid "Could not symlink %s to %s; will not have such a desktop device icon." msgstr "" "No s'ha pogunt enllaçar %s amb %s; no hi haurà icona de dir. personal a " "l'escriptori." -#: gnome/gmount.c:446 +#: gnome/gmount.c:439 #, c-format msgid "CD-ROM %d" msgstr "" -#: gnome/gmount.c:458 +#: gnome/gmount.c:451 #, c-format msgid "Floppy %d" msgstr "" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, fuzzy, c-format msgid "Disk %d" msgstr "és " -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "Dispositiu %d" #. we set the file part -#: gnome/gnome-file-property-dialog.c:170 +#: gnome/gnome-file-property-dialog.c:171 msgid "Full Name: " msgstr "Nom complet: " -#: gnome/gnome-file-property-dialog.c:178 +#: gnome/gnome-file-property-dialog.c:179 msgid "File Name" msgstr "Nom del fitxer" -#: gnome/gnome-file-property-dialog.c:201 +#: gnome/gnome-file-property-dialog.c:204 +#: gnome/gnome-file-property-dialog.c:210 msgid "File Type: " msgstr "Tipus: " -#: gnome/gnome-file-property-dialog.c:207 +#: gnome/gnome-file-property-dialog.c:217 msgid "File Type: Symbolic Link" msgstr "Tipus: Enllaç simbòlic" -#: gnome/gnome-file-property-dialog.c:212 +#: gnome/gnome-file-property-dialog.c:222 msgid "Target Name: INVALID LINK" msgstr "Nom destinació: ENLLAÇ NO VÀLID" -#: gnome/gnome-file-property-dialog.c:215 +#: gnome/gnome-file-property-dialog.c:225 msgid "Target Name: " msgstr "Nom destinació: " -#: gnome/gnome-file-property-dialog.c:220 +#: gnome/gnome-file-property-dialog.c:230 msgid "File Type: Directory" msgstr "Tipus: Directori" -#: gnome/gnome-file-property-dialog.c:222 +#: gnome/gnome-file-property-dialog.c:232 msgid "File Type: Character Device" msgstr "Tipus: Dispositiu de caràcters" -#: gnome/gnome-file-property-dialog.c:224 +#: gnome/gnome-file-property-dialog.c:234 msgid "File Type: Block Device" msgstr "Tipus: dispositiu de blocs" -#: gnome/gnome-file-property-dialog.c:226 +#: gnome/gnome-file-property-dialog.c:236 msgid "File Type: Socket" msgstr "Tipus: Connector" -#: gnome/gnome-file-property-dialog.c:228 +#: gnome/gnome-file-property-dialog.c:238 msgid "File Type: FIFO" msgstr "Tipus: Cua FIFO" -#: gnome/gnome-file-property-dialog.c:238 +#: gnome/gnome-file-property-dialog.c:248 msgid " bytes" msgstr " octets" -#: gnome/gnome-file-property-dialog.c:238 -#: gnome/gnome-file-property-dialog.c:242 #: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:252 +#: gnome/gnome-file-property-dialog.c:258 msgid "File Size: " msgstr "Tamany: " -#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:252 msgid " KBytes (" msgstr " KOctets (" -#: gnome/gnome-file-property-dialog.c:243 -#: gnome/gnome-file-property-dialog.c:249 +#: gnome/gnome-file-property-dialog.c:253 +#: gnome/gnome-file-property-dialog.c:259 msgid " bytes)" msgstr " octets)" -#: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:258 msgid " MBytes (" msgstr " MOctets (" -#: gnome/gnome-file-property-dialog.c:256 +#: gnome/gnome-file-property-dialog.c:266 msgid "File Size: N/A" msgstr "Tamany: no aplicable" -#: gnome/gnome-file-property-dialog.c:267 +#: gnome/gnome-file-property-dialog.c:277 msgid "File Created on: " msgstr "Fitxer creat a: " -#: gnome/gnome-file-property-dialog.c:276 +#: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "Útima modificació: " -#: gnome/gnome-file-property-dialog.c:285 +#: gnome/gnome-file-property-dialog.c:295 msgid "Last Accessed on: " msgstr "Últim accés: " -#: gnome/gnome-file-property-dialog.c:303 +#: gnome/gnome-file-property-dialog.c:313 msgid "URL:" msgstr "URL:" -#: gnome/gnome-file-property-dialog.c:310 +#: gnome/gnome-file-property-dialog.c:320 msgid "Caption:" msgstr "Llegenda:" -#: gnome/gnome-file-property-dialog.c:387 -#: gnome/gnome-file-property-dialog.c:489 +#: gnome/gnome-file-property-dialog.c:397 +#: gnome/gnome-file-property-dialog.c:499 msgid "Drop Action" msgstr "Acció en deixar" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 #, fuzzy msgid "Use default Drop Action options" msgstr "Usar l'acció per defecte en deixar" -#: gnome/gnome-file-property-dialog.c:403 -#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 #: src/screen.c:2397 src/screen.c:2427 msgid "View" msgstr "Veure" -#: gnome/gnome-file-property-dialog.c:404 +#: gnome/gnome-file-property-dialog.c:414 #, fuzzy msgid "Use default View options" msgstr "Usar l'acció per defecte en veure" -#: gnome/gnome-file-property-dialog.c:439 +#: gnome/gnome-file-property-dialog.c:449 msgid "Select an Icon" msgstr "Seleccionar icona" #. we do open first -#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 +#: gnome/gnome-file-property-dialog.c:479 gnome/gpopup2.c:195 msgid "Open" msgstr "Obrir" -#: gnome/gnome-file-property-dialog.c:479 +#: gnome/gnome-file-property-dialog.c:489 msgid "Use default Open action" msgstr "Usar l'acció per defecte en obrir" -#: gnome/gnome-file-property-dialog.c:502 +#: gnome/gnome-file-property-dialog.c:512 msgid "Use default Drop action" msgstr "Usar l'acció per defecte en deixar" -#: gnome/gnome-file-property-dialog.c:504 +#: gnome/gnome-file-property-dialog.c:514 msgid "Use default View action" msgstr "Usar l'acció per defecte en veure" -#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +#: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 msgid "Edit" msgstr "Editar" -#: gnome/gnome-file-property-dialog.c:523 +#: gnome/gnome-file-property-dialog.c:533 msgid "Use default Edit action" msgstr "Usar l'acció per defecte en editar" -#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521 +#: gnome/gnome-file-property-dialog.c:587 gnome/gprop.c:521 msgid "Icon" msgstr "Icona" #. We must be a file or a link to a file. -#: gnome/gnome-file-property-dialog.c:611 +#: gnome/gnome-file-property-dialog.c:621 msgid "File Actions" msgstr "Accions del fitxer" -#: gnome/gnome-file-property-dialog.c:616 +#: gnome/gnome-file-property-dialog.c:626 msgid "Open action" msgstr "Acció d'obrir" -#: gnome/gnome-file-property-dialog.c:617 +#: gnome/gnome-file-property-dialog.c:627 msgid "Needs terminal to run" msgstr "Necessita obrir un terminal" -#: gnome/gnome-file-property-dialog.c:742 +#: gnome/gnome-file-property-dialog.c:753 msgid "File Permissions" msgstr "Permissos del fitxer" -#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259 +#: gnome/gnome-file-property-dialog.c:764 gnome/gprop.c:259 msgid "Current mode: " msgstr "Mode actual: " #. Headings -#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272 +#: gnome/gnome-file-property-dialog.c:780 gnome/gprop.c:272 msgid "Read" msgstr "Lectura" -#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273 +#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:273 msgid "Write" msgstr "Escriptura" -#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274 +#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:274 msgid "Exec" msgstr "Execució" -#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275 +#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:275 msgid "Special" msgstr "Especial" #. Permissions -#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279 +#: gnome/gnome-file-property-dialog.c:787 gnome/gprop.c:279 msgid "User" msgstr "Usuari" -#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281 +#: gnome/gnome-file-property-dialog.c:789 gnome/gprop.c:281 msgid "Other" msgstr "Altres" #. Special -#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285 +#: gnome/gnome-file-property-dialog.c:793 gnome/gprop.c:285 msgid "Set UID" msgstr "Establir UID" -#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286 +#: gnome/gnome-file-property-dialog.c:794 gnome/gprop.c:286 msgid "Set GID" msgstr "Establir GID" # Mentre ningú diga el contrari... Què vos sembla? iv -#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287 +#: gnome/gnome-file-property-dialog.c:795 gnome/gprop.c:287 msgid "Sticky" msgstr "Permanença" -#: gnome/gnome-file-property-dialog.c:905 +#: gnome/gnome-file-property-dialog.c:917 #, c-format msgid " (%d)" msgstr " (%d)" -#: gnome/gnome-file-property-dialog.c:919 +#: gnome/gnome-file-property-dialog.c:931 msgid "File ownership" msgstr "Propietat del fitxer" -#: gnome/gnome-file-property-dialog.c:1079 +#: gnome/gnome-file-property-dialog.c:1097 msgid "URL" msgstr "URL" -#: gnome/gnome-file-property-dialog.c:1082 +#: gnome/gnome-file-property-dialog.c:1100 msgid "Statistics" msgstr "Estadístiques" -#: gnome/gnome-file-property-dialog.c:1088 +#: gnome/gnome-file-property-dialog.c:1106 msgid "Options" msgstr "Opcions" -#: gnome/gnome-file-property-dialog.c:1091 +#: gnome/gnome-file-property-dialog.c:1109 msgid "Permissions" msgstr "Permissos" -#: gnome/gnome-file-property-dialog.c:1094 +#: gnome/gnome-file-property-dialog.c:1112 msgid " Properties" msgstr " Propietats" -#: gnome/gnome-file-property-dialog.c:1146 -#: gnome/gnome-file-property-dialog.c:1157 +#: gnome/gnome-file-property-dialog.c:1164 +#: gnome/gnome-file-property-dialog.c:1175 msgid "You entered an invalid username" msgstr "Heu entrat un nom d'usuari no vàlid" -#: gnome/gnome-file-property-dialog.c:1202 +#: gnome/gnome-file-property-dialog.c:1220 msgid "You must rename your file to something" msgstr "Heu de canviar el nom del fitxer" -#: gnome/gnome-file-property-dialog.c:1208 +#: gnome/gnome-file-property-dialog.c:1226 msgid "You cannot rename a file to something containing a '/' character" msgstr "No podeu fer que el nou nom continga el caràcter «/»" @@ -1344,7 +1363,7 @@ msgid "Copy..." msgstr "Copiar..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2402 #: src/screen.c:2432 msgid "Delete" msgstr "Esborrar" @@ -1385,71 +1404,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Usar patrons de l'intèrpret, no expressions regulars" -#: gnome/gprefs.c:113 +#: gnome/gprefs.c:108 +msgid "Determine file types from file content instead of extensions" +msgstr "" + +#: gnome/gprefs.c:117 msgid "Confirm when deleting file" msgstr "Confirmar l'esborrament d'un fitxer" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "Confirmar la sobreescriptura de fitxers" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "Confirmar l'execució de fitxers" -#: gnome/gprefs.c:125 +#: gnome/gprefs.c:129 msgid "Show progress while operations are being performed" msgstr "Mostrar el progrés de les operacions portades a terme" -#: gnome/gprefs.c:134 +#: gnome/gprefs.c:138 msgid "VFS Timeout:" msgstr "Expiració dels VFS:" -#: gnome/gprefs.c:135 gnome/gprefs.c:160 +#: gnome/gprefs.c:139 gnome/gprefs.c:164 msgid "Seconds" msgstr "Segons" -#: gnome/gprefs.c:138 +#: gnome/gprefs.c:142 msgid "Anonymous FTP password:" msgstr "Contrasenya d'FTP anònim:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "Usar sempre altern per l'FTP" -#: gnome/gprefs.c:151 +#: gnome/gprefs.c:155 msgid "Fast directory reload" msgstr "Recàrrega ràpida de directoris" -#: gnome/gprefs.c:155 +#: gnome/gprefs.c:159 msgid "Compute totals before copying files" msgstr "Calcular totals abans de copiar fitxers" -#: gnome/gprefs.c:159 +#: gnome/gprefs.c:163 msgid "FTP directory cache timeout :" msgstr "Expiració de la cache d'FTP:" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:167 msgid "Allow customization of icons in icon view" msgstr "Permetre vista amb icones personalitzades" -#: gnome/gprefs.c:172 +#: gnome/gprefs.c:176 msgid "File display" msgstr "Vista de fitxers" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:180 msgid "Confirmation" msgstr "Confirmació" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:184 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "Memòria cau" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "Preferències" @@ -1493,109 +1516,109 @@ msgid "Select icon" msgstr "Seleccionar icona" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Rellig el directori actual" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 #, fuzzy msgid "Creates a new directory here" msgstr "Crea un nou directori" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "Nou _Directori..." -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 #, fuzzy msgid "Creates a new file here" msgstr "Crea una nova carpeta ací" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." msgstr "Nou _Fitxers..." -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "Cercar: %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "%s octets en %d fitxer" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "%s octets en %d fitxers" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" msgstr "" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 #, fuzzy msgid "Copy directory" msgstr "Directori personal" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 #, fuzzy msgid "Delete directory" msgstr "Directori personal" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 #, fuzzy msgid "Rename or move directory" msgstr "Mou o reanomena fitxers" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Enrere" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Torna al directori visitat en últim lloc" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Puja un nivell a la jerarquia de directoris" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Amunt" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Avant" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Va al següent directori" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Rellegir" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Rellig el directori actual" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "Va al vostre directori personal" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "Dir. Personal" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "Ubicació:" #. 1 -#: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1219 -#: gtkedit/editcmd.c:1304 gtkedit/editcmd.c:2916 gtkedit/editoptions.c:71 +#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 +#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:71 #: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466 #: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 #: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:143 @@ -1608,12 +1631,12 @@ msgid "Offset 0x%08lx" msgstr "Desplaçament 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:735 #, c-format msgid "Col %d" msgstr "Columna %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "%s octets" @@ -1667,60 +1690,76 @@ msgid "_Search" msgstr "_Cercar" -#: gnome/gwidget.c:90 +#: gnome/gwidget.c:95 msgid "ok" msgstr "acceptar" -#: gnome/gwidget.c:92 +#: gnome/gwidget.c:97 msgid "cancel" msgstr "cancel·lar" -#: gnome/gwidget.c:94 +#: gnome/gwidget.c:99 msgid "help" msgstr "ajuda" -#: gnome/gwidget.c:96 src/file.c:2271 +#: gnome/gwidget.c:101 src/file.c:2268 msgid "yes" msgstr "sí" -#: gnome/gwidget.c:98 src/file.c:2269 +#: gnome/gwidget.c:103 src/file.c:2266 msgid "no" msgstr "no" -#: gnome/gwidget.c:100 +#: gnome/gwidget.c:105 msgid "exit" msgstr "eixir" -#: gnome/gwidget.c:102 +#: gnome/gwidget.c:107 msgid "abort" msgstr "avortar" #. The file-name is printed after the ':' -#: gtkedit/edit.c:132 gtkedit/edit.c:227 gtkedit/edit.c:234 gtkedit/edit.c:241 -#: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 -#: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 -#: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: gtkedit/edit.c:145 gtkedit/edit.c:314 gtkedit/edit.c:319 gtkedit/edit.c:333 +#: gtkedit/edit.c:337 gtkedit/edit.c:369 gtkedit/edit.c:375 gtkedit/edit.c:382 +#: gtkedit/edit.c:389 gtkedit/edit.c:395 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2030 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/screen.c:2417 src/tree.c:682 src/tree.c:688 +#: src/wtools.c:222 msgid " Error " msgstr " Error " -#: gtkedit/edit.c:132 gtkedit/edit.c:234 +#: gtkedit/edit.c:145 gtkedit/edit.c:337 gtkedit/edit.c:375 msgid " Failed trying to open file for reading: " msgstr " Fallada en intentar obrir fitxer per llegir: " -#: gtkedit/edit.c:241 +#: gtkedit/edit.c:314 +#, fuzzy +msgid " Error reading from pipe: " +msgstr " Problemes en llegir del fill " + +#: gtkedit/edit.c:319 +#, fuzzy +msgid " Failed trying to open pipe for reading: " +msgstr " Fallada en intentar obrir fitxer per llegir: " + +#: gtkedit/edit.c:333 +#, fuzzy +msgid " Error reading file: " +msgstr " Error en prendre informació del fitxer " + +#: gtkedit/edit.c:382 msgid " Cannot get size/permissions info on file: " msgstr " No es pot obtenir tamany/permissos del fitxer: " -#: gtkedit/edit.c:248 +#: gtkedit/edit.c:389 msgid " Not an ordinary file: " msgstr " No és un fitxer ordinari: " -#: gtkedit/edit.c:254 +#: gtkedit/edit.c:395 msgid " File is too large: " msgstr " El fitxer és massa gran: " -#: gtkedit/edit.c:255 +#: gtkedit/edit.c:396 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " @@ -1728,145 +1767,151 @@ " \n" " Incrementeu MAXBUF a edit.h i recompileu l'editor. " -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr " Error en reservar memòria " +#: gtkedit/editcmd.c:298 +#, fuzzy +msgid " Error writing to pipe: " +msgstr " Error en prendre informació del fitxer " + +#: gtkedit/editcmd.c:304 +#, fuzzy +msgid " Failed trying to open pipe for writing: " +msgstr " Fallada en intentar obrir fitxer per llegir: " -#: gtkedit/editcmd.c:334 +#: gtkedit/editcmd.c:379 msgid "Quick save " msgstr "Guardar ràpid " -#: gtkedit/editcmd.c:335 +#: gtkedit/editcmd.c:380 msgid "Safe save " msgstr "Guardar segur " -#: gtkedit/editcmd.c:336 +#: gtkedit/editcmd.c:381 msgid "Do backups -->" msgstr "Fer còpies -->" # Sí que hi ha NLS, sí... I la feinada que ha costat! iv #. NLS for hotkeys? -#: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1171 gtkedit/editcmd.c:1217 -#: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 +#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 +#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:68 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 -#: src/chmod.c:114 src/chown.c:79 src/cmd.c:854 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 -#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: src/view.c:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 #: vfs/smbfs.c:116 msgid "&Cancel" msgstr "&Cancel·lar" -#: gtkedit/editcmd.c:345 +#: gtkedit/editcmd.c:390 msgid "Extension:" msgstr "Extensió:" #. NLS ? -#: gtkedit/editcmd.c:352 +#: gtkedit/editcmd.c:397 msgid " Edit Save Mode " msgstr " Mode de guardat " -#: gtkedit/editcmd.c:499 +#: gtkedit/editcmd.c:525 msgid " Save As " msgstr " Guardar com a " #. Warning message with a query to continue or cancel the operation -#: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:703 src/screen.c:1451 src/screen.c:2129 +#: gtkedit/editcmd.c:539 gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " Avís " -#: gtkedit/editcmd.c:514 +#: gtkedit/editcmd.c:540 msgid " A file already exists with this name. " msgstr " Ja existeix un fitxer amb aquest nom. " -#: gtkedit/editcmd.c:516 gtkedit/editcmd.c:583 gtkedit/editcmd.c:810 -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:542 gtkedit/editcmd.c:609 gtkedit/editcmd.c:836 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 +#: gtkedit/editcmd.c:1670 msgid "Cancel" msgstr "Cancel·lar" #. Push buttons to over-write the current file, or cancel the operation -#: gtkedit/editcmd.c:516 +#: gtkedit/editcmd.c:542 msgid "Overwrite" msgstr "Sobreescriure" -#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 msgid " Error trying to save file. " msgstr " Error en guardar el fitxer. " -#: gtkedit/editcmd.c:535 +#: gtkedit/editcmd.c:561 msgid " Save as " msgstr " Guardar com a " #. This heads the delete macro error dialog box -#: gtkedit/editcmd.c:653 gtkedit/editcmd.c:661 gtkedit/editcmd.c:686 +#: gtkedit/editcmd.c:679 gtkedit/editcmd.c:687 gtkedit/editcmd.c:712 msgid " Delete macro " msgstr " Esborrar macro " #. 'Open' = load temp file -#: gtkedit/editcmd.c:655 +#: gtkedit/editcmd.c:681 msgid " Error trying to open temp file " msgstr " Error en obrir fitxer temporal " #. 'Open' = load temp file -#: gtkedit/editcmd.c:663 gtkedit/editcmd.c:724 gtkedit/editcmd.c:792 +#: gtkedit/editcmd.c:689 gtkedit/editcmd.c:750 gtkedit/editcmd.c:818 msgid " Error trying to open macro file " msgstr " Error en obrir fitxer de macros " -#: gtkedit/editcmd.c:668 gtkedit/editcmd.c:676 gtkedit/editcmd.c:712 -#: gtkedit/editcmd.c:767 +#: gtkedit/editcmd.c:694 gtkedit/editcmd.c:702 gtkedit/editcmd.c:738 +#: gtkedit/editcmd.c:793 #, c-format msgid "key '%d 0': " msgstr "tecla '%d 0': " -#: gtkedit/editcmd.c:687 +#: gtkedit/editcmd.c:713 msgid " Error trying to overwrite macro file " msgstr " Error en sobreescriure fitxer de macros " #. This heads the 'Macro' dialog box -#: gtkedit/editcmd.c:703 +#: gtkedit/editcmd.c:729 msgid " Macro " msgstr " Macro " #. Input line for a single key press follows the ':' -#: gtkedit/editcmd.c:705 +#: gtkedit/editcmd.c:731 msgid " Press the macro's new hotkey: " msgstr " Premeu la nova combinació per la macro: " #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:724 +#: gtkedit/editcmd.c:750 msgid " Save macro " msgstr " Guardar macro " -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:767 msgid " Delete Macro " msgstr " Esborrar macro " #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:791 +#: gtkedit/editcmd.c:817 msgid " Load macro " msgstr " Carregar macro " -#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833 msgid " Confirm save file? : " msgstr " Voleu guardar el fitxer?: " #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 msgid " Save file " msgstr " Guardar fitxer " -#: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 -#: src/view.c:2075 +#: gtkedit/editcmd.c:836 gtkedit/editwidget.c:1137 gtkedit/gtkedit.c:1247 +#: src/view.c:2080 msgid "Save" msgstr "Guardar" -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 msgid "" " Current text was modified without a file save. \n" " Continue discards these changes. " @@ -1874,119 +1919,114 @@ " El text actual ha estat modificat, però no guardat. \n" " «Continuar» descartarà aquests canvis. " -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 msgid "Continue" msgstr "Continuar" -#: gtkedit/editcmd.c:859 -msgid " Error trying to open file for reading " -msgstr " Error en obrir fitxer per llegir " - -#. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +#: gtkedit/editcmd.c:893 msgid " Load " msgstr " Carregar " -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 msgid " Block is large, you may not be able to undo this action. " msgstr " El bloc és gran, potser no podreu desfer aquesta acció " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Cancel " msgstr " Cancel·lar " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Continue " msgstr " Continuar " -#: gtkedit/editcmd.c:1173 +#: gtkedit/editcmd.c:1190 #, fuzzy msgid "o&Ne" msgstr "&Nom" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1192 src/filegui.c:597 msgid "al&L" msgstr "&Tots" -#: gtkedit/editcmd.c:1177 src/file.c:2193 src/filegui.c:267 +#: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Saltar" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1196 msgid "&Replace" msgstr "&Reemplaçar" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 msgid " Replace with: " msgstr " Reemplaçar amb: " -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1206 msgid " Confirm replace " msgstr " Confirmar reemplaçament " -#: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 +#: gtkedit/editcmd.c:1236 gtkedit/editcmd.c:1321 msgid "scanf &Expression" msgstr "expressió d'&Scanf" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1238 msgid "replace &All" msgstr "reemplaçar &Tots" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1240 msgid "pr&Ompt on replace" msgstr "con&Firmar reemplaçament" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 msgid "&Backwards" msgstr "cap &Enrere" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 msgid "&Regular expression" msgstr "expressió &Regular" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 msgid "&Whole words only" msgstr "paraules com&Pletes" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 msgid "case &Sensitive" msgstr "sensible a &Majúscules" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1252 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " Entreu l'ordre dels arguments, p.ex. 3,2,1,4 " -#: gtkedit/editcmd.c:1241 +#: gtkedit/editcmd.c:1256 msgid " Enter replacement string:" msgstr " Entreu la cadena reemplaçant:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2003 msgid " Enter search string:" msgstr " Entreu la cadena a cercar:" #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1264 gtkedit/editcmd.c:1516 gtkedit/editcmd.c:1607 -#: gtkedit/editcmd.c:2147 gtkedit/editcmd.c:2178 gtkedit/editcmd.c:2180 +#: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:2209 gtkedit/editcmd.c:2240 gtkedit/editcmd.c:2242 msgid " Replace " msgstr " Reemplaçar " #. Heads the 'Search' dialog box -#: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 -#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 -#: src/view.c:1998 +#: gtkedit/editcmd.c:1347 gtkedit/editcmd.c:1577 gtkedit/editcmd.c:2308 +#: gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 src/view.c:1531 +#: src/view.c:1630 src/view.c:1753 src/view.c:1971 src/view.c:2003 msgid " Search " msgstr " Cercar " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1382 +#: gtkedit/editcmd.c:1401 msgid " Enter search text : " msgstr " Entreu el text a cercar: " -#: gtkedit/editcmd.c:1389 +#: gtkedit/editcmd.c:1408 msgid " Enter replace text : " msgstr " Entreu el text reemplaçant: " -#: gtkedit/editcmd.c:1392 gtkedit/editcmd.c:1393 +#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 #, fuzzy, c-format msgid "" "You can enter regexp substrings with %s\n" @@ -1995,12 +2035,12 @@ "Podeu entrar subcadenes d'expressió regular amb %s (no \\1, \\2 com a sed) i " "aleshores usar \"ordre...entrada\"" -#: gtkedit/editcmd.c:1395 +#: gtkedit/editcmd.c:1414 msgid " Enter argument (or substring) order : " msgstr " Entreu l'ordre de l'argument o subcadena: " #. Tool hint -#: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1418 gtkedit/editcmd.c:1419 #, fuzzy msgid "" "Enter the order of replacement of your scanf\n" @@ -2010,19 +2050,19 @@ "de les subcadenes d'expressió regular" #. The following are check boxes -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1424 msgid " Whole words only " msgstr " Paraules completes " -#: gtkedit/editcmd.c:1407 +#: gtkedit/editcmd.c:1426 msgid " Case sensitive " msgstr " Sensible a majúscules " -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1429 msgid " Regular expression " msgstr " Expressió regular " -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1430 gtkedit/editcmd.c:1431 #, fuzzy msgid "" "See the regex man page for how\n" @@ -2031,34 +2071,50 @@ "Vegeu la pàgina de manual de regex per veure com composar una expressió " "regular" -#: gtkedit/editcmd.c:1418 +#: gtkedit/editcmd.c:1439 msgid " Backwards " msgstr " Cap enrere " #. Tool hint -#: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 +#: gtkedit/editcmd.c:1441 gtkedit/editcmd.c:1442 msgid "Warning: Searching backward can be slow" msgstr "Avís: cercar enrere pot ser lent" -#: gtkedit/editcmd.c:1434 +#: gtkedit/editcmd.c:1463 msgid " Prompt on replace " msgstr " Confirmar reemplaçament " #. Tool hint -#: gtkedit/editcmd.c:1436 +#: gtkedit/editcmd.c:1465 msgid "Ask before making each replacement" msgstr "Pregunta abans de fer cada reemplaçament" -#: gtkedit/editcmd.c:1438 +#: gtkedit/editcmd.c:1467 msgid " Replace all " msgstr " Reemplaçar tot " -#: gtkedit/editcmd.c:1441 +#. Tool hint +#: gtkedit/editcmd.c:1469 +#, fuzzy +msgid "Replace repeatedly" +msgstr "Reemplaçar tots" + +#: gtkedit/editcmd.c:1473 +#, fuzzy +msgid " Bookmarks " +msgstr "Eliminar marcadors" + +#. Tool hint +#: gtkedit/editcmd.c:1475 gtkedit/editcmd.c:1476 +msgid "Create bookmarks at all lines found" +msgstr "" + +#: gtkedit/editcmd.c:1479 msgid " Scanf expression " msgstr " Expressió d'scanf " #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1481 #, fuzzy msgid "" "Allows entering of a C format string,\n" @@ -2068,57 +2124,62 @@ "vegeu la pàgina de manual d'scanf" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1506 msgid "Begin search, Enter" msgstr "Començar recerca, Retorn" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "Avortar el diàleg, Esc" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace" msgstr "Reemplaçar" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace all" msgstr "Reemplaçar tots" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 #, fuzzy msgid "Replace one" msgstr " Reemplaçar " -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Skip" msgstr "Saltar" -#: gtkedit/editcmd.c:1969 +#: gtkedit/editcmd.c:2030 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr " Expressió regular no vàlida, o expressió scanf amb massa conversions " #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2149 +#: gtkedit/editcmd.c:2211 msgid " Error in replacement format string. " msgstr " Error al format de la cadena reemplaçant. " -#: gtkedit/editcmd.c:2177 +#: gtkedit/editcmd.c:2239 #, c-format msgid " %ld replacements made. " msgstr " S'han fet %ld reemplaçaments. " -#: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 +#: gtkedit/editcmd.c:2242 gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 msgid " Search string not found. " msgstr " No s'ha trobat la cadena cercada. " +#. in response to number of bookmarks added because of string being found %d times +#: gtkedit/editcmd.c:2307 +#, c-format +msgid " %d finds made, %d bookmarks added " +msgstr "" + #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 +#: gtkedit/editcmd.c:2363 gtkedit/editcmd.c:2378 gtkedit/editcmd.c:2381 msgid " Quit " msgstr " Eixir " -#: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2382 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -2126,137 +2187,137 @@ " El fitxer actual ha estat modificat però no guardat. \n" " Guardar en eixir? " -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2378 msgid " File was modified, Save with exit? " msgstr " El fitxer ha estat modificat. Guardar en eixir? " -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&No" msgstr "&No" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&Yes" msgstr "&Sí" -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2378 msgid "Cancel quit" msgstr "Cancel·lar eixida" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Cancel quit " msgstr " &Cancel·lar eixida " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &No " msgstr " &No " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Yes " msgstr " &Sí " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 msgid " Copy to clipboard " msgstr " Copiar al portafolis " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 -#: gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2702 msgid " Unable to save to file. " msgstr " No es pot guardar a un fitxer. " -#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 msgid " Cut to clipboard " msgstr " Tallar al portafolis " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 msgid " Enter line: " msgstr " Entreu la línia: " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 src/view.c:1918 msgid " Goto line " msgstr " Vés a la línia " -#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 msgid " Save Block " msgstr " Guardar bloc " -#: gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2784 msgid " Insert File " msgstr " Inserir fitxer " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Error trying to insert file. " msgstr " Error en inserir fitxer. " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Insert file " msgstr " Inserir fitxer " #. Not essential to translate -#: gtkedit/editcmd.c:2752 +#: gtkedit/editcmd.c:2819 msgid " Sort block " msgstr " Ordenar bloc " #. Not essential to translate -#: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 +#: gtkedit/editcmd.c:2819 gtkedit/editcmd.c:2873 msgid " You must first highlight a block of text. " msgstr " Primer cal que seleccioneu un bloc de text. " -#: gtkedit/editcmd.c:2759 +#: gtkedit/editcmd.c:2826 msgid " Run Sort " msgstr " Executar «sort» " #. Not essential to translate -#: gtkedit/editcmd.c:2761 +#: gtkedit/editcmd.c:2828 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Entreu opcions per «sort» (vegeu manual) separades per espais: " -#: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 +#: gtkedit/editcmd.c:2839 gtkedit/editcmd.c:2845 msgid " Sort " msgstr " Ordenar " #. Not essential to translate -#: gtkedit/editcmd.c:2774 +#: gtkedit/editcmd.c:2841 msgid " Error trying to execute sort command " msgstr " Error en executar comanda «sort» " #. Not essential to translate -#: gtkedit/editcmd.c:2780 +#: gtkedit/editcmd.c:2847 msgid " Sort returned non-zero: " msgstr " «Sort» ha eixit amb un error: " #. Not essential to translate -#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 +#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 msgid " Process block " msgstr " Processar bloc " #. Not essential to translate -#: gtkedit/editcmd.c:2836 +#: gtkedit/editcmd.c:2903 msgid " Error trying to stat file " msgstr " Error en prendre informació del fitxer " -#: gtkedit/editcmd.c:2907 +#: gtkedit/editcmd.c:2974 msgid " Mail " msgstr " Enviar per correu " -#: gtkedit/editcmd.c:2920 +#: gtkedit/editcmd.c:2987 msgid " Copies to" msgstr " Còpies per" -#: gtkedit/editcmd.c:2924 +#: gtkedit/editcmd.c:2991 msgid " Subject" msgstr " Tema" -#: gtkedit/editcmd.c:2928 +#: gtkedit/editcmd.c:2995 msgid " To" msgstr " Per" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:2997 msgid " mail -s -c " msgstr " mail -s -c " @@ -2269,364 +2330,350 @@ msgid " Enter line length, 0 for off: " msgstr " Entreu llarg de línia, 0 inhabilita: " -#: gtkedit/editmenu.c:74 -msgid " About " -msgstr " A propòsit de " - -#: gtkedit/editmenu.c:75 -msgid "" -"\n" -" Cooledit v3.11.5\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 v3.11.5\n" -"\n" -" Copyright (C) 1996 Free Software Foundation\n" -"\n" -" Un editor de text amistós escrit\n" -" pel Midnight Commander.\n" - -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 msgid "&Open/load... C-o" msgstr "&Obrir/carregar... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "&Nou C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "&Guardar F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "gu&Ardar com a... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "&Inserir fitxer... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "copiar a &Fitxer... C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 msgid "a&Bout... " msgstr "a &Propòsit de... " -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 msgid "&Quit F10" msgstr "ei&Xir F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" msgstr "&Nou C-x k" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:147 msgid "copy to &File... " msgstr "copiar a &Fitxer... " -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Toggle Mark F3" msgstr "inici/fi de m&Arcat F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Mark Columns S-F3" msgstr "marcar c&Olumnes S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "toggle &Ins/overw Ins" msgstr "&Insereix/sobreescriu Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Copy F5" msgstr "&Copiar F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "&Moure F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "&Esborrar F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "&Desfer C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "&Principi C-RePàg" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "&Final C-AvPàg" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "&Cercar... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "cercar &Altra volta F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "&Reemplaçar F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "&Vés a la línia... M-l" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +msgid "goto matching &Bracket M-b" +msgstr "" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 msgid "insert &Literal... C-q" msgstr "inserir &Literal... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "actualit&Zar la pantalla C-l" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:234 msgid "&Start record macro C-r" msgstr "començar a &Gravar macro C-r" -#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:235 msgid "&Finish record macro... C-r" msgstr "&Acabar gravat de macro... C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "e&Xecutar macro... C-a, TECLA" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "delete macr&O... " msgstr "&Esborrar macro... " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 msgid "insert &Date/time " msgstr "inserir &Data/hora " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 msgid "format p&Aragraph M-p" msgstr "&Formatar paràgraf M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:219 msgid "'ispell' s&Pell check C-p" msgstr "provar or&Tografia: ispell C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 msgid "sor&T... M-t" msgstr "&Ordenar... M-t" -#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "'indent' &C Formatter F19" msgstr "formatar codi &C: indent F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:222 msgid "&Mail... " msgstr "enviar per co&Rreu... " -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:236 msgid "&Execute macro... C-x e, KEY" msgstr "e&Xecutar macro... C-x e, TECLA" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:242 msgid "'ispell' s&Pell check M-$" msgstr "provar or&Tografia: ispell M-$" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 msgid "&General... " msgstr "&General..." -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 msgid "&Save mode..." msgstr "&Mode de guardar..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1349 +#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 msgid "&Layout..." msgstr "&Disposició..." # Açò s'agraeix! iv #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279 gtkedit/editmenu.c:396 +#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr " Fitxer " -#: gtkedit/editmenu.c:271 gtkedit/editmenu.c:280 gtkedit/editmenu.c:412 +#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 gtkedit/editmenu.c:415 msgid " Edit " msgstr " Edició " -#: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 +#: gtkedit/editmenu.c:275 gtkedit/editmenu.c:284 msgid " Sear/Repl " msgstr " Cercar/Reempl " -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 +#: gtkedit/editmenu.c:276 gtkedit/editmenu.c:285 gtkedit/editmenu.c:455 msgid " Command " msgstr " Comandes " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 msgid " Options " msgstr " Opcions " -#: gtkedit/editmenu.c:397 +#: gtkedit/editmenu.c:400 msgid "Open...\tC-o" msgstr "Obrir...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "Nou\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "Guardar\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "Guardar com a...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "Inserir fitxer...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "Copiar a fitxer...\tC-f" #. Tool hint -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:410 msgid "Disk operations and file indexing/searching" msgstr "" -#: gtkedit/editmenu.c:413 +#: gtkedit/editmenu.c:416 msgid "Toggle mark\tF3" msgstr "Inici/fi de marcat\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:417 msgid "Toggle mark columns\tC-b" msgstr "Marcar columnes\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:419 msgid "Toggle book mark\tC-M-Ins" msgstr "Posar marcador\tC-M-Ins" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:420 msgid "Previous book mark\tC-M-Up" msgstr "Marcador previ\tC-M-Amunt" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:421 msgid "Next book mark\tC-M-Down" msgstr "Marcador següent\tC-M-Avall" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:422 msgid "Flush book marks" msgstr "Eliminar marcadors" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:424 msgid "Toggle insert/overwrite\tIns" msgstr "Insereix/sobreescriu\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:426 msgid "Copy block to cursor\tF5" msgstr "Copiar bloc al cursor\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "Moure bloc al cursor\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "Esborrar bloc\tF8/C-Supr" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "Copiar bloc a portafolis\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "Tallar bloc a portafolis\tS-Supr" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "Apegar bloc de portafolis\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:433 msgid "Selection history\tM-Ins" msgstr "Històric de seleccions\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:435 msgid "Undo\tC-BackSpace" msgstr "Desfer\tC-Retrocés" #. Tool hint -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:438 msgid "Manipulating blocks of text" msgstr "Manipula blocs de text" -#: gtkedit/editmenu.c:440 +#: gtkedit/editmenu.c:443 msgid " Srch/Replce " msgstr " Cercar/Reempl " -#: gtkedit/editmenu.c:441 +#: gtkedit/editmenu.c:444 msgid "Search...\tF7" msgstr "Cercar...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "Cerca altra volta\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "Reemplaçar...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "Reemplaçar altra volta\tF14" #. Tool hint -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:450 msgid "Search for and replace text" msgstr "Cerca i reemplaça text" -#: gtkedit/editmenu.c:453 +#: gtkedit/editmenu.c:456 msgid "Goto line...\tM-l" msgstr "Vés a la línia...\tM-l" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:457 +msgid "Goto matching bracket\tM-b" +msgstr "" + +#: gtkedit/editmenu.c:459 msgid "Start record macro\tC-r" msgstr "Començar a gravar macro\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "Acabar gravat de macro...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "Executar macro...\tC-a, TECLA" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "Esborrar macro...\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "Inserir data/hora\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "Formatar paràgraf\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "Actualitzar la finestra\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "Macros i comandes internes" @@ -2704,31 +2751,31 @@ msgstr " Opcions de l'editor " #. Not essential to translate -#: gtkedit/editwidget.c:317 +#: gtkedit/editwidget.c:323 msgid "Error initialising editor.\n" msgstr "Error en iniciar l'editor.\n" -#: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1715 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2068 +#: gtkedit/editwidget.c:1136 gtkedit/gtkedit.c:1246 src/help.c:806 +#: src/main.c:1721 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2073 msgid "Help" msgstr "Ajuda" -#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +#: gtkedit/editwidget.c:1138 gtkedit/gtkedit.c:1248 msgid "Mark" msgstr "Marca" -#: gtkedit/editwidget.c:1096 +#: gtkedit/editwidget.c:1139 msgid "Replac" msgstr "Reempl" -#: gtkedit/editwidget.c:1102 src/main.c:1717 +#: gtkedit/editwidget.c:1145 src/main.c:1723 msgid "PullDn" msgstr "Desple" #. gtk_edit_menu -#: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1718 src/view.c:2070 src/view.c:2092 +#: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 +#: src/main.c:1724 src/view.c:2075 src/view.c:2097 msgid "Quit" msgstr "Eixir" @@ -2801,7 +2848,7 @@ msgid "Dlete" msgstr "Esborrar" -#: gtkedit/gtkedit.c:1255 src/main.c:1716 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Menú" @@ -2838,59 +2885,47 @@ msgid "Search/Replace" msgstr "Cercar/Reemplaçar" -#: gtkedit/syntax.c:1051 +#: gtkedit/syntax.c:1069 msgid "" " Fail trying to open ispell program. \n" " Check that it is in your path and works with the -a option. \n" " Alternatively, disable spell checking from the Options menu. " msgstr "" -#: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1069 gtkedit/syntax.c:1078 gtkedit/syntax.c:1087 +#: gtkedit/syntax.c:1096 msgid " Spelling Message " msgstr "" -#: gtkedit/syntax.c:1060 +#: gtkedit/syntax.c:1078 msgid "" " Fail trying to open ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" " Alternatively, disable spell checking from the Options menu. " msgstr "" -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1087 msgid "" " Fail trying to read ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" " Alternatively, disable spell checking from the Options menu. " msgstr "" -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1096 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " msgstr "" -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 -#, fuzzy -msgid " Load Syntax Rules " -msgstr " Carregar fitxer de sintaxi " - -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 -msgid "" -" Your syntax rule file is outdated \n" -" A new rule file is being installed. \n" -" Your old rule file has been saved with a .OLD extension. " -msgstr "" - -#: gtkedit/syntax.c:1487 +#: gtkedit/syntax.c:1519 msgid " File access error " msgstr " Error d'accés a fitxer " -#: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 +#: gtkedit/syntax.c:1519 gtkedit/syntax.c:1526 msgid " Load syntax file " msgstr " Carregar fitxer de sintaxi " -#: gtkedit/syntax.c:1493 +#: gtkedit/syntax.c:1525 #, c-format msgid " Error in file %s on line %d " msgstr " Error al fitxer %s, línia %d " @@ -2957,7 +2992,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:634 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 msgid " Oops... " msgstr " Ieeep... " @@ -2973,7 +3008,7 @@ msgid "Background process:" msgstr "Procés de fons:" -#: src/background.c:287 src/file.c:2192 +#: src/background.c:287 src/file.c:2189 msgid " Background process error " msgstr " Error al procés de fons " @@ -3313,7 +3348,7 @@ msgid "Files tagged, want to cd?" msgstr "Hi ha fitxers seleccionats. Canviar de directori?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 msgid "Could not change directory" msgstr "No s'ha pogut canviar de directori" @@ -3389,39 +3424,39 @@ msgid "&Local" msgstr "&Local" -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Compare directories " msgstr " Comparar directoris " -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Select compare method: " msgstr " Trieu un mètode de comparació: " -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Quick" msgstr "&Ràpid" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Size only" msgstr "només &Tamany" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Thorough" msgstr "&Detallat" -#: src/cmd.c:864 +#: src/cmd.c:869 msgid " Both panels should be on the listing view mode to use this command " msgstr " Cal que ambdós plafons siguen en mode llistat per usar la comanda " -#: src/cmd.c:878 +#: src/cmd.c:883 msgid " The command history is empty " msgstr " L'històric de comandes és buit " -#: src/cmd.c:884 +#: src/cmd.c:889 msgid " Command history " msgstr " Històric de comandes " -#: src/cmd.c:926 +#: src/cmd.c:931 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3429,11 +3464,11 @@ " No es pot amagar els plafons si no sou \n" " a un xterm o a una consola Linux. " -#: src/cmd.c:965 +#: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" msgstr "Entreu «exit» per retornar al Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1025 #, c-format msgid "" " Couldn't stat %s \n" @@ -3442,100 +3477,100 @@ " No s'ha pogut estudiar %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1034 src/cmd.c:1036 msgid " Link " msgstr " Enllaç " -#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1704 +#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 msgid " to:" msgstr " cap a:" -#: src/cmd.c:1041 +#: src/cmd.c:1046 #, c-format msgid " link: %s " msgstr " enllaç: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1079 #, c-format msgid " symlink: %s " msgstr " enllaç simbòlic: %s " -#: src/cmd.c:1128 +#: src/cmd.c:1133 #, c-format msgid " Symlink `%s' points to: " msgstr " Enll. simbòlic «%s» apunta a: " -#: src/cmd.c:1133 +#: src/cmd.c:1138 msgid " Edit symlink " msgstr " Editar enllaç simbòlic " -#: src/cmd.c:1138 +#: src/cmd.c:1143 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " editar esimbòlic, no es pot eliminar %s: %s " -#: src/cmd.c:1142 +#: src/cmd.c:1147 #, c-format msgid " edit symlink: %s " msgstr " editar esimbòlic: %s " -#: src/cmd.c:1169 +#: src/cmd.c:1174 msgid " Link symbolically " msgstr " Enllaçar simbòlicament " -#: src/cmd.c:1170 +#: src/cmd.c:1175 msgid " Relative symlink " msgstr " Enllaç simbòlic relatiu " -#: src/cmd.c:1181 +#: src/cmd.c:1186 #, c-format msgid " relative symlink: %s " msgstr " esimbòlic relatiu: %s " -#: src/cmd.c:1331 +#: src/cmd.c:1336 msgid " Enter machine name (F1 for details): " msgstr " Entreu el nom de la màquina (F1 per detalls): " -#: src/cmd.c:1355 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr " No s'ha pogut canviar a %s " -#: src/cmd.c:1362 +#: src/cmd.c:1370 msgid " Link to a remote machine " msgstr " Enllaçar amb màquina remota " -#: src/cmd.c:1368 +#: src/cmd.c:1376 msgid " FTP to machine " msgstr " Fer FTP a màquina " -#: src/cmd.c:1374 +#: src/cmd.c:1382 #, fuzzy msgid " SMB link to machine " msgstr " Fer FTP a màquina " # Si té a veure amb SO_DONTROUTE amb això seria suficient iv -#: src/cmd.c:1384 +#: src/cmd.c:1392 msgid " Socket source routing setup " msgstr " Configuració d'encaminament " -#: src/cmd.c:1385 +#: src/cmd.c:1393 msgid " Enter host name to use as a source routing hop: " msgstr " Entreu l'amfitrió que s'usarà com a mitjancer: " -#: src/cmd.c:1392 +#: src/cmd.c:1400 msgid " Error while looking up IP address " msgstr " Error en cercar l'adreça IP " -#: src/cmd.c:1392 +#: src/cmd.c:1400 msgid " Host name " msgstr " Nom de l'amfitrió " -#: src/cmd.c:1403 +#: src/cmd.c:1411 msgid " Undelete files on an ext2 file system " msgstr " Recuperar fitxers d'un sistema ext2 " -#: src/cmd.c:1404 +#: src/cmd.c:1412 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3543,11 +3578,11 @@ " Entreu el dispositiu (sense /dev/) d'on voleu\n" " recuperar els fitxers: (F1 per detalls)" -#: src/cmd.c:1454 +#: src/cmd.c:1462 msgid " Setup saved to ~/" msgstr " S'ha guardat la configuració a ~/" -#: src/cmd.c:1459 +#: src/cmd.c:1467 msgid " Setup " msgstr " Configuració " @@ -3638,15 +3673,15 @@ msgstr "gr&Up" #: src/dir.c:386 -#, c-format -msgid "File exists but can not be stat-ed: %s %s" +#, fuzzy, c-format +msgid "File '%s' exists but can not be stat-ed: %s" msgstr "El fitxer existeix però no es pot estudiar: %s %s" #: src/dir.c:657 msgid "Unknown" msgstr "Desconegut" -#: src/ext.c:143 src/user.c:501 +#: src/ext.c:143 src/user.c:499 #, fuzzy, c-format msgid "" " Can't generate unique filename \n" @@ -3655,7 +3690,7 @@ " No es pot obrir el fitxer %s \n" " %s " -#: src/ext.c:150 src/user.c:513 +#: src/ext.c:150 src/user.c:511 #, c-format msgid "" " Can't create temporary command file \n" @@ -3664,7 +3699,7 @@ " No es pot crear fitxer temporal de comandes \n" " %s " -#: src/ext.c:165 src/user.c:542 +#: src/ext.c:165 src/user.c:533 msgid " Parameter " msgstr " Paràmetre " @@ -3710,6 +3745,120 @@ msgid "mc.ext will be used for this moment." msgstr "mc.ext serà usat de moment." +#: src/features.inc:8 +#, fuzzy +msgid "Edition: " +msgstr " Edició " + +#: src/features.inc:11 +#, fuzzy +msgid "XView" +msgstr "Veure" + +#: src/features.inc:13 +msgid "Tk" +msgstr "" + +#: src/features.inc:16 +#, fuzzy +msgid "text mode" +msgstr "Mode actual: " + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" +msgstr "" + +#: src/features.inc:24 +#, fuzzy +msgid "Virtual File System: tarfs, extfs" +msgstr " Configuració de Sistemes de Fitxers Virtuals " + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr "" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr "" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr "" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr "" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr "" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr "" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "" + +#: src/features.inc:48 +#, fuzzy +msgid "Using " +msgstr "Movent " + +#: src/features.inc:51 +msgid "system-installed " +msgstr "" + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "" + +#: src/features.inc:56 +#, fuzzy +msgid "terminfo" +msgstr "Usar terminal" + +#: src/features.inc:59 +msgid "termcap" +msgstr "" + +#: src/features.inc:61 +#, fuzzy +msgid "an unknown terminal" +msgstr "Per funcionar amb terminals lents" + +#: src/features.inc:64 +msgid " database" +msgstr "" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "" + +#: src/features.inc:74 +#, fuzzy +msgid "With subshell support: " +msgstr "Inhabilita el suport de sub-intèrprets" + +#: src/features.inc:76 +#, fuzzy +msgid "optional" +msgstr "Opcions" + +#: src/features.inc:78 +msgid "as default" +msgstr "" + +#: src/features.inc:84 +#, fuzzy +msgid "With support for background operations\n" +msgstr "Mostra una llista de tasques de fons" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " Copiar " @@ -4079,7 +4228,7 @@ msgid "directory" msgstr "directori" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:476 msgid "file" msgstr "fitxer" @@ -4111,15 +4260,15 @@ msgid " Sorry, I could not put the job in background " msgstr " Ho sent, no s'ha pogut moure la tasca al fons " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Internal failure " msgstr " Fallada interna " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " msgstr " Operació de fitxer desconeguda " -#: src/file.c:2031 +#: src/file.c:2029 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -4128,15 +4277,15 @@ " Cal que la destinació «%s» siga un directori \n" " %s " -#: src/file.c:2193 src/file.c:2254 src/filegui.c:264 src/filegui.c:592 +#: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" msgstr "a&Vortar" -#: src/file.c:2193 +#: src/file.c:2190 msgid "&Retry" msgstr "&Reintentar" -#: src/file.c:2245 +#: src/file.c:2242 msgid "" "\n" " Directory not empty. \n" @@ -4146,7 +4295,7 @@ " El directori no és buit. \n" " Esborrar-lo recursivament? " -#: src/file.c:2246 +#: src/file.c:2243 msgid "" "\n" " Background process: Directory not empty \n" @@ -4156,28 +4305,28 @@ " Tasca de fons: El directori no és buit \n" " Esborrar-lo recursivament? " -#: src/file.c:2253 +#: src/file.c:2250 msgid "a&ll" msgstr "&Tots" -#: src/file.c:2253 src/filegui.c:595 +#: src/file.c:2250 src/filegui.c:595 msgid "non&E" msgstr "ca&P" # No usa el locale... Deuria ser un FIXME? iv -#: src/file.c:2263 +#: src/file.c:2260 msgid " Type 'yes' if you REALLY want to delete " msgstr " Entreu «yes» si voleu esborrar AMB CERTESA " -#: src/file.c:2265 +#: src/file.c:2262 msgid "all the directories " msgstr "tots els directoris " -#: src/file.c:2267 +#: src/file.c:2264 msgid " Recursive Delete " msgstr " Esborrat recursiu " -#: src/file.c:2268 +#: src/file.c:2265 msgid " Background process: Recursive Delete " msgstr " Procés de fons: Esborrat recursiu " @@ -4337,7 +4486,7 @@ msgid "Start at:" msgstr "Començar a:" -#: src/find.c:171 src/main.c:1240 src/main.c:1264 +#: src/find.c:171 src/main.c:1245 src/main.c:1269 msgid "&Tree" msgstr "Ar&bre" @@ -4363,7 +4512,7 @@ msgid "Finished" msgstr "Finalitzat" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1531 #, c-format msgid "Searching %s" msgstr "Cercant a %s" @@ -4444,7 +4593,7 @@ msgid " Help " msgstr " Ajuda " -#: src/help.c:766 src/user.c:650 +#: src/help.c:766 src/user.c:637 #, c-format msgid "" " Can't open file %s \n" @@ -4912,7 +5061,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "l'espai o feu-hi clic. Per desplaçar-vos, useu el tabulador." -#: src/main.c:704 +#: src/main.c:709 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4924,260 +5073,264 @@ " vostre directori de treball, o pres uns permissos \n" " d'accés extra amb la comanda «su»? " -#: src/main.c:779 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "Premeu qualsevol tecla per continuar..." -#: src/main.c:829 +#: src/main.c:834 msgid " The shell is already running a command " msgstr " L'intèrpret és executant una comanda " -#: src/main.c:856 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: src/main.c:857 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr " Realment voleu abandonar Midnight Commander? " -#: src/main.c:1237 src/main.c:1261 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "mode de &Llistat..." -#: src/main.c:1238 src/main.c:1262 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "&Vista ràpida C-x q" -#: src/main.c:1239 src/main.c:1263 +#: src/main.c:1244 src/main.c:1268 msgid "&Info C-x i" msgstr "&Informació C-x i" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "&Ordenació..." -#: src/main.c:1244 src/main.c:1268 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "&Filtrar..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "enllaç per &Xarxa..." -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "enllaç per F&TP..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1255 src/main.c:1279 #, fuzzy msgid "SM&B link..." msgstr "enllaç per F&TP..." -#: src/main.c:1255 src/main.c:1279 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "&Unitat... M-d" -#: src/main.c:1257 src/main.c:1281 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "&Rellegir C-r" -#: src/main.c:1285 +#: src/main.c:1290 msgid "&User menu F2" msgstr "menú d'&Usuari F2" -#: src/main.c:1286 +#: src/main.c:1291 msgid "&View F3" msgstr "&Veure F3" -#: src/main.c:1287 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "veure fi&Txer... " -#: src/main.c:1288 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "veure &Filtrat M-!" -#: src/main.c:1289 +#: src/main.c:1294 msgid "&Edit F4" msgstr "&Editar F4" -#: src/main.c:1290 +#: src/main.c:1295 msgid "&Copy F5" msgstr "&Copiar F5" -#: src/main.c:1291 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "permissos (c&Hmod) C-x c" -#: src/main.c:1293 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "en&Llaçar C-x l" -#: src/main.c:1294 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "enllaç &Simbòlic C-x s" -#: src/main.c:1295 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "e&Ditar enllaç simbòlic C-x C-s" -#: src/main.c:1296 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "propietari (ch&Own) C-x o" -#: src/main.c:1297 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "&Permissos i propietari " -#: src/main.c:1299 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "&Reanomenar/Moure F6" -#: src/main.c:1300 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "crear directori (&Mkdir) F7" -#: src/main.c:1301 +#: src/main.c:1306 msgid "&Delete F8" msgstr "es&Borrar F8" -#: src/main.c:1302 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "&Anar a directori M-c" -#: src/main.c:1304 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "seleccionar &Grup M-+" -#: src/main.c:1305 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "deseleccio&Nar grup M-\\" -#: src/main.c:1306 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "&Invertir selecció M-*" -#: src/main.c:1308 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "ei&Xir F10" -#: src/main.c:1318 +#: src/main.c:1323 msgid "&Directory tree" msgstr "arbre de &Directoris" -#: src/main.c:1320 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "&Cercar fitxer M-?" -#: src/main.c:1321 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "&Intercanviar plafons C-u" -#: src/main.c:1322 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "activar/desact. &Plafons C-o" -#: src/main.c:1323 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "c&Omparar directoris C-x d" -#: src/main.c:1324 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "plafó recerca e&Xterna C-x !" -#: src/main.c:1325 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "mostrar taman&Y de directoris" -#: src/main.c:1327 +#: src/main.c:1332 msgid "command &History" msgstr "&Històric de comandes" -#: src/main.c:1328 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "directoris fa&Vorits C-\\" -#: src/main.c:1330 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "llista de VFSs &Actius C-x a" -#: src/main.c:1333 +#: src/main.c:1336 +msgid "Fr&ee VFSs now" +msgstr "" + +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "tasques de &Fons C-x j" -#: src/main.c:1337 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "&Recuperar fitxers (sols ext2)" -#: src/main.c:1340 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "editar format de &Listat" -#: src/main.c:1342 +#: src/main.c:1348 msgid "&Extension file edit" msgstr "editar fitxer d'&Extensions" -#: src/main.c:1343 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "editar fitxer de &Menús" -#: src/main.c:1348 +#: src/main.c:1354 msgid "&Configuration..." msgstr "&Configuració..." -#: src/main.c:1350 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "con&Firmació..." -#: src/main.c:1351 +#: src/main.c:1357 msgid "&Display bits..." msgstr "&Bits de visualització..." -#: src/main.c:1353 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "definir &Tecles..." -#: src/main.c:1356 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "Sistemes de fitxers &Virtuals..." -#: src/main.c:1359 +#: src/main.c:1365 msgid "&Save setup" msgstr "&Guardar configuració" -#: src/main.c:1375 src/main.c:1377 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr " &Esquerra " -#: src/main.c:1377 +#: src/main.c:1383 msgid " &Above " msgstr " dal&T " -#: src/main.c:1380 +#: src/main.c:1386 msgid " &File " msgstr " &Fitxer " -#: src/main.c:1381 +#: src/main.c:1387 msgid " &Command " msgstr " &Comanda " -#: src/main.c:1382 +#: src/main.c:1388 msgid " &Options " msgstr " &Opcions " -#: src/main.c:1384 src/main.c:1386 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr " &Dreta " -#: src/main.c:1386 +#: src/main.c:1392 msgid " &Below " msgstr " bai&X " -#: src/main.c:1441 +#: src/main.c:1447 msgid " Information " msgstr " Informació " -#: src/main.c:1442 +#: src/main.c:1448 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5189,132 +5342,250 @@ " que feu una recàrrega manual del directori. Vegeu la \n" " pàgina de manual per conéixer-ne els detalls. " -#: src/main.c:1921 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "Gràcies per usar el GNU Midnight Commander" -#: src/main.c:2280 +#: src/main.c:2284 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "amb suport per ratolí a xterm%s.\n" -#: src/main.c:2281 +#: src/main.c:2285 msgid " and the Linux console" msgstr " i a la consola Linux" -#: src/main.c:2376 +#: src/main.c:2381 msgid "The TERM environment variable is unset!\n" msgstr "La variable d'entorn TERM no és definida!\n" +#: src/main.c:2487 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" + +#: src/main.c:2490 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "" + +#: src/main.c:2492 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "" + +#: src/main.c:2494 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "" + +#: src/main.c:2496 +msgid "" +"-c, --color Force color mode.\n" +"-C, --colors Specify colors (use --help-colors to get a list).\n" +"-d, --nomouse Disable mouse support.\n" +msgstr "" + +#: src/main.c:2500 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "" + +#: src/main.c:2502 +msgid "" +"-f, --libdir Print configured paths.\n" +"-h, --help Shows this help message.\n" +"-k, --resetsoft Reset softkeys (HP terminals only) to their " +"terminfo/termcap\n" +" default.\n" +msgstr "" + +#: src/main.c:2507 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "" + +#: src/main.c:2510 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "" + +#: src/main.c:2512 +msgid "" +"-P, --printwd At exit, print the last working directory.\n" +"-s, --slow Disables verbose operation (for slow terminals).\n" +msgstr "" + +#: src/main.c:2515 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "" + +#: src/main.c:2518 +msgid "" +"-S, --createcmdile Create command file to set default directory upon exit.\n" +msgstr "" + +#: src/main.c:2521 +msgid "" +"-u, --nosubshell Disable the concurrent subshell mode.\n" +"-U, --subshell Force the concurrent subshell mode.\n" +"-r, --forceexec Force subshell execution.\n" +msgstr "" + +#: src/main.c:2525 +msgid "" +"-v, --view fname Start up into the viewer mode.\n" +"-V, --version Report version and configuration options.\n" +"-x, --xterm Force xterm mouse support and screen save/restore.\n" +msgstr "" + +#: src/main.c:2529 +msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" +msgstr "" + +#: src/main.c:2531 +msgid "" +"\n" +"Please send any bug reports (including the output of `mc -V')\n" +"to mc-bugs@nuclecu.unam.mx\n" +msgstr "" + +#: src/main.c:2547 +msgid "" +"--colors KEYWORD={FORE},{BACK}\n" +"\n" +"{FORE} and {BACK} can be ommited, and the default will be used\n" +"\n" +"Keywords:\n" +" Global: errors, reverse, gauge, input\n" +" File display: normal, selected, marked, markselect\n" +" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus\n" +" Menus: menu, menuhot, menusel, menuhotsel\n" +" Help: helpnormal, helpitalic, helplink, helpslink\n" +" File types: directory, execute, link, device, special, core\n" +"\n" +"Colors:\n" +" black, gray, red, brightred, green, brightgreen, brown,\n" +" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +" brightcyan, lightgray and white\n" +"\n" +msgstr "" + # Farà referència a /usr/.../lib/mc iv -#: src/main.c:2586 +#: src/main.c:2596 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Directori de fitxers propis de Midnight Commander: %s\n" -#: src/main.c:2600 +#: src/main.c:2610 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "L'opció -m és obsoleta. Vegeu Bits de visualització... al menú d'opcions\n" -#: src/main.c:2677 +#: src/main.c:2687 msgid "Use to debug the background code" msgstr "Usat per depurar el codi executat de fons" -#: src/main.c:2683 +#: src/main.c:2693 msgid "Request to run in color mode" msgstr "Demana que s'use el mode en color" -#: src/main.c:2685 +#: src/main.c:2695 msgid "Specifies a color configuration" msgstr "Especifica una configuració de color" -#: src/main.c:2690 +#: src/main.c:2700 msgid "Edits one file" msgstr "Edita un fitxer" -#: src/main.c:2694 +#: src/main.c:2704 msgid "Displays this help message" msgstr "Mostra aquest missatge d'ajuda" -#: src/main.c:2697 +#: src/main.c:2707 msgid "Displays a help screen on how to change the color scheme" msgstr "Mostra una ajuda tocant a com canviar l'esquema de colors" -#: src/main.c:2700 +#: src/main.c:2710 msgid "Log ftp dialog to specified file" msgstr "Enregistra les transaccions ftp a un fitxer" -#: src/main.c:2707 +#: src/main.c:2717 msgid "Obsolete" msgstr "Obsoleta" -#: src/main.c:2709 +#: src/main.c:2719 msgid "Requests to run in black and white" msgstr "Demana que s'use el mode blanc i negre" -#: src/main.c:2711 +#: src/main.c:2721 msgid "Disable mouse support in text version" msgstr "Inhabilita el suport de ratolí a la versió text" -#: src/main.c:2714 +#: src/main.c:2724 msgid "Disables subshell support" msgstr "Inhabilita el suport de sub-intèrprets" -#: src/main.c:2718 +#: src/main.c:2728 msgid "Prints working directory at program exit" msgstr "Mostra el directori de trenall en eixir" -#: src/main.c:2720 +#: src/main.c:2730 msgid "Resets soft keys on HP terminals" msgstr "Reinicia les tecles programades a terminals HP" -#: src/main.c:2722 +#: src/main.c:2732 msgid "To run on slow terminals" msgstr "Per funcionar amb terminals lents" -#: src/main.c:2725 +#: src/main.c:2735 msgid "Use stickchars to draw" msgstr "Usa línies per fer marcs" -#: src/main.c:2729 +#: src/main.c:2739 msgid "Enables subshell support (default)" msgstr "Habilita el suport de sub-intèrprets (per defecte)" -#: src/main.c:2734 +#: src/main.c:2744 msgid "Tries to use termcap instead of terminfo" msgstr "Prova d'usar termcap en comptes de terminfo" -#: src/main.c:2738 +#: src/main.c:2748 msgid "Displays the current version" msgstr "Mostra la versió actual" -#: src/main.c:2740 +#: src/main.c:2750 msgid "Launches the file viewer on a file" msgstr "Llança el visor de fitxers amb un fitxer" -#: src/main.c:2742 +#: src/main.c:2752 msgid "Forces xterm features" msgstr "Força l'ús de característiques d'xterm" -#: src/main.c:2744 +#: src/main.c:2754 msgid "GEOMETRY" msgstr "GEOMETRIA" -#: src/main.c:2744 +#: src/main.c:2754 msgid "Geometry for the window" msgstr "Geometria de la finestra" -#: src/main.c:2745 +#: src/main.c:2755 msgid "No windows opened at startup" msgstr "No obre finestres en iniciar-se" -#: src/main.c:2747 +#: src/main.c:2756 +#, fuzzy +msgid "No desktop icons" +msgstr "Rellig els continguts del directori" + +#: src/main.c:2757 +msgid "Look more like traditional gmc" +msgstr "" + +#: src/main.c:2759 msgid "Display the directory that holds the .links startup files and exit" msgstr "Mostra el directori de fitxers d'inici .links i ix" -#: src/main.c:3045 +#: src/main.c:3071 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5322,11 +5593,11 @@ "No es pot obrir una línia al terminal. Heu d'executar mc sense l'opció -P.\n" "A alguns sistemes podeu fer servir # `which mc`\n" -#: src/main.c:3123 +#: src/main.c:3149 msgid " Notice " msgstr " Avís " -#: src/main.c:3124 +#: src/main.c:3150 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5661,32 +5932,32 @@ "No es pot escriure al fitxer %s:\n" "%s\n" -#: src/user.c:256 +#: src/user.c:250 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " La definició «%c» del patró d'intèrpret no és vàlida. " -#: src/user.c:389 +#: src/user.c:383 msgid " Debug " msgstr " Depurar " -#: src/user.c:398 +#: src/user.c:392 msgid " ERROR: " msgstr " ERROR: " -#: src/user.c:402 +#: src/user.c:396 msgid " True: " msgstr " Cert: " -#: src/user.c:404 +#: src/user.c:398 msgid " False: " msgstr " Fals: " -#: src/user.c:616 +#: src/user.c:602 msgid " Warning -- ignoring file " msgstr " Avís -- es descarta el fitxer " -#: src/user.c:617 +#: src/user.c:603 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5695,17 +5966,18 @@ "El fitxer %s no és vostre ni de root, o és modificable per\n" "qualsevol. Usar-lo podria comprometre la vostra seguretat" -#: src/user.c:635 +#: src/user.c:622 msgid " I can't run programs while logged on a non local directory " msgstr " No es pot executar programes dins d'un directori no-local " -#: src/user.c:719 +#. FIXME: this message is not quite right +#: src/user.c:720 #, fuzzy, c-format msgid " Empty file %s " msgstr "Còpia fitxers" #. Create listbox -#: src/user.c:728 +#: src/user.c:730 msgid " User menu " msgstr " Menú d'usuari " @@ -5731,7 +6003,7 @@ msgid " Dup failed " msgstr " Ha fallat dup() " -#: src/view.c:401 +#: src/view.c:406 msgid "" "File: \n" "\n" @@ -5741,7 +6013,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:407 msgid "" "\n" "\n" @@ -5751,28 +6023,28 @@ "\n" "ha estat modificat. Voleu guardar els canvis?\n" -#: src/view.c:404 +#: src/view.c:409 msgid " Save changes " msgstr " Guardar canvis " -#: src/view.c:446 +#: src/view.c:451 msgid " Can't spawn child program " msgstr " No es pot llançar el procés fill " -#: src/view.c:455 +#: src/view.c:460 msgid " Empty output from child filter " msgstr " L'eixida del filtre fill és buida " -#: src/view.c:460 +#: src/view.c:465 msgid " Could not open file " msgstr " No es pot obrir el fitxer " # Apa, trenquem la tipografia! iv -#: src/view.c:475 +#: src/view.c:480 msgid " Can't open file \"" msgstr " No es pot obrir el fitxer \"" -#: src/view.c:482 +#: src/view.c:487 msgid "" " Can't stat file \n" " " @@ -5780,11 +6052,11 @@ " No es pot estudiar el fitxer \n" " " -#: src/view.c:488 +#: src/view.c:493 msgid " Can't view: not a regular file " msgstr " No es pot veure perquè no és un fitxer ordinari " -#: src/view.c:569 +#: src/view.c:574 #, fuzzy, c-format msgid "" " Can't open \"%s\"\n" @@ -5793,7 +6065,7 @@ " No es pot obrir el fitxer %s \n" " %s " -#: src/view.c:578 +#: src/view.c:583 #, fuzzy, c-format msgid "" " Can't stat \"%s\"\n" @@ -5802,34 +6074,34 @@ " No s'ha pogut estudiar %s \n" " %s " -#: src/view.c:714 +#: src/view.c:719 #, c-format msgid "File: %s" msgstr "Fitxer: %s" -#: src/view.c:728 +#: src/view.c:733 #, c-format msgid "Offset 0x%08x" msgstr "Desplaçament 0x%08x" -#: src/view.c:739 +#: src/view.c:744 msgid " [grow]" msgstr " [expandit]" -#: src/view.c:1518 +#: src/view.c:1523 #, c-format msgid "Searching for `%s'" msgstr "S'està cercant «%s»" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1630 src/view.c:1753 msgid " Search string not found " msgstr " No s'ha trobat la cadena " -#: src/view.c:1787 +#: src/view.c:1792 msgid " Invalid regular expression " msgstr " L'expressió regular no és vàlida " -#: src/view.c:1911 +#: src/view.c:1916 #, c-format msgid "" " The current line number is %d.\n" @@ -5838,7 +6110,7 @@ " La línia actual és la número %d.\n" " Entreu el nou número de línia:" -#: src/view.c:1933 +#: src/view.c:1938 #, fuzzy, c-format msgid "" " The current address is 0x%lx.\n" @@ -5847,68 +6119,68 @@ " La línia actual és la número %d.\n" " Entreu el nou número de línia:" -#: src/view.c:1935 +#: src/view.c:1940 #, fuzzy msgid " Goto Address " msgstr " Vés a la línia " -#: src/view.c:1966 +#: src/view.c:1971 msgid " Enter regexp:" msgstr " Entreu l'expressió regular:" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Ascii" msgstr "ASCII" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "Hexa" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "Línia" -#: src/view.c:2075 +#: src/view.c:2080 msgid "RxSrch" msgstr "ExpReg" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdHex" msgstr "EdtHex" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdText" msgstr "EdtTxt" -#: src/view.c:2080 +#: src/view.c:2085 msgid "UnWrap" msgstr "NoAjus" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "Ajusta" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "CrcHex" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "Interp" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "Brut" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "Format" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "NoFrmt" @@ -6112,7 +6384,85 @@ msgid "NumLock on keypad" msgstr "BloqNum t. num." -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, fuzzy, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"No s'ha pogut obrir l'arxiu %s\n" +"%s" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "" + +#: vfs/cpio.c:427 +#, fuzzy, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "L'arxiu tar no és consistent" + +#. In case entry is already there +#. This shouldn't happen! (well, it can happen if there is a record for a +#. file and than a record for a directory it is in; cpio would die with +#. 'No such file or directory' is such case) +#. This can be considered archive inconsistency +#: vfs/cpio.c:450 +#, c-format +msgid "%s contains duplicit entries! Skiping!" +msgstr "" + +#: vfs/cpio.c:517 +#, fuzzy, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "Fí de fitxer inesperat a l'arxiu" + +#: vfs/direntry.c:312 +#, c-format +msgid "Dir cache expired for %s" +msgstr "" + +#: vfs/direntry.c:444 vfs/direntry.c:447 +#, fuzzy +msgid " Direntry warning " +msgstr " Ruta del directori " + +#: vfs/direntry.c:444 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "" + +#: vfs/direntry.c:447 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:821 +#, fuzzy +msgid "Starting linear transfer..." +msgstr "ftpfs: avortant la transferència." + +#: vfs/direntry.c:964 +#, fuzzy +msgid "Getting file" +msgstr "Esborrant fitxer: " + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -6121,237 +6471,228 @@ "No s'ha pogut obrir l'arxiu %s\n" "%s" -#: vfs/extfs.c:300 vfs/extfs.c:320 +#: vfs/extfs.c:302 vfs/extfs.c:322 msgid "Inconsistent extfs archive" msgstr "L'arxiu extfs no és consistent" -#: vfs/fish.c:136 +#: vfs/fish.c:139 #, fuzzy, c-format msgid "fish: Disconnecting from %s" msgstr "ftpfs: Desconnectant de %s" -#: vfs/fish.c:214 +#: vfs/fish.c:217 msgid "fish: Waiting for initial line..." msgstr "" -#: vfs/fish.c:224 +#: vfs/fish.c:227 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Ho sent, però encara no es poden fer connexions autenticades." -#: vfs/fish.c:238 +#: vfs/fish.c:232 +#, fuzzy +msgid " fish: Password required for " +msgstr " FTP: Cal una contrasenya per " + +#: vfs/fish.c:241 #, fuzzy msgid "fish: Sending password..." msgstr "ftpfs: enviant contrasenya" -#: vfs/fish.c:244 +#: vfs/fish.c:247 msgid "fish: Sending initial line..." msgstr "" -#: vfs/fish.c:248 +#: vfs/fish.c:251 msgid "fish: Handshaking version..." msgstr "" -#: vfs/fish.c:252 +#: vfs/fish.c:255 #, fuzzy msgid "fish: Setting up current directory..." msgstr "Rellig el directori actual" -#: vfs/fish.c:254 +#: vfs/fish.c:257 #, fuzzy, c-format msgid "fish: Connected, home %s." msgstr "ftpfs: s'ha connectat amb %s" -#: vfs/fish.c:331 +#: vfs/fish.c:333 #, fuzzy, c-format msgid "fish: Reading directory %s..." msgstr "ftpfs: Llegint directori FTP %s..." -#: vfs/fish.c:426 -#, fuzzy -msgid "fish: got listing" -msgstr "ftpfs: s'ha obtés el llistat" - -#: vfs/fish.c:430 +#: vfs/fish.c:429 #, fuzzy msgid "fish: failed" msgstr "ftpfs: ha fallat" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:450 +#: vfs/fish.c:449 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: vfs/fish.c:464 +#: vfs/fish.c:463 msgid "fish: Local read failed, sending zeros" msgstr "" -#: vfs/fish.c:476 +#: vfs/fish.c:475 #, fuzzy, c-format msgid "fish: storing %s %d (%d)" msgstr "ftpfs: guardant el fitxer %d (%d)" -#: vfs/fish.c:516 +#: vfs/fish.c:476 +msgid "zeros" +msgstr "" + +#: vfs/fish.c:515 #, fuzzy msgid "Aborting transfer..." msgstr "ftpfs: avortant la transferència." -#: vfs/fish.c:525 +#: vfs/fish.c:524 msgid "Error reported after abort." msgstr "" -#: vfs/fish.c:527 +#: vfs/fish.c:526 msgid "Aborted transfer would be successful." msgstr "" -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:316 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Desconnectant de %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:374 msgid " FTP: Password required for " msgstr " FTP: Cal una contrasenya per " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:407 msgid " Proxy: Password required for " msgstr " Altern: Cal una contrasenya per " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:433 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: enviant identificació a l'altern" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:437 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: enviant contrasenya a l'altern" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:441 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: l'autenticació amb l'altern ha tingut èxit" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:445 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: s'ha connectat amb %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:462 msgid "ftpfs: sending login name" msgstr "ftpfs: enviant identificació" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:467 msgid "ftpfs: sending user password" msgstr "ftpfs: enviant contrasenya" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:472 msgid "ftpfs: logged in" msgstr "ftpfs: la identificació és correcta" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:487 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: La identificació per %s no és correcta" -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:519 #, c-format msgid " Could not set source routing (%s)" msgstr " No s'ha pogut establir l'encaminament (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: El nom de l'amfitrió no és vàlid." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: L'adreça de l'amfitrió no és vàlida." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: s'està connectant amb %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: l'usuari ha interromput la connexió" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: fallà la connexió amb el servidor: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Esperant a reintentar... %d (Ctrl-C per cancel·lar)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: no s'ha pogut establir el mode passiu a l'encaminament" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:917 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: no s'ha pogut establir el mode passiu" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:992 msgid "ftpfs: aborting transfer." msgstr "ftpfs: avortant la transferència." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:994 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: error en avortar: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:999 msgid "ftpfs: abort failed" msgstr "ftpfs: ha fallat l'avortament" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1088 vfs/ftpfs.c:1185 msgid "ftpfs: CWD failed." msgstr "ftpfs: ha fallat la comanda CWD." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1098 vfs/ftpfs.c:1105 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: no es pot seguir l'enllaç simbòlic" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1156 msgid "Resolving symlink..." msgstr "Seguint l'enllaç simbòlic..." -#: vfs/ftpfs.c:1338 -#, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: llegint directori FTP %s... (no useu opcions de l'ls)" - -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." +#: vfs/ftpfs.c:1174 +#, fuzzy, c-format +msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: Llegint directori FTP %s..." -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: FALLADA" - -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: l'usuari ha interromput la lectura del directori FTP" - -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: s'ha obtés el llistat" +#: vfs/ftpfs.c:1175 +msgid "(strict rfc959)" +msgstr "" + +#: vfs/ftpfs.c:1176 +msgid "(chdir first)" +msgstr "" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1270 msgid "ftpfs: failed" msgstr "ftpfs: ha fallat" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1280 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ha fallat; enlloc per retornar-hi" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1343 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: guardant el fitxer %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1758 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6359,15 +6700,15 @@ "~/.netrc no té els permissos adequats.\n" "Elimineu-ne la contrasenya o corregiu els permissos." -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " El servidor no suporta aquesta versió " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -6377,30 +6718,54 @@ " Necessiteu una contrasenya per entrar-hi, però la informació \n" " podria no ser segura a la banda remota. Continuar? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " No " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Sí " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " El servidor remot és corrent a un port estrany. Desistint.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " Cal una contrasenya per l'MCFS " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " La contrasenya no és vàlida " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, fuzzy, c-format +msgid " Can't locate hostname: %s " +msgstr "" +" No es pot estudiar la destinació \n" +" %s " + +#: vfs/mcfs.c:253 +#, fuzzy, c-format +msgid " Can't create socket: %s " +msgstr "" +" No es pot canviar a %s \n" +" %s " + +#: vfs/mcfs.c:259 +#, fuzzy, c-format +msgid " Can't connect to server: %s " +msgstr "ftpfs: fallà la connexió amb el servidor: %s" + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr "Massa connexions obertes " +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "" + #: vfs/smbfs.c:115 #, fuzzy msgid "Domain:" @@ -6428,6 +6793,10 @@ " " msgstr "ftpfs: fallà la connexió amb el servidor: %s" +#: vfs/smbfs.c:1242 +msgid " Authentication failed " +msgstr "" + #: vfs/smbfs.c:1737 #, fuzzy, c-format msgid " %s mkdir'ing %s " @@ -6479,79 +6848,247 @@ "%s\n" "no sembla un arxiu tar." +#: vfs/undelfs.c:80 +#, fuzzy +msgid " undelfs: error " +msgstr " error de fitxer " + +#: vfs/undelfs.c:183 +msgid " not enough memory " +msgstr "" + +#: vfs/undelfs.c:188 +msgid " while allocating block buffer " +msgstr "" + +#: vfs/undelfs.c:192 +#, c-format +msgid " open_inode_scan: %d " +msgstr "" + +#: vfs/undelfs.c:196 +#, c-format +msgid " while starting inode scan %d " +msgstr "" + +#: vfs/undelfs.c:203 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "" + +#: vfs/undelfs.c:218 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr "" + +#: vfs/undelfs.c:226 +msgid " no more memory while reallocating array " +msgstr "" + +#: vfs/undelfs.c:245 +#, c-format +msgid " while doing inode scan %d " +msgstr "" + +#: vfs/undelfs.c:269 +#, fuzzy +msgid " Ext2lib error " +msgstr " error de fitxer " + +#: vfs/undelfs.c:296 +#, fuzzy, c-format +msgid " Could not open file %s " +msgstr " No es pot obrir el fitxer " + +#: vfs/undelfs.c:299 +msgid "undelfs: reading inode bitmap..." +msgstr "" + +#: vfs/undelfs.c:302 +#, fuzzy, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr " No s'ha pogut canviar a %s " + +#: vfs/undelfs.c:305 +msgid "undelfs: reading block bitmap..." +msgstr "" + +#: vfs/undelfs.c:308 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:314 +msgid "undelfs: done." +msgstr "" + +#: vfs/undelfs.c:317 +#, fuzzy +msgid "undelfs: failure" +msgstr " Fallada interna " + +#: vfs/undelfs.c:341 +msgid " vfs_info is not fs! " +msgstr "" + +#: vfs/undelfs.c:397 vfs/undelfs.c:581 +msgid " You have to chdir to extract files first " +msgstr "" + +#: vfs/undelfs.c:520 +msgid " while iterating over blocks " +msgstr "" + +#: vfs/undelfs.c:625 +#, fuzzy, c-format +msgid " Could not open file: %s " +msgstr " No es pot obrir el fitxer " + +#. This is place of next pointer +#: vfs/undelfs.c:683 +#, fuzzy +msgid "Undelete filesystem for ext2" +msgstr "&Recuperar fitxers (sols ext2)" + +#: vfs/vfs.c:1149 +#, fuzzy +msgid "Changes to file lost" +msgstr "llistat &Llarg" + #: vfs/vfs.c:1792 +#, fuzzy +msgid "Could not parse:" +msgstr "" +"No s'ha pogut estudiar %s\n" +"%s" + +#: vfs/vfs.c:1794 +msgid "(sorry)" +msgstr "" + +#: vfs/vfs.c:1794 +msgid "More parsing errors will be ignored." +msgstr "" + +#: vfs/vfs.c:1805 +#, fuzzy +msgid "Internal error:" +msgstr " Error intern: get_file \n" + +#: vfs/vfs.c:1815 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "" -#: vfs/vfs.c:1793 +#: vfs/vfs.c:1816 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "" -#~ msgid "Disk operations" -#~ msgstr "Operacions de disc" +#~ msgid "Could not symlink %s to %s; will not have initial home desktop icon." +#~ msgstr "" +#~ "No s'ha pogunt enllaçar %s amb %s; no hi haurà icona de dir. personal a " +#~ "l'escriptori." -#~ msgid "Filter" -#~ msgstr "Filtre" +#~ msgid "New folder" +#~ msgstr "Nova carpeta" -#~ msgid "Misc. program files" -#~ msgstr "Codi font divers" +#~ msgid "All files" +#~ msgstr "Tots els fitxers" -# Està bé, comprovat! iv -#~ msgid "Assembler program files" -#~ msgstr "Codi font en assemblador" +# «Equilicuà» la diferència entre fitxer i arxiu! ;) iv +#~ msgid "Archives and compressed files" +#~ msgstr "Arxius i fitxers comprimits" -#~ msgid "Scheme program files" -#~ msgstr "Codi font en Scheme" +#~ msgid "RPM/DEB files" +#~ msgstr "Paquets RPM/DEB" -#~ msgid "Objective-C program files" -#~ msgstr "Codi font en Objective-C" +#~ msgid "Text/Document files" +#~ msgstr "Documents i fitxers text" -#~ msgid "C++ program files" -#~ msgstr "Codi font en C++" +#~ msgid "HTML and SGML files" +#~ msgstr "Documents HTML i SGML" -#~ msgid "C program files" -#~ msgstr "Codi font en C" +#~ msgid "Postscript and PDF files" +#~ msgstr "Documents PostScript i PDF" -#~ msgid "Audio files" -#~ msgstr "Fitxers d'àudio" +#~ msgid "Spreadsheet files" +#~ msgstr "Fulls de càlcul" + +#~ msgid "Image files" +#~ msgstr "Fitxers d'imatges" #~ msgid "Video/animation files" #~ msgstr "Fitxers de vídeo/animació" -#~ msgid "Image files" -#~ msgstr "Fitxers d'imatges" +#~ msgid "Audio files" +#~ msgstr "Fitxers d'àudio" -#~ msgid "Spreadsheet files" -#~ msgstr "Fulls de càlcul" +#~ msgid "C program files" +#~ msgstr "Codi font en C" -#~ msgid "Postscript and PDF files" -#~ msgstr "Documents PostScript i PDF" +#~ msgid "C++ program files" +#~ msgstr "Codi font en C++" -#~ msgid "HTML and SGML files" -#~ msgstr "Documents HTML i SGML" +#~ msgid "Objective-C program files" +#~ msgstr "Codi font en Objective-C" -#~ msgid "Text/Document files" -#~ msgstr "Documents i fitxers text" +#~ msgid "Scheme program files" +#~ msgstr "Codi font en Scheme" -#~ msgid "RPM/DEB files" -#~ msgstr "Paquets RPM/DEB" +# Està bé, comprovat! iv +#~ msgid "Assembler program files" +#~ msgstr "Codi font en assemblador" -# «Equilicuà» la diferència entre fitxer i arxiu! ;) iv -#~ msgid "Archives and compressed files" -#~ msgstr "Arxius i fitxers comprimits" +#~ msgid "Misc. program files" +#~ msgstr "Codi font divers" -#~ msgid "All files" -#~ msgstr "Tots els fitxers" +#~ msgid "Filter" +#~ msgstr "Filtre" -#~ msgid "New folder" -#~ msgstr "Nova carpeta" +#~ msgid "Disk operations" +#~ msgstr "Operacions de disc" -#~ msgid "Could not symlink %s to %s; will not have initial home desktop icon." +#~ msgid " Error allocating memory " +#~ msgstr " Error en reservar memòria " + +#~ msgid " Error trying to open file for reading " +#~ msgstr " Error en obrir fitxer per llegir " + +#~ msgid " About " +#~ msgstr " A propòsit de " + +#~ msgid "" +#~ "\n" +#~ " Cooledit v3.11.5\n" +#~ "\n" +#~ " Copyright (C) 1996 the Free Software Foundation\n" +#~ "\n" +#~ " A user friendly text editor written\n" +#~ " for the Midnight Commander.\n" #~ msgstr "" -#~ "No s'ha pogunt enllaçar %s amb %s; no hi haurà icona de dir. personal a " -#~ "l'escriptori." +#~ "\n" +#~ " Cooledit v3.11.5\n" +#~ "\n" +#~ " Copyright (C) 1996 Free Software Foundation\n" +#~ "\n" +#~ " Un editor de text amistós escrit\n" +#~ " pel Midnight Commander.\n" + +#~ msgid "ftpfs: could not setup passive mode for source routing" +#~ msgstr "ftpfs: no s'ha pogut establir el mode passiu a l'encaminament" + +#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +#~ msgstr "ftpfs: llegint directori FTP %s... (no useu opcions de l'ls)" -#, fuzzy -#~ msgid "Rescan _Desktop" -#~ msgstr "Rellegir l'escriptori" +#~ msgid "ftpfs: FAIL" +#~ msgstr "ftpfs: FALLADA" + +#~ msgid "ftpfs: reading FTP directory interrupt by user" +#~ msgstr "ftpfs: l'usuari ha interromput la lectura del directori FTP" + +#~ msgid "ftpfs: got listing" +#~ msgstr "ftpfs: s'ha obtés el llistat" diff -ruN old/mc-4.5.42/po/cat-id-tbl.c new/mc-4.5.43/po/cat-id-tbl.c --- old/mc-4.5.42/po/cat-id-tbl.c Mon Dec 6 18:50:18 1999 +++ new/mc-4.5.43/po/cat-id-tbl.c Sat Mar 18 08:43:50 2000 @@ -192,7 +192,7 @@ {"\ Could not stat %s\n\ %s", 147}, - {"Default set of icons not found, please check your installation", 148}, + {"Default set of icons not found, check your installation", 148}, {"_Icon View", 149}, {"Switch view to an icon display", 150}, {"_Brief View", 151}, @@ -352,221 +352,232 @@ {"Show hidden files", 291}, {"Mix files and directories", 292}, {"Use shell patterns instead of regular expressions", 293}, - {"Confirm when deleting file", 294}, - {"Confirm when overwriting files", 295}, - {"Confirm when executing files", 296}, - {"Show progress while operations are being performed", 297}, - {"VFS Timeout:", 298}, - {"Seconds", 299}, - {"Anonymous FTP password:", 300}, - {"Always use FTP proxy", 301}, - {"Fast directory reload", 302}, - {"Compute totals before copying files", 303}, - {"FTP directory cache timeout :", 304}, - {"Allow customization of icons in icon view", 305}, - {"File display", 306}, - {"Confirmation", 307}, - {"VFS", 308}, - {"Caching", 309}, - {"Preferences", 310}, - {"Filename", 311}, - {"Full name: ", 312}, - {"Command", 313}, - {"Command:", 314}, - {"Use terminal", 315}, - {"File mode (permissions)", 316}, - {"", 317}, - {"General", 318}, - {"Title", 319}, - {"Select icon", 320}, - {"Reloads the current directory", 321}, - {"New _Directory...", 322}, - {"Creates a new directory here", 323}, - {"New _File...", 324}, - {"Creates a new file here", 325}, - {"Search: %s", 326}, - {"%s bytes in %d file", 327}, - {"%s bytes in %d files", 328}, - {"", 329}, - {"Copy directory", 330}, - {"Delete directory", 331}, - {"Rename or move directory", 332}, - {"Back", 333}, - {"Go to the previously visited directory", 334}, - {"Up", 335}, - {"Go up a level in the directory heirarchy", 336}, - {"Forward", 337}, - {"Go to the next directory", 338}, - {"Rescan", 339}, - {"Rescan the current directory", 340}, - {"Home", 341}, - {"Go to your home directory", 342}, - {"Location:", 343}, - {"&Ok", 344}, - {"Offset 0x%08lx", 345}, - {"Col %d", 346}, - {"%s bytes", 347}, - {"_Goto line", 348}, - {"Jump to a specified line number", 349}, - {"_Monitor file", 350}, - {"Monitor file growing", 351}, - {"Regexp search", 352}, - {"Regular expression search", 353}, - {"_Wrap", 354}, - {"Wrap the text", 355}, - {"_Parsed view", 356}, - {"_Formatted", 357}, - {"_Hex", 358}, - {"_Search", 359}, - {"ok", 360}, - {"cancel", 361}, - {"help", 362}, - {"yes", 363}, - {"no", 364}, - {"exit", 365}, - {"abort", 366}, - {"Could not contact the file manager\n", 367}, - {"Could not get the desktop\n", 368}, - {"Create window showing the specified directory", 369}, - {"DIRECTORY", 370}, - {"Rescan the specified directory", 371}, - {"Rescan the desktop icons", 372}, - {"Rescan the desktop device icons", 373}, - {"Close windows whose directories cannot be reached", 374}, - {" Error ", 375}, - {" Failed trying to open file for reading: ", 376}, - {" Cannot get size/permissions info on file: ", 377}, - {" Not an ordinary file: ", 378}, - {" File is too large: ", 379}, + {"Determine file types from file content instead of extensions", 294}, + {"Confirm when deleting file", 295}, + {"Confirm when overwriting files", 296}, + {"Confirm when executing files", 297}, + {"Show progress while operations are being performed", 298}, + {"VFS Timeout:", 299}, + {"Seconds", 300}, + {"Anonymous FTP password:", 301}, + {"Always use FTP proxy", 302}, + {"Fast directory reload", 303}, + {"Compute totals before copying files", 304}, + {"FTP directory cache timeout :", 305}, + {"Allow customization of icons in icon view", 306}, + {"File display", 307}, + {"Confirmation", 308}, + {"VFS", 309}, + {"Caching", 310}, + {"Preferences", 311}, + {"Filename", 312}, + {"Full name: ", 313}, + {"Command", 314}, + {"Command:", 315}, + {"Use terminal", 316}, + {"File mode (permissions)", 317}, + {"", 318}, + {"General", 319}, + {"Title", 320}, + {"Select icon", 321}, + {"Reloads the current directory", 322}, + {"New _Directory...", 323}, + {"Creates a new directory here", 324}, + {"New _File...", 325}, + {"Creates a new file here", 326}, + {"Search: %s", 327}, + {"%s bytes in %d file", 328}, + {"%s bytes in %d files", 329}, + {"", 330}, + {"Copy directory", 331}, + {"Delete directory", 332}, + {"Rename or move directory", 333}, + {"Back", 334}, + {"Go to the previously visited directory", 335}, + {"Up", 336}, + {"Go up a level in the directory heirarchy", 337}, + {"Forward", 338}, + {"Go to the next directory", 339}, + {"Rescan", 340}, + {"Rescan the current directory", 341}, + {"Home", 342}, + {"Go to your home directory", 343}, + {"Location:", 344}, + {"&Ok", 345}, + {"Offset 0x%08lx", 346}, + {"Col %d", 347}, + {"%s bytes", 348}, + {"_Goto line", 349}, + {"Jump to a specified line number", 350}, + {"_Monitor file", 351}, + {"Monitor file growing", 352}, + {"Regexp search", 353}, + {"Regular expression search", 354}, + {"_Wrap", 355}, + {"Wrap the text", 356}, + {"_Parsed view", 357}, + {"_Formatted", 358}, + {"_Hex", 359}, + {"_Search", 360}, + {"ok", 361}, + {"cancel", 362}, + {"help", 363}, + {"yes", 364}, + {"no", 365}, + {"exit", 366}, + {"abort", 367}, + {"Could not contact the file manager\n", 368}, + {"Could not get the desktop\n", 369}, + {"Unknown arrange type `%s'\n", 370}, + {"Create window showing the specified directory", 371}, + {"DIRECTORY", 372}, + {"Rescan the specified directory", 373}, + {"Rescan the desktop icons", 374}, + {"Rescan the desktop device icons", 375}, + {"Arrange the desktop icons", 376}, + {"name | type | size | atime | mtime | ctime", 377}, + {"Close windows whose directories cannot be reached", 378}, + {" Error ", 379}, + {" Failed trying to open file for reading: ", 380}, + {" Error reading from pipe: ", 381}, + {" Failed trying to open pipe for reading: ", 382}, + {" Error reading file: ", 383}, + {" Cannot get size/permissions info on file: ", 384}, + {" Not an ordinary file: ", 385}, + {" File is too large: ", 386}, {"\ \n\ - Increase edit.h:MAXBUF and recompile the editor. ", 380}, - {" Error allocating memory ", 381}, - {"Quick save ", 382}, - {"Safe save ", 383}, - {"Do backups -->", 384}, - {"&Cancel", 385}, - {"Extension:", 386}, - {" Edit Save Mode ", 387}, - {" Save As ", 388}, - {" Warning ", 389}, - {" A file already exists with this name. ", 390}, - {"Overwrite", 391}, - {"Cancel", 392}, - {" Save as ", 393}, - {" Error trying to save file. ", 394}, - {" Delete macro ", 395}, - {" Error trying to open temp file ", 396}, - {" Error trying to open macro file ", 397}, - {"key '%d 0': ", 398}, - {" Error trying to overwrite macro file ", 399}, - {" Macro ", 400}, - {" Press the macro's new hotkey: ", 401}, - {" Save macro ", 402}, - {" Delete Macro ", 403}, - {" Load macro ", 404}, - {" Confirm save file? : ", 405}, - {" Save file ", 406}, - {"Save", 407}, + Increase edit.h:MAXBUF and recompile the editor. ", 387}, + {" Error writing to pipe: ", 388}, + {" Failed trying to open pipe for writing: ", 389}, + {"Quick save ", 390}, + {"Safe save ", 391}, + {"Do backups -->", 392}, + {"&Cancel", 393}, + {"Extension:", 394}, + {" Edit Save Mode ", 395}, + {" Save As ", 396}, + {" Warning ", 397}, + {" A file already exists with this name. ", 398}, + {"Overwrite", 399}, + {"Cancel", 400}, + {" Save as ", 401}, + {" Error trying to save file. ", 402}, + {" Delete macro ", 403}, + {" Error trying to open temp file ", 404}, + {" Error trying to open macro file ", 405}, + {"key '%d 0': ", 406}, + {" Error trying to overwrite macro file ", 407}, + {" Macro ", 408}, + {" Press the macro's new hotkey: ", 409}, + {" Save macro ", 410}, + {" Delete Macro ", 411}, + {" Load macro ", 412}, + {" Confirm save file? : ", 413}, + {" Save file ", 414}, + {"Save", 415}, {"\ Current text was modified without a file save. \n\ - Continue discards these changes. ", 408}, - {"Continue", 409}, - {" Load ", 410}, - {" Error trying to open file for reading ", 411}, - {" Block is large, you may not be able to undo this action. ", 412}, - {" Continue ", 413}, - {" Cancel ", 414}, - {"o&Ne", 415}, - {"al&L", 416}, - {"&Skip", 417}, - {"&Replace", 418}, - {" Replace with: ", 419}, - {" Confirm replace ", 420}, - {"scanf &Expression", 421}, - {"replace &All", 422}, - {"pr&Ompt on replace", 423}, - {"&Backwards", 424}, - {"&Regular expression", 425}, - {"&Whole words only", 426}, - {"case &Sensitive", 427}, - {" Enter replacement argument order eg. 3,2,1,4 ", 428}, - {" Enter replacement string:", 429}, - {" Enter search string:", 430}, - {" Replace ", 431}, - {" Search ", 432}, - {" Enter search text : ", 433}, - {" Enter replace text : ", 434}, + Continue discards these changes. ", 416}, + {"Continue", 417}, + {" Load ", 418}, + {" Block is large, you may not be able to undo this action. ", 419}, + {" Continue ", 420}, + {" Cancel ", 421}, + {"o&Ne", 422}, + {"al&L", 423}, + {"&Skip", 424}, + {"&Replace", 425}, + {" Replace with: ", 426}, + {" Confirm replace ", 427}, + {"scanf &Expression", 428}, + {"replace &All", 429}, + {"pr&Ompt on replace", 430}, + {"&Backwards", 431}, + {"&Regular expression", 432}, + {"&Whole words only", 433}, + {"case &Sensitive", 434}, + {" Enter replacement argument order eg. 3,2,1,4 ", 435}, + {" Enter replacement string:", 436}, + {" Enter search string:", 437}, + {" Replace ", 438}, + {" Search ", 439}, + {" Enter search text : ", 440}, + {" Enter replace text : ", 441}, {"\ You can enter regexp substrings with %s\n\ -(not \\1, \\2 like sed) then use \"Enter...order\"", 435}, - {" Enter argument (or substring) order : ", 436}, +(not \\1, \\2 like sed) then use \"Enter...order\"", 442}, + {" Enter argument (or substring) order : ", 443}, {"\ Enter the order of replacement of your scanf\n\ -format specifiers or regexp substrings, eg 3,1,2", 437}, - {" Whole words only ", 438}, - {" Case sensitive ", 439}, - {" Regular expression ", 440}, +format specifiers or regexp substrings, eg 3,1,2", 444}, + {" Whole words only ", 445}, + {" Case sensitive ", 446}, + {" Regular expression ", 447}, {"\ See the regex man page for how\n\ -to compose a regular expression", 441}, - {" Backwards ", 442}, - {"Warning: Searching backward can be slow", 443}, - {" Prompt on replace ", 444}, - {"Ask before making each replacement", 445}, - {" Replace all ", 446}, - {" Scanf expression ", 447}, +to compose a regular expression", 448}, + {" Backwards ", 449}, + {"Warning: Searching backward can be slow", 450}, + {" Prompt on replace ", 451}, + {"Ask before making each replacement", 452}, + {" Replace all ", 453}, + {"Replace repeatedly", 454}, + {" Bookmarks ", 455}, + {"Create bookmarks at all lines found", 456}, + {" Scanf expression ", 457}, {"\ Allows entering of a C format string,\n\ -see the scanf man page", 448}, - {"Begin search, Enter", 449}, - {"Abort this dialog, Esc", 450}, - {"Replace", 451}, - {"Skip", 452}, - {"Replace all", 453}, - {"Replace one", 454}, - {"\ - Invalid regular expression, or scanf expression with to many conversions ", 455}, - {" Error in replacement format string. ", 456}, - {" %ld replacements made. ", 457}, - {" Search string not found. ", 458}, - {" Quit ", 459}, +see the scanf man page", 458}, + {"Begin search, Enter", 459}, + {"Abort this dialog, Esc", 460}, + {"Replace", 461}, + {"Skip", 462}, + {"Replace all", 463}, + {"Replace one", 464}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 465}, + {" Error in replacement format string. ", 466}, + {" %ld replacements made. ", 467}, + {" Search string not found. ", 468}, + {" %d finds made, %d bookmarks added ", 469}, + {" Quit ", 470}, {"\ Current text was modified without a file save. \n\ - Save with exit? ", 460}, - {" File was modified, Save with exit? ", 461}, - {"Cancel quit", 462}, - {"&Yes", 463}, - {"&No", 464}, - {" &Cancel quit ", 465}, - {" &Yes ", 466}, - {" &No ", 467}, - {" Copy to clipboard ", 468}, - {" Unable to save to file. ", 469}, - {" Cut to clipboard ", 470}, - {" Goto line ", 471}, - {" Enter line: ", 472}, - {" Save Block ", 473}, - {" Insert File ", 474}, - {" Insert file ", 475}, - {" Error trying to insert file. ", 476}, - {" Sort block ", 477}, - {" You must first highlight a block of text. ", 478}, - {" Run Sort ", 479}, - {" Enter sort options (see manpage) separated by whitespace: ", 480}, - {" Sort ", 481}, - {" Error trying to execute sort command ", 482}, - {" Sort returned non-zero: ", 483}, - {" Process block ", 484}, - {" Error trying to stat file ", 485}, - {" Mail ", 486}, - {" Copies to", 487}, - {" Subject", 488}, - {" To", 489}, - {" mail -s -c ", 490}, - {" Word wrap ", 491}, - {" Enter line length, 0 for off: ", 492}, - {" About ", 493}, + Save with exit? ", 471}, + {" File was modified, Save with exit? ", 472}, + {"Cancel quit", 473}, + {"&Yes", 474}, + {"&No", 475}, + {" &Cancel quit ", 476}, + {" &Yes ", 477}, + {" &No ", 478}, + {" Copy to clipboard ", 479}, + {" Unable to save to file. ", 480}, + {" Cut to clipboard ", 481}, + {" Goto line ", 482}, + {" Enter line: ", 483}, + {" Save Block ", 484}, + {" Insert File ", 485}, + {" Insert file ", 486}, + {" Error trying to insert file. ", 487}, + {" Sort block ", 488}, + {" You must first highlight a block of text. ", 489}, + {" Run Sort ", 490}, + {" Enter sort options (see manpage) separated by whitespace: ", 491}, + {" Sort ", 492}, + {" Error trying to execute sort command ", 493}, + {" Sort returned non-zero: ", 494}, + {" Process block ", 495}, + {" Error trying to stat file ", 496}, + {" Mail ", 497}, + {" Copies to", 498}, + {" Subject", 499}, + {" To", 500}, + {" mail -s -c ", 501}, + {" Word wrap ", 502}, + {" Enter line length, 0 for off: ", 503}, + {" About ", 504}, {"\ \n\ Cooledit v3.11.5\n\ @@ -574,678 +585,706 @@ Copyright (C) 1996 the Free Software Foundation\n\ \n\ A user friendly text editor written\n\ - for the Midnight Commander.\n", 494}, - {"&Open/load... C-o", 495}, - {"&New C-n", 496}, - {"&Save F2", 497}, - {"save &As... F12", 498}, - {"&Insert file... F15", 499}, - {"copy to &File... C-f", 500}, - {"a&Bout... ", 501}, - {"&Quit F10", 502}, - {"&New C-x k", 503}, - {"copy to &File... ", 504}, - {"&Toggle Mark F3", 505}, - {"&Mark Columns S-F3", 506}, - {"toggle &Ins/overw Ins", 507}, - {"&Copy F5", 508}, - {"&Move F6", 509}, - {"&Delete F8", 510}, - {"&Undo C-u", 511}, - {"&Beginning C-PgUp", 512}, - {"&End C-PgDn", 513}, - {"&Search... F7", 514}, - {"search &Again F17", 515}, - {"&Replace... F4", 516}, - {"&Goto line... M-l", 517}, - {"insert &Literal... C-q", 518}, - {"&Refresh screen C-l", 519}, - {"&Start record macro C-r", 520}, - {"&Finish record macro... C-r", 521}, - {"&Execute macro... C-a, KEY", 522}, - {"delete macr&O... ", 523}, - {"insert &Date/time ", 524}, - {"format p&Aragraph M-p", 525}, - {"'ispell' s&Pell check C-p", 526}, - {"sor&T... M-t", 527}, - {"'indent' &C Formatter F19", 528}, - {"&Mail... ", 529}, - {"&Execute macro... C-x e, KEY", 530}, - {"'ispell' s&Pell check M-$", 531}, - {"&General... ", 532}, - {"&Save mode...", 533}, - {"&Layout...", 534}, - {" File ", 535}, - {" Edit ", 536}, - {" Sear/Repl ", 537}, - {" Command ", 538}, - {" Options ", 539}, - {"Open...\tC-o", 540}, - {"New\tC-n", 541}, - {"Save\tF2", 542}, - {"Save as...\tF12", 543}, - {"Insert file...\tF15", 544}, - {"Copy to file...\tC-f", 545}, - {"Disk operations and file indexing/searching", 546}, - {"Toggle mark\tF3", 547}, - {"Toggle mark columns\tC-b", 548}, - {"Toggle book mark\tC-M-Ins", 549}, - {"Previous book mark\tC-M-Up", 550}, - {"Next book mark\tC-M-Down", 551}, - {"Flush book marks", 552}, - {"Toggle insert/overwrite\tIns", 553}, - {"Copy block to cursor\tF5", 554}, - {"Move block to cursor\tF6", 555}, - {"Delete block\tF8/C-Del", 556}, - {"Copy block to clipbrd\tC-Ins", 557}, - {"Cut block to clipbrd\tS-Del", 558}, - {"Paste block from clipbrd\tS-Ins", 559}, - {"Selection history\tM-Ins", 560}, - {"Undo\tC-BackSpace", 561}, - {"Manipulating blocks of text", 562}, - {" Srch/Replce ", 563}, - {"Search...\tF7", 564}, - {"Search again\tF17", 565}, - {"Replace...\tF4", 566}, - {"Replace again\tF14", 567}, - {"Search for and replace text", 568}, - {"Goto line...\tM-l", 569}, - {"Start record macro\tC-r", 570}, - {"Finish record macro...\tC-r", 571}, - {"Execute macro...\tC-a, KEY", 572}, - {"Delete macro...\t", 573}, - {"Insert date/time\tC-d", 574}, - {"Format paragraph\tM-p", 575}, - {"Refresh display\tC-l", 576}, - {"Macros and internal commands", 577}, - {"Intuitive", 578}, - {"Emacs", 579}, - {"None", 580}, - {"Dynamic paragraphing", 581}, - {"Type writer wrap", 582}, - {"Word wrap line length : ", 583}, - {"Tab spacing : ", 584}, - {"synta&X highlighting", 585}, - {"confir&M before saving", 586}, - {"fill tabs with &Spaces", 587}, - {"&Return does autoindent", 588}, - {"&Backspace through tabs", 589}, - {"&Fake half tabs", 590}, - {"Wrap mode", 591}, - {"Key emulation", 592}, - {" Editor options ", 593}, - {"Error initialising editor.\n", 594}, - {"Help", 595}, - {"Mark", 596}, - {"Replac", 597}, - {"PullDn", 598}, - {"Quit", 599}, - {"&Dismiss", 600}, - {" Enter file name: ", 601}, - {"The Quick Brown Fox Jumps Over The Lazy Dog", 602}, - {"\ -gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 603}, - {"Interactive help browser", 604}, - {"Save to current file name", 605}, - {"Toggle In/Off invisible marker to highlight text", 606}, - {"Replc", 607}, - {"Find and replace strings/regular expressions", 608}, - {"Copy highlighted block to cursor position", 609}, - {"Move highlighted block to cursor position", 610}, - {"Find", 611}, - {"Find strings/regular expressions", 612}, - {"Dlete", 613}, - {"Delete highlighted text", 614}, - {"Menu", 615}, - {"Pull down menu", 616}, - {"Exit editor", 617}, - {"Clear the edit buffer", 618}, - {"Insert File", 619}, - {"Insert text from a file", 620}, - {"Copy to file", 621}, - {"copy a block to a file", 622}, - {"Search/Replace", 623}, - {" Spelling Message ", 624}, + for the Midnight Commander.\n", 505}, + {"&Open/load... C-o", 506}, + {"&New C-n", 507}, + {"&Save F2", 508}, + {"save &As... F12", 509}, + {"&Insert file... F15", 510}, + {"copy to &File... C-f", 511}, + {"a&Bout... ", 512}, + {"&Quit F10", 513}, + {"&New C-x k", 514}, + {"copy to &File... ", 515}, + {"&Toggle Mark F3", 516}, + {"&Mark Columns S-F3", 517}, + {"toggle &Ins/overw Ins", 518}, + {"&Copy F5", 519}, + {"&Move F6", 520}, + {"&Delete F8", 521}, + {"&Undo C-u", 522}, + {"&Beginning C-PgUp", 523}, + {"&End C-PgDn", 524}, + {"&Search... F7", 525}, + {"search &Again F17", 526}, + {"&Replace... F4", 527}, + {"&Goto line... M-l", 528}, + {"goto matching &Bracket M-b", 529}, + {"insert &Literal... C-q", 530}, + {"&Refresh screen C-l", 531}, + {"&Start record macro C-r", 532}, + {"&Finish record macro... C-r", 533}, + {"&Execute macro... C-a, KEY", 534}, + {"delete macr&O... ", 535}, + {"insert &Date/time ", 536}, + {"format p&Aragraph M-p", 537}, + {"'ispell' s&Pell check C-p", 538}, + {"sor&T... M-t", 539}, + {"'indent' &C Formatter F19", 540}, + {"&Mail... ", 541}, + {"&Execute macro... C-x e, KEY", 542}, + {"'ispell' s&Pell check M-$", 543}, + {"&General... ", 544}, + {"&Save mode...", 545}, + {"&Layout...", 546}, + {" File ", 547}, + {" Edit ", 548}, + {" Sear/Repl ", 549}, + {" Command ", 550}, + {" Options ", 551}, + {"Open...\tC-o", 552}, + {"New\tC-n", 553}, + {"Save\tF2", 554}, + {"Save as...\tF12", 555}, + {"Insert file...\tF15", 556}, + {"Copy to file...\tC-f", 557}, + {"Disk operations and file indexing/searching", 558}, + {"Toggle mark\tF3", 559}, + {"Toggle mark columns\tC-b", 560}, + {"Toggle book mark\tC-M-Ins", 561}, + {"Previous book mark\tC-M-Up", 562}, + {"Next book mark\tC-M-Down", 563}, + {"Flush book marks", 564}, + {"Toggle insert/overwrite\tIns", 565}, + {"Copy block to cursor\tF5", 566}, + {"Move block to cursor\tF6", 567}, + {"Delete block\tF8/C-Del", 568}, + {"Copy block to clipbrd\tC-Ins", 569}, + {"Cut block to clipbrd\tS-Del", 570}, + {"Paste block from clipbrd\tS-Ins", 571}, + {"Selection history\tM-Ins", 572}, + {"Undo\tC-BackSpace", 573}, + {"Manipulating blocks of text", 574}, + {" Srch/Replce ", 575}, + {"Search...\tF7", 576}, + {"Search again\tF17", 577}, + {"Replace...\tF4", 578}, + {"Replace again\tF14", 579}, + {"Search for and replace text", 580}, + {"Goto line...\tM-l", 581}, + {"Goto matching bracket\tM-b", 582}, + {"Start record macro\tC-r", 583}, + {"Finish record macro...\tC-r", 584}, + {"Execute macro...\tC-a, KEY", 585}, + {"Delete macro...\t", 586}, + {"Insert date/time\tC-d", 587}, + {"Format paragraph\tM-p", 588}, + {"Refresh display\tC-l", 589}, + {"Macros and internal commands", 590}, + {"Intuitive", 591}, + {"Emacs", 592}, + {"None", 593}, + {"Dynamic paragraphing", 594}, + {"Type writer wrap", 595}, + {"Word wrap line length : ", 596}, + {"Tab spacing : ", 597}, + {"synta&X highlighting", 598}, + {"confir&M before saving", 599}, + {"fill tabs with &Spaces", 600}, + {"&Return does autoindent", 601}, + {"&Backspace through tabs", 602}, + {"&Fake half tabs", 603}, + {"Wrap mode", 604}, + {"Key emulation", 605}, + {" Editor options ", 606}, + {"Error initialising editor.\n", 607}, + {"Help", 608}, + {"Mark", 609}, + {"Replac", 610}, + {"PullDn", 611}, + {"Quit", 612}, + {"&Dismiss", 613}, + {" Enter file name: ", 614}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 615}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 616}, + {"Interactive help browser", 617}, + {"Save to current file name", 618}, + {"Toggle In/Off invisible marker to highlight text", 619}, + {"Replc", 620}, + {"Find and replace strings/regular expressions", 621}, + {"Copy highlighted block to cursor position", 622}, + {"Move highlighted block to cursor position", 623}, + {"Find", 624}, + {"Find strings/regular expressions", 625}, + {"Dlete", 626}, + {"Delete highlighted text", 627}, + {"Menu", 628}, + {"Pull down menu", 629}, + {"Exit editor", 630}, + {"Clear the edit buffer", 631}, + {"Insert File", 632}, + {"Insert text from a file", 633}, + {"Copy to file", 634}, + {"copy a block to a file", 635}, + {"Search/Replace", 636}, + {" Spelling Message ", 637}, {"\ Fail trying to open ispell program. \n\ Check that it is in your path and works with the -a option. \n\ - Alternatively, disable spell checking from the Options menu. ", 625}, + Alternatively, disable spell checking from the Options menu. ", 638}, {"\ Fail trying to open ispell pipes. \n\ Check that it is in your path and works with the -a option. \n\ - Alternatively, disable spell checking from the Options menu. ", 626}, + Alternatively, disable spell checking from the Options menu. ", 639}, {"\ Fail trying to read ispell pipes. \n\ Check that it is in your path and works with the -a option. \n\ - Alternatively, disable spell checking from the Options menu. ", 627}, + Alternatively, disable spell checking from the Options menu. ", 640}, {"\ Error reading from ispell. \n\ - Ispell is being restarted. ", 628}, - {" Load Syntax Rules ", 629}, + Ispell is being restarted. ", 641}, + {" Load Syntax Rules ", 642}, {"\ Your syntax rule file is outdated \n\ A new rule file is being installed. \n\ - Your old rule file has been saved with a .OLD extension. ", 630}, - {" Load syntax file ", 631}, - {" File access error ", 632}, - {" Error in file %s on line %d ", 633}, - {"&Set", 634}, - {"S&kip", 635}, - {"Set &all", 636}, - {"owner", 637}, - {"group", 638}, - {"other", 639}, - {"On", 640}, - {"Flag", 641}, - {"%6d of %d", 642}, - {" Chown advanced command ", 643}, + Your old rule file has been saved with a .OLD extension. ", 643}, + {" Load syntax file ", 644}, + {" File access error ", 645}, + {" Error in file %s on line %d ", 646}, + {"&Set", 647}, + {"S&kip", 648}, + {"Set &all", 649}, + {"owner", 650}, + {"group", 651}, + {"other", 652}, + {"On", 653}, + {"Flag", 654}, + {"%6d of %d", 655}, + {" Chown advanced command ", 656}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 644}, + %s ", 657}, {"\ Couldn't chown \"%s\" \n\ - %s ", 645}, - {" Oops... ", 646}, - {" I can't run the Advanced Chown command on an extfs ", 647}, - {" I can't run the Advanced Chown command on a tarfs ", 648}, - {"Background process:", 649}, - {" Background process error ", 650}, - {" Child died unexpectedly ", 651}, - {" Unknown error in child ", 652}, - {" Background protocol error ", 653}, + %s ", 658}, + {" Oops... ", 659}, + {" I can't run the Advanced Chown command on an extfs ", 660}, + {" I can't run the Advanced Chown command on a tarfs ", 661}, + {"Background process:", 662}, + {" Background process error ", 663}, + {" Child died unexpectedly ", 664}, + {" Unknown error in child ", 665}, + {" Background protocol error ", 666}, {"\ Background process sent us a request for more arguments \n\ - than we can handle. \n", 654}, - {" Listing mode ", 655}, - {"&Full file list", 656}, - {"&Brief file list", 657}, - {"&Long file list", 658}, - {"&User defined:", 659}, - {"&Icon view", 660}, - {"user &Mini status", 661}, - {"Listing mode", 662}, - {"&Reverse", 663}, - {"case sensi&tive", 664}, - {"Sort order", 665}, - {" confirm &Exit ", 666}, - {" confirm e&Xecute ", 667}, - {" confirm o&Verwrite ", 668}, - {" confirm &Delete ", 669}, - {" Confirmation ", 670}, - {"Full 8 bits output", 671}, - {"ISO 8859-1", 672}, - {"7 bits", 673}, - {"F&ull 8 bits input", 674}, - {" Display bits ", 675}, - {"&Always use ftp proxy", 676}, - {"sec", 677}, - {"ftpfs directory cache timeout:", 678}, - {"ftp anonymous password:", 679}, - {"Timeout for freeing VFSs:", 680}, - {" Virtual File System Setting ", 681}, - {"Quick cd", 682}, - {"cd", 683}, - {"Symbolic link", 684}, - {"Running ", 685}, - {"Stopped", 686}, - {"&Stop", 687}, - {"&Resume", 688}, - {"&Kill", 689}, - {"Background Jobs", 690}, - {"execute/search by others", 691}, - {"write by others", 692}, - {"read by others", 693}, - {"execute/search by group", 694}, - {"write by group", 695}, - {"read by group", 696}, - {"execute/search by owner", 697}, - {"write by owner", 698}, - {"read by owner", 699}, - {"sticky bit", 700}, - {"set group ID on execution", 701}, - {"set user ID on execution", 702}, - {"C&lear marked", 703}, - {"S&et marked", 704}, - {"&Marked all", 705}, - {"Permissions (Octal)", 706}, - {"Owner name", 707}, - {"Group name", 708}, - {" Chmod command ", 709}, - {" Permission ", 710}, - {"Use SPACE to change", 711}, - {"an option, ARROW KEYS", 712}, - {"to move between options", 713}, - {"and T or INS to mark", 714}, - {"Chmod command", 715}, - {" I can't run the Chmod command on an extfs ", 716}, - {" I can't run the Chmod command on a tarfs ", 717}, - {"Set &users", 718}, - {"Set &groups", 719}, - {" Name ", 720}, - {" Owner name ", 721}, - {" Group name ", 722}, - {" Size ", 723}, - {" Chown command ", 724}, - {" User name ", 725}, - {"", 726}, - {"", 727}, - {" I can't run the Chown command on an extfs ", 728}, - {" I can't run the Chown command on a tarfs ", 729}, - {" Can not fetch a local copy of %s ", 730}, - {" CD ", 731}, - {"Files tagged, want to cd?", 732}, - {"Could not change directory", 733}, - {" View file ", 734}, - {" Filename:", 735}, - {" Filtered view ", 736}, - {" Filter command and arguments:", 737}, - {"Create a new Directory", 738}, - {" Enter directory name:", 739}, - {" Filter ", 740}, - {" Set expression for filtering filenames", 741}, - {" Select ", 742}, - {" Unselect ", 743}, - {"Extension file edit", 744}, - {" Which extension file you want to edit? ", 745}, - {"&User", 746}, - {"&System Wide", 747}, - {"Menu file edit", 748}, - {" Which menu file will you edit? ", 749}, - {"&Local", 750}, - {"&Home", 751}, - {" Compare directories ", 752}, - {" Select compare method: ", 753}, - {"&Quick", 754}, - {"&Size only", 755}, - {"&Thorough", 756}, - {" Both panels should be on the listing view mode to use this command ", 757}, - {" The command history is empty ", 758}, - {" Command history ", 759}, + than we can handle. \n", 667}, + {" Listing mode ", 668}, + {"&Full file list", 669}, + {"&Brief file list", 670}, + {"&Long file list", 671}, + {"&User defined:", 672}, + {"&Icon view", 673}, + {"user &Mini status", 674}, + {"Listing mode", 675}, + {"&Reverse", 676}, + {"case sensi&tive", 677}, + {"Sort order", 678}, + {" confirm &Exit ", 679}, + {" confirm e&Xecute ", 680}, + {" confirm o&Verwrite ", 681}, + {" confirm &Delete ", 682}, + {" Confirmation ", 683}, + {"Full 8 bits output", 684}, + {"ISO 8859-1", 685}, + {"7 bits", 686}, + {"F&ull 8 bits input", 687}, + {" Display bits ", 688}, + {"&Always use ftp proxy", 689}, + {"sec", 690}, + {"ftpfs directory cache timeout:", 691}, + {"ftp anonymous password:", 692}, + {"Timeout for freeing VFSs:", 693}, + {" Virtual File System Setting ", 694}, + {"Quick cd", 695}, + {"cd", 696}, + {"Symbolic link", 697}, + {"Running ", 698}, + {"Stopped", 699}, + {"&Stop", 700}, + {"&Resume", 701}, + {"&Kill", 702}, + {"Background Jobs", 703}, + {"execute/search by others", 704}, + {"write by others", 705}, + {"read by others", 706}, + {"execute/search by group", 707}, + {"write by group", 708}, + {"read by group", 709}, + {"execute/search by owner", 710}, + {"write by owner", 711}, + {"read by owner", 712}, + {"sticky bit", 713}, + {"set group ID on execution", 714}, + {"set user ID on execution", 715}, + {"C&lear marked", 716}, + {"S&et marked", 717}, + {"&Marked all", 718}, + {"Permissions (Octal)", 719}, + {"Owner name", 720}, + {"Group name", 721}, + {" Chmod command ", 722}, + {" Permission ", 723}, + {"Use SPACE to change", 724}, + {"an option, ARROW KEYS", 725}, + {"to move between options", 726}, + {"and T or INS to mark", 727}, + {"Chmod command", 728}, + {" I can't run the Chmod command on an extfs ", 729}, + {" I can't run the Chmod command on a tarfs ", 730}, + {"Set &users", 731}, + {"Set &groups", 732}, + {" Name ", 733}, + {" Owner name ", 734}, + {" Group name ", 735}, + {" Size ", 736}, + {" Chown command ", 737}, + {" User name ", 738}, + {"", 739}, + {"", 740}, + {" I can't run the Chown command on an extfs ", 741}, + {" I can't run the Chown command on a tarfs ", 742}, + {" Can not fetch a local copy of %s ", 743}, + {" CD ", 744}, + {"Files tagged, want to cd?", 745}, + {"Could not change directory", 746}, + {" View file ", 747}, + {" Filename:", 748}, + {" Filtered view ", 749}, + {" Filter command and arguments:", 750}, + {"Create a new Directory", 751}, + {" Enter directory name:", 752}, + {" Filter ", 753}, + {" Set expression for filtering filenames", 754}, + {" Select ", 755}, + {" Unselect ", 756}, + {"Extension file edit", 757}, + {" Which extension file you want to edit? ", 758}, + {"&User", 759}, + {"&System Wide", 760}, + {"Menu file edit", 761}, + {" Which menu file will you edit? ", 762}, + {"&Local", 763}, + {"&Home", 764}, + {" Compare directories ", 765}, + {" Select compare method: ", 766}, + {"&Quick", 767}, + {"&Size only", 768}, + {"&Thorough", 769}, + {" Both panels should be on the listing view mode to use this command ", 770}, + {" The command history is empty ", 771}, + {" Command history ", 772}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 760}, - {"Type `exit' to return to the Midnight Commander", 761}, + the panels cannot be toggled. ", 773}, + {"Type `exit' to return to the Midnight Commander", 774}, {"\ Couldn't stat %s \n\ - %s ", 762}, - {" Link ", 763}, - {" to:", 764}, - {" link: %s ", 765}, - {" symlink: %s ", 766}, - {" Symlink `%s' points to: ", 767}, - {" Edit symlink ", 768}, - {" edit symlink, unable to remove %s: %s ", 769}, - {" edit symlink: %s ", 770}, - {" Link symbolically ", 771}, - {" Relative symlink ", 772}, - {" relative symlink: %s ", 773}, - {" Enter machine name (F1 for details): ", 774}, - {" Could not chdir to %s ", 775}, - {" Link to a remote machine ", 776}, - {" FTP to machine ", 777}, - {" SMB link to machine ", 778}, - {" Socket source routing setup ", 779}, - {" Enter host name to use as a source routing hop: ", 780}, - {" Host name ", 781}, - {" Error while looking up IP address ", 782}, - {" Undelete files on an ext2 file system ", 783}, + %s ", 775}, + {" Link ", 776}, + {" to:", 777}, + {" link: %s ", 778}, + {" symlink: %s ", 779}, + {" Symlink `%s' points to: ", 780}, + {" Edit symlink ", 781}, + {" edit symlink, unable to remove %s: %s ", 782}, + {" edit symlink: %s ", 783}, + {" Link symbolically ", 784}, + {" Relative symlink ", 785}, + {" relative symlink: %s ", 786}, + {" Enter machine name (F1 for details): ", 787}, + {" Could not chdir to %s ", 788}, + {" Link to a remote machine ", 789}, + {" FTP to machine ", 790}, + {" SMB link to machine ", 791}, + {" Socket source routing setup ", 792}, + {" Enter host name to use as a source routing hop: ", 793}, + {" Host name ", 794}, + {" Error while looking up IP address ", 795}, + {" Undelete files on an ext2 file system ", 796}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 784}, - {" Setup saved to ~/", 785}, - {" Setup ", 786}, + files on: (F1 for details)", 797}, + {" Setup saved to ~/", 798}, + {" Setup ", 799}, {"\ Can't chdir to '%s' \n\ - %s ", 787}, - {" You can not execute commands on non-local filesystems", 788}, + %s ", 800}, + {" You can not execute commands on non-local filesystems", 801}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\n", 789}, - {"&Unsorted", 790}, - {"&Name", 791}, - {"&Extension", 792}, - {"&Modify time", 793}, - {"&Access time", 794}, - {"&Change time", 795}, - {"&Size", 796}, - {"&Inode", 797}, - {"&Type", 798}, - {"&Links", 799}, - {"N&GID", 800}, - {"N&UID", 801}, - {"&Owner", 802}, - {"&Group", 803}, - {"File '%s' exists but can not be stat-ed: %s", 804}, - {"Unknown", 805}, +\n", 802}, + {"&Unsorted", 803}, + {"&Name", 804}, + {"&Extension", 805}, + {"&Modify time", 806}, + {"&Access time", 807}, + {"&Change time", 808}, + {"&Size", 809}, + {"&Inode", 810}, + {"&Type", 811}, + {"&Links", 812}, + {"N&GID", 813}, + {"N&UID", 814}, + {"&Owner", 815}, + {"&Group", 816}, + {"File '%s' exists but can not be stat-ed: %s", 817}, + {"Unknown", 818}, {"\ Can't generate unique filename \n\ - %s ", 806}, + %s ", 819}, {"\ Can't create temporary command file \n\ - %s ", 807}, - {" Parameter ", 808}, - {" Can't execute commands on a Virtual File System directory ", 809}, - {" file error", 810}, - {"Format of the ", 811}, - {" file error ", 812}, - {"Format of the ~/", 813}, + %s ", 820}, + {" Parameter ", 821}, + {" Can't execute commands on a Virtual File System directory ", 822}, + {" file error", 823}, + {"Format of the ", 824}, + {" file error ", 825}, + {"Format of the ~/", 826}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 814}, +copy it from ", 827}, {"\ mc.ext or use that\n\ -file as an example of how to write it.\n", 815}, - {"mc.ext will be used for this moment.", 816}, - {" Copy ", 817}, - {" Move ", 818}, - {" Delete ", 819}, - {" Invalid target mask ", 820}, - {" Could not make the hardlink ", 821}, +file as an example of how to write it.\n", 828}, + {"mc.ext will be used for this moment.", 829}, + {"Edition: ", 830}, + {"XView", 831}, + {"Tk", 832}, + {"text mode", 833}, + {" with X11 support to read modifiers", 834}, + {"Virtual File System: tarfs, extfs", 835}, + {", ftpfs", 836}, + {" (proxies: hsc proxy)", 837}, + {", mcfs", 838}, + {" (with termnet support)", 839}, + {", smbfs", 840}, + {", undelfs", 841}, + {"With builtin Editor\n", 842}, + {"Using ", 843}, + {"system-installed ", 844}, + {"S-lang library with ", 845}, + {"terminfo", 846}, + {"termcap", 847}, + {"an unknown terminal", 848}, + {" database", 849}, + {"the ncurses library", 850}, + {"some unknown curses library", 851}, + {"With subshell support: ", 852}, + {"optional", 853}, + {"as default", 854}, + {"With support for background operations\n", 855}, + {" Copy ", 856}, + {" Move ", 857}, + {" Delete ", 858}, + {" Invalid target mask ", 859}, + {" Could not make the hardlink ", 860}, {"\ Cannot read source link \"%s\" \n\ - %s ", 822}, + %s ", 861}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 823}, + Option Stable Symlinks will be disabled ", 862}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 824}, + %s ", 863}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 825}, + %s ", 864}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 826}, - {" `%s' and `%s' are the same file. ", 827}, + %s ", 865}, + {" `%s' and `%s' are the same file. ", 866}, {"\ Cannot create special file \"%s\" \n\ - %s ", 828}, + %s ", 867}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 829}, + %s ", 868}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 830}, + %s ", 869}, {"\ Cannot open source file \"%s\" \n\ - %s ", 831}, - {" Reget failed, about to overwrite file ", 832}, + %s ", 870}, + {" Reget failed, about to overwrite file ", 871}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 833}, + %s ", 872}, {"\ Cannot create target file \"%s\" \n\ - %s ", 834}, + %s ", 873}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 835}, + %s ", 874}, {"\ Cannot read source file \"%s\" \n\ - %s ", 836}, + %s ", 875}, {"\ Cannot write target file \"%s\" \n\ - %s ", 837}, - {"(stalled)", 838}, + %s ", 876}, + {"(stalled)", 877}, {"\ Cannot close source file \"%s\" \n\ - %s ", 839}, + %s ", 878}, {"\ Cannot close target file \"%s\" \n\ - %s ", 840}, - {"Incomplete file was retrieved. Keep it?", 841}, - {"&Delete", 842}, - {"&Keep", 843}, + %s ", 879}, + {"Incomplete file was retrieved. Keep it?", 880}, + {"&Delete", 881}, + {"&Keep", 882}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 844}, + %s ", 883}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 845}, + %s ", 884}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 846}, + `%s' ", 885}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 847}, + %s ", 886}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 848}, + %s ", 887}, {"\ Cannot stat file \"%s\" \n\ - %s ", 849}, - {" `%s' and `%s' are the same file ", 850}, - {" Cannot overwrite directory `%s' ", 851}, + %s ", 888}, + {" `%s' and `%s' are the same file ", 889}, + {" Cannot overwrite directory `%s' ", 890}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 852}, + %s ", 891}, {"\ Cannot remove file \"%s\" \n\ - %s ", 853}, - {" `%s' and `%s' are the same directory ", 854}, - {" Cannot overwrite directory \"%s\" %s ", 855}, - {" Cannot overwrite file \"%s\" %s ", 856}, + %s ", 892}, + {" `%s' and `%s' are the same directory ", 893}, + {" Cannot overwrite directory \"%s\" %s ", 894}, + {" Cannot overwrite file \"%s\" %s ", 895}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 857}, + %s ", 896}, {"\ Cannot delete file \"%s\" \n\ - %s ", 858}, + %s ", 897}, {"\ Cannot remove directory \"%s\" \n\ - %s ", 859}, - {" Internal error: get_file \n", 860}, - {"1Copy", 861}, - {"1Move", 862}, - {"1Delete", 863}, - {"%o %f \"%s\"%m", 864}, - {"%o %d %f%m", 865}, - {"%o %f \"%s\"%e", 866}, - {"%o %d %f%e", 867}, - {"file", 868}, - {"files", 869}, - {"directory", 870}, - {"directories", 871}, - {"files/directories", 872}, - {" with source mask:", 873}, - {" Can't operate on \"..\"! ", 874}, - {"Yes", 875}, - {"No", 876}, - {" Sorry, I could not put the job in background ", 877}, - {" Internal failure ", 878}, - {" Unknown file operation ", 879}, + %s ", 898}, + {" Internal error: get_file \n", 899}, + {"1Copy", 900}, + {"1Move", 901}, + {"1Delete", 902}, + {"%o %f \"%s\"%m", 903}, + {"%o %d %f%m", 904}, + {"%o %f \"%s\"%e", 905}, + {"%o %d %f%e", 906}, + {"file", 907}, + {"files", 908}, + {"directory", 909}, + {"directories", 910}, + {"files/directories", 911}, + {" with source mask:", 912}, + {" Can't operate on \"..\"! ", 913}, + {"Yes", 914}, + {"No", 915}, + {" Sorry, I could not put the job in background ", 916}, + {" Internal failure ", 917}, + {" Unknown file operation ", 918}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 880}, - {"&Retry", 881}, - {"&Abort", 882}, + %s ", 919}, + {"&Retry", 920}, + {"&Abort", 921}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 883}, + Delete it recursively? ", 922}, {"\ \n\ Background process: Directory not empty \n\ - Delete it recursively? ", 884}, - {"a&ll", 885}, - {"non&E", 886}, - {" Type 'yes' if you REALLY want to delete ", 887}, - {"all the directories ", 888}, - {" Recursive Delete ", 889}, - {" Background process: Recursive Delete ", 890}, - {"File", 891}, - {"Count", 892}, - {"Bytes", 893}, - {"Source", 894}, - {"Target", 895}, - {"Deleting", 896}, - {"Target file \"%s\" already exists!", 897}, - {"if &Size differs", 898}, - {"&Update", 899}, - {"Overwrite all targets?", 900}, - {"&Reget", 901}, - {"ap&Pend", 902}, - {"Overwrite this target?", 903}, - {"Target date: %s, size %d", 904}, - {"Source date: %s, size %d", 905}, - {" File exists ", 906}, - {" Background process: File exists ", 907}, - {"preserve &Attributes", 908}, - {"follow &Links", 909}, - {"to:", 910}, - {"&Using shell patterns", 911}, - {"&Background", 912}, - {"&Stable Symlinks", 913}, - {"&Dive into subdir if exists", 914}, + Delete it recursively? ", 923}, + {"a&ll", 924}, + {"non&E", 925}, + {" Type 'yes' if you REALLY want to delete ", 926}, + {"all the directories ", 927}, + {" Recursive Delete ", 928}, + {" Background process: Recursive Delete ", 929}, + {"File", 930}, + {"Count", 931}, + {"Bytes", 932}, + {"Source", 933}, + {"Target", 934}, + {"Deleting", 935}, + {"Target file \"%s\" already exists!", 936}, + {"if &Size differs", 937}, + {"&Update", 938}, + {"Overwrite all targets?", 939}, + {"&Reget", 940}, + {"ap&Pend", 941}, + {"Overwrite this target?", 942}, + {"Target date: %s, size %d", 943}, + {"Source date: %s, size %d", 944}, + {" File exists ", 945}, + {" Background process: File exists ", 946}, + {"preserve &Attributes", 947}, + {"follow &Links", 948}, + {"to:", 949}, + {"&Using shell patterns", 950}, + {"&Background", 951}, + {"&Stable Symlinks", 952}, + {"&Dive into subdir if exists", 953}, {"\ Invalid source pattern `%s' \n\ - %s ", 915}, - {"&Suspend", 916}, - {"Con&tinue", 917}, - {"&Chdir", 918}, - {"&Again", 919}, - {"&Quit", 920}, - {"Pane&lize", 921}, - {"&View - F3", 922}, - {"&Edit - F4", 923}, - {"Start at:", 924}, - {"Filename:", 925}, - {"Content: ", 926}, - {"&Tree", 927}, - {"Find File", 928}, - {"Grepping in %s", 929}, - {" Find/read ", 930}, - {" Problem reading from child ", 931}, - {"Finished", 932}, - {"Searching %s", 933}, - {"Suspend", 934}, - {"Restart", 935}, - {"Searching", 936}, - {"Find file", 937}, - {"Change to this directory", 938}, - {"Search again", 939}, - {"View this file", 940}, - {"Edit this file", 941}, - {"Send the results to a Panel", 942}, - {"Usage: fixhlp \n", 943}, - {"fixhlp: Cannot open toc for writing", 944}, + %s ", 954}, + {"&Suspend", 955}, + {"Con&tinue", 956}, + {"&Chdir", 957}, + {"&Again", 958}, + {"&Quit", 959}, + {"Pane&lize", 960}, + {"&View - F3", 961}, + {"&Edit - F4", 962}, + {"Start at:", 963}, + {"Filename:", 964}, + {"Content: ", 965}, + {"&Tree", 966}, + {"Find File", 967}, + {"Grepping in %s", 968}, + {" Find/read ", 969}, + {" Problem reading from child ", 970}, + {"Finished", 971}, + {"Searching %s", 972}, + {"Suspend", 973}, + {"Restart", 974}, + {"Searching", 975}, + {"Find file", 976}, + {"Change to this directory", 977}, + {"Search again", 978}, + {"View this file", 979}, + {"Edit this file", 980}, + {"Send the results to a Panel", 981}, + {"Usage: fixhlp \n", 982}, + {"fixhlp: Cannot open toc for writing", 983}, {"\ [Contents]\n\ Topics:\n\ -\n", 945}, +\n", 984}, {"\ Help file format error\n\ -", 946}, - {" Internal bug: Double start of link area ", 947}, - {" Can't find node [Contents] in help file ", 948}, - {" Help ", 949}, +", 985}, + {" Internal bug: Double start of link area ", 986}, + {" Can't find node [Contents] in help file ", 987}, + {" Help ", 988}, {"\ Can't open file %s \n\ - %s ", 950}, - {" Can't find node %s in help file ", 951}, - {"Index", 952}, - {"Prev", 953}, - {"&Move", 954}, - {"&Remove", 955}, - {"&Append", 956}, - {"&Insert", 957}, - {"New &Entry", 958}, - {"New &Group", 959}, - {"&Up", 960}, - {"&Add current", 961}, - {"Change &To", 962}, - {"Subgroup - press ENTER to see list", 963}, - {"Active VFS directories", 964}, - {"Directory hotlist", 965}, - {" Directory path ", 966}, - {" Directory label ", 967}, - {"Moving ", 968}, - {"New hotlist entry", 969}, - {"Directory label", 970}, - {"Directory path", 971}, - {" New hotlist group ", 972}, - {"Name of new group", 973}, - {"Label for \"%s\":", 974}, - {" Add to hotlist ", 975}, - {" Remove: ", 976}, + %s ", 989}, + {" Can't find node %s in help file ", 990}, + {"Index", 991}, + {"Prev", 992}, + {"&Move", 993}, + {"&Remove", 994}, + {"&Append", 995}, + {"&Insert", 996}, + {"New &Entry", 997}, + {"New &Group", 998}, + {"&Up", 999}, + {"&Add current", 1000}, + {"Change &To", 1001}, + {"Subgroup - press ENTER to see list", 1002}, + {"Active VFS directories", 1003}, + {"Directory hotlist", 1004}, + {" Directory path ", 1005}, + {" Directory label ", 1006}, + {"Moving ", 1007}, + {"New hotlist entry", 1008}, + {"Directory label", 1009}, + {"Directory path", 1010}, + {" New hotlist group ", 1011}, + {"Name of new group", 1012}, + {"Label for \"%s\":", 1013}, + {" Add to hotlist ", 1014}, + {" Remove: ", 1015}, {"\ \n\ Group not empty.\n\ - Remove it?", 977}, - {" Top level group ", 978}, - {"Hotlist is now kept in file ~/", 979}, - {"MC will load hotlist from ~/", 980}, - {"and then delete [Hotlist] section there", 981}, - {" Hotlist Load ", 982}, - {"MC was unable to write ~/", 983}, - {" file, your old hotlist entries were not deleted", 984}, - {"You have ~/", 985}, - {" file and [Hotlist] section in ~/", 986}, - {"Your ~/", 987}, - {" most probably was created\n", 988}, + Remove it?", 1016}, + {" Top level group ", 1017}, + {"Hotlist is now kept in file ~/", 1018}, + {"MC will load hotlist from ~/", 1019}, + {"and then delete [Hotlist] section there", 1020}, + {" Hotlist Load ", 1021}, + {"MC was unable to write ~/", 1022}, + {" file, your old hotlist entries were not deleted", 1023}, + {"You have ~/", 1024}, + {" file and [Hotlist] section in ~/", 1025}, + {"Your ~/", 1026}, + {" most probably was created\n", 1027}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 989}, +and is more actual than ~/", 1028}, {"\ entries\n\ -\n", 990}, +\n", 1029}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 991}, + Remove - remove old hotlist entries from ~/", 1030}, {"\ 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 ~/", 992}, - {"&Merge", 993}, - {" Entries from ~/", 994}, - {" file your old hotlist entries were not deleted", 995}, - {"Midnight Commander %s", 996}, - {"File: %s", 997}, - {"Free nodes %d (%d%%) of %d", 998}, - {"No node information", 999}, - {"Free space ", 1000}, - {" (%d%%) of ", 1001}, - {"No space information", 1002}, - {"Type: %s ", 1003}, - {"non-local vfs", 1004}, - {"Device: %s", 1005}, - {"Filesystem: %s", 1006}, - {"Accessed: %s", 1007}, - {"Modified: %s", 1008}, - {"Created: %s", 1009}, - {"Size: ", 1010}, - {" (%d blocks)", 1011}, - {"Owner: %s/%s", 1012}, - {"Links: %d", 1013}, - {"Mode: %s (%04o)", 1014}, - {"Location: %Xh:%Xh", 1015}, - {"File: None", 1016}, - {"&Vertical", 1017}, - {"&Horizontal", 1018}, - {"&Xterm hintbar", 1019}, - {"h&Intbar visible", 1020}, - {"&Keybar visible", 1021}, - {"command &Prompt", 1022}, - {"show &Mini status", 1023}, - {"menu&Bar visible", 1024}, - {"&Equal split", 1025}, - {"pe&Rmissions", 1026}, - {"&File types", 1027}, - {"&Save", 1028}, - {" Layout ", 1029}, - {" Panel split ", 1030}, - {" Highlight... ", 1031}, - {" Other options ", 1032}, - {"output lines", 1033}, - {"Layout", 1034}, - {" Learn keys ", 1035}, - {" Teach me a key ", 1036}, + Merge - add old entries to hotlist as group \"Entries from ~/", 1031}, + {"&Merge", 1032}, + {" Entries from ~/", 1033}, + {" file your old hotlist entries were not deleted", 1034}, + {"Midnight Commander %s", 1035}, + {"File: %s", 1036}, + {"Free nodes %d (%d%%) of %d", 1037}, + {"No node information", 1038}, + {"Free space ", 1039}, + {" (%d%%) of ", 1040}, + {"No space information", 1041}, + {"Type: %s ", 1042}, + {"non-local vfs", 1043}, + {"Device: %s", 1044}, + {"Filesystem: %s", 1045}, + {"Accessed: %s", 1046}, + {"Modified: %s", 1047}, + {"Created: %s", 1048}, + {"Size: ", 1049}, + {" (%d blocks)", 1050}, + {"Owner: %s/%s", 1051}, + {"Links: %d", 1052}, + {"Mode: %s (%04o)", 1053}, + {"Location: %Xh:%Xh", 1054}, + {"File: None", 1055}, + {"&Vertical", 1056}, + {"&Horizontal", 1057}, + {"&Xterm hintbar", 1058}, + {"h&Intbar visible", 1059}, + {"&Keybar visible", 1060}, + {"command &Prompt", 1061}, + {"show &Mini status", 1062}, + {"menu&Bar visible", 1063}, + {"&Equal split", 1064}, + {"pe&Rmissions", 1065}, + {"&File types", 1066}, + {"&Save", 1067}, + {" Layout ", 1068}, + {" Panel split ", 1069}, + {" Highlight... ", 1070}, + {" Other options ", 1071}, + {"output lines", 1072}, + {"Layout", 1073}, + {" Learn keys ", 1074}, + {" Teach me a key ", 1075}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1254,425 +1293,544 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 1037}, - {" Cannot accept this key ", 1038}, - {" You have entered \"%s\"", 1039}, - {"OK", 1040}, +and wait as well.", 1076}, + {" Cannot accept this key ", 1077}, + {" You have entered \"%s\"", 1078}, + {"OK", 1079}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 1041}, - {"&Discard", 1042}, +work fine. That's great.", 1080}, + {"&Discard", 1081}, {"\ Great! You have a complete terminal database!\n\ -All your keys work well.", 1043}, - {"Learn keys", 1044}, - {"Press all the keys mentioned here. After you have done it, check", 1045}, - {"which keys are not marked with OK. Press space on the missing", 1046}, - {"key, or click with the mouse to define it. Move around with Tab.", 1047}, +All your keys work well.", 1082}, + {"Learn keys", 1083}, + {"Press all the keys mentioned here. After you have done it, check", 1084}, + {"which keys are not marked with OK. Press space on the missing", 1085}, + {"key, or click with the mouse to define it. Move around with Tab.", 1086}, {"\ 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? ", 1048}, - {"Press any key to continue...", 1049}, - {" The shell is already running a command ", 1050}, - {" The Midnight Commander ", 1051}, - {" Do you really want to quit the Midnight Commander? ", 1052}, - {"&Listing mode...", 1053}, - {"&Quick view C-x q", 1054}, - {"&Info C-x i", 1055}, - {"&Sort order...", 1056}, - {"&Filter...", 1057}, - {"&Network link...", 1058}, - {"FT&P link...", 1059}, - {"SM&B link...", 1060}, - {"&Drive... M-d", 1061}, - {"&Rescan C-r", 1062}, - {"&User menu F2", 1063}, - {"&View F3", 1064}, - {"Vie&w file... ", 1065}, - {"&Filtered view M-!", 1066}, - {"&Edit F4", 1067}, - {"&Copy F5", 1068}, - {"c&Hmod C-x c", 1069}, - {"&Link C-x l", 1070}, - {"&SymLink C-x s", 1071}, - {"edit s&Ymlink C-x C-s", 1072}, - {"ch&Own C-x o", 1073}, - {"&Advanced chown ", 1074}, - {"&Rename/Move F6", 1075}, - {"&Mkdir F7", 1076}, - {"&Delete F8", 1077}, - {"&Quick cd M-c", 1078}, - {"select &Group M-+", 1079}, - {"u&Nselect group M-\\", 1080}, - {"reverse selec&Tion M-*", 1081}, - {"e&Xit F10", 1082}, - {"&Directory tree", 1083}, - {"&Find file M-?", 1084}, - {"s&Wap panels C-u", 1085}, - {"switch &Panels on/off C-o", 1086}, - {"&Compare directories C-x d", 1087}, - {"e&Xternal panelize C-x !", 1088}, - {"show directory s&Izes", 1089}, - {"command &History", 1090}, - {"di&Rectory hotlist C-\\", 1091}, - {"&Active VFS list C-x a", 1092}, - {"Fr&ee VFSs now", 1093}, - {"&Background jobs C-x j", 1094}, - {"&Undelete files (ext2fs only)", 1095}, - {"&Listing format edit", 1096}, - {"&Extension file edit", 1097}, - {"&Menu file edit", 1098}, - {"&Configuration...", 1099}, - {"c&Onfirmation...", 1100}, - {"&Display bits...", 1101}, - {"learn &Keys...", 1102}, - {"&Virtual FS...", 1103}, - {"&Save setup", 1104}, - {" &Left ", 1105}, - {" &Above ", 1106}, - {" &File ", 1107}, - {" &Command ", 1108}, - {" &Options ", 1109}, - {" &Right ", 1110}, - {" &Below ", 1111}, - {" Information ", 1112}, + extra access permissions with the \"su\" command? ", 1087}, + {"Press any key to continue...", 1088}, + {" The shell is already running a command ", 1089}, + {" The Midnight Commander ", 1090}, + {" Do you really want to quit the Midnight Commander? ", 1091}, + {"&Listing mode...", 1092}, + {"&Quick view C-x q", 1093}, + {"&Info C-x i", 1094}, + {"&Sort order...", 1095}, + {"&Filter...", 1096}, + {"&Network link...", 1097}, + {"FT&P link...", 1098}, + {"SM&B link...", 1099}, + {"&Drive... M-d", 1100}, + {"&Rescan C-r", 1101}, + {"&User menu F2", 1102}, + {"&View F3", 1103}, + {"Vie&w file... ", 1104}, + {"&Filtered view M-!", 1105}, + {"&Edit F4", 1106}, + {"&Copy F5", 1107}, + {"c&Hmod C-x c", 1108}, + {"&Link C-x l", 1109}, + {"&SymLink C-x s", 1110}, + {"edit s&Ymlink C-x C-s", 1111}, + {"ch&Own C-x o", 1112}, + {"&Advanced chown ", 1113}, + {"&Rename/Move F6", 1114}, + {"&Mkdir F7", 1115}, + {"&Delete F8", 1116}, + {"&Quick cd M-c", 1117}, + {"select &Group M-+", 1118}, + {"u&Nselect group M-\\", 1119}, + {"reverse selec&Tion M-*", 1120}, + {"e&Xit F10", 1121}, + {"&Directory tree", 1122}, + {"&Find file M-?", 1123}, + {"s&Wap panels C-u", 1124}, + {"switch &Panels on/off C-o", 1125}, + {"&Compare directories C-x d", 1126}, + {"e&Xternal panelize C-x !", 1127}, + {"show directory s&Izes", 1128}, + {"command &History", 1129}, + {"di&Rectory hotlist C-\\", 1130}, + {"&Active VFS list C-x a", 1131}, + {"Fr&ee VFSs now", 1132}, + {"&Background jobs C-x j", 1133}, + {"&Undelete files (ext2fs only)", 1134}, + {"&Listing format edit", 1135}, + {"&Extension file edit", 1136}, + {"&Menu file edit", 1137}, + {"&Configuration...", 1138}, + {"c&Onfirmation...", 1139}, + {"&Display bits...", 1140}, + {"learn &Keys...", 1141}, + {"&Virtual FS...", 1142}, + {"&Save setup", 1143}, + {" &Left ", 1144}, + {" &Above ", 1145}, + {" &File ", 1146}, + {" &Command ", 1147}, + {" &Options ", 1148}, + {" &Right ", 1149}, + {" &Below ", 1150}, + {" Information ", 1151}, {"\ 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. ", 1113}, - {"Thank you for using GNU Midnight Commander", 1114}, - {"with mouse support on xterm%s.\n", 1115}, - {" and the Linux console", 1116}, - {"The TERM environment variable is unset!\n", 1117}, - {"Library directory for the Midnight Commander: %s\n", 1118}, - {"\ -Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1119}, - {"Use to debug the background code", 1120}, - {"Request to run in color mode", 1121}, - {"Specifies a color configuration", 1122}, - {"Edits one file", 1123}, - {"Displays this help message", 1124}, - {"Displays a help screen on how to change the color scheme", 1125}, - {"Log ftp dialog to specified file", 1126}, - {"Obsolete", 1127}, - {"Requests to run in black and white", 1128}, - {"Disable mouse support in text version", 1129}, - {"Disables subshell support", 1130}, - {"Prints working directory at program exit", 1131}, - {"Resets soft keys on HP terminals", 1132}, - {"To run on slow terminals", 1133}, - {"Use stickchars to draw", 1134}, - {"Enables subshell support (default)", 1135}, - {"Tries to use termcap instead of terminfo", 1136}, - {"Displays the current version", 1137}, - {"Launches the file viewer on a file", 1138}, - {"Forces xterm features", 1139}, - {"Geometry for the window", 1140}, - {"GEOMETRY", 1141}, - {"No windows opened at startup", 1142}, - {"Display the directory that holds the .links startup files and exit", 1143}, + the details. ", 1152}, + {"Thank you for using GNU Midnight Commander", 1153}, + {"with mouse support on xterm%s.\n", 1154}, + {" and the Linux console", 1155}, + {"The TERM environment variable is unset!\n", 1156}, + {"\ +Usage is:\n\ +\n\ +mc [flags] [this_dir] [other_panel_dir]\n\ +\n", 1157}, + {"-a, --stickchars Force use of +, -, | for line drawing.\n", 1158}, + {"-b, --nocolor Force black and white display.\n", 1159}, + {"-B, --background [DEVEL-ONLY: Debug the background code]\n", 1160}, + {"\ +-c, --color Force color mode.\n\ +-C, --colors Specify colors (use --help-colors to get a list).\n\ +-d, --nomouse Disable mouse support.\n", 1161}, + {"-e, --edit Startup the internal editor.\n", 1162}, + {"\ +-f, --libdir Print configured paths.\n\ +-h, --help Shows this help message.\n\ +-k, --resetsoft Reset softkeys (HP terminals only) to their \ +terminfo/termcap\n\ + default.\n", 1163}, + {"-l, --ftplog file Log ftpfs commands to the file.\n", 1164}, + {"-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n", 1165}, + {"\ +-P, --printwd At exit, print the last working directory.\n\ +-s, --slow Disables verbose operation (for slow terminals).\n", 1166}, + {"-t, --termcap Activate support for the TERMCAP variable.\n", 1167}, + {"\ +-S, --createcmdile Create command file to set default directory upon exit.\n", 1168}, + {"\ +-u, --nosubshell Disable the concurrent subshell mode.\n\ +-U, --subshell Force the concurrent subshell mode.\n\ +-r, --forceexec Force subshell execution.\n", 1169}, + {"\ +-v, --view fname Start up into the viewer mode.\n\ +-V, --version Report version and configuration options.\n\ +-x, --xterm Force xterm mouse support and screen save/restore.\n", 1170}, + {"-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n", 1171}, + {"\ +\n\ +Please send any bug reports (including the output of `mc -V')\n\ +to mc-bugs@nuclecu.unam.mx\n", 1172}, + {"\ +--colors KEYWORD={FORE},{BACK}\n\ +\n\ +{FORE} and {BACK} can be ommited, and the default will be used\n\ +\n\ +Keywords:\n\ + Global: errors, reverse, gauge, input\n\ + File display: normal, selected, marked, markselect\n\ + Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus\n\ + Menus: menu, menuhot, menusel, menuhotsel\n\ + Help: helpnormal, helpitalic, helplink, helpslink\n\ + File types: directory, execute, link, device, special, core\n\ +\n\ +Colors:\n\ + black, gray, red, brightred, green, brightgreen, brown,\n\ + yellow, blue, brightblue, magenta, brightmagenta, cyan,\n\ + brightcyan, lightgray and white\n\ +\n", 1173}, + {"Library directory for the Midnight Commander: %s\n", 1174}, + {"\ +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1175}, + {"Use to debug the background code", 1176}, + {"Request to run in color mode", 1177}, + {"Specifies a color configuration", 1178}, + {"Edits one file", 1179}, + {"Displays this help message", 1180}, + {"Displays a help screen on how to change the color scheme", 1181}, + {"Log ftp dialog to specified file", 1182}, + {"Obsolete", 1183}, + {"Requests to run in black and white", 1184}, + {"Disable mouse support in text version", 1185}, + {"Disables subshell support", 1186}, + {"Prints working directory at program exit", 1187}, + {"Resets soft keys on HP terminals", 1188}, + {"To run on slow terminals", 1189}, + {"Use stickchars to draw", 1190}, + {"Enables subshell support (default)", 1191}, + {"Tries to use termcap instead of terminfo", 1192}, + {"Displays the current version", 1193}, + {"Launches the file viewer on a file", 1194}, + {"Forces xterm features", 1195}, + {"Geometry for the window", 1196}, + {"GEOMETRY", 1197}, + {"No windows opened at startup", 1198}, + {"No desktop icons", 1199}, + {"Look more like traditional gmc", 1200}, + {"Display the directory that holds the .links startup files and exit", 1201}, {"\ 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", 1144}, - {" Notice ", 1145}, +On some systems you may want to run # `which mc`\n", 1202}, + {" Notice ", 1203}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - files have been moved now\n", 1146}, - {"safe de&Lete", 1147}, - {"cd follows lin&Ks", 1148}, - {"advanced cho&Wn", 1149}, - {"l&Ynx-like motion", 1150}, - {"Animation", 1151}, - {"rotatin&G dash", 1152}, - {"co&Mplete: show all", 1153}, - {"&Use internal view", 1154}, - {"use internal ed&It", 1155}, - {"auto m&Enus", 1156}, - {"&Auto save setup", 1157}, - {"shell &Patterns", 1158}, - {"Compute &Totals", 1159}, - {"&Verbose operation", 1160}, - {"&Fast dir reload", 1161}, - {"mi&X all files", 1162}, - {"&Drop down menus", 1163}, - {"ma&Rk moves down", 1164}, - {"show &Hidden files", 1165}, - {"show &Backup files", 1166}, - {"&Never", 1167}, - {"on dumb &Terminals", 1168}, - {"alwa&Ys", 1169}, - {" Configure options ", 1170}, - {" Panel options ", 1171}, - {" Pause after run... ", 1172}, - {"Configure options", 1173}, - {"&Add new", 1174}, - {" External panelize ", 1175}, - {"External panelize", 1176}, - {"Other command", 1177}, - {" Add to external panelize ", 1178}, - {" Enter command label: ", 1179}, - {" I can't run external panelize while logged on a non local directory ", 1180}, - {"Find *.orig after patching", 1181}, - {"Find SUID and SGID programs", 1182}, - {"Cannot invoke command.", 1183}, - {"Pipe close failed", 1184}, - {"Show this help message", 1185}, - {"Display brief usage message", 1186}, - {"MTime", 1187}, - {"ATime", 1188}, - {"CTime", 1189}, - {"Perm", 1190}, - {"Nl", 1191}, - {"Inode", 1192}, - {"UID", 1193}, - {"GID", 1194}, - {" %s bytes in %d file%s", 1195}, - {"Unknow tag on display format: ", 1196}, - {"User suplied format looks invalid, reverting to default.", 1197}, - {" Do you really want to execute? ", 1198}, - {" No action taken ", 1199}, - {"RenMov", 1200}, - {"Mkdir", 1201}, + files have been moved now\n", 1204}, + {"safe de&Lete", 1205}, + {"cd follows lin&Ks", 1206}, + {"advanced cho&Wn", 1207}, + {"l&Ynx-like motion", 1208}, + {"Animation", 1209}, + {"rotatin&G dash", 1210}, + {"co&Mplete: show all", 1211}, + {"&Use internal view", 1212}, + {"use internal ed&It", 1213}, + {"auto m&Enus", 1214}, + {"&Auto save setup", 1215}, + {"shell &Patterns", 1216}, + {"Compute &Totals", 1217}, + {"&Verbose operation", 1218}, + {"&Fast dir reload", 1219}, + {"mi&X all files", 1220}, + {"&Drop down menus", 1221}, + {"ma&Rk moves down", 1222}, + {"show &Hidden files", 1223}, + {"show &Backup files", 1224}, + {"&Never", 1225}, + {"on dumb &Terminals", 1226}, + {"alwa&Ys", 1227}, + {" Configure options ", 1228}, + {" Panel options ", 1229}, + {" Pause after run... ", 1230}, + {"Configure options", 1231}, + {"&Add new", 1232}, + {" External panelize ", 1233}, + {"External panelize", 1234}, + {"Other command", 1235}, + {" Add to external panelize ", 1236}, + {" Enter command label: ", 1237}, + {" I can't run external panelize while logged on a non local directory ", 1238}, + {"Find *.orig after patching", 1239}, + {"Find SUID and SGID programs", 1240}, + {"Cannot invoke command.", 1241}, + {"Pipe close failed", 1242}, + {"Show this help message", 1243}, + {"Display brief usage message", 1244}, + {"MTime", 1245}, + {"ATime", 1246}, + {"CTime", 1247}, + {"Perm", 1248}, + {"Nl", 1249}, + {"Inode", 1250}, + {"UID", 1251}, + {"GID", 1252}, + {" %s bytes in %d file%s", 1253}, + {"Unknow tag on display format: ", 1254}, + {"User suplied format looks invalid, reverting to default.", 1255}, + {" Do you really want to execute? ", 1256}, + {" No action taken ", 1257}, + {"RenMov", 1258}, + {"Mkdir", 1259}, {"\ Can't chdir to %s \n\ - %s ", 1202}, - {"Couldn't open named pipe %s\n", 1203}, - {" The shell is still active. Quit anyway? ", 1204}, - {" There are stopped jobs.", 1205}, - {" Quit anyway? ", 1206}, - {"Warning: Couldn't change to %s.\n", 1207}, + %s ", 1260}, + {"Couldn't open named pipe %s\n", 1261}, + {" The shell is still active. Quit anyway? ", 1262}, + {" There are stopped jobs.", 1263}, + {" Quit anyway? ", 1264}, + {"Warning: Couldn't change to %s.\n", 1265}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1208}, - {"Copy \"%s\" directory to:", 1209}, - {"Move \"%s\" directory to:", 1210}, +%s\n", 1266}, + {"Copy \"%s\" directory to:", 1267}, + {"Move \"%s\" directory to:", 1268}, {"\ Can't stat the destination \n\ - %s ", 1211}, - {" The destination isn't a directory ", 1212}, - {" Delete %s? ", 1213}, - {"Static", 1214}, - {"Dynamc", 1215}, + %s ", 1269}, + {" The destination isn't a directory ", 1270}, + {" Delete %s? ", 1271}, + {"Static", 1272}, + {"Dynamc", 1273}, {"\ Can't chdir to \"%s\" \n\ - %s ", 1216}, - {"Forget", 1217}, - {"Rmdir", 1218}, + %s ", 1274}, + {"Forget", 1275}, + {"Rmdir", 1276}, {"\ Can't write to the %s file:\n\ -%s\n", 1219}, - {" Invalid shell pattern definition \"%c\". ", 1220}, - {" Debug ", 1221}, - {" ERROR: ", 1222}, - {" True: ", 1223}, - {" False: ", 1224}, - {" Warning -- ignoring file ", 1225}, +%s\n", 1277}, + {" Invalid shell pattern definition \"%c\". ", 1278}, + {" Debug ", 1279}, + {" ERROR: ", 1280}, + {" True: ", 1281}, + {" False: ", 1282}, + {" Warning -- ignoring file ", 1283}, {"\ File %s is not owned by root or you or is world writable.\n\ -Using it may compromise your security", 1226}, - {" I can't run programs while logged on a non local directory ", 1227}, - {" Empty file %s ", 1228}, - {" User menu ", 1229}, - {"name_trunc: too big", 1230}, - {"%b %e %H:%M", 1231}, - {"%b %e %Y", 1232}, - {" Pipe failed ", 1233}, - {" Dup failed ", 1234}, +Using it may compromise your security", 1284}, + {" I can't run programs while logged on a non local directory ", 1285}, + {" Empty file %s ", 1286}, + {" User menu ", 1287}, + {"name_trunc: too big", 1288}, + {"%b %e %H:%M", 1289}, + {"%b %e %Y", 1290}, + {" Pipe failed ", 1291}, + {" Dup failed ", 1292}, {"\ File: \n\ \n\ - ", 1235}, + ", 1293}, {"\ \n\ \n\ -has been modified, do you want to save the changes?\n", 1236}, - {" Save changes ", 1237}, - {" Can't spawn child program ", 1238}, - {" Empty output from child filter ", 1239}, - {" Could not open file ", 1240}, - {" Can't open file \"", 1241}, +has been modified, do you want to save the changes?\n", 1294}, + {" Save changes ", 1295}, + {" Can't spawn child program ", 1296}, + {" Empty output from child filter ", 1297}, + {" Could not open file ", 1298}, + {" Can't open file \"", 1299}, {"\ Can't stat file \n\ - ", 1242}, - {" Can't view: not a regular file ", 1243}, + ", 1300}, + {" Can't view: not a regular file ", 1301}, {"\ Can't open \"%s\"\n\ - %s ", 1244}, + %s ", 1302}, {"\ Can't stat \"%s\"\n\ - %s ", 1245}, - {"File: %s", 1246}, - {"Offset 0x%08x", 1247}, - {" [grow]", 1248}, - {"Searching for `%s'", 1249}, - {" Search string not found ", 1250}, - {" Invalid regular expression ", 1251}, + %s ", 1303}, + {"File: %s", 1304}, + {"Offset 0x%08x", 1305}, + {" [grow]", 1306}, + {"Searching for `%s'", 1307}, + {" Search string not found ", 1308}, + {" Invalid regular expression ", 1309}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1252}, + Enter the new line number:", 1310}, {"\ The current address is 0x%lx.\n\ - Enter the new address:", 1253}, - {" Goto Address ", 1254}, - {" Enter regexp:", 1255}, - {"Ascii", 1256}, - {"Hex", 1257}, - {"Goto", 1258}, - {"Line", 1259}, - {"RxSrch", 1260}, - {"EdText", 1261}, - {"EdHex", 1262}, - {"UnWrap", 1263}, - {"Wrap", 1264}, - {"HxSrch", 1265}, - {"Raw", 1266}, - {"Parse", 1267}, - {"Unform", 1268}, - {"Format", 1269}, - {" History ", 1270}, - {"Function key 1", 1271}, - {"Function key 2", 1272}, - {"Function key 3", 1273}, - {"Function key 4", 1274}, - {"Function key 5", 1275}, - {"Function key 6", 1276}, - {"Function key 7", 1277}, - {"Function key 8", 1278}, - {"Function key 9", 1279}, - {"Function key 10", 1280}, - {"Function key 11", 1281}, - {"Function key 12", 1282}, - {"Function key 13", 1283}, - {"Function key 14", 1284}, - {"Function key 15", 1285}, - {"Function key 16", 1286}, - {"Function key 17", 1287}, - {"Function key 18", 1288}, - {"Function key 19", 1289}, - {"Function key 20", 1290}, - {"Backspace key", 1291}, - {"End key", 1292}, - {"Up arrow key", 1293}, - {"Down arrow key", 1294}, - {"Left arrow key", 1295}, - {"Right arrow key", 1296}, - {"Home key", 1297}, - {"Page Down key", 1298}, - {"Page Up key", 1299}, - {"Insert key", 1300}, - {"Delete key", 1301}, - {"Completion/M-tab", 1302}, - {"+ on keypad", 1303}, - {"- on keypad", 1304}, - {"* on keypad", 1305}, - {"Left arrow keypad", 1306}, - {"Right arrow keypad", 1307}, - {"Up arrow keypad", 1308}, - {"Down arrow keypad", 1309}, - {"Home on keypad", 1310}, - {"End on keypad", 1311}, - {"Page Down keypad", 1312}, - {"Page Up keypad", 1313}, - {"Insert on keypad", 1314}, - {"Delete on keypad", 1315}, - {"Enter on keypad", 1316}, - {"Slash on keypad", 1317}, - {"NumLock on keypad", 1318}, + Enter the new address:", 1311}, + {" Goto Address ", 1312}, + {" Enter regexp:", 1313}, + {"Ascii", 1314}, + {"Hex", 1315}, + {"Goto", 1316}, + {"Line", 1317}, + {"RxSrch", 1318}, + {"EdText", 1319}, + {"EdHex", 1320}, + {"UnWrap", 1321}, + {"Wrap", 1322}, + {"HxSrch", 1323}, + {"Raw", 1324}, + {"Parse", 1325}, + {"Unform", 1326}, + {"Format", 1327}, + {" History ", 1328}, + {"Function key 1", 1329}, + {"Function key 2", 1330}, + {"Function key 3", 1331}, + {"Function key 4", 1332}, + {"Function key 5", 1333}, + {"Function key 6", 1334}, + {"Function key 7", 1335}, + {"Function key 8", 1336}, + {"Function key 9", 1337}, + {"Function key 10", 1338}, + {"Function key 11", 1339}, + {"Function key 12", 1340}, + {"Function key 13", 1341}, + {"Function key 14", 1342}, + {"Function key 15", 1343}, + {"Function key 16", 1344}, + {"Function key 17", 1345}, + {"Function key 18", 1346}, + {"Function key 19", 1347}, + {"Function key 20", 1348}, + {"Backspace key", 1349}, + {"End key", 1350}, + {"Up arrow key", 1351}, + {"Down arrow key", 1352}, + {"Left arrow key", 1353}, + {"Right arrow key", 1354}, + {"Home key", 1355}, + {"Page Down key", 1356}, + {"Page Up key", 1357}, + {"Insert key", 1358}, + {"Delete key", 1359}, + {"Completion/M-tab", 1360}, + {"+ on keypad", 1361}, + {"- on keypad", 1362}, + {"* on keypad", 1363}, + {"Left arrow keypad", 1364}, + {"Right arrow keypad", 1365}, + {"Up arrow keypad", 1366}, + {"Down arrow keypad", 1367}, + {"Home on keypad", 1368}, + {"End on keypad", 1369}, + {"Page Down keypad", 1370}, + {"Page Up keypad", 1371}, + {"Insert on keypad", 1372}, + {"Delete on keypad", 1373}, + {"Enter on keypad", 1374}, + {"Slash on keypad", 1375}, + {"NumLock on keypad", 1376}, + {"\ +Couldn't open cpio archive\n\ +%s", 1377}, + {"\ +Premature end of cpio archive\n\ +%s", 1378}, + {"\ +Corrupt cpio header encountered in\n\ +%s", 1379}, + {"\ +Inconsistent hardlinks of\n\ +%s\n\ +in cpio archive\n\ +%s", 1380}, + {"%s contains duplicit entries! Skiping!", 1381}, + {"\ +Unexpected end of file\n\ +%s", 1382}, + {"Dir cache expired for %s", 1383}, + {" Direntry warning ", 1384}, + {"Super ino_usage is %d, memory leak", 1385}, + {"Super has want_stale set", 1386}, + {"Starting linear transfer...", 1387}, + {"Getting file", 1388}, {"\ Couldn't open %s archive\n\ -%s", 1319}, - {"Inconsistent extfs archive", 1320}, - {"fish: Disconnecting from %s", 1321}, - {"fish: Waiting for initial line...", 1322}, - {"Sorry, we can not do password authenticated connections for now.", 1323}, - {"fish: Sending password...", 1324}, - {"fish: Sending initial line...", 1325}, - {"fish: Handshaking version...", 1326}, - {"fish: Setting up current directory...", 1327}, - {"fish: Connected, home %s.", 1328}, - {"fish: Reading directory %s...", 1329}, - {"fish: failed", 1330}, - {"fish: store %s: sending command...", 1331}, - {"fish: Local read failed, sending zeros", 1332}, - {"fish: storing %s %d (%d)", 1333}, - {"Aborting transfer...", 1334}, - {"Error reported after abort.", 1335}, - {"Aborted transfer would be successful.", 1336}, - {"ftpfs: Disconnecting from %s", 1337}, - {" FTP: Password required for ", 1338}, - {" Proxy: Password required for ", 1339}, - {"ftpfs: sending proxy login name", 1340}, - {"ftpfs: sending proxy user password", 1341}, - {"ftpfs: proxy authentication succeeded", 1342}, - {"ftpfs: connected to %s", 1343}, - {"ftpfs: sending login name", 1344}, - {"ftpfs: sending user password", 1345}, - {"ftpfs: logged in", 1346}, - {"ftpfs: Login incorrect for user %s ", 1347}, - {" Could not set source routing (%s)", 1348}, - {"ftpfs: Invalid host name.", 1349}, - {"ftpfs: Invalid host address.", 1350}, - {"ftpfs: making connection to %s", 1351}, - {"ftpfs: connection interrupted by user", 1352}, - {"ftpfs: connection to server failed: %s", 1353}, - {"Waiting to retry... %d (Control-C to cancel)", 1354}, - {"ftpfs: could not setup passive mode for source routing", 1355}, - {"ftpfs: could not setup passive mode", 1356}, - {"ftpfs: aborting transfer.", 1357}, - {"ftpfs: abort error: %s", 1358}, - {"ftpfs: abort failed", 1359}, - {"ftpfs: CWD failed.", 1360}, - {"ftpfs: couldn't resolve symlink", 1361}, - {"Resolving symlink...", 1362}, - {"ftpfs: Reading FTP directory %s... (don't use UNIX ls options)", 1363}, - {"ftpfs: Reading FTP directory %s...", 1364}, - {"ftpfs: FAIL", 1365}, - {"ftpfs: reading FTP directory interrupt by user", 1366}, - {"ftpfs: got listing", 1367}, - {"ftpfs: failed", 1368}, - {"ftpfs: failed; nowhere to fallback to", 1369}, - {"ftpfs: storing file %d (%d)", 1370}, +%s", 1389}, + {"Inconsistent extfs archive", 1390}, + {"fish: Disconnecting from %s", 1391}, + {"fish: Waiting for initial line...", 1392}, + {"Sorry, we can not do password authenticated connections for now.", 1393}, + {" fish: Password required for ", 1394}, + {"fish: Sending password...", 1395}, + {"fish: Sending initial line...", 1396}, + {"fish: Handshaking version...", 1397}, + {"fish: Setting up current directory...", 1398}, + {"fish: Connected, home %s.", 1399}, + {"fish: Reading directory %s...", 1400}, + {"fish: failed", 1401}, + {"fish: store %s: sending command...", 1402}, + {"fish: Local read failed, sending zeros", 1403}, + {"fish: storing %s %d (%d)", 1404}, + {"zeros", 1405}, + {"Aborting transfer...", 1406}, + {"Error reported after abort.", 1407}, + {"Aborted transfer would be successful.", 1408}, + {"ftpfs: Disconnecting from %s", 1409}, + {" FTP: Password required for ", 1410}, + {" Proxy: Password required for ", 1411}, + {"ftpfs: sending proxy login name", 1412}, + {"ftpfs: sending proxy user password", 1413}, + {"ftpfs: proxy authentication succeeded", 1414}, + {"ftpfs: connected to %s", 1415}, + {"ftpfs: sending login name", 1416}, + {"ftpfs: sending user password", 1417}, + {"ftpfs: logged in", 1418}, + {"ftpfs: Login incorrect for user %s ", 1419}, + {" Could not set source routing (%s)", 1420}, + {"ftpfs: Invalid host name.", 1421}, + {"ftpfs: Invalid host address.", 1422}, + {"ftpfs: making connection to %s", 1423}, + {"ftpfs: connection interrupted by user", 1424}, + {"ftpfs: connection to server failed: %s", 1425}, + {"Waiting to retry... %d (Control-C to cancel)", 1426}, + {"ftpfs: could not setup passive mode", 1427}, + {"ftpfs: aborting transfer.", 1428}, + {"ftpfs: abort error: %s", 1429}, + {"ftpfs: abort failed", 1430}, + {"ftpfs: CWD failed.", 1431}, + {"ftpfs: couldn't resolve symlink", 1432}, + {"Resolving symlink...", 1433}, + {"ftpfs: Reading FTP directory %s... %s%s", 1434}, + {"(strict rfc959)", 1435}, + {"(chdir first)", 1436}, + {"ftpfs: failed", 1437}, + {"ftpfs: failed; nowhere to fallback to", 1438}, + {"ftpfs: storing file %d (%d)", 1439}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1371}, - {" MCFS ", 1372}, - {" The server does not support this version ", 1373}, +Remove password or correct mode.", 1440}, + {" MCFS ", 1441}, + {" The server does not support this version ", 1442}, {"\ 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", 1374}, - {" Yes ", 1375}, - {" No ", 1376}, - {" The remote server is running on strange port. Giving up.\n", 1377}, - {" MCFS Password required ", 1378}, - {" Invalid password ", 1379}, - {" Too many open connections ", 1380}, - {"Domain:", 1381}, - {"Username:", 1382}, - {"Password: ", 1383}, - {"Password for \\\\%s\\%s", 1384}, + not be safe on the remote side. Continue? \n", 1443}, + {" Yes ", 1444}, + {" No ", 1445}, + {" The remote server is running on strange port. Giving up.\n", 1446}, + {" MCFS Password required ", 1447}, + {" Invalid password ", 1448}, + {" Can't locate hostname: %s ", 1449}, + {" Can't create socket: %s ", 1450}, + {" Can't connect to server: %s ", 1451}, + {" Too many open connections ", 1452}, + {"Midnight Commander's private remote filesystem", 1453}, + {"Domain:", 1454}, + {"Username:", 1455}, + {"Password: ", 1456}, + {"Password for \\\\%s\\%s", 1457}, {"\ reconnect to %s failed\n\ - ", 1385}, - {" %s mkdir'ing %s ", 1386}, - {" %s rmdir'ing %s ", 1387}, - {" %s opening remote file %s ", 1388}, - {" %s renaming files\n", 1389}, + ", 1458}, + {" Authentication failed ", 1459}, + {" %s mkdir'ing %s ", 1460}, + {" %s rmdir'ing %s ", 1461}, + {" %s opening remote file %s ", 1462}, + {" %s renaming files\n", 1463}, {"\ Couldn't open tar archive\n\ -%s", 1390}, - {"Unexpected EOF on archive file", 1391}, - {"Inconsistent tar archive", 1392}, +%s", 1464}, + {"Unexpected EOF on archive file", 1465}, + {"Inconsistent tar archive", 1466}, {"\ Hmm,...\n\ %s\n\ -doesn't look like a tar archive.", 1393}, - {"%s: %s: %s %3d%% (%ld bytes transfered)", 1394}, - {"%s: %s: %s %ld bytes transfered", 1395}, +doesn't look like a tar archive.", 1467}, + {"Changes to file lost", 1468}, + {"Could not parse:", 1469}, + {"More parsing errors will be ignored.", 1470}, + {"(sorry)", 1471}, + {"Internal error:", 1472}, + {"%s: %s: %s %3d%% (%ld bytes transfered)", 1473}, + {"%s: %s: %s %ld bytes transfered", 1474}, + {" undelfs: error ", 1475}, + {" not enough memory ", 1476}, + {" while allocating block buffer ", 1477}, + {" open_inode_scan: %d ", 1478}, + {" while starting inode scan %d ", 1479}, + {"undelfs: loading deleted files information %d inodes", 1480}, + {" while calling ext2_block_iterate %d ", 1481}, + {" no more memory while reallocating array ", 1482}, + {" while doing inode scan %d ", 1483}, + {" Ext2lib error ", 1484}, + {" Could not open file %s ", 1485}, + {"undelfs: reading inode bitmap...", 1486}, + {"\ + Could not load inode bitmap from: \n\ + %s \n", 1487}, + {"undelfs: reading block bitmap...", 1488}, + {"\ + Could not load block bitmap from: \n\ + %s \n", 1489}, + {"undelfs: done.", 1490}, + {"undelfs: failure", 1491}, + {" vfs_info is not fs! ", 1492}, + {" You have to chdir to extract files first ", 1493}, + {" while iterating over blocks ", 1494}, + {" Could not open file: %s ", 1495}, + {"Undelete filesystem for ext2", 1496}, }; -int _msg_tbl_length = 1395; +int _msg_tbl_length = 1496; Binary files old/mc-4.5.42/po/da.gmo and new/mc-4.5.43/po/da.gmo differ diff -ruN old/mc-4.5.42/po/da.po new/mc-4.5.43/po/da.po --- old/mc-4.5.42/po/da.po Mon Dec 6 18:50:15 1999 +++ new/mc-4.5.43/po/da.po Sat Mar 18 08:43:50 2000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: mc 4.5.41\n" "POT-Creation-Date: 1999-12-01 16:58+0100\n" -"PO-Revision-Date: 1999-12-06 03:11+01:00\n" +"PO-Revision-Date: 1999-12-16 21:37+01:00\n" "Last-Translator: Birger Langkjer \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" @@ -977,8 +977,8 @@ msgstr "" "Du kører GNOME filhåndteringen som administrator (root).\n" "\n" -"Som root kan du gøre skade på dit system, hvis ud ikke passer på. GNOME " -"filhåndteringen vil ikke forhindre dig i det." +"Som root kan du gøre skade på dit system, hvis ud ikke passer på.\n" +"GNOME filhåndteringen vil ikke forhindre dig i det." #: gnome/gmount.c:225 msgid "Could not open the /etc/fstab file" Binary files old/mc-4.5.42/po/es.gmo and new/mc-4.5.43/po/es.gmo differ diff -ruN old/mc-4.5.42/po/es.po new/mc-4.5.43/po/es.po --- old/mc-4.5.42/po/es.po Mon Dec 6 18:50:15 1999 +++ new/mc-4.5.43/po/es.po Sat Mar 18 08:43:50 2000 @@ -3,9 +3,9 @@ # David Martín , 1998-1999. msgid "" msgstr "" -"Project-Id-Version: 4.5.42\n" -"POT-Creation-Date: 1999-11-14 01:54+0100\n" -"PO-Revision-Date: 1999-11-14 02:00+0100\n" +"Project-Id-Version: 4.5.43\n" +"POT-Creation-Date: 1999-12-19 11:07+0100\n" +"PO-Revision-Date: 1999-12-19 12:00+0100\n" "Last-Translator: David Martín \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -70,7 +70,7 @@ msgstr "" "\".\n" "\n" -"Para corregir el error, abra las propiedades de este fichero y cambie la " +"Para corregir el error, abra las propiedades de este archivo y cambie la " "acción predeterminada para %s." #: gnome/gaction.c:51 @@ -354,19 +354,19 @@ msgid "Could not open %s; will not have desktop icons" msgstr "No pude abrir %s; no habrá iconos en el escritorio" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1186 msgid "While running the mount/umount command" msgstr "Al ejecutar mount/umount" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1255 msgid "While running the eject command" msgstr "Al ejecutar eject" -#: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" msgstr "Error" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2598 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -380,84 +380,84 @@ "\n" "No se puede configurar el fondo." -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2616 gnome/glayout.c:363 +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Abrir un nuevo terminal en el directorio actual" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2618 gnome/glayout.c:365 +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Directorio..." -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Crear un directorio nuevo" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "URL L_ink..." msgstr "Enlace _URL..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "Creates a new URL link" msgstr "Crear un nuevo enlace tipo URL" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "_Launcher..." msgstr "_Lanzador..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "Creates a new launcher" msgstr "Crear un lanzador nuevo" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2631 msgid "By _Name" msgstr "Por _nombre " -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2632 msgid "By File _Type" msgstr "Por _tipo de archivo" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2633 msgid "By _Size" msgstr "Por tamañ_o " -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2634 msgid "By Time Last _Accessed" msgstr "Por fecha de _acceso" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2635 msgid "By Time Last _Modified" msgstr "Por fecha de _modificación" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2636 msgid "By Time Last _Changed" msgstr "Por fecha de _cambio" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Ordenar iconos..." -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2645 msgid "Create _New Window" msgstr "Abrir una _ventana nueva" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Actualizar _escritorio" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Actualizar _dispositivos" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Reconstruir _iconos por defecto" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2651 msgid "Configure _Background Image" msgstr "Configurar imagen de _fondo" @@ -653,7 +653,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1840 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1836 msgid "Password:" msgstr "Contraseña:" @@ -1683,7 +1683,7 @@ #: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 #: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 #: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid " Error " msgstr " Error " @@ -1756,9 +1756,9 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:706 src/screen.c:1451 src/screen.c:2129 +#: src/help.c:318 src/main.c:707 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " ¡ Atención ! " @@ -2114,13 +2114,13 @@ msgstr "Cancelar salida" #: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 msgid "&Yes" msgstr "&Sí" #: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 msgid "&No" msgstr "&No" @@ -2426,7 +2426,7 @@ msgid "&Save mode..." msgstr "&Modo de guardar..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1353 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 msgid "&Layout..." msgstr "&Presentación..." @@ -2479,7 +2479,7 @@ #. Tool hint #: gtkedit/editmenu.c:407 msgid "Disk operations and file indexing/searching" -msgstr "Operaciones de disco e indexación/búsqueda de ficheros" +msgstr "Operaciones de disco e indexación/búsqueda de archivos" #: gtkedit/editmenu.c:413 msgid "Toggle mark\tF3" @@ -2687,7 +2687,7 @@ msgstr "Error al inicializar el editor.\n" #: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1719 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 #: src/view.c:2068 msgid "Help" msgstr "Ayuda" @@ -2700,13 +2700,13 @@ msgid "Replac" msgstr "Reempl" -#: gtkedit/editwidget.c:1102 src/main.c:1721 +#: gtkedit/editwidget.c:1102 src/main.c:1722 msgid "PullDn" msgstr "Menú" #. gtk_edit_menu #: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1722 src/view.c:2070 src/view.c:2092 +#: src/main.c:1723 src/view.c:2070 src/view.c:2092 msgid "Quit" msgstr "Salir" @@ -2735,7 +2735,7 @@ #: gtkedit/gtkedit.c:1247 msgid "Save to current file name" -msgstr "Guardar con el mismo nombre de fichero" +msgstr "Guardar con el mismo nombre de archivo" #: gtkedit/gtkedit.c:1248 msgid "Toggle In/Off invisible marker to highlight text" @@ -2773,7 +2773,7 @@ msgid "Delete highlighted text" msgstr "Borrar el texto seleccionado" -#: gtkedit/gtkedit.c:1255 src/main.c:1720 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Menú" @@ -2863,8 +2863,8 @@ " Your old rule file has been saved with a .OLD extension. " msgstr "" " Su archivo con las reglas de sintaxis está obsoleto. \n" -" Un nuevo fichero de reglas va a ser instalado. \n" -" Su antiguo fichero se conservará con extensión .OLD " +" Un nuevo archivo de reglas va a ser instalado. \n" +" Su antiguo archivo se conservará con extensión .OLD " #: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 msgid " Load syntax file " @@ -4319,7 +4319,7 @@ msgid "Content: " msgstr "Contenido: " -#: src/find.c:171 src/main.c:1243 src/main.c:1267 +#: src/find.c:171 src/main.c:1244 src/main.c:1268 msgid "&Tree" msgstr "ár&Bol" @@ -4889,7 +4889,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "en esa tecla o presione el mouse. Puede moverse con el tabulador." -#: src/main.c:707 +#: src/main.c:708 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4901,263 +4901,263 @@ " ¿Acaso borró usted el directorio o se dio otros \n" " permisos con el comando \"su\"?" -#: src/main.c:782 +#: src/main.c:783 msgid "Press any key to continue..." msgstr "Presione cualquier tecla para continuar..." -#: src/main.c:832 +#: src/main.c:833 msgid " The shell is already running a command " msgstr " El shell ya está ejecutando un comando " -#: src/main.c:859 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: src/main.c:860 +#: src/main.c:861 msgid " Do you really want to quit the Midnight Commander? " msgstr " ¿Desea realmente salir del Midnight Commander? " -#: src/main.c:1240 src/main.c:1264 +#: src/main.c:1241 src/main.c:1265 msgid "&Listing mode..." msgstr "&Modo de listado..." -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1242 src/main.c:1266 msgid "&Quick view C-x q" msgstr "&Vista rápida C-x q" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1243 src/main.c:1267 msgid "&Info C-x i" msgstr "&Información C-x i" -#: src/main.c:1245 src/main.c:1269 +#: src/main.c:1246 src/main.c:1270 msgid "&Sort order..." msgstr "&Ordenar..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1248 src/main.c:1272 msgid "&Filter..." msgstr "&Filtro..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1251 src/main.c:1275 msgid "&Network link..." msgstr "&Conexión por red..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1252 src/main.c:1276 msgid "FT&P link..." msgstr "conexión por FT&P..." -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1254 src/main.c:1278 msgid "SM&B link..." msgstr "conexión por &SMB..." -#: src/main.c:1258 src/main.c:1282 +#: src/main.c:1259 src/main.c:1283 msgid "&Drive... M-d" msgstr "&Disco... M-d" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1261 src/main.c:1285 msgid "&Rescan C-r" msgstr "actualiza&R C-r" -#: src/main.c:1288 +#: src/main.c:1289 msgid "&User menu F2" msgstr "me&Nú de usuario F2" -#: src/main.c:1289 +#: src/main.c:1290 msgid "&View F3" msgstr "&Ver F3" -#: src/main.c:1290 +#: src/main.c:1291 msgid "Vie&w file... " msgstr "ver arc&Hivo..." -#: src/main.c:1291 +#: src/main.c:1292 msgid "&Filtered view M-!" msgstr "ver archivo (con &Filtro)... M-!" -#: src/main.c:1292 +#: src/main.c:1293 msgid "&Edit F4" msgstr "&Editar F4" -#: src/main.c:1293 +#: src/main.c:1294 msgid "&Copy F5" msgstr "&Copiar... F5" -#: src/main.c:1294 +#: src/main.c:1295 msgid "c&Hmod C-x c" msgstr "cambiar &Permisos... C-x c" -#: src/main.c:1296 +#: src/main.c:1297 msgid "&Link C-x l" msgstr "crear en&Lace... C-x l" -#: src/main.c:1297 +#: src/main.c:1298 msgid "&SymLink C-x s" msgstr "crear enlace &Simbólico... C-x s" -#: src/main.c:1298 +#: src/main.c:1299 msgid "edit s&Ymlink C-x C-s" msgstr "edi&Tar enlace simbólico C-x C-s" -#: src/main.c:1299 +#: src/main.c:1300 msgid "ch&Own C-x o" msgstr "cambiar dueñ&O... C-x o" -#: src/main.c:1300 +#: src/main.c:1301 msgid "&Advanced chown " msgstr "c&Ambiar dueño y permisos..." -#: src/main.c:1302 +#: src/main.c:1303 msgid "&Rename/Move F6" msgstr "&Renombrar/mover... F6" -#: src/main.c:1303 +#: src/main.c:1304 msgid "&Mkdir F7" msgstr "crear &Directorio... F7" -#: src/main.c:1304 +#: src/main.c:1305 msgid "&Delete F8" msgstr "&Borrar F8" -#: src/main.c:1305 +#: src/main.c:1306 msgid "&Quick cd M-c" msgstr "ca&Mbiar directorio... M-c" -#: src/main.c:1307 +#: src/main.c:1308 msgid "select &Group M-+" msgstr "seleccionar &Grupo... M-+" -#: src/main.c:1308 +#: src/main.c:1309 msgid "u&Nselect group M-\\" msgstr "de-seleccionar gr&Upo... M-\\" -#: src/main.c:1309 +#: src/main.c:1310 msgid "reverse selec&Tion M-*" msgstr "&Invertir la selección M-*" -#: src/main.c:1311 +#: src/main.c:1312 msgid "e&Xit F10" msgstr "sali&R F10" -#: src/main.c:1321 +#: src/main.c:1322 msgid "&Directory tree" msgstr "árbol de &Directorios" -#: src/main.c:1323 +#: src/main.c:1324 msgid "&Find file M-?" msgstr "&Buscar archivos... M-?" -#: src/main.c:1324 +#: src/main.c:1325 msgid "s&Wap panels C-u" msgstr "&Intercambiar paneles C-u" -#: src/main.c:1325 +#: src/main.c:1326 msgid "switch &Panels on/off C-o" msgstr "&Activar/desactivar paneles C-o" -#: src/main.c:1326 +#: src/main.c:1327 msgid "&Compare directories C-x d" msgstr "&Comparar directorios... C-x d" -#: src/main.c:1327 +#: src/main.c:1328 msgid "e&Xternal panelize C-x !" msgstr "búsquedas e&Xternas... C-x !" -#: src/main.c:1328 +#: src/main.c:1329 msgid "show directory s&Izes" msgstr "mostrar &Tamaños de los directorios" -#: src/main.c:1330 +#: src/main.c:1331 msgid "command &History" msgstr "&Historia de comandos" -#: src/main.c:1331 +#: src/main.c:1332 msgid "di&Rectory hotlist C-\\" msgstr "directorios &Favoritos... C-\\" -#: src/main.c:1333 +#: src/main.c:1334 msgid "&Active VFS list C-x a" msgstr "directorios virtuales (&VFS)... C-x a" -#: src/main.c:1334 +#: src/main.c:1335 msgid "Fr&ee VFSs now" msgstr "&Liberar VFS ahora" -#: src/main.c:1337 +#: src/main.c:1338 msgid "&Background jobs C-x j" msgstr "&Procesos en 2º plano... C-x j" -#: src/main.c:1341 +#: src/main.c:1342 msgid "&Undelete files (ext2fs only)" msgstr "&Recuperar archivos (ext2fs)..." -#: src/main.c:1344 +#: src/main.c:1345 msgid "&Listing format edit" msgstr "edición del formato de &Listado" -#: src/main.c:1346 +#: src/main.c:1347 msgid "&Extension file edit" msgstr "&Editar el archivo de extensiones..." -#: src/main.c:1347 +#: src/main.c:1348 msgid "&Menu file edit" msgstr "editar archivo de &Menú..." -#: src/main.c:1352 +#: src/main.c:1353 msgid "&Configuration..." msgstr "&Configuración..." -#: src/main.c:1354 +#: src/main.c:1355 msgid "c&Onfirmation..." msgstr "c&Onfirmación..." -#: src/main.c:1355 +#: src/main.c:1356 msgid "&Display bits..." msgstr "&Juego de caracteres..." -#: src/main.c:1357 +#: src/main.c:1358 msgid "learn &Keys..." msgstr "redefinir &Teclas..." -#: src/main.c:1360 +#: src/main.c:1361 msgid "&Virtual FS..." msgstr "sistema de archivos &Virtual (VFS)..." -#: src/main.c:1363 +#: src/main.c:1364 msgid "&Save setup" msgstr "&Guardar configuración" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1380 src/main.c:1382 msgid " &Left " msgstr " &Izquierdo " -#: src/main.c:1381 +#: src/main.c:1382 msgid " &Above " msgstr " a&Rriba " -#: src/main.c:1384 +#: src/main.c:1385 msgid " &File " msgstr " &Archivo " -#: src/main.c:1385 +#: src/main.c:1386 msgid " &Command " msgstr " &Comando " -#: src/main.c:1386 +#: src/main.c:1387 msgid " &Options " msgstr " &Opciones " -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1389 src/main.c:1391 msgid " &Right " msgstr " &Derecho " -#: src/main.c:1390 +#: src/main.c:1391 msgid " &Below " msgstr " a&Bajo " -#: src/main.c:1445 +#: src/main.c:1446 msgid " Information " msgstr " Información " -#: src/main.c:1446 +#: src/main.c:1447 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5169,132 +5169,132 @@ " caso use C-r para obligar al programa a actualizar los datos.\n" " Lea la página de manual para mayor información. " -#: src/main.c:1925 +#: src/main.c:1926 msgid "Thank you for using GNU Midnight Commander" msgstr "Gracias por usar el GNU Midnight Commander" -#: src/main.c:2284 +#: src/main.c:2283 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "con soporte para ratón en xterm%s.\n" -#: src/main.c:2285 +#: src/main.c:2284 msgid " and the Linux console" msgstr " y la consola Linux" -#: src/main.c:2381 +#: src/main.c:2380 msgid "The TERM environment variable is unset!\n" msgstr "¡La variable de entorno TERM está sin definir!\n" -#: src/main.c:2592 +#: src/main.c:2591 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Directorio para archivos del Midnight Commander: %s\n" -#: src/main.c:2606 +#: src/main.c:2605 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "La opción -m está obsoleta. Vea \"Juego de caracteres...\" en el menú " "\"Opciones\"\n" -#: src/main.c:2683 +#: src/main.c:2682 msgid "Use to debug the background code" msgstr "Se usa para depurar código de 2º plano" -#: src/main.c:2689 +#: src/main.c:2688 msgid "Request to run in color mode" msgstr "Solicitar la ejecución en color" -#: src/main.c:2691 +#: src/main.c:2690 msgid "Specifies a color configuration" msgstr "Indicar una configuración de colores" -#: src/main.c:2696 +#: src/main.c:2695 msgid "Edits one file" msgstr "Editar un archivo" -#: src/main.c:2700 +#: src/main.c:2699 msgid "Displays this help message" msgstr "Mostrar este mensaje de ayuda" -#: src/main.c:2703 +#: src/main.c:2702 msgid "Displays a help screen on how to change the color scheme" msgstr "Mostrar ayuda sobre cómo cambiar colores" -#: src/main.c:2706 +#: src/main.c:2705 msgid "Log ftp dialog to specified file" msgstr "Registrar diálogos ftp en un archivo" -#: src/main.c:2713 +#: src/main.c:2712 msgid "Obsolete" msgstr "Obsoleto" -#: src/main.c:2715 +#: src/main.c:2714 msgid "Requests to run in black and white" msgstr "Solicitar ejecución en blanco y negro" -#: src/main.c:2717 +#: src/main.c:2716 msgid "Disable mouse support in text version" msgstr "Desactivar ratón en la versión texto" -#: src/main.c:2720 +#: src/main.c:2719 msgid "Disables subshell support" msgstr "Desactivar el uso de subshell" -#: src/main.c:2724 +#: src/main.c:2723 msgid "Prints working directory at program exit" msgstr "Mostrar el nombre del directorio al salir" -#: src/main.c:2726 +#: src/main.c:2725 msgid "Resets soft keys on HP terminals" msgstr "Restablecer teclas en terminales HP" -#: src/main.c:2728 +#: src/main.c:2727 msgid "To run on slow terminals" msgstr "Para ejecutar en terminales lentos" -#: src/main.c:2731 +#: src/main.c:2730 msgid "Use stickchars to draw" msgstr "Usar caracteres simples para recuadros" -#: src/main.c:2735 +#: src/main.c:2734 msgid "Enables subshell support (default)" msgstr "Activar uso de subshell (por defecto)" -#: src/main.c:2740 +#: src/main.c:2739 msgid "Tries to use termcap instead of terminfo" msgstr "Intentar utilizar termcap en vez de terminfo" -#: src/main.c:2744 +#: src/main.c:2743 msgid "Displays the current version" msgstr "Mostrar el número de versión" -#: src/main.c:2746 +#: src/main.c:2745 msgid "Launches the file viewer on a file" msgstr "Abrir un archivo con el visor" -#: src/main.c:2748 +#: src/main.c:2747 msgid "Forces xterm features" msgstr "Utilizar las posibilidades de xterm" -#: src/main.c:2750 +#: src/main.c:2749 msgid "Geometry for the window" msgstr "Geometría de la ventana" -#: src/main.c:2750 +#: src/main.c:2749 msgid "GEOMETRY" msgstr "GEOMETRIA" -#: src/main.c:2751 +#: src/main.c:2750 msgid "No windows opened at startup" msgstr "No abrir ninguna ventana al inicio" -#: src/main.c:2753 +#: src/main.c:2752 msgid "Display the directory that holds the .links startup files and exit" msgstr "Mostrar el directorio con archivos de inicio" -#: src/main.c:3051 +#: src/main.c:3062 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5302,11 +5302,11 @@ "No se pudo abrir la línea del terminal. Debe ejecutar \"mc\" sin\n" "la opción -P. En algunos sistemas, basta con ejecutar `which mc`\n" -#: src/main.c:3129 +#: src/main.c:3140 msgid " Notice " msgstr " Aviso " -#: src/main.c:3130 +#: src/main.c:3141 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -6092,237 +6092,254 @@ msgid "NumLock on keypad" msgstr "Bloquea números, pad" +#: vfs/direntry.c:318 +#, c-format +msgid "Dir cache expired for %s" +msgstr "El cache para %s ha expirado" + +#: vfs/direntry.c:448 vfs/direntry.c:451 +msgid " Direntry warning " +msgstr " Aviso en una entrada de directorio " + +#: vfs/direntry.c:448 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage vale %d, fuga de memoria" + +#: vfs/direntry.c:451 +msgid "Super has want_stale set" +msgstr "Super tiene want_stale activo" + +#: vfs/direntry.c:822 +msgid "Starting linear transfer..." +msgstr "Iniciando transferencia en línea..." + +#: vfs/direntry.c:967 +msgid "Getting file" +msgstr "Trayendo archivo" + #: vfs/extfs.c:268 #, c-format msgid "" "Couldn't open %s archive\n" "%s" msgstr "" -"No pude abrir el archivo %s\n" +"No se pudo abrir el archivo %s\n" "%s" #: vfs/extfs.c:300 vfs/extfs.c:320 msgid "Inconsistent extfs archive" msgstr "Archivo extfs inconsistente" -#: vfs/fish.c:136 +#: vfs/fish.c:138 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Desconectando de %s" -#: vfs/fish.c:214 +#: vfs/fish.c:216 msgid "fish: Waiting for initial line..." msgstr "fish: Esperando línea de inicio..." -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Lo siento, las conexiones con contraseña aún no son posibles." -#: vfs/fish.c:238 +#: vfs/fish.c:231 +msgid " fish: Password required for " +msgstr " fish: Contraseña requerida para " + +#: vfs/fish.c:240 msgid "fish: Sending password..." msgstr "fish: Enviando contraseña de usuario" -#: vfs/fish.c:244 +#: vfs/fish.c:246 msgid "fish: Sending initial line..." msgstr "fish: Enviando línea de inicio..." -#: vfs/fish.c:248 +#: vfs/fish.c:250 msgid "fish: Handshaking version..." msgstr "fish: Negociando versión..." -#: vfs/fish.c:252 +#: vfs/fish.c:254 msgid "fish: Setting up current directory..." msgstr "fish: Preparando directorio actual..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Conectado, inicio en %s" -#: vfs/fish.c:330 +#: vfs/fish.c:332 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Leyendo el directorio %s..." -#: vfs/fish.c:426 +#: vfs/fish.c:428 msgid "fish: failed" msgstr "fish: falló" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:448 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: guardar %s: enviando comando..." -#: vfs/fish.c:460 +#: vfs/fish.c:462 msgid "fish: Local read failed, sending zeros" msgstr "fish: Fallo de lectura local, enviando ceros" -#: vfs/fish.c:472 +#: vfs/fish.c:474 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: guardando %s %d (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:514 msgid "Aborting transfer..." msgstr "Abortando transferencia." -#: vfs/fish.c:521 +#: vfs/fish.c:523 msgid "Error reported after abort." msgstr "Error denunciado tras abortar." -#: vfs/fish.c:523 +#: vfs/fish.c:525 msgid "Aborted transfer would be successful." msgstr "Abortada transferencia con éxito." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:290 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Desconectando de %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:348 msgid " FTP: Password required for " msgstr " FTP: Contraseña requerida para " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:381 msgid " Proxy: Password required for " msgstr " Proxy: Contraseña requerida para " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:407 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: Enviando nombre de usuario al proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:411 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: Enviando contraseña de usuario al proxy" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:415 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: La identificación ante el proxy tuvo éxito" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:419 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: Conectado a %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:436 msgid "ftpfs: sending login name" msgstr "ftpfs: Enviando nombre de usuario" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:441 msgid "ftpfs: sending user password" msgstr "ftpfs: Enviando contraseña de usuario" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:446 msgid "ftpfs: logged in" msgstr "ftpfs: Autorizados" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:461 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: denegada autorización al usuario %s" -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:493 #, c-format msgid " Could not set source routing (%s)" msgstr " No se pudo prefijar la ruta (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:622 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Nombre de máquina incorrecto" -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:642 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Dirección de máquina incorrecta" -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:665 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: Estableciendo conexión con %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:675 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: Conexión abortada por el usuario" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:677 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: Conexión al servidor fracasó: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:719 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Esperando antes de insistir... %d (Ctrl-C para cancelar)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: No se pudo aplicar el enrutamiento en \"modo pasivo\"" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:892 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: No se pudo aplicar el \"modo pasivo\"" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:967 msgid "ftpfs: aborting transfer." msgstr "ftpfs: Abortando transferencia." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:969 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: Error al abortar: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:974 msgid "ftpfs: abort failed" msgstr "ftpfs: Aborto fracasado" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1063 vfs/ftpfs.c:1160 msgid "ftpfs: CWD failed." msgstr "ftpfs: Fallo al ejecutar CWD" -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1073 vfs/ftpfs.c:1080 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: No se pudo resolver el enlace simbólico" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1131 msgid "Resolving symlink..." msgstr "Resolviendo enlace simbólico..." -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1149 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: Leyendo vía FTP el directorio %s... (No use opciones de ls)" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: Leyendo vía FTP el directorio %s... %s%s" -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: Leyendo vía FTP el directorio %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: FALLO" - -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: Lectura de directorio FTP abortada por el usuario" +#: vfs/ftpfs.c:1150 +msgid "(strict rfc959)" +msgstr "(rfc959)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: Listado completo" +#: vfs/ftpfs.c:1151 +msgid "(chdir first)" +msgstr "(chdir)" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1247 msgid "ftpfs: failed" msgstr "ftpfs: Falló" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1257 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Falló; no hay dónde replegarse" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1320 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: Guardando archivo %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1790 vfs/ftpfs.c:1805 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6330,15 +6347,15 @@ "El archivo ~/.netrc contiene una contraseña.\n" "Quítela o restrinja los permisos de lectura." -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " El servidor no soporta esta versión " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -6348,30 +6365,50 @@ " contraseña para conectarse, pero la información puede \n" " quedar desprotegida al otro lado. ¿Desea continuar? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Sí " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " No " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " Desisto. El servidor remoto está en un puerto no habitual.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " Contraseña requerida para MCFS " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " La contraseña es incorrecta " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr " Máquina ilocalizable: %s " + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr " Imposible crear socket: %s " + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr " Imposible conectar con servidor: %s " + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " Demasiadas conexiones en curso " +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "Sistema de archivos remoto de Midnight Commander" + #: vfs/smbfs.c:115 msgid "Domain:" msgstr "Dominio:" @@ -6446,14 +6483,49 @@ "%s\n" "no parece un archivo de tipo tar." -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1157 +msgid "Changes to file lost" +msgstr "Los cambios del archivo se han perdido" + +#: vfs/vfs.c:1797 +msgid "Could not parse:" +msgstr "Imposible analizar:" + +#: vfs/vfs.c:1799 +msgid "More parsing errors will be ignored." +msgstr "El resto de errores de análisis serán ignorados." + +#: vfs/vfs.c:1799 +msgid "(sorry)" +msgstr "(disculpas)" + +#: vfs/vfs.c:1810 +msgid "Internal error:" +msgstr "Error interno:" + +#: vfs/vfs.c:1820 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld bytes transferidos)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1821 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes transfered" + +#~ msgid "ftpfs: could not setup passive mode for source routing" +#~ msgstr "ftpfs: No se pudo aplicar el enrutamiento en \"modo pasivo\"" + +#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +#~ msgstr "ftpfs: Leyendo vía FTP el directorio %s... (No use opciones de ls)" + +#~ msgid "ftpfs: FAIL" +#~ msgstr "ftpfs: FALLO" + +#~ msgid "ftpfs: reading FTP directory interrupt by user" +#~ msgstr "ftpfs: Lectura de directorio FTP abortada por el usuario" + +#~ msgid "ftpfs: got listing" +#~ msgstr "ftpfs: Listado completo" #~ msgid "fish: got listing" #~ msgstr "fish: listado completo" Binary files old/mc-4.5.42/po/es_ES.gmo and new/mc-4.5.43/po/es_ES.gmo differ diff -ruN old/mc-4.5.42/po/es_ES.po new/mc-4.5.43/po/es_ES.po --- old/mc-4.5.42/po/es_ES.po Mon Dec 6 18:50:15 1999 +++ new/mc-4.5.43/po/es_ES.po Sat Mar 18 08:43:50 2000 @@ -3,9 +3,9 @@ # David Martín , 1998-1999. msgid "" msgstr "" -"Project-Id-Version: 4.5.42\n" -"POT-Creation-Date: 1999-11-14 01:54+0100\n" -"PO-Revision-Date: 1999-11-14 02:00+0100\n" +"Project-Id-Version: 4.5.43\n" +"POT-Creation-Date: 1999-12-19 11:07+0100\n" +"PO-Revision-Date: 1999-12-19 12:00+0100\n" "Last-Translator: David Martín \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -354,19 +354,19 @@ msgid "Could not open %s; will not have desktop icons" msgstr "No pude abrir %s; no habrá iconos en el escritorio" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1186 msgid "While running the mount/umount command" msgstr "Al ejecutar mount/umount" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1255 msgid "While running the eject command" msgstr "Al ejecutar eject" -#: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" msgstr "Error" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2598 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -380,84 +380,84 @@ "\n" "No se puede configurar el fondo." -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2616 gnome/glayout.c:363 +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Abrir un nuevo terminal en el directorio actual" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2618 gnome/glayout.c:365 +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Directorio..." -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Crear un directorio nuevo" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "URL L_ink..." msgstr "Enlace _URL..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "Creates a new URL link" msgstr "Crear un nuevo enlace tipo URL" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "_Launcher..." msgstr "_Lanzador..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "Creates a new launcher" msgstr "Crear un lanzador nuevo" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2631 msgid "By _Name" msgstr "Por _nombre " -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2632 msgid "By File _Type" msgstr "Por _tipo de fichero" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2633 msgid "By _Size" msgstr "Por tamañ_o " -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2634 msgid "By Time Last _Accessed" msgstr "Por fecha de _acceso" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2635 msgid "By Time Last _Modified" msgstr "Por fecha de _modificación" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2636 msgid "By Time Last _Changed" msgstr "Por fecha de _cambio" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Ordenar iconos..." -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2645 msgid "Create _New Window" msgstr "Abrir una _ventana nueva" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Actualizar _escritorio" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Actualizar _dispositivos" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Reconstruir _iconos por defecto" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2651 msgid "Configure _Background Image" msgstr "Configurar imagen de _fondo" @@ -653,7 +653,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1840 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1836 msgid "Password:" msgstr "Contraseña:" @@ -1683,7 +1683,7 @@ #: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 #: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 #: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid " Error " msgstr " Error " @@ -1756,9 +1756,9 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:706 src/screen.c:1451 src/screen.c:2129 +#: src/help.c:318 src/main.c:707 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " ¡ Atención ! " @@ -2114,13 +2114,13 @@ msgstr "Cancelar salida" #: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 msgid "&Yes" msgstr "&Sí" #: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 msgid "&No" msgstr "&No" @@ -2426,7 +2426,7 @@ msgid "&Save mode..." msgstr "&Modo de guardar..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1353 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 msgid "&Layout..." msgstr "&Presentación..." @@ -2687,7 +2687,7 @@ msgstr "Error al inicializar el editor.\n" #: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1719 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 #: src/view.c:2068 msgid "Help" msgstr "Ayuda" @@ -2700,13 +2700,13 @@ msgid "Replac" msgstr "Reempl" -#: gtkedit/editwidget.c:1102 src/main.c:1721 +#: gtkedit/editwidget.c:1102 src/main.c:1722 msgid "PullDn" msgstr "Menú" #. gtk_edit_menu #: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1722 src/view.c:2070 src/view.c:2092 +#: src/main.c:1723 src/view.c:2070 src/view.c:2092 msgid "Quit" msgstr "Salir" @@ -2773,7 +2773,7 @@ msgid "Delete highlighted text" msgstr "Borrar el texto seleccionado" -#: gtkedit/gtkedit.c:1255 src/main.c:1720 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Menú" @@ -4319,7 +4319,7 @@ msgid "Content: " msgstr "Contenido: " -#: src/find.c:171 src/main.c:1243 src/main.c:1267 +#: src/find.c:171 src/main.c:1244 src/main.c:1268 msgid "&Tree" msgstr "ár&Bol" @@ -4889,7 +4889,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "en esa tecla o presione el mouse. Puede moverse con el tabulador." -#: src/main.c:707 +#: src/main.c:708 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4901,263 +4901,263 @@ " ¿Acaso borró usted el directorio o se dio otros \n" " permisos con el comando \"su\"?" -#: src/main.c:782 +#: src/main.c:783 msgid "Press any key to continue..." msgstr "Presione cualquier tecla para continuar..." -#: src/main.c:832 +#: src/main.c:833 msgid " The shell is already running a command " msgstr " El shell ya está ejecutando un comando " -#: src/main.c:859 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: src/main.c:860 +#: src/main.c:861 msgid " Do you really want to quit the Midnight Commander? " msgstr " ¿Desea realmente salir del Midnight Commander? " -#: src/main.c:1240 src/main.c:1264 +#: src/main.c:1241 src/main.c:1265 msgid "&Listing mode..." msgstr "&Modo de listado..." -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1242 src/main.c:1266 msgid "&Quick view C-x q" msgstr "&Vista rápida C-x q" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1243 src/main.c:1267 msgid "&Info C-x i" msgstr "&Información C-x i" -#: src/main.c:1245 src/main.c:1269 +#: src/main.c:1246 src/main.c:1270 msgid "&Sort order..." msgstr "&Ordenar..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1248 src/main.c:1272 msgid "&Filter..." msgstr "&Filtro..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1251 src/main.c:1275 msgid "&Network link..." msgstr "&Conexión por red..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1252 src/main.c:1276 msgid "FT&P link..." msgstr "conexión por FT&P..." -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1254 src/main.c:1278 msgid "SM&B link..." msgstr "conexión por &SMB..." -#: src/main.c:1258 src/main.c:1282 +#: src/main.c:1259 src/main.c:1283 msgid "&Drive... M-d" msgstr "&Disco... M-d" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1261 src/main.c:1285 msgid "&Rescan C-r" msgstr "actualiza&R C-r" -#: src/main.c:1288 +#: src/main.c:1289 msgid "&User menu F2" msgstr "me&Nú de usuario F2" -#: src/main.c:1289 +#: src/main.c:1290 msgid "&View F3" msgstr "&Ver F3" -#: src/main.c:1290 +#: src/main.c:1291 msgid "Vie&w file... " msgstr "ver fic&Hero..." -#: src/main.c:1291 +#: src/main.c:1292 msgid "&Filtered view M-!" msgstr "ver fichero (con &Filtro)... M-!" -#: src/main.c:1292 +#: src/main.c:1293 msgid "&Edit F4" msgstr "&Editar F4" -#: src/main.c:1293 +#: src/main.c:1294 msgid "&Copy F5" msgstr "&Copiar... F5" -#: src/main.c:1294 +#: src/main.c:1295 msgid "c&Hmod C-x c" msgstr "cambiar &Permisos... C-x c" -#: src/main.c:1296 +#: src/main.c:1297 msgid "&Link C-x l" msgstr "crear en&Lace... C-x l" -#: src/main.c:1297 +#: src/main.c:1298 msgid "&SymLink C-x s" msgstr "crear enlace &Simbólico... C-x s" -#: src/main.c:1298 +#: src/main.c:1299 msgid "edit s&Ymlink C-x C-s" msgstr "edi&Tar enlace simbólico C-x C-s" -#: src/main.c:1299 +#: src/main.c:1300 msgid "ch&Own C-x o" msgstr "cambiar dueñ&O... C-x o" -#: src/main.c:1300 +#: src/main.c:1301 msgid "&Advanced chown " msgstr "c&Ambiar dueño y permisos..." -#: src/main.c:1302 +#: src/main.c:1303 msgid "&Rename/Move F6" msgstr "&Renombrar/mover... F6" -#: src/main.c:1303 +#: src/main.c:1304 msgid "&Mkdir F7" msgstr "crear &Directorio... F7" -#: src/main.c:1304 +#: src/main.c:1305 msgid "&Delete F8" msgstr "&Borrar F8" -#: src/main.c:1305 +#: src/main.c:1306 msgid "&Quick cd M-c" msgstr "ca&Mbiar directorio... M-c" -#: src/main.c:1307 +#: src/main.c:1308 msgid "select &Group M-+" msgstr "seleccionar &Grupo... M-+" -#: src/main.c:1308 +#: src/main.c:1309 msgid "u&Nselect group M-\\" msgstr "de-seleccionar gr&Upo... M-\\" -#: src/main.c:1309 +#: src/main.c:1310 msgid "reverse selec&Tion M-*" msgstr "&Invertir la selección M-*" -#: src/main.c:1311 +#: src/main.c:1312 msgid "e&Xit F10" msgstr "sali&R F10" -#: src/main.c:1321 +#: src/main.c:1322 msgid "&Directory tree" msgstr "árbol de &Directorios" -#: src/main.c:1323 +#: src/main.c:1324 msgid "&Find file M-?" msgstr "&Buscar ficheros... M-?" -#: src/main.c:1324 +#: src/main.c:1325 msgid "s&Wap panels C-u" msgstr "&Intercambiar paneles C-u" -#: src/main.c:1325 +#: src/main.c:1326 msgid "switch &Panels on/off C-o" msgstr "&Activar/desactivar paneles C-o" -#: src/main.c:1326 +#: src/main.c:1327 msgid "&Compare directories C-x d" msgstr "&Comparar directorios... C-x d" -#: src/main.c:1327 +#: src/main.c:1328 msgid "e&Xternal panelize C-x !" msgstr "búsquedas e&Xternas... C-x !" -#: src/main.c:1328 +#: src/main.c:1329 msgid "show directory s&Izes" msgstr "mostrar &Tamaños de los directorios" -#: src/main.c:1330 +#: src/main.c:1331 msgid "command &History" msgstr "&Historia de comandos" -#: src/main.c:1331 +#: src/main.c:1332 msgid "di&Rectory hotlist C-\\" msgstr "directorios &Favoritos... C-\\" -#: src/main.c:1333 +#: src/main.c:1334 msgid "&Active VFS list C-x a" msgstr "directorios virtuales (&VFS)... C-x a" -#: src/main.c:1334 +#: src/main.c:1335 msgid "Fr&ee VFSs now" msgstr "&Liberar VFS ahora" -#: src/main.c:1337 +#: src/main.c:1338 msgid "&Background jobs C-x j" msgstr "&Procesos en 2º plano... C-x j" -#: src/main.c:1341 +#: src/main.c:1342 msgid "&Undelete files (ext2fs only)" msgstr "&Recuperar ficheros (ext2fs)..." -#: src/main.c:1344 +#: src/main.c:1345 msgid "&Listing format edit" msgstr "edición del formato de &Listado" -#: src/main.c:1346 +#: src/main.c:1347 msgid "&Extension file edit" msgstr "&Editar el fichero de extensiones..." -#: src/main.c:1347 +#: src/main.c:1348 msgid "&Menu file edit" msgstr "editar fichero de &Menú..." -#: src/main.c:1352 +#: src/main.c:1353 msgid "&Configuration..." msgstr "&Configuración..." -#: src/main.c:1354 +#: src/main.c:1355 msgid "c&Onfirmation..." msgstr "c&Onfirmación..." -#: src/main.c:1355 +#: src/main.c:1356 msgid "&Display bits..." msgstr "&Juego de caracteres..." -#: src/main.c:1357 +#: src/main.c:1358 msgid "learn &Keys..." msgstr "redefinir &Teclas..." -#: src/main.c:1360 +#: src/main.c:1361 msgid "&Virtual FS..." msgstr "sistema de ficheros &Virtual (VFS)..." -#: src/main.c:1363 +#: src/main.c:1364 msgid "&Save setup" msgstr "&Guardar configuración" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1380 src/main.c:1382 msgid " &Left " msgstr " &Izquierdo " -#: src/main.c:1381 +#: src/main.c:1382 msgid " &Above " msgstr " a&Rriba " -#: src/main.c:1384 +#: src/main.c:1385 msgid " &File " msgstr " &Fichero " -#: src/main.c:1385 +#: src/main.c:1386 msgid " &Command " msgstr " &Comando " -#: src/main.c:1386 +#: src/main.c:1387 msgid " &Options " msgstr " &Opciones " -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1389 src/main.c:1391 msgid " &Right " msgstr " &Derecho " -#: src/main.c:1390 +#: src/main.c:1391 msgid " &Below " msgstr " a&Bajo " -#: src/main.c:1445 +#: src/main.c:1446 msgid " Information " msgstr " Información " -#: src/main.c:1446 +#: src/main.c:1447 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5169,132 +5169,132 @@ " caso use C-r para obligar al programa a actualizar los datos.\n" " Lea la página de manual para mayor información. " -#: src/main.c:1925 +#: src/main.c:1926 msgid "Thank you for using GNU Midnight Commander" msgstr "Gracias por usar el GNU Midnight Commander" -#: src/main.c:2284 +#: src/main.c:2283 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "con soporte para ratón en xterm%s.\n" -#: src/main.c:2285 +#: src/main.c:2284 msgid " and the Linux console" msgstr " y la consola Linux" -#: src/main.c:2381 +#: src/main.c:2380 msgid "The TERM environment variable is unset!\n" msgstr "¡La variable de entorno TERM está sin definir!\n" -#: src/main.c:2592 +#: src/main.c:2591 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Directorio para ficheros del Midnight Commander: %s\n" -#: src/main.c:2606 +#: src/main.c:2605 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "La opción -m está obsoleta. Vea \"Juego de caracteres...\" en el menú " "\"Opciones\"\n" -#: src/main.c:2683 +#: src/main.c:2682 msgid "Use to debug the background code" msgstr "Se usa para depurar código de 2º plano" -#: src/main.c:2689 +#: src/main.c:2688 msgid "Request to run in color mode" msgstr "Solicitar la ejecución en color" -#: src/main.c:2691 +#: src/main.c:2690 msgid "Specifies a color configuration" msgstr "Indicar una configuración de colores" -#: src/main.c:2696 +#: src/main.c:2695 msgid "Edits one file" msgstr "Editar un fichero" -#: src/main.c:2700 +#: src/main.c:2699 msgid "Displays this help message" msgstr "Mostrar este mensaje de ayuda" -#: src/main.c:2703 +#: src/main.c:2702 msgid "Displays a help screen on how to change the color scheme" msgstr "Mostrar ayuda sobre cómo cambiar colores" -#: src/main.c:2706 +#: src/main.c:2705 msgid "Log ftp dialog to specified file" msgstr "Registrar diálogos ftp en un fichero" -#: src/main.c:2713 +#: src/main.c:2712 msgid "Obsolete" msgstr "Obsoleto" -#: src/main.c:2715 +#: src/main.c:2714 msgid "Requests to run in black and white" msgstr "Solicitar ejecución en blanco y negro" -#: src/main.c:2717 +#: src/main.c:2716 msgid "Disable mouse support in text version" msgstr "Desactivar ratón en la versión texto" -#: src/main.c:2720 +#: src/main.c:2719 msgid "Disables subshell support" msgstr "Desactivar el uso de subshell" -#: src/main.c:2724 +#: src/main.c:2723 msgid "Prints working directory at program exit" msgstr "Mostrar el nombre del directorio al salir" -#: src/main.c:2726 +#: src/main.c:2725 msgid "Resets soft keys on HP terminals" msgstr "Restablecer teclas en terminales HP" -#: src/main.c:2728 +#: src/main.c:2727 msgid "To run on slow terminals" msgstr "Para ejecutar en terminales lentos" -#: src/main.c:2731 +#: src/main.c:2730 msgid "Use stickchars to draw" msgstr "Usar caracteres simples para recuadros" -#: src/main.c:2735 +#: src/main.c:2734 msgid "Enables subshell support (default)" msgstr "Activar uso de subshell (por defecto)" -#: src/main.c:2740 +#: src/main.c:2739 msgid "Tries to use termcap instead of terminfo" msgstr "Intentar utilizar termcap en vez de terminfo" -#: src/main.c:2744 +#: src/main.c:2743 msgid "Displays the current version" msgstr "Mostrar el número de versión" -#: src/main.c:2746 +#: src/main.c:2745 msgid "Launches the file viewer on a file" msgstr "Abrir un fichero con el visor" -#: src/main.c:2748 +#: src/main.c:2747 msgid "Forces xterm features" msgstr "Utilizar las posibilidades de xterm" -#: src/main.c:2750 +#: src/main.c:2749 msgid "Geometry for the window" msgstr "Geometría de la ventana" -#: src/main.c:2750 +#: src/main.c:2749 msgid "GEOMETRY" msgstr "GEOMETRIA" -#: src/main.c:2751 +#: src/main.c:2750 msgid "No windows opened at startup" msgstr "No abrir ninguna ventana al inicio" -#: src/main.c:2753 +#: src/main.c:2752 msgid "Display the directory that holds the .links startup files and exit" msgstr "Mostrar el directorio con ficheros de inicio" -#: src/main.c:3051 +#: src/main.c:3062 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5302,11 +5302,11 @@ "No se pudo abrir la línea del terminal. Debe ejecutar \"mc\" sin\n" "la opción -P. En algunos sistemas, basta con ejecutar `which mc`\n" -#: src/main.c:3129 +#: src/main.c:3140 msgid " Notice " msgstr " Aviso " -#: src/main.c:3130 +#: src/main.c:3141 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -6092,237 +6092,254 @@ msgid "NumLock on keypad" msgstr "Bloquea números, pad" +#: vfs/direntry.c:318 +#, c-format +msgid "Dir cache expired for %s" +msgstr "El cache para %s ha expirado" + +#: vfs/direntry.c:448 vfs/direntry.c:451 +msgid " Direntry warning " +msgstr " Aviso en una entrada de directorio " + +#: vfs/direntry.c:448 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage vale %d, fuga de memoria" + +#: vfs/direntry.c:451 +msgid "Super has want_stale set" +msgstr "Super tiene want_stale activo" + +#: vfs/direntry.c:822 +msgid "Starting linear transfer..." +msgstr "Iniciando transferencia en línea..." + +#: vfs/direntry.c:967 +msgid "Getting file" +msgstr "Trayendo fichero" + #: vfs/extfs.c:268 #, c-format msgid "" "Couldn't open %s archive\n" "%s" msgstr "" -"No pude abrir el fichero %s\n" +"No se pudo abrir el fichero %s\n" "%s" #: vfs/extfs.c:300 vfs/extfs.c:320 msgid "Inconsistent extfs archive" msgstr "Fichero extfs inconsistente" -#: vfs/fish.c:136 +#: vfs/fish.c:138 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Desconectando de %s" -#: vfs/fish.c:214 +#: vfs/fish.c:216 msgid "fish: Waiting for initial line..." msgstr "fish: Esperando línea de inicio..." -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Lo siento, las conexiones con contraseña aún no son posibles." -#: vfs/fish.c:238 +#: vfs/fish.c:231 +msgid " fish: Password required for " +msgstr " fish: Contraseña requerida para " + +#: vfs/fish.c:240 msgid "fish: Sending password..." msgstr "fish: Enviando contraseña de usuario" -#: vfs/fish.c:244 +#: vfs/fish.c:246 msgid "fish: Sending initial line..." msgstr "fish: Enviando línea de inicio..." -#: vfs/fish.c:248 +#: vfs/fish.c:250 msgid "fish: Handshaking version..." msgstr "fish: Negociando versión..." -#: vfs/fish.c:252 +#: vfs/fish.c:254 msgid "fish: Setting up current directory..." msgstr "fish: Preparando directorio actual..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Conectado, inicio en %s" -#: vfs/fish.c:330 +#: vfs/fish.c:332 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Leyendo el directorio %s..." -#: vfs/fish.c:426 +#: vfs/fish.c:428 msgid "fish: failed" msgstr "fish: falló" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:448 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: guardar %s: enviando comando..." -#: vfs/fish.c:460 +#: vfs/fish.c:462 msgid "fish: Local read failed, sending zeros" msgstr "fish: Fallo de lectura local, enviando ceros" -#: vfs/fish.c:472 +#: vfs/fish.c:474 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: guardando %s %d (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:514 msgid "Aborting transfer..." msgstr "Abortando transferencia." -#: vfs/fish.c:521 +#: vfs/fish.c:523 msgid "Error reported after abort." msgstr "Error denunciado tras abortar." -#: vfs/fish.c:523 +#: vfs/fish.c:525 msgid "Aborted transfer would be successful." msgstr "Abortada transferencia con éxito." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:290 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Desconectando de %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:348 msgid " FTP: Password required for " msgstr " FTP: Contraseña requerida para " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:381 msgid " Proxy: Password required for " msgstr " Proxy: Contraseña requerida para " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:407 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: Enviando nombre de usuario al proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:411 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: Enviando contraseña de usuario al proxy" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:415 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: La identificación ante el proxy tuvo éxito" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:419 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: Conectado a %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:436 msgid "ftpfs: sending login name" msgstr "ftpfs: Enviando nombre de usuario" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:441 msgid "ftpfs: sending user password" msgstr "ftpfs: Enviando contraseña de usuario" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:446 msgid "ftpfs: logged in" msgstr "ftpfs: Autorizados" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:461 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: denegada autorización al usuario %s" -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:493 #, c-format msgid " Could not set source routing (%s)" msgstr " No se pudo prefijar la ruta (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:622 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Nombre de máquina incorrecto" -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:642 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Dirección de máquina incorrecta" -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:665 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: Estableciendo conexión con %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:675 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: Conexión abortada por el usuario" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:677 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: Conexión al servidor fracasó: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:719 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Esperando antes de insistir... %d (Ctrl-C para cancelar)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: No se pudo aplicar el enrutamiento en \"modo pasivo\"" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:892 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: No se pudo aplicar el \"modo pasivo\"" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:967 msgid "ftpfs: aborting transfer." msgstr "ftpfs: Abortando transferencia." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:969 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: Error al abortar: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:974 msgid "ftpfs: abort failed" msgstr "ftpfs: Aborto fracasado" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1063 vfs/ftpfs.c:1160 msgid "ftpfs: CWD failed." msgstr "ftpfs: Fallo al ejecutar CWD" -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1073 vfs/ftpfs.c:1080 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: No se pudo resolver el enlace simbólico" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1131 msgid "Resolving symlink..." msgstr "Resolviendo enlace simbólico..." -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1149 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: Leyendo vía FTP el directorio %s... (No use opciones de ls)" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: Leyendo vía FTP el directorio %s... %s%s" -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: Leyendo vía FTP el directorio %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: FALLO" - -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: Lectura de directorio FTP abortada por el usuario" +#: vfs/ftpfs.c:1150 +msgid "(strict rfc959)" +msgstr "(rfc959)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: Listado completo" +#: vfs/ftpfs.c:1151 +msgid "(chdir first)" +msgstr "(chdir)" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1247 msgid "ftpfs: failed" msgstr "ftpfs: Falló" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1257 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Falló; no hay dónde replegarse" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1320 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: Guardando fichero %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1790 vfs/ftpfs.c:1805 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6330,15 +6347,15 @@ "El fichero ~/.netrc contiene una contraseña.\n" "Quítela o restrinja los permisos de lectura." -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " El servidor no soporta esta versión " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -6348,30 +6365,50 @@ " contraseña para conectarse, pero la información puede \n" " quedar desprotegida al otro lado. ¿Desea continuar? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Sí " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " No " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " Desisto. El servidor remoto está en un puerto no habitual.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " Contraseña requerida para MCFS " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " La contraseña es incorrecta " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr " Máquina ilocalizable: %s " + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr " Imposible crear socket: %s " + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr " Imposible conectar con servidor: %s " + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " Demasiadas conexiones en curso " +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "Sistema de ficheros remoto de Midnight Commander" + #: vfs/smbfs.c:115 msgid "Domain:" msgstr "Dominio:" @@ -6446,14 +6483,49 @@ "%s\n" "no parece un fichero de tipo tar." -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1157 +msgid "Changes to file lost" +msgstr "Los cambios del fichero se han perdido" + +#: vfs/vfs.c:1797 +msgid "Could not parse:" +msgstr "Imposible analizar:" + +#: vfs/vfs.c:1799 +msgid "More parsing errors will be ignored." +msgstr "El resto de errores de análisis serán ignorados." + +#: vfs/vfs.c:1799 +msgid "(sorry)" +msgstr "(disculpas)" + +#: vfs/vfs.c:1810 +msgid "Internal error:" +msgstr "Error interno:" + +#: vfs/vfs.c:1820 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld bytes transferidos)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1821 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes transfered" + +#~ msgid "ftpfs: could not setup passive mode for source routing" +#~ msgstr "ftpfs: No se pudo aplicar el enrutamiento en \"modo pasivo\"" + +#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +#~ msgstr "ftpfs: Leyendo vía FTP el directorio %s... (No use opciones de ls)" + +#~ msgid "ftpfs: FAIL" +#~ msgstr "ftpfs: FALLO" + +#~ msgid "ftpfs: reading FTP directory interrupt by user" +#~ msgstr "ftpfs: Lectura de directorio FTP abortada por el usuario" + +#~ msgid "ftpfs: got listing" +#~ msgstr "ftpfs: Listado completo" #~ msgid "fish: got listing" #~ msgstr "fish: listado completo" Binary files old/mc-4.5.42/po/fr.gmo and new/mc-4.5.43/po/fr.gmo differ diff -ruN old/mc-4.5.42/po/fr.po new/mc-4.5.43/po/fr.po --- old/mc-4.5.42/po/fr.po Mon Dec 6 18:50:16 1999 +++ new/mc-4.5.43/po/fr.po Sat Mar 18 08:43:50 2000 @@ -1,12 +1,13 @@ # mc fr.po -# Copyright (C) 1998,1999 Free Software Foundation, Inc. -# Vincent Renardias , 1998, 1999. +# Copyright (C) 1998,1999,2000 Free Software Foundation, Inc. +# Vincent Renardias , 1998, 1999, 2000. # Thibaut Cousin , 1999. +# Martin Quinson , 2000. # msgid "" msgstr "" "Project-Id-Version: mc 4.5.39-pre8\n" -"POT-Creation-Date: 1999-09-22 19:46+0200\n" +"POT-Creation-Date: 2000-01-04 18:39+0100\n" "PO-Revision-Date: 1998-03-27 01:22+0100\n" "Last-Translator: Vincent Renardias \n" "Language-Team: GNOME French Team \n" @@ -89,15 +90,15 @@ "avec la commande :\n" "\"%s\"%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:130 gnome/gaction.c:146 msgid "open" msgstr "ouvrir" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:181 gnome/gaction.c:194 msgid "edit" msgstr "editer" -#: gnome/gaction.c:331 +#: gnome/gaction.c:327 msgid "view" msgstr "voir" @@ -211,7 +212,7 @@ msgstr "Définir le filtre" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 -#: gnome/gscreen.c:2416 +#: gnome/gscreen.c:2429 msgid "Show all files" msgstr "Montrer tous les fichiers" @@ -361,19 +362,19 @@ msgid "Could not open %s; will not have desktop icons" msgstr "Impossible d'ouvrir %s ; il n'y aura pas d'icône sur le bureau" -#: gnome/gdesktop.c:1176 +#: gnome/gdesktop.c:1186 msgid "While running the mount/umount command" msgstr "Pendant l'exécution de la commande mount/umount" -#: gnome/gdesktop.c:1245 +#: gnome/gdesktop.c:1255 msgid "While running the eject command" msgstr "Pendant l'exécution de la commande eject" -#: gnome/gdesktop.c:1429 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" msgstr "Erreur" -#: gnome/gdesktop.c:2588 +#: gnome/gdesktop.c:2598 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -386,84 +387,84 @@ "dans votre chemin, et donc\n" "définir le fond d'écran." -#: gnome/gdesktop.c:2611 gnome/glayout.c:362 +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2611 gnome/glayout.c:363 +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Démarrer un nouveau terminal dans le répertoire courant" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2613 gnome/glayout.c:365 +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Répertoire..." -#: gnome/gdesktop.c:2613 gnome/glayout.c:366 +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Crée un nouveau répertoire" -#: gnome/gdesktop.c:2614 +#: gnome/gdesktop.c:2624 msgid "URL L_ink..." msgstr "L_ien URL..." -#: gnome/gdesktop.c:2614 +#: gnome/gdesktop.c:2624 msgid "Creates a new URL link" msgstr "Crée un nouveau lien URL" -#: gnome/gdesktop.c:2615 +#: gnome/gdesktop.c:2625 msgid "_Launcher..." msgstr "_Lanceur..." -#: gnome/gdesktop.c:2615 +#: gnome/gdesktop.c:2625 msgid "Creates a new launcher" msgstr "Crée un nouveau lanceur" -#: gnome/gdesktop.c:2621 +#: gnome/gdesktop.c:2631 msgid "By _Name" msgstr "Par _nom" -#: gnome/gdesktop.c:2622 +#: gnome/gdesktop.c:2632 msgid "By File _Type" msgstr "Par _type de fichier" -#: gnome/gdesktop.c:2623 +#: gnome/gdesktop.c:2633 msgid "By _Size" msgstr "Par ta_ille " -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2634 msgid "By Time Last _Accessed" msgstr "Par date de dernier _accès" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2635 msgid "By Time Last _Modified" msgstr "Par date de dernière _modification" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2636 msgid "By Time Last _Changed" msgstr "Par date de dernier _changement" -#: gnome/gdesktop.c:2634 gnome/glayout.c:462 +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Arranger les icônes" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2645 msgid "Create _New Window" msgstr "Créer une _nouvelle fenêtre" -#: gnome/gdesktop.c:2637 gnome/glayout.c:464 +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Rescanner le _bureau" -#: gnome/gdesktop.c:2638 gnome/glayout.c:465 +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Rafraîchir les périphériques" -#: gnome/gdesktop.c:2639 gnome/glayout.c:466 +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Recréer les _icônes par défaut" -#: gnome/gdesktop.c:2641 +#: gnome/gdesktop.c:2651 msgid "Configure _Background Image" msgstr "Configurer le _fond d'écran" @@ -493,6 +494,11 @@ msgid "Desktop" msgstr "Bureau" +#. Create the link to the user's home directory so that he will have an icon +#: gnome/gdesktop-init.c:141 +msgid "Home directory" +msgstr "Rép. perso" + #: gnome/gdialogs.c:60 msgid "To: " msgstr "Vers : " @@ -622,7 +628,7 @@ "\n" "Le répertoire n'est pas vide. L'effacer récursivement ?" -#: gnome/gdialogs.c:790 src/file.c:2247 +#: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " msgstr " Effacer: " @@ -656,7 +662,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1808 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1836 msgid "Password:" msgstr "Mot de passe :" @@ -800,7 +806,7 @@ msgstr "Crée un nouveau fichier dans ce répertoire" #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:389 gnome/gscreen.c:2085 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." msgstr "_Copier..." @@ -808,7 +814,7 @@ msgid "Copy files" msgstr "Copie des fichiers" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "_Effacer..." @@ -816,7 +822,7 @@ msgid "Delete files" msgstr "Efface des fichiers" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "_Déplacer..." @@ -864,7 +870,7 @@ msgid "Reverses the list of tagged files" msgstr "Inverse la liste des fichiers marqués" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2088 msgid "Search" msgstr "Rechercher" @@ -872,7 +878,7 @@ msgid "Search for a file in the current Panel" msgstr "Rechercher un fichier dans le panneau courant" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "_Rafraîchir le répertoire" @@ -1120,7 +1126,7 @@ msgstr "Utiliser les options par défaut lorsqu'un fichier est lâché dessus" #: gnome/gnome-file-property-dialog.c:403 -#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194 +#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 #: src/screen.c:2397 src/screen.c:2427 msgid "View" msgstr "Voir" @@ -1134,7 +1140,7 @@ msgstr "Sélectionnez une icône" #. we do open first -#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187 +#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 msgid "Open" msgstr "Ouvrir" @@ -1150,8 +1156,8 @@ msgid "Use default View action" msgstr "Utiliser l'action de visualisation par défaut" -#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 msgid "Edit" msgstr "Editer" @@ -1283,52 +1289,52 @@ msgid "Program to run" msgstr "Programme à lancer" -#: gnome/gpopup2.c:188 +#: gnome/gpopup2.c:197 msgid "Mount device" msgstr "Monter le périphérique" -#: gnome/gpopup2.c:189 +#: gnome/gpopup2.c:198 msgid "Unmount device" msgstr "Démonter le périphérique" -#: gnome/gpopup2.c:190 +#: gnome/gpopup2.c:199 msgid "Eject device" msgstr "Ejecter le périphérique" -#: gnome/gpopup2.c:193 +#: gnome/gpopup2.c:202 msgid "Open with..." msgstr "Ouvrir avec..." -#: gnome/gpopup2.c:195 +#: gnome/gpopup2.c:204 msgid "View Unfiltered" msgstr "Vue non filtrée" -#: gnome/gpopup2.c:198 +#: gnome/gpopup2.c:207 msgid "Copy..." msgstr "Copier..." -#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1100 src/screen.c:2402 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 #: src/screen.c:2432 msgid "Delete" msgstr "Effacer" -#: gnome/gpopup2.c:200 +#: gnome/gpopup2.c:209 msgid "Move..." msgstr "Déplacer..." -#: gnome/gpopup2.c:201 +#: gnome/gpopup2.c:210 msgid "Hard Link..." msgstr "Lien physique..." -#: gnome/gpopup2.c:202 +#: gnome/gpopup2.c:211 msgid "Symlink..." msgstr "Lien symbolique..." -#: gnome/gpopup2.c:203 +#: gnome/gpopup2.c:212 msgid "Edit Symlink..." msgstr "Editer le lien symbolique..." -#: gnome/gpopup2.c:205 +#: gnome/gpopup2.c:214 msgid "Properties..." msgstr "Propriétés..." @@ -1456,98 +1462,98 @@ msgid "Select icon" msgstr "Sélectionnez une icône" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Recharger le répertoire courant" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "Nouveau _Répertoire..." -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "Crée un nouveau répertoire ici" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." msgstr "Nouveau _Fichier..." -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "Creates a new file here" msgstr "Crée un nouveau fichier ici" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "Rechercher : %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr " %s octets dans %d fichiers" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr " %s octets dans %d fichiers" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" msgstr "<échec de readlink>" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 msgid "Copy directory" msgstr "Copier un répertoire" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "Effacer un répertoire" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "Renommer ou déplacer un répertoire" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Retour" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Retourner au répertoire visité précédement" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Haut" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Remonter d'un niveau dans la hiérarchie" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Avant" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Aller au répertoire suivant" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Rafraîchir" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Rafraîchir le répertoire courant" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "Rép. perso" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "Aller à votre répertoire personnel" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "Emplacement : " @@ -1566,12 +1572,12 @@ msgid "Offset 0x%08lx" msgstr "Décalage 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:735 #, c-format msgid "Col %d" msgstr "Col %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "%s octets" @@ -1625,31 +1631,31 @@ msgid "_Search" msgstr "_Rechercher" -#: gnome/gwidget.c:90 +#: gnome/gwidget.c:95 msgid "ok" msgstr "OK" -#: gnome/gwidget.c:92 +#: gnome/gwidget.c:97 msgid "cancel" msgstr "Annuler" -#: gnome/gwidget.c:94 +#: gnome/gwidget.c:99 msgid "help" msgstr "Aide" -#: gnome/gwidget.c:96 src/file.c:2271 +#: gnome/gwidget.c:101 src/file.c:2268 msgid "yes" msgstr "oui" -#: gnome/gwidget.c:98 src/file.c:2269 +#: gnome/gwidget.c:103 src/file.c:2266 msgid "no" msgstr "non" -#: gnome/gwidget.c:100 +#: gnome/gwidget.c:105 msgid "exit" msgstr "Quitter" -#: gnome/gwidget.c:102 +#: gnome/gwidget.c:107 msgid "abort" msgstr "Arrêter" @@ -1690,7 +1696,7 @@ #: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 #: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 #: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid " Error " msgstr " Erreur " @@ -1739,10 +1745,10 @@ #: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 -#: src/chmod.c:114 src/chown.c:79 src/cmd.c:854 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 -#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: src/view.c:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 #: vfs/smbfs.c:116 msgid "&Cancel" msgstr "&Annuler" @@ -1763,9 +1769,9 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:703 src/screen.c:1451 src/screen.c:2129 +#: src/help.c:318 src/main.c:707 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " Attention " @@ -1851,7 +1857,7 @@ msgstr " Enregistrer le fichier " #: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 -#: src/view.c:2075 +#: src/view.c:2080 msgid "Save" msgstr "Enregistrer" @@ -1896,9 +1902,9 @@ #: gtkedit/editcmd.c:1175 src/filegui.c:597 msgid "al&L" -msgstr "Tou&s" +msgstr "&Tous" -#: gtkedit/editcmd.c:1177 src/file.c:2193 src/filegui.c:267 +#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Suivant" @@ -1950,7 +1956,7 @@ msgid " Enter replacement string:" msgstr " Entrez la chaîne de remplacement :" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:2003 msgid " Enter search string:" msgstr " Entrez la chaîne à rechercher :" @@ -1962,8 +1968,8 @@ #. Heads the 'Search' dialog box #: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 -#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 -#: src/view.c:1998 +#: src/view.c:1531 src/view.c:1630 src/view.c:1753 src/view.c:1971 +#: src/view.c:2003 msgid " Search " msgstr " Rechercher " @@ -2121,15 +2127,15 @@ msgid "Cancel quit" msgstr "Annuler quitter" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&Yes" msgstr "&Oui" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&No" msgstr "&Non" @@ -2159,7 +2165,7 @@ msgstr " Couper vers le presse-papiers " #: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2646 src/view.c:1918 msgid " Goto line " msgstr " Aller à la ligne " @@ -2436,7 +2442,7 @@ msgid "&Save mode..." msgstr "Mode &Sauvegarde..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1349 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 msgid "&Layout..." msgstr "Présentation..." @@ -2697,8 +2703,8 @@ msgstr "Erreur lors de l'initialisation de l'éditeur.\n" #: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1715 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2068 +#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2073 msgid "Help" msgstr "Aide" @@ -2710,13 +2716,13 @@ msgid "Replac" msgstr "Remplacer" -#: gtkedit/editwidget.c:1102 src/main.c:1717 +#: gtkedit/editwidget.c:1102 src/main.c:1722 msgid "PullDn" msgstr "Menu déroulant" #. gtk_edit_menu #: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1718 src/view.c:2070 src/view.c:2092 +#: src/main.c:1723 src/view.c:2075 src/view.c:2097 msgid "Quit" msgstr "Quitter" @@ -2783,7 +2789,7 @@ msgid "Delete highlighted text" msgstr "Effacer le texte sélectionné" -#: gtkedit/gtkedit.c:1255 src/main.c:1716 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Menu" @@ -2899,7 +2905,7 @@ #: src/achown.c:74 src/chmod.c:119 src/chown.c:83 msgid "Set &all" -msgstr "Tout &appliquer" +msgstr "&Global" #: src/achown.c:362 src/achown.c:369 msgid "owner" @@ -2951,7 +2957,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:639 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 msgid " Oops... " msgstr " Argh... " @@ -2969,7 +2975,7 @@ msgid "Background process:" msgstr "Processus en tâche de fond :" -#: src/background.c:287 src/file.c:2192 +#: src/background.c:287 src/file.c:2189 msgid " Background process error " msgstr " Erreur dans un processus en tâche de fond " @@ -3030,7 +3036,7 @@ #: src/boxes.c:281 msgid "case sensi&tive" -msgstr "Respec&t de la case " +msgstr "Respec&t de la casse " #: src/boxes.c:282 msgid "Sort order" @@ -3086,7 +3092,7 @@ #: src/boxes.c:657 msgid "ftpfs directory cache timeout:" -msgstr "Délai avant expiration du cache pour ftpfs :" +msgstr "Durée de garde du cache FTPfs:" #: src/boxes.c:661 msgid "ftp anonymous password:" @@ -3094,7 +3100,7 @@ #: src/boxes.c:668 msgid "Timeout for freeing VFSs:" -msgstr "Délai avant libération des VFS :" +msgstr "Délai pour libérer les SFVs:" #: src/boxes.c:674 msgid " Virtual File System Setting " @@ -3139,7 +3145,7 @@ #: src/chmod.c:95 msgid "execute/search by others" -msgstr "exécution/recherche par les autres" +msgstr "exéc./rech. par les autres" #: src/chmod.c:96 msgid "write by others" @@ -3151,7 +3157,7 @@ #: src/chmod.c:98 msgid "execute/search by group" -msgstr "exécution/recherche par le groupe" +msgstr "exéc./rech. par le groupe" #: src/chmod.c:99 msgid "write by group" @@ -3163,15 +3169,15 @@ #: src/chmod.c:101 msgid "execute/search by owner" -msgstr "exécution/recherche par le propriétaire" +msgstr "exéc./rech. par le propr." #: src/chmod.c:102 msgid "write by owner" -msgstr "écriture par le propriétaire" +msgstr "écriture par le propr." #: src/chmod.c:103 msgid "read by owner" -msgstr "lecture par le propriétaire" +msgstr "lecture par le propr." #: src/chmod.c:104 msgid "sticky bit" @@ -3179,15 +3185,15 @@ #: src/chmod.c:105 msgid "set group ID on execution" -msgstr "positionner l'ID groupe pour l'exécution" +msgstr "exécuter avec l'ID groupe" #: src/chmod.c:106 msgid "set user ID on execution" -msgstr "positionner l'ID utilisateur pour l'exécution" +msgstr "exécuter avec l'ID propr." #: src/chmod.c:116 msgid "C&lear marked" -msgstr "Effacer &marques" +msgstr "Ra&Z marqué" #: src/chmod.c:117 msgid "S&et marked" @@ -3219,15 +3225,15 @@ #: src/chmod.c:169 msgid "Use SPACE to change" -msgstr "Utilisez ESPACE pour changer" +msgstr "Tapez ESPACE pour changer" #: src/chmod.c:171 msgid "an option, ARROW KEYS" -msgstr "une option, les FLECHES DE DIRECTION" +msgstr "une option, une FLECHE pour" #: src/chmod.c:173 msgid "to move between options" -msgstr "pour passer d'une option à l'autre" +msgstr "naviguer entre les options," #: src/chmod.c:175 msgid "and T or INS to mark" @@ -3240,7 +3246,7 @@ #: src/chmod.c:321 msgid " I can't run the Chmod command on an extfs " msgstr "" -" Je ne peut pas utiliser la commande Chmod sur un système de fichiers extfs" +" Je ne peux pas utiliser la commande Chmod sur un système de fichiers extfs" #: src/chmod.c:325 msgid " I can't run the Chmod command on a tarfs " @@ -3261,7 +3267,7 @@ #: src/chown.c:114 msgid " Owner name " -msgstr " Nom du propriétaire " +msgstr " Nom du propr. " #: src/chown.c:116 src/chown.c:128 msgid " Group name " @@ -3277,7 +3283,7 @@ #: src/chown.c:126 msgid " User name " -msgstr " Nom de l'utilisateur " +msgstr " Nom d'utilisateur " #: src/chown.c:192 msgid "" @@ -3311,7 +3317,7 @@ msgid "Files tagged, want to cd?" msgstr "Fichiers marqués, voulez-vous changer de répertoire?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 msgid "Could not change directory" msgstr " Impossible de changer de répertoire" @@ -3387,40 +3393,40 @@ msgid "&Home" msgstr "Répertoire &personnel" -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Compare directories " msgstr " Comparer des répertoires " -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Select compare method: " msgstr " Sélectionner la méthode de comparaison : " -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Quick" msgstr "&Rapide" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Size only" msgstr "Taille &Seulement" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Thorough" msgstr "&Exhaustive" -#: src/cmd.c:864 +#: src/cmd.c:869 msgid " Both panels should be on the listing view mode to use this command " msgstr "" " Les deux panneaux doivent être en mode liste pour utiliser cette commande " -#: src/cmd.c:878 +#: src/cmd.c:883 msgid " The command history is empty " msgstr " L'historique des commandes est vide " -#: src/cmd.c:884 +#: src/cmd.c:889 msgid " Command history " msgstr " Historique des commandes " -#: src/cmd.c:926 +#: src/cmd.c:931 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3428,11 +3434,11 @@ "Ceci n'est pas un xterm ou une console Linux ;\n" "les panneaux ne peuvent être basculés. " -#: src/cmd.c:965 +#: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" msgstr "Tapez `exit' pour retourner à Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1025 #, c-format msgid "" " Couldn't stat %s \n" @@ -3441,99 +3447,99 @@ " Impossible d'analyser %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1034 src/cmd.c:1036 msgid " Link " msgstr " Lien " -#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1704 +#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 msgid " to:" msgstr " vers :" -#: src/cmd.c:1041 +#: src/cmd.c:1046 #, c-format msgid " link: %s " msgstr " lien : %s " -#: src/cmd.c:1074 +#: src/cmd.c:1079 #, c-format msgid " symlink: %s " msgstr " lien symbolique : %s " -#: src/cmd.c:1128 +#: src/cmd.c:1133 #, c-format msgid " Symlink `%s' points to: " msgstr " Le lien symbolique `%s' pointe vers : " -#: src/cmd.c:1133 +#: src/cmd.c:1138 msgid " Edit symlink " msgstr " Editer le lien symbolique " -#: src/cmd.c:1138 +#: src/cmd.c:1143 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " édition de lien symbolique, impossible d'enlever %s : %s " -#: src/cmd.c:1142 +#: src/cmd.c:1147 #, c-format msgid " edit symlink: %s " msgstr " éditer le lien symbolique : %s " -#: src/cmd.c:1169 +#: src/cmd.c:1174 msgid " Link symbolically " msgstr " Lier symboliquement " -#: src/cmd.c:1170 +#: src/cmd.c:1175 msgid " Relative symlink " msgstr " Lien symbolique relatif " -#: src/cmd.c:1181 +#: src/cmd.c:1186 #, c-format msgid " relative symlink: %s " msgstr " lien symbolique relatif : %s " -#: src/cmd.c:1331 +#: src/cmd.c:1336 msgid " Enter machine name (F1 for details): " msgstr " Entrez le nom de la machine (F1 pour les détails): " -#: src/cmd.c:1355 +#: src/cmd.c:1360 #, c-format msgid " Could not chdir to %s " msgstr " Impossible d'aller dans le répertoire %s " -#: src/cmd.c:1362 +#: src/cmd.c:1367 msgid " Link to a remote machine " msgstr " Lien vers une machine distante " -#: src/cmd.c:1368 +#: src/cmd.c:1373 msgid " FTP to machine " msgstr " FTP vers une machine " -#: src/cmd.c:1374 +#: src/cmd.c:1379 msgid " SMB link to machine " msgstr " Lien SMB vers une machine " -#: src/cmd.c:1384 +#: src/cmd.c:1389 msgid " Socket source routing setup " msgstr " Configuration du routage à la source " -#: src/cmd.c:1385 +#: src/cmd.c:1390 msgid " Enter host name to use as a source routing hop: " msgstr "" " Entrez le nom de la machine a utiliser noeud de routage à la source : " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Host name " msgstr " Nom de l'hôte " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Error while looking up IP address " msgstr " Erreur lors de la recherche de l'adresse IP " -#: src/cmd.c:1403 +#: src/cmd.c:1408 msgid " Undelete files on an ext2 file system " msgstr " Récupération de fichiers effacés sur un système de fichiers ext2" -#: src/cmd.c:1404 +#: src/cmd.c:1409 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3542,11 +3548,11 @@ " lequel la récupération doit être faite : (F1 pour\n" " les détails)" -#: src/cmd.c:1454 +#: src/cmd.c:1459 msgid " Setup saved to ~/" msgstr " Configuration enregistrée dans ~/" -#: src/cmd.c:1459 +#: src/cmd.c:1464 msgid " Setup " msgstr " Configuration " @@ -3639,14 +3645,14 @@ #: src/dir.c:386 #, c-format -msgid "File exists but can not be stat-ed: %s %s" -msgstr "Le fichier existe mais ne peut être évalué : %s %s" +msgid "File '%s' exists but can not be stat-ed: %s" +msgstr "Le fichier '%s' existe mais ne peut être lus : %s" #: src/dir.c:657 msgid "Unknown" msgstr "Inconnu" -#: src/ext.c:143 src/user.c:506 +#: src/ext.c:143 src/user.c:499 #, c-format msgid "" " Can't generate unique filename \n" @@ -3655,7 +3661,7 @@ " Impossible de générer un nom de fichier unique \n" " %s " -#: src/ext.c:150 src/user.c:518 +#: src/ext.c:150 src/user.c:511 #, c-format msgid "" " Can't create temporary command file \n" @@ -3664,7 +3670,7 @@ " Impossible de créer un fichier de commandes temporaire \n" " %s " -#: src/ext.c:165 src/user.c:547 +#: src/ext.c:165 src/user.c:533 msgid " Parameter " msgstr " Paramètre " @@ -4109,15 +4115,15 @@ msgid " Sorry, I could not put the job in background " msgstr " Désolé, je ne peux pas passer le processus en tâche de fond " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Internal failure " msgstr " Erreur interne " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " msgstr " Opération inconnue sur le fichier " -#: src/file.c:2031 +#: src/file.c:2029 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -4126,25 +4132,25 @@ " La destination \"%s\" doit être un répertoire \n" " %s " -#: src/file.c:2193 +#: src/file.c:2190 msgid "&Retry" msgstr "&Ré-essayer" -#: src/file.c:2193 src/file.c:2254 src/filegui.c:264 src/filegui.c:592 +#: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" msgstr "&Interrompre" -#: src/file.c:2245 +#: src/file.c:2242 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" "\n" -" Le répertoire n'est pas vite. \n" +" Le répertoire n'est pas vide. \n" " L'effacer récursivement ?" -#: src/file.c:2246 +#: src/file.c:2243 msgid "" "\n" " Background process: Directory not empty \n" @@ -4154,27 +4160,27 @@ " Processus en tâche de fond : le répertoire n'est pas vide \n" " L'effacer récursivement ?" -#: src/file.c:2253 +#: src/file.c:2250 msgid "a&ll" -msgstr "&tous" +msgstr "&Tous" -#: src/file.c:2253 src/filegui.c:595 +#: src/file.c:2250 src/filegui.c:595 msgid "non&E" -msgstr "&aucun" +msgstr "&Aucun" -#: src/file.c:2263 +#: src/file.c:2260 msgid " Type 'yes' if you REALLY want to delete " msgstr " Tapez 'yes' si vous voulez vraiment effacer " -#: src/file.c:2265 +#: src/file.c:2262 msgid "all the directories " msgstr "tous les répertoires " -#: src/file.c:2267 +#: src/file.c:2264 msgid " Recursive Delete " msgstr " Effacement récursif " -#: src/file.c:2268 +#: src/file.c:2265 msgid " Background process: Recursive Delete " msgstr " Processus en tâche de fond : effacement récursif " @@ -4213,11 +4219,11 @@ #: src/filegui.c:596 msgid "&Update" -msgstr "Mettre à jo&Ur" +msgstr "M-à-jo&Ur" #: src/filegui.c:598 msgid "Overwrite all targets?" -msgstr "Ecraser toutes les cibles ?" +msgstr "Écrase toutes cibles ?" #: src/filegui.c:600 msgid "&Reget" @@ -4225,7 +4231,7 @@ #: src/filegui.c:601 msgid "ap&Pend" -msgstr "A&jouter" +msgstr "a&Joute" #: src/filegui.c:604 msgid "Overwrite this target?" @@ -4304,7 +4310,7 @@ #: src/find.c:133 msgid "&Again" -msgstr "&Encore" +msgstr "e&Ncore" #: src/find.c:134 msgid "&Quit" @@ -4334,7 +4340,7 @@ msgid "Content: " msgstr "Contenu : " -#: src/find.c:171 src/main.c:1240 src/main.c:1264 +#: src/find.c:171 src/main.c:1244 src/main.c:1268 msgid "&Tree" msgstr "&Arborescence" @@ -4357,9 +4363,9 @@ #: src/find.c:537 msgid "Finished" -msgstr "Terminé" +msgstr "Recherche terminée " -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1531 #, c-format msgid "Searching %s" msgstr "Recherche de %s" @@ -4439,7 +4445,7 @@ msgid " Help " msgstr " Aide " -#: src/help.c:766 src/user.c:655 +#: src/help.c:766 src/user.c:637 #, c-format msgid "" " Can't open file %s \n" @@ -4467,11 +4473,11 @@ #: src/hotlist.c:133 src/hotlist.c:1443 src/panelize.c:88 src/wtools.c:383 msgid "&Remove" -msgstr "Supp&Rimer" +msgstr "&Supprimer" #: src/hotlist.c:134 src/hotlist.c:818 src/hotlist.c:915 msgid "&Append" -msgstr "&Ajouter" +msgstr "A&jouter" #: src/hotlist.c:135 src/hotlist.c:816 src/hotlist.c:913 msgid "&Insert" @@ -4491,11 +4497,11 @@ #: src/hotlist.c:140 msgid "&Add current" -msgstr "&Ajouter courant" +msgstr "A&jouter courant" #: src/hotlist.c:141 msgid "Change &To" -msgstr "Changer &en" +msgstr "&Changer en" #: src/hotlist.c:201 msgid "Subgroup - press ENTER to see list" @@ -4520,7 +4526,7 @@ #: src/hotlist.c:663 msgid "Moving " -msgstr "Déplacer " +msgstr "&Déplacer " #: src/hotlist.c:892 msgid "New hotlist entry" @@ -4848,18 +4854,18 @@ "If you want to escape, press a single Escape key\n" "and wait as well." msgstr "" -"Veuillez appuyez sur le %s\n" -"puis attendre que ce message disparaisse.\n" +"Appuyez sur '%s'\n" +"et attendez la disparition de ce message.\n" "\n" -"Alors, appuyez une seconde fois pour voir\n" -"OK apparaître à côté de son bouton.\n" +"Ensuite, appuyez à nouveau pour voir OK s'afficher\n" +"à l'emplacement prévu.\n" "\n" -"Si vous désirez arrêter, appuyez une fois\n" -"sur Echap. et attendez." +"Pour annuler, appuyez sur la touche Echappement\n" +"jusqu'à la disparition de ce panneau." #: src/learn.c:122 msgid " Cannot accept this key " -msgstr " Impossible d'accepter cette touche " +msgstr "Touche incorrecte" #: src/learn.c:123 #, c-format @@ -4875,8 +4881,8 @@ "It seems that all your keys already\n" "work fine. That's great." msgstr "" -"Il semblerait que toutes vos touches\n" -"fonctionnent déjà correctement. Merveilleux." +"Toutes les touches sont déjà\n" +"configurées. Bravo!" #: src/learn.c:179 msgid "&Discard" @@ -4887,8 +4893,8 @@ "Great! You have a complete terminal database!\n" "All your keys work well." msgstr "" -"Parfait ! Vous disposez d'une base de données de\n" -"terminaux ! Toutes vos touches fonctionnent correctement." +"Bravo! Votre configuration est correcte!\n" +"Toutes les touches sont définies." #: src/learn.c:267 msgid "Learn keys" @@ -4896,19 +4902,17 @@ #: src/learn.c:300 msgid "Press all the keys mentioned here. After you have done it, check" -msgstr "Appuyez sur toutes les touches mentionnées ici. Ceci fait, repérez " +msgstr "Essayez toutes les touches citées ici. Vérifiez ensuite qu'elles" #: src/learn.c:302 msgid "which keys are not marked with OK. Press space on the missing" -msgstr "" -"les touches qui ne sont pas marquées OK. Appuyez sur la barre espace sur la " -"touche concernée " +msgstr "toutes ont été marquées 'OK'. Appuyez sur 'espace' en face de la " #: src/learn.c:304 msgid "key, or click with the mouse to define it. Move around with Tab." -msgstr ", ou cliquez dessus pour la définir. Déplacez-vous avec la touche Tab." +msgstr "touche manquante, ou cliquez avec la souris." -#: src/main.c:704 +#: src/main.c:708 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4920,259 +4924,263 @@ " effacer votre répertoire de travail, ou vous êtes-vous \n" " donné des permissions supplémentaires avec la commande su ? " -#: src/main.c:779 +#: src/main.c:783 msgid "Press any key to continue..." msgstr "Appuyez sur une touche pour continuer..." -#: src/main.c:829 +#: src/main.c:833 msgid " The shell is already running a command " msgstr " Le shell est déjà en train d'exécuter une commande " -#: src/main.c:856 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander " -#: src/main.c:857 +#: src/main.c:861 msgid " Do you really want to quit the Midnight Commander? " msgstr " Voulez-vous vraiment quitter Midnight Commander ? " -#: src/main.c:1237 src/main.c:1261 +#: src/main.c:1241 src/main.c:1265 msgid "&Listing mode..." msgstr "Mode de &Listage..." -#: src/main.c:1238 src/main.c:1262 +#: src/main.c:1242 src/main.c:1266 msgid "&Quick view C-x q" -msgstr "Vue rapide C-x q" +msgstr "&Vue rapide C-x q" -#: src/main.c:1239 src/main.c:1263 +#: src/main.c:1243 src/main.c:1267 msgid "&Info C-x i" msgstr "&Info C-x i" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1246 src/main.c:1270 msgid "&Sort order..." msgstr "Ordre de tri..." -#: src/main.c:1244 src/main.c:1268 +#: src/main.c:1248 src/main.c:1272 msgid "&Filter..." msgstr "&Filtre..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1251 src/main.c:1275 msgid "&Network link..." msgstr "Lien réseau..." -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1252 src/main.c:1276 msgid "FT&P link..." msgstr "Lien FT&P..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1254 src/main.c:1278 msgid "SM&B link..." msgstr "Lien SM&B..." -#: src/main.c:1255 src/main.c:1279 +#: src/main.c:1259 src/main.c:1283 msgid "&Drive... M-d" msgstr "&Lecteur... M-d" -#: src/main.c:1257 src/main.c:1281 +#: src/main.c:1261 src/main.c:1285 msgid "&Rescan C-r" msgstr "&Rafraîchir C-r" -#: src/main.c:1285 +#: src/main.c:1289 msgid "&User menu F2" -msgstr "Menu &Utilisateur F2" +msgstr "Menu &Utilisateur F2" -#: src/main.c:1286 +#: src/main.c:1290 msgid "&View F3" -msgstr "&Vue F3" +msgstr "&Vue F3" -#: src/main.c:1287 +#: src/main.c:1291 msgid "Vie&w file... " -msgstr "Voi&r fichier... " +msgstr "Voi&r fichier... " -#: src/main.c:1288 +#: src/main.c:1292 msgid "&Filtered view M-!" -msgstr "Vue &Filtrée M-!" +msgstr "Vue &Filtrée M-!" -#: src/main.c:1289 +#: src/main.c:1293 msgid "&Edit F4" -msgstr "&Editer F4" +msgstr "&Editer F4" -#: src/main.c:1290 +#: src/main.c:1294 msgid "&Copy F5" -msgstr "&Copier F5" +msgstr "&Copier F5" -#: src/main.c:1291 +#: src/main.c:1295 msgid "c&Hmod C-x c" -msgstr "c&Hmod C-x c" +msgstr "c&Hmod C-x c" -#: src/main.c:1293 +#: src/main.c:1297 msgid "&Link C-x l" -msgstr "&Lien C-x l" +msgstr "&Lien C-x l" -#: src/main.c:1294 +#: src/main.c:1298 msgid "&SymLink C-x s" -msgstr "Lien &Symbolique C-x s" +msgstr "Lien &Symbolique C-x s" -#: src/main.c:1295 +#: src/main.c:1299 msgid "edit s&Ymlink C-x C-s" -msgstr "Editer lien s&Ymb. C-x C-s" +msgstr "Editer lien s&Ymb C-x C-s" -#: src/main.c:1296 +#: src/main.c:1300 msgid "ch&Own C-x o" -msgstr "ch&Own C-x o" +msgstr "ch&Own C-x o" -#: src/main.c:1297 +#: src/main.c:1301 msgid "&Advanced chown " msgstr "chown &Avancé " -#: src/main.c:1299 +#: src/main.c:1303 msgid "&Rename/Move F6" -msgstr "&Renommer/déplacer F6" +msgstr "&Renommer/déplacer F6" -#: src/main.c:1300 +#: src/main.c:1304 msgid "&Mkdir F7" -msgstr "&Créer répertoire F7" +msgstr "&Créer répertoire F7" -#: src/main.c:1301 +#: src/main.c:1305 msgid "&Delete F8" -msgstr "&Supprimer F8" +msgstr "&Supprimer F8" -#: src/main.c:1302 +#: src/main.c:1306 msgid "&Quick cd M-c" -msgstr "cd r&apide M-c" +msgstr "cd r&apide M-c" -#: src/main.c:1304 +#: src/main.c:1308 msgid "select &Group M-+" -msgstr "Sélectionner &Groupe M-+" +msgstr "Sélectionner &Groupe M-+" -#: src/main.c:1305 +#: src/main.c:1309 msgid "u&Nselect group M-\\" -msgstr "Désélectio&Nner groupe M-\\" +msgstr "Désélect&. groupe M-\\" -#: src/main.c:1306 +#: src/main.c:1310 msgid "reverse selec&Tion M-*" -msgstr "Inverser sélec&Tion M-*" +msgstr "&Inverser sélection M-*" -#: src/main.c:1308 +#: src/main.c:1312 msgid "e&Xit F10" -msgstr "Q&uitter F10" +msgstr "Q&uitter F10" -#: src/main.c:1318 +#: src/main.c:1322 msgid "&Directory tree" msgstr "&Arborescence des répertoires" -#: src/main.c:1320 +#: src/main.c:1324 msgid "&Find file M-?" -msgstr "Rechercher &Fichier M-?" +msgstr "Rechercher &Fichier M-?" -#: src/main.c:1321 +#: src/main.c:1325 msgid "s&Wap panels C-u" -msgstr "Echanger panneaux C-u" +msgstr "Echanger pannea&Ux C-u" -#: src/main.c:1322 +#: src/main.c:1326 msgid "switch &Panels on/off C-o" -msgstr "inverser &Panneaux on/off C-o" +msgstr "inverser &Panneaux on/off C-o" -#: src/main.c:1323 +#: src/main.c:1327 msgid "&Compare directories C-x d" -msgstr "&Comparer répertoires C-x d" +msgstr "&Comparer répertoires C-x d" -#: src/main.c:1324 +#: src/main.c:1328 msgid "e&Xternal panelize C-x !" -msgstr "Mise en panneau externe C-x !" +msgstr "Mise en panneau e&Xterne C-x !" -#: src/main.c:1325 +#: src/main.c:1329 msgid "show directory s&Izes" msgstr "Aff&Icher la taille des répertoires" -#: src/main.c:1327 +#: src/main.c:1331 msgid "command &History" msgstr "&Historique des commandes" -#: src/main.c:1328 +#: src/main.c:1332 msgid "di&Rectory hotlist C-\\" -msgstr "&Répertoire hotlist C-\\" +msgstr "&Répertoire hotlist C-\\" -#: src/main.c:1330 +#: src/main.c:1334 msgid "&Active VFS list C-x a" -msgstr "Liste des VFS &actifs C-x a" +msgstr "Liste des VFS &actifs C-x a" + +#: src/main.c:1335 +msgid "Fr&ee VFSs now" +msgstr "Désalou&er VFSs" -#: src/main.c:1333 +#: src/main.c:1338 msgid "&Background jobs C-x j" -msgstr "&Tâches de fond C-x j" +msgstr "&Tâches de fond C-x j" -#: src/main.c:1337 +#: src/main.c:1342 msgid "&Undelete files (ext2fs only)" msgstr "Réc&upération de fichiers (ext2fs seulement)" -#: src/main.c:1340 +#: src/main.c:1345 msgid "&Listing format edit" msgstr "Edition du format de &Liste" -#: src/main.c:1342 +#: src/main.c:1347 msgid "&Extension file edit" msgstr "Edition des &Extensions de fichier" -#: src/main.c:1343 +#: src/main.c:1348 msgid "&Menu file edit" msgstr "Edition du fichier de &Menu" -#: src/main.c:1348 +#: src/main.c:1353 msgid "&Configuration..." msgstr "&Configuration..." -#: src/main.c:1350 +#: src/main.c:1355 msgid "c&Onfirmation..." msgstr "C&Onfirmation..." -#: src/main.c:1351 +#: src/main.c:1356 msgid "&Display bits..." msgstr "&Affichage des bits..." -#: src/main.c:1353 +#: src/main.c:1358 msgid "learn &Keys..." msgstr "Apprendre les &touches..." -#: src/main.c:1356 +#: src/main.c:1361 msgid "&Virtual FS..." msgstr "Système de Fichiers &Virtuel (VFS)..." -#: src/main.c:1359 +#: src/main.c:1364 msgid "&Save setup" msgstr "Enregi&Strer la configuration" -#: src/main.c:1375 src/main.c:1377 +#: src/main.c:1380 src/main.c:1382 msgid " &Left " msgstr " &Gauche " -#: src/main.c:1377 +#: src/main.c:1382 msgid " &Above " msgstr " &Au-dessus " -#: src/main.c:1380 +#: src/main.c:1385 msgid " &File " msgstr " &Fichier " -#: src/main.c:1381 +#: src/main.c:1386 msgid " &Command " msgstr " &Commande " -#: src/main.c:1382 +#: src/main.c:1387 msgid " &Options " msgstr " &Options " -#: src/main.c:1384 src/main.c:1386 +#: src/main.c:1389 src/main.c:1391 msgid " &Right " msgstr " D&Roite " -#: src/main.c:1386 +#: src/main.c:1391 msgid " &Below " msgstr " &En-dessous " -#: src/main.c:1441 +#: src/main.c:1446 msgid " Information " msgstr " Information " -#: src/main.c:1442 +#: src/main.c:1447 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5185,133 +5193,133 @@ " manuel du répertoire. Voir la page de manuel pour les \n" " détails." -#: src/main.c:1921 +#: src/main.c:1926 msgid "Thank you for using GNU Midnight Commander" msgstr "Merci d'utiliser GNU Midnight Commander" -#: src/main.c:2280 +#: src/main.c:2283 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "avec support de la souris pour xterm%s.\n" -#: src/main.c:2281 +#: src/main.c:2284 msgid " and the Linux console" msgstr " et la console Linux" -#: src/main.c:2376 +#: src/main.c:2380 msgid "The TERM environment variable is unset!\n" msgstr "La variable d'environnement TERM n'est pas définie !\n" -#: src/main.c:2586 +#: src/main.c:2591 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Répertoire bibliothèque pour Midnight Commander : %s\n" -#: src/main.c:2600 +#: src/main.c:2605 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "L'option -m est obsolète. Veuillez étudier l'entrée \"Affichage\n" "des bits...\" dans le menu Options.\n" -#: src/main.c:2677 +#: src/main.c:2682 msgid "Use to debug the background code" msgstr "Utilisez ceci pour débuguer du code en tâche de fond" -#: src/main.c:2683 +#: src/main.c:2688 msgid "Request to run in color mode" msgstr "Demande à fonctionner en mode couleur" -#: src/main.c:2685 +#: src/main.c:2690 msgid "Specifies a color configuration" msgstr "Spécifie une configuration des couleurs" -#: src/main.c:2690 +#: src/main.c:2695 msgid "Edits one file" msgstr "Edite un fichier" -#: src/main.c:2694 +#: src/main.c:2699 msgid "Displays this help message" msgstr "Affiche ce message d'aide" -#: src/main.c:2697 +#: src/main.c:2702 msgid "Displays a help screen on how to change the color scheme" msgstr "Affiche un écran d'aide sur la façon de changer les styles de couleur" -#: src/main.c:2700 +#: src/main.c:2705 msgid "Log ftp dialog to specified file" msgstr "Consigne les dialogues FTP dans le fichier spécifié" -#: src/main.c:2707 +#: src/main.c:2712 msgid "Obsolete" msgstr "Obsolète" -#: src/main.c:2709 +#: src/main.c:2714 msgid "Requests to run in black and white" msgstr "Demande à fonctionner en mode noir et blanc" -#: src/main.c:2711 +#: src/main.c:2716 msgid "Disable mouse support in text version" msgstr "Désactive le support de la souris pour la version texte" -#: src/main.c:2714 +#: src/main.c:2719 msgid "Disables subshell support" msgstr "Désactive le support des sous-shells" -#: src/main.c:2718 +#: src/main.c:2723 msgid "Prints working directory at program exit" msgstr "Affiche le répertoire courant à la sortie du programme" -#: src/main.c:2720 +#: src/main.c:2725 msgid "Resets soft keys on HP terminals" msgstr "Réinitialiser les \"softkeys\" sur les terminaux HP" -#: src/main.c:2722 +#: src/main.c:2727 msgid "To run on slow terminals" msgstr "A exécuter sur les terminaux lents" -#: src/main.c:2725 +#: src/main.c:2730 msgid "Use stickchars to draw" msgstr "Utiliser les caractères graphiques pour dessiner" -#: src/main.c:2729 +#: src/main.c:2734 msgid "Enables subshell support (default)" msgstr "Active le support des sous-shells (par défaut)" -#: src/main.c:2734 +#: src/main.c:2739 msgid "Tries to use termcap instead of terminfo" msgstr "Essaie d'utiliser termcap au lieu de terminfo" -#: src/main.c:2738 +#: src/main.c:2743 msgid "Displays the current version" msgstr "Affiche le numéro de la version courante" -#: src/main.c:2740 +#: src/main.c:2745 msgid "Launches the file viewer on a file" msgstr "Lance le visualiseur de fichiers sur un fichier" -#: src/main.c:2742 +#: src/main.c:2747 msgid "Forces xterm features" msgstr "Force un attribut xterm" -#: src/main.c:2744 +#: src/main.c:2749 msgid "Geometry for the window" msgstr "Géométrie de la fenêtre" -#: src/main.c:2744 +#: src/main.c:2749 msgid "GEOMETRY" msgstr "GEOMETRIE" -#: src/main.c:2745 +#: src/main.c:2750 msgid "No windows opened at startup" msgstr "Pas de fenêtre ouverte au lancement" -#: src/main.c:2747 +#: src/main.c:2752 msgid "Display the directory that holds the .links startup files and exit" msgstr "" "Affiche le répertoire qui contient les fichiers de démarrage .links et quitte" -#: src/main.c:3039 +#: src/main.c:3062 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5319,11 +5327,11 @@ "Impossible d'ouvrir la ligne tty. Vous devez exécuter mc sans l'option -P.\n" "Sur certains systèmes, vous devriez exécuter # `which mc`\n" -#: src/main.c:3117 +#: src/main.c:3140 msgid " Notice " msgstr " Note " -#: src/main.c:3118 +#: src/main.c:3141 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5355,7 +5363,7 @@ #: src/option.c:81 msgid "rotatin&G dash" -msgstr "&Trait tournant" +msgstr "&Trait tournant (attente)" #: src/option.c:83 msgid "co&Mplete: show all" @@ -5659,32 +5667,32 @@ "%s\n" msgstr "Impossible d'écrire dans le fichier %s :\n" -#: src/user.c:261 +#: src/user.c:250 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr "Définition d'un motif de shell invalide \"%c\". " -#: src/user.c:394 +#: src/user.c:383 msgid " Debug " msgstr " Debug " -#: src/user.c:403 +#: src/user.c:392 msgid " ERROR: " msgstr " ERREUR : " -#: src/user.c:407 +#: src/user.c:396 msgid " True: " msgstr " Vrai : " -#: src/user.c:409 +#: src/user.c:398 msgid " False: " msgstr " Faux : " -#: src/user.c:621 +#: src/user.c:602 msgid " Warning -- ignoring file " msgstr " Avertissement -- fichier ignoré " -#: src/user.c:622 +#: src/user.c:603 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5694,19 +5702,20 @@ "écrire.\n" "Son utilisation peut compromettre la sécurité du système" -#: src/user.c:640 +#: src/user.c:622 msgid " I can't run programs while logged on a non local directory " msgstr "" " Je ne peux pas exécuter de programme lors d'une connexion à un répertoire " "distant " -#: src/user.c:724 +#. FIXME: this message is not quite right +#: src/user.c:720 #, c-format msgid " Empty file %s " msgstr "Fichier %s vide " #. Create listbox -#: src/user.c:733 +#: src/user.c:730 msgid " User menu " msgstr " Menu utilisateur " @@ -5732,7 +5741,7 @@ msgid " Dup failed " msgstr " Echec de la duplication " -#: src/view.c:401 +#: src/view.c:406 msgid "" "File: \n" "\n" @@ -5742,7 +5751,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:407 msgid "" "\n" "\n" @@ -5752,27 +5761,27 @@ "\n" "a été modifié, voulez-vous enregistrer les changements ?\n" -#: src/view.c:404 +#: src/view.c:409 msgid " Save changes " msgstr " Enregistrer les changements " -#: src/view.c:446 +#: src/view.c:451 msgid " Can't spawn child program " msgstr " Impossible de lancer un processus fils " -#: src/view.c:455 +#: src/view.c:460 msgid " Empty output from child filter " msgstr "Vider la sortie du filtre fils " -#: src/view.c:460 +#: src/view.c:465 msgid " Could not open file " msgstr " Impossible d'ouvrir le fichier " -#: src/view.c:475 +#: src/view.c:480 msgid " Can't open file \"" msgstr " Impossible d'ouvrir le fichier \"" -#: src/view.c:482 +#: src/view.c:487 msgid "" " Can't stat file \n" " " @@ -5780,11 +5789,11 @@ " Impossible d'analyser le fichier\n" " " -#: src/view.c:488 +#: src/view.c:493 msgid " Can't view: not a regular file " msgstr " Visualisation impossible : ce n'est pas un fichier régulier " -#: src/view.c:569 +#: src/view.c:574 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5793,7 +5802,7 @@ " Impossible d'ouvrir \"%s\" \n" " %s " -#: src/view.c:578 +#: src/view.c:583 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5802,34 +5811,34 @@ " Impossible d'accéder à \"%s\" \n" " %s " -#: src/view.c:714 +#: src/view.c:719 #, c-format msgid "File: %s" msgstr "Fichier : %s " -#: src/view.c:728 +#: src/view.c:733 #, c-format msgid "Offset 0x%08x" msgstr "Décalage 0x%08x" -#: src/view.c:739 +#: src/view.c:744 msgid " [grow]" msgstr " [augm.]" -#: src/view.c:1518 +#: src/view.c:1523 #, c-format msgid "Searching for `%s'" msgstr "Recherche de `%s'" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1630 src/view.c:1753 msgid " Search string not found " msgstr " Chaîne non trouvée " -#: src/view.c:1787 +#: src/view.c:1792 msgid " Invalid regular expression " msgstr " Expression régulière invalide " -#: src/view.c:1911 +#: src/view.c:1916 #, c-format msgid "" " The current line number is %d.\n" @@ -5838,7 +5847,7 @@ " Le numéro de la ligne courante est %d.\n" " Entrez le nouveau numéro de ligne :" -#: src/view.c:1933 +#: src/view.c:1938 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5847,67 +5856,67 @@ " L'adresse courante est 0x%lx.\n" " Entrez la nouvelle adresse :" -#: src/view.c:1935 +#: src/view.c:1940 msgid " Goto Address " msgstr " Aller à l'adresse " -#: src/view.c:1966 +#: src/view.c:1971 msgid " Enter regexp:" msgstr " Entrez l'expression régulière :" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Ascii" msgstr "Ascii" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "Hexa" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "Aller à" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "Ligne" -#: src/view.c:2075 +#: src/view.c:2080 msgid "RxSrch" msgstr "Chercher ExpReg" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdText" msgstr "EdTexte" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdHex" msgstr "EdHexa" -#: src/view.c:2080 +#: src/view.c:2085 msgid "UnWrap" msgstr "Pas de césure" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "Césure" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "RechHx" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "Brut" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "Analyser" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "Déformat" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "Format" @@ -5919,127 +5928,127 @@ #. to define f0 as well. Also, it makes Learn keys a bunch of problems :( #: src/win.c:224 msgid "Function key 1" -msgstr "Touche de fct 1" +msgstr "Fonction: F1 " #: src/win.c:225 msgid "Function key 2" -msgstr "Touche de fct 2" +msgstr "Fonction: F2 " #: src/win.c:226 msgid "Function key 3" -msgstr "Touche de fct 3" +msgstr "Fonction: F3 " #: src/win.c:227 msgid "Function key 4" -msgstr "Touche de fct 4" +msgstr "Fonction: F4 " #: src/win.c:228 msgid "Function key 5" -msgstr "Touche de fct 5" +msgstr "Fonction: F5 " #: src/win.c:229 msgid "Function key 6" -msgstr "Touche de fct 6" +msgstr "Fonction: F6 " #: src/win.c:230 msgid "Function key 7" -msgstr "Touche de fct 7" +msgstr "Fonction: F7 " #: src/win.c:231 msgid "Function key 8" -msgstr "Touche de fct 8" +msgstr "Fonction: F8 " #: src/win.c:232 msgid "Function key 9" -msgstr "Touche de fct 9" +msgstr "Fonction: F9 " #: src/win.c:233 msgid "Function key 10" -msgstr "Touche de fct 10" +msgstr "Fonction: F10 " #: src/win.c:234 msgid "Function key 11" -msgstr "Touche de fct 11" +msgstr "Fonction: F11 " #: src/win.c:235 msgid "Function key 12" -msgstr "Touche de fct 12" +msgstr "Fonction: F12 " #: src/win.c:236 msgid "Function key 13" -msgstr "Touche de fct 13" +msgstr "Fonction: F13 " #: src/win.c:237 msgid "Function key 14" -msgstr "Touche de fct 14" +msgstr "Fonction: F14 " #: src/win.c:238 msgid "Function key 15" -msgstr "Touche de fct 15" +msgstr "Fonction: F15 " #: src/win.c:239 msgid "Function key 16" -msgstr "Touche de fct 16" +msgstr "Fonction: F16 " #: src/win.c:240 msgid "Function key 17" -msgstr "Touche de fct 17" +msgstr "Fonction: F17 " #: src/win.c:241 msgid "Function key 18" -msgstr "Touche de fct 18" +msgstr "Fonction: F18 " #: src/win.c:242 msgid "Function key 19" -msgstr "Touche de fct 19" +msgstr "Fonction: F19 " #: src/win.c:243 msgid "Function key 20" -msgstr "Touche de fct 20" +msgstr "Fonction: F20 " #: src/win.c:244 msgid "Backspace key" -msgstr "Touche effac. arrière" +msgstr "Retour arrière" #: src/win.c:245 msgid "End key" -msgstr "Touche fin" +msgstr "Touche Fin " #: src/win.c:246 msgid "Up arrow key" -msgstr "Flèche haut" +msgstr "Flèche en haut" #: src/win.c:247 msgid "Down arrow key" -msgstr "Flèche bas" +msgstr "Flèche en bas " #: src/win.c:248 msgid "Left arrow key" -msgstr "Flèche gauche" +msgstr "Flèche à gauche" #: src/win.c:249 msgid "Right arrow key" -msgstr "Flèche droite" +msgstr "Flèche à droite" #: src/win.c:250 msgid "Home key" -msgstr "Touche début" +msgstr "Touche Origine" #: src/win.c:251 msgid "Page Down key" -msgstr "Touche page bas" +msgstr "Page suivante" #: src/win.c:252 msgid "Page Up key" -msgstr "Touche page haut" +msgstr "Page précédente" #: src/win.c:253 msgid "Insert key" -msgstr "Touche insertion" +msgstr "Touche Insertion" #: src/win.c:254 msgid "Delete key" -msgstr "Touche supprime" +msgstr "Touche Effacement" #: src/win.c:255 msgid "Completion/M-tab" @@ -6047,68 +6056,68 @@ #: src/win.c:256 msgid "+ on keypad" -msgstr "+ sur pavé numérique" +msgstr "Pavé numérique +" #: src/win.c:257 msgid "- on keypad" -msgstr "- sur pavé numérique" +msgstr "Pavé numérique -" #: src/win.c:258 msgid "* on keypad" -msgstr "* sur pavé numérique" +msgstr "Pavé numérique *" #. From here on, these won't be shown in Learn keys (no space) #: src/win.c:260 msgid "Left arrow keypad" -msgstr "Flèche gauche pavé num." +msgstr "Flèche gauche (Pavé numérique)" #: src/win.c:261 msgid "Right arrow keypad" -msgstr "Flèche droite pavé num." +msgstr "Flèche droite (Pavé numérique)" #: src/win.c:262 msgid "Up arrow keypad" -msgstr "Flèche haut pavé num." +msgstr "Flèche haut (Pavé numérique)" #: src/win.c:263 msgid "Down arrow keypad" -msgstr "Flèche bas pavé num." +msgstr "Flèche bas (Pavé numérique)" #: src/win.c:264 msgid "Home on keypad" -msgstr "Début pavé num." +msgstr "Début de ligne (Pavé numérique)" #: src/win.c:265 msgid "End on keypad" -msgstr "Fin pavé num." +msgstr "Fin de ligne (Pavé numérique)" #: src/win.c:266 msgid "Page Down keypad" -msgstr "Page bas pavé num." +msgstr "Page suivante (Pavé numérique)" #: src/win.c:267 msgid "Page Up keypad" -msgstr "Page haut pavé num." +msgstr "Page précédente (Pavé numérique)" #: src/win.c:268 msgid "Insert on keypad" -msgstr "Inser pavé num." +msgstr "'Inser' sur pavé numérique" #: src/win.c:269 msgid "Delete on keypad" -msgstr "Suppr pavé num." +msgstr "'Suppr' sur pavé numérique" #: src/win.c:270 msgid "Enter on keypad" -msgstr "Entrée pavé num." +msgstr "'Entrée' sur pavé numérique" #: src/win.c:271 msgid "Slash on keypad" -msgstr "/ pavé num." +msgstr "'/' sur pavé numérique" #: src/win.c:272 msgid "NumLock on keypad" -msgstr "NumLock pavé num." +msgstr "NumLock sur pavé numérique" #: vfs/extfs.c:268 #, c-format @@ -6123,231 +6132,217 @@ msgid "Inconsistent extfs archive" msgstr "archive extfs incohérente" -#: vfs/fish.c:136 +#: vfs/fish.c:138 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish : déconnexion de %s" -#: vfs/fish.c:214 +#: vfs/fish.c:216 msgid "fish: Waiting for initial line..." msgstr "fish : attente de la première ligne..." -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" "Désolé, nous ne pouvons pas faire de connexion authentifiée par mot de passe " "pour l'instant." -#: vfs/fish.c:238 +#: vfs/fish.c:231 +msgid " fish: Password required for " +msgstr " fish : mot de passe requis " + +#: vfs/fish.c:240 msgid "fish: Sending password..." msgstr "fish : envoi du mot de passe" -#: vfs/fish.c:244 +#: vfs/fish.c:246 msgid "fish: Sending initial line..." msgstr "fish : envoie de la ligne initiale..." -#: vfs/fish.c:248 +#: vfs/fish.c:250 msgid "fish: Handshaking version..." msgstr "fish : vérification des numéros de version..." -#: vfs/fish.c:252 +#: vfs/fish.c:254 msgid "fish: Setting up current directory..." msgstr "fish: configuration du répertoire courant..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 #, c-format msgid "fish: Connected, home %s." msgstr "fish : connecté, home %s." -#: vfs/fish.c:331 +#: vfs/fish.c:332 #, c-format msgid "fish: Reading directory %s..." msgstr "fish : lecture du répertoire %s..." -#: vfs/fish.c:426 -msgid "fish: got listing" -msgstr "fish : liste obtenue" - -#: vfs/fish.c:430 +#: vfs/fish.c:428 msgid "fish: failed" msgstr "fish : échec" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:450 +#: vfs/fish.c:448 #, c-format msgid "fish: store %s: sending command..." msgstr "fish : store %s : envoie de la commande..." -#: vfs/fish.c:464 +#: vfs/fish.c:462 msgid "fish: Local read failed, sending zeros" msgstr "fish : Échec de la lecture locale, envoie de zéros" -#: vfs/fish.c:476 +#: vfs/fish.c:474 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish : stockage %s %d (%d)" -#: vfs/fish.c:516 +#: vfs/fish.c:514 msgid "Aborting transfer..." msgstr "Abandon du transfert." -#: vfs/fish.c:525 +#: vfs/fish.c:523 msgid "Error reported after abort." msgstr "Erreur raportée après l'abandon." -#: vfs/fish.c:527 +#: vfs/fish.c:525 msgid "Aborted transfer would be successful." msgstr "Le transfert abandonné devrait avoir réussi." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:290 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "FTPfs : déconnexion de %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:348 msgid " FTP: Password required for " msgstr " FTP : mot de passe requis " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:381 msgid " Proxy: Password required for " msgstr " Proxy : mot de passe requis " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:407 msgid "ftpfs: sending proxy login name" msgstr "FTPfs : envoi du nom de connexion pour le proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:411 msgid "ftpfs: sending proxy user password" msgstr "FTPfs : envoi du mot de passe pour le proxy" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:415 msgid "ftpfs: proxy authentication succeeded" msgstr "FTPfs : authentification par le proxy réussie" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:419 #, c-format msgid "ftpfs: connected to %s" msgstr "FTPfs : connecté à %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:436 msgid "ftpfs: sending login name" msgstr "FTPfs : envoi du nom de connexion" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:441 msgid "ftpfs: sending user password" msgstr "FTPfs : envoi du mot de passe" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:446 msgid "ftpfs: logged in" msgstr "FTPfs : logué" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:461 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "FTPfs : login incorrect pour l'utilisateur %s" -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:493 #, c-format msgid " Could not set source routing (%s)" msgstr " Impossible d'utiliser le routage par la source (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:622 msgid "ftpfs: Invalid host name." msgstr "FTPfs : nom d'hôte invalide." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:642 msgid "ftpfs: Invalid host address." msgstr "FTPfs : adresse d'hôte invalide." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:665 #, c-format msgid "ftpfs: making connection to %s" msgstr "FTPfs : établissement de la connexion à %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:675 msgid "ftpfs: connection interrupted by user" msgstr "FTPfs : connexion interrompue par l'utilisateur" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:677 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "FTPfs : connexion au serveur échouée : %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:719 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Attente avant de réessayer... %d (Control-C pour annuler)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "" -"FTPfs : impossible de configurer le mode passif pour le routage par la source" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:892 msgid "ftpfs: could not setup passive mode" msgstr "FTPfs : impossible de configurer le mode passif" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:967 msgid "ftpfs: aborting transfer." msgstr "FTPfs : abandon du transfert." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:969 #, c-format msgid "ftpfs: abort error: %s" msgstr "FTPfs : erreur d'abandon : %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:974 msgid "ftpfs: abort failed" msgstr "FTPfs : échec de l'abandon" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1063 vfs/ftpfs.c:1160 msgid "ftpfs: CWD failed." msgstr "FTPfs : échec de CWD." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1073 vfs/ftpfs.c:1080 msgid "ftpfs: couldn't resolve symlink" msgstr "FTPfs : impossible de résoudre le lien symbolique" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1131 msgid "Resolving symlink..." msgstr "Résolution du lien symbolique..." -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1149 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "FTPfs : lecture du répertoire FTP %s... (pas d'options UNIX pour ls)" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs : lecture du répertoire FTP %s... %s%s" -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "FTPfs : lecture du répertoire FTP %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "FTPfs : ÉCHEC" +#: vfs/ftpfs.c:1150 +msgid "(strict rfc959)" +msgstr "(rfc959 stricte)" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "FTPfs : lecture du répertoire FTP interrompue par l'utilisateur" +#: vfs/ftpfs.c:1151 +msgid "(chdir first)" +msgstr "(chdir d'abord)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "FTPfs : liste obtenue" - -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1247 msgid "ftpfs: failed" msgstr "FTPfs : échec" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1257 msgid "ftpfs: failed; nowhere to fallback to" msgstr "FTPfs : échec ; nulle part où retomber" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1320 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "FTPfs : stockage du fichier %d (%d)" -#: vfs/ftpfs.c:2036 vfs/ftpfs.c:2051 +#: vfs/ftpfs.c:1790 vfs/ftpfs.c:1805 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6355,15 +6350,15 @@ "Le fichier ~/.netrc n'a pas un mode correct.\n" "Enlevez le mot de passe ou corrigez le mode." -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " Le serveur ne supporte pas cette version " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -6373,30 +6368,50 @@ " Vous devez donner un mot de passe pour entrer, mais cette \n" " information peut etre détournée sur le serveur. Continuer ? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Oui " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " Non " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " Le serveur distant utilise un port étrange. J'abandonne.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " Mot de passe MCFS requis " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " Mot de passe incorrect " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr " Impossible de localiser la machine : %s " + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr " Impossible de creer une socket : %s " + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr " Impossible de se connecter au serveur : %s" + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " Trop de connexions ouvertes " +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "Système de fichier distant privé de Midnight Commander" + #: vfs/smbfs.c:115 msgid "Domain:" msgstr "Domaine :" @@ -6471,19 +6486,31 @@ "%s\n" "ne ressemble pas à une archive tar." -#: vfs/vfs.c:1792 +#: vfs/vfs.c:1157 +msgid "Changes to file lost" +msgstr "Les changements au fichier sont perdus" + +#: vfs/vfs.c:1797 +msgid "Could not parse:" +msgstr "Impossible d'analyser :" + +#: vfs/vfs.c:1799 +msgid "More parsing errors will be ignored." +msgstr "Les prochaines erreurs d'analyse seront ignorées." + +#: vfs/vfs.c:1799 +msgid "(sorry)" +msgstr "(désolé)" + +#: vfs/vfs.c:1810 +msgid "Internal error:" +msgstr " Erreur interne : " + +#: vfs/vfs.c:1820 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld octets transférés)" -#: vfs/vfs.c:1793 +#: vfs/vfs.c:1821 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld octets transférés" - -#~ msgid "Home directory" -#~ msgstr "Rép. perso" - -#~ msgid "Could not symlink %s to %s; will not have initial home desktop icon." -#~ msgstr "" -#~ "Impossible d'établir le lien symbolique vers %s ; il n'y aura pas d'icône " -#~ "sur le bureau." Binary files old/mc-4.5.42/po/ja.gmo and new/mc-4.5.43/po/ja.gmo differ diff -ruN old/mc-4.5.42/po/ja.po new/mc-4.5.43/po/ja.po --- old/mc-4.5.42/po/ja.po Mon Dec 6 18:50:16 1999 +++ new/mc-4.5.43/po/ja.po Sat Mar 18 08:43:50 2000 @@ -2,14 +2,15 @@ # Copyright (C) 1998,1999 Free Software Foundation, Inc. # Yasuyuki Furukawa , 1999. # Takayuki KUSANO , 1999. +# Akira TAGOH , 2000. msgid "" msgstr "" -"Project-Id-Version: mc 4.5.29\n" +"Project-Id-Version: mc 4.5.42\n" "POT-Creation-Date: 1999-09-27 17:14+0900\n" -"PO-Revision-Date: 1999-04-11 04:26+0900\n" +"PO-Revision-Date: 2000-01-26 04:13+0900\n" "First-Translator: Yasuyuki Furukawa \n" -"Last-Translator: Takayuki KUSANO \n" -"Language-Team: \n" +"Last-Translator: Akira TAGOH \n" +"Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,15 +27,15 @@ #: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 #: gtkedit/editcmd.c:734 gtkedit/editcmd.c:743 msgid " Press macro hotkey: " -msgstr " ¥Þ¥¯¥í¥Û¥Ã¥È¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤" +msgstr " ¥Þ¥¯¥í¥Û¥Ã¥È¥­¡¼¤ò²¡¤·¤Æ²¼¤µ¤¤: " #: edit/edit_key_translator.c:144 msgid " Insert Literal " -msgstr "ʸ»ú¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤" +msgstr " ʸ»ú¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ " #: edit/edit_key_translator.c:144 msgid " Press any key: " -msgstr "¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " +msgstr " ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " #: gnome/gaction.c:33 #, c-format @@ -54,8 +55,8 @@ msgid "" "\".\n" "\n" -"To fix this, bring up the mime-properties editor in the GNOME Control Center," -" and edit the default %s-action for \"%s\"." +"To fix this, bring up the mime-properties editor in the GNOME Control " +"Center, and edit the default %s-action for \"%s\"." msgstr "" "\"\n" "¥¨¥é¡¼¤ò½¤Àµ¤¹¤ë¤Ë¤Ï¡¢GNOME¥³¥ó¥È¥í¡¼¥ë¥»¥ó¥¿¡¼¤Î MIME¥×¥í¥Ñ¥Æ¥£¥¨¥Ç¥£¥¿¤ò\n" @@ -66,8 +67,8 @@ msgid "" "\".\n" "\n" -"To fix this error, bring up this file's properties and change the default %s" -"-action." +"To fix this error, bring up this file's properties and change the default " +"%s-action." msgstr "" "\".\n" "¥¨¥é¡¼¤ò½¤Àµ¤¹¤ë¤Ë¤Ï¥Õ¥¡¥¤¥ë¤Î¥×¥í¥Ñ¥Æ¥£¤ò³«¤¤¤Æ¥Ç¥Õ¥©¥ë¥È¤Î\n" @@ -77,8 +78,7 @@ #, c-format msgid "" "Unable to %s\n" -"\"%s\"" -"\n" +"\"%s\"\n" "with the command:\n" "\"%s\"%s" msgstr "" @@ -86,15 +86,15 @@ "\"%s\"\n" "¥³¥Þ¥ó¥É: \"%s\"%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:130 gnome/gaction.c:146 msgid "open" msgstr "³«¤¯" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:181 gnome/gaction.c:194 msgid "edit" msgstr "ÊÔ½¸" -#: gnome/gaction.c:331 +#: gnome/gaction.c:327 msgid "view" msgstr "ɽ¼¨" @@ -201,14 +201,14 @@ #: gnome/gcmd.c:595 msgid "Command: " -msgstr "¥³¥Þ¥ó¥É" +msgstr "¥³¥Þ¥ó¥É: " #: gnome/gcmd.c:674 msgid "Set Filter" msgstr "¥Õ¥£¥ë¥¿¤ÎÀßÄê" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 -#: gnome/gscreen.c:2416 +#: gnome/gscreen.c:2429 msgid "Show all files" msgstr "Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤òɽ¼¨" @@ -266,7 +266,7 @@ #: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 msgid " Malformed regular expression " -msgstr " ¤ª¤«¤·¤ÊÀµµ¬É½¸½¤Ç¤¹ " +msgstr " ¤ª¤«¤·¤ÊÀµµ¬É½¸½¤Ç¤¹ " #: gnome/gcmd.c:962 msgid "Creating a desktop link" @@ -354,113 +354,110 @@ msgid "Could not open %s; will not have desktop icons" msgstr "%s¤ò³«¤±¤Þ¤»¤ó; ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥¤¥³¥ó¤¬¤¢¤ê¤Þ¤»¤ó" -#: gnome/gdesktop.c:1176 +#: gnome/gdesktop.c:1186 msgid "While running the mount/umount command" msgstr "mount/umount¥³¥Þ¥ó¥É¼Â¹ÔÃæ" -#: gnome/gdesktop.c:1245 +#: gnome/gdesktop.c:1255 msgid "While running the eject command" msgstr "eject¥³¥Þ¥ó¥É¼Â¹ÔÃæ" -#: gnome/gdesktop.c:1429 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" msgstr "¥¨¥é¡¼" -#: gnome/gdesktop.c:2588 +#: gnome/gdesktop.c:2598 msgid "" -"Unable to locate the file:" -"\n" -"background-properties-capplet" -"\n" +"Unable to locate the file:\n" +"background-properties-capplet\n" "in your path.\n" "\n" "We are unable to set the background." msgstr "" "¥Õ¥¡¥¤¥ë¤Î¾ì½ê¤ò³Îǧ¤Ç¤­¤Þ¤»¤ó:\n" -"¤¢¤Ê¤¿¤Î¥Ñ¥¹¾å¤Î" -"\n" +"¤¢¤Ê¤¿¤Î¥Ñ¥¹¾å¤Î\n" "background-properties-capplet.\n" "\n" "ÇطʤòÀßÄê¤Ç¤­¤Þ¤»¤ó." -#: gnome/gdesktop.c:2611 gnome/glayout.c:362 +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 msgid "_Terminal" -msgstr "_üËö" +msgstr "üËö (_T)" -#: gnome/gdesktop.c:2611 gnome/glayout.c:363 +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ç¿·µ¬Ã¼Ëö¤òµ¯Æ°" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2613 gnome/glayout.c:365 +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 msgid "_Directory..." -msgstr "¥Ç¥£¥ì¥¯¥È¥ê...(_D)" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê (_D)..." -#: gnome/gdesktop.c:2613 gnome/glayout.c:366 +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®" -#: gnome/gdesktop.c:2614 +#: gnome/gdesktop.c:2624 msgid "URL L_ink..." msgstr "URL¥ê¥ó¥¯ (_L)..." -#: gnome/gdesktop.c:2614 +#: gnome/gdesktop.c:2624 msgid "Creates a new URL link" msgstr "¿·µ¬URL¥ê¥ó¥¯¤òºîÀ®¤¹¤ë" -#: gnome/gdesktop.c:2615 +#: gnome/gdesktop.c:2625 msgid "_Launcher..." -msgstr "¥é¥ó¥Á¥ã...(_L)" +msgstr "¥é¥ó¥Á¥ã (_L)..." -#: gnome/gdesktop.c:2615 +#: gnome/gdesktop.c:2625 msgid "Creates a new launcher" msgstr "¿·µ¬¥é¥ó¥Á¥ã¤ò¤³¤Î¾ì½ê¤ÇºîÀ®¤¹¤ë" -#: gnome/gdesktop.c:2621 +#: gnome/gdesktop.c:2631 msgid "By _Name" -msgstr "̾Á°(_N)" +msgstr "̾Á° (_N)" -#: gnome/gdesktop.c:2622 +#: gnome/gdesktop.c:2632 msgid "By File _Type" msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥× (_T)" -#: gnome/gdesktop.c:2623 +#: gnome/gdesktop.c:2633 msgid "By _Size" msgstr "¥µ¥¤¥º (_S)" -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2634 msgid "By Time Last _Accessed" -msgstr "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï )_A)" +msgstr "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï (_A)" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2635 msgid "By Time Last _Modified" msgstr "ºÇ½ª¹¹¿·»þ¹ï (_M)" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2636 msgid "By Time Last _Changed" msgstr "ºÇ½ªÊѹ¹»þ¹ï (_C)" -#: gnome/gdesktop.c:2634 gnome/glayout.c:462 +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "¥¢¥¤¥³¥ó¤ÎÀ°Îó (_A)" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2645 msgid "Create _New Window" msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤ÎºîÀ® (_N)" -#: gnome/gdesktop.c:2637 gnome/glayout.c:464 +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "¥Ç¥£¥ì¥¯¥È¥êºÆ¥¹¥­¥ã¥ó (_D)" -#: gnome/gdesktop.c:2638 gnome/glayout.c:465 +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "¥Ç¥Ð¥¤¥¹¤òºÆ¥¹¥­¥ã¥ó (_V)" -#: gnome/gdesktop.c:2639 gnome/glayout.c:466 +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¤¥³¥ó¤òºÆºîÀ® (_I)" -#: gnome/gdesktop.c:2641 +#: gnome/gdesktop.c:2651 msgid "Configure _Background Image" msgstr "ÇطʲèÁü¤òÀßÄê (_B)" @@ -490,6 +487,11 @@ msgid "Desktop" msgstr "¥Ç¥¹¥¯¥È¥Ã¥×" +#. Create the link to the user's home directory so that he will have an icon +#: gnome/gdesktop-init.c:141 +msgid "Home directory" +msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê" + #: gnome/gdialogs.c:60 msgid "To: " msgstr "Àè: " @@ -508,8 +510,8 @@ #: gnome/gdialogs.c:386 msgid "" -"Some of the files you are trying to copy already exist in the destination" -" folder. Please select the action to be performed." +"Some of the files you are trying to copy already exist in the destination " +"folder. Please select the action to be performed." msgstr "" "¥³¥Ô¡¼»ÈÍѤȤ·¤Æ¤¤¤ë¥Õ¥¡¥¤¥ë¤¬¥³¥Ô¡¼Àè¤Î¥Õ¥©¥ë¥À¾å¤Ë´û¤Ë¤¤¤¯¤Ä¤«Â¸ºß¤·¤Þ¤¹. " "¼è¤ë¤Ù¤­½èÍý¤òÁªÂò¤·¤Æ¤¯¤À¤µ¤¤." @@ -586,8 +588,8 @@ #: gnome/gdialogs.c:649 msgid "" -"Selecting this will copy the files that symlinks point to instead of just" -" copying the link." +"Selecting this will copy the files that symlinks point to instead of just " +"copying the link." msgstr "" "¥ê¥ó¥¯Àè¤Î¼ÂÂΤò¥³¥Ô¡¼¤·¤Ê¤¤¤Ç¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¥Ý¥¤¥ó¥¿¾ðÊó¤Î¤ß¤ò¥³¥Ô¡¼¤¹¤ë" @@ -618,7 +620,7 @@ "\n" "¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó. ºÆµ¢Åª¤Ëºï½ü¤·¤Þ¤¹¤«?" -#: gnome/gdialogs.c:790 src/file.c:2247 +#: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " msgstr " ºï½ü:" @@ -652,7 +654,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1808 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1837 msgid "Password:" msgstr "¥Ñ¥¹¥ï¡¼¥É:" @@ -675,15 +677,15 @@ #: gnome/gdnd.c:52 msgid "_Move here" -msgstr "¤³¤Î¾ì½ê¤Ç°ÜÆ°(_M)" +msgstr "¤³¤Î¾ì½ê¤Ç°ÜÆ° (_M)" #: gnome/gdnd.c:53 msgid "_Copy here" -msgstr "¤³¤Î¾ì½ê¤Ç¥³¥Ô¡¼(_C)" +msgstr "¤³¤Î¾ì½ê¤Ç¥³¥Ô¡¼ (_C)" #: gnome/gdnd.c:54 msgid "_Link here" -msgstr "¤³¤Î¾ì½ê¤Ç¥ê¥ó¥¯(_L)" +msgstr "¤³¤Î¾ì½ê¤Ç¥ê¥ó¥¯ (_L)" #: gnome/gdnd.c:56 msgid "Cancel drag" @@ -706,7 +708,7 @@ #: gnome/glayout.c:41 msgid "_Icon View" -msgstr "¥¢¥¤¥³¥óɽ¼¨(_I)" +msgstr "¥¢¥¤¥³¥óɽ¼¨ (_I)" #: gnome/glayout.c:42 gnome/glayout.c:58 msgid "Switch view to an icon display" @@ -714,7 +716,7 @@ #: gnome/glayout.c:44 msgid "_Brief View" -msgstr "´Ê°×ɽ¼¨(_B)" +msgstr "´Ê°×ɽ¼¨ (_B)" #: gnome/glayout.c:45 gnome/glayout.c:61 msgid "Switch view to show just file name and type" @@ -722,7 +724,7 @@ #: gnome/glayout.c:47 msgid "_Detailed View" -msgstr "¾ÜºÙɽ¼¨(_D)" +msgstr "¾ÜºÙɽ¼¨ (_D)" #: gnome/glayout.c:48 gnome/glayout.c:64 msgid "Switch view to show detailed file statistics" @@ -730,7 +732,7 @@ #: gnome/glayout.c:50 msgid "_Custom View" -msgstr "¥«¥¹¥¿¥àɽ¼¨(_C)" +msgstr "¥«¥¹¥¿¥àɽ¼¨ (_C)" #: gnome/glayout.c:51 gnome/glayout.c:67 msgid "Switch view to show user-defined statistics" @@ -758,14 +760,12 @@ #: gnome/glayout.c:315 msgid "" -"Notice that if you choose to terminate the file manager, you will" -"\n" +"Notice that if you choose to terminate the file manager, you will\n" "also terminate the GNOME desktop handler.\n" "\n" "Are you sure you want to exit?" msgstr "" -"¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤¬½ªÎ»¤¹¤ë¤È¡¢" -"\n" +"¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤¬½ªÎ»¤¹¤ë¤È¡¢\n" "GNOME¥Ç¥¹¥¯¥È¥Ã¥×¥Ï¥ó¥É¥é¤âƱ»þ¤Ë½ªÎ»¤·¤Æ¤·¤Þ¤¤¤Þ¤¹.\n" "\n" "ËÜÅö¤Ë½ªÎ»¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?" @@ -774,48 +774,46 @@ msgid "" "The file manager and the desktop handler are now terminating\n" "\n" -"If you want to start up again the desktop handler or the file manager" -"\n" +"If you want to start up again the desktop handler or the file manager\n" "you can launch it from the Panel, or you can run the UNIX command `gmc'\n" "\n" "Press OK to terminate the application, or cancel to continue using it." msgstr "" "¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ª¤è¤Ó¥Ç¥¹¥¯¥È¥Ã¥×¥Ï¥ó¥É¥é¤ÏÂþº£½ªÎ»¤·¤Þ¤¹\n" "\n" -"ºÆ¤Ó¥Ç¥¹¥¯¥È¥Ã¥×¥Ï¥ó¥É¥é, ¤â¤·¤¯¤Ï¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤òµ¯Æ°¤µ¤»¤ë¤Ë¤Ï" -"\n" +"ºÆ¤Ó¥Ç¥¹¥¯¥È¥Ã¥×¥Ï¥ó¥É¥é, ¤â¤·¤¯¤Ï¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤òµ¯Æ°¤µ¤»¤ë¤Ë¤Ï\n" "GNOME¥Ñ¥Í¥ë¤«¤é¼Â¹Ô¤¹¤ë¤«, UNIX¥³¥Þ¥ó¥É`gmc'¤ò¼Â¹Ô¤µ¤»¤Æ¤¯¤À¤µ¤¤\n" "\n" "λ²ò¤ò²¡¤¹¤È½ªÎ»¤·¤Þ¤¹. ÍøÍѤò·Ñ³¤¹¤ë¤Ê¤é¥­¥ã¥ó¥»¥ë¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤." #: gnome/glayout.c:367 msgid "_File..." -msgstr "¥Õ¥¡¥¤¥ë(_F)..." +msgstr "¥Õ¥¡¥¤¥ë (_F)..." #: gnome/glayout.c:368 msgid "Creates a new file in this directory" msgstr "¤³¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ë¿·¤·¤¤¥Õ¥¡¥¤¥ë¤òºîÀ®¤·¤Þ¤¹" #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:389 gnome/gscreen.c:2085 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." -msgstr "¥³¥Ô¡¼(_C)..." +msgstr "¥³¥Ô¡¼ (_C)..." #: gnome/glayout.c:389 msgid "Copy files" msgstr "¥Õ¥¡¥¤¥ë¤ò¥³¥Ô¡¼¤¹¤ë" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." -msgstr "ºï½ü...(_D)" +msgstr "ºï½ü (_D)..." #: gnome/glayout.c:390 msgid "Delete files" msgstr "¥Õ¥¡¥¤¥ë¤òºï½ü¤¹¤ë" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." -msgstr "°ÜÆ°...(_M)" +msgstr "°ÜÆ° (_M)..." #: gnome/glayout.c:391 msgid "Rename or move files" @@ -839,7 +837,7 @@ #: gnome/glayout.c:402 msgid "Select _All" -msgstr "Á´ÁªÂò(_A)" +msgstr "Á´ÁªÂò (_A)" #: gnome/glayout.c:402 msgid "Select all files in the current Panel" @@ -847,7 +845,7 @@ #: gnome/glayout.c:404 msgid "_Select Files..." -msgstr "¥Õ¥¡¥¤¥ëÁªÂò...(_S)" +msgstr "¥Õ¥¡¥¤¥ëÁªÂò (_S)..." #: gnome/glayout.c:404 msgid "Select a group of files" @@ -855,13 +853,13 @@ #: gnome/glayout.c:405 msgid "_Invert Selection" -msgstr "ÁªÂòȿž(_I)" +msgstr "ÁªÂòȿž (_I)" #: gnome/glayout.c:405 msgid "Reverses the list of tagged files" msgstr "¥Õ¥¡¥¤¥ë¥¹¥¤¥Ã¥Á¤Î°ìÍ÷¤òȿž¤¹¤ë" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2088 msgid "Search" msgstr "¸¡º÷" @@ -869,9 +867,9 @@ msgid "Search for a file in the current Panel" msgstr "¸½ºß¤Î¥Ñ¥Í¥ë¤Ç¤Î¥Õ¥¡¥¤¥ë¤ò¸¡º÷" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºÆ¥¹¥­¥ã¥ó(_R)" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºÆ¥¹¥­¥ã¥ó (_R)" #: gnome/glayout.c:411 msgid "Rescan the directory contents" @@ -879,7 +877,7 @@ #: gnome/glayout.c:421 msgid "_Sort By..." -msgstr "¥½¡¼¥È...(_S)" +msgstr "¥½¡¼¥È (_S)..." #: gnome/glayout.c:421 msgid "Confirmation settings" @@ -887,7 +885,7 @@ #: gnome/glayout.c:422 msgid "_Filter View..." -msgstr "¥Õ¥£¥ë¥¿É½¼¨...(_F)" +msgstr "¥Õ¥£¥ë¥¿É½¼¨ (_F)..." #: gnome/glayout.c:422 msgid "Global option settings" @@ -895,7 +893,7 @@ #: gnome/glayout.c:429 msgid "_Find File..." -msgstr "¥Õ¥¡¥¤¥ë¸¡º÷...(_F)" +msgstr "¥Õ¥¡¥¤¥ë¸¡º÷ (_F)..." #: gnome/glayout.c:429 msgid "Locate files on disk" @@ -904,7 +902,7 @@ #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, #: gnome/glayout.c:432 msgid "_Edit mime types..." -msgstr "MIME·Á¼°¤ÎÊÔ½¸...(_E)" +msgstr "MIME·Á¼°¤ÎÊÔ½¸ (_E)..." #: gnome/glayout.c:432 msgid "Edits the MIME type bindings" @@ -912,7 +910,7 @@ #: gnome/glayout.c:434 msgid "_Run Command..." -msgstr "¥³¥Þ¥ó¥É¼Â¹Ô...(_R)" +msgstr "¥³¥Þ¥ó¥É¼Â¹Ô (_R)..." #: gnome/glayout.c:434 msgid "Runs a command" @@ -920,7 +918,7 @@ #: gnome/glayout.c:436 msgid "_Run Command in panel..." -msgstr "¥Ñ¥Í¥ëÃæ¤Ç¥³¥Þ¥ó¥É¤ò¼Â¹Ô...(_R)" +msgstr "¥Ñ¥Í¥ëÃæ¤Ç¥³¥Þ¥ó¥É¤ò¼Â¹Ô (_R)..." #: gnome/glayout.c:436 msgid "Run a command and put the results in a panel" @@ -928,7 +926,7 @@ #: gnome/glayout.c:446 msgid "_Background jobs..." -msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥¸¥ç¥Ö...(_B)" +msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥¸¥ç¥Ö (_B)..." #: gnome/glayout.c:446 msgid "List of background operations" @@ -944,23 +942,23 @@ #: gnome/glayout.c:473 gnome/glayout.c:484 msgid "_Settings" -msgstr "ÀßÄê(_S)" +msgstr "ÀßÄê (_S)" #: gnome/glayout.c:474 gnome/glayout.c:485 msgid "_Layout" -msgstr "¥ì¥¤¥¢¥¦¥È(_L)" +msgstr "¥ì¥¤¥¢¥¦¥È (_L)" #: gnome/glayout.c:475 gnome/glayout.c:486 msgid "_Commands" -msgstr "¥³¥Þ¥ó¥É(_C)" +msgstr "¥³¥Þ¥ó¥É (_C)" #: gnome/glayout.c:476 msgid "_Desktop" -msgstr "¥Ç¥¹¥¯¥È¥Ã¥×(_D)" +msgstr "¥Ç¥¹¥¯¥È¥Ã¥× (_D)" #: gnome/glayout.c:477 gnome/glayout.c:487 msgid "_Help" -msgstr "¥Ø¥ë¥×(_H)" +msgstr "¥Ø¥ë¥× (_H)" #: gnome/glayout.c:627 msgid "File/New/Directory..." @@ -970,12 +968,13 @@ msgid "" "You are running the GNOME File Manager as root.\n" "\n" -"As root, you can damage your system if you are not careful, and the GNOME" -" File Manager will not stop you from doing it." +"As root, you can damage your system if you are not careful, and the GNOME " +"File Manager will not stop you from doing it." msgstr "" "root ¤È¤·¤Æ GNOME¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤òÆ°¤«¤½¤¦¤È¤·¤Æ¤¤¤Þ¤¹\n" "\n" -"root ¤Ç¼Â¹Ô¤¹¤ë¤È¡¢ÉÔÃí°Õ¤Ç¥·¥¹¥Æ¥à¤òÇ˲õ¤·¤Æ¤·¤Þ¤¤¤Þ¤¹.GNOME¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ÏÇ˲õ¹Ô°Ù¤ò»ß¤á¤ë¤è¤¦¤Ê¤³¤È¤Ï¤·¤Þ¤»¤ó" +"root ¤Ç¼Â¹Ô¤¹¤ë¤È, ÉÔÃí°Õ¤Ç¥·¥¹¥Æ¥à¤òÇ˲õ¤·¤Æ¤·¤Þ¤¤¤Þ¤¹. " +"GNOME¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ÏÇ˲õ¹Ô°Ù¤ò»ß¤á¤ë¤è¤¦¤Ê¤³¤È¤Ï¤·¤Þ¤»¤ó" #: gnome/gmount.c:225 msgid "Could not open the /etc/fstab file" @@ -984,7 +983,8 @@ #: gnome/gmount.c:390 #, c-format msgid "Could not symlink %s to %s; will not have such a desktop device icon." -msgstr "%s¤ò%s¤Øsymlink¤Ç¤­¤Þ¤»¤ó; ¥Ç¥¹¥¯¥È¥Ã¥×¡¦¥Ç¥Ð¥¤¥¹¡¦¥¢¥¤¥³¥ó¤Ï¤Ê¤¯¤Ê¤ê¤Þ¤¹" +msgstr "" +"%s¤ò%s¤Øsymlink¤Ç¤­¤Þ¤»¤ó; ¥Ç¥¹¥¯¥È¥Ã¥×¡¦¥Ç¥Ð¥¤¥¹¡¦¥¢¥¤¥³¥ó¤Ï¤Ê¤¯¤Ê¤ê¤Þ¤¹" #: gnome/gmount.c:446 #, c-format @@ -1014,7 +1014,7 @@ #. we set the file part #: gnome/gnome-file-property-dialog.c:170 msgid "Full Name: " -msgstr "¥Õ¥ë¥Ñ¥¹Ì¾:" +msgstr "¥Õ¥ë¥Ñ¥¹Ì¾: " #: gnome/gnome-file-property-dialog.c:178 msgid "File Name" @@ -1113,7 +1113,7 @@ msgstr "ɸ½à¤ÇÍÑ°Õ¤µ¤ì¤¿¥É¥í¥Ã¥×½èÍý¤ò¹Ô¤¦" #: gnome/gnome-file-property-dialog.c:403 -#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194 +#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 #: src/screen.c:2397 src/screen.c:2427 msgid "View" msgstr "ɽ¼¨" @@ -1127,7 +1127,7 @@ msgstr "¥¢¥¤¥³¥ó¤òÁªÂò" #. we do open first -#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187 +#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 msgid "Open" msgstr "³«¤¯" @@ -1143,8 +1143,8 @@ msgid "Use default View action" msgstr "ɸ½à¤ÇÍÑ°Õ¤µ¤ì¤¿É½¼¨½èÍý¤ò¹Ô¤¦" -#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 msgid "Edit" msgstr "ÊÔ½¸" @@ -1276,52 +1276,52 @@ msgid "Program to run" msgstr "¼Â¹Ô¤¹¤ë¥×¥í¥°¥é¥à" -#: gnome/gpopup2.c:188 +#: gnome/gpopup2.c:197 msgid "Mount device" msgstr "¥Ç¥Ð¥¤¥¹¤ò¥Þ¥¦¥ó¥È¤¹¤ë" -#: gnome/gpopup2.c:189 +#: gnome/gpopup2.c:198 msgid "Unmount device" msgstr "¥Ç¥Ð¥¤¥¹¤ò¥Þ¥¦¥ó¥È²ò½ü¤¹¤ë" -#: gnome/gpopup2.c:190 +#: gnome/gpopup2.c:199 msgid "Eject device" msgstr "¥Ç¥Ð¥¤¥¹¤ò¥¤¥¸¥§¥¯¥È¤¹¤ë" -#: gnome/gpopup2.c:193 +#: gnome/gpopup2.c:202 msgid "Open with..." msgstr "ÊÌ¥³¥Þ¥ó¥É¤Ç³«¤¯..." -#: gnome/gpopup2.c:195 +#: gnome/gpopup2.c:204 msgid "View Unfiltered" msgstr "¥Õ¥£¥ë¥¿¤»¤º¤Ëɽ¼¨" -#: gnome/gpopup2.c:198 +#: gnome/gpopup2.c:207 msgid "Copy..." msgstr "¥³¥Ô¡¼..." -#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1100 src/screen.c:2402 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 #: src/screen.c:2432 msgid "Delete" msgstr "ºï½ü" -#: gnome/gpopup2.c:200 +#: gnome/gpopup2.c:209 msgid "Move..." msgstr "°ÜÆ°..." -#: gnome/gpopup2.c:201 +#: gnome/gpopup2.c:210 msgid "Hard Link..." msgstr "¥Ï¡¼¥É¥ê¥ó¥¯..." -#: gnome/gpopup2.c:202 +#: gnome/gpopup2.c:211 msgid "Symlink..." msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯..." -#: gnome/gpopup2.c:203 +#: gnome/gpopup2.c:212 msgid "Edit Symlink..." msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ÊÔ½¸" -#: gnome/gpopup2.c:205 +#: gnome/gpopup2.c:214 msgid "Properties..." msgstr "¥×¥í¥Ñ¥Æ¥£..." @@ -1449,98 +1449,98 @@ msgid "Select icon" msgstr "¥¢¥¤¥³¥óÁªÂò" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºÆÆɤ߹þ¤ß" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." -msgstr "¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê(_D)..." +msgstr "¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê (_D)..." -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "¤³¤³¤Ë¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê¤ÎºîÀ®" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." -msgstr "¿·µ¬¥Õ¥¡¥¤¥ë(_F)..." +msgstr "¿·µ¬¥Õ¥¡¥¤¥ë (_F)..." -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "Creates a new file here" -msgstr "¿·µ¬¥Ç¥£¥ì¥¯¥È¥ê¤ò¤³¤³¤ËºîÀ®¤¹¤ë" +msgstr "¤³¤³¤Ë¿·µ¬¥Õ¥¡¥¤¥ë¤òºîÀ®" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "¸¡º÷: %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "%s ¥Ð¥¤¥È %d ¥Õ¥¡¥¤¥ë" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "%s ¥Ð¥¤¥È %d ¥Õ¥¡¥¤¥ë" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" msgstr "<¥ê¥ó¥¯ÆɤߤÀ¤·¤Ë¼ºÇÔ>" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 msgid "Copy directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò¥³¥Ô¡¼" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òºï½ü" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "¥Õ¥¡¥¤¥ë¤Î°ÜÆ°¤Þ¤¿¤Ï̾Á°Êѹ¹" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Ìá¤ë" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Á°¤Î¥Ç¥£¥ì¥¯¥È¥ê¤ËÌá¤ë" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "¾å" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "°ì¤Ä¾å¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø°ÜÆ°" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "¼¡¤Ø" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "¼¡¤Î¥Ç¥£¥ì¥¯¥È¥ê¤Ø¿Ê¤à" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "ºÆÁöºº" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "¸½ºß¤Î¥Ç¥£¥ì¥¯¥È¥ê¤òºÆ¥¹¥­¥ã¥ó¤¹¤ë" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "¥Û¡¼¥à" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "¤¢¤Ê¤¿¤Î¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ø°ÜÆ°¤¹¤ë" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "¾ì½ê:" @@ -1559,19 +1559,19 @@ msgid "Offset 0x%08lx" msgstr "¥ª¥Õ¥»¥Ã¥È 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:735 #, c-format msgid "Col %d" msgstr "Îó %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "%s¥Ð¥¤¥È" #: gnome/gview.c:306 msgid "_Goto line" -msgstr "¹Ô°ÜÆ°(_G)" +msgstr "¹Ô°ÜÆ° (_G)" #: gnome/gview.c:307 msgid "Jump to a specified line number" @@ -1595,7 +1595,7 @@ #: gnome/gview.c:326 msgid "_Wrap" -msgstr "ÀÞ¤êÊÖ¤·(_W)" +msgstr "ÀÞ¤êÊÖ¤· (_W)" #: gnome/gview.c:327 msgid "Wrap the text" @@ -1604,45 +1604,45 @@ #. Can not use this one yet, as it destroys the viewer, need to fix that #: gnome/gview.c:330 msgid "_Parsed view" -msgstr "ÁöººÉ½¼¨(_P)" +msgstr "ÁöººÉ½¼¨ (_P)" #: gnome/gview.c:333 msgid "_Formatted" -msgstr "À°·Á(_F)" +msgstr "À°·Á (_F)" #: gnome/gview.c:335 msgid "_Hex" -msgstr "16¿Ê¿ô(_H)" +msgstr "16¿Ê¿ô (_H)" #: gnome/gview.c:341 msgid "_Search" -msgstr "¸¡º÷(_S)" +msgstr "¸¡º÷ (_S)" -#: gnome/gwidget.c:90 +#: gnome/gwidget.c:95 msgid "ok" msgstr "λ²ò" -#: gnome/gwidget.c:92 +#: gnome/gwidget.c:97 msgid "cancel" msgstr "¥­¥ã¥ó¥»¥ë" -#: gnome/gwidget.c:94 +#: gnome/gwidget.c:99 msgid "help" msgstr "¥Ø¥ë¥×" -#: gnome/gwidget.c:96 src/file.c:2271 +#: gnome/gwidget.c:101 src/file.c:2268 msgid "yes" msgstr "¤Ï¤¤" -#: gnome/gwidget.c:98 src/file.c:2269 +#: gnome/gwidget.c:103 src/file.c:2266 msgid "no" msgstr "¤¤¤¤¤¨" -#: gnome/gwidget.c:100 +#: gnome/gwidget.c:105 msgid "exit" msgstr "½ªÎ»" -#: gnome/gwidget.c:102 +#: gnome/gwidget.c:107 msgid "abort" msgstr "ÃæÃÇ" @@ -1683,7 +1683,7 @@ #: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 #: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 #: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid " Error " msgstr " ¥¨¥é¡¼ " @@ -1715,11 +1715,11 @@ #: gtkedit/editcmd.c:334 msgid "Quick save " -msgstr "¥¯¥¤¥Ã¥¯¥»¡¼¥Ö" +msgstr "¥¯¥¤¥Ã¥¯¥»¡¼¥Ö " #: gtkedit/editcmd.c:335 msgid "Safe save " -msgstr "¥»¡¼¥Õ¥»¡¼¥Ö" +msgstr "¥»¡¼¥Õ¥»¡¼¥Ö " #: gtkedit/editcmd.c:336 msgid "Do backups -->" @@ -1730,13 +1730,13 @@ #: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 -#: src/chmod.c:114 src/chown.c:79 src/cmd.c:854 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 -#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: src/view.c:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 #: vfs/smbfs.c:116 msgid "&Cancel" -msgstr "¥­¥ã¥ó¥»¥ë(&C)" +msgstr "¥­¥ã¥ó¥»¥ë (&C)" #: gtkedit/editcmd.c:345 msgid "Extension:" @@ -1745,7 +1745,7 @@ #. NLS ? #: gtkedit/editcmd.c:352 msgid " Edit Save Mode " -msgstr "ÊݸÊýË¡¤òÊѹ¹" +msgstr "ÊݸÊýË¡¤òÊѹ¹ " #: gtkedit/editcmd.c:499 msgid " Save As " @@ -1754,9 +1754,9 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:703 src/screen.c:1451 src/screen.c:2129 +#: src/help.c:318 src/main.c:707 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " ·Ù¹ð " @@ -1806,7 +1806,7 @@ #: gtkedit/editcmd.c:687 msgid " Error trying to overwrite macro file " -msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" +msgstr "¥Þ¥¯¥í¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #. This heads the 'Macro' dialog box #: gtkedit/editcmd.c:703 @@ -1842,7 +1842,7 @@ msgstr " ¥Õ¥¡¥¤¥ëÊݸ " #: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 -#: src/view.c:2075 +#: src/view.c:2080 msgid "Save" msgstr "Êݸ" @@ -1865,11 +1865,11 @@ #: gtkedit/editcmd.c:859 msgid " Error trying to open file for reading " -msgstr "Æɤ߹þ¤ß¤Î¤¿¤á¤Ë¥Õ¥¡¥¤¥ë¤ò³«¤³¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" +msgstr "Æɤ߹þ¤ß¤Î¤¿¤á¤Ë¥Õ¥¡¥¤¥ë¤ò³«¤³¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 msgid " Block is large, you may not be able to undo this action. " -msgstr "Â礭¤Ê¥Ö¥í¥Ã¥¯¤Ç¤¹¡£¤³¤ÎÁàºî¤Ï¤ä¤êľ¤»¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó¡£" +msgstr "Â礭¤Ê¥Ö¥í¥Ã¥¯¤Ç¤¹¡£¤³¤ÎÁàºî¤Ï¤ä¤êľ¤»¤Ê¤¤¤«¤â¤·¤ì¤Þ¤»¤ó" #: gtkedit/editcmd.c:1117 msgid " Continue " @@ -1881,19 +1881,19 @@ #: gtkedit/editcmd.c:1173 msgid "o&Ne" -msgstr "°ì¤Ä(&N)" +msgstr "°ì¤Ä (&N)" #: gtkedit/editcmd.c:1175 src/filegui.c:597 msgid "al&L" -msgstr "Á´Éô(&L)" +msgstr "Á´Éô (&L)" -#: gtkedit/editcmd.c:1177 src/file.c:2193 src/filegui.c:267 +#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 msgid "&Skip" -msgstr "¥¹¥­¥Ã¥×(&S)" +msgstr "¥¹¥­¥Ã¥× (&S)" #: gtkedit/editcmd.c:1179 msgid "&Replace" -msgstr "ÃÖ´¹(&R)" +msgstr "ÃÖ´¹ (&R)" #: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 msgid " Replace with: " @@ -1909,11 +1909,11 @@ #: gtkedit/editcmd.c:1223 msgid "replace &All" -msgstr "Á´¤ÆÃÖ¤­´¹¤¨¤ë(&A)" +msgstr "Á´¤ÆÃÖ¤­´¹¤¨¤ë (&A)" #: gtkedit/editcmd.c:1225 msgid "pr&Ompt on replace" -msgstr "ÃÖ´¹»þ¤Ë¥×¥í¥ó¥×¥È(&O)" +msgstr "ÃÖ´¹»þ¤Ë¥×¥í¥ó¥×¥È (&O)" #: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 msgid "&Backwards" @@ -1921,15 +1921,15 @@ #: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 msgid "&Regular expression" -msgstr "Àµµ¬É½¸½(&R)" +msgstr "Àµµ¬É½¸½ (&R)" #: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 msgid "&Whole words only" -msgstr "ñ¸ì¤Î¤ß(&W)" +msgstr "ñ¸ì¤Î¤ß (&W)" #: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 msgid "case &Sensitive" -msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ(&S)" +msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ (&S)" #: gtkedit/editcmd.c:1237 msgid " Enter replacement argument order eg. 3,2,1,4 " @@ -1939,7 +1939,7 @@ msgid " Enter replacement string:" msgstr "ÃÖ´¹Ê¸»úÎó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:2003 msgid " Enter search string:" msgstr "¸¡º÷ʸ»úÎó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" @@ -1951,8 +1951,8 @@ #. Heads the 'Search' dialog box #: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 -#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 -#: src/view.c:1998 +#: src/view.c:1531 src/view.c:1630 src/view.c:1753 src/view.c:1971 +#: src/view.c:2003 msgid " Search " msgstr " ¸¡º÷ " @@ -1981,8 +1981,7 @@ #. Tool hint #: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 msgid "" -"Enter the order of replacement of your scanf" -"\n" +"Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" msgstr "" "scanf ·Á¼°»ØÄêʸ»úÎ󡢤¢¤ë¤¤¤ÏÀµµ¬É½¸½Éôʬʸ»úÎó¤ÎÃÖ´¹¤Î½çÈÖ¤ò\n" @@ -1991,20 +1990,19 @@ #. The following are check boxes #: gtkedit/editcmd.c:1405 msgid " Whole words only " -msgstr "ñ¸ì¤Î¤ß" +msgstr "ñ¸ì¤Î¤ß " #: gtkedit/editcmd.c:1407 msgid " Case sensitive " -msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ" +msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ " #: gtkedit/editcmd.c:1410 msgid " Regular expression " -msgstr "Àµµ¬É½¸½" +msgstr "Àµµ¬É½¸½ " #: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 msgid "" -"See the regex man page for how" -"\n" +"See the regex man page for how\n" "to compose a regular expression" msgstr "" "Àµµ¬É½¸½¤Î½ñ¤­Êý¤Ë¤Ä¤¤¤Æ¤Ï\n" @@ -2012,7 +2010,7 @@ #: gtkedit/editcmd.c:1418 msgid " Backwards " -msgstr "¸åÊý" +msgstr "¸åÊý " #. Tool hint #: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 @@ -2021,7 +2019,7 @@ #: gtkedit/editcmd.c:1434 msgid " Prompt on replace " -msgstr "ÃÖ´¹»þ¤Ë³Îǧ" +msgstr "ÃÖ´¹»þ¤Ë³Îǧ " #. Tool hint #: gtkedit/editcmd.c:1436 @@ -2030,17 +2028,16 @@ #: gtkedit/editcmd.c:1438 msgid " Replace all " -msgstr "Á´ÉôÃÖ´¹¤¹¤ë" +msgstr "Á´ÉôÃÖ´¹¤¹¤ë " #: gtkedit/editcmd.c:1441 msgid " Scanf expression " -msgstr "Scanf ·Á¼°" +msgstr "Scanf ·Á¼° " #. Tool hint #: gtkedit/editcmd.c:1443 msgid "" -"Allows entering of a C format string," -"\n" +"Allows entering of a C format string,\n" "see the scanf man page" msgstr "" "C ¤Î¥Õ¥©¡¼¥Þ¥Ã¥Èʸ»úÎó¤ÎÆþÎϤòµö²Ä¤¹¤ë\n" @@ -2049,7 +2046,7 @@ #. Tool hint #: gtkedit/editcmd.c:1448 msgid "Begin search, Enter" -msgstr "¸¡º÷¤Î³«»Ï, ¥¨¥ó¥¿¡¼" +msgstr "¸¡º÷¤Î³«»Ï, ENTER" #. Tool hint #: gtkedit/editcmd.c:1451 @@ -2075,7 +2072,7 @@ #: gtkedit/editcmd.c:1969 msgid "" " Invalid regular expression, or scanf expression with to many conversions " -msgstr "¤ª¤«¤·¤ÊÀµµ¬É½¸½¡¢¤¢¤ë¤¤¤Ï scanf ·Á¼°¤Ç¤¹¡£ÊÑ´¹¤¬Â¿¤¹¤®¤Þ¤¹" +msgstr "¤ª¤«¤·¤ÊÀµµ¬É½¸½¡¢¤¢¤ë¤¤¤Ï scanf ·Á¼°¤Ç¤¹¡£ÊÑ´¹¤¬Â¿¤¹¤®¤Þ¤¹ " #. "Invalid regexp string or scanf string" #: gtkedit/editcmd.c:2149 @@ -2094,7 +2091,7 @@ #. Confirm 'Quit' dialog box #: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 msgid " Quit " -msgstr "½ªÎ»" +msgstr " ½ªÎ» " #: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 msgid "" @@ -2112,87 +2109,88 @@ msgid "Cancel quit" msgstr "½ªÎ»¤òÃæ»ß" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&Yes" -msgstr "¤Ï¤¤(&Y)" +msgstr "¤Ï¤¤ (&Y)" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&No" -msgstr "¤¤¤¤¤¨(&N)" +msgstr "¤¤¤¤¤¨ (&N)" #: gtkedit/editcmd.c:2292 msgid " &Cancel quit " -msgstr "½ªÎ»¤òÃæ»ß(&C)" +msgstr " ½ªÎ»¤òÃæ»ß (&C) " #: gtkedit/editcmd.c:2292 msgid " &Yes " -msgstr "¤Ï¤¤(&Y)" +msgstr " ¤Ï¤¤ (&Y) " #: gtkedit/editcmd.c:2292 msgid " &No " -msgstr "¤¤¤¤¤¨(&N)" +msgstr " ¤¤¤¤¤¨ (&N) " #: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 msgid " Copy to clipboard " -msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼" +msgstr " ¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ " #: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 #: gtkedit/editcmd.c:2612 msgid " Unable to save to file. " -msgstr "¥Õ¥¡¥¤¥ëÊݸ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿" +msgstr " ¥Õ¥¡¥¤¥ëÊݸ¤¬¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ " #: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 msgid " Cut to clipboard " -msgstr "¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê½Ð¤·" +msgstr " ¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê½Ð¤· " #: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2646 src/view.c:1918 msgid " Goto line " -msgstr "»ØÄê¹Ô¤Ø°ÜÆ°" +msgstr " »ØÄê¹Ô¤Ø°ÜÆ° " #: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 #: gtkedit/editcmd.c:2646 msgid " Enter line: " -msgstr "¹ÔÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " +msgstr " ¹ÔÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " #: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 msgid " Save Block " -msgstr "¥Ö¥í¥Ã¥¯¤òÊݸ" +msgstr " ¥Ö¥í¥Ã¥¯¤òÊݸ " #: gtkedit/editcmd.c:2717 msgid " Insert File " -msgstr "¥Õ¥¡¥¤¥ë¤òÁÞÆþ" +msgstr " ¥Õ¥¡¥¤¥ë¤òÁÞÆþ " #: gtkedit/editcmd.c:2730 msgid " Insert file " -msgstr "¥Õ¥¡¥¤¥ë¤òÁÞÆþ" +msgstr " ¥Õ¥¡¥¤¥ë¤òÁÞÆþ " #: gtkedit/editcmd.c:2730 msgid " Error trying to insert file. " -msgstr "¥Õ¥¡¥¤¥ë¤òÁÞÆþ¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" +msgstr " ¥Õ¥¡¥¤¥ë¤òÁÞÆþ¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #. Not essential to translate #: gtkedit/editcmd.c:2752 msgid " Sort block " -msgstr "¥Ö¥í¥Ã¥¯¤ÇʤÙÂؤ¨" +msgstr " ¥Ö¥í¥Ã¥¯¤ÇʤÙÂؤ¨ " #. Not essential to translate #: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 msgid " You must first highlight a block of text. " -msgstr "¤Þ¤º¥Æ¥­¥¹¥È¥Ö¥í¥Ã¥¯¤ò¥Ï¥¤¥é¥¤¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹" +msgstr " ¤Þ¤º¥Æ¥­¥¹¥È¥Ö¥í¥Ã¥¯¤ò¥Ï¥¤¥é¥¤¥È¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹ " #: gtkedit/editcmd.c:2759 msgid " Run Sort " -msgstr "sort ¤ò¼Â¹Ô " +msgstr "¥½¡¼¥È¤ò¼Â¹Ô " #. Not essential to translate #: gtkedit/editcmd.c:2761 msgid " Enter sort options (see manpage) separated by whitespace: " -msgstr "sort ¤Î¥ª¥×¥·¥ç¥ó (¥Þ¥Ë¥å¥¢¥ë»²¾È) ¤ò¶õÇò¤Ç¶èÀڤäÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " +msgstr "" +" ¥½¡¼¥È¤Î¥ª¥×¥·¥ç¥ó (¥Þ¥Ë¥å¥¢¥ë»²¾È) ¤ò¶õÇò¤Ç¶èÀڤäÆÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " #: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 msgid " Sort " @@ -2201,51 +2199,51 @@ #. Not essential to translate #: gtkedit/editcmd.c:2774 msgid " Error trying to execute sort command " -msgstr "sort ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" +msgstr " ¥½¡¼¥È¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #. Not essential to translate #: gtkedit/editcmd.c:2780 msgid " Sort returned non-zero: " -msgstr "sort ¥³¥Þ¥ó¥É¤¬¥¼¥í°Ê³°¤ÎÊÖ¤êÃÍ: " +msgstr " ¥½¡¼¥È¥³¥Þ¥ó¥É¤¬¥¼¥í°Ê³°¤ÎÊÖ¤êÃÍ: " #. Not essential to translate #: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 msgid " Process block " -msgstr "¥Ö¥í¥Ã¥¯¤ò½èÍý" +msgstr " ¥Ö¥í¥Ã¥¯¤ò½èÍý " #. Not essential to translate #: gtkedit/editcmd.c:2836 msgid " Error trying to stat file " -msgstr "¥Õ¥¡¥¤¥ë¤Î stat ¤ò¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿" +msgstr " ¥Õ¥¡¥¤¥ë¤Î stat ¤ò¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " #: gtkedit/editcmd.c:2907 msgid " Mail " -msgstr "¥á¥¤¥ë" +msgstr " ¥á¥¤¥ë " #: gtkedit/editcmd.c:2920 msgid " Copies to" -msgstr "¥³¥Ô¡¼" +msgstr " ¥³¥Ô¡¼" #: gtkedit/editcmd.c:2924 msgid " Subject" -msgstr "·ï̾" +msgstr " ·ï̾" #: gtkedit/editcmd.c:2928 msgid " To" -msgstr "To" +msgstr " To" #: gtkedit/editcmd.c:2930 msgid " mail -s -c " -msgstr "mail -s -c " +msgstr " mail -s -c " #: gtkedit/editmenu.c:61 msgid " Word wrap " -msgstr "ñ¸ìÀÞ¤êÊÖ¤·" +msgstr " ñ¸ìÀÞ¤êÊÖ¤· " #. Not essential to translate #: gtkedit/editmenu.c:63 msgid " Enter line length, 0 for off: " -msgstr "¹Ô¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (0 ¤Ç¥ª¥Õ): " +msgstr " ¹Ô¤ÎŤµ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (0 ¤Ç¥ª¥Õ): " #: gtkedit/editmenu.c:74 msgid " About " @@ -2271,51 +2269,51 @@ #: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 msgid "&Open/load... C-o" -msgstr "³«¤¯(&O)... C-o" +msgstr "³«¤¯ (&O)... C-o" #: gtkedit/editmenu.c:124 msgid "&New C-n" -msgstr "¿·µ¬ºîÀ®(&N) C-n" +msgstr "¿·µ¬ºîÀ® (&N) C-n" #: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 msgid "&Save F2" -msgstr "Êݸ(&S) F2" +msgstr "Êݸ (&S) F2" #: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "save &As... F12" -msgstr "ÊÌ̾¤ÇÊݸ(&A)... F12" +msgstr "ÊÌ̾¤ÇÊݸ (&A)... F12" #: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 msgid "&Insert file... F15" -msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ(&I)... F15" +msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ (&I)... F15" #: gtkedit/editmenu.c:130 msgid "copy to &File... C-f" -msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼(&F)... C-f" +msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼ (&F)... C-f" #: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 msgid "a&Bout... " -msgstr "¾ðÊó(&B)... " +msgstr "¾ðÊó (&B)... " #: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 msgid "&Quit F10" -msgstr "½ªÎ»(&Q) F10" +msgstr "½ªÎ» (&Q) F10" #: gtkedit/editmenu.c:140 msgid "&New C-x k" -msgstr "¿·µ¬(&N) C-x k" +msgstr "¿·µ¬ (&N) C-x k" #: gtkedit/editmenu.c:146 msgid "copy to &File... " -msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼(&F)..." +msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼ (&F)... " #: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 msgid "&Toggle Mark F3" -msgstr "¥Þ¡¼¥¯¤òÀÚÂؤ¨(&T) F3" +msgstr "¥Þ¡¼¥¯¤òÀÚÂؤ¨ (&T) F3" #: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Mark Columns S-F3" -msgstr "Îó¤Ë¥Þ¡¼¥¯(&M) S-F3" +msgstr "Îó¤Ë¥Þ¡¼¥¯ (&M) S-F3" #: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 msgid "toggle &Ins/overw Ins" @@ -2323,75 +2321,75 @@ #: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 msgid "&Copy F5" -msgstr "¥³¥Ô¡¼(&C) F5" +msgstr "¥³¥Ô¡¼ (&C) F5" #: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Move F6" -msgstr "°ÜÆ°(&M) F6" +msgstr "°ÜÆ° (&M) F6" #: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Delete F8" -msgstr "ºï½ü(&D) F8" +msgstr "ºï½ü (&D) F8" #: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 msgid "&Undo C-u" -msgstr "¤ä¤ê¤Ê¤ª¤·(&U) C-u" +msgstr "¤ä¤ê¤Ê¤ª¤· (&U) C-u" #: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Beginning C-PgUp" -msgstr "ÀèƬ(&B) C-PgUp" +msgstr "ÀèƬ (&B) C-PgUp" #: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&End C-PgDn" -msgstr "ËöÈø(&E) C-PgDn" +msgstr "ËöÈø (&E) C-PgDn" #: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 msgid "&Search... F7" -msgstr "¸¡º÷(&S)... F7" +msgstr "¸¡º÷ (&S)... F7" #: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "search &Again F17" -msgstr "ºÆ¸¡º÷(&A) F17" +msgstr "ºÆ¸¡º÷ (&A) F17" #: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "&Replace... F4" -msgstr "ÃÖ´¹(&R)... F4" +msgstr "ÃÖ´¹ (&R)... F4" #: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 msgid "&Goto line... M-l" -msgstr "¹Ô°ÜÆ°(&G)... M-l" +msgstr "¹Ô°ÜÆ° (&G)... M-l" #: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 msgid "insert &Literal... C-q" -msgstr "ʸ»ú¤òÁÞÆþ(&L)... C-q" +msgstr "ʸ»ú¤òÁÞÆþ (&L)... C-q" #: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 msgid "&Refresh screen C-l" -msgstr "²èÌ̤òºÆÉÁ²è(&R) C-l" +msgstr "²èÌ̤òºÆÉÁ²è (&R) C-l" #: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 msgid "&Start record macro C-r" -msgstr "¥Þ¥¯¥í¤Îµ­Ï¿¤ò³«»Ï(&S) C-r" +msgstr "¥Þ¥¯¥í¤Îµ­Ï¿¤ò³«»Ï (&S) C-r" #: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 msgid "&Finish record macro... C-r" -msgstr "¥Þ¥¯¥í¤Îµ­Ï¿¤ò½ªÎ»(&F)... C-r" +msgstr "¥Þ¥¯¥í¤Îµ­Ï¿¤ò½ªÎ» (&F)... C-r" #: gtkedit/editmenu.c:211 msgid "&Execute macro... C-a, KEY" -msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô(&E)... C-a, KEY" +msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô (&E)... C-a, KEY" #: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 msgid "delete macr&O... " -msgstr "¥Þ¥¯¥í¤òºï½ü(&O) " +msgstr "¥Þ¥¯¥í¤òºï½ü (&O) " #: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 msgid "insert &Date/time " -msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ(&D) " +msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ (&D) " #: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 msgid "format p&Aragraph M-p" -msgstr "ÃÊÍî¤òÀ°·Á(&A) M-p" +msgstr "ÃÊÍî¤òÀ°·Á (&A) M-p" #: gtkedit/editmenu.c:217 msgid "'ispell' s&Pell check C-p" @@ -2403,15 +2401,15 @@ #: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 msgid "'indent' &C Formatter F19" -msgstr "'indent' C¥×¥í¥°¥é¥àÀ°·Á F19" +msgstr "'indent' &C¥×¥í¥°¥é¥àÀ°·Á F19" #: gtkedit/editmenu.c:220 msgid "&Mail... " -msgstr "¥á¥¤¥ë(&M)... " +msgstr "¥á¥¤¥ë (&M)... " #: gtkedit/editmenu.c:233 msgid "&Execute macro... C-x e, KEY" -msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô(&E)... C-x e, KEY" +msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô (&E)... C-x e, KEY" #: gtkedit/editmenu.c:239 msgid "'ispell' s&Pell check M-$" @@ -2419,13 +2417,13 @@ #: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 msgid "&General... " -msgstr "°ìÈÌ(&G)... " +msgstr "°ìÈÌ (&G)... " #: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 msgid "&Save mode..." msgstr "ÊݸÊýË¡(&S)..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1349 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 msgid "&Layout..." msgstr "¥ì¥¤¥¢¥¦¥È(&L)..." @@ -2433,31 +2431,31 @@ #: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279 gtkedit/editmenu.c:396 #: src/chmod.c:164 src/chown.c:130 msgid " File " -msgstr "¥Õ¥¡¥¤¥ë" +msgstr " ¥Õ¥¡¥¤¥ë " #: gtkedit/editmenu.c:271 gtkedit/editmenu.c:280 gtkedit/editmenu.c:412 msgid " Edit " -msgstr "ÊÔ½¸" +msgstr " ÊÔ½¸ " #: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 msgid " Sear/Repl " -msgstr "¸¡º÷¡¦ÃÖ´¹" +msgstr " ¸¡º÷¡¦ÃÖ´¹ " #: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 msgid " Command " -msgstr "¥³¥Þ¥ó¥É" +msgstr " ¥³¥Þ¥ó¥É " #: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 msgid " Options " -msgstr "¥ª¥×¥·¥ç¥ó" +msgstr " ¥ª¥×¥·¥ç¥ó " #: gtkedit/editmenu.c:397 msgid "Open...\tC-o" -msgstr "³«¤¯... C-o" +msgstr "³«¤¯...\tC-o" #: gtkedit/editmenu.c:398 msgid "New\tC-n" -msgstr "¿·µ¬ C-n" +msgstr "¿·µ¬\tC-n" #: gtkedit/editmenu.c:400 msgid "Save\tF2" @@ -2473,7 +2471,7 @@ #: gtkedit/editmenu.c:404 msgid "Copy to file...\tC-f" -msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼...C-f" +msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼...\tC-f" #. Tool hint #: gtkedit/editmenu.c:407 @@ -2482,23 +2480,23 @@ #: gtkedit/editmenu.c:413 msgid "Toggle mark\tF3" -msgstr "¥Þ¡¼¥¯¤Î¥È¥°¥ë F3" +msgstr "¥Þ¡¼¥¯¤Î¥È¥°¥ë\tF3" #: gtkedit/editmenu.c:414 msgid "Toggle mark columns\tC-b" -msgstr "Îó¤Î¥Þ¡¼¥¯¤ò¥È¥°¥ë C-b" +msgstr "Îó¤Î¥Þ¡¼¥¯¤ò¥È¥°¥ë\tC-b" #: gtkedit/editmenu.c:416 msgid "Toggle book mark\tC-M-Ins" -msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥È¥°¥ë C-M-Ins" +msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥È¥°¥ë\tC-M-Ins" #: gtkedit/editmenu.c:417 msgid "Previous book mark\tC-M-Up" -msgstr "Á°¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯ C-M-Up" +msgstr "Á°¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯\tC-M-Up" #: gtkedit/editmenu.c:418 msgid "Next book mark\tC-M-Down" -msgstr "¼¡¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯ C-M-Down" +msgstr "¼¡¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯\tC-M-Down" #: gtkedit/editmenu.c:419 msgid "Flush book marks" @@ -2506,39 +2504,39 @@ #: gtkedit/editmenu.c:421 msgid "Toggle insert/overwrite\tIns" -msgstr "ÁÞÆþ¡¦¾å½ñ¤­¤ÎÀÚÂؤ¨ Ins" +msgstr "ÁÞÆþ¡¦¾å½ñ¤­¤ÎÀÚÂؤ¨\tIns" #: gtkedit/editmenu.c:423 msgid "Copy block to cursor\tF5" -msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤إ³¥Ô¡¼ F5" +msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤إ³¥Ô¡¼\tF5" #: gtkedit/editmenu.c:424 msgid "Move block to cursor\tF6" -msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤ذÜÆ° F6" +msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤ذÜÆ°\tF6" #: gtkedit/editmenu.c:425 msgid "Delete block\tF8/C-Del" -msgstr "¥Ö¥í¥Ã¥¯¤òºï½ü F8/C-Del" +msgstr "¥Ö¥í¥Ã¥¯¤òºï½ü\tF8/C-Del" #: gtkedit/editmenu.c:427 msgid "Copy block to clipbrd\tC-Ins" -msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼ C-Ins" +msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼\tC-Ins" #: gtkedit/editmenu.c:428 msgid "Cut block to clipbrd\tS-Del" -msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê¤À¤· S-Del" +msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê¤À¤·\tS-Del" #: gtkedit/editmenu.c:429 msgid "Paste block from clipbrd\tS-Ins" -msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤«¤éÄ¥¤êÉÕ¤± S-Ins" +msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤«¤éÄ¥¤êÉÕ¤±\tS-Ins" #: gtkedit/editmenu.c:430 msgid "Selection history\tM-Ins" -msgstr "ÁªÂò¤ÎÍúÎò M-Ins" +msgstr "ÁªÂò¤ÎÍúÎò\tM-Ins" #: gtkedit/editmenu.c:432 msgid "Undo\tC-BackSpace" -msgstr "¤ä¤ê¤Ê¤ª¤· C-BackSpace" +msgstr "¤ä¤ê¤Ê¤ª¤·\tC-BackSpace" #. Tool hint #: gtkedit/editmenu.c:435 @@ -2547,7 +2545,7 @@ #: gtkedit/editmenu.c:440 msgid " Srch/Replce " -msgstr "¸¡º÷¡¦ÃÖ´¹" +msgstr " ¸¡º÷¡¦ÃÖ´¹ " #: gtkedit/editmenu.c:441 msgid "Search...\tF7" @@ -2584,7 +2582,7 @@ #: gtkedit/editmenu.c:457 msgid "Execute macro...\tC-a, KEY" -msgstr "¥Þ¥¯¥í¼Â¹Ô...\tC-r" +msgstr "¥Þ¥¯¥í¼Â¹Ô...\tC-a, KEY" #: gtkedit/editmenu.c:458 msgid "Delete macro...\t" @@ -2592,11 +2590,11 @@ #: gtkedit/editmenu.c:460 msgid "Insert date/time\tC-d" -msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ C-d" +msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ\tC-d" #: gtkedit/editmenu.c:461 msgid "Format paragraph\tM-p" -msgstr "ÃÊÍî¤òÀ°·Á M-p" +msgstr "ÃÊÍî¤òÀ°·Á\tM-p" #: gtkedit/editmenu.c:463 msgid "Refresh display\tC-l" @@ -2639,32 +2637,32 @@ #: gtkedit/editoptions.c:88 msgid "synta&X highlighting" -msgstr "ʸˡ¥Ï¥¤¥é¥¤¥È(&S)" +msgstr "ʸˡ¥Ï¥¤¥é¥¤¥È (&S)" #. 7 #: gtkedit/editoptions.c:94 msgid "confir&M before saving" -msgstr "ÊݸÁ°¤Ë³Îǧ(&M)" +msgstr "ÊݸÁ°¤Ë³Îǧ (&M)" #. 8 #: gtkedit/editoptions.c:97 msgid "fill tabs with &Spaces" -msgstr "¥¿¥Ö¤ò¶õÇò¤ÇËä¤á¤ë(&S)" +msgstr "¥¿¥Ö¤ò¶õÇò¤ÇËä¤á¤ë (&S)" #. 9 #: gtkedit/editoptions.c:100 msgid "&Return does autoindent" -msgstr "¥ê¥¿¡¼¥ó¤Ç¼«Æ°Åª¤Ë¥¤¥ó¥Ç¥ó¥È(&R)" +msgstr "¥ê¥¿¡¼¥ó¤Ç¼«Æ°Åª¤Ë¥¤¥ó¥Ç¥ó¥È (&R)" #. 10 #: gtkedit/editoptions.c:103 msgid "&Backspace through tabs" -msgstr "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ÇTAB¤ò°ìµ¤¤Ë¾Ãµî(&B)" +msgstr "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ÇTAB¤ò°ìµ¤¤Ë¾Ãµî (&B)" #. 11 #: gtkedit/editoptions.c:106 msgid "&Fake half tabs" -msgstr "µ¿»÷Ⱦ¥¿¥Ö(&F)" +msgstr "µ¿»÷Ⱦ¥¿¥Ö (&F)" #. 13 #: gtkedit/editoptions.c:112 @@ -2686,8 +2684,8 @@ msgstr "¥¨¥Ç¥£¥¿¤Î½é´ü²½¤Ë¥¨¥é¡¼¤¬µ¯¤³¤ê¤Þ¤·¤¿.\n" #: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1715 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2068 +#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2073 msgid "Help" msgstr "¥Ø¥ë¥×" @@ -2699,19 +2697,19 @@ msgid "Replac" msgstr "ÃÖ´¹" -#: gtkedit/editwidget.c:1102 src/main.c:1717 +#: gtkedit/editwidget.c:1102 src/main.c:1722 msgid "PullDn" msgstr "PullDn" #. gtk_edit_menu #: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1718 src/view.c:2070 src/view.c:2092 +#: src/main.c:1723 src/view.c:2075 src/view.c:2097 msgid "Quit" msgstr "½ªÎ»" #: gtkedit/gtkedit.c:65 msgid "&Dismiss" -msgstr "¾Ãµî(&D)" +msgstr "¾Ãµî (&D)" #: gtkedit/gtkedit.c:66 msgid " Enter file name: " @@ -2725,8 +2723,8 @@ msgid "" "gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n" msgstr "" -"gtkedit.c: ´Ä¶­ÊÑ¿ôHOME¤ÎÀßÄ꤬¤Ê¤¯¡¢¥Ñ¥¹¥ï¡¼¥É¥¨¥ó¥È¥ê¤â¤¢¤ê¤Þ¤»¤ó - ÃæÃǤ·" -"¤Þ¤¹\n" +"gtkedit.c: ´Ä¶­ÊÑ¿ôHOME¤ÎÀßÄ꤬¤Ê¤¯¡¢¥Ñ¥¹¥ï¡¼¥É¥¨¥ó¥È¥ê¤â¤¢¤ê¤Þ¤»¤ó - " +"ÃæÃǤ·¤Þ¤¹\n" #: gtkedit/gtkedit.c:1246 msgid "Interactive help browser" @@ -2772,7 +2770,7 @@ msgid "Delete highlighted text" msgstr "¥Ï¥¤¥é¥¤¥È¤·¤¿¥Æ¥­¥¹¥È¤òºï½ü" -#: gtkedit/gtkedit.c:1255 src/main.c:1716 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "¥á¥Ë¥å" @@ -2867,7 +2865,7 @@ #: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 msgid " Load syntax file " -msgstr "ʸˡ¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É" +msgstr " ʸˡ¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É " #: gtkedit/syntax.c:1487 msgid " File access error " @@ -2876,19 +2874,19 @@ #: gtkedit/syntax.c:1493 #, c-format msgid " Error in file %s on line %d " -msgstr "¥Õ¥¡¥¤¥ë %s ¤Î %d ¹ÔÌܤǥ¨¥é¡¼" +msgstr " ¥Õ¥¡¥¤¥ë %s ¤Î %d ¹ÔÌܤǥ¨¥é¡¼ " #: src/achown.c:72 src/chmod.c:115 src/chown.c:80 msgid "&Set" -msgstr "ÀßÄê(&S)" +msgstr "ÀßÄê (&S)" #: src/achown.c:73 msgid "S&kip" -msgstr "¥¹¥­¥Ã¥×(&k)" +msgstr "¥¹¥­¥Ã¥× (&k)" #: src/achown.c:74 src/chmod.c:119 src/chown.c:83 msgid "Set &all" -msgstr "¤¹¤Ù¤ÆÀßÄê(&A)" +msgstr "¤¹¤Ù¤ÆÀßÄê (&A)" #: src/achown.c:362 src/achown.c:369 msgid "owner" @@ -2940,29 +2938,29 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:639 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 msgid " Oops... " msgstr " ¤¢¤¦¤¦... " #: src/achown.c:667 msgid " I can't run the Advanced Chown command on an extfs " -msgstr "extfs ¤Ç¤Ï¾åµé Chown ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr " extfs ¤Ç¤Ï¾åµé Chown ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " #: src/achown.c:671 msgid " I can't run the Advanced Chown command on a tarfs " -msgstr "tarfs ¤Ç¤Ï¾åµé Chwon ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr " tarfs ¤Ç¤Ï¾åµé Chwon ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " #: src/background.c:181 msgid "Background process:" msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É½èÍý:" -#: src/background.c:287 src/file.c:2192 +#: src/background.c:287 src/file.c:2189 msgid " Background process error " msgstr " ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É½èÍý¥¨¥é¡¼ " #: src/background.c:294 msgid " Child died unexpectedly " -msgstr "»Ò¥×¥í¥»¥¹¤¬»à¤ó¤Ç¤·¤Þ¤¤¤Þ¤·¤¿" +msgstr " »Ò¥×¥í¥»¥¹¤¬»à¤ó¤Ç¤·¤Þ¤¤¤Þ¤·¤¿ " #: src/background.c:296 msgid " Unknown error in child " @@ -2982,31 +2980,31 @@ #: src/boxes.c:63 msgid " Listing mode " -msgstr "°ìÍ÷ÊýË¡" +msgstr " °ìÍ÷ÊýË¡ " #: src/boxes.c:68 msgid "&Full file list" -msgstr "¾ÜºÙ¤Ê¥Õ¥¡¥¤¥ë°ìÍ÷(&F)" +msgstr "¾ÜºÙ¤Ê¥Õ¥¡¥¤¥ë°ìÍ÷ (&F)" #: src/boxes.c:69 msgid "&Brief file list" -msgstr "û¤¤¥Õ¥¡¥¤¥ë°ìÍ÷(&B)" +msgstr "û¤¤¥Õ¥¡¥¤¥ë°ìÍ÷ (&B)" #: src/boxes.c:70 msgid "&Long file list" -msgstr "Ť¤¥Õ¥¡¥¤¥ë°ìÍ÷(&L)" +msgstr "Ť¤¥Õ¥¡¥¤¥ë°ìÍ÷ (&L)" #: src/boxes.c:71 msgid "&User defined:" -msgstr "¥æ¡¼¥¶ÄêµÁ(&U):" +msgstr "¥æ¡¼¥¶ÄêµÁ (&U):" #: src/boxes.c:72 msgid "&Icon view" -msgstr "¥¢¥¤¥³¥óɽ¼¨(&I)" +msgstr "¥¢¥¤¥³¥óɽ¼¨ (&I)" #: src/boxes.c:137 msgid "user &Mini status" -msgstr "¥æ¡¼¥¶¥ß¥Ë¥¹¥Æ¡¼¥¿¥¹(&M)" +msgstr "¥æ¡¼¥¶¥ß¥Ë¥¹¥Æ¡¼¥¿¥¹ (&M)" #: src/boxes.c:186 msgid "Listing mode" @@ -3014,11 +3012,11 @@ #: src/boxes.c:280 msgid "&Reverse" -msgstr "ȿž(&)" +msgstr "ȿž (&R)" #: src/boxes.c:281 msgid "case sensi&tive" -msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ(&t)" +msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ (&t)" #: src/boxes.c:282 msgid "Sort order" @@ -3026,23 +3024,23 @@ #: src/boxes.c:381 msgid " confirm &Exit " -msgstr "½ªÎ»¤ò³Îǧ(&E)" +msgstr "½ªÎ»¤ò³Îǧ (&E)" #: src/boxes.c:383 msgid " confirm e&Xecute " -msgstr "¼Â¹Ô¤ò³Îǧ(&X)" +msgstr "¼Â¹Ô¤ò³Îǧ (&X)" #: src/boxes.c:385 msgid " confirm o&Verwrite " -msgstr "¾å½ñ¤­¤ò³Îǧ(&V)" +msgstr "¾å½ñ¤­¤ò³Îǧ (&V)" #: src/boxes.c:387 msgid " confirm &Delete " -msgstr "ºï½ü¤ò³Îǧ(&D)" +msgstr "ºï½ü¤ò³Îǧ (&D)" #: src/boxes.c:393 msgid " Confirmation " -msgstr "³Îǧ" +msgstr " ³Îǧ " #: src/boxes.c:461 msgid "Full 8 bits output" @@ -3058,15 +3056,15 @@ #: src/boxes.c:468 msgid "F&ull 8 bits input" -msgstr "8 ¥Ó¥Ã¥ÈÆþÎÏ(&F)" +msgstr "8 ¥Ó¥Ã¥ÈÆþÎÏ (&F)" #: src/boxes.c:476 msgid " Display bits " -msgstr "ɽ¼¨¥Ó¥Ã¥È¿ô" +msgstr " ɽ¼¨¥Ó¥Ã¥È¿ô " #: src/boxes.c:651 msgid "&Always use ftp proxy" -msgstr "¾ï¤Ë ftp ¥×¥í¥­¥·¤ò»È¤¦(&A)" +msgstr "¾ï¤Ë ftp ¥×¥í¥­¥·¤ò»È¤¦ (&A)" #: src/boxes.c:653 msgid "sec" @@ -3086,7 +3084,7 @@ #: src/boxes.c:674 msgid " Virtual File System Setting " -msgstr "²¾ÁÛ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÀßÄê" +msgstr " ²¾ÁÛ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÀßÄê " #: src/boxes.c:740 msgid "Quick cd" @@ -3103,7 +3101,7 @@ #: src/boxes.c:833 msgid "Running " -msgstr "¼Â¹ÔÃæ" +msgstr "¼Â¹ÔÃæ " #: src/boxes.c:834 src/find.c:719 src/find.c:960 msgid "Stopped" @@ -3111,15 +3109,15 @@ #: src/boxes.c:895 msgid "&Stop" -msgstr "Ää»ß(&S)" +msgstr "Ää»ß (&S)" #: src/boxes.c:896 msgid "&Resume" -msgstr "ºÆ³«(&R)" +msgstr "ºÆ³« (&R)" #: src/boxes.c:897 msgid "&Kill" -msgstr "¶¯À©½ªÎ»(&K)" +msgstr "¶¯À©½ªÎ» (&K)" #: src/boxes.c:936 msgid "Background Jobs" @@ -3175,15 +3173,15 @@ #: src/chmod.c:116 msgid "C&lear marked" -msgstr "" +msgstr "¥Þ¡¼¥¯¤ò¥¯¥ê¥¢ (&l)" #: src/chmod.c:117 msgid "S&et marked" -msgstr "" +msgstr "¥Þ¡¼¥¯¤òÀßÄê (&e)" #: src/chmod.c:118 msgid "&Marked all" -msgstr "" +msgstr "Á´¥Þ¡¼¥¯ (&M)" #: src/chmod.c:152 msgid "Permissions (Octal)" @@ -3199,11 +3197,11 @@ #: src/chmod.c:160 msgid " Chmod command " -msgstr "chmod ¥³¥Þ¥ó¥É" +msgstr " chmod ¥³¥Þ¥ó¥É " #: src/chmod.c:162 src/chown.c:120 msgid " Permission " -msgstr "¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó" +msgstr " ¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó " #: src/chmod.c:169 msgid "Use SPACE to change" @@ -3227,43 +3225,43 @@ #: src/chmod.c:321 msgid " I can't run the Chmod command on an extfs " -msgstr "extfs ¤Ç¤Ï chmod ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr " extfs ¤Ç¤Ï chmod ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " #: src/chmod.c:325 msgid " I can't run the Chmod command on a tarfs " -msgstr "tarfs ¤Ç¤Ï chmod ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr " tarfs ¤Ç¤Ï chmod ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " #: src/chown.c:81 msgid "Set &users" -msgstr "¥æ¡¼¥¶¤òÀßÄê(&S)" +msgstr "¥æ¡¼¥¶¤òÀßÄê (&S)" #: src/chown.c:82 msgid "Set &groups" -msgstr "¥°¥ë¡¼¥×¤òÀßÄê(&G)" +msgstr "¥°¥ë¡¼¥×¤òÀßÄê (&G)" #: src/chown.c:112 msgid " Name " -msgstr "̾Á°" +msgstr " ̾Á° " #: src/chown.c:114 msgid " Owner name " -msgstr "½êÍ­¼Ô̾" +msgstr " ½êÍ­¼Ô̾ " #: src/chown.c:116 src/chown.c:128 msgid " Group name " -msgstr "¥°¥ë¡¼¥×̾" +msgstr " ¥°¥ë¡¼¥×̾ " #: src/chown.c:118 msgid " Size " -msgstr "Â礭¤µ" +msgstr " Â礭¤µ " #: src/chown.c:124 msgid " Chown command " -msgstr "chown ¥³¥Þ¥ó¥É" +msgstr " chown ¥³¥Þ¥ó¥É " #: src/chown.c:126 msgid " User name " -msgstr "¥æ¡¼¥¶Ì¾" +msgstr " ¥æ¡¼¥¶Ì¾ " #: src/chown.c:192 msgid "" @@ -3276,16 +3274,16 @@ #: src/chown.c:261 msgid " I can't run the Chown command on an extfs " -msgstr "extfs ¤Ç¤Ï chown ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr " extfs ¤Ç¤Ï chown ¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " #: src/chown.c:265 msgid " I can't run the Chown command on a tarfs " -msgstr "tarfs ¤Ç¤Ï chown ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" +msgstr " tarfs ¤Ç¤Ï chown ¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " #: src/cmd.c:198 #, c-format msgid " Can not fetch a local copy of %s " -msgstr "%s ¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó" +msgstr " %s ¤Î¥í¡¼¥«¥ë¥³¥Ô¡¼¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤»¤ó " #: src/cmd.c:248 msgid " CD " @@ -3295,13 +3293,13 @@ msgid "Files tagged, want to cd?" msgstr "¥Õ¥¡¥¤¥ë¤Ï¥¿¥°ÉÕ¤é¤ì¤Æ¤¤¤Þ¤¹¡£cd ¤·¤Þ¤¹¤«?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 msgid "Could not change directory" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÊѹ¹¤Ç¤­¤Þ¤»¤ó" #: src/cmd.c:283 msgid " View file " -msgstr " ¥Õ¥¡¥¤¥ë¤ò¸«¤ë" +msgstr " ¥Õ¥¡¥¤¥ë¤ò¸«¤ë " #: src/cmd.c:283 msgid " Filename:" @@ -3309,11 +3307,11 @@ #: src/cmd.c:300 msgid " Filtered view " -msgstr "¥Õ¥£¥ë¥¿¤µ¤ì¤¿°ìÍ÷" +msgstr " ¥Õ¥£¥ë¥¿¤µ¤ì¤¿°ìÍ÷ " #: src/cmd.c:300 msgid " Filter command and arguments:" -msgstr "¥Õ¥£¥ë¥¿¥³¥Þ¥ó¥É¤È°ú¿ô:" +msgstr " ¥Õ¥£¥ë¥¿¥³¥Þ¥ó¥É¤È°ú¿ô:" #: src/cmd.c:388 msgid "Create a new Directory" @@ -3321,7 +3319,7 @@ #: src/cmd.c:388 msgid " Enter directory name:" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþÎÏ: " +msgstr " ¥Ç¥£¥ì¥¯¥È¥ê̾¤òÆþÎÏ:" #: src/cmd.c:449 msgid " Filter " @@ -3329,15 +3327,15 @@ #: src/cmd.c:449 msgid " Set expression for filtering filenames" -msgstr "¥Õ¥¡¥¤¥ë̾¤Î¥Õ¥£¥ë¥¿¤Î·Á¼°¤òÀßÄê" +msgstr " ¥Õ¥¡¥¤¥ë̾¤Î¥Õ¥£¥ë¥¿¤Î·Á¼°¤òÀßÄê" #: src/cmd.c:515 msgid " Select " -msgstr "ÁªÂò" +msgstr " ÁªÂò " #: src/cmd.c:567 msgid " Unselect " -msgstr "ÁªÂò²ò½ü" +msgstr " ÁªÂò²ò½ü " #: src/cmd.c:640 msgid "Extension file edit" @@ -3345,15 +3343,15 @@ #: src/cmd.c:641 msgid " Which extension file you want to edit? " -msgstr "¤É¤Î³ÈÄ¥¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¤«?" +msgstr " ¤É¤Î³ÈÄ¥¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¤«? " #: src/cmd.c:642 msgid "&User" -msgstr "¥æ¡¼¥¶(&U)" +msgstr "¥æ¡¼¥¶ (&U)" #: src/cmd.c:642 src/cmd.c:668 msgid "&System Wide" -msgstr "¥·¥¹¥Æ¥àÁ´ÂÎ(&S)" +msgstr "¥·¥¹¥Æ¥àÁ´ÂÎ (&S)" #: src/cmd.c:665 msgid "Menu file edit" @@ -3361,173 +3359,174 @@ #: src/cmd.c:666 msgid " Which menu file will you edit? " -msgstr "¤É¤Î¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¤«?" +msgstr " ¤É¤Î¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¤«? " #: src/cmd.c:668 msgid "&Local" -msgstr "¥í¡¼¥«¥ë(&L)" +msgstr "¥í¡¼¥«¥ë (&L)" #: src/cmd.c:668 msgid "&Home" -msgstr "¥Û¡¼¥à(&H)" +msgstr "¥Û¡¼¥à (&H)" -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Compare directories " -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó" +msgstr " ¥Ç¥£¥ì¥¯¥È¥ê¤òÈæ³Ó " -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Select compare method: " -msgstr "Èæ³ÓÊýË¡¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤: " +msgstr " Èæ³ÓÊýË¡¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤: " -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Quick" -msgstr "¥¯¥¤¥Ã¥¯(&Q)" +msgstr "¥¯¥¤¥Ã¥¯ (&Q)" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Size only" -msgstr "Â礭¤µ¤Î¤ß(&S)" +msgstr "Â礭¤µ¤Î¤ß (&S)" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Thorough" -msgstr "Ä̤·¤Ç(&T)" +msgstr "Ä̤·¤Ç (&T)" -#: src/cmd.c:864 +#: src/cmd.c:869 msgid " Both panels should be on the listing view mode to use this command " -msgstr "¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤Ë¤Ï,ξ¥Ñ¥Í¥ë¤È¤â°ìÍ÷ɽ¼¨¥â¡¼¥É¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" +msgstr "" +" ¤³¤Î¥³¥Þ¥ó¥É¤ò»È¤¦¤Ë¤Ï,ξ¥Ñ¥Í¥ë¤È¤â°ìÍ÷ɽ¼¨¥â¡¼¥É¤Ç¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó " -#: src/cmd.c:878 +#: src/cmd.c:883 msgid " The command history is empty " -msgstr "¥³¥Þ¥ó¥É¤ÎÍúÎò¤Ï¶õ¤Ç¤¹" +msgstr " ¥³¥Þ¥ó¥É¤ÎÍúÎò¤Ï¶õ¤Ç¤¹ " -#: src/cmd.c:884 +#: src/cmd.c:889 msgid " Command history " -msgstr "¥³¥Þ¥ó¥É¤ÎÍúÎò" +msgstr " ¥³¥Þ¥ó¥É¤ÎÍúÎò " -#: src/cmd.c:926 +#: src/cmd.c:931 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " msgstr "" -"xterm ¤Þ¤¿¤Ï Linux ¥³¥ó¥½¡¼¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó;\n" -"¥Ñ¥Í¥ë¤ò¥È¥°¥ë¤Ç¤­¤Þ¤»¤ó." +" xterm ¤Þ¤¿¤Ï Linux ¥³¥ó¥½¡¼¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó; \n" +" ¥Ñ¥Í¥ë¤ò¥È¥°¥ë¤Ç¤­¤Þ¤»¤ó" -#: src/cmd.c:965 +#: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" msgstr "`exit' ¤ÈÆþÎϤ¹¤ì¤Ð Midnight Commander ¤ØÌá¤ê¤Þ¤¹" -#: src/cmd.c:1020 +#: src/cmd.c:1025 #, c-format msgid "" " Couldn't stat %s \n" " %s " msgstr "" -"%s ¤ò stat ¤Ç¤­¤Þ¤»¤ó\n" -"%s" +" %s ¤ò stat ¤Ç¤­¤Þ¤»¤ó \n" +" %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1034 src/cmd.c:1036 msgid " Link " -msgstr "¥ê¥ó¥¯: %s" +msgstr " ¥ê¥ó¥¯ " -#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1704 +#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 msgid " to:" msgstr " to:" -#: src/cmd.c:1041 +#: src/cmd.c:1046 #, c-format msgid " link: %s " -msgstr "¥ê¥ó¥¯: %s " +msgstr " ¥ê¥ó¥¯: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1079 #, c-format msgid " symlink: %s " -msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯: %s " +msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯: %s " -#: src/cmd.c:1128 +#: src/cmd.c:1133 #, c-format msgid " Symlink `%s' points to: " -msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ `%s' ¤Î¥ê¥ó¥¯Àè: " +msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ `%s' ¤Î¥ê¥ó¥¯Àè: " -#: src/cmd.c:1133 +#: src/cmd.c:1138 msgid " Edit symlink " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸ " -#: src/cmd.c:1138 +#: src/cmd.c:1143 #, c-format msgid " edit symlink, unable to remove %s: %s " -msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸, %s¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s" +msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸, %s¤òºï½ü¤Ç¤­¤Þ¤»¤ó: %s " -#: src/cmd.c:1142 +#: src/cmd.c:1147 #, c-format msgid " edit symlink: %s " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸: %s " -#: src/cmd.c:1169 +#: src/cmd.c:1174 msgid " Link symbolically " msgstr " ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òÄ¥¤ë " -#: src/cmd.c:1170 +#: src/cmd.c:1175 msgid " Relative symlink " msgstr " ÁêÂÐŪ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ " -#: src/cmd.c:1181 +#: src/cmd.c:1186 #, c-format msgid " relative symlink: %s " msgstr " ÁêÂÐŪ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯: %s " -#: src/cmd.c:1331 +#: src/cmd.c:1336 msgid " Enter machine name (F1 for details): " msgstr " ¥Þ¥·¥ó̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(¾ÜºÙ¤ÏF1¥­¡¼): " -#: src/cmd.c:1355 +#: src/cmd.c:1360 #, c-format msgid " Could not chdir to %s " -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤ò%s¤ØÊѹ¹¤Ç¤­¤Þ¤»¤ó" +msgstr " ¥Ç¥£¥ì¥¯¥È¥ê¤ò%s¤ØÊѹ¹¤Ç¤­¤Þ¤»¤ó " -#: src/cmd.c:1362 +#: src/cmd.c:1367 msgid " Link to a remote machine " msgstr " ¥ê¥â¡¼¥È¡¦¥Þ¥·¥ó¤Ø¤Î¥ê¥ó¥¯ " -#: src/cmd.c:1368 +#: src/cmd.c:1373 msgid " FTP to machine " msgstr " ¥Þ¥·¥ó¤Ø¤ÎFTP " -#: src/cmd.c:1374 +#: src/cmd.c:1379 msgid " SMB link to machine " -msgstr " ¥Þ¥·¥ó¤Ø¤ÎSMB¥ê¥ó¥¯" +msgstr " ¥Þ¥·¥ó¤Ø¤ÎSMB¥ê¥ó¥¯ " -#: src/cmd.c:1384 +#: src/cmd.c:1389 msgid " Socket source routing setup " -msgstr "¥½¥±¥Ã¥È¤Î¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°ÀßÄê" +msgstr " ¥½¥±¥Ã¥È¤Î¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°ÀßÄê " -#: src/cmd.c:1385 +#: src/cmd.c:1390 msgid " Enter host name to use as a source routing hop: " -msgstr "¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Î hop ¤Ë»È¤¦¥Û¥¹¥È¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " +msgstr " ¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Î hop ¤Ë»È¤¦¥Û¥¹¥È¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Host name " msgstr " ¥Û¥¹¥È̾ " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Error while looking up IP address " -msgstr " IP¥¢¥É¥ì¥¹¤ò¸«ÉÕ¤±¤ëºÝ¤Î¥¨¥é¡¼" +msgstr " IP¥¢¥É¥ì¥¹¤ò¸«ÉÕ¤±¤ëºÝ¤Î¥¨¥é¡¼ " -#: src/cmd.c:1403 +#: src/cmd.c:1408 msgid " Undelete files on an ext2 file system " -msgstr "ext2¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Î¥Õ¥¡¥¤¥ëºï½ü¤Î¤ä¤êľ¤·" +msgstr " ext2¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Î¥Õ¥¡¥¤¥ëºï½ü¤Î¤ä¤êľ¤· " -#: src/cmd.c:1404 +#: src/cmd.c:1409 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -"¥Õ¥¡¥¤¥ë¤òÉü³è¤µ¤»¤ë¥Ç¥Ð¥¤¥¹¤Î¥Ç¥Ð¥¤¥¹Ì¾ (/dev/ ¤Ï¾Ê¤¯) ¤ò\n" -"ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: (F1 ¤Ç¾ÜºÙ)" +" ¥Õ¥¡¥¤¥ë¤òÉü³è¤µ¤»¤ë¥Ç¥Ð¥¤¥¹¤Î¥Ç¥Ð¥¤¥¹Ì¾ (/dev/ ¤Ï¾Ê¤¯) ¤ò\n" +" ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: (F1 ¤Ç¾ÜºÙ)" -#: src/cmd.c:1454 +#: src/cmd.c:1459 msgid " Setup saved to ~/" -msgstr "ÀßÄê¤Ï ~/ ¤ØÊݸ¤µ¤ì¤Þ¤·¤¿" +msgstr " ÀßÄê¤Ï ~/ ¤ØÊݸ¤µ¤ì¤Þ¤·¤¿" -#: src/cmd.c:1459 +#: src/cmd.c:1464 msgid " Setup " msgstr " ÀßÄê " @@ -3542,7 +3541,7 @@ #: src/command.c:198 msgid " You can not execute commands on non-local filesystems" -msgstr " Èó¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ç¤Ï¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó " +msgstr " Èó¥í¡¼¥«¥ë¤Î¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¾å¤Ç¤Ï¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" #: src/dialog.c:56 msgid "" @@ -3562,44 +3561,44 @@ #: src/dir.c:61 msgid "&Unsorted" -msgstr "ʤÙÂؤ¨Ìµ¤·(&U)" +msgstr "ʤÙÂؤ¨Ìµ¤· (&U)" #: src/dir.c:62 msgid "&Name" -msgstr "̾Á°(&N)" +msgstr "̾Á° (&N)" #: src/dir.c:63 msgid "&Extension" -msgstr "³ÈÄ¥»Ò(&E)" +msgstr "³ÈÄ¥»Ò (&E)" #: src/dir.c:64 msgid "&Modify time" -msgstr "¹¹¿·»þ¹ï(&M)" +msgstr "¹¹¿·»þ¹ï (&M)" #: src/dir.c:65 msgid "&Access time" -msgstr "¥¢¥¯¥»¥¹»þ¹ï(&A)" +msgstr "¥¢¥¯¥»¥¹»þ¹ï (&A)" #: src/dir.c:66 msgid "&Change time" -msgstr "Êѹ¹»þ¹ï(&C)" +msgstr "Êѹ¹»þ¹ï (&C)" #: src/dir.c:67 msgid "&Size" -msgstr "¥µ¥¤¥º(&S)" +msgstr "¥µ¥¤¥º (&S)" #: src/dir.c:68 msgid "&Inode" -msgstr "I¥Î¡¼¥É(&I)" +msgstr "I¥Î¡¼¥É (&I)" #. New sort orders #: src/dir.c:71 msgid "&Type" -msgstr "·Á¼°(&T)" +msgstr "·Á¼° (&T)" #: src/dir.c:72 msgid "&Links" -msgstr "¥ê¥ó¥¯(&L)" +msgstr "¥ê¥ó¥¯ (&L)" #: src/dir.c:73 msgid "N&GID" @@ -3611,40 +3610,40 @@ #: src/dir.c:75 msgid "&Owner" -msgstr "½êÍ­¼Ô(&O)" +msgstr "½êÍ­¼Ô (&O)" #: src/dir.c:76 msgid "&Group" -msgstr "¥°¥ë¡¼¥×(&G)" +msgstr "¥°¥ë¡¼¥× (&G)" #: src/dir.c:386 #, c-format -msgid "File exists but can not be stat-ed: %s %s" -msgstr "¥Õ¥¡¥¤¥ë¤Ï¸ºß¤·¤Þ¤¹¤¬ stat ¤Ç¤­¤Þ¤»¤ó: %s %s" +msgid "File '%s' exists but can not be stat-ed: %s" +msgstr "¥Õ¥¡¥¤¥ë '%s' ¤Ï¸ºß¤·¤Þ¤¹¤¬ stat-ed ¤Ç¤­¤Þ¤»¤ó: %s" #: src/dir.c:657 msgid "Unknown" msgstr "ÉÔÌÀ" -#: src/ext.c:143 src/user.c:506 +#: src/ext.c:143 src/user.c:499 #, c-format msgid "" " Can't generate unique filename \n" " %s " msgstr "" -"°ì°Õ¤Ê¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó\n" +" °ì°Õ¤Ê¥Õ¥¡¥¤¥ë̾¤òÀ¸À®¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/ext.c:150 src/user.c:518 +#: src/ext.c:150 src/user.c:511 #, c-format msgid "" " Can't create temporary command file \n" " %s " msgstr "" -" °ì»þŪ¤Ê¥³¥Þ¥ó¥É¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n" +" °ì»þŪ¤Ê¥³¥Þ¥ó¥É¡¦¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/ext.c:165 src/user.c:547 +#: src/ext.c:165 src/user.c:533 msgid " Parameter " msgstr " ¥Ñ¥é¥á¡¼¥¿ " @@ -3670,10 +3669,8 @@ #: src/ext.c:432 msgid "" -" file has changed" -"\n" -"with version 3.0. You may want either to" -"\n" +" file has changed\n" +"with version 3.0. You may want either to\n" "copy it from " msgstr "" "¤Î·Á¼°¤Ï version 3.0 ¤ÇÊѤï¤ê¤Þ¤·¤¿¡£\n" @@ -3682,8 +3679,7 @@ #: src/ext.c:434 msgid "" -"mc.ext or use that" -"\n" +"mc.ext or use that\n" "file as an example of how to write it.\n" msgstr "" "mc.ext ¤«¤é¥³¥Ô¡¼¤¹¤ë¤«¡¢¤½¤ì¤ò½ñ¤­Êý¤Î\n" @@ -3747,7 +3743,7 @@ " Cannot overwrite directory \"%s\" \n" " %s " msgstr "" -"¥Ç¥£¥ì¥¯¥È¥ê \"%s\" ¤ò¾å½ñ¤­¤Ç¤­¤Þ¤»¤ó\n" +" ¥Ç¥£¥ì¥¯¥È¥ê \"%s\" ¤ò¾å½ñ¤­¤Ç¤­¤Þ¤»¤ó \n" " %s " #: src/file.c:518 @@ -3756,7 +3752,7 @@ " Cannot stat source file \"%s\" \n" " %s " msgstr "" -"¸µ¥Õ¥¡¥¤¥ë \"%s\" ¤ò stat ¤Ç¤­¤Þ¤»¤ó\n" +" ¸µ¥Õ¥¡¥¤¥ë \"%s\" ¤ò stat ¤Ç¤­¤Þ¤»¤ó\n" " %s " #: src/file.c:531 @@ -3770,7 +3766,7 @@ " Cannot create special file \"%s\" \n" " %s " msgstr "" -"¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë \"%s\" ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n" +" ¥¹¥Ú¥·¥ã¥ë¥Õ¥¡¥¤¥ë \"%s\" ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó\n" " %s " #: src/file.c:583 src/file.c:812 @@ -3779,7 +3775,7 @@ " Cannot chown target file \"%s\" \n" " %s " msgstr "" -"¥¿¡¼¥²¥Ã¥È¥Õ¥¡¥¤¥ë \"%s\" ¤ò chown ¤Ç¤­¤Þ¤»¤ó\n" +" ¥¿¡¼¥²¥Ã¥È¥Õ¥¡¥¤¥ë \"%s\" ¤ò chown ¤Ç¤­¤Þ¤»¤ó\n" " %s " #: src/file.c:592 src/file.c:831 @@ -3788,7 +3784,7 @@ " Cannot chmod target file \"%s\" \n" " %s " msgstr "" -"¥¿¡¼¥²¥Ã¥È¥Õ¥¡¥¤¥ë \"%s\" ¤ò chmod ¤Ç¤­¤Þ¤»¤ó\n" +" ¥¿¡¼¥²¥Ã¥È¥Õ¥¡¥¤¥ë \"%s\" ¤ò chmod ¤Ç¤­¤Þ¤»¤ó\n" " %s " #: src/file.c:609 @@ -3797,7 +3793,7 @@ " Cannot open source file \"%s\" \n" " %s " msgstr "" -"¸µ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó\n" +" ¸µ¥Õ¥¡¥¤¥ë \"%s\" ¤ò³«¤±¤Þ¤»¤ó\n" " %s " #: src/file.c:619 @@ -3873,15 +3869,15 @@ #: src/file.c:802 msgid "Incomplete file was retrieved. Keep it?" -msgstr " ¥Õ¥¡¥¤¥ë¤ò´°Á´¤Ë¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Êݸ¤·¤Þ¤¹¤«?" +msgstr "¥Õ¥¡¥¤¥ë¤ò´°Á´¤Ë¼èÆÀ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿¡£Êݸ¤·¤Þ¤¹¤«?" #: src/file.c:803 msgid "&Delete" -msgstr "ºï½ü(&D)" +msgstr "ºï½ü (&D)" #: src/file.c:803 src/hotlist.c:1443 msgid "&Keep" -msgstr "Êݸ(&K)" +msgstr "Êݸ (&K)" #: src/file.c:876 #, c-format @@ -4088,21 +4084,21 @@ #: src/file.c:1875 src/screen.c:2117 msgid "No" -msgstr "¤¤¤¨¤¨" +msgstr "¤¤¤¤¤¨" #: src/file.c:1928 msgid " Sorry, I could not put the job in background " msgstr " ¤´¤á¤ó¤Ê¤µ¤¤¡£¥¸¥ç¥Ö¤ò¥Ð¥Ã¥¯¥°¥é¥ó¥É½èÍý¤Ë¤Ç¤­¤Þ¤»¤ó " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Internal failure " msgstr " ÆâÉô¥¨¥é¡¼ " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " msgstr " ÉÔÌÀ¤Ê¥Õ¥¡¥¤¥ëÁàºî¤Ç¤¹ " -#: src/file.c:2031 +#: src/file.c:2029 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -4111,15 +4107,15 @@ " ÂÐ¾Ý \"%s\" ¤Ï¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó \n" " %s " -#: src/file.c:2193 +#: src/file.c:2190 msgid "&Retry" -msgstr "ºÆ»î¹Ô(&R)" +msgstr "ºÆ»î¹Ô (&R)" -#: src/file.c:2193 src/file.c:2254 src/filegui.c:264 src/filegui.c:592 +#: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" -msgstr "ÃæÃÇ(&A)" +msgstr "ÃæÃÇ (&A)" -#: src/file.c:2245 +#: src/file.c:2242 msgid "" "\n" " Directory not empty. \n" @@ -4129,7 +4125,7 @@ " ¥Ç¥£¥ì¥¯¥È¥ê¤¬¶õ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó \n" " ºÆµ¢Åª¤Ëºï½ü¤·¤Þ¤¹¤«? " -#: src/file.c:2246 +#: src/file.c:2243 msgid "" "\n" " Background process: Directory not empty \n" @@ -4139,27 +4135,27 @@ " ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹: ¥Ç¥£¥ì¥¯¥È¥ê¤Ï¶õ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó \n" " ºÆµ¢Åª¤Ëºï½ü¤·¤Þ¤¹¤«? " -#: src/file.c:2253 +#: src/file.c:2250 msgid "a&ll" -msgstr "Á´Éô(&L)" +msgstr "Á´Éô (&L)" -#: src/file.c:2253 src/filegui.c:595 +#: src/file.c:2250 src/filegui.c:595 msgid "non&E" -msgstr "¤Ê¤·(&E)" +msgstr "¤Ê¤· (&E)" -#: src/file.c:2263 +#: src/file.c:2260 msgid " Type 'yes' if you REALLY want to delete " -msgstr "" +msgstr " ËÜÅö¤Ëºï½ü¤·¤Æ¤â¤è¤¤¾ì¹ç¤Ï 'yes' ¤ÈÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ " -#: src/file.c:2265 +#: src/file.c:2262 msgid "all the directories " -msgstr "" +msgstr "Á´¥Ç¥£¥ì¥¯¥È¥ê " -#: src/file.c:2267 +#: src/file.c:2264 msgid " Recursive Delete " msgstr " ºÆµ¢Åªºï½ü " -#: src/file.c:2268 +#: src/file.c:2265 msgid " Background process: Recursive Delete " msgstr " ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥×¥í¥»¥¹: ºÆµ¢Åªºï½ü " @@ -4194,11 +4190,11 @@ #: src/filegui.c:593 msgid "if &Size differs" -msgstr "¥µ¥¤¥º¤¬°Û¤Ê¤ì¤Ð(&S)" +msgstr "¥µ¥¤¥º¤¬°Û¤Ê¤ì¤Ð (&S)" #: src/filegui.c:596 msgid "&Update" -msgstr "¹¹¿·(&U)" +msgstr "¹¹¿· (&U)" #: src/filegui.c:598 msgid "Overwrite all targets?" @@ -4206,11 +4202,11 @@ #: src/filegui.c:600 msgid "&Reget" -msgstr "ºÆ¼èÆÀ(&R)" +msgstr "ºÆ¼èÆÀ (&R)" #: src/filegui.c:601 msgid "ap&Pend" -msgstr "ÄɲÃ(&P)" +msgstr "Äɲà (&P)" #: src/filegui.c:604 msgid "Overwrite this target?" @@ -4237,12 +4233,12 @@ #. follow symlinks and preserve Attributes must be the first #: src/filegui.c:805 msgid "preserve &Attributes" -msgstr "°À­¤òÊݸ¤¹¤ë(&A)" +msgstr "°À­¤òÊݸ¤¹¤ë (&A)" #. &op_preserve #: src/filegui.c:807 msgid "follow &Links" -msgstr "¥ê¥ó¥¯¤ò¤¿¤É¤ë(&L)" +msgstr "¥ê¥ó¥¯¤ò¤¿¤É¤ë (&L)" #. &file_mask_op_follow_links #: src/filegui.c:809 @@ -4251,20 +4247,20 @@ #: src/filegui.c:810 msgid "&Using shell patterns" -msgstr "¥·¥§¥ë¥Ñ¥¿¡¼¥ó¤ò»ÈÍÑ(&U)" +msgstr "¥·¥§¥ë¥Ñ¥¿¡¼¥ó¤ò»ÈÍÑ (&U)" #: src/filegui.c:831 msgid "&Background" -msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É(&B)" +msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É (&B)" #: src/filegui.c:840 msgid "&Stable Symlinks" -msgstr "°ÂÄꥷ¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯(&S)" +msgstr "°ÂÄꥷ¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯ (&S)" #. &file_mask_stable_symlinks #: src/filegui.c:842 msgid "&Dive into subdir if exists" -msgstr "¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤¹¤ì¤ÐÆþ¤ë(&D)" +msgstr "¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤¬Â¸ºß¤¹¤ì¤ÐÆþ¤ë (&D)" #: src/filegui.c:1001 #, c-format @@ -4277,35 +4273,35 @@ #: src/find.c:130 msgid "&Suspend" -msgstr "°ì»þÄä»ß(&S)" +msgstr "°ì»þÄä»ß (&S)" #: src/find.c:131 msgid "Con&tinue" -msgstr "³¹Ô(&T)" +msgstr "³¹Ô (&T)" #: src/find.c:132 msgid "&Chdir" -msgstr "¥Ç¥£¥ì¥¯¥È¥ê°ÜÆ°(&C)" +msgstr "¥Ç¥£¥ì¥¯¥È¥ê°ÜÆ° (&C)" #: src/find.c:133 msgid "&Again" -msgstr "¤â¤¦°ìÅÙ(&A)" +msgstr "¤â¤¦°ìÅÙ (&A)" #: src/find.c:134 msgid "&Quit" -msgstr "½ªÎ»(&Q)" +msgstr "½ªÎ» (&Q)" #: src/find.c:135 src/panelize.c:89 msgid "Pane&lize" -msgstr "¥Ñ¥Í¥ë²½(&L)" +msgstr "¥Ñ¥Í¥ë²½ (&L)" #: src/find.c:136 msgid "&View - F3" -msgstr "ɽ¼¨(&V) - F3" +msgstr "ɽ¼¨ (&V) - F3" #: src/find.c:137 msgid "&Edit - F4" -msgstr "ÊÔ½¸(&E) - F4" +msgstr "ÊÔ½¸ (&E) - F4" #: src/find.c:170 msgid "Start at:" @@ -4319,9 +4315,9 @@ msgid "Content: " msgstr "ÆâÍÆ:" -#: src/find.c:171 src/main.c:1240 src/main.c:1264 +#: src/find.c:171 src/main.c:1244 src/main.c:1268 msgid "&Tree" -msgstr "¥Ä¥ê¡¼(&T)" +msgstr "¥Ä¥ê¡¼ (&T)" #: src/find.c:223 msgid "Find File" @@ -4344,7 +4340,7 @@ msgid "Finished" msgstr "½ªÎ»" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1531 #, c-format msgid "Searching %s" msgstr "%s¤ò¸¡º÷Ãæ" @@ -4400,6 +4396,9 @@ " Topics:\n" "\n" msgstr "" +"[Ìܼ¡]\n" +"¥È¥Ô¥Ã¥¯:\n" +"\n" #: src/help.c:279 msgid "" @@ -4421,7 +4420,7 @@ msgid " Help " msgstr " ¥Ø¥ë¥× " -#: src/help.c:766 src/user.c:655 +#: src/help.c:766 src/user.c:637 #, c-format msgid "" " Can't open file %s \n" @@ -4445,39 +4444,39 @@ #: src/hotlist.c:132 msgid "&Move" -msgstr "°ÜÆ°(&M)" +msgstr "°ÜÆ° (&M)" #: src/hotlist.c:133 src/hotlist.c:1443 src/panelize.c:88 src/wtools.c:383 msgid "&Remove" -msgstr "ºï½ü(&R)" +msgstr "ºï½ü (&R)" #: src/hotlist.c:134 src/hotlist.c:818 src/hotlist.c:915 msgid "&Append" -msgstr "ÄɲÃ(&A)" +msgstr "Äɲà (&A)" #: src/hotlist.c:135 src/hotlist.c:816 src/hotlist.c:913 msgid "&Insert" -msgstr "ÁÞÆþ(&I)" +msgstr "ÁÞÆþ (&I)" #: src/hotlist.c:136 msgid "New &Entry" -msgstr "¿·µ¬¥¨¥ó¥È¥ê(&E)" +msgstr "¿·µ¬¥¨¥ó¥È¥ê (&E)" #: src/hotlist.c:137 msgid "New &Group" -msgstr "¿·µ¬¥°¥ë¡¼¥×(&G)" +msgstr "¿·µ¬¥°¥ë¡¼¥× (&G)" #: src/hotlist.c:139 msgid "&Up" -msgstr "¾å¤Ø(&U)" +msgstr "¾å¤Ø (&U)" #: src/hotlist.c:140 msgid "&Add current" -msgstr "ÄɲÃ(&A)" +msgstr "Äɲà (&A)" #: src/hotlist.c:141 msgid "Change &To" -msgstr "Êѹ¹(&T)" +msgstr "Êѹ¹ (&T)" #: src/hotlist.c:201 msgid "Subgroup - press ENTER to see list" @@ -4493,7 +4492,7 @@ #: src/hotlist.c:639 msgid " Directory path " -msgstr "¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ñ¥¹" +msgstr " ¥Ç¥£¥ì¥¯¥È¥ê¤Î¥Ñ¥¹ " #. This one holds the displayed pathname #: src/hotlist.c:642 src/hotlist.c:689 @@ -4593,8 +4592,7 @@ #: src/hotlist.c:1433 msgid "" -"by an earlier development version of MC" -"\n" +"by an earlier development version of MC\n" "and is more actual than ~/" msgstr "½é´ü³«È¯ÈǤΠMC ¤ÇºîÀ®¤µ¤ì¡¢¼ÂºÝ¤Î ~/" @@ -4628,7 +4626,7 @@ #: src/hotlist.c:1443 msgid "&Merge" -msgstr "¹çÀ®(&M)" +msgstr "¹çÀ® (&M)" #: src/hotlist.c:1455 msgid " Entries from ~/" @@ -4737,51 +4735,51 @@ #: src/layout.c:159 msgid "&Vertical" -msgstr "¿âľ(&V)" +msgstr "¿âľ (&V)" #: src/layout.c:160 msgid "&Horizontal" -msgstr "¿åÊ¿(&H)" +msgstr "¿åÊ¿ (&H)" #: src/layout.c:170 msgid "&Xterm hintbar" -msgstr "xterm¥Ò¥ó¥È¥Ð¡¼(&X)" +msgstr "xterm¥Ò¥ó¥È¥Ð¡¼ (&X)" #: src/layout.c:171 msgid "h&Intbar visible" -msgstr "¥Ò¥ó¥È¥Ð¡¼É½¼¨(&I)" +msgstr "¥Ò¥ó¥È¥Ð¡¼É½¼¨ (&I)" #: src/layout.c:172 msgid "&Keybar visible" -msgstr "¥­¡¼¥Ð¡¼É½¼¨(&K)" +msgstr "¥­¡¼¥Ð¡¼É½¼¨ (&K)" #: src/layout.c:173 msgid "command &Prompt" -msgstr "¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È(&P)" +msgstr "¥³¥Þ¥ó¥É¥×¥í¥ó¥×¥È (&P)" #: src/layout.c:174 msgid "show &Mini status" -msgstr "¥ß¥Ë¥¹¥Æ¡¼¥¿¥¹¤òɽ¼¨(&M)" +msgstr "¥ß¥Ë¥¹¥Æ¡¼¥¿¥¹¤òɽ¼¨ (&M)" #: src/layout.c:175 msgid "menu&Bar visible" -msgstr "¥á¥Ë¥å¡¼¥Ð¡¼¤òɽ¼¨(&B)" +msgstr "¥á¥Ë¥å¡¼¥Ð¡¼¤òɽ¼¨ (&B)" #: src/layout.c:176 msgid "&Equal split" -msgstr "Ʊ¤¸Â礭¤µ¤Ëʬ³ä(&E)" +msgstr "Ʊ¤¸Â礭¤µ¤Ëʬ³ä (&E)" #: src/layout.c:177 msgid "pe&Rmissions" -msgstr "¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó(&R)" +msgstr "¥Ñ¡¼¥ß¥Ã¥·¥ç¥ó (&R)" #: src/layout.c:178 msgid "&File types" -msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥×(&F)" +msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥× (&F)" #: src/layout.c:372 src/learn.c:60 src/learn.c:179 src/option.c:145 msgid "&Save" -msgstr "Êݸ(&S)" +msgstr "Êݸ (&S)" #. length of line with '<' '>' buttons #: src/layout.c:380 @@ -4819,16 +4817,13 @@ #: src/learn.c:94 #, c-format msgid "" -"Please press the %s" -"\n" +"Please press the %s\n" "and then wait until this message disappears.\n" "\n" -"Then, press it again to see if OK appears" -"\n" +"Then, press it again to see if OK appears\n" "next to its button.\n" "\n" -"If you want to escape, press a single Escape key" -"\n" +"If you want to escape, press a single Escape key\n" "and wait as well." msgstr "" "%s ¤ò²¡¤·¤Æ¤³¤Î¥á¥Ã¥»¡¼¥¸¤¬\n" @@ -4855,8 +4850,7 @@ #: src/learn.c:177 msgid "" -"It seems that all your keys already" -"\n" +"It seems that all your keys already\n" "work fine. That's great." msgstr "" "¤¹¤Ù¤Æ¤Î¥­¡¼¤ÏÌäÂê¤Ê¤µ¤½¤¦¤Ç¤¹¡£\n" @@ -4864,12 +4858,11 @@ #: src/learn.c:179 msgid "&Discard" -msgstr "ÇË´þ(&D)" +msgstr "ÇË´þ (&D)" #: src/learn.c:183 msgid "" -"Great! You have a complete terminal database!" -"\n" +"Great! You have a complete terminal database!\n" "All your keys work well." msgstr "" "¤¹¤Ð¤é¤·¤¤! ¥¿¡¼¥ß¥Ê¥ë¥Ç¡¼¥¿¥Ù¡¼¥¹¤Ï´°À®¤·¤Þ¤·¤¿!\n" @@ -4891,7 +4884,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "¥¹¤«¥Þ¥¦¥¹¤ò²¡¤·¤Æ¥­¡¼ÄêµÁ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£TAB¤Ç°ÜÆ°¤Ç¤­¤Þ¤¹" -#: src/main.c:704 +#: src/main.c:708 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4903,259 +4896,263 @@ "\"su\" ¥³¥Þ¥ó¥É¤ÇÆÃÊ̤ʸ¢¸Â¤ò¹Ô»È¤·¤¿¤Î¤Ç¤Ï¤Ê¤¤¤Ç\n" "¤¹¤«?" -#: src/main.c:779 +#: src/main.c:783 msgid "Press any key to continue..." msgstr "¤Ê¤Ë¤«¥­¡¼¤ò²¡¤»¤Ð³¹Ô¤·¤Þ¤¹..." -#: src/main.c:829 +#: src/main.c:833 msgid " The shell is already running a command " msgstr " ¥·¥§¥ë¤Ï¤¹¤Ç¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹ÔÃæ¤Ç¤¹ " -#: src/main.c:856 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: src/main.c:857 +#: src/main.c:861 msgid " Do you really want to quit the Midnight Commander? " msgstr "ËÜÅö¤ËMidnight Commander¤ò½ªÎ»¤µ¤»¤Þ¤¹¤«?" -#: src/main.c:1237 src/main.c:1261 +#: src/main.c:1241 src/main.c:1265 msgid "&Listing mode..." -msgstr "°ìÍ÷ÊýË¡(&L)..." +msgstr "°ìÍ÷ÊýË¡ (&L)..." -#: src/main.c:1238 src/main.c:1262 +#: src/main.c:1242 src/main.c:1266 msgid "&Quick view C-x q" -msgstr "´Ê°×ɽ¼¨(&Q) C-x q" +msgstr "´Ê°×ɽ¼¨ (&Q) C-x q" -#: src/main.c:1239 src/main.c:1263 +#: src/main.c:1243 src/main.c:1267 msgid "&Info C-x i" -msgstr "¾ðÊó(&I) C-x i" +msgstr "¾ðÊó (&I) C-x i" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1246 src/main.c:1270 msgid "&Sort order..." -msgstr "À°Îó½ç(&S)..." +msgstr "À°Îó½ç (&S)..." -#: src/main.c:1244 src/main.c:1268 +#: src/main.c:1248 src/main.c:1272 msgid "&Filter..." -msgstr "¥Õ¥£¥ë¥¿(&F)..." +msgstr "¥Õ¥£¥ë¥¿ (&F)..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1251 src/main.c:1275 msgid "&Network link..." -msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥ê¥ó¥¯(&N)..." +msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥ê¥ó¥¯ (&N)..." -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1252 src/main.c:1276 msgid "FT&P link..." -msgstr "FTP ¥ê¥ó¥¯(&P)..." +msgstr "FTP ¥ê¥ó¥¯ (&P)..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1254 src/main.c:1278 msgid "SM&B link..." -msgstr "SMB¥ê¥ó¥¯(&B)..." +msgstr "SMB¥ê¥ó¥¯ (&B)..." -#: src/main.c:1255 src/main.c:1279 +#: src/main.c:1259 src/main.c:1283 msgid "&Drive... M-d" -msgstr "¥É¥é¥¤¥Ö(&D)... M-d" +msgstr "¥É¥é¥¤¥Ö (&D)... M-d" -#: src/main.c:1257 src/main.c:1281 +#: src/main.c:1261 src/main.c:1285 msgid "&Rescan C-r" -msgstr "ºÆ¥¹¥­¥ã¥ó(&R) C-r" +msgstr "ºÆ¥¹¥­¥ã¥ó (&R) C-r" -#: src/main.c:1285 +#: src/main.c:1289 msgid "&User menu F2" -msgstr "¥æ¡¼¥¶¥á¥Ë¥å¡¼(&U) F2" +msgstr "¥æ¡¼¥¶¥á¥Ë¥å¡¼(&U) F2" -#: src/main.c:1286 +#: src/main.c:1290 msgid "&View F3" -msgstr "ɽ¼¨(&V) F3" +msgstr "ɽ¼¨(&V) F3" -#: src/main.c:1287 +#: src/main.c:1291 msgid "Vie&w file... " -msgstr "¥Õ¥¡¥¤¥ë¤òɽ¼¨(&W)..." +msgstr "¥Õ¥¡¥¤¥ë¤òɽ¼¨(&W)... " -#: src/main.c:1288 +#: src/main.c:1292 msgid "&Filtered view M-!" -msgstr "¥Õ¥£¥ë¥¿¥ê¥ó¥°¤·¤Æɽ¼¨(&F) M-!" +msgstr "¥Õ¥£¥ë¥¿¥ê¥ó¥°¤·¤Æɽ¼¨(&F) M-!" -#: src/main.c:1289 +#: src/main.c:1293 msgid "&Edit F4" -msgstr "ÊÔ½¸(&E) F4" +msgstr "ÊÔ½¸(&E) F4" -#: src/main.c:1290 +#: src/main.c:1294 msgid "&Copy F5" -msgstr "¥³¥Ô¡¼(&C) F5" +msgstr "¥³¥Ô¡¼(&C) F5" -#: src/main.c:1291 +#: src/main.c:1295 msgid "c&Hmod C-x c" -msgstr "chmod(&H) C-x c" +msgstr "chmod(&H) C-x c" -#: src/main.c:1293 +#: src/main.c:1297 msgid "&Link C-x l" -msgstr "¥ê¥ó¥¯(&L) C-x l" +msgstr "¥ê¥ó¥¯(&L) C-x l" -#: src/main.c:1294 +#: src/main.c:1298 msgid "&SymLink C-x s" -msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯(&S) C-x s" +msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯(&S) C-x s" -#: src/main.c:1295 +#: src/main.c:1299 msgid "edit s&Ymlink C-x C-s" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸(&Y) C-x C-s" -#: src/main.c:1296 +#: src/main.c:1300 msgid "ch&Own C-x o" -msgstr "chown(&O) C-x o" +msgstr "chown(&O) C-x o" -#: src/main.c:1297 +#: src/main.c:1301 msgid "&Advanced chown " -msgstr "¾åµéchown(&A)" +msgstr "¾åµéchown(&A) " -#: src/main.c:1299 +#: src/main.c:1303 msgid "&Rename/Move F6" -msgstr "̾Á°Êѹ¹¡¦°ÜÆ°(&R) F6" +msgstr "̾Á°Êѹ¹¡¦°ÜÆ°(&R) F6" -#: src/main.c:1300 +#: src/main.c:1304 msgid "&Mkdir F7" -msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®(&M) F7" +msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®(&M) F7" -#: src/main.c:1301 +#: src/main.c:1305 msgid "&Delete F8" -msgstr "ºï½ü(&D) F8" +msgstr "ºï½ü(&D) F8" -#: src/main.c:1302 +#: src/main.c:1306 msgid "&Quick cd M-c" -msgstr "¥¯¥¤¥Ã¥¯cd(&Q) M-c" +msgstr "¥¯¥¤¥Ã¥¯cd(&Q) M-c" -#: src/main.c:1304 +#: src/main.c:1308 msgid "select &Group M-+" -msgstr "¥°¥ë¡¼¥×ÁªÂò(&G) M-+" +msgstr "¥°¥ë¡¼¥×ÁªÂò(&G) M-+" -#: src/main.c:1305 +#: src/main.c:1309 msgid "u&Nselect group M-\\" -msgstr "¥°¥ë¡¼¥×ÁªÂò²ò½ü(&N) M-\\" +msgstr "¥°¥ë¡¼¥×ÁªÂò²ò½ü(&N) M-\\" -#: src/main.c:1306 +#: src/main.c:1310 msgid "reverse selec&Tion M-*" -msgstr "ÁªÂòȿž(&N) M-*" +msgstr "ÁªÂòȿž(&N) M-*" -#: src/main.c:1308 +#: src/main.c:1312 msgid "e&Xit F10" -msgstr "½ªÎ»(&X) F10" +msgstr "½ªÎ»(&X) F10" -#: src/main.c:1318 +#: src/main.c:1322 msgid "&Directory tree" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼(&D)" -#: src/main.c:1320 +#: src/main.c:1324 msgid "&Find file M-?" msgstr "¥Õ¥¡¥¤¥ë¸¡º÷(&F) M-?" -#: src/main.c:1321 +#: src/main.c:1325 msgid "s&Wap panels C-u" msgstr "¥Ñ¥Í¥ë¤òÆþ¤ì´¹¤¨(&W) C-u" -#: src/main.c:1322 +#: src/main.c:1326 msgid "switch &Panels on/off C-o" msgstr "¥Ñ¥Í¥ë¤Îon/offÀÚÂØ(&P) C-o" -#: src/main.c:1323 +#: src/main.c:1327 msgid "&Compare directories C-x d" msgstr "¥Ç¥£¥ì¥¯¥È¥êÈæ³Ó(&C) C-x d" -#: src/main.c:1324 +#: src/main.c:1328 msgid "e&Xternal panelize C-x !" msgstr "³°Éô¥Ñ¥Í¥ë(&X) C-x !" -#: src/main.c:1325 +#: src/main.c:1329 msgid "show directory s&Izes" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥µ¥¤¥ºÉ½¼¨(&I)" -#: src/main.c:1327 +#: src/main.c:1331 msgid "command &History" msgstr "¥³¥Þ¥ó¥ÉÍúÎò(&H)" -#: src/main.c:1328 +#: src/main.c:1332 msgid "di&Rectory hotlist C-\\" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥Û¥Ã¥È¥ê¥¹¥È(&R) C-\\" -#: src/main.c:1330 +#: src/main.c:1334 msgid "&Active VFS list C-x a" msgstr "¥¢¥¯¥Æ¥£¥Ö¤ÊVFS°ìÍ÷(&V) C-x a" -#: src/main.c:1333 +#: src/main.c:1335 +msgid "Fr&ee VFSs now" +msgstr "VFS ¤ò²òÊü" + +#: src/main.c:1338 msgid "&Background jobs C-x j" msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥¸¥ç¥Ö(&B) C-x j" -#: src/main.c:1337 +#: src/main.c:1342 msgid "&Undelete files (ext2fs only)" msgstr "¥Õ¥¡¥¤¥ë¤ÎÉü³è(&U) (ext2fs¤Î¤ß)" -#: src/main.c:1340 +#: src/main.c:1345 msgid "&Listing format edit" msgstr "°ìÍ÷·Á¼°ÊÔ½¸(&L)" -#: src/main.c:1342 +#: src/main.c:1347 msgid "&Extension file edit" msgstr "³ÈÄ¥¥Õ¥¡¥¤¥ë¤òÊÔ½¸(&E)" -#: src/main.c:1343 +#: src/main.c:1348 msgid "&Menu file edit" msgstr "¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ëÊÔ½¸(&M)" -#: src/main.c:1348 +#: src/main.c:1353 msgid "&Configuration..." msgstr "ÀßÄê(&C)..." -#: src/main.c:1350 +#: src/main.c:1355 msgid "c&Onfirmation..." msgstr "³Îǧ(&O)..." -#: src/main.c:1351 +#: src/main.c:1356 msgid "&Display bits..." msgstr "ɽ¼¨¥Ó¥Ã¥È¿ô(&D)..." -#: src/main.c:1353 +#: src/main.c:1358 msgid "learn &Keys..." msgstr "¥­¡¼¤Î³Ø½¬(&K)..." -#: src/main.c:1356 +#: src/main.c:1361 msgid "&Virtual FS..." msgstr "²¾ÁÛFS(&V)..." -#: src/main.c:1359 +#: src/main.c:1364 msgid "&Save setup" msgstr "ÀßÄêÊݸ(&S)" -#: src/main.c:1375 src/main.c:1377 +#: src/main.c:1380 src/main.c:1382 msgid " &Left " msgstr "º¸(&L)" -#: src/main.c:1377 +#: src/main.c:1382 msgid " &Above " msgstr "¾å(&A)" -#: src/main.c:1380 +#: src/main.c:1385 msgid " &File " msgstr " ¥Õ¥¡¥¤¥ë(&F) " -#: src/main.c:1381 +#: src/main.c:1386 msgid " &Command " msgstr " ¥³¥Þ¥ó¥É(&C) " -#: src/main.c:1382 +#: src/main.c:1387 msgid " &Options " msgstr " ¥ª¥×¥·¥ç¥ó(&O) " -#: src/main.c:1384 src/main.c:1386 +#: src/main.c:1389 src/main.c:1391 msgid " &Right " msgstr " ±¦(&R) " -#: src/main.c:1386 +#: src/main.c:1391 msgid " &Below " msgstr " ²¼(&B) " -#: src/main.c:1441 +#: src/main.c:1446 msgid " Information " msgstr " ¾ðÊó " -#: src/main.c:1442 +#: src/main.c:1447 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5167,143 +5164,144 @@ " ¥ì¥¯¥È¥ê¤ÎºÆÆɹþ¤ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¥Þ¥Ë¥å\n" " ¥¢¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤" -#: src/main.c:1921 +#: src/main.c:1926 msgid "Thank you for using GNU Midnight Commander" msgstr " GNU Midnight Command ¤Î¤´ÍøÍÑ¡¢¤¢¤ê¤¬¤È¤´¤¶¤¤¤Þ¤·¤¿" -#: src/main.c:2280 +#: src/main.c:2283 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "xterm%s ¤Ë¤è¤ë¥Þ¥¦¥¹¥µ¥Ý¡¼¥ÈÍ­¤ê\n" -#: src/main.c:2281 +#: src/main.c:2284 msgid " and the Linux console" msgstr "Linux console ¤Ç¤Î¥µ¥Ý¡¼¥È¤âÍ­¤ê" -#: src/main.c:2376 +#: src/main.c:2380 msgid "The TERM environment variable is unset!\n" msgstr "´Ä¶­ÊÑ¿ô TERM ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/main.c:2586 +#: src/main.c:2591 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Midnight Commander ¤Î¥é¥¤¥Ö¥é¥ê¥Ç¥£¥ì¥¯¥È¥ê: %s\n" -#: src/main.c:2600 +#: src/main.c:2605 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" -msgstr "¥ª¥×¥·¥ç¥ó -m ¤ÏÇѻߤµ¤ì¤Þ¤·¤¿¡£¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î¡Öɽ¼¨¥Ó¥Ã¥È¿ô...¡×¤ò¤´Í÷¤¯¤À¤µ¤¤\n" +msgstr "" +"¥ª¥×¥·¥ç¥ó -m " +"¤ÏÇѻߤµ¤ì¤Þ¤·¤¿¡£¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î¡Öɽ¼¨¥Ó¥Ã¥È¿ô...¡×¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: src/main.c:2677 +#: src/main.c:2682 msgid "Use to debug the background code" msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î¥³¡¼¥É¤Î¥Ç¥Ð¥Ã¥°¤Ë»ÈÍÑ" -#: src/main.c:2683 +#: src/main.c:2688 msgid "Request to run in color mode" msgstr "¥«¥é¡¼¥â¡¼¥É¤Ç¤Î¼Â¹Ô¤òÍ×µá" -#: src/main.c:2685 +#: src/main.c:2690 msgid "Specifies a color configuration" msgstr "¥«¥é¡¼ÀßÄê¤ò»ØÄê" -#: src/main.c:2690 +#: src/main.c:2695 msgid "Edits one file" msgstr "¥Õ¥¡¥¤¥ë¤òÊÔ½¸" -#: src/main.c:2694 +#: src/main.c:2699 msgid "Displays this help message" msgstr "¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/main.c:2697 +#: src/main.c:2702 msgid "Displays a help screen on how to change the color scheme" msgstr "¥«¥é¡¼¥¹¥­¡¼¥à¤ÎÊѹ¹ÊýË¡¤ò²èÌ̤Ëɽ¼¨" -#: src/main.c:2700 +#: src/main.c:2705 msgid "Log ftp dialog to specified file" msgstr "ftp ¤ÎÂÐÏõ­Ï¿¤ò»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ËÊݸ" -#: src/main.c:2707 +#: src/main.c:2712 msgid "Obsolete" msgstr "ÇÑ»ß" -#: src/main.c:2709 +#: src/main.c:2714 msgid "Requests to run in black and white" msgstr "Çò¹õ¥â¡¼¥É¤Ç¤Î¼Â¹Ô¤òÍ×µá" -#: src/main.c:2711 +#: src/main.c:2716 msgid "Disable mouse support in text version" msgstr "¥Æ¥­¥¹¥ÈÈǤǤΥޥ¦¥¹¤Î¥µ¥Ý¡¼¥È¤ò̵¸ú²½" -#: src/main.c:2714 +#: src/main.c:2719 msgid "Disables subshell support" msgstr "¥µ¥Ö¥·¥§¥ë¤Î¥µ¥Ý¡¼¥È¤ò̵¸ú²½" -#: src/main.c:2718 +#: src/main.c:2723 msgid "Prints working directory at program exit" msgstr "¥×¥í¥°¥é¥à½ªÎ»»þ¤Ëºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨" -#: src/main.c:2720 +#: src/main.c:2725 msgid "Resets soft keys on HP terminals" msgstr "HP¥¿¡¼¥ß¥Ê¥ë¤Ç¥½¥Õ¥È¥¦¥§¥¢¥­¡¼¥Ü¡¼¥É¤òÍ×µá" -#: src/main.c:2722 +#: src/main.c:2727 msgid "To run on slow terminals" msgstr "ÃÙ¤¤Ã¼Ëö¤Ç¼Â¹Ô" -#: src/main.c:2725 +#: src/main.c:2730 msgid "Use stickchars to draw" msgstr "stickchars ¤ÇÉÁ²è" -#: src/main.c:2729 +#: src/main.c:2734 msgid "Enables subshell support (default)" msgstr "¥µ¥Ö¥·¥§¥ë¤Î¥µ¥Ý¡¼¥È (¥Ç¥Õ¥©¥ë¥È)" -#: src/main.c:2734 +#: src/main.c:2739 msgid "Tries to use termcap instead of terminfo" msgstr "terminfo¤ÎÂå¤ï¤ê¤Ëtermcap¤ò»î¤¹" -#: src/main.c:2738 +#: src/main.c:2743 msgid "Displays the current version" msgstr "¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨" -#: src/main.c:2740 +#: src/main.c:2745 msgid "Launches the file viewer on a file" msgstr "¥Õ¥¡¥¤¥ë¥Ó¥å¡¼¥¢¤òµ¯Æ°" -#: src/main.c:2742 +#: src/main.c:2747 msgid "Forces xterm features" msgstr "¶¯À©Åª¤Ë xterm µ¡Ç½¤ò»È¤¦" -#: src/main.c:2744 +#: src/main.c:2749 msgid "Geometry for the window" msgstr "¥¦¥¤¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê" -#: src/main.c:2744 +#: src/main.c:2749 msgid "GEOMETRY" msgstr "GEOMETRY" -#: src/main.c:2745 +#: src/main.c:2750 msgid "No windows opened at startup" msgstr "µ¯Æ°»þ¤Ë¥¦¥¤¥ó¥É¥¦¤òɽ¼¨¤·¤Ê¤¤" -#: src/main.c:2747 +#: src/main.c:2752 msgid "Display the directory that holds the .links startup files and exit" msgstr ".links µ¯Æ°¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨¤·, ½ªÎ»" -#: src/main.c:3039 +#: src/main.c:3062 msgid "" -"Couldn't open tty line. You have to run mc without the -P flag." -"\n" +"Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" msgstr "" "tty ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó. -P ¥Õ¥é¥°¤òÉÕ¤±¤º¤Ëµ¯Æ°¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó.\n" "¤¤¤¯¤Ä¤«¤Î¥·¥¹¥Æ¥à¤Ç¤Ï # `which mc` ¤ò¼Â¹Ô¤·¤¿¤Û¤¦¤¬Îɤ¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" -#: src/main.c:3117 +#: src/main.c:3140 msgid " Notice " msgstr " Ãí°Õ " -#: src/main.c:3118 +#: src/main.c:3141 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5408,7 +5406,7 @@ #. Similar code is in layout.c (init_layout()) #: src/option.c:153 msgid " Configure options " -msgstr " ÀßÄꥪ¥×¥·¥ç¥ó" +msgstr " ÀßÄꥪ¥×¥·¥ç¥ó " #: src/option.c:154 msgid " Panel options " @@ -5424,7 +5422,7 @@ #: src/panelize.c:87 msgid "&Add new" -msgstr "" +msgstr "¿·µ¬Äɲà (&A)" #: src/panelize.c:99 msgid " External panelize " @@ -5460,7 +5458,7 @@ #: src/panelize.c:403 msgid "Cannot invoke command." -msgstr "¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó." +msgstr "¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤Ç¤­¤Þ¤»¤ó" #: src/panelize.c:458 msgid "Pipe close failed" @@ -5517,7 +5515,7 @@ #: src/screen.c:1451 msgid "User suplied format looks invalid, reverting to default." -msgstr "¥æ¡¼¥¶¤Î»ØÄꤷ¤¿·Á¼°¤ÏÉÔÀµ¤Ê¤è¤¦¤Ç¤¹. ¥Ç¥Õ¥©¥ë¥È¤ËÌᤷ¤Þ¤¹." +msgstr "¥æ¡¼¥¶¤Î»ØÄꤷ¤¿·Á¼°¤ÏÉÔÀµ¤Ê¤è¤¦¤Ç¤¹. ¥Ç¥Õ¥©¥ë¥È¤ËÌᤷ¤Þ¤¹" #: src/screen.c:2116 src/screen.c:2164 msgid " Do you really want to execute? " @@ -5637,52 +5635,52 @@ "¥Õ¥¡¥¤¥ë %s ¤Ë½ñ¤­¹þ¤á¤Þ¤»¤ó:\n" "%s\n" -#: src/user.c:261 +#: src/user.c:250 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " ÉÔÀµ¤Ê¥·¥§¥ë¥Ñ¥¿¡¼¥óÄêµÁ¤Ç¤¹ \"%c\". " -#: src/user.c:394 +#: src/user.c:383 msgid " Debug " msgstr " ¥Ç¥Ð¥Ã¥° " -#: src/user.c:403 +#: src/user.c:392 msgid " ERROR: " msgstr " ¥¨¥é¡¼: " -#: src/user.c:407 +#: src/user.c:396 msgid " True: " msgstr " ¿¿: " -#: src/user.c:409 +#: src/user.c:398 msgid " False: " msgstr " µ¶: " -#: src/user.c:621 +#: src/user.c:602 msgid " Warning -- ignoring file " msgstr " ·Ù¹ð -- ¥Õ¥¡¥¤¥ë¤ò̵»ë " -#: src/user.c:622 +#: src/user.c:603 #, c-format msgid "" -"File %s is not owned by root or you or is world writable." -"\n" +"File %s is not owned by root or you or is world writable.\n" "Using it may compromise your security" msgstr "" "¥Õ¥¡¥¤¥ë %s ¤Ï root ¤ä¤¢¤Ê¤¿¤Î½êͭʪ¤Ç¤Ï¤Ê¤¤¤Î¤Ëï¤Ç¤â½ñ¤­¹þ¤ß\n" "²Äǽ¤Ç¤¹.ÍøÍѤ¹¤ë¤È¤¢¤Ê¤¿¤Î¥»¥­¥å¥ê¥Æ¥£¤ò¿¯³²¤¹¤ë¶²¤ì¤¬¤¢¤ê¤Þ¤¹" -#: src/user.c:640 +#: src/user.c:622 msgid " I can't run programs while logged on a non local directory " msgstr " ¥í¡¼¥«¥ë¤Ç¤Ê¤¤¥Ç¥£¥ì¥¯¥È¥ê¤Ë¤¤¤ë»þ¤Ë¥×¥í¥°¥é¥à¤Î¼Â¹Ô¤Ï¤Ç¤­¤Þ¤»¤ó " -#: src/user.c:724 +#. FIXME: this message is not quite right +#: src/user.c:720 #, c-format msgid " Empty file %s " msgstr " ¶õ¤Î¥Õ¥¡¥¤¥ë %s " #. Create listbox -#: src/user.c:733 +#: src/user.c:730 msgid " User menu " msgstr " ¥æ¡¼¥¶¡¼¡¦¥á¥Ë¥å¡¼ " @@ -5708,7 +5706,7 @@ msgid " Dup failed " msgstr " dup ¼ºÇÔ " -#: src/view.c:401 +#: src/view.c:406 msgid "" "File: \n" "\n" @@ -5718,44 +5716,47 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:407 msgid "" "\n" "\n" "has been modified, do you want to save the changes?\n" -msgstr "\n\n¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿. Êѹ¹ÅÀ¤òÊݸ¤·¤Þ¤¹¤«?\n" +msgstr "" +"\n" +"\n" +"¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿. Êѹ¹ÅÀ¤òÊݸ¤·¤Þ¤¹¤«?\n" -#: src/view.c:404 +#: src/view.c:409 msgid " Save changes " msgstr " Êѹ¹ÅÀ¤òÊݸ " -#: src/view.c:446 +#: src/view.c:451 msgid " Can't spawn child program " msgstr " »Ò¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó " -#: src/view.c:455 +#: src/view.c:460 msgid " Empty output from child filter " msgstr " ¥Õ¥£¥ë¥¿¤«¤é¶õ¤Î½ÐÎϤǤ¹ " -#: src/view.c:460 +#: src/view.c:465 msgid " Could not open file " msgstr " ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó " -#: src/view.c:475 +#: src/view.c:480 msgid " Can't open file \"" msgstr " ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó \"" -#: src/view.c:482 +#: src/view.c:487 msgid "" " Can't stat file \n" " " msgstr " ¥Õ¥¡¥¤¥ë¤ò stat ¤Ç¤­¤Þ¤»¤ó \"" -#: src/view.c:488 +#: src/view.c:493 msgid " Can't view: not a regular file " msgstr " ɽ¼¨¤Ç¤­¤Þ¤»¤ó: Ä̾ï¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó " -#: src/view.c:569 +#: src/view.c:574 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5764,7 +5765,7 @@ " \"%s\" ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/view.c:578 +#: src/view.c:583 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5773,34 +5774,34 @@ " \"%s\" ¤òstat¤Ç¤­¤Þ¤»¤ó\n" " %s " -#: src/view.c:714 +#: src/view.c:719 #, c-format msgid "File: %s" msgstr "¥Õ¥¡¥¤¥ë: %s" -#: src/view.c:728 +#: src/view.c:733 #, c-format msgid "Offset 0x%08x" msgstr "¥ª¥Õ¥»¥Ã¥È 0x%08x" -#: src/view.c:739 +#: src/view.c:744 msgid " [grow]" msgstr " [grow]" -#: src/view.c:1518 +#: src/view.c:1523 #, c-format msgid "Searching for `%s'" msgstr "`%s'¤ò¸¡º÷Ãæ" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1630 src/view.c:1753 msgid " Search string not found " msgstr " ¸¡º÷ʸ»úÎ󤬸«ÉÕ¤«¤ê¤Þ¤»¤ó " -#: src/view.c:1787 +#: src/view.c:1792 msgid " Invalid regular expression " msgstr " ÉÔÀµ¤ÊÀµµ¬É½¸½¤Ç¤¹ " -#: src/view.c:1911 +#: src/view.c:1916 #, c-format msgid "" " The current line number is %d.\n" @@ -5809,7 +5810,7 @@ " ¸½ºß¤Î¹ÔÈÖ¹æ¤Ï %d ¤Ç¤¹.\n" " ¿·¤·¤¤¹ÔÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: src/view.c:1933 +#: src/view.c:1938 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5818,67 +5819,67 @@ " ¸½ºß¤Î¥¢¥É¥ì¥¹¤Ï0x%lx¤Ç¤¹.\n" " ¿·¤·¤¤¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: src/view.c:1935 +#: src/view.c:1940 msgid " Goto Address " msgstr " ¥¢¥É¥ì¥¹°ÜÆ° " -#: src/view.c:1966 +#: src/view.c:1971 msgid " Enter regexp:" msgstr " Àµµ¬É½¸½¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Ascii" msgstr "ASCII" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "HEX" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "°ÜÆ°" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "¹Ô" -#: src/view.c:2075 +#: src/view.c:2080 msgid "RxSrch" msgstr "RxSrch" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdText" msgstr "EdText" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdHex" msgstr "EdHex" -#: src/view.c:2080 +#: src/view.c:2085 msgid "UnWrap" msgstr "ÈóÀÞÊÖ" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "ÀÞÊÖ" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "HxSrch" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "Raw" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "Parse" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "Unform" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "Format" @@ -5890,83 +5891,83 @@ #. to define f0 as well. Also, it makes Learn keys a bunch of problems :( #: src/win.c:224 msgid "Function key 1" -msgstr "" +msgstr "Function¥­¡¼ 1" #: src/win.c:225 msgid "Function key 2" -msgstr "" +msgstr "Function¥­¡¼ 2" #: src/win.c:226 msgid "Function key 3" -msgstr "" +msgstr "Function¥­¡¼ 3" #: src/win.c:227 msgid "Function key 4" -msgstr "" +msgstr "Function¥­¡¼ 4" #: src/win.c:228 msgid "Function key 5" -msgstr "" +msgstr "Function¥­¡¼ 5" #: src/win.c:229 msgid "Function key 6" -msgstr "" +msgstr "Function¥­¡¼ 6" #: src/win.c:230 msgid "Function key 7" -msgstr "" +msgstr "Function¥­¡¼ 7" #: src/win.c:231 msgid "Function key 8" -msgstr "" +msgstr "Function¥­¡¼ 8" #: src/win.c:232 msgid "Function key 9" -msgstr "" +msgstr "Function¥­¡¼ 9" #: src/win.c:233 msgid "Function key 10" -msgstr "" +msgstr "Function¥­¡¼ 10" #: src/win.c:234 msgid "Function key 11" -msgstr "" +msgstr "Function¥­¡¼ 11" #: src/win.c:235 msgid "Function key 12" -msgstr "" +msgstr "Function¥­¡¼ 12" #: src/win.c:236 msgid "Function key 13" -msgstr "" +msgstr "Function¥­¡¼ 13" #: src/win.c:237 msgid "Function key 14" -msgstr "" +msgstr "Function¥­¡¼ 14" #: src/win.c:238 msgid "Function key 15" -msgstr "" +msgstr "Function¥­¡¼ 15" #: src/win.c:239 msgid "Function key 16" -msgstr "" +msgstr "Function¥­¡¼ 16" #: src/win.c:240 msgid "Function key 17" -msgstr "" +msgstr "Function¥­¡¼ 17" #: src/win.c:241 msgid "Function key 18" -msgstr "" +msgstr "Function¥­¡¼ 18" #: src/win.c:242 msgid "Function key 19" -msgstr "" +msgstr "Function¥­¡¼ 19" #: src/win.c:243 msgid "Function key 20" -msgstr "" +msgstr "Function¥­¡¼ 20" #: src/win.c:244 msgid "Backspace key" @@ -6006,15 +6007,15 @@ #: src/win.c:253 msgid "Insert key" -msgstr "ÁÞÆþ¥­¡¼" +msgstr "Insert¥­¡¼" #: src/win.c:254 msgid "Delete key" -msgstr "ºï½ü¥­¡¼" +msgstr "Delete¥­¡¼" #: src/win.c:255 msgid "Completion/M-tab" -msgstr "" +msgstr "Completion/M-tab" #: src/win.c:256 msgid "+ on keypad" @@ -6031,307 +6032,320 @@ #. From here on, these won't be shown in Learn keys (no space) #: src/win.c:260 msgid "Left arrow keypad" -msgstr "" +msgstr "10¥­¡¼¤Î º¸Ìð°õ" #: src/win.c:261 msgid "Right arrow keypad" -msgstr "" +msgstr "10¥­¡¼¤Î ±¦Ìð°õ" #: src/win.c:262 msgid "Up arrow keypad" -msgstr "" +msgstr "10¥­¡¼¤Î ¾åÌð°õ" #: src/win.c:263 msgid "Down arrow keypad" -msgstr "" +msgstr "10¥­¡¼¤Î ²¼Ìð°õ" #: src/win.c:264 msgid "Home on keypad" -msgstr "" +msgstr "10¥­¡¼¤Î Home" #: src/win.c:265 msgid "End on keypad" -msgstr "" +msgstr "10¥­¡¼¤Î End" #: src/win.c:266 msgid "Page Down keypad" -msgstr "" +msgstr "10¥­¡¼¤Î PageDown" #: src/win.c:267 msgid "Page Up keypad" -msgstr "" +msgstr "10¥­¡¼¤Î PageUp" #: src/win.c:268 msgid "Insert on keypad" -msgstr "" +msgstr "10¥­¡¼¤Î Insert" #: src/win.c:269 msgid "Delete on keypad" -msgstr "" +msgstr "10¥­¡¼¤Î Delete" #: src/win.c:270 msgid "Enter on keypad" -msgstr "" +msgstr "10¥­¡¼¤Î Enter" #: src/win.c:271 msgid "Slash on keypad" -msgstr "" +msgstr "10¥­¡¼¤Î /" #: src/win.c:272 msgid "NumLock on keypad" +msgstr "10¥­¡¼¤Î NumLock" + +#: vfs/direntry.c:318 +#, c-format +msgid "Dir cache expired for %s" +msgstr "'%s' ¤Î Dir ¥­¥ã¥Ã¥·¥å¤¬½ªÎ»¤·¤Þ¤·¤¿" + +#: vfs/direntry.c:448 vfs/direntry.c:451 +msgid " Direntry warning " +msgstr "Direntry ¤Î·Ù¹ð" + +#: vfs/direntry.c:448 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage ¤Ï %d ¤Ç¡¤¤³¤ì¤Ï¥á¥â¥ê¥ê¡¼¥¯¤Ç¤¹" + +#: vfs/direntry.c:451 +msgid "Super has want_stale set" msgstr "" -#: vfs/extfs.c:268 +#: vfs/direntry.c:822 +msgid "Starting linear transfer..." +msgstr "¥ê¥Ë¥¢Å¾Á÷¤ò³«»Ï¤·¤Þ¤¹..." + +#: vfs/direntry.c:967 +msgid "Getting file" +msgstr "¥Õ¥¡¥¤¥ë¼èÆÀÃæ" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" "%s" msgstr "" +"%s ¥¢¡¼¥«¥¤¥Ö¤ò³«¤¯¤³¤È¤¬½ÐÍè¤Þ¤»¤ó\n" +"%s" -#: vfs/extfs.c:300 vfs/extfs.c:320 +#: vfs/extfs.c:302 vfs/extfs.c:322 msgid "Inconsistent extfs archive" msgstr "ÉÔÀ°¹ç¤Ê extfs ¥¢¡¼¥«¥¤¥Ö¤Ç¤¹" -#: vfs/fish.c:136 +#: vfs/fish.c:138 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: %s ¤«¤éÀÚÃǤ·¤Æ¤¤¤Þ¤¹" -#: vfs/fish.c:214 +#: vfs/fish.c:216 msgid "fish: Waiting for initial line..." msgstr "fish: ºÇ½é¤Î¹Ô¤òÂԤäƤ¤¤Þ¤¹..." -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid "Sorry, we can not do password authenticated connections for now." -msgstr "" +msgstr "¤¹¤¤¤Þ¤»¤ó¤¬¡¤º£¤Î¤È¤³¤í¥Ñ¥¹¥ï¡¼¥É¤ò¾ÚÌÀ¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó" + +#: vfs/fish.c:231 +msgid " fish: Password required for " +msgstr "fish: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹ " -#: vfs/fish.c:238 +#: vfs/fish.c:240 msgid "fish: Sending password..." msgstr "fish: ¥Ñ¥¹¥ï¡¼¥ÉÁ÷¿®Ãæ..." -#: vfs/fish.c:244 +#: vfs/fish.c:246 msgid "fish: Sending initial line..." msgstr "fish: ºÇ½é¤Î¹Ô¤òÁ÷¿®..." -#: vfs/fish.c:248 +#: vfs/fish.c:250 msgid "fish: Handshaking version..." msgstr "fish: ¥Ð¡¼¥¸¥ç¥ó¤Î¥Ï¥ó¥É¥·¥§¥¤¥¯..." -#: vfs/fish.c:252 +#: vfs/fish.c:254 msgid "fish: Setting up current directory..." msgstr "fish: ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Àܳ¤·¤Þ¤·¤¿¡£¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ï %s ¤Ç¤¹¡£" -#: vfs/fish.c:331 +#: vfs/fish.c:332 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: ¥Ç¥£¥ì¥¯¥È¥ê%s¤òÆɤ߹þ¤ßÃæ... " -#: vfs/fish.c:426 -msgid "fish: got listing" -msgstr "fish: °ìÍ÷¤ò¼èÆÀ¤·¤Þ¤·¤¿" - -#: vfs/fish.c:430 +#: vfs/fish.c:428 msgid "fish: failed" msgstr "fish: ¼ºÇÔ¤·¤Þ¤·¤¿" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:450 +#: vfs/fish.c:448 #, c-format msgid "fish: store %s: sending command..." -msgstr "" +msgstr "fish: store %s: ¥³¥Þ¥ó¥É¤òÁ÷¿®Ãæ..." -#: vfs/fish.c:464 +#: vfs/fish.c:462 msgid "fish: Local read failed, sending zeros" -msgstr "" +msgstr "fish: ¶ÉÉôÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£zero¤òÁ÷¿®¤·¤Þ¤¹" -#: vfs/fish.c:476 +#: vfs/fish.c:474 #, c-format msgid "fish: storing %s %d (%d)" -msgstr "" +msgstr "fish: %s ¤òÊݸÃæ %d (%d)" -#: vfs/fish.c:516 +#: vfs/fish.c:514 msgid "Aborting transfer..." msgstr "žÁ÷¤òÃæÃǤ·¤Þ¤¹..." -#: vfs/fish.c:525 +#: vfs/fish.c:523 msgid "Error reported after abort." msgstr "ÃæÃǸå¤Ë¥¨¥é¡¼¤¬Êó¹ð¤µ¤ì¤Þ¤·¤¿" -#: vfs/fish.c:527 +#: vfs/fish.c:525 msgid "Aborted transfer would be successful." -msgstr "" +msgstr "žÁ÷ÃæÃǤËÀ®¸ù¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:291 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: %s ¤«¤éÀÚÃÇÃæ¤Ç¤¹" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:349 msgid " FTP: Password required for " msgstr " FTP: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹ " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:382 msgid " Proxy: Password required for " msgstr " Proxy: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹ " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:408 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: proxy ¤Î¥í¥°¥¤¥ó̾¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:412 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: proxy ¤Î¥æ¡¼¥¶¥Ñ¥¹¥ï¡¼¥É¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:416 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: proxy ¤Îǧ¾Ú¤¬À®¸ù¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:420 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: %s ¤ËÀܳ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:437 msgid "ftpfs: sending login name" msgstr "ftpfs: ¥í¥°¥¤¥ó̾¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:442 msgid "ftpfs: sending user password" msgstr "ftpfs: ¥Ñ¥¹¥ï¡¼¥É¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:447 msgid "ftpfs: logged in" msgstr "ftpfs: ¥í¥°¥¤¥ó¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:462 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: ¥æ¡¼¥¶ %s ¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿ " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:494 #, c-format msgid " Could not set source routing (%s)" msgstr " ¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:623 msgid "ftpfs: Invalid host name." msgstr "ftpfs: ÉÔÀµ¤Ê¥Û¥¹¥È̾¤Ç¤¹" -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:643 msgid "ftpfs: Invalid host address." msgstr "ftpfs: ÉÔÀµ¤Ê¥Û¥¹¥È¤Î¥¢¥É¥ì¥¹¤Ç¤¹" -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:666 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: %s ¤ØÀܳÃæ" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:676 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: ¥æ¡¼¥¶¤Ë¤è¤Ã¤ÆÀܳ¤¬ÃǤ¿¤ì¤Þ¤·¤¿" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:678 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: ¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:720 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "ºÆ»î¹Ô¤¹¤ë¤Î¤Ç¤ªÂÔ¤Á¤¯¤À¤µ¤¤... %d (Control-C ¤ÇÃæ»ß)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: ¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Î¤¿¤á¤Î¥Ñ¥Ã¥·¥Ö¥â¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:893 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: ¥Ñ¥Ã¥·¥Ö¥â¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:968 msgid "ftpfs: aborting transfer." msgstr "ftpfs: žÁ÷¤òÃæÃǤ·¤Þ¤¹" -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:970 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: ÃæÃÇ: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:975 msgid "ftpfs: abort failed" msgstr "ftpfs: ÃæÃǤ˼ºÇÔ" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1064 vfs/ftpfs.c:1161 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD ¼ºÇÔ" -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1074 vfs/ftpfs.c:1081 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎŸ³«¤Ë¼ºÇÔ" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1132 msgid "Resolving symlink..." msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òŸ³«¤¹¤ë..." -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1150 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "" -"ftpfs: FTP¥Ç¥£¥ì¥¯¥È¥ê%s¤òÆɤ߹þ¤ßÃæ... (UNIX ls¥ª¥×¥·¥ç¥ó¤Ï»È¤¤¤Þ¤»¤ó)" - -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: FTP¥Ç¥£¥ì¥¯¥È¥ê%s¤òÆɤ߹þ¤ßÃæ... " - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: ¼ºÇÔ" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: FTP¥Ç¥£¥ì¥¯¥È¥ê %s ¤òÆɤ߹þ¤ßÃæ... %s%s" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: FTP¥Ç¥£¥ì¥¯¥È¥êÆɤ߹þ¤ß¤ò¥æ¡¼¥¶¤Ë¤è¤Ã¤Æ³ä¤ê¹þ¤Þ¤ì¤Þ¤·¤¿" +#: vfs/ftpfs.c:1151 +msgid "(strict rfc959)" +msgstr "(¸·Ì©¤Ê rfc959)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: ¥ê¥¹¥È¤ò¼èÆÀ¤·¤Þ¤·¤¿" +#: vfs/ftpfs.c:1152 +msgid "(chdir first)" +msgstr "(½é¤á¤Ë chdir)" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1247 msgid "ftpfs: failed" msgstr "ftpfs: ¼ºÇÔ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1257 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ¼ºÇÔ¤·¤Þ¤·¤¿¡£¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1320 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ¥Õ¥¡¥¤¥ë¤ÎÊݸÃæ %d (%d)" -#: vfs/ftpfs.c:2036 vfs/ftpfs.c:2051 +#: vfs/ftpfs.c:1788 vfs/ftpfs.c:1803 msgid "" -"~/.netrc file has not correct mode." -"\n" +"~/.netrc file has not correct mode.\n" "Remove password or correct mode." msgstr "" "~/.netrc¥Õ¥¡¥¤¥ë¤¬Àµ¤·¤¤¥â¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó.\n" "¥Ñ¥¹¥ï¡¼¥É¤òºï½ü¤¹¤ë¤«¥â¡¼¥É¤òÄûÀµ¤·¤Æ¤¯¤À¤µ¤¤." -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " ¥µ¡¼¥Ð¤Ï¤³¤Î¥Ð¡¼¥¸¥ç¥ó¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -6341,29 +6355,49 @@ " ¥Ñ¥¹¥ï¡¼¥É¤¬¥í¥°¥¤¥ó¤Î¤¿¤áɬÍפǤ¹, ¤·¤«¤·¤³¤Î¾ðÊó¤Ï\n" " °ÂÁ´¤ÊÊýË¡¤ÇžÁ÷¤µ¤ì¤Þ¤»¤ó. ·Ñ³¤·¤Þ¤¹¤«? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " ¤Ï¤¤ " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " ¤¤¤¤¤¨ " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " ¥ê¥â¡¼¥È¤Î¥µ¡¼¥Ð¤¬¤ª¤«¤·¤Ê¥Ý¡¼¥È¤ÇÆ°ºî¤·¤Æ¤¤¤Þ¤¹¡£ÃæÃǤ·¤Þ¤¹\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " MCFS ¥Ñ¥¹¥ï¡¼¥É¤ÎÍ×µá " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " ´Ö°ã¤Ã¤¿¥Ñ¥¹¥ï¡¼¥É " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr "hostname ¤Î¾ì½ê¤ò¸«¤Ä¤±¤é¤ì¤Þ¤»¤ó¤Ç¤·¤¿: %s" + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr "¥½¥±¥Ã¥È¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr "¥µ¡¼¥Ð¤ËÀܳ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿: %s" + +#: vfs/mcfs.c:324 msgid " Too many open connections " -msgstr " Àܳ¤¬Â¿¤¹¤®¤Þ¤¹" +msgstr " Àܳ¤¬Â¿¤¹¤®¤Þ¤¹ " + +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "Midnight Commander's private remote filesystem" #: vfs/smbfs.c:115 msgid "Domain:" @@ -6432,87 +6466,140 @@ #, c-format msgid "" "Hmm,...\n" -"%s" -"\n" +"%s\n" "doesn't look like a tar archive." msgstr "" "¤ó¡¼,¡Å¡Å\n" "%s\n" -"¤³¤ì¤Ïtar¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹." +"¤³¤ì¤Ïtar¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹" + +#: vfs/vfs.c:1158 +msgid "Changes to file lost" +msgstr "ʶ¼º¤·¤¿¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤·¤Þ¤¹" -#: vfs/vfs.c:1792 +#: vfs/vfs.c:1798 +msgid "Could not parse:" +msgstr "¹½Ê¸²òÀϤ¬½ÐÍè¤Þ¤»¤ó:" + +#: vfs/vfs.c:1800 +msgid "More parsing errors will be ignored." +msgstr "¿¤¯¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼¤¬¤Ç¤Þ¤·¤¿¤¬Ìµ»ë¤·¤Þ¤¹" + +#: vfs/vfs.c:1800 +msgid "(sorry)" +msgstr "(sorry)" + +#: vfs/vfs.c:1811 +msgid "Internal error:" +msgstr "ÆâÉô¥¨¥é¡¼:" + +#: vfs/vfs.c:1821 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ¥Ð¥¤¥ÈžÁ÷)" -#: vfs/vfs.c:1793 +#: vfs/vfs.c:1822 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ¥Ð¥¤¥ÈžÁ÷¤·¤Þ¤·¤¿" -#~ msgid "Home directory" -#~ msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê" +#: vfs/undelfs.c:80 +msgid " undelfs: error " +msgstr " undelfs: ¥¨¥é¡¼ " -#~ msgid "Could not symlink %s to %s; will not have initial home desktop icon." -#~ msgstr "" -#~ "%s¤ò%s¤Øsymlink¤Ç¤­¤Þ¤»¤ó; ºÇ½é¤Î¥Û¡¼¥à¡¦¥Ç¥¹¥¯¥È¥Ã¥×¡¦¥¢¥¤¥³¥ó¤Ï¤Ê¤¯¤Ê¤ê¤Þ¤¹" +#: vfs/undelfs.c:183 +msgid " not enough memory " +msgstr " ½½Ê¬¤Ê¥á¥â¥ê¤¬¤¢¤ê¤Þ¤»¤ó " -#, fuzzy -#~ msgid "Rescan _Desktop" -#~ msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¤òºÆ¥¹¥­¥ã¥ó" +#: vfs/undelfs.c:188 +msgid " while allocating block buffer " +msgstr " ¥Ö¥í¥Ã¥¯¥Ð¥Ã¥Õ¥¡¤ò³ä¤êÅö¤Æ¤ë´Ö¤Ë " -#~ msgid "New folder" -#~ msgstr "¿·µ¬¥Õ¥©¥ë¥À" +#: vfs/undelfs.c:192 +#, c-format +msgid " open_inode_scan: %d " +msgstr " open_inode_scan: %d " -#~ msgid "All files" -#~ msgstr "Á´¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:196 +#, c-format +msgid " while starting inode scan %d " +msgstr " i¥Î¡¼¥É¥¹¥­¥ã¥ó %d ¤ò³«»Ï¤·¤Æ¤¤¤ë´Ö¤Ë " -#~ msgid "Archives and compressed files" -#~ msgstr "¥¢¡¼¥«¥¤¥Ö¡¦°µ½Ì¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:203 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "undelfs: %d i¥Î¡¼¥É¤Îºï½ü¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥í¡¼¥ÉÃæ¤Ç¤¹" -#~ msgid "RPM/DEB files" -#~ msgstr "RPM/DEB ¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:218 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr " ext2_block_iterate %d ¤ò¸Æ¤ó¤Ç¤¤¤ë´Ö¤Ë " -#~ msgid "Text/Document files" -#~ msgstr "¥Æ¥­¥¹¥È/ʸ½ñ¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:226 +msgid " no more memory while reallocating array " +msgstr " ¥á¥â¥ê¤Î´Ö¤ËºÆÇÛʬ¤·¤Æ¤¤¤ëÇÛÎó¤Ï¤¢¤ê¤Þ¤»¤ó " -#~ msgid "HTML and SGML files" -#~ msgstr "HTML¡¦SGML¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:245 +#, c-format +msgid " while doing inode scan %d " +msgstr "i¥Î¡¼¥É¥¹¥­¥ã¥ó %d ¤ò¤¹¤ë´Ö¤Ë " -#~ msgid "Postscript and PDF files" -#~ msgstr "¥Ý¥¹¥È¥¹¥¯¥ê¥×¥È¡¦PDF¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:269 +msgid " Ext2lib error " +msgstr " Ext2lib ¥¨¥é¡¼ " -#~ msgid "Spreadsheet files" -#~ msgstr "¥¹¥×¥ì¥Ã¥É¥·¡¼¥È¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:296 +#, c-format +msgid " Could not open file %s " +msgstr " ¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó " -#~ msgid "Image files" -#~ msgstr "²èÁü¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:299 +msgid "undelfs: reading inode bitmap..." +msgstr "undelfs: i¥Î¡¼¥É¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò¥í¡¼¥ÉÃæ¤Ç¤¹..." -#~ msgid "Video/animation files" -#~ msgstr "¥Ó¥Ç¥ª/Æ°²è¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:302 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "'%s' ¤«¤éi¥Î¡¼¥É¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó \n" -#~ msgid "Audio files" -#~ msgstr "¥ª¡¼¥Ç¥£¥ª¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:305 +msgid "undelfs: reading block bitmap..." +msgstr "undelfs: ¥Ö¥í¥Ã¥¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤òÆɤ߹þ¤ßÃæ¤Ç¤¹..." -#~ msgid "C program files" -#~ msgstr "C¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:308 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr " '%s' ¤«¤é¥Ö¥í¥Ã¥¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n" -#~ msgid "C++ program files" -#~ msgstr "C++¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:314 +msgid "undelfs: done." +msgstr "undelfs: ´°Î»" -#~ msgid "Objective-C program files" -#~ msgstr "¥ª¥Ö¥¸¥§¥¯¥Æ¥£¥ÖC¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:317 +msgid "undelfs: failure" +msgstr "undelfs: ¼ºÇÔ" -#~ msgid "Scheme program files" -#~ msgstr "Scheme¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:341 +msgid " vfs_info is not fs! " +msgstr " vfs_info ¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó! " -#~ msgid "Assembler program files" -#~ msgstr "¥¢¥»¥ó¥Ö¥é¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:397 vfs/undelfs.c:581 +msgid " You have to chdir to extract files first " +msgstr "½é¤á¤ËÃê½Ð¤·¤¿¥Õ¥¡¥¤¥ë¤Ø chdir ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#~ msgid "Misc. program files" -#~ msgstr "¤½¤Î¾¤¤¤í¤¤¤í¤Ê¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë" +#: vfs/undelfs.c:520 +msgid " while iterating over blocks " +msgstr " ¥Ö¥í¥Ã¥¯¤Î½ª¤ï¤ê¤Þ¤Ç¤ò·«¤êÊÖ¤¹´Ö¤Ë " -#~ msgid "Filter" -#~ msgstr "¥Õ¥£¥ë¥¿" +#: vfs/undelfs.c:625 +#, c-format +msgid " Could not open file: %s " +msgstr " ¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó " -#~ msgid "Disk operations" -#~ msgstr "¥Ç¥£¥¹¥¯Áàºî" +#. This is place of next pointer +#: vfs/undelfs.c:683 +msgid "Undelete filesystem for ext2" +msgstr "ext2 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÉü¸µ" diff -ruN old/mc-4.5.42/po/mc.pot new/mc-4.5.43/po/mc.pot --- old/mc-4.5.42/po/mc.pot Mon Dec 6 18:50:18 1999 +++ new/mc-4.5.43/po/mc.pot Sat Mar 18 08:43:50 2000 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-06 18:04-0500\n" +"POT-Creation-Date: 2000-03-18 08:42-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,25 +14,25 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr "" -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 msgid " Execute Macro " msgstr "" #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:743 +#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr "" -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Insert Literal " msgstr "" -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Press any key: " msgstr "" @@ -72,15 +72,15 @@ "\"%s\"%s" msgstr "" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "" -#: gnome/gaction.c:331 +#: gnome/gaction.c:351 msgid "view" msgstr "" @@ -194,7 +194,7 @@ msgstr "" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 -#: gnome/gscreen.c:2416 +#: gnome/gscreen.c:2429 msgid "Show all files" msgstr "" @@ -263,8 +263,8 @@ msgstr "" #. Group -#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:776 -#: gnome/gnome-file-property-dialog.c:945 gnome/gprop.c:280 gnome/gprop.c:405 +#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:788 +#: gnome/gnome-file-property-dialog.c:957 gnome/gprop.c:280 gnome/gprop.c:405 #: src/screen.c:427 msgid "Group" msgstr "" @@ -290,7 +290,7 @@ msgstr "" #. Owner -#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:930 +#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:942 #: gnome/gprop.c:390 src/screen.c:426 msgid "Owner" msgstr "" @@ -323,28 +323,28 @@ msgid "Custom View" msgstr "" -#: gnome/gdesktop.c:521 gnome/gmount.c:389 +#: gnome/gdesktop.c:532 gnome/gmount.c:382 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:522 +#: gnome/gdesktop.c:533 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1186 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "" -#: gnome/gdesktop.c:1255 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "" -#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "" -#: gnome/gdesktop.c:2598 +#: gnome/gdesktop.c:2617 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -353,84 +353,84 @@ "We are unable to set the background." msgstr "" -#: gnome/gdesktop.c:2621 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "" -#: gnome/gdesktop.c:2621 gnome/glayout.c:363 +#: gnome/gdesktop.c:2640 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2623 gnome/glayout.c:365 +#: gnome/gdesktop.c:2642 gnome/glayout.c:365 msgid "_Directory..." msgstr "" -#: gnome/gdesktop.c:2623 gnome/glayout.c:366 +#: gnome/gdesktop.c:2642 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "" -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "URL L_ink..." msgstr "" -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" msgstr "" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "Creates a new launcher" msgstr "" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2650 msgid "By _Name" msgstr "" -#: gnome/gdesktop.c:2632 +#: gnome/gdesktop.c:2651 msgid "By File _Type" msgstr "" -#: gnome/gdesktop.c:2633 +#: gnome/gdesktop.c:2652 msgid "By _Size" msgstr "" -#: gnome/gdesktop.c:2634 +#: gnome/gdesktop.c:2653 msgid "By Time Last _Accessed" msgstr "" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2654 msgid "By Time Last _Modified" msgstr "" -#: gnome/gdesktop.c:2636 +#: gnome/gdesktop.c:2655 msgid "By Time Last _Changed" msgstr "" -#: gnome/gdesktop.c:2644 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "" -#: gnome/gdesktop.c:2645 +#: gnome/gdesktop.c:2664 msgid "Create _New Window" msgstr "" -#: gnome/gdesktop.c:2647 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "" -#: gnome/gdesktop.c:2648 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "" -#: gnome/gdesktop.c:2649 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2670 msgid "Configure _Background Image" msgstr "" @@ -524,12 +524,12 @@ msgid "Replace it?" msgstr "" -#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1097 gtkedit/gtkedit.c:1250 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 #: src/file.c:802 src/screen.c:2399 src/screen.c:2429 src/tree.c:1014 msgid "Copy" msgstr "" -#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1098 gtkedit/gtkedit.c:1252 +#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1141 gtkedit/gtkedit.c:1252 msgid "Move" msgstr "" @@ -621,7 +621,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1840 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1831 msgid "Password:" msgstr "" @@ -642,32 +642,32 @@ msgid "Symbolic link filename:" msgstr "" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "" -#: gnome/gdnd.c:56 +#: gnome/gdnd.c:57 msgid "Cancel drag" msgstr "" #. FIXME: this error message sucks -#: gnome/gdnd.c:192 +#: gnome/gdnd.c:193 #, c-format msgid "" "Could not stat %s\n" "%s" msgstr "" -#: gnome/gicon.c:218 -msgid "Default set of icons not found, please check your installation" +#: gnome/gicon.c:282 +msgid "Default set of icons not found, check your installation" msgstr "" #: gnome/glayout.c:41 @@ -749,7 +749,7 @@ msgstr "" #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:389 gnome/gscreen.c:2085 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." msgstr "" @@ -757,7 +757,7 @@ msgid "Copy files" msgstr "" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "" @@ -765,7 +765,7 @@ msgid "Delete files" msgstr "" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "" @@ -813,7 +813,7 @@ msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2088 msgid "Search" msgstr "" @@ -821,7 +821,7 @@ msgid "Search for a file in the current Panel" msgstr "" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "" @@ -926,284 +926,285 @@ "File Manager will not stop you from doing it." msgstr "" -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "" -#: gnome/gmount.c:390 +#: gnome/gmount.c:383 #, c-format msgid "Could not symlink %s to %s; will not have such a desktop device icon." msgstr "" -#: gnome/gmount.c:446 +#: gnome/gmount.c:439 #, c-format msgid "CD-ROM %d" msgstr "" -#: gnome/gmount.c:458 +#: gnome/gmount.c:451 #, c-format msgid "Floppy %d" msgstr "" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "" #. we set the file part -#: gnome/gnome-file-property-dialog.c:170 +#: gnome/gnome-file-property-dialog.c:171 msgid "Full Name: " msgstr "" -#: gnome/gnome-file-property-dialog.c:178 +#: gnome/gnome-file-property-dialog.c:179 msgid "File Name" msgstr "" -#: gnome/gnome-file-property-dialog.c:201 +#: gnome/gnome-file-property-dialog.c:204 +#: gnome/gnome-file-property-dialog.c:210 msgid "File Type: " msgstr "" -#: gnome/gnome-file-property-dialog.c:207 +#: gnome/gnome-file-property-dialog.c:217 msgid "File Type: Symbolic Link" msgstr "" -#: gnome/gnome-file-property-dialog.c:212 +#: gnome/gnome-file-property-dialog.c:222 msgid "Target Name: INVALID LINK" msgstr "" -#: gnome/gnome-file-property-dialog.c:215 +#: gnome/gnome-file-property-dialog.c:225 msgid "Target Name: " msgstr "" -#: gnome/gnome-file-property-dialog.c:220 +#: gnome/gnome-file-property-dialog.c:230 msgid "File Type: Directory" msgstr "" -#: gnome/gnome-file-property-dialog.c:222 +#: gnome/gnome-file-property-dialog.c:232 msgid "File Type: Character Device" msgstr "" -#: gnome/gnome-file-property-dialog.c:224 +#: gnome/gnome-file-property-dialog.c:234 msgid "File Type: Block Device" msgstr "" -#: gnome/gnome-file-property-dialog.c:226 +#: gnome/gnome-file-property-dialog.c:236 msgid "File Type: Socket" msgstr "" -#: gnome/gnome-file-property-dialog.c:228 +#: gnome/gnome-file-property-dialog.c:238 msgid "File Type: FIFO" msgstr "" -#: gnome/gnome-file-property-dialog.c:238 -#: gnome/gnome-file-property-dialog.c:242 #: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:252 +#: gnome/gnome-file-property-dialog.c:258 msgid "File Size: " msgstr "" -#: gnome/gnome-file-property-dialog.c:238 +#: gnome/gnome-file-property-dialog.c:248 msgid " bytes" msgstr "" -#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:252 msgid " KBytes (" msgstr "" -#: gnome/gnome-file-property-dialog.c:243 -#: gnome/gnome-file-property-dialog.c:249 +#: gnome/gnome-file-property-dialog.c:253 +#: gnome/gnome-file-property-dialog.c:259 msgid " bytes)" msgstr "" -#: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:258 msgid " MBytes (" msgstr "" -#: gnome/gnome-file-property-dialog.c:256 +#: gnome/gnome-file-property-dialog.c:266 msgid "File Size: N/A" msgstr "" -#: gnome/gnome-file-property-dialog.c:267 +#: gnome/gnome-file-property-dialog.c:277 msgid "File Created on: " msgstr "" -#: gnome/gnome-file-property-dialog.c:276 +#: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "" -#: gnome/gnome-file-property-dialog.c:285 +#: gnome/gnome-file-property-dialog.c:295 msgid "Last Accessed on: " msgstr "" -#: gnome/gnome-file-property-dialog.c:303 +#: gnome/gnome-file-property-dialog.c:313 msgid "URL:" msgstr "" -#: gnome/gnome-file-property-dialog.c:310 +#: gnome/gnome-file-property-dialog.c:320 msgid "Caption:" msgstr "" -#: gnome/gnome-file-property-dialog.c:387 -#: gnome/gnome-file-property-dialog.c:489 +#: gnome/gnome-file-property-dialog.c:397 +#: gnome/gnome-file-property-dialog.c:499 msgid "Drop Action" msgstr "" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 msgid "Use default Drop Action options" msgstr "" -#: gnome/gnome-file-property-dialog.c:403 -#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 #: src/screen.c:2397 src/screen.c:2427 msgid "View" msgstr "" -#: gnome/gnome-file-property-dialog.c:404 +#: gnome/gnome-file-property-dialog.c:414 msgid "Use default View options" msgstr "" -#: gnome/gnome-file-property-dialog.c:439 +#: gnome/gnome-file-property-dialog.c:449 msgid "Select an Icon" msgstr "" #. we do open first -#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 +#: gnome/gnome-file-property-dialog.c:479 gnome/gpopup2.c:195 msgid "Open" msgstr "" -#: gnome/gnome-file-property-dialog.c:479 +#: gnome/gnome-file-property-dialog.c:489 msgid "Use default Open action" msgstr "" -#: gnome/gnome-file-property-dialog.c:502 +#: gnome/gnome-file-property-dialog.c:512 msgid "Use default Drop action" msgstr "" -#: gnome/gnome-file-property-dialog.c:504 +#: gnome/gnome-file-property-dialog.c:514 msgid "Use default View action" msgstr "" -#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +#: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 msgid "Edit" msgstr "" -#: gnome/gnome-file-property-dialog.c:523 +#: gnome/gnome-file-property-dialog.c:533 msgid "Use default Edit action" msgstr "" -#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521 +#: gnome/gnome-file-property-dialog.c:587 gnome/gprop.c:521 msgid "Icon" msgstr "" #. We must be a file or a link to a file. -#: gnome/gnome-file-property-dialog.c:611 +#: gnome/gnome-file-property-dialog.c:621 msgid "File Actions" msgstr "" -#: gnome/gnome-file-property-dialog.c:616 +#: gnome/gnome-file-property-dialog.c:626 msgid "Open action" msgstr "" -#: gnome/gnome-file-property-dialog.c:617 +#: gnome/gnome-file-property-dialog.c:627 msgid "Needs terminal to run" msgstr "" -#: gnome/gnome-file-property-dialog.c:742 +#: gnome/gnome-file-property-dialog.c:753 msgid "File Permissions" msgstr "" -#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259 +#: gnome/gnome-file-property-dialog.c:764 gnome/gprop.c:259 msgid "Current mode: " msgstr "" #. Headings -#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272 +#: gnome/gnome-file-property-dialog.c:780 gnome/gprop.c:272 msgid "Read" msgstr "" -#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273 +#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:273 msgid "Write" msgstr "" -#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274 +#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:274 msgid "Exec" msgstr "" -#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275 +#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:275 msgid "Special" msgstr "" #. Permissions -#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279 +#: gnome/gnome-file-property-dialog.c:787 gnome/gprop.c:279 msgid "User" msgstr "" -#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281 +#: gnome/gnome-file-property-dialog.c:789 gnome/gprop.c:281 msgid "Other" msgstr "" #. Special -#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285 +#: gnome/gnome-file-property-dialog.c:793 gnome/gprop.c:285 msgid "Set UID" msgstr "" -#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286 +#: gnome/gnome-file-property-dialog.c:794 gnome/gprop.c:286 msgid "Set GID" msgstr "" -#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287 +#: gnome/gnome-file-property-dialog.c:795 gnome/gprop.c:287 msgid "Sticky" msgstr "" -#: gnome/gnome-file-property-dialog.c:905 +#: gnome/gnome-file-property-dialog.c:917 #, c-format msgid " (%d)" msgstr "" -#: gnome/gnome-file-property-dialog.c:919 +#: gnome/gnome-file-property-dialog.c:931 msgid "File ownership" msgstr "" -#: gnome/gnome-file-property-dialog.c:1079 +#: gnome/gnome-file-property-dialog.c:1097 msgid "URL" msgstr "" -#: gnome/gnome-file-property-dialog.c:1082 +#: gnome/gnome-file-property-dialog.c:1100 msgid "Statistics" msgstr "" -#: gnome/gnome-file-property-dialog.c:1088 +#: gnome/gnome-file-property-dialog.c:1106 msgid "Options" msgstr "" -#: gnome/gnome-file-property-dialog.c:1091 +#: gnome/gnome-file-property-dialog.c:1109 msgid "Permissions" msgstr "" -#: gnome/gnome-file-property-dialog.c:1094 +#: gnome/gnome-file-property-dialog.c:1112 msgid " Properties" msgstr "" -#: gnome/gnome-file-property-dialog.c:1146 -#: gnome/gnome-file-property-dialog.c:1157 +#: gnome/gnome-file-property-dialog.c:1164 +#: gnome/gnome-file-property-dialog.c:1175 msgid "You entered an invalid username" msgstr "" -#: gnome/gnome-file-property-dialog.c:1202 +#: gnome/gnome-file-property-dialog.c:1220 msgid "You must rename your file to something" msgstr "" -#: gnome/gnome-file-property-dialog.c:1208 +#: gnome/gnome-file-property-dialog.c:1226 msgid "You cannot rename a file to something containing a '/' character" msgstr "" @@ -1249,7 +1250,7 @@ msgid "Copy..." msgstr "" -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2402 #: src/screen.c:2432 msgid "Delete" msgstr "" @@ -1290,71 +1291,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "" -#: gnome/gprefs.c:113 -msgid "Confirm when deleting file" +#: gnome/gprefs.c:108 +msgid "Determine file types from file content instead of extensions" msgstr "" #: gnome/gprefs.c:117 -msgid "Confirm when overwriting files" +msgid "Confirm when deleting file" msgstr "" #: gnome/gprefs.c:121 -msgid "Confirm when executing files" +msgid "Confirm when overwriting files" msgstr "" #: gnome/gprefs.c:125 +msgid "Confirm when executing files" +msgstr "" + +#: gnome/gprefs.c:129 msgid "Show progress while operations are being performed" msgstr "" -#: gnome/gprefs.c:134 +#: gnome/gprefs.c:138 msgid "VFS Timeout:" msgstr "" -#: gnome/gprefs.c:135 gnome/gprefs.c:160 +#: gnome/gprefs.c:139 gnome/gprefs.c:164 msgid "Seconds" msgstr "" -#: gnome/gprefs.c:138 +#: gnome/gprefs.c:142 msgid "Anonymous FTP password:" msgstr "" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "" -#: gnome/gprefs.c:151 +#: gnome/gprefs.c:155 msgid "Fast directory reload" msgstr "" -#: gnome/gprefs.c:155 +#: gnome/gprefs.c:159 msgid "Compute totals before copying files" msgstr "" -#: gnome/gprefs.c:159 +#: gnome/gprefs.c:163 msgid "FTP directory cache timeout :" msgstr "" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:167 msgid "Allow customization of icons in icon view" msgstr "" -#: gnome/gprefs.c:172 +#: gnome/gprefs.c:176 msgid "File display" msgstr "" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:180 msgid "Confirmation" msgstr "" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:184 msgid "VFS" msgstr "" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "" @@ -1398,104 +1403,104 @@ msgid "Select icon" msgstr "" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." msgstr "" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "Creates a new file here" msgstr "" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" msgstr "" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 msgid "Copy directory" msgstr "" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "" #. 1 -#: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1219 -#: gtkedit/editcmd.c:1304 gtkedit/editcmd.c:2916 gtkedit/editoptions.c:71 +#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 +#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:69 #: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466 #: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 #: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:143 @@ -1508,12 +1513,12 @@ msgid "Offset 0x%08lx" msgstr "" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:735 #, c-format msgid "Col %d" msgstr "" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "" @@ -1603,572 +1608,616 @@ msgid "Could not get the desktop\n" msgstr "" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "" + +#: gnome/gmc-client.c:206 msgid "Create window showing the specified directory" msgstr "" -#: gnome/gmc-client.c:171 gnome/gmc-client.c:173 +#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 msgid "DIRECTORY" msgstr "" -#: gnome/gmc-client.c:173 +#: gnome/gmc-client.c:208 msgid "Rescan the specified directory" msgstr "" -#: gnome/gmc-client.c:175 +#: gnome/gmc-client.c:210 msgid "Rescan the desktop icons" msgstr "" -#: gnome/gmc-client.c:177 +#: gnome/gmc-client.c:212 msgid "Rescan the desktop device icons" msgstr "" -#: gnome/gmc-client.c:179 +#: gnome/gmc-client.c:214 +msgid "Arrange the desktop icons" +msgstr "" + +#: gnome/gmc-client.c:215 +msgid "name | type | size | atime | mtime | ctime" +msgstr "" + +#: gnome/gmc-client.c:217 msgid "Close windows whose directories cannot be reached" msgstr "" #. The file-name is printed after the ':' -#: gtkedit/edit.c:132 gtkedit/edit.c:227 gtkedit/edit.c:234 gtkedit/edit.c:241 -#: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 -#: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 -#: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: gtkedit/edit.c:145 gtkedit/edit.c:314 gtkedit/edit.c:319 gtkedit/edit.c:333 +#: gtkedit/edit.c:337 gtkedit/edit.c:369 gtkedit/edit.c:375 gtkedit/edit.c:382 +#: gtkedit/edit.c:389 gtkedit/edit.c:395 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2030 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/screen.c:2417 src/tree.c:682 src/tree.c:688 +#: src/wtools.c:222 msgid " Error " msgstr "" -#: gtkedit/edit.c:132 gtkedit/edit.c:234 +#: gtkedit/edit.c:145 gtkedit/edit.c:337 gtkedit/edit.c:375 msgid " Failed trying to open file for reading: " msgstr "" -#: gtkedit/edit.c:241 +#: gtkedit/edit.c:314 +msgid " Error reading from pipe: " +msgstr "" + +#: gtkedit/edit.c:319 +msgid " Failed trying to open pipe for reading: " +msgstr "" + +#: gtkedit/edit.c:333 +msgid " Error reading file: " +msgstr "" + +#: gtkedit/edit.c:382 msgid " Cannot get size/permissions info on file: " msgstr "" -#: gtkedit/edit.c:248 +#: gtkedit/edit.c:389 msgid " Not an ordinary file: " msgstr "" -#: gtkedit/edit.c:254 +#: gtkedit/edit.c:395 msgid " File is too large: " msgstr "" -#: gtkedit/edit.c:255 +#: gtkedit/edit.c:396 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " msgstr "" -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " msgstr "" -#: gtkedit/editcmd.c:334 +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr "" + +#: gtkedit/editcmd.c:379 msgid "Quick save " msgstr "" -#: gtkedit/editcmd.c:335 +#: gtkedit/editcmd.c:380 msgid "Safe save " msgstr "" -#: gtkedit/editcmd.c:336 +#: gtkedit/editcmd.c:381 msgid "Do backups -->" msgstr "" #. NLS for hotkeys? -#: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1171 gtkedit/editcmd.c:1217 -#: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 +#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 +#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:66 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 #: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 -#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: src/view.c:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 #: vfs/smbfs.c:116 msgid "&Cancel" msgstr "" -#: gtkedit/editcmd.c:345 +#: gtkedit/editcmd.c:390 msgid "Extension:" msgstr "" #. NLS ? -#: gtkedit/editcmd.c:352 +#: gtkedit/editcmd.c:397 msgid " Edit Save Mode " msgstr "" -#: gtkedit/editcmd.c:499 +#: gtkedit/editcmd.c:525 msgid " Save As " msgstr "" #. Warning message with a query to continue or cancel the operation -#: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:706 src/screen.c:1451 src/screen.c:2129 +#: gtkedit/editcmd.c:539 gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr "" -#: gtkedit/editcmd.c:514 +#: gtkedit/editcmd.c:540 msgid " A file already exists with this name. " msgstr "" #. Push buttons to over-write the current file, or cancel the operation -#: gtkedit/editcmd.c:516 +#: gtkedit/editcmd.c:542 msgid "Overwrite" msgstr "" -#: gtkedit/editcmd.c:516 gtkedit/editcmd.c:583 gtkedit/editcmd.c:810 -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:542 gtkedit/editcmd.c:609 gtkedit/editcmd.c:836 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 +#: gtkedit/editcmd.c:1670 msgid "Cancel" msgstr "" -#: gtkedit/editcmd.c:535 +#: gtkedit/editcmd.c:561 msgid " Save as " msgstr "" -#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 msgid " Error trying to save file. " msgstr "" #. This heads the delete macro error dialog box -#: gtkedit/editcmd.c:653 gtkedit/editcmd.c:661 gtkedit/editcmd.c:686 +#: gtkedit/editcmd.c:679 gtkedit/editcmd.c:687 gtkedit/editcmd.c:712 msgid " Delete macro " msgstr "" #. 'Open' = load temp file -#: gtkedit/editcmd.c:655 +#: gtkedit/editcmd.c:681 msgid " Error trying to open temp file " msgstr "" #. 'Open' = load temp file -#: gtkedit/editcmd.c:663 gtkedit/editcmd.c:724 gtkedit/editcmd.c:792 +#: gtkedit/editcmd.c:689 gtkedit/editcmd.c:750 gtkedit/editcmd.c:818 msgid " Error trying to open macro file " msgstr "" -#: gtkedit/editcmd.c:668 gtkedit/editcmd.c:676 gtkedit/editcmd.c:712 -#: gtkedit/editcmd.c:767 +#: gtkedit/editcmd.c:694 gtkedit/editcmd.c:702 gtkedit/editcmd.c:738 +#: gtkedit/editcmd.c:793 #, c-format msgid "key '%d 0': " msgstr "" -#: gtkedit/editcmd.c:687 +#: gtkedit/editcmd.c:713 msgid " Error trying to overwrite macro file " msgstr "" #. This heads the 'Macro' dialog box -#: gtkedit/editcmd.c:703 +#: gtkedit/editcmd.c:729 msgid " Macro " msgstr "" #. Input line for a single key press follows the ':' -#: gtkedit/editcmd.c:705 +#: gtkedit/editcmd.c:731 msgid " Press the macro's new hotkey: " msgstr "" #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:724 +#: gtkedit/editcmd.c:750 msgid " Save macro " msgstr "" -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:767 msgid " Delete Macro " msgstr "" #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:791 +#: gtkedit/editcmd.c:817 msgid " Load macro " msgstr "" -#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833 msgid " Confirm save file? : " msgstr "" #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 msgid " Save file " msgstr "" -#: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 -#: src/view.c:2075 +#: gtkedit/editcmd.c:836 gtkedit/editwidget.c:1137 gtkedit/gtkedit.c:1247 +#: src/view.c:2080 msgid "Save" msgstr "" -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 msgid "" " Current text was modified without a file save. \n" " Continue discards these changes. " msgstr "" -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 msgid "Continue" msgstr "" -#. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +#: gtkedit/editcmd.c:893 msgid " Load " msgstr "" -#: gtkedit/editcmd.c:859 -msgid " Error trying to open file for reading " -msgstr "" - -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 msgid " Block is large, you may not be able to undo this action. " msgstr "" -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Continue " msgstr "" -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Cancel " msgstr "" -#: gtkedit/editcmd.c:1173 +#: gtkedit/editcmd.c:1190 msgid "o&Ne" msgstr "" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1192 src/filegui.c:597 msgid "al&L" msgstr "" -#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 +#: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1196 msgid "&Replace" msgstr "" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 msgid " Replace with: " msgstr "" -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1206 msgid " Confirm replace " msgstr "" -#: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 +#: gtkedit/editcmd.c:1236 gtkedit/editcmd.c:1321 msgid "scanf &Expression" msgstr "" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1238 msgid "replace &All" msgstr "" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1240 msgid "pr&Ompt on replace" msgstr "" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 msgid "&Backwards" msgstr "" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 msgid "&Regular expression" msgstr "" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 msgid "&Whole words only" msgstr "" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 msgid "case &Sensitive" msgstr "" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1252 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr "" -#: gtkedit/editcmd.c:1241 +#: gtkedit/editcmd.c:1256 msgid " Enter replacement string:" msgstr "" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2003 msgid " Enter search string:" msgstr "" #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1264 gtkedit/editcmd.c:1516 gtkedit/editcmd.c:1607 -#: gtkedit/editcmd.c:2147 gtkedit/editcmd.c:2178 gtkedit/editcmd.c:2180 +#: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:2209 gtkedit/editcmd.c:2240 gtkedit/editcmd.c:2242 msgid " Replace " msgstr "" #. Heads the 'Search' dialog box -#: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 -#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 -#: src/view.c:1998 +#: gtkedit/editcmd.c:1347 gtkedit/editcmd.c:1577 gtkedit/editcmd.c:2308 +#: gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 src/view.c:1531 +#: src/view.c:1630 src/view.c:1753 src/view.c:1971 src/view.c:2003 msgid " Search " msgstr "" #. An input line comes after the ':' -#: gtkedit/editcmd.c:1382 +#: gtkedit/editcmd.c:1401 msgid " Enter search text : " msgstr "" -#: gtkedit/editcmd.c:1389 +#: gtkedit/editcmd.c:1408 msgid " Enter replace text : " msgstr "" -#: gtkedit/editcmd.c:1392 gtkedit/editcmd.c:1393 +#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 #, c-format msgid "" "You can enter regexp substrings with %s\n" "(not \\1, \\2 like sed) then use \"Enter...order\"" msgstr "" -#: gtkedit/editcmd.c:1395 +#: gtkedit/editcmd.c:1414 msgid " Enter argument (or substring) order : " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1418 gtkedit/editcmd.c:1419 msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" msgstr "" #. The following are check boxes -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1424 msgid " Whole words only " msgstr "" -#: gtkedit/editcmd.c:1407 +#: gtkedit/editcmd.c:1426 msgid " Case sensitive " msgstr "" -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1429 msgid " Regular expression " msgstr "" -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1430 gtkedit/editcmd.c:1431 msgid "" "See the regex man page for how\n" "to compose a regular expression" msgstr "" -#: gtkedit/editcmd.c:1418 +#: gtkedit/editcmd.c:1439 msgid " Backwards " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 +#: gtkedit/editcmd.c:1441 gtkedit/editcmd.c:1442 msgid "Warning: Searching backward can be slow" msgstr "" -#: gtkedit/editcmd.c:1434 +#: gtkedit/editcmd.c:1463 msgid " Prompt on replace " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1436 +#: gtkedit/editcmd.c:1465 msgid "Ask before making each replacement" msgstr "" -#: gtkedit/editcmd.c:1438 +#: gtkedit/editcmd.c:1467 msgid " Replace all " msgstr "" -#: gtkedit/editcmd.c:1441 +#. Tool hint +#: gtkedit/editcmd.c:1469 +msgid "Replace repeatedly" +msgstr "" + +#: gtkedit/editcmd.c:1473 +msgid " Bookmarks " +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1475 gtkedit/editcmd.c:1476 +msgid "Create bookmarks at all lines found" +msgstr "" + +#: gtkedit/editcmd.c:1479 msgid " Scanf expression " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1481 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1506 msgid "Begin search, Enter" msgstr "" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace" msgstr "" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Skip" msgstr "" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace all" msgstr "" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace one" msgstr "" -#: gtkedit/editcmd.c:1969 +#: gtkedit/editcmd.c:2030 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2149 +#: gtkedit/editcmd.c:2211 msgid " Error in replacement format string. " msgstr "" -#: gtkedit/editcmd.c:2177 +#: gtkedit/editcmd.c:2239 #, c-format msgid " %ld replacements made. " msgstr "" -#: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 +#: gtkedit/editcmd.c:2242 gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 msgid " Search string not found. " msgstr "" +#. in response to number of bookmarks added because of string being found %d times +#: gtkedit/editcmd.c:2307 +#, c-format +msgid " %d finds made, %d bookmarks added " +msgstr "" + #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 +#: gtkedit/editcmd.c:2363 gtkedit/editcmd.c:2378 gtkedit/editcmd.c:2381 msgid " Quit " msgstr "" -#: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2382 msgid "" " Current text was modified without a file save. \n" " Save with exit? " msgstr "" -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2378 msgid " File was modified, Save with exit? " msgstr "" -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2378 msgid "Cancel quit" msgstr "" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&Yes" msgstr "" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&No" msgstr "" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Cancel quit " msgstr "" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Yes " msgstr "" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &No " msgstr "" -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 msgid " Copy to clipboard " msgstr "" -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 -#: gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2702 msgid " Unable to save to file. " msgstr "" -#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 msgid " Cut to clipboard " msgstr "" -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 src/view.c:1918 msgid " Goto line " msgstr "" -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 msgid " Enter line: " msgstr "" -#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 msgid " Save Block " msgstr "" -#: gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2784 msgid " Insert File " msgstr "" -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Insert file " msgstr "" -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Error trying to insert file. " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2752 +#: gtkedit/editcmd.c:2819 msgid " Sort block " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 +#: gtkedit/editcmd.c:2819 gtkedit/editcmd.c:2873 msgid " You must first highlight a block of text. " msgstr "" -#: gtkedit/editcmd.c:2759 +#: gtkedit/editcmd.c:2826 msgid " Run Sort " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2761 +#: gtkedit/editcmd.c:2828 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr "" -#: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 +#: gtkedit/editcmd.c:2839 gtkedit/editcmd.c:2845 msgid " Sort " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2774 +#: gtkedit/editcmd.c:2841 msgid " Error trying to execute sort command " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2780 +#: gtkedit/editcmd.c:2847 msgid " Sort returned non-zero: " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 +#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 msgid " Process block " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2836 +#: gtkedit/editcmd.c:2903 msgid " Error trying to stat file " msgstr "" -#: gtkedit/editcmd.c:2907 +#: gtkedit/editcmd.c:2974 msgid " Mail " msgstr "" -#: gtkedit/editcmd.c:2920 +#: gtkedit/editcmd.c:2987 msgid " Copies to" msgstr "" -#: gtkedit/editcmd.c:2924 +#: gtkedit/editcmd.c:2991 msgid " Subject" msgstr "" -#: gtkedit/editcmd.c:2928 +#: gtkedit/editcmd.c:2995 msgid " To" msgstr "" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:2997 msgid " mail -s -c " msgstr "" @@ -2196,341 +2245,349 @@ " for the Midnight Commander.\n" msgstr "" -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 msgid "&Open/load... C-o" msgstr "" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 msgid "a&Bout... " msgstr "" -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 msgid "&Quit F10" msgstr "" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" msgstr "" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:147 msgid "copy to &File... " msgstr "" -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Toggle Mark F3" msgstr "" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Mark Columns S-F3" msgstr "" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "toggle &Ins/overw Ins" msgstr "" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Copy F5" msgstr "" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +msgid "goto matching &Bracket M-b" +msgstr "" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 msgid "insert &Literal... C-q" msgstr "" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:234 msgid "&Start record macro C-r" msgstr "" -#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:235 msgid "&Finish record macro... C-r" msgstr "" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "delete macr&O... " msgstr "" -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 msgid "insert &Date/time " msgstr "" -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 msgid "format p&Aragraph M-p" msgstr "" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:219 msgid "'ispell' s&Pell check C-p" msgstr "" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 msgid "sor&T... M-t" msgstr "" -#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "'indent' &C Formatter F19" msgstr "" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:222 msgid "&Mail... " msgstr "" -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:236 msgid "&Execute macro... C-x e, KEY" msgstr "" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:242 msgid "'ispell' s&Pell check M-$" msgstr "" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 msgid "&General... " msgstr "" -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 msgid "&Save mode..." msgstr "" -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1353 +#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 msgid "&Layout..." msgstr "" #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279 gtkedit/editmenu.c:396 +#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr "" -#: gtkedit/editmenu.c:271 gtkedit/editmenu.c:280 gtkedit/editmenu.c:412 +#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 gtkedit/editmenu.c:415 msgid " Edit " msgstr "" -#: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 +#: gtkedit/editmenu.c:275 gtkedit/editmenu.c:284 msgid " Sear/Repl " msgstr "" -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 +#: gtkedit/editmenu.c:276 gtkedit/editmenu.c:285 gtkedit/editmenu.c:455 msgid " Command " msgstr "" -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 msgid " Options " msgstr "" -#: gtkedit/editmenu.c:397 +#: gtkedit/editmenu.c:400 msgid "Open...\tC-o" msgstr "" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:410 msgid "Disk operations and file indexing/searching" msgstr "" -#: gtkedit/editmenu.c:413 +#: gtkedit/editmenu.c:416 msgid "Toggle mark\tF3" msgstr "" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:417 msgid "Toggle mark columns\tC-b" msgstr "" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:419 msgid "Toggle book mark\tC-M-Ins" msgstr "" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:420 msgid "Previous book mark\tC-M-Up" msgstr "" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:421 msgid "Next book mark\tC-M-Down" msgstr "" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:422 msgid "Flush book marks" msgstr "" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:424 msgid "Toggle insert/overwrite\tIns" msgstr "" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:426 msgid "Copy block to cursor\tF5" msgstr "" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:433 msgid "Selection history\tM-Ins" msgstr "" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:435 msgid "Undo\tC-BackSpace" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:438 msgid "Manipulating blocks of text" msgstr "" -#: gtkedit/editmenu.c:440 +#: gtkedit/editmenu.c:443 msgid " Srch/Replce " msgstr "" -#: gtkedit/editmenu.c:441 +#: gtkedit/editmenu.c:444 msgid "Search...\tF7" msgstr "" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:450 msgid "Search for and replace text" msgstr "" -#: gtkedit/editmenu.c:453 +#: gtkedit/editmenu.c:456 msgid "Goto line...\tM-l" msgstr "" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:457 +msgid "Goto matching bracket\tM-b" +msgstr "" + +#: gtkedit/editmenu.c:459 msgid "Start record macro\tC-r" msgstr "" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "" @@ -2555,84 +2612,84 @@ msgstr "" #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "" #. 4 -#: gtkedit/editoptions.c:80 +#: gtkedit/editoptions.c:78 msgid "Tab spacing : " msgstr "" -#: gtkedit/editoptions.c:88 +#: gtkedit/editoptions.c:86 msgid "synta&X highlighting" msgstr "" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "" #. 15 -#: gtkedit/editoptions.c:118 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr "" #. Not essential to translate -#: gtkedit/editwidget.c:317 +#: gtkedit/editwidget.c:323 msgid "Error initialising editor.\n" msgstr "" -#: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1719 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2068 +#: gtkedit/editwidget.c:1136 gtkedit/gtkedit.c:1246 src/help.c:806 +#: src/main.c:1721 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2073 msgid "Help" msgstr "" -#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +#: gtkedit/editwidget.c:1138 gtkedit/gtkedit.c:1248 msgid "Mark" msgstr "" -#: gtkedit/editwidget.c:1096 +#: gtkedit/editwidget.c:1139 msgid "Replac" msgstr "" -#: gtkedit/editwidget.c:1102 src/main.c:1721 +#: gtkedit/editwidget.c:1145 src/main.c:1723 msgid "PullDn" msgstr "" #. gtk_edit_menu -#: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1722 src/view.c:2070 src/view.c:2092 +#: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 +#: src/main.c:1724 src/view.c:2075 src/view.c:2097 msgid "Quit" msgstr "" @@ -2697,7 +2754,7 @@ msgid "Delete highlighted text" msgstr "" -#: gtkedit/gtkedit.c:1255 src/main.c:1720 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "" @@ -2733,58 +2790,58 @@ msgid "Search/Replace" msgstr "" -#: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1069 gtkedit/syntax.c:1078 gtkedit/syntax.c:1087 +#: gtkedit/syntax.c:1096 msgid " Spelling Message " msgstr "" -#: gtkedit/syntax.c:1051 +#: gtkedit/syntax.c:1069 msgid "" " Fail trying to open ispell program. \n" " Check that it is in your path and works with the -a option. \n" " Alternatively, disable spell checking from the Options menu. " msgstr "" -#: gtkedit/syntax.c:1060 +#: gtkedit/syntax.c:1078 msgid "" " Fail trying to open ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" " Alternatively, disable spell checking from the Options menu. " msgstr "" -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1087 msgid "" " Fail trying to read ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" " Alternatively, disable spell checking from the Options menu. " msgstr "" -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1096 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " msgstr "" -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 msgid " Load Syntax Rules " msgstr "" -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 msgid "" " Your syntax rule file is outdated \n" " A new rule file is being installed. \n" " Your old rule file has been saved with a .OLD extension. " msgstr "" -#: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 +#: gtkedit/syntax.c:1519 gtkedit/syntax.c:1526 msgid " Load syntax file " msgstr "" -#: gtkedit/syntax.c:1487 +#: gtkedit/syntax.c:1519 msgid " File access error " msgstr "" -#: gtkedit/syntax.c:1493 +#: gtkedit/syntax.c:1525 #, c-format msgid " Error in file %s on line %d " msgstr "" @@ -3379,54 +3436,54 @@ msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1360 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1367 +#: src/cmd.c:1370 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1373 +#: src/cmd.c:1376 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1379 +#: src/cmd.c:1382 msgid " SMB link to machine " msgstr "" -#: src/cmd.c:1389 +#: src/cmd.c:1392 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1390 +#: src/cmd.c:1393 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1397 +#: src/cmd.c:1400 msgid " Host name " msgstr "" -#: src/cmd.c:1397 +#: src/cmd.c:1400 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1408 +#: src/cmd.c:1411 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1409 +#: src/cmd.c:1412 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1459 +#: src/cmd.c:1462 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1464 +#: src/cmd.c:1467 msgid " Setup " msgstr "" @@ -3572,6 +3629,110 @@ msgid "mc.ext will be used for this moment." msgstr "" +#: src/features.inc:8 +msgid "Edition: " +msgstr "" + +#: src/features.inc:11 +msgid "XView" +msgstr "" + +#: src/features.inc:13 +msgid "Tk" +msgstr "" + +#: src/features.inc:16 +msgid "text mode" +msgstr "" + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" +msgstr "" + +#: src/features.inc:24 +msgid "Virtual File System: tarfs, extfs" +msgstr "" + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr "" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr "" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr "" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr "" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr "" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr "" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "" + +#: src/features.inc:48 +msgid "Using " +msgstr "" + +#: src/features.inc:51 +msgid "system-installed " +msgstr "" + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "" + +#: src/features.inc:56 +msgid "terminfo" +msgstr "" + +#: src/features.inc:59 +msgid "termcap" +msgstr "" + +#: src/features.inc:61 +msgid "an unknown terminal" +msgstr "" + +#: src/features.inc:64 +msgid " database" +msgstr "" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "" + +#: src/features.inc:74 +msgid "With subshell support: " +msgstr "" + +#: src/features.inc:76 +msgid "optional" +msgstr "" + +#: src/features.inc:78 +msgid "as default" +msgstr "" + +#: src/features.inc:84 +msgid "With support for background operations\n" +msgstr "" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr "" @@ -3878,7 +4039,7 @@ msgid "%o %d %f%e" msgstr "" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:476 msgid "file" msgstr "" @@ -4133,7 +4294,7 @@ msgid "Content: " msgstr "" -#: src/find.c:171 src/main.c:1243 src/main.c:1267 +#: src/find.c:171 src/main.c:1245 src/main.c:1269 msgid "&Tree" msgstr "" @@ -4158,7 +4319,7 @@ msgid "Finished" msgstr "" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1531 #, c-format msgid "Searching %s" msgstr "" @@ -4672,7 +4833,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "" -#: src/main.c:707 +#: src/main.c:709 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4680,263 +4841,263 @@ " extra access permissions with the \"su\" command? " msgstr "" -#: src/main.c:782 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "" -#: src/main.c:832 +#: src/main.c:834 msgid " The shell is already running a command " msgstr "" -#: src/main.c:859 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr "" -#: src/main.c:860 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: src/main.c:1240 src/main.c:1264 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "" -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1244 src/main.c:1268 msgid "&Info C-x i" msgstr "" -#: src/main.c:1245 src/main.c:1269 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "" -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "" -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "" -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "" -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "" -#: src/main.c:1258 src/main.c:1282 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "" -#: src/main.c:1288 +#: src/main.c:1290 msgid "&User menu F2" msgstr "" -#: src/main.c:1289 +#: src/main.c:1291 msgid "&View F3" msgstr "" -#: src/main.c:1290 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "" -#: src/main.c:1291 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Edit F4" msgstr "" -#: src/main.c:1293 +#: src/main.c:1295 msgid "&Copy F5" msgstr "" -#: src/main.c:1294 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "" -#: src/main.c:1297 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "" -#: src/main.c:1298 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "" -#: src/main.c:1299 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "" -#: src/main.c:1300 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "" -#: src/main.c:1302 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "" -#: src/main.c:1303 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "" -#: src/main.c:1304 +#: src/main.c:1306 msgid "&Delete F8" msgstr "" -#: src/main.c:1305 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "" -#: src/main.c:1307 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "" -#: src/main.c:1308 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "" -#: src/main.c:1309 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "" -#: src/main.c:1311 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "" -#: src/main.c:1321 +#: src/main.c:1323 msgid "&Directory tree" msgstr "" -#: src/main.c:1323 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "" -#: src/main.c:1324 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "" -#: src/main.c:1325 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "" -#: src/main.c:1326 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "" -#: src/main.c:1327 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "" -#: src/main.c:1328 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "" -#: src/main.c:1330 +#: src/main.c:1332 msgid "command &History" msgstr "" -#: src/main.c:1331 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "" -#: src/main.c:1333 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "" -#: src/main.c:1334 +#: src/main.c:1336 msgid "Fr&ee VFSs now" msgstr "" -#: src/main.c:1337 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "" -#: src/main.c:1341 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/main.c:1344 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "" -#: src/main.c:1346 +#: src/main.c:1348 msgid "&Extension file edit" msgstr "" -#: src/main.c:1347 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "" -#: src/main.c:1352 +#: src/main.c:1354 msgid "&Configuration..." msgstr "" -#: src/main.c:1354 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "" -#: src/main.c:1355 +#: src/main.c:1357 msgid "&Display bits..." msgstr "" -#: src/main.c:1357 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "" -#: src/main.c:1360 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "" -#: src/main.c:1363 +#: src/main.c:1365 msgid "&Save setup" msgstr "" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr "" -#: src/main.c:1381 +#: src/main.c:1383 msgid " &Above " msgstr "" -#: src/main.c:1384 +#: src/main.c:1386 msgid " &File " msgstr "" -#: src/main.c:1385 +#: src/main.c:1387 msgid " &Command " msgstr "" -#: src/main.c:1386 +#: src/main.c:1388 msgid " &Options " msgstr "" -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr "" -#: src/main.c:1390 +#: src/main.c:1392 msgid " &Below " msgstr "" -#: src/main.c:1445 +#: src/main.c:1447 msgid " Information " msgstr "" -#: src/main.c:1446 +#: src/main.c:1448 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -4944,7 +5105,7 @@ " the details. " msgstr "" -#: src/main.c:1925 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "" @@ -4961,123 +5122,240 @@ msgid "The TERM environment variable is unset!\n" msgstr "" -#: src/main.c:2592 +#: src/main.c:2487 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" + +#: src/main.c:2490 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "" + +#: src/main.c:2492 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "" + +#: src/main.c:2494 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "" + +#: src/main.c:2496 +msgid "" +"-c, --color Force color mode.\n" +"-C, --colors Specify colors (use --help-colors to get a list).\n" +"-d, --nomouse Disable mouse support.\n" +msgstr "" + +#: src/main.c:2500 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "" + +#: src/main.c:2502 +msgid "" +"-f, --libdir Print configured paths.\n" +"-h, --help Shows this help message.\n" +"-k, --resetsoft Reset softkeys (HP terminals only) to their " +"terminfo/termcap\n" +" default.\n" +msgstr "" + +#: src/main.c:2507 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "" + +#: src/main.c:2510 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "" + +#: src/main.c:2512 +msgid "" +"-P, --printwd At exit, print the last working directory.\n" +"-s, --slow Disables verbose operation (for slow terminals).\n" +msgstr "" + +#: src/main.c:2515 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "" + +#: src/main.c:2518 +msgid "" +"-S, --createcmdile Create command file to set default directory upon exit.\n" +msgstr "" + +#: src/main.c:2521 +msgid "" +"-u, --nosubshell Disable the concurrent subshell mode.\n" +"-U, --subshell Force the concurrent subshell mode.\n" +"-r, --forceexec Force subshell execution.\n" +msgstr "" + +#: src/main.c:2525 +msgid "" +"-v, --view fname Start up into the viewer mode.\n" +"-V, --version Report version and configuration options.\n" +"-x, --xterm Force xterm mouse support and screen save/restore.\n" +msgstr "" + +#: src/main.c:2529 +msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" +msgstr "" + +#: src/main.c:2531 +msgid "" +"\n" +"Please send any bug reports (including the output of `mc -V')\n" +"to mc-bugs@nuclecu.unam.mx\n" +msgstr "" + +#: src/main.c:2547 +msgid "" +"--colors KEYWORD={FORE},{BACK}\n" +"\n" +"{FORE} and {BACK} can be ommited, and the default will be used\n" +"\n" +"Keywords:\n" +" Global: errors, reverse, gauge, input\n" +" File display: normal, selected, marked, markselect\n" +" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus\n" +" Menus: menu, menuhot, menusel, menuhotsel\n" +" Help: helpnormal, helpitalic, helplink, helpslink\n" +" File types: directory, execute, link, device, special, core\n" +"\n" +"Colors:\n" +" black, gray, red, brightred, green, brightgreen, brown,\n" +" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +" brightcyan, lightgray and white\n" +"\n" +msgstr "" + +#: src/main.c:2596 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "" -#: src/main.c:2606 +#: src/main.c:2610 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" -#: src/main.c:2683 +#: src/main.c:2687 msgid "Use to debug the background code" msgstr "" -#: src/main.c:2689 +#: src/main.c:2693 msgid "Request to run in color mode" msgstr "" -#: src/main.c:2691 +#: src/main.c:2695 msgid "Specifies a color configuration" msgstr "" -#: src/main.c:2696 +#: src/main.c:2700 msgid "Edits one file" msgstr "" -#: src/main.c:2700 +#: src/main.c:2704 msgid "Displays this help message" msgstr "" -#: src/main.c:2703 +#: src/main.c:2707 msgid "Displays a help screen on how to change the color scheme" msgstr "" -#: src/main.c:2706 +#: src/main.c:2710 msgid "Log ftp dialog to specified file" msgstr "" -#: src/main.c:2713 +#: src/main.c:2717 msgid "Obsolete" msgstr "" -#: src/main.c:2715 +#: src/main.c:2719 msgid "Requests to run in black and white" msgstr "" -#: src/main.c:2717 +#: src/main.c:2721 msgid "Disable mouse support in text version" msgstr "" -#: src/main.c:2720 +#: src/main.c:2724 msgid "Disables subshell support" msgstr "" -#: src/main.c:2724 +#: src/main.c:2728 msgid "Prints working directory at program exit" msgstr "" -#: src/main.c:2726 +#: src/main.c:2730 msgid "Resets soft keys on HP terminals" msgstr "" -#: src/main.c:2728 +#: src/main.c:2732 msgid "To run on slow terminals" msgstr "" -#: src/main.c:2731 +#: src/main.c:2735 msgid "Use stickchars to draw" msgstr "" -#: src/main.c:2735 +#: src/main.c:2739 msgid "Enables subshell support (default)" msgstr "" -#: src/main.c:2740 +#: src/main.c:2744 msgid "Tries to use termcap instead of terminfo" msgstr "" -#: src/main.c:2744 +#: src/main.c:2748 msgid "Displays the current version" msgstr "" -#: src/main.c:2746 +#: src/main.c:2750 msgid "Launches the file viewer on a file" msgstr "" -#: src/main.c:2748 +#: src/main.c:2752 msgid "Forces xterm features" msgstr "" -#: src/main.c:2750 +#: src/main.c:2754 msgid "Geometry for the window" msgstr "" -#: src/main.c:2750 +#: src/main.c:2754 msgid "GEOMETRY" msgstr "" -#: src/main.c:2751 +#: src/main.c:2755 msgid "No windows opened at startup" msgstr "" -#: src/main.c:2753 +#: src/main.c:2756 +msgid "No desktop icons" +msgstr "" + +#: src/main.c:2757 +msgid "Look more like traditional gmc" +msgstr "" + +#: src/main.c:2759 msgid "Display the directory that holds the .links startup files and exit" msgstr "" -#: src/main.c:3051 +#: src/main.c:3071 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" msgstr "" -#: src/main.c:3129 +#: src/main.c:3149 msgid " Notice " msgstr "" -#: src/main.c:3130 +#: src/main.c:3150 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5467,166 +5745,166 @@ msgid " Dup failed " msgstr "" -#: src/view.c:401 +#: src/view.c:406 msgid "" "File: \n" "\n" " " msgstr "" -#: src/view.c:402 +#: src/view.c:407 msgid "" "\n" "\n" "has been modified, do you want to save the changes?\n" msgstr "" -#: src/view.c:404 +#: src/view.c:409 msgid " Save changes " msgstr "" -#: src/view.c:446 +#: src/view.c:451 msgid " Can't spawn child program " msgstr "" -#: src/view.c:455 +#: src/view.c:460 msgid " Empty output from child filter " msgstr "" -#: src/view.c:460 +#: src/view.c:465 msgid " Could not open file " msgstr "" -#: src/view.c:475 +#: src/view.c:480 msgid " Can't open file \"" msgstr "" -#: src/view.c:482 +#: src/view.c:487 msgid "" " Can't stat file \n" " " msgstr "" -#: src/view.c:488 +#: src/view.c:493 msgid " Can't view: not a regular file " msgstr "" -#: src/view.c:569 +#: src/view.c:574 #, c-format msgid "" " Can't open \"%s\"\n" " %s " msgstr "" -#: src/view.c:578 +#: src/view.c:583 #, c-format msgid "" " Can't stat \"%s\"\n" " %s " msgstr "" -#: src/view.c:714 +#: src/view.c:719 #, c-format msgid "File: %s" msgstr "" -#: src/view.c:728 +#: src/view.c:733 #, c-format msgid "Offset 0x%08x" msgstr "" -#: src/view.c:739 +#: src/view.c:744 msgid " [grow]" msgstr "" -#: src/view.c:1518 +#: src/view.c:1523 #, c-format msgid "Searching for `%s'" msgstr "" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1630 src/view.c:1753 msgid " Search string not found " msgstr "" -#: src/view.c:1787 +#: src/view.c:1792 msgid " Invalid regular expression " msgstr "" -#: src/view.c:1911 +#: src/view.c:1916 #, c-format msgid "" " The current line number is %d.\n" " Enter the new line number:" msgstr "" -#: src/view.c:1933 +#: src/view.c:1938 #, c-format msgid "" " The current address is 0x%lx.\n" " Enter the new address:" msgstr "" -#: src/view.c:1935 +#: src/view.c:1940 msgid " Goto Address " msgstr "" -#: src/view.c:1966 +#: src/view.c:1971 msgid " Enter regexp:" msgstr "" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Ascii" msgstr "" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "" -#: src/view.c:2075 +#: src/view.c:2080 msgid "RxSrch" msgstr "" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdText" msgstr "" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdHex" msgstr "" -#: src/view.c:2080 +#: src/view.c:2085 msgid "UnWrap" msgstr "" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "" @@ -5829,279 +6107,367 @@ msgid "NumLock on keypad" msgstr "" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "" + +#: vfs/cpio.c:427 +#, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "" + +#. In case entry is already there +#. This shouldn't happen! (well, it can happen if there is a record for a +#. file and than a record for a directory it is in; cpio would die with +#. 'No such file or directory' is such case) +#. This can be considered archive inconsistency +#: vfs/cpio.c:450 +#, c-format +msgid "%s contains duplicit entries! Skiping!" +msgstr "" + +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" + +#: vfs/direntry.c:312 +#, c-format +msgid "Dir cache expired for %s" +msgstr "" + +#: vfs/direntry.c:444 vfs/direntry.c:447 +msgid " Direntry warning " +msgstr "" + +#: vfs/direntry.c:444 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "" + +#: vfs/direntry.c:447 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:821 +msgid "Starting linear transfer..." +msgstr "" + +#: vfs/direntry.c:964 +msgid "Getting file" +msgstr "" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" "%s" msgstr "" -#: vfs/extfs.c:300 vfs/extfs.c:320 +#: vfs/extfs.c:302 vfs/extfs.c:322 msgid "Inconsistent extfs archive" msgstr "" -#: vfs/fish.c:136 +#: vfs/fish.c:139 #, c-format msgid "fish: Disconnecting from %s" msgstr "" -#: vfs/fish.c:214 +#: vfs/fish.c:217 msgid "fish: Waiting for initial line..." msgstr "" -#: vfs/fish.c:224 +#: vfs/fish.c:227 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" -#: vfs/fish.c:238 +#: vfs/fish.c:232 +msgid " fish: Password required for " +msgstr "" + +#: vfs/fish.c:241 msgid "fish: Sending password..." msgstr "" -#: vfs/fish.c:244 +#: vfs/fish.c:247 msgid "fish: Sending initial line..." msgstr "" -#: vfs/fish.c:248 +#: vfs/fish.c:251 msgid "fish: Handshaking version..." msgstr "" -#: vfs/fish.c:252 +#: vfs/fish.c:255 msgid "fish: Setting up current directory..." msgstr "" -#: vfs/fish.c:254 +#: vfs/fish.c:257 #, c-format msgid "fish: Connected, home %s." msgstr "" -#: vfs/fish.c:330 +#: vfs/fish.c:333 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: vfs/fish.c:426 +#: vfs/fish.c:429 msgid "fish: failed" msgstr "" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:449 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: vfs/fish.c:460 +#: vfs/fish.c:463 msgid "fish: Local read failed, sending zeros" msgstr "" -#: vfs/fish.c:472 +#: vfs/fish.c:475 #, c-format msgid "fish: storing %s %d (%d)" msgstr "" -#: vfs/fish.c:512 +#: vfs/fish.c:476 +msgid "zeros" +msgstr "" + +#: vfs/fish.c:515 msgid "Aborting transfer..." msgstr "" -#: vfs/fish.c:521 +#: vfs/fish.c:524 msgid "Error reported after abort." msgstr "" -#: vfs/fish.c:523 +#: vfs/fish.c:526 msgid "Aborted transfer would be successful." msgstr "" -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:316 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:374 msgid " FTP: Password required for " msgstr "" -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:407 msgid " Proxy: Password required for " msgstr "" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:433 msgid "ftpfs: sending proxy login name" msgstr "" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:437 msgid "ftpfs: sending proxy user password" msgstr "" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:441 msgid "ftpfs: proxy authentication succeeded" msgstr "" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:445 #, c-format msgid "ftpfs: connected to %s" msgstr "" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:462 msgid "ftpfs: sending login name" msgstr "" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:467 msgid "ftpfs: sending user password" msgstr "" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:472 msgid "ftpfs: logged in" msgstr "" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:487 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "" -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:519 #, c-format msgid " Could not set source routing (%s)" msgstr "" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "" -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "" -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:917 msgid "ftpfs: could not setup passive mode" msgstr "" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:992 msgid "ftpfs: aborting transfer." msgstr "" -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:994 #, c-format msgid "ftpfs: abort error: %s" msgstr "" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:999 msgid "ftpfs: abort failed" msgstr "" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1088 vfs/ftpfs.c:1185 msgid "ftpfs: CWD failed." msgstr "" -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1098 vfs/ftpfs.c:1105 msgid "ftpfs: couldn't resolve symlink" msgstr "" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1156 msgid "Resolving symlink..." msgstr "" -#: vfs/ftpfs.c:1338 -#, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "" - -#: vfs/ftpfs.c:1340 +#: vfs/ftpfs.c:1174 #, c-format -msgid "ftpfs: Reading FTP directory %s..." +msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "" -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" +#: vfs/ftpfs.c:1175 +msgid "(strict rfc959)" msgstr "" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" +#: vfs/ftpfs.c:1176 +msgid "(chdir first)" msgstr "" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "" - -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1270 msgid "ftpfs: failed" msgstr "" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1280 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1343 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1758 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." msgstr "" -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr "" -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr "" -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " 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" msgstr "" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr "" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr "" -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr "" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr "" -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr "" -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr "" + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr "" + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr "" + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr "" +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "" + #: vfs/smbfs.c:115 msgid "Domain:" msgstr "" @@ -6126,6 +6492,10 @@ " " msgstr "" +#: vfs/smbfs.c:1242 +msgid " Authentication failed " +msgstr "" + #: vfs/smbfs.c:1737 #, c-format msgid " %s mkdir'ing %s " @@ -6169,11 +6539,133 @@ "doesn't look like a tar archive." msgstr "" -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1149 +msgid "Changes to file lost" +msgstr "" + +#: vfs/vfs.c:1792 +msgid "Could not parse:" +msgstr "" + +#: vfs/vfs.c:1794 +msgid "More parsing errors will be ignored." +msgstr "" + +#: vfs/vfs.c:1794 +msgid "(sorry)" +msgstr "" + +#: vfs/vfs.c:1805 +msgid "Internal error:" +msgstr "" + +#: vfs/vfs.c:1815 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1816 #, c-format msgid "%s: %s: %s %ld bytes transfered" +msgstr "" + +#: vfs/undelfs.c:80 +msgid " undelfs: error " +msgstr "" + +#: vfs/undelfs.c:183 +msgid " not enough memory " +msgstr "" + +#: vfs/undelfs.c:188 +msgid " while allocating block buffer " +msgstr "" + +#: vfs/undelfs.c:192 +#, c-format +msgid " open_inode_scan: %d " +msgstr "" + +#: vfs/undelfs.c:196 +#, c-format +msgid " while starting inode scan %d " +msgstr "" + +#: vfs/undelfs.c:203 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "" + +#: vfs/undelfs.c:218 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr "" + +#: vfs/undelfs.c:226 +msgid " no more memory while reallocating array " +msgstr "" + +#: vfs/undelfs.c:245 +#, c-format +msgid " while doing inode scan %d " +msgstr "" + +#: vfs/undelfs.c:269 +msgid " Ext2lib error " +msgstr "" + +#: vfs/undelfs.c:296 +#, c-format +msgid " Could not open file %s " +msgstr "" + +#: vfs/undelfs.c:299 +msgid "undelfs: reading inode bitmap..." +msgstr "" + +#: vfs/undelfs.c:302 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:305 +msgid "undelfs: reading block bitmap..." +msgstr "" + +#: vfs/undelfs.c:308 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:314 +msgid "undelfs: done." +msgstr "" + +#: vfs/undelfs.c:317 +msgid "undelfs: failure" +msgstr "" + +#: vfs/undelfs.c:341 +msgid " vfs_info is not fs! " +msgstr "" + +#: vfs/undelfs.c:397 vfs/undelfs.c:581 +msgid " You have to chdir to extract files first " +msgstr "" + +#: vfs/undelfs.c:520 +msgid " while iterating over blocks " +msgstr "" + +#: vfs/undelfs.c:625 +#, c-format +msgid " Could not open file: %s " +msgstr "" + +#. This is place of next pointer +#: vfs/undelfs.c:683 +msgid "Undelete filesystem for ext2" msgstr "" Binary files old/mc-4.5.42/po/no.gmo and new/mc-4.5.43/po/no.gmo differ diff -ruN old/mc-4.5.42/po/no.po new/mc-4.5.43/po/no.po --- old/mc-4.5.42/po/no.po Mon Dec 6 18:50:16 1999 +++ new/mc-4.5.43/po/no.po Sat Mar 18 08:43:50 2000 @@ -4,8 +4,8 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.34\n" -"POT-Creation-Date: 1999-12-01 10:43+0100\n" -"PO-Revision-Date: 1999-12-01 10:43+01:00\n" +"POT-Creation-Date: 2000-02-19 20:21+0100\n" +"PO-Revision-Date: 2000-02-19 20:51+01:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" "MIME-Version: 1.0\n" @@ -22,7 +22,7 @@ #. Input line for a single key press follows the ':' #: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:743 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr " Trykk hurtigtast for makro: " @@ -84,15 +84,15 @@ "med kommandoen:\n" "\"%s\"%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:135 gnome/gaction.c:151 msgid "open" msgstr "åpne" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:188 gnome/gaction.c:205 msgid "edit" msgstr "rediger" -#: gnome/gaction.c:331 +#: gnome/gaction.c:345 msgid "view" msgstr "se på" @@ -206,7 +206,7 @@ msgstr "Sett filter" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 -#: gnome/gscreen.c:2416 +#: gnome/gscreen.c:2429 msgid "Show all files" msgstr "Vis alle filer" @@ -283,8 +283,8 @@ msgstr "Opprettelsestid" #. Group -#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:776 -#: gnome/gnome-file-property-dialog.c:945 gnome/gprop.c:280 gnome/gprop.c:405 +#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:788 +#: gnome/gnome-file-property-dialog.c:957 gnome/gprop.c:280 gnome/gprop.c:405 #: src/screen.c:427 msgid "Group" msgstr "Gruppe" @@ -310,7 +310,7 @@ msgstr "Antall harde lenker" #. Owner -#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:930 +#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:942 #: gnome/gprop.c:390 src/screen.c:426 msgid "Owner" msgstr "Eier" @@ -343,28 +343,28 @@ msgid "Custom View" msgstr "Egendefinert visning" -#: gnome/gdesktop.c:521 gnome/gmount.c:389 +#: gnome/gdesktop.c:532 gnome/gmount.c:382 msgid "Warning" msgstr "Advarsel" -#: gnome/gdesktop.c:522 +#: gnome/gdesktop.c:533 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "Kunne ikke åpne %s; vil ikke ha skrivebordsikoner" -#: gnome/gdesktop.c:1186 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "Under kjøring av mount/umount kommandoen" -#: gnome/gdesktop.c:1255 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "Under kjøring av eject kommandoen" -#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "Feil" -#: gnome/gdesktop.c:2598 +#: gnome/gdesktop.c:2617 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -378,84 +378,84 @@ "\n" "Kan ikke sette bakgrunnen." -#: gnome/gdesktop.c:2621 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2621 gnome/glayout.c:363 +#: gnome/gdesktop.c:2640 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Starter en ny terminal i aktiv katalog" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2623 gnome/glayout.c:365 +#: gnome/gdesktop.c:2642 gnome/glayout.c:365 msgid "_Directory..." msgstr "Katalog..." -#: gnome/gdesktop.c:2623 gnome/glayout.c:366 +#: gnome/gdesktop.c:2642 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Oppretter en ny katalog" -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "URL L_ink..." msgstr "URL-snarve_i..." -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" msgstr "Oppretter en ny URL-snarvei" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "_Oppstarter..." -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "Creates a new launcher" msgstr "Oppretter en ny oppstarter" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2650 msgid "By _Name" msgstr "Etter _navn" -#: gnome/gdesktop.c:2632 +#: gnome/gdesktop.c:2651 msgid "By File _Type" msgstr "Etter _filtype" -#: gnome/gdesktop.c:2633 +#: gnome/gdesktop.c:2652 msgid "By _Size" msgstr "Etter _størrelse" -#: gnome/gdesktop.c:2634 +#: gnome/gdesktop.c:2653 msgid "By Time Last _Accessed" msgstr "Etter tid for siste _aksess" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2654 msgid "By Time Last _Modified" msgstr "Etter tid for siste _modifikasjon" -#: gnome/gdesktop.c:2636 +#: gnome/gdesktop.c:2655 msgid "By Time Last _Changed" msgstr "Etter tid for siste _endring" -#: gnome/gdesktop.c:2644 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Plasser ikonene" -#: gnome/gdesktop.c:2645 +#: gnome/gdesktop.c:2664 msgid "Create _New Window" msgstr "Opprett _nytt vindu" -#: gnome/gdesktop.c:2647 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Oppdater skrivebor_dskatalogen" -#: gnome/gdesktop.c:2648 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Oppdater en_heter" -#: gnome/gdesktop.c:2649 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Lag standard_ikonene på nytt" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2670 msgid "Configure _Background Image" msgstr "Konfigurer _bakgrunnsbilde" @@ -551,12 +551,12 @@ msgid "Replace it?" msgstr "Erstatt den?" -#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1097 gtkedit/gtkedit.c:1250 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 #: src/file.c:802 src/screen.c:2399 src/screen.c:2429 src/tree.c:1014 msgid "Copy" msgstr "Kopier" -#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1098 gtkedit/gtkedit.c:1252 +#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1141 gtkedit/gtkedit.c:1252 msgid "Move" msgstr "Flytt" @@ -653,7 +653,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1840 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1837 msgid "Password:" msgstr "Passord:" @@ -674,24 +674,24 @@ msgid "Symbolic link filename:" msgstr "Filnavn for symbolsk lenke:" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "Flytt hit" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "Kopier hit" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "Lag lenke her" -#: gnome/gdnd.c:56 +#: gnome/gdnd.c:57 msgid "Cancel drag" msgstr "Avbryt dra" #. FIXME: this error message sucks -#: gnome/gdnd.c:192 +#: gnome/gdnd.c:193 #, c-format msgid "" "Could not stat %s\n" @@ -700,9 +700,9 @@ " Kunne ikke kjøre stat på %s \n" " %s " -#: gnome/gicon.c:218 -msgid "Default set of icons not found, please check your installation" -msgstr "Standard ikonsett ikke funnet, vennligst sjekk installasjonen" +#: gnome/gicon.c:282 +msgid "Default set of icons not found, check your installation" +msgstr "Standard ikonsett ikke funnet, sjekk installasjonen" #: gnome/glayout.c:41 msgid "_Icon View" @@ -793,7 +793,7 @@ msgstr "Oppretter en ny fil i denne katalogen" #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:389 gnome/gscreen.c:2085 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." msgstr "Kopier..." @@ -801,7 +801,7 @@ msgid "Copy files" msgstr "Kopier filer" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "Slett..." @@ -809,7 +809,7 @@ msgid "Delete files" msgstr "Slett filer" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "Flytt..." @@ -857,7 +857,7 @@ msgid "Reverses the list of tagged files" msgstr "Reverserer listen med merkede filer" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2088 msgid "Search" msgstr "Søk" @@ -865,7 +865,7 @@ msgid "Search for a file in the current Panel" msgstr "Søk etter en fil i det aktive panelet" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "Oppdate_r kataloginnholdet" @@ -974,285 +974,286 @@ "Som root kan du påføre systemet ditt stor skade hvis du ikke er forsiktig, " "og GNOME filbehandleren vil ikke hindre deg i å gjøre dette." -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr " Kunne ikke åpne /etc/fstab filen" -#: gnome/gmount.c:390 +#: gnome/gmount.c:383 #, c-format msgid "Could not symlink %s to %s; will not have such a desktop device icon." msgstr "" "Kunne ikke lage symlenke fra %s til %s; får ikke et slikt skrivebordsikon." -#: gnome/gmount.c:446 +#: gnome/gmount.c:439 #, c-format msgid "CD-ROM %d" msgstr "CD-ROM %d" -#: gnome/gmount.c:458 +#: gnome/gmount.c:451 #, c-format msgid "Floppy %d" msgstr "Diskett %d" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "Disk %d" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "NFS katalog %s" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "Enhet %d" #. we set the file part -#: gnome/gnome-file-property-dialog.c:170 +#: gnome/gnome-file-property-dialog.c:171 msgid "Full Name: " msgstr "Fullt navn: " -#: gnome/gnome-file-property-dialog.c:178 +#: gnome/gnome-file-property-dialog.c:179 msgid "File Name" msgstr "Filnavn" -#: gnome/gnome-file-property-dialog.c:201 +#: gnome/gnome-file-property-dialog.c:204 +#: gnome/gnome-file-property-dialog.c:210 msgid "File Type: " msgstr "Filtype: " -#: gnome/gnome-file-property-dialog.c:207 +#: gnome/gnome-file-property-dialog.c:217 msgid "File Type: Symbolic Link" msgstr "Filtype: Symbolsk lenke" -#: gnome/gnome-file-property-dialog.c:212 +#: gnome/gnome-file-property-dialog.c:222 msgid "Target Name: INVALID LINK" msgstr "Målnavn: UGYLDIG LENKE" -#: gnome/gnome-file-property-dialog.c:215 +#: gnome/gnome-file-property-dialog.c:225 msgid "Target Name: " msgstr "Målnavn: " -#: gnome/gnome-file-property-dialog.c:220 +#: gnome/gnome-file-property-dialog.c:230 msgid "File Type: Directory" msgstr "Filtype: Katalog" -#: gnome/gnome-file-property-dialog.c:222 +#: gnome/gnome-file-property-dialog.c:232 msgid "File Type: Character Device" msgstr "Filtype: Tegnenhet" -#: gnome/gnome-file-property-dialog.c:224 +#: gnome/gnome-file-property-dialog.c:234 msgid "File Type: Block Device" msgstr "Filtype: Blokkenhet" -#: gnome/gnome-file-property-dialog.c:226 +#: gnome/gnome-file-property-dialog.c:236 msgid "File Type: Socket" msgstr "Filtype: Socket" -#: gnome/gnome-file-property-dialog.c:228 +#: gnome/gnome-file-property-dialog.c:238 msgid "File Type: FIFO" msgstr "Filtype: FIFO" -#: gnome/gnome-file-property-dialog.c:238 -#: gnome/gnome-file-property-dialog.c:242 #: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:252 +#: gnome/gnome-file-property-dialog.c:258 msgid "File Size: " msgstr "Filstørrelse: " -#: gnome/gnome-file-property-dialog.c:238 +#: gnome/gnome-file-property-dialog.c:248 msgid " bytes" msgstr " bytes" -#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:252 msgid " KBytes (" msgstr " KBytes (" -#: gnome/gnome-file-property-dialog.c:243 -#: gnome/gnome-file-property-dialog.c:249 +#: gnome/gnome-file-property-dialog.c:253 +#: gnome/gnome-file-property-dialog.c:259 msgid " bytes)" msgstr " bytes)" -#: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:258 msgid " MBytes (" msgstr " MBytes (" -#: gnome/gnome-file-property-dialog.c:256 +#: gnome/gnome-file-property-dialog.c:266 msgid "File Size: N/A" msgstr "Filstørrelse: I/T" -#: gnome/gnome-file-property-dialog.c:267 +#: gnome/gnome-file-property-dialog.c:277 msgid "File Created on: " msgstr "Fil opprettet: " -#: gnome/gnome-file-property-dialog.c:276 +#: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "Sist modifisert: " -#: gnome/gnome-file-property-dialog.c:285 +#: gnome/gnome-file-property-dialog.c:295 msgid "Last Accessed on: " msgstr "Sist aksessert: " -#: gnome/gnome-file-property-dialog.c:303 +#: gnome/gnome-file-property-dialog.c:313 msgid "URL:" msgstr "URL:" -#: gnome/gnome-file-property-dialog.c:310 +#: gnome/gnome-file-property-dialog.c:320 msgid "Caption:" msgstr "Tittel:" -#: gnome/gnome-file-property-dialog.c:387 -#: gnome/gnome-file-property-dialog.c:489 +#: gnome/gnome-file-property-dialog.c:397 +#: gnome/gnome-file-property-dialog.c:499 msgid "Drop Action" msgstr "Handlig ved slipp" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 msgid "Use default Drop Action options" msgstr "Bruk standard alternativer for slipp" -#: gnome/gnome-file-property-dialog.c:403 -#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 #: src/screen.c:2397 src/screen.c:2427 msgid "View" msgstr "Se på" -#: gnome/gnome-file-property-dialog.c:404 +#: gnome/gnome-file-property-dialog.c:414 msgid "Use default View options" msgstr "Bruk standardvalg for visning" -#: gnome/gnome-file-property-dialog.c:439 +#: gnome/gnome-file-property-dialog.c:449 msgid "Select an Icon" msgstr "Velg et ikon" #. we do open first -#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 +#: gnome/gnome-file-property-dialog.c:479 gnome/gpopup2.c:195 msgid "Open" msgstr "Åpne" -#: gnome/gnome-file-property-dialog.c:479 +#: gnome/gnome-file-property-dialog.c:489 msgid "Use default Open action" msgstr "Bruk standard handling for åpning" -#: gnome/gnome-file-property-dialog.c:502 +#: gnome/gnome-file-property-dialog.c:512 msgid "Use default Drop action" msgstr "Bruk standard handling for slipp" -#: gnome/gnome-file-property-dialog.c:504 +#: gnome/gnome-file-property-dialog.c:514 msgid "Use default View action" msgstr "Bruk standard handling for visning" -#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +#: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 msgid "Edit" msgstr "Rediger" -#: gnome/gnome-file-property-dialog.c:523 +#: gnome/gnome-file-property-dialog.c:533 msgid "Use default Edit action" msgstr "Bruk standard handling for redigering" -#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521 +#: gnome/gnome-file-property-dialog.c:587 gnome/gprop.c:521 msgid "Icon" msgstr "Ikon" #. We must be a file or a link to a file. -#: gnome/gnome-file-property-dialog.c:611 +#: gnome/gnome-file-property-dialog.c:621 msgid "File Actions" msgstr "Fil-handlinger" -#: gnome/gnome-file-property-dialog.c:616 +#: gnome/gnome-file-property-dialog.c:626 msgid "Open action" msgstr "Handling for åpning" -#: gnome/gnome-file-property-dialog.c:617 +#: gnome/gnome-file-property-dialog.c:627 msgid "Needs terminal to run" msgstr "Trenger terminal for å kjøre" -#: gnome/gnome-file-property-dialog.c:742 +#: gnome/gnome-file-property-dialog.c:753 msgid "File Permissions" msgstr "Filrettigheter" -#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259 +#: gnome/gnome-file-property-dialog.c:764 gnome/gprop.c:259 msgid "Current mode: " msgstr "Nåværende modus: " #. Headings -#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272 +#: gnome/gnome-file-property-dialog.c:780 gnome/gprop.c:272 msgid "Read" msgstr "Lese" -#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273 +#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:273 msgid "Write" msgstr "Skrive" -#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274 +#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:274 msgid "Exec" msgstr "Kjøre" -#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275 +#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:275 msgid "Special" msgstr "Spesielle" #. Permissions -#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279 +#: gnome/gnome-file-property-dialog.c:787 gnome/gprop.c:279 msgid "User" msgstr "Bruker" -#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281 +#: gnome/gnome-file-property-dialog.c:789 gnome/gprop.c:281 msgid "Other" msgstr "Andre" #. Special -#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285 +#: gnome/gnome-file-property-dialog.c:793 gnome/gprop.c:285 msgid "Set UID" msgstr "Sett UID" -#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286 +#: gnome/gnome-file-property-dialog.c:794 gnome/gprop.c:286 msgid "Set GID" msgstr "Sett GID" -#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287 +#: gnome/gnome-file-property-dialog.c:795 gnome/gprop.c:287 msgid "Sticky" msgstr "Sticky" -#: gnome/gnome-file-property-dialog.c:905 +#: gnome/gnome-file-property-dialog.c:917 #, c-format msgid " (%d)" msgstr " (%d)" -#: gnome/gnome-file-property-dialog.c:919 +#: gnome/gnome-file-property-dialog.c:931 msgid "File ownership" msgstr "Eierskap for fil" -#: gnome/gnome-file-property-dialog.c:1079 +#: gnome/gnome-file-property-dialog.c:1097 msgid "URL" msgstr "URL" -#: gnome/gnome-file-property-dialog.c:1082 +#: gnome/gnome-file-property-dialog.c:1100 msgid "Statistics" msgstr "Statistikk" -#: gnome/gnome-file-property-dialog.c:1088 +#: gnome/gnome-file-property-dialog.c:1106 msgid "Options" msgstr "Alternativer" -#: gnome/gnome-file-property-dialog.c:1091 +#: gnome/gnome-file-property-dialog.c:1109 msgid "Permissions" msgstr "Rettigheter" -#: gnome/gnome-file-property-dialog.c:1094 +#: gnome/gnome-file-property-dialog.c:1112 msgid " Properties" msgstr " Egenskaper" -#: gnome/gnome-file-property-dialog.c:1146 -#: gnome/gnome-file-property-dialog.c:1157 +#: gnome/gnome-file-property-dialog.c:1164 +#: gnome/gnome-file-property-dialog.c:1175 msgid "You entered an invalid username" msgstr "Du skrev inn et ugyldig brukernavn" -#: gnome/gnome-file-property-dialog.c:1202 +#: gnome/gnome-file-property-dialog.c:1220 msgid "You must rename your file to something" msgstr "Du må gi filen din et nytt navn" -#: gnome/gnome-file-property-dialog.c:1208 +#: gnome/gnome-file-property-dialog.c:1226 msgid "You cannot rename a file to something containing a '/' character" msgstr "Du kan ikke gi nytt navn til noe som inneholde tegnet '/'" @@ -1298,7 +1299,7 @@ msgid "Copy..." msgstr "Kopier..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2402 #: src/screen.c:2432 msgid "Delete" msgstr "Slett" @@ -1339,71 +1340,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Bruk skall-uttrykk i stedet for regulære uttrykk" -#: gnome/gprefs.c:113 +#: gnome/gprefs.c:108 +msgid "Determine file types from file content instead of extensions" +msgstr "Bestem filtyper fra innhold i stedet for etternavn" + +#: gnome/gprefs.c:117 msgid "Confirm when deleting file" msgstr "Bekreft ved sletting av fil" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "Bekreft ved overskriving av filer" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "Bekreft ved kjøring av filer" -#: gnome/gprefs.c:125 +#: gnome/gprefs.c:129 msgid "Show progress while operations are being performed" msgstr "Vis fremgang mens operasjoner utføres" -#: gnome/gprefs.c:134 +#: gnome/gprefs.c:138 msgid "VFS Timeout:" msgstr "VFS tidsavbrudd:" -#: gnome/gprefs.c:135 gnome/gprefs.c:160 +#: gnome/gprefs.c:139 gnome/gprefs.c:164 msgid "Seconds" msgstr "Sekunder" -#: gnome/gprefs.c:138 +#: gnome/gprefs.c:142 msgid "Anonymous FTP password:" msgstr "Passord for anonym FTP:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "Alltid bruk FTP stedfortreder" -#: gnome/gprefs.c:151 +#: gnome/gprefs.c:155 msgid "Fast directory reload" msgstr "Rask katalogoppfrisking" -#: gnome/gprefs.c:155 +#: gnome/gprefs.c:159 msgid "Compute totals before copying files" msgstr "Beregn totaler før filer kopieres" -#: gnome/gprefs.c:159 +#: gnome/gprefs.c:163 msgid "FTP directory cache timeout :" msgstr "Katalog cache tidsavbrudd for FTP :" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:167 msgid "Allow customization of icons in icon view" msgstr "Tillat egendefinerte ikoner i ikonvisning" -#: gnome/gprefs.c:172 +#: gnome/gprefs.c:176 msgid "File display" msgstr "Filvisning" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:180 msgid "Confirmation" msgstr "Bekreftelse" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:184 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "Mellomlagring" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "Innstillinger" @@ -1447,104 +1452,104 @@ msgid "Select icon" msgstr "Velg ikon" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Leser aktiv katalog på nytt" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "Ny _Katalog..." -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "Oppretter en ny katalog her" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." msgstr "Ny _fil..." -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "Creates a new file here" msgstr "Oppretter en ny fil her" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "Søk: %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "%s bytes i %d fil" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "%s bytes i %d filer" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" msgstr "" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 msgid "Copy directory" msgstr "Kopier katalog" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "Slett katalog" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "Omdøp eller flytt katalog" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Tilbake" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Gå til tidligere vist katalog" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Opp" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Gå opp ett nivå i kataloghierarkiet" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Fram" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Gå til neste katalog" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Oppdater" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Oppdater aktiv katalog" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "Hjem" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "Gå til din hjemmekatalog" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "Plassering:" #. 1 -#: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1219 -#: gtkedit/editcmd.c:1304 gtkedit/editcmd.c:2916 gtkedit/editoptions.c:71 +#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 +#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:71 #: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466 #: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 #: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:143 @@ -1557,12 +1562,12 @@ msgid "Offset 0x%08lx" msgstr "Offset 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:735 #, c-format msgid "Col %d" msgstr "Kol %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "%s bytes" @@ -1652,56 +1657,82 @@ msgid "Could not get the desktop\n" msgstr "Kunne ikke finne skrivebordet\n" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "Ukjent sorteringstype `%s'\n" + +#: gnome/gmc-client.c:206 msgid "Create window showing the specified directory" msgstr "Åpne vindu som viser den spesifiserte katalogen" -#: gnome/gmc-client.c:171 gnome/gmc-client.c:173 +#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 msgid "DIRECTORY" msgstr "KATALOG" -#: gnome/gmc-client.c:173 +#: gnome/gmc-client.c:208 msgid "Rescan the specified directory" msgstr "Oppdater den spesifiserte katalogen" -#: gnome/gmc-client.c:175 +#: gnome/gmc-client.c:210 msgid "Rescan the desktop icons" msgstr "Oppdater skrivebordsikonene" -#: gnome/gmc-client.c:177 +#: gnome/gmc-client.c:212 msgid "Rescan the desktop device icons" msgstr "Oppdater enhetsikonene på skrivebordet" -#: gnome/gmc-client.c:179 +#: gnome/gmc-client.c:214 +msgid "Arrange the desktop icons" +msgstr "Plasser skrivebordsikonene" + +#: gnome/gmc-client.c:215 +msgid "name | type | size | atime | mtime | ctime" +msgstr "navn | type | størrelse | atid | mtid | etid" + +#: gnome/gmc-client.c:217 msgid "Close windows whose directories cannot be reached" msgstr "Lukk vinduer hvis kataloger ikke kan nås" #. The file-name is printed after the ':' -#: gtkedit/edit.c:132 gtkedit/edit.c:227 gtkedit/edit.c:234 gtkedit/edit.c:241 -#: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 -#: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 -#: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: gtkedit/edit.c:145 gtkedit/edit.c:314 gtkedit/edit.c:319 gtkedit/edit.c:333 +#: gtkedit/edit.c:337 gtkedit/edit.c:369 gtkedit/edit.c:375 gtkedit/edit.c:382 +#: gtkedit/edit.c:389 gtkedit/edit.c:395 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2030 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/screen.c:2417 src/tree.c:682 src/tree.c:688 +#: src/wtools.c:222 vfs/fish.c:226 msgid " Error " msgstr " Feil " -#: gtkedit/edit.c:132 gtkedit/edit.c:234 +#: gtkedit/edit.c:145 gtkedit/edit.c:337 gtkedit/edit.c:375 msgid " Failed trying to open file for reading: " msgstr " Feil under åpning av fil for lesing: " -#: gtkedit/edit.c:241 +#: gtkedit/edit.c:314 +msgid " Error reading from pipe: " +msgstr " Feil under lesing fra rør: " + +#: gtkedit/edit.c:319 +msgid " Failed trying to open pipe for reading: " +msgstr " Feil under åpning av rør for lesing: " + +#: gtkedit/edit.c:333 +msgid " Error reading file: " +msgstr " Feil under lesing av fil: " + +#: gtkedit/edit.c:382 msgid " Cannot get size/permissions info on file: " msgstr " Kan ikke finne størrelse-/rettighetsinformasjon for filen: " -#: gtkedit/edit.c:248 +#: gtkedit/edit.c:389 msgid " Not an ordinary file: " msgstr " Ikke en vanlig fil: " -#: gtkedit/edit.c:254 +#: gtkedit/edit.c:395 msgid " File is too large: " msgstr " Filen er for stor: " -#: gtkedit/edit.c:255 +#: gtkedit/edit.c:396 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " @@ -1709,144 +1740,148 @@ " \n" " Gjør edit.h:MAXBUF større og rekompiler editoren. " -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr " Feil under minneallokering " +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " Feil under skriving til rør: " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr " Feil under åpning av rør for skriving: " -#: gtkedit/editcmd.c:334 +#: gtkedit/editcmd.c:379 msgid "Quick save " msgstr "Hurtiglagring" -#: gtkedit/editcmd.c:335 +#: gtkedit/editcmd.c:380 msgid "Safe save " msgstr "Trygg lagring" -#: gtkedit/editcmd.c:336 +#: gtkedit/editcmd.c:381 msgid "Do backups -->" msgstr "Lag sikkerhetskopi -->" #. NLS for hotkeys? -#: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1171 gtkedit/editcmd.c:1217 -#: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 +#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 +#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:68 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 #: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 -#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: src/view.c:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 #: vfs/smbfs.c:116 msgid "&Cancel" msgstr "&Avbryt" -#: gtkedit/editcmd.c:345 +#: gtkedit/editcmd.c:390 msgid "Extension:" msgstr "Utvidelse:" #. NLS ? -#: gtkedit/editcmd.c:352 +#: gtkedit/editcmd.c:397 msgid " Edit Save Mode " msgstr " Rediger lagringsmodus " -#: gtkedit/editcmd.c:499 +#: gtkedit/editcmd.c:525 msgid " Save As " msgstr " Lagre som " #. Warning message with a query to continue or cancel the operation -#: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:706 src/screen.c:1451 src/screen.c:2129 +#: gtkedit/editcmd.c:539 gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " Advarsel " -#: gtkedit/editcmd.c:514 +#: gtkedit/editcmd.c:540 msgid " A file already exists with this name. " msgstr " En fil med dette navnet eksisterer allerede. " #. Push buttons to over-write the current file, or cancel the operation -#: gtkedit/editcmd.c:516 +#: gtkedit/editcmd.c:542 msgid "Overwrite" msgstr "Overskriv" -#: gtkedit/editcmd.c:516 gtkedit/editcmd.c:583 gtkedit/editcmd.c:810 -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:542 gtkedit/editcmd.c:609 gtkedit/editcmd.c:836 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 +#: gtkedit/editcmd.c:1670 msgid "Cancel" msgstr "Avbryt" -#: gtkedit/editcmd.c:535 +#: gtkedit/editcmd.c:561 msgid " Save as " msgstr " Lagre som " -#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 msgid " Error trying to save file. " msgstr " Feil under lagring av fil. " #. This heads the delete macro error dialog box -#: gtkedit/editcmd.c:653 gtkedit/editcmd.c:661 gtkedit/editcmd.c:686 +#: gtkedit/editcmd.c:679 gtkedit/editcmd.c:687 gtkedit/editcmd.c:712 msgid " Delete macro " msgstr " Slett makro " #. 'Open' = load temp file -#: gtkedit/editcmd.c:655 +#: gtkedit/editcmd.c:681 msgid " Error trying to open temp file " msgstr " Feil under åpning av midlertidig fil " #. 'Open' = load temp file -#: gtkedit/editcmd.c:663 gtkedit/editcmd.c:724 gtkedit/editcmd.c:792 +#: gtkedit/editcmd.c:689 gtkedit/editcmd.c:750 gtkedit/editcmd.c:818 msgid " Error trying to open macro file " msgstr " Feil under åpning av makrofil " -#: gtkedit/editcmd.c:668 gtkedit/editcmd.c:676 gtkedit/editcmd.c:712 -#: gtkedit/editcmd.c:767 +#: gtkedit/editcmd.c:694 gtkedit/editcmd.c:702 gtkedit/editcmd.c:738 +#: gtkedit/editcmd.c:793 #, c-format msgid "key '%d 0': " msgstr "tast '%d 0': " -#: gtkedit/editcmd.c:687 +#: gtkedit/editcmd.c:713 msgid " Error trying to overwrite macro file " msgstr " Feil under overskriving av makrofil " #. This heads the 'Macro' dialog box -#: gtkedit/editcmd.c:703 +#: gtkedit/editcmd.c:729 msgid " Macro " msgstr " Makro " #. Input line for a single key press follows the ':' -#: gtkedit/editcmd.c:705 +#: gtkedit/editcmd.c:731 msgid " Press the macro's new hotkey: " msgstr " Trykk makroens nye hurtigtast: " #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:724 +#: gtkedit/editcmd.c:750 msgid " Save macro " msgstr " Lagre makro " -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:767 msgid " Delete Macro " msgstr " Slett makro " #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:791 +#: gtkedit/editcmd.c:817 msgid " Load macro " msgstr " Last makro " -#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833 msgid " Confirm save file? : " msgstr " Bekreft lagre fil? : " #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 msgid " Save file " msgstr " Lagre fil " -#: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 -#: src/view.c:2075 +#: gtkedit/editcmd.c:836 gtkedit/editwidget.c:1137 gtkedit/gtkedit.c:1247 +#: src/view.c:2080 msgid "Save" msgstr "Lagre" -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 msgid "" " Current text was modified without a file save. \n" " Continue discards these changes. " @@ -1854,118 +1889,113 @@ " Teksten er endret uten å ha vært lagret. \n" " Fortsett forkaster disse endringene. " -#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 +#: gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 gtkedit/editcmd.c:1038 msgid "Continue" msgstr "Fortsett" -#. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +#: gtkedit/editcmd.c:893 msgid " Load " msgstr " Last " -#: gtkedit/editcmd.c:859 -msgid " Error trying to open file for reading " -msgstr " Feil under åpning av fil for lesing " - -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 msgid " Block is large, you may not be able to undo this action. " msgstr " Blokken er for stor, du kan kanskje ikke angre denne handlingen. " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Continue " msgstr " Fortsett " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Cancel " msgstr " Avbryt " -#: gtkedit/editcmd.c:1173 +#: gtkedit/editcmd.c:1190 msgid "o&Ne" msgstr "e&N" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1192 src/filegui.c:597 msgid "al&L" msgstr "al&Le" -#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 +#: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Hopp over" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1196 msgid "&Replace" msgstr "E&rstatt" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 msgid " Replace with: " msgstr " Erstatt med: " -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1206 msgid " Confirm replace " msgstr " Bekreft erstatt " -#: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 +#: gtkedit/editcmd.c:1236 gtkedit/editcmd.c:1321 msgid "scanf &Expression" msgstr "scanf uttrykk" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1238 msgid "replace &All" msgstr "erstatt alle" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1240 msgid "pr&Ompt on replace" msgstr "spør ved erstatning" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 msgid "&Backwards" msgstr "Bakover" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 msgid "&Regular expression" msgstr "Vanlig uttrykk" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 msgid "&Whole words only" msgstr "Kun hele ord" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 msgid "case &Sensitive" msgstr "skill mellom &store/små tegn" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1252 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " Skriv inn argumentrekkefølge f.eks. 3,2,1,4 " -#: gtkedit/editcmd.c:1241 +#: gtkedit/editcmd.c:1256 msgid " Enter replacement string:" msgstr " Skriv inn erstatningsstreng:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2003 msgid " Enter search string:" msgstr " Skriv inn søkestreng:" #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1264 gtkedit/editcmd.c:1516 gtkedit/editcmd.c:1607 -#: gtkedit/editcmd.c:2147 gtkedit/editcmd.c:2178 gtkedit/editcmd.c:2180 +#: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:2209 gtkedit/editcmd.c:2240 gtkedit/editcmd.c:2242 msgid " Replace " msgstr " Erstatt " #. Heads the 'Search' dialog box -#: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 -#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 -#: src/view.c:1998 +#: gtkedit/editcmd.c:1347 gtkedit/editcmd.c:1577 gtkedit/editcmd.c:2308 +#: gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 src/view.c:1531 +#: src/view.c:1630 src/view.c:1753 src/view.c:1971 src/view.c:2003 msgid " Search " msgstr " Søk " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1382 +#: gtkedit/editcmd.c:1401 msgid " Enter search text : " msgstr " Skriv inn søketekst : " -#: gtkedit/editcmd.c:1389 +#: gtkedit/editcmd.c:1408 msgid " Enter replace text : " msgstr " Skriv inn erstatningstekst : " -#: gtkedit/editcmd.c:1392 gtkedit/editcmd.c:1393 +#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 #, c-format msgid "" "You can enter regexp substrings with %s\n" @@ -1974,12 +2004,12 @@ "Du kan skrive inn regexp understrenger med %s\n" "(ikke \\1, \\2 som sed), siden brukes \"Enter...order\"" -#: gtkedit/editcmd.c:1395 +#: gtkedit/editcmd.c:1414 msgid " Enter argument (or substring) order : " msgstr " Skriv inn argument- (eller understreng) rekkefølge : " #. Tool hint -#: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1418 gtkedit/editcmd.c:1419 msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" @@ -1988,19 +2018,19 @@ "format spesifikatorene eller regexp understrengene, f.eks. 3,1,2" #. The following are check boxes -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1424 msgid " Whole words only " msgstr " Bare hele ord " -#: gtkedit/editcmd.c:1407 +#: gtkedit/editcmd.c:1426 msgid " Case sensitive " msgstr " Skill mellom store og små bokstaver " -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1429 msgid " Regular expression " msgstr " Vanlig uttrykk " -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1430 gtkedit/editcmd.c:1431 msgid "" "See the regex man page for how\n" "to compose a regular expression" @@ -2008,34 +2038,48 @@ "Se manualsiden for regex for eksempel\n" "på hvordan et vanlig uttrykk er satt sammen" -#: gtkedit/editcmd.c:1418 +#: gtkedit/editcmd.c:1439 msgid " Backwards " msgstr " Bakover " #. Tool hint -#: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 +#: gtkedit/editcmd.c:1441 gtkedit/editcmd.c:1442 msgid "Warning: Searching backward can be slow" msgstr "Advarsel: Søking bakover kan være tidkrevende" -#: gtkedit/editcmd.c:1434 +#: gtkedit/editcmd.c:1463 msgid " Prompt on replace " msgstr " Spør ved erstatning " #. Tool hint -#: gtkedit/editcmd.c:1436 +#: gtkedit/editcmd.c:1465 msgid "Ask before making each replacement" msgstr "Spør før utførelse av hver erstatning" -#: gtkedit/editcmd.c:1438 +#: gtkedit/editcmd.c:1467 msgid " Replace all " msgstr " Erstatt alle " -#: gtkedit/editcmd.c:1441 +#. Tool hint +#: gtkedit/editcmd.c:1469 +msgid "Replace repeatedly" +msgstr "Erstatt flere" + +#: gtkedit/editcmd.c:1473 +msgid " Bookmarks " +msgstr "Bokmerker" + +#. Tool hint +#: gtkedit/editcmd.c:1475 gtkedit/editcmd.c:1476 +msgid "Create bookmarks at all lines found" +msgstr "Opprett bokmerker for alle linjer som ble funnet" + +#: gtkedit/editcmd.c:1479 msgid " Scanf expression " msgstr " Scanf uttrykk " #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1481 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2044,57 +2088,62 @@ "C-format, se manualsiden for scanf" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1506 msgid "Begin search, Enter" msgstr "Begynn søk, Linjeskift" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "Avbryt denne dialogen, Esc" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace" msgstr "Erstatt" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Skip" msgstr "Hopp over" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace all" msgstr "Erstatt alle" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1670 msgid "Replace one" msgstr "Erstatt en" -#: gtkedit/editcmd.c:1969 +#: gtkedit/editcmd.c:2030 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" " Ugyldig vanlig uttrykk, eller scanf uttrykk med for mange omsettinger " #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2149 +#: gtkedit/editcmd.c:2211 msgid " Error in replacement format string. " msgstr " Feil i erstatningsstrengen for format. " -#: gtkedit/editcmd.c:2177 +#: gtkedit/editcmd.c:2239 #, c-format msgid " %ld replacements made. " msgstr " %ld erstatninger utført. " -#: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 +#: gtkedit/editcmd.c:2242 gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 msgid " Search string not found. " msgstr " Søkestrengen ikke funnet. " +#. in response to number of bookmarks added because of string being found %d times +#: gtkedit/editcmd.c:2307 +#, c-format +msgid " %d finds made, %d bookmarks added " +msgstr "%d funn gjort, %d bokmerker lagt til" + #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 +#: gtkedit/editcmd.c:2363 gtkedit/editcmd.c:2378 gtkedit/editcmd.c:2381 msgid " Quit " msgstr " Avslutt " -#: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2382 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -2102,137 +2151,137 @@ " Teksten er endret uten å ha vært lagret. \n" " Lagre ved avslutting? " -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2378 msgid " File was modified, Save with exit? " msgstr " Filen ble endret, Lagre ved avslutting? " -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2378 msgid "Cancel quit" msgstr "Avbryt avslutt" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&Yes" msgstr "&Ja" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:863 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&No" msgstr "&Nei" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Cancel quit " msgstr " &Avbryt avslutt " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Yes " msgstr " &Ja " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &No " msgstr " &Nei " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 msgid " Copy to clipboard " msgstr " Kopier til utklippstavlen " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 -#: gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2702 msgid " Unable to save to file. " msgstr " Ute av stand til å lagre filen. " -#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 msgid " Cut to clipboard " msgstr " Klipp ut til utklippstavlen " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 src/view.c:1918 msgid " Goto line " msgstr " Gå til linje " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 msgid " Enter line: " msgstr " Skriv inn linje: " -#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 msgid " Save Block " msgstr " Lagre blokk " -#: gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2784 msgid " Insert File " msgstr " Sett inn fil " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Insert file " msgstr " Sett inn fil " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Error trying to insert file. " msgstr " Feil under innsetting av fil. " #. Not essential to translate -#: gtkedit/editcmd.c:2752 +#: gtkedit/editcmd.c:2819 msgid " Sort block " msgstr " Sorter blokk " #. Not essential to translate -#: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 +#: gtkedit/editcmd.c:2819 gtkedit/editcmd.c:2873 msgid " You must first highlight a block of text. " msgstr " Du må først merke en tekstblokk. " -#: gtkedit/editcmd.c:2759 +#: gtkedit/editcmd.c:2826 msgid " Run Sort " msgstr " Kjør sortering " #. Not essential to translate -#: gtkedit/editcmd.c:2761 +#: gtkedit/editcmd.c:2828 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Skriv inn flagg for sortering (se manualside), skilt av tomrom: " -#: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 +#: gtkedit/editcmd.c:2839 gtkedit/editcmd.c:2845 msgid " Sort " msgstr " Sorter " #. Not essential to translate -#: gtkedit/editcmd.c:2774 +#: gtkedit/editcmd.c:2841 msgid " Error trying to execute sort command " msgstr " Feil under kjøring av sorteringskommando " #. Not essential to translate -#: gtkedit/editcmd.c:2780 +#: gtkedit/editcmd.c:2847 msgid " Sort returned non-zero: " msgstr " Sortering returnerte ikke-null: " #. Not essential to translate -#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 +#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 msgid " Process block " msgstr " Prosesser blokk " #. Not essential to translate -#: gtkedit/editcmd.c:2836 +#: gtkedit/editcmd.c:2903 msgid " Error trying to stat file " msgstr " Feil under stat av fil " -#: gtkedit/editcmd.c:2907 +#: gtkedit/editcmd.c:2974 msgid " Mail " msgstr " Send " -#: gtkedit/editcmd.c:2920 +#: gtkedit/editcmd.c:2987 msgid " Copies to" msgstr " Kopier til:" -#: gtkedit/editcmd.c:2924 +#: gtkedit/editcmd.c:2991 msgid " Subject" msgstr " Emne " -#: gtkedit/editcmd.c:2928 +#: gtkedit/editcmd.c:2995 msgid " To" msgstr " Til" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:2997 msgid " mail -s -c " msgstr " mail -s -c " @@ -2245,363 +2294,349 @@ msgid " Enter line length, 0 for off: " msgstr " Skriv inn linjelengden, 0 for av: " -#: gtkedit/editmenu.c:74 -msgid " About " -msgstr " Om " - -#: gtkedit/editmenu.c:75 -msgid "" -"\n" -" Cooledit v3.11.5\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 v3.11.5\n" -"\n" -" Copyright (C) 1996 the Free Software Foundation\n" -"\n" -" En brukervennlig tekst editor skrevet\n" -" for Midnight Commander.\n" - -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 msgid "&Open/load... C-o" msgstr "&Åpne/laste... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "&Ny C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "&Lagre F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "l&Agre som... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "sett &Inn fil... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "kopier til &Fil...C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 msgid "a&Bout... " msgstr "Om " -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 msgid "&Quit F10" msgstr "A&vslutt F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" msgstr "&Ny C-x k" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:147 msgid "copy to &File... " msgstr "kopier til &Fil... " -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Toggle Mark F3" msgstr "slå av/på merking F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Mark Columns S-F3" msgstr "&Merk kolonner S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "toggle &Ins/overw Ins" msgstr "slå av/på sett inn/overskriv Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Copy F5" msgstr "Kopier F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "Flytt F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "Slett F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "Angre C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "&Begynnelsen C-PgUp" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "Slutt C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "Søk... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "søk igjen F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "Erstatt... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "Gå til linje... M-l" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +msgid "goto matching &Bracket M-b" +msgstr "gå til passende &Klamme M-b" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 msgid "insert &Literal... C-q" msgstr "sett inn &Literal... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "Oppdater skjermen C-l" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:234 msgid "&Start record macro C-r" msgstr "&Start makroinnspilling C-r" -#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:235 msgid "&Finish record macro... C-r" msgstr "stopp makroinnspilling...C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "Kjør makro... C-a, TAST" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "delete macr&O... " msgstr "slett makro... " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 msgid "insert &Date/time " msgstr "sett inn dato/klokke " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 msgid "format p&Aragraph M-p" msgstr "formater p&Aragraf M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:219 msgid "'ispell' s&Pell check C-p" msgstr "'ispell' stavekontroll C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 msgid "sor&T... M-t" msgstr "sor&Ter... M-t" -#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "'indent' &C Formatter F19" msgstr "'indent' C formatering F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:222 msgid "&Mail... " msgstr "Send... " -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:236 msgid "&Execute macro... C-x e, KEY" msgstr "Kjør makro... C-x e, TAST" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:242 msgid "'ispell' s&Pell check M-$" msgstr "'ispell' stavekontroll M-$" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 msgid "&General... " msgstr "Generelt... " -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 msgid "&Save mode..." msgstr "Lagringsmodus..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1353 +#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 msgid "&Layout..." msgstr "Utseende." #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279 gtkedit/editmenu.c:396 +#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr " Fil " -#: gtkedit/editmenu.c:271 gtkedit/editmenu.c:280 gtkedit/editmenu.c:412 +#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 gtkedit/editmenu.c:415 msgid " Edit " msgstr " Rediger " -#: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 +#: gtkedit/editmenu.c:275 gtkedit/editmenu.c:284 msgid " Sear/Repl " msgstr " Søk/Erstatt " -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 +#: gtkedit/editmenu.c:276 gtkedit/editmenu.c:285 gtkedit/editmenu.c:455 msgid " Command " msgstr " Kommando " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 msgid " Options " msgstr " Alternativer " -#: gtkedit/editmenu.c:397 +#: gtkedit/editmenu.c:400 msgid "Open...\tC-o" msgstr "Åpne...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "Ny\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "Lagre\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "Lagre som...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "Sett inn fil...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "Kopier til fil...\tC-f" #. Tool hint -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:410 msgid "Disk operations and file indexing/searching" msgstr "Diskoperasjoner og filindeksering-/søking" -#: gtkedit/editmenu.c:413 +#: gtkedit/editmenu.c:416 msgid "Toggle mark\tF3" msgstr "Slå av/på marker\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:417 msgid "Toggle mark columns\tC-b" msgstr "Slå av/på marker kolonner\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:419 msgid "Toggle book mark\tC-M-Ins" msgstr "Slå av/på bokmerker\tC-M-Ins" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:420 msgid "Previous book mark\tC-M-Up" msgstr "Forrige bokmerke\tC-M-Opp" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:421 msgid "Next book mark\tC-M-Down" msgstr "Neste bokmerke\tC-M-Ned" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:422 msgid "Flush book marks" msgstr "Fjern bokmerker" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:424 msgid "Toggle insert/overwrite\tIns" msgstr "Slå av/på overskriv\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:426 msgid "Copy block to cursor\tF5" msgstr "Kopier blokk til markøren\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "Flytt blokk til markøren\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "Slett blokk\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "Kopier blokk til utklippstavle\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "Klipp ut blokk til utklippstavle\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "Lim inn blokk fra utklippstavlen\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:433 msgid "Selection history\tM-Ins" msgstr "Utvalgshistorikk\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:435 msgid "Undo\tC-BackSpace" msgstr "Angre\tC-Tilbake" #. Tool hint -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:438 msgid "Manipulating blocks of text" msgstr "Manipulering av tekstblokker" -#: gtkedit/editmenu.c:440 +#: gtkedit/editmenu.c:443 msgid " Srch/Replce " msgstr " Søk/Erstatt " -#: gtkedit/editmenu.c:441 +#: gtkedit/editmenu.c:444 msgid "Search...\tF7" msgstr "Søk...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "Søk igjen\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "Erstatt...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "Erstatt igjen\tF14" #. Tool hint -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:450 msgid "Search for and replace text" msgstr "Søk etter og erstatt tekst" -#: gtkedit/editmenu.c:453 +#: gtkedit/editmenu.c:456 msgid "Goto line...\tM-l" msgstr "Gå til linje...\tM-l" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:457 +msgid "Goto matching bracket\tM-b" +msgstr "Gå til passende klamme\tM-b" + +#: gtkedit/editmenu.c:459 msgid "Start record macro\tC-r" msgstr "Start makroinnspilling\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "Avslutt makroinnspilling...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "Kjør makro...\tC-a, TAST" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "Slett makro...\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "Sett inn dato/klokkeslett\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "Formater paragraf\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "Oppdater skjermen\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "Makroer og interne kommandoer" @@ -2679,31 +2714,31 @@ msgstr " Alternativer for redigerer " #. Not essential to translate -#: gtkedit/editwidget.c:317 +#: gtkedit/editwidget.c:323 msgid "Error initialising editor.\n" msgstr "Feil under initialisering av editor.\n" -#: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1719 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2068 +#: gtkedit/editwidget.c:1136 gtkedit/gtkedit.c:1246 src/help.c:806 +#: src/main.c:1721 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2073 msgid "Help" msgstr "Hjelp" -#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +#: gtkedit/editwidget.c:1138 gtkedit/gtkedit.c:1248 msgid "Mark" msgstr "Marker" -#: gtkedit/editwidget.c:1096 +#: gtkedit/editwidget.c:1139 msgid "Replac" msgstr "Erstatt" -#: gtkedit/editwidget.c:1102 src/main.c:1721 +#: gtkedit/editwidget.c:1145 src/main.c:1723 msgid "PullDn" msgstr "Meny" #. gtk_edit_menu -#: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1722 src/view.c:2070 src/view.c:2092 +#: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 +#: src/main.c:1724 src/view.c:2075 src/view.c:2097 msgid "Quit" msgstr "Slutt" @@ -2770,7 +2805,7 @@ msgid "Delete highlighted text" msgstr "Slett markert tekst" -#: gtkedit/gtkedit.c:1255 src/main.c:1720 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Meny" @@ -2806,12 +2841,12 @@ msgid "Search/Replace" msgstr "Søk/Erstatt" -#: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1069 gtkedit/syntax.c:1078 gtkedit/syntax.c:1087 +#: gtkedit/syntax.c:1096 msgid " Spelling Message " msgstr " Stavemelding " -#: gtkedit/syntax.c:1051 +#: gtkedit/syntax.c:1069 msgid "" " Fail trying to open ispell program. \n" " Check that it is in your path and works with the -a option. \n" @@ -2821,7 +2856,7 @@ " Sjekk at det er i stien og at det virker med -a flagget. \n" " Ellers kan du også slå av stavekontroll i Alternativer menyen." -#: gtkedit/syntax.c:1060 +#: gtkedit/syntax.c:1078 msgid "" " Fail trying to open ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2831,7 +2866,7 @@ " Sjekk at det er i stien og at det virker med -a flagget. \n" " Ellers kan du også slå av stavekontroll i Alternativer menyen. " -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1087 msgid "" " Fail trying to read ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2841,7 +2876,7 @@ " Sjekk at programmet er i stien og at det virker med -a flagget. \n" " Ellers kan du også slå av stavekontroll i Alternativer menyen. " -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1096 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2849,29 +2884,15 @@ " Feil under lesing fra ispell. \n" " Ispell startes på nytt. " -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 -msgid " Load Syntax Rules " -msgstr " Last syntaksregler " - -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 -msgid "" -" Your syntax rule file is outdated \n" -" A new rule file is being installed. \n" -" Your old rule file has been saved with a .OLD extension. " -msgstr "" -" Syntaksregelfilen er gammel \n" -" En ny regelfil installeres. \n" -" Din ganle regelfil lagres med .OLD som filtype. " - -#: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 +#: gtkedit/syntax.c:1519 gtkedit/syntax.c:1526 msgid " Load syntax file " msgstr " Les syntaksfil " -#: gtkedit/syntax.c:1487 +#: gtkedit/syntax.c:1519 msgid " File access error " msgstr " Tilgangsfeil for fil " -#: gtkedit/syntax.c:1493 +#: gtkedit/syntax.c:1525 #, c-format msgid " Error in file %s on line %d " msgstr " Feil i filen %s ved linje %d " @@ -3478,44 +3499,44 @@ msgid " Enter machine name (F1 for details): " msgstr " Skriv inn maskinnavn (F1 for detaljer): " -#: src/cmd.c:1360 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr " Kunne ikke skifte katalog til %s " -#: src/cmd.c:1367 +#: src/cmd.c:1370 msgid " Link to a remote machine " msgstr " Lenke til en fjern maskin " -#: src/cmd.c:1373 +#: src/cmd.c:1376 msgid " FTP to machine " msgstr " FTP til maskin " -#: src/cmd.c:1379 +#: src/cmd.c:1382 msgid " SMB link to machine " msgstr " SMB-tilkobling til maskin " -#: src/cmd.c:1389 +#: src/cmd.c:1392 msgid " Socket source routing setup " msgstr " Oppsett av kontaktens kilderuting" -#: src/cmd.c:1390 +#: src/cmd.c:1393 msgid " Enter host name to use as a source routing hop: " msgstr " Skriv inn vertsnavnet som skal brukes som kilderutingshop: " -#: src/cmd.c:1397 +#: src/cmd.c:1400 msgid " Host name " msgstr " Vertsnavn " -#: src/cmd.c:1397 +#: src/cmd.c:1400 msgid " Error while looking up IP address " msgstr " Feil under oppslag av IP-adresse " -#: src/cmd.c:1408 +#: src/cmd.c:1411 msgid " Undelete files on an ext2 file system " msgstr " Gjenopprett filer på et ext2 filsystem " -#: src/cmd.c:1409 +#: src/cmd.c:1412 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3523,11 +3544,11 @@ " Skriv inn enhet (uten /dev/) som det skal gjenopprettes\n" " filer på: (F1 for detaljer)" -#: src/cmd.c:1459 +#: src/cmd.c:1462 msgid " Setup saved to ~/" msgstr " Oppsett lagret til ~/" -#: src/cmd.c:1464 +#: src/cmd.c:1467 msgid " Setup " msgstr " Oppsett " @@ -4316,7 +4337,7 @@ msgid "Content: " msgstr "Innhold: " -#: src/find.c:171 src/main.c:1243 src/main.c:1267 +#: src/find.c:171 src/main.c:1245 src/main.c:1269 msgid "&Tree" msgstr "Tre" @@ -4341,7 +4362,7 @@ msgid "Finished" msgstr "Ferdig" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1531 #, c-format msgid "Searching %s" msgstr "Søker etter %s" @@ -4887,7 +4908,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "tast, eller klikk med musen for å definere den. Flytt med Tab." -#: src/main.c:707 +#: src/main.c:709 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4899,263 +4920,263 @@ " arbeidskatalogen, eller gitt deg selv ekstra tilgangs- \n" " rettigheter med \"su\" kommandoen? " -#: src/main.c:782 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "Trykk en tast for å fortsette..." -#: src/main.c:832 +#: src/main.c:834 msgid " The shell is already running a command " msgstr " Skallet kjører allerede en kommando " -#: src/main.c:859 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander " -#: src/main.c:860 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr " Vil du virkelig avslutte Midnight Commander? " -#: src/main.c:1240 src/main.c:1264 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "Listemodus..." -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "Rask visning C-x q" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1244 src/main.c:1268 msgid "&Info C-x i" msgstr "Info C-x i" -#: src/main.c:1245 src/main.c:1269 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "Sorteringsrekkefølge..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "Filter..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "Nettverkskobling..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "FTP kobling..." -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "SM&B-kobling..." -#: src/main.c:1258 src/main.c:1282 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "Disk... M-d" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "Gjenles C-r" -#: src/main.c:1288 +#: src/main.c:1290 msgid "&User menu F2" msgstr "Brukermeny F2" -#: src/main.c:1289 +#: src/main.c:1291 msgid "&View F3" msgstr "Vis F3" -#: src/main.c:1290 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "Vis fil... " -#: src/main.c:1291 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "Filtrert visning M-!" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Edit F4" msgstr "Rediger F4" -#: src/main.c:1293 +#: src/main.c:1295 msgid "&Copy F5" msgstr "Kopier F5" -#: src/main.c:1294 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "chmod C-x c" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "Lenke C-x l" -#: src/main.c:1297 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "Symlenke C-x s" -#: src/main.c:1298 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "rediger symlenke C-x C-s" -#: src/main.c:1299 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "chown C-x o" -#: src/main.c:1300 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "Avansert chown " -#: src/main.c:1302 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "Gi nytt navn/flytt F6" -#: src/main.c:1303 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "Lag katalog F7" -#: src/main.c:1304 +#: src/main.c:1306 msgid "&Delete F8" msgstr "Slett F8" -#: src/main.c:1305 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "rask cd M-c" -#: src/main.c:1307 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "velg gruppe M-+" -#: src/main.c:1308 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "velg bort gruppe M-\\" -#: src/main.c:1309 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "reverser valg M-*" -#: src/main.c:1311 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "avslutt F10" -#: src/main.c:1321 +#: src/main.c:1323 msgid "&Directory tree" msgstr "Katalogtre" -#: src/main.c:1323 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "Finn fil M-?" -#: src/main.c:1324 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "bytt paneler C-u" -#: src/main.c:1325 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "slå paneler på/av C-o" -#: src/main.c:1326 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "Sammenlign kataloger C-x d" -#: src/main.c:1327 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "eksternt panel C-x !" -#: src/main.c:1328 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "vis katalogstørrelser" -#: src/main.c:1330 +#: src/main.c:1332 msgid "command &History" msgstr "kommandohistorikk" -#: src/main.c:1331 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "kataloghurtigliste C-\\" -#: src/main.c:1333 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "Aktivt VFS liste C-x a" -#: src/main.c:1334 +#: src/main.c:1336 msgid "Fr&ee VFSs now" msgstr "Frigjør VFS nå" -#: src/main.c:1337 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "Bakgrunnsjobber C-x j" -#: src/main.c:1341 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "Gjenopprett filer (kun ext2fs)" -#: src/main.c:1344 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "Redigering av listeformat" -#: src/main.c:1346 +#: src/main.c:1348 msgid "&Extension file edit" msgstr "Redigering av utvidelsesfil" -#: src/main.c:1347 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "Menyfilredigering" -#: src/main.c:1352 +#: src/main.c:1354 msgid "&Configuration..." msgstr "Konfigurasjon..." -#: src/main.c:1354 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "bekreftelse..." -#: src/main.c:1355 +#: src/main.c:1357 msgid "&Display bits..." msgstr "Tastaturdefinisjon..." -#: src/main.c:1357 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "lær taster..." -#: src/main.c:1360 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "Virtuelt FS..." -#: src/main.c:1363 +#: src/main.c:1365 msgid "&Save setup" msgstr "Lagre oppsett" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr " Venstre " -#: src/main.c:1381 +#: src/main.c:1383 msgid " &Above " msgstr " Over " -#: src/main.c:1384 +#: src/main.c:1386 msgid " &File " msgstr " Fil " -#: src/main.c:1385 +#: src/main.c:1387 msgid " &Command " msgstr " Kommando " -#: src/main.c:1386 +#: src/main.c:1388 msgid " &Options " msgstr " Alternativer " -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr " Høyre " -#: src/main.c:1390 +#: src/main.c:1392 msgid " &Below " msgstr " Under " -#: src/main.c:1445 +#: src/main.c:1447 msgid " Information " msgstr " Informasjon " -#: src/main.c:1446 +#: src/main.c:1448 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5167,7 +5188,7 @@ " du utføre en manuell gjenlesing av katalogen. Se manualsiden for \n" " detaljene." -#: src/main.c:1925 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "Takk for at du bruker GNU Midnight Commander" @@ -5184,115 +5205,271 @@ msgid "The TERM environment variable is unset!\n" msgstr "TERM miljøvariabelen er ikke satt!\n" -#: src/main.c:2592 +#: src/main.c:2487 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" +"Bruk:\n" +"\n" +"mc [flagg] [denne_katalogen] [annet_panels_katalog]\n" +"\n" + +#: src/main.c:2490 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "-a, --sickchars Tvungen bruk av +, -, | for linjeopptegning.\n" + +#: src/main.c:2492 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "-b, --nocolor Tvunget sort/hvit skjerm.\n" + +#: src/main.c:2494 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "-B, --background [KUN-UTVIKLERE: Debug bakgrunnskoden]\n" + +#: src/main.c:2496 +msgid "" +"-c, --color Force color mode.\n" +"-C, --colors Specify colors (use --help-colors to get a list).\n" +"-d, --nomouse Disable mouse support.\n" +msgstr "" +"-c, --color Tvungen bruk av fargemodus.\n" +"-C, --colors Spesifiser farger (bruk --help-colors for å få en liste).\n" +"-d, --nomouse Slå av musstøtte.\n" + +#: src/main.c:2500 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "-e, --edit Start opp den interne editoren.\n" + +#: src/main.c:2502 +msgid "" +"-f, --libdir Print configured paths.\n" +"-h, --help Shows this help message.\n" +"-k, --resetsoft Reset softkeys (HP terminals only) to their " +"terminfo/termcap\n" +" default.\n" +msgstr "" +"-f, --libdir Skriv ut konfigurerte stier.\n" +"-h, --help Viser denne hjelpteksten.\n" +"-k, --resetsoft Nullstiller softkeys (kun HP terminaler) til sine terminfo/termcap\n" +" standardverdier.\n" + +#: src/main.c:2507 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "-l, --ftplog fil Logger ftpfs kommandoer til filen.\n" + +#: src/main.c:2510 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "-M, --memory fil [KUN-UTVIKLERE: Logg MAD meldinger til filen.]\n" + +#: src/main.c:2512 +msgid "" +"-P, --printwd At exit, print the last working directory.\n" +"-s, --slow Disables verbose operation (for slow terminals).\n" +msgstr "" +"-P, --printwd Skriv ut siste arbeidskatalog ved avslutting.\n" +"-s, --slow Slår av detaljert operasjon (for trege terminaler).\n" + +#: src/main.c:2515 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "-t, --termcap Aktiver støtte for TERMCAP variabelen.\n" + +#: src/main.c:2518 +msgid "" +"-S, --createcmdile Create command file to set default directory upon exit.\n" +msgstr "-S, --createcmdfile Opprett kommandofil for å sette standard katalog ved avslutting.\n" + +#: src/main.c:2521 +msgid "" +"-u, --nosubshell Disable the concurrent subshell mode.\n" +"-U, --subshell Force the concurrent subshell mode.\n" +"-r, --forceexec Force subshell execution.\n" +msgstr "" +"-u, --nosubshell Slå av samtidig underskall modus.\n" +"-U, --subshell Tvungen bruk av samtidig underskall modus.\n" +"-r, --forceexec Tvungen kjøring av underskall.\n" + +#: src/main.c:2525 +msgid "" +"-v, --view fname Start up into the viewer mode.\n" +"-V, --version Report version and configuration options.\n" +"-x, --xterm Force xterm mouse support and screen save/restore.\n" +msgstr "" +"-v, --view fname Start opp i visningsmodus.\n" +"-V, --version Vis versjon og konfigurasjonsvalg.\n" +"-x, --xterm Tvungen bruk av mus i xterm og lagre/gjenopprette skjerm.\n" + +#: src/main.c:2529 +msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" +msgstr "-X, --dbgsubshell [KUN-UTVIKLERE: Debug underskallet].\n" + +#: src/main.c:2531 +msgid "" +"\n" +"Please send any bug reports (including the output of `mc -V')\n" +"to mc-bugs@nuclecu.unam.mx\n" +msgstr "" +"\n" +"Vennligst send feilrapporter (inkludert utskrift av `mc -V')\n" +"til mc-bugs@nuclecu.unam.mx\n" + +#: src/main.c:2547 +msgid "" +"--colors KEYWORD={FORE},{BACK}\n" +"\n" +"{FORE} and {BACK} can be ommited, and the default will be used\n" +"\n" +"Keywords:\n" +" Global: errors, reverse, gauge, input\n" +" File display: normal, selected, marked, markselect\n" +" Dialog boxes: dnormal, dfocus, dhotnormal, dhotfocus\n" +" Menus: menu, menuhot, menusel, menuhotsel\n" +" Help: helpnormal, helpitalic, helplink, helpslink\n" +" File types: directory, execute, link, device, special, core\n" +"\n" +"Colors:\n" +" black, gray, red, brightred, green, brightgreen, brown,\n" +" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +" brightcyan, lightgray and white\n" +"\n" +msgstr "" +"--colors KEYWORD={FORE},{BACK}\n" +"\n" +"{FORE} og {BACK} kan utelates, så vil standardverdiene brukes\n" +"\n" +"Nøkkelord:\n" +" Global: errors, reverse, gauge, input\n" +" Filvisning: normal, ,selected, marked, markselect\n" +" Dialogbokser: dnormal, dfocus, dhotnormalm dhotfoucus\n" +" Menyer: menu, menuhot, menuselm menuhotsel\n" +" Hjelp: helpnormal, helpitalic, helplink, helpslink\n" +" Filtyper: directory, execute, link, device, special, core\n" +"\n" +"Farger:\n" +" black, gray, red, brightred, green, brightgreen, brown,\n" +" yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" +" brightcyan, lightgray and white\n" +"\n" + +#: src/main.c:2596 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Bibliotekkatalog for Midnight Commander: %s\n" -#: src/main.c:2606 +#: src/main.c:2610 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "Flagget -m er utgått. Vær snill å se på visningsbiter... i " "alternativermenyen\n" -#: src/main.c:2683 +#: src/main.c:2687 msgid "Use to debug the background code" msgstr "Bruk til å avluse bakgrunnskoden" -#: src/main.c:2689 +#: src/main.c:2693 msgid "Request to run in color mode" msgstr "Be om å kjøre i fargemodus" -#: src/main.c:2691 +#: src/main.c:2695 msgid "Specifies a color configuration" msgstr "Spesifiserer en fargekonfigurasjon" -#: src/main.c:2696 +#: src/main.c:2700 msgid "Edits one file" msgstr "Redigerer en fil" -#: src/main.c:2700 +#: src/main.c:2704 msgid "Displays this help message" msgstr "Viser denne hjelpeteksten" -#: src/main.c:2703 +#: src/main.c:2707 msgid "Displays a help screen on how to change the color scheme" msgstr "Viser en hjelpskjerm for endring av fargeplanen" -#: src/main.c:2706 +#: src/main.c:2710 msgid "Log ftp dialog to specified file" msgstr "Logg ftp dialogen til spesifisert fil" -#: src/main.c:2713 +#: src/main.c:2717 msgid "Obsolete" msgstr "Utgått" -#: src/main.c:2715 +#: src/main.c:2719 msgid "Requests to run in black and white" msgstr "Be om å kjøre i sort-hvitt" -#: src/main.c:2717 +#: src/main.c:2721 msgid "Disable mouse support in text version" msgstr "Slå av musstøtte i tekstversjonen" -#: src/main.c:2720 +#: src/main.c:2724 msgid "Disables subshell support" msgstr "Slå av støtte for underskall" -#: src/main.c:2724 +#: src/main.c:2728 msgid "Prints working directory at program exit" msgstr "Skriv ut arbeidskatalogen ved avslutting av programmet" -#: src/main.c:2726 +#: src/main.c:2730 msgid "Resets soft keys on HP terminals" msgstr "Setter tilbake myke taster på HP terminaler" -#: src/main.c:2728 +#: src/main.c:2732 msgid "To run on slow terminals" msgstr "For kjøring på trege terminaler" -#: src/main.c:2731 +#: src/main.c:2735 msgid "Use stickchars to draw" msgstr "Tegn med klebende tegn" -#: src/main.c:2735 +#: src/main.c:2739 msgid "Enables subshell support (default)" msgstr "Slår på støtte for underskall (standard)" -#: src/main.c:2740 +#: src/main.c:2744 msgid "Tries to use termcap instead of terminfo" msgstr "Prøver å bruke termcap i stedet for terminfo" -#: src/main.c:2744 +#: src/main.c:2748 msgid "Displays the current version" msgstr "Viser nåværende versjon" -#: src/main.c:2746 +#: src/main.c:2750 msgid "Launches the file viewer on a file" msgstr "Starter filvisning for en fil" -#: src/main.c:2748 +#: src/main.c:2752 msgid "Forces xterm features" msgstr "Tvungen bruk av xterm funksjoner" -#: src/main.c:2750 +#: src/main.c:2754 msgid "Geometry for the window" msgstr "Geometri for vinduet" -#: src/main.c:2750 +#: src/main.c:2754 msgid "GEOMETRY" msgstr "GEOMETRI" -#: src/main.c:2751 +#: src/main.c:2755 msgid "No windows opened at startup" msgstr "Ingen vinduer åpnet ved oppstart" -#: src/main.c:2753 +#: src/main.c:2756 +msgid "No desktop icons" +msgstr "Ingen skrivebordsikonene" + +#: src/main.c:2757 +msgid "Look more like traditional gmc" +msgstr "Se mer ut som den tradisjonelle gmc" + +#: src/main.c:2759 msgid "Display the directory that holds the .links startup files and exit" msgstr "Viser katalogen som inneholder .links oppstartsfilene og avslutt" -#: src/main.c:3051 +#: src/main.c:3071 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5300,11 +5477,11 @@ "Kunne ikke åpne tty linjen. Du må kjøre mc uten -P flagget.\n" "På noen systemer vil du kanskje bruke # `which mc`\n" -#: src/main.c:3129 +#: src/main.c:3149 msgid " Notice " msgstr " Notis " -#: src/main.c:3130 +#: src/main.c:3150 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5710,7 +5887,7 @@ msgid " Dup failed " msgstr " Dup feilet " -#: src/view.c:401 +#: src/view.c:406 msgid "" "File: \n" "\n" @@ -5720,7 +5897,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:407 msgid "" "\n" "\n" @@ -5730,27 +5907,27 @@ "\n" "har blitt endret, vil du lagre endringene?\n" -#: src/view.c:404 +#: src/view.c:409 msgid " Save changes " msgstr " Lagre endringer " -#: src/view.c:446 +#: src/view.c:451 msgid " Can't spawn child program " msgstr " Kan ikke starte underprogram " -#: src/view.c:455 +#: src/view.c:460 msgid " Empty output from child filter " msgstr " Tom utskrift fra underfilter " -#: src/view.c:460 +#: src/view.c:465 msgid " Could not open file " msgstr " Kunne ikke åpne filen " -#: src/view.c:475 +#: src/view.c:480 msgid " Can't open file \"" msgstr " Kan ikke åpne filen \"" -#: src/view.c:482 +#: src/view.c:487 msgid "" " Can't stat file \n" " " @@ -5758,11 +5935,11 @@ " Kan ikke kjøre stat på filen \n" " " -#: src/view.c:488 +#: src/view.c:493 msgid " Can't view: not a regular file " msgstr " Kan ikke vise: ikke en vanlig fil " -#: src/view.c:569 +#: src/view.c:574 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5771,7 +5948,7 @@ " Kan ikke åpne \"%s\"\n" " %s " -#: src/view.c:578 +#: src/view.c:583 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5780,34 +5957,34 @@ " Kunne ikke kjøre stat på \"%s\"\n" " %s " -#: src/view.c:714 +#: src/view.c:719 #, c-format msgid "File: %s" msgstr "Fil: %s" -#: src/view.c:728 +#: src/view.c:733 #, c-format msgid "Offset 0x%08x" msgstr "Offset 0x%08x" -#: src/view.c:739 +#: src/view.c:744 msgid " [grow]" msgstr " [voks]" -#: src/view.c:1518 +#: src/view.c:1523 #, c-format msgid "Searching for `%s'" msgstr "Søker etter `%s'" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1630 src/view.c:1753 msgid " Search string not found " msgstr " Søkestrengen ikke funnet " -#: src/view.c:1787 +#: src/view.c:1792 msgid " Invalid regular expression " msgstr " Ugyldig vanlig uttrykk " -#: src/view.c:1911 +#: src/view.c:1916 #, c-format msgid "" " The current line number is %d.\n" @@ -5816,7 +5993,7 @@ " Det nåværende linjenummeret er %d.\n" " Skriv inn det nye linjenummeret:" -#: src/view.c:1933 +#: src/view.c:1938 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5825,67 +6002,67 @@ " Det nåværende adressen er 0x%lx.\n" " Skriv inn den nye adressen:" -#: src/view.c:1935 +#: src/view.c:1940 msgid " Goto Address " msgstr " Gå til adresse " -#: src/view.c:1966 +#: src/view.c:1971 msgid " Enter regexp:" msgstr " Skriv inn vanlig uttrykk:" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Ascii" msgstr "Ascii" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "Hex" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "Gåtil" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "Linje" -#: src/view.c:2075 +#: src/view.c:2080 msgid "RxSrch" msgstr "VanUtSøk" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdText" msgstr "RedTekst" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdHex" msgstr "RedHeks" -#: src/view.c:2080 +#: src/view.c:2085 msgid "UnWrap" msgstr "Fjern bryting" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "Bryt" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "HexSøk" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "Rått" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "Tolk" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "Fjern format" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "Format" @@ -6088,7 +6265,33 @@ msgid "NumLock on keypad" msgstr "NumLock på numerisk tastatur" -#: vfs/extfs.c:268 +#: vfs/direntry.c:312 +#, c-format +msgid "Dir cache expired for %s" +msgstr "Katalog-cache utgått for %s" + +#: vfs/direntry.c:444 vfs/direntry.c:447 +msgid " Direntry warning " +msgstr " Advarsel for katalogoppføring " + +#: vfs/direntry.c:444 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage er %d, minnelekkasje" + +#: vfs/direntry.c:447 +msgid "Super has want_stale set" +msgstr "Super har want_stale sett" + +#: vfs/direntry.c:821 +msgid "Starting linear transfer..." +msgstr "Starter lineær overføring..." + +#: vfs/direntry.c:964 +msgid "Getting file" +msgstr "Henter fil" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -6097,228 +6300,219 @@ "Kunne ikke åpne %s arkiv\n" "%s" -#: vfs/extfs.c:300 vfs/extfs.c:320 +#: vfs/extfs.c:302 vfs/extfs.c:322 msgid "Inconsistent extfs archive" msgstr "Ukonsistent extfs arkiv" -#: vfs/fish.c:136 +#: vfs/fish.c:138 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Kobler fra %s" -#: vfs/fish.c:214 +#: vfs/fish.c:216 msgid "fish: Waiting for initial line..." msgstr "fish: Venter på innledende linje..." -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Beklager, vi kan ikke gjøre passordautentiserte forbindelser ennå." -#: vfs/fish.c:238 +#: vfs/fish.c:231 +msgid " fish: Password required for " +msgstr " fish: Passord nødvendig for " + +#: vfs/fish.c:240 msgid "fish: Sending password..." msgstr "fish: Sender passord..." -#: vfs/fish.c:244 +#: vfs/fish.c:246 msgid "fish: Sending initial line..." msgstr "fish: Sender innledende linje..." -#: vfs/fish.c:248 +#: vfs/fish.c:250 msgid "fish: Handshaking version..." msgstr "fish: Handshaking versjon..." -#: vfs/fish.c:252 +#: vfs/fish.c:254 msgid "fish: Setting up current directory..." msgstr "fish: Setter opp aktiv katalog..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Tilkoblet, hjemme %s." -#: vfs/fish.c:330 +#: vfs/fish.c:332 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Leser katalog %s..." -#: vfs/fish.c:426 +#: vfs/fish.c:428 msgid "fish: failed" msgstr "fish: feilet" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:448 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: lager %s: sender kommando..." -#: vfs/fish.c:460 +#: vfs/fish.c:462 msgid "fish: Local read failed, sending zeros" msgstr "fish: Lokal lesekommando feilet, sender nuller" -#: vfs/fish.c:472 +#: vfs/fish.c:474 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: lagrer %s %d (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:514 msgid "Aborting transfer..." msgstr "Avbryter overføring..." -#: vfs/fish.c:521 +#: vfs/fish.c:523 msgid "Error reported after abort." msgstr "Feil rapportert etter avbrudd." -#: vfs/fish.c:523 +#: vfs/fish.c:525 msgid "Aborted transfer would be successful." msgstr "Avbrutt overføring ville vært i orden." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:312 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Kobler fra %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:370 msgid " FTP: Password required for " msgstr " FTP: Passord nødvendig for " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:403 msgid " Proxy: Password required for " msgstr " Proxy: Passord nødvendig for " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:429 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: sender innloggingsnavn for proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:433 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: sender brukers passord til proxy" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:437 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: autentisering mot proxy i orden" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:441 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: tilkoblet til %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:458 msgid "ftpfs: sending login name" msgstr "ftpfs: sender innloggingsnavn" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:463 msgid "ftpfs: sending user password" msgstr "ftpfs: sender brukers passord" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:468 msgid "ftpfs: logged in" msgstr "ftpfs: logget inn" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:483 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Innlogging ukorrekt for bruker %s " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:515 #, c-format msgid " Could not set source routing (%s)" msgstr " Kunne ikke sette opp kilderuting (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:644 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Ugyldig vertsnavn." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:664 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Ugyldig vertsadresse." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:687 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: setter opp forbindelse til %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:697 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: tilkobling avbrutt av bruker" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:699 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: tilkobling til tjener feilet: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:741 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Venter på nytt forsøk... %d (Ctrl-C for å avbryte)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: kunne ikke sette opp passiv modus for kilderuting" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:914 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: kunne ikke sette opp passiv modus" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:989 msgid "ftpfs: aborting transfer." msgstr "ftpfs: avbryter overføring." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:991 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: avbrytlsesfeil: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:996 msgid "ftpfs: abort failed" msgstr "ftpfs: avbrudd feilet" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1085 vfs/ftpfs.c:1182 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD feilet." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1095 vfs/ftpfs.c:1102 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: kunne ikke følge symbolsk lenke" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1153 msgid "Resolving symlink..." msgstr "Finner symlink..." -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1171 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: Leser FTP katalog %s... (ikke bruk UNIX ls flagg)" - -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: Leser FTP katalog %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: FEIL" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: Leser FTP katalog %s... %s%s" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: lesing av FTP katalog avbrutt av bruker" +#: vfs/ftpfs.c:1172 +msgid "(strict rfc959)" +msgstr "(følg rfc959)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: hentet liste" +#: vfs/ftpfs.c:1173 +msgid "(chdir first)" +msgstr "(chdir først)" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1268 msgid "ftpfs: failed" msgstr "ftpfs: feilet" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1278 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: feilet; ingen steder å falle tilbake til" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1341 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: lagrer fil %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1756 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6326,15 +6520,15 @@ "~/.netrc filen har ikke korrekt modus.\n" "Fjern passord eller korriger modus." -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " Tjeneren støtter ikke denne versjonen " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " The remote server is not running on a system port \n" " you need a password to log in, but the information may \n" @@ -6344,30 +6538,50 @@ " du trenger et passord for å logge inn, men informasjonen \n" " er ikke nødvendigvis trygg på den eksterne siden. Fortsett? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Ja " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " Nei " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " Den eksterne tjeneren kjører på en rar port. Gir opp.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " MCFS passord nødvendig" -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " Ugyldig passord " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr " Kan ikke finne vertsnavn: %s " + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr " Kan ikke opprette socket: %s " + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr " Kan ikke koble til tjener: %s " + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " For mange åpne forbindelser " +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "Midnight Commander's private eksterne filsystem" + #: vfs/smbfs.c:115 msgid "Domain:" msgstr "Domene:" @@ -6442,11 +6656,137 @@ "%s\n" "ser ikke ut som et tar-arkiv." -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1158 +msgid "Changes to file lost" +msgstr "Endringer i filen tapt" + +#: vfs/vfs.c:1798 +msgid "Could not parse:" +msgstr "Kunne ikke fortolke:" + +#: vfs/vfs.c:1800 +msgid "More parsing errors will be ignored." +msgstr "Flere fortolkningsfeil vil bli ignorert." + +#: vfs/vfs.c:1800 +msgid "(sorry)" +msgstr "(beklager)" + +#: vfs/vfs.c:1811 +msgid "Internal error:" +msgstr "Intern feil:" + +#: vfs/vfs.c:1821 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld bytes overført)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1822 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes overført" + +#: vfs/undelfs.c:80 +msgid " undelfs: error " +msgstr " undelfs: feil " + +#: vfs/undelfs.c:183 +msgid " not enough memory " +msgstr " ikke nok minne " + +#: vfs/undelfs.c:188 +msgid " while allocating block buffer " +msgstr " under allokering av blokkbuffer " + +#: vfs/undelfs.c:192 +#, c-format +msgid " open_inode_scan: %d " +msgstr " open_inode_scan: %d " + +#: vfs/undelfs.c:196 +#, c-format +msgid " while starting inode scan %d " +msgstr " under start av inodeskann %d " + +#: vfs/undelfs.c:203 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "undelfs: laster informasjon om slettede filer %d inoder" + +#: vfs/undelfs.c:218 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr " under kall til ext2_block_iterate %d " + +#: vfs/undelfs.c:226 +msgid " no more memory while reallocating array " +msgstr " ikke mer minne under reallokasjon av matrise " + +#: vfs/undelfs.c:245 +#, c-format +msgid " while doing inode scan %d " +msgstr " under skanning av inode %d " + +#: vfs/undelfs.c:269 +msgid " Ext2lib error " +msgstr " Ext2lib feil " + +#: vfs/undelfs.c:296 +#, c-format +msgid " Could not open file %s " +msgstr " Kunne ikke åpne filen %s " + +#: vfs/undelfs.c:299 +msgid "undelfs: reading inode bitmap..." +msgstr "undelfs: leser inode bitmap..." + +#: vfs/undelfs.c:302 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" +" Kunne ikke laste inode bitmap fra: \n" +" %s \n" + +#: vfs/undelfs.c:305 +msgid "undelfs: reading block bitmap..." +msgstr "undelfs: leser blokk bitmap..." + +#: vfs/undelfs.c:308 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" +" Kunne ikke laste blokk bitmap fra: \n" +" %s \n" + +#: vfs/undelfs.c:314 +msgid "undelfs: done." +msgstr "undelfs: ferdig." + +#: vfs/undelfs.c:317 +msgid "undelfs: failure" +msgstr " undelfs: feilet " + +#: vfs/undelfs.c:341 +msgid " vfs_info is not fs! " +msgstr "vfs_info er ikke fs! " + +#: vfs/undelfs.c:397 vfs/undelfs.c:581 +msgid " You have to chdir to extract files first " +msgstr "Du må endre katalog før du henter ut filene " + +#: vfs/undelfs.c:520 +msgid " while iterating over blocks " +msgstr " under iterasjon over blokker " + +#: vfs/undelfs.c:625 +#, c-format +msgid " Could not open file: %s " +msgstr " Kunne ikke åpne fil: %s " + +#. This is place of next pointer +#: vfs/undelfs.c:683 +msgid "Undelete filesystem for ext2" +msgstr "Undelete filsystem for ext2" Binary files old/mc-4.5.42/po/pl.gmo and new/mc-4.5.43/po/pl.gmo differ diff -ruN old/mc-4.5.42/po/pl.po new/mc-4.5.43/po/pl.po --- old/mc-4.5.42/po/pl.po Mon Dec 6 18:50:16 1999 +++ new/mc-4.5.43/po/pl.po Sat Mar 18 08:43:50 2000 @@ -158,7 +158,7 @@ #: gnome/gcmd.c:1 msgid "Enter name." -msgstr "Wprowad¼ nazwê" +msgstr "Wprowad¼ nazwê." #: gnome/gcmd.c:1 msgid "Enter label for command:" @@ -170,7 +170,7 @@ #: gnome/gcmd.c:1 src/panelize.c:1 msgid "Find rejects after patching" -msgstr "" +msgstr "Znajd¼ odrzuty po patchowaniu" #: gnome/gcmd.c:1 msgid "Run Command" @@ -206,7 +206,7 @@ #: gnome/gcmd.c:1 gnome/gcmd.c:1 gnome/gcmd.c:1 gnome/gcmd.c:1 #: gnome/gscreen.c:1 msgid "Show all files" -msgstr "Wy¶wietlaj wszystkie pliki" +msgstr "Poka¿ wszystkie pliki" #: gnome/gcmd.c:1 msgid "." @@ -509,7 +509,7 @@ #: gnome/gdialogs.c:1 msgid "Prompt me before overwriting any file." -msgstr "Zapytaj przed nadpisaniem jakiegokolwiek pliku." +msgstr "Zapytaj przed nadpisaniem pliku." #: gnome/gdialogs.c:1 msgid "Don't overwrite any files." @@ -595,7 +595,7 @@ #: gnome/gdialogs.c:1 msgid "Recursively copy subdirectories." -msgstr "Rekurencyjnie kopiuj podkatalogi." +msgstr "Kopiuj katalogi rekursywnie." #: gnome/gdialogs.c:1 msgid "If set, this will copy the directories recursively" @@ -1321,11 +1321,11 @@ #: gnome/gprefs.c:1 msgid "Show backup files" -msgstr "Wy¶wietlanie plików zapasowych" +msgstr "Pokazuj pliki kopii zapasowych" #: gnome/gprefs.c:1 msgid "Show hidden files" -msgstr "Wy¶wietlanie ukrytych plików" +msgstr "Pokazuj ukryte pliki" #: gnome/gprefs.c:1 msgid "Mix files and directories" @@ -1349,7 +1349,7 @@ #: gnome/gprefs.c:1 msgid "Show progress while operations are being performed" -msgstr "Wy¶wietlanie postêpu podczas wykowywania operacji" +msgstr "Pokazuj stopieñ zaawansowania wykonywania operacji" #: gnome/gprefs.c:1 msgid "VFS Timeout:" @@ -1361,11 +1361,11 @@ #: gnome/gprefs.c:1 msgid "Anonymous FTP password:" -msgstr "Has³o anonimowego FTP:" +msgstr "Has³o do anonimowego FTP:" #: gnome/gprefs.c:1 msgid "Always use FTP proxy" -msgstr "Wykorzystanie proxy FTP" +msgstr "Zawsze u¿ywaj proxy do FTP" #: gnome/gprefs.c:1 msgid "Fast directory reload" @@ -1377,7 +1377,7 @@ #: gnome/gprefs.c:1 msgid "FTP directory cache timeout :" -msgstr "Czas przechowywania katalogu FTP : " +msgstr "Czas buforowania katalogu FTP: " #: gnome/gprefs.c:1 msgid "Allow customization of icons in icon view" Binary files old/mc-4.5.42/po/ru.gmo and new/mc-4.5.43/po/ru.gmo differ diff -ruN old/mc-4.5.42/po/ru.po new/mc-4.5.43/po/ru.po --- old/mc-4.5.42/po/ru.po Mon Dec 6 18:50:17 1999 +++ new/mc-4.5.43/po/ru.po Sat Mar 18 08:43:50 2000 @@ -6,13 +6,13 @@ # Andrew V. Samoilov , 1999, # and Alex Tkachenko , 1998. # -# $Id: ru.po,v 1.25 1999/11/01 04:57:00 sipan Exp $ +# $Id: ru.po,v 1.26 1999/12/13 14:22:02 sipan Exp $ # msgid "" msgstr "" "Project-Id-Version: mc 4.5.40\n" -"POT-Creation-Date: 1999-10-29 09:42-0400\n" -"PO-Revision-Date: 1999-10-12 02:56-0500\n" +"POT-Creation-Date: 1999-12-13 03:51-0500\n" +"PO-Revision-Date: 1999-12-12 23:56-0200\n" "Last-Translator: Evgeny Bulgakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" @@ -361,19 +361,19 @@ msgid "Could not open %s; will not have desktop icons" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s; ÎÅ ÂÕÄÅÔ ÐÉËÔÏÇÒÁÍÍ ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1186 msgid "While running the mount/umount command" msgstr "ðÒÉ ÉÓÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ mount/umount" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1255 msgid "While running the eject command" msgstr "ðÒÉ ÉÓÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ eject" -#: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" msgstr "ïÛÉÂËÁ" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2598 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -387,84 +387,84 @@ "\n" "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÆÏÎÏ×ÏÅ ÉÚÏÂÒÁÖÅÎÉÅ." -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 msgid "_Terminal" msgstr "ôÅÒÍÉÎÁÌ" -#: gnome/gdesktop.c:2616 gnome/glayout.c:363 +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "úÁÐÕÓÔÉÔØ ÎÏ×ÙÊ ÔÅÒÍÉÎÁÌ × ÔÅËÕÝÅÍ ËÁÔÁÌÏÇÅ" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2618 gnome/glayout.c:365 +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 msgid "_Directory..." msgstr "ëÁÔÁÌÏÇ..." -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "óÏÚÄÁÔØ ÎÏ×ÙÊ ËÁÔÁÌÏÇ" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "URL L_ink..." msgstr "óÓÙÌËÁ URL..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "Creates a new URL link" msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ÓÓÙÌËÕ URL" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "_Launcher..." msgstr "ëÎÏÐËÁ ÚÁÐÕÓËÁ" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "Creates a new launcher" msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ËÎÏÐËÕ ÚÁÐÕÓËÁ" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2631 msgid "By _Name" msgstr "ðÏ ÉÍÅÎÉ" -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2632 msgid "By File _Type" msgstr "ðÏ ÔÉÐÕ ÆÁÊÌÁ" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2633 msgid "By _Size" msgstr "ðÏ ÒÁÚÍÅÒÕ" -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2634 msgid "By Time Last _Accessed" msgstr "ðÏ ×ÒÅÍÅÎÉ ÐÏÓÌÅÄÎÅÇÏ ÄÏÓÔÕÐÁ" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2635 msgid "By Time Last _Modified" msgstr "ðÏ ×ÒÅÍÅÎÉ ÐÏÓÌÅÄÎÅÊ ÍÏÄÉÆÉËÁÃÉÉ" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2636 msgid "By Time Last _Changed" msgstr "ðÏ ×ÒÅÍÅÎÉ ÐÏÓÌÅÄÎÅÇÏ ÉÚÍÅÎÅÎÉÑ" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "÷ÙÒÏ×ÎÑÔØ ÐÉËÔÏÇÒÁÍÍÙ" -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2645 msgid "Create _New Window" msgstr "óÏÚÄÁÔØ ÎÏ×ÏÅ ÏËÎÏ" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "ðÅÒÅÓÍÏÔÒÅÔØ ËÁÔÁÌÏÇ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "ðÅÒÅÓÍÏÔÒÅÔØ ÓÐÉÓÏË ÕÓÔÒÏÊÓÔ×" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "÷ÏÓÓÏÚÄÁÔØ ÓÔÁÎÄÁÒÔÎÙÅ ÐÉËÔÏÇÒÁÍÍÙ" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2651 msgid "Configure _Background Image" msgstr "îÁÓÔÒÏÉÔØ ÆÏÎ" @@ -628,7 +628,7 @@ "\n" "ëÁÔÁÌÏÇ ÎÅ ÐÕÓÔ. õÄÁÌÉÔØ ÒÅËÕÒÓÉ×ÎÏ?" -#: gnome/gdialogs.c:790 src/file.c:2247 +#: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " msgstr " õÄÁÌÉÔØ: " @@ -662,7 +662,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1808 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1840 msgid "Password:" msgstr "ðÁÒÏÌØ:" @@ -979,7 +979,7 @@ "As root, you can damage your system if you are not careful, and the GNOME " "File Manager will not stop you from doing it." msgstr "" -"÷Ù ÉÓÐÏÌØÚÕÅÔÅ ÄÉÓÐÅÔÞÅÒ ÆÁÊÌÏ× GNOME Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ root.\n" +"÷Ù ÉÓÐÏÌØÚÕÅÔÅ ÄÉÓÐÅÔÞÅÒ ÆÁÊÌÏ× GNOME Ó ÐÒÉ×ÉÌÅÇÉÑÍÉ root. \n" "\n" "ëÁË root, ×Ù ÍÏÖÅÔÅ ÓÌÕÞÁÊÎÏ ÐÏ×ÒÅÄÉÔØ ×ÁÛÕ ÓÉÓÔÅÍÕ.äÉÓÐÅÔÞÅÒ ÆÁÊÌÏ× GNOME " "ÎÅ ÓÍÏÖÅÔ ÐÏÍÅÛÁÔØ ×ÁÍ × ÜÔÏÍ." @@ -1347,7 +1347,7 @@ #: gnome/gprefs.c:104 msgid "Use shell patterns instead of regular expressions" -msgstr "éÓÐÏÌØÚÕÊÔÅ ÏÂÒÁÚÃÙ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ×ÍÅÓÔÏ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" +msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÏÂÒÁÚÃÙ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ×ÍÅÓÔÏ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" #: gnome/gprefs.c:113 msgid "Confirm when deleting file" @@ -1391,7 +1391,7 @@ #: gnome/gprefs.c:159 msgid "FTP directory cache timeout :" -msgstr "ôÁÊÍ-ÁÕÔ ËÜÛÁ ËÁÔÁÌÏÇÁ FTP:" +msgstr "ôÁÊÍ-ÁÕÔ ËÅÛÁ ËÁÔÁÌÏÇÁ FTP:" #: gnome/gprefs.c:163 msgid "Allow customization of icons in icon view" @@ -1411,7 +1411,7 @@ #: gnome/gprefs.c:184 msgid "Caching" -msgstr "ëÜÛÉÒÏ×ÁÎÉÅ" +msgstr "ëÅÛÉÒÏ×ÁÎÉÅ" #: gnome/gprefs.c:474 msgid "Preferences" @@ -1626,31 +1626,31 @@ msgid "_Search" msgstr "ðÏÉÓË" -#: gnome/gwidget.c:90 +#: gnome/gwidget.c:95 msgid "ok" msgstr "ÄÁÌØÛÅ" -#: gnome/gwidget.c:92 +#: gnome/gwidget.c:97 msgid "cancel" msgstr "ÏÔÍÅÎÉÔØ" -#: gnome/gwidget.c:94 +#: gnome/gwidget.c:99 msgid "help" msgstr "ÓÐÒÁ×ËÁ" -#: gnome/gwidget.c:96 src/file.c:2271 +#: gnome/gwidget.c:101 src/file.c:2268 msgid "yes" msgstr "ÄÁ" -#: gnome/gwidget.c:98 src/file.c:2269 +#: gnome/gwidget.c:103 src/file.c:2266 msgid "no" msgstr "ÎÅÔ" -#: gnome/gwidget.c:100 +#: gnome/gwidget.c:105 msgid "exit" msgstr "×ÙÈÏÄ" -#: gnome/gwidget.c:102 +#: gnome/gwidget.c:107 msgid "abort" msgstr "ÐÒÅËÒÁÔÉÔØ" @@ -1740,7 +1740,7 @@ #: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 -#: src/chmod.c:114 src/chown.c:79 src/cmd.c:854 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 #: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 @@ -1764,7 +1764,7 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:703 src/screen.c:1451 src/screen.c:2129 +#: src/help.c:318 src/main.c:707 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 #: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 msgid " Warning " @@ -1897,7 +1897,7 @@ msgid "al&L" msgstr "&÷ÓÅ" -#: gtkedit/editcmd.c:1177 src/file.c:2193 src/filegui.c:267 +#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "ð&ÒÏÐÕÓÔÉÔØ" @@ -2120,14 +2120,14 @@ msgid "Cancel quit" msgstr "ðÒÅÒ×ÁÔØ ×ÙÈÏÄ" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 msgid "&Yes" msgstr "&äÁ" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 #: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 msgid "&No" msgstr "&îÅÔ" @@ -2433,7 +2433,7 @@ msgid "&Save mode..." msgstr "òÅÖÉÍ &ÓÏÈÒÁÎÅÎÉÑ..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1349 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 msgid "&Layout..." msgstr "&÷ÎÅÛÎÉÊ ×ÉÄ" @@ -2694,7 +2694,7 @@ msgstr "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÒÅÄÁËÔÏÒÁ.\n" #: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1715 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 #: src/view.c:2068 msgid "Help" msgstr "ðÏÍÏÝØ" @@ -2707,13 +2707,13 @@ msgid "Replac" msgstr "úÁÍÅÎÁ" -#: gtkedit/editwidget.c:1102 src/main.c:1717 +#: gtkedit/editwidget.c:1102 src/main.c:1722 msgid "PullDn" msgstr "íÅÎÀMC" #. gtk_edit_menu #: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1718 src/view.c:2070 src/view.c:2092 +#: src/main.c:1723 src/view.c:2070 src/view.c:2092 msgid "Quit" msgstr "÷ÙÈÏÄ" @@ -2780,7 +2780,7 @@ msgid "Delete highlighted text" msgstr "õÄÁÌÉÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ" -#: gtkedit/gtkedit.c:1255 src/main.c:1716 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "íÅÎÀ" @@ -2948,7 +2948,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:634 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 msgid " Oops... " msgstr " ïÊ... " @@ -2964,7 +2964,7 @@ msgid "Background process:" msgstr "æÏÎÏ×ÙÊ ÐÒÏÃÅÓÓ:" -#: src/background.c:287 src/file.c:2192 +#: src/background.c:287 src/file.c:2189 msgid " Background process error " msgstr " ïÛÉÂËÁ ÆÏÎÏ×ÏÇÏ ÐÒÏÃÅÓÓÁ " @@ -3082,7 +3082,7 @@ #: src/boxes.c:657 msgid "ftpfs directory cache timeout:" -msgstr "ôÁÊÍ-ÁÕÔ ËÜÛÁ ËÁÔÁÌÏÇÁ FTP:" +msgstr "ôÁÊÍ-ÁÕÔ ËÅÛÁ ËÁÔÁÌÏÇÁ FTP:" #: src/boxes.c:661 msgid "ftp anonymous password:" @@ -3303,7 +3303,7 @@ msgid "Files tagged, want to cd?" msgstr "æÁÊÌÙ ÐÏÍÅÞÅÎÙ, ÓÍÅÎÉÔØ ËÁÔÁÌÏÇ?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 msgid "Could not change directory" msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÍÅÎÉÔØ ËÁÔÁÌÏÇ" @@ -3379,39 +3379,39 @@ msgid "&Home" msgstr "&ðÅÒÓÏÎÁÌØÎÙÊ" -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Compare directories " msgstr " óÒÁ×ÎÉÔØ ËÁÔÁÌÏÇÉ " -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Select compare method: " msgstr " ÷ÙÂÅÒÉÔÅ ÍÅÔÏÄ ÓÒÁ×ÎÅÎÉÑ: " -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Quick" msgstr "&âÙÓÔÒÙÊ" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Size only" msgstr "ðÏ &ÒÁÚÍÅÒÕ" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Thorough" msgstr "ðÏ&ÂÁÊÔÎÙÊ" -#: src/cmd.c:864 +#: src/cmd.c:869 msgid " Both panels should be on the listing view mode to use this command " msgstr "äÌÑ ×ÙÐÏÌÎÅÎÉÑ ÜÔÏÊ ËÏÍÁÎÄÙ ÏÂÅ ÐÁÎÅÌÉ ÄÏÌÖÎÙ ÂÙÔØ × ÒÅÖÉÍÅ ÓÐÉÓËÁ" -#: src/cmd.c:878 +#: src/cmd.c:883 msgid " The command history is empty " msgstr " éÓÔÏÒÉÑ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ÐÕÓÔÁ " -#: src/cmd.c:884 +#: src/cmd.c:889 msgid " Command history " msgstr " éÓÔÏÒÉÑ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ " -#: src/cmd.c:926 +#: src/cmd.c:931 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3419,11 +3419,11 @@ " üÔÏ ÎÅ xterm É ÎÅ ËÏÎÓÏÌØ Linux/SCO; \n" " ðÁÎÅÌÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÏÔËÌÀÞÅÎÙ. " -#: src/cmd.c:965 +#: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" msgstr "÷×ÅÄÉÔÅ `exit' ÄÌÑ ×ÏÚ×ÒÁÔÁ × Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1025 #, c-format msgid "" " Couldn't stat %s \n" @@ -3432,98 +3432,98 @@ " îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ Ó×ÏÊÓÔ×Á ÕÚÌÁ %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1034 src/cmd.c:1036 msgid " Link " msgstr " óÓÙÌËÁ " -#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1704 +#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 msgid " to:" msgstr " ×:" -#: src/cmd.c:1041 +#: src/cmd.c:1046 #, c-format msgid " link: %s " msgstr " ÓÓÙÌËÁ: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1079 #, c-format msgid " symlink: %s " msgstr " ÓÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ: %s " -#: src/cmd.c:1128 +#: src/cmd.c:1133 #, c-format msgid " Symlink `%s' points to: " msgstr " óÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ `%s' ÕËÁÚÙ×ÁÅÔ ÎÁ: " -#: src/cmd.c:1133 +#: src/cmd.c:1138 msgid " Edit symlink " msgstr " ðÒÁ×ËÁ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÉ " -#: src/cmd.c:1138 +#: src/cmd.c:1143 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " ÐÒÁ×ËÁ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÉ, ÎÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ %s: %s " -#: src/cmd.c:1142 +#: src/cmd.c:1147 #, c-format msgid " edit symlink: %s " msgstr " ÐÒÁ×ËÁ ÓÉÍ×ÏÌÉÞÅÓËÏÊ ÓÓÙÌËÉ: %s " -#: src/cmd.c:1169 +#: src/cmd.c:1174 msgid " Link symbolically " msgstr " ó×ÑÚÁÔØ ÓÉÍ×ÏÌÉÞÅÓËÉ " -#: src/cmd.c:1170 +#: src/cmd.c:1175 msgid " Relative symlink " msgstr " ïÔÎÏÓÉÔÅÌØÎÁÑ ÓÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ " -#: src/cmd.c:1181 +#: src/cmd.c:1186 #, c-format msgid " relative symlink: %s " msgstr " ÏÔÎÏÓÉÔÅÌØÎÁÑ ÓÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ: %s " -#: src/cmd.c:1331 +#: src/cmd.c:1336 msgid " Enter machine name (F1 for details): " msgstr " ÷×ÅÄÉÔÅ ÉÍÑ ÍÁÛÉÎÙ (ÄÅÔÁÌÉ ÐÏ F1): " -#: src/cmd.c:1355 +#: src/cmd.c:1360 #, c-format msgid " Could not chdir to %s " msgstr " îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × %s " -#: src/cmd.c:1362 +#: src/cmd.c:1367 msgid " Link to a remote machine " msgstr " óÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ " -#: src/cmd.c:1368 +#: src/cmd.c:1373 msgid " FTP to machine " msgstr " FTP-ÓÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ " -#: src/cmd.c:1374 +#: src/cmd.c:1379 msgid " SMB link to machine " msgstr " SMB Ó×ÑÚØ Ó ÍÁÛÉÎÏÊ " -#: src/cmd.c:1384 +#: src/cmd.c:1389 msgid " Socket source routing setup " msgstr " îÁÓÔÒÏÊËÁ ÒÁÓÐÒÅÄÅÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ ÇÎÅÚÄ" -#: src/cmd.c:1385 +#: src/cmd.c:1390 msgid " Enter host name to use as a source routing hop: " msgstr " ÷×ÅÄÉÔÅ ÉÍÑ ÒÁÓÐÒÅÄÅÌÑÀÝÅÇÏ ÒÅÔÒÁÎÓÌÑÔÏÒÁ-ÉÓÔÏÞÎÉËÁ: " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Host name " msgstr " éÍÑ ÓÉÓÔÅÍÙ " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Error while looking up IP address " msgstr " ïÛÉÂËÁ ÐÏÉÓËÁ IP ÁÄÒÅÓÁ " -#: src/cmd.c:1403 +#: src/cmd.c:1408 msgid " Undelete files on an ext2 file system " msgstr " ÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÆÁÊÌÏ× ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ ext2 " -#: src/cmd.c:1404 +#: src/cmd.c:1409 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3531,11 +3531,11 @@ " ÷×ÅÄÉÔÅ ÉÍÑ ÕÓÔÒÏÊÓÔ×Á (ÂÅÚ /dev/) ÎÁ ËÏÔÏÒÏÍ\n" " ×ÏÓÓÔÁÎÁ×ÌÉ×ÁÔØ ÆÁÊÌÙ ÐÏÓÌÅ ÕÄÁÌÅÎÉÑ: (ÄÅÔÁÌÉ ÐÏ F1)" -#: src/cmd.c:1454 +#: src/cmd.c:1459 msgid " Setup saved to ~/" msgstr " ðÁÒÁÍÅÔÒÙ ÓÏÈÒÁÎÅÎÙ × ~/" -#: src/cmd.c:1459 +#: src/cmd.c:1464 msgid " Setup " msgstr " îÁÓÔÒÏÊËÁ " @@ -3627,14 +3627,14 @@ #: src/dir.c:386 #, c-format -msgid "File exists but can not be stat-ed: %s %s" -msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ Ó×ÏÊÓÔ×Á: %s %s" +msgid "File '%s' exists but can not be stat-ed: %s" +msgstr "æÁÊÌ '%s' ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ Ó×ÏÊÓÔ×Á: %s" #: src/dir.c:657 msgid "Unknown" msgstr "îÅÉÚ×ÅÓÔÎÙÊ" -#: src/ext.c:143 src/user.c:501 +#: src/ext.c:143 src/user.c:499 #, c-format msgid "" " Can't generate unique filename \n" @@ -3643,7 +3643,7 @@ " îÅ×ÏÚÍÏÖÎÏ ÓÆÏÒÍÉÒÏ×ÁÔØ ÕÎÉËÁÌØÎÏÅ ÉÍÑ ÆÁÊÌÁ \n" " %s " -#: src/ext.c:150 src/user.c:513 +#: src/ext.c:150 src/user.c:511 #, c-format msgid "" " Can't create temporary command file \n" @@ -3652,7 +3652,7 @@ " îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÒÅÍÅÎÎÙÊ ËÏÍÁÎÄÎÙÊ ÆÁÊÌ \n" " %s " -#: src/ext.c:165 src/user.c:542 +#: src/ext.c:165 src/user.c:533 msgid " Parameter " msgstr " ðÁÒÁÍÅÔÒ " @@ -4074,7 +4074,7 @@ #: src/file.c:1703 msgid "directories" -msgstr "ËÁÔÁÌÏÇÉ" +msgstr "ËÁÔÁÌÏÇÁ" #: src/file.c:1704 msgid "files/directories" @@ -4100,15 +4100,15 @@ msgid " Sorry, I could not put the job in background " msgstr " éÚ×ÉÎÉÔÅ, ÓÄÅÌÁÔØ ÜÔÏ × ÆÏÎÏ×ÏÍ ÒÅÖÉÍÅ ÎÅ×ÏÚÍÏÖÎÏ " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Internal failure " msgstr " ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " msgstr " îÅÉÚ×ÅÓÔÎÁÑ ÆÁÊÌÏ×ÁÑ ÏÐÅÒÁÃÉÑ " -#: src/file.c:2031 +#: src/file.c:2029 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -4117,15 +4117,15 @@ " îÁÚÎÁÞÅÎÉÅ \"%s\" ÄÏÌÖÎÏ ÂÙÔØ ËÁÔÁÌÏÇÏÍ \n" " %s " -#: src/file.c:2193 +#: src/file.c:2190 msgid "&Retry" msgstr "ðÏ&×ÔÏÒÉÔØ" -#: src/file.c:2193 src/file.c:2254 src/filegui.c:264 src/filegui.c:592 +#: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" msgstr "&ðÒÅÒ×ÁÔØ" -#: src/file.c:2245 +#: src/file.c:2242 msgid "" "\n" " Directory not empty. \n" @@ -4135,7 +4135,7 @@ " ëÁÔÁÌÏÇ ÎÅ ÐÕÓÔ. \n" " õÄÁÌÉÔØ ÒÅËÕÒÓÉ×ÎÏ? " -#: src/file.c:2246 +#: src/file.c:2243 msgid "" "\n" " Background process: Directory not empty \n" @@ -4145,27 +4145,27 @@ " æÏÎÏ×ÙÊ ÐÒÏÃÅÓÓ: ËÁÔÁÌÏÇ ÎÅ ÐÕÓÔ \n" " õÄÁÌÉÔØ ÒÅËÕÒÓÉ×ÎÏ? " -#: src/file.c:2253 +#: src/file.c:2250 msgid "a&ll" msgstr "&÷ÓÅ" -#: src/file.c:2253 src/filegui.c:595 +#: src/file.c:2250 src/filegui.c:595 msgid "non&E" msgstr "ÎÉ &ïÄÎÏÇÏ" -#: src/file.c:2263 +#: src/file.c:2260 msgid " Type 'yes' if you REALLY want to delete " msgstr " îÁÂÅÒÉÔÅ 'yes' ÅÓÌÉ ÷Ù äåêóô÷éôåìøîï ÈÏÔÉÔÅ ÕÄÁÌÉÔØ " -#: src/file.c:2265 +#: src/file.c:2262 msgid "all the directories " msgstr "ÕÄÁÌÉÔØ ×ÓÅ ËÁÔÁÌÏÇÉ" -#: src/file.c:2267 +#: src/file.c:2264 msgid " Recursive Delete " msgstr " òÅËÕÒÓÉ×ÎÏÅ ÕÄÁÌÅÎÉÅ " -#: src/file.c:2268 +#: src/file.c:2265 msgid " Background process: Recursive Delete " msgstr " æÏÎÏ×ÙÊ ÐÒÏÃÅÓÓ: òÅËÕÒÓÉ×ÎÏÅ ÕÄÁÌÅÎÉÅ " @@ -4325,7 +4325,7 @@ msgid "Content: " msgstr "óÏÄÅÒÖÉÔ ÔÅËÓÔ" -#: src/find.c:171 src/main.c:1240 src/main.c:1264 +#: src/find.c:171 src/main.c:1244 src/main.c:1268 msgid "&Tree" msgstr "ä&ÅÒÅ×Ï" @@ -4430,7 +4430,7 @@ msgid " Help " msgstr " ðÏÍÏÝØ " -#: src/help.c:766 src/user.c:650 +#: src/help.c:766 src/user.c:637 #, c-format msgid "" " Can't open file %s \n" @@ -4896,7 +4896,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "ÅÅ ÐÒÉ ÐÏÍÏÝÉ Tab ÉÌÉ ÍÙÛËÏÊ É ÎÁÖÍÉÔÅ ÐÒÏÂÅÌ." -#: src/main.c:704 +#: src/main.c:708 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4908,259 +4908,263 @@ " ÕÄÁÌÉÌÉ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÉÌÉ ÄÁÌÉ ÓÅÂÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ \n" " ÐÒÉ×ÉÌÅÇÉÉ ÄÏÓÔÕÐÁ ÐÒÉ ÐÏÍÏÝÉ ËÏÍÁÎÄÙ \"su\"? " -#: src/main.c:779 +#: src/main.c:783 msgid "Press any key to continue..." msgstr "äÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ..." -#: src/main.c:829 +#: src/main.c:833 msgid " The shell is already running a command " msgstr " éÎÔÅÒÐÒÅÔÁÔÏÒ ÕÖÅ ÏÚÁÂÏÞÅÎ ×ÙÐÏÌÎÅÎÉÅÍ ËÏÍÁÎÄÙ " -#: src/main.c:856 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander " -#: src/main.c:857 +#: src/main.c:861 msgid " Do you really want to quit the Midnight Commander? " msgstr " ÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ ÉÚ Midnight Commander? " -#: src/main.c:1237 src/main.c:1261 +#: src/main.c:1241 src/main.c:1265 msgid "&Listing mode..." msgstr "æÏÒ&ÍÁÔ ÓÐÉÓËÁ..." -#: src/main.c:1238 src/main.c:1262 +#: src/main.c:1242 src/main.c:1266 msgid "&Quick view C-x q" msgstr "&âÙÓÔÒÙÊ ÐÒÏÓÍÏÔÒ C-x q" -#: src/main.c:1239 src/main.c:1263 +#: src/main.c:1243 src/main.c:1267 msgid "&Info C-x i" msgstr "&éÎÆÏÒÍÁÃÉÑ C-x i" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1246 src/main.c:1270 msgid "&Sort order..." msgstr "ðÏÒÑÄÏË &ÓÏÒÔÉÒÏ×ËÉ" -#: src/main.c:1244 src/main.c:1268 +#: src/main.c:1248 src/main.c:1272 msgid "&Filter..." msgstr "&æÉÌØÔÒ" -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1251 src/main.c:1275 msgid "&Network link..." msgstr "óÅ&ÔÅ×ÏÅ ÓÏÅÄÉÎÅÎÉÅ..." -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1252 src/main.c:1276 msgid "FT&P link..." msgstr "&FTP-ÓÏÅÄÉÎÅÎÉÅ" -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1254 src/main.c:1278 msgid "SM&B link..." msgstr "SM&B Ó×ÑÚØ..." -#: src/main.c:1255 src/main.c:1279 +#: src/main.c:1259 src/main.c:1283 msgid "&Drive... M-d" msgstr "&äÉÓË... M-d" -#: src/main.c:1257 src/main.c:1281 +#: src/main.c:1261 src/main.c:1285 msgid "&Rescan C-r" msgstr "&ðÅÒÅÓÍÏÔÒÅÔØ C-r" -#: src/main.c:1285 +#: src/main.c:1289 msgid "&User menu F2" msgstr "&íÅÎÀ ÐÏÌØÚÏ×ÁÔÅÌÑ F2" -#: src/main.c:1286 +#: src/main.c:1290 msgid "&View F3" msgstr "ðÒÏÓÍÏÔÒ &ÆÁÊÌÁ F3" -#: src/main.c:1287 +#: src/main.c:1291 msgid "Vie&w file... " msgstr "&ðÒÏÓÍÏÔÒ ÆÁÊÌÁ..." -#: src/main.c:1288 +#: src/main.c:1292 msgid "&Filtered view M-!" msgstr "&ðÒÏÓÍÏÔÒ ËÏÍÁÎÄÙ M-!" -#: src/main.c:1289 +#: src/main.c:1293 msgid "&Edit F4" msgstr "&òÅÄÁËÔÉÒÏ×ÁÎÉÅ F4" -#: src/main.c:1290 +#: src/main.c:1294 msgid "&Copy F5" msgstr "&ëÏÐÉÒÏ×ÁÎÉÅ F5" -#: src/main.c:1291 +#: src/main.c:1295 msgid "c&Hmod C-x c" msgstr "ðÒÁ×Á &ÄÏÓÔÕÐÁ C-x c" -#: src/main.c:1293 +#: src/main.c:1297 msgid "&Link C-x l" msgstr "&öÅÓÔËÁÑ ÓÓÙÌËÁ C-x l" -#: src/main.c:1294 +#: src/main.c:1298 msgid "&SymLink C-x s" msgstr "&óÉÍ×ÏÌÉÞ. ÓÓÙÌËÁ C-x s" -#: src/main.c:1295 +#: src/main.c:1299 msgid "edit s&Ymlink C-x C-s" msgstr "ðÒÁ×ËÁ ÓÓÙ&ÌËÉ C-x C-s" -#: src/main.c:1296 +#: src/main.c:1300 msgid "ch&Own C-x o" msgstr "&÷ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ C-x o" -#: src/main.c:1297 +#: src/main.c:1301 msgid "&Advanced chown " msgstr "ðÒ&Á×Á (ÒÁÓÛÉÒÅÎÎÙÅ) " -#: src/main.c:1299 +#: src/main.c:1303 msgid "&Rename/Move F6" msgstr "ðÅÒÅ&ÉÍÅÎÏ×ÁÎÉÅ F6" -#: src/main.c:1300 +#: src/main.c:1304 msgid "&Mkdir F7" msgstr "óÏ&ÚÄÁÎÉÅ ËÁÔÁÌÏÇÁ F7" -#: src/main.c:1301 +#: src/main.c:1305 msgid "&Delete F8" msgstr "&õÄÁÌÅÎÉÅ F8" -#: src/main.c:1302 +#: src/main.c:1306 msgid "&Quick cd M-c" msgstr "óÍÅ&ÎÁ ËÁÔÁÌÏÇÁ M-c" -#: src/main.c:1304 +#: src/main.c:1308 msgid "select &Group M-+" msgstr "ïÔÍÅÔÉÔØ &ÇÒÕÐÐÕ M-+" -#: src/main.c:1305 +#: src/main.c:1309 msgid "u&Nselect group M-\\" msgstr "óÎÑÔØ &ÏÔÍÅÔËÕ M-\\" -#: src/main.c:1306 +#: src/main.c:1310 msgid "reverse selec&Tion M-*" msgstr "éÎ×ÅÒ&ÔÉÒÏ×ÁÔØ ÏÔÍÅÔËÕ *" -#: src/main.c:1308 +#: src/main.c:1312 msgid "e&Xit F10" msgstr "÷Ù&ÈÏÄ F10" -#: src/main.c:1318 +#: src/main.c:1322 msgid "&Directory tree" msgstr "&äÅÒÅ×Ï ËÁÔÁÌÏÇÏ×" -#: src/main.c:1320 +#: src/main.c:1324 msgid "&Find file M-?" msgstr "ðÏÉÓË &ÆÁÊÌÁ M-?" -#: src/main.c:1321 +#: src/main.c:1325 msgid "s&Wap panels C-u" msgstr "&ðÅÒÅÓÔÁ×ÉÔØ ÐÁÎÅÌÉ C-u" -#: src/main.c:1322 +#: src/main.c:1326 msgid "switch &Panels on/off C-o" msgstr "&ïÔËÌÀÞÉÔØ ÐÁÎÅÌÉ C-o" -#: src/main.c:1323 +#: src/main.c:1327 msgid "&Compare directories C-x d" msgstr "&óÒÁ×ÎÉÔØ ËÁÔÁÌÏÇÉ C-x d" -#: src/main.c:1324 +#: src/main.c:1328 msgid "e&Xternal panelize C-x !" msgstr "&ëÒÉÔÅÒÉÊ ÐÁÎÅÌÉÚÁÃÉÉ C-x !" -#: src/main.c:1325 +#: src/main.c:1329 msgid "show directory s&Izes" msgstr "&òÁÚÍÅÒÙ ËÁÔÁÌÏÇÏ×" -#: src/main.c:1327 +#: src/main.c:1331 msgid "command &History" msgstr "&éÓÔÏÒÉÑ ËÏÍÁÎÄ" -#: src/main.c:1328 +#: src/main.c:1332 msgid "di&Rectory hotlist C-\\" msgstr "óÐÒÁ×ÏÞÎÉË ËÁÔÁ&ÌÏÇÏ× C-\\" -#: src/main.c:1330 +#: src/main.c:1334 msgid "&Active VFS list C-x a" msgstr "óÐÉÓÏË &ÁËÔÉ×ÎÙÈ ÷æó C-x a" -#: src/main.c:1333 +#: src/main.c:1335 +msgid "Fr&ee VFSs now" +msgstr "" + +#: src/main.c:1338 msgid "&Background jobs C-x j" msgstr "æÏ&ÎÏ×ÙÅ ÚÁÄÁÎÉÑ C-x j" -#: src/main.c:1337 +#: src/main.c:1342 msgid "&Undelete files (ext2fs only)" msgstr "&÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÆÁÊÌÏ×" -#: src/main.c:1340 +#: src/main.c:1345 msgid "&Listing format edit" msgstr "&òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÏÒÍÁÔÁ" -#: src/main.c:1342 +#: src/main.c:1347 msgid "&Extension file edit" msgstr "æÁÊÌ ÒÁÓ&ÛÉÒÅÎÉÊ" -#: src/main.c:1343 +#: src/main.c:1348 msgid "&Menu file edit" msgstr "æÁÊÌ &ÍÅÎÀ" -#: src/main.c:1348 +#: src/main.c:1353 msgid "&Configuration..." msgstr "&ëÏÎÆÉÇÕÒÁÃÉÑ" -#: src/main.c:1350 +#: src/main.c:1355 msgid "c&Onfirmation..." msgstr "&ðÏÄÔ×ÅÒÖÄÅÎÉÅ" -#: src/main.c:1351 +#: src/main.c:1356 msgid "&Display bits..." msgstr "&âÉÔÙ ÓÉÍ×ÏÌÏ×..." -#: src/main.c:1353 +#: src/main.c:1358 msgid "learn &Keys..." msgstr "&òÁÓÐÏÚÎÁ×ÁÎÉÅ ËÌÁ×ÉÛ..." -#: src/main.c:1356 +#: src/main.c:1361 msgid "&Virtual FS..." msgstr "÷ÉÒÔÕÁÌØÎÙÅ &æó..." -#: src/main.c:1359 +#: src/main.c:1364 msgid "&Save setup" msgstr "&óÏÈÒÁÎÉÔØ ÎÁÓÔÒÏÊËÉ" -#: src/main.c:1375 src/main.c:1377 +#: src/main.c:1380 src/main.c:1382 msgid " &Left " msgstr " &ìÅ×ÁÑ ÐÁÎÅÌØ" -#: src/main.c:1377 +#: src/main.c:1382 msgid " &Above " msgstr " ÷ÅÒÈÎÑÑ " -#: src/main.c:1380 +#: src/main.c:1385 msgid " &File " msgstr " &æÁÊÌ " -#: src/main.c:1381 +#: src/main.c:1386 msgid " &Command " msgstr " &ëÏÍÁÎÄÁ " -#: src/main.c:1382 +#: src/main.c:1387 msgid " &Options " msgstr " &îÁÓÔÒÏÊËÉ " -#: src/main.c:1384 src/main.c:1386 +#: src/main.c:1389 src/main.c:1391 msgid " &Right " msgstr " &ðÒÁ×ÁÑ ÐÁÎÅÌØ" -#: src/main.c:1386 +#: src/main.c:1391 msgid " &Below " msgstr " îÉÖÎÑÑ " -#: src/main.c:1441 +#: src/main.c:1446 msgid " Information " msgstr " éÎÆÏÒÍÁÃÉÑ " -#: src/main.c:1442 +#: src/main.c:1447 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5172,131 +5176,131 @@ " ÐÅÒÅÚÁÇÒÕÚÉÔØ ËÁÔÁÌÏÇ. äÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÓÍÏÔÒÉÔÅ \n" " ÒÕËÏ×ÏÄÓÔ×Ï (man)." -#: src/main.c:1921 +#: src/main.c:1926 msgid "Thank you for using GNU Midnight Commander" msgstr "âÌÁÇÏÄÁÒÉÍ ÷ÁÓ ÚÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ GNU Midnight Commander" -#: src/main.c:2280 +#: src/main.c:2283 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "Ó ÐÏÄÄÅÒÖËÏÊ ÍÙÛÉ ÎÁ xterm%s.\n" -#: src/main.c:2281 +#: src/main.c:2284 msgid " and the Linux console" msgstr " É Linux-ËÏÎÓÏÌÉ" -#: src/main.c:2376 +#: src/main.c:2380 msgid "The TERM environment variable is unset!\n" msgstr "ðÅÒÅÍÅÎÎÁÑ ÓÒÅÄÙ TERM ÎÅ ÏÐÒÅÄÅÌÅÎÁ!\n" -#: src/main.c:2586 +#: src/main.c:2591 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "âÉÂÌÉÏÔÅÞÎÙÊ ËÁÔÁÌÏÇ Midnight Commander: %s\n" -#: src/main.c:2600 +#: src/main.c:2605 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "ïÐÃÉÑ -m ÕÓÔÁÒÅÌÁ. ðÏÖÁÌÕÊÓÔÁ ×ÚÇÌÑÎÉÔÅ ÎÁ `âÉÔÙ ÓÉÍ×ÏÌÏ×' × ÍÅÎÀ îÁÓÔÒÏÊËÉ\n" -#: src/main.c:2677 +#: src/main.c:2682 msgid "Use to debug the background code" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÏÔÌÁÄËÉ ÆÏÎÏ×ÏÇÏ ËÏÄÁ" -#: src/main.c:2683 +#: src/main.c:2688 msgid "Request to run in color mode" msgstr "úÁÐÒÏÓ ÎÁ ÚÁÐÕÓË × Ã×ÅÔÎÏÍ ÒÅÖÉÍÅ" -#: src/main.c:2685 +#: src/main.c:2690 msgid "Specifies a color configuration" msgstr "ïÐÒÅÄÅÌÑÅÔ ÎÁÓÔÒÏÊËÉ Ã×ÅÔÏ×" -#: src/main.c:2690 +#: src/main.c:2695 msgid "Edits one file" msgstr "òÅÄÁËÔÉÒÕÅÔ ÏÄÉÎ ÆÁÊÌ" -#: src/main.c:2694 +#: src/main.c:2699 msgid "Displays this help message" msgstr "ïÔÏÂÒÁÖÁÅÔ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏÍÏÝÉ" -#: src/main.c:2697 +#: src/main.c:2702 msgid "Displays a help screen on how to change the color scheme" msgstr "ïÔÏÂÒÁÖÁÅÔ ÜËÒÁÎ ÐÏÍÏÝÉ Ï ÔÏÍ, ËÁË ÉÚÍÅÎÉÔØ Ã×ÅÔÏ×ÕÀ ÓÈÅÍÕ" -#: src/main.c:2700 +#: src/main.c:2705 msgid "Log ftp dialog to specified file" msgstr "ðÒÏÔÏËÏÌÉÒÏ×ÁÔØ ÄÉÁÌÏÇ Ó FTP × ÏÐÒÅÄÅÌÅÎÎÙÊ ÆÁÊÌ" -#: src/main.c:2707 +#: src/main.c:2712 msgid "Obsolete" msgstr "õÓÔÁÒÅ×ÛÅÅ" -#: src/main.c:2709 +#: src/main.c:2714 msgid "Requests to run in black and white" msgstr "úÁÐÒÏÓ ÎÁ ÚÁÐÕÓË × ÞÅÒÎÏ-ÂÅÌÏÍ ÒÅÖÉÍÅ" -#: src/main.c:2711 +#: src/main.c:2716 msgid "Disable mouse support in text version" msgstr "ïÔËÌÀÞÉÔØ ÐÏÄÄÅÒÖËÕ ÍÙÛÉ × ÔÅËÓÔÏ×ÏÊ ×ÅÒÓÉÉ" -#: src/main.c:2714 +#: src/main.c:2719 msgid "Disables subshell support" msgstr "ïÔËÌÀÞÁÅÔ ÐÏÄÄÅÒÖËÕ ×ÓÔÒÏÅÎÎÏÊ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ" -#: src/main.c:2718 +#: src/main.c:2723 msgid "Prints working directory at program exit" msgstr "ðÅÞÁÔÁÅÔ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÐÏ ÚÁ×ÅÒÛÅÎÉÉ ÐÒÏÇÒÁÍÍÙ" -#: src/main.c:2720 +#: src/main.c:2725 msgid "Resets soft keys on HP terminals" msgstr "óÂÒÁÓÙ×ÁÅÔ ÐÒÏÇÒÁÍÍÎÙÅ ËÌÁ×ÉÛÉ ÎÁ ÔÅÒÍÉÎÁÌÁÈ HP" -#: src/main.c:2722 +#: src/main.c:2727 msgid "To run on slow terminals" msgstr "úÁÐÕÓË ÎÁ ÍÅÄÌÅÎÎÙÈ ÔÅÒÍÉÎÁÌÁÈ" -#: src/main.c:2725 +#: src/main.c:2730 msgid "Use stickchars to draw" msgstr "ðÓÅ×ÄÏÇÒÁÆÉËÁ ÄÌÑ ÒÉÓÏ×ÁÎÉÑ" -#: src/main.c:2729 +#: src/main.c:2734 msgid "Enables subshell support (default)" msgstr "÷ËÌÀÞÁÅÔ ÐÏÄÄÅÒÖËÕ ×ÓÔÒÏÅÎÎÏÊ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" -#: src/main.c:2734 +#: src/main.c:2739 msgid "Tries to use termcap instead of terminfo" msgstr "ðÙÔÁÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ termcaps ×ÍÅÓÔÏ terminfo" -#: src/main.c:2738 +#: src/main.c:2743 msgid "Displays the current version" msgstr "ïÔÏÂÒÁÖÁÅÔ ÔÅËÕÝÕÀ ×ÅÒÓÉÀ" -#: src/main.c:2740 +#: src/main.c:2745 msgid "Launches the file viewer on a file" msgstr "úÁÐÕÓËÁÅÔ ÆÁÊÌÏ×ÙÊ ÐÒÏÓÍÏÔÒÝÉË ÄÌÑ ÆÁÊÌÁ" -#: src/main.c:2742 +#: src/main.c:2747 msgid "Forces xterm features" msgstr "îÁ×ÑÚÙ×ÁÅÔ Ó×ÏÊÓÔ×Á xterm" -#: src/main.c:2744 +#: src/main.c:2749 msgid "Geometry for the window" msgstr "çÅÏÍÅÔÒÉÑ ÏËÎÁ" -#: src/main.c:2744 +#: src/main.c:2749 msgid "GEOMETRY" msgstr "çåïíåôòéñ" -#: src/main.c:2745 +#: src/main.c:2750 msgid "No windows opened at startup" msgstr "îÅÔ ÏÔËÒÙÔÙÈ ÏËÏÎ ÐÒÉ ÚÁÇÒÕÚËÅ" -#: src/main.c:2747 +#: src/main.c:2752 msgid "Display the directory that holds the .links startup files and exit" msgstr "ðÏËÁÚÁÔØ ËÁÔÁÌÏÇ Ó .ÓÓÙÌËÁÍÉ ÓÔÁÒÔÏ×ÙÈ ÆÁÊÌÏ× É ×ÙÊÔÉ" -#: src/main.c:3045 +#: src/main.c:3062 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" @@ -5304,11 +5308,11 @@ "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ tty ÌÉÎÉÀ. ÷Ù ÄÏÌÖÎÙ ÚÁÐÕÓÔÉÔØ mc ÂÅÚ ÆÌÁÇÁ -P.\n" "îÁ ÎÅËÏÔÏÒÙÈ ÓÉÓÔÅÍÁÈ ×Ù ÍÏÖÅÔÅ ÚÁÈÏÔÅÔØ ÚÁÐÕÓÔÉÔØ # `which mc`\n" -#: src/main.c:3123 +#: src/main.c:3140 msgid " Notice " msgstr " ðÒÅÄÕÐÒÅÖÄÅÎÉÅ " -#: src/main.c:3124 +#: src/main.c:3141 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5453,7 +5457,7 @@ #: src/panelize.c:301 msgid " I can't run external panelize while logged on a non local directory " -msgstr " ñ ÎÅ ÍÏÇÕ ×ÙÐÏÌÎÉÔØ ÜÔÏ ËÏÍÁÎÄÕ, ÂÕÄÕÞÉ × ÎÅ ÌÏËÁÌØÎÏÍ ËÁÔÁÌÏÇÅ " +msgstr " îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÜÔÏ ËÏÍÁÎÄÕ, ÂÕÄÕÞÉ × ÎÅ ÌÏËÁÌØÎÏÍ ËÁÔÁÌÏÇÅ " #: src/panelize.c:351 msgid "Find *.orig after patching" @@ -5642,32 +5646,32 @@ "îÅ×ÏÚÍÏÖÎÏ ÐÉÓÁÔØ × ÆÁÊÌ %s:\n" "%s\n" -#: src/user.c:256 +#: src/user.c:250 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " îÅ×ÅÒÎÏÅ ÏÐÒÅÄÅÌÅÎÉÅ ÏÂÒÁÚÃÁ ÏÂÏÌÏÞËÉ \"%c\". " -#: src/user.c:389 +#: src/user.c:383 msgid " Debug " msgstr " ïÔÌÁÄËÁ " -#: src/user.c:398 +#: src/user.c:392 msgid " ERROR: " msgstr " ïûéâëá: " -#: src/user.c:402 +#: src/user.c:396 msgid " True: " msgstr " éÓÔÉÎÁ: " -#: src/user.c:404 +#: src/user.c:398 msgid " False: " msgstr " ìÏÖØ: " -#: src/user.c:616 +#: src/user.c:602 msgid " Warning -- ignoring file " msgstr " ðÒÅÄÕÐÒÅÖÄÅÎÉÅ - ÆÁÊÌ ÉÇÎÏÒÉÒÕÅÔÓÑ " -#: src/user.c:617 +#: src/user.c:603 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5677,17 +5681,18 @@ "É ÄÏÓÔÕÐÅÎ ÄÒÕÇÉÍ ÎÁ ÚÁÐÉÓØ. éÓÐÏÌØÚÏ×ÁÎÉÅ ÔÁËÏÇÏ ÆÁÊÌÁ ÎÅÐÒÉÅÍÌÅÍÏ\n" "c ÔÏÞËÉ ÚÒÅÎÉÑ ÂÅÚÏÐÁÓÎÏÓÔÉ." -#: src/user.c:635 +#: src/user.c:622 msgid " I can't run programs while logged on a non local directory " msgstr " îÅ×ÏÚÍÏÖÎÏ ÉÓÐÏÌÎÑÔØ ÐÒÏÇÒÁÍÍÙ, ÂÕÄÕÞÉ ÎÅ × ÌÏËÁÌØÎÏÍ ËÁÔÁÌÏÇÅ " -#: src/user.c:719 +#. FIXME: this message is not quite right +#: src/user.c:720 #, c-format msgid " Empty file %s " msgstr " ðÕÓÔÏÊ ÆÁÊÌ %s " #. Create listbox -#: src/user.c:728 +#: src/user.c:730 msgid " User menu " msgstr " íÅÎÀ ÐÏÌØÚÏ×ÁÔÅÌÑ " @@ -6139,195 +6144,177 @@ msgid "fish: Connected, home %s." msgstr "fish: óÏÅÄÉÎÅÎÉÅ ÕÓÐÅÛÎÏ, ÐÅÒÓÏÎÁÌØÎÙÊ ËÁÔÁÌÏÇ %s." -#: vfs/fish.c:331 +#: vfs/fish.c:330 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ %s..." #: vfs/fish.c:426 -msgid "fish: got listing" -msgstr "fish: ÐÏÌÕÞÉÌ ÓÐÉÓÏË" - -#: vfs/fish.c:430 msgid "fish: failed" msgstr "fish: ÏÛÉÂËÁ" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:450 +#: vfs/fish.c:446 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: ÚÁÐÉÓØ %s: ÐÏÓÙÌÁÅÔÓÑ ËÏÍÁÎÄÁ..." -#: vfs/fish.c:464 +#: vfs/fish.c:460 msgid "fish: Local read failed, sending zeros" msgstr "fish: óÂÏÊ ÌÏËÁÌØÎÏÇÏ ÞÔÅÎÉÑ, ÐÏÓÙÌÁÀÔÓÑ ÎÕÌÉ" -#: vfs/fish.c:476 +#: vfs/fish.c:472 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: ÚÁÐÉÓØ %s %d (%d)" -#: vfs/fish.c:516 +#: vfs/fish.c:512 msgid "Aborting transfer..." msgstr "ðÒÅÒÙ×ÁÎÉÅ ÐÅÒÅÄÁÞÉ..." -#: vfs/fish.c:525 +#: vfs/fish.c:521 msgid "Error reported after abort." msgstr "ïÔÍÅÞÅÎÁ ÏÛÉÂËÁ ÐÏÓÌÅ ÐÒÅÒÙ×ÁÎÉÑ." -#: vfs/fish.c:527 +#: vfs/fish.c:523 msgid "Aborted transfer would be successful." msgstr "ðÅÒÅÄÁÞÁ ÕÓÐÅÛÎÏ ÐÒÅÒ×ÁÎÁ." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:291 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: ïÔÓÏÅÄÉÎÅÎÉÅ ÏÔ %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:349 msgid " FTP: Password required for " msgstr " FTP: ôÒÅÂÕÅÔÓÑ ÐÁÒÏÌØ ÄÌÑ " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:382 msgid " Proxy: Password required for " msgstr " ðÒÏËÓÉ: ôÒÅÂÕÅÔÓÑ ÐÁÒÏÌØ ÄÌÑ " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:408 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÏËÓÉ" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:412 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÐÁÒÏÌØ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÏËÓÉ" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:416 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: á×ÔÏÒÉÚÁÃÉÑ ÎÁ ÐÒÏËÓÉ ÕÓÐÅÛÎÁ" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:420 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: ðÏÄËÌÀÞÅÎ Ë %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:437 msgid "ftpfs: sending login name" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:442 msgid "ftpfs: sending user password" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÐÁÒÏÌØ ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:447 msgid "ftpfs: logged in" msgstr "ftpfs: ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎ" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:462 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: ïÛÉÂËÁ ÒÅÇÉÓÔÒÁÃÉÉ ÐÏÌØÚÏ×ÁÔÅÌÑ %s " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:494 #, c-format msgid " Could not set source routing (%s)" msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÒÁÓÐÒÅÄÅÌÅÎÉÅ ÉÓÔÏÞÎÉËÁ (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:623 msgid "ftpfs: Invalid host name." msgstr "ftpfs: îÅ×ÅÒÎÏÅ ÉÍÑ ÓÉÓÔÅÍÙ." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:643 msgid "ftpfs: Invalid host address." msgstr "ftpfs: îÅ×ÅÒÎÙÊ ÁÄÒÅÓ ÓÉÓÔÅÍÙ." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:666 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:676 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:678 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: ÓÂÏÊ ÓÏÅÄÉÎÅÎÉÑ Ó ÓÅÒ×ÅÒÏÍ: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:720 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "ïÖÉÄÁÎÉÅ ÐÏ×ÔÏÒÁ ÐÏÐÙÔËÉ... %d (Control-C ÄÌÑ ÏÔÍÅÎÙ)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "" -"ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ ÄÌÑ ÒÁÓÐÒÅÄÅÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:893 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:967 msgid "ftpfs: aborting transfer." msgstr "ftpfs: ÐÒÅÒÙ×ÁÎÉÅ ÐÅÒÅÄÁÞÉ." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:969 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: ïÛÉÂËÁ ÐÒÅÒÙ×ÁÎÉÑ: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:974 msgid "ftpfs: abort failed" msgstr "ftpfs: ÓÂÏÊ ÐÒÅÒÙ×ÁÎÉÑ" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1063 vfs/ftpfs.c:1159 msgid "ftpfs: CWD failed." msgstr "ftpfs: ÓÂÏÊ ÐÏÉÓËÁ ÔÅËÕÝÅÇÏ ÒÁÂÏÞÅÇÏ ËÁÔÁÌÏÇÁ." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1073 vfs/ftpfs.c:1080 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓÐÏÚÎÁÔØ ÓÉÍ×ÏÌÉÞÅÓËÕÀ ÓÓÙÌËÕ" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1131 msgid "Resolving symlink..." msgstr "òÁÓÐÏÚÎÁÅÔÓÑ ÓÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ..." -#: vfs/ftpfs.c:1338 -#, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP %s...(îÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÉ ËÏÍÁÎÄÙ ls)" - -#: vfs/ftpfs.c:1340 +#: vfs/ftpfs.c:1149 #, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP %s..." +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP %s... %s%s" -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: óâïê" - -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: ÞÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP ÐÒÅÒ×ÁÎÏ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" +#: vfs/ftpfs.c:1150 +msgid "(strict rfc959)" +msgstr "" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: ÐÏÌÕÞÉÌ ÓÐÉÓÏË" +#: vfs/ftpfs.c:1151 +msgid "(chdir first)" +msgstr "" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1245 msgid "ftpfs: failed" msgstr "ftpfs: ÏÛÉÂËÁ" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1255 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ÏÛÉÂËÁ; ÎÅËÕÄÁ ÐÅÒÅÊÔÉ ÎÁ Á×ÁÒÉÊÎÙÊ ÒÅÖÉÍ" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1318 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ÚÁÐÉÓØ ÆÁÊÌÁ %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1786 vfs/ftpfs.c:1801 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6451,11 +6438,30 @@ "%s\n" "ÎÅ ÐÏÈÏÖ ÎÁ tar-ÁÒÈÉ×." -#: vfs/vfs.c:1792 +#: vfs/vfs.c:1824 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ÂÁÊÔ ÐÅÒÅÎÅÓÅÎÏ)" -#: vfs/vfs.c:1793 +#: vfs/vfs.c:1825 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ÂÁÊÔ ÐÅÒÅÎÅÓÅÎÏ" + +#~ msgid "fish: got listing" +#~ msgstr "fish: ÐÏÌÕÞÉÌ ÓÐÉÓÏË" + +#~ msgid "ftpfs: could not setup passive mode for source routing" +#~ msgstr "" +#~ "ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ ÄÌÑ ÒÁÓÐÒÅÄÅÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ" + +#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +#~ msgstr "ftpfs: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP %s...(îÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÉ ËÏÍÁÎÄÙ ls)" + +#~ msgid "ftpfs: FAIL" +#~ msgstr "ftpfs: óâïê" + +#~ msgid "ftpfs: reading FTP directory interrupt by user" +#~ msgstr "ftpfs: ÞÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP ÐÒÅÒ×ÁÎÏ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" + +#~ msgid "ftpfs: got listing" +#~ msgstr "ftpfs: ÐÏÌÕÞÉÌ ÓÐÉÓÏË" Binary files old/mc-4.5.42/po/sk.gmo and new/mc-4.5.43/po/sk.gmo differ diff -ruN old/mc-4.5.42/po/sk.po new/mc-4.5.43/po/sk.po --- old/mc-4.5.42/po/sk.po Mon Dec 6 18:50:17 1999 +++ new/mc-4.5.43/po/sk.po Sat Mar 18 08:43:50 2000 @@ -143,7 +143,7 @@ #: gnome/gcmd.c:316 gnome/gcustom-layout.c:45 src/screen.c:414 #: src/screen.c:415 msgid "Size" -msgstr "Veµkosti" +msgstr "Veµkos»" #: gnome/gcmd.c:322 msgid "Time Last Accessed" Binary files old/mc-4.5.42/po/tr.gmo and new/mc-4.5.43/po/tr.gmo differ diff -ruN old/mc-4.5.42/po/tr.po new/mc-4.5.43/po/tr.po --- old/mc-4.5.42/po/tr.po Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.43/po/tr.po Sat Mar 18 08:43:50 2000 @@ -0,0 +1,6246 @@ +# ------------------------------------------------------- +# Copyright (C) 2000 Free Software Foundation, Inc. +# Fatih Demir , 1999 - 2000. +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: mc 4.5.43\n" +"POT-Creation-Date: 1999-12-26 21:51+0100\n" +"PO-Revision-Date: 2000-02-11 22:12+0100\n" +"Last-Translator: Fatih Demir \n" +"Language-Team: Turkish Gnome Tranlation Team \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=iso-8859-9\n" +"Content-Transfer-Encoding: 8bit\n" + +#: edit/edit_key_translator.c:121 +msgid " Emacs key: " +msgstr " Emacs tuþu :" + +#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +msgid " Execute Macro " +msgstr " Macro'yu çalýþtýr" + +#. Input line for a single key press follows the ':' +#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:743 +msgid " Press macro hotkey: " +msgstr " Macro tuþuna bas :" + +#: edit/edit_key_translator.c:144 +msgid " Insert Literal " +msgstr " Harfi içer" + +#: edit/edit_key_translator.c:144 +msgid " Press any key: " +msgstr " Istediðin tuþa bas :" + +#: gnome/gaction.c:33 +#, c-format +msgid "" +"Unable to execute\n" +"\"%s\".\n" +"\n" +"Please check it to see if it points to a valid command." +msgstr "" +"\"%s\"'i çalýþtýramadým .\n" +"\n" +"\n" +"Lütfen verdiðin komutanýn geçerliliðin bir gözden geçir" + +#: gnome/gaction.c:40 +#, c-format +msgid "" +"\".\n" +"\n" +"To fix this, bring up the mime-properties editor in the GNOME Control " +"Center, and edit the default %s-action for \"%s\"." +msgstr "" +"\".\n" +"\n" +"Bun sorunu çözmek için ,Gnome Kontrol Merkezinde mime-editörünü\n" +"çalýþtýr ve %s-etkenini \"%s\" tipi için deðiþtir ." + +#: gnome/gaction.c:46 +#, c-format +msgid "" +"\".\n" +"\n" +"To fix this error, bring up this file's properties and change the default " +"%s-action." +msgstr "" +"\".\n" +"\n" +"Bu sorunu çümek için , dosya özelliklerini çaðýrýp \n" +"%s için önayarlý eylemini deðiþtir ." + +#: gnome/gaction.c:51 +#, c-format +msgid "" +"Unable to %s\n" +"\"%s\"\n" +"with the command:\n" +"\"%s\"%s" +msgstr "" +"%s yapamadým\n" +"\"%s\"\n" +"(bu komutayla) :\n" +"\"%s\"%s" + +#: gnome/gaction.c:134 gnome/gaction.c:150 +msgid "open" +msgstr "open" + +#: gnome/gaction.c:185 gnome/gaction.c:198 +msgid "edit" +msgstr "edit" + +#: gnome/gaction.c:331 +msgid "view" +msgstr "view" + +#: gnome/gcmd.c:49 +msgid " There is no other panel to compare contents to " +msgstr " Hiç karþýlaþtýralacak baþka panel yok ki" + +#: gnome/gcmd.c:100 +msgid "The Midnight Commander Team" +msgstr "Midnight Commander timi" + +#: gnome/gcmd.c:102 +msgid "bug reports: http://bugs.gnome.org, or use gnome-bug" +msgstr "hata raporlarý sitesi: http://bugs.gnome.org ; istersen gnome-bug'ý kullan" + +#: gnome/gcmd.c:114 +msgid "GNU Midnight Commander" +msgstr "GNU Midnight Commander" + +#: gnome/gcmd.c:117 +msgid "The GNOME edition of the Midnight Commander file manager." +msgstr "Midnight Commander'in Gnome teþkili ." + +#: gnome/gcmd.c:290 +msgid "Sort By" +msgstr "Sýrala" + +#. we define this up here so we can pass it in to our callback +#: gnome/gcmd.c:295 +msgid "Ignore case sensitivity." +msgstr "Yazýlýþý gözardý et" + +#: gnome/gcmd.c:298 +msgid "Sort files by " +msgstr "Dosyalarý sýrala" + +#: gnome/gcmd.c:303 gnome/gcustom-layout.c:41 src/chmod.c:150 src/screen.c:413 +msgid "Name" +msgstr "Ad :" + +#: gnome/gcmd.c:310 +msgid "File Type" +msgstr "Dosya tipi" + +#: gnome/gcmd.c:316 gnome/gcustom-layout.c:45 src/screen.c:414 +#: src/screen.c:415 +msgid "Size" +msgstr "Büyüklük" + +#: gnome/gcmd.c:322 +msgid "Time Last Accessed" +msgstr "Son eriþim vakti" + +#: gnome/gcmd.c:328 +msgid "Time Last Modified" +msgstr "Son deðiþim zamaný" + +#: gnome/gcmd.c:334 +msgid "Time Last Changed" +msgstr "Son deðiþim zamaný" + +#: gnome/gcmd.c:348 +msgid "Reverse the order." +msgstr "Sýralamayý ters çevir ." + +#: gnome/gcmd.c:395 +msgid "Enter name." +msgstr "Adý ver :" + +#: gnome/gcmd.c:401 +msgid "Enter label for command:" +msgstr "Komuta için yafta ver :" + +#: gnome/gcmd.c:506 +msgid "Find all core files" +msgstr "Yekin 'kötük(core)' dosyalarý bul" + +#: gnome/gcmd.c:509 src/panelize.c:350 +msgid "Find rejects after patching" +msgstr "'Patch' edildikten sonraki redleri ('reject') bul" + +#: gnome/gcmd.c:554 +msgid "Run Command" +msgstr "Komutayý çalýþtýr" + +#. Frame 1 +#: gnome/gcmd.c:559 +msgid "Preset Commands" +msgstr "Ayarlý komutalar" + +#. add add/remove buttons in center +#: gnome/gcmd.c:576 gnome/gcustom-layout.c:183 +msgid "Add" +msgstr "Ekle" + +#: gnome/gcmd.c:580 gnome/gcustom-layout.c:184 +msgid "Remove" +msgstr "Sil" + +#. Frame 2 +#: gnome/gcmd.c:588 +msgid "Run this Command" +msgstr "Bu komutayý çalýþtýr" + +#: gnome/gcmd.c:595 +msgid "Command: " +msgstr "Komuta :" + +#: gnome/gcmd.c:674 +msgid "Set Filter" +msgstr "Filtra kullan" + +#: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 +#: gnome/gscreen.c:2416 +msgid "Show all files" +msgstr "Yekin dosyalarý göster" + +#: gnome/gcmd.c:686 +msgid "." +msgstr "." + +#: gnome/gcmd.c:702 +msgid "" +"Enter a filter here for files in the panel view.\n" +"\n" +"For example:\n" +"*.png will show just png images" +msgstr "" +"Panel bakýþý için filtr(larý) ver .\n" +"\n" +"Mesela :\n" +"*.png sadece png-resimlerini gösterir" + +#: gnome/gcmd.c:704 +msgid "Enter a Regular Expression to filter files in the panel view." +msgstr "Panel bakýþýnýn filtrasýný bir tanýmlanmýþ tabir (regexp) olarak ver ." + +#: gnome/gcmd.c:764 +msgid " Open with..." +msgstr " Farklý aç ..." + +#: gnome/gcmd.c:765 +msgid "Enter extra arguments:" +msgstr "Eklenek argümanlarý ver :" + +#: gnome/gcmd.c:835 +msgid "Desktop entry properties" +msgstr "Masaüstü birimi özellikleri" + +#: gnome/gcmd.c:861 +msgid "Select File" +msgstr "Dosya seç" + +#: gnome/gcmd.c:869 +msgid "" +"Enter a filter here to select files in the panel view with.\n" +"\n" +"For example:\n" +"*.png will select all png images" +msgstr "" +"Panel bakýþýnda dosyalarý seçmek için filtr(larý) ver .\n" +"\n" +"Mesela :\n" +"*.png sadece png-resimlerini gösterir" + +#: gnome/gcmd.c:871 +msgid "Enter a regular expression here to select files in the panel view with." +msgstr "Panel bakýþýnda dosya seçmek için bir tanýmlanmýþ tabir (regexp) olarak ver ." + +#: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 +msgid " Malformed regular expression " +msgstr " Yanlýþ bir tanýmlanm_iþ tabir" + +#: gnome/gcmd.c:962 +msgid "Creating a desktop link" +msgstr "Bir masaüsüt baðýný yapýyorum" + +#: gnome/gcmd.c:963 +msgid "Enter the URL:" +msgstr "Adresi ver :" + +#: gnome/gcustom-layout.c:34 +msgid "Access Time" +msgstr "Eriþim vakti" + +#: gnome/gcustom-layout.c:35 +msgid "Creation Time" +msgstr "Yaratýþ vakti" + +#. Group +#: gnome/gcustom-layout.c:36 gnome/gnome-file-property-dialog.c:776 +#: gnome/gnome-file-property-dialog.c:945 gnome/gprop.c:280 gnome/gprop.c:405 +#: src/screen.c:427 +msgid "Group" +msgstr "Grup" + +#: gnome/gcustom-layout.c:37 +msgid "Group ID" +msgstr "Grup numarasý" + +#: gnome/gcustom-layout.c:38 +msgid "Inode Number" +msgstr "Inode numarasý" + +#: gnome/gcustom-layout.c:39 src/achown.c:378 +msgid "Mode" +msgstr "Haklar" + +#: gnome/gcustom-layout.c:40 +msgid "Modification Time" +msgstr "Deðiþim vakti" + +#: gnome/gcustom-layout.c:42 +msgid "Number of Hard Links" +msgstr "Sert baðlarýn sayýsý" + +#. Owner +#: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:930 +#: gnome/gprop.c:390 src/screen.c:426 +msgid "Owner" +msgstr "Iye" + +#: gnome/gcustom-layout.c:44 src/screen.c:420 +msgid "Permission" +msgstr "Eriþim haklarý" + +#: gnome/gcustom-layout.c:46 +msgid "Size (short)" +msgstr "Büyüklük (kýsa)" + +#: gnome/gcustom-layout.c:47 +msgid "Type" +msgstr "Tip" + +#: gnome/gcustom-layout.c:48 +msgid "User ID" +msgstr "Kullanýcý numarasý" + +#: gnome/gcustom-layout.c:142 +msgid "Possible Columns" +msgstr "Mümküm sütunlar" + +#: gnome/gcustom-layout.c:162 +msgid "Displayed Columns" +msgstr "Gösterilen sütunlar" + +#: gnome/gcustom-layout.c:304 +msgid "Custom View" +msgstr "Özelleþmiþ bakýþ" + +#: gnome/gdesktop.c:521 gnome/gmount.c:389 +msgid "Warning" +msgstr "Ikaz" + +#: gnome/gdesktop.c:522 +#, c-format +msgid "Could not open %s; will not have desktop icons" +msgstr "%s'yi açamadým ; masaüstü ikonalarýn olmayacak " + +#: gnome/gdesktop.c:1186 +msgid "While running the mount/umount command" +msgstr "Mount/umount komutasýný çalýþtýrýrken" + +#: gnome/gdesktop.c:1255 +msgid "While running the eject command" +msgstr "Çýkar komutasýný çalýþtýrýken" + +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 +msgid "Error" +msgstr "Hata" + +#: gnome/gdesktop.c:2598 +msgid "" +"Unable to locate the file:\n" +"background-properties-capplet\n" +"in your path.\n" +"\n" +"We are unable to set the background." +msgstr "" +"Senin dizgelerinde þu\n" +"background-properties-capplet\n" +"uygulaðýný bulamadým .\n" +"\n" +"Ardalaný belirleyemeyeceðiz ." + +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 +msgid "_Terminal" +msgstr "Komu_ta" + +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 +msgid "Launch a new terminal in the current directory" +msgstr "Geçerli dizinde bir komuta aç" + +#. If this ever changes, make sure you update create_new_menu accordingly. +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 +msgid "_Directory..." +msgstr "_Dizin ..." + +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 +msgid "Creates a new directory" +msgstr "Yeni bir dizin yaratýr" + +#: gnome/gdesktop.c:2624 +msgid "URL L_ink..." +msgstr "Adres badý ..." + +#: gnome/gdesktop.c:2624 +msgid "Creates a new URL link" +msgstr "Yeni bir adres badý yaratýr" + +#: gnome/gdesktop.c:2625 +msgid "_Launcher..." +msgstr "Baþlatýcý ..." + +#: gnome/gdesktop.c:2625 +msgid "Creates a new launcher" +msgstr "Yeni bir baþlatýcý yaratýr" + +#: gnome/gdesktop.c:2631 +msgid "By _Name" +msgstr "Adlarýndan" + +#: gnome/gdesktop.c:2632 +msgid "By File _Type" +msgstr "Tiplerinden" + +#: gnome/gdesktop.c:2633 +msgid "By _Size" +msgstr "Büyüklüklerinden" + +#: gnome/gdesktop.c:2634 +msgid "By Time Last _Accessed" +msgstr "Son eriþim vaktinden" + +#: gnome/gdesktop.c:2635 +msgid "By Time Last _Modified" +msgstr "Son deðiþim vaktinden" + +#: gnome/gdesktop.c:2636 +msgid "By Time Last _Changed" +msgstr "Son deðiþim vaktinden" + +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 +msgid "_Arrange Icons" +msgstr "Ikonalarý diz" + +#: gnome/gdesktop.c:2645 +msgid "Create _New Window" +msgstr "Ye_ni pencere yarat" + +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 +msgid "Rescan _Desktop Directory" +msgstr "Masaüstü _dizini yeniden tara" + +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 +msgid "Rescan De_vices" +msgstr "Ahizeleri yeniden tara" + +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 +msgid "Recreate Default _Icons" +msgstr "Önayarlý ikonalarý yeniden yarat" + +#: gnome/gdesktop.c:2651 +msgid "Configure _Background Image" +msgstr "Ardalan resmini ayarla" + +#. Icon position +#: gnome/gdesktop-prefs.c:242 +msgid "Icon position" +msgstr "Ikona yeri" + +#. Snap and placement +#: gnome/gdesktop-prefs.c:258 +msgid "Automatic icon placement" +msgstr "Otomatik ikona yerleþtirmesi" + +#: gnome/gdesktop-prefs.c:262 +msgid "Snap icons to grid" +msgstr "Ikonalarý þebekede yakala" + +#: gnome/gdesktop-prefs.c:277 +msgid "Use shaped icons" +msgstr "Gölgeli ikonalarý kullan" + +#: gnome/gdesktop-prefs.c:281 +msgid "Use shaped text" +msgstr "Gölgeli metinleri kullan" + +#: gnome/gdesktop-prefs.c:335 +msgid "Desktop" +msgstr "Masaüstü" + +#. Create the link to the user's home directory so that he will have an icon +#: gnome/gdesktop-init.c:141 +msgid "Home directory" +msgstr "Ev dizini" + +#: gnome/gdialogs.c:60 +msgid "To: " +msgstr "Gönderilen :" + +#: gnome/gdialogs.c:61 +msgid "Copying from: " +msgstr "Kopyalanma yeri :" + +#: gnome/gdialogs.c:62 +msgid "Deleting file: " +msgstr "Dosyayý siliyorum :" + +#: gnome/gdialogs.c:371 +msgid "Files Exist" +msgstr "Dosya zaten var" + +#: gnome/gdialogs.c:386 +msgid "" +"Some of the files you are trying to copy already exist in the destination " +"folder. Please select the action to be performed." +msgstr "" +"Kopyalam istediðin dosyalarýnýn bazýlarý hedef mekanýnda zaten var ." +"Lütfen istenilen iþlemi seç ." + +#: gnome/gdialogs.c:399 +msgid "Prompt me before overwriting any file." +msgstr "Her bir dosya için beni sorgula ." + +#: gnome/gdialogs.c:406 +msgid "Don't overwrite any files." +msgstr "Hiç bir dosyanýn üstüne yazma ." + +#: gnome/gdialogs.c:422 +msgid "Overwrite:" +msgstr "Üstüne yaz :" + +#: gnome/gdialogs.c:429 +msgid "Older files." +msgstr "Eskice olan dosyalar ." + +#: gnome/gdialogs.c:435 +msgid "Files only if size differs." +msgstr "Sadece büyüklükleri deðiþik ise ." + +#: gnome/gdialogs.c:441 +msgid "All files." +msgstr "Yekin dosyalarý ." + +#: gnome/gdialogs.c:481 +msgid "File Exists" +msgstr "Dosya zaten var" + +#: gnome/gdialogs.c:487 +#, c-format +msgid "The target file already exists: %s" +msgstr "%s hedef dosyasý zaten var " + +#: gnome/gdialogs.c:494 +msgid "Replace it?" +msgstr "Yerine yazamayým mý ?" + +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1097 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2399 src/screen.c:2429 src/tree.c:1014 +msgid "Copy" +msgstr "Kopyala" + +#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1098 gtkedit/gtkedit.c:1252 +msgid "Move" +msgstr "Taþý" + +#: gnome/gdialogs.c:583 +msgid "Destination" +msgstr "Hedef" + +#: gnome/gdialogs.c:597 +msgid "Find Destination Folder" +msgstr "Hedef dizini ara" + +#: gnome/gdialogs.c:611 +msgid "Copy as a background process" +msgstr "Ardalan iþlemi olarak kopyala" + +#: gnome/gdialogs.c:629 +msgid "Advanced Options" +msgstr "Geliþmiþ ayarlar" + +#: gnome/gdialogs.c:633 +msgid "Preserve symlinks" +msgstr "Baðlarý koru" + +#: gnome/gdialogs.c:643 +msgid "Follow links." +msgstr "Baðlarý takip et ." + +#: gnome/gdialogs.c:649 +msgid "" +"Selecting this will copy the files that symlinks point to instead of just " +"copying the link." +msgstr "" +"Bunu seçersen , sadece baðlarýn yerine baðýn hedeflediði dosya da" +"kopyalanýyor ." + +#: gnome/gdialogs.c:654 +msgid "Preserve file attributes." +msgstr "Dosya özelliklerini koru ." + +#: gnome/gdialogs.c:660 +msgid "Preserves the permissions and the UID/GID if possible" +msgstr "Mümkün ise , eriþim haklarýný ve UID/GID'i koru" + +#: gnome/gdialogs.c:666 +msgid "Recursively copy subdirectories." +msgstr "Altdizinleri de kopyala ." + +#: gnome/gdialogs.c:673 +msgid "If set, this will copy the directories recursively" +msgstr "Bunla dizinlerin altdizinleri de kopyalanýyor" + +#: gnome/gdialogs.c:780 +#, c-format +msgid "" +"%s\n" +"\n" +"Directory not empty. Delete it recursively?" +msgstr "" +"%s\n" +"\n" +"Bu dizin boþ deðil . Altdizinleri ile birlikte sileyim mi?" + +#: gnome/gdialogs.c:790 src/file.c:2244 +msgid " Delete: " +msgstr " Sil : " + +#: gnome/gdialogs.c:794 +msgid "Do the same for the rest" +msgstr "Öbürküleri için de aynýsýný yap" + +#: gnome/gdialogs.c:877 +msgid "Move Progress" +msgstr "Taþýma ilerlemesi" + +#: gnome/gdialogs.c:880 +msgid "Copy Progress" +msgstr "Kopyalama ilerlemesi" + +#: gnome/gdialogs.c:883 +msgid "Delete Progress" +msgstr "Silme ilerlemesi" + +#: gnome/gdialogs.c:939 +msgid "File " +msgstr "Dosya " + +#: gnome/gdialogs.c:943 +msgid "is " +msgstr "" + +#: gnome/gdialogs.c:946 +msgid "done." +msgstr " bitti ." + +#. Translators should take care as "Password" or its translations +#. are used to identify password boxes and hide characters with "*" +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1840 +msgid "Password:" +msgstr "Parola :" + +#: gnome/gdialogs.c:1007 +msgid "Password" +msgstr "Parola" + +#. Create the dialog +#: gnome/gdialogs.c:1039 +msgid "Symbolic Link" +msgstr "\"Yumþak\" bað" + +#: gnome/gdialogs.c:1055 src/boxes.c:803 +msgid "Existing filename (filename symlink will point to):" +msgstr "Varolan dosya (yumþak baðýn hedefi ) :" + +#: gnome/gdialogs.c:1069 src/boxes.c:801 +msgid "Symbolic link filename:" +msgstr "Yumþak baðýn adý :" + +#: gnome/gdnd.c:52 +msgid "_Move here" +msgstr "Buraya taþý" + +#: gnome/gdnd.c:53 +msgid "_Copy here" +msgstr "Buraya kopyala" + +#: gnome/gdnd.c:54 +msgid "_Link here" +msgstr "Buraya bað baðla" + +#: gnome/gdnd.c:56 +msgid "Cancel drag" +msgstr "Taþýmayý iptal et" + +#. FIXME: this error message sucks +#: gnome/gdnd.c:192 +#, c-format +msgid "" +"Could not stat %s\n" +"%s" +msgstr "" +"%s'yi stat edemedim\n" +"%s" + +#: gnome/gicon.c:218 +msgid "Default set of icons not found, please check your installation" +msgstr "Önayarlý ikonalar bulunamadý , lütfen yüklenimi gözden geçir" + +#: gnome/glayout.c:41 +msgid "_Icon View" +msgstr "_Ikona bakýþý" + +#: gnome/glayout.c:42 gnome/glayout.c:58 +msgid "Switch view to an icon display" +msgstr "Bakýþý ikona gösteriþine deðiþtir" + +#: gnome/glayout.c:44 +msgid "_Brief View" +msgstr "_Brifing bakýþý" + +#: gnome/glayout.c:45 gnome/glayout.c:61 +msgid "Switch view to show just file name and type" +msgstr "Bakýþý öyle deðiþtir ki, sýrf dosya adý ve tipi gözüksün" + +#: gnome/glayout.c:47 +msgid "_Detailed View" +msgstr "Geliþmýþ bakýþ" + +#: gnome/glayout.c:48 gnome/glayout.c:64 +msgid "Switch view to show detailed file statistics" +msgstr "Bakýþý öyle deðiþtir ki, geliþmiþ dosya özellikleri görünsün" + +#: gnome/glayout.c:50 +msgid "_Custom View" +msgstr "Özelleþtirilmiþ bakýþ" + +#: gnome/glayout.c:51 gnome/glayout.c:67 +msgid "Switch view to show user-defined statistics" +msgstr "Bakýþý öyle deðiþtir ki, kullanýcýnýn özgü bilgilerini göster" + +#: gnome/glayout.c:57 +msgid "Icons" +msgstr "Ikonalar" + +#: gnome/glayout.c:60 +msgid "Brief" +msgstr "Kýsa" + +#: gnome/glayout.c:63 +msgid "Detailed" +msgstr "Geliþmiþ" + +#: gnome/glayout.c:66 +msgid "Custom" +msgstr "Özelleþmiþ" + +#: gnome/glayout.c:302 +msgid "Enter command to run" +msgstr "Çalýþtýrýcak komutayý ver" + +#: gnome/glayout.c:315 +msgid "" +"Notice that if you choose to terminate the file manager, you will\n" +"also terminate the GNOME desktop handler.\n" +"\n" +"Are you sure you want to exit?" +msgstr "" +"Dosya yöneticisini bitirirsen , Gnome masaüstü yöneticisini de ayný\n" +"anda bitirmiþ olacaðýn .\n" +"\n" +"Çýkmaktan halen emin misin ?" + +#: gnome/glayout.c:327 +msgid "" +"The file manager and the desktop handler are now terminating\n" +"\n" +"If you want to start up again the desktop handler or the file manager\n" +"you can launch it from the Panel, or you can run the UNIX command `gmc'\n" +"\n" +"Press OK to terminate the application, or cancel to continue using it." +msgstr "" +"Dosya ve masaüstü yöneticisi þu an bitiriliyor\n" +"\n" +"Dosya veya masaüstü yöneticisini baþlatmak istiyorsan , bunu kolayca\n" +"panelden çaðýrabilirsin veya UNIX `gmx` komutasýný çalýþtýrýrsýn\n" +"\n" +"Vallahi çýkmak için \"Oldu\" de veya iptal edip yöneticiyi kullan." + +#: gnome/glayout.c:367 +msgid "_File..." +msgstr "Dosya ..." + +#: gnome/glayout.c:368 +msgid "Creates a new file in this directory" +msgstr "Bu dizinde yeni bir dosya yarattýr" + +#. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, +#: gnome/glayout.c:389 gnome/gscreen.c:2085 +msgid "_Copy..." +msgstr "Kopyala" + +#: gnome/glayout.c:389 +msgid "Copy files" +msgstr "Dosyalarý kopyala" + +#: gnome/glayout.c:390 gnome/gscreen.c:2086 +msgid "_Delete..." +msgstr "Sil ..." + +#: gnome/glayout.c:390 +msgid "Delete files" +msgstr "Dosyalarý sil" + +#: gnome/glayout.c:391 gnome/gscreen.c:2087 +msgid "_Move..." +msgstr "Taþý ..." + +#: gnome/glayout.c:391 +msgid "Rename or move files" +msgstr "Yeniden adlandýn yada taþý" + +#: gnome/glayout.c:393 +msgid "Show directory sizes" +msgstr "Dizin büyüklüklerini göster" + +#: gnome/glayout.c:393 +msgid "Shows the disk space used by each directory" +msgstr "Her bir dizinin disk'te kullandýðý alaný göster" + +#: gnome/glayout.c:395 +msgid "Close window" +msgstr "Pencereyi kapat" + +#: gnome/glayout.c:395 +msgid "Closes this window" +msgstr "Bu pencereyi kapat" + +#: gnome/glayout.c:402 +msgid "Select _All" +msgstr "El-_alem hepsini seç" + +#: gnome/glayout.c:402 +msgid "Select all files in the current Panel" +msgstr "Geçerli paneldeki yekin dosyalarý seç" + +#: gnome/glayout.c:404 +msgid "_Select Files..." +msgstr "Dosyalarý _seç ..." + +#: gnome/glayout.c:404 +msgid "Select a group of files" +msgstr "Bir dosya grubunu seç" + +#: gnome/glayout.c:405 +msgid "_Invert Selection" +msgstr "Seçimi terse çev_ir" + +#: gnome/glayout.c:405 +msgid "Reverses the list of tagged files" +msgstr "Iþaretlenmiþ dosyalrýn listesini terse çevirir" + +#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +msgid "Search" +msgstr "Ara" + +#: gnome/glayout.c:408 +msgid "Search for a file in the current Panel" +msgstr "Þu anki panelde bir dosya ara" + +#: gnome/glayout.c:411 gnome/gscreen.c:1415 +msgid "_Rescan Directory" +msgstr "Dizini yeniden ta_ra" + +#: gnome/glayout.c:411 +msgid "Rescan the directory contents" +msgstr "dizin içeriðini yeniden tara" + +#: gnome/glayout.c:421 +msgid "_Sort By..." +msgstr "Sýrala ..." + +#: gnome/glayout.c:421 +msgid "Confirmation settings" +msgstr "Sorgulama ayarlarý" + +#: gnome/glayout.c:422 +msgid "_Filter View..." +msgstr "_Filtra bakýþý" + +#: gnome/glayout.c:422 +msgid "Global option settings" +msgstr "Genel ayarlar" + +#: gnome/glayout.c:429 +msgid "_Find File..." +msgstr "Bir dosya bul ..." + +#: gnome/glayout.c:429 +msgid "Locate files on disk" +msgstr "Disk'te dosyalarýn yerini tespit et" + +#. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, +#: gnome/glayout.c:432 +msgid "_Edit mime types..." +msgstr "Mim_e tiplerini deðiþtir ..." + +#: gnome/glayout.c:432 +msgid "Edits the MIME type bindings" +msgstr "MIME tipleri baðlarýn_i deðiþtir" + +#: gnome/glayout.c:434 +msgid "_Run Command..." +msgstr "Komutayý çalýþtý_r" + +#: gnome/glayout.c:434 +msgid "Runs a command" +msgstr "Bir komuta çalýþtýrýr" + +#: gnome/glayout.c:436 +msgid "_Run Command in panel..." +msgstr "Panelde bir komutayý çalýþtýr ..." + +#: gnome/glayout.c:436 +msgid "Run a command and put the results in a panel" +msgstr "Bir komutayý çalýþtýr ve geri-verimi panelde göster" + +#: gnome/glayout.c:446 +msgid "_Background jobs..." +msgstr "Ardalan iþlemleri ..." + +#: gnome/glayout.c:446 +msgid "List of background operations" +msgstr "Ardalan iþlemlerinin listeleri" + +#: gnome/glayout.c:449 +msgid "Exit" +msgstr "Çýk" + +#: gnome/glayout.c:449 +msgid "Terminates the file manager and the desktop" +msgstr "Dosya ve masaüstü yöneticisini bitirir" + +#: gnome/glayout.c:473 gnome/glayout.c:484 +msgid "_Settings" +msgstr "Ayarlar" + +#: gnome/glayout.c:474 gnome/glayout.c:485 +msgid "_Layout" +msgstr "Dizi_lim" + +#: gnome/glayout.c:475 gnome/glayout.c:486 +msgid "_Commands" +msgstr "Komutalar" + +#: gnome/glayout.c:476 +msgid "_Desktop" +msgstr "Masaüstü" + +#: gnome/glayout.c:477 gnome/glayout.c:487 +msgid "_Help" +msgstr "Yardým" + +#: gnome/glayout.c:627 +msgid "File/New/Directory..." +msgstr "Dosya/Yeni/Dizin" + +#: gnome/gmain.c:554 +msgid "" +"You are running the GNOME File Manager as root.\n" +"\n" +"As root, you can damage your system if you are not careful, and the GNOME " +"File Manager will not stop you from doing it." +msgstr "" +"Gnome Dosya Yöneticisini 'root' olarak çalýþtýrýyorsun .\n" +"\n" +"'Root' olarak ( dikkatsiz veya kötü niyetli olduðun vakit ) yekin sistemi " +"çökürtebilirsin ve Gnome Dosya Yöneticisi seni bundan korumayacaktýr ." + +#: gnome/gmount.c:225 +msgid "Could not open the /etc/fstab file" +msgstr "/etc/fstab dosyasýný açamadým" + +#: gnome/gmount.c:390 +#, c-format +msgid "Could not symlink %s to %s; will not have such a desktop device icon." +msgstr "%s'yi %s'ye badlayamadým ; öyle bir ahize ikonan masaüstünde olmayacaktýr." + +#: gnome/gmount.c:446 +#, c-format +msgid "CD-ROM %d" +msgstr "%d Cd-sürücüsü" + +#: gnome/gmount.c:458 +#, c-format +msgid "Floppy %d" +msgstr "%d Floppy-sürücüsü" + +#: gnome/gmount.c:464 +#, c-format +msgid "Disk %d" +msgstr "%d Sabit disk" + +#: gnome/gmount.c:469 +#, c-format +msgid "NFS dir %s" +msgstr "%s NFS dizini" + +#: gnome/gmount.c:473 +#, c-format +msgid "Device %d" +msgstr "%d Ahizesi" + +#. we set the file part +#: gnome/gnome-file-property-dialog.c:170 +msgid "Full Name: " +msgstr "Tam adý :" + +#: gnome/gnome-file-property-dialog.c:178 +msgid "File Name" +msgstr "Dosya adý" + +#: gnome/gnome-file-property-dialog.c:201 +msgid "File Type: " +msgstr "Dosya tipi : " + +#: gnome/gnome-file-property-dialog.c:207 +msgid "File Type: Symbolic Link" +msgstr "Dosya tipi : Yumþak bað" + +#: gnome/gnome-file-property-dialog.c:212 +msgid "Target Name: INVALID LINK" +msgstr "Hedef adý : GEÇERSiZ BAÐ" + +#: gnome/gnome-file-property-dialog.c:215 +msgid "Target Name: " +msgstr "Hedef adý : " + +#: gnome/gnome-file-property-dialog.c:220 +msgid "File Type: Directory" +msgstr "Dosya tipi : Dizin" + +#: gnome/gnome-file-property-dialog.c:222 +msgid "File Type: Character Device" +msgstr "Dosya tipi : Harf ahizesi" + +#: gnome/gnome-file-property-dialog.c:224 +msgid "File Type: Block Device" +msgstr "Dosya tipi : Blok ahizesi" + +#: gnome/gnome-file-property-dialog.c:226 +msgid "File Type: Socket" +msgstr "Dosya tipi : Socket" + +#: gnome/gnome-file-property-dialog.c:228 +msgid "File Type: FIFO" +msgstr "Dosya tipi : \"Arabellekcik\"" + +#: gnome/gnome-file-property-dialog.c:238 +#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:248 +msgid "File Size: " +msgstr "Dosya büyüklüðü : " + +#: gnome/gnome-file-property-dialog.c:238 +msgid " bytes" +msgstr " byte" + +#: gnome/gnome-file-property-dialog.c:242 +msgid " KBytes (" +msgstr " KByte (" + +#: gnome/gnome-file-property-dialog.c:243 +#: gnome/gnome-file-property-dialog.c:249 +msgid " bytes)" +msgstr " byte)" + +#: gnome/gnome-file-property-dialog.c:248 +msgid " MBytes (" +msgstr " MByte (" + +#: gnome/gnome-file-property-dialog.c:256 +msgid "File Size: N/A" +msgstr "dosya büyüklüðü : Belirlenemedi" + +#: gnome/gnome-file-property-dialog.c:267 +msgid "File Created on: " +msgstr "Dosyanýn yaratýlýþ tarihi : " + +#: gnome/gnome-file-property-dialog.c:276 +msgid "Last Modified on: " +msgstr "Son deðiþim tarihi : " + +#: gnome/gnome-file-property-dialog.c:285 +msgid "Last Accessed on: " +msgstr "Son eriþim tarihi : " + +#: gnome/gnome-file-property-dialog.c:303 +msgid "URL:" +msgstr "Adres :" + +#: gnome/gnome-file-property-dialog.c:310 +msgid "Caption:" +msgstr "Üstyazý :" + +#: gnome/gnome-file-property-dialog.c:387 +#: gnome/gnome-file-property-dialog.c:489 +msgid "Drop Action" +msgstr "Býrakýlýþ eylemi" + +#: gnome/gnome-file-property-dialog.c:388 +msgid "Use default Drop Action options" +msgstr "Önayarlý býrakma eylemini kullan" + +#: gnome/gnome-file-property-dialog.c:403 +#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 +#: src/screen.c:2397 src/screen.c:2427 +msgid "View" +msgstr "Göster" + +#: gnome/gnome-file-property-dialog.c:404 +msgid "Use default View options" +msgstr "Önayarlý gösterme ayarlarýný kullan" + +#: gnome/gnome-file-property-dialog.c:439 +msgid "Select an Icon" +msgstr "Bir ikona seç" + +#. we do open first +#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 +msgid "Open" +msgstr "Aç" + +#: gnome/gnome-file-property-dialog.c:479 +msgid "Use default Open action" +msgstr "Önayarlý açma eylemi" + +#: gnome/gnome-file-property-dialog.c:502 +msgid "Use default Drop action" +msgstr "Önayarlý býrakma eylemi" + +#: gnome/gnome-file-property-dialog.c:504 +msgid "Use default View action" +msgstr "Önayarlý gösterme eylemi" + +#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +msgid "Edit" +msgstr "Deðiþtir" + +#: gnome/gnome-file-property-dialog.c:523 +msgid "Use default Edit action" +msgstr "Önayarlý deðiþtirme eylemini kullan" + +#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521 +msgid "Icon" +msgstr "Ikona" + +#. We must be a file or a link to a file. +#: gnome/gnome-file-property-dialog.c:611 +msgid "File Actions" +msgstr "Dosya eylemleri" + +#: gnome/gnome-file-property-dialog.c:616 +msgid "Open action" +msgstr "Açma eylemi" + +#: gnome/gnome-file-property-dialog.c:617 +msgid "Needs terminal to run" +msgstr "Çalýþmasý için komuta lazým" + +#: gnome/gnome-file-property-dialog.c:742 +msgid "File Permissions" +msgstr "Eriþim haklarý" + +#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259 +msgid "Current mode: " +msgstr "Þu anki haklar : " + +#. Headings +#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272 +msgid "Read" +msgstr "Okuma" + +#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273 +msgid "Write" +msgstr "Yazma" + +#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274 +msgid "Exec" +msgstr "Çalýþtýrma" + +#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275 +msgid "Special" +msgstr "Özel" + +#. Permissions +#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279 +msgid "User" +msgstr "Kullançiý" + +#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281 +msgid "Other" +msgstr "Baþka" + +#. Special +#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285 +msgid "Set UID" +msgstr "UID'i belirle" + +#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286 +msgid "Set GID" +msgstr "GID'i belirle" + +#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287 +msgid "Sticky" +msgstr "Yapýþýk" + +#: gnome/gnome-file-property-dialog.c:905 +#, c-format +msgid " (%d)" +msgstr " (%d)" + +#: gnome/gnome-file-property-dialog.c:919 +msgid "File ownership" +msgstr "Dosya iyeliði" + +#: gnome/gnome-file-property-dialog.c:1079 +msgid "URL" +msgstr "Adres" + +#: gnome/gnome-file-property-dialog.c:1082 +msgid "Statistics" +msgstr "Istatistikler" + +#: gnome/gnome-file-property-dialog.c:1088 +msgid "Options" +msgstr "Ayarlar" + +#: gnome/gnome-file-property-dialog.c:1091 +msgid "Permissions" +msgstr "Eriþim haklarý" + +#: gnome/gnome-file-property-dialog.c:1094 +msgid " Properties" +msgstr " Özellikler" + +#: gnome/gnome-file-property-dialog.c:1146 +#: gnome/gnome-file-property-dialog.c:1157 +msgid "You entered an invalid username" +msgstr "Geçersiz bir kullanýcý verdin" + +#: gnome/gnome-file-property-dialog.c:1202 +msgid "You must rename your file to something" +msgstr "Yeniden adlandýrmak için yeni bir dosya dý vermek zorundasýn" + +#: gnome/gnome-file-property-dialog.c:1208 +msgid "You cannot rename a file to something containing a '/' character" +msgstr "Bir dosya dý hiç ´/´ içermez" + +#: gnome/gnome-open-dialog.c:385 +#, c-format +msgid "Select an application to open \"%s\" with." +msgstr "\"%s\"'yi açacak uygulamayý belirle ." + +#: gnome/gnome-open-dialog.c:395 +msgid "Select a file to run with" +msgstr "Çalýþtýrýlcak dosyayý seç" + +#. the file tree +#: gnome/gnome-open-dialog.c:406 +msgid "Applications" +msgstr "Uygulamalar" + +#: gnome/gnome-open-dialog.c:422 +msgid "Program to run" +msgstr "Çalýþtýrýlacak uygulama" + +#: gnome/gpopup2.c:197 +msgid "Mount device" +msgstr "Ahizeyi tak" + +#: gnome/gpopup2.c:198 +msgid "Unmount device" +msgstr "Ahizeyi \"sök\"" + +#: gnome/gpopup2.c:199 +msgid "Eject device" +msgstr "Ahizeyi çýkar" + +#: gnome/gpopup2.c:202 +msgid "Open with..." +msgstr "Farklý aç ..." + +#: gnome/gpopup2.c:204 +msgid "View Unfiltered" +msgstr "filtrasýz bakýþ" + +#: gnome/gpopup2.c:207 +msgid "Copy..." +msgstr "Kopyala ..." + +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 +#: src/screen.c:2432 +msgid "Delete" +msgstr "Sil" + +#: gnome/gpopup2.c:209 +msgid "Move..." +msgstr "Taþý ..." + +#: gnome/gpopup2.c:210 +msgid "Hard Link..." +msgstr "Bað ..." + +#: gnome/gpopup2.c:211 +msgid "Symlink..." +msgstr "Yumþak bað ..." + +#: gnome/gpopup2.c:212 +msgid "Edit Symlink..." +msgstr "Yumþak baðý deðiþtir ..." + +#: gnome/gpopup2.c:214 +msgid "Properties..." +msgstr "Özellikler ..." + +#: gnome/gprefs.c:92 +msgid "Show backup files" +msgstr "Yedek dosyalarý göster" + +#: gnome/gprefs.c:96 +msgid "Show hidden files" +msgstr "Gizli dosyalarý göster" + +#: gnome/gprefs.c:100 +msgid "Mix files and directories" +msgstr "Dizinleri ve dosyalarý göster" + +#: gnome/gprefs.c:104 +msgid "Use shell patterns instead of regular expressions" +msgstr "Tanýmlanmýþ tabirler yerine komuta teþkilini kullan" + +#: gnome/gprefs.c:113 +msgid "Confirm when deleting file" +msgstr "Silerken sorgula" + +#: gnome/gprefs.c:117 +msgid "Confirm when overwriting files" +msgstr "Üstüne yazarken sorgula" + +#: gnome/gprefs.c:121 +msgid "Confirm when executing files" +msgstr "Çalýþýrken sorgula" + +#: gnome/gprefs.c:125 +msgid "Show progress while operations are being performed" +msgstr "Eylemlerin ilerlemelerini göster" + +#: gnome/gprefs.c:134 +msgid "VFS Timeout:" +msgstr "VFS zaman arasý :" + +#: gnome/gprefs.c:135 gnome/gprefs.c:160 +msgid "Seconds" +msgstr "Saniye" + +#: gnome/gprefs.c:138 +msgid "Anonymous FTP password:" +msgstr "Adsýz FTP parolasý :" + +#: gnome/gprefs.c:142 +msgid "Always use FTP proxy" +msgstr "Her zaman FTP ara belleðini kullan" + +#: gnome/gprefs.c:151 +msgid "Fast directory reload" +msgstr "hýzlý dizin yüklemesini kullan" + +#: gnome/gprefs.c:155 +msgid "Compute totals before copying files" +msgstr "Hepsini kopyalamadan önce toplamý hesapla" + +#: gnome/gprefs.c:159 +msgid "FTP directory cache timeout :" +msgstr "FTP dizin ara belleði için zaman arasý :" + +#: gnome/gprefs.c:163 +msgid "Allow customization of icons in icon view" +msgstr "Ikona bakýþýnda ikonalarýn özelleþmesine izin ver" + +#: gnome/gprefs.c:172 +msgid "File display" +msgstr "Dosya gösterimi" + +#: gnome/gprefs.c:176 +msgid "Confirmation" +msgstr "Sorgulama" + +#: gnome/gprefs.c:180 +msgid "VFS" +msgstr "VFS" + +#: gnome/gprefs.c:184 +msgid "Caching" +msgstr "Belleme" + +#: gnome/gprefs.c:474 +msgid "Preferences" +msgstr "Ayarlar" + +#: gnome/gprop.c:58 gnome/gprop.c:75 +msgid "Filename" +msgstr "Dosya adý" + +#: gnome/gprop.c:67 +msgid "Full name: " +msgstr "Tam adý : " + +#: gnome/gprop.c:109 src/panelize.c:205 +msgid "Command" +msgstr "Komuta" + +#: gnome/gprop.c:119 +msgid "Command:" +msgstr "Komuta :" + +#: gnome/gprop.c:129 +msgid "Use terminal" +msgstr "Komutayý kullan" + +#: gnome/gprop.c:248 +msgid "File mode (permissions)" +msgstr "Dosya eriþim haklarý" + +#: gnome/gprop.c:321 gnome/gprop.c:347 +msgid "" +msgstr "" + +#: gnome/gprop.c:494 +msgid "General" +msgstr "Genel" + +#: gnome/gprop.c:505 +msgid "Title" +msgstr "Üstyazý" + +#: gnome/gprop.c:535 +msgid "Select icon" +msgstr "Ikona seç" + +#: gnome/gscreen.c:1415 +msgid "Reloads the current directory" +msgstr "Geçerli dizini yeniden yükle" + +#: gnome/gscreen.c:1417 +msgid "New _Directory..." +msgstr "Yeni _dizin .." + +#: gnome/gscreen.c:1417 +msgid "Creates a new directory here" +msgstr "burada yeni bir dizin yaratýr" + +#: gnome/gscreen.c:1419 +msgid "New _File..." +msgstr "Yeni dosya" + +#: gnome/gscreen.c:1419 +msgid "Creates a new file here" +msgstr "Burada yeni bir dosya yaratýr" + +#: gnome/gscreen.c:1620 +#, c-format +msgid "Search: %s" +msgstr "Ara : %s" + +#: gnome/gscreen.c:1630 +#, c-format +msgid "%s bytes in %d file" +msgstr "%d dosyasýnda %s byte" + +#: gnome/gscreen.c:1630 +#, c-format +msgid "%s bytes in %d files" +msgstr "%d dosyada %s byte" + +#: gnome/gscreen.c:1656 src/screen.c:688 +msgid "" +msgstr "" + +#: gnome/gscreen.c:2085 +msgid "Copy directory" +msgstr "Dizini kopyala" + +#: gnome/gscreen.c:2086 +msgid "Delete directory" +msgstr "Dizini sil" + +#: gnome/gscreen.c:2087 +msgid "Rename or move directory" +msgstr "Dizini yeniden adlandýt yada taþý" + +#: gnome/gscreen.c:2245 +msgid "Back" +msgstr "Geri" + +#: gnome/gscreen.c:2245 +msgid "Go to the previously visited directory" +msgstr "Önceki dizine geç" + +#: gnome/gscreen.c:2247 +msgid "Up" +msgstr "Yukarý" + +#: gnome/gscreen.c:2247 +msgid "Go up a level in the directory heirarchy" +msgstr "Üst dizine geç" + +#: gnome/gscreen.c:2249 +msgid "Forward" +msgstr "Ileri" + +#: gnome/gscreen.c:2249 +msgid "Go to the next directory" +msgstr "Ileri dizine geç" + +#: gnome/gscreen.c:2252 src/tree.c:1010 +msgid "Rescan" +msgstr "Yeniden tara" + +#: gnome/gscreen.c:2252 +msgid "Rescan the current directory" +msgstr "Geçerli dizini yeniden tara" + +#: gnome/gscreen.c:2255 +msgid "Home" +msgstr "Bark" + +#: gnome/gscreen.c:2255 +msgid "Go to your home directory" +msgstr "Ev dizinine geç" + +#: gnome/gscreen.c:2395 +msgid "Location:" +msgstr "Mekan :" + +#. 1 +#: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1219 +#: gtkedit/editcmd.c:1304 gtkedit/editcmd.c:2916 gtkedit/editoptions.c:71 +#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466 +#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 +#: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:143 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +msgid "&Ok" +msgstr "&Oldu" + +#: gnome/gview.c:136 +#, c-format +msgid "Offset 0x%08lx" +msgstr "" + +#: gnome/gview.c:138 src/view.c:730 +#, c-format +msgid "Col %d" +msgstr "Sütun %d" + +#: gnome/gview.c:142 src/view.c:734 +#, c-format +msgid "%s bytes" +msgstr "%s byte" + +#: gnome/gview.c:306 +msgid "_Goto line" +msgstr "Satýra _geç" + +#: gnome/gview.c:307 +msgid "Jump to a specified line number" +msgstr "Belirlenmiþ bir satýra geç" + +#: gnome/gview.c:309 +msgid "_Monitor file" +msgstr "Dosyayý görüntüle" + +#: gnome/gview.c:309 +msgid "Monitor file growing" +msgstr "Dosyayý büyürken görüntüle" + +#: gnome/gview.c:316 +msgid "Regexp search" +msgstr "Tabir aramasý" + +#: gnome/gview.c:317 +msgid "Regular expression search" +msgstr "Tanýmlanmýþ tabir aramasý" + +#: gnome/gview.c:326 +msgid "_Wrap" +msgstr "_Kýr" + +#: gnome/gview.c:327 +msgid "Wrap the text" +msgstr "Metni kýr" + +#. Can not use this one yet, as it destroys the viewer, need to fix that +#: gnome/gview.c:330 +msgid "_Parsed view" +msgstr "" +#msgstr "Taranmýþ bakýþ" + +#: gnome/gview.c:333 +msgid "_Formatted" +msgstr "_Formatlý" + +#: gnome/gview.c:335 +msgid "_Hex" +msgstr "_Heksadesimal" + +#: gnome/gview.c:341 +msgid "_Search" +msgstr "Ara" + +#: gnome/gwidget.c:95 +msgid "ok" +msgstr "oldu" + +#: gnome/gwidget.c:97 +msgid "cancel" +msgstr "iptal" + +#: gnome/gwidget.c:99 +msgid "help" +msgstr "yardým" + +#: gnome/gwidget.c:101 src/file.c:2268 +msgid "yes" +msgstr "evet" + +#: gnome/gwidget.c:103 src/file.c:2266 +msgid "no" +msgstr "hayýr" + +#: gnome/gwidget.c:105 +msgid "exit" +msgstr "çýk" + +#: gnome/gwidget.c:107 +msgid "abort" +msgstr "terk et" + +#: gnome/gmc-client.c:26 +msgid "Could not contact the file manager\n" +msgstr "Dosya yöneticisine baðlantý kuramadým\n" + +#: gnome/gmc-client.c:45 +msgid "Could not get the desktop\n" +msgstr "Masaüstüne ulaþamadým\n" + +#: gnome/gmc-client.c:171 +msgid "Create window showing the specified directory" +msgstr "Belirtilen dizini gösteren bir pencere aç" + +#: gnome/gmc-client.c:171 gnome/gmc-client.c:173 +msgid "DIRECTORY" +msgstr "DIZIN" + +#: gnome/gmc-client.c:173 +msgid "Rescan the specified directory" +msgstr "Belirlenmiþ dizini yeniden tara" + +#: gnome/gmc-client.c:175 +msgid "Rescan the desktop icons" +msgstr "Masaüstü ikonalarýný yeniden tara" + +#: gnome/gmc-client.c:177 +msgid "Rescan the desktop device icons" +msgstr "Masaüstü ahize ikonalarý yeniden tara" + +#: gnome/gmc-client.c:179 +msgid "Close windows whose directories cannot be reached" +msgstr "Ulaþýlamayan dizinlerin pencereleri kapat" + +#. The file-name is printed after the ':' +#: gtkedit/edit.c:132 gtkedit/edit.c:227 gtkedit/edit.c:234 gtkedit/edit.c:241 +#: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 +#: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 +#: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 +#: vfs/fish.c:224 +msgid " Error " +msgstr " HATA " + +#: gtkedit/edit.c:132 gtkedit/edit.c:234 +msgid " Failed trying to open file for reading: " +msgstr " Dosyayý okumaya açarken hata oldu : " + +#: gtkedit/edit.c:241 +msgid " Cannot get size/permissions info on file: " +msgstr " Dosyanýn eriþim haklarýný/büyüklüðünü alamadým : " + +#: gtkedit/edit.c:248 +msgid " Not an ordinary file: " +msgstr " Normal bir dosya deðil : " + +#: gtkedit/edit.c:254 +msgid " File is too large: " +msgstr " Dosya çok fazla büyük : " + +#: gtkedit/edit.c:255 +msgid "" +" \n" +" Increase edit.h:MAXBUF and recompile the editor. " +msgstr "" +" \n" +" ´edit.h´'da \"MAXBUF\"'un deðerini deðiþtirip editörü yeniden denetlet . " + +#: gtkedit/edit.c:311 gtkedit/edit.c:347 +msgid " Error allocating memory " +msgstr " Bellek ayrýrken hata oldu " + +#: gtkedit/editcmd.c:334 +msgid "Quick save " +msgstr "Hýzlý kaydet " + +#: gtkedit/editcmd.c:335 +msgid "Safe save " +msgstr "Güvenilir kaydet " + +#: gtkedit/editcmd.c:336 +msgid "Do backups -->" +msgstr "Yedek yarat -->" + +#. NLS for hotkeys? +#: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1171 gtkedit/editcmd.c:1217 +#: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 +#: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 +#: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 +#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 +#: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 +#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:116 +msgid "&Cancel" +msgstr "&Iptal" + +#: gtkedit/editcmd.c:345 +msgid "Extension:" +msgstr "Sonek :" + +#. NLS ? +#: gtkedit/editcmd.c:352 +msgid " Edit Save Mode " +msgstr " Kaydetme þeklini deðiþtir " + +#: gtkedit/editcmd.c:499 +msgid " Save As " +msgstr " Farklý kaydet " + +#. Warning message with a query to continue or cancel the operation +#: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 +#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:706 src/screen.c:1451 src/screen.c:2129 +#: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +msgid " Warning " +msgstr " Ikaz " + +#: gtkedit/editcmd.c:514 +msgid " A file already exists with this name. " +msgstr " Bu adla zaten bir dosya var " + +#. Push buttons to over-write the current file, or cancel the operation +#: gtkedit/editcmd.c:516 +msgid "Overwrite" +msgstr "Üstüne yaz" + +#: gtkedit/editcmd.c:516 gtkedit/editcmd.c:583 gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 +#: gtkedit/editcmd.c:1607 +msgid "Cancel" +msgstr "Iptal" + +#: gtkedit/editcmd.c:535 +msgid " Save as " +msgstr " Farklý kaydet" + +#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +msgid " Error trying to save file. " +msgstr " Dosyayý kaydederken hata oldu . " + +#. This heads the delete macro error dialog box +#: gtkedit/editcmd.c:653 gtkedit/editcmd.c:661 gtkedit/editcmd.c:686 +msgid " Delete macro " +msgstr " Macro'yu sil " + +#. 'Open' = load temp file +#: gtkedit/editcmd.c:655 +msgid " Error trying to open temp file " +msgstr " Geçici dosyayý açarken hata oldu " + +#. 'Open' = load temp file +#: gtkedit/editcmd.c:663 gtkedit/editcmd.c:724 gtkedit/editcmd.c:792 +msgid " Error trying to open macro file " +msgstr " Macro dosyasýný açarken hata oldu " + +#: gtkedit/editcmd.c:668 gtkedit/editcmd.c:676 gtkedit/editcmd.c:712 +#: gtkedit/editcmd.c:767 +#, c-format +msgid "key '%d 0': " +msgstr "Tuþ ´5d 0´ : " + +#: gtkedit/editcmd.c:687 +msgid " Error trying to overwrite macro file " +msgstr " Macro dosyasýnýn üstüne yazarken hata oldu " + +#. This heads the 'Macro' dialog box +#: gtkedit/editcmd.c:703 +msgid " Macro " +msgstr " Macro " + +#. Input line for a single key press follows the ':' +#: gtkedit/editcmd.c:705 +msgid " Press the macro's new hotkey: " +msgstr " Macro'nun yeni basayýný belirle : " + +#. This heads the 'Save Macro' dialog box +#: gtkedit/editcmd.c:724 +msgid " Save macro " +msgstr " Macro'yu kaydet " + +#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +msgid " Delete Macro " +msgstr " Macro'yu sil " + +#. This heads the 'Load Macro' dialog box +#: gtkedit/editcmd.c:791 +msgid " Load macro " +msgstr " Macro'yu yükle " + +#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +msgid " Confirm save file? : " +msgstr " Dosyayý kaydedeyim mi ? :" + +#. Buttons to 'Confirm save file' query +#: gtkedit/editcmd.c:810 +msgid " Save file " +msgstr " Dosyayý kaydet" + +#: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 +#: src/view.c:2075 +msgid "Save" +msgstr "Kaydet" + +#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 +msgid "" +" Current text was modified without a file save. \n" +" Continue discards these changes. " +msgstr "" + +#: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 +msgid "Continue" +msgstr "Devam et" + +#. Heads the 'Load' file dialog box +#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +msgid " Load " +msgstr " Yükle " + +#: gtkedit/editcmd.c:859 +msgid " Error trying to open file for reading " +msgstr " Dosyayý okumak için açarken bir hata oldu" + +#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 +msgid " Block is large, you may not be able to undo this action. " +msgstr " Blokçok büyük , bu eylemi geri alamayabilirsin . " + +#: gtkedit/editcmd.c:1117 +msgid " Continue " +msgstr " Devam et " + +#: gtkedit/editcmd.c:1117 +msgid " Cancel " +msgstr " Iptal " + +#: gtkedit/editcmd.c:1173 +msgid "o&Ne" +msgstr "" + +#: gtkedit/editcmd.c:1175 src/filegui.c:597 +msgid "al&L" +msgstr "" + +#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 +msgid "&Skip" +msgstr "&Atla" + +#: gtkedit/editcmd.c:1179 +msgid "&Replace" +msgstr "&Yerleþtir" + +#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +msgid " Replace with: " +msgstr " Bunla yerleþtir : " + +#: gtkedit/editcmd.c:1189 +msgid " Confirm replace " +msgstr " Yerleþmeyi doðrula " + +#: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 +msgid "scanf &Expression" +msgstr "" + +#: gtkedit/editcmd.c:1223 +msgid "replace &All" +msgstr "hepsine yerleþtir" + +#: gtkedit/editcmd.c:1225 +msgid "pr&Ompt on replace" +msgstr "" + +#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +msgid "&Backwards" +msgstr "" + +#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +msgid "&Regular expression" +msgstr "" + +#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +msgid "&Whole words only" +msgstr "" + +#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +msgid "case &Sensitive" +msgstr "" + +#: gtkedit/editcmd.c:1237 +msgid " Enter replacement argument order eg. 3,2,1,4 " +msgstr "" + +#: gtkedit/editcmd.c:1241 +msgid " Enter replacement string:" +msgstr "" + +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +msgid " Enter search string:" +msgstr "" + +#. Heads the 'Replace' dialog box +#: gtkedit/editcmd.c:1264 gtkedit/editcmd.c:1516 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:2147 gtkedit/editcmd.c:2178 gtkedit/editcmd.c:2180 +msgid " Replace " +msgstr "" + +#. Heads the 'Search' dialog box +#: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 +#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 +#: src/view.c:1998 +msgid " Search " +msgstr "" + +#. An input line comes after the ':' +#: gtkedit/editcmd.c:1382 +msgid " Enter search text : " +msgstr "" + +#: gtkedit/editcmd.c:1389 +msgid " Enter replace text : " +msgstr "" + +#: gtkedit/editcmd.c:1392 gtkedit/editcmd.c:1393 +#, c-format +msgid "" +"You can enter regexp substrings with %s\n" +"(not \\1, \\2 like sed) then use \"Enter...order\"" +msgstr "" + +#: gtkedit/editcmd.c:1395 +msgid " Enter argument (or substring) order : " +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 +msgid "" +"Enter the order of replacement of your scanf\n" +"format specifiers or regexp substrings, eg 3,1,2" +msgstr "" + +#. The following are check boxes +#: gtkedit/editcmd.c:1405 +msgid " Whole words only " +msgstr "" + +#: gtkedit/editcmd.c:1407 +msgid " Case sensitive " +msgstr "" + +#: gtkedit/editcmd.c:1410 +msgid " Regular expression " +msgstr "" + +#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +msgid "" +"See the regex man page for how\n" +"to compose a regular expression" +msgstr "" + +#: gtkedit/editcmd.c:1418 +msgid " Backwards " +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 +msgid "Warning: Searching backward can be slow" +msgstr "" + +#: gtkedit/editcmd.c:1434 +msgid " Prompt on replace " +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1436 +msgid "Ask before making each replacement" +msgstr "" + +#: gtkedit/editcmd.c:1438 +msgid " Replace all " +msgstr "" + +#: gtkedit/editcmd.c:1441 +msgid " Scanf expression " +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1443 +msgid "" +"Allows entering of a C format string,\n" +"see the scanf man page" +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1448 +msgid "Begin search, Enter" +msgstr "" + +#. Tool hint +#: gtkedit/editcmd.c:1451 +msgid "Abort this dialog, Esc" +msgstr "" + +#: gtkedit/editcmd.c:1607 +msgid "Replace" +msgstr "" + +#: gtkedit/editcmd.c:1607 +msgid "Skip" +msgstr "" + +#: gtkedit/editcmd.c:1607 +msgid "Replace all" +msgstr "" + +#: gtkedit/editcmd.c:1607 +msgid "Replace one" +msgstr "" + +#: gtkedit/editcmd.c:1969 +msgid "" +" Invalid regular expression, or scanf expression with to many conversions " +msgstr "" + +#. "Invalid regexp string or scanf string" +#: gtkedit/editcmd.c:2149 +msgid " Error in replacement format string. " +msgstr "" + +#: gtkedit/editcmd.c:2177 +#, c-format +msgid " %ld replacements made. " +msgstr "" + +#: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 +msgid " Search string not found. " +msgstr "" + +#. Confirm 'Quit' dialog box +#: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 +msgid " Quit " +msgstr "" + +#: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 +msgid "" +" Current text was modified without a file save. \n" +" Save with exit? " +msgstr "" + +#: gtkedit/editcmd.c:2288 +msgid " File was modified, Save with exit? " +msgstr "" + +#: gtkedit/editcmd.c:2288 +msgid "Cancel quit" +msgstr "" + +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +msgid "&Yes" +msgstr "&Evet" + +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:861 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +msgid "&No" +msgstr "&Hayýr" + +#: gtkedit/editcmd.c:2292 +msgid " &Cancel quit " +msgstr "" + +#: gtkedit/editcmd.c:2292 +msgid " &Yes " +msgstr " &Evet " + +#: gtkedit/editcmd.c:2292 +msgid " &No " +msgstr " &Hayýr " + +#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +msgid " Copy to clipboard " +msgstr "" + +#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2612 +msgid " Unable to save to file. " +msgstr "" + +#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +msgid " Cut to clipboard " +msgstr "" + +#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 +#: gtkedit/editcmd.c:2646 src/view.c:1913 +msgid " Goto line " +msgstr "" + +#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 +#: gtkedit/editcmd.c:2646 +msgid " Enter line: " +msgstr "" + +#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +msgid " Save Block " +msgstr "" + +#: gtkedit/editcmd.c:2717 +msgid " Insert File " +msgstr "" + +#: gtkedit/editcmd.c:2730 +msgid " Insert file " +msgstr "" + +#: gtkedit/editcmd.c:2730 +msgid " Error trying to insert file. " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2752 +msgid " Sort block " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 +msgid " You must first highlight a block of text. " +msgstr "" + +#: gtkedit/editcmd.c:2759 +msgid " Run Sort " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2761 +msgid " Enter sort options (see manpage) separated by whitespace: " +msgstr "" + +#: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 +msgid " Sort " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2774 +msgid " Error trying to execute sort command " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2780 +msgid " Sort returned non-zero: " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 +msgid " Process block " +msgstr "" + +#. Not essential to translate +#: gtkedit/editcmd.c:2836 +msgid " Error trying to stat file " +msgstr "" + +#: gtkedit/editcmd.c:2907 +msgid " Mail " +msgstr "" + +#: gtkedit/editcmd.c:2920 +msgid " Copies to" +msgstr "" + +#: gtkedit/editcmd.c:2924 +msgid " Subject" +msgstr "" + +#: gtkedit/editcmd.c:2928 +msgid " To" +msgstr "" + +#: gtkedit/editcmd.c:2930 +msgid " mail -s -c " +msgstr "" + +#: gtkedit/editmenu.c:61 +msgid " Word wrap " +msgstr "" + +#. Not essential to translate +#: gtkedit/editmenu.c:63 +msgid " Enter line length, 0 for off: " +msgstr "" + +#: gtkedit/editmenu.c:74 +msgid " About " +msgstr " Bilgi " + +#: gtkedit/editmenu.c:75 +msgid "" +"\n" +" Cooledit v3.11.5\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:123 gtkedit/editmenu.c:139 +msgid "&Open/load... C-o" +msgstr "" + +#: gtkedit/editmenu.c:124 +msgid "&New C-n" +msgstr "" + +#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +msgid "&Save F2" +msgstr "" + +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +msgid "save &As... F12" +msgstr "" + +#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +msgid "&Insert file... F15" +msgstr "" + +#: gtkedit/editmenu.c:130 +msgid "copy to &File... C-f" +msgstr "" + +#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +msgid "a&Bout... " +msgstr "" + +#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +msgid "&Quit F10" +msgstr "" + +#: gtkedit/editmenu.c:140 +msgid "&New C-x k" +msgstr "" + +#: gtkedit/editmenu.c:146 +msgid "copy to &File... " +msgstr "" + +#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +msgid "&Toggle Mark F3" +msgstr "" + +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +msgid "&Mark Columns S-F3" +msgstr "" + +#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +msgid "toggle &Ins/overw Ins" +msgstr "" + +#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +msgid "&Copy F5" +msgstr "" + +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +msgid "&Move F6" +msgstr "" + +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +msgid "&Delete F8" +msgstr "" + +#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +msgid "&Undo C-u" +msgstr "" + +#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +msgid "&Beginning C-PgUp" +msgstr "" + +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +msgid "&End C-PgDn" +msgstr "" + +#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +msgid "&Search... F7" +msgstr "" + +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +msgid "search &Again F17" +msgstr "" + +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +msgid "&Replace... F4" +msgstr "" + +#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +msgid "&Goto line... M-l" +msgstr "" + +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +msgid "insert &Literal... C-q" +msgstr "" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +msgid "&Refresh screen C-l" +msgstr "" + +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +msgid "&Start record macro C-r" +msgstr "" + +#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +msgid "&Finish record macro... C-r" +msgstr "" + +#: gtkedit/editmenu.c:211 +msgid "&Execute macro... C-a, KEY" +msgstr "" + +#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +msgid "delete macr&O... " +msgstr "" + +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +msgid "insert &Date/time " +msgstr "" + +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +msgid "format p&Aragraph M-p" +msgstr "" + +#: gtkedit/editmenu.c:217 +msgid "'ispell' s&Pell check C-p" +msgstr "" + +#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +msgid "sor&T... M-t" +msgstr "" + +#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 +msgid "'indent' &C Formatter F19" +msgstr "" + +#: gtkedit/editmenu.c:220 +msgid "&Mail... " +msgstr "" + +#: gtkedit/editmenu.c:233 +msgid "&Execute macro... C-x e, KEY" +msgstr "" + +#: gtkedit/editmenu.c:239 +msgid "'ispell' s&Pell check M-$" +msgstr "" + +#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +msgid "&General... " +msgstr "&Genel ..." + +#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +msgid "&Save mode..." +msgstr "Ka&ydetme türü ..." + +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1353 +msgid "&Layout..." +msgstr "&Dizinem ..." + +#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' +#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279 gtkedit/editmenu.c:396 +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr "" + +#: gtkedit/editmenu.c:271 gtkedit/editmenu.c:280 gtkedit/editmenu.c:412 +msgid " Edit " +msgstr "" + +#: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 +msgid " Sear/Repl " +msgstr "" + +#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 +msgid " Command " +msgstr "" + +#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +msgid " Options " +msgstr "" + +#: gtkedit/editmenu.c:397 +msgid "Open...\tC-o" +msgstr "" + +#: gtkedit/editmenu.c:398 +msgid "New\tC-n" +msgstr "" + +#: gtkedit/editmenu.c:400 +msgid "Save\tF2" +msgstr "" + +#: gtkedit/editmenu.c:401 +msgid "Save as...\tF12" +msgstr "" + +#: gtkedit/editmenu.c:403 +msgid "Insert file...\tF15" +msgstr "" + +#: gtkedit/editmenu.c:404 +msgid "Copy to file...\tC-f" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:407 +msgid "Disk operations and file indexing/searching" +msgstr "" + +#: gtkedit/editmenu.c:413 +msgid "Toggle mark\tF3" +msgstr "" + +#: gtkedit/editmenu.c:414 +msgid "Toggle mark columns\tC-b" +msgstr "" + +#: gtkedit/editmenu.c:416 +msgid "Toggle book mark\tC-M-Ins" +msgstr "" + +#: gtkedit/editmenu.c:417 +msgid "Previous book mark\tC-M-Up" +msgstr "" + +#: gtkedit/editmenu.c:418 +msgid "Next book mark\tC-M-Down" +msgstr "" + +#: gtkedit/editmenu.c:419 +msgid "Flush book marks" +msgstr "" + +#: gtkedit/editmenu.c:421 +msgid "Toggle insert/overwrite\tIns" +msgstr "" + +#: gtkedit/editmenu.c:423 +msgid "Copy block to cursor\tF5" +msgstr "" + +#: gtkedit/editmenu.c:424 +msgid "Move block to cursor\tF6" +msgstr "" + +#: gtkedit/editmenu.c:425 +msgid "Delete block\tF8/C-Del" +msgstr "" + +#: gtkedit/editmenu.c:427 +msgid "Copy block to clipbrd\tC-Ins" +msgstr "" + +#: gtkedit/editmenu.c:428 +msgid "Cut block to clipbrd\tS-Del" +msgstr "" + +#: gtkedit/editmenu.c:429 +msgid "Paste block from clipbrd\tS-Ins" +msgstr "" + +#: gtkedit/editmenu.c:430 +msgid "Selection history\tM-Ins" +msgstr "" + +#: gtkedit/editmenu.c:432 +msgid "Undo\tC-BackSpace" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:435 +msgid "Manipulating blocks of text" +msgstr "" + +#: gtkedit/editmenu.c:440 +msgid " Srch/Replce " +msgstr "" + +#: gtkedit/editmenu.c:441 +msgid "Search...\tF7" +msgstr "" + +#: gtkedit/editmenu.c:442 +msgid "Search again\tF17" +msgstr "" + +#: gtkedit/editmenu.c:443 +msgid "Replace...\tF4" +msgstr "" + +#: gtkedit/editmenu.c:444 +msgid "Replace again\tF14" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:447 +msgid "Search for and replace text" +msgstr "" + +#: gtkedit/editmenu.c:453 +msgid "Goto line...\tM-l" +msgstr "" + +#: gtkedit/editmenu.c:455 +msgid "Start record macro\tC-r" +msgstr "" + +#: gtkedit/editmenu.c:456 +msgid "Finish record macro...\tC-r" +msgstr "" + +#: gtkedit/editmenu.c:457 +msgid "Execute macro...\tC-a, KEY" +msgstr "" + +#: gtkedit/editmenu.c:458 +msgid "Delete macro...\t" +msgstr "" + +#: gtkedit/editmenu.c:460 +msgid "Insert date/time\tC-d" +msgstr "" + +#: gtkedit/editmenu.c:461 +msgid "Format paragraph\tM-p" +msgstr "" + +#: gtkedit/editmenu.c:463 +msgid "Refresh display\tC-l" +msgstr "" + +#. Tool hint +#: gtkedit/editmenu.c:466 +msgid "Macros and internal commands" +msgstr "" + +#: gtkedit/editoptions.c:36 +msgid "Intuitive" +msgstr "" + +#: gtkedit/editoptions.c:36 +msgid "Emacs" +msgstr "" + +#: gtkedit/editoptions.c:39 +msgid "None" +msgstr "" + +#: gtkedit/editoptions.c:39 +msgid "Dynamic paragraphing" +msgstr "" + +#: gtkedit/editoptions.c:39 +msgid "Type writer wrap" +msgstr "" + +#. 2 +#: gtkedit/editoptions.c:74 +msgid "Word wrap line length : " +msgstr "" + +#. 4 +#: gtkedit/editoptions.c:80 +msgid "Tab spacing : " +msgstr "" + +#: gtkedit/editoptions.c:88 +msgid "synta&X highlighting" +msgstr "" + +#. 7 +#: gtkedit/editoptions.c:94 +msgid "confir&M before saving" +msgstr "" + +#. 8 +#: gtkedit/editoptions.c:97 +msgid "fill tabs with &Spaces" +msgstr "" + +#. 9 +#: gtkedit/editoptions.c:100 +msgid "&Return does autoindent" +msgstr "" + +#. 10 +#: gtkedit/editoptions.c:103 +msgid "&Backspace through tabs" +msgstr "" + +#. 11 +#: gtkedit/editoptions.c:106 +msgid "&Fake half tabs" +msgstr "" + +#. 13 +#: gtkedit/editoptions.c:112 +msgid "Wrap mode" +msgstr "" + +#. 15 +#: gtkedit/editoptions.c:118 +msgid "Key emulation" +msgstr "Tuþ ayarlarý" + +#: gtkedit/editoptions.c:159 +msgid " Editor options " +msgstr " Yazman ayaralarý" + +#. Not essential to translate +#: gtkedit/editwidget.c:317 +msgid "Error initialising editor.\n" +msgstr "" + +#: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 +#: src/main.c:1719 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2068 +msgid "Help" +msgstr "Yardým" + +#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +msgid "Mark" +msgstr "Iþaretle" + +#: gtkedit/editwidget.c:1096 +msgid "Replac" +msgstr "Yerleþle" + +#: gtkedit/editwidget.c:1102 src/main.c:1721 +msgid "PullDn" +msgstr "Aç" + +#. gtk_edit_menu +#: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 +#: src/main.c:1722 src/view.c:2070 src/view.c:2092 +msgid "Quit" +msgstr "Çýk" + +#: gtkedit/gtkedit.c:65 +msgid "&Dismiss" +msgstr "" + +#: gtkedit/gtkedit.c:66 +msgid " Enter file name: " +msgstr "" + +#: gtkedit/gtkedit.c:111 +msgid "The Quick Brown Fox Jumps Over The Lazy Dog" +msgstr "" + +#: gtkedit/gtkedit.c:802 +msgid "" +"gtkedit.c: 22ME environment variable not set and no passwd entry - aborting\n" +msgstr "" + +#: gtkedit/gtkedit.c:1246 +msgid "Interactive help browser" +msgstr "" + +#: gtkedit/gtkedit.c:1247 +msgid "Save to current file name" +msgstr "" + +#: gtkedit/gtkedit.c:1248 +msgid "Toggle In/Off invisible marker to highlight text" +msgstr "" + +#: gtkedit/gtkedit.c:1249 +msgid "Replc" +msgstr "" + +#: gtkedit/gtkedit.c:1249 +msgid "Find and replace strings/regular expressions" +msgstr "" + +#: gtkedit/gtkedit.c:1250 +msgid "Copy highlighted block to cursor position" +msgstr "" + +#: gtkedit/gtkedit.c:1252 +msgid "Move highlighted block to cursor position" +msgstr "" + +#: gtkedit/gtkedit.c:1253 +msgid "Find" +msgstr "" + +#: gtkedit/gtkedit.c:1253 +msgid "Find strings/regular expressions" +msgstr "" + +#: gtkedit/gtkedit.c:1254 +msgid "Dlete" +msgstr "" + +#: gtkedit/gtkedit.c:1254 +msgid "Delete highlighted text" +msgstr "" + +#: gtkedit/gtkedit.c:1255 src/main.c:1720 src/screen.c:2396 src/screen.c:2426 +msgid "Menu" +msgstr "Mönü" + +#: gtkedit/gtkedit.c:1255 +msgid "Pull down menu" +msgstr "" + +#: gtkedit/gtkedit.c:1256 +msgid "Exit editor" +msgstr "" + +#: gtkedit/gtkedit.c:1290 +msgid "Clear the edit buffer" +msgstr "" + +#: gtkedit/gtkedit.c:1295 +msgid "Insert File" +msgstr "" + +#: gtkedit/gtkedit.c:1295 +msgid "Insert text from a file" +msgstr "" + +#: gtkedit/gtkedit.c:1297 +msgid "Copy to file" +msgstr "" + +#: gtkedit/gtkedit.c:1297 +msgid "copy a block to a file" +msgstr "" + +#: gtkedit/gtkedit.c:1337 +msgid "Search/Replace" +msgstr "" + +#: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1078 +msgid " Spelling Message " +msgstr "" + +#: gtkedit/syntax.c:1051 +msgid "" +" Fail trying to open ispell program. \n" +" Check that it is in your path and works with the -a option. \n" +" Alternatively, disable spell checking from the Options menu. " +msgstr "" + +#: gtkedit/syntax.c:1060 +msgid "" +" Fail trying to open ispell pipes. \n" +" Check that it is in your path and works with the -a option. \n" +" Alternatively, disable spell checking from the Options menu. " +msgstr "" + +#: gtkedit/syntax.c:1069 +msgid "" +" Fail trying to read ispell pipes. \n" +" Check that it is in your path and works with the -a option. \n" +" Alternatively, disable spell checking from the Options menu. " +msgstr "" + +#: gtkedit/syntax.c:1078 +msgid "" +" Error reading from ispell. \n" +" Ispell is being restarted. " +msgstr "" + +#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +msgid " Load Syntax Rules " +msgstr "" + +#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +msgid "" +" Your syntax rule file is outdated \n" +" A new rule file is being installed. \n" +" Your old rule file has been saved with a .OLD extension. " +msgstr "" + +#: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 +msgid " Load syntax file " +msgstr "" + +#: gtkedit/syntax.c:1487 +msgid " File access error " +msgstr "" + +#: gtkedit/syntax.c:1493 +#, c-format +msgid " Error in file %s on line %d " +msgstr "" + +#: src/achown.c:72 src/chmod.c:115 src/chown.c:80 +msgid "&Set" +msgstr "" + +#: src/achown.c:73 +msgid "S&kip" +msgstr "" + +#: src/achown.c:74 src/chmod.c:119 src/chown.c:83 +msgid "Set &all" +msgstr "" + +#: src/achown.c:362 src/achown.c:369 +msgid "owner" +msgstr "" + +#: src/achown.c:364 src/achown.c:371 +msgid "group" +msgstr "" + +#: src/achown.c:366 +msgid "other" +msgstr "" + +#: src/achown.c:374 +msgid "On" +msgstr "" + +#: src/achown.c:376 +msgid "Flag" +msgstr "" + +#: src/achown.c:383 +#, c-format +msgid "%6d of %d" +msgstr "" + +#: src/achown.c:391 +msgid " Chown advanced command " +msgstr "" + +#: src/achown.c:629 src/achown.c:645 src/achown.c:708 src/chmod.c:285 +#: src/chmod.c:370 +#, c-format +msgid "" +" Couldn't chmod \"%s\" \n" +" %s " +msgstr "" + +#: src/achown.c:634 src/achown.c:649 src/achown.c:712 src/chown.c:223 +#: src/chown.c:345 +#, c-format +msgid "" +" Couldn't chown \"%s\" \n" +" %s " +msgstr "" + +#: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 +msgid " Oops... " +msgstr "" + +#: src/achown.c:667 +msgid " I can't run the Advanced Chown command on an extfs " +msgstr "" + +#: src/achown.c:671 +msgid " I can't run the Advanced Chown command on a tarfs " +msgstr "" + +#: src/background.c:181 +msgid "Background process:" +msgstr "" + +#: src/background.c:287 src/file.c:2189 +msgid " Background process error " +msgstr "" + +#: src/background.c:294 +msgid " Child died unexpectedly " +msgstr "" + +#: src/background.c:296 +msgid " Unknown error in child " +msgstr "" + +#: src/background.c:311 +msgid " Background protocol error " +msgstr "" + +#: src/background.c:312 +msgid "" +" Background process sent us a request for more arguments \n" +" than we can handle. \n" +msgstr "" + +#: src/boxes.c:63 +msgid " Listing mode " +msgstr " Sýralama tipi " + +#: src/boxes.c:68 +msgid "&Full file list" +msgstr "&Tam dosya bakýþý" + +#: src/boxes.c:69 +msgid "&Brief file list" +msgstr "&Kýsa dosya bakýþý" + +#: src/boxes.c:70 +msgid "&Long file list" +msgstr "&Uzun dosya bakýþý" + +#: src/boxes.c:71 +msgid "&User defined:" +msgstr "Ku&llanýcýya özgü :" + +#: src/boxes.c:72 +msgid "&Icon view" +msgstr "&Ikona bakýþý" + +#: src/boxes.c:137 +msgid "user &Mini status" +msgstr "" + +#: src/boxes.c:186 +msgid "Listing mode" +msgstr "Sýralama tipi" + +#: src/boxes.c:280 +msgid "&Reverse" +msgstr "Te&rs" + +#: src/boxes.c:281 +msgid "case sensi&tive" +msgstr "" + +#: src/boxes.c:282 +msgid "Sort order" +msgstr "Sýralama türü" + +#: src/boxes.c:381 +msgid " confirm &Exit " +msgstr " çýkmayý &onaylat " + +#: src/boxes.c:383 +msgid " confirm e&Xecute " +msgstr " çalýþtýrmayý o&naylat " + +#: src/boxes.c:385 +msgid " confirm o&Verwrite " +msgstr " ü&stüne yazmayý onaylat " + +#: src/boxes.c:387 +msgid " confirm &Delete " +msgstr " sil&meyi onaylar " + +#: src/boxes.c:393 +msgid " Confirmation " +msgstr " Onaylama " + +#: src/boxes.c:461 +msgid "Full 8 bits output" +msgstr "Tam 8-bitlik göster" + +#: src/boxes.c:461 +msgid "ISO 8859-1" +msgstr "ISO 8859-1" + +#: src/boxes.c:461 +msgid "7 bits" +msgstr "7 bit" + +#: src/boxes.c:468 +msgid "F&ull 8 bits input" +msgstr "Tam 8-bitlik veri" + +#: src/boxes.c:476 +msgid " Display bits " +msgstr "" + +#: src/boxes.c:651 +msgid "&Always use ftp proxy" +msgstr "Her z&aman ftp proxy'sini kullan" + +#: src/boxes.c:653 +msgid "sec" +msgstr "san." + +#: src/boxes.c:657 +msgid "ftpfs directory cache timeout:" +msgstr "" + +#: src/boxes.c:661 +msgid "ftp anonymous password:" +msgstr "" + +#: src/boxes.c:668 +msgid "Timeout for freeing VFSs:" +msgstr "" + +#: src/boxes.c:674 +msgid " Virtual File System Setting " +msgstr "" + +#: src/boxes.c:740 +msgid "Quick cd" +msgstr "" + +#. want cd like completion +#: src/boxes.c:745 +msgid "cd" +msgstr "" + +#: src/boxes.c:796 +msgid "Symbolic link" +msgstr "" + +#: src/boxes.c:833 +msgid "Running " +msgstr "" + +#: src/boxes.c:834 src/find.c:719 src/find.c:960 +msgid "Stopped" +msgstr "" + +#: src/boxes.c:895 +msgid "&Stop" +msgstr "&Durdur" + +#: src/boxes.c:896 +msgid "&Resume" +msgstr "Y&eniden devam et" + +#: src/boxes.c:897 +msgid "&Kill" +msgstr "&Öldür" + +#: src/boxes.c:936 +msgid "Background Jobs" +msgstr "" + +#: src/chmod.c:95 +msgid "execute/search by others" +msgstr "" + +#: src/chmod.c:96 +msgid "write by others" +msgstr "" + +#: src/chmod.c:97 +msgid "read by others" +msgstr "" + +#: src/chmod.c:98 +msgid "execute/search by group" +msgstr "" + +#: src/chmod.c:99 +msgid "write by group" +msgstr "" + +#: src/chmod.c:100 +msgid "read by group" +msgstr "" + +#: src/chmod.c:101 +msgid "execute/search by owner" +msgstr "" + +#: src/chmod.c:102 +msgid "write by owner" +msgstr "" + +#: src/chmod.c:103 +msgid "read by owner" +msgstr "" + +#: src/chmod.c:104 +msgid "sticky bit" +msgstr "" + +#: src/chmod.c:105 +msgid "set group ID on execution" +msgstr "" + +#: src/chmod.c:106 +msgid "set user ID on execution" +msgstr "" + +#: src/chmod.c:116 +msgid "C&lear marked" +msgstr "" + +#: src/chmod.c:117 +msgid "S&et marked" +msgstr "" + +#: src/chmod.c:118 +msgid "&Marked all" +msgstr "" + +#: src/chmod.c:152 +msgid "Permissions (Octal)" +msgstr "" + +#: src/chmod.c:154 +msgid "Owner name" +msgstr "" + +#: src/chmod.c:156 +msgid "Group name" +msgstr "" + +#: src/chmod.c:160 +msgid " Chmod command " +msgstr "" + +#: src/chmod.c:162 src/chown.c:120 +msgid " Permission " +msgstr "" + +#: src/chmod.c:169 +msgid "Use SPACE to change" +msgstr "" + +#: src/chmod.c:171 +msgid "an option, ARROW KEYS" +msgstr "" + +#: src/chmod.c:173 +msgid "to move between options" +msgstr "" + +#: src/chmod.c:175 +msgid "and T or INS to mark" +msgstr "" + +#: src/chmod.c:233 +msgid "Chmod command" +msgstr "" + +#: src/chmod.c:321 +msgid " I can't run the Chmod command on an extfs " +msgstr "" + +#: src/chmod.c:325 +msgid " I can't run the Chmod command on a tarfs " +msgstr "" + +#: src/chown.c:81 +msgid "Set &users" +msgstr "" + +#: src/chown.c:82 +msgid "Set &groups" +msgstr "" + +#: src/chown.c:112 +msgid " Name " +msgstr " Ad " + +#: src/chown.c:114 +msgid " Owner name " +msgstr " Iye adý " + +#: src/chown.c:116 src/chown.c:128 +msgid " Group name " +msgstr " Kitle adý " + +#: src/chown.c:118 +msgid " Size " +msgstr " Boyut " + +#: src/chown.c:124 +msgid " Chown command " +msgstr " Yömle komutasý " + +#: src/chown.c:126 +msgid " User name " +msgstr " Kullanýcý adý " + +#: src/chown.c:192 +msgid "" +msgstr "" + +#. add fields for unknown names (numbers) +#: src/chown.c:193 +msgid "" +msgstr "" + +#: src/chown.c:261 +msgid " I can't run the Chown command on an extfs " +msgstr "" + +#: src/chown.c:265 +msgid " I can't run the Chown command on a tarfs " +msgstr "" + +#: src/cmd.c:198 +#, c-format +msgid " Can not fetch a local copy of %s " +msgstr "" + +#: src/cmd.c:248 +msgid " CD " +msgstr "" + +#: src/cmd.c:248 +msgid "Files tagged, want to cd?" +msgstr "" + +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 +msgid "Could not change directory" +msgstr "" + +#: src/cmd.c:283 +msgid " View file " +msgstr " Dosyayý göster " + +#: src/cmd.c:283 +msgid " Filename:" +msgstr " Dosya adý :" + +#: src/cmd.c:300 +msgid " Filtered view " +msgstr "" + +#: src/cmd.c:300 +msgid " Filter command and arguments:" +msgstr "" + +#: src/cmd.c:388 +msgid "Create a new Directory" +msgstr "" + +#: src/cmd.c:388 +msgid " Enter directory name:" +msgstr " Dizin adýný ver :" + +#: src/cmd.c:449 +msgid " Filter " +msgstr " Filtra " + +#: src/cmd.c:449 +msgid " Set expression for filtering filenames" +msgstr "" + +#: src/cmd.c:515 +msgid " Select " +msgstr "" + +#: src/cmd.c:567 +msgid " Unselect " +msgstr "" + +#: src/cmd.c:640 +msgid "Extension file edit" +msgstr "" + +#: src/cmd.c:641 +msgid " Which extension file you want to edit? " +msgstr "" + +#: src/cmd.c:642 +msgid "&User" +msgstr "" + +#: src/cmd.c:642 src/cmd.c:668 +msgid "&System Wide" +msgstr "" + +#: src/cmd.c:665 +msgid "Menu file edit" +msgstr "" + +#: src/cmd.c:666 +msgid " Which menu file will you edit? " +msgstr "" + +#: src/cmd.c:668 +msgid "&Local" +msgstr "Yere&l" + +#: src/cmd.c:668 +msgid "&Home" +msgstr "" + +#: src/cmd.c:858 +msgid " Compare directories " +msgstr "" + +#: src/cmd.c:858 +msgid " Select compare method: " +msgstr "" + +#: src/cmd.c:859 +msgid "&Quick" +msgstr "" + +#: src/cmd.c:859 +msgid "&Size only" +msgstr "" + +#: src/cmd.c:859 +msgid "&Thorough" +msgstr "" + +#: src/cmd.c:869 +msgid " Both panels should be on the listing view mode to use this command " +msgstr "" + +#: src/cmd.c:883 +msgid " The command history is empty " +msgstr "" + +#: src/cmd.c:889 +msgid " Command history " +msgstr "" + +#: src/cmd.c:931 +msgid "" +" Not an xterm or Linux console; \n" +" the panels cannot be toggled. " +msgstr "" + +#: src/cmd.c:970 +msgid "Type `exit' to return to the Midnight Commander" +msgstr "" + +#: src/cmd.c:1025 +#, c-format +msgid "" +" Couldn't stat %s \n" +" %s " +msgstr "" + +#: src/cmd.c:1034 src/cmd.c:1036 +msgid " Link " +msgstr "" + +#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 +msgid " to:" +msgstr "" + +#: src/cmd.c:1046 +#, c-format +msgid " link: %s " +msgstr "" + +#: src/cmd.c:1079 +#, c-format +msgid " symlink: %s " +msgstr "" + +#: src/cmd.c:1133 +#, c-format +msgid " Symlink `%s' points to: " +msgstr "" + +#: src/cmd.c:1138 +msgid " Edit symlink " +msgstr "" + +#: src/cmd.c:1143 +#, c-format +msgid " edit symlink, unable to remove %s: %s " +msgstr "" + +#: src/cmd.c:1147 +#, c-format +msgid " edit symlink: %s " +msgstr "" + +#: src/cmd.c:1174 +msgid " Link symbolically " +msgstr "" + +#: src/cmd.c:1175 +msgid " Relative symlink " +msgstr "" + +#: src/cmd.c:1186 +#, c-format +msgid " relative symlink: %s " +msgstr "" + +#: src/cmd.c:1336 +msgid " Enter machine name (F1 for details): " +msgstr "" + +#: src/cmd.c:1360 +#, c-format +msgid " Could not chdir to %s " +msgstr "" + +#: src/cmd.c:1367 +msgid " Link to a remote machine " +msgstr "" + +#: src/cmd.c:1373 +msgid " FTP to machine " +msgstr "" + +#: src/cmd.c:1379 +msgid " SMB link to machine " +msgstr "" + +#: src/cmd.c:1389 +msgid " Socket source routing setup " +msgstr "" + +#: src/cmd.c:1390 +msgid " Enter host name to use as a source routing hop: " +msgstr "" + +#: src/cmd.c:1397 +msgid " Host name " +msgstr "" + +#: src/cmd.c:1397 +msgid " Error while looking up IP address " +msgstr "" + +#: src/cmd.c:1408 +msgid " Undelete files on an ext2 file system " +msgstr "" + +#: src/cmd.c:1409 +msgid "" +" Enter device (without /dev/) to undelete\n" +" files on: (F1 for details)" +msgstr "" + +#: src/cmd.c:1459 +msgid " Setup saved to ~/" +msgstr "" + +#: src/cmd.c:1464 +msgid " Setup " +msgstr "" + +#: src/command.c:170 +#, c-format +msgid "" +" Can't chdir to '%s' \n" +" %s " +msgstr "" + +#: src/command.c:198 +msgid " You can not execute commands on non-local filesystems" +msgstr "" + +#: src/dialog.c:56 +msgid "" +"\n" +"\n" +"\n" +"refresh stack underflow!\n" +"\n" +"\n" +msgstr "" + +#: src/dir.c:61 +msgid "&Unsorted" +msgstr "" + +#: src/dir.c:62 +msgid "&Name" +msgstr "" + +#: src/dir.c:63 +msgid "&Extension" +msgstr "" + +#: src/dir.c:64 +msgid "&Modify time" +msgstr "" + +#: src/dir.c:65 +msgid "&Access time" +msgstr "" + +#: src/dir.c:66 +msgid "&Change time" +msgstr "" + +#: src/dir.c:67 +msgid "&Size" +msgstr "" + +#: src/dir.c:68 +msgid "&Inode" +msgstr "" + +#. New sort orders +#: src/dir.c:71 +msgid "&Type" +msgstr "" + +#: src/dir.c:72 +msgid "&Links" +msgstr "" + +#: src/dir.c:73 +msgid "N&GID" +msgstr "" + +#: src/dir.c:74 +msgid "N&UID" +msgstr "" + +#: src/dir.c:75 +msgid "&Owner" +msgstr "" + +#: src/dir.c:76 +msgid "&Group" +msgstr "" + +#: src/dir.c:386 +#, c-format +msgid "File '%s' exists but can not be stat-ed: %s" +msgstr "" + +#: src/dir.c:657 +msgid "Unknown" +msgstr "" + +#: src/ext.c:143 src/user.c:499 +#, c-format +msgid "" +" Can't generate unique filename \n" +" %s " +msgstr "" + +#: src/ext.c:150 src/user.c:511 +#, c-format +msgid "" +" Can't create temporary command file \n" +" %s " +msgstr "" + +#: src/ext.c:165 src/user.c:533 +msgid " Parameter " +msgstr "" + +#: src/ext.c:315 +msgid " Can't execute commands on a Virtual File System directory " +msgstr "" + +#: src/ext.c:412 +msgid " file error" +msgstr "" + +#: src/ext.c:413 +msgid "Format of the " +msgstr "" + +#: src/ext.c:431 +msgid " file error " +msgstr "" + +#: src/ext.c:432 +msgid "Format of the ~/" +msgstr "" + +#: src/ext.c:432 +msgid "" +" file has changed\n" +"with version 3.0. You may want either to\n" +"copy it from " +msgstr "" + +#: src/ext.c:434 +msgid "" +"mc.ext or use that\n" +"file as an example of how to write it.\n" +msgstr "" + +#: src/ext.c:436 +msgid "mc.ext will be used for this moment." +msgstr "" + +#: src/file.c:154 src/tree.c:639 +msgid " Copy " +msgstr "" + +#: src/file.c:155 src/tree.c:677 +msgid " Move " +msgstr "" + +#: src/file.c:156 src/tree.c:745 +msgid " Delete " +msgstr "" + +#: src/file.c:244 +msgid " Invalid target mask " +msgstr "" + +#: src/file.c:342 +msgid " Could not make the hardlink " +msgstr "" + +#: src/file.c:384 +#, c-format +msgid "" +" Cannot read source link \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:394 +msgid "" +" Cannot make stable symlinks across non-local filesystems: \n" +"\n" +" Option Stable Symlinks will be disabled " +msgstr "" + +#: src/file.c:442 +#, c-format +msgid "" +" Cannot create target symlink \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:509 +#, c-format +msgid "" +" Cannot overwrite directory \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:518 +#, c-format +msgid "" +" Cannot stat source file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:531 +#, c-format +msgid " `%s' and `%s' are the same file. " +msgstr "" + +#: src/file.c:574 +#, c-format +msgid "" +" Cannot create special file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:583 src/file.c:812 +#, c-format +msgid "" +" Cannot chown target file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:592 src/file.c:831 +#, c-format +msgid "" +" Cannot chmod target file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:609 +#, c-format +msgid "" +" Cannot open source file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:619 +msgid " Reget failed, about to overwrite file " +msgstr "" + +#: src/file.c:625 +#, c-format +msgid "" +" Cannot fstat source file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:651 +#, c-format +msgid "" +" Cannot create target file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:665 +#, c-format +msgid "" +" Cannot fstat target file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:696 +#, c-format +msgid "" +" Cannot read source file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:726 +#, c-format +msgid "" +" Cannot write target file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:745 +msgid "(stalled)" +msgstr "" + +#: src/file.c:783 +#, c-format +msgid "" +" Cannot close source file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:792 +#, c-format +msgid "" +" Cannot close target file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:802 +msgid "Incomplete file was retrieved. Keep it?" +msgstr "" + +#: src/file.c:803 +msgid "&Delete" +msgstr "" + +#: src/file.c:803 src/hotlist.c:1443 +msgid "&Keep" +msgstr "" + +#: src/file.c:876 +#, c-format +msgid "" +" Cannot stat source directory \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:899 +#, c-format +msgid "" +" Source directory \"%s\" is not a directory \n" +" %s " +msgstr "" + +#. we found a cyclic symbolic link +#: src/file.c:907 +#, c-format +msgid "" +" Cannot copy cyclic symbolic link \n" +" `%s' " +msgstr "" + +#: src/file.c:964 +#, c-format +msgid "" +" Cannot create target directory \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:987 +#, c-format +msgid "" +" Cannot chown target directory \"%s\" \n" +" %s " +msgstr "" + +#. Source doesn't exist +#: src/file.c:1100 +#, c-format +msgid "" +" Cannot stat file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:1122 +#, c-format +msgid " `%s' and `%s' are the same file " +msgstr "" + +#: src/file.c:1129 +#, c-format +msgid " Cannot overwrite directory `%s' " +msgstr "" + +#: src/file.c:1172 +#, c-format +msgid "" +" Cannot move file \"%s\" to \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:1192 +#, c-format +msgid "" +" Cannot remove file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:1246 +#, c-format +msgid " `%s' and `%s' are the same directory " +msgstr "" + +#: src/file.c:1265 +#, c-format +msgid " Cannot overwrite directory \"%s\" %s " +msgstr "" + +#: src/file.c:1267 +#, c-format +msgid " Cannot overwrite file \"%s\" %s " +msgstr "" + +#: src/file.c:1294 +#, c-format +msgid "" +" Cannot move directory \"%s\" to \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:1357 +#, c-format +msgid "" +" Cannot delete file \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:1418 src/file.c:1488 src/file.c:1520 +#, c-format +msgid "" +" Cannot remove directory \"%s\" \n" +" %s " +msgstr "" + +#: src/file.c:1559 +msgid " Internal error: get_file \n" +msgstr "" + +#. +#. * This array introduced to avoid translation problems. The former (op_names) +#. * is assumed to be nouns, suitable in dialog box titles; this one should +#. * contain whatever is used in prompt itself (i.e. in russian, it's verb). +#. * Notice first symbol - it is to fool gettext and force these strings to +#. * be different for it. First symbol is skipped while building a prompt. +#. * (I don't use spaces around the words, because someday they could be +#. * dropped, when widgets get smarter) +#. +#: src/file.c:1680 +msgid "1Copy" +msgstr "" + +#: src/file.c:1680 +msgid "1Move" +msgstr "" + +#: src/file.c:1680 +msgid "1Delete" +msgstr "" + +#: src/file.c:1695 +#, c-format +msgid "%o %f \"%s\"%m" +msgstr "" + +#: src/file.c:1696 +#, c-format +msgid "%o %d %f%m" +msgstr "" + +#: src/file.c:1698 +#, c-format +msgid "%o %f \"%s\"%e" +msgstr "" + +#: src/file.c:1699 +#, c-format +msgid "%o %d %f%e" +msgstr "" + +#: src/file.c:1703 +msgid "file" +msgstr "" + +#: src/file.c:1703 +msgid "files" +msgstr "" + +#: src/file.c:1703 +msgid "directory" +msgstr "" + +#: src/file.c:1703 +msgid "directories" +msgstr "" + +#: src/file.c:1704 +msgid "files/directories" +msgstr "" + +#: src/file.c:1704 +msgid " with source mask:" +msgstr "" + +#: src/file.c:1856 +msgid " Can't operate on \"..\"! " +msgstr "" + +#: src/file.c:1875 src/screen.c:2117 +msgid "Yes" +msgstr "" + +#: src/file.c:1875 src/screen.c:2117 +msgid "No" +msgstr "" + +#: src/file.c:1928 +msgid " Sorry, I could not put the job in background " +msgstr "" + +#: src/file.c:2014 src/file.c:2098 +msgid " Internal failure " +msgstr "" + +#: src/file.c:2014 src/file.c:2098 +msgid " Unknown file operation " +msgstr "" + +#: src/file.c:2029 +#, c-format +msgid "" +" Destination \"%s\" must be a directory \n" +" %s " +msgstr "" + +#: src/file.c:2190 +msgid "&Retry" +msgstr "" + +#: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 +msgid "&Abort" +msgstr "" + +#: src/file.c:2242 +msgid "" +"\n" +" Directory not empty. \n" +" Delete it recursively? " +msgstr "" + +#: src/file.c:2243 +msgid "" +"\n" +" Background process: Directory not empty \n" +" Delete it recursively? " +msgstr "" + +#: src/file.c:2250 +msgid "a&ll" +msgstr "" + +#: src/file.c:2250 src/filegui.c:595 +msgid "non&E" +msgstr "" + +#: src/file.c:2260 +msgid " Type 'yes' if you REALLY want to delete " +msgstr "" + +#: src/file.c:2262 +msgid "all the directories " +msgstr "" + +#: src/file.c:2264 +msgid " Recursive Delete " +msgstr "" + +#: src/file.c:2265 +msgid " Background process: Recursive Delete " +msgstr "" + +#: src/filegui.c:424 +msgid "File" +msgstr "" + +#: src/filegui.c:447 +msgid "Count" +msgstr "" + +#: src/filegui.c:468 +msgid "Bytes" +msgstr "" + +#: src/filegui.c:505 +msgid "Source" +msgstr "" + +#: src/filegui.c:528 +msgid "Target" +msgstr "" + +#: src/filegui.c:550 +msgid "Deleting" +msgstr "" + +#: src/filegui.c:590 +#, c-format +msgid "Target file \"%s\" already exists!" +msgstr "" + +#: src/filegui.c:593 +msgid "if &Size differs" +msgstr "" + +#: src/filegui.c:596 +msgid "&Update" +msgstr "" + +#: src/filegui.c:598 +msgid "Overwrite all targets?" +msgstr "" + +#: src/filegui.c:600 +msgid "&Reget" +msgstr "" + +#: src/filegui.c:601 +msgid "ap&Pend" +msgstr "" + +#: src/filegui.c:604 +msgid "Overwrite this target?" +msgstr "" + +#: src/filegui.c:606 +#, c-format +msgid "Target date: %s, size %d" +msgstr "" + +#: src/filegui.c:608 +#, c-format +msgid "Source date: %s, size %d" +msgstr "" + +#: src/filegui.c:692 +msgid " File exists " +msgstr "" + +#: src/filegui.c:693 +msgid " Background process: File exists " +msgstr "" + +#. follow symlinks and preserve Attributes must be the first +#: src/filegui.c:805 +msgid "preserve &Attributes" +msgstr "" + +#. &op_preserve +#: src/filegui.c:807 +msgid "follow &Links" +msgstr "" + +#. &file_mask_op_follow_links +#: src/filegui.c:809 +msgid "to:" +msgstr "" + +#: src/filegui.c:810 +msgid "&Using shell patterns" +msgstr "" + +#: src/filegui.c:831 +msgid "&Background" +msgstr "" + +#: src/filegui.c:840 +msgid "&Stable Symlinks" +msgstr "" + +#. &file_mask_stable_symlinks +#: src/filegui.c:842 +msgid "&Dive into subdir if exists" +msgstr "" + +#: src/filegui.c:1001 +#, c-format +msgid "" +"Invalid source pattern `%s' \n" +" %s " +msgstr "" + +#: src/find.c:130 +msgid "&Suspend" +msgstr "" + +#: src/find.c:131 +msgid "Con&tinue" +msgstr "" + +#: src/find.c:132 +msgid "&Chdir" +msgstr "" + +#: src/find.c:133 +msgid "&Again" +msgstr "" + +#: src/find.c:134 +msgid "&Quit" +msgstr "" + +#: src/find.c:135 src/panelize.c:89 +msgid "Pane&lize" +msgstr "" + +#: src/find.c:136 +msgid "&View - F3" +msgstr "" + +#: src/find.c:137 +msgid "&Edit - F4" +msgstr "" + +#: src/find.c:170 +msgid "Start at:" +msgstr "" + +#: src/find.c:170 +msgid "Filename:" +msgstr "" + +#: src/find.c:170 +msgid "Content: " +msgstr "" + +#: src/find.c:171 src/main.c:1243 src/main.c:1267 +msgid "&Tree" +msgstr "&Aðaç" + +#: src/find.c:223 +msgid "Find File" +msgstr "" + +#: src/find.c:452 +#, c-format +msgid "Grepping in %s" +msgstr "" + +#: src/find.c:490 +msgid " Find/read " +msgstr "" + +#: src/find.c:490 +msgid " Problem reading from child " +msgstr "" + +#: src/find.c:537 +msgid "Finished" +msgstr "" + +#: src/find.c:561 src/view.c:1526 +#, c-format +msgid "Searching %s" +msgstr "" + +#: src/find.c:717 src/find.c:757 +msgid "Suspend" +msgstr "" + +#: src/find.c:717 +msgid "Restart" +msgstr "" + +#: src/find.c:719 src/find.c:821 src/find.c:960 src/find.c:1056 +msgid "Searching" +msgstr "" + +#: src/find.c:750 src/find.c:1031 +msgid "Find file" +msgstr "" + +#. The buttons +#: src/find.c:755 +msgid "Change to this directory" +msgstr "" + +#: src/find.c:756 +msgid "Search again" +msgstr "" + +#: src/find.c:761 +msgid "View this file" +msgstr "" + +#: src/find.c:762 +msgid "Edit this file" +msgstr "" + +#: src/find.c:763 +msgid "Send the results to a Panel" +msgstr "" + +#: src/fixhlp.c:171 +msgid "Usage: fixhlp \n" +msgstr "" + +#: src/fixhlp.c:176 +msgid "fixhlp: Cannot open toc for writing" +msgstr "" + +#: src/fixhlp.c:179 +msgid "" +"[Contents]\n" +" Topics:\n" +"\n" +msgstr "" + +#: src/help.c:279 +msgid "" +" Help file format error\n" +"" +msgstr "" + +#: src/help.c:318 +msgid " Internal bug: Double start of link area " +msgstr "" + +#: src/help.c:572 +msgid " Can't find node [Contents] in help file " +msgstr "" + +#: src/help.c:741 +msgid " Help " +msgstr "" + +#: src/help.c:766 src/user.c:637 +#, c-format +msgid "" +" Can't open file %s \n" +" %s " +msgstr "" + +#: src/help.c:771 +#, c-format +msgid " Can't find node %s in help file " +msgstr "" + +#: src/help.c:808 +msgid "Index" +msgstr "" + +#: src/help.c:810 +msgid "Prev" +msgstr "" + +#: src/hotlist.c:132 +msgid "&Move" +msgstr "" + +#: src/hotlist.c:133 src/hotlist.c:1443 src/panelize.c:88 src/wtools.c:383 +msgid "&Remove" +msgstr "" + +#: src/hotlist.c:134 src/hotlist.c:818 src/hotlist.c:915 +msgid "&Append" +msgstr "" + +#: src/hotlist.c:135 src/hotlist.c:816 src/hotlist.c:913 +msgid "&Insert" +msgstr "" + +#: src/hotlist.c:136 +msgid "New &Entry" +msgstr "" + +#: src/hotlist.c:137 +msgid "New &Group" +msgstr "" + +#: src/hotlist.c:139 +msgid "&Up" +msgstr "" + +#: src/hotlist.c:140 +msgid "&Add current" +msgstr "" + +#: src/hotlist.c:141 +msgid "Change &To" +msgstr "" + +#: src/hotlist.c:201 +msgid "Subgroup - press ENTER to see list" +msgstr "" + +#: src/hotlist.c:620 +msgid "Active VFS directories" +msgstr "" + +#: src/hotlist.c:620 +msgid "Directory hotlist" +msgstr "" + +#: src/hotlist.c:639 +msgid " Directory path " +msgstr "" + +#. This one holds the displayed pathname +#: src/hotlist.c:642 src/hotlist.c:689 +msgid " Directory label " +msgstr "" + +#: src/hotlist.c:663 +msgid "Moving " +msgstr "" + +#: src/hotlist.c:892 +msgid "New hotlist entry" +msgstr "" + +#: src/hotlist.c:892 +msgid "Directory label" +msgstr "" + +#: src/hotlist.c:892 +msgid "Directory path" +msgstr "" + +#: src/hotlist.c:973 +msgid " New hotlist group " +msgstr "" + +#: src/hotlist.c:973 +msgid "Name of new group" +msgstr "" + +#: src/hotlist.c:988 +#, c-format +msgid "Label for \"%s\":" +msgstr "" + +#: src/hotlist.c:992 +msgid " Add to hotlist " +msgstr "" + +#: src/hotlist.c:1029 +msgid " Remove: " +msgstr "" + +#: src/hotlist.c:1033 +msgid "" +"\n" +" Group not empty.\n" +" Remove it?" +msgstr "" + +#: src/hotlist.c:1378 +msgid " Top level group " +msgstr "" + +#: src/hotlist.c:1394 +msgid "Hotlist is now kept in file ~/" +msgstr "" + +#: src/hotlist.c:1396 +msgid "MC will load hotlist from ~/" +msgstr "" + +#: src/hotlist.c:1398 +msgid "and then delete [Hotlist] section there" +msgstr "" + +#: src/hotlist.c:1400 src/hotlist.c:1419 src/hotlist.c:1442 src/hotlist.c:1467 +msgid " Hotlist Load " +msgstr "" + +#: src/hotlist.c:1416 src/hotlist.c:1464 +msgid "MC was unable to write ~/" +msgstr "" + +#: src/hotlist.c:1417 +msgid " file, your old hotlist entries were not deleted" +msgstr "" + +#: src/hotlist.c:1431 +msgid "You have ~/" +msgstr "" + +#: src/hotlist.c:1431 +msgid " file and [Hotlist] section in ~/" +msgstr "" + +#: src/hotlist.c:1432 +msgid "Your ~/" +msgstr "" + +#: src/hotlist.c:1432 +msgid " most probably was created\n" +msgstr "" + +#: src/hotlist.c:1433 +msgid "" +"by an earlier development version of MC\n" +"and is more actual than ~/" +msgstr "" + +#: src/hotlist.c:1434 +msgid "" +" entries\n" +"\n" +msgstr "" + +#: src/hotlist.c:1435 +msgid "" +"You can choose between\n" +"\n" +" Remove - remove old hotlist entries from ~/" +msgstr "" + +#: src/hotlist.c:1437 +msgid "" +" Keep - keep your old entries; you will be asked\n" +" the same question next time\n" +" Merge - add old entries to hotlist as group \"Entries from ~/" +msgstr "" + +#: src/hotlist.c:1443 +msgid "&Merge" +msgstr "" + +#: src/hotlist.c:1455 +msgid " Entries from ~/" +msgstr "" + +#: src/hotlist.c:1465 +msgid " file your old hotlist entries were not deleted" +msgstr "" + +#: src/info.c:83 +#, c-format +msgid "Midnight Commander %s" +msgstr "Midnight Commander %s" + +#: src/info.c:109 +#, c-format +msgid "File: %s" +msgstr "Dosya : %s" + +#: src/info.c:122 +msgid "Free nodes %d (%d%%) of %d" +msgstr "" + +#: src/info.c:128 +msgid "No node information" +msgstr "" + +#: src/info.c:133 +msgid "Free space " +msgstr "" + +#: src/info.c:135 +msgid " (%d%%) of " +msgstr "" + +#: src/info.c:139 +msgid "No space information" +msgstr "" + +#: src/info.c:143 +#, c-format +msgid "Type: %s " +msgstr "" + +#: src/info.c:143 +msgid "non-local vfs" +msgstr "" + +#: src/info.c:149 +#, c-format +msgid "Device: %s" +msgstr "" + +#: src/info.c:153 +#, c-format +msgid "Filesystem: %s" +msgstr "" + +#: src/info.c:158 +#, c-format +msgid "Accessed: %s" +msgstr "" + +#: src/info.c:162 +#, c-format +msgid "Modified: %s" +msgstr "" + +#: src/info.c:166 +#, c-format +msgid "Created: %s" +msgstr "" + +#: src/info.c:179 +msgid "Size: " +msgstr "" + +#: src/info.c:182 +#, c-format +msgid " (%d blocks)" +msgstr "" + +#: src/info.c:188 +#, c-format +msgid "Owner: %s/%s" +msgstr "" + +#: src/info.c:193 +#, c-format +msgid "Links: %d" +msgstr "" + +#: src/info.c:197 +#, c-format +msgid "Mode: %s (%04o)" +msgstr "" + +#: src/info.c:202 +#, c-format +msgid "Location: %Xh:%Xh" +msgstr "" + +#: src/info.c:212 +msgid "File: None" +msgstr "" + +#: src/layout.c:159 +msgid "&Vertical" +msgstr "D&ikey" + +#: src/layout.c:160 +msgid "&Horizontal" +msgstr "U&fki" + +#: src/layout.c:170 +msgid "&Xterm hintbar" +msgstr "&Xterm yardým satrý" + +#: src/layout.c:171 +msgid "h&Intbar visible" +msgstr "" + +#: src/layout.c:172 +msgid "&Keybar visible" +msgstr "" + +#: src/layout.c:173 +msgid "command &Prompt" +msgstr "komuta" + +#: src/layout.c:174 +msgid "show &Mini status" +msgstr "" + +#: src/layout.c:175 +msgid "menu&Bar visible" +msgstr "" + +#: src/layout.c:176 +msgid "&Equal split" +msgstr "&Eþit böl" + +#: src/layout.c:177 +msgid "pe&Rmissions" +msgstr "hakla&r" + +#: src/layout.c:178 +msgid "&File types" +msgstr "" + +#: src/layout.c:372 src/learn.c:60 src/learn.c:179 src/option.c:145 +msgid "&Save" +msgstr "" + +#. length of line with '<' '>' buttons +#: src/layout.c:380 +msgid " Layout " +msgstr " Dizinim " + +#: src/layout.c:381 +msgid " Panel split " +msgstr " Panle bölüþümü " + +#: src/layout.c:382 +msgid " Highlight... " +msgstr " Yükselim ..." + +#: src/layout.c:383 src/option.c:156 +msgid " Other options " +msgstr " Öbür ayarlar " + +#: src/layout.c:384 +msgid "output lines" +msgstr "" + +#: src/layout.c:451 +msgid "Layout" +msgstr "Dizinim" + +#: src/learn.c:74 +msgid " Learn keys " +msgstr " Tuþlarý öðren " + +#: src/learn.c:93 +msgid " Teach me a key " +msgstr " Bana bir tuþu öðret " + +#: src/learn.c:94 +#, c-format +msgid "" +"Please press the %s\n" +"and then wait until this message disappears.\n" +"\n" +"Then, press it again to see if OK appears\n" +"next to its button.\n" +"\n" +"If you want to escape, press a single Escape key\n" +"and wait as well." +msgstr "" + +#: src/learn.c:122 +msgid " Cannot accept this key " +msgstr "" + +#: src/learn.c:123 +#, c-format +msgid " You have entered \"%s\"" +msgstr "" + +#: src/learn.c:170 +msgid "OK" +msgstr "Oldu" + +#: src/learn.c:177 +msgid "" +"It seems that all your keys already\n" +"work fine. That's great." +msgstr "" + +#: src/learn.c:179 +msgid "&Discard" +msgstr "U&nut" + +#: src/learn.c:183 +msgid "" +"Great! You have a complete terminal database!\n" +"All your keys work well." +msgstr "" + +#: src/learn.c:267 +msgid "Learn keys" +msgstr "" + +#: src/learn.c:300 +msgid "Press all the keys mentioned here. After you have done it, check" +msgstr "" + +#: src/learn.c:302 +msgid "which keys are not marked with OK. Press space on the missing" +msgstr "" + +#: src/learn.c:304 +msgid "key, or click with the mouse to define it. Move around with Tab." +msgstr "" + +#: src/main.c:707 +msgid "" +" The Commander can't change to the directory that \n" +" the subshell claims you are in. Perhaps you have \n" +" deleted your working directory, or given yourself \n" +" extra access permissions with the \"su\" command? " +msgstr "" + +#: src/main.c:782 +msgid "Press any key to continue..." +msgstr "" + +#: src/main.c:832 +msgid " The shell is already running a command " +msgstr "" + +#: src/main.c:859 src/screen.c:2115 src/screen.c:2163 +msgid " The Midnight Commander " +msgstr "" + +#: src/main.c:860 +msgid " Do you really want to quit the Midnight Commander? " +msgstr "" + +#: src/main.c:1240 src/main.c:1264 +msgid "&Listing mode..." +msgstr "Sýra&lama türü ..." + +#: src/main.c:1241 src/main.c:1265 +msgid "&Quick view C-x q" +msgstr "Çab&uk bakýþ C-x q" + +#: src/main.c:1242 src/main.c:1266 +msgid "&Info C-x i" +msgstr "B&ilgi C-x i" + +#: src/main.c:1245 src/main.c:1269 +msgid "&Sort order..." +msgstr "&sýralama türü ..." + +#: src/main.c:1247 src/main.c:1271 +msgid "&Filter..." +msgstr "&Filtra ..." + +#: src/main.c:1250 src/main.c:1274 +msgid "&Network link..." +msgstr "Þ&ebeke baðý ..." + +#: src/main.c:1251 src/main.c:1275 +msgid "FT&P link..." +msgstr "FT&P baðý ..." + +#: src/main.c:1253 src/main.c:1277 +msgid "SM&B link..." +msgstr "" + +#: src/main.c:1258 src/main.c:1282 +msgid "&Drive... M-d" +msgstr "Sürü&cü .. M-d" + +#: src/main.c:1260 src/main.c:1284 +msgid "&Rescan C-r" +msgstr "Yeniden ta&ra C-r" + +#: src/main.c:1288 +msgid "&User menu F2" +msgstr "K&ullanýcý mönüsü F2" + +#: src/main.c:1289 +msgid "&View F3" +msgstr "&Göster F3" + +#: src/main.c:1290 +msgid "Vie&w file... " +msgstr "Dosyaya ba&k ..." + +#: src/main.c:1291 +msgid "&Filtered view M-!" +msgstr "&Filtralý bakýþ M-!" + +#: src/main.c:1292 +msgid "&Edit F4" +msgstr "D&eðiþtir F4" + +#: src/main.c:1293 +msgid "&Copy F5" +msgstr "&Kopyala F5" + +#: src/main.c:1294 +msgid "c&Hmod C-x c" +msgstr "y&ömlr C-x x" + +#: src/main.c:1296 +msgid "&Link C-x l" +msgstr "Bað&la C-x l" + +#: src/main.c:1297 +msgid "&SymLink C-x s" +msgstr "Yumþak&Baðla C-x s" + +#: src/main.c:1298 +msgid "edit s&Ymlink C-x C-s" +msgstr "YBaðý deðiþtir C-x C-s" + +#: src/main.c:1299 +msgid "ch&Own C-x o" +msgstr "yö&mle C-x o" + +#: src/main.c:1300 +msgid "&Advanced chown " +msgstr "Geliþmiþ y&ömle " + +#: src/main.c:1302 +msgid "&Rename/Move F6" +msgstr "YenidenAd/&Taþý F6" + +#: src/main.c:1303 +msgid "&Mkdir F7" +msgstr "D&izin yarat F7" + +#: src/main.c:1304 +msgid "&Delete F8" +msgstr "&Sil F8" + +#: src/main.c:1305 +msgid "&Quick cd M-c" +msgstr "Çabuk dizine geç M-c" + +#: src/main.c:1307 +msgid "select &Group M-+" +msgstr "&Kitle seç M-+" + +#: src/main.c:1308 +msgid "u&Nselect group M-\\" +msgstr "Kitle&yi seçme M-\\" + +#: src/main.c:1309 +msgid "reverse selec&Tion M-*" +msgstr "Kitleyi te&rsle M-*" + +#: src/main.c:1311 +msgid "e&Xit F10" +msgstr "Çýk F10" + +#: src/main.c:1321 +msgid "&Directory tree" +msgstr "&Dizinler aðaçý" + +#: src/main.c:1323 +msgid "&Find file M-?" +msgstr "Dosya b&ul M-?" + +#: src/main.c:1324 +msgid "s&Wap panels C-u" +msgstr "Panelleri &deðiþtir C-u" + +#: src/main.c:1325 +msgid "switch &Panels on/off C-o" +msgstr "&Panelleri kapat/aç C-o" + +#: src/main.c:1326 +msgid "&Compare directories C-x d" +msgstr "Dizinleri karþýlaþtýr C-x d" + +#: src/main.c:1327 +msgid "e&Xternal panelize C-x !" +msgstr "D6ýþarýdan panelle C-x !" + +#: src/main.c:1328 +msgid "show directory s&Izes" +msgstr "diz&inlerin boyutunu göster" + +#: src/main.c:1330 +msgid "command &History" +msgstr "komuta geçmiþi" + +#: src/main.c:1331 +msgid "di&Rectory hotlist C-\\" +msgstr "Di&zinler geçmiþi C-\\" + +#: src/main.c:1333 +msgid "&Active VFS list C-x a" +msgstr "&Geçerli VFS listesi C-x a" + +#: src/main.c:1334 +msgid "Fr&ee VFSs now" +msgstr "VFS'i þimdi boþalt" + +#: src/main.c:1337 +msgid "&Background jobs C-x j" +msgstr "&Ardalan iþlemleri C-x j" + +#: src/main.c:1341 +msgid "&Undelete files (ext2fs only)" +msgstr "Dosyalarý k&urtar (sadece ext2fs'de)" + +#: src/main.c:1344 +msgid "&Listing format edit" +msgstr "" + +#: src/main.c:1346 +msgid "&Extension file edit" +msgstr "Dosya son&eklerini deðiþtir" + +#: src/main.c:1347 +msgid "&Menu file edit" +msgstr "Mön&üyü deðiþtir" + +#: src/main.c:1352 +msgid "&Configuration..." +msgstr "&Ayarlar ..." + +#: src/main.c:1354 +msgid "c&Onfirmation..." +msgstr "&Onaylama ..." + +#: src/main.c:1355 +msgid "&Display bits..." +msgstr "Bitleri &göster ..." + +#: src/main.c:1357 +msgid "learn &Keys..." +msgstr "Tu&þlarý öðren ..." + +#: src/main.c:1360 +msgid "&Virtual FS..." +msgstr "&Sanal DYS (VFS) ..." + +#: src/main.c:1363 +msgid "&Save setup" +msgstr "A&yarlarý kaydet" + +#: src/main.c:1379 src/main.c:1381 +msgid " &Left " +msgstr " &Sol " + +#: src/main.c:1381 +msgid " &Above " +msgstr " &Üst " + +#: src/main.c:1384 +msgid " &File " +msgstr " &Dosya " + +#: src/main.c:1385 +msgid " &Command " +msgstr " &Komuta " + +#: src/main.c:1386 +msgid " &Options " +msgstr " &Ayarlar " + +#: src/main.c:1388 src/main.c:1390 +msgid " &Right " +msgstr " &Sað " + +#: src/main.c:1390 +msgid " &Below " +msgstr " &Alt" + +#: src/main.c:1445 +msgid " Information " +msgstr " Bilgi " + +#: src/main.c:1446 +msgid "" +" Using the fast reload option may not reflect the exact \n" +" directory contents. In this cases you'll need to do a \n" +" manual reload of the directory. See the man page for \n" +" the details. " +msgstr "" + +#: src/main.c:1925 +msgid "Thank you for using GNU Midnight Commander" +msgstr "GNU Midinight Commander'i kullandýðýn için teþekkürler" + +#: src/main.c:2284 +#, c-format +msgid "with mouse support on xterm%s.\n" +msgstr "" + +#: src/main.c:2285 +msgid " and the Linux console" +msgstr "" + +#: src/main.c:2381 +msgid "The TERM environment variable is unset!\n" +msgstr "" + +#: src/main.c:2592 +#, c-format +msgid "Library directory for the Midnight Commander: %s\n" +msgstr "" + +#: src/main.c:2606 +msgid "" +"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" +msgstr "" + +#: src/main.c:2683 +msgid "Use to debug the background code" +msgstr "" + +#: src/main.c:2689 +msgid "Request to run in color mode" +msgstr "" + +#: src/main.c:2691 +msgid "Specifies a color configuration" +msgstr "" + +#: src/main.c:2696 +msgid "Edits one file" +msgstr "" + +#: src/main.c:2700 +msgid "Displays this help message" +msgstr "" + +#: src/main.c:2703 +msgid "Displays a help screen on how to change the color scheme" +msgstr "" + +#: src/main.c:2706 +msgid "Log ftp dialog to specified file" +msgstr "" + +#: src/main.c:2713 +msgid "Obsolete" +msgstr "" + +#: src/main.c:2715 +msgid "Requests to run in black and white" +msgstr "" + +#: src/main.c:2717 +msgid "Disable mouse support in text version" +msgstr "" + +#: src/main.c:2720 +msgid "Disables subshell support" +msgstr "" + +#: src/main.c:2724 +msgid "Prints working directory at program exit" +msgstr "" + +#: src/main.c:2726 +msgid "Resets soft keys on HP terminals" +msgstr "" + +#: src/main.c:2728 +msgid "To run on slow terminals" +msgstr "" + +#: src/main.c:2731 +msgid "Use stickchars to draw" +msgstr "" + +#: src/main.c:2735 +msgid "Enables subshell support (default)" +msgstr "" + +#: src/main.c:2740 +msgid "Tries to use termcap instead of terminfo" +msgstr "" + +#: src/main.c:2744 +msgid "Displays the current version" +msgstr "" + +#: src/main.c:2746 +msgid "Launches the file viewer on a file" +msgstr "" + +#: src/main.c:2748 +msgid "Forces xterm features" +msgstr "" + +#: src/main.c:2750 +msgid "Geometry for the window" +msgstr "" + +#: src/main.c:2750 +msgid "GEOMETRY" +msgstr "" + +#: src/main.c:2751 +msgid "No windows opened at startup" +msgstr "" + +#: src/main.c:2753 +msgid "Display the directory that holds the .links startup files and exit" +msgstr "" + +#: src/main.c:3051 +msgid "" +"Couldn't open tty line. You have to run mc without the -P flag.\n" +"On some systems you may want to run # `which mc`\n" +msgstr "" + +#: src/main.c:3129 +msgid " Notice " +msgstr "" + +#: src/main.c:3130 +msgid "" +" The Midnight Commander configuration files \n" +" are now stored in the ~/.mc directory, the \n" +" files have been moved now\n" +msgstr "" + +#: src/option.c:74 +msgid "safe de&Lete" +msgstr "güvenilir si&lme" + +#: src/option.c:75 +msgid "cd follows lin&Ks" +msgstr "" + +#: src/option.c:76 +msgid "advanced cho&Wn" +msgstr "" + +#: src/option.c:77 +msgid "l&Ynx-like motion" +msgstr "" + +#: src/option.c:79 +msgid "Animation" +msgstr "" + +#: src/option.c:81 +msgid "rotatin&G dash" +msgstr "" + +#: src/option.c:83 +msgid "co&Mplete: show all" +msgstr "" + +#: src/option.c:84 +msgid "&Use internal view" +msgstr "" + +#: src/option.c:85 +msgid "use internal ed&It" +msgstr "" + +#: src/option.c:86 +msgid "auto m&Enus" +msgstr "" + +#: src/option.c:87 +msgid "&Auto save setup" +msgstr "" + +#: src/option.c:88 +msgid "shell &Patterns" +msgstr "" + +#: src/option.c:89 +msgid "Compute &Totals" +msgstr "" + +#: src/option.c:90 +msgid "&Verbose operation" +msgstr "" + +#: src/option.c:91 +msgid "&Fast dir reload" +msgstr "" + +#: src/option.c:92 +msgid "mi&X all files" +msgstr "" + +#: src/option.c:93 +msgid "&Drop down menus" +msgstr "" + +#: src/option.c:94 +msgid "ma&Rk moves down" +msgstr "" + +#: src/option.c:95 +msgid "show &Hidden files" +msgstr "gizli dosyalarý da göster" + +#: src/option.c:96 +msgid "show &Backup files" +msgstr "yedek dosyalara da &bak" + +#: src/option.c:103 +msgid "&Never" +msgstr "Hiç bir zama&n" + +#: src/option.c:104 +msgid "on dumb &Terminals" +msgstr "" + +#: src/option.c:105 +msgid "alwa&Ys" +msgstr "her z&aman" + +#. Similar code is in layout.c (init_layout()) +#: src/option.c:153 +msgid " Configure options " +msgstr "" + +#: src/option.c:154 +msgid " Panel options " +msgstr "" + +#: src/option.c:155 +msgid " Pause after run... " +msgstr "" + +#: src/option.c:207 +msgid "Configure options" +msgstr "" + +#: src/panelize.c:87 +msgid "&Add new" +msgstr "Yeni bir t&ane ekle" + +#: src/panelize.c:99 +msgid " External panelize " +msgstr "" + +#: src/panelize.c:194 src/panelize.c:458 +msgid "External panelize" +msgstr "" + +#: src/panelize.c:219 src/panelize.c:276 src/panelize.c:347 src/panelize.c:368 +msgid "Other command" +msgstr "Baþka komuta" + +#: src/panelize.c:260 +msgid " Add to external panelize " +msgstr "" + +#: src/panelize.c:261 +msgid " Enter command label: " +msgstr "" + +#: src/panelize.c:301 +msgid " I can't run external panelize while logged on a non local directory " +msgstr "" + +#: src/panelize.c:351 +msgid "Find *.orig after patching" +msgstr "" + +#: src/panelize.c:352 +msgid "Find SUID and SGID programs" +msgstr "" + +#: src/panelize.c:403 +msgid "Cannot invoke command." +msgstr "" + +#: src/panelize.c:458 +msgid "Pipe close failed" +msgstr "" + +#: src/popthelp.c:31 +msgid "Show this help message" +msgstr "Bu yardým ileitisini göster" + +#: src/popthelp.c:32 +msgid "Display brief usage message" +msgstr "" + +#: src/screen.c:417 +msgid "MTime" +msgstr "" + +#: src/screen.c:418 +msgid "ATime" +msgstr "" + +#: src/screen.c:419 +msgid "CTime" +msgstr "" + +#: src/screen.c:421 +msgid "Perm" +msgstr "" + +#: src/screen.c:422 +msgid "Nl" +msgstr "" + +#: src/screen.c:423 +msgid "Inode" +msgstr "" + +#: src/screen.c:424 +msgid "UID" +msgstr "" + +#: src/screen.c:425 +msgid "GID" +msgstr "" + +#: src/screen.c:661 +#, c-format +msgid " %s bytes in %d file%s" +msgstr "" + +#: src/screen.c:1325 +msgid "Unknow tag on display format: " +msgstr "" + +#: src/screen.c:1451 +msgid "User suplied format looks invalid, reverting to default." +msgstr "" + +#: src/screen.c:2116 src/screen.c:2164 +msgid " Do you really want to execute? " +msgstr "" + +#: src/screen.c:2129 src/screen.c:2179 +msgid " No action taken " +msgstr "" + +#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +msgid "RenMov" +msgstr "YenidenAd" + +#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +msgid "Mkdir" +msgstr "Dizinle" + +#: src/screen.c:2417 +#, c-format +msgid "" +" Can't chdir to %s \n" +" %s " +msgstr "" + +#: src/subshell.c:287 +#, c-format +msgid "Couldn't open named pipe %s\n" +msgstr "" + +#: src/subshell.c:705 +msgid " The shell is still active. Quit anyway? " +msgstr "" + +#: src/subshell.c:731 +msgid " There are stopped jobs." +msgstr "" + +#: src/subshell.c:732 +msgid " Quit anyway? " +msgstr " Illaki mi çýkayým mý ?" + +#: src/subshell.c:785 +#, c-format +msgid "Warning: Couldn't change to %s.\n" +msgstr "" + +#: src/tree.c:192 +#, c-format +msgid "" +"Can't open the %s file for writing:\n" +"%s\n" +msgstr "" + +#: src/tree.c:637 +#, c-format +msgid "Copy \"%s\" directory to:" +msgstr "\"%s\"'yi buraya kopyala :" + +#: src/tree.c:675 +#, c-format +msgid "Move \"%s\" directory to:" +msgstr "\"%s\"'yi buraya taþý :" + +#: src/tree.c:682 +#, c-format +msgid "" +" Can't stat the destination \n" +" %s " +msgstr "" + +#: src/tree.c:688 +msgid " The destination isn't a directory " +msgstr "" + +#: src/tree.c:744 +#, c-format +msgid " Delete %s? " +msgstr " %s silinsin mi ? " + +#: src/tree.c:776 +msgid "Static" +msgstr "Statik" + +#: src/tree.c:776 +msgid "Dynamc" +msgstr "Dinamik" + +#: src/tree.c:866 +#, c-format +msgid "" +" Can't chdir to \"%s\" \n" +" %s " +msgstr "" + +#: src/tree.c:1012 +msgid "Forget" +msgstr "Unut" + +#: src/tree.c:1025 +msgid "Rmdir" +msgstr "Dizini sil" + +#: src/treestore.c:360 +#, c-format +msgid "" +"Can't write to the %s file:\n" +"%s\n" +msgstr "" + +#: src/user.c:250 +#, c-format +msgid " Invalid shell pattern definition \"%c\". " +msgstr "" + +#: src/user.c:383 +msgid " Debug " +msgstr "" + +#: src/user.c:392 +msgid " ERROR: " +msgstr "" + +#: src/user.c:396 +msgid " True: " +msgstr "" + +#: src/user.c:398 +msgid " False: " +msgstr "" + +#: src/user.c:602 +msgid " Warning -- ignoring file " +msgstr "" + +#: src/user.c:603 +#, c-format +msgid "" +"File %s is not owned by root or you or is world writable.\n" +"Using it may compromise your security" +msgstr "" + +#: src/user.c:622 +msgid " I can't run programs while logged on a non local directory " +msgstr "" + +#. FIXME: this message is not quite right +#: src/user.c:720 +#, c-format +msgid " Empty file %s " +msgstr "" + +#. Create listbox +#: src/user.c:730 +msgid " User menu " +msgstr "" + +#: src/util.c:232 +msgid "name_trunc: too big" +msgstr "" + +#. strftime() format string for recent dates +#: src/util.c:599 src/util.c:624 +msgid "%b %e %H:%M" +msgstr "" + +#. strftime() format string for old dates +#: src/util.c:600 src/util.c:622 +msgid "%b %e %Y" +msgstr "" + +#: src/utilunix.c:390 +msgid " Pipe failed " +msgstr "" + +#: src/utilunix.c:394 +msgid " Dup failed " +msgstr "" + +#: src/view.c:401 +msgid "" +"File: \n" +"\n" +" " +msgstr "" + +#: src/view.c:402 +msgid "" +"\n" +"\n" +"has been modified, do you want to save the changes?\n" +msgstr "" + +#: src/view.c:404 +msgid " Save changes " +msgstr "" + +#: src/view.c:446 +msgid " Can't spawn child program " +msgstr "" + +#: src/view.c:455 +msgid " Empty output from child filter " +msgstr "" + +#: src/view.c:460 +msgid " Could not open file " +msgstr "" + +#: src/view.c:475 +msgid " Can't open file \"" +msgstr "" + +#: src/view.c:482 +msgid "" +" Can't stat file \n" +" " +msgstr "" + +#: src/view.c:488 +msgid " Can't view: not a regular file " +msgstr "" + +#: src/view.c:569 +#, c-format +msgid "" +" Can't open \"%s\"\n" +" %s " +msgstr "" + +#: src/view.c:578 +#, c-format +msgid "" +" Can't stat \"%s\"\n" +" %s " +msgstr "" + +#: src/view.c:714 +#, c-format +msgid "File: %s" +msgstr "" + +#: src/view.c:728 +#, c-format +msgid "Offset 0x%08x" +msgstr "" + +#: src/view.c:739 +msgid " [grow]" +msgstr "" + +#: src/view.c:1518 +#, c-format +msgid "Searching for `%s'" +msgstr "" + +#: src/view.c:1625 src/view.c:1748 +msgid " Search string not found " +msgstr "" + +#: src/view.c:1787 +msgid " Invalid regular expression " +msgstr "" + +#: src/view.c:1911 +#, c-format +msgid "" +" The current line number is %d.\n" +" Enter the new line number:" +msgstr "" + +#: src/view.c:1933 +#, c-format +msgid "" +" The current address is 0x%lx.\n" +" Enter the new address:" +msgstr "" + +#: src/view.c:1935 +msgid " Goto Address " +msgstr "" + +#: src/view.c:1966 +msgid " Enter regexp:" +msgstr "" + +#: src/view.c:2071 +msgid "Ascii" +msgstr "Ascii" + +#: src/view.c:2071 +msgid "Hex" +msgstr "Heksades." + +#: src/view.c:2072 +msgid "Goto" +msgstr "Git" + +#: src/view.c:2072 +msgid "Line" +msgstr "Fýkra" + +#: src/view.c:2075 +msgid "RxSrch" +msgstr "" + +#: src/view.c:2078 +msgid "EdText" +msgstr "" + +#: src/view.c:2078 +msgid "EdHex" +msgstr "" + +#: src/view.c:2080 +msgid "UnWrap" +msgstr "Kýrma" + +#: src/view.c:2080 +msgid "Wrap" +msgstr "Kýr" + +#: src/view.c:2083 +msgid "HxSrch" +msgstr "" + +#: src/view.c:2086 +msgid "Raw" +msgstr "Saf" + +#: src/view.c:2086 +msgid "Parse" +msgstr "Tara" + +#: src/view.c:2090 +msgid "Unform" +msgstr "" + +#: src/view.c:2090 +msgid "Format" +msgstr "" + +#: src/widget.c:999 +msgid " History " +msgstr "" + +#. KEY_F(0) is not here, since we are mapping it to f10, so there is no reason +#. to define f0 as well. Also, it makes Learn keys a bunch of problems :( +#: src/win.c:224 +msgid "Function key 1" +msgstr "" + +#: src/win.c:225 +msgid "Function key 2" +msgstr "" + +#: src/win.c:226 +msgid "Function key 3" +msgstr "" + +#: src/win.c:227 +msgid "Function key 4" +msgstr "" + +#: src/win.c:228 +msgid "Function key 5" +msgstr "" + +#: src/win.c:229 +msgid "Function key 6" +msgstr "" + +#: src/win.c:230 +msgid "Function key 7" +msgstr "" + +#: src/win.c:231 +msgid "Function key 8" +msgstr "" + +#: src/win.c:232 +msgid "Function key 9" +msgstr "" + +#: src/win.c:233 +msgid "Function key 10" +msgstr "" + +#: src/win.c:234 +msgid "Function key 11" +msgstr "" + +#: src/win.c:235 +msgid "Function key 12" +msgstr "" + +#: src/win.c:236 +msgid "Function key 13" +msgstr "" + +#: src/win.c:237 +msgid "Function key 14" +msgstr "" + +#: src/win.c:238 +msgid "Function key 15" +msgstr "" + +#: src/win.c:239 +msgid "Function key 16" +msgstr "" + +#: src/win.c:240 +msgid "Function key 17" +msgstr "" + +#: src/win.c:241 +msgid "Function key 18" +msgstr "" + +#: src/win.c:242 +msgid "Function key 19" +msgstr "" + +#: src/win.c:243 +msgid "Function key 20" +msgstr "" + +#: src/win.c:244 +msgid "Backspace key" +msgstr "" + +#: src/win.c:245 +msgid "End key" +msgstr "" + +#: src/win.c:246 +msgid "Up arrow key" +msgstr "" + +#: src/win.c:247 +msgid "Down arrow key" +msgstr "" + +#: src/win.c:248 +msgid "Left arrow key" +msgstr "" + +#: src/win.c:249 +msgid "Right arrow key" +msgstr "" + +#: src/win.c:250 +msgid "Home key" +msgstr "" + +#: src/win.c:251 +msgid "Page Down key" +msgstr "" + +#: src/win.c:252 +msgid "Page Up key" +msgstr "" + +#: src/win.c:253 +msgid "Insert key" +msgstr "" + +#: src/win.c:254 +msgid "Delete key" +msgstr "" + +#: src/win.c:255 +msgid "Completion/M-tab" +msgstr "" + +#: src/win.c:256 +msgid "+ on keypad" +msgstr "" + +#: src/win.c:257 +msgid "- on keypad" +msgstr "" + +#: src/win.c:258 +msgid "* on keypad" +msgstr "" + +#. From here on, these won't be shown in Learn keys (no space) +#: src/win.c:260 +msgid "Left arrow keypad" +msgstr "" + +#: src/win.c:261 +msgid "Right arrow keypad" +msgstr "" + +#: src/win.c:262 +msgid "Up arrow keypad" +msgstr "" + +#: src/win.c:263 +msgid "Down arrow keypad" +msgstr "" + +#: src/win.c:264 +msgid "Home on keypad" +msgstr "" + +#: src/win.c:265 +msgid "End on keypad" +msgstr "" + +#: src/win.c:266 +msgid "Page Down keypad" +msgstr "" + +#: src/win.c:267 +msgid "Page Up keypad" +msgstr "" + +#: src/win.c:268 +msgid "Insert on keypad" +msgstr "" + +#: src/win.c:269 +msgid "Delete on keypad" +msgstr "" + +#: src/win.c:270 +msgid "Enter on keypad" +msgstr "" + +#: src/win.c:271 +msgid "Slash on keypad" +msgstr "" + +#: src/win.c:272 +msgid "NumLock on keypad" +msgstr "" + +#: vfs/extfs.c:268 +#, c-format +msgid "" +"Couldn't open %s archive\n" +"%s" +msgstr "" + +#: vfs/extfs.c:300 vfs/extfs.c:320 +msgid "Inconsistent extfs archive" +msgstr "" + +#: vfs/fish.c:136 +#, c-format +msgid "fish: Disconnecting from %s" +msgstr "" + +#: vfs/fish.c:214 +msgid "fish: Waiting for initial line..." +msgstr "" + +#: vfs/fish.c:224 +msgid "Sorry, we can not do password authenticated connections for now." +msgstr "" + +#: vfs/fish.c:238 +msgid "fish: Sending password..." +msgstr "" + +#: vfs/fish.c:244 +msgid "fish: Sending initial line..." +msgstr "" + +#: vfs/fish.c:248 +msgid "fish: Handshaking version..." +msgstr "" + +#: vfs/fish.c:252 +msgid "fish: Setting up current directory..." +msgstr "" + +#: vfs/fish.c:254 +#, c-format +msgid "fish: Connected, home %s." +msgstr "" + +#: vfs/fish.c:330 +#, c-format +msgid "fish: Reading directory %s..." +msgstr "" + +#: vfs/fish.c:426 +msgid "fish: failed" +msgstr "" + +#. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) +#: vfs/fish.c:446 +#, c-format +msgid "fish: store %s: sending command..." +msgstr "" + +#: vfs/fish.c:460 +msgid "fish: Local read failed, sending zeros" +msgstr "" + +#: vfs/fish.c:472 +#, c-format +msgid "fish: storing %s %d (%d)" +msgstr "" + +#: vfs/fish.c:512 +msgid "Aborting transfer..." +msgstr "" + +#: vfs/fish.c:521 +msgid "Error reported after abort." +msgstr "" + +#: vfs/fish.c:523 +msgid "Aborted transfer would be successful." +msgstr "" + +#: vfs/ftpfs.c:328 +#, c-format +msgid "ftpfs: Disconnecting from %s" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:379 +msgid " FTP: Password required for " +msgstr "" + +#: vfs/ftpfs.c:411 +msgid " Proxy: Password required for " +msgstr "" + +#: vfs/ftpfs.c:437 +msgid "ftpfs: sending proxy login name" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:441 +msgid "ftpfs: sending proxy user password" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:445 +msgid "ftpfs: proxy authentication succeeded" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:449 +#, c-format +msgid "ftpfs: connected to %s" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:466 +msgid "ftpfs: sending login name" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:471 +msgid "ftpfs: sending user password" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:476 +msgid "ftpfs: logged in" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:491 +#, c-format +msgid "ftpfs: Login incorrect for user %s " +msgstr "ftpfs : " + +#: vfs/ftpfs.c:523 +#, c-format +msgid " Could not set source routing (%s)" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:652 +msgid "ftpfs: Invalid host name." +msgstr "ftpfs : " + +#: vfs/ftpfs.c:672 +msgid "ftpfs: Invalid host address." +msgstr "ftpfs : " + +#: vfs/ftpfs.c:697 +#, c-format +msgid "ftpfs: making connection to %s" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:707 +msgid "ftpfs: connection interrupted by user" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:709 +#, c-format +msgid "ftpfs: connection to server failed: %s" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:793 +#, c-format +msgid "Waiting to retry... %d (Control-C to cancel)" +msgstr "" + +#: vfs/ftpfs.c:987 +msgid "ftpfs: could not setup passive mode for source routing" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:997 +msgid "ftpfs: could not setup passive mode" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:1070 +msgid "ftpfs: aborting transfer." +msgstr "ftpfs : " + +#: vfs/ftpfs.c:1072 +#, c-format +msgid "ftpfs: abort error: %s" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:1077 +msgid "ftpfs: abort failed" +msgstr "ftpfs : " + +#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +msgid "ftpfs: CWD failed." +msgstr "ftpfs : " + +#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +msgid "ftpfs: couldn't resolve symlink" +msgstr "ftpfs : yumþak baðý çözemedim" + +#: vfs/ftpfs.c:1236 +msgid "Resolving symlink..." +msgstr "Yumþak baðý çöziyorum ..." + +#: vfs/ftpfs.c:1338 +#, c-format +msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +msgstr "ftpfs : %s FTP dizinini okuyorum ... (UNIX \"ls\" özellikerini kullanmýyorum)" + +#: vfs/ftpfs.c:1340 +#, c-format +msgid "ftpfs: Reading FTP directory %s..." +msgstr "ftpfs : %s FTP dizinini okuyorum ..." + +#: vfs/ftpfs.c:1356 +msgid "ftpfs: FAIL" +msgstr "ftpfs: FAIL" + +#: vfs/ftpfs.c:1447 +msgid "ftpfs: reading FTP directory interrupt by user" +msgstr "ftpfs : FTP dizininin okunmasý kullanýcý tarafýndan iptal edildi" + +#: vfs/ftpfs.c:1477 +msgid "ftpfs: got listing" +msgstr "ftpfs : listeyi aldým" + +#: vfs/ftpfs.c:1490 +msgid "ftpfs: failed" +msgstr "ftpfs : baþarýsýz" + +#: vfs/ftpfs.c:1534 +msgid "ftpfs: failed; nowhere to fallback to" +msgstr "ftpfs : baþarýsýzlýk ..; geriye dönülcek nokta yok" + +#: vfs/ftpfs.c:1598 +#, c-format +msgid "ftpfs: storing file %d (%d)" +msgstr "ftpfs : %d dosyasýný uzakta kaydediyorum (%d)" + +#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +msgid "" +"~/.netrc file has not correct mode.\n" +"Remove password or correct mode." +msgstr "" +"+/.netrc dosyasý doðru eriþilebilir deðil .\n" +"Parolayý sil yada eriþilebiliriði saðla ." + +#: vfs/mcfs.c:154 +msgid " MCFS " +msgstr " MCFS " + +#: vfs/mcfs.c:154 +msgid " The server does not support this version " +msgstr " Sunucu bu versiyonu desteklemiyor " + +#: vfs/mcfs.c:171 +msgid "" +" 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" +msgstr "" +" Uzaktaki sunucu bir system port'unda çalýþmýyor ,\n" +" giriþ yapmak için bir parola lazým , fakat bu bilig \n" +" uzaktaki taraftan güvnilir kullanýlmeyebilir . Devam edeyim mi ?\n" + +#: vfs/mcfs.c:174 +msgid " Yes " +msgstr " Evet " + +#: vfs/mcfs.c:174 +msgid " No " +msgstr " Hayýr" + +#: vfs/mcfs.c:176 +msgid " The remote server is running on strange port. Giving up.\n" +msgstr " Uzaktaki sunucu komik bir port'ta çalýþýyor . Pes ediyorum .\n" + +#: vfs/mcfs.c:188 +msgid " MCFS Password required " +msgstr " MCFS parolasý gerekli " + +#: vfs/mcfs.c:202 +msgid " Invalid password " +msgstr " Yanlýþ parola " + +#: vfs/mcfs.c:322 +msgid " Too many open connections " +msgstr " Çok fazla açýk baðlantý var " + +#: vfs/smbfs.c:115 +msgid "Domain:" +msgstr "Sunucu : " + +#: vfs/smbfs.c:115 +msgid "Username:" +msgstr "Kullanýcý : " + +#: vfs/smbfs.c:115 +msgid "Password: " +msgstr "Parola : " + +#: vfs/smbfs.c:170 +#, c-format +msgid "Password for \\\\%s\\%s" +msgstr "\\\\%s\\%s için parola" + +#: vfs/smbfs.c:666 +#, c-format +msgid "" +" reconnect to %s failed\n" +" " +msgstr "" +" %s'ye bir daha baðlanamadý \n" +" " + +#: vfs/smbfs.c:1737 +#, c-format +msgid " %s mkdir'ing %s " +msgstr " %s %s dizinini yaratýyor " + +#: vfs/smbfs.c:1758 +#, c-format +msgid " %s rmdir'ing %s " +msgstr " %s %s dizinini siliyor " + +#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#, c-format +msgid " %s opening remote file %s " +msgstr " %s uzaktaki %s dosyasýný açiýyor " + +#: vfs/smbfs.c:1971 +#, c-format +msgid " %s renaming files\n" +msgstr " %s dosyalarý yeniden adlandýrýyor \n" + +#: vfs/tar.c:84 vfs/tar.c:101 +#, c-format +msgid "" +"Couldn't open tar archive\n" +"%s" +msgstr "" +"%s\n" +"tar arþivini açamdým" + +#: vfs/tar.c:284 +msgid "Unexpected EOF on archive file" +msgstr "Arþiv dosyasýnda beklenmeyen EOF yakalandý" + +#: vfs/tar.c:339 vfs/tar.c:346 +msgid "Inconsistent tar archive" +msgstr "Tar arþivi düzgün deðil" + +#: vfs/tar.c:411 +#, c-format +msgid "" +"Hmm,...\n" +"%s\n" +"doesn't look like a tar archive." +msgstr "" +"Ehem ,....\n" +"%s\n" +"bir tar arþivine benzemiyor. " + +#: vfs/vfs.c:1824 +msgid "%s: %s: %s %3d%% (%ld bytes transfered)" +msgstr "%s : %s : %s %3d%% (%ld byte transfer edildi)" + +#: vfs/vfs.c:1825 +#, c-format +msgid "%s: %s: %s %ld bytes transfered" +msgstr "%s : %s : %s %ld byte tansfer edildi" Binary files old/mc-4.5.42/po/uk.gmo and new/mc-4.5.43/po/uk.gmo differ diff -ruN old/mc-4.5.42/po/uk.po new/mc-4.5.43/po/uk.po --- old/mc-4.5.42/po/uk.po Mon Dec 6 18:50:17 1999 +++ new/mc-4.5.43/po/uk.po Sat Mar 18 08:43:50 2000 @@ -15,7 +15,7 @@ #: edit/edit_key_translator.c:121 msgid " Emacs key: " -msgstr "" +msgstr " ëÌÁצÛÁ Emacs: " #: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 msgid " Execute Macro " @@ -29,11 +29,11 @@ #: edit/edit_key_translator.c:144 msgid " Insert Literal " -msgstr " ÷ÓÔÁ×ÉÔÉ Ì¦ÔÅÒÁÌÕ " +msgstr " ÷ÓÔÁ×ÉÔÉ Ì¦ÔÅÒÁÌ " #: edit/edit_key_translator.c:144 msgid " Press any key: " -msgstr "" +msgstr " îÁÔÉÓΦÔØ ËÌÁצÛÕ: " #: gnome/gaction.c:33 #, c-format @@ -43,6 +43,10 @@ "\n" "Please check it to see if it points to a valid command." msgstr "" +"îÅÍÏÖÌÉ×Ï ×ÉËÏÎÁÔÉ\n" +"\"%s\".\n" +"\n" +"ðÅÒÅצÒÔÅ, ÂÕÄØ ÌÁÓËÁ, ÞÉ ×ËÁÚÕ¤ ÃÅ ÐÏÓÉÌÁÎÎÑ ÎÁ צÒÎÕ ËÏÍÁÎÄÕ." #: gnome/gaction.c:40 #, c-format @@ -52,6 +56,10 @@ "To fix this, bring up the mime-properties editor in the GNOME Control " "Center, and edit the default %s-action for \"%s\"." msgstr "" +"\".\n" +"\n" +"äÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ, ÚÁÐÕÓÔ¦ÔØ ÒÅÄÁËÔÏÒ mime-×ÌÁÓÔÉ×ÏÓÔÅÊ × ãÅÎÔÒ¦ ëÅÒÕ×ÁÎÎÑ GNOME, " +"ÔÁ ×ÉÐÒÁ×ÔÅ ÔÉÐÏ×Õ %s-ĦÀ ÄÌÑ \"%s\"." #: gnome/gaction.c:46 #, c-format @@ -61,6 +69,10 @@ "To fix this error, bring up this file's properties and change the default " "%s-action." msgstr "" +"\".\n" +"\n" +"äÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ, צÄËÒÉÊÔŠĦÁÌÏÇ ×ÌÁÓÔÉ×ÏÓÔÅÊ ÆÁÊÌÕ ÔÁ ÚͦΦÔØ ÔÉÐÏ×Õ " +"%s-ĦÀ." #: gnome/gaction.c:51 #, c-format @@ -70,22 +82,26 @@ "with the command:\n" "\"%s\"%s" msgstr "" +"îÅÍÏÖÌÉ×Ï %s\n" +"\"%s\"\n" +"ËÏÍÁÎÄÏÀ:\n" +"\"%s\"%s" #: gnome/gaction.c:134 gnome/gaction.c:150 msgid "open" -msgstr "" +msgstr "צÄËÒÉÔÉ" #: gnome/gaction.c:185 gnome/gaction.c:198 msgid "edit" -msgstr "" +msgstr "ÒÅÄÁÇÕ×ÁÔÉ" #: gnome/gaction.c:331 msgid "view" -msgstr "" +msgstr "ÐÅÒÅÇÌÑÄÁÔÉ" #: gnome/gcmd.c:49 msgid " There is no other panel to compare contents to " -msgstr "" +msgstr " îÅÍÁ¤ ¦ÎÛϧ ÐÁÎÅ̦ ÄÌÑ ÐÏÒ¦×ÎÑÎÎÑ ×ͦÓÔÕ " #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" @@ -105,12 +121,12 @@ #: gnome/gcmd.c:290 msgid "Sort By" -msgstr "" +msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ" #. we define this up here so we can pass it in to our callback #: gnome/gcmd.c:295 msgid "Ignore case sensitivity." -msgstr "" +msgstr "¶ÇÎÏÒÕ×ÁÔÉ ÒÅǦÓÔÒ." #: gnome/gcmd.c:298 msgid "Sort files by " @@ -118,16 +134,16 @@ #: gnome/gcmd.c:303 gnome/gcustom-layout.c:41 src/chmod.c:150 src/screen.c:413 msgid "Name" -msgstr "îÁÚ×ÏÀ" +msgstr "îÁÚ×Á" #: gnome/gcmd.c:310 msgid "File Type" -msgstr "ôÉÐÏÍ" +msgstr "ôÉÐ" #: gnome/gcmd.c:316 gnome/gcustom-layout.c:45 src/screen.c:414 #: src/screen.c:415 msgid "Size" -msgstr "òÏÚͦÒÏÍ" +msgstr "òÏÚͦÒ" #: gnome/gcmd.c:322 msgid "Time Last Accessed" @@ -147,15 +163,15 @@ #: gnome/gcmd.c:395 msgid "Enter name." -msgstr "" +msgstr "÷×ÅĦÔØ ÎÁÚ×Õ." #: gnome/gcmd.c:401 msgid "Enter label for command:" -msgstr "" +msgstr "÷×ÅĦÔØ Í¦ÔËÕ ÄÌÑ ËÏÍÁÎÄÉ:" #: gnome/gcmd.c:506 msgid "Find all core files" -msgstr "" +msgstr "úÎÁÊÔÉ ×Ó¦ core-ÆÁÊÌÉ" #: gnome/gcmd.c:509 src/panelize.c:350 msgid "Find rejects after patching" @@ -173,11 +189,11 @@ #. add add/remove buttons in center #: gnome/gcmd.c:576 gnome/gcustom-layout.c:183 msgid "Add" -msgstr "" +msgstr "äÏÄÁÔÉ" #: gnome/gcmd.c:580 gnome/gcustom-layout.c:184 msgid "Remove" -msgstr "" +msgstr "÷ÉÌÕÞÉÔÉ" #. Frame 2 #: gnome/gcmd.c:588 @@ -190,7 +206,7 @@ #: gnome/gcmd.c:674 msgid "Set Filter" -msgstr "" +msgstr "÷ÓÔÁÎÏ×ÉÔÉ Æ¦ÌØÔÒ" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 #: gnome/gscreen.c:2416 @@ -208,26 +224,30 @@ "For example:\n" "*.png will show just png images" msgstr "" +"÷×ÅĦÔØ Æ¦ÌØÔÒ ÄÌÑ ×ÉÂÉÒÁÎÎÑ ÆÁÊÌ¦× Õ ÐÁÎÅÌØ.\n" +"\n" +"îÁÐÒÉËÌÁÄ:\n" +"*.png ×ÉÂÅÒÅ ×Ó¦ png ÚÏÂÒÁÖÅÎÎÑ" #: gnome/gcmd.c:704 msgid "Enter a Regular Expression to filter files in the panel view." -msgstr "" +msgstr "÷×ÅĦÔØ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ ÄÌÑ Æ¦ÌØÔÒÕ×ÁÎÎÑ ÆÁÊÌ¦× Õ ÐÁÎÅ̦." #: gnome/gcmd.c:764 msgid " Open with..." -msgstr "" +msgstr " ÷¦ÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ... " #: gnome/gcmd.c:765 msgid "Enter extra arguments:" -msgstr "" +msgstr "÷×ÅĦÔØ ÄÏÄÁÔËÏצ ÁÒÇÕÍÅÎÔÉ:" #: gnome/gcmd.c:835 msgid "Desktop entry properties" -msgstr "" +msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦ ÅÌÅÍÅÎÔÕ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ" #: gnome/gcmd.c:861 msgid "Select File" -msgstr "" +msgstr "÷ÉÂÒÁÔÉ ÆÁÊÌ" #: gnome/gcmd.c:869 msgid "" @@ -236,6 +256,10 @@ "For example:\n" "*.png will select all png images" msgstr "" +"÷×ÅĦÔØ Æ¦ÌØÔÒ ÄÌÑ ×ÉÂÉÒÁÎÎÑ ÆÁÊÌ¦× Õ ÐÁÎÅÌØ.\n" +"\n" +"îÁÐÒÉËÌÁÄ:\n" +"*.png ×ÉÂÅÒÅ ×Ó¦ png ÚÏÂÒÁÖÅÎÎÑ" #: gnome/gcmd.c:871 msgid "Enter a regular expression here to select files in the panel view with." @@ -243,15 +267,15 @@ #: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 msgid " Malformed regular expression " -msgstr "" +msgstr " ðÏÇÁÎÏ ÓÆÏÒÍÏ×ÁÎÉÊ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ " #: gnome/gcmd.c:962 msgid "Creating a desktop link" -msgstr "" +msgstr "ó×ÏÒÅÎÎÑ ÐÏÓÉÌÁÎÎÑ ÎÁ ÒÏÂÏÞÏÍÕ ÓÔÏ̦" #: gnome/gcmd.c:963 msgid "Enter the URL:" -msgstr "" +msgstr "÷×ÅĦÔØ URL:" #: gnome/gcustom-layout.c:34 msgid "Access Time" @@ -266,15 +290,15 @@ #: gnome/gnome-file-property-dialog.c:945 gnome/gprop.c:280 gnome/gprop.c:405 #: src/screen.c:427 msgid "Group" -msgstr "" +msgstr "çÒÕÐÁ" #: gnome/gcustom-layout.c:37 msgid "Group ID" -msgstr "" +msgstr "¶ÄÅÎÔÉƦËÁÔÏÒ ÇÒÕÐÉ" #: gnome/gcustom-layout.c:38 msgid "Inode Number" -msgstr "" +msgstr "îÏÍÅÒ I-×ÕÚÌÁ" #: gnome/gcustom-layout.c:39 src/achown.c:378 msgid "Mode" @@ -282,17 +306,17 @@ #: gnome/gcustom-layout.c:40 msgid "Modification Time" -msgstr "" +msgstr "þÁÓ ÍÏÄÉƦËÁæ§" #: gnome/gcustom-layout.c:42 msgid "Number of Hard Links" -msgstr "" +msgstr "ë¦ÌØ˦ÓÔØ ÖÏÒÓÔËÉÈ ÐÏÓÉÌÁÎØ" #. Owner #: gnome/gcustom-layout.c:43 gnome/gnome-file-property-dialog.c:930 #: gnome/gprop.c:390 src/screen.c:426 msgid "Owner" -msgstr "" +msgstr "÷ÌÁÓÎÉË" #: gnome/gcustom-layout.c:44 src/screen.c:420 msgid "Permission" @@ -300,27 +324,27 @@ #: gnome/gcustom-layout.c:46 msgid "Size (short)" -msgstr "" +msgstr "òÏÚÍ¦Ò (ËÏÒÏÔËÏ)" #: gnome/gcustom-layout.c:47 msgid "Type" -msgstr "" +msgstr "ôÉÐ" #: gnome/gcustom-layout.c:48 msgid "User ID" -msgstr "" +msgstr "¶ÄÅÎÔÉƦËÁÔÏÒ ËÏÒÉÓÔÕ×ÁÞÁ" #: gnome/gcustom-layout.c:142 msgid "Possible Columns" -msgstr "" +msgstr "íÏÖÌÉצ ÓÔÏ×ÐÞÉËÉ" #: gnome/gcustom-layout.c:162 msgid "Displayed Columns" -msgstr "" +msgstr "ðÏËÁÚÕ×ÁΦ ÓÔÏ×ÐÞÉËÉ" #: gnome/gcustom-layout.c:304 msgid "Custom View" -msgstr "" +msgstr "îÅÔÉÐÏ׊צÄÏÂÒÁÖÅÎÎÑ" #: gnome/gdesktop.c:521 gnome/gmount.c:389 msgid "Warning" @@ -333,11 +357,11 @@ #: gnome/gdesktop.c:1181 msgid "While running the mount/umount command" -msgstr "" +msgstr "ðÒÉ ×ÉËÏÎÁÎΦ ËÏÍÁÎÄÉ mount/umount" #: gnome/gdesktop.c:1250 msgid "While running the eject command" -msgstr "" +msgstr "ðÒÉ ×ÉËÏÎÁÎΦ ËÏÍÁÎÄÉ eject" #: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" @@ -411,11 +435,11 @@ #: gnome/gdesktop.c:2639 gnome/glayout.c:462 msgid "_Arrange Icons" -msgstr "" +msgstr "÷ÐÏÒÑÄËÕ×ÁÔÉ Ð¦ËÔÏÇÒÁÍÉ" #: gnome/gdesktop.c:2640 msgid "Create _New Window" -msgstr "" +msgstr "óÔ×ÏÒÉÔÉ ÎÏ׊צËÎÏ" #: gnome/gdesktop.c:2642 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" @@ -436,16 +460,16 @@ #. Icon position #: gnome/gdesktop-prefs.c:242 msgid "Icon position" -msgstr "" +msgstr "ðÏÚÉÃ¦Ñ Ð¦ËÔÏÇÒÁÍÉ" #. Snap and placement #: gnome/gdesktop-prefs.c:258 msgid "Automatic icon placement" -msgstr "" +msgstr "á×ÔÏÍÁÔÉÞÎÅ ÒÏÚͦÝÅÎÎÑ Ð¦ËÔÏÇÒÁÍ" #: gnome/gdesktop-prefs.c:262 msgid "Snap icons to grid" -msgstr "" +msgstr "ðÒɤÄÎÕ×ÁÔÉ Ð¦ËÔÏÇÒÁÍÉ ÄÏ Ó¦ÔËÉ" #: gnome/gdesktop-prefs.c:277 msgid "Use shaped icons" @@ -457,7 +481,7 @@ #: gnome/gdesktop-prefs.c:335 msgid "Desktop" -msgstr "" +msgstr "òÏÂÏÞÉÊ ÓÔ¦Ì" #. Create the link to the user's home directory so that he will have an icon #: gnome/gdesktop-init.c:141 @@ -466,117 +490,119 @@ #: gnome/gdialogs.c:60 msgid "To: " -msgstr "" +msgstr "÷: " #: gnome/gdialogs.c:61 msgid "Copying from: " -msgstr "" +msgstr "ëÏЦÀ×ÁÎÎÑ Ú: " #: gnome/gdialogs.c:62 msgid "Deleting file: " -msgstr "" +msgstr "÷ÉÄÁÌÅÎÎÑ ÆÁÊÌÕ: " #: gnome/gdialogs.c:371 msgid "Files Exist" -msgstr "" +msgstr "æÁÊÌÉ ¦ÓÎÕÀÔØ" #: gnome/gdialogs.c:386 msgid "" "Some of the files you are trying to copy already exist in the destination " "folder. Please select the action to be performed." msgstr "" +"äÅÑ˦ ÆÁÊÌÉ, ÝÏ ×É ÐÒÏÂÕ¤ÔÅ ÓËÏЦÀ×ÁÔÉ ×ÖÅ ¦ÓÎÕÀÔØ Õ ÆÏÌÄÅÒ¦ ÐÒÉÚÎÁÞÅÎÎÑ. " +"âÕÄØ ÌÁÓËÁ, ×ÉÂÅÒ¦ÔØ ÏÄÎÕ ¦Ú ÚÁÐÒÏÐÏÎÏ×ÁÎÉÈ Ä¦Ê." #: gnome/gdialogs.c:399 msgid "Prompt me before overwriting any file." -msgstr "" +msgstr "ðÅÒÅÐÉÔÕ×ÁÎÎÑ ÐÅÒÅÄ ÚÁͦÝÅÎÎÑÍ ÂÕÄØ-ÑËÉÈ ÆÁÊ̦×." #: gnome/gdialogs.c:406 msgid "Don't overwrite any files." -msgstr "" +msgstr "îÅ ÚÁͦÝÁÔÉ Î¦ÑËÉÈ ÆÁÊ̦×." #: gnome/gdialogs.c:422 msgid "Overwrite:" -msgstr "" +msgstr "úÁͦÓÔÉÔÉ:" #: gnome/gdialogs.c:429 msgid "Older files." -msgstr "" +msgstr "óÔÁÒ¦ ÆÁÊÌÉ." #: gnome/gdialogs.c:435 msgid "Files only if size differs." -msgstr "" +msgstr "æÁÌÉ, ÝÏ ×¦ÄÒ¦ÚÎÑÀÔØ ÄÏ×ÖÉÎÏÀ." #: gnome/gdialogs.c:441 msgid "All files." -msgstr "" +msgstr "÷Ó¦ ÆÁÊÌÉ:" #: gnome/gdialogs.c:481 msgid "File Exists" -msgstr "" +msgstr "æÁÊÌ ¦ÓÎÕ¤" #: gnome/gdialogs.c:487 #, c-format msgid "The target file already exists: %s" -msgstr "" +msgstr "ã¦ÌØÏ×ÉÊ ÆÁÊÌ ×ÖÅ ¦ÓÎÕ¤: %s" #: gnome/gdialogs.c:494 msgid "Replace it?" -msgstr "" +msgstr "úÁͦÎÉÔÉ ÊÏÇÏ?" #: gnome/gdialogs.c:568 gtkedit/editwidget.c:1097 gtkedit/gtkedit.c:1250 #: src/file.c:802 src/screen.c:2399 src/screen.c:2429 src/tree.c:1014 msgid "Copy" -msgstr "ëÏЦÑ" +msgstr "ëÏЦÀ×ÁÔÉ" #: gnome/gdialogs.c:571 gtkedit/editwidget.c:1098 gtkedit/gtkedit.c:1252 msgid "Move" -msgstr "" +msgstr "ðÅÒÅÎÅÓÔÉ" #: gnome/gdialogs.c:583 msgid "Destination" -msgstr "" +msgstr "í¦ÓÃÅ ÐÒÉÚÎÁÞÅÎÎÑ" #: gnome/gdialogs.c:597 msgid "Find Destination Folder" -msgstr "" +msgstr "ðÏÛÕË Í¦ÓÃÑ ÐÒÉÚÎÁÞÅÎÎÑ" #: gnome/gdialogs.c:611 msgid "Copy as a background process" -msgstr "" +msgstr "ëÏЦÀ×ÁÔÉ × ÐÒÏÃÅÓ¦ ÎÁ Ô̦" #: gnome/gdialogs.c:629 msgid "Advanced Options" -msgstr "" +msgstr "äÏÄÁÔËÏצ ÐÁÒÁÍÅÔÒÉ" #: gnome/gdialogs.c:633 msgid "Preserve symlinks" -msgstr "" +msgstr "úÂÅÒ¦ÇÁÔÉ ÓÉÍ×ÏÌØΦ ÐÏÓÉÌÁÎÑ" #: gnome/gdialogs.c:643 msgid "Follow links." -msgstr "" +msgstr "òÏÚ¦ÍÅÎÏ×Õ×ÁÔÉ ÐÏÓÉÌÁÎØ" #: gnome/gdialogs.c:649 msgid "" "Selecting this will copy the files that symlinks point to instead of just " "copying the link." -msgstr "" +msgstr "ëÏЦÀ×ÁÔÉ ÆÁÊÌÉ ÎÁ Ñ˦ ×ËÁÚÕÀÔØ ÐÏÓÉÌÁÎÎÑ ÚÁͦÓÔØ ÐÏÓÉÌÁÎØ" #: gnome/gdialogs.c:654 msgid "Preserve file attributes." -msgstr "" +msgstr "úÂÅÒ¦ÇÁÔÉ ÁÔÒÉÂÕÔÉ" #: gnome/gdialogs.c:660 msgid "Preserves the permissions and the UID/GID if possible" -msgstr "" +msgstr "úÂÅÒ¦ÇÁÔÉ ÐÒÁ×Á ÔÁ UID/GID ÑËÝÏ ÍÏÖÌÉ×Ï" #: gnome/gdialogs.c:666 msgid "Recursively copy subdirectories." -msgstr "" +msgstr "òÅËÕÒÓÉ×ÎÏ ËÏЦÀ×ÁÔÉ ËÁÔÁÌÏÇÉ" #: gnome/gdialogs.c:673 msgid "If set, this will copy the directories recursively" -msgstr "" +msgstr "òÅËÕÒÓÉ×ÎÏ ËÏЦÀ×ÁÔÉ ËÁÔÁÌÏÇÉ" #: gnome/gdialogs.c:780 #, c-format @@ -585,26 +611,29 @@ "\n" "Directory not empty. Delete it recursively?" msgstr "" +"%s\n" +"\n" +"ëÁÔÁÌÏÇ ÎÅ ÐÏÒÏÖΦÊ. óÔÅÒÔÉ ÊÏÇÏ ÒÅËÕÒÓÉ×ÎÏ?" #: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " -msgstr "" +msgstr " óÔÅÒÔÉ: " #: gnome/gdialogs.c:794 msgid "Do the same for the rest" -msgstr "" +msgstr "òÏÂÉÔÉ ÔÅ Ö ÓÁÍÅ ÄÌÑ ¦ÎÛÉÈ" #: gnome/gdialogs.c:877 msgid "Move Progress" -msgstr "" +msgstr "ðÏÓÔÕÐ ÐÅÒÅÎÏÓÕ" #: gnome/gdialogs.c:880 msgid "Copy Progress" -msgstr "" +msgstr "ðÏÓÔÕÐ ËÏЦÀ×ÁÎÎÑ" #: gnome/gdialogs.c:883 msgid "Delete Progress" -msgstr "" +msgstr "ðÏÓÔÕÐ ×ÉÄÁÌÅÎÎÑ" #: gnome/gdialogs.c:939 msgid "File " @@ -631,15 +660,15 @@ #. Create the dialog #: gnome/gdialogs.c:1039 msgid "Symbolic Link" -msgstr "" +msgstr "óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ" #: gnome/gdialogs.c:1055 src/boxes.c:803 msgid "Existing filename (filename symlink will point to):" -msgstr "" +msgstr "îÁÚ×Á ¦ÓÎÕÀÞÏÇÏ ÆÁÊÕ (ÎÁ ÑËÉÊ ÂÕÄÅ ×ÁÚÕ×ÁÔÉ ÐÏÓÉÌÁÎÎÑ):" #: gnome/gdialogs.c:1069 src/boxes.c:801 msgid "Symbolic link filename:" -msgstr "" +msgstr "îÁÚ×Á ÓÉÍ×ÏÌØÎÏÇÏ ÐÏÓÉÌÁÎÎÑ:" #: gnome/gdnd.c:52 msgid "_Move here" @@ -671,35 +700,35 @@ #: gnome/glayout.c:41 msgid "_Icon View" -msgstr "" +msgstr "ð¦ËÔÏÇÒÁÍÉ" #: gnome/glayout.c:42 gnome/glayout.c:58 msgid "Switch view to an icon display" -msgstr "" +msgstr "ðÏËÁÚ Ð¦ËÔÏÇÒÁÍ" #: gnome/glayout.c:44 msgid "_Brief View" -msgstr "" +msgstr "ëÏÒÏÔËÏ" #: gnome/glayout.c:45 gnome/glayout.c:61 msgid "Switch view to show just file name and type" -msgstr "" +msgstr "ðÏËÁÚ ÌÉÛÅ ÎÁÚ×É ÔÁ ÔÉÐ¦× ÆÁÊ̦×" #: gnome/glayout.c:47 msgid "_Detailed View" -msgstr "" +msgstr "äÅÔÁÌØÎÏ" #: gnome/glayout.c:48 gnome/glayout.c:64 msgid "Switch view to show detailed file statistics" -msgstr "" +msgstr "ðÏËÁÚ ÄÅÔÁÌØÎϧ ÆÁÊÌÏ×ϧ ÓÔÁÔÉÓÔÉËÉ" #: gnome/glayout.c:50 msgid "_Custom View" -msgstr "" +msgstr "îÅÔÉÐÏ×Ï" #: gnome/glayout.c:51 gnome/glayout.c:67 msgid "Switch view to show user-defined statistics" -msgstr "" +msgstr "ðÏËÁÚ ×ÉÚÎÁÞÅÎϧ ËÏÒÉÓÔÕ×ÁÞÅÍ ÓÔÁÔÉÓÔÉËÉ" #: gnome/glayout.c:57 msgid "Icons" @@ -745,32 +774,32 @@ #: gnome/glayout.c:368 msgid "Creates a new file in this directory" -msgstr "" +msgstr "óÔ×ÏÒÉÎÉ ÎÏ×ÉÊ ÆÁÊÌ × ÃØÏÍÕ ËÁÔÁÌÏÚ¦" #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, #: gnome/glayout.c:389 gnome/gscreen.c:2085 msgid "_Copy..." -msgstr "" +msgstr "ëÏЦÀ×ÁÔÉ..." #: gnome/glayout.c:389 msgid "Copy files" -msgstr "" +msgstr "ëÏЦÀ×ÁÔÉ ÆÁÊÌÉ" #: gnome/glayout.c:390 gnome/gscreen.c:2086 msgid "_Delete..." -msgstr "" +msgstr "_óÔÅÒÔÉ..." #: gnome/glayout.c:390 msgid "Delete files" -msgstr "" +msgstr "óÔÅÒÔÉ ÆÁÊÌÉ" #: gnome/glayout.c:391 gnome/gscreen.c:2087 msgid "_Move..." -msgstr "" +msgstr "_ðÅÒÅͦÓÔÉÔÉ..." #: gnome/glayout.c:391 msgid "Rename or move files" -msgstr "" +msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÞÉ ÐÅÒÅͦÓÔÉÔÉ ÆÁÊÌÉ" #: gnome/glayout.c:393 msgid "Show directory sizes" @@ -782,35 +811,35 @@ #: gnome/glayout.c:395 msgid "Close window" -msgstr "" +msgstr "úÁËÒÉÔÉ ×¦ËÎÏ" #: gnome/glayout.c:395 msgid "Closes this window" -msgstr "" +msgstr "úÁËÒÉ×Á¤ ÊצËÎÏ" #: gnome/glayout.c:402 msgid "Select _All" -msgstr "" +msgstr "÷ÉÂÒÁÔÉ ×ÓÅ" #: gnome/glayout.c:402 msgid "Select all files in the current Panel" -msgstr "" +msgstr "÷ÉÂÒÁÔÉ ×Ó¦ ÆÁÊÌÉ × ÐÏÔÏÞÎ¦Ê ÐÁÎÅ̦" #: gnome/glayout.c:404 msgid "_Select Files..." -msgstr "" +msgstr "÷ÉÂÒÁÔÉ ÆÁÊÌÉ..." #: gnome/glayout.c:404 msgid "Select a group of files" -msgstr "" +msgstr "÷ÉÂÒÁÔÉ ÇÒÕÐÕ ÆÁÊ̦×" #: gnome/glayout.c:405 msgid "_Invert Selection" -msgstr "" +msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ɦÒ" #: gnome/glayout.c:405 msgid "Reverses the list of tagged files" -msgstr "" +msgstr "¶Î×ÅÒÔÕ×ÁÔÉ ×ÉÂ¦Ò ÆÁÊ̦×" #: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 msgid "Search" @@ -818,7 +847,7 @@ #: gnome/glayout.c:408 msgid "Search for a file in the current Panel" -msgstr "" +msgstr "ûÕ×ÁÔÉ ÆÁÊÌ × ÐÏÔÏÞÎ¦Ê ÐÁÎÅ̦" #: gnome/glayout.c:411 gnome/gscreen.c:1415 msgid "_Rescan Directory" @@ -830,7 +859,7 @@ #: gnome/glayout.c:421 msgid "_Sort By..." -msgstr "" +msgstr "óÏÒÔÕ×ÁÔÉ ÚÁ..." #: gnome/glayout.c:421 msgid "Confirmation settings" @@ -846,52 +875,52 @@ #: gnome/glayout.c:429 msgid "_Find File..." -msgstr "" +msgstr "ûÕËÁÔÉ ÆÁÊÌ..." #: gnome/glayout.c:429 msgid "Locate files on disk" -msgstr "" +msgstr "úÎÁÊÔÉ ÆÁÊÌÉ ÎÁ ÄÉÓËÕ" #. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, #: gnome/glayout.c:432 msgid "_Edit mime types..." -msgstr "" +msgstr "òÅÄÁÇÕ×ÁÔÉ MIME-ÔÉÐÉ..." #: gnome/glayout.c:432 msgid "Edits the MIME type bindings" -msgstr "" +msgstr "òÅÄÁÇÕ×ÁÔÉ ÐÒÉ×'ÑÚËÉ ÄÏ MIME-ÔÉЦ×" #: gnome/glayout.c:434 msgid "_Run Command..." -msgstr "" +msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ" #: gnome/glayout.c:434 msgid "Runs a command" -msgstr "" +msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ" #: gnome/glayout.c:436 msgid "_Run Command in panel..." -msgstr "" +msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ × ÐÁÎÅ̦..." #: gnome/glayout.c:436 msgid "Run a command and put the results in a panel" -msgstr "" +msgstr "÷ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ ¦ ÒÏÚͦÓÔÉÔÉ ÒÅÚÕÌØÔÁÔ × ÐÁÎÅ̦" #: gnome/glayout.c:446 msgid "_Background jobs..." -msgstr "" +msgstr "úÁ×ÄÁÎÎÑ ÎÁ Ô̦..." #: gnome/glayout.c:446 msgid "List of background operations" -msgstr "" +msgstr "óÐÉÓÏË ÏÐÅÒÁÃ¦Ê ÎÁ Ô̦" #: gnome/glayout.c:449 msgid "Exit" -msgstr "" +msgstr "÷ÉÊÔÉ" #: gnome/glayout.c:449 msgid "Terminates the file manager and the desktop" -msgstr "" +msgstr "úÁ×ÅÒÛÉÔÉ ÒÏÂÏÔÕ ÆÁÊÌÏ×ÏÇÏ ÍÅÎÅÄÖÅÒÁ ¦ ÒÏÂÏÞÏÇÏ ÓÔÏÌÕ" #: gnome/glayout.c:473 gnome/glayout.c:484 msgid "_Settings" @@ -907,7 +936,7 @@ #: gnome/glayout.c:476 msgid "_Desktop" -msgstr "" +msgstr "òÏÂÏÞÉÊ ÓÔ¦Ì" #: gnome/glayout.c:477 gnome/glayout.c:487 msgid "_Help" @@ -952,7 +981,7 @@ #: gnome/gmount.c:469 #, c-format msgid "NFS dir %s" -msgstr "" +msgstr "NFS-ËÁÔÁÌÏÇ %s" #: gnome/gmount.c:473 #, c-format @@ -974,35 +1003,35 @@ #: gnome/gnome-file-property-dialog.c:207 msgid "File Type: Symbolic Link" -msgstr "" +msgstr "ôÉÐ ÆÁÊÌÕ: óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ" #: gnome/gnome-file-property-dialog.c:212 msgid "Target Name: INVALID LINK" -msgstr "" +msgstr "îÁÚ×Á ÏÒÉǦÎÁÌÕ: îå÷¶òîå ðïóéìáîîñ" #: gnome/gnome-file-property-dialog.c:215 msgid "Target Name: " -msgstr "" +msgstr "îÁÚ×Á ÏÒÉǦÎÁÌÕ: " #: gnome/gnome-file-property-dialog.c:220 msgid "File Type: Directory" -msgstr "" +msgstr "ôÉÐ ÆÁÊÌÕ: ëÁÔÁÌÏÇ" #: gnome/gnome-file-property-dialog.c:222 msgid "File Type: Character Device" -msgstr "" +msgstr "ôÉÐ ÆÁÊÌÕ: óÉÍ×ÏÌØÎÉÊ ÐÒÉÓÔÒ¦Ê" #: gnome/gnome-file-property-dialog.c:224 msgid "File Type: Block Device" -msgstr "" +msgstr "ôÉÐ ÆÁÊÌÕ: âÌÏËÏ×ÉÊ ÐÒÉÓÔÒ¦Ê" #: gnome/gnome-file-property-dialog.c:226 msgid "File Type: Socket" -msgstr "" +msgstr "ôÉÐ ÆÁÊÌÕ: óÏËÅÔ" #: gnome/gnome-file-property-dialog.c:228 msgid "File Type: FIFO" -msgstr "" +msgstr "ôÉÐ ÆÁÊÌÕ: FIFO" #: gnome/gnome-file-property-dialog.c:238 #: gnome/gnome-file-property-dialog.c:242 @@ -1012,24 +1041,24 @@ #: gnome/gnome-file-property-dialog.c:238 msgid " bytes" -msgstr " ÂÁÊÔ" +msgstr " ÂÁÊÔ¦×" #: gnome/gnome-file-property-dialog.c:242 msgid " KBytes (" -msgstr " ëâÁÊÔ (" +msgstr " ëâÁÊÔ¦× (" #: gnome/gnome-file-property-dialog.c:243 #: gnome/gnome-file-property-dialog.c:249 msgid " bytes)" -msgstr " ÂÉÊÔ)" +msgstr " ÂÁÊÔ¦×)" #: gnome/gnome-file-property-dialog.c:248 msgid " MBytes (" -msgstr " íâÁÊÔ (" +msgstr " íâÁÊÔ¦× (" #: gnome/gnome-file-property-dialog.c:256 msgid "File Size: N/A" -msgstr "" +msgstr "òÏÚÍ¦Ò ÆÁÊÌÕ: î/ä" #: gnome/gnome-file-property-dialog.c:267 msgid "File Created on: " @@ -1045,11 +1074,11 @@ #: gnome/gnome-file-property-dialog.c:303 msgid "URL:" -msgstr "" +msgstr "URL:" #: gnome/gnome-file-property-dialog.c:310 msgid "Caption:" -msgstr "" +msgstr "ð¦ÄÐÉÓ:" #: gnome/gnome-file-property-dialog.c:387 #: gnome/gnome-file-property-dialog.c:489 @@ -1064,15 +1093,15 @@ #: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:203 #: src/screen.c:2397 src/screen.c:2427 msgid "View" -msgstr "ðÏËÁÚ" +msgstr "ðÅÒÅÇÌÑÎÕÔÉ" #: gnome/gnome-file-property-dialog.c:404 msgid "Use default View options" -msgstr "" +msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÔÉÐÏ×ÉÊ ÐÅÒÅÇÌÑÄ" #: gnome/gnome-file-property-dialog.c:439 msgid "Select an Icon" -msgstr "" +msgstr "÷ÉÂÅÒ¦ÔØ Ð¦ËÔÏÇÒÁÍÕ" #. we do open first #: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:195 @@ -1081,7 +1110,7 @@ #: gnome/gnome-file-property-dialog.c:479 msgid "Use default Open action" -msgstr "" +msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÔÉÐÏ׊צÄËÒÉÔÔÑ" #: gnome/gnome-file-property-dialog.c:502 msgid "Use default Drop action" @@ -1089,16 +1118,16 @@ #: gnome/gnome-file-property-dialog.c:504 msgid "Use default View action" -msgstr "" +msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÔÉÐÏ×ÉÊ ÐÅÒÅÇÌÑÄ" #: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 #: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 msgid "Edit" -msgstr "úͦÎÁ" +msgstr "÷ÉÐÒÁ×ÉÔÉ" #: gnome/gnome-file-property-dialog.c:523 msgid "Use default Edit action" -msgstr "" +msgstr "÷ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÔÉÐÏ×Å ÒÅÄÁÇÕ×ÁÎÎÑ" #: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521 msgid "Icon" @@ -1107,62 +1136,62 @@ #. We must be a file or a link to a file. #: gnome/gnome-file-property-dialog.c:611 msgid "File Actions" -msgstr "" +msgstr "䦧 ÎÁÄ ÆÁÊÌÏÍ" #: gnome/gnome-file-property-dialog.c:616 msgid "Open action" -msgstr "" +msgstr "÷¦ÄËÒÉÔÔÑ" #: gnome/gnome-file-property-dialog.c:617 msgid "Needs terminal to run" -msgstr "" +msgstr "÷ÉËÏÎÁÎÎÑ × ÔÅÒͦÎÁ̦" #: gnome/gnome-file-property-dialog.c:742 msgid "File Permissions" -msgstr "" +msgstr "ðÒÁ×Á ÄÏÓÔÕÐÕ ÄÏ ÆÁÊÌÕ" #: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259 msgid "Current mode: " -msgstr "" +msgstr "ðÏÔÏÞΦ ÐÒÁ×Á: " #. Headings #: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272 msgid "Read" -msgstr "" +msgstr "úÞÉÔÕ×ÁÎÎÑ" #: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273 msgid "Write" -msgstr "" +msgstr "úÁÐÉÓ" #: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274 msgid "Exec" -msgstr "" +msgstr "÷ÉËÏÎÁÎÎÑ" #: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275 msgid "Special" -msgstr "" +msgstr "óÐÅæÁÌØΦ" #. Permissions #: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279 msgid "User" -msgstr "" +msgstr "ëÏÒÉÓÔÕ×ÁÞ" #: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281 msgid "Other" -msgstr "" +msgstr "¶ÎÛ¦" #. Special #: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285 msgid "Set UID" -msgstr "" +msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ UID" #: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286 msgid "Set GID" -msgstr "" +msgstr "÷ÓÔÁÎÏ×ÌÅÎÎÑ GID" #: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287 msgid "Sticky" -msgstr "" +msgstr "úÁËÒ¦ÐÌÅÎÎÑ" #: gnome/gnome-file-property-dialog.c:905 #, c-format @@ -1171,11 +1200,11 @@ #: gnome/gnome-file-property-dialog.c:919 msgid "File ownership" -msgstr "" +msgstr "÷ÏÌÏĦÎÎÑ ÆÁÊÌÏÍ" #: gnome/gnome-file-property-dialog.c:1079 msgid "URL" -msgstr "" +msgstr "URL" #: gnome/gnome-file-property-dialog.c:1082 msgid "Statistics" @@ -1187,7 +1216,7 @@ #: gnome/gnome-file-property-dialog.c:1091 msgid "Permissions" -msgstr "" +msgstr "ðÒÁ×Á" #: gnome/gnome-file-property-dialog.c:1094 msgid " Properties" @@ -1209,7 +1238,7 @@ #: gnome/gnome-open-dialog.c:385 #, c-format msgid "Select an application to open \"%s\" with." -msgstr "" +msgstr "÷ÉÂÅÒ¦ÔØ ÐÒÏÇÒÁÍÕ ÄÌÑ ×¦ÄËÒÉÔÔÑ ÎÅÀ \"%s\"." #: gnome/gnome-open-dialog.c:395 msgid "Select a file to run with" @@ -1218,19 +1247,19 @@ #. the file tree #: gnome/gnome-open-dialog.c:406 msgid "Applications" -msgstr "" +msgstr "ðÒÏÇÒÁÍÉ" #: gnome/gnome-open-dialog.c:422 msgid "Program to run" -msgstr "" +msgstr "úÁÐÕÓÔÉÔÉ ÐÒÏÇÒÁÍÕ" #: gnome/gpopup2.c:197 msgid "Mount device" -msgstr "" +msgstr "úÍÏÎÔÕ×ÁÔÉ ÐÒÉÓÔÒ¦Ê" #: gnome/gpopup2.c:198 msgid "Unmount device" -msgstr "" +msgstr "äÅÍÏÎÔÕ×ÁÔÉ ÐÒÉÓÔÒ¦Ê" #: gnome/gpopup2.c:199 msgid "Eject device" @@ -1238,7 +1267,7 @@ #: gnome/gpopup2.c:202 msgid "Open with..." -msgstr "" +msgstr "÷ÉÄËÒÉÔÉ ÚÁ ÄÏÐÏÍÏÇÏÀ..." #: gnome/gpopup2.c:204 msgid "View Unfiltered" @@ -1246,44 +1275,44 @@ #: gnome/gpopup2.c:207 msgid "Copy..." -msgstr "" +msgstr "ëÏЦÀ×ÁÎÎÑ..." #: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 #: src/screen.c:2432 msgid "Delete" -msgstr "" +msgstr "óÔÅÒÔÉ" #: gnome/gpopup2.c:209 msgid "Move..." -msgstr "" +msgstr "ðÅÒÅÎÅÓÔÉ..." #: gnome/gpopup2.c:210 msgid "Hard Link..." -msgstr "" +msgstr "öÏÒÓÔËÅ ÐÏÓÉÌÁÎÎÑ..." #: gnome/gpopup2.c:211 msgid "Symlink..." -msgstr "" +msgstr "óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ..." #: gnome/gpopup2.c:212 msgid "Edit Symlink..." -msgstr "" +msgstr "úͦÎÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ..." #: gnome/gpopup2.c:214 msgid "Properties..." -msgstr "" +msgstr "÷ÌÁÓÔÉ×ÏÓÔ¦..." #: gnome/gprefs.c:92 msgid "Show backup files" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ ÒÅÚÅÒ×Φ ËÏЦ§" #: gnome/gprefs.c:96 msgid "Show hidden files" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ ÐÒÉÈÏ×ÁΦ ÆÁÊÌÉ" #: gnome/gprefs.c:100 msgid "Mix files and directories" -msgstr "" +msgstr "óÕÍ¦Û ÆÁÊÌ¦× ÔÁ ËÁÔÁÌÏǦ×" #: gnome/gprefs.c:104 msgid "Use shell patterns instead of regular expressions" @@ -1291,19 +1320,19 @@ #: gnome/gprefs.c:113 msgid "Confirm when deleting file" -msgstr "" +msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ×ÉÄÁÌÅÎÎÑ ÆÁÊÌÕ" #: gnome/gprefs.c:117 msgid "Confirm when overwriting files" -msgstr "" +msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ÚÁͦÝÅÎÎÑ ÆÁÊÌÕ" #: gnome/gprefs.c:121 msgid "Confirm when executing files" -msgstr "" +msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ×ÉËÏÎÁÎÎÑ ÆÁÊÌÕ" #: gnome/gprefs.c:125 msgid "Show progress while operations are being performed" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ ÐÏÓÔÕÐ ×ÉËÏÎÁÎÎÑ ÏÐÅÒÁæÊ" #: gnome/gprefs.c:134 msgid "VFS Timeout:" @@ -1315,7 +1344,7 @@ #: gnome/gprefs.c:138 msgid "Anonymous FTP password:" -msgstr "" +msgstr "ðÁÒÏÌØ ÄÌÑ ÁÎÏΦÍÎÏÇÏ FTP:" #: gnome/gprefs.c:142 msgid "Always use FTP proxy" @@ -1327,7 +1356,7 @@ #: gnome/gprefs.c:155 msgid "Compute totals before copying files" -msgstr "" +msgstr "ðÏÒÁÈÕ×ÁÔÉ ÚÁÇÁÌØÎÉÊ ÒÏÚÍ¦Ò ÐÅÒÅÄ ËÏЦÀ×ÁÎÎÑÍ" #: gnome/gprefs.c:159 msgid "FTP directory cache timeout :" @@ -1347,7 +1376,7 @@ #: gnome/gprefs.c:180 msgid "VFS" -msgstr "" +msgstr "÷æó" #: gnome/gprefs.c:184 msgid "Caching" @@ -1355,15 +1384,15 @@ #: gnome/gprefs.c:474 msgid "Preferences" -msgstr "" +msgstr "õÓÔÁÎÏ×ËÉ" #: gnome/gprop.c:58 gnome/gprop.c:75 msgid "Filename" -msgstr "" +msgstr "îÁÚ×Á ÆÁÊÌÕ" #: gnome/gprop.c:67 msgid "Full name: " -msgstr "" +msgstr "ðÏ×ÎÁ ÎÁÚ×Á: " #: gnome/gprop.c:109 src/panelize.c:205 msgid "Command" @@ -1391,46 +1420,46 @@ #: gnome/gprop.c:505 msgid "Title" -msgstr "" +msgstr "úÁÇÏÌÏ×ÏË" #: gnome/gprop.c:535 msgid "Select icon" -msgstr "" +msgstr "÷ÉÂÅÒÁÔÉ Ð¦ËÔÏÇÒÁÍÕ" #: gnome/gscreen.c:1415 msgid "Reloads the current directory" -msgstr "" +msgstr "ðÅÒÅÚÁ×ÁÎÔÁÖÕ¤ ÐÏÔÏÞÎÉÊ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:1417 msgid "New _Directory..." -msgstr "" +msgstr "îÏ×ÉÊ _ËÁÔÁÌÏÇ..." #: gnome/gscreen.c:1417 msgid "Creates a new directory here" -msgstr "" +msgstr "óÔ×ÏÒÀ¤ ÔÕÔ ÎÏ×ÉÊ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:1419 msgid "New _File..." -msgstr "" +msgstr "îÏ×ÉÊ _ÆÁÊÌ..." #: gnome/gscreen.c:1419 msgid "Creates a new file here" -msgstr "" +msgstr "óÔ×ÏÒÀ¤ ÔÕÔ ÎÏ×ÉÊ ÆÁÊÌ" #: gnome/gscreen.c:1620 #, c-format msgid "Search: %s" -msgstr "" +msgstr "ðÏÛÕË: %s" #: gnome/gscreen.c:1630 #, c-format msgid "%s bytes in %d file" -msgstr "%s ÂÁÊÔ¦ × %d ÆÁÊ̦" +msgstr "%s ÂÁÊÔ¦× × %d ÆÁÊ̦" #: gnome/gscreen.c:1630 #, c-format msgid "%s bytes in %d files" -msgstr "%s ÂÁÊÔ × %d ÆÁÊÌÁÈ" +msgstr "%s ÂÁÊÔ¦× × %d ÆÁÊÌÁÈ" #: gnome/gscreen.c:1656 src/screen.c:688 msgid "" @@ -1438,43 +1467,43 @@ #: gnome/gscreen.c:2085 msgid "Copy directory" -msgstr "" +msgstr "óËÏЦÀ×ÁÔÉ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:2086 msgid "Delete directory" -msgstr "" +msgstr "óÔÅÒÔÉ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:2087 msgid "Rename or move directory" -msgstr "" +msgstr "ðÅÒÅÊÍÅÎÕ×ÁÔÉ ÞÉ ÐÅÒÅÎÅÓÔÉ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:2245 msgid "Back" -msgstr "" +msgstr "îÁÚÁÄ" #: gnome/gscreen.c:2245 msgid "Go to the previously visited directory" -msgstr "" +msgstr "ðÅÒÅÊÔÉ × ÐÏÐÅÒÅÄÎ¦Ê ËÁÔÁÌÏÇ" #: gnome/gscreen.c:2247 msgid "Up" -msgstr "" +msgstr "÷×ÅÒÈ" #: gnome/gscreen.c:2247 msgid "Go up a level in the directory heirarchy" -msgstr "" +msgstr "ð¦ÄÎÑÔÉÓØ ÎÁ Ò¦×ÅÎØ × ¦¤ÒÁÒȦ§ ËÁÔÁÌÏǦ×" #: gnome/gscreen.c:2249 msgid "Forward" -msgstr "" +msgstr "÷ÐÅÒÅÄ" #: gnome/gscreen.c:2249 msgid "Go to the next directory" -msgstr "" +msgstr "ðÅÒÅÊÔÉ × ÎÁÓÔÕÐÎÉÊ ËÁÔÁÌÏÇ" #: gnome/gscreen.c:2252 src/tree.c:1010 msgid "Rescan" -msgstr "ðÅÒÅÓËÁÎÕ×ÁÔÉ" +msgstr "ïÎÏ×ÉÔÉ" #: gnome/gscreen.c:2252 msgid "Rescan the current directory" @@ -1482,15 +1511,15 @@ #: gnome/gscreen.c:2255 msgid "Home" -msgstr "" +msgstr "äÏͦ×ËÁ" #: gnome/gscreen.c:2255 msgid "Go to your home directory" -msgstr "" +msgstr "ðÅÒÅÊÔÉ Õ ×ÁÛ ÄÏÍÁÛÎ¦Ê ËÁÔÁÌÏÇ" #: gnome/gscreen.c:2395 msgid "Location:" -msgstr "" +msgstr "òÏÚͦÝÅÎÎÑ:" #. 1 #: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1219 @@ -1510,7 +1539,7 @@ #: gnome/gview.c:138 src/view.c:730 #, c-format msgid "Col %d" -msgstr "" +msgstr "óÔÏ×ÐÞÉË %d" #: gnome/gview.c:142 src/view.c:734 #, c-format @@ -1519,19 +1548,19 @@ #: gnome/gview.c:306 msgid "_Goto line" -msgstr "" +msgstr "_ðÅÒÅÊÔÉ ÎÁ ÒÑÄÏË" #: gnome/gview.c:307 msgid "Jump to a specified line number" -msgstr "" +msgstr "ðÅÒÅÓËÏÞÉÔÉ ÎÁ ×ËÁÚÁÎÉÊ ÒÑÄÏË" #: gnome/gview.c:309 msgid "_Monitor file" -msgstr "" +msgstr "íÏΦÔÏÒÉÎÇ ÆÁÊÌÕ" #: gnome/gview.c:309 msgid "Monitor file growing" -msgstr "" +msgstr "íÏΦÔÏÒÉÎÇ Ú¦ÌØÛÅÎÎÑ ÆÁÊÌÕ" #: gnome/gview.c:316 msgid "Regexp search" @@ -1564,7 +1593,7 @@ #: gnome/gview.c:341 msgid "_Search" -msgstr "" +msgstr "_ûÕËÁÔÉ" #: gnome/gwidget.c:95 msgid "ok" @@ -1572,7 +1601,7 @@ #: gnome/gwidget.c:97 msgid "cancel" -msgstr "×ÉÄͦÎÁ" +msgstr "צÄͦÎÁ" #: gnome/gwidget.c:99 msgid "help" @@ -1588,7 +1617,7 @@ #: gnome/gwidget.c:105 msgid "exit" -msgstr "" +msgstr "×ÉȦÄ" #: gnome/gwidget.c:107 msgid "abort" @@ -1612,11 +1641,11 @@ #: gnome/gmc-client.c:173 msgid "Rescan the specified directory" -msgstr "" +msgstr "ðÅÒÅÓËÁÎÕ×ÁÔÉ ×ËÁÚÁÎÉÊ ËÁÔÁÌÏÇ" #: gnome/gmc-client.c:175 msgid "Rescan the desktop icons" -msgstr "" +msgstr "ðÅÒÅÓËÁÎÕ×ÁÔÉ Ð¦ËÔÏÇÒÁÍÉ ÎÁ ÒÏÂÏÞÏÍÕ ÓÔÏ̦" #: gnome/gmc-client.c:177 msgid "Rescan the desktop device icons" @@ -1645,17 +1674,19 @@ #: gtkedit/edit.c:248 msgid " Not an ordinary file: " -msgstr "" +msgstr " îÅÚ×ÉÞÁÊÎÉÊ ÆÁÊÌ: " #: gtkedit/edit.c:254 msgid " File is too large: " -msgstr "" +msgstr " æÁÊÌ ÎÁÄÔÏ ×ÅÌÉËÉÊ: " #: gtkedit/edit.c:255 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " msgstr "" +" \n" +" ú¦ÌØÛ¦ÔØ ÚÎÁÞÅÎÎÑ edit.h:MAXBUF ÔÁ ÐÅÒÅËÏÍЦÌÀÊÔÅ ÒÅÄÁËÔÏÒ. " #: gtkedit/edit.c:311 gtkedit/edit.c:347 msgid " Error allocating memory " @@ -1663,15 +1694,15 @@ #: gtkedit/editcmd.c:334 msgid "Quick save " -msgstr "" +msgstr "û×ÉÄËÅ ÚÂÅÒÅÖÅÎÎÑ " #: gtkedit/editcmd.c:335 msgid "Safe save " -msgstr "" +msgstr "âÅÚÐÅÞÎÅ ÚÂÅÒÅÖÅÎÎÑ " #: gtkedit/editcmd.c:336 msgid "Do backups -->" -msgstr "" +msgstr "òÏÂÉÔÉ ÒÅÚÅÒ×Φ ËÏЦ§ -->" #. NLS for hotkeys? #: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1171 gtkedit/editcmd.c:1217 @@ -1688,16 +1719,16 @@ #: gtkedit/editcmd.c:345 msgid "Extension:" -msgstr "" +msgstr "òÏÚÛÉÒÅÎÎÑ:" #. NLS ? #: gtkedit/editcmd.c:352 msgid " Edit Save Mode " -msgstr "" +msgstr " òÅÄÁÇÕ×ÁÎÎÑ ÒÅÖÉÍÕ ÚÂÅÒÅÖÅÎÎÑ " #: gtkedit/editcmd.c:499 msgid " Save As " -msgstr "" +msgstr " úÂÅÒÅÇÔÉ ÑË " #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 @@ -1710,12 +1741,12 @@ #: gtkedit/editcmd.c:514 msgid " A file already exists with this name. " -msgstr "" +msgstr " æÁÊÌ Ú Ã¦¤À ÎÁÚ×ÏÀ ×ÖÅ ¦ÓÎÕ¤. " #. Push buttons to over-write the current file, or cancel the operation #: gtkedit/editcmd.c:516 msgid "Overwrite" -msgstr "" +msgstr "úÁͦÓÔÉÔÉ" #: gtkedit/editcmd.c:516 gtkedit/editcmd.c:583 gtkedit/editcmd.c:810 #: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 @@ -1729,12 +1760,12 @@ #: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 msgid " Error trying to save file. " -msgstr "" +msgstr " ðÏÍÉÌËÁ ÎÁ ÓÐÒϦ ÚÂÅÒÅÇÔÉ ÆÁÊÌ. " #. This heads the delete macro error dialog box #: gtkedit/editcmd.c:653 gtkedit/editcmd.c:661 gtkedit/editcmd.c:686 msgid " Delete macro " -msgstr " ÷ÉÄÉÌÉÔÉ ÍÁËÒÏÓ " +msgstr " óÔÅÒÔÉ ÍÁËÒÏÓ " #. 'Open' = load temp file #: gtkedit/editcmd.c:655 @@ -1750,7 +1781,7 @@ #: gtkedit/editcmd.c:767 #, c-format msgid "key '%d 0': " -msgstr "" +msgstr "ËÌÁצÛÁ '%d 0': " #: gtkedit/editcmd.c:687 msgid " Error trying to overwrite macro file " @@ -1773,7 +1804,7 @@ #: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 msgid " Delete Macro " -msgstr " ÷ÉÄÁÌÉÔÉ ÍÁËÒÏÓ " +msgstr " óÔÅÒÔÉ ÍÁËÒÏÓ " #. This heads the 'Load Macro' dialog box #: gtkedit/editcmd.c:791 @@ -1782,12 +1813,12 @@ #: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 msgid " Confirm save file? : " -msgstr "" +msgstr " ð¦ÄÔ×ÅÒĦÔØ ÚÂÅÒÅÖÅÎÎÑ ÆÁÊÌÕ : " #. Buttons to 'Confirm save file' query #: gtkedit/editcmd.c:810 msgid " Save file " -msgstr "" +msgstr " úÂÅÒÅÖÅÎÎÑ ÆÁÊÌÕ " #: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 #: src/view.c:2075 @@ -1799,27 +1830,29 @@ " Current text was modified without a file save. \n" " Continue discards these changes. " msgstr "" +" ðÏÔÏÞÎÉÊ ÔÅËÓÔ ÂÕÌÏ ÍÏÄÉƦËÏ×ÁÎÏ ¦ ÎÅ ÚÂÅÒÅÖÅÎÏ. \n" +" ðÒÏÄÏ×ÖÅÎÎÑ ÐÒÉÚ×ÅÄÅ ÄÏ ×ÔÒÁÔÉ ÃÉÈ ÚͦÎ. " #: gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 gtkedit/editcmd.c:1020 msgid "Continue" -msgstr "" +msgstr "ðÒÏÄÏ×ÖÉÔÉ" #. Heads the 'Load' file dialog box #: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 msgid " Load " -msgstr "" +msgstr " úÁ×ÁÎÔÁÖÅÎÎÑ " #: gtkedit/editcmd.c:859 msgid " Error trying to open file for reading " -msgstr "" +msgstr " ðÏÍÉÌËÁ ÎÁ ÓÐÒϦ צÄËÒÉÔÉ ÆÁÊÌ ÎÁ ÚÞÉÔÕ×ÁÎÎÑ " #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 msgid " Block is large, you may not be able to undo this action. " -msgstr "" +msgstr " âÌÏË ÎÁÄÔÏ ×ÅÌÉËÉÊ, ×É ÎÅ ÚÍÏÖÅÔÅ ÚÒÏÂÉÔÉ ×¦ÄËÁÔ Ã¦¤§ Ħ§. " #: gtkedit/editcmd.c:1117 msgid " Continue " -msgstr "" +msgstr " ðÒÏÄÏ×ÖÉÔÉ " #: gtkedit/editcmd.c:1117 msgid " Cancel " @@ -1827,19 +1860,19 @@ #: gtkedit/editcmd.c:1173 msgid "o&Ne" -msgstr "" +msgstr "ÏÄÉÎ" #: gtkedit/editcmd.c:1175 src/filegui.c:597 msgid "al&L" -msgstr "" +msgstr "×Ó¦" #: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 msgid "&Skip" -msgstr "" +msgstr "&ðÒÏÐÕÓÔÉÔÉ" #: gtkedit/editcmd.c:1179 msgid "&Replace" -msgstr "" +msgstr "&úÁͦÎÉÔÉ" #: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 msgid " Replace with: " @@ -1847,7 +1880,7 @@ #: gtkedit/editcmd.c:1189 msgid " Confirm replace " -msgstr "" +msgstr " ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÚÁͦÎÉ " #: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 msgid "scanf &Expression" @@ -1879,7 +1912,7 @@ #: gtkedit/editcmd.c:1237 msgid " Enter replacement argument order eg. 3,2,1,4 " -msgstr "" +msgstr " ÷×ÅĦÔØ ÐÏÒÑÄÏË ÁÒÇÕÍÅÎÔ¦× ÚÁͦÎÉ, ÎÁÐÒ. 3,2,1,4 " #: gtkedit/editcmd.c:1241 msgid " Enter replacement string:" @@ -1959,12 +1992,12 @@ #: gtkedit/editcmd.c:1434 msgid " Prompt on replace " -msgstr "" +msgstr " ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ÚÁͦÎÕ " #. Tool hint #: gtkedit/editcmd.c:1436 msgid "Ask before making each replacement" -msgstr "" +msgstr "ðÅÒÅÐÉÔÕ×ÁÔÉ ÐÅÒÅÄ ÚÁͦÎÏÀ" #: gtkedit/editcmd.c:1438 msgid " Replace all " @@ -1984,28 +2017,28 @@ #. Tool hint #: gtkedit/editcmd.c:1448 msgid "Begin search, Enter" -msgstr "" +msgstr "òÏÚÐÏÞÁÔÉ ÐÏÛÕË, Enter" #. Tool hint #: gtkedit/editcmd.c:1451 msgid "Abort this dialog, Esc" -msgstr "" +msgstr "÷¦ÄͦÎÉÔÉ Ä¦À, Esc" #: gtkedit/editcmd.c:1607 msgid "Replace" -msgstr "" +msgstr "úÁͦÎÉÔÉ" #: gtkedit/editcmd.c:1607 msgid "Skip" -msgstr "" +msgstr "ðÒÏÐÕÓÔÉÔÉ" #: gtkedit/editcmd.c:1607 msgid "Replace all" -msgstr "" +msgstr "úÁͦÎÉÔÉ ×ÓÅ" #: gtkedit/editcmd.c:1607 msgid "Replace one" -msgstr "" +msgstr "úÁͦÎÉÔÉ ÒÁÚ" #: gtkedit/editcmd.c:1969 msgid "" @@ -2020,11 +2053,11 @@ #: gtkedit/editcmd.c:2177 #, c-format msgid " %ld replacements made. " -msgstr "" +msgstr " %ld ÚÁͦΠÚÒÏÂÌÅÎÏ. " #: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 msgid " Search string not found. " -msgstr "" +msgstr " òÑÄÏË ÎÅ ÚÎÁÊÄÅÎÏ. " #. Confirm 'Quit' dialog box #: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 @@ -2036,6 +2069,8 @@ " Current text was modified without a file save. \n" " Save with exit? " msgstr "" +" ðÏÔÏÞÎÉÊ ÔÅËÓÔ ÂÕÌÏ ÚͦÎÅÎÏ ¦ ÎÅ ÚÂÅÒÅÖÅÎÏ. \n" +" úÂÅÒÅÇÔÉ ÂÅÒÅÚ ×ÉÈÏÄÏÍ? " #: gtkedit/editcmd.c:2288 msgid " File was modified, Save with exit? " @@ -2071,7 +2106,7 @@ #: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 msgid " Copy to clipboard " -msgstr "" +msgstr " ëÏЦÀ×ÁÎÎÑ Õ ÂÕÆÅÒ ÏÂͦÎÕ " #: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 #: gtkedit/editcmd.c:2612 @@ -2080,61 +2115,61 @@ #: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 msgid " Cut to clipboard " -msgstr "" +msgstr " ÷ÉÒ¦ÚÁÎÎÑ Õ ÂÕÆÅÒ ÏÂͦÎÕ " #: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 #: gtkedit/editcmd.c:2646 src/view.c:1913 msgid " Goto line " -msgstr "" +msgstr " ðÅÒÅÈ¦Ä ÎÁ ÒÑÄÏË " #: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 #: gtkedit/editcmd.c:2646 msgid " Enter line: " -msgstr "" +msgstr " ÷×ÅĦÔØ ÎÏÍÅÒ ÒÑÄËÁ: " #: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 msgid " Save Block " -msgstr "" +msgstr " úÂÅÒÅÖÅÎÎÑ ÂÌÏËÕ " #: gtkedit/editcmd.c:2717 msgid " Insert File " -msgstr "" +msgstr " ÷ÓÔÁ×ÌÑÎÎÑ ÆÁÊÌÕ " #: gtkedit/editcmd.c:2730 msgid " Insert file " -msgstr "" +msgstr " ÷ÓÔÁ×ÉÔÉ ÆÁÊÌ " #: gtkedit/editcmd.c:2730 msgid " Error trying to insert file. " -msgstr "" +msgstr " ðÏÍÉÌËÁ ÎÁ ÓÐÒϦ ×ÓÔÁ×ÉÔÉ ÆÁÊÌ. " #. Not essential to translate #: gtkedit/editcmd.c:2752 msgid " Sort block " -msgstr "" +msgstr " óÏÒÔÕ×ÁÎÎÑ ÂÌÏËÕ " #. Not essential to translate #: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 msgid " You must first highlight a block of text. " -msgstr "" +msgstr " îÅÏÂȦÄÎÏ ÓÐÏÞÁÔËÕ ×ÉĦÌÉÔÉ ÂÌÏË ÔÅËÓÔÕ. " #: gtkedit/editcmd.c:2759 msgid " Run Sort " -msgstr "" +msgstr " ðÏÞÁÔÉ ÓÏÒÔÕ×ÁÎÎÑ " #. Not essential to translate #: gtkedit/editcmd.c:2761 msgid " Enter sort options (see manpage) separated by whitespace: " -msgstr "" +msgstr " ÷×ÅĦÔØ ÐÁÒÁÍÅÔÒÉ sort ÒÏÚĦÌÅΦ ÐÒÏÐÕÓËÁÍÉ: " #: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 msgid " Sort " -msgstr "" +msgstr " óÏÒÔÕ×ÁÎÎÑ " #. Not essential to translate #: gtkedit/editcmd.c:2774 msgid " Error trying to execute sort command " -msgstr "" +msgstr " ðÏÍÉÌËÁ ÎÁ ÓÐÒϦ ×ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ sort" #. Not essential to translate #: gtkedit/editcmd.c:2780 @@ -2144,7 +2179,7 @@ #. Not essential to translate #: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 msgid " Process block " -msgstr "" +msgstr " ïÂÒÏÂËÁ ÂÌÏËÕ " #. Not essential to translate #: gtkedit/editcmd.c:2836 @@ -2173,12 +2208,12 @@ #: gtkedit/editmenu.c:61 msgid " Word wrap " -msgstr "" +msgstr " æÏÒÍÁÔÕ×ÁÎÎÑ ÒÑÄËÁ " #. Not essential to translate #: gtkedit/editmenu.c:63 msgid " Enter line length, 0 for off: " -msgstr "" +msgstr " ÷×ÅĦÔØ ÄÏ×ÖÉÎÕ ÒÑÄËÁ, 0 - ×ÉÍËÎÕÔÉ: " #: gtkedit/editmenu.c:74 msgid " About " @@ -2194,6 +2229,13 @@ " A user friendly text editor written\n" " for the Midnight Commander.\n" msgstr "" +"\n" +" Cooledit v3.11.5\n" +"\n" +" Copyright (C) 1996 the Free Software Foundation\n" +"\n" +"ôÅËÓÔÏ×ÉÊ ÒÅÄÁËÔÏÒ Ú ÄÒÕÖÎ¦Í ¦ÎÔÅÒÆÅÊÓÏÍ ËÏÒÉÓÔÕ×ÁÞÁ.\n" +" óÔ×ÏÒÅÎÏ ÄÌÑ Midnight Commander.\n" #: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 msgid "&Open/load... C-o" @@ -2257,11 +2299,11 @@ #: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Delete F8" -msgstr "&÷ÉÄÁÌÉÔÉ F8" +msgstr "&óÔÅÒÔÉ F8" #: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 msgid "&Undo C-u" -msgstr "" +msgstr "÷¦Ä&ËÁÔ C-u" #: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Beginning C-PgUp" @@ -2436,27 +2478,27 @@ #: gtkedit/editmenu.c:423 msgid "Copy block to cursor\tF5" -msgstr "" +msgstr "óËÏЦÀ×ÁÔÉ ÂÌÏË\tF5" #: gtkedit/editmenu.c:424 msgid "Move block to cursor\tF6" -msgstr "" +msgstr "ðÅÒÅÎÅÓÔÉ ÂÌÏË\tF6" #: gtkedit/editmenu.c:425 msgid "Delete block\tF8/C-Del" -msgstr "" +msgstr "óÔÅÒÔÉ ÂÌÏË\tF8/C-Del" #: gtkedit/editmenu.c:427 msgid "Copy block to clipbrd\tC-Ins" -msgstr "" +msgstr "óËÏЦÀ×ÁÔÉ ÂÌÏË Õ ÂÕÆÅÒ ÏÂͦÎÕ\tC-Ins" #: gtkedit/editmenu.c:428 msgid "Cut block to clipbrd\tS-Del" -msgstr "" +msgstr "÷ÉÒ¦ÚÁÔÉ ÂÌÏË Õ ÂÕÆÅÒ ÏÂͦÎÕ\tS-Del" #: gtkedit/editmenu.c:429 msgid "Paste block from clipbrd\tS-Ins" -msgstr "" +msgstr "÷ÓÔÁ×ÉÔÉ ÂÌÏË Ú ÂÕÆÅÒÕ ÏÂͦÎÕ\tS-Ins" #: gtkedit/editmenu.c:430 msgid "Selection history\tM-Ins" @@ -2494,7 +2536,7 @@ #. Tool hint #: gtkedit/editmenu.c:447 msgid "Search for and replace text" -msgstr "" +msgstr "úÎÁÊÔÉ ÔÁ ÚÁͦÎÉÔÉ ÔÅËÓÔ" #: gtkedit/editmenu.c:453 msgid "Goto line...\tM-l" @@ -2506,7 +2548,7 @@ #: gtkedit/editmenu.c:456 msgid "Finish record macro...\tC-r" -msgstr "Á×ÅÒÛÉÔÉ ÚÁÐÉÓ ÍÁËÒÏÓÕ...\tC-r" +msgstr "úÁ×ÅÒÛÉÔÉ ÚÁÐÉÓ ÍÁËÒÏÓÕ...\tC-r" #: gtkedit/editmenu.c:457 msgid "Execute macro...\tC-a, KEY" @@ -2514,7 +2556,7 @@ #: gtkedit/editmenu.c:458 msgid "Delete macro...\t" -msgstr "÷ÉÄÉÌÉÔÉ ÍÁËÒÏÓ..\t" +msgstr "÷ÉÄÁÌÉÔÉ ÍÁËÒÏÓ..\t" #: gtkedit/editmenu.c:460 msgid "Insert date/time\tC-d" @@ -2535,15 +2577,15 @@ #: gtkedit/editoptions.c:36 msgid "Intuitive" -msgstr "" +msgstr "¶ÎÔÕ¦ÔÉ×ÎÁ" #: gtkedit/editoptions.c:36 msgid "Emacs" -msgstr "" +msgstr "Emacs" #: gtkedit/editoptions.c:39 msgid "None" -msgstr "" +msgstr "îÅÍÁ¤" #: gtkedit/editoptions.c:39 msgid "Dynamic paragraphing" @@ -2556,16 +2598,16 @@ #. 2 #: gtkedit/editoptions.c:74 msgid "Word wrap line length : " -msgstr "" +msgstr "ðÏÚÉÃÉÑ ÏÂÒÉ×Õ ÒÑÄË¦× : " #. 4 #: gtkedit/editoptions.c:80 msgid "Tab spacing : " -msgstr "" +msgstr "ëÒÏË ÔÁÂÕÌÑæ§ : " #: gtkedit/editoptions.c:88 msgid "synta&X highlighting" -msgstr "" +msgstr "&÷ÉĦÌÅÎÎÑ ÓÉÎÔÁËÓÉÓÕ ËÏÌØÏÒÏÍ" #. 7 #: gtkedit/editoptions.c:94 @@ -2575,12 +2617,12 @@ #. 8 #: gtkedit/editoptions.c:97 msgid "fill tabs with &Spaces" -msgstr "" +msgstr "&úÁÐÏ×ÎÅÎÎÑ ÔÁÂÕÌÑæ§ ÐÒÏÐÕÓËÁÍÉ" #. 9 #: gtkedit/editoptions.c:100 msgid "&Return does autoindent" -msgstr "" +msgstr "&á×ÔÏ×ÉÒ¦×ÎÀ×ÁÎÎÑ ÒÑÄ˦×" #. 10 #: gtkedit/editoptions.c:103 @@ -2590,7 +2632,7 @@ #. 11 #: gtkedit/editoptions.c:106 msgid "&Fake half tabs" -msgstr "" +msgstr "&óÉÍÕÌÑÃ¦Ñ Ð¦×ÔÁÂÕÌÑæ§" #. 13 #: gtkedit/editoptions.c:112 @@ -2600,7 +2642,7 @@ #. 15 #: gtkedit/editoptions.c:118 msgid "Key emulation" -msgstr "" +msgstr "åÍÕÌÑÃ¦Ñ ËÌÁצÛ" #: gtkedit/editoptions.c:159 msgid " Editor options " @@ -2615,7 +2657,7 @@ #: src/main.c:1719 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 #: src/view.c:2068 msgid "Help" -msgstr "ðÏͦÞ" +msgstr "äÏצÄËÁ" #: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 msgid "Mark" @@ -2641,7 +2683,7 @@ #: gtkedit/gtkedit.c:66 msgid " Enter file name: " -msgstr "" +msgstr " ÷×ÅĦÔØ ÎÁÚ×Õ ÆÁÊÌÕ: " #: gtkedit/gtkedit.c:111 msgid "The Quick Brown Fox Jumps Over The Lazy Dog" @@ -2786,7 +2828,7 @@ #: gtkedit/syntax.c:1493 #, c-format msgid " Error in file %s on line %d " -msgstr "" +msgstr " ðÏÍÉÌËÁ Õ ÆÁÊ̦ %s × ÒÑÄËÕ %d " #: src/achown.c:72 src/chmod.c:115 src/chown.c:80 msgid "&Set" @@ -2860,11 +2902,11 @@ #: src/background.c:181 msgid "Background process:" -msgstr "" +msgstr "ðÒÏÃÅÓ ÎÁ Ô̦:" #: src/background.c:287 src/file.c:2189 msgid " Background process error " -msgstr "" +msgstr " ðÏÍÉÌËÁ ÐÒÏÃÅÓÕ ÎÁ Ô̦ " #: src/background.c:294 msgid " Child died unexpectedly " @@ -2890,19 +2932,19 @@ #: src/boxes.c:68 msgid "&Full file list" -msgstr "" +msgstr "&ðÏ×ÎÉÊ ÓÐÉÓÏË ÆÁÊ̦×" #: src/boxes.c:69 msgid "&Brief file list" -msgstr "" +msgstr "&ëÏÒÏÔËÉÊ ÓÐÉÓÏË ÆÁÊ̦×" #: src/boxes.c:70 msgid "&Long file list" -msgstr "" +msgstr "&äÏ×ÇÉÊ ÓÐÉÓÏË ÆÁÊ̦×" #: src/boxes.c:71 msgid "&User defined:" -msgstr "" +msgstr "&÷ÉÚÎÁÞÅÎÉÊ ËÏÒÉÓÔÕ×ÁÞÅÍ" #: src/boxes.c:72 msgid "&Icon view" @@ -2910,7 +2952,7 @@ #: src/boxes.c:137 msgid "user &Mini status" -msgstr "" +msgstr "ëÏÒÉÓÔÕ×ÁÃØËÉÊ ÒÑÄÏË &ÓÔÁÔÕÓÕ" #: src/boxes.c:186 msgid "Listing mode" @@ -2918,15 +2960,15 @@ #: src/boxes.c:280 msgid "&Reverse" -msgstr "" +msgstr "&ðÅÒÅ×ÅÒÎÕÔÉÊ" #: src/boxes.c:281 msgid "case sensi&tive" -msgstr "" +msgstr "&÷ÒÁÈÕ×ÁÔÉ ÒÅǦÓÔÒ" #: src/boxes.c:282 msgid "Sort order" -msgstr "" +msgstr "ðÏÒÑÄÏË ÓÏÒÔÕ×ÁÎÎÑ" #: src/boxes.c:381 msgid " confirm &Exit " @@ -2966,15 +3008,15 @@ #: src/boxes.c:476 msgid " Display bits " -msgstr " ðÏËÁÚ Â¦Ô¦× " +msgstr " ÷¦ÄÏÂÒÁÖÅÎÎÑ Â¦Ô¦× " #: src/boxes.c:651 msgid "&Always use ftp proxy" -msgstr "" +msgstr "&úÁ×ÖÄÉ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÐÒÏËÓ¦ FTP" #: src/boxes.c:653 msgid "sec" -msgstr "" +msgstr "Ó" #: src/boxes.c:657 msgid "ftpfs directory cache timeout:" @@ -3003,31 +3045,31 @@ #: src/boxes.c:796 msgid "Symbolic link" -msgstr "" +msgstr "óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ" #: src/boxes.c:833 msgid "Running " -msgstr "" +msgstr "÷ÉËÏÎÁÎÎÑ " #: src/boxes.c:834 src/find.c:719 src/find.c:960 msgid "Stopped" -msgstr "" +msgstr "úÕÐÉÎÅÎÏ" #: src/boxes.c:895 msgid "&Stop" -msgstr "" +msgstr "úÕ&ÐÉÎÉÔÉ" #: src/boxes.c:896 msgid "&Resume" -msgstr "" +msgstr "&ðÒÏÄÏ×ÖÉÔÉ" #: src/boxes.c:897 msgid "&Kill" -msgstr "" +msgstr "&úÎÉÝÉÔÉ" #: src/boxes.c:936 msgid "Background Jobs" -msgstr "" +msgstr "úÁ×ÄÁÎÎÑ ÎÁ Ô̦" #: src/chmod.c:95 msgid "execute/search by others" @@ -3103,27 +3145,27 @@ #: src/chmod.c:160 msgid " Chmod command " -msgstr "" +msgstr " úͦÎÁ ÐÒÁ× " #: src/chmod.c:162 src/chown.c:120 msgid " Permission " -msgstr "" +msgstr " ðÒÁ×Á " #: src/chmod.c:169 msgid "Use SPACE to change" -msgstr "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ðòïðõóë ÄÌÑ ÚÁͦÎÉ" +msgstr "÷ÉËÏÒÉÓÔÏ×ÕÊÔÅ ðòïðõóë ÄÌÑ" #: src/chmod.c:171 msgid "an option, ARROW KEYS" -msgstr "" +msgstr "ÚͦÎÉ ÐÁÒÁÍÅÔÒÕ, óôò¶ìëé" #: src/chmod.c:173 msgid "to move between options" -msgstr "" +msgstr "ÄÌÑ ÐÅÒÅÓÕ×ÁÎÎÑ ÔÁ T" #: src/chmod.c:175 msgid "and T or INS to mark" -msgstr "" +msgstr "ÞÉ INS ÄÌÑ ×ÉÂÏÒÕ" #: src/chmod.c:233 msgid "Chmod command" @@ -3151,11 +3193,11 @@ #: src/chown.c:114 msgid " Owner name " -msgstr "" +msgstr " îÁÚ×Á ×ÌÁÓÎÉËÁ " #: src/chown.c:116 src/chown.c:128 msgid " Group name " -msgstr "" +msgstr " îÁÚ×Á ÇÒÕÐÉ " #: src/chown.c:118 msgid " Size " @@ -3167,16 +3209,16 @@ #: src/chown.c:126 msgid " User name " -msgstr "" +msgstr " îÁÚ×Á ËÏÒÉÓÔÕ×ÁÞÁ " #: src/chown.c:192 msgid "" -msgstr "" +msgstr "<îÅצÄÏÍÉÊ ËÏÒÉÓÔÕ×ÁÞ>" #. add fields for unknown names (numbers) #: src/chown.c:193 msgid "" -msgstr "" +msgstr "<îÅצÄÏÍÁ ÇÒÕÐÁ>" #: src/chown.c:261 msgid " I can't run the Chown command on an extfs " @@ -3197,27 +3239,27 @@ #: src/cmd.c:248 msgid "Files tagged, want to cd?" -msgstr "" +msgstr "÷ÉÂÒÁÎÏ ÆÁÊÌÉ, ÈÏÞÅÔÅ ÚͦÎÉÔÉ ËÁÔÁÌÏÇ?" #: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 msgid "Could not change directory" -msgstr "" +msgstr "îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ËÁÔÁÌÏÇ" #: src/cmd.c:283 msgid " View file " -msgstr "" +msgstr " ðÅÒÅÇÌÑÄ ÆÁÊÌÕ " #: src/cmd.c:283 msgid " Filename:" -msgstr "" +msgstr " îÁÚ×Á ÆÁÊÌÕ:" #: src/cmd.c:300 msgid " Filtered view " -msgstr "" +msgstr " æ¦ÌØÔÒÏ×ÁÎÉÊ ÐÅÒÅÇÌÑÄ " #: src/cmd.c:300 msgid " Filter command and arguments:" -msgstr "" +msgstr " ëÏÍÁÎÄÁ-ƦÌØÔÒ ÔÁ ÁÒÇÕÍÅÎÔÉ:" #: src/cmd.c:388 msgid "Create a new Directory" @@ -3229,11 +3271,11 @@ #: src/cmd.c:449 msgid " Filter " -msgstr "" +msgstr " æ¦ÌØÔÒ " #: src/cmd.c:449 msgid " Set expression for filtering filenames" -msgstr "" +msgstr " ÷ËÁÖ¦ÔØ ×ÉÒÁÚ ÄÌÑ ×¦ÌØÔÒÁæ§ ÎÁÚ× ÆÁÊ̦×" #: src/cmd.c:515 msgid " Select " @@ -3301,7 +3343,7 @@ #: src/cmd.c:883 msgid " The command history is empty " -msgstr "" +msgstr " ¶ÓÔÏÒ¦Ñ ËÏÍÁÎÄ ÐÏÒÏÖÎÑ " #: src/cmd.c:889 msgid " Command history " @@ -3323,10 +3365,12 @@ " Couldn't stat %s \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ×ÌÁÓÔÉ×ÏÓÔ¦ %s \n" +" %s " #: src/cmd.c:1034 src/cmd.c:1036 msgid " Link " -msgstr "" +msgstr " ðÏÓÉÌÁÎÎÑ " #: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 msgid " to:" @@ -3335,21 +3379,21 @@ #: src/cmd.c:1046 #, c-format msgid " link: %s " -msgstr "" +msgstr " ÐÏÓÉÌÁÎÎÑ: %s " #: src/cmd.c:1079 #, c-format msgid " symlink: %s " -msgstr "" +msgstr " ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ: %s " #: src/cmd.c:1133 #, c-format msgid " Symlink `%s' points to: " -msgstr "" +msgstr " óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ \"%s\" ×ËÁÚÕ¤ ÎÁ: " #: src/cmd.c:1138 msgid " Edit symlink " -msgstr "" +msgstr " òÅÄÁÇÕ×ÁÎÎÑ ÓÉÍ×ÏÌØÎÏÇÏ ÐÏÓÉÌÁÎÎÑ " #: src/cmd.c:1143 #, c-format @@ -3385,15 +3429,15 @@ #: src/cmd.c:1367 msgid " Link to a remote machine " -msgstr "" +msgstr " ú×'ÑÚÏË ¦Ú צÄÄÁÌÅÎÏÀ ÍÁÛÉÎÏÀ " #: src/cmd.c:1373 msgid " FTP to machine " -msgstr "" +msgstr " FTP-Ú×'ÑÚÏË ¦Ú ÍÁÛÉÎÏÀ " #: src/cmd.c:1379 msgid " SMB link to machine " -msgstr "" +msgstr " SMB-Ú×'ÑÚÏË ¦Ú ÍÁÛÉÎÏÀ " #: src/cmd.c:1389 msgid " Socket source routing setup " @@ -3413,7 +3457,7 @@ #: src/cmd.c:1408 msgid " Undelete files on an ext2 file system " -msgstr "" +msgstr " ÷¦ÄÎÏ×ÌÅÎÎÑ ÆÁÊÌ¦× ÎÁ ÆÁÊÌÏ×¦Ê ÓÉÓÔÅͦ ext2" #: src/cmd.c:1409 msgid "" @@ -3435,7 +3479,7 @@ " Can't chdir to '%s' \n" " %s " msgstr "" -" îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ÄÉÒÅËÔÏÒ¦À ÎÁ '%s' \n" +" îÅÍÏÖÌÉ×Ï ÐÅÒÅÊÔÉ × ËÁÔÁÌÏÇ \"%s\" \n" " %s " #: src/command.c:198 @@ -3726,11 +3770,11 @@ #: src/file.c:803 msgid "&Delete" -msgstr "" +msgstr "&óÔÅÒÔÉ" #: src/file.c:803 src/hotlist.c:1443 msgid "&Keep" -msgstr "" +msgstr "&ìÉÛÉÔÉ" #: src/file.c:876 #, c-format @@ -3753,6 +3797,8 @@ " Cannot copy cyclic symbolic link \n" " `%s' " msgstr "" +" îÅÍÏÖÌÉ×Ï ÓËÏЦÀ×ÁÔÉ ÃÉË̦ÞÎÅ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ \n" +" `%s' " #: src/file.c:964 #, c-format @@ -3760,6 +3806,8 @@ " Cannot create target directory \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ã¦ÌØÏ×ÉÊ ËÁÔÁÌÏÇ \"%s\" \n" +" %s " #: src/file.c:987 #, c-format @@ -3775,6 +3823,8 @@ " Cannot stat file \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÏÔÒÉÍÁÔÉ ×ÌÁÓÔÉ×ÏÓÔ¦ ÆÁÊÌÕ \"%s\" \n" +" %s " #: src/file.c:1122 #, c-format @@ -3799,6 +3849,8 @@ " Cannot remove file \"%s\" \n" " %s " msgstr "" +" îÅ ×ÄÁÌÏÓÑ ×ÉÄÁÌÉÔÉ ÆÁÊÌ \"%s\" \n" +" %s " #: src/file.c:1246 #, c-format @@ -3808,12 +3860,12 @@ #: src/file.c:1265 #, c-format msgid " Cannot overwrite directory \"%s\" %s " -msgstr "" +msgstr " îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÐÉÓÁÔÉ ËÁÔÁÌÏÇ \"%s\" %s " #: src/file.c:1267 #, c-format msgid " Cannot overwrite file \"%s\" %s " -msgstr "" +msgstr " îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÐÉÓÁÔÉ ÆÁÊÌ \"%s\" %s " #: src/file.c:1294 #, c-format @@ -3821,6 +3873,8 @@ " Cannot move directory \"%s\" to \"%s\" \n" " %s " msgstr "" +" îÅ ×ÄÁÌÏÓÑ ÐÅÒÅÎÅÓÔÉ ËÁÔÁÌÏÇ \"%s\" Õ \"%s\" \n" +" %s " #: src/file.c:1357 #, c-format @@ -3828,6 +3882,8 @@ " Cannot delete file \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÓÔÅÒÔÉ ÆÁÊÌ \"%s\" \n" +" %s " #: src/file.c:1418 src/file.c:1488 src/file.c:1520 #, c-format @@ -3835,10 +3891,12 @@ " Cannot remove directory \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ×ÉÄÁÌÉÔÉ ËÁÔÁÌÏÇ \"%s\" \n" +" %s " #: src/file.c:1559 msgid " Internal error: get_file \n" -msgstr "" +msgstr " ÷ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ: get_file \n" #. #. * This array introduced to avoid translation problems. The former (op_names) @@ -3859,7 +3917,7 @@ #: src/file.c:1680 msgid "1Delete" -msgstr "1÷ÉÄÁÌÉÔÉ" +msgstr "1óÔÅÒÔÉ" #: src/file.c:1695 #, c-format @@ -3938,11 +3996,11 @@ #: src/file.c:2190 msgid "&Retry" -msgstr "" +msgstr "&ðÏ×ÔÏÒÉÔÉ" #: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" -msgstr "" +msgstr "&ðÅÒÅÒ×ÁÔÉ" #: src/file.c:2242 msgid "" @@ -3950,6 +4008,9 @@ " Directory not empty. \n" " Delete it recursively? " msgstr "" +"\n" +" ëÁÔÁÌÏÇ ÎÅ ÐÏÒÏÖΦÊ. \n" +" óÔÅÒÔÉ ÊÏÇÏ ÒÅËÕÒÓÉ×ÎÏ? " #: src/file.c:2243 msgid "" @@ -3957,10 +4018,13 @@ " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" +"\n" +" ðÒÏÃÅÓ ÎÁ Ô̦: ëÁÔÁÌÏÇ ÎÅ ÐÏÒÏÖÎ¦Ê \n" +" óÔÅÒÔÉ ÊÏÇÏ ÒÅËÕÒÓÉ×ÎÏ? " #: src/file.c:2250 msgid "a&ll" -msgstr "" +msgstr "&×Ó¦" #: src/file.c:2250 src/filegui.c:595 msgid "non&E" @@ -3972,44 +4036,44 @@ #: src/file.c:2262 msgid "all the directories " -msgstr "" +msgstr "×Ó¦ ËÁÔÁÌÏÇÉ " #: src/file.c:2264 msgid " Recursive Delete " -msgstr "" +msgstr " òÅËÕÒÓÉ×ÎÅ ÓÔÉÒÁÎÎÑ " #: src/file.c:2265 msgid " Background process: Recursive Delete " -msgstr "" +msgstr " ðÒÏÃÅÓ ÎÁ Ô̦: ÒÅËÕÒÓÉ×ÎÅ ÓÔÉÒÁÎÎÑ " #: src/filegui.c:424 msgid "File" -msgstr "" +msgstr "æÁÊÌ" #: src/filegui.c:447 msgid "Count" -msgstr "" +msgstr "ë¦ÌØ˦ÓÔØ" #: src/filegui.c:468 msgid "Bytes" -msgstr "" +msgstr "âÁÊÔÉ" #: src/filegui.c:505 msgid "Source" -msgstr "" +msgstr "äÖÅÒÅÌÏ" #: src/filegui.c:528 msgid "Target" -msgstr "" +msgstr "ã¦ÌØ" #: src/filegui.c:550 msgid "Deleting" -msgstr "" +msgstr "÷ÉÄÁÌÅÎÎÑ" #: src/filegui.c:590 #, c-format msgid "Target file \"%s\" already exists!" -msgstr "" +msgstr "ã¦ÌØÏ×ÉÊ ÆÁÊÌ \"%s\" ×ÖÅ ¦ÓÎÕ¤!" #: src/filegui.c:593 msgid "if &Size differs" @@ -4047,11 +4111,11 @@ #: src/filegui.c:692 msgid " File exists " -msgstr "" +msgstr " æÁÊÌ ¦ÓÎÕ¤ " #: src/filegui.c:693 msgid " Background process: File exists " -msgstr "" +msgstr " ðÒÏÃÅÓ ÎÁ Ô̦: æÁÊÌ ¦ÓÎÕ¤ " #. follow symlinks and preserve Attributes must be the first #: src/filegui.c:805 @@ -4094,11 +4158,11 @@ #: src/find.c:130 msgid "&Suspend" -msgstr "" +msgstr "ðÒÉ&ÚÕÐÉÎÉÔÉ" #: src/find.c:131 msgid "Con&tinue" -msgstr "" +msgstr "&ðÒÏÄÏ×ÖÉÔÉ" #: src/find.c:132 msgid "&Chdir" @@ -4106,11 +4170,11 @@ #: src/find.c:133 msgid "&Again" -msgstr "" +msgstr "&úÎÏ×Õ" #: src/find.c:134 msgid "&Quit" -msgstr "" +msgstr "&÷ÉÊÔÉ" #: src/find.c:135 src/panelize.c:89 msgid "Pane&lize" @@ -4122,19 +4186,19 @@ #: src/find.c:137 msgid "&Edit - F4" -msgstr "" +msgstr "&òÅÄÁÇÕ×ÁÔÉ - F4" #: src/find.c:170 msgid "Start at:" -msgstr "" +msgstr "ðÏÞÉÎÁÔÉ Ú:" #: src/find.c:170 msgid "Filename:" -msgstr "" +msgstr "îÁÚ×Á ÆÁÊÌÕ:" #: src/find.c:170 msgid "Content: " -msgstr "" +msgstr "÷ͦÓÔ: " #: src/find.c:171 src/main.c:1243 src/main.c:1267 msgid "&Tree" @@ -4142,7 +4206,7 @@ #: src/find.c:223 msgid "Find File" -msgstr "" +msgstr "ðÏÛÕË ÆÁÊÌÕ" #: src/find.c:452 #, c-format @@ -4159,7 +4223,7 @@ #: src/find.c:537 msgid "Finished" -msgstr "" +msgstr "úÁ×ÅÒÛÅÎÏ" #: src/find.c:561 src/view.c:1526 #, c-format @@ -4168,7 +4232,7 @@ #: src/find.c:717 src/find.c:757 msgid "Suspend" -msgstr "" +msgstr "úÕÐÉÎÉÔÉ" #: src/find.c:717 msgid "Restart" @@ -4180,7 +4244,7 @@ #: src/find.c:750 src/find.c:1031 msgid "Find file" -msgstr "" +msgstr "ðÏÛÕË ÆÁÊÌÕ" #. The buttons #: src/find.c:755 @@ -4193,11 +4257,11 @@ #: src/find.c:761 msgid "View this file" -msgstr "" +msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÃÅÊ ÆÁÊÌ" #: src/find.c:762 msgid "Edit this file" -msgstr "" +msgstr "òÅÄÁÇÕ×ÁÔÉ ÃÅÊ ÆÁÊÌ" #: src/find.c:763 msgid "Send the results to a Panel" @@ -4234,7 +4298,7 @@ #: src/help.c:741 msgid " Help " -msgstr "" +msgstr " äÏצÄËÁ " #: src/help.c:766 src/user.c:637 #, c-format @@ -4242,6 +4306,8 @@ " Can't open file %s \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ %s \n" +" %s " #: src/help.c:771 #, c-format @@ -4250,7 +4316,7 @@ #: src/help.c:808 msgid "Index" -msgstr "" +msgstr "ðÏËÁÖÞÉË" #: src/help.c:810 msgid "Prev" @@ -4258,23 +4324,23 @@ #: src/hotlist.c:132 msgid "&Move" -msgstr "" +msgstr "&ðÅÒÅÓÕÎÕÔÉ" #: src/hotlist.c:133 src/hotlist.c:1443 src/panelize.c:88 src/wtools.c:383 msgid "&Remove" -msgstr "" +msgstr "&÷ÉÄÁÌÉÔÉ" #: src/hotlist.c:134 src/hotlist.c:818 src/hotlist.c:915 msgid "&Append" -msgstr "" +msgstr "&äÏÄÁÔÉ" #: src/hotlist.c:135 src/hotlist.c:816 src/hotlist.c:913 msgid "&Insert" -msgstr "" +msgstr "&÷ÓÔÁ×ÉÔÉ" #: src/hotlist.c:136 msgid "New &Entry" -msgstr "" +msgstr "îÏ×ÉÊ &ÅÌÅÍÅÎÔ" #: src/hotlist.c:137 msgid "New &Group" @@ -4290,19 +4356,19 @@ #: src/hotlist.c:141 msgid "Change &To" -msgstr "" +msgstr "&ðÅÒÅÊÔÉ ×" #: src/hotlist.c:201 msgid "Subgroup - press ENTER to see list" -msgstr "" +msgstr "ð¦ÄÇÒÕÐÁ - ÎÁÔÉÓΦÔØ ENTER ÝÏ ÐÏÂÁÞÉÔÉ ÓÐÉÓÏË" #: src/hotlist.c:620 msgid "Active VFS directories" -msgstr "" +msgstr "áËÔÉ×Φ ËÁÔÁÌÏÇÉ ÷æó" #: src/hotlist.c:620 msgid "Directory hotlist" -msgstr "" +msgstr "ð¦ÄÒÕÞΦ ËÁÔÁÌÏÇÉ" #: src/hotlist.c:639 msgid " Directory path " @@ -4311,44 +4377,44 @@ #. This one holds the displayed pathname #: src/hotlist.c:642 src/hotlist.c:689 msgid " Directory label " -msgstr "" +msgstr " í¦ÔËÁ ËÁÔÁÌÏÇÕ " #: src/hotlist.c:663 msgid "Moving " -msgstr "" +msgstr "ðÅÒÅÓÕ×ÁÎÎÑ " #: src/hotlist.c:892 msgid "New hotlist entry" -msgstr "" +msgstr "îÏ×ÉÊ ÅÌÅÍÅÎÔ" #: src/hotlist.c:892 msgid "Directory label" -msgstr "" +msgstr "í¦ÔËÁ ËÁÔÁÌÏÇÕ" #: src/hotlist.c:892 msgid "Directory path" -msgstr "" +msgstr "ëÁÔÁÌÏÇ" #: src/hotlist.c:973 msgid " New hotlist group " -msgstr "" +msgstr " óÔ×ÏÒÅÎÎÑ ÎÏ×ϧ ÇÒÕÐÉ " #: src/hotlist.c:973 msgid "Name of new group" -msgstr "" +msgstr "îÁÚ×Á ÎÏ×ϧ ÇÒÕÐÉ" #: src/hotlist.c:988 #, c-format msgid "Label for \"%s\":" -msgstr "" +msgstr "í¦ÔËÁ ÄÏ \"%s\":" #: src/hotlist.c:992 msgid " Add to hotlist " -msgstr "" +msgstr " äÏÄÁÔÉ ÄÏ ÓÐÉÓËÕ " #: src/hotlist.c:1029 msgid " Remove: " -msgstr "" +msgstr " ÷ÉÄÁÌÉÔÉ: " #: src/hotlist.c:1033 msgid "" @@ -4366,11 +4432,11 @@ #: src/hotlist.c:1394 msgid "Hotlist is now kept in file ~/" -msgstr "" +msgstr "óÐÉÓÏË ÚÂÅÒÅÖÅÎÏ Õ ÆÁÊ̦ ~/" #: src/hotlist.c:1396 msgid "MC will load hotlist from ~/" -msgstr "" +msgstr "úÁ×ÁÎÔÁÖÅÎÏ ÓÐÉÓÏË Ú ~/" #: src/hotlist.c:1398 msgid "and then delete [Hotlist] section there" @@ -4378,11 +4444,11 @@ #: src/hotlist.c:1400 src/hotlist.c:1419 src/hotlist.c:1442 src/hotlist.c:1467 msgid " Hotlist Load " -msgstr "" +msgstr " úÁ×ÁÎÔÁÖÅÎÎÑ ÓÐÉÓËÕ " #: src/hotlist.c:1416 src/hotlist.c:1464 msgid "MC was unable to write ~/" -msgstr "" +msgstr "îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ ~/" #: src/hotlist.c:1417 msgid " file, your old hotlist entries were not deleted" @@ -4450,11 +4516,11 @@ #: src/info.c:109 #, c-format msgid "File: %s" -msgstr "" +msgstr "æÁÊÌ: %s" #: src/info.c:122 msgid "Free nodes %d (%d%%) of %d" -msgstr "" +msgstr "÷¦ÌØÎÏ %d (%d%%) ×ÕÚÌ¦× Ú %d" #: src/info.c:128 msgid "No node information" @@ -4462,11 +4528,11 @@ #: src/info.c:133 msgid "Free space " -msgstr "" +msgstr "÷¦ÌØÎÏ" #: src/info.c:135 msgid " (%d%%) of " -msgstr "" +msgstr " (%d%%) Ú " #: src/info.c:139 msgid "No space information" @@ -4475,113 +4541,113 @@ #: src/info.c:143 #, c-format msgid "Type: %s " -msgstr "" +msgstr "ôÉÐ: %s " #: src/info.c:143 msgid "non-local vfs" -msgstr "" +msgstr "ÎÅ ÌÏËÁÌØÎÁ ÷æó" #: src/info.c:149 #, c-format msgid "Device: %s" -msgstr "" +msgstr "ðÒÉÓÔÒ¦Ê: %s" #: src/info.c:153 #, c-format msgid "Filesystem: %s" -msgstr "" +msgstr "æÁÊÌÓÉÓÔÅÍÁ: %s" #: src/info.c:158 #, c-format msgid "Accessed: %s" -msgstr "" +msgstr "äÏÓÔÕÐ: %s" #: src/info.c:162 #, c-format msgid "Modified: %s" -msgstr "" +msgstr "íÏÄÉƦËÏ×ÁÎÏ: %s" #: src/info.c:166 #, c-format msgid "Created: %s" -msgstr "" +msgstr "óÔ×ÏÒÅÎÏ: %s" #: src/info.c:179 msgid "Size: " -msgstr "" +msgstr "òÏÚͦÒ: " #: src/info.c:182 #, c-format msgid " (%d blocks)" -msgstr "" +msgstr " (%d ÂÌÏ˦×)" #: src/info.c:188 #, c-format msgid "Owner: %s/%s" -msgstr "" +msgstr "÷ÌÁÓÎÉË: %s/%s" #: src/info.c:193 #, c-format msgid "Links: %d" -msgstr "" +msgstr "ðÏÓÉÌÁÎØ: %d" #: src/info.c:197 #, c-format msgid "Mode: %s (%04o)" -msgstr "" +msgstr "ðÒÁ×Á: %s (%04o)" #: src/info.c:202 #, c-format msgid "Location: %Xh:%Xh" -msgstr "" +msgstr "òÏÚͦÝÅÎÎÑ: %Xh:%Xh" #: src/info.c:212 msgid "File: None" -msgstr "" +msgstr "æÁÊÌ: îÅÍÁ¤" #: src/layout.c:159 msgid "&Vertical" -msgstr "" +msgstr "&÷ÅÒÔÉËÁÌØÎÅ" #: src/layout.c:160 msgid "&Horizontal" -msgstr "" +msgstr "&çÏÒÉÚÏÎÔÁÌØÎÅ" #: src/layout.c:170 msgid "&Xterm hintbar" -msgstr "" +msgstr "ðÁÎÅÌØ ÐÏÒÁÄ &Xterm" #: src/layout.c:171 msgid "h&Intbar visible" -msgstr "" +msgstr "ðÁÎÅÌØ &ÐÏÒÁÄ" #: src/layout.c:172 msgid "&Keybar visible" -msgstr "" +msgstr "ðÁÎÅÌØ &ËÌÁצÛ" #: src/layout.c:173 msgid "command &Prompt" -msgstr "" +msgstr "òÑÄÏË &××ÏÄÕ ËÏÍÁÎÄ" #: src/layout.c:174 msgid "show &Mini status" -msgstr "" +msgstr "òÑÄÏË &ÓÔÁÎÕ" #: src/layout.c:175 msgid "menu&Bar visible" -msgstr "" +msgstr "ðÁÎÅÌØ &ÍÅÎÀ" #: src/layout.c:176 msgid "&Equal split" -msgstr "" +msgstr "&ò¦×ÎÅ ÒÏÚĦÌÅÎÎÑ" #: src/layout.c:177 msgid "pe&Rmissions" -msgstr "" +msgstr "&ðÒÁ×Á ÄÏÓÔÕÐÕ" #: src/layout.c:178 msgid "&File types" -msgstr "" +msgstr "&ôÉÐÉ ÆÁÊ̦×" #: src/layout.c:372 src/learn.c:60 src/learn.c:179 src/option.c:145 msgid "&Save" @@ -4594,11 +4660,11 @@ #: src/layout.c:381 msgid " Panel split " -msgstr "" +msgstr " òÏÚĦÌÅÎÎÑ ÐÁÎÅÌÅÊ " #: src/layout.c:382 msgid " Highlight... " -msgstr "" +msgstr " ð¦ÄÓצÔËÁ " #: src/layout.c:383 src/option.c:156 msgid " Other options " @@ -4606,11 +4672,11 @@ #: src/layout.c:384 msgid "output lines" -msgstr "" +msgstr "ÒÑÄË¦× ×É×ÏÄÕ" #: src/layout.c:451 msgid "Layout" -msgstr "" +msgstr "óÈÅÍÁ ÒÏÚÔÁÛÕ×ÁÎÎÑ" #: src/learn.c:74 msgid " Learn keys " @@ -4618,7 +4684,7 @@ #: src/learn.c:93 msgid " Teach me a key " -msgstr "" +msgstr " òÏÚЦÚÎÁ×ÁÎÎÑ ËÌÁצۦ " #: src/learn.c:94 #, c-format @@ -4632,10 +4698,18 @@ "If you want to escape, press a single Escape key\n" "and wait as well." msgstr "" +"âÕÄØ ÌÁÓËÁ ÎÁÔÉÓΦÔØ ËÌÁ×ÉÛÕ %s\n" +"¦ ÐÏÞÅËÁÊÔÅ, ÄÏËÉ ÃÅ ÐÏצÄÏÍÌÅÎÎÑ ÎÅ ÚÎÉËÎÅ.\n" +"\n" +"ðÏÔ¦Í ÎÁÔÉÓΦÔØ §§ ÝÅ ÒÁÚ, ÝÏ ÐÅÒÅÓצÄÞÉÔÉÓØ,\n" +"ÝÏ ÓÐÒÁ×Á ×¦Ä §§ ÎÁÚ×É Ú'Ñ×ÉÌÁÓØ ÐÏÚÎÁÞËÁ –.\n" +"\n" +"ñËÝÏ ×É ÈÏÞÅÔÅ ÐÒÉÐÉÎÉÔÉ ÒÏÚЦÚÎÁ×ÁÎÎÑ, ÎÁÔÉÓΦÔØ\n" +"ËÌÁ×ÉÛÕ Esc ¦ ÔÅÖ ÔÒ¦ÛËÉ ÐÏÞÅËÁÊÔÅ." #: src/learn.c:122 msgid " Cannot accept this key " -msgstr "" +msgstr " îÅÍÏÖÌÉ×Ï ÐÒÉÊÎÑÔÉ ÃÀ ËÌÁצÛÕ " #: src/learn.c:123 #, c-format @@ -4644,7 +4718,7 @@ #: src/learn.c:170 msgid "OK" -msgstr "çÁÒÁÚÄ" +msgstr "–" #: src/learn.c:177 msgid "" @@ -4672,15 +4746,15 @@ #: src/learn.c:300 msgid "Press all the keys mentioned here. After you have done it, check" -msgstr "" +msgstr "îÁÔÉÓΦÔØ ×Ó¦ ÐÅÒÅÒÁÈÏ×ÁΦ ×ÉÝÅ ËÌÁצۦ. ðÏÓÌÑ ÎÁÔÉÓÎÅÎØ ÚÎÁÊĦÔØ," #: src/learn.c:302 msgid "which keys are not marked with OK. Press space on the missing" -msgstr "" +msgstr "Ô¦, ÝÏ ÎÅ ÍÁÀÔØ ÐÏÚÎÁÞËÉ –. äÌÑ ÒÏÚЦÚÎÁ×ÁÎÎÑ ËÌÁצۦ" #: src/learn.c:304 msgid "key, or click with the mouse to define it. Move around with Tab." -msgstr "" +msgstr "×ÉÂÅÒ¦ÔØ §§ ÚÁ ÄÏÐÏÍÏÇÏÀ Tab ÞÉ ÍÉÛÏÀ ¦ ÎÁÔÉÓΦÔØ ÐÒÏÐÕÓË." #: src/main.c:707 msgid "" @@ -4689,14 +4763,18 @@ " deleted your working directory, or given yourself \n" " extra access permissions with the \"su\" command? " msgstr "" +" îÅÍÏÖÌÉ×Ï ÐÅÒÅÊÔÉ × ËÁÔÁÌÏÇ, ÐÒÏ ÑËÉÊ ÐÏצÄÏÍÉ× \n" +" ¦ÎÔÅÒÐÒÅÔÁÔÏÒ ËÏÍÁÎÄ. íÏÖÅ, ×É ×ÉÄÁÌÉÌÉ ÒÏÂÏÞÉÊ \n" +" ËÁÔÁÌÏÇ ÞÉ ÄÁÌÉ ÓϦ ÄÏÄÁÔËÏצ ÐÒÁ×Á ÄÏÓÔÕÐÕ ÚÁ \n" +" ÄÏÐÏÍÏÇÏÀ ËÏÍÁÎÄÉ \"su\"? " #: src/main.c:782 msgid "Press any key to continue..." -msgstr "" +msgstr "äÌÑ ÐÒÏÄÏ×ÖÅÎÎÑ ÎÁÔÉÓΦÔØ ÂÕÄØ-ÑËÕ ËÌÁצÛÕ..." #: src/main.c:832 msgid " The shell is already running a command " -msgstr "" +msgstr " ¶ÎÔÅÒÐÒÅÔÁÔÏÒ ×ÖÅ ×ÉËÏÎÕ¤ ËÏÍÁÎÄÕ " #: src/main.c:859 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " @@ -4748,83 +4826,83 @@ #: src/main.c:1288 msgid "&User menu F2" -msgstr "íÅÎÀ &ËÏÒÉÓÔÕ×ÁÞÁ F2" +msgstr "íÅÎÀ &ËÏÒÉÓÔÕ×ÁÞÁ F2" #: src/main.c:1289 msgid "&View F3" -msgstr "&ðÅÒÅÇÌÑÎÕÔÉ F3" +msgstr "&ðÅÒÅÇÌÑÎÕÔÉ F3" #: src/main.c:1290 msgid "Vie&w file... " -msgstr "ðÅÒÅÇÌÑÎÕÔÉ ÆÁÊÌ... " +msgstr "ðÅÒÅ&ÇÌÑÎÕÔÉ ÆÁÊÌ..." #: src/main.c:1291 msgid "&Filtered view M-!" -msgstr "" +msgstr "&æ¦ÌØÔÒÏ×ÁÎÉÊ ÐÅÒÅÇÌÑÄ M-!" #: src/main.c:1292 msgid "&Edit F4" -msgstr "&òÅÄÁÇÕ×ÁÔÉ F4" +msgstr "&òÅÄÁÇÕ×ÁÔÉ F4" #: src/main.c:1293 msgid "&Copy F5" -msgstr "&óËÏЦÀ×ÁÔÉ F5" +msgstr "&óËÏЦÀ×ÁÔÉ F5" #: src/main.c:1294 msgid "c&Hmod C-x c" -msgstr "" +msgstr "úͦÎÁ &ÐÒÁ× C-x c" #: src/main.c:1296 msgid "&Link C-x l" -msgstr "" +msgstr "&ðÏÓÉÌÁÎÎÑ C-x l" #: src/main.c:1297 msgid "&SymLink C-x s" -msgstr "" +msgstr "&óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ C-x s" #: src/main.c:1298 msgid "edit s&Ymlink C-x C-s" -msgstr "" +msgstr "&úͦÎÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ C-x C-s" #: src/main.c:1299 msgid "ch&Own C-x o" -msgstr "úͦÎÁ ×ÌÁÓÎÉËÁ C-x o" +msgstr "úͦÎÉÔÉ ×ÌÁÓÎÉËÁ C-x o" #: src/main.c:1300 msgid "&Advanced chown " -msgstr "" +msgstr "&òÏÚÛÉÒÅÎÁ ÚͦÎÁ ×ÌÁÓÎÉËÁ" #: src/main.c:1302 msgid "&Rename/Move F6" -msgstr "" +msgstr "&ðÅÒÅÊÍÅÎÕ×ÁÔÉ/ðÅÒÅÎÅÓÔÉ F6" #: src/main.c:1303 msgid "&Mkdir F7" -msgstr "&óÔ×ÏÒÉÔÉ ËÁÌÏÇ F7" +msgstr "&óÔ×ÏÒÉÔÉ ËÁÌÏÇ F7" #: src/main.c:1304 msgid "&Delete F8" -msgstr "&÷ÉÄÁÌÉÔÉ F8" +msgstr "&óÔÅÒÔÉ F8" #: src/main.c:1305 msgid "&Quick cd M-c" -msgstr "&û×ÉÄËÁ ÚͦÎÁ ËÁÌÏÇÕ M-c" +msgstr "&û×ÉÄËÁ ÚͦÎÁ ËÁÌÏÇÕ M-c" #: src/main.c:1307 msgid "select &Group M-+" -msgstr "÷ÉÂÒÁÔÉ &ÇÒÕÐÕ M-+" +msgstr "÷ÉÂÒÁÔÉ &ÇÒÕÐÕ M-+" #: src/main.c:1308 msgid "u&Nselect group M-\\" -msgstr "&úÎÑÔÉ ×ÉÂ¦Ò Ú ÇÒÕÐÉ M-\\" +msgstr "&úÎÑÔÉ ×ÉÂ¦Ò Ú ÇÒÕÐÉ M-\\" #: src/main.c:1309 msgid "reverse selec&Tion M-*" -msgstr "&¶Î×ÅÒÔÕ×ÁÔÉ ×ÉÂ¦Ò M-*" +msgstr "&¶Î×ÅÒÔÕ×ÁÔÉ ×ÉÂ¦Ò M-*" #: src/main.c:1311 msgid "e&Xit F10" -msgstr "úÁ×ÅÒÛÉÔÉ F10" +msgstr "úÁ×ÅÒÛÉÔÉ F10" #: src/main.c:1321 msgid "&Directory tree" @@ -4832,19 +4910,19 @@ #: src/main.c:1323 msgid "&Find file M-?" -msgstr "" +msgstr "&ûÕËÁÔÉ ÆÁÊÌ M-?" #: src/main.c:1324 msgid "s&Wap panels C-u" -msgstr "" +msgstr "&ïÂͦÎÑÔÉ ÐÁÎÅ̦ C-u" #: src/main.c:1325 msgid "switch &Panels on/off C-o" -msgstr "" +msgstr "÷×ÍË/×ÉÍË &ÐÁÎÅ̦ C-o" #: src/main.c:1326 msgid "&Compare directories C-x d" -msgstr "" +msgstr "&ðÏÒ¦×ÎÑÔÉ ËÁÔÁÌÏÇÉ C-x d" #: src/main.c:1327 msgid "e&Xternal panelize C-x !" @@ -4860,23 +4938,23 @@ #: src/main.c:1331 msgid "di&Rectory hotlist C-\\" -msgstr "" +msgstr "&ð¦ÄÒÕÞΦ ËÁÔÁÌÏÇÉ C-\\" #: src/main.c:1333 msgid "&Active VFS list C-x a" -msgstr "" +msgstr "óÐÉÓÏË ÁËÔÉ×ÎÉÈ &÷æó C-x a" #: src/main.c:1334 msgid "Fr&ee VFSs now" -msgstr "" +msgstr "ú&צÌØÎÉÔÉ ÷æó" #: src/main.c:1337 msgid "&Background jobs C-x j" -msgstr "" +msgstr "úÁ×ÄÁÎÎÑ ÎÁ &Ô̦ C-x j" #: src/main.c:1341 msgid "&Undelete files (ext2fs only)" -msgstr "" +msgstr "&÷¦ÄÎÏ×ÌÅÎÎÑ ÆÁÊÌ¦× (ÌÉÛÅ ext2fs)" #: src/main.c:1344 msgid "&Listing format edit" @@ -4884,11 +4962,11 @@ #: src/main.c:1346 msgid "&Extension file edit" -msgstr "" +msgstr "òÅÄÁÇÕ×ÁÔÉ ÆÁÊÌ &ÒÏÚÛÉÒÅÎØ" #: src/main.c:1347 msgid "&Menu file edit" -msgstr "&òÅÄÁÇÕ×ÁÔÉ ÆÁÊÌ ÍÅÎÀ" +msgstr "òÅÄÁÇÕ×ÁÔÉ ÆÁÊÌ &ÍÅÎÀ" #: src/main.c:1352 msgid "&Configuration..." @@ -4900,7 +4978,7 @@ #: src/main.c:1355 msgid "&Display bits..." -msgstr "&÷¦ÄÏÂÒÁÖÅÎÎÑ Â¦Ô¦×" +msgstr "&÷¦ÄÏÂÒÁÖÅÎÎÑ Â¦Ô¦×..." #: src/main.c:1357 msgid "learn &Keys..." @@ -4969,7 +5047,7 @@ #: src/main.c:2381 msgid "The TERM environment variable is unset!\n" -msgstr "" +msgstr "úͦÎÎÕ ÓÅÒÅÄÏ×ÉÝÁ TERM ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ!\n" #: src/main.c:2592 #, c-format @@ -4980,6 +5058,7 @@ msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" +"ðÁÒÁÍÅÔÒ -m ÚÁÓÔÁÒ¦×. ðÏÄÉצÔØÓÑ Õ ÷¦ÄÏÂÒÁÖÅÎÎÑ Â¦Ô¦×... × ÍÅÎÀ ðÁÒÁÍÅÔÒÉ\n" #: src/main.c:2683 msgid "Use to debug the background code" @@ -4987,19 +5066,19 @@ #: src/main.c:2689 msgid "Request to run in color mode" -msgstr "" +msgstr "÷ÉÍÏÇÁ ÎÁ ×ÉËÏÎÁÎÎÑ × ËÏÌØÏÒÏ×ÏÍÕ ÒÅÖÉͦ" #: src/main.c:2691 msgid "Specifies a color configuration" -msgstr "" +msgstr "÷ÉÚÎÁÞÁ¤ ËÏÌØÏÒÏ×Õ ËÏÎƦÇÕÒÁæÀ" #: src/main.c:2696 msgid "Edits one file" -msgstr "" +msgstr "òÅÄÁÇÕ¤ ÏÄÉÎ ÆÁÊÌ" #: src/main.c:2700 msgid "Displays this help message" -msgstr "" +msgstr "ðÏËÁÚÕ¤ ÃÅ ÄÏצÄËÏ×Å ÐÏצÄÏÍÌÅÎÎÑ" #: src/main.c:2703 msgid "Displays a help screen on how to change the color scheme" @@ -5007,7 +5086,7 @@ #: src/main.c:2706 msgid "Log ftp dialog to specified file" -msgstr "" +msgstr "öÕÒÎÁÌÀ×ÁÔÉ Ä¦ÁÌÏÇ Ú ftp Õ ×ËÁÚÁÎÉÊ ÆÁÊÌ" #: src/main.c:2713 msgid "Obsolete" @@ -5015,19 +5094,19 @@ #: src/main.c:2715 msgid "Requests to run in black and white" -msgstr "" +msgstr "÷ÉÍÏÇÁ ÎÁ ×ÉËÏÎÁÎÎÑ Õ ÞÏÒÎϦÌÏÍÕ ÒÅÖÉͦ" #: src/main.c:2717 msgid "Disable mouse support in text version" -msgstr "" +msgstr "÷ÉÍËÎÅÎÎÑ Ð¦ÄÔÒÉÍËÉ Í¦Û¦ × ÔÅËÓÔÏ×¦Ê ×ÅÒÓ¦§" #: src/main.c:2720 msgid "Disables subshell support" -msgstr "" +msgstr "÷ÉÍËÎÅÎÎÑ Ð¦ÄÔÒÉÍËÉ Ð¦Ä¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ ËÏÍÁÎÄ" #: src/main.c:2724 msgid "Prints working directory at program exit" -msgstr "" +msgstr "äÒÕËÕ¤ ÒÏÂÏÞÉÊ ËÁÔÁÌÏÇ ÎÁ ×ÉÈÏĦ Ú ÐÒÏÇÒÁÍÉ" #: src/main.c:2726 msgid "Resets soft keys on HP terminals" @@ -5035,7 +5114,7 @@ #: src/main.c:2728 msgid "To run on slow terminals" -msgstr "" +msgstr "äÌÑ ×ÉËÏÎÁÎÎÑ ÎÁ ÐÏצÌØÎÉÈ ÔÅÒͦÎÁÌÁÈ" #: src/main.c:2731 msgid "Use stickchars to draw" @@ -5043,19 +5122,19 @@ #: src/main.c:2735 msgid "Enables subshell support (default)" -msgstr "" +msgstr "õצÍËÎÅÎÎÑ Ð¦ÄÔÒÉÍËÉ Ð¦Ä¦ÎÔÅÒÐÒÅÔÁÔÏÒÁ ËÏÍÁÎÄ (ÔÉÐÏ×Ï)" #: src/main.c:2740 msgid "Tries to use termcap instead of terminfo" -msgstr "" +msgstr "óÐÒÏÂÕ×ÁÔÉ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ termcap ÚÁͦÓÔØ terminfo" #: src/main.c:2744 msgid "Displays the current version" -msgstr "" +msgstr "ðÏËÁÚÕ¤ ÐÏÔÏÞÎÕ ×ÅÒÓ¦À" #: src/main.c:2746 msgid "Launches the file viewer on a file" -msgstr "" +msgstr "úÁÐÕÓËÁ¤ ÐÅÒÅÇÌÑÄÁÞ ÎÁ ÆÁÊÌ" #: src/main.c:2748 msgid "Forces xterm features" @@ -5071,7 +5150,7 @@ #: src/main.c:2751 msgid "No windows opened at startup" -msgstr "" +msgstr "îŠצÄËÒÉ×ÁÔÉ ×¦ËÏÎ ÎÁ ÐÏÞÁÔËÕ ÒÏÂÏÔÉ" #: src/main.c:2753 msgid "Display the directory that holds the .links startup files and exit" @@ -5096,7 +5175,7 @@ #: src/option.c:74 msgid "safe de&Lete" -msgstr "" +msgstr "âÅÚÐÅÞÎÅ &×ÉÄÁÌÅÎÎÑ" #: src/option.c:75 msgid "cd follows lin&Ks" @@ -5116,7 +5195,7 @@ #: src/option.c:81 msgid "rotatin&G dash" -msgstr "" +msgstr "&ïÂÅÒÔÏ×ÉÊ ¦ÎÄÉËÁÔÏÒ" #: src/option.c:83 msgid "co&Mplete: show all" @@ -5136,7 +5215,7 @@ #: src/option.c:87 msgid "&Auto save setup" -msgstr "" +msgstr "&á×ÔÏÍÁÔÉÞÎÅ ÚÂÅÒ¦ÇÁÎÎÑ ÕÓÔÁÎÏ×ÏË" #: src/option.c:88 msgid "shell &Patterns" @@ -5152,44 +5231,44 @@ #: src/option.c:91 msgid "&Fast dir reload" -msgstr "" +msgstr "&û×ÉÄËÅ ÐÅÒÅ×ÁÎÔÁÖÅÎÎÑ ËÁÔÁÌÏǦ×" #: src/option.c:92 msgid "mi&X all files" -msgstr "" +msgstr "&óÕÍ¦Û ÕÓ¦È ÆÁÊ̦×" #: src/option.c:93 msgid "&Drop down menus" -msgstr "" +msgstr "÷ÉÐÁÄÁÀÞÉ &ÍÅÎÀ" #: src/option.c:94 msgid "ma&Rk moves down" -msgstr "" +msgstr "÷ÉÂ¦Ò ÐÅÒÅÓÕ×Á¤ÔØÓÑ &×ÎÉÚ" #: src/option.c:95 msgid "show &Hidden files" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ &ÐÒÉÈÏ×ÁΦ ÆÁÊÌÉ" #: src/option.c:96 msgid "show &Backup files" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ &ÒÅÚÅÒ×Φ ËÏЦ§" #: src/option.c:103 msgid "&Never" -msgstr "" +msgstr "&î¦ËÏÌÉ" #: src/option.c:104 msgid "on dumb &Terminals" -msgstr "" +msgstr "ÎÁ &ÐÒÏÓÔÉÈ ÔÅÒͦÎÁÌÁÈ" #: src/option.c:105 msgid "alwa&Ys" -msgstr "" +msgstr "&úÁ×ÖÄÉ" #. Similar code is in layout.c (init_layout()) #: src/option.c:153 msgid " Configure options " -msgstr "" +msgstr " ðÁÒÁÍÅÔÒÉ ËÏÎƦÇÕÒÁæ§ " #: src/option.c:154 msgid " Panel options " @@ -5197,11 +5276,11 @@ #: src/option.c:155 msgid " Pause after run... " -msgstr "" +msgstr " ðÁÕÚÁ ЦÓÌÑ ×ÉËÏÎÁÎÎÑ " #: src/option.c:207 msgid "Configure options" -msgstr "" +msgstr "ðÁÒÁÍÅÔÒÉ ËÏÎƦÇÕÒÁæ§" #: src/panelize.c:87 msgid "&Add new" @@ -5217,7 +5296,7 @@ #: src/panelize.c:219 src/panelize.c:276 src/panelize.c:347 src/panelize.c:368 msgid "Other command" -msgstr "" +msgstr "¶ÎÛÁ ËÏÍÁÎÄÁ" #: src/panelize.c:260 msgid " Add to external panelize " @@ -5241,35 +5320,35 @@ #: src/panelize.c:403 msgid "Cannot invoke command." -msgstr "" +msgstr "îÅÍÏÖÌÉ×Ï ×ÉËÌÉËÁÔÉ ËÏÍÁÎÄÕ." #: src/panelize.c:458 msgid "Pipe close failed" -msgstr "" +msgstr "îÅ ×ÄÁÌÏÓØ ÚÁËÒÉÔÉ ËÁÎÁÌ" #: src/popthelp.c:31 msgid "Show this help message" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ ÃÅ ÄÏצÄËÏ×Å ÐÏצÄÏÍÌÅÎÎÑ" #: src/popthelp.c:32 msgid "Display brief usage message" -msgstr "" +msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ" #: src/screen.c:417 msgid "MTime" -msgstr "" +msgstr "þÁÓí" #: src/screen.c:418 msgid "ATime" -msgstr "" +msgstr "þÁÓä" #: src/screen.c:419 msgid "CTime" -msgstr "" +msgstr "þÁÓó" #: src/screen.c:421 msgid "Perm" -msgstr "" +msgstr "ðÒÁ×Á" #: src/screen.c:422 msgid "Nl" @@ -5277,7 +5356,7 @@ #: src/screen.c:423 msgid "Inode" -msgstr "" +msgstr "I-×ÕÚÏÌ" #: src/screen.c:424 msgid "UID" @@ -5290,7 +5369,7 @@ #: src/screen.c:661 #, c-format msgid " %s bytes in %d file%s" -msgstr "" +msgstr " %s ÂÁÊÔ¦× × %d ÆÁÊ̦%s" #: src/screen.c:1325 msgid "Unknow tag on display format: " @@ -5302,7 +5381,7 @@ #: src/screen.c:2116 src/screen.c:2164 msgid " Do you really want to execute? " -msgstr "" +msgstr " ÷É ÓÐÒÁ×Ħ ÈÏÞÅÔÅ ×ÉËÏÎÁÔÉ? " #: src/screen.c:2129 src/screen.c:2179 msgid " No action taken " @@ -5310,11 +5389,11 @@ #: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 msgid "RenMov" -msgstr "ðÅÒÅÎ" +msgstr "ðÅÒÅÍ" #: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 msgid "Mkdir" -msgstr "" +msgstr "óÔ×ëÁÔ" #: src/screen.c:2417 #, c-format @@ -5322,23 +5401,25 @@ " Can't chdir to %s \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÐÅÒÅÊÔÉ × ËÁÔÁÌÏÇ %s \n" +" %s " #: src/subshell.c:287 #, c-format msgid "Couldn't open named pipe %s\n" -msgstr "" +msgstr "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ¦ÍÅÎÏ×ÁÎÉÊ ËÁÎÁÌ %s\n" #: src/subshell.c:705 msgid " The shell is still active. Quit anyway? " -msgstr "" +msgstr " ¶ÎÔÅÒÐÒÅÔÁÔÏÒ ÚÁÌÉÛÁ¤ÔØÓÑ ÁËÔÉ×ÎÉÍ. ÷ÓÅ-ÔÁËÉ ×ÉÊÔÉ? " #: src/subshell.c:731 msgid " There are stopped jobs." -msgstr "" +msgstr " ´ ÚÕÐÉÎÅΦ ÚÁ×ÄÁÎÎÑ. " #: src/subshell.c:732 msgid " Quit anyway? " -msgstr "" +msgstr " ÷ÓÅ-ÔÁËÉ ×ÉÊÔÉ? " #: src/subshell.c:785 #, c-format @@ -5351,6 +5432,8 @@ "Can't open the %s file for writing:\n" "%s\n" msgstr "" +"îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ %s ÄÌÑ ÚÁÐÉÓÕ×ÁÎÎÑ:\n" +"%s\n" #: src/tree.c:637 #, c-format @@ -5376,7 +5459,7 @@ #: src/tree.c:744 #, c-format msgid " Delete %s? " -msgstr " ÷ÉÄÁÌÉÔÉ %s? " +msgstr " óÔÅÒÔÉ %s? " #: src/tree.c:776 msgid "Static" @@ -5392,6 +5475,8 @@ " Can't chdir to \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ËÁÔÁÌÏÇ ÎÁ \"%s\" \n" +" %s " #: src/tree.c:1012 msgid "Forget" @@ -5407,6 +5492,8 @@ "Can't write to the %s file:\n" "%s\n" msgstr "" +"îÅÍÏÖÌÉ×Ï ÚÁÐÉÓÁÔÉ Õ ÆÁÊÌ %s:\n" +"%s\n" #: src/user.c:250 #, c-format @@ -5415,11 +5502,11 @@ #: src/user.c:383 msgid " Debug " -msgstr "" +msgstr " îÁÌÁÇÏÄÖÅÎÎÑ " #: src/user.c:392 msgid " ERROR: " -msgstr "" +msgstr " ðïíéìëá: " #: src/user.c:396 msgid " True: " @@ -5431,7 +5518,7 @@ #: src/user.c:602 msgid " Warning -- ignoring file " -msgstr "" +msgstr " ðÏÐÅÒÅÄÖÅÎÎÑ -- ¦ÇÎÏÒÕ×ÁÎÎÑ ÆÁÊÌÕ " #: src/user.c:603 #, c-format @@ -5442,13 +5529,13 @@ #: src/user.c:622 msgid " I can't run programs while logged on a non local directory " -msgstr "" +msgstr " îÅÍÏÖÌÉ×Ï ×ÉËÏÎÕ×ÁÔÉ ÐÒÏÇÒÁÍÉ, ÚÎÁÈÏÄÑÞÉÓØ ÎÅ × ÌÏËÁÌØÎÏÍÕ ËÁÔÁÌÏÚ¦ " #. FIXME: this message is not quite right #: src/user.c:720 #, c-format msgid " Empty file %s " -msgstr "" +msgstr " ðÏÒÏÖÎ¦Ê ÆÁÊÌ %s " #. Create listbox #: src/user.c:730 @@ -5507,15 +5594,15 @@ #: src/view.c:455 msgid " Empty output from child filter " -msgstr "" +msgstr " ðÕÓÔÉÊ ×É×¦Ä Ú Æ¦ÌØÔÒÕ " #: src/view.c:460 msgid " Could not open file " -msgstr "" +msgstr " îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ " #: src/view.c:475 msgid " Can't open file \"" -msgstr "" +msgstr " îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ \"" #: src/view.c:482 msgid "" @@ -5594,7 +5681,7 @@ #: src/view.c:1966 msgid " Enter regexp:" -msgstr "" +msgstr " ÷×ÅĦÔØ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ:" #: src/view.c:2071 msgid "Ascii" @@ -5654,89 +5741,89 @@ #: src/widget.c:999 msgid " History " -msgstr "" +msgstr " ¶ÓÔÏÒ¦Ñ " #. KEY_F(0) is not here, since we are mapping it to f10, so there is no reason #. to define f0 as well. Also, it makes Learn keys a bunch of problems :( #: src/win.c:224 msgid "Function key 1" -msgstr "ëÌÁצÛÁ F1" +msgstr "F1" #: src/win.c:225 msgid "Function key 2" -msgstr "ëÌÁצÛÁ F2" +msgstr "F2" #: src/win.c:226 msgid "Function key 3" -msgstr "ëÌÁצÛÁ F3" +msgstr "F3" #: src/win.c:227 msgid "Function key 4" -msgstr "ëÌÁצÛÁ F4" +msgstr "F4" #: src/win.c:228 msgid "Function key 5" -msgstr "ëÌÁצÛÁ F5" +msgstr "F5" #: src/win.c:229 msgid "Function key 6" -msgstr "ëÌÁצÛÁ F6" +msgstr "F6" #: src/win.c:230 msgid "Function key 7" -msgstr "ëÌÁצÛÁ F7" +msgstr "F7" #: src/win.c:231 msgid "Function key 8" -msgstr "ëÌÁצÛÁ F8" +msgstr "F8" #: src/win.c:232 msgid "Function key 9" -msgstr "ëÌÁצÛÁ F9" +msgstr "F9" #: src/win.c:233 msgid "Function key 10" -msgstr "ëÌÁצÛÁ F10" +msgstr "F10" #: src/win.c:234 msgid "Function key 11" -msgstr "ëÌÁצÛÁ F11" +msgstr "F11" #: src/win.c:235 msgid "Function key 12" -msgstr "ëÌÁצÛÁ F12" +msgstr "F12" #: src/win.c:236 msgid "Function key 13" -msgstr "ëÌÁצÛÁ F13" +msgstr "F13" #: src/win.c:237 msgid "Function key 14" -msgstr "ëÌÁצÛÁ F14" +msgstr "F14" #: src/win.c:238 msgid "Function key 15" -msgstr "ëÌÁצÛÁ F15" +msgstr "F15" #: src/win.c:239 msgid "Function key 16" -msgstr "ëÌÁצÛÁ F16" +msgstr "F16" #: src/win.c:240 msgid "Function key 17" -msgstr "ëÌÁצÛÁ F17" +msgstr "F17" #: src/win.c:241 msgid "Function key 18" -msgstr "ëÌÁצÛÁ F18" +msgstr "F18" #: src/win.c:242 msgid "Function key 19" -msgstr "ëÌÁצÛÁ F19" +msgstr "F19" #: src/win.c:243 msgid "Function key 20" -msgstr "ëÌÁצÛÁ F20" +msgstr "F20" #: src/win.c:244 msgid "Backspace key" @@ -5784,7 +5871,7 @@ #: src/win.c:255 msgid "Completion/M-tab" -msgstr "" +msgstr "Completion/M-tab" #: src/win.c:256 msgid "+ on keypad" @@ -5857,6 +5944,8 @@ "Couldn't open %s archive\n" "%s" msgstr "" +"îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÁÒÈ¦× %s\n" +"%s" #: vfs/extfs.c:300 vfs/extfs.c:320 msgid "Inconsistent extfs archive" @@ -5865,7 +5954,7 @@ #: vfs/fish.c:136 #, c-format msgid "fish: Disconnecting from %s" -msgstr "" +msgstr "fish: òÏÚÒÉ× Ú'¤ÄÎÁÎÎÑ Ú %s" #: vfs/fish.c:214 msgid "fish: Waiting for initial line..." @@ -5877,7 +5966,7 @@ #: vfs/fish.c:238 msgid "fish: Sending password..." -msgstr "" +msgstr "fish: ÷¦ÄÓÉÌÁÎÎÑ ÐÁÒÏÌÀ..." #: vfs/fish.c:244 msgid "fish: Sending initial line..." @@ -5899,7 +5988,7 @@ #: vfs/fish.c:330 #, c-format msgid "fish: Reading directory %s..." -msgstr "" +msgstr "fish: úÞÉÔÕ×ÁÎÎÑ ËÁÔÁÌÏÇÕ %s..." #: vfs/fish.c:426 msgid "fish: failed" @@ -5918,11 +6007,11 @@ #: vfs/fish.c:472 #, c-format msgid "fish: storing %s %d (%d)" -msgstr "" +msgstr "fish: ÚÂÅÒÅÖÅÎÎÑ %s %d (%d)" #: vfs/fish.c:512 msgid "Aborting transfer..." -msgstr "" +msgstr "ðÅÒÅÒÉ×ÁÎÎÑ ÐÅÒÅÄÁÞ¦..." #: vfs/fish.c:521 msgid "Error reported after abort." @@ -5947,32 +6036,32 @@ #: vfs/ftpfs.c:437 msgid "ftpfs: sending proxy login name" -msgstr "" +msgstr "ftpfs: צÄÓÉÌÁÎÎÑ ÎÁÚ×É ËÏÒÉÓÔÕ×Á ÐÒÏËÓ¦" #: vfs/ftpfs.c:441 msgid "ftpfs: sending proxy user password" -msgstr "" +msgstr "ftpfs: צÄÓÉÌÁÎÎÑ ÐÁÒÏÌÀ ËÏÒÉÓÔÕ×Á ÐÒÏËÓ¦" #: vfs/ftpfs.c:445 msgid "ftpfs: proxy authentication succeeded" -msgstr "" +msgstr "ftpfs: ÁÕÔÅÎƦËÁÃ¦Ñ ÎÁ ÐÒÏËÓ¦ ÐÒÏÊÛÌÁ ÕÓЦÛÎÏ" #: vfs/ftpfs.c:449 #, c-format msgid "ftpfs: connected to %s" -msgstr "" +msgstr "ftpfs: Ú'¤ÄÎÁÎÏ Ú %s" #: vfs/ftpfs.c:466 msgid "ftpfs: sending login name" -msgstr "" +msgstr "ftpfs: sending login name" #: vfs/ftpfs.c:471 msgid "ftpfs: sending user password" -msgstr "" +msgstr "ftpfs: צÄÓÉÌÁÎÎÑ ÐÁÒÏÌÀ ËÏÒÉÓÔÕ×ÁÞÁ" #: vfs/ftpfs.c:476 msgid "ftpfs: logged in" -msgstr "" +msgstr "ftpfs: ÒÏÚÐÏÞÁÔÏ ÒÏÂÏÔÕ" #: vfs/ftpfs.c:491 #, c-format @@ -5995,21 +6084,21 @@ #: vfs/ftpfs.c:697 #, c-format msgid "ftpfs: making connection to %s" -msgstr "" +msgstr "ftpfs: ÓÔ×ÏÒÅÎÎÑ Ú'¤ÄÎÁÎÎÑ Ú %s" #: vfs/ftpfs.c:707 msgid "ftpfs: connection interrupted by user" -msgstr "" +msgstr "ftpfs: Ú'¤ÄÎÁÎÎÑ ÐÅÒÅÒ×ÁÎÏ ËÏÒÉÓÔÕ×ÁÞÅÍ" #: vfs/ftpfs.c:709 #, c-format msgid "ftpfs: connection to server failed: %s" -msgstr "" +msgstr "ftpfs: ÎÅ×ÄÁÌÁ ÓÐÒÏÂÁ Ú'¤ÄÎÁÎÎÑ ÄÏ ÓÅÒ×ÅÒÁ: %s" #: vfs/ftpfs.c:793 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" -msgstr "" +msgstr "ïÞ¦ËÕ×ÁÎÎÑ ×¦ÄÐÏצĦ... %d (Control-C - צÄÍÏ×Á)" #: vfs/ftpfs.c:987 msgid "ftpfs: could not setup passive mode for source routing" @@ -6017,28 +6106,28 @@ #: vfs/ftpfs.c:997 msgid "ftpfs: could not setup passive mode" -msgstr "" +msgstr "ftpfs: ÎÅ ×ÄÁÌÏÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÐÁÓÉ×ÎÉÊ ÒÅÖÉÍ" #: vfs/ftpfs.c:1070 msgid "ftpfs: aborting transfer." -msgstr "" +msgstr "ftpfs: ÐÅÒÅÒÉ×ÁÎÎÑ ÐÅÒÅÄÁÞ¦." #: vfs/ftpfs.c:1072 #, c-format msgid "ftpfs: abort error: %s" -msgstr "" +msgstr "ftpfs: ÐÏÍÉÌËÁ ÐÅÒÅÒÉ×ÁÎÎÑ: %s" #: vfs/ftpfs.c:1077 msgid "ftpfs: abort failed" -msgstr "" +msgstr "ftpfs: ÎÅ ×ÄÁÌÏÓÑ ÐÅÒÅÒ×ÁÔÉ" #: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 msgid "ftpfs: CWD failed." -msgstr "" +msgstr "ftpfs: ÎÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ËÁÔÁÌÏÇ." #: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 msgid "ftpfs: couldn't resolve symlink" -msgstr "" +msgstr "ftpfs: ÎÅÍÏÖÌÉ×Ï ÒÏÚ¦ÍÅÎÕ×ÁÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ" #: vfs/ftpfs.c:1236 msgid "Resolving symlink..." @@ -6052,7 +6141,7 @@ #: vfs/ftpfs.c:1340 #, c-format msgid "ftpfs: Reading FTP directory %s..." -msgstr "" +msgstr "ftpfs: úÞÉÔÕ×ÁÎÎÑ FTP-ËÁÔÁÌÏÇÕ %s..." #: vfs/ftpfs.c:1356 msgid "ftpfs: FAIL" @@ -6060,7 +6149,7 @@ #: vfs/ftpfs.c:1447 msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "" +msgstr "ftpfs: ÚÞÉÔÕ×ÁÎÎÑ ËÁÔÁÌÏÇÕ FTP ÐÅÒÅÒ×ÁÎÏ ËÏÒÉÓÔÕ×ÁÞÅÍ" #: vfs/ftpfs.c:1477 msgid "ftpfs: got listing" @@ -6091,7 +6180,7 @@ #: vfs/mcfs.c:154 msgid " The server does not support this version " -msgstr "" +msgstr " óÅÒ×ÅÒ ÎŠЦÄÔÒÉÍÕ¤ ÃÀ ×ÅÒÓ¦À " #: vfs/mcfs.c:171 msgid "" @@ -6151,22 +6240,22 @@ #: vfs/smbfs.c:1737 #, c-format msgid " %s mkdir'ing %s " -msgstr "" +msgstr " %s ÓÔ×ÏÒÅÎÎÑ ËÁÔÁÌÏÇÕ %s " #: vfs/smbfs.c:1758 #, c-format msgid " %s rmdir'ing %s " -msgstr "" +msgstr " %s ×ÉÄÁÌÅÎÎÑ ËÁÔÁÌÏÇÕ %s " #: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 #, c-format msgid " %s opening remote file %s " -msgstr "" +msgstr " %s צÄËÒÉÔÔÑ ×¦ÄÄÁÌÅÎÏÇÏ ÆÁÊÌÕ %s " #: vfs/smbfs.c:1971 #, c-format msgid " %s renaming files\n" -msgstr "" +msgstr " %s ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊ̦×\n" #: vfs/tar.c:84 vfs/tar.c:101 #, c-format Binary files old/mc-4.5.42/po/wa.gmo and new/mc-4.5.43/po/wa.gmo differ diff -ruN old/mc-4.5.42/po/wa.po new/mc-4.5.43/po/wa.po --- old/mc-4.5.42/po/wa.po Mon Dec 6 18:50:17 1999 +++ new/mc-4.5.43/po/wa.po Sat Mar 18 08:43:50 2000 @@ -5,11 +5,12 @@ # ; nos avans co bråmint di l' ovraedje a fé. # # Copyright (C) 1999 Free Software Foundation, Inc. -# Lorint Hendschel , 1999 +# Lorint Hendschel , 1999-2000 +# Pablo Saratxaga , 2000 msgid "" msgstr "" "Project-Id-Version: mc 4.5.38\n" -"POT-Creation-Date: 1999-10-31 14:53+0100\n" +"POT-Creation-Date: 2000-01-11 23:09+0100\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Lorint Hendschel \n" "Language-Team: walon \n" @@ -74,16 +75,20 @@ "with the command:\n" "\"%s\"%s" msgstr "" +"Dji n' pout %s\n" +"«%s»\n" +"avou l' comande:\n" +"«%s»%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:130 gnome/gaction.c:146 msgid "open" msgstr "drovi" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:181 gnome/gaction.c:194 msgid "edit" msgstr "aspougnî" -#: gnome/gaction.c:331 +#: gnome/gaction.c:327 msgid "view" msgstr "vey" @@ -197,7 +202,7 @@ msgstr "Mete ene passete" #: gnome/gcmd.c:679 gnome/gcmd.c:720 gnome/gcmd.c:725 gnome/gcmd.c:729 -#: gnome/gscreen.c:2416 +#: gnome/gscreen.c:2429 msgid "Show all files" msgstr "Mostrer tos les fitchîs" @@ -263,7 +268,7 @@ #: gnome/gcmd.c:963 msgid "Enter the URL:" -msgstr "Intrez l'URL:" +msgstr "Intrez li hårdeye (URL):" #: gnome/gcustom-layout.c:34 msgid "Access Time" @@ -374,19 +379,19 @@ msgid "Could not open %s; will not have desktop icons" msgstr "Dji n' a savu drovi %s; gn årè nole imådjete so li scribanne" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1186 msgid "While running the mount/umount command" msgstr "Come dj' enondeve li cmande monter/dismonter" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1255 msgid "While running the eject command" msgstr "Come dj' enondeve li cmande \"foû\"" -#: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 msgid "Error" msgstr "Aroke" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2598 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -400,84 +405,84 @@ "\n" "Dji n' vos såreu mete on fond." -#: gnome/gdesktop.c:2616 gnome/glayout.c:363 +#: gnome/gdesktop.c:2621 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Enonder on novea terminå è ci ridant chal" -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2621 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminå" -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2623 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Fé on novea ridant" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2618 gnome/glayout.c:365 +#: gnome/gdesktop.c:2623 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Ridant..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "Creates a new URL link" -msgstr "Fé on novea loyén URL" +msgstr "Fé ene novele hårdeye" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2624 msgid "URL L_ink..." -msgstr "Lo_yén URL..." +msgstr "_Hårdeye (loyén URL)..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "Creates a new launcher" msgstr "Fé ene novele enondrece" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2625 msgid "_Launcher..." msgstr "_Enondrece..." -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2631 msgid "By _Name" msgstr "_No" -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2632 msgid "By File _Type" msgstr "_Sôrt do Fitchî" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2633 msgid "By _Size" msgstr "_Grandeu" -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2634 msgid "By Time Last _Accessed" msgstr "Dierinne Feye _Eployî" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2635 msgid "By Time Last _Modified" msgstr "Dierinne Feye _Aspougnî" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2636 msgid "By Time Last _Changed" msgstr "Dierinne Feye _Candjî" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2644 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Arindjî les imådjetes" -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2645 msgid "Create _New Window" msgstr "Fé on _novea purnea" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2647 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Rilére li Ridant do _Scribanne" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2648 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Rilére les _Éndjins" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2649 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Rifé les _Rascoûrtis so li Scribanne" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2651 msgid "Configure _Background Image" msgstr "Apontyî l' Imådje di _Fond" @@ -610,7 +615,7 @@ "\n" "Li ridant n' est nén vûde. El fåt-i disfacer avou tos ses efants?" -#: gnome/gdialogs.c:790 src/file.c:2247 +#: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " msgstr " Disfacer: " @@ -648,7 +653,7 @@ #. Translators should take care as "Password" or its translations #. are used to identify password boxes and hide characters with "*" -#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1808 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1837 msgid "Password:" msgstr "Secret:" @@ -789,7 +794,7 @@ # _Copyî is the normal way, but we alreadi have _Cloyu on the same menu #. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, -#: gnome/glayout.c:389 gnome/gscreen.c:2085 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." msgstr "C_opyî..." @@ -798,7 +803,7 @@ msgstr "Disfacer des fitchîs" # _Disfacer is the normal way; but we already have _Drovi on the same menu -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "Di_sfacer..." @@ -806,7 +811,7 @@ msgid "Rename or move files" msgstr "Rilomer ou bodjî des fitchîs" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "_Bodjî..." @@ -850,7 +855,7 @@ msgid "_Invert Selection" msgstr "Tchwezi çu ki n' esteut _nén tchwezi" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2088 msgid "Search" msgstr "Cweri" @@ -862,7 +867,7 @@ msgid "Rescan the directory contents" msgstr "Rilére çu k' i gn a è ci ridant chal" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "_Rilére li Ridant" @@ -1122,7 +1127,7 @@ #: gnome/gnome-file-property-dialog.c:303 msgid "URL:" -msgstr "URL:" +msgstr "Hårdeye:" #: gnome/gnome-file-property-dialog.c:310 msgid "Caption:" @@ -1169,7 +1174,7 @@ msgstr "Eployî li prémetuwe tchûze po loukî" #: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:205 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2079 +#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 msgid "Edit" msgstr "Aspougnî" @@ -1252,7 +1257,7 @@ #: gnome/gnome-file-property-dialog.c:1079 msgid "URL" -msgstr "URL" +msgstr "Hårdeye" #: gnome/gnome-file-property-dialog.c:1082 msgid "Statistics" @@ -1476,98 +1481,98 @@ msgid "Select icon" msgstr "Tchwezi ene imådjete" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Ritcherdjî li ridant do moumint" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "Fé on novea ridant droci" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "Novea _Ridant..." -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "Creates a new file here" msgstr "Fé on novea fitchî droci" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." msgstr "Novea _Fitchî..." -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "Cachî après: %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "%s bytes è fitchî %d" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "%s bytes è fitchî %d" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" msgstr "" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 msgid "Copy directory" msgstr "Copyî ridant" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "Disfacer ridant" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "Rilomer ou bodjî l' ridant" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Èn Erî" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Eraler å ridant wice ki vos estîz dvant ci chal" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Rimonter on schayon pus hôt sol schåle des ridants" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Dizeu" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Èn Avant" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Potchî è ridant d' après" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Rilére" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Rilére li ridant do moumint" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "Eraler a vosse ridant måjhon" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "Måjhon" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "Eplaeçmint:" @@ -1586,12 +1591,12 @@ msgid "Offset 0x%08lx" msgstr "" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:735 #, c-format msgid "Col %d" msgstr "Col %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "%s bytes" @@ -1645,31 +1650,31 @@ msgid "_Search" msgstr "_Cweraedje" -#: gnome/gwidget.c:90 +#: gnome/gwidget.c:95 msgid "ok" msgstr "i va" -#: gnome/gwidget.c:92 +#: gnome/gwidget.c:97 msgid "cancel" msgstr "rinoncî" -#: gnome/gwidget.c:94 +#: gnome/gwidget.c:99 msgid "help" msgstr "aidance" -#: gnome/gwidget.c:96 src/file.c:2271 +#: gnome/gwidget.c:101 src/file.c:2268 msgid "yes" msgstr "oyi" -#: gnome/gwidget.c:98 src/file.c:2269 +#: gnome/gwidget.c:103 src/file.c:2266 msgid "no" msgstr "neni" -#: gnome/gwidget.c:100 +#: gnome/gwidget.c:105 msgid "exit" msgstr "moussî foû" -#: gnome/gwidget.c:102 +#: gnome/gwidget.c:107 msgid "abort" msgstr "si djoker" @@ -1678,7 +1683,7 @@ #: gtkedit/edit.c:248 gtkedit/edit.c:254 gtkedit/edit.c:311 gtkedit/edit.c:347 #: gtkedit/editcmd.c:1969 gtkedit/editwidget.c:980 src/dir.c:386 #: src/screen.c:2417 src/tree.c:682 src/tree.c:688 src/wtools.c:222 -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid " Error " msgstr " Aroke " @@ -1727,10 +1732,10 @@ #: gtkedit/editcmd.c:1302 gtkedit/editcmd.c:2914 gtkedit/editoptions.c:68 #: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 #: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 -#: src/chmod.c:114 src/chown.c:79 src/cmd.c:854 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:859 src/filegui.c:822 #: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 #: src/layout.c:371 src/learn.c:59 src/option.c:144 src/panelize.c:86 -#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: src/view.c:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 #: vfs/smbfs.c:116 msgid "&Cancel" msgstr "&Rinoncî" @@ -1752,9 +1757,9 @@ #. Warning message with a query to continue or cancel the operation #: gtkedit/editcmd.c:513 gtkedit/editcmd.c:836 gtkedit/editcmd.c:869 #: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 src/ext.c:315 src/file.c:619 -#: src/help.c:318 src/main.c:703 src/screen.c:1451 src/screen.c:2129 +#: src/help.c:318 src/main.c:707 src/screen.c:1451 src/screen.c:2129 #: src/screen.c:2179 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 -#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:172 msgid " Warning " msgstr " Advertixhmint " @@ -1840,7 +1845,7 @@ msgstr " Schaper Fitchî " #: gtkedit/editcmd.c:810 gtkedit/editwidget.c:1094 gtkedit/gtkedit.c:1247 -#: src/view.c:2075 +#: src/view.c:2080 msgid "Save" msgstr "Schaper" @@ -1885,7 +1890,7 @@ msgid "al&L" msgstr "&Tertos" -#: gtkedit/editcmd.c:1177 src/file.c:2193 src/filegui.c:267 +#: gtkedit/editcmd.c:1177 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Passer" @@ -1937,7 +1942,7 @@ msgid " Enter replacement string:" msgstr " Dinez li tchinne pol discandje:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:2003 msgid " Enter search string:" msgstr " Dinez li tchinne a cweri après:" @@ -1949,8 +1954,8 @@ #. Heads the 'Search' dialog box #: gtkedit/editcmd.c:1332 gtkedit/editcmd.c:1510 gtkedit/editcmd.c:2249 -#: src/view.c:1526 src/view.c:1625 src/view.c:1748 src/view.c:1966 -#: src/view.c:1998 +#: src/view.c:1531 src/view.c:1630 src/view.c:1753 src/view.c:1971 +#: src/view.c:2003 msgid " Search " msgstr " Cweri " @@ -2105,15 +2110,15 @@ msgid " File was modified, Save with exit? " msgstr " Li fitchî a stî candjî. El fåt-i schaper tot moussant foû? " -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&No" msgstr "&Neni" -#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2252 -#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:858 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:404 +#: gtkedit/editcmd.c:2288 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:862 src/screen.c:2165 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 msgid "&Yes" msgstr "&Oyi" @@ -2152,7 +2157,7 @@ msgstr " Diner roye: " #: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2646 src/view.c:1918 msgid " Goto line " msgstr " Potchî al roye " @@ -2424,7 +2429,7 @@ msgid "&Save mode..." msgstr "Môde &Schapaedje..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1349 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 msgid "&Layout..." msgstr "arindj&mint del pådje..." @@ -2687,8 +2692,8 @@ msgstr "Yåk n' a nén stî come dj' enondéve l' aspougneu.\n" #: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1715 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2068 +#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 +#: src/view.c:2073 msgid "Help" msgstr "Aide" @@ -2700,13 +2705,13 @@ msgid "Replac" msgstr "Discandjî" -#: gtkedit/editwidget.c:1102 src/main.c:1717 +#: gtkedit/editwidget.c:1102 src/main.c:1722 msgid "PullDn" msgstr "Djus" #. gtk_edit_menu #: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1718 src/view.c:2070 src/view.c:2092 +#: src/main.c:1723 src/view.c:2075 src/view.c:2097 msgid "Quit" msgstr "Cwiter" @@ -2774,7 +2779,7 @@ msgid "Dlete" msgstr "Disf" -#: gtkedit/gtkedit.c:1255 src/main.c:1716 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Menu" @@ -2929,7 +2934,7 @@ " %s " #: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 -#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:634 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:621 msgid " Oops... " msgstr " Way!... " @@ -2945,7 +2950,7 @@ msgid "Background process:" msgstr "Porcessus di fond:" -#: src/background.c:287 src/file.c:2192 +#: src/background.c:287 src/file.c:2189 msgid " Background process error " msgstr " Aroke è processus di fond \"" @@ -3286,7 +3291,7 @@ msgid "Files tagged, want to cd?" msgstr "Essegne metuwe so les fitchîs, voloz-ve fé on cd?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 msgid "Could not change directory" msgstr "Dji n' sai candjî di ridant" @@ -3362,41 +3367,41 @@ msgid "&Local" msgstr "&Locå" -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Compare directories " msgstr " Rimete les ridants " -#: src/cmd.c:853 +#: src/cmd.c:858 msgid " Select compare method: " msgstr " Tchwezi li manire di rmete: " -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Quick" msgstr "A&beye" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Size only" msgstr "Rén ki li &Grandeu" -#: src/cmd.c:854 +#: src/cmd.c:859 msgid "&Thorough" msgstr "E&tir" -#: src/cmd.c:864 +#: src/cmd.c:869 msgid " Both panels should be on the listing view mode to use this command " msgstr "" " Les deus paneas dvèt esse veyus a môde di djîveye por vos savu eployî cisse " "comande " -#: src/cmd.c:878 +#: src/cmd.c:883 msgid " The command history is empty " msgstr " I gn a rén è l' istwere des cmandes " -#: src/cmd.c:884 +#: src/cmd.c:889 msgid " Command history " msgstr " Istwere des cmandes " -#: src/cmd.c:926 +#: src/cmd.c:931 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3404,11 +3409,11 @@ " Ci n' est nén on xterm ni ene conzole di Linux; \n" " dji n' såreu discandjî les paneas. " -#: src/cmd.c:965 +#: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" msgstr "Tapez 'exit' po-z eraler a Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1025 #, c-format msgid "" " Couldn't stat %s \n" @@ -3417,99 +3422,99 @@ " Dji n' sai fé on %s \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1034 src/cmd.c:1036 msgid " Link " msgstr " Loyén " -#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1704 +#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 msgid " to:" msgstr " a:" -#: src/cmd.c:1041 +#: src/cmd.c:1046 #, c-format msgid " link: %s " msgstr " loyén: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1079 #, c-format msgid " symlink: %s " msgstr " loyén simbolike: %s " -#: src/cmd.c:1128 +#: src/cmd.c:1133 #, c-format msgid " Symlink `%s' points to: " msgstr "'%s' e-st on loyén simbolike après: " -#: src/cmd.c:1133 +#: src/cmd.c:1138 msgid " Edit symlink " msgstr " Aspougnî li loyén simbolike " -#: src/cmd.c:1138 +#: src/cmd.c:1143 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " aspougnî li loyén simbolike, dji n' sai waester %s: %s " -#: src/cmd.c:1142 +#: src/cmd.c:1147 #, c-format msgid " edit symlink: %s " msgstr " aspougnî loyén simbolike : %s " -#: src/cmd.c:1169 +#: src/cmd.c:1174 msgid " Link symbolically " msgstr " Fé on loyén simbolike " -#: src/cmd.c:1170 +#: src/cmd.c:1175 msgid " Relative symlink " msgstr " Loyén simbolike relatif " -#: src/cmd.c:1181 +#: src/cmd.c:1186 #, c-format msgid " relative symlink: %s " msgstr " loyén simbolike relatif: %s " -#: src/cmd.c:1331 +#: src/cmd.c:1336 msgid " Enter machine name (F1 for details): " msgstr " Intrer li no di l' éndjole (F1 po ndè savu did pus): " -#: src/cmd.c:1355 +#: src/cmd.c:1360 #, c-format msgid " Could not chdir to %s " msgstr " Dji n' a savu fé on chdir viè %s " -#: src/cmd.c:1362 +#: src/cmd.c:1367 msgid " Link to a remote machine " msgstr " Loyén après ene éndjole å lon " -#: src/cmd.c:1368 +#: src/cmd.c:1373 msgid " FTP to machine " msgstr " FTP après ene éndjole " -#: src/cmd.c:1374 +#: src/cmd.c:1379 msgid " SMB link to machine " msgstr " raloyaedje SMB so ene éndjole " -#: src/cmd.c:1384 +#: src/cmd.c:1389 msgid " Socket source routing setup " msgstr " Apontiyî l' aminaedje do soûrdant do soket " # hop??? -#: src/cmd.c:1385 +#: src/cmd.c:1390 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Error while looking up IP address " msgstr " Yåk n' a nén stî come dji waitîve après l' adresse IP " -#: src/cmd.c:1392 +#: src/cmd.c:1397 msgid " Host name " msgstr " No do lodjeu " -#: src/cmd.c:1403 +#: src/cmd.c:1408 msgid " Undelete files on an ext2 file system " msgstr " Disrafacer des fitchîs so on sistinme di fitchî ext2 " -#: src/cmd.c:1404 +#: src/cmd.c:1409 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3517,11 +3522,11 @@ " Intrer l' éndjin (sins li /dev/) ki vos voloz disrafacer\n" " des fitchîs dsu: (F1 po ndè savu did pus)" -#: src/cmd.c:1454 +#: src/cmd.c:1459 msgid " Setup saved to ~/" msgstr " Apontiaedje schapé dins ~/" -#: src/cmd.c:1459 +#: src/cmd.c:1464 msgid " Setup " msgstr " Apontiaedje " @@ -3608,15 +3613,14 @@ msgstr "&Hopê" #: src/dir.c:386 -#, c-format -msgid "File exists but can not be stat-ed: %s %s" -msgstr "Li fitchî egzisteye mins dji n' sai fé on stat dissu: %s %s" +msgid "File '%s' exists but can not be stat-ed: %s" +msgstr "Li fitchî «%s» egzisteye mins dji n' sai fé on stat dissu: %s" #: src/dir.c:657 msgid "Unknown" msgstr "Nén cnoxhu" -#: src/ext.c:143 src/user.c:501 +#: src/ext.c:143 src/user.c:499 #, c-format msgid "" " Can't generate unique filename \n" @@ -3625,7 +3629,7 @@ " Dji n' sai produre on no di fitchî unike \n" " %s " -#: src/ext.c:150 src/user.c:513 +#: src/ext.c:150 src/user.c:511 #, c-format msgid "" " Can't create temporary command file \n" @@ -3634,7 +3638,7 @@ " Dji n' sai fé on passant fitchî di cmande \n" " %s " -#: src/ext.c:165 src/user.c:542 +#: src/ext.c:165 src/user.c:533 msgid " Parameter " msgstr " Pondant " @@ -4087,15 +4091,15 @@ msgid " Sorry, I could not put the job in background " msgstr " Dji rgrete, dji n' sai mete ci bezogne la è fond " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Internal failure " msgstr " Divintrinne aroke " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " msgstr " Dji n' conoxhe nén cist ovraedje la so les fitchîs " -#: src/file.c:2031 +#: src/file.c:2029 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -4104,15 +4108,15 @@ " Li såme \"%s\" doet esse on ridant \n" " %s " -#: src/file.c:2193 src/file.c:2254 src/filegui.c:264 src/filegui.c:592 +#: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" msgstr "Ri&noncî" -#: src/file.c:2193 +#: src/file.c:2190 msgid "&Retry" msgstr "&Rissayî" -#: src/file.c:2245 +#: src/file.c:2242 msgid "" "\n" " Directory not empty. \n" @@ -4122,7 +4126,7 @@ " Li ridant n' est nén vûde. \n" " El fåt-i disfacer avou tos ses efants? " -#: src/file.c:2246 +#: src/file.c:2243 msgid "" "\n" " Background process: Directory not empty \n" @@ -4132,27 +4136,27 @@ " Bezogne di fond: li ridant n' est nén vûde \n" " El fåt-i disfacer avou tos ses efants? " -#: src/file.c:2253 +#: src/file.c:2250 msgid "a&ll" msgstr "&Tertos" -#: src/file.c:2253 src/filegui.c:595 +#: src/file.c:2250 src/filegui.c:595 msgid "non&E" msgstr "&Nouk" -#: src/file.c:2263 +#: src/file.c:2260 msgid " Type 'yes' if you REALLY want to delete " msgstr " Tapez 'oyi' si vos voloz disfacer PO DO BON " -#: src/file.c:2265 +#: src/file.c:2262 msgid "all the directories " msgstr "tos les ridants " -#: src/file.c:2267 +#: src/file.c:2264 msgid " Recursive Delete " msgstr " Disfacer les Efants " -#: src/file.c:2268 +#: src/file.c:2265 msgid " Background process: Recursive Delete " msgstr " Bezogne di fond: Disfacer avou ses efants " @@ -4312,7 +4316,7 @@ msgid "Start at:" msgstr "Ataker a:" -#: src/find.c:171 src/main.c:1240 src/main.c:1264 +#: src/find.c:171 src/main.c:1244 src/main.c:1268 msgid "&Tree" msgstr "Å&be" @@ -4337,7 +4341,7 @@ msgid "Finished" msgstr "Fwait" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1531 #, c-format msgid "Searching %s" msgstr "Dji cwîr %s" @@ -4417,7 +4421,7 @@ msgid " Help " msgstr " Aide " -#: src/help.c:766 src/user.c:650 +#: src/help.c:766 src/user.c:637 #, c-format msgid "" " Can't open file %s \n" @@ -4890,7 +4894,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "tape, ou bén clitchîz avou vosse soris pol defini. Bodjî avou Tab." -#: src/main.c:704 +#: src/main.c:708 msgid "" " The Commander can't change to the directory that \n" " the subshell claims you are in. Perhaps you have \n" @@ -4902,259 +4906,263 @@ " disfacé l' ovrant ridant, oudôbén v's avoz-ve diné \n" " des novelès permissions po moussî avou li cmande \"su\"? " -#: src/main.c:779 +#: src/main.c:783 msgid "Press any key to continue..." msgstr "Tchôkîz so tot l' minme li kéne tape po tcheryî pus lon..." -#: src/main.c:829 +#: src/main.c:833 msgid " The shell is already running a command " msgstr "Li shell est ddja k' il enonde ene comande " -#: src/main.c:856 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Li Midnight Commander " -#: src/main.c:857 +#: src/main.c:861 msgid " Do you really want to quit the Midnight Commander? " msgstr " Voloz moussî foû po do bon do Midnight Commander? " -#: src/main.c:1237 src/main.c:1261 +#: src/main.c:1241 src/main.c:1265 msgid "&Listing mode..." msgstr "Môde &Djîveye..." -#: src/main.c:1238 src/main.c:1262 +#: src/main.c:1242 src/main.c:1266 msgid "&Quick view C-x q" msgstr "&Vey al vole C-x q" -#: src/main.c:1239 src/main.c:1263 +#: src/main.c:1243 src/main.c:1267 msgid "&Info C-x i" msgstr "&Info C-x i" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1246 src/main.c:1270 msgid "&Sort order..." msgstr "Ôrde po &Relire..." -#: src/main.c:1244 src/main.c:1268 +#: src/main.c:1248 src/main.c:1272 msgid "&Filter..." msgstr "&Passete..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1251 src/main.c:1275 msgid "&Network link..." msgstr "&Loyén Rantoele???" -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1252 src/main.c:1276 msgid "FT&P link..." msgstr "Loyén &FTP..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1254 src/main.c:1278 msgid "SM&B link..." msgstr "Loyén SM&B..." -#: src/main.c:1255 src/main.c:1279 +#: src/main.c:1259 src/main.c:1283 msgid "&Drive... M-d" msgstr "&Léjheu... M-d" -#: src/main.c:1257 src/main.c:1281 +#: src/main.c:1261 src/main.c:1285 msgid "&Rescan C-r" msgstr "&Rilére C-r" -#: src/main.c:1285 +#: src/main.c:1289 msgid "&User menu F2" msgstr "Menu di l' &Ûzeu F2" -#: src/main.c:1286 +#: src/main.c:1290 msgid "&View F3" msgstr "&Vey F3" -#: src/main.c:1287 +#: src/main.c:1291 msgid "Vie&w file... " msgstr "Vey& fitchî... " -#: src/main.c:1288 +#: src/main.c:1292 msgid "&Filtered view M-!" msgstr "Vey avou ene &Passete M-!" -#: src/main.c:1289 +#: src/main.c:1293 msgid "&Edit F4" msgstr "&Aspougnî F4" -#: src/main.c:1290 +#: src/main.c:1294 msgid "&Copy F5" msgstr "&Copyî F5" -#: src/main.c:1291 +#: src/main.c:1295 msgid "c&Hmod C-x c" msgstr "c&Hmod C-x c" -#: src/main.c:1293 +#: src/main.c:1297 msgid "&Link C-x l" msgstr "&Loyén C-x l" -#: src/main.c:1294 +#: src/main.c:1298 msgid "&SymLink C-x s" msgstr "Loyén &Simbolike C-x s" -#: src/main.c:1295 +#: src/main.c:1299 msgid "edit s&Ymlink C-x C-s" msgstr "candjî lo&yén simbolike C-x C-s" -#: src/main.c:1296 +#: src/main.c:1300 msgid "ch&Own C-x o" msgstr "ch&Own C-x o" -#: src/main.c:1297 +#: src/main.c:1301 msgid "&Advanced chown " msgstr "chown &Avancî " -#: src/main.c:1299 +#: src/main.c:1303 msgid "&Rename/Move F6" msgstr "&Rilomes/bodjî F6" -#: src/main.c:1300 +#: src/main.c:1304 msgid "&Mkdir F7" msgstr "&Mkdir F7" -#: src/main.c:1301 +#: src/main.c:1305 msgid "&Delete F8" msgstr "&Disfacer F8" -#: src/main.c:1302 +#: src/main.c:1306 msgid "&Quick cd M-c" msgstr "cd al &Vole M-c" -#: src/main.c:1304 +#: src/main.c:1308 msgid "select &Group M-+" msgstr "tchwezi &Hopê M-+" -#: src/main.c:1305 +#: src/main.c:1309 msgid "u&Nselect group M-\\" msgstr "di&Stchwezi hopê M-\\" -#: src/main.c:1306 +#: src/main.c:1310 msgid "reverse selec&Tion M-*" msgstr "reverse selec&Tion M-*" -#: src/main.c:1308 +#: src/main.c:1312 msgid "e&Xit F10" msgstr "moussî &Foû F10" -#: src/main.c:1318 +#: src/main.c:1322 msgid "&Directory tree" msgstr "&Brantches do ridant" -#: src/main.c:1320 +#: src/main.c:1324 msgid "&Find file M-?" msgstr "&Trover Fitchî M-?" -#: src/main.c:1321 +#: src/main.c:1325 msgid "s&Wap panels C-u" msgstr "discandjî les &Paneas C-u" -#: src/main.c:1322 +#: src/main.c:1326 msgid "switch &Panels on/off C-o" msgstr "mostrer/catchî les &Paneas C-o" -#: src/main.c:1323 +#: src/main.c:1327 msgid "&Compare directories C-x d" msgstr "ri&mete des ridants C-x d" -#: src/main.c:1324 +#: src/main.c:1328 msgid "e&Xternal panelize C-x !" msgstr "" -#: src/main.c:1325 +#: src/main.c:1329 msgid "show directory s&Izes" msgstr "mostrer grandeu des r&Idants" -#: src/main.c:1327 +#: src/main.c:1331 msgid "command &History" msgstr "ist&were des cmandes" -#: src/main.c:1328 +#: src/main.c:1332 msgid "di&Rectory hotlist C-\\" msgstr "djîveye rascoûrti des &Ridants C-\\" -#: src/main.c:1330 +#: src/main.c:1334 msgid "&Active VFS list C-x a" msgstr "" -#: src/main.c:1333 +#: src/main.c:1335 +msgid "Fr&ee VFSs now" +msgstr "" + +#: src/main.c:1338 msgid "&Background jobs C-x j" msgstr "&Bouyes di fond C-x j" -#: src/main.c:1337 +#: src/main.c:1342 msgid "&Undelete files (ext2fs only)" msgstr "Disra&Facer des fitchîs (seulmint ext2fs)" -#: src/main.c:1340 +#: src/main.c:1345 msgid "&Listing format edit" msgstr "" -#: src/main.c:1342 +#: src/main.c:1347 msgid "&Extension file edit" msgstr "" -#: src/main.c:1343 +#: src/main.c:1348 msgid "&Menu file edit" msgstr "" -#: src/main.c:1348 +#: src/main.c:1353 msgid "&Configuration..." msgstr "&Apontiaedje..." -#: src/main.c:1350 +#: src/main.c:1355 msgid "c&Onfirmation..." msgstr "Ra&certiner..." -#: src/main.c:1351 +#: src/main.c:1356 msgid "&Display bits..." msgstr "" -#: src/main.c:1353 +#: src/main.c:1358 msgid "learn &Keys..." msgstr "a&Prinde des tapes..." -#: src/main.c:1356 +#: src/main.c:1361 msgid "&Virtual FS..." msgstr "" -#: src/main.c:1359 +#: src/main.c:1364 msgid "&Save setup" msgstr "&Schaper l' apontiaedje" -#: src/main.c:1375 src/main.c:1377 +#: src/main.c:1380 src/main.c:1382 msgid " &Left " msgstr " &Hintche " -#: src/main.c:1377 +#: src/main.c:1382 msgid " &Above " msgstr " Diz&eu " -#: src/main.c:1380 +#: src/main.c:1385 msgid " &File " msgstr " &Fitchî " -#: src/main.c:1381 +#: src/main.c:1386 msgid " &Command " msgstr " &Comande " -#: src/main.c:1382 +#: src/main.c:1387 msgid " &Options " msgstr " &Tchûzes " -#: src/main.c:1384 src/main.c:1386 +#: src/main.c:1389 src/main.c:1391 msgid " &Right " msgstr " &Droete " -#: src/main.c:1386 +#: src/main.c:1391 msgid " &Below " msgstr " Diz&o " -#: src/main.c:1441 +#: src/main.c:1446 msgid " Information " msgstr " Informåcion " -#: src/main.c:1442 +#: src/main.c:1447 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5162,140 +5170,140 @@ " the details. " msgstr "" -#: src/main.c:1921 +#: src/main.c:1926 msgid "Thank you for using GNU Midnight Commander" msgstr "Merci di vos siervi do GNU Midnight Commander" -#: src/main.c:2280 +#: src/main.c:2283 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "avou sopoirt soris dins xterm%s.\n" -#: src/main.c:2281 +#: src/main.c:2284 msgid " and the Linux console" msgstr " eyèt li conzole Linux" -#: src/main.c:2376 +#: src/main.c:2380 msgid "The TERM environment variable is unset!\n" msgstr "Li variåve d' inviron'mint TERM n' est nén metuwe!\n" -#: src/main.c:2586 +#: src/main.c:2591 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Ridant del lîvreye po li Midnight Commander: %s\n" -#: src/main.c:2600 +#: src/main.c:2605 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "Li tchûze -m e-st aviyeye. Waitîz a Display Bits... è menu Tchûzes\n" -#: src/main.c:2677 +#: src/main.c:2682 msgid "Use to debug the background code" msgstr "" -#: src/main.c:2683 +#: src/main.c:2688 msgid "Request to run in color mode" msgstr "Fé roter è coleurs" -#: src/main.c:2685 +#: src/main.c:2690 msgid "Specifies a color configuration" msgstr "Dire avou kénès coleurs" -#: src/main.c:2690 +#: src/main.c:2695 msgid "Edits one file" msgstr "Aspougne on fitchî" -#: src/main.c:2694 +#: src/main.c:2699 msgid "Displays this help message" msgstr "Mostere ci messaedje d' aide chal" -#: src/main.c:2697 +#: src/main.c:2702 msgid "Displays a help screen on how to change the color scheme" msgstr "Po v' mostrer comint-ce k' on candje l' arindjmint des coleurs" -#: src/main.c:2700 +#: src/main.c:2705 msgid "Log ftp dialog to specified file" msgstr "" -#: src/main.c:2707 +#: src/main.c:2712 msgid "Obsolete" msgstr "Vî vî" -#: src/main.c:2709 +#: src/main.c:2714 msgid "Requests to run in black and white" msgstr "Fé roter è noer èt blanc" -#: src/main.c:2711 +#: src/main.c:2716 msgid "Disable mouse support in text version" msgstr "Ni nén sopoirter li soris dvins li modeye texe" -#: src/main.c:2714 +#: src/main.c:2719 msgid "Disables subshell support" msgstr "" -#: src/main.c:2718 +#: src/main.c:2723 msgid "Prints working directory at program exit" msgstr "Håyner li ridant do moumint å moumint ki vos moussîz foû" -#: src/main.c:2720 +#: src/main.c:2725 msgid "Resets soft keys on HP terminals" msgstr "" -#: src/main.c:2722 +#: src/main.c:2727 msgid "To run on slow terminals" msgstr "Po-aler so des londjins terminås" -#: src/main.c:2725 +#: src/main.c:2730 msgid "Use stickchars to draw" msgstr "" -#: src/main.c:2729 +#: src/main.c:2734 msgid "Enables subshell support (default)" msgstr "" -#: src/main.c:2734 +#: src/main.c:2739 msgid "Tries to use termcap instead of terminfo" msgstr "" -#: src/main.c:2738 +#: src/main.c:2743 msgid "Displays the current version" msgstr "Håyenye li modeye do moumint" -#: src/main.c:2740 +#: src/main.c:2745 msgid "Launches the file viewer on a file" msgstr "Enonder li håyneu di fitchî so on fitchî" -#: src/main.c:2742 +#: src/main.c:2747 msgid "Forces xterm features" msgstr "" -#: src/main.c:2744 +#: src/main.c:2749 msgid "GEOMETRY" msgstr "DJOMETREYE" -#: src/main.c:2744 +#: src/main.c:2749 msgid "Geometry for the window" msgstr "Djometreye do purnea" -#: src/main.c:2745 +#: src/main.c:2750 msgid "No windows opened at startup" msgstr "I gn a nou purnea ki s' a drovu a l' enondeye" -#: src/main.c:2747 +#: src/main.c:2752 msgid "Display the directory that holds the .links startup files and exit" msgstr "" -#: src/main.c:3045 +#: src/main.c:3062 msgid "" "Couldn't open tty line. You have to run mc without the -P flag.\n" "On some systems you may want to run # `which mc`\n" msgstr "" -#: src/main.c:3123 +#: src/main.c:3140 msgid " Notice " msgstr " Advertixhmint " -#: src/main.c:3124 +#: src/main.c:3141 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5627,32 +5635,32 @@ "Dji n' sai scrire è fitchî %s :\n" "%s\n" -#: src/user.c:256 +#: src/user.c:250 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr "" -#: src/user.c:389 +#: src/user.c:383 msgid " Debug " msgstr " Disbuguer " -#: src/user.c:398 +#: src/user.c:392 msgid " ERROR: " msgstr " AROKE: " -#: src/user.c:402 +#: src/user.c:396 msgid " True: " msgstr " Veur: " -#: src/user.c:404 +#: src/user.c:398 msgid " False: " msgstr " Fås: " -#: src/user.c:616 +#: src/user.c:602 msgid " Warning -- ignoring file " msgstr " Advertixhmint -- dji passe hute do fitchî " -#: src/user.c:617 +#: src/user.c:603 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5662,17 +5670,18 @@ "divins.\n" "Do côp, si vos vos è siervoz, ça pôreut esse dandjureu..." -#: src/user.c:635 +#: src/user.c:622 msgid " I can't run programs while logged on a non local directory " msgstr " Dji n' sai enonder des programes a pårti d' on ridant nén locå " -#: src/user.c:719 +#. FIXME: this message is not quite right +#: src/user.c:720 #, c-format msgid " Empty file %s " msgstr " Vûde fitchî %s " #. Create listbox -#: src/user.c:728 +#: src/user.c:730 msgid " User menu " msgstr " Menu di l' ûzeu " @@ -5698,7 +5707,7 @@ msgid " Dup failed " msgstr " Dup a fwait berwete " -#: src/view.c:401 +#: src/view.c:406 msgid "" "File: \n" "\n" @@ -5708,7 +5717,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:407 msgid "" "\n" "\n" @@ -5718,27 +5727,27 @@ "\n" "a stî candjî. Voloz-ve schaper les candjmints?\n" -#: src/view.c:404 +#: src/view.c:409 msgid " Save changes " msgstr " Schaper les candjmints " -#: src/view.c:446 +#: src/view.c:451 msgid " Can't spawn child program " msgstr "" -#: src/view.c:455 +#: src/view.c:460 msgid " Empty output from child filter " msgstr "" -#: src/view.c:460 +#: src/view.c:465 msgid " Could not open file " msgstr " Dji n' sai drovi li fitchî " -#: src/view.c:475 +#: src/view.c:480 msgid " Can't open file \"" msgstr " Dji n' sai drovi li fitchî \"" -#: src/view.c:482 +#: src/view.c:487 msgid "" " Can't stat file \n" " " @@ -5746,11 +5755,11 @@ " Dji n' sai fé on stat sol fitchî \n" " " -#: src/view.c:488 +#: src/view.c:493 msgid " Can't view: not a regular file " msgstr " Dji n' sai håyner ci fitchî ci: ci n' est nén on fitchî normå " -#: src/view.c:569 +#: src/view.c:574 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5759,7 +5768,7 @@ " Dji n' sai drovi \"%s\"\n" " %s " -#: src/view.c:578 +#: src/view.c:583 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5768,34 +5777,34 @@ " Dji n' sai fé on stat so \"%s\"\n" " %s " -#: src/view.c:714 +#: src/view.c:719 #, c-format msgid "File: %s" msgstr "Fitchî: %s" -#: src/view.c:728 +#: src/view.c:733 #, c-format msgid "Offset 0x%08x" msgstr "" -#: src/view.c:739 +#: src/view.c:744 msgid " [grow]" msgstr " [grandit]" -#: src/view.c:1518 +#: src/view.c:1523 #, c-format msgid "Searching for `%s'" msgstr "Dji cwir après `%s'" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1630 src/view.c:1753 msgid " Search string not found " msgstr " Dji n' a nén trové li tchinne ki dji cachîve après " -#: src/view.c:1787 +#: src/view.c:1792 msgid " Invalid regular expression " msgstr " Voste erûleye ratoûrneure n' est nén valåbe " -#: src/view.c:1911 +#: src/view.c:1916 #, c-format msgid "" " The current line number is %d.\n" @@ -5804,7 +5813,7 @@ " Li roye do moumint a li limerô %d.\n" " Intrez li novea limerô del roye:" -#: src/view.c:1933 +#: src/view.c:1938 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5813,67 +5822,67 @@ " L' adresse do moumint est 0x%lx.\n" " Intrez li novele adresse:" -#: src/view.c:1935 +#: src/view.c:1940 msgid " Goto Address " msgstr " Potchî al Adresse " -#: src/view.c:1966 +#: src/view.c:1971 msgid " Enter regexp:" msgstr " Intrez l' erûleye ratoûrneure:" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Ascii" msgstr "Ascii" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "Hex" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "Roye" -#: src/view.c:2075 +#: src/view.c:2080 msgid "RxSrch" msgstr "RxSrch" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdHex" msgstr "EdHex" -#: src/view.c:2078 +#: src/view.c:2083 msgid "EdText" msgstr "EdText" -#: src/view.c:2080 +#: src/view.c:2085 msgid "UnWrap" msgstr "" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "" @@ -6076,284 +6085,315 @@ msgid "NumLock on keypad" msgstr "" -#: vfs/extfs.c:268 +#: vfs/direntry.c:318 +#, c-format +msgid "Dir cache expired for %s" +msgstr "" + +#: vfs/direntry.c:448 vfs/direntry.c:451 +msgid " Direntry warning " +msgstr " Avertixhmint direntry " + +#: vfs/direntry.c:448 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "" + +#: vfs/direntry.c:451 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:822 +msgid "Starting linear transfer..." +msgstr "" + +#: vfs/direntry.c:967 +msgid "Getting file" +msgstr "Aberwetant l' fitchî" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" "%s" msgstr "" -#: vfs/extfs.c:300 vfs/extfs.c:320 +#: vfs/extfs.c:302 vfs/extfs.c:322 msgid "Inconsistent extfs archive" msgstr "" -#: vfs/fish.c:136 +#: vfs/fish.c:138 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Dji m' disraloye di %s" -#: vfs/fish.c:214 +#: vfs/fish.c:216 msgid "fish: Waiting for initial line..." msgstr "" -#: vfs/fish.c:224 +#: vfs/fish.c:226 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" -#: vfs/fish.c:238 +#: vfs/fish.c:231 +msgid " fish: Password required for " +msgstr " fish: Secret dmandé po " + +#: vfs/fish.c:240 msgid "fish: Sending password..." msgstr "fish: dj' evoye li scret di l' ûzeu..." -#: vfs/fish.c:244 +#: vfs/fish.c:246 msgid "fish: Sending initial line..." msgstr "" -#: vfs/fish.c:248 +#: vfs/fish.c:250 msgid "fish: Handshaking version..." msgstr "" -#: vfs/fish.c:252 +#: vfs/fish.c:254 msgid "fish: Setting up current directory..." msgstr "" -#: vfs/fish.c:254 +#: vfs/fish.c:256 +#, c-format msgid "fish: Connected, home %s." -msgstr "" +msgstr "fish: Raloyi, måjhon %s." -#: vfs/fish.c:331 +#: vfs/fish.c:332 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Dji lé li ridant FTP %s..." -#: vfs/fish.c:426 -msgid "fish: got listing" -msgstr "" - -#: vfs/fish.c:430 +#: vfs/fish.c:428 msgid "fish: failed" msgstr "fish: berwete" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:450 +#: vfs/fish.c:448 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: vfs/fish.c:464 +#: vfs/fish.c:462 msgid "fish: Local read failed, sending zeros" msgstr "" -#: vfs/fish.c:476 +#: vfs/fish.c:474 #, c-format msgid "fish: storing %s %d (%d)" msgstr "" -#: vfs/fish.c:516 +#: vfs/fish.c:514 msgid "Aborting transfer..." msgstr "" -#: vfs/fish.c:525 +#: vfs/fish.c:523 msgid "Error reported after abort." msgstr "" -#: vfs/fish.c:527 +#: vfs/fish.c:525 msgid "Aborted transfer would be successful." msgstr "" -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:290 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Dji m' disraloye di %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:348 msgid " FTP: Password required for " msgstr " FTP: Secret dmandé po " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:381 msgid " Proxy: Password required for " msgstr " Proxy: Secret dmandé po " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:407 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: dj' evoye li no di login proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:411 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: dj' evoye li scret proxy" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:415 msgid "ftpfs: proxy authentication succeeded" msgstr "" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:419 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: raloyî a %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:436 msgid "ftpfs: sending login name" msgstr "ftpfs: dj' evoye li no di login" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:441 msgid "ftpfs: sending user password" msgstr "ftpfs: dj' evoye li scret di l' ûzeu" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:446 msgid "ftpfs: logged in" msgstr "ftpfs: moussî dvins" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:461 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: måva login po l' ûzeu %s " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:493 #, c-format msgid " Could not set source routing (%s)" msgstr "" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:622 msgid "ftpfs: Invalid host name." msgstr "ftpfs: måva no di lodjeu." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:642 msgid "ftpfs: Invalid host address." msgstr "ftpfs: mwaijhe adresse di lodjeu." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:665 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: dji m' raloye a %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:675 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: disraloyî pa l' ûzeu" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:677 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: dj' a fwait berwete come dji m' raloyîve å sierveu: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:719 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Dji rawåde divant do rataker... %d (Control-C po rnoncî)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:892 msgid "ftpfs: could not setup passive mode" msgstr "" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:967 msgid "ftpfs: aborting transfer." msgstr "" -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:969 #, c-format msgid "ftpfs: abort error: %s" msgstr "" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:974 msgid "ftpfs: abort failed" msgstr "" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1063 vfs/ftpfs.c:1160 msgid "ftpfs: CWD failed." -msgstr "" +msgstr "ftpfs: CWD a fwait berwete." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1073 vfs/ftpfs.c:1080 msgid "ftpfs: couldn't resolve symlink" msgstr "" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1131 msgid "Resolving symlink..." msgstr "" -#: vfs/ftpfs.c:1338 -#, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "" -"ftpfs: Dji lé li ridant FTP %s... (n' eployîz nén les tchûzes di ls dizo " -"UNIX)" - -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: Dji lé li ridant FTP %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: BERWETE" +#: vfs/ftpfs.c:1149 +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: Dji lé li ridant FTP %s... %s%s" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" +#: vfs/ftpfs.c:1150 +msgid "(strict rfc959)" msgstr "" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" +#: vfs/ftpfs.c:1151 +msgid "(chdir first)" msgstr "" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1247 msgid "ftpfs: failed" msgstr "ftpfs: berwete" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1257 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1320 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1790 vfs/ftpfs.c:1805 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." msgstr "" -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 vfs/mcfs.c:178 vfs/mcfs.c:204 msgid " MCFS " msgstr " MCFS " -#: vfs/mcfs.c:154 +#: vfs/mcfs.c:156 msgid " The server does not support this version " msgstr " Li sierveu n' sopoite nén cisse modeye ci " -#: vfs/mcfs.c:171 +#: vfs/mcfs.c:173 msgid "" " 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" msgstr "" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr "" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Oyi " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr "" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr "" -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr "" -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +msgid " Can't locate hostname: %s " +msgstr " Dji n' sai trovrer li lodjeu: %s " + +#: vfs/mcfs.c:253 +#, fuzzy, c-format +msgid " Can't create socket: %s " +msgstr "" +" Dji n' sai chdir dins %s \n" +" %s " + +#: vfs/mcfs.c:259 +msgid " Can't connect to server: %s " +msgstr "Dji n' pout m' raloyi å sierveu: %s" + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr "" +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "" + #: vfs/smbfs.c:115 msgid "Domain:" msgstr "Domaine:" @@ -6372,20 +6412,24 @@ msgstr "Mot di passe po \\\\%s\\%s" #: vfs/smbfs.c:666 +#, c-format msgid "" " reconnect to %s failed\n" " " msgstr "" #: vfs/smbfs.c:1737 +#, c-format msgid " %s mkdir'ing %s " msgstr " %s fjhant on mkdir %s " #: vfs/smbfs.c:1758 +#, c-format msgid " %s rmdir'ing %s " msgstr " %s fjhant on rmdir %s " #: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#, c-format msgid " %s opening remote file %s " msgstr "" @@ -6417,11 +6461,134 @@ "doesn't look like a tar archive." msgstr "" -#: vfs/vfs.c:1792 +#: vfs/undelfs.c:80 +msgid " undelfs: error " +msgstr " undelfs: aroke " + +#: vfs/undelfs.c:183 +msgid " not enough memory " +msgstr "" + +#: vfs/undelfs.c:188 +msgid " while allocating block buffer " +msgstr "" + +#: vfs/undelfs.c:192 +#, c-format +msgid " open_inode_scan: %d " +msgstr "" + +#: vfs/undelfs.c:196 +#, c-format +msgid " while starting inode scan %d " +msgstr "" + +#: vfs/undelfs.c:203 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "" + +#: vfs/undelfs.c:218 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr "" + +#: vfs/undelfs.c:226 +msgid " no more memory while reallocating array " +msgstr "" + +#: vfs/undelfs.c:245 +#, c-format +msgid " while doing inode scan %d " +msgstr "" + +#: vfs/undelfs.c:269 +msgid " Ext2lib error " +msgstr " Aroke di ext2lib " + +#: vfs/undelfs.c:296 +msgid " Could not open file %s " +msgstr " Dji n' sai drovi li fitchî %s" + +#: vfs/undelfs.c:299 +msgid "undelfs: reading inode bitmap..." +msgstr "" + +#: vfs/undelfs.c:302 +#, fuzzy, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr " Dji n' a savu fé on chdir viè %s " + +#: vfs/undelfs.c:305 +msgid "undelfs: reading block bitmap..." +msgstr "" + +#: vfs/undelfs.c:308 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:314 +msgid "undelfs: done." +msgstr "" + +#: vfs/undelfs.c:317 +msgid "undelfs: failure" +msgstr "undelfs: berwete" + +#: vfs/undelfs.c:341 +msgid " vfs_info is not fs! " +msgstr "" + +#: vfs/undelfs.c:397 vfs/undelfs.c:581 +msgid " You have to chdir to extract files first " +msgstr "" + +#: vfs/undelfs.c:520 +msgid " while iterating over blocks " +msgstr "" + +#: vfs/undelfs.c:625 +msgid " Could not open file: %s " +msgstr " Dji n' sai drovi li fitchî: %s " + +#. This is place of next pointer +#: vfs/undelfs.c:683 +msgid "Undelete filesystem for ext2" +msgstr "Sistinme di fitchîs disrafaçabe po ext2fs" + +#: vfs/vfs.c:1158 +msgid "Changes to file lost" +msgstr "Les candjmints do fitchî ont stî perdus" + +#: vfs/vfs.c:1798 +#, fuzzy +msgid "Could not parse:" +msgstr "" +"Dji n' sai enonder li foncsion stat %s\n" +"%s" + +#: vfs/vfs.c:1800 +msgid "(sorry)" +msgstr "(mande escuzes)" + +#: vfs/vfs.c:1800 +msgid "More parsing errors will be ignored." +msgstr "" + +#: vfs/vfs.c:1811 +msgid "Internal error:" +msgstr "Divintrinne aroke:" + +#: vfs/vfs.c:1821 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "" -#: vfs/vfs.c:1793 +#: vfs/vfs.c:1822 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "" @@ -6430,3 +6597,8 @@ #~ msgstr "" #~ "Dji n' a savu fé on loyén simbolike di %s a %s; i gn årè nole imådjete " #~ "måjhon so li scribanne po cmincî" + +#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +#~ msgstr "" +#~ "ftpfs: Dji lé li ridant FTP %s... (n' eployîz nén les tchûzes di ls dizo " +#~ "UNIX)" Binary files old/mc-4.5.42/po/zh_CN.GB2312.gmo and new/mc-4.5.43/po/zh_CN.GB2312.gmo differ diff -ruN old/mc-4.5.42/po/zh_CN.GB2312.po new/mc-4.5.43/po/zh_CN.GB2312.po --- old/mc-4.5.42/po/zh_CN.GB2312.po Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.43/po/zh_CN.GB2312.po Sat Mar 18 08:43:50 2000 @@ -0,0 +1,6037 @@ +msgid "" +msgstr "" +"Project-Id-Version: mc-4.5.12\n" +"POT-Creation-Date: 1999-06-11 11:39+0800\n" +"PO-Revision-Date: 1999-02-12 03:40+0800\n" +"Last-Translator: Dillion Chen \n" +"Language-Team: TLDN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=gb2312\n" +"Content-Transfer-Encoding: 8bit\n" + +#: edit/edit_key_translator.c:121 +msgid " Emacs key: " +msgstr " Emacs °´¼ü£º " + +#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +msgid " Execute Macro " +msgstr " Ö´Ðкê " + +#. Input line for a single key press follows the ':' +#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: gtkedit/editcmd.c:706 gtkedit/editcmd.c:715 +msgid " Press macro hotkey: " +msgstr " °´ÏºêÈȼü£º " + +#: edit/edit_key_translator.c:144 +msgid " Insert Literal " +msgstr " Öð×Ö²åÈë " + +#: edit/edit_key_translator.c:144 +msgid " Press any key: " +msgstr " °´ÏÂÈÎÒâ¼ü£º" + +#: gnome/gcmd.c:58 +msgid " There is no other panel to compare contents to " +msgstr " ûÓÐÁíÍâÒ»¸öÃæ°æ¿ÉÒÔÓÃÀ´±È½ÏÄÚÈÝ " + +#: gnome/gcmd.c:109 +msgid "The Midnight Commander Team" +msgstr "Midnight Commander ¹¤×÷С×é" + +#: gnome/gcmd.c:111 +msgid "bug reports: http://bugs.gnome.org, or use gnome-bug" +msgstr "»Ø±¨³ô³æ: http://bugs.gnome.org, »òʹÓà gnome-bug ³ÌÐò" + +#: gnome/gcmd.c:123 +msgid "GNU Midnight Commander" +msgstr "GNU Midnight Commander" + +#: gnome/gcmd.c:126 +msgid "The GNOME edition of the Midnight Commander file manager." +msgstr "GNOME °æµÄ Midnight Commander Îļþ¹ÜÀíÔ±¡£" + +#: gnome/gcmd.c:261 +msgid "Sort By" +msgstr "ÓÃÀ´ÅÅÐòµÄ¼üΪ" + +#. we define this up here so we can pass it in to our callback +#: gnome/gcmd.c:266 +msgid "Ignore case sensitivity." +msgstr "ºöÂÔ´óСд¡£" + +#: gnome/gcmd.c:269 +msgid "Sort files by " +msgstr "ÒÀ´ËÅÅÐòÎļþ" + +#: gnome/gcmd.c:274 gnome/gcustom-layout.c:43 src/chmod.c:150 src/screen.c:395 +msgid "Name" +msgstr "ÓòÃû" + +#: gnome/gcmd.c:281 +msgid "File Type" +msgstr "ÎļþÀàÐÍ" + +#: gnome/gcmd.c:287 gnome/gcustom-layout.c:47 src/screen.c:396 +#: src/screen.c:397 +msgid "Size" +msgstr "´óС" + +#: gnome/gcmd.c:293 +msgid "Time Last Accessed" +msgstr "×îºó´æȡʱ¼ä" + +#: gnome/gcmd.c:299 +msgid "Time Last Modified" +msgstr "×îºó¸ü¶¯Ê±¼ä" + +#: gnome/gcmd.c:305 +msgid "Time Last Changed" +msgstr "×îºó¸Ä±äʱ¼ä" + +#: gnome/gcmd.c:319 +msgid "Reverse the order." +msgstr "˳ÐòÏà·´" + +#: gnome/gcmd.c:384 +msgid "Enter name." +msgstr "ÊäÈëÓòÃû¡£" + +#: gnome/gcmd.c:390 +msgid "Enter label for command:" +msgstr "ÊäÈëÖ¸ÁîµÄ±êÇ©£º" + +#: gnome/gcmd.c:495 +msgid "Find all core files" +msgstr "ËÑÑ°ËùÓÐµÄ core Îļþ" + +#: gnome/gcmd.c:498 src/panelize.c:350 +msgid "Find rejects after patching" +msgstr "ÔÚ²¹Ç¿ááÕÒ³ö±»¾Ü¾øµÄ²¹Ç¿µµ (patch)" + +#: gnome/gcmd.c:543 +msgid "Run Command" +msgstr "Ö´ÐÐÖ¸Áî" + +#. Frame 1 +#: gnome/gcmd.c:548 +msgid "Preset Commands" +msgstr "Ä¿Ç°Ö¸Áî" + +#. add add/remove buttons in center +#: gnome/gcmd.c:565 gnome/gcustom-layout.c:185 +msgid "Add" +msgstr "Ôö¼Ó" + +#: gnome/gcmd.c:569 gnome/gcustom-layout.c:186 +msgid "Remove" +msgstr "ÒƳý" + +#. Frame 2 +#: gnome/gcmd.c:577 +msgid "Run this Command" +msgstr "Ö´ÐдËÖ¸Áî" + +#: gnome/gcmd.c:584 +msgid "Command: " +msgstr "Ö¸Á" + +#: gnome/gcmd.c:662 +msgid "Set Filter" +msgstr "É趨¹ýÂËÆ÷" + +#: gnome/gcmd.c:667 gnome/gcmd.c:708 gnome/gcmd.c:713 gnome/gcmd.c:717 +#: gnome/gscreen.c:2564 +msgid "Show all files" +msgstr "ÏÔʾËùÓÐÎļþ" + +#: gnome/gcmd.c:674 +msgid "." +msgstr "." + +#: gnome/gcmd.c:690 +msgid "" +"Enter a filter here for files in the panel view.\n" +"\n" +"For example:\n" +"*.png will show just png images" +msgstr "" +"ÇëÊäÈëÒªÔÚÃæ°åÏÔʾʱʹÓõĹýÂËÆ÷¡£\n" +"\n" +"ÀýÈ磺\n" +"*.gif ½«»áÖ»ÏÔʾ GIF ͼÐεµ¡£" + +#: gnome/gcmd.c:692 +msgid "Enter a Regular Expression to filter files in the panel view." +msgstr "ÇëÊäÈëÒ»¸öÕý¹æ±íʾʽ£¬ÒÔµ±×öÃæ°åÏÔʾʱʹÓõĹýÂËÆ÷¡£" + +#: gnome/gcmd.c:752 +msgid " Open with..." +msgstr " ÒÔ´Ë¿ªÆô..." + +#: gnome/gcmd.c:753 +msgid "Enter extra arguments:" +msgstr "ÇëÊäÈëÆäËüµÄ²ÎÊý£º" + +#: gnome/gcmd.c:816 +msgid "Desktop entry properties" +msgstr "×ÀÃæͼ±êÉ趨" + +#: gnome/gcmd.c:842 +msgid "Select File" +msgstr "Ñ¡È¡Îļþ" + +#: gnome/gcmd.c:850 +msgid "" +"Enter a filter here to select files in the panel view with.\n" +"\n" +"For example:\n" +"*.png will select all png images" +msgstr "" +"ÇëÊäÈëÒªÔÚÃæ°åÏÔʾʱʹÓõĹýÂËÆ÷¡£\n" +"\n" +"ÀýÈ磺\n" +"*.gif ½«»áÖ»ÏÔʾ GIF ͼÐεµ¡£" + +#: gnome/gcmd.c:852 +msgid "Enter a regular expression here to select files in the panel view with." +msgstr "ÇëÊäÈëÒ»¸öÕý¹æ±íʾʽ£¬ÒÔµ±×öÃæ°åÏÔʾʱʹÓõĹýÂËÆ÷¡£" + +#: gnome/gcmd.c:898 src/cmd.c:543 src/cmd.c:594 +msgid " Malformed regular expression " +msgstr " ±äÐεÄÕý¹æÔËËãʽ " + +#: gnome/gcmd.c:943 +msgid "Creating a desktop link" +msgstr "½¨Á¢×ÀÃæÁ¬½á" + +#: gnome/gcmd.c:944 +msgid "Enter the URL:" +msgstr "ÊäÈë URL:" + +#: gnome/gcustom-layout.c:36 +msgid "Access Time" +msgstr "´æȡʱ¼ä" + +#: gnome/gcustom-layout.c:37 +msgid "Creation Time" +msgstr "½¨Á¢Ê±¼ä" + +#. Group +#: gnome/gcustom-layout.c:38 gnome/gnome-file-property-dialog.c:776 +#: gnome/gnome-file-property-dialog.c:940 gnome/gprop.c:280 gnome/gprop.c:405 +#: src/screen.c:409 +msgid "Group" +msgstr "Ⱥ×é" + +#: gnome/gcustom-layout.c:39 +msgid "Group ID" +msgstr "Ⱥ×é±àºÅ" + +#: gnome/gcustom-layout.c:40 +msgid "Inode Number" +msgstr "Inode ºÅÂë" + +#: gnome/gcustom-layout.c:41 src/achown.c:378 +msgid "Mode" +msgstr "ģʽ" + +#: gnome/gcustom-layout.c:42 +msgid "Modification Time" +msgstr "¸ü¶¯Ê±¼ä" + +#: gnome/gcustom-layout.c:44 +msgid "Number of Hard Links" +msgstr "Ó²Á¬½áµÄÊýÄ¿" + +#. Owner +#: gnome/gcustom-layout.c:45 gnome/gnome-file-property-dialog.c:925 +#: gnome/gprop.c:390 src/screen.c:408 +msgid "Owner" +msgstr "ÓµÓÐÕß" + +#: gnome/gcustom-layout.c:46 src/screen.c:402 +msgid "Permission" +msgstr "ȨÏÞ" + +#: gnome/gcustom-layout.c:48 +msgid "Size (short)" +msgstr "´óС (¶Ì¸ñʽ)" + +#: gnome/gcustom-layout.c:49 +msgid "Type" +msgstr "ÀàÐÍ" + +#: gnome/gcustom-layout.c:50 +msgid "User ID" +msgstr "ʹÓÃÕß±àºÅ" + +#: gnome/gcustom-layout.c:144 +msgid "Possible Columns" +msgstr "¿ÉÄܵÄ×Ö¶Î" + +#: gnome/gcustom-layout.c:164 +msgid "Displayed Columns" +msgstr "ÏÔʾµÄ×Ö¶Î" + +#: gnome/gcustom-layout.c:306 +msgid "Custom View" +msgstr "×Ô¶¨ÏÔʾ" + +#: gnome/gdesktop.c:425 gnome/gdesktop.c:2052 gnome/gmount.c:321 +msgid "Warning" +msgstr "¾¯¸æ" + +#: gnome/gdesktop.c:426 +#, c-format +msgid "Could not open %s; will not have desktop icons" +msgstr "ÎÞ·¨¿ªÆô %s£»½«ÎÞ·¨Ê¹ÓÃ×ÀÃæͼ±ê" + +#: gnome/gdesktop.c:1019 +msgid "While running the mount/umount command" +msgstr "µ±Ö´ÐÐ mount/umount Ö¸Áîʱ" + +#: gnome/gdesktop.c:1088 +msgid "While running the eject command" +msgstr "µ±Ö´ÐÐ eject Ö¸Áîʱ" + +#: gnome/gdesktop.c:1272 gnome/gicon.c:154 gnome/gtools.c:46 +msgid "Error" +msgstr "´íÎó" + +#. Create the link to the user's home directory so that he will have an icon +#: gnome/gdesktop.c:2048 +msgid "Home directory" +msgstr "ʹÓÃÕߵļÒĿ¼" + +#: gnome/gdesktop.c:2053 +#, c-format +msgid "Could not symlink %s to %s; will not have initial home desktop icon." +msgstr "ÎÞ·¨½« %s ·ûºÅÁ¬½áÖÁ %s£»½«²»Ê¹ÓÃȱʡµÄ×ÀÃæͼ±ê¡£" + +#: gnome/gdesktop.c:2398 +msgid "" +"Unable to locate the file:\n" +"background-properties-capplet\n" +"in your path.\n" +"\n" +"We are unable to set the background." +msgstr "" +"ÔÚÄúµÄȱʡ·¾¶ÀïÕÒ²»µ½\n" +"background-properties-capplet\n" +"´ËÒ»Îļþ¡£\n" +"\n" +"ÎÞ·¨É趨±³¾°¡£" + +#: gnome/gdesktop.c:2421 gnome/glayout.c:361 +msgid "_Terminal" +msgstr "Öն˻ú (_T)" + +#: gnome/gdesktop.c:2421 gnome/glayout.c:361 +msgid "Launch a new terminal in the current directory" +msgstr "ÔÚµ±Ç°Ä¿Â¼Ï¿ªÆôÒ»¸öеÄÖն˻ú" + +#. If this ever changes, make sure you update create_new_menu accordingly. +#: gnome/gdesktop.c:2423 gnome/glayout.c:363 +msgid "_Directory..." +msgstr "Ŀ¼ (_D)..." + +#: gnome/gdesktop.c:2423 gnome/glayout.c:363 +msgid "Creates a new directory" +msgstr "½¨Á¢ÐÂĿ¼" + +#: gnome/gdesktop.c:2424 +msgid "URL L_ink..." +msgstr "Á¬½á (_i)..." + +#: gnome/gdesktop.c:2424 +msgid "Creates a new URL link" +msgstr "½¨Á¢Ð URL Á¬½á" + +#: gnome/gdesktop.c:2425 +msgid "_Launcher..." +msgstr "Æô¶¯Í¼±ê (_L)..." + +#: gnome/gdesktop.c:2425 +msgid "Creates a new launcher" +msgstr "½¨Á¢ÐÂÆô¶¯Í¼±ê" + +#: gnome/gdesktop.c:2433 gnome/glayout.c:451 +msgid "Arrange Icons" +msgstr "ÅÅÁÐͼ±ê" + +#: gnome/gdesktop.c:2434 +msgid "Create New Window" +msgstr "¿ªÐ´°¿Ú" + +#: gnome/gdesktop.c:2436 +msgid "Recreate Desktop Shortcuts" +msgstr "ÖØн¨Á¢×ÀÃæͼ±ê" + +#: gnome/gdesktop.c:2437 gnome/glayout.c:454 +msgid "Rescan Desktop" +msgstr "ÖضÁĿ¼" + +#: gnome/gdesktop.c:2438 +msgid "Configure Background Image" +msgstr "É趨±³¾°Í¼" + +#: gnome/gdialogs.c:60 +msgid "To: " +msgstr "ÖÁ£º" + +#: gnome/gdialogs.c:61 +msgid "Copying from: " +msgstr "¸´ÖƵÄÀ´Ô´£º" + +#: gnome/gdialogs.c:62 +msgid "Deleting file: " +msgstr "ɾ³ýÎļþ£º" + +#: gnome/gdialogs.c:370 +msgid "Files Exist" +msgstr "ÎļþÒѾ­´æÔÚ" + +#: gnome/gdialogs.c:385 +msgid "" +"Some of the files you are trying to copy already exist in the destination " +"folder. Please select the action to be performed." +msgstr "" +"ijЩÄúÏëÒª¸´ÖƵÄÎļþ£¬ÒѾ­´æÔÚÄ¿µÄÊý¾Ý¼ÐÄÚ¡£\n" +"ÇëÑ¡È¡ÄúÏëÒª½øÐеĶ¯×÷¡£" + +#: gnome/gdialogs.c:398 +msgid "Prompt me before overwriting any file." +msgstr "ÔÚ¸ÇдÈκÎÎļþ֮ǰ¶¼ÒªÏÈÌáʾÎÒ¡£" + +#: gnome/gdialogs.c:405 +msgid "Don't overwrite any files." +msgstr "²»Òª¸ÇдÈκÎÎļþ¡£" + +#: gnome/gdialogs.c:421 +msgid "Overwrite:" +msgstr "¸Çд£º" + +#: gnome/gdialogs.c:428 +msgid "Older files." +msgstr "½Ï¾ÉµÄÎļþ¡£" + +#: gnome/gdialogs.c:434 +msgid "Files only if size differs." +msgstr "Ö»ÓдóС²»Í¬µÄÎļþ¡£" + +#: gnome/gdialogs.c:440 +msgid "All files." +msgstr "ËùÓеÄÎļþ¡£" + +#: gnome/gdialogs.c:480 +msgid "File Exists" +msgstr "ÎļþÒѾ­´æÔÚ" + +#: gnome/gdialogs.c:486 +#, c-format +msgid "The target file already exists: %s" +msgstr "Õâ¸öÄ¿±êÎļþÒѾ­´æÔÚ£º%s" + +#: gnome/gdialogs.c:493 +msgid "Replace it?" +msgstr "°ÑËü»»µô£¿" + +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1069 src/file.c:802 +#: src/screen.c:2368 src/screen.c:2398 src/tree.c:1015 +msgid "Copy" +msgstr "¸´ÖÆ" + +#: gnome/gdialogs.c:571 gtkedit/editwidget.c:1070 +msgid "Move" +msgstr "°áÒÆ" + +#: gnome/gdialogs.c:588 +msgid "Destination" +msgstr "Ä¿µÄλÖÃ" + +#: gnome/gdialogs.c:592 +msgid "Find Destination Folder" +msgstr "Ñ°ÕÒÄ¿µÄÊý¾Ý¼Ð" + +#: gnome/gdialogs.c:597 +msgid "Copy as a background process" +msgstr "ÒÔ±³¾°³ÌÐòÀ´¸´ÖÆ" + +#: gnome/gdialogs.c:617 +msgid "Advanced Options" +msgstr "½ø½×µÄÑ¡Ïî" + +#: gnome/gdialogs.c:621 +msgid "Preserve symlinks" +msgstr "±£Áô·ûºÅÁ¬½á" + +#: gnome/gdialogs.c:631 +msgid "Follow links." +msgstr "¸úËæÁ¬½á¡£" + +#: gnome/gdialogs.c:637 +msgid "" +"Selecting this will copy the files that symlinks point to instead of just " +"copying the link." +msgstr "" +"Ñ¡ÔñÕâÒ»ÏîµÄ»°£¬½«»á¸´ÖÆ·ûºÅÁ¬½áÖ¸µ½µÄÎļþ£¬\n" +"¶ø²»ÊÇ·ûºÅÁ¬½á±¾Éí¡£" + +#: gnome/gdialogs.c:642 +msgid "Preserve file attributes." +msgstr "±£ÁôÎļþµÄÊôÐÔ" + +#: gnome/gdialogs.c:647 +msgid "Preserves the permissions and the UID/GID if possible" +msgstr "¾¡¿ÉÄܵı£ÁôÎļþµÄȨÏÞÓë UID/GID" + +#: gnome/gdialogs.c:653 +msgid "Recursively copy subdirectories." +msgstr "µÝ»ØµÄ¸´ÖÆ×ÓĿ¼" + +#: gnome/gdialogs.c:658 +msgid "If set, this will copy the directories recursively" +msgstr "ÈôÑ¡È¡µÄ»°£¬»á¸´ÖÆ´ËĿ¼ÏµÄËùÓÐ×ÓĿ¼" + +#: gnome/gdialogs.c:767 +#, c-format +msgid "" +"%s\n" +"\n" +"Directory not empty. Delete it recursively?" +msgstr "" +"%s\n" +"Ŀ¼ÀïÃ滹Óж«Î÷£»\n" +"È·¶¨ÒªÍêȫɾ³ý£¿" + +#: gnome/gdialogs.c:776 src/file.c:2228 +msgid " Delete: " +msgstr " ɾ³ý£º " + +#: gnome/gdialogs.c:780 +msgid "Do the same for the rest" +msgstr "¶ÔÆäÓàÎļþÖظ²Í¬Ò»¶¯×÷" + +#: gnome/gdialogs.c:863 +msgid "Move Progress" +msgstr "½øÐаáÒÆ" + +#: gnome/gdialogs.c:866 +msgid "Copy Progress" +msgstr "½øÐи´ÖÆ" + +#: gnome/gdialogs.c:869 +msgid "Delete Progress" +msgstr "½øÐÐɾ³ý" + +#: gnome/gdialogs.c:919 +msgid "File " +msgstr "Îļþ" + +#: gnome/gdialogs.c:923 +msgid "is " +msgstr " ÊÇ " + +#: gnome/gdialogs.c:926 +msgid "done." +msgstr " Íê³É¡£" + +#. Translators should take care as "Password" or its translations +#. are used to identify password boxes and hide characters with "*" +#: gnome/gdialogs.c:986 src/wtools.c:587 vfs/vfs.c:1775 +msgid "Password:" +msgstr "ÃÜÂ룺" + +#: gnome/gdialogs.c:986 +msgid "Password" +msgstr "ÃÜÂë" + +#. Create the dialog +#: gnome/gdialogs.c:1018 +msgid "Symbolic Link" +msgstr "·ûºÅÁ¬½á" + +#: gnome/gdialogs.c:1034 src/boxes.c:803 +msgid "Existing filename (filename symlink will point to):" +msgstr "¼È´æµÄÎļþÓòÃû (·ûºÅÁ¬½áÒªÖ¸µ½µÄÎļþ)£º" + +#: gnome/gdialogs.c:1048 src/boxes.c:801 +msgid "Symbolic link filename:" +msgstr "·ûºÅÁ¬½áÓòÃû£º" + +#: gnome/gdnd.c:52 +msgid "_Move here" +msgstr "°áµ½ÕâÀï (_M)" + +#: gnome/gdnd.c:53 +msgid "_Copy here" +msgstr "¸´ÖƵ½ÕâÀï (_C)" + +#: gnome/gdnd.c:54 +msgid "_Link here" +msgstr "Á¬½áµ½ÕâÀï (_L)" + +#: gnome/gdnd.c:56 +msgid "Cancel drag" +msgstr "È¡ÏûÍÏÒ·¶¯×÷" + +#. FIXME: this error message sucks +#: gnome/gdnd.c:192 +#, c-format +msgid "" +"Could not stat %s\n" +"%s" +msgstr "" +"ÎÞ·¨ stat %s\n" +"%s" + +#: gnome/gicon.c:154 +msgid "Default set of icons not found, please check your installation" +msgstr "ÕÒ²»µ½È±Ê¡µÄͼ±ê£¬¼ì²éÄúµÄ°²×°ÊÇ·ñÍêÈ«" + +#: gnome/glayout.c:41 +msgid "_Icon View" +msgstr "ͼ±êÏÔʾ (_I)" + +#: gnome/glayout.c:42 gnome/glayout.c:58 +msgid "Switch view to an icon display" +msgstr "ת»»³Éͼ±êÏÔʾ" + +#: gnome/glayout.c:44 +msgid "_Brief View" +msgstr "¼òÒª (_B)" + +#: gnome/glayout.c:45 gnome/glayout.c:61 +msgid "Switch view to show just file name and type" +msgstr "ת»»³ÉÏÔʾÎļþÃûÓëÎļþÀàÐÍ" + +#: gnome/glayout.c:47 +msgid "_Detailed View" +msgstr "Ïêϸ (_D)" + +#: gnome/glayout.c:48 gnome/glayout.c:64 +msgid "Switch view to show detailed file statistics" +msgstr "ת»»³ÉÏÔʾÏêϸµÄÎļþÐÔÖÊ" + +#: gnome/glayout.c:50 +msgid "_Custom View" +msgstr "×Ô¶¨ÏÔʾ (_C)" + +#: gnome/glayout.c:51 gnome/glayout.c:67 +msgid "Switch view to show user-defined statistics" +msgstr "ת»»³É×Ô¶¨µÄÏÔʾģʽ¡£" + +#: gnome/glayout.c:57 +msgid "Icons" +msgstr "ͼ±ê" + +#: gnome/glayout.c:60 +msgid "Brief" +msgstr "¼òÒª" + +#: gnome/glayout.c:63 +msgid "Detailed" +msgstr "Ïêϸ" + +#: gnome/glayout.c:66 +msgid "Custom" +msgstr "×Ô¶¨" + +#: gnome/glayout.c:302 +msgid "Enter command to run" +msgstr "ÊäÈëÒªÖ´ÐеÄÖ¸Áî" + +#: gnome/glayout.c:315 +msgid "" +"Notice that if you choose to terminate the file manager, you will\n" +"also terminate the GNOME desktop handler.\n" +"\n" +"Are you sure you want to exit?" +msgstr "" +"×¢Òâ!! ÈôÄúÑ¡Ôñ½áÊøÎļþ¹ÜÀíÔ±µÄ»°£¬\n" +"×ÀÃæ¹ÜÀíµÄ¹¦ÄÜҲͬʱ»á½áÊø¡£\n" +"\n" +"ÄúÈ·¶¨ÄúÒª½áÊøÂð£¿" + +#: gnome/glayout.c:327 +msgid "" +"The file manager and the desktop handler are now terminating\n" +"\n" +"If you want to start up again the desktop handler or the file manager\n" +"you can launch it from the Panel, or you can run the UNIX command `gmc'\n" +"\n" +"Press OK to terminate the application, or cancel to continue using it." +msgstr "" +"½áÊøÎļþ¹ÜÀíÔ±Óë×ÀÃæ¹ÜÀí¹¦ÄÜ\n" +"\n" +"ÈôÄúÏëÒªÖØÐÂÆô¶¯×ÀÃæ¹ÜÀí¹¦ÄÜ»òÎļþ¹ÜÀíÔ±µÄ»°£¬\n" +"¿ÉÒÔ´Ó GNOME Panel ÀïÃæÑ¡È¡Ö´ÐУ¬»òÖ±½Óµ÷Óà UNIX ³ÌÐò `gmc'¡£\n" +"\n" +"°´Ï \"È·¶¨\" ÒÔ½áÊø³ÌÐò£¬»ò°´ \"È¡Ïû\" ¼ÌÐøʹÓá£" + +#. GNOMEUIINFO_ITEM_NONE(N_("Open _FTP site"), N_("Opens an FTP site"), ftplink_cmd }, +#: gnome/glayout.c:384 gnome/gscreen.c:2233 +msgid "_Copy..." +msgstr "¸´ÖÆ (_C)..." + +#: gnome/glayout.c:384 +msgid "Copy files" +msgstr "¸´ÖÆÎļþ" + +#: gnome/glayout.c:385 gnome/gscreen.c:2234 +msgid "_Delete..." +msgstr "ɾ³ý (_D)..." + +#: gnome/glayout.c:385 +msgid "Delete files" +msgstr "ɾ³ýÎļþ" + +#: gnome/glayout.c:386 gnome/gscreen.c:2235 +msgid "_Move..." +msgstr "°áÒÆ (_M)..." + +#: gnome/glayout.c:386 +msgid "Rename or move files" +msgstr "¸ü¸ÄÓòÃû»òÕß°áÒÆÎļþλÖÃ" + +#: gnome/glayout.c:388 +msgid "Show directory sizes" +msgstr "ÏÔʾĿ¼´óС" + +#: gnome/glayout.c:388 +msgid "Shows the disk space used by each directory" +msgstr "ÏÔʾÿ¸öĿ¼ÓÃÈ¥µÄÓ²ÅÌ¿Õ¼ä" + +#: gnome/glayout.c:395 +msgid "Select _All" +msgstr "È«Ñ¡ (_A)" + +#: gnome/glayout.c:395 +msgid "Select all files in the current Panel" +msgstr "Ñ¡È¡Õâ¸öÃæ°åÀïÃæµÄËùÓÐÎļþ" + +#: gnome/glayout.c:397 +msgid "_Select Files..." +msgstr "Ñ¡È¡Îļþ (_S)..." + +#: gnome/glayout.c:397 +msgid "Select a group of files" +msgstr "ѡȡһȺÎļþ" + +#: gnome/glayout.c:398 +msgid "_Invert Selection" +msgstr "·´ÏòÑ¡È¡ (_I)" + +#: gnome/glayout.c:398 +msgid "Reverses the list of tagged files" +msgstr "ѡȡδѡȡ֮Îļþ" + +#: gnome/glayout.c:400 gtkedit/editwidget.c:1071 src/view.c:2038 +msgid "Search" +msgstr "ËÑÑ°" + +#: gnome/glayout.c:400 +msgid "Search for a file in the current Panel" +msgstr "Ñ¡È¡Õâ¸öÃæ°åÀïÃæµÄËùÓÐÎļþ" + +#: gnome/glayout.c:403 gnome/gscreen.c:1448 +msgid "_Rescan Directory" +msgstr "ÖضÁĿ¼ (_R)" + +#: gnome/glayout.c:403 +msgid "Rescan the directory contents" +msgstr "ÖØжÁȡĿ¼ÄÚÈÝ" + +#: gnome/glayout.c:410 +msgid "_Sort By..." +msgstr "ÒÔ´ËÀ´ÅÅÐò (_S)..." + +#: gnome/glayout.c:410 +msgid "Confirmation settings" +msgstr "È·ÈÏÉ趨ֵ" + +#: gnome/glayout.c:411 +msgid "_Filter View..." +msgstr "¹ýÂËÆ÷ÏÔʾ (_F)" + +#: gnome/glayout.c:411 +msgid "Global option settings" +msgstr "È«ÓòµÄÑ¡ÏîÉ趨" + +#: gnome/glayout.c:418 +msgid "_Find File..." +msgstr "Ñ°ÕÒÎļþ (_F)" + +#: gnome/glayout.c:418 +msgid "Locate files on disk" +msgstr "ÔÚ´ÅÅÌÀïÃæÕÒ³öÎļþµÄλÖÃ" + +#. { GNOME_APP_UI_ITEM, N_("_Compare panels..."), N_("Compare two panel contents"), gnome_compare_panels }, +#: gnome/glayout.c:421 +msgid "_Edit mime types..." +msgstr "±à¼­ mimi ÀàÐÍ (_E)" + +#: gnome/glayout.c:421 +msgid "Edits the MIME type bindings" +msgstr "±à¼­ MIME ÀàÐÍÉ趨" + +#: gnome/glayout.c:423 +msgid "_Run Command..." +msgstr "Ö´ÐÐÖ¸Áî (_R)..." + +#: gnome/glayout.c:423 +msgid "Runs a command" +msgstr "Ö´ÐÐÒ»ÔòÖ¸Áî" + +#: gnome/glayout.c:425 +msgid "_Run Command in panel..." +msgstr "ÔÚÃæ°åÖÐÖ´ÐÐÖ¸Áî (_R)..." + +#: gnome/glayout.c:425 +msgid "Run a command and put the results in a panel" +msgstr "Ö´ÐÐÖ¸Á²¢ÇÒ½«½á¹ûÊä³öµ½Ãæ°åÉÏ" + +#: gnome/glayout.c:435 +msgid "_Background jobs..." +msgstr "±³¾°¹¤×÷ (_B)..." + +#: gnome/glayout.c:435 +msgid "List of background operations" +msgstr "ÁгöÔÚ±³¾°Ö´ÐеŤ×÷" + +#: gnome/glayout.c:438 +msgid "Exit" +msgstr "À뿪" + +#: gnome/glayout.c:438 +msgid "Terminates the file manager and the desktop" +msgstr "½áÊøÎļþ¹ÜÀíÔ±Óë×ÀÃæ³ÌÐò" + +#: gnome/glayout.c:453 +msgid "Rescan System Devices" +msgstr "ÖØÐÂɨÃèϵͳװÖÃ" + +#: gnome/glayout.c:461 gnome/glayout.c:471 +msgid "_Layout" +msgstr "¸ñʽ (_L)" + +#: gnome/glayout.c:462 gnome/glayout.c:472 +msgid "_Commands" +msgstr "Ö¸Áî (_C)" + +#: gnome/glayout.c:463 +msgid "_Desktop" +msgstr "×ÀÃæ (_D)" + +#: gnome/glayout.c:464 gnome/glayout.c:473 +msgid "_Help" +msgstr "˵Ã÷ (_H)" + +#: gnome/glayout.c:613 +msgid "File/New/Directory..." +msgstr "Îļþ/еÄ/Ŀ¼..." + +#: gnome/gmain.c:558 +msgid "" +"You are running the GNOME File Manager as root.\n" +"\n" +"As root, you can damage your system if you are not careful, and the GNOME " +"File Manager will not stop you from doing it." +msgstr "" +"You are running the GNOME File Manager as root.\n" +"\n" +"As root, you can damage your system if you are not careful, and the GNOME File Manager will not stop you from doing it." + +#. we set the file part +#: gnome/gnome-file-property-dialog.c:170 +msgid "Full Name: " +msgstr "ÎļþÈ«Ãû£º" + +#: gnome/gnome-file-property-dialog.c:178 +msgid "File Name" +msgstr "ÎļþÃû" + +#: gnome/gnome-file-property-dialog.c:201 +msgid "File Type: " +msgstr "ÎļþÀàÐÍ: " + +#: gnome/gnome-file-property-dialog.c:207 +msgid "File Type: Symbolic Link" +msgstr "ÎļþÀàÐÍ£º·ûºÅÁ¬½á" + +#: gnome/gnome-file-property-dialog.c:212 +msgid "Target Name: INVALID LINK" +msgstr " ÓòÃû: ÎÞЧµÄÁ¬½á" + +#: gnome/gnome-file-property-dialog.c:215 +msgid "Target Name: " +msgstr " ÓòÃû: " + +#: gnome/gnome-file-property-dialog.c:220 +msgid "File Type: Directory" +msgstr "ÎļþÀàÐÍ: Ŀ¼" + +#: gnome/gnome-file-property-dialog.c:222 +msgid "File Type: Character Device" +msgstr "ÎļþÀàÐÍ: ×Ö·û×°ÖÃ" + +#: gnome/gnome-file-property-dialog.c:224 +msgid "File Type: Block Device" +msgstr "ÎļþÀàÐÍ: Çø¿é×°ÖÃ" + +#: gnome/gnome-file-property-dialog.c:226 +msgid "File Type: Socket" +msgstr "ÎļþÀàÐÍ: ²å×ù (Socket)" + +#: gnome/gnome-file-property-dialog.c:228 +msgid "File Type: FIFO" +msgstr "ÎļþÀàÐÍ: FIFO" + +#: gnome/gnome-file-property-dialog.c:238 +#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:248 +msgid "File Size: " +msgstr "Îļþ´óС: " + +#: gnome/gnome-file-property-dialog.c:238 +msgid " bytes" +msgstr " ±ÈÌØ" + +#: gnome/gnome-file-property-dialog.c:242 +msgid " KBytes (" +msgstr " ǧ±ÈÌØ (" + +#: gnome/gnome-file-property-dialog.c:243 +#: gnome/gnome-file-property-dialog.c:249 +msgid " bytes)" +msgstr " ±ÈÌØ)" + +#: gnome/gnome-file-property-dialog.c:248 +msgid " MBytes (" +msgstr " °ÙÍò±ÈÌØ (" + +#: gnome/gnome-file-property-dialog.c:256 +msgid "File Size: N/A" +msgstr "Îļþ´óС: ÎÞ·¨µÃÖª " + +#: gnome/gnome-file-property-dialog.c:267 +msgid "File Created on: " +msgstr "Îļþ½¨Á¢ì¶: " + +#: gnome/gnome-file-property-dialog.c:276 +msgid "Last Modified on: " +msgstr "×îºó¸ü¶¯Ê±¼ä: " + +#: gnome/gnome-file-property-dialog.c:285 +msgid "Last Accessed on: " +msgstr "×îºó´æȡʱ¼ä: " + +#: gnome/gnome-file-property-dialog.c:303 +msgid "URL:" +msgstr "URL:" + +#: gnome/gnome-file-property-dialog.c:310 +msgid "Caption:" +msgstr "±êÌâ:" + +#: gnome/gnome-file-property-dialog.c:403 +#: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194 +#: src/screen.c:2366 src/screen.c:2396 +msgid "View" +msgstr "²é¿´" + +#: gnome/gnome-file-property-dialog.c:404 +msgid "Use default View options" +msgstr "ʹÓÃȱʡµÄÏÔʾѡÏî" + +#: gnome/gnome-file-property-dialog.c:439 +msgid "Select an Icon" +msgstr "Ñ¡È¡Ò»¸öͼ±ê" + +#. we do open first +#: gnome/gnome-file-property-dialog.c:469 gnome/gpopup2.c:187 +msgid "Open" +msgstr "¿ªÆô" + +#: gnome/gnome-file-property-dialog.c:479 +msgid "Use default Open action" +msgstr "ʹÓÃȱʡµÄ¿ªÆô¶¯×÷" + +#: gnome/gnome-file-property-dialog.c:489 +msgid "Drop Action" +msgstr "Ö÷Ŷ¯×÷" + +#: gnome/gnome-file-property-dialog.c:502 +msgid "Use default Drop action" +msgstr "ʹÓÃȱʡµÄÖ÷Ŷ¯×÷" + +#: gnome/gnome-file-property-dialog.c:504 +msgid "Use default View action" +msgstr "ʹÓÃȱʡµÄ²é¿´¶¯×÷" + +#: gnome/gnome-file-property-dialog.c:513 gnome/gpopup2.c:196 +#: src/screen.c:2367 src/screen.c:2397 src/view.c:2034 +msgid "Edit" +msgstr "±à¼­" + +#: gnome/gnome-file-property-dialog.c:523 +msgid "Use default Edit action" +msgstr "ʹÓÃȱʡµÄ±à¼­¶¯×÷" + +#: gnome/gnome-file-property-dialog.c:577 gnome/gprop.c:521 +msgid "Icon" +msgstr "ͼ±ê" + +#. We must be a file or a link to a file. +#: gnome/gnome-file-property-dialog.c:611 +msgid "File Actions" +msgstr "Îļþ¶¯×÷" + +#: gnome/gnome-file-property-dialog.c:616 +msgid "Open action" +msgstr "¿ªÆô¶¯×÷" + +#: gnome/gnome-file-property-dialog.c:617 +msgid "Needs terminal to run" +msgstr "ʹÓÃÖն˻úÀ´Ö´ÐÐ" + +#: gnome/gnome-file-property-dialog.c:742 +msgid "File Permissions" +msgstr "ÎļþȨÏÞ" + +#: gnome/gnome-file-property-dialog.c:753 gnome/gprop.c:259 +msgid "Current mode: " +msgstr "Ä¿Ç°µÄģʽ£º" + +#. Headings +#: gnome/gnome-file-property-dialog.c:768 gnome/gprop.c:272 +msgid "Read" +msgstr "¶ÁÈ¡" + +#: gnome/gnome-file-property-dialog.c:769 gnome/gprop.c:273 +msgid "Write" +msgstr "дÈë" + +#: gnome/gnome-file-property-dialog.c:770 gnome/gprop.c:274 +msgid "Exec" +msgstr "Ö´ÐÐ" + +#: gnome/gnome-file-property-dialog.c:771 gnome/gprop.c:275 +msgid "Special" +msgstr "ÌØÊâ" + +#. Permissions +#: gnome/gnome-file-property-dialog.c:775 gnome/gprop.c:279 +msgid "User" +msgstr "ʹÓÃÕß" + +#: gnome/gnome-file-property-dialog.c:777 gnome/gprop.c:281 +msgid "Other" +msgstr "ÆäËü" + +#. Special +#: gnome/gnome-file-property-dialog.c:781 gnome/gprop.c:285 +msgid "Set UID" +msgstr "Set UID" + +#: gnome/gnome-file-property-dialog.c:782 gnome/gprop.c:286 +msgid "Set GID" +msgstr "Set GID" + +#: gnome/gnome-file-property-dialog.c:783 gnome/gprop.c:287 +msgid "Sticky" +msgstr "Sticky" + +#: gnome/gnome-file-property-dialog.c:914 +msgid "File ownership" +msgstr "ÎļþȨÏÞ" + +#: gnome/gnome-file-property-dialog.c:1074 +msgid "URL" +msgstr "URL" + +#: gnome/gnome-file-property-dialog.c:1077 +msgid "Statistics" +msgstr "ͳ¼ÆÊý¾Ý" + +#: gnome/gnome-file-property-dialog.c:1083 +msgid "Options" +msgstr "Ñ¡Ïî" + +#: gnome/gnome-file-property-dialog.c:1086 +msgid "Permissions" +msgstr "ȨÏÞ" + +#: gnome/gnome-file-property-dialog.c:1089 +msgid " Properties" +msgstr "ÄÚÈÝ" + +#: gnome/gnome-file-property-dialog.c:1140 +msgid "You entered an invalid username" +msgstr "ÄúÊäÈëµÄÊÇÒ»¸öÎÞЧµÄʹÓÃÕßÓòÃû" + +#: gnome/gnome-file-property-dialog.c:1185 +msgid "You must rename your file to something" +msgstr "Äú±ØÐë¸Ä±äÎļþÓòÃû" + +#: gnome/gnome-file-property-dialog.c:1191 +msgid "You cannot rename a file to something containing a '/' character" +msgstr "²»Äܽ«Îļþ¸ÄÃû³Éº¬ÓÐ '/' ×Ö·û" + +#. the first label +#: gnome/gnome-open-dialog.c:383 +msgid "Select an application to open \"" +msgstr "Ñ¡È¡Òª¿ªÆôµÄÓ¦ÓóÌÐò \"" + +#: gnome/gnome-open-dialog.c:394 +msgid "Select a file to run with" +msgstr "Ñ¡È¡ÒªÖ´ÐеÄÎļþ" + +#. the file tree +#: gnome/gnome-open-dialog.c:405 +msgid "Applications" +msgstr "Ó¦ÓóÌÐò" + +#: gnome/gnome-open-dialog.c:421 +msgid "Program to run" +msgstr "ÒªÖ´ÐеijÌÐò" + +#: gnome/gpopup2.c:188 +msgid "Mount device" +msgstr "¹ÒÉÏ×°ÖÃ" + +#: gnome/gpopup2.c:189 +msgid "Unmount device" +msgstr "жÔØ×°ÖÃ" + +#: gnome/gpopup2.c:190 +msgid "Eject device" +msgstr "È¡³öµúƬ" + +#: gnome/gpopup2.c:193 +msgid "Open with..." +msgstr " ÒÔ´Ë¿ªÆô..." + +#: gnome/gpopup2.c:195 +msgid "View Unfiltered" +msgstr "²é¿´Î´¹ýÂ˳öÀ´µÄ" + +#: gnome/gpopup2.c:198 +msgid "Copy..." +msgstr "¸´ÖÆ..." + +#: gnome/gpopup2.c:199 gtkedit/editwidget.c:1072 src/screen.c:2371 +#: src/screen.c:2401 +msgid "Delete" +msgstr "ɾ³ý" + +#: gnome/gpopup2.c:200 +msgid "Move..." +msgstr "°áÒÆ..." + +#: gnome/gpopup2.c:201 +msgid "Hard Link..." +msgstr "Á¬½á..." + +#: gnome/gpopup2.c:202 +msgid "Symlink..." +msgstr "·ûºÅÁ¬½á..." + +#: gnome/gpopup2.c:203 +msgid "Edit Symlink..." +msgstr "±à¼­·ûºÅÁ¬½á..." + +#: gnome/gpopup2.c:205 +msgid "Properties..." +msgstr "ÄÚÈÝ" + +#: gnome/gprefs.c:88 +msgid "Show backup files" +msgstr "ÏÔʾ±¸·ÝÎļþ" + +#: gnome/gprefs.c:92 +msgid "Show hidden files" +msgstr "ÏÔʾÒþ²Øµµ" + +#: gnome/gprefs.c:96 +msgid "Mix files and directories" +msgstr "ÎļþÓëĿ¼»ìºÏÏÔʾ" + +#: gnome/gprefs.c:100 +msgid "Use shell patterns instead of regular expressions" +msgstr "ÒÔϵͳ¿ÇÍòÓÃ×Ö·û´úÌæÕý¹æ±íʾʽ" + +#: gnome/gprefs.c:109 +msgid "Confirm when deleting file" +msgstr "ɾ³ýÎļþ֮ǰÏȾ­¹ýÈ·ÈÏ" + +#: gnome/gprefs.c:113 +msgid "Confirm when overwriting files" +msgstr "¸ÇдÎļþ֮ǰÏȾ­¹ýÈ·ÈÏ" + +#: gnome/gprefs.c:117 +msgid "Confirm when executing files" +msgstr "Ö´ÐгÌÐò֮ǰÏȾ­¹ýÈ·ÈÏ" + +#: gnome/gprefs.c:121 +msgid "Show progress while operations are being performed" +msgstr "½øÐй¤×÷ͬʱ²¢ÏÔʾ½ø¶È" + +#: gnome/gprefs.c:130 +msgid "VFS Timeout:" +msgstr "ÐéÄâÎļþϵͳÓâʱ£º" + +#: gnome/gprefs.c:131 gnome/gprefs.c:156 +msgid "Seconds" +msgstr "Ãë" + +#: gnome/gprefs.c:134 +msgid "Anonymous FTP password:" +msgstr "ÄäÃûÎļþ´«ÊäÃÜÂ룺" + +#: gnome/gprefs.c:138 +msgid "Always use FTP proxy" +msgstr "Îļþ´«ÊäʱʹÓôúÀí·þÎñÆ÷" + +#: gnome/gprefs.c:147 +msgid "Fast directory reload" +msgstr "¿ìËÙÖضÁĿ¼" + +#: gnome/gprefs.c:151 +msgid "Compute totals before copying files" +msgstr "¸´ÖÆÎļþ֮ǰÏȼÆËã×ÜÊý" + +#: gnome/gprefs.c:155 +msgid "FTP directory cache timeout :" +msgstr "FTP Ŀ¼¿ìÈ¡Óâʱ£º" + +#: gnome/gprefs.c:159 +msgid "Allow customization of icons in icon view" +msgstr "ÔÊÐíÔÚͼ±êÏÔʾʱʹÓÃ×Ô¶¨µÄͼ±ê" + +#: gnome/gprefs.c:167 +msgid "Use shaped icons" +msgstr "ʹÓÃÐÎ״ͼ±ê" + +#: gnome/gprefs.c:171 +msgid "Auto place icons" +msgstr "×Ô¶¯ÅÅÁÐͼ±ê" + +#: gnome/gprefs.c:175 +msgid "Snap icons to grid" +msgstr "½«Í¼±ê¶ÔÆë¸ñÏß" + +#: gnome/gprefs.c:184 +msgid "File display" +msgstr "ÎļþÏÔʾ" + +#: gnome/gprefs.c:188 +msgid "Confirmation" +msgstr "È·ÈÏ" + +#: gnome/gprefs.c:192 +msgid "VFS" +msgstr "ÐéÄâÎļþϵͳ" + +#: gnome/gprefs.c:196 +msgid "Caching" +msgstr "¿ìÈ¡" + +#: gnome/gprefs.c:200 +msgid "Desktop" +msgstr "×ÀÃæ" + +#: gnome/gprefs.c:479 +msgid "Preferences" +msgstr "É趨" + +#: gnome/gprop.c:58 gnome/gprop.c:75 +msgid "Filename" +msgstr "ÎļþÃû" + +#: gnome/gprop.c:67 +msgid "Full name: " +msgstr "ÎļþÈ«Ãû£º" + +#: gnome/gprop.c:109 src/panelize.c:205 +msgid "Command" +msgstr "Ö¸Áî" + +#: gnome/gprop.c:119 +msgid "Command:" +msgstr "Ö¸Á" + +#: gnome/gprop.c:129 +msgid "Use terminal" +msgstr "ʹÓÃÖն˻ú" + +#: gnome/gprop.c:248 +msgid "File mode (permissions)" +msgstr "Îļþģʽ (ȨÏÞ)" + +#: gnome/gprop.c:321 gnome/gprop.c:347 +msgid "" +msgstr "<δ֪>" + +#: gnome/gprop.c:494 +msgid "General" +msgstr "Ò»°ã" + +#: gnome/gprop.c:505 +msgid "Title" +msgstr "±êÌâ" + +#: gnome/gprop.c:535 +msgid "Select icon" +msgstr "ѡȡͼ±ê" + +#: gnome/gscreen.c:1448 +msgid "Reloads the current directory" +msgstr "ÖضÁÕâ¸öĿ¼" + +#: gnome/gscreen.c:1450 +msgid "New _Directory..." +msgstr "ÐÂĿ¼ (_D)..." + +#: gnome/gscreen.c:1450 +msgid "Creates a new directory here" +msgstr "½¨Á¢ÐÂĿ¼" + +#: gnome/gscreen.c:1631 +msgid "All files" +msgstr "ËùÓÐÎļþ" + +#: gnome/gscreen.c:1633 +msgid "Archives and compressed files" +msgstr "Îļþ¼¯ÓëѹËõµµ" + +#: gnome/gscreen.c:1635 +msgid "RPM/DEB files" +msgstr "RPM/DEB Îļþ" + +#: gnome/gscreen.c:1637 +msgid "Text/Document files" +msgstr "´¿ÎÄ×Ö/Îļþ" + +#: gnome/gscreen.c:1639 +msgid "HTML and SGML files" +msgstr "HTML Óë SGML Îļþ" + +#: gnome/gscreen.c:1641 +msgid "Postscript and PDF files" +msgstr "Postscript Óë PDF Îļþ" + +#: gnome/gscreen.c:1643 +msgid "Spreadsheet files" +msgstr "ÊÔËã±íÊý¾Ýµµ" + +#: gnome/gscreen.c:1645 +msgid "Image files" +msgstr "ͼÐεµ" + +#: gnome/gscreen.c:1648 +msgid "Video/animation files" +msgstr "ͼÏñ/¶¯»­µµ" + +#: gnome/gscreen.c:1650 +msgid "Audio files" +msgstr "ÉùÒôÎļþ" + +#: gnome/gscreen.c:1652 +msgid "C program files" +msgstr "C ³ÌÐòµµ" + +#: gnome/gscreen.c:1654 +msgid "C++ program files" +msgstr "C++ ³ÌÐòµµ" + +#: gnome/gscreen.c:1656 +msgid "Objective-C program files" +msgstr "Objective-C ³ÌÐòµµ" + +#: gnome/gscreen.c:1658 +msgid "Scheme program files" +msgstr "Scheme ³ÌÐòµµ" + +#: gnome/gscreen.c:1660 +msgid "Assembler program files" +msgstr "×éºÏÓïÑÔ³ÌÐòµµ" + +#: gnome/gscreen.c:1662 +msgid "Misc. program files" +msgstr "ÆäËü³ÌÐòµµ" + +#: gnome/gscreen.c:1664 +msgid "Font files" +msgstr "×ÖÐεµ" + +#: gnome/gscreen.c:1791 +#, c-format +msgid "Search: %s" +msgstr "Ñ°ÕÒ£º%s" + +#: gnome/gscreen.c:1801 +#, c-format +msgid "%s bytes in %d file" +msgstr "%s ±ÈÌØ£¬%d ¸öÎļþ" + +#: gnome/gscreen.c:1801 +#, c-format +msgid "%s bytes in %d files" +msgstr "%s ±ÈÌØ£¬¹² %d ¸öÎļþ" + +#: gnome/gscreen.c:1827 src/screen.c:670 +msgid "" +msgstr "<Á¬½á¶ÁÈ¡´íÎó>" + +#: gnome/gscreen.c:2233 +msgid "Copy directory" +msgstr "¸´ÖÆĿ¼" + +#: gnome/gscreen.c:2234 +msgid "Delete directory" +msgstr "ɾ³ýĿ¼" + +#: gnome/gscreen.c:2235 +msgid "Rename or move directory" +msgstr "¸ü¸ÄÓòÃû»ò°áÒÆĿ¼" + +#: gnome/gscreen.c:2391 +msgid "Back" +msgstr "ºóÍË" + +#: gnome/gscreen.c:2391 +msgid "Go to the previously visited directory" +msgstr "µ½Ç°Ò»¸öµ½¹ýµÄĿ¼" + +#: gnome/gscreen.c:2393 +msgid "Up" +msgstr "ÍùÉÏ" + +#: gnome/gscreen.c:2393 +msgid "Go up a level in the directory heirarchy" +msgstr "µ½Ä¿Â¼½á¹¹µÄÉÏÒ»²ã" + +#: gnome/gscreen.c:2395 +msgid "Forward" +msgstr "Ç°½ø" + +#: gnome/gscreen.c:2395 +msgid "Go to the next directory" +msgstr "µ½ÏÂÒ»¸öĿ¼" + +#: gnome/gscreen.c:2398 src/tree.c:1011 +msgid "Rescan" +msgstr "ÖØжÁÈ¡" + +#: gnome/gscreen.c:2398 +msgid "Rescan the current directory" +msgstr "ÖØжÁȡĿ¼ÄÚÈÝ" + +#: gnome/gscreen.c:2401 +msgid "Home" +msgstr "¼ÒĿ¼" + +#: gnome/gscreen.c:2401 +msgid "Go to your home directory" +msgstr "µ½Ê¹ÓÃÕߵļÒĿ¼" + +#: gnome/gscreen.c:2542 +msgid "Location:" +msgstr "λÖãº" + +#. 1 +#: gnome/gtools.c:105 gtkedit/editcmd.c:341 gtkedit/editcmd.c:1184 +#: gtkedit/editcmd.c:1269 gtkedit/editcmd.c:2865 gtkedit/editoptions.c:71 +#: src/boxes.c:138 src/boxes.c:278 src/boxes.c:378 src/boxes.c:466 +#: src/boxes.c:646 src/boxes.c:728 src/boxes.c:783 src/boxes.c:898 +#: src/filegui.c:839 src/find.c:171 src/layout.c:370 src/option.c:144 +#: src/wtools.c:289 src/wtools.c:563 +msgid "&Ok" +msgstr "ºÃ (&O)" + +#: gnome/gview.c:135 src/view.c:718 +#, c-format +msgid "Offset 0x%08x" +msgstr "Æ«ÒÆÖµ 0x%08x" + +#: gnome/gview.c:137 src/view.c:720 +#, c-format +msgid "Col %d" +msgstr "À¸ %d" + +#: gnome/gview.c:141 src/view.c:724 +#, c-format +msgid "%s bytes" +msgstr "%s ±ÈÌØ" + +#: gnome/gview.c:305 +msgid "_Goto line" +msgstr "ÌøÖÁijÐÐ (_G)" + +#: gnome/gview.c:306 +msgid "Jump to a specified line number" +msgstr "Ìøµ½Ê¹ÓÃÕßÖ¸¶¨µÄÐкÅ" + +#: gnome/gview.c:308 +msgid "_Monitor file" +msgstr "¹Û²ìÎļþ (_M)" + +#: gnome/gview.c:308 +msgid "Monitor file growing" +msgstr "¹Û²ìÎļþ´óСµÄ±ä»¯" + +#: gnome/gview.c:315 +msgid "Regexp search" +msgstr "Õý¹æʽËÑÑ°" + +#: gnome/gview.c:316 +msgid "Regular expression search" +msgstr "ÒÔÕý¹æ±íʾʽÀ´ËÑÑ°" + +#: gnome/gview.c:325 +msgid "_Wrap" +msgstr "»»ÐÐ (_W)" + +#: gnome/gview.c:326 +msgid "Wrap the text" +msgstr "ÎÄ×Ö×Ô¶¯»»ÐÐ" + +#. Can not use this one yet, as it destroys the viewer, need to fix that +#: gnome/gview.c:329 +msgid "_Parsed view" +msgstr "½âÒë¹ýµÄ²é¿´ (_P)" + +#: gnome/gview.c:332 +msgid "_Formatted" +msgstr "¸ñʽ»¯ (_F)" + +#: gnome/gview.c:334 +msgid "_Hex" +msgstr "Ê®Áù½øλ (_H)" + +#: gnome/gview.c:340 +msgid "_Search" +msgstr "ËÑÑ° (_S)" + +#: gnome/gwidget.c:90 +msgid "ok" +msgstr "ºÃ" + +#: gnome/gwidget.c:92 +msgid "cancel" +msgstr "È¡Ïû" + +#: gnome/gwidget.c:94 +msgid "help" +msgstr "˵Ã÷" + +#: gnome/gwidget.c:96 src/file.c:2252 +msgid "yes" +msgstr "ÊÇ" + +#: gnome/gwidget.c:98 src/file.c:2250 +msgid "no" +msgstr "·ñ" + +#: gnome/gwidget.c:100 +msgid "exit" +msgstr "À뿪" + +#: gnome/gwidget.c:102 +msgid "abort" +msgstr "ÖжÏ" + +#: gnome/gmount.c:195 +msgid "Could not open the /etc/fstab file" +msgstr "ÎÞ·¨¿ªÆô /etc/fstab µµ" + +#: gnome/gmount.c:322 +#, c-format +msgid "Could not symlink %s to %s; will not have such a desktop device icon." +msgstr "ÎÞ·¨½« %s ·ûºÅÁ¬½áÖÁ %s£»½«²»»áÓдËÒ»×ÀÃæ×°ÖÃͼ±ê¡£" + +#: gnome/gmount.c:374 gnome/gmount.c:389 +#, c-format +msgid "CD-ROM %d" +msgstr "¹âÇý %d" + +#: gnome/gmount.c:379 +#, c-format +msgid "Floppy %d" +msgstr "ÈíÇý %d" + +#: gnome/gmount.c:385 +#, c-format +msgid "Disk %d" +msgstr "´ÅÅÌ %d" + +#: gnome/gmount.c:395 +#, c-format +msgid "NFS dir %s" +msgstr "NFS Ŀ¼ %s" + +#: gnome/gmount.c:399 +#, c-format +msgid "Device %d" +msgstr "×°Öà %d" + +#. The file-name is printed after the ':' +#: gtkedit/edit.c:131 gtkedit/edit.c:226 gtkedit/edit.c:233 gtkedit/edit.c:240 +#: gtkedit/edit.c:247 gtkedit/edit.c:253 gtkedit/edit.c:310 gtkedit/edit.c:346 +#: gtkedit/editcmd.c:1951 gtkedit/editwidget.c:952 src/dir.c:386 +#: src/screen.c:2386 src/tree.c:683 src/tree.c:689 src/wtools.c:222 +#: vfs/fish.c:224 +msgid " Error " +msgstr " ´íÎó " + +#: gtkedit/edit.c:131 gtkedit/edit.c:233 +msgid " Failed trying to open file for reading: " +msgstr " ÔÚ¿ªÆôÎļþÓÃÀ´¶Áȡʱʧ°Ü£º " + +#: gtkedit/edit.c:240 +msgid " Cannot get size/permissions info on file: " +msgstr " ÎÞ·¨»ñµÃÎļþµÄ´óС/ȨÏÞÐÅÏ¢£º " + +#: gtkedit/edit.c:247 +msgid " Not an ordinary file: " +msgstr " ²»Êdz£¹æÎļþ£º " + +#: gtkedit/edit.c:253 +msgid " File is too large: " +msgstr " ÎļþÌ«´óÁË£º " + +#: gtkedit/edit.c:254 +msgid "" +" \n" +" Increase edit.h:MAXBUF and recompile the editor. " +msgstr "" +" \n" +" Ôö¼Ó edit.h ÀïÃ涨ÒåµÄ MAXBUF£¬²¢ÖØбàÒë±à¼­Æ÷¡£ " + +#: gtkedit/edit.c:310 gtkedit/edit.c:346 +msgid " Error allocating memory " +msgstr " ÅäÖÃÄÚ´æʱ·¢Éú´íÎó " + +#: gtkedit/editcmd.c:334 +msgid "Quick save " +msgstr "¿ìËÙ´æµµ" + +#: gtkedit/editcmd.c:335 +msgid "Safe save " +msgstr "°²È«´æµµ" + +#: gtkedit/editcmd.c:336 +msgid "Do backups -->" +msgstr "½øÐб¸·Ý -->" + +#. NLS for hotkeys? +#: gtkedit/editcmd.c:339 gtkedit/editcmd.c:1136 gtkedit/editcmd.c:1182 +#: gtkedit/editcmd.c:1267 gtkedit/editcmd.c:2863 gtkedit/editoptions.c:68 +#: src/achown.c:71 src/boxes.c:139 src/boxes.c:279 src/boxes.c:376 +#: src/boxes.c:464 src/boxes.c:644 src/boxes.c:727 src/boxes.c:781 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:854 src/filegui.c:822 +#: src/find.c:171 src/hotlist.c:138 src/hotlist.c:814 src/hotlist.c:911 +#: src/layout.c:371 src/learn.c:59 src/option.c:145 src/panelize.c:86 +#: src/view.c:404 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +msgid "&Cancel" +msgstr "È¡Ïû" + +#: gtkedit/editcmd.c:345 +msgid "Extension:" +msgstr "À©³ä:" + +#. NLS ? +#: gtkedit/editcmd.c:352 +msgid " Edit Save Mode " +msgstr " ¸Ä±ä´æµµÄ£Ê½ " + +#: gtkedit/editcmd.c:476 +msgid " Save As " +msgstr " Áí´æÐÂÎļþ " + +#. Warning message with a query to continue or cancel the operation +#: gtkedit/editcmd.c:490 gtkedit/editcmd.c:809 gtkedit/editcmd.c:839 +#: gtkedit/editcmd.c:986 gtkedit/editcmd.c:1083 src/ext.c:303 src/file.c:619 +#: src/help.c:318 src/main.c:699 src/screen.c:1432 src/screen.c:2106 +#: src/screen.c:2149 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:390 +#: src/utilunix.c:394 src/utilunix.c:465 vfs/mcfs.c:170 +msgid " Warning " +msgstr " ¾¯¸æ " + +#: gtkedit/editcmd.c:491 +msgid " A file already exists with this name. " +msgstr " ͬÃûµÄÎļþÒѾ­´æÔÚ¡£ " + +#. Push buttons to over-write the current file, or cancel the operation +#: gtkedit/editcmd.c:493 +msgid "Overwrite" +msgstr "¸Çд" + +#: gtkedit/editcmd.c:493 gtkedit/editcmd.c:555 gtkedit/editcmd.c:782 +#: gtkedit/editcmd.c:809 gtkedit/editcmd.c:839 gtkedit/editcmd.c:986 +#: gtkedit/editcmd.c:1578 +msgid "Cancel" +msgstr "È¡Ïû" + +#: gtkedit/editcmd.c:509 +msgid " Save as " +msgstr " Áí´æÐÂÎļþ " + +#: gtkedit/editcmd.c:509 gtkedit/editcmd.c:2633 +msgid " Error trying to save file. " +msgstr " ÊÔÖø´æµµÊ±·¢Éú´íÎó¡£ " + +#. This heads the delete macro error dialog box +#: gtkedit/editcmd.c:625 gtkedit/editcmd.c:633 gtkedit/editcmd.c:658 +msgid " Delete macro " +msgstr " ɾ³ýºê " + +#. 'Open' = load temp file +#: gtkedit/editcmd.c:627 +msgid " Error trying to open temp file " +msgstr " ³¢ÊÔ¿ªÆôÔݴ浵ʱ·¢Éú´íÎó " + +#. 'Open' = load temp file +#: gtkedit/editcmd.c:635 gtkedit/editcmd.c:696 gtkedit/editcmd.c:764 +msgid " Error trying to open macro file " +msgstr " ³¢ÊÔ¿ªÆôºêµµÊ±·¢Éú´íÎó " + +#: gtkedit/editcmd.c:640 gtkedit/editcmd.c:648 gtkedit/editcmd.c:684 +#: gtkedit/editcmd.c:739 +#, c-format +msgid "key '%d 0': " +msgstr "°´¼ü '%d 0': " + +#: gtkedit/editcmd.c:659 +msgid " Error trying to overwrite macro file " +msgstr " ³¢ÊÔ¸ÇдºêµµÊ±·¢Éú´íÎó " + +#. This heads the 'Macro' dialog box +#: gtkedit/editcmd.c:676 +msgid " Macro " +msgstr " ºê " + +#. Input line for a single key press follows the ':' +#: gtkedit/editcmd.c:678 +msgid " Press the macro's new hotkey: " +msgstr " Çë°´ÏÂÆô¶¯´ËÒ»ºêµÄÈȼü£º " + +#. This heads the 'Save Macro' dialog box +#: gtkedit/editcmd.c:696 +msgid " Save macro " +msgstr " ´¢´æºê " + +#: gtkedit/editcmd.c:706 gtkedit/editcmd.c:713 +msgid " Delete Macro " +msgstr " ɾ³ýºê " + +#. This heads the 'Load Macro' dialog box +#: gtkedit/editcmd.c:763 +msgid " Load macro " +msgstr " ÔØÈëºê " + +#: gtkedit/editcmd.c:777 gtkedit/editcmd.c:779 +msgid " Confirm save file? : " +msgstr " È·¶¨Òª´¢´æÎļþ£¿: " + +#. Buttons to 'Confirm save file' query +#: gtkedit/editcmd.c:782 +msgid " Save file " +msgstr " ´¢´æÎļþ " + +#: gtkedit/editcmd.c:782 gtkedit/editwidget.c:1066 src/view.c:2030 +msgid "Save" +msgstr "´æµµ" + +#: gtkedit/editcmd.c:809 gtkedit/editcmd.c:839 +msgid "" +" Current text was modified without a file save. \n" +" Continue discards these changes. " +msgstr "" +" Ä¿Ç°µÄÎļþÄÚÈÝÒѾ­±»¸ü¶¯¹ý£¬¶øÇÒÉÐδ´æµµ¡£ \n" +" ºöÂÔ×÷¹ýµÄ¸Ä±ä²¢¼ÌÐø¹¤×÷¡£ " + +#: gtkedit/editcmd.c:809 gtkedit/editcmd.c:839 gtkedit/editcmd.c:986 +msgid "Continue" +msgstr "¼ÌÐø" + +#. Heads the 'Load' file dialog box +#: gtkedit/editcmd.c:828 gtkedit/editcmd.c:842 +msgid " Load " +msgstr " ÔØÈë " + +#: gtkedit/editcmd.c:828 +msgid " Error trying to open file for reading " +msgstr " ÔÚ¿ªÆôÎļþÓÃÀ´¶Áȡʱ·¢Éú´íÎó " + +#: gtkedit/editcmd.c:986 gtkedit/editcmd.c:1083 +msgid " Block is large, you may not be able to undo this action. " +msgstr " Çø¿éÌ«´óÁË£¬Äú¿ÉÄÜÎÞ·¨¸´Ô­Õâ¸ö¶¯×÷¡£ " + +#: gtkedit/editcmd.c:1083 +msgid " Continue " +msgstr " ¼ÌÐø " + +#: gtkedit/editcmd.c:1083 +msgid " Cancel " +msgstr " È¡Ïû" + +#: gtkedit/editcmd.c:1138 src/filegui.c:597 +msgid "al&L" +msgstr "È«²¿" + +#: gtkedit/editcmd.c:1140 src/file.c:2174 src/filegui.c:267 +msgid "&Skip" +msgstr "Ìø¹ý" + +#: gtkedit/editcmd.c:1142 +msgid "&Replace" +msgstr "Ìæ»»" + +#. This is for the confirm replace dialog box. The replaced string comes after the ':' +#: gtkedit/editcmd.c:1148 gtkedit/editcmd.c:1576 +msgid " Replace with: " +msgstr " ÒÔ´ËÌæ»»£º¡¡" + +#: gtkedit/editcmd.c:1152 +msgid " Confirm replace " +msgstr " È·¶¨Ìæ»» " + +#: gtkedit/editcmd.c:1186 gtkedit/editcmd.c:1271 +msgid "scanf &Expression" +msgstr " Scanf ±íʾʽ " + +#: gtkedit/editcmd.c:1188 +msgid "replace &All" +msgstr "È«²¿Ìæ»»" + +#: gtkedit/editcmd.c:1190 +msgid "pr&Ompt on replace" +msgstr " Ì滻֮ǰҪÏÈѯÎÊ " + +#: gtkedit/editcmd.c:1192 gtkedit/editcmd.c:1273 +msgid "&Backwards" +msgstr " Ïòáá " + +#: gtkedit/editcmd.c:1194 gtkedit/editcmd.c:1275 +msgid "&Regular expression" +msgstr " Õý¹æ±íʾʽ " + +#: gtkedit/editcmd.c:1196 gtkedit/editcmd.c:1277 +msgid "&Whole words only" +msgstr " ֻƥÅäÕû¸öµ¥×Ö " + +#: gtkedit/editcmd.c:1198 gtkedit/editcmd.c:1279 +msgid "case &Sensitive" +msgstr "´óСд²»Í¬" + +#: gtkedit/editcmd.c:1202 +msgid " Enter replacement argument order eg. 3,2,1,4 " +msgstr " ÊäÈë²ÎÊýµÄ˳Ðò, eg. 3,2,1,4 " + +#: gtkedit/editcmd.c:1206 +msgid " Enter replacement string:" +msgstr " ÊäÈëÒªÌæ»»µÄ×Ö´®:" + +#: gtkedit/editcmd.c:1210 gtkedit/editcmd.c:1283 src/view.c:1955 +msgid " Enter search string:" +msgstr " ÊäÈëÒªËÑÑ°µÄ×Ö´®£º " + +#. Heads the 'Replace' dialog box +#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1480 gtkedit/editcmd.c:1574 +#: gtkedit/editcmd.c:2125 gtkedit/editcmd.c:2156 gtkedit/editcmd.c:2158 +msgid " Replace " +msgstr " Ìæ»» " + +#. Heads the 'Search' dialog box +#: gtkedit/editcmd.c:1297 gtkedit/editcmd.c:1474 gtkedit/editcmd.c:2227 +#: src/view.c:1509 src/view.c:1608 src/view.c:1730 src/view.c:1923 +#: src/view.c:1955 +msgid " Search " +msgstr " ËÑÑ° " + +#. An input line comes after the ':' +#: gtkedit/editcmd.c:1346 +msgid " Enter search text : " +msgstr " ÊäÈëÏëÒªËÑÑ°µÄ×Ö´®£º " + +#: gtkedit/editcmd.c:1353 +msgid " Enter replace text : " +msgstr " ÊäÈëÏëÒªÌæ»»µÄ×Ö´®£º " + +#: gtkedit/editcmd.c:1356 gtkedit/editcmd.c:1357 +#, c-format +msgid "" +"You can enter regexp substrings with %s (not \\1, \\2 like sed) then use " +"\"Enter...order\"" +msgstr "Äú¿ÉÒÔÓà %s ÊäÈëÕý¹æʽ´Î×Ö´® (²»ÊÇ sed ʽµÄ \\1, \\2 )£¬È»ºóʹÓà \"ÊäÈë...´ÎÐò\"" + +#: gtkedit/editcmd.c:1359 +msgid " Enter argument (or substring) order : " +msgstr " ÊäÈë²ÎÊý (´Î×Ö´®) µÄ˳Ðò£º " + +#. Tool hint +#: gtkedit/editcmd.c:1363 gtkedit/editcmd.c:1364 +msgid "" +"Enter the order of replacement of your scanf format specifiers or regexp " +"substrings" +msgstr " ÇëÊäÈëÄú scanf ¸ñʽָ¶¨×ÓµÄÌ滻˳Ðò" + +#. The following are check boxes +#: gtkedit/editcmd.c:1369 +msgid " Whole words only " +msgstr " ֻƥÅäÕû¸öµ¥×Ö " + +#: gtkedit/editcmd.c:1371 +msgid " Case sensitive " +msgstr " ´óСд²»Í¬ " + +#: gtkedit/editcmd.c:1374 +msgid " Regular expression " +msgstr " Õý¹æ±íʾʽ " + +#: gtkedit/editcmd.c:1375 gtkedit/editcmd.c:1376 +msgid "See the regex man page for how to compose a regular expression" +msgstr "Çë²Î¿¼ regex µÄ man page ÒÔµÃÖªÕý¹æ±íʾʽµÄд·¨" + +#: gtkedit/editcmd.c:1382 +msgid " Backwards " +msgstr " Ïòáá " + +#. Tool hint +#: gtkedit/editcmd.c:1384 gtkedit/editcmd.c:1385 +msgid "Warning: Searching backward can be slow" +msgstr "¾¯¸æ£ºÏòááËÑÑ°µÄËٶȿÉÄÜ»áºÜÂý" + +#: gtkedit/editcmd.c:1398 +msgid " Prompt on replace " +msgstr " Ì滻֮ǰҪÏÈѯÎÊ " + +#. Tool hint +#: gtkedit/editcmd.c:1400 +msgid "Ask before making each replacement" +msgstr "ÔÚÖ´ÐÐÿһ´ÎÌ滻֮ǰ¶¼ÏÈѯÎÊ" + +#: gtkedit/editcmd.c:1402 +msgid " Replace all " +msgstr " È«²¿Ìæ»» " + +#: gtkedit/editcmd.c:1405 +msgid " Scanf expression " +msgstr " Scanf ±íʾʽ " + +#. Tool hint +#: gtkedit/editcmd.c:1407 +msgid "Allows entering of a C format string, see the scanf man page" +msgstr "ÔÊÐíÄúʹÓÃÒ»×é C ÓïÑÔ¸ñʽµÄ×Ö´®£¬²Î¿¼ scanf µÄ man page" + +#. Tool hint +#: gtkedit/editcmd.c:1412 +msgid "Begin search, Enter" +msgstr "°´ Enter ¼ü¿ªÊ¼½øÐÐËÑÑ°" + +#. Tool hint +#: gtkedit/editcmd.c:1415 +msgid "Abort this dialog, Esc" +msgstr "°´ Esc ¼üÖжϴ˶Ի°¿ò" + +#. Buttons for the confirm replace dialog box. +#: gtkedit/editcmd.c:1578 +msgid "Replace" +msgstr "Ìæ»»" + +#: gtkedit/editcmd.c:1578 +msgid "Skip" +msgstr "Ìø¹ý" + +#: gtkedit/editcmd.c:1578 +msgid "Replace all" +msgstr "È«²¿Ìæ»»" + +#: gtkedit/editcmd.c:1951 +msgid "" +" Invalid regular expression, or scanf expression with to many conversions " +msgstr " ²»ÕýÈ·µÄÕý¹æÔËËãʽ£¬»òÊÇ scanf ±íʾʽÀïÓÐÌ«¶àµÄת»»¡£ " + +#. "Invalid regexp string or scanf string" +#: gtkedit/editcmd.c:2127 +msgid " Error in replacement format string. " +msgstr " ÓÃÀ´Ìæ»»µÄ¸ñʽ»¯×Ö´®ÓдíÎó¡£ " + +#: gtkedit/editcmd.c:2155 +#, c-format +msgid " %ld replacements made. " +msgstr " Ö´ÐÐÁË %ld ´ÎÌæ»»¡£ " + +#: gtkedit/editcmd.c:2158 gtkedit/editcmd.c:2227 +msgid " Search string not found. " +msgstr " ÕÒ²»µ½ÒªËÑÑ°µÄ×Ö´®¡£ " + +#. Confirm 'Quit' dialog box +#: gtkedit/editcmd.c:2251 gtkedit/editcmd.c:2266 gtkedit/editcmd.c:2269 +msgid " Quit " +msgstr " ½áÊø " + +#: gtkedit/editcmd.c:2252 gtkedit/editcmd.c:2270 +msgid "" +" Current text was modified without a file save. \n" +" Save with exit? " +msgstr "" +" Ä¿Ç°ÕýÔڱ༭µÄÎļþ»¹Ã»´æµµ£¬ \n" +" ÔÚÀ뿪ǰÏÈ´æµµ£¿ " + +#: gtkedit/editcmd.c:2266 +msgid " File was modified, Save with exit? " +msgstr "" +" ÎļþÒѾ­Óиü¶¯¹ý£¬ \n" +" ÔÚÀ뿪ǰÏÈ´æµµ£¿ " + +#: gtkedit/editcmd.c:2266 +msgid "Cancel quit" +msgstr "È¡Ïû²¢½áÊø" + +#: gtkedit/editcmd.c:2266 src/cmd.c:249 src/file.c:1859 src/file.c:2233 +#: src/filegui.c:603 src/hotlist.c:1035 src/main.c:854 src/screen.c:2135 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:746 src/view.c:404 +msgid "&Yes" +msgstr "ÊÇ(&Y)" + +#: gtkedit/editcmd.c:2266 src/cmd.c:249 src/file.c:1859 src/file.c:2233 +#: src/filegui.c:602 src/hotlist.c:1035 src/main.c:854 src/screen.c:2135 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:746 src/view.c:404 +msgid "&No" +msgstr "·ñ(&N)" + +#: gtkedit/editcmd.c:2270 +msgid " &Cancel quit " +msgstr " È¡Ïû²¢½áÊø (&C)" + +#: gtkedit/editcmd.c:2270 +msgid " &Yes " +msgstr " ÊÇ (&Y)" + +#: gtkedit/editcmd.c:2270 +msgid " &No " +msgstr " ·ñ (&N)" + +#: gtkedit/editcmd.c:2473 gtkedit/editcmd.c:2548 +msgid " Copy to clipboard " +msgstr " ¸´ÖƵ½¼ôÌù²¾ " + +#: gtkedit/editcmd.c:2473 gtkedit/editcmd.c:2495 gtkedit/editcmd.c:2548 +#: gtkedit/editcmd.c:2561 +msgid " Unable to save to file. " +msgstr " ÎÞ·¨´¢´æÖÁÎļþ¡£ " + +#: gtkedit/editcmd.c:2495 gtkedit/editcmd.c:2561 +msgid " Cut to clipboard " +msgstr " ¼ôϵ½¼ôÌù²¾ " + +#: gtkedit/editcmd.c:2583 gtkedit/editcmd.c:2587 gtkedit/editcmd.c:2592 +#: gtkedit/editcmd.c:2595 src/view.c:1895 +msgid " Goto line " +msgstr " ÌøÖÁijÐÐ " + +#: gtkedit/editcmd.c:2583 gtkedit/editcmd.c:2587 gtkedit/editcmd.c:2592 +#: gtkedit/editcmd.c:2595 +msgid " Enter line: " +msgstr " ÊäÈëÐкţº " + +#: gtkedit/editcmd.c:2616 gtkedit/editcmd.c:2633 +msgid " Save Block " +msgstr " ´¢´æÇø¿é " + +#: gtkedit/editcmd.c:2667 +msgid " Insert File " +msgstr " ²åÈëÎļþ " + +#: gtkedit/editcmd.c:2682 +msgid " Insert file " +msgstr " ²åÈëÎļþ " + +#: gtkedit/editcmd.c:2682 +msgid " Error trying to insert file. " +msgstr " ³¢ÊÔ²åÈëÎļþʱ·¢Éú´íÎó¡£ " + +#. Not essential to translate +#: gtkedit/editcmd.c:2702 +msgid " Sort block " +msgstr " ÅÅÐòÇø¿é " + +#. Not essential to translate +#: gtkedit/editcmd.c:2702 gtkedit/editcmd.c:2756 +msgid " You must first highlight a block of text. " +msgstr " Äú±ØÐëÏÈÑ¡È¡Ò»¸öÎÄ×ÖÇø¿é¡£ " + +#: gtkedit/editcmd.c:2709 +msgid " Run Sort " +msgstr " ½øÐÐÅÅÐò " + +#. Not essential to translate +#: gtkedit/editcmd.c:2711 +msgid " Enter sort options (see manpage) separated by whitespace: " +msgstr " ÊäÈë sort µÄÑ¡ÏÒÔ¿Õ°××Ö·û·Ö¸ô (²Î¿¼ sort µÄ man page): " + +#: gtkedit/editcmd.c:2722 gtkedit/editcmd.c:2728 +msgid " Sort " +msgstr " ÅÅÐò " + +#. Not essential to translate +#: gtkedit/editcmd.c:2724 +msgid " Error trying to execute sort command " +msgstr " ³¢ÊÔÖ´ÐÐ sort Ö¸Áîʱ·¢Éú´íÎó " + +#. Not essential to translate +#: gtkedit/editcmd.c:2730 +msgid " Sort returned non-zero: " +msgstr " sort ´«»Ø·ÇÁãµÄÖµ£º " + +#. Not essential to translate +#: gtkedit/editcmd.c:2754 gtkedit/editcmd.c:2784 +msgid " Process block " +msgstr " ´¦ÀíÇø¿é " + +#. Not essential to translate +#: gtkedit/editcmd.c:2786 +msgid " Error trying to stat file " +msgstr " ³¢ÊÔ stat Îļþʱ·¢Éú´íÎó " + +#: gtkedit/editcmd.c:2856 +msgid " Mail " +msgstr " Óʼþ " + +#: gtkedit/editcmd.c:2869 +msgid " Copies to" +msgstr " ¸´ÖƵ½ " + +#: gtkedit/editcmd.c:2873 +msgid " Subject" +msgstr " ±êÌâ " + +#: gtkedit/editcmd.c:2877 +msgid " To" +msgstr " µ½ " + +#: gtkedit/editcmd.c:2879 +msgid " mail -s -c " +msgstr " mail -s <±êÌâ> -c <¸±±¾> <Ä¿µØ>" + +#: gtkedit/editoptions.c:36 +msgid "Intuitive" +msgstr "Intuitive" + +#: gtkedit/editoptions.c:36 +msgid "Emacs" +msgstr "Emacs" + +#: gtkedit/editoptions.c:39 +msgid "None" +msgstr "ÎÞ" + +#: gtkedit/editoptions.c:39 +msgid "Dynamic paragraphing" +msgstr "¶¯Ì¬·Ö¶Î" + +#: gtkedit/editoptions.c:39 +msgid "Type writer wrap" +msgstr "´ò×ÖÊäÈë»»ÐÐ" + +#. 2 +#: gtkedit/editoptions.c:74 +msgid "Word wrap line length : " +msgstr " ÊäÈëÿÐг¤¶È£º " + +#. 4 +#: gtkedit/editoptions.c:80 +msgid "Tab spacing : " +msgstr "Tab ¿Õ¸ñ : " + +#: gtkedit/editoptions.c:88 +msgid "synta&X highlighting" +msgstr "ÒÀÓï·¨¸Ä±äÑÕÉ«" + +#. 7 +#: gtkedit/editoptions.c:94 +msgid "confir&M before saving" +msgstr "´æµµÇ°ÏÈÈ·ÈÏ" + +#. 8 +#: gtkedit/editoptions.c:97 +msgid "fill tabs with &Spaces" +msgstr "ÒÔ¿Õ°×ÌîÂúÒÆλ¼ü (tab)" + +#. 9 +#: gtkedit/editoptions.c:100 +msgid "&Return does autoindent" +msgstr "»»ÐÐʱ×Ô¶¯ËõÅÅ" + +#. 10 +#: gtkedit/editoptions.c:103 +msgid "&Backspace through tabs" +msgstr "Backspace ɾ³ýÒÆλ¼ü" + +#. 11 +#: gtkedit/editoptions.c:106 +msgid "&Fake half tabs" +msgstr "&Fake half tabs" + +#. 13 +#: gtkedit/editoptions.c:112 +msgid "Wrap mode" +msgstr "»»ÐÐģʽ" + +#. 15 +#: gtkedit/editoptions.c:118 +msgid "Key emulation" +msgstr "°´¼üÄ£Äâ" + +#: gtkedit/editoptions.c:159 +msgid " Editor options " +msgstr " ±à¼­Æ÷Ñ¡Ïî " + +#. Not essential to translate +#: gtkedit/editwidget.c:312 +msgid "Error initialising editor.\n" +msgstr "³õʹ»¯±à¼­Æ÷ʱ·¢Éú´íÎó¡£\n" + +#: gtkedit/editwidget.c:1065 src/help.c:806 src/main.c:1705 src/screen.c:2364 +#: src/screen.c:2394 src/tree.c:1009 src/view.c:2025 +msgid "Help" +msgstr "˵Ã÷" + +#: gtkedit/editwidget.c:1067 +msgid "Mark" +msgstr "±êʾ" + +#: gtkedit/editwidget.c:1068 +msgid "Replac" +msgstr "Ìæ»»" + +#: gtkedit/editwidget.c:1074 src/main.c:1707 +msgid "PullDn" +msgstr "À­ÏÂ" + +#: gtkedit/editwidget.c:1075 src/help.c:818 src/main.c:1708 src/view.c:2027 +#: src/view.c:2047 +msgid "Quit" +msgstr "½áÊø" + +#: gtkedit/editmenu.c:57 +msgid " Word wrap " +msgstr " µ¥×Ö»»ÐÐ " + +#. Not essential to translate +#: gtkedit/editmenu.c:59 +msgid " Enter line length, 0 for off: " +msgstr " ÊäÈëÿÐг¤¶È (×Ö·û)£¬0 ´ú±í¹Ø±Õ£º " + +#: gtkedit/editmenu.c:70 +msgid " About " +msgstr " ¹ØÓÚ " + +#: gtkedit/editmenu.c:71 +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" +" A user friendly text editor written\n" +" for the Midnight Commander.\n" + +#: gtkedit/editmenu.c:119 gtkedit/editmenu.c:135 +msgid "&Open/load... C-o" +msgstr "¿ªÆô/ÔØÈë (&O)... C-o" + +#: gtkedit/editmenu.c:120 +msgid "&New C-n" +msgstr "¿ªÐÂÎļþ C-n" + +#: gtkedit/editmenu.c:122 gtkedit/editmenu.c:138 +msgid "&Save F2" +msgstr "´æµµ F2" + +#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +msgid "save &As... F12" +msgstr "Áí´æÐÂÎļþ... F12" + +#: gtkedit/editmenu.c:125 gtkedit/editmenu.c:141 +msgid "&Insert file... F15" +msgstr "²åÈëÎļþ... F15" + +#: gtkedit/editmenu.c:126 +msgid "copy to &File... C-f" +msgstr "¸´ÖƵ½Îļþ... C-f" + +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 +msgid "a&Bout... " +msgstr "¹ØÓÚ... " + +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 +msgid "&Quit F10" +msgstr "½áÊø F10" + +#: gtkedit/editmenu.c:136 +msgid "&New C-x k" +msgstr "Ð嵀 C-x k" + +#: gtkedit/editmenu.c:142 +msgid "copy to &File... " +msgstr "¸´ÖƵ½Îļþ... " + +#: gtkedit/editmenu.c:151 gtkedit/editmenu.c:168 +msgid "&Toggle Mark F3" +msgstr "Çл»±êʾÇøÓò F3" + +#: gtkedit/editmenu.c:152 gtkedit/editmenu.c:169 +msgid "&Mark Columns S-F3" +msgstr "Ñ¡È¡À¸ S-F3" + +#: gtkedit/editmenu.c:154 gtkedit/editmenu.c:171 +msgid "toggle &Ins/overw Ins" +msgstr "Çл»¸Çд/²åÈë Ins" + +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +msgid "&Copy F5" +msgstr "¸´ÖÆ F5" + +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 +msgid "&Move F6" +msgstr "°áÒÆ F6" + +#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +msgid "&Delete F8" +msgstr "ɾ³ý F8" + +#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +msgid "&Undo C-u" +msgstr "¸´Ô­ C-u" + +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +msgid "&Beginning C-PgUp" +msgstr "Îļþ¿ªÍ· C-PgUp" + +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 +msgid "&End C-PgDn" +msgstr "Îļþ½áβ C-PgDn" + +#: gtkedit/editmenu.c:185 gtkedit/editmenu.c:192 +msgid "&Search... F7" +msgstr "ËÑÑ° F7" + +#: gtkedit/editmenu.c:186 gtkedit/editmenu.c:193 +msgid "search &Again F17" +msgstr "ÔÙ´ÎËÑÑ° F17" + +#: gtkedit/editmenu.c:187 gtkedit/editmenu.c:194 +msgid "&Replace... F4" +msgstr "Ìæ»» F4" + +#: gtkedit/editmenu.c:199 gtkedit/editmenu.c:221 +msgid "&Goto line... M-l" +msgstr "ÌøÖÁijÐÐ... M-l" + +#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:223 +msgid "insert &Literal... C-q" +msgstr "Öð×Ö²åÈë... C-q" + +#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +msgid "&Refresh screen C-l" +msgstr "ÖØ»æÆÁÄ» C-l" + +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +msgid "&Start record macro C-r" +msgstr "¿ªÊ¼ºê¼ÖÆ C-r" + +#: gtkedit/editmenu.c:206 gtkedit/editmenu.c:228 +msgid "&Finish record macro... C-r" +msgstr "Íê³Éºê¼ÖÆ... C-r" + +#: gtkedit/editmenu.c:207 +msgid "&Execute macro... C-a, KEY" +msgstr "Ö´Ðкê... C-a, KEY" + +#: gtkedit/editmenu.c:208 gtkedit/editmenu.c:230 +msgid "delete macr&O... " +msgstr "ɾ³ýºê... " + +#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +msgid "insert &Date/time " +msgstr "²åÈëÈÕÆÚ/ʱ¼ä " + +#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +msgid "format p&Aragraph M-p" +msgstr "½«¶ÎÂä¸ñʽ»¯ M-p" + +#: gtkedit/editmenu.c:213 +msgid "'ispell' s&Pell check C-p" +msgstr "'ispell' Æ´×Ö¼ì²é C-p" + +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +msgid "sor&T... M-t" +msgstr "ÅÅÐò... M-t" + +#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:237 +msgid "'indent' &C Formatter F19" +msgstr "'indent' &C ¸ñʽ»¯ F19" + +#: gtkedit/editmenu.c:216 +msgid "&Mail... " +msgstr "Óʼþ " + +#: gtkedit/editmenu.c:229 +msgid "&Execute macro... C-x e, KEY" +msgstr "Ö´Ðкê... C-x e, KEY" + +#: gtkedit/editmenu.c:235 +msgid "'ispell' s&Pell check M-$" +msgstr "'ispell' Æ´×Ö¼ì²é M-$" + +#: gtkedit/editmenu.c:244 gtkedit/editmenu.c:253 +msgid "&General... " +msgstr "Ò»°ã" + +#: gtkedit/editmenu.c:245 gtkedit/editmenu.c:254 +msgid "&Save mode..." +msgstr "´¢´æģʽ" + +#: gtkedit/editmenu.c:247 gtkedit/editmenu.c:256 src/main.c:1339 +msgid "&Layout..." +msgstr "Ñùʽ" + +#. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' +#: gtkedit/editmenu.c:266 gtkedit/editmenu.c:275 gtkedit/editmenu.c:392 +#: src/chmod.c:164 src/chown.c:130 +msgid " File " +msgstr " Îļþ " + +#: gtkedit/editmenu.c:267 gtkedit/editmenu.c:276 gtkedit/editmenu.c:408 +msgid " Edit " +msgstr " ±à¼­ " + +#: gtkedit/editmenu.c:268 gtkedit/editmenu.c:277 +msgid " Sear/Repl " +msgstr " ËÑÑ°/Ìæ»» " + +#: gtkedit/editmenu.c:269 gtkedit/editmenu.c:278 gtkedit/editmenu.c:448 +msgid " Command " +msgstr " Ö¸Áî " + +#: gtkedit/editmenu.c:270 gtkedit/editmenu.c:279 +msgid " Options " +msgstr " Ñ¡Ïî " + +#: gtkedit/editmenu.c:393 +msgid "Open...\tC-o" +msgstr "¿ªÆô...\tC-o" + +#: gtkedit/editmenu.c:394 +msgid "New\tC-n" +msgstr "ÐÂÎļþ\tC-n" + +#: gtkedit/editmenu.c:396 +msgid "Save\tF2" +msgstr "´æµµ\tF2" + +#: gtkedit/editmenu.c:397 +msgid "Save as...\tF12" +msgstr "Áí´æÐÂÎļþ...\tF12" + +#: gtkedit/editmenu.c:399 +msgid "Insert file...\tF15" +msgstr "²åÈëÎļþ...\tF15" + +#: gtkedit/editmenu.c:400 +msgid "Copy to file...\tC-f" +msgstr "¸´ÖƵ½Îļþ...\tC-f" + +#. Tool hint +#: gtkedit/editmenu.c:403 +msgid "Disk operations" +msgstr "´ÅÅÌ»ú¹¤×÷" + +#: gtkedit/editmenu.c:409 +msgid "Toggle mark\tF3" +msgstr "Çл»±êʾÇøÓò\tF3" + +#: gtkedit/editmenu.c:410 +msgid "Toggle mark columns\tC-b" +msgstr "Çл»±êʾ×Ö¶Î\tC-b" + +#: gtkedit/editmenu.c:412 +msgid "Toggle book mark\tC-M-Ins" +msgstr "Çл»ÊéÇ©\tC-M-Ins" + +#: gtkedit/editmenu.c:413 +msgid "Previous book mark\tC-M-Up" +msgstr "Ç°Ò»¸öÊéÇ©\tC-M-Up" + +#: gtkedit/editmenu.c:414 +msgid "Next book mark\tC-M-Down" +msgstr "ÏÂÒ»¸öÊéÇ©\tC-M-Down" + +#: gtkedit/editmenu.c:415 +msgid "Flush book marks" +msgstr "¸üÐÂÊéÇ©" + +#: gtkedit/editmenu.c:417 +msgid "Toggle insert/overwrite\tIns" +msgstr "Çл»²åÈë/¸Çд\tIns" + +#: gtkedit/editmenu.c:419 +msgid "Copy block to cursor\tF5" +msgstr "¸´ÖÆÇø¿éµ½ÓαêλÖÃ\tF5" + +#: gtkedit/editmenu.c:420 +msgid "Move block to cursor\tF6" +msgstr "°áÒÆÇø¿éµ½ÓαêλÖÃ\tF6" + +#: gtkedit/editmenu.c:421 +msgid "Delete block\tF8/C-Del" +msgstr "ɾ³ýÇø¿é\tF8/C-Del" + +#: gtkedit/editmenu.c:423 +msgid "Copy block to clipbrd\tC-Ins" +msgstr "¸´ÖÆÇø¿éÖÁ¼ôÌù²¾\tC-Ins" + +#: gtkedit/editmenu.c:424 +msgid "Cut block to clipbrd\tS-Del" +msgstr "¼ôÏÂÇø¿éÖÁ¼ôÌù²¾\tS-Del" + +#: gtkedit/editmenu.c:425 +msgid "Paste block from clipbrd\tS-Ins" +msgstr "´Ó¼ôÌù²¾ÌùÉÏÇø¿é\tS-Ins" + +#: gtkedit/editmenu.c:426 +msgid "Selection history\tM-Ins" +msgstr "Ñ¡È¡ÀúÊ·¼Í¼\tM-Ins" + +#: gtkedit/editmenu.c:428 +msgid "Undo\tC-BackSpace" +msgstr "¸´Ô­\tC-BackSpace" + +#. Tool hint +#: gtkedit/editmenu.c:431 +msgid "Manipulating blocks of text" +msgstr "´¦ÀíÎÄ×ÖÇø¿é" + +#: gtkedit/editmenu.c:436 +msgid " Srch/Replce " +msgstr " ËÑÑ°/Ìæ»» " + +#: gtkedit/editmenu.c:437 +msgid "Search...\tF7" +msgstr "ËÑÑ°...\tF7" + +#: gtkedit/editmenu.c:438 +msgid "Search again\tF17" +msgstr "ÔÙ´ÎËÑÑ°\tF17" + +#: gtkedit/editmenu.c:439 +msgid "Replace...\tF4" +msgstr "Ìæ»»...\tF4" + +#: gtkedit/editmenu.c:440 +msgid "Replace again\tF14" +msgstr "ÔÙ´ÎÌæ»»\tF14" + +#. Tool hint +#: gtkedit/editmenu.c:443 +msgid "Search for and replace text" +msgstr "ËÑÑ°»òÌæ»»ÎÄ×Ö×Ö´®" + +#: gtkedit/editmenu.c:449 +msgid "Goto line...\tM-l" +msgstr "ÌøÖÁijÐÐ...\tM-l" + +#: gtkedit/editmenu.c:451 +msgid "Start record macro\tC-r" +msgstr "ºê¼ÖÆ¿ªÊ¼\tC-r" + +#: gtkedit/editmenu.c:452 +msgid "Finish record macro...\tC-r" +msgstr "ºê¼ÖÆÍê³É...\tC-r" + +#: gtkedit/editmenu.c:453 +msgid "Execute macro...\tC-a, KEY" +msgstr "Ö´Ðкê...\tC-a, KEY" + +#: gtkedit/editmenu.c:454 +msgid "Delete macro...\t" +msgstr "ɾ³ýºê...\t" + +#: gtkedit/editmenu.c:456 +msgid "Insert date/time\tC-d" +msgstr "²åÈëÈÕÆÚ/ʱ¼ä\tC-d" + +#: gtkedit/editmenu.c:457 +msgid "Format paragraph\tM-p" +msgstr "¸ñʽ»¯Çø¿é\tM-p" + +#: gtkedit/editmenu.c:459 +msgid "Refresh display\tC-l" +msgstr "ÖØ»æÆÁÄ»\tC-l" + +#. Tool hint +#: gtkedit/editmenu.c:462 +msgid "Macros and internal commands" +msgstr "ºêÓëÄÚ²¿Ö¸Áî" + +#: gtkedit/gtkedit.c:65 +msgid "&Dismiss" +msgstr "¹Ø±Õ" + +#: gtkedit/gtkedit.c:66 +msgid " Enter file name: " +msgstr " ÊäÈëÎļþÃû£º " + +#: gtkedit/gtkedit.c:111 +msgid "The Quick Brown Fox Jumps Over The Lazy Dog" +msgstr "ÎÄ×Ö£ºThe Quick Brown Fox Jumps Over The Lazy Dog" + +#: gtkedit/gtkedit.c:802 +msgid "" +"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n" +msgstr "gtkedit.c: HOME »·¾³±äÁ¿²¢Î´É趨£¬¶øÇÒÒ²ÕÒ²»µ½ÃÜÂëÎļþµÄÊý¾Ý - ÖжÏ\n" + +#: gtkedit/gtkedit.c:1290 +msgid "Clear the edit buffer" +msgstr "Çå³ý±à¼­»º³åÇø" + +#: gtkedit/gtkedit.c:1295 +msgid "Insert File" +msgstr "²åÈëÎļþ" + +#: gtkedit/gtkedit.c:1295 +msgid "Insert text from a file" +msgstr "´Óij¸öÎļþÀïÃæ²åÈëÎÄ×Ö" + +#: gtkedit/gtkedit.c:1297 +msgid "Copy to file" +msgstr "¸´ÖƵ½Îļþ" + +#: gtkedit/gtkedit.c:1297 +msgid "copy a block to a file" +msgstr "¸´ÖÆÇø¿éµ½Ä³¸öÎļþÀïÃæ" + +#: gtkedit/gtkedit.c:1337 +msgid "Search/Replace" +msgstr "ËÑÑ°/Ìæ»»" + +#: gtkedit/syntax.c:1339 gtkedit/syntax.c:1346 +msgid " Load syntax file " +msgstr " ÔØÈëÓï·¨Îļþ " + +#: gtkedit/syntax.c:1339 +msgid " File access error " +msgstr " Îļþ´æÈ¡´íÎó " + +#: gtkedit/syntax.c:1345 +#, c-format +msgid " Error in file %s on line %d " +msgstr " Îļþ %s µÄµÚ %d ÐÐÓÐÓï·¨´íÎó " + +#: src/achown.c:72 src/chmod.c:115 src/chown.c:80 +msgid "&Set" +msgstr "É趨" + +#: src/achown.c:73 +msgid "S&kip" +msgstr "Ìø¹ý" + +#: src/achown.c:74 src/chmod.c:119 src/chown.c:83 +msgid "Set &all" +msgstr "É趨ȫ²¿" + +#: src/achown.c:362 src/achown.c:369 +msgid "owner" +msgstr "ÓµÓÐÕß" + +#: src/achown.c:364 src/achown.c:371 +msgid "group" +msgstr "Ⱥ×é" + +#: src/achown.c:366 +msgid "other" +msgstr "ÆäËü" + +#: src/achown.c:374 +msgid "On" +msgstr "¿ª" + +#: src/achown.c:376 +msgid "Flag" +msgstr "Æì±ê" + +#: src/achown.c:383 +#, c-format +msgid "%6d of %d" +msgstr "%6d Ö® %d" + +#: src/achown.c:391 +msgid " Chown advanced command " +msgstr " ½ø½×µÄ chown Ö¸Áî " + +#: src/achown.c:629 src/achown.c:645 src/achown.c:708 src/chmod.c:285 +#: src/chmod.c:370 +#, c-format +msgid "" +" Couldn't chmod \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ chmod \"%s\" \n" +" %s " + +#: src/achown.c:634 src/achown.c:649 src/achown.c:712 src/chown.c:223 +#: src/chown.c:345 +#, c-format +msgid "" +" Couldn't chown \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ chown \"%s\" \n" +" %s " + +#: src/achown.c:666 src/achown.c:670 src/chmod.c:320 src/chmod.c:324 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:639 +msgid " Oops... " +msgstr " ÔãÁË... " + +#: src/achown.c:667 +msgid " I can't run the Advanced Chown command on an extfs " +msgstr " ÎÞ·¨ÔÚ extfs ÉÏÖ´Ðнø½×µÄ chown Ö¸Áî " + +#: src/achown.c:671 +msgid " I can't run the Advanced Chown command on a tarfs " +msgstr " ÎÞ·¨ÔÚ tarfs ÉÏÖ´Ðнø½×µÄ chown Ö¸Áî " + +#: src/background.c:181 +msgid "Background process:" +msgstr "±³¾°³ÌÐò£º" + +#: src/background.c:287 src/file.c:2173 +msgid " Background process error " +msgstr " ±³¾°³ÌÐò´íÎó " + +#: src/background.c:294 +msgid " Child died unexpectedly " +msgstr " ×Ó³ÌÐò²»Ô¤ÆڵĽáÊø " + +#: src/background.c:296 +msgid " Unknown error in child " +msgstr " ×Ó³ÌÐò·¢Éúδ֪µÄ´íÎó " + +#: src/background.c:311 +msgid " Background protocol error " +msgstr " ±³¾° protocol ´íÎó " + +#: src/background.c:312 +msgid "" +" Background process sent us a request for more arguments \n" +" than we can handle. \n" +msgstr "" +" ±³¾°³ÌÐòÒªÇóµÄ²ÎÊýÌ«¶à£¬³¬³ö³ÌÐòÄܹ»´¦ÀíµÄ \n" +" ÊýÄ¿ÁË! \n" + +#: src/boxes.c:63 +msgid " Listing mode " +msgstr " Áбíģʽ " + +#: src/boxes.c:68 +msgid "&Full file list" +msgstr "ÍêÕûÎļþÁбí" + +#: src/boxes.c:69 +msgid "&Brief file list" +msgstr "¼òÒªµÄÎļþÁбí" + +#: src/boxes.c:70 +msgid "&Long file list" +msgstr "³¤ÎļþÁбí" + +#: src/boxes.c:71 +msgid "&User defined:" +msgstr "ʹÓÃÕß×Ô¶¨£º" + +#: src/boxes.c:72 +msgid "&Icon view" +msgstr "ͼ±êÏÔʾ" + +#: src/boxes.c:137 +msgid "user &Mini status" +msgstr "ʹÓÃÕßÃÔÄã״̬" + +#: src/boxes.c:186 +msgid "Listing mode" +msgstr "Áбíģʽ" + +#: src/boxes.c:280 +msgid "&Reverse" +msgstr "·´Ïò" + +#: src/boxes.c:281 +msgid "case sensi&tive" +msgstr "´óСд²»Í¬" + +#: src/boxes.c:282 +msgid "Sort order" +msgstr "ÅÅÐòµÄ˳Ðò" + +#: src/boxes.c:381 +msgid " confirm &Exit " +msgstr " È·¶¨À뿪 " + +#: src/boxes.c:383 +msgid " confirm e&Xecute " +msgstr " È·¶¨Ö´ÐÐ " + +#: src/boxes.c:385 +msgid " confirm o&Verwrite " +msgstr " È·¶¨¸Çд " + +#: src/boxes.c:387 +msgid " confirm &Delete " +msgstr " È·¶¨É¾³ý " + +#: src/boxes.c:393 +msgid " Confirmation " +msgstr " È·ÈÏ " + +#: src/boxes.c:461 +msgid "Full 8 bits output" +msgstr "ÍêÕûµÄ°Ë±ÈÌØÊä³ö" + +#: src/boxes.c:461 +msgid "ISO 8859-1" +msgstr "ISO 8859-1" + +#: src/boxes.c:461 +msgid "7 bits" +msgstr "Æß±ÈÌØ" + +#: src/boxes.c:468 +msgid "F&ull 8 bits input" +msgstr "ÍêÕûµÄ°Ë±ÈÌØÊäÈë" + +#: src/boxes.c:476 +msgid " Display bits " +msgstr " ÏÔʾ±ÈÌØÊý " + +#: src/boxes.c:651 +msgid "&Always use ftp proxy" +msgstr "ÓÀԶʹÓÃÎļþ´«Êä´úÀí·þÎñÆ÷" + +#: src/boxes.c:653 +msgid "sec" +msgstr "Ãë" + +#: src/boxes.c:657 +msgid "ftpfs directory cache timeout:" +msgstr "Îļþ´«ÊäĿ¼¿ìÈ¡Óâʱ£º" + +#: src/boxes.c:661 +msgid "ftp anonymous password:" +msgstr "ÄäÃûÎļþ´«ÊäÃÜÂ룺" + +#: src/boxes.c:668 +msgid "Timeout for freeing VFSs:" +msgstr "¹Ø±ÕÐéÄâÎļþϵͳÓâʱ£º" + +#: src/boxes.c:674 +msgid " Virtual File System Setting " +msgstr " ÐéÄâÎļþϵͳÉ趨 " + +#: src/boxes.c:740 +msgid "Quick cd" +msgstr "¿ìËٸıäĿ¼" + +#. want cd like completion +#: src/boxes.c:745 +msgid "cd" +msgstr "¸Ä±äĿ¼" + +#: src/boxes.c:796 +msgid "Symbolic link" +msgstr "·ûºÅÁ¬½á" + +#: src/boxes.c:833 +msgid "Running " +msgstr "ÕýÔÚÖ´ÐÐ " + +#: src/boxes.c:834 src/find.c:719 src/find.c:960 +msgid "Stopped" +msgstr "Í£Ö¹ÁË" + +#: src/boxes.c:895 +msgid "&Stop" +msgstr "Í£Ö¹" + +#: src/boxes.c:896 +msgid "&Resume" +msgstr "¼ÌÐø" + +#: src/boxes.c:897 +msgid "&Kill" +msgstr "¹Ø±Õ" + +#: src/boxes.c:936 +msgid "Background Jobs" +msgstr "±³¾°¹¤×÷" + +#: src/chmod.c:95 +msgid "execute/search by others" +msgstr "ÈÃËûÈËÖ´ÐÐ/ËÑÑ°" + +#: src/chmod.c:96 +msgid "write by others" +msgstr "ÈÃËûÈËдÈë" + +#: src/chmod.c:97 +msgid "read by others" +msgstr "ÈÃËûÈ˶ÁÈ¡" + +#: src/chmod.c:98 +msgid "execute/search by group" +msgstr "ÈÃͬȺ×éµÄÈËÖ´ÐÐ/ËÑÑ°" + +#: src/chmod.c:99 +msgid "write by group" +msgstr "ÈÃͬȺ×éµÄÈËдÈë" + +#: src/chmod.c:100 +msgid "read by group" +msgstr "ÈÃͬȺ×éµÄÈ˶ÁÈ¡" + +#: src/chmod.c:101 +msgid "execute/search by owner" +msgstr "ÓµÓÐÕßÖ´ÐÐ/ËÑÑ°" + +#: src/chmod.c:102 +msgid "write by owner" +msgstr "ÓµÓÐÕßдÈë" + +#: src/chmod.c:103 +msgid "read by owner" +msgstr "ÓµÓÐÕ߶ÁÈ¡" + +#: src/chmod.c:104 +msgid "sticky bit" +msgstr "sticky ±ÈÌØ" + +#: src/chmod.c:105 +msgid "set group ID on execution" +msgstr "Ö´ÐÐʱ sGID" + +#: src/chmod.c:106 +msgid "set user ID on execution" +msgstr "Ö´ÐÐʱ sUID" + +#: src/chmod.c:116 +msgid "C&lear marked" +msgstr "Çå³ý±êʾÇø" + +#: src/chmod.c:117 +msgid "S&et marked" +msgstr "±êʾÇøÉ趨" + +#: src/chmod.c:118 +msgid "&Marked all" +msgstr "±êʾȫ²¿" + +#: src/chmod.c:152 +msgid "Permissions (Octal)" +msgstr "ȨÏÞ (°Ë½øλ)" + +#: src/chmod.c:154 +msgid "Owner name" +msgstr "ÓµÓÐÕßÓòÃû" + +#: src/chmod.c:156 +msgid "Group name" +msgstr "Ⱥ×éÓòÃû" + +#: src/chmod.c:160 +msgid " Chmod command " +msgstr " Chmod Ö¸Áî " + +#: src/chmod.c:162 src/chown.c:120 +msgid " Permission " +msgstr " ȨÏÞ " + +#: src/chmod.c:169 +msgid "Use SPACE to change" +msgstr "ʹÓÿհ׼üÀ´¸Ä±ä" + +#: src/chmod.c:171 +msgid "an option, ARROW KEYS" +msgstr "Ò»¸öÑ¡Ï·½Ïò¼ü" + +#: src/chmod.c:173 +msgid "to move between options" +msgstr "ÔÚÑ¡Ïî¼äÒƶ¯" + +#: src/chmod.c:175 +msgid "and T or INS to mark" +msgstr "£¬T »ò INS ¼ü±êʾ" + +#: src/chmod.c:233 +msgid "Chmod command" +msgstr "chmod Ö¸Áî" + +#: src/chmod.c:321 +msgid " I can't run the Chmod command on an extfs " +msgstr " ÎÞ·¨ÔÚ extfs ÉÏÖ´ÐÐ chmod Ö¸Áî " + +#: src/chmod.c:325 +msgid " I can't run the Chmod command on a tarfs " +msgstr " ÎÞ·¨ÔÚ tarfs ÉÏÖ´ÐÐ chown Ö¸Áî " + +#: src/chown.c:81 +msgid "Set &users" +msgstr "É趨ʹÓÃÕß" + +#: src/chown.c:82 +msgid "Set &groups" +msgstr "É趨Ⱥ×é" + +#: src/chown.c:112 +msgid " Name " +msgstr " ÓòÃû " + +#: src/chown.c:114 +msgid " Owner name " +msgstr " ÓµÓÐÕßÓòÃû " + +#: src/chown.c:116 src/chown.c:128 +msgid " Group name " +msgstr " Ⱥ×éÓòÃû " + +#: src/chown.c:118 +msgid " Size " +msgstr "´óС " + +#: src/chown.c:124 +msgid " Chown command " +msgstr " chmod Ö¸Áî " + +#: src/chown.c:126 +msgid " User name " +msgstr " ʹÓÃÕßÓòÃû " + +#: src/chown.c:192 +msgid "" +msgstr "<²»Ã÷µÄʹÓÃÕß>" + +#. add fields for unknown names (numbers) +#: src/chown.c:193 +msgid "" +msgstr "<²»Ã÷µÄȺ×é>" + +#: src/chown.c:261 +msgid " I can't run the Chown command on an extfs " +msgstr " ÎÞ·¨ÔÚ extfs ÉÏÖ´ÐÐ chown Ö¸Áî " + +#: src/chown.c:265 +msgid " I can't run the Chown command on a tarfs " +msgstr " ÎÞ·¨ÔÚ tarfs ÉÏÖ´ÐÐ chown Ö¸Áî " + +#: src/cmd.c:198 +#, c-format +msgid " Can not fetch a local copy of %s " +msgstr " ÎÞ·¨×¥È¡Ò»·Ý %s µÄÔÝ´æµµ " + +#: src/cmd.c:248 +msgid " CD " +msgstr " ¸Ä±äĿ¼ " + +#: src/cmd.c:248 +msgid "Files tagged, want to cd?" +msgstr "ÓÐÎļþÌùÉϱêÇ©ÁË£¬»¹ÊÇÒª¸Ä±äĿ¼£¿" + +#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +msgid "Could not change directory" +msgstr "ÎÞ·¨¸Ä±äĿ¼" + +#: src/cmd.c:283 +msgid " View file " +msgstr " ²é¿´Îļþ " + +#: src/cmd.c:283 +msgid " Filename:" +msgstr " ÎļþÃû£º" + +#: src/cmd.c:300 +msgid " Filtered view " +msgstr " Ñ¡ÔñÐÔµÄÏÔʾ " + +#: src/cmd.c:300 +msgid " Filter command and arguments:" +msgstr " ¹ýÂËÆ÷Ö¸ÁîÓë²ÎÊý£º" + +#: src/cmd.c:388 +msgid "Create a new Directory" +msgstr "½¨Á¢ÐÂĿ¼" + +#: src/cmd.c:388 +msgid " Enter directory name:" +msgstr " ÊäÈëĿ¼ÓòÃû£º" + +#: src/cmd.c:449 +msgid " Filter " +msgstr " ¹ýÂËÆ÷ " + +#: src/cmd.c:449 +msgid " Set expression for filtering filenames" +msgstr " É趨¹ýÂËÎļþÃûµÄ±íʾʽ" + +#: src/cmd.c:515 +msgid " Select " +msgstr " Ñ¡È¡ " + +#: src/cmd.c:567 +msgid " Unselect " +msgstr " È¡ÏûÑ¡È¡ " + +#: src/cmd.c:640 +msgid "Extension file edit" +msgstr "À©³äÎļþ±à¼­" + +#: src/cmd.c:641 +msgid " Which extension file you want to edit? " +msgstr " ÄúÏëÒª±à¼­ÄĸöÀ©³äÎļþ£¿ " + +#: src/cmd.c:642 +msgid "&User" +msgstr "ʹÓÃÕß" + +#: src/cmd.c:642 src/cmd.c:668 +msgid "&System Wide" +msgstr "ȫϵͳµÄ" + +#: src/cmd.c:665 +msgid "Menu file edit" +msgstr "Ñ¡µ¥µµ±à¼­" + +#: src/cmd.c:666 +msgid " Which menu file will you edit? " +msgstr " Äú×¼±¸±à¼­ÄĸöÑ¡µ¥µµ£¿ " + +#: src/cmd.c:668 +msgid "&Local" +msgstr "±¾µØ" + +#: src/cmd.c:668 +msgid "&Home" +msgstr "¼ÒĿ¼" + +#: src/cmd.c:853 +msgid " Compare directories " +msgstr " ±È½ÏĿ¼ " + +#: src/cmd.c:853 +msgid " Select compare method: " +msgstr " Ñ¡Ôñ±È½Ï·½Ê½£º " + +#: src/cmd.c:854 +msgid "&Quick" +msgstr "¿ìËÙ" + +#: src/cmd.c:854 +msgid "&Size only" +msgstr "´óС" + +#: src/cmd.c:854 +msgid "&Thorough" +msgstr "³¹µ×µÄ" + +#: src/cmd.c:864 +msgid " Both panels should be on the listing view mode to use this command " +msgstr " ʹÓôËÒ»Ö¸Áîʱ£¬Á½¸öÃæ°å¶¼ÒªÔÚÁбíÏÔʾģʽ " + +#: src/cmd.c:878 +msgid " The command history is empty " +msgstr " Ö¸ÁîÀúÊ·¼Í¼ÊÇ¿ÕµÄ " + +#: src/cmd.c:884 +msgid " Command history " +msgstr " Ö¸ÁîÀúÊ·¼Í¼ " + +#: src/cmd.c:926 +msgid "" +" Not an xterm or Linux console; \n" +" the panels cannot be toggled. " +msgstr "" +" ²¢·ÇÔÚ xterm »ò Linux Ö÷¿Ø̨ÏÂÖ´ÐУ» \n" +" ÎÞ·¨Çл»Ãæ°å¡£ " + +#: src/cmd.c:965 +msgid "Type `exit' to return to the Midnight Commander" +msgstr "ÊäÈë `exit' ¾Í¿ÉÒԻص½ Midnight Commander" + +#: src/cmd.c:1020 +#, c-format +msgid "" +" Couldn't stat %s \n" +" %s " +msgstr "" +" ÎÞ·¨ stat %s \n" +" %s " + +#: src/cmd.c:1029 src/cmd.c:1031 +msgid " Link " +msgstr " Á¬½á " + +#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1685 +msgid " to:" +msgstr " ÖÁ£º" + +#: src/cmd.c:1041 +#, c-format +msgid " link: %s " +msgstr " Á¬½á£º %s " + +#: src/cmd.c:1074 +#, c-format +msgid " symlink: %s " +msgstr " ·ûºÅÁ¬½á£º %s " + +#: src/cmd.c:1128 +#, c-format +msgid " Symlink `%s' points to: " +msgstr " ·ûºÅÁ¬½á `%s' Ö¸µ½£º" + +#: src/cmd.c:1133 +msgid " Edit symlink " +msgstr " ±à¼­·ûºÅÁ¬½á " + +#: src/cmd.c:1138 +#, c-format +msgid " edit symlink, unable to remove %s: %s " +msgstr " ±à¼­·ûºÅÁ¬½á£¬ÎÞ·¨ÒƳý %s£º %s " + +#: src/cmd.c:1142 +#, c-format +msgid " edit symlink: %s " +msgstr " ±à¼­·ûºÅÁ¬½á£º %s " + +#: src/cmd.c:1169 +msgid " Link symbolically " +msgstr " ·ûºÅÐÔµÄÁ¬½á " + +#: src/cmd.c:1170 +msgid " Relative symlink " +msgstr " Ïà¶ÔµÄ·ûºÅÁ¬½á " + +#: src/cmd.c:1181 +#, c-format +msgid " relative symlink: %s " +msgstr " Ïà¶ÔµÄ·ûºÅÁ¬½á£º %s " + +#: src/cmd.c:1284 +msgid " Enter machine name (F1 for details): " +msgstr " ÊäÈëÖ÷»úÓòÃû (°´ F1 »ñÈ¡½øÒ»²½µÄÐÅÏ¢)£º " + +#: src/cmd.c:1308 +#, c-format +msgid " Could not chdir to %s " +msgstr " ÎÞ·¨½«Ä¿Â¼¸Ä±äÖÁ %s " + +#: src/cmd.c:1315 +msgid " Link to a remote machine " +msgstr " Á¬½áÖÁÔ¶³ÌÖ÷»ú " + +#: src/cmd.c:1321 +msgid " FTP to machine " +msgstr " Ô¶³ÌÎļþ´«ÊäµÄÖ÷»ú " + +#: src/cmd.c:1331 +msgid " Socket source routing setup " +msgstr " ·â°üÀ´Ô´Â·ÓÉÉ趨 " + +#: src/cmd.c:1332 +msgid " Enter host name to use as a source routing hop: " +msgstr " ÊäÈëÒªÓÃÀ´×÷ΪÀ´Ô´Â·ÓÉÖмÌÆ÷µÄÖ÷»úÓòÃû£º " + +#: src/cmd.c:1339 +msgid " Host name " +msgstr " Ö÷»úÓòÃû " + +#: src/cmd.c:1339 +msgid " Error while looking up IP address " +msgstr " ²éѯ IP µØַʱ·¢Éú´íÎó " + +#: src/cmd.c:1350 +msgid " Undelete files on an ext2 file system " +msgstr " ÔÚ ext2 ÎļþϵͳÉϸ´Ô­ÒÑɾ³ýÖ®Îļþ " + +#: src/cmd.c:1351 +msgid "" +" Enter device (without /dev/) to undelete\n" +" files on: (F1 for details)" +msgstr "" +" ÊäÈëÒª¸´Ô­ÒÑɾ³ýÎļþµÄ×°ÖÃÓòÃû£º\n" +" (²»°üÀ¨ /dev/£¬°´ F1 ÒÔ»ñÖªÏêÇé)" + +#: src/cmd.c:1401 +msgid " Setup saved to ~/" +msgstr " ½«É趨´¢´æÖÁ ~/" + +#: src/cmd.c:1406 +msgid " Setup " +msgstr " É趨 " + +#: src/command.c:170 +#, c-format +msgid "" +" Can't chdir to '%s' \n" +" %s " +msgstr "" +" ÎÞ·¨¸Ä±äĿ¼µ½ '%s' \n" +" %s " + +#: src/command.c:198 +msgid " You can not execute commands on non-local filesystems" +msgstr " ²»ÄÜÔڷDZ¾µØ¶ËµÄÎļþϵͳÉÏÖ´ÐÐÖ¸Áî " + +#: src/dialog.c:56 +msgid "" +"\n" +"\n" +"\n" +"refresh stack underflow!\n" +"\n" +"\n" +msgstr "" +"\n" +"\n" +"\n" +"ÖØ»æÓöѵþǷλ!\n" +"\n" +"\n" + +#: src/dir.c:61 +msgid "&Unsorted" +msgstr "δÅÅÐòµÄ" + +#: src/dir.c:62 +msgid "&Name" +msgstr "ÓòÃû" + +#: src/dir.c:63 +msgid "&Extension" +msgstr "À©³ä" + +#: src/dir.c:64 +msgid "&Modify time" +msgstr "¸ü¶¯Ê±¼ä" + +#: src/dir.c:65 +msgid "&Access time" +msgstr "´æȡʱ¼ä" + +#: src/dir.c:66 +msgid "&Change time" +msgstr "¸Ä±äʱ¼ä" + +#: src/dir.c:67 +msgid "&Size" +msgstr "´óС" + +#: src/dir.c:68 +msgid "&Inode" +msgstr "&I ½Úµã" + +#. New sort orders +#: src/dir.c:71 +msgid "&Type" +msgstr "ÀàÐÍ" + +#: src/dir.c:72 +msgid "&Links" +msgstr "Á¬½á" + +#: src/dir.c:73 +msgid "N&GID" +msgstr "N&GID" + +#: src/dir.c:74 +msgid "N&UID" +msgstr "N&UID" + +#: src/dir.c:75 +msgid "&Owner" +msgstr "ÓµÓÐÕß" + +#: src/dir.c:76 +msgid "&Group" +msgstr "Ⱥ×é" + +#: src/dir.c:386 +#, c-format +msgid "File exists but can not be stat-ed: %s %s" +msgstr "Îļþ´æÔÚ£¬µ«ÊÇÎÞ·¨±» stat: %s %s" + +#: src/dir.c:662 +msgid "Unknown" +msgstr "²»Ã÷µÄ" + +#: src/ext.c:131 src/user.c:506 +#, c-format +msgid "" +" Can't generate unique filename \n" +" %s " +msgstr "" +" ÎÞ·¨²úÉúΨһµÄÎļþÃû\n" +" %s " + +#: src/ext.c:138 src/user.c:518 +#, c-format +msgid "" +" Can't create temporary command file \n" +" %s " +msgstr "" +" ÎÞ·¨½¨Á¢Ö¸ÁîÔÝ´æµµ \n" +" %s " + +#: src/ext.c:153 src/user.c:547 +msgid " Parameter " +msgstr " ²ÎÊý " + +#: src/ext.c:303 +msgid " Can't execute commands on a Virtual File System directory " +msgstr " ÎÞ·¨ÔÚÐéÄâÎļþϵͳµÄĿ¼ÉÏÖ´ÐÐÖ¸Áî " + +#: src/ext.c:400 +msgid " file error" +msgstr " Îļþ´íÎó" + +#: src/ext.c:401 +msgid "Format of the " +msgstr "¸ñʽÎÊÌ⣺ " + +#: src/ext.c:419 +msgid " file error " +msgstr " Îļþ´íÎó " + +#: src/ext.c:420 +msgid "Format of the ~/" +msgstr "¸ñʽÎÊÌ⣺ ~/" + +#: src/ext.c:420 +msgid "" +" file has changed\n" +"with version 3.0. You may want either to\n" +"copy it from " +msgstr "" +" ÎļþÒѾ­±»µÚ 3.0 °æ\n" +"¸ü¸Ä¹ýÁË£¬ÄúÒªÂï¾Í´Ó\n" +"ÕâÀ︴ÖÆÒ»·Ý " + +#: src/ext.c:422 +msgid "" +"mc.ext or use that\n" +"file as an example of how to write it.\n" +msgstr "" +"mc.ext£¬·ñÔò¾ÍÒÔÕâ¸öÎļþ\n" +"µ±·¶±¾ÖØдһ¸ö¡£\n" + +#: src/ext.c:424 +msgid "mc.ext will be used for this moment." +msgstr "mc.ext ÔÚÕâ¸öʱºòÏȱ»ÄÃÀ´ÓÃÁË¡£" + +#: src/file.c:154 src/tree.c:640 +msgid " Copy " +msgstr " ¸´ÖÆ " + +#: src/file.c:155 src/tree.c:678 +msgid " Move " +msgstr " °áÒÆ" + +#: src/file.c:156 src/tree.c:746 +msgid " Delete " +msgstr " ɾ³ý " + +#: src/file.c:244 +msgid " Invalid target mask " +msgstr " ÎÞЧµÄÄ¿±êÑÚÂë " + +#: src/file.c:342 +msgid " Could not make the hardlink " +msgstr " ÎÞ·¨ÖÆÔì´ËÒ»Ó²Á¬½á " + +#: src/file.c:384 +#, c-format +msgid "" +" Cannot read source link \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¶ÁÈ¡À´Ô´Á¬½á \"%s\" \n" +" %s " + +#: src/file.c:394 +msgid "" +" Cannot make stable symlinks across non-local filesystems: \n" +"\n" +" Option Stable Symlinks will be disabled " +msgstr "" +" ²»Äܺá¿ç²»Í¬µÄ·Ç±¾µØ¶ËÎļþϵͳÀ´½¨Á¢Îȶ¨µÄÁ¬½á£º\n" +"\n" +" Ñ¡ÏÎȶ¨·ûºÅÁ¬½á¡»½«²»ÄÜʹÓà " + +#: src/file.c:442 +#, c-format +msgid "" +" Cannot create target symlink \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨½¨Á¢Ä¿±ê·ûºÅÁ¬½á \"%s\" \n" +" %s " + +#: src/file.c:509 +#, c-format +msgid "" +" Cannot overwrite directory \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¸ÇдĿ¼ \"%s\" \n" +" %s " + +#: src/file.c:518 +#, c-format +msgid "" +" Cannot stat source file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ stat À´Ô´Îļþ \"%s\" \n" +" %s " + +#: src/file.c:531 +#, c-format +msgid " `%s' and `%s' are the same file. " +msgstr " `%s' Óë `%s' ÊÇͬһ¸öÎļþ¡£ " + +#: src/file.c:574 +#, c-format +msgid "" +" Cannot create special file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨½¨Á¢ÌØÊâÎļþ \"%s\" \n" +" %s " + +#: src/file.c:583 src/file.c:812 +#, c-format +msgid "" +" Cannot chown target file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¸Ä±äÄ¿±êÎļþ \"%s\" µÄÓµÓÐ״̬ \n" +" %s " + +#: src/file.c:592 src/file.c:831 +#, c-format +msgid "" +" Cannot chmod target file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¸Ä±äÄ¿±êÎļþ \"%s\" µÄģʽ\n" +" %s " + +#: src/file.c:609 +#, c-format +msgid "" +" Cannot open source file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¿ªÆôÀ´Ô´µµ \"%s\" \n" +" %s " + +#: src/file.c:619 +msgid " Reget failed, about to overwrite file " +msgstr " ÖØÐÂץȡʧ°Ü£¬×¼±¸¸ÇдԭÓÐÎļþ " + +#: src/file.c:625 +#, c-format +msgid "" +" Cannot fstat source file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ fstat À´Ô´µµ \"%s\" \n" +" %s " + +#: src/file.c:651 +#, c-format +msgid "" +" Cannot create target file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨½¨Á¢Ä¿±êÎļþ \"%s\" \n" +" %s " + +#: src/file.c:665 +#, c-format +msgid "" +" Cannot fstat target file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ fstat Ä¿±êµµ \"%s\" \n" +" %s " + +#: src/file.c:696 +#, c-format +msgid "" +" Cannot read source file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¶ÁÈ¡À´Ô´µµ \"%s\" \n" +" %s " + +#: src/file.c:726 +#, c-format +msgid "" +" Cannot write target file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨Ð´ÈëÄ¿±êÎļþ \"%s\" \n" +" %s " + +#: src/file.c:745 +msgid "(stalled)" +msgstr "(ÔÝÍ£ÁË)" + +#: src/file.c:783 +#, c-format +msgid "" +" Cannot close source file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¹Ø±ÕÀ´Ô´Îļþ \"%s\" \n" +" %s " + +#: src/file.c:792 +#, c-format +msgid "" +" Cannot close target file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¹Ø±ÕÄ¿±êÎļþ \"%s\" \n" +" %s " + +#: src/file.c:802 +msgid "Incomplete file was retrieved. Keep it?" +msgstr "×¥»ØµÄÎļþ²»ÍêÈ«£¬Òª±£ÁôÂð£¿" + +#: src/file.c:803 +msgid "&Delete" +msgstr "ɾ³ý" + +#: src/file.c:803 src/hotlist.c:1443 +msgid "&Keep" +msgstr "±£Áô" + +#: src/file.c:876 +#, c-format +msgid "" +" Cannot stat source directory \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ stat À´Ô´Ä¿Â¼ \"%s\" \n" +" %s " + +#: src/file.c:899 +#, c-format +msgid "" +" Source directory \"%s\" is not a directory \n" +" %s " +msgstr "" +" ¸ø¶¨µÄÀ´Ô´Ä¿Â¼ \"%s\" ²¢²»ÊÇÒ»¸öĿ¼ \n" +" %s " + +#. we found a cyclic symbolic link +#: src/file.c:907 +#, c-format +msgid "" +" Cannot copy cyclic symbolic link \n" +" `%s' " +msgstr "" +" ÎÞ·¨¸´ÖÆÑ­»·µÄ·ûºÅÁ¬½á \n" +" `%s' " + +#: src/file.c:964 +#, c-format +msgid "" +" Cannot create target directory \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨½¨Á¢Ä¿±êĿ¼ \"%s\" \n" +" %s " + +#: src/file.c:987 +#, c-format +msgid "" +" Cannot chown target directory \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¸Ä±äÄ¿±êĿ¼ \"%s\" µÄÓµÓÐ״̬ \n" +" %s " + +#. Source doesn't exist +#: src/file.c:1100 +#, c-format +msgid "" +" Cannot stat file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ stat Îļþ \"%s\" \n" +" %s " + +#: src/file.c:1122 +#, c-format +msgid " `%s' and `%s' are the same file " +msgstr " `%s' Óë `%s' ÊÇͬһ¸öÎļþ " + +#: src/file.c:1129 +#, c-format +msgid " Cannot overwrite directory `%s' " +msgstr " ÎÞ·¨¸ÇдĿ¼ `%s' " + +#: src/file.c:1172 +#, c-format +msgid "" +" Cannot move file \"%s\" to \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨½«Îļþ \"%s\" °áÒÆÖÁ \"%s\" \n" +" %s " + +#: src/file.c:1192 +#, c-format +msgid "" +" Cannot remove file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ÒƳýÎļþ \"%s\" \n" +" %s " + +#: src/file.c:1246 +#, c-format +msgid " Cannot overwrite directory \"%s\" %s " +msgstr " ÎÞ·¨¸ÇдĿ¼ \"%s\" %s " + +#: src/file.c:1248 +#, c-format +msgid " Cannot overwrite file \"%s\" %s " +msgstr " ÎÞ·¨¸ÇдÎļþ \"%s\" %s " + +#: src/file.c:1275 +#, c-format +msgid "" +" Cannot move directory \"%s\" to \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨°ÑĿ¼ \"%s\" °áÒÆÖÁ \"%s\" \n" +" %s " + +#: src/file.c:1338 +#, c-format +msgid "" +" Cannot delete file \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨É¾³ýÎļþ \"%s\" \n" +" %s " + +#: src/file.c:1399 src/file.c:1469 src/file.c:1501 +#, c-format +msgid "" +" Cannot remove directory \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨ÒƳýĿ¼ \"%s\" \n" +" %s " + +#: src/file.c:1540 +msgid " Internal error: get_file \n" +msgstr " ÄÚ²¿´íÎó£º get_file \n" + +#. +#. * This array introduced to avoid translation problems. The former (op_names) +#. * is assumed to be nouns, suitable in dialog box titles; this one should +#. * contain whatever is used in prompt itself (i.e. in russian, it's verb). +#. * Notice first symbol - it is to fool gettext and force these strings to +#. * be different for it. First symbol is skipped while building a prompt. +#. * (I don't use spaces around the words, because someday they could be +#. * dropped, when widgets get smarter) +#. +#: src/file.c:1661 +msgid "1Copy" +msgstr "1¸´ÖÆ" + +#: src/file.c:1661 +msgid "1Move" +msgstr "1°áÒÆ" + +#: src/file.c:1661 +msgid "1Delete" +msgstr "1ɾ³ý" + +#: src/file.c:1676 +#, c-format +msgid "%o %f \"%s\"%m" +msgstr "%o %f \"%s\"%m" + +#: src/file.c:1677 +#, c-format +msgid "%o %d %f%m" +msgstr "%o %d %f%m" + +#: src/file.c:1679 +#, c-format +msgid "%o %f \"%s\"%e" +msgstr "%o %f \"%s\"%e" + +#: src/file.c:1680 +#, c-format +msgid "%o %d %f%e" +msgstr "%o %d %f%e" + +#: src/file.c:1684 +msgid "file" +msgstr "Îļþ" + +#: src/file.c:1684 +msgid "files" +msgstr "Îļþ" + +#: src/file.c:1684 +msgid "directory" +msgstr "Ŀ¼" + +#: src/file.c:1684 +msgid "directories" +msgstr "Ŀ¼" + +#: src/file.c:1685 +msgid "files/directories" +msgstr "Îļþ/Ŀ¼" + +#: src/file.c:1685 +msgid " with source mask:" +msgstr " ÒÔÀ´Ô´ÑÚÂ룺" + +#: src/file.c:1837 +msgid " Can't operate on \"..\"! " +msgstr " ÎÞ·¨²Ù×÷ \"..\"! " + +#: src/file.c:1856 src/screen.c:2095 +msgid "Yes" +msgstr "ÊÇ" + +#: src/file.c:1856 src/screen.c:2095 +msgid "No" +msgstr "·ñ" + +#: src/file.c:1909 +msgid " Sorry, I could not put the job in background " +msgstr " ±§Ç¸£¬ÎÞ·¨½«´ËÒ»¹¤×÷·Åµ½±³¾°ÀïÖ´ÐÐ " + +#: src/file.c:1997 src/file.c:2081 +msgid " Internal failure " +msgstr " ÄÚ²¿Ê§°Ü " + +#: src/file.c:1997 src/file.c:2081 +msgid " Unknown file operation " +msgstr " ²»Ã÷µÄÎļþ²Ù×÷ " + +#: src/file.c:2012 +#, c-format +msgid "" +" Destination \"%s\" must be a directory \n" +" %s " +msgstr "" +" Ä¿µÄ \"%s\" ±ØÐëÊÇÒ»¸öĿ¼ \n" +" %s " + +#: src/file.c:2174 +msgid "&Retry" +msgstr "ÖØÊÔ" + +#: src/file.c:2174 src/file.c:2235 src/filegui.c:264 src/filegui.c:592 +msgid "&Abort" +msgstr "ÖжÏ" + +#: src/file.c:2226 +msgid "" +"\n" +" Directory not empty. \n" +" Delete it recursively? " +msgstr "" +"\n" +" Ŀ¼ÀïÃ滹Óж«Î÷£» \n" +" È·¶¨ÒªÍêȫɾ³ý£¿ " + +#: src/file.c:2227 +msgid "" +"\n" +" Background process: Directory not empty \n" +" Delete it recursively? " +msgstr "" +"\n" +" ±³¾°³ÌÐò£º Ŀ¼ÀïÃ滹Óж«Î÷£¬ \n" +" È·¶¨ÒªÍêȫɾ³ý£¿ " + +#: src/file.c:2234 +msgid "a&ll" +msgstr "È«²¿" + +#: src/file.c:2234 src/filegui.c:595 +msgid "non&E" +msgstr "ÎÞ" + +#: src/file.c:2244 +msgid " Type 'yes' if you REALLY want to delete " +msgstr " ¼ÙÈçÄúÈ·¶¨ÒªÉ¾³ýµÄ»°¾ÍÊäÈë 'yes' " + +#: src/file.c:2246 +msgid "all the directories " +msgstr "ËùÓеÄĿ¼" + +#: src/file.c:2248 +msgid " Recursive Delete " +msgstr " µÝ»ØµÄɾ³ý " + +#: src/file.c:2249 +msgid " Background process: Recursive Delete " +msgstr " ±³¾°³ÌÐò£º µÝ»ØµÄɾ³ý " + +#: src/filegui.c:424 +msgid "File" +msgstr "Îļþ" + +#: src/filegui.c:447 +msgid "Count" +msgstr "¼ÆÊý" + +#: src/filegui.c:468 +msgid "Bytes" +msgstr "±ÈÌØ" + +#: src/filegui.c:505 +msgid "Source" +msgstr "À´Ô´" + +#: src/filegui.c:528 +msgid "Target" +msgstr "Ä¿±ê" + +#: src/filegui.c:550 +msgid "Deleting" +msgstr "ɾ³ýÖÐ" + +#: src/filegui.c:590 +#, c-format +msgid "Target file \"%s\" already exists!" +msgstr "Ä¿±êÎļþ \"%s\" ÒѾ­´æÔÚ£¡" + +#: src/filegui.c:593 +msgid "if &Size differs" +msgstr "Èô´óС²»Í¬" + +#: src/filegui.c:596 +msgid "&Update" +msgstr "¸üÐÂ" + +#: src/filegui.c:598 +msgid "Overwrite all targets?" +msgstr "Ҫȫ²¿¸Çд£¿" + +#: src/filegui.c:600 +msgid "&Reget" +msgstr "ÖØ×¥" + +#: src/filegui.c:601 +msgid "ap&Pend" +msgstr "×·¼Ó" + +#: src/filegui.c:604 +msgid "Overwrite this target?" +msgstr "¸Çд£¿" + +#: src/filegui.c:606 +#, c-format +msgid "Target date: %s, size %d" +msgstr "Ä¿±êµµÈÕÆÚ£º %s, ´óС %d" + +#: src/filegui.c:608 +#, c-format +msgid "Source date: %s, size %d" +msgstr "À´Ô´µµÈÕÆÚ£º %s, ´óС %d" + +#: src/filegui.c:692 +msgid " File exists " +msgstr " ÎļþÒѾ­´æÔÚ " + +#: src/filegui.c:693 +msgid " Background process: File exists " +msgstr " ±³¾°³ÌÐò£ºÎļþÒѾ­´æÔÚ " + +#. follow symlinks and preserve Attributes must be the first +#: src/filegui.c:805 +msgid "preserve &Attributes" +msgstr "±£ÁôÎļþÊôÐÔ" + +#. &op_preserve +#: src/filegui.c:807 +msgid "follow &Links" +msgstr "¸úËæÁ¬½á" + +#. &file_mask_op_follow_links +#: src/filegui.c:809 +msgid "to:" +msgstr "µ½£º" + +#: src/filegui.c:810 +msgid "&Using shell patterns" +msgstr "ʹÓÃϵͳ¿ÇÍòÓÃ×Ö·û" + +#: src/filegui.c:831 +msgid "&Background" +msgstr "±³¾°" + +#: src/filegui.c:840 +msgid "&Stable Symlinks" +msgstr "Îȶ¨·ûºÅÁ¬½á" + +#. &file_mask_stable_symlinks +#: src/filegui.c:842 +msgid "&Dive into subdir if exists" +msgstr "½øÈëÿ¸ö´æÔÚµÄ×ÓĿ¼" + +#: src/filegui.c:1001 +#, c-format +msgid "" +"Invalid source pattern `%s' \n" +" %s " +msgstr "" +"ÎÞЧµÄÀ´Ô´Ñùʽ `%s' \n" +" %s " + +#: src/find.c:130 +msgid "&Suspend" +msgstr "ÔÝÍ£" + +#: src/find.c:131 +msgid "Con&tinue" +msgstr "¼ÌÐø" + +#: src/find.c:132 +msgid "&Chdir" +msgstr "¸Ä±äĿ¼" + +#: src/find.c:133 +msgid "&Again" +msgstr "ÔÙÒ»´Î" + +#: src/find.c:134 +msgid "&Quit" +msgstr "½áÊø" + +#: src/find.c:135 src/panelize.c:89 +msgid "Pane&lize" +msgstr "Ãæ°å»¯" + +#: src/find.c:136 +msgid "&View - F3" +msgstr "²é¿´ - F3" + +#: src/find.c:137 +msgid "&Edit - F4" +msgstr "±à¼­ - F4" + +#: src/find.c:170 +msgid "Start at:" +msgstr "¿ªÊ¼ì¶£º" + +#: src/find.c:170 +msgid "Filename:" +msgstr "ÎļþÃû£º" + +#: src/find.c:170 +msgid "Content: " +msgstr "ÄÚÈÝ£º" + +#: src/find.c:171 src/main.c:1236 src/main.c:1257 +msgid "&Tree" +msgstr "Ê÷×´" + +#: src/find.c:223 +msgid "Find File" +msgstr "Ñ°ÕÒÎļþ" + +#: src/find.c:452 +#, c-format +msgid "Grepping in %s" +msgstr "ÔÚ %s ÀïËÑÑ°×Ö´®" + +#: src/find.c:490 +msgid " Find/read " +msgstr " Ñ°ÕÒ/¶ÁÈ¡ " + +#: src/find.c:490 +msgid " Problem reading from child " +msgstr " ´Ó×Ó³ÌÐò¶ÁÈ¡Êý¾Ýʱ·¢ÉúÎÊÌâ " + +#: src/find.c:537 +msgid "Finished" +msgstr "Íê³É" + +#: src/find.c:561 src/view.c:1509 +#, c-format +msgid "Searching %s" +msgstr "ËÑÑ° %s" + +#: src/find.c:717 src/find.c:757 +msgid "Suspend" +msgstr "ÔÝÍ£" + +#: src/find.c:717 +msgid "Restart" +msgstr "ÖØÊÔ" + +#: src/find.c:719 src/find.c:821 src/find.c:960 src/find.c:1056 +msgid "Searching" +msgstr "ËÑÑ°ÖÐ" + +#: src/find.c:750 src/find.c:1031 +msgid "Find file" +msgstr "Ñ°ÕÒÎļþ" + +#. The buttons +#: src/find.c:755 +msgid "Change to this directory" +msgstr "µ½´ËһĿ¼" + +#: src/find.c:756 +msgid "Search again" +msgstr "ÔÙ´ÎËÑÑ°" + +#: src/find.c:761 +msgid "View this file" +msgstr " ²é¿´Îļþ " + +#: src/find.c:762 +msgid "Edit this file" +msgstr "±à¼­´ËÒ»Îļþ" + +#: src/find.c:763 +msgid "Send the results to a Panel" +msgstr "Ö´ÐÐÖ¸Á²¢ÇÒ½«½á¹ûÊä³öµ½Ãæ°åÉÏ" + +#: src/fixhlp.c:171 +msgid "Usage: fixhlp \n" +msgstr "ʹÓ÷¨£º fixhlp <¿í¶È> <ÌâÄ¿ÓòÃû>\n" + +#: src/fixhlp.c:176 +msgid "fixhlp: Cannot open toc for writing" +msgstr "fixhlp: ÎÞ·¨¿ªÆôÌâÄ¿À´Ð´Èë" + +#: src/fixhlp.c:179 +msgid "" +"[Contents]\n" +" Topics:\n" +"\n" +msgstr "" +"[ÄÚÈÝ]\n" +" ÌâÄ¿£º\n" +"\n" + +#: src/help.c:279 +msgid "" +" Help file format error\n" +"" +msgstr "" +" ˵Ã÷µµ¸ñʽ´íÎó\n" +"" + +#: src/help.c:318 +msgid " Internal bug: Double start of link area " +msgstr " ÄÚ²¿³ô³æ£º Öظ²µÄÁ¬½áÇøÓò¿ªÍ· " + +#: src/help.c:572 +msgid " Can't find node [Contents] in help file " +msgstr " ÎÞ·¨ÔÚ˵Ã÷µµÀïÕÒµ½ [ÄÚÈÝ] ½Úµã " + +#: src/help.c:741 +msgid " Help " +msgstr " ˵Ã÷ " + +#: src/help.c:766 src/user.c:655 +#, c-format +msgid "" +" Can't open file %s \n" +" %s " +msgstr "" +" ÎÞ·¨¿ªÆôÎļþ %s \n" +" %s " + +#: src/help.c:771 +#, c-format +msgid " Can't find node %s in help file " +msgstr " ÎÞ·¨ÔÚ˵Ã÷µµÀïÕÒµ½½Úµã %s " + +#: src/help.c:808 +msgid "Index" +msgstr "Ŀ¼" + +#: src/help.c:810 +msgid "Prev" +msgstr "ÍùÇ°" + +#: src/hotlist.c:132 +msgid "&Move" +msgstr "Òƶ¯" + +#: src/hotlist.c:133 src/hotlist.c:1443 src/panelize.c:88 src/wtools.c:383 +msgid "&Remove" +msgstr "ÒƳý" + +#: src/hotlist.c:134 src/hotlist.c:818 src/hotlist.c:915 +msgid "&Append" +msgstr "Ôö¼Ó" + +#: src/hotlist.c:135 src/hotlist.c:816 src/hotlist.c:913 +msgid "&Insert" +msgstr "²åÈë" + +#: src/hotlist.c:136 +msgid "New &Entry" +msgstr "ÐÂÔöÏîÄ¿" + +#: src/hotlist.c:137 +msgid "New &Group" +msgstr "ÐÂÔöȺ×é" + +#: src/hotlist.c:139 +msgid "&Up" +msgstr "ÍùÉÏ" + +#: src/hotlist.c:140 +msgid "&Add current" +msgstr "¼ÓÈëÄ¿Ç°µÄ" + +#: src/hotlist.c:141 +msgid "Change &To" +msgstr "¸ü»»ÖÁ" + +#: src/hotlist.c:201 +msgid "Subgroup - press ENTER to see list" +msgstr "Subgroup - °´ ENTER ÒԲ鿴Áбí" + +#: src/hotlist.c:620 +msgid "Active VFS directories" +msgstr "Æô¶¯ÐéÄâÎļþϵͳĿ¼" + +#: src/hotlist.c:620 +msgid "Directory hotlist" +msgstr "ÈÈÃÅĿ¼Áбí" + +#: src/hotlist.c:639 +msgid " Directory path " +msgstr " Ŀ¼;¾¶ " + +#. This one holds the displayed pathname +#: src/hotlist.c:642 src/hotlist.c:689 +msgid " Directory label " +msgstr " Ŀ¼±êÇ© " + +#: src/hotlist.c:663 +msgid "Moving " +msgstr "Òƶ¯ÖÐ " + +#: src/hotlist.c:892 +msgid "New hotlist entry" +msgstr "еÄÈÈÃÅÁбíÏîÄ¿" + +#: src/hotlist.c:892 +msgid "Directory label" +msgstr "Ŀ¼±êÇ©" + +#: src/hotlist.c:892 +msgid "Directory path" +msgstr "Ŀ¼;¾¶" + +#: src/hotlist.c:973 +msgid " New hotlist group " +msgstr " еÄÈÈÃÅÁбíȺ×é " + +#: src/hotlist.c:973 +msgid "Name of new group" +msgstr "ÐÂȺ×éµÄÓòÃû" + +#: src/hotlist.c:988 +#, c-format +msgid "Label for \"%s\":" +msgstr " \"%s\" µÄ±êÇ©£º" + +#: src/hotlist.c:992 +msgid " Add to hotlist " +msgstr " ÐÂÔöÖÁÈÈÃÅÁбí " + +#: src/hotlist.c:1029 +msgid " Remove: " +msgstr " ÒƳý£º " + +#: src/hotlist.c:1033 +msgid "" +"\n" +" Group not empty.\n" +" Remove it?" +msgstr "" +"\n" +" Ⱥ×黹ÓÐÄÚÈÝ£¬\n" +" È·¶¨ÒªÒƳý£¿" + +#: src/hotlist.c:1378 +msgid " Top level group " +msgstr " ×îÉϲãȺ×é " + +#: src/hotlist.c:1394 +msgid "Hotlist is now kept in file ~/" +msgstr "ÈÈÃÅÁбíÒѾ­±»´æÔÚÎļþ ~/" + +#: src/hotlist.c:1396 +msgid "MC will load hotlist from ~/" +msgstr "MC ½«»á´ÓÕâÀïÔØÈëÈÈÃÅÁÐ±í£º ~/" + +#: src/hotlist.c:1398 +msgid "and then delete [Hotlist] section there" +msgstr "£¬½ÓÖøɾ³ýÕâÀïµÄ [ÈÈÃÅÁбí] ¶ÎÂ䣺 " + +#: src/hotlist.c:1400 src/hotlist.c:1419 src/hotlist.c:1442 src/hotlist.c:1467 +msgid " Hotlist Load " +msgstr " ÔØÈëÈÈÃÅÁбí " + +#: src/hotlist.c:1416 src/hotlist.c:1464 +msgid "MC was unable to write ~/" +msgstr "MC ÎÞ·¨Ð´Èë ~/" + +#: src/hotlist.c:1417 +msgid " file, your old hotlist entries were not deleted" +msgstr "Îļþ£¬Äú¾ÉÓеÄÈÈÃÅÁбíûÓÐɾ³ý" + +#: src/hotlist.c:1431 +msgid "You have ~/" +msgstr "ÄúÒѾ­ÓÐ ~/" + +#: src/hotlist.c:1431 +msgid " file and [Hotlist] section in ~/" +msgstr " ÎļþÒÔ¼° [ÈÈÃÅÁбí] ¶ÎÂäÔÚ ~/" + +#: src/hotlist.c:1432 +msgid "Your ~/" +msgstr "ÄúµÄ ~/" + +#: src/hotlist.c:1432 +msgid " most probably was created\n" +msgstr " ºÜ¿ÉÄÜÒѾ­±»½¨Á¢ \n" + +#: src/hotlist.c:1433 +msgid "" +"by an earlier development version of MC\n" +"and is more actual than ~/" +msgstr "" +"£¬ÊÇÓÉÒ»¸öÔçÆÚ·¢Õ¹Öа汾µÄ MC Ëù½¨Á¢£¬\n" +"¶øÇÒ±ÈÕâÒ»¸ö»¹ÒªÐ£º ~/" + +#: src/hotlist.c:1434 +msgid "" +" entries\n" +"\n" +msgstr "" +" µÄÏîÄ¿\n" +"\n" + +#: src/hotlist.c:1435 +msgid "" +"You can choose between\n" +"\n" +" Remove - remove old hotlist entries from ~/" +msgstr "" +"Äú¿ÉÒÔÑ¡ÔñÒÔÏÂÏîÄ¿£º\n" +"\n" +" ÒƳý - ÒƳý¾ÉµÄÈÈÃÅÁбíÏîÄ¿ ~/" + +#: src/hotlist.c:1437 +msgid "" +" Keep - keep your old entries; you will be asked\n" +" the same question next time\n" +" Merge - add old entries to hotlist as group \"Entries from ~/" +msgstr "" +" ±£Áô - ±£Áô¾ÉµÄÏîÄ¿£»ÄúÏ´Î×ö´æµµ¶¯×÷ʱ»¹»á\n" +" ÔÙ´ÎѯÎÊÄúµÄÏë·¨¡£\n" +" ºÏ²¢ - °Ñ¾ÉµÄÏîÄ¿¼Óµ½ÈÈÃÅÁбíȺ×é \"¾ÉÏîÄ¿ ~/" + +#: src/hotlist.c:1443 +msgid "&Merge" +msgstr "ºÏ²¢" + +#: src/hotlist.c:1455 +msgid " Entries from ~/" +msgstr " ¾ÉÏîÄ¿ ~/" + +#: src/hotlist.c:1465 +msgid " file your old hotlist entries were not deleted" +msgstr " Îļþ£¬Äú¾ÉµÄÈÈÃÅÁÐ±í²¢Î´±»É¾³ý" + +#: src/info.c:83 +#, c-format +msgid "Midnight Commander %s" +msgstr "Midnight Commander %s" + +#: src/info.c:109 +#, c-format +msgid "File: %s" +msgstr "Îļþ£º %s" + +#: src/info.c:122 +msgid "Free nodes %d (%d%%) of %d" +msgstr "¿Õ½Úµã %d (%d%%) Ö® %d" + +#: src/info.c:128 +msgid "No node information" +msgstr "ûÓнڵãÐÅÏ¢" + +#: src/info.c:133 +msgid "Free space " +msgstr "¿Õ¼ä" + +#: src/info.c:135 +msgid " (%d%%) of " +msgstr " (%d%%) Ö® " + +#: src/info.c:139 +msgid "No space information" +msgstr "ûÓпռäÐÅÏ¢" + +#: src/info.c:143 +#, c-format +msgid "Type: %s " +msgstr "ÀàÐÍ£º %s " + +#: src/info.c:143 +msgid "non-local vfs" +msgstr "·Ç±¾µØµÄÐéÄâÎļþϵͳ" + +#: src/info.c:149 +#, c-format +msgid "Device: %s" +msgstr "×°Ö㺠%s" + +#: src/info.c:153 +#, c-format +msgid "Filesystem: %s" +msgstr "Îļþϵͳ£º %s" + +#: src/info.c:158 +#, c-format +msgid "Accessed: %s" +msgstr "´æÈ¡£º %s" + +#: src/info.c:162 +#, c-format +msgid "Modified: %s" +msgstr "¸ü¶¯£º %s" + +#: src/info.c:166 +#, c-format +msgid "Created: %s" +msgstr "½¨Á¢£º %s" + +#: src/info.c:179 +msgid "Size: " +msgstr "´óС£º " + +#: src/info.c:182 +#, c-format +msgid " (%d blocks)" +msgstr " (%d ¸öÇø¿é)" + +#: src/info.c:188 +#, c-format +msgid "Owner: %s/%s" +msgstr "ÓµÓÐÕߣº %s/%s" + +#: src/info.c:193 +#, c-format +msgid "Links: %d" +msgstr "Á¬½á£º %d" + +#: src/info.c:197 +#, c-format +msgid "Mode: %s (%04o)" +msgstr "ģʽ£º %s (%04o)" + +#: src/info.c:202 +#, c-format +msgid "Location: %Xh:%Xh" +msgstr "λÖ㺠%Xh:%Xh" + +#: src/info.c:212 +msgid "File: None" +msgstr "Îļþ£º ÎÞ" + +#: src/layout.c:159 +msgid "&Vertical" +msgstr "´¹Ö±" + +#: src/layout.c:160 +msgid "&Horizontal" +msgstr "ˮƽ" + +#: src/layout.c:170 +msgid "&Xterm hintbar" +msgstr "xterm ÌáʾÁÐ" + +#: src/layout.c:171 +msgid "h&Intbar visible" +msgstr "ÏÔʾÌáʾÁÐ" + +#: src/layout.c:172 +msgid "&Keybar visible" +msgstr "ÏÔʾ¼üÅÌÁÐ" + +#: src/layout.c:173 +msgid "command &Prompt" +msgstr "Ö¸ÁîÌáʾ·ûºÅ" + +#: src/layout.c:174 +msgid "show &Mini status" +msgstr "ÏÔʾÃÔÄã״̬" + +#: src/layout.c:175 +msgid "menu&Bar visible" +msgstr "ÏÔʾѡµ¥ÁÐ" + +#: src/layout.c:176 +msgid "&Equal split" +msgstr "µÈÁ¿·Ö¸î" + +#: src/layout.c:177 +msgid "pe&Rmissions" +msgstr "ȨÏÞ" + +#: src/layout.c:178 +msgid "&File types" +msgstr "ÎļþÀàÐÍ" + +#: src/layout.c:372 src/learn.c:60 src/learn.c:179 src/option.c:146 +msgid "&Save" +msgstr "´æµµ" + +#. length of line with '<' '>' buttons +#: src/layout.c:380 +msgid " Layout " +msgstr " Ñùʽ " + +#: src/layout.c:381 +msgid " Panel split " +msgstr " ·Ö¸îÃæ°å " + +#: src/layout.c:382 +msgid " Highlight... " +msgstr " Ñ¡È¡... " + +#: src/layout.c:383 src/option.c:157 +msgid " Other options " +msgstr " ÆäËüÑ¡Ïî " + +#: src/layout.c:384 +msgid "output lines" +msgstr "Êä³öÐÐÊý" + +#: src/layout.c:451 +msgid "Layout" +msgstr "Ñùʽ" + +#: src/learn.c:74 +msgid " Learn keys " +msgstr " ÈÏʶ°´¼ü " + +#: src/learn.c:93 +msgid " Teach me a key " +msgstr " ½ÌÎÒÈÏʶһ¸ö°´¼ü " + +#: src/learn.c:94 +#, c-format +msgid "" +"Please press the %s\n" +"and then wait until this message disappears.\n" +"\n" +"Then, press it again to see if OK appears\n" +"next to its button.\n" +"\n" +"If you want to escape, press a single Escape key\n" +"and wait as well." +msgstr "" +"Çë°´Ï %s\n" +"È»ºóµÈµ½´ËһѶϢÏûʧ¡£\n" +"\n" +"½ÓÖøÔÙ°´Ò»´Î£¬¿´¿´ÔÚ°´Å¥ÅÔ±ßÊDz»ÊÇÓÐ\n" +"ÏÔʾ \"ºÃ\"¡£\n" +"\n" +"ÒªÀ뿪µÄ»°£¬°´Ò»Ï Esc ¼ü£¬È»ºóµÈ´ý\n" +"Ò»ÏÂ×ӾͿÉÒÔÁË¡£" + +#: src/learn.c:122 +msgid " Cannot accept this key " +msgstr " ÎÞ·¨¶ÁÈ¡Õâ¸ö°´¼ü " + +#: src/learn.c:123 +#, c-format +msgid " You have entered \"%s\"" +msgstr " Äú¸Õ¸Õ°´ÏÂÁË \"%s\"" + +#: src/learn.c:170 +msgid "OK" +msgstr "ºÃ" + +#: src/learn.c:177 +msgid "" +"It seems that all your keys already\n" +"work fine. That's great." +msgstr "" +"¿´ÆðÀ´ÄúËùÓеİ´¼ü¶¼\n" +"Õý³£ÎÞÎ󣬺ܺá£" + +#: src/learn.c:179 +msgid "&Discard" +msgstr "ºöÂÔ" + +#: src/learn.c:183 +msgid "" +"Great! You have a complete terminal database!\n" +"All your keys work well." +msgstr "" +"Ì«ºÃÁË£¡ÄúµÄÖն˻úÊý¾Ý¿âºÜÍêÕû£¡ \n" +"ËùÓеİ´¼ü¶¼¿ÉÒÔÕý³£Ê¹Óá£" + +#: src/learn.c:267 +msgid "Learn keys" +msgstr "ÈÏʶ°´¼ü" + +#: src/learn.c:300 +msgid "Press all the keys mentioned here. After you have done it, check" +msgstr "Ò»¸ö¸ö°´ÏÂÕâ±ßÏÔʾµÄÕâЩ°´¼ü£¬ÔÚÄú°´ÍêÒԺ󣬼ì²éÒ»ÏÂ" + +#: src/learn.c:302 +msgid "which keys are not marked with OK. Press space on the missing" +msgstr "Äĸö°´¼üûÓбêÉÏ \"ºÃ\"£¬ÔÚÕâЩµØ·½°´Ò»Ï¿հ׼ü£¬»òÕß" + +#: src/learn.c:304 +msgid "key, or click with the mouse to define it. Move around with Tab." +msgstr "ÓÃÊó±ê¿ØÖÆÀ´É趨ÕâЩ°´¼ü¡£Óà Tab ¼ü¿ÉÒÔÔÚÑ¡ÏîÖ®¼äÒƶ¯¡£" + +#: src/main.c:700 +msgid "" +" The Commander can't change to the directory that \n" +" the subshell claims you are in. Perhaps you have \n" +" deleted your working directory, or given yourself \n" +" extra access permissions with the \"su\" command? " +msgstr "" +" Commander ÎÞ·¨¸Ä±äĿ¼µ½ÄúÔ­À´ \n" +" ËùÔڵĵط½£¬Äú¿ÉÄÜɾ³ýÁËÄúµÄ¹¤×÷ \n" +" Ŀ¼£¬»òÕßÒòΪִÐйý \"su\" Ö¸Áî \n" +" ¶ø¸Ä±äÁËȨÏÞ״̬£¿ " + +#: src/main.c:775 +msgid "Press any key to continue..." +msgstr "°´ÈÎÒâ¼ü¼ÌÐø..." + +#: src/main.c:825 +msgid " The shell is already running a command " +msgstr " ´Ëϵͳ¿ÇÕýÔÚÖ´ÐÐÖ¸ÁîÖÐ " + +#: src/main.c:852 src/screen.c:2093 src/screen.c:2133 +msgid " The Midnight Commander " +msgstr " The Midnight Commander " + +#: src/main.c:853 +msgid " Do you really want to quit the Midnight Commander? " +msgstr " ÄãÈ·¶¨ÒªÀ뿪±¾³ÌÐò£¿" + +#: src/main.c:1233 src/main.c:1254 +msgid "&Listing mode..." +msgstr "ÁгöģʽÖÐ..." + +#: src/main.c:1234 src/main.c:1255 +msgid "&Quick view C-x q" +msgstr "¿ìËٲ鿴 C-x q" + +#: src/main.c:1235 src/main.c:1256 +msgid "&Info C-x i" +msgstr "ѶϢ C-x i" + +#: src/main.c:1238 src/main.c:1259 +msgid "&Sort order..." +msgstr "ÅÅÁÐ˳Ðò..." + +#: src/main.c:1240 src/main.c:1261 +msgid "&Filter..." +msgstr "¹ýÂËÆ÷..." + +#: src/main.c:1243 src/main.c:1264 +msgid "&Network link..." +msgstr "ÍøÂçÁ¬½á..." + +#: src/main.c:1244 src/main.c:1265 +msgid "FT&P link..." +msgstr "Îļþ´«ÊäÁ¬½á..." + +#: src/main.c:1248 src/main.c:1269 +msgid "&Drive... M-d" +msgstr "´ÅÅÌ... M-d" + +#: src/main.c:1250 src/main.c:1271 +msgid "&Rescan C-r" +msgstr "ÖØжÁÈ¡ C-r" + +#: src/main.c:1275 +msgid "&User menu F2" +msgstr "ʹÓÃÕßÑ¡µ¥ F2" + +#: src/main.c:1276 +msgid "&View F3" +msgstr "²é¿´ F3" + +#: src/main.c:1277 +msgid "Vie&w file... " +msgstr "²é¿´Îļþ... " + +#: src/main.c:1278 +msgid "&Filtered view M-!" +msgstr "²é¿´Ç°ÏȹýÂË M-!" + +#: src/main.c:1279 +msgid "&Edit F4" +msgstr "±à¼­ F4" + +#: src/main.c:1280 +msgid "&Copy F5" +msgstr "¸´ÖÆ F5" + +#: src/main.c:1281 +msgid "c&Hmod C-x c" +msgstr "¸Ä±äÎļþģʽ C-x c" + +#: src/main.c:1283 +msgid "&Link C-x l" +msgstr "Á¬½á C-x l" + +#: src/main.c:1284 +msgid "&SymLink C-x s" +msgstr "·ûºÅÁ¬½á C-x s" + +#: src/main.c:1285 +msgid "edit s&Ymlink C-x C-s" +msgstr "±à¼­·ûºÅÁ¬½á C-x C-s" + +#: src/main.c:1286 +msgid "ch&Own C-x o" +msgstr "¸Ä±äÓµÓÐ״̬ C-x o" + +#: src/main.c:1287 +msgid "&Advanced chown " +msgstr "½ø½×µÄ¸Ä±äÓµÓÐ״̬ " + +#: src/main.c:1289 +msgid "&Rename/Move F6" +msgstr "¸ü¸ÄÓòÃû/°áÒÆ F6" + +#: src/main.c:1290 +msgid "&Mkdir F7" +msgstr "ÖÆÔìĿ¼ F7" + +#: src/main.c:1291 +msgid "&Delete F8" +msgstr "ɾ³ý F8" + +#: src/main.c:1292 +msgid "&Quick cd M-c" +msgstr "¿ìËٸıäĿ¼ M-c" + +#: src/main.c:1294 +msgid "select &Group M-+" +msgstr "ѡȡȺ×é M-+" + +#: src/main.c:1295 +msgid "u&Nselect group M-\\" +msgstr "È¡ÏûѡȡȺ×é M-\\" + +#: src/main.c:1296 +msgid "reverse selec&Tion M-*" +msgstr "·´ÏòÑ¡È¡ M-*" + +#: src/main.c:1298 +msgid "e&Xit F10" +msgstr "À뿪 F10" + +#: src/main.c:1308 +msgid "&Directory tree" +msgstr "Ŀ¼Ê÷" + +#: src/main.c:1310 +msgid "&Find file M-?" +msgstr "Ñ°ÕÒÎļþ M-?" + +#: src/main.c:1311 +msgid "s&Wap panels C-u" +msgstr "µ÷»»Ãæ°å C-u" + +#: src/main.c:1312 +msgid "switch &Panels on/off C-o" +msgstr "Çл»Ãæ°å¿ª¹Ø C-o" + +#: src/main.c:1313 +msgid "&Compare directories C-x d" +msgstr "±È½ÏĿ¼ C-x d" + +#: src/main.c:1314 +msgid "e&Xternal panelize C-x !" +msgstr "ÍⲿÃæ°å»¯ C-x !" + +#: src/main.c:1315 +msgid "show directory s&Izes" +msgstr "ÏÔʾĿ¼´óС" + +#: src/main.c:1317 +msgid "command &History" +msgstr "Ö¸ÁîÀúÊ·¼Í¼" + +#: src/main.c:1318 +msgid "di&Rectory hotlist C-\\" +msgstr "Ŀ¼ÈÈÃÅÁбí C-\\" + +#: src/main.c:1320 +msgid "&Active VFS list C-x a" +msgstr "Æô¶¯µÄÐéÄâÎļþϵͳÁбí C-x a" + +#: src/main.c:1323 +msgid "&Background jobs C-x j" +msgstr "±³¾°¹¤×÷ C-x j" + +#: src/main.c:1327 +msgid "&Undelete files (ext2fs only)" +msgstr "¸´Ô­Îļþ (Ö»ÄÜÓÃÔÚ ext2fs ÉÏÃæ)" + +#: src/main.c:1330 +msgid "&Listing format edit" +msgstr "±à¼­Áбí¸ñʽ" + +#: src/main.c:1332 +msgid "&Extension file edit" +msgstr "±à¼­À©³äµµ" + +#: src/main.c:1333 +msgid "&Menu file edit" +msgstr "±à¼­Ñ¡µ¥µµ" + +#: src/main.c:1338 +msgid "&Configuration..." +msgstr "É趨..." + +#: src/main.c:1340 +msgid "c&Onfirmation..." +msgstr "È·ÈÏ..." + +#: src/main.c:1341 +msgid "&Display bits..." +msgstr "ÏÔʾ±ÈÌØÊý..." + +#: src/main.c:1343 +msgid "learn &Keys..." +msgstr "ÈÏʶ°´¼ü..." + +#: src/main.c:1346 +msgid "&Virtual FS..." +msgstr "ÐéÄâÎļþϵͳ..." + +#: src/main.c:1349 +msgid "&Save setup" +msgstr "´¢´æÉ趨" + +#: src/main.c:1365 src/main.c:1367 +msgid " &Left " +msgstr " ×ó·½ " + +#: src/main.c:1367 +msgid " &Above " +msgstr " ÉÏ·½ " + +#: src/main.c:1370 +msgid " &File " +msgstr " Îļþ " + +#: src/main.c:1371 +msgid " &Command " +msgstr "Ö¸Áî " + +#: src/main.c:1372 +msgid " &Options " +msgstr " Ñ¡Ïî " + +#: src/main.c:1374 src/main.c:1376 +msgid " &Right " +msgstr " ÓÒ·½ " + +#: src/main.c:1376 +msgid " &Below " +msgstr " Ï·½ " + +#: src/main.c:1431 +msgid " Information " +msgstr " ѶϢ " + +#: src/main.c:1432 +msgid "" +" Using the fast reload option may not reflect the exact \n" +" directory contents. In this cases you'll need to do a \n" +" manual reload of the directory. See the man page for \n" +" the details. " +msgstr "" +" ʹÓÿìËÙÖØÔع¦ÄܵĻ°£¬ÓпÉÄÜ»áÔì³É \n" +" ÎÞ·¨ÕýÈ·ÏÔʾĿ¼µÄÄÚÈÝ£¬ÕâʱºòÄúÐèÒª \n" +" ×ÔÐÐÊÖ¶¯ÖØÐÂÔØÈëĿ¼ÄÚÈÝ£¬Çë²Î¿¼ man \n" +" page ÒÔ»ñµÃÏêϸÐÅÏ¢¡£ " + +#: src/main.c:1706 src/screen.c:2365 src/screen.c:2395 +msgid "Menu" +msgstr "Ñ¡µ¥" + +#: src/main.c:1911 +msgid "Thank you for using GNU Midnight Commander" +msgstr "¸ÐлÄúʹÓà GNU Midnight Commander" + +#: src/main.c:2270 +#, c-format +msgid "with mouse support on xterm%s.\n" +msgstr "xterm%s ʹÓÃÊó±êÖ§³Ö¡£\n" + +#: src/main.c:2271 +msgid " and the Linux console" +msgstr " ÒÔ¼° Linux Ö÷¿Ø̨" + +#: src/main.c:2366 +msgid "The TERM environment variable is unset!\n" +msgstr "»·¾³±äÁ¿ TERM ²¢Î´É趨£¡ \n" + +#: src/main.c:2573 +#, c-format +msgid "Library directory for the Midnight Commander: %s\n" +msgstr "Midnight Commander µÄº¯Êý¿âĿ¼£º %s\n" + +#: src/main.c:2584 +msgid "" +"Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" +msgstr "Ñ¡Ïî -m ÒѾ­¹ýʱ²»ÓÃÁË£»Ç뿴һϠ'Ñ¡Ïî' Ñ¡µ¥ÖÐµÄ 'ÏÔʾ±ÈÌØÊý'...\n" + +#: src/main.c:2661 +msgid "Use to debug the background code" +msgstr "ÓÃÀ´¶Ô±³¾°³ÌÐò´úÂëµ÷ÊÔ" + +#: src/main.c:2667 +msgid "Request to run in color mode" +msgstr "ÒªÇóÔÚ²ÊɫģʽÖÐÖ´ÐÐ" + +#: src/main.c:2669 +msgid "Specifies a color configuration" +msgstr "Ö¸¶¨Ò»×éÉ«²ÊÉ趨" + +#: src/main.c:2674 +msgid "Edits one file" +msgstr "±à¼­Ò»¸öÎļþ" + +#: src/main.c:2678 +msgid "Displays this help message" +msgstr "ÏÔʾ´Ë˵Ã÷ѶϢ" + +#: src/main.c:2681 +msgid "Displays a help screen on how to change the color scheme" +msgstr "ÏÔʾÈçºÎ¸Ä±äÉ«²ÊÉ趨µÄ˵Ã÷»­Ãæ" + +#: src/main.c:2684 +msgid "Log ftp dialog to specified file" +msgstr "¼Í¼ FTP ¶Ô»°¿òµ½Ìض¨Îļþ" + +#: src/main.c:2691 +msgid "Obsolete" +msgstr "¹ýʱµÄ" + +#: src/main.c:2693 +msgid "Requests to run in black and white" +msgstr "ÒªÇóÔÚºÚ°×ģʽÏÂÖ´ÐÐ" + +#: src/main.c:2695 +msgid "Disable mouse support in text version" +msgstr "ÎÄ×Öģʽϲ»Ê¹ÓÃÊó±êÖ§³Ö" + +#: src/main.c:2698 +msgid "Disables subshell support" +msgstr "²»Ö§³ÖʹÓôοDzã (subshell)" + +#: src/main.c:2702 +msgid "Prints working directory at program exit" +msgstr "³ÌÐò½áÊøʱӡ³öµ±Ç°Ä¿Â¼" + +#: src/main.c:2704 +msgid "Resets soft keys on HP terminals" +msgstr "ÔÚ HP Öն˻úÉÏÖØÉèÈí¼ü (soft keys)" + +#: src/main.c:2706 +msgid "To run on slow terminals" +msgstr "ì¶ÂýËÙµÄÖն˻úÉÏÖ´ÐÐ" + +#: src/main.c:2709 +msgid "Use stickchars to draw" +msgstr "Use stickchars to draw" + +#: src/main.c:2713 +msgid "Enables subshell support (default)" +msgstr "Ö§³ÖʹÓôοDzã (ȱʡֵ)" + +#: src/main.c:2718 +msgid "Tries to use termcap instead of terminfo" +msgstr "ÊÔÖøʹÓà termcap À´´úÌæ terminfo" + +#: src/main.c:2722 +msgid "Displays the current version" +msgstr "ÏÔʾĿǰµÄ°æ±¾" + +#: src/main.c:2724 +msgid "Launches the file viewer on a file" +msgstr "¶Ôij¸öÎļþÖ´ÐÐÎļþ²é¿´³ÌÐò" + +#: src/main.c:2726 +msgid "Forces xterm features" +msgstr "Ç¿ÆÈʹÓà xterm ÌØÐÔ" + +#: src/main.c:2728 +msgid "Geometry for the window" +msgstr "´°¿ÚµÄλÖÃ" + +#: src/main.c:2728 +msgid "GEOMETRY" +msgstr "λÖÃ" + +#: src/main.c:2729 +msgid "No windows opened at startup" +msgstr "¸ÕÆô¶¯Ê±²»¿ªÆôÈκδ°¿Ú" + +#: src/main.c:2731 +msgid "Display the directory that holds the .links startup files and exit" +msgstr "ÏÔʾ´æ·Å .links Æô¶¯µµµÄĿ¼ááÀ뿪" + +#: src/main.c:3022 +msgid "" +"Couldn't open tty line. You have to run mc without the -P flag.\n" +"On some systems you may want to run # `which mc`\n" +msgstr "" +"ÎÞ·¨¿ªÆôÖն˻úÁ¬Ïߣ¬Äú²»ÄÜÓà -P Ñ¡ÏîÀ´Ö´ÐÐ mc¡£ \n" +"ÔÚijЩϵͳÉÏÄú¿ÉÄÜÐèÒªÖ´ÐÐ # `which mc`\n" + +#: src/main.c:3100 +msgid " Notice " +msgstr " ×¢Òâ " + +#: src/main.c:3101 +msgid "" +" The Midnight Commander configuration files \n" +" are now stored in the ~/.mc directory, the \n" +" files have been moved now\n" +msgstr "" +" Midnight Commander µÄ\n" +" É趨ÎļþÒѾ­¸Ä·Åµ½\n" +" ~/.mc Ŀ¼µ×ÏÂÁË¡£\n" + +#: src/option.c:75 +msgid "safe de&Lete" +msgstr "°²È«µÄɾ³ý (&L)" + +#: src/option.c:76 +msgid "cd follows lin&Ks" +msgstr "Çл»Ä¿Â¼Ê±¸úËæÁ¬½á (&K)" + +#: src/option.c:77 +msgid "advanced cho&Wn" +msgstr "½ø½×µÄ¸Ä±äÓµÓÐ״̬" + +#: src/option.c:78 +msgid "l&Ynx-like motion" +msgstr "ÀàËÆ lynx µÄÒƶ¯·½Ê½" + +#: src/option.c:80 +msgid "Animation" +msgstr "¶¯»­" + +#: src/option.c:82 +msgid "rotatin&G dash" +msgstr "ÐýתµÄбÏß" + +#: src/option.c:84 +msgid "co&Mplete: show all" +msgstr "Íê³É£º ÏÔʾȫ²¿" + +#: src/option.c:85 +msgid "&Use internal view" +msgstr "ʹÓÃÄÚ²¿²é¿´" + +#: src/option.c:86 +msgid "use internal ed&It" +msgstr "ʹÓÃÄÚ²¿±à¼­" + +#: src/option.c:87 +msgid "auto m&Enus" +msgstr "×Ô¶¯Ñ¡µ¥" + +#: src/option.c:88 +msgid "&Auto save setup" +msgstr "×Ô¶¯´¢´æÉ趨" + +#: src/option.c:89 +msgid "shell &Patterns" +msgstr "ϵͳ¿ÇÍòÓÃ×Ö·û" + +#: src/option.c:90 +msgid "Compute &Totals" +msgstr "¼ÆËã×ÜÖµ" + +#: src/option.c:91 +msgid "&Verbose operation" +msgstr "ÏêϸµÄ²Ù×÷¹ý³Ì" + +#: src/option.c:92 +msgid "&Fast dir reload" +msgstr "¿ìËÙĿ¼ÖØÔØ" + +#: src/option.c:93 +msgid "mi&X all files" +msgstr "ËùÓÐÎļþ»ìºÏÏÔʾ" + +#: src/option.c:94 +msgid "&Drop down menus" +msgstr "ÏÂÀ­Ñ¡µ¥" + +#: src/option.c:95 +msgid "ma&Rk moves down" +msgstr "±êʾÏÂÒÆ" + +#: src/option.c:96 +msgid "show &Hidden files" +msgstr "ÏÔʾÒþ²Øµµ" + +#: src/option.c:97 +msgid "show &Backup files" +msgstr "ÏÔʾ±¸·Ýµµ" + +#: src/option.c:104 +msgid "&Never" +msgstr "´Ó²»" + +#: src/option.c:105 +msgid "on dumb &Terminals" +msgstr "춱¿µ°Öն˻úÉÏ" + +#: src/option.c:106 +msgid "alwa&Ys" +msgstr "ÓÀÔ¶" + +#. Similar code is in layout.c (init_layout()) +#: src/option.c:154 +msgid " Configure options " +msgstr " É趨ѡÏî " + +#: src/option.c:155 +msgid " Panel options " +msgstr " Ãæ°åÑ¡Ïî " + +#: src/option.c:156 +msgid " Pause after run... " +msgstr " Ö´ÐÐááÔÝÍ£... " + +#: src/option.c:208 +msgid "Configure options" +msgstr "É趨ѡÏî" + +#: src/panelize.c:87 +msgid "&Add new" +msgstr "ÐÂÔö" + +#: src/panelize.c:99 +msgid " External panelize " +msgstr " ÍⲿÃæ°å»¯ " + +#: src/panelize.c:194 src/panelize.c:458 +msgid "External panelize" +msgstr "ÍⲿÃæ°å»¯" + +#: src/panelize.c:219 src/panelize.c:276 src/panelize.c:347 src/panelize.c:368 +msgid "Other command" +msgstr "ÆäËüÖ¸Áî" + +#: src/panelize.c:260 +msgid " Add to external panelize " +msgstr " ¼Óµ½ÍⲿÃæ°å»¯ÖÐ " + +#: src/panelize.c:261 +msgid " Enter command label: " +msgstr " ÇëÊäÈëÖ¸Áî±êÇ©£º " + +#: src/panelize.c:301 +msgid " I can't run external panelize while logged on a non local directory " +msgstr " µÇ¼ÔڷDZ¾µØ¶ËÎļþϵͳʱÎÞ·¨Ö´ÐÐÍⲿÃæ°å»¯ " + +#: src/panelize.c:351 +msgid "Find *.orig after patching" +msgstr "ÔÚ²¹Ç¿ááÕÒ³ö *.orig" + +#: src/panelize.c:352 +msgid "Find SUID and SGID programs" +msgstr "ÕÒ³ö SUID Óë SGID µÄ³ÌÐò" + +#: src/panelize.c:403 +msgid "Cannot invoke command." +msgstr "ÎÞ·¨µ÷ÓÃÖ¸Áî¡£" + +#: src/panelize.c:458 +msgid "Pipe close failed" +msgstr "¹ÜÏ߹رÕʧ°Ü" + +#: src/popthelp.c:31 +msgid "Show this help message" +msgstr "ÏÔʾ´Ë˵Ã÷ѶϢ" + +#: src/popthelp.c:32 +msgid "Display brief usage message" +msgstr "ÏÔʾ¼òµ¥Ê¹ÓÃ˵Ã÷" + +#: src/screen.c:399 +msgid "MTime" +msgstr "MTime" + +#: src/screen.c:400 +msgid "ATime" +msgstr "ATime" + +#: src/screen.c:401 +msgid "CTime" +msgstr "CTime" + +#: src/screen.c:403 +msgid "Perm" +msgstr "ȨÏÞ" + +#: src/screen.c:404 +msgid "Nl" +msgstr "Nl" + +#: src/screen.c:405 +msgid "Inode" +msgstr "i ½Úµã" + +#: src/screen.c:406 +msgid "UID" +msgstr "UID" + +#: src/screen.c:407 +msgid "GID" +msgstr "GID" + +#: src/screen.c:643 +#, c-format +msgid " %s bytes in %d file%s" +msgstr " %s ±ÈÌØì¶ %d Îļþ%s" + +#: src/screen.c:1306 +msgid "Unknow tag on display format: " +msgstr "²»Ã÷µÄÏÔʾ¸ñʽ±êÇ©£º " + +#: src/screen.c:1432 +msgid "User suplied format looks invalid, reverting to default." +msgstr "ʹÓÃÕßÌṩµÄ¸ñʽ¿´À´ÊÇÎÞЧµÄ£¬»Øµ½È±Ê¡Öµ¡£" + +#: src/screen.c:2094 src/screen.c:2134 +msgid " Do you really want to execute? " +msgstr "ÄúÈ·¶¨ÒªÖ´ÐУ¿ " + +#: src/screen.c:2106 src/screen.c:2149 +msgid " No action taken " +msgstr " ²»×÷Èκζ¯×÷ " + +#: src/screen.c:2369 src/screen.c:2399 src/tree.c:1017 +msgid "RenMov" +msgstr "¸ÄÃû/°áÒÆ" + +#: src/screen.c:2370 src/screen.c:2400 src/tree.c:1021 +msgid "Mkdir" +msgstr "ÐÂĿ¼" + +#: src/screen.c:2386 +#, c-format +msgid "" +" Can't chdir to %s \n" +" %s " +msgstr "" +" ÎÞ·¨¸Ä±äĿ¼ÖÁ %s \n" +" %s " + +#: src/subshell.c:287 +#, c-format +msgid "Couldn't open named pipe %s\n" +msgstr "ÎÞ·¨¿ªÆô¾ßÃû¹ÜÏß %s\n" + +#: src/subshell.c:705 +msgid " The shell is still active. Quit anyway? " +msgstr " ϵͳ¿ÇÈÔδ½áÊø£¬ÎÞÂÛÈçºÎ¶¼Òª½áÊø£¿ " + +#: src/subshell.c:731 +msgid " There are stopped jobs." +msgstr " »¹ÓÐÍ£Ö¹µÄ±³¾°¹¤×÷δÍê³É¡£" + +#: src/subshell.c:732 +msgid " Quit anyway? " +msgstr " ÎÞÂÛÈçºÎ¶¼Òª½áÊø£¿ " + +#: src/subshell.c:785 +#, c-format +msgid "Warning: Couldn't change to %s.\n" +msgstr "¾¯¸æ£º ÎÞ·¨¸Ä±äµ½ %s.\n" + +#: src/tree.c:193 +#, c-format +msgid "" +"Can't open the %s file for writing:\n" +"%s\n" +msgstr "" +"ÎÞ·¨¿ªÆôÎļþ %s À´Ð´ÈëÊý¾Ý£º\n" +"%s\n" + +#: src/tree.c:638 +#, c-format +msgid "Copy \"%s\" directory to:" +msgstr "¸´ÖÆĿ¼ \"%s\" ÖÁ£º" + +#: src/tree.c:676 +#, c-format +msgid "Move \"%s\" directory to:" +msgstr "°áÒÆĿ¼ \"%s\" ÖÁ£º" + +#: src/tree.c:683 +#, c-format +msgid "" +" Can't stat the destination \n" +" %s " +msgstr "" +" ÎÞ·¨ stat Ä¿µÄµØ \n" +" %s " + +#: src/tree.c:689 +msgid " The destination isn't a directory " +msgstr " Ëù¸øµÄÄ¿µÄ²¢²»ÊÇÒ»¸öĿ¼ " + +#: src/tree.c:745 +#, c-format +msgid " Delete %s? " +msgstr " ɾ³ý %s? " + +#: src/tree.c:777 +msgid "Static" +msgstr "¾²Ì¬" + +#: src/tree.c:777 +msgid "Dynamc" +msgstr "¶¯Ì¬" + +#: src/tree.c:867 +#, c-format +msgid "" +" Can't chdir to \"%s\" \n" +" %s " +msgstr "" +" ÎÞ·¨¸Ä±äĿ¼ÖÁ \"%s\" \n" +" %s " + +#: src/tree.c:1013 +msgid "Forget" +msgstr "ºöÂÔ" + +#: src/tree.c:1026 +msgid "Rmdir" +msgstr "ɾĿ¼" + +#: src/treestore.c:385 +#, c-format +msgid "" +"Can't write to the %s file:\n" +"%s\n" +msgstr "" +"ÎÞ·¨Ð´Èëµ½Îļþ %s :\n" +"%s\n" + +#: src/user.c:261 +#, c-format +msgid " Invalid shell pattern defination \"%c\". " +msgstr " ÎÞЧµÄϵͳ¿ÇÍòÓÃ×Ö·û¶¨Òå \"%c\". " + +#: src/user.c:394 +msgid " Debug " +msgstr " µ÷ÊÔ " + +#: src/user.c:403 +msgid " ERROR: " +msgstr " ´íÎó£º " + +#: src/user.c:407 +msgid " True: " +msgstr " ÕæµÄ£º " + +#: src/user.c:409 +msgid " False: " +msgstr " ¼ÙµÄ£º " + +#: src/user.c:621 +msgid " Warning -- ignoring file " +msgstr " ¾¯¸æ -- ºöÂÔÎļþ " + +#: src/user.c:622 +#, c-format +msgid "" +"File %s is not owned by root or you or is world writable.\n" +"Using it may compromise your security" +msgstr "" +"Îļþ %s µÄÓµÓÐÕß²¢²»ÊÇ root »òÄú£¬»òÕßÎļþÔÊÐíÈκÎÈËдÈ룻\n" +"ʹÓÃÕâ¸öÎļþ¶ÔÄúϵͳµÄ°²È«Ôì³ÉΣº¦¡£" + +#: src/user.c:640 +msgid " I can't run programs while logged on a non local directory " +msgstr " ÎÞ·¨ÔڵǼ춷DZ¾µØÎļþϵͳµÄʱºòÖ´ÐгÌÐò " + +#. Create listbox +#: src/user.c:727 +msgid " User menu " +msgstr " ʹÓÃÕßÑ¡µ¥ " + +#: src/util.c:232 +msgid "name_trunc: too big" +msgstr "name_trunc: Ì«´óÁË" + +#. strftime() format string for recent dates +#: src/util.c:602 src/util.c:627 +msgid "%b %e %H:%M" +msgstr "%b %e %H:%M" + +#. strftime() format string for old dates +#: src/util.c:603 src/util.c:625 +msgid "%b %e %Y" +msgstr "%b %e %Y" + +#: src/utilunix.c:390 +msgid " Pipe failed " +msgstr " ¹ÜÏßʧ°Ü " + +#: src/utilunix.c:394 +msgid " Dup failed " +msgstr " ³­Ð´Ê§°Ü " + +#: src/view.c:401 +msgid "" +"File: \n" +"\n" +" " +msgstr "" +"Îļþ£º \n" +"\n" +" " + +#: src/view.c:402 +msgid "" +"\n" +"\n" +"has been modified, do you want to save the changes?\n" +msgstr "" +"\n" +"\n" +"ÒѾ­±»¸ü¶¯¹ý£¬ÄúÒª´æµµÂð£¿\n" + +#: src/view.c:404 +msgid " Save changes " +msgstr " ´æµµ " + +#: src/view.c:446 +msgid " Can't spawn child program " +msgstr " ÎÞ·¨²úÉú×Ó³ÌÐò " + +#: src/view.c:455 +msgid " Empty output from child filter " +msgstr " ×Ó¹ýÂËÆ÷µÄÊä³öÊÇ¿ÕµÄ " + +#: src/view.c:460 +msgid " Could not open file " +msgstr " ÎÞ·¨¿ªÆôÎļþ " + +#: src/view.c:475 +msgid " Can't open file \"" +msgstr " ÎÞ·¨¿ªÆôÎļþ \"" + +#: src/view.c:482 +msgid "" +" Can't stat file \n" +" " +msgstr "" +" ÎÞ·¨ stat Îļþ \n" +" " + +#: src/view.c:488 +msgid " Can't view: not a regular file " +msgstr " ÎÞ·¨²é¿´£º²¢·ÇÒ»³£¹æÎļþ " + +#: src/view.c:567 src/view.c:572 +#, c-format +msgid "" +" Can't open \"%s\"\n" +" %s " +msgstr "" +" ÎÞ·¨¿ªÆôÎļþ \"%s\" \n" +" %s " + +#: src/view.c:704 +#, c-format +msgid "File: %s" +msgstr "Îļþ£º %s" + +#: src/view.c:729 +msgid " [grow]" +msgstr " [³É³¤] " + +#: src/view.c:1501 +#, c-format +msgid "Searching for `%s'" +msgstr "ËÑÑ° `%s'" + +#: src/view.c:1608 src/view.c:1730 +msgid " Search string not found " +msgstr " ÕÒ²»µ½ÒªËÑÑ°µÄ×Ö´® " + +#: src/view.c:1769 +msgid " Invalid regular expression " +msgstr " ÎÞЧµÄÕý¹æ±íʾʽ " + +#: src/view.c:1893 +#, c-format +msgid "" +" The current line number is %d.\n" +" Enter the new line number:" +msgstr "" +" Ä¿Ç°ÐкÅÊÇ %d£¬\n" +" ÇëÊäÈëÐÂÐкţº" + +#: src/view.c:1923 +msgid " Enter regexp:" +msgstr "ÊäÈëÕý¹æʽ£º" + +#: src/view.c:2028 +msgid "Ascii" +msgstr "Ascii" + +#: src/view.c:2028 +msgid "Hex" +msgstr "Hex" + +#: src/view.c:2029 +msgid "Line" +msgstr "ÐÐ" + +#: src/view.c:2030 +msgid "RxSrch" +msgstr "Õý¹æËÑÑ°" + +#: src/view.c:2033 +msgid "EdText" +msgstr "±à¼­ÎÄ×Ö" + +#: src/view.c:2033 +msgid "EdHex" +msgstr "±à¼­ Hex" + +#: src/view.c:2035 +msgid "UnWrap" +msgstr "²»»»ÐÐ " + +#: src/view.c:2035 +msgid "Wrap" +msgstr "»»ÐÐ" + +#: src/view.c:2038 +msgid "HxSrch" +msgstr "Ê®Áù½øλËÑÑ°" + +#: src/view.c:2041 +msgid "Raw" +msgstr "ԭʼ" + +#: src/view.c:2041 +msgid "Parse" +msgstr "ÆÊÎö" + +#: src/view.c:2045 +msgid "Unform" +msgstr "ÎÞ¸ñʽ" + +#: src/view.c:2045 +msgid "Format" +msgstr "¸ñʽ" + +#. KEY_F(0) is not here, since we are mapping it to f10, so there is no reason +#. to define f0 as well. Also, it makes Learn keys a bunch of problems :( +#: src/win.c:224 +msgid "Function key 1" +msgstr "¹¦Äܼü 1" + +#: src/win.c:225 +msgid "Function key 2" +msgstr "¹¦Äܼü 2" + +#: src/win.c:226 +msgid "Function key 3" +msgstr "¹¦Äܼü 3" + +#: src/win.c:227 +msgid "Function key 4" +msgstr "¹¦Äܼü 4" + +#: src/win.c:228 +msgid "Function key 5" +msgstr "¹¦Äܼü 5" + +#: src/win.c:229 +msgid "Function key 6" +msgstr "¹¦Äܼü 6" + +#: src/win.c:230 +msgid "Function key 7" +msgstr "¹¦Äܼü 7" + +#: src/win.c:231 +msgid "Function key 8" +msgstr "¹¦Äܼü 8" + +#: src/win.c:232 +msgid "Function key 9" +msgstr "¹¦Äܼü 9" + +#: src/win.c:233 +msgid "Function key 10" +msgstr "¹¦Äܼü 10" + +#: src/win.c:234 +msgid "Function key 11" +msgstr "¹¦Äܼü 11" + +#: src/win.c:235 +msgid "Function key 12" +msgstr "¹¦Äܼü 12" + +#: src/win.c:236 +msgid "Function key 13" +msgstr "¹¦Äܼü 13" + +#: src/win.c:237 +msgid "Function key 14" +msgstr "¹¦Äܼü 14" + +#: src/win.c:238 +msgid "Function key 15" +msgstr "¹¦Äܼü 15" + +#: src/win.c:239 +msgid "Function key 16" +msgstr "¹¦Äܼü 16" + +#: src/win.c:240 +msgid "Function key 17" +msgstr "¹¦Äܼü 17" + +#: src/win.c:241 +msgid "Function key 18" +msgstr "¹¦Äܼü 18" + +#: src/win.c:242 +msgid "Function key 19" +msgstr "¹¦Äܼü 19" + +#: src/win.c:243 +msgid "Function key 20" +msgstr "¹¦Äܼü 20" + +#: src/win.c:244 +msgid "Backspace key" +msgstr "Backspace ¼ü" + +#: src/win.c:245 +msgid "End key" +msgstr "End ¼ü" + +#: src/win.c:246 +msgid "Up arrow key" +msgstr "ÏòÉϼü" + +#: src/win.c:247 +msgid "Down arrow key" +msgstr "Ïòϼü" + +#: src/win.c:248 +msgid "Left arrow key" +msgstr "Ïò×ó¼ü" + +#: src/win.c:249 +msgid "Right arrow key" +msgstr "ÏòÓÒ¼ü" + +#: src/win.c:250 +msgid "Home key" +msgstr "Home ¼ü" + +#: src/win.c:251 +msgid "Page Down key" +msgstr "Page Down ¼ü" + +#: src/win.c:252 +msgid "Page Up key" +msgstr "Page Up ¼ü" + +#: src/win.c:253 +msgid "Insert key" +msgstr "Insert ¼ü" + +#: src/win.c:254 +msgid "Delete key" +msgstr "Delete ¼ü" + +#: src/win.c:255 +msgid "Completion/M-tab" +msgstr "Completion/M-tab ¼ü" + +#: src/win.c:256 +msgid "+ on keypad" +msgstr "Êý×ÖÇøµÄ +" + +#: src/win.c:257 +msgid "- on keypad" +msgstr "Êý×ÖÇøµÄ -" + +#: src/win.c:258 +msgid "* on keypad" +msgstr "Êý×ÖÇøµÄ *" + +#. From here on, these won't be shown in Learn keys (no space) +#: src/win.c:260 +msgid "Left arrow keypad" +msgstr "Êý×ÖÇøµÄÏò×ó¼ü" + +#: src/win.c:261 +msgid "Right arrow keypad" +msgstr "Êý×ÖÇøµÄÏòÓÒ¼ü" + +#: src/win.c:262 +msgid "Up arrow keypad" +msgstr "Êý×ÖÇøµÄÏòÉϼü" + +#: src/win.c:263 +msgid "Down arrow keypad" +msgstr "Êý×ÖÇøµÄÏòϼü" + +#: src/win.c:264 +msgid "Home on keypad" +msgstr "Êý×ÖÇøµÄ Home ¼ü" + +#: src/win.c:265 +msgid "End on keypad" +msgstr "Êý×ÖÇøµÄ End ¼ü" + +#: src/win.c:266 +msgid "Page Down keypad" +msgstr "Êý×ÖÇøµÄ Page Down ¼ü" + +#: src/win.c:267 +msgid "Page Up keypad" +msgstr "Êý×ÖÇøµÄ Page Up¼ü" + +#: src/win.c:268 +msgid "Insert on keypad" +msgstr "Êý×ÖÇøµÄ Insert ¼ü" + +#: src/win.c:269 +msgid "Delete on keypad" +msgstr "Êý×ÖÇøµÄ Del ¼ü" + +#: src/win.c:270 +msgid "Enter on keypad" +msgstr "Êý×ÖÇøµÄ Enter ¼ü" + +#: src/win.c:271 +msgid "Slash on keypad" +msgstr "Êý×ÖÇøµÄ / ¼ü" + +#: src/win.c:272 +msgid "NumLock on keypad" +msgstr "Êý×ÖÇøµÄ NumLock ¼ü" + +#: vfs/extfs.c:268 +#, c-format +msgid "" +"Couldn't open %s archive\n" +"%s" +msgstr "" +"ÎÞ·¨¿ªÆô %s Îļþ¼¯\n" +"%s" + +#: vfs/extfs.c:300 vfs/extfs.c:320 +msgid "Inconsistent extfs archive" +msgstr "²»ÍêÕûµÄ extfs Îļþ¼¯" + +#: vfs/fish.c:224 +msgid "Sorry, we can not do password authenticated connections for now." +msgstr "²»ºÃÒâ˼£¬Ä¿Ç°ÎÞ·¨½øÐо­¹ýÃÜÂëÈÏÖ¤µÄÁ¬Ïß¡£" + +#: vfs/ftpfs.c:326 +#, c-format +msgid "ftpfs: Disconnecting from %s" +msgstr "ftpfs: ½áÊøÖÁ %s µÄÁ¬Ïß" + +#: vfs/ftpfs.c:377 +msgid " FTP: Password required for " +msgstr " FTP: ±ØÐèÓÐÃÜÂë -> " + +#: vfs/ftpfs.c:409 +msgid " Proxy: Password required for " +msgstr " Proxy: ±ØÐèÓÐÃÜÂë ->" + +#: vfs/ftpfs.c:435 +msgid "ftpfs: sending proxy login name" +msgstr "ftpfs: ÕýÔÚËͳö proxy µÇ¼ÓòÃû" + +#: vfs/ftpfs.c:439 +msgid "ftpfs: sending proxy user password" +msgstr "ftpfs: ÕýÔÚËͳö proxy ÃÜÂë" + +#: vfs/ftpfs.c:443 +msgid "ftpfs: proxy authentication succeeded" +msgstr "ftpfs: µÇ¼³É¹¦" + +#: vfs/ftpfs.c:447 +#, c-format +msgid "ftpfs: connected to %s" +msgstr "ftpfs: Á¬½áÖÁ %s" + +#: vfs/ftpfs.c:464 +msgid "ftpfs: sending login name" +msgstr "ftpfs: ÕýÔÚËͳöµÇ¼ÓòÃû" + +#: vfs/ftpfs.c:469 +msgid "ftpfs: sending user password" +msgstr "ftpfs: ÕýÔÚËͳöµÇ¼ÃÜÂë" + +#: vfs/ftpfs.c:474 +msgid "ftpfs: logged in" +msgstr "ftpfs: µÇ¼" + +#: vfs/ftpfs.c:489 +#, c-format +msgid "ftpfs: Login incorrect for user %s " +msgstr "ftpfs: ʹÓÃÕß %s µÇ¼´íÎó" + +#: vfs/ftpfs.c:521 +#, c-format +msgid " Could not set source routing (%s)" +msgstr " ÎÞ·¨É趨À´Ô´Â·ÓÉ (%s)" + +#: vfs/ftpfs.c:650 +msgid "ftpfs: Invalid host name." +msgstr "ftpfs: ÎÞЧµÄÖ÷»úÓòÃû¡£" + +#: vfs/ftpfs.c:670 +msgid "ftpfs: Invalid host address." +msgstr "ftpfs: ÎÞЧµÄÖ÷»úµØÖ·¡£" + +#: vfs/ftpfs.c:695 +#, c-format +msgid "ftpfs: making connection to %s" +msgstr "ftpfs: ½¨Á¢ÖÁ %s µÄÁ¬Ïß" + +#: vfs/ftpfs.c:705 +msgid "ftpfs: connection interrupted by user" +msgstr "ftpfs: ʹÓÃÕßÖжÏÁ¬Ïß" + +#: vfs/ftpfs.c:707 +#, c-format +msgid "ftpfs: connection to server failed: %s" +msgstr "ftpfs: Á¬½áµ½·þÎñÆ÷·¢Éú´íÎó: %s" + +#: vfs/ftpfs.c:791 +#, c-format +msgid "Waiting to retry... %d (Control-C to cancel)" +msgstr "µÈºòÖØÊÔ... %d (Control-C ½áÊø)" + +#: vfs/ftpfs.c:985 +msgid "ftpfs: could not setup passive mode for source routing" +msgstr "ftpfs: ÎÞ·¨É趨 passive mode ×öΪÀ´Ô´Â·ÓÉ" + +#: vfs/ftpfs.c:995 +msgid "ftpfs: could not setup passive mode" +msgstr "ftpfs: ÎÞ·¨É趨 passive mode" + +#: vfs/ftpfs.c:1066 +msgid "ftpfs: aborting transfer." +msgstr "ftpfs: ´«ÊäÖжÏ" + +#: vfs/ftpfs.c:1068 +#, c-format +msgid "ftpfs: abort error: %s" +msgstr "ftpfs: Ôì³ÉÖжϵĴíÎó: %s" + +#: vfs/ftpfs.c:1073 +msgid "ftpfs: abort failed" +msgstr "ftpfs: ÖжÏʧ°Ü" + +#: vfs/ftpfs.c:1159 vfs/ftpfs.c:1329 +msgid "ftpfs: CWD failed." +msgstr "ftpfs: ¸Ä±äĿ¼ʧ°Ü" + +#: vfs/ftpfs.c:1169 vfs/ftpfs.c:1176 +msgid "ftpfs: couldn't resolve symlink" +msgstr "FTPFS: ÎÞ·¨½â¶Á·ûºÅÁ¬½á" + +#: vfs/ftpfs.c:1221 +msgid "Resolving symlink..." +msgstr "½â¶Á·ûºÅÁ¬½á..." + +#: vfs/ftpfs.c:1323 +#, c-format +msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +msgstr "ftpfs: ¶ÁÈ¡ FTP Ŀ¼ %s... (²»Ê¹Óà UNIX ls µÄÑ¡Ïî)" + +#: vfs/ftpfs.c:1325 +#, c-format +msgid "ftpfs: Reading FTP directory %s..." +msgstr "ftpfs: ¶ÁÈ¡ FTP Ŀ¼ %s..." + +#: vfs/ftpfs.c:1341 +msgid "ftpfs: FAIL" +msgstr "ftpfs: ʧ°Ü" + +#: vfs/ftpfs.c:1432 +msgid "ftpfs: reading FTP directory interrupt by user" +msgstr "ftpfs: ʹÓÃÕßÖÐ¶Ï FTP Ŀ¼¶ÁÈ¡" + +#: vfs/ftpfs.c:1462 +msgid "ftpfs: got listing" +msgstr "ftpfs: È¡µÃÁбí" + +#: vfs/ftpfs.c:1475 +msgid "ftpfs: failed" +msgstr "ftpfs: ʧ°Ü" + +#: vfs/ftpfs.c:1519 +msgid "ftpfs: failed; nowhere to fallback to" +msgstr "ftpfs: ʧ°Ü; ÎÞ·¨×ªÒƵ½ÆäËüĿ¼" + +#: vfs/ftpfs.c:1583 +#, c-format +msgid "ftpfs: storing file %d (%d)" +msgstr "ftpfs: ´¢´æÎļþ %d (%d)" + +#: vfs/ftpfs.c:2019 vfs/ftpfs.c:2034 +msgid "" +"~/.netrc file has not correct mode.\n" +"Remove password or correct mode." +msgstr "" +"~/.netrc ÎļþµÄģʽ²»ÕýÈ·¡£ÒƳýдÔÚÀïÃæ \n" +"µÄÃÜÂë»òÐÞÕý ~/.netrc ÎļþµÄģʽ¡£ " + +#: vfs/mcfs.c:154 +msgid " MCFS " +msgstr " MCFS " + +#: vfs/mcfs.c:154 +msgid " The server does not support this version " +msgstr " ·þÎñÆ÷²¢²»Ö§³Ö´ËÒ»°æ±¾ " + +#: vfs/mcfs.c:171 +msgid "" +" 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" +msgstr "" +" Ô¶³ÌÖ÷»ú²¢Î´ÔÚÕý³£ port ÉÏÖ´ÐзþÎñÈí¼þ£¬ \n" +" Äú±ØÐëÊäÈëÃÜÂëÒԵǼÖ÷»ú£¬¿ÉÊÇÃÜÂëÐÅÏ¢¾­¹ý \n" +" ÍøÂç´«Êä¿ÉÄܲ»Ì«°²È«£¬»¹Òª¼ÌÐøÂ𣿠\n" + +#: vfs/mcfs.c:174 +msgid " Yes " +msgstr " ÊÇ " + +#: vfs/mcfs.c:174 +msgid " No " +msgstr " ·ñ " + +#: vfs/mcfs.c:176 +msgid " The remote server is running on strange port. Giving up.\n" +msgstr " Ô¶³ÌÖ÷»úÅÜµÄ port ºÜÆæ¹Ö£¬·ÅÆúÁË¡£\n" + +#: vfs/mcfs.c:188 +msgid " MCFS Password required " +msgstr " ±ØÐèÓÐ MCFS ÃÜÂë " + +#: vfs/mcfs.c:202 +msgid " Invalid password " +msgstr " ÃÜÂëÎÞЧ " + +#: vfs/mcfs.c:322 +msgid " Too many open connections " +msgstr " Ì«¶à¿ªÆôµÄÁ¬½áÁË " + +#: vfs/tar.c:84 vfs/tar.c:101 +#, c-format +msgid "" +"Couldn't open tar archive\n" +"%s" +msgstr "" +"ÎÞ·¨¿ªÆô tar Îļþ¼¯\n" +"%s" + +#: vfs/tar.c:284 +msgid "Unexpected EOF on archive file" +msgstr "Îļþ¼¯µÄÎļþ½áβ²»Õý³£" + +#: vfs/tar.c:339 vfs/tar.c:346 +msgid "Inconsistent tar archive" +msgstr "²»ÍêÕûµÄ tar Îļþ¼¯" + +#: vfs/tar.c:411 +#, c-format +msgid "" +"Hmm,...\n" +"%s\n" +"doesn't look like a tar archive." +msgstr "" +"àÅ...\n" +"%s\n" +"¿´ÆðÀ´²»ÏñÊÇÒ»¸ö tar Îļþ¼¯¡£" diff -ruN old/mc-4.5.42/src/ChangeLog new/mc-4.5.43/src/ChangeLog --- old/mc-4.5.42/src/ChangeLog Mon Dec 6 18:50:02 1999 +++ new/mc-4.5.43/src/ChangeLog Sat Mar 18 08:43:47 2000 @@ -1,3 +1,59 @@ +2000-02-23 Norbert Warmuth + + * main.c (parse_control_file): add missing right parentheses + + * boxes.c: fix incorrect initialization of array of structure (gcc + version 2.96 20000131 chokes on it). + +2000-02-18 Paul Sheer + + * gtkedit/*.[ch], edit.c et al: updates to reflect + cooledit-3.13.0. See CVS commits and cooledit ChangeLog + for details. + +2000-02-10 Pavel Machek + + * setup.c (load_setup): remove duplicate loading of anonymous + passwd by do_load_string(), it is doing by + ftpfs_init_passwd. (Patch by sav@bcs.zp.ua) + +2000-02-04 "David H.Martin" + + * src/widget.c (input_new): Change NULL to empty strings and avoid + crashing when string functions are called. + * src/boxes.c (configure_vfs): Remove local change to empty string. + * src/setup.c (load setup): Load anonymous password + +2000-02-03 Andrew V. Samoilov + + * setup.c (load_setup): call ftpfs_init_passwd to avoid segfault + +2000-01-24 Andrew V. Samoilov + + * main.c (parse_control_file): add extra secutity checks for + control file. It cannot be group/world writable; + (ctl_x_map, default_map, argument_table): added const qualifier. + + * fixed segfault in print_mc_usage + +2000-01-24 Pavel Machek + + * cmd.c (nice_cd): disabled ability to go to home. + +2000-01-02 viro@math.psu.edu + + * src/subshell.c: Reason: in feed_subshell() we are trying to read + from shell pty,check for retval==-1 && errno != EIO. In that case + we flame and exit. Otherwise we are trying to write what we've + read. Good luck doing it if we got errno==EIO, which is _normal_ + for situation when shell just died. Resulting write(1,foo,~0U) is + somewhat excessively, erm, verbose. + +1999-12-21 Pavel Roskin + + * src/main.c, src/view.c: #warning's replaced with FIXME's. + They were not for users, but for developers + 1999-11-11 Pavel Machek * main.c, cmd.c: add possibility to free VFS now diff -ruN old/mc-4.5.42/src/boxes.c new/mc-4.5.43/src/boxes.c --- old/mc-4.5.42/src/boxes.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/boxes.c Sat Mar 18 08:43:46 2000 @@ -386,7 +386,7 @@ 10, 0, &my_overwrite, 0, XV_WLAY_BELOWCLOSE, "ov" }, { quick_checkbox, 1, 13, 3, CONFY, N_(" confirm &Delete "), 9, 0, &my_delete, 0, XV_WLAY_BELOWCLOSE, "de" }, -{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XV_WLAY_DONTCARE } +{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XV_WLAY_DONTCARE, 0 } }; static QuickDialog confirmation = @@ -667,7 +667,7 @@ XV_WLAY_RIGHTOF, "input-timo-vfs" }, { quick_label, 4, VFSX, 3, VFSY, N_("Timeout for freeing VFSs:"), 0, 0, 0, 0, XV_WLAY_BELOWCLOSE, "label-vfs" }, -{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XV_WLAY_DONTCARE, 0 } +{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XV_WLAY_DONTCARE, 0 } }; static QuickDialog confvfs_dlg = @@ -694,7 +694,7 @@ g_snprintf(buffer3, sizeof (buffer3), "%i", ftpfs_directory_timeout); confvfs_widgets[5].text = buffer3; confvfs_widgets[7].text = ftpfs_anonymous_passwd; - confvfs_widgets[2].text = ftpfs_proxy_host ? ftpfs_proxy_host : ""; + confvfs_widgets[2].text = ftpfs_proxy_host; #endif if (quick_dialog (&confvfs_dlg) != B_CANCEL) { diff -ruN old/mc-4.5.42/src/cmd.c new/mc-4.5.43/src/cmd.c --- old/mc-4.5.42/src/cmd.c Mon Dec 6 18:50:02 1999 +++ new/mc-4.5.43/src/cmd.c Sat Mar 18 08:43:46 2000 @@ -1349,6 +1349,9 @@ if (!machine) return; + to_home = 0; /* FIXME: how to solve going to home nicely? /~/ is + ugly as hell and leads to problems in vfs layer */ + if (strncmp (prefix, machine, strlen (prefix)) == 0) cd_path = g_strconcat (machine, to_home ? "/~/" : NULL, NULL); else diff -ruN old/mc-4.5.42/src/features.inc new/mc-4.5.43/src/features.inc --- old/mc-4.5.42/src/features.inc Mon Dec 6 18:50:00 1999 +++ new/mc-4.5.43/src/features.inc Sat Mar 18 08:43:45 2000 @@ -4,85 +4,86 @@ # define VERSION "undefined" #endif -char *features = - "Edition: " +static const char * const features [] = { + N_("Edition: "), #ifdef HAVE_X # ifdef HAVE_XVIEW - "XView" + N_("XView"), # else - "Tk" + N_("Tk"), # endif #else - "text mode" + N_("text mode"), #ifdef HAVE_TEXTMODE_X11_SUPPORT - " with X11 support to read modifiers" + N_(" with X11 support to read modifiers"), #endif #endif - ".\n" + ".\n", #ifdef USE_VFS - "Virtual File System: tarfs, extfs" + N_("Virtual File System: tarfs, extfs"), #ifdef USE_NETCODE - ", ftpfs" + N_(", ftpfs"), # ifdef HSC_PROXY - " (proxies: hsc proxy)" + N_(" (proxies: hsc proxy)"), # endif - ", mcfs" + N_(", mcfs"), # ifdef USE_TERMNET - " (with termnet support)" + N_(" (with termnet support)"), # endif # ifdef WITH_SMBFS - ", smbfs" + N_(", smbfs"), # endif #endif #ifdef USE_EXT2FSLIB - ", undelfs" + N_(", undelfs"), #endif - ".\n" + ".\n", #endif #ifdef USE_INTERNAL_EDIT - "With builtin Editor\n" + N_("With builtin Editor\n"), #endif - "Using " + N_("Using "), #ifdef HAVE_SLANG # ifdef HAVE_SYSTEM_SLANG - "system-installed " + N_("system-installed "), # endif - "S-lang library with " + N_("S-lang library with "), # ifdef SLANG_TERMINFO - "terminfo" + N_("terminfo"), # else # ifdef USE_TERMCAP - "termcap" + N_("termcap"), # else - "an unknown terminal" + N_("an unknown terminal"), # endif # endif - " database" + N_(" database"), #else # ifdef USE_NCURSES - "the ncurses library" + N_("the ncurses library"), # else - "some unknown curses library" + N_("some unknown curses library"), # endif #endif - "\n" + "\n", #ifdef HAVE_SUBSHELL_SUPPORT - "With subshell support: " + N_("With subshell support: "), # ifdef SUBSHELL_OPTIONAL - "optional" + N_("optional"), # else - "as default" + N_("as default"), # endif - "\n" + "\n", #endif #ifdef WITH_BACKGROUND - "With support for background operations\n" + N_("With support for background operations\n"), #endif + NULL } ; static const int status_mouse_support = @@ -102,5 +103,4 @@ 0; #endif #endif - diff -ruN old/mc-4.5.42/src/main.c new/mc-4.5.43/src/main.c --- old/mc-4.5.42/src/main.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/main.c Sat Mar 18 08:43:45 2000 @@ -144,7 +144,7 @@ #include "gsession.h" #endif -/* "$Id: main.c,v 1.104 1999/11/11 14:35:40 pavel Exp $" */ +/* "$Id: main.c,v 1.111 2000/02/23 07:43:16 norbert Exp $" */ /* When the modes are active, left_panel, right_panel and tree_panel */ /* Point to a proper data structure. You should check with the functions */ @@ -190,8 +190,8 @@ /* If true, at startup the user-menu is invoked */ int auto_menu = 0; -/* If true, use + and \ keys normally and select/unselect do if M-+ / M-\ and M-- - and keypad + / - */ +/* If true, use + and \ keys normally and select/unselect do if M-+ / M-\ + and M-- and keypad + / - */ int alternate_plus_minus = 0; /* If true, then the +, - and \ keys have their special meaning only if the @@ -328,8 +328,9 @@ /* File name to view if argument was supplied */ char *view_one_file = 0; -/* File name to view if argument was supplied */ +/* File name to edit if argument was supplied */ char *edit_one_file = 0; +static int edit_one_file_start_line = 1; /* Used so that widgets know if they are being destroyed or shut down */ @@ -365,7 +366,7 @@ int finish_program = 0; /* If set, then no windows are displayed in the GNOME edition */ -int nowindows = 0; +int nowindows = 0, nodesktop = 0, twopanel; /* If set it displays the directory that holds the gnome .links files */ int display_linksdir = 0; @@ -446,10 +447,10 @@ if (force_update & UP_RELOAD){ panel->is_panelized = 0; -#if 1 +#if 0 ftpfs_flushdir (); #endif -#warning Should supply flushdir method +/* FIXME: Should supply flushdir method */ memset (&(panel->dir_stat), 0, sizeof (panel->dir_stat)); } @@ -599,9 +600,10 @@ return; } #ifndef OS2_NT - /* Security: Check that the user owns the control file to prevent - other users from playing tricks on him/her. */ - if (s.st_uid != getuid ()){ + /* Security: Check that the user owns the control file and this file + is not group/world writable to prevent other users from playing tricks + on him/her. */ + if (s.st_uid != getuid () || ((s.st_mode) & (S_IWGRP|S_IWOTH))) { fclose (file); return; } @@ -1172,7 +1174,7 @@ } return 0; } - +#if 0 static void set_sort_to (WPanel *p, sortfn *sort_order) { @@ -1189,7 +1191,7 @@ } do_re_sort (p); } - +#endif void sort_cmd (void) { @@ -1722,7 +1724,7 @@ define_label (midnight_dlg, paneletc, 10, _("Quit"), (voidfn) quit_cmd); } -static key_map ctl_x_map [] = { +static const key_map ctl_x_map [] = { { XCTRL('c'), (callfn) quit_cmd }, #ifdef USE_VFS { 'a', reselect_vfs }, @@ -1770,7 +1772,7 @@ { } -static key_map default_map [] = { +static const key_map default_map [] = { #ifndef HAVE_GNOME { KEY_F(19), menu_last_selected_cmd }, { KEY_F(20), (key_callback) quiet_quit_cmd }, @@ -2212,26 +2214,24 @@ setup_dummy_mc (path); view_file (path, 0, 1); } -#ifdef USE_INTERNAL_EDIT else { path = prepend_cwd_on_local (""); #ifndef HAVE_GNOME setup_dummy_mc (path); #endif - edit (edit_one_file, 1); + edit (edit_one_file, edit_one_file_start_line); #ifdef HAVE_GNOME gtk_main (); exit (1); #endif } -#endif g_free (path); midnight_shutdown = 1; done_mc (); return 1; } -#endif +#endif /* USE_INTERNAL_EDIT */ static void do_nc (void) @@ -2284,8 +2284,8 @@ _("with mouse support on xterm%s.\n"), status_mouse_support ? _(" and the Linux console") : ""); #endif /* HAVE_X */ - - fprintf (stderr, features); + for (verbose = 0; features [verbose]; verbose++) + fprintf (stderr, _(features [verbose])); if (print_last_wd) write (stdout_fd, ".", 1); } @@ -2481,63 +2481,69 @@ static void print_mc_usage (void) { - version (0); - fprintf (stderr, - "Usage is:\n\n" - "mc [flags] [this_dir] [other_panel_dir]\n\n" + const char * const * ptr; + const char * const usage [] = { + + N_("Usage is:\n\n" + "mc [flags] [this_dir] [other_panel_dir]\n\n"), #if defined(HAVE_SLANG) && !defined(OS2_NT) - "-a, --stickchars Force use of +, -, | for line drawing.\n" + N_("-a, --stickchars Force use of +, -, | for line drawing.\n"), #endif - "-b, --nocolor Force black and white display.\n" + N_("-b, --nocolor Force black and white display.\n"), #ifdef WITH_BACKGROUND - "-B, --background [DEVEL-ONLY: Debug the background code]\n" + N_("-B, --background [DEVEL-ONLY: Debug the background code]\n"), #endif - "-c, --color Force color mode.\n" - "-C, --colors Specify colors (use --help-colors to get a list).\n" - "-d, --nomouse Disable mouse support.\n" + N_("-c, --color Force color mode.\n" + "-C, --colors Specify colors (use --help-colors to get a list).\n" + "-d, --nomouse Disable mouse support.\n"), #ifdef USE_INTERNAL_EDIT - "-e, --edit Startup the internal editor.\n" + N_("-e, --edit Startup the internal editor.\n"), #endif - "-f, --libdir Print configured paths.\n" - "-h, --help Shows this help message.\n" - "-k, --resetsoft Reset softkeys (HP terminals only) to their terminfo/termcap\n" - " default.\n" + N_("-f, --libdir Print configured paths.\n" + "-h, --help Shows this help message.\n" + "-k, --resetsoft Reset softkeys (HP terminals only) to their terminfo/termcap\n" + " default.\n"), #ifdef USE_NETCODE - "-l, --ftplog file Log ftpfs commands to the file.\n" + N_("-l, --ftplog file Log ftpfs commands to the file.\n"), #endif #ifdef HAVE_MAD - "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" + N_("-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n"), #endif - "-P, --printwd At exit, print the last working directory.\n" - "-s, --slow Disables verbose operation (for slow terminals).\n" + N_("-P, --printwd At exit, print the last working directory.\n" + "-s, --slow Disables verbose operation (for slow terminals).\n"), #if defined(HAVE_SLANG) && !defined(OS2_NT) - "-t, --termcap Activate support for the TERMCAP variable.\n" + N_("-t, --termcap Activate support for the TERMCAP variable.\n"), #endif #if defined(HAVE_SLANG) && defined(OS2_NT) - "-S, --createcmdile Create command file to set default directory upon exit.\n" + N_("-S, --createcmdile Create command file to set default directory upon exit.\n"), #endif - #ifdef HAVE_SUBSHELL_SUPPORT - "-u, --nosubshell Disable the concurrent subshell mode.\n" - "-U, --subshell Force the concurrent subshell mode.\n" - "-r, --forceexec Force subshell execution.\n" -#endif - "-v, --view fname Start up into the viewer mode.\n" - "-V, --version Report version and configuration options.\n" - "-x, --xterm Force xterm mouse support and screen save/restore.\n" + N_("-u, --nosubshell Disable the concurrent subshell mode.\n" + "-U, --subshell Force the concurrent subshell mode.\n" + "-r, --forceexec Force subshell execution.\n"), +#endif + N_("-v, --view fname Start up into the viewer mode.\n" + "-V, --version Report version and configuration options.\n" + "-x, --xterm Force xterm mouse support and screen save/restore.\n"), #ifdef HAVE_SUBSHELL_SUPPORT - "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" + N_("-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n"), #endif - "\n" - "Please send any bug reports (including the output of `mc -V')\n" - "to mc-bugs@nuclecu.unam.mx\n" - ); + N_("\n" + "Please send any bug reports (including the output of `mc -V')\n" + "to mc-bugs@nuclecu.unam.mx\n"), + NULL + }; + + version (0); + + for (ptr = usage; *ptr; ptr++) + fprintf (stderr, _(*ptr)); } static void print_color_usage (void) { - fprintf (stderr, + fprintf (stderr, _( "--colors KEYWORD={FORE},{BACK}\n\n" "{FORE} and {BACK} can be ommited, and the default will be used\n" "\n" @@ -2552,11 +2558,9 @@ "Colors:\n" " black, gray, red, brightred, green, brightgreen, brown,\n" " yellow, blue, brightblue, magenta, brightmagenta, cyan,\n" - " brightcyan, lightgray and white\n\n"); - + " brightcyan, lightgray and white\n\n")); } - static void probably_finish_program (void) { @@ -2674,7 +2678,7 @@ char *cmdline_geometry = NULL; -static struct poptOption argument_table [] = { +static const struct poptOption argument_table [] = { #ifdef HAVE_GNOME { NULL, '\0', POPT_ARG_CALLBACK, parse_an_arg, 0}, #endif @@ -2749,6 +2753,8 @@ #ifdef HAVE_GNOME { "geometry", '\0', POPT_ARG_STRING, &cmdline_geometry, 0, N_("Geometry for the window"), N_("GEOMETRY")}, {"nowindows", '\0', POPT_ARG_NONE, &nowindows, 0, N_("No windows opened at startup"), NULL}, + {"nodesktop", '\0', POPT_ARG_NONE, &nodesktop, 0, N_("No desktop icons"), NULL}, + {"twopanel", '\0', POPT_ARG_NONE, &twopanel, 0, N_("Look more like traditional gmc"), NULL}, {"desktop-linksdir", '\0', POPT_ARG_NONE, &display_linksdir, 0, N_("Display the directory that holds the .links startup files and exit")}, #endif @@ -2756,6 +2762,7 @@ { NULL, 0, 0, NULL, 0 } }; +#if defined(HAVE_CORBA) || defined(HAVE_GNOME) /* Convenience function to display the desktop initialization directory and exit */ static void maybe_display_linksdir (void) @@ -2765,6 +2772,7 @@ exit (1); } } +#endif #ifdef HAVE_CORBA /* Initializes the ORB and does the initial argument processing */ @@ -2870,12 +2878,24 @@ base = x_basename (argv[0]); if (!STRNCOMP (base, "mce", 3) || !STRCOMP(base, "vi")) { edit_one_file = ""; - if (tmp) + edit_one_file_start_line = 1; + if (tmp) { + if (*tmp == '+' && isdigit (tmp[1])){ + int start_line = atoi (tmp); + if (start_line > 0) { + char *file = poptGetArg (ctx); + if (file) { + tmp = file; + edit_one_file_start_line = start_line; + } + } + } edit_one_file = g_strdup (tmp); + } } else - if (!STRNCOMP (base, "mcv", 3) || !STRCOMP(base, "view")) { - if (tmp) - view_one_file = g_strdup (tmp); + if (!STRNCOMP (base, "mcv", 3) || !STRCOMP(base, "view")) { + if (tmp) + view_one_file = g_strdup (tmp); } else { /* sets the current dir and the other dir */ if (tmp) { @@ -2997,7 +3017,7 @@ if (base){ if (strcmp (base, "mcedit") == 0) edit_one_file = ""; - + else if (strcmp (base, "mcview") == 0) view_one_file = ""; } diff -ruN old/mc-4.5.42/src/mc.hlp new/mc-4.5.43/src/mc.hlp --- old/mc-4.5.42/src/mc.hlp Mon Dec 6 18:50:02 1999 +++ new/mc-4.5.43/src/mc.hlp Sat Mar 18 08:43:47 2000 @@ -135,7 +135,7 @@ but the backquotes on bash won't accept your suspension the program with C-z. The temporary file is created in the private directory ~/.mc/tmp in order to avoid symlink -attachs in a world writable /tmp. +attacks in a world writable /tmp. "-s" Turns on the slow terminal mode, in this mode the program will not draw expensive line drawing characters @@ -1310,7 +1310,7 @@ The Midnight Commander has some options that may be toggled on and off in several dialogs which are accessible -from this menue. Options are enabled if they have an +from this menu. Options are enabled if they have an asterisk or "x" in front of them. The ConfigurationConfiguration command pops up a dialog from which you @@ -1356,7 +1356,7 @@ either C-t or the Insert key) the selection bar will move down. -Drop down menues. When this option is enabled, when you +Drop down menus. When this option is enabled, when you press the F9 key, the pull down menus will be activated, else, you will only be presented with the menu title, and you will have to select the entry with the arrow keys or @@ -1474,8 +1474,8 @@ unintentionally will get more difficult. The default selection in the confirmation dialog changes from the "Yes" to the "No" button and deletion of non empty -direcories has to be confirmed by entering the word yes By -default this option is disabled. +directories has to be confirmed by entering the word yes +By default this option is disabled. [Display bits] Display bits @@ -1543,7 +1543,7 @@ directory listings fetched from ftp servers). Moreover in order to access the contents of compressed -files (for eaxample, compressed tar files) the Midnight +files (for example, compressed tar files) the Midnight Commander has to create a temporary uncompressed file on your disk. @@ -1738,7 +1738,7 @@ in brackets. The arguments are: ascii to force the viewer into ascii mode; hex to force the viewer into hex mode; nroff to tell the viewer that it should interpret the bold -and underline sequences of nroff; unformated to tell the +and underline sequences of nroff; unformatted to tell the viewer to not interpret nroff commands for making the text bold or underlined. @@ -2174,8 +2174,8 @@ a C format string. First take a look at the sscanf and sprintf man pages to see what a format string is and how it works. An example is as follows: Suppose you want to -replace all occurences of say, an open bracket, three -comma seperated numbers, and a close bracket, with the +replace all occurrences of say, an open bracket, three +comma separated numbers, and a close bracket, with the word apples, the third number, the word oranges and then the second number, I would fill in the Replace dialog box as follows: @@ -2282,9 +2282,10 @@ will try to logon on the remote machine as that user, otherwise it will use your login name. The optional pass element, if present is the password used for the -connection. This use is not recomented (nor keeping this -in your hotlist, unless you set the appropiate permissions -there, and then, it may not be entirely safe anyways). +connection. This use is not recommended (nor keeping this +in your hotlist, unless you set the appropriate +permissions there, and then, it may not be entirely safe +anyways). Examples: @@ -2429,7 +2430,7 @@ partition of the first scsi disk on Linux, you would use the following path name: - /#undel:/dev/sda2 + /#undel:sda2 It may take a while for the undelfs to load the required information before you start browsing files there. @@ -2562,7 +2563,7 @@ ftpfs_use_passive_connections. This option is by off default. This makes the ftpfs code use the passive open -mode for transfering files. This is used by people that +mode for transferring files. This is used by people that are behind a filtering packet router. This option just works if you are not using an ftp proxy. diff -ruN old/mc-4.5.42/src/mountlist.c new/mc-4.5.43/src/mountlist.c --- old/mc-4.5.42/src/mountlist.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/mountlist.c Sat Mar 18 08:43:46 2000 @@ -84,13 +84,6 @@ #include #endif -/* 4.4BSD2 derived systems */ -#if defined(__bsdi__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) -# ifndef MOUNT_UFS -# define xBSD -# endif -#endif - /* void error (void); FIXME -- needed? */ #ifdef DOLPHIN @@ -124,7 +117,7 @@ } #endif /* MOUNTED_GETMNTENT1. */ -#if defined (MOUNTED_GETMNTINFO) && !defined (xBSD) +#if defined (MOUNTED_GETMNTINFO) && !defined (HAVE_F_FSTYPENAME) static char *fstype_to_string (short t) { switch (t) { @@ -241,7 +234,7 @@ me = (struct mount_entry *) malloc (sizeof (struct mount_entry)); me->me_devname = strdup (fsp->f_mntfromname); me->me_mountdir = strdup (fsp->f_mntonname); -#ifdef xBSD +#ifdef HAVE_F_FSTYPENAME me->me_type = strdup (fsp->f_fstypename); #else me->me_type = fstype_to_string (fsp->f_type); diff -ruN old/mc-4.5.42/src/setup.c new/mc-4.5.43/src/setup.c --- old/mc-4.5.42/src/setup.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/setup.c Sat Mar 18 08:43:46 2000 @@ -67,9 +67,10 @@ #ifdef HAVE_GNOME extern int tree_panel_visible; extern int we_can_afford_the_speed; +int use_magic = 0; #endif -/* "$Id: setup.c,v 1.31 1999/09/20 20:03:59 unammx Exp $" */ +/* "$Id: setup.c,v 1.36 2000/02/11 00:33:28 pavel Exp $" */ #ifdef USE_VFS extern int vfs_timeout; @@ -97,7 +98,7 @@ /* default panel values */ int saving_setup; -static struct { +static const struct { char *key; sortfn *sort_type; } sort_names [] = { @@ -112,7 +113,7 @@ { 0, 0 } }; -static struct { +static const struct { char *key; int list_type; } list_types [] = { @@ -124,7 +125,7 @@ { 0, 0 } }; -static struct { +static const struct { char *opt_name; int opt_type; } panel_types [] = { @@ -135,7 +136,7 @@ { 0, 0 } }; -static struct { +static const struct { char *opt_name; int *opt_addr; } layout [] = { @@ -162,7 +163,7 @@ extern int preserve_uidgid; #endif -static struct { +static const struct { char *opt_name; int *opt_addr; } options [] = { @@ -219,6 +220,9 @@ { "xtree_mode", &xtree_mode }, { "num_history_items_recorded", &num_history_items_recorded }, { "file_op_compute_totals", &file_op_compute_totals }, +#ifdef HAVE_GNOME + { "use_magic", &use_magic }, +#endif #ifdef SAVE_CHANGES_OUTSIDE_OPTIONS_MENU { "dive_into_subdirs", &dive_into_subdirs }, { "preserve_uidgid", &preserve_uidgid }, @@ -536,7 +540,7 @@ char * setup_init (void) { - static char *buffer; + char *buffer; char *profile; char *inifile; diff -ruN old/mc-4.5.42/src/subshell.c new/mc-4.5.43/src/subshell.c --- old/mc-4.5.42/src/subshell.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/subshell.c Sat Mar 18 08:43:46 2000 @@ -932,7 +932,14 @@ /* for (i=0; i<5; ++i) * FIXME -- experimental */ { bytes = read (subshell_pty, pty_buffer, pty_buffer_size); - if (bytes == -1 && errno != EIO) + /* Patch from viro@math.psu.edu + * add by MichaelBramer (Debian MC-Maintainer */ + if (bytes == -1 && errno == EIO && !subshell_alive) + { + return FALSE; + } + if (bytes == -1) + /* end from the patch */ { tcsetattr (STDOUT_FILENO, TCSANOW, &shell_mode); perror ("\n"__FILE__": read (subshell_pty...)"); diff -ruN old/mc-4.5.42/src/view.c new/mc-4.5.43/src/view.c --- old/mc-4.5.42/src/view.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/view.c Sat Mar 18 08:43:46 2000 @@ -121,9 +121,9 @@ int altered_nroff_flag = 0; /* }}} */ -/* "$Id: view.c,v 1.37 1999/06/24 21:53:49 norbert Exp $" */ +/* "$Id: view.c,v 1.39 1999/12/22 04:04:23 proskin Exp $" */ -static char hex_char[] = "0123456789ABCDEF"; +static const char hex_char[] = "0123456789ABCDEF"; /* }}} */ /* {{{ Clean-up functions */ @@ -239,7 +239,12 @@ n = fread (p, 1, VIEW_PAGE_SIZE, view->stdfile); else n = mc_read (view->file, p, VIEW_PAGE_SIZE); -#warning FIXME: Errors are ignored at this point, also should report preliminary EOF + +/* + * FIXME: Errors are ignored at this point + * Also should report preliminary EOF + */ + if (n != -1) view->bytes_read += n; if (view->s.st_size < view->bytes_read){ @@ -1362,8 +1367,8 @@ if (view->nib_shift == 0) return; } - view->edit_cursor = (--view->edit_cursor < view->first) ? - view->first : view->edit_cursor; + if (view->edit_cursor > view->first) + --view->edit_cursor; if (view->edit_cursor < view->start_display) { view->edit_cursor += view->bytes_per_line; view_move_backward(view, 1); diff -ruN old/mc-4.5.42/src/widget.c new/mc-4.5.43/src/widget.c --- old/mc-4.5.42/src/widget.c Mon Dec 6 18:50:01 1999 +++ new/mc-4.5.43/src/widget.c Sat Mar 18 08:43:46 2000 @@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* "$Id: widget.c,v 1.34 1999/09/14 18:20:03 norbert Exp $" */ +/* "$Id: widget.c,v 1.35 2000/02/03 15:00:12 pavel Exp $" */ #include #include @@ -1748,6 +1748,10 @@ in->history = history_get (tkname); } } + + if (!def_text) + def_text=""; + if (def_text == INPUT_LAST_TEXT) { def_text = ""; if (in->history) diff -ruN old/mc-4.5.42/syntax/Makefile.in new/mc-4.5.43/syntax/Makefile.in --- old/mc-4.5.42/syntax/Makefile.in Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/Makefile.in Sat Mar 18 08:43:49 2000 @@ -18,7 +18,7 @@ c.syntax \ changelog.syntax \ diff.syntax \ - diffc.syntax \ + fortran.syntax \ html.syntax \ java.syntax \ latex.syntax \ diff -ruN old/mc-4.5.42/syntax/ada95.syntax new/mc-4.5.43/syntax/ada95.syntax --- old/mc-4.5.42/syntax/ada95.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/ada95.syntax Sat Mar 18 08:43:49 2000 @@ -22,11 +22,11 @@ keyword : brightgreen/6 keyword ( brightgreen/6 keyword ) brightgreen/6 - keyword + brightgreen/6 + keyword \+ brightgreen/6 keyword - brightgreen/6 keyword / brightgreen/6 - keyword * brightgreen/6 - keyword ** brightgreen/6 + keyword \* brightgreen/6 + keyword \*\* brightgreen/6 keyword # brightgreen/6 keyword => brightgreen/6 keyword , brightgreen/6 diff -ruN old/mc-4.5.42/syntax/c.syntax new/mc-4.5.43/syntax/c.syntax --- old/mc-4.5.42/syntax/c.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/c.syntax Sat Mar 18 08:43:49 2000 @@ -66,12 +66,12 @@ keyword /\* brown/22 keyword \*/ brown/22 - keyword '\\\{abtnvfr\}' brightgreen/16 + keyword '\\\{"abtnvfr\}' brightgreen/16 keyword '\\\{0123\}\{01234567\}\{01234567\}' brightgreen/16 keyword '\\'' brightgreen/16 keyword '\\\\' brightgreen/16 keyword '\\0' brightgreen/16 - keyword '\{\s!"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ\}' brightgreen/16 + keyword '\{\s!"#$%&()\*\+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ\}' brightgreen/16 keyword > yellow/24 keyword < yellow/24 @@ -92,6 +92,7 @@ keyword , brightcyan/14 keyword : brightcyan/14 keyword ; brightmagenta/19 + keyword #define\[\t\s\]\[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_0123456789\]\[\t\s\]0x\[0123456789abcdefABCDEF\] brightred/18 context exclusive /\* \*/ brown/22 spellcheck context // \n brown/22 diff -ruN old/mc-4.5.42/syntax/diff.syntax new/mc-4.5.43/syntax/diff.syntax --- old/mc-4.5.42/syntax/diff.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/diff.syntax Sat Mar 18 08:43:49 2000 @@ -1,37 +1,26 @@ -# yawn +# Highlighting for various diffs including those generated by CVS +# Comments to Pavel Roskin context default - keyword linestart @@*@@ green/16 + keyword linestart @@*@@ cyan/16 + keyword linestart Index:\s brown/12 keyword linestart \s black/0 white/26 + keyword linestart \*\*\*\*\*\*\*\*\*\*\*\*\*\*\* cyan/16 + keyword linestart \*\*\**\*\*\*\* cyan/16 + keyword linestart ---*---- cyan/16 +context exclusive linestart @@*@@ \n brightcyan/8 +context exclusive linestart Index:\s \n black/0 white/26 context linestart diff \n white/26 red/9 context linestart --- \n brightmagenta/20 -context linestart +++ \n brightmagenta/20 -context linestart + \n brightgreen/6 +context linestart \+\+\+ \n brightmagenta/20 +context linestart \*\*\* \n brightmagenta/20 +context linestart === \n brown/12 +context linestart \+ \n brightgreen/6 +context linestart > \n brightgreen/6 context linestart - \n brightred/18 -context linestart A \n white/26 black/0 -context linestart B \n white/26 black/0 -context linestart C \n white/26 black/0 -context linestart D \n white/26 black/0 -context linestart E \n white/26 black/0 -context linestart F \n white/26 black/0 -context linestart G \n white/26 black/0 -context linestart H \n white/26 black/0 -context linestart I \n white/26 black/0 -context linestart J \n white/26 black/0 -context linestart K \n white/26 black/0 -context linestart L \n white/26 black/0 -context linestart M \n white/26 black/0 -context linestart N \n white/26 black/0 -context linestart O \n white/26 black/0 -context linestart P \n white/26 black/0 -context linestart Q \n white/26 black/0 -context linestart R \n white/26 black/0 -context linestart S \n white/26 black/0 -context linestart T \n white/26 black/0 -context linestart U \n white/26 black/0 -context linestart V \n white/26 black/0 -context linestart W \n white/26 black/0 -context linestart X \n white/26 black/0 -context linestart Y \n white/26 black/0 -context linestart Z \n white/26 black/0 - - +context linestart < \n brightred/18 +context linestart ! \n yellow/24 +context linestart ? \n brown/12 +context linestart RCS\s \n brown/12 +context linestart retrieving\s \n brown/12 +context linestart Only\s \n yellow/24 black/0 +context linestart Common\s \n yellow/24 black/0 diff -ruN old/mc-4.5.42/syntax/diffc.syntax new/mc-4.5.43/syntax/diffc.syntax --- old/mc-4.5.42/syntax/diffc.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/diffc.syntax Wed Dec 31 19:00:00 1969 @@ -1,14 +0,0 @@ -# Jeroen Ruigrok van der Werven -# did thusly spake: - -context default - keyword linestart \s black/0 white/26 - keyword linestart \*\*\*\*\*\*\*\*\*\*\*\*\*\*\* white/26 brightred/18 - keyword linestart \*\*\**\*\*\*\* white/26 brightcyan/14 -context linestart diff \n white/26 red/9 -context linestart --- \n brightmagenta/20 -context linestart \*\*\* \n brightmagenta/20 -context linestart + \n green/6 -context linestart ! \n yellow/24 - - diff -ruN old/mc-4.5.42/syntax/fortran.syntax new/mc-4.5.43/syntax/fortran.syntax --- old/mc-4.5.42/syntax/fortran.syntax Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.43/syntax/fortran.syntax Sat Mar 18 08:43:49 2000 @@ -0,0 +1,241 @@ +# --------------------------------------------------- +# fortran.syntax +# FORTRAN language syntax highlighting template. +# Provides syntax highlighting rules for the +# FORTRAN programming language. +# +# Author: John Theal +# Email: jtheal@renegadelinuxbox.dhs.org +# December 7, 1999 +# --------------------------------------------------- + +# Heavily modified by Paul Sheer . + +context default +# boolean and logical expressions / operators + keyword .and. brightred/orange + keyword .eq. brightred/orange + keyword .eqv. brightred/orange + keyword .false. brightred/orange + keyword .ge. brightred/orange + keyword .gt. brightred/orange + keyword .le. brightred/orange + keyword .lt. brightred/orange + keyword .ne. brightred/orange + keyword .neqv. brightred/orange + keyword .not. brightred/orange + keyword .or. brightred/orange + keyword .true. brightred/orange + keyword whole lge brightred/orange + keyword whole lgt brightred/orange + keyword whole lle brightred/orange + keyword whole llt brightred/orange + +# declarations + keyword whole block brightcyan/17 + keyword whole character brightcyan/17 + keyword whole common brightcyan/17 + keyword whole complex brightcyan/17 + keyword whole data brightcyan/17 + keyword whole dimension brightcyan/17 + keyword whole double brightcyan/17 + keyword whole external brightcyan/17 + keyword whole format brightcyan/17 + keyword whole implicit brightcyan/17 + keyword whole integer brightcyan/17 + keyword whole intrinsic brightcyan/17 + keyword whole logical brightcyan/17 + keyword whole none brightcyan/17 + keyword whole parameter brightcyan/17 + keyword whole precision brightcyan/17 + keyword whole real brightcyan/17 + +# general programming syntax + keyword whole assign brightgreen/15 + keyword whole call brightgreen/15 + keyword whole continue brightgreen/15 + keyword whole do brightgreen/15 + keyword whole else brightgreen/15 + keyword whole elseif brightgreen/15 + keyword whole end brightgreen/15 + keyword whole enddo brightgreen/15 + keyword whole endif brightgreen/15 + keyword whole for brightgreen/15 + keyword whole goto brightgreen/15 + keyword whole if brightgreen/15 + keyword whole pause brightgreen/15 + keyword whole return brightgreen/15 + keyword whole stop brightgreen/15 + keyword whole then brightgreen/15 + keyword whole to brightgreen/15 + keyword whole while brightgreen/15 + +# headers + keyword whole entry brightgreen/15 + keyword whole function yellow/21 + keyword whole program yellow/21 + keyword whole subroutine yellow/21 + +# I/O functions +# may have optional equal signs after them: 'keyword =' + keyword whole access brightmagenta/20 + keyword whole backspace brightmagenta/20 + keyword whole blank brightmagenta/20 + keyword whole close brightmagenta/20 + keyword whole direct brightmagenta/20 + keyword whole endfile brightmagenta/20 + keyword whole err brightmagenta/20 + keyword whole exist brightmagenta/20 + keyword whole file brightmagenta/20 + keyword whole fmt brightmagenta/20 + keyword whole form brightmagenta/20 + keyword whole formatted brightmagenta/20 + keyword whole inquire brightmagenta/20 + keyword whole iostat brightmagenta/20 + keyword whole name brightmagenta/20 + keyword whole named brightmagenta/20 + keyword whole nextrec brightmagenta/20 + keyword whole number brightmagenta/20 + keyword whole open brightmagenta/20 + keyword whole opened brightmagenta/20 + keyword whole print brightmagenta/20 + keyword whole read brightmagenta/20 + keyword whole rec brightmagenta/20 + keyword whole recl brightmagenta/20 + keyword whole rewind brightmagenta/20 + keyword whole sequential brightmagenta/20 + keyword whole status brightmagenta/20 + keyword whole unformatted brightmagenta/20 + keyword whole unit brightmagenta/20 + keyword whole write brightmagenta/20 + +# mathematical functions + keyword whole abs yellow/24 + keyword whole acos yellow/24 + keyword whole aimag yellow/24 + keyword whole aint yellow/24 + keyword whole alog yellow/24 + keyword whole alog10 yellow/24 + keyword whole amax0 yellow/24 + keyword whole amax1 yellow/24 + keyword whole amin0 yellow/24 + keyword whole amin1 yellow/24 + keyword whole amod yellow/24 + keyword whole anint yellow/24 + keyword whole aprime yellow/24 + keyword whole asin yellow/24 + keyword whole atan yellow/24 + keyword whole atan2 yellow/24 + keyword whole acos yellow/24 + keyword whole cabs yellow/24 + keyword whole cexp yellow/24 + keyword whole char yellow/24 + keyword whole clog yellow/24 + keyword whole cmplx yellow/24 + keyword whole conjg yellow/24 + keyword whole cos yellow/24 + keyword whole cosh yellow/24 + keyword whole ccos yellow/24 + keyword whole csin yellow/24 + keyword whole csqrt yellow/24 + keyword whole dabs yellow/24 + keyword whole dacos yellow/24 + keyword whole dasin yellow/24 + keyword whole datan yellow/24 + keyword whole datan2 yellow/24 + keyword whole dble yellow/24 + keyword whole dcos yellow/24 + keyword whole dcosh yellow/24 + keyword whole dfloat yellow/24 + keyword whole ddmim yellow/24 + keyword whole dexp yellow/24 + keyword whole dim yellow/24 + keyword whole dint yellow/24 + keyword whole dlog yellow/24 + keyword whole dlog10 yellow/24 + keyword whole dmax1 yellow/24 + keyword whole dmin1 yellow/24 + keyword whole dmod yellow/24 + keyword whole dnint yellow/24 + keyword whole dsign yellow/24 + keyword whole dsin yellow/24 + keyword whole dsinh yellow/24 + keyword whole dsqrt yellow/24 + keyword whole dtan yellow/24 + keyword whole dtanh yellow/24 + keyword whole equivalence yellow/24 + keyword whole exp yellow/24 + keyword whole float yellow/24 + keyword whole iabs yellow/24 + keyword whole ichar yellow/24 + keyword whole idim yellow/24 + keyword whole idint yellow/24 + keyword whole ifix yellow/24 + keyword whole index yellow/24 + keyword whole int yellow/24 + keyword whole isign yellow/24 + keyword whole len yellow/24 + keyword whole log yellow/24 + keyword whole log10 yellow/24 + keyword whole max yellow/24 + keyword whole max0 yellow/24 + keyword whole max1 yellow/24 + keyword whole min yellow/24 + keyword whole min0 yellow/24 + keyword whole min1 yellow/24 + keyword whole mod yellow/24 + keyword whole rand yellow/24 + keyword whole sign yellow/24 + keyword whole sin yellow/24 + keyword whole sinh yellow/24 + keyword whole sngl yellow/24 + keyword whole sqrt yellow/24 + keyword whole tan yellow/24 + keyword whole tanh yellow/24 + + keyword ( brightcyan/15 + keyword ) brightcyan/15 + keyword , brightcyan/14 + keyword \+ yellow/24 + keyword - yellow/24 + keyword \* yellow/24 + keyword / yellow/24 + keyword = yellow/24 + + keyword linestart ! black/0 yellow/24 + keyword linestart \* black/0 yellow/24 + keyword linestart c black/0 yellow/24 + keyword linestart C black/0 yellow/24 + + keyword linestart \s\s\s\s\s\* yellow/24 red/9 + + keyword linestart \s\s\s\s\s\s black/0 brightcyan/blue3 + + keyword linestart 0\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 1\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 2\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 3\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 4\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 5\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 6\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 7\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 8\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart 9\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + + keyword linestart \s\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart \s\s\{0123456789\s\}\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart \s\s\s\{0123456789\s\}\{0123456789\s\}\s white/26 brightcyan/2 + keyword linestart \s\s\s\s\{0123456789\s\}\s white/26 brightcyan/2 + +# comments and quotes + keyword '*' green/6 + +context exclusive linestart ! \n brown/22 + spellcheck +context exclusive linestart \* \n brown/22 + spellcheck +context exclusive linestart c \n brown/22 + spellcheck +context exclusive linestart C \n brown/22 + spellcheck + diff -ruN old/mc-4.5.42/syntax/java.syntax new/mc-4.5.43/syntax/java.syntax --- old/mc-4.5.42/syntax/java.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/java.syntax Sat Mar 18 08:43:49 2000 @@ -129,6 +129,7 @@ keyword , brightcyan/14 keyword : brightcyan/14 keyword ; brightmagenta/19 + keyword #define\[\t\s\]\[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_0123456789\]\[\t\s\]0x\[0123456789abcdefABCDEF\] brightred/18 context exclusive /\* \*/ brown/22 spellcheck context // \n brown/22 diff -ruN old/mc-4.5.42/syntax/latex.syntax new/mc-4.5.43/syntax/latex.syntax --- old/mc-4.5.42/syntax/latex.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/latex.syntax Sat Mar 18 08:43:49 2000 @@ -10,7 +10,7 @@ keyword } brightgreen/6 keyword { brightgreen/6 - keyword whole \\$ yellow/24 + keyword \\$ yellow/24 # type style keyword whole \\tiny yellow/24 @@ -264,6 +264,8 @@ keyword Alph brightcyan/17 context % \n brown/22 + +context exclusive \\begin{verbatim} \\end{verbatim} white/13 # mathematical formulas context $ $ brightgreen/6 diff -ruN old/mc-4.5.42/syntax/mail.syntax new/mc-4.5.43/syntax/mail.syntax --- old/mc-4.5.42/syntax/mail.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/mail.syntax Sat Mar 18 08:43:49 2000 @@ -2,7 +2,7 @@ spellcheck keyword linestart From: keyword linestart From brightred/18 -context exclusive linestart From\s \n\n lightgray/25 red/9 +context exclusive linestart From\s \n\n white/25 red/9 keyword <*@*> white/26 wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_01234567890.- diff -ruN old/mc-4.5.42/syntax/makefile.syntax new/mc-4.5.43/syntax/makefile.syntax --- old/mc-4.5.42/syntax/makefile.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/makefile.syntax Sat Mar 18 08:43:49 2000 @@ -5,6 +5,7 @@ keyword whole linestart include magenta keyword whole linestart ifdef magenta keyword whole linestart endif magenta + keyword whole linestart if magenta keyword whole linestart ifeq magenta keyword whole linestart ifneq magenta keyword whole linestart else magenta diff -ruN old/mc-4.5.42/syntax/python.syntax new/mc-4.5.43/syntax/python.syntax --- old/mc-4.5.42/syntax/python.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/python.syntax Sat Mar 18 08:43:49 2000 @@ -120,102 +120,102 @@ keyword whole center magenta/23 keyword whole zfill magenta/23 - keyword whole __init__ white/13 - keyword whole __del__ white/13 - keyword whole __repr__ white/13 - keyword whole __str__ white/13 - keyword whole __cmp__ white/13 - keyword whole __hash__ white/13 - keyword whole __call__ white/13 - keyword whole __getattr__ white/13 - keyword whole __setattr__ white/13 - keyword whole __delattr__ white/13 - keyword whole __len__ white/13 - keyword whole __getitem__ white/13 - keyword whole __setitem__ white/13 - keyword whole __delitem__ white/13 - keyword whole __getslice__ white/13 - keyword whole __setslice__ white/13 - keyword whole __delslice__ white/13 - keyword whole __add__ white/13 - keyword whole __sub__ white/13 - keyword whole __mul__ white/13 - keyword whole __div__ white/13 - keyword whole __mod__ white/13 - keyword whole __divmod__ white/13 - keyword whole __pow__ white/13 - keyword whole __lshift__ white/13 - keyword whole __rshift__ white/13 - keyword whole __and__ white/13 - keyword whole __xor__ white/13 - keyword whole __or__ white/13 - keyword whole __neg__ white/13 - keyword whole __pos__ white/13 - keyword whole __abs__ white/13 - keyword whole __invert__ white/13 - keyword whole __nonzero__ white/13 - keyword whole __coerce__ white/13 - keyword whole __int__ white/13 - keyword whole __long__ white/13 - keyword whole __float__ white/13 - keyword whole __oct__ white/13 - keyword whole __hex__ white/13 + keyword whole __init__ lightgray/13 + keyword whole __del__ lightgray/13 + keyword whole __repr__ lightgray/13 + keyword whole __str__ lightgray/13 + keyword whole __cmp__ lightgray/13 + keyword whole __hash__ lightgray/13 + keyword whole __call__ lightgray/13 + keyword whole __getattr__ lightgray/13 + keyword whole __setattr__ lightgray/13 + keyword whole __delattr__ lightgray/13 + keyword whole __len__ lightgray/13 + keyword whole __getitem__ lightgray/13 + keyword whole __setitem__ lightgray/13 + keyword whole __delitem__ lightgray/13 + keyword whole __getslice__ lightgray/13 + keyword whole __setslice__ lightgray/13 + keyword whole __delslice__ lightgray/13 + keyword whole __add__ lightgray/13 + keyword whole __sub__ lightgray/13 + keyword whole __mul__ lightgray/13 + keyword whole __div__ lightgray/13 + keyword whole __mod__ lightgray/13 + keyword whole __divmod__ lightgray/13 + keyword whole __pow__ lightgray/13 + keyword whole __lshift__ lightgray/13 + keyword whole __rshift__ lightgray/13 + keyword whole __and__ lightgray/13 + keyword whole __xor__ lightgray/13 + keyword whole __or__ lightgray/13 + keyword whole __neg__ lightgray/13 + keyword whole __pos__ lightgray/13 + keyword whole __abs__ lightgray/13 + keyword whole __invert__ lightgray/13 + keyword whole __nonzero__ lightgray/13 + keyword whole __coerce__ lightgray/13 + keyword whole __int__ lightgray/13 + keyword whole __long__ lightgray/13 + keyword whole __float__ lightgray/13 + keyword whole __oct__ lightgray/13 + keyword whole __hex__ lightgray/13 - keyword whole __init__ white/13 - keyword whole __del__ white/13 - keyword whole __repr__ white/13 - keyword whole __str__ white/13 - keyword whole __cmp__ white/13 - keyword whole __hash__ white/13 - keyword whole __call__ white/13 - keyword whole __getattr__ white/13 - keyword whole __setattr__ white/13 - keyword whole __delattr__ white/13 - keyword whole __len__ white/13 - keyword whole __getitem__ white/13 - keyword whole __setitem__ white/13 - keyword whole __delitem__ white/13 - keyword whole __getslice__ white/13 - keyword whole __setslice__ white/13 - keyword whole __delslice__ white/13 - keyword whole __add__ white/13 - keyword whole __sub__ white/13 - keyword whole __mul__ white/13 - keyword whole __div__ white/13 - keyword whole __mod__ white/13 - keyword whole __divmod__ white/13 - keyword whole __pow__ white/13 - keyword whole __lshift__ white/13 - keyword whole __rshift__ white/13 - keyword whole __and__ white/13 - keyword whole __xor__ white/13 - keyword whole __or__ white/13 - keyword whole __neg__ white/13 - keyword whole __pos__ white/13 - keyword whole __abs__ white/13 - keyword whole __invert__ white/13 - keyword whole __nonzero__ white/13 - keyword whole __coerce__ white/13 - keyword whole __int__ white/13 - keyword whole __long__ white/13 - keyword whole __float__ white/13 - keyword whole __oct__ white/13 - keyword whole __hex__ white/13 + keyword whole __init__ lightgray/13 + keyword whole __del__ lightgray/13 + keyword whole __repr__ lightgray/13 + keyword whole __str__ lightgray/13 + keyword whole __cmp__ lightgray/13 + keyword whole __hash__ lightgray/13 + keyword whole __call__ lightgray/13 + keyword whole __getattr__ lightgray/13 + keyword whole __setattr__ lightgray/13 + keyword whole __delattr__ lightgray/13 + keyword whole __len__ lightgray/13 + keyword whole __getitem__ lightgray/13 + keyword whole __setitem__ lightgray/13 + keyword whole __delitem__ lightgray/13 + keyword whole __getslice__ lightgray/13 + keyword whole __setslice__ lightgray/13 + keyword whole __delslice__ lightgray/13 + keyword whole __add__ lightgray/13 + keyword whole __sub__ lightgray/13 + keyword whole __mul__ lightgray/13 + keyword whole __div__ lightgray/13 + keyword whole __mod__ lightgray/13 + keyword whole __divmod__ lightgray/13 + keyword whole __pow__ lightgray/13 + keyword whole __lshift__ lightgray/13 + keyword whole __rshift__ lightgray/13 + keyword whole __and__ lightgray/13 + keyword whole __xor__ lightgray/13 + keyword whole __or__ lightgray/13 + keyword whole __neg__ lightgray/13 + keyword whole __pos__ lightgray/13 + keyword whole __abs__ lightgray/13 + keyword whole __invert__ lightgray/13 + keyword whole __nonzero__ lightgray/13 + keyword whole __coerce__ lightgray/13 + keyword whole __int__ lightgray/13 + keyword whole __long__ lightgray/13 + keyword whole __float__ lightgray/13 + keyword whole __oct__ lightgray/13 + keyword whole __hex__ lightgray/13 - keyword whole __radd__ white/13 - keyword whole __rsub__ white/13 - keyword whole __rmul__ white/13 - keyword whole __rdiv__ white/13 - keyword whole __rmod__ white/13 - keyword whole __rdivmod__ white/13 - keyword whole __rpow__ white/13 - keyword whole __rlshift__ white/13 - keyword whole __rrshift__ white/13 - keyword whole __rand__ white/13 - keyword whole __rxor__ white/13 - keyword whole __ror__ white/13 + keyword whole __radd__ lightgray/13 + keyword whole __rsub__ lightgray/13 + keyword whole __rmul__ lightgray/13 + keyword whole __rdiv__ lightgray/13 + keyword whole __rmod__ lightgray/13 + keyword whole __rdivmod__ lightgray/13 + keyword whole __rpow__ lightgray/13 + keyword whole __rlshift__ lightgray/13 + keyword whole __rrshift__ lightgray/13 + keyword whole __rand__ lightgray/13 + keyword whole __rxor__ lightgray/13 + keyword whole __ror__ lightgray/13 - keyword whole __*__ brightred/18 + keyword whole __+__ brightred/18 context """ """ brown/22 spellcheck diff -ruN old/mc-4.5.42/syntax/sh.syntax new/mc-4.5.43/syntax/sh.syntax --- old/mc-4.5.42/syntax/sh.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/sh.syntax Sat Mar 18 08:43:49 2000 @@ -45,7 +45,7 @@ keyword $ brightgreen/16 - keyword wholeleft linestart function* brightblue/11 + keyword wholeleft linestart function*() brightblue/11 wholechars right abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ wholechars left abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._ @@ -175,6 +175,7 @@ context exclusive ` ` white/26 black/0 keyword '*' green/6 keyword " green/6 + keyword \\` green/6 keyword ; brightcyan/17 keyword $(*) brightgreen/16 keyword ${*} brightgreen/16 diff -ruN old/mc-4.5.42/syntax/swig.syntax new/mc-4.5.43/syntax/swig.syntax --- old/mc-4.5.42/syntax/swig.syntax Mon Dec 6 18:50:11 1999 +++ new/mc-4.5.43/syntax/swig.syntax Sat Mar 18 08:43:49 2000 @@ -1,5 +1,4 @@ context default - keyword whole linestart %addmethods red/orange keyword whole linestart %alpha red/orange keyword whole linestart %apply red/orange @@ -106,8 +105,13 @@ keyword /\* brown/22 keyword \*/ brown/22 - keyword '\s' brightgreen/16 - keyword '+' brightgreen/16 + keyword '\\\{"abtnvfr\}' brightgreen/16 + keyword '\\\{0123\}\{01234567\}\{01234567\}' brightgreen/16 + keyword '\\'' brightgreen/16 + keyword '\\\\' brightgreen/16 + keyword '\\0' brightgreen/16 + keyword '\{\s!"#$%&()\*\+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ\}' brightgreen/16 + keyword > yellow/24 keyword < yellow/24 keyword \+ yellow/24 @@ -127,6 +131,7 @@ keyword , brightcyan/14 keyword : brightcyan/14 keyword ; brightmagenta/19 + keyword #define\[\t\s\]\[ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_0123456789\]\[\t\s\]0x\[0123456789abcdefABCDEF\] brightred/18 context exclusive /\* \*/ brown/22 spellcheck context // \n brown/22 diff -ruN old/mc-4.5.42/vfs/ChangeLog new/mc-4.5.43/vfs/ChangeLog --- old/mc-4.5.42/vfs/ChangeLog Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/ChangeLog Sat Mar 18 08:43:43 2000 @@ -1,3 +1,114 @@ +2000-03-06 Pavel Machek + + Patch by Andrew V. Samoilov + + * vfs.c (vfs_parse_ls_lga): don't hard code st_ino and st_dev to 0's, + these variables must be assigned in vfs_s_new_inode () or extfs + layer, so ftpfs subdirectories now can be copied. + +2000-02-25 Pavel Machek + + Patch by Andrew V. Samoilov + + * vfs.[ch] (vfs_canon, mc_open, vfs_file_is_local, + mc_(un)?getlocalcopy): added const qualifier + (mc_def_getlocalcopy): tempnam() returns malloc()ed buffer, + so, free() it, not g_free(); + (vfs_canon): prepend filename by cwd when tilde '~' cannot be expanded; + +2000-02-23 Pavel Machek + + * cpio.c: cpio.h is missing, so don't try to include it. (It is + not needed, anyway. Strange.) + + * Makefile.in (NONETFILES): cpio added to compilation list + +2000-02-23 Norbert Warmuth + + * ftpfs.c: Definition of PORT changed in the middle of ftpfs.c + with unexpected side effects (only when HSC_PROXY was + defined). Introduce HSC_PROXY_PORT and FTP_COMMAND_PORT and use + where appropriate. + + (dir_load): Do not hard code the directory cache timeout to 10 + seconds. Instead use the setting from Options/Virtual VFS ... + + * fish.c (file_store): honour changed semantics for return value + (on error -1 is expected). + + * ftpfs.c (file_store): dito + +2000-02-22 Pavel Machek + + * cpio.c: added. Thanx to Jan Hudec , who wrote + it using code from tarfs. + +2000-02-21 Pavel Machek + + * extfs/uzip.in (nam): y2k fixes (workarounds) by + christian.gennerat@vz.cit.alcatel.fr + +2000-02-04 Pavel Machek + + * ftpfs.c (ftpfs_unlink, *): prepend / so that it actually works + +2000-02-03 Andrew V. Samoilov + + * xdirentry.h: added prototype for vfs_s_retrieve_file + +2000-01-31 Andrew V. Samoilov + + * direntry.c: (vfs_s_resolve_symlink, vfs_s_readlink) fixed segfaults + for broken symlinks like 2001 -> The Space Oddysea. + +2000-01-24 Pavel Machek + + * ftpfs.c: vfs semantics has some problems with ~s. What will + happen if we just don't go to home directory of user? (We used to + have /#ftp:hobit/~/ mean home directory of anonymous at + hobit. Thats pretty broken.) + + * direntry.c (vfs_s_find_entry_linear): don't sleep after showing + message + + * ftpfs.c: cosmetic fixes by Andrew V. Samoilov + +2000-01-18 Pavel Machek + + * ftpfs.c: cosmetic fixes + killed ugly infinite loop, patch + from Andrew V. Samoilov + +2000-01-13 Pavel Machek + + * extfs.c (extfs_chdir): removed unneeded statment, plus applied + cosmetics fixes from Andrew V. Samoilov + +2000-01-02 Martin Bialasinski + + * extfs/deb.in: Change to the deb vfs. tar has changed, and + depending on the version, it saves files as "./filename" or + "filename". + + * From debian: added deba, debd, dpkg, apt script file systems. + +1999-12-21 Pavel Roskin + + * vfs/vfs.h: use #warning only for gcc. Not all compilers + understand it + +1999-12-15 Pavel Machek + + * Merged changes by Andrew V. Samoilov . They are + mostly internationalization + fixing stupid bugs of mine + +1999-12-08 Pavel Machek + + * ftpfs.c: basically replaced ftpfs with new one. Unlike the + previous one, this uses new direntry.c layer, so shared_ftp_fish.c + can be killed. + + This is new code, so beware. + 1999-11-11 Pavel Machek * shared_ftp_fish.c (s_ungetlocalcopy): need to supply some return diff -ruN old/mc-4.5.42/vfs/Make-mc.in new/mc-4.5.43/vfs/Make-mc.in --- old/mc-4.5.42/vfs/Make-mc.in Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/Make-mc.in Sat Mar 18 08:43:43 2000 @@ -161,6 +161,7 @@ NONETFILES = \ container.o \ + cpio.o \ direntry.o \ extfs.o \ local.o \ @@ -171,6 +172,7 @@ VFSSRCS = \ container.c \ + cpio.c \ direntry.c \ extfs.c \ ftpfs.c \ @@ -225,7 +227,11 @@ uzip.in EXTFS_OUT = \ + apt \ deb \ + deba \ + debd \ + dpkg \ lslR \ ucpio \ urar \ @@ -243,7 +249,7 @@ # VFSSOOBJS = tcputil.so fish.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so \ - tar.so sfs.so names.so container.so extfs.so util-alone.so \ + tar.so cpio.so sfs.so names.so container.so extfs.so util-alone.so \ util.sor utilunix.sor direntry.so %.sor: ../src/%.c diff -ruN old/mc-4.5.42/vfs/cpio.c new/mc-4.5.43/vfs/cpio.c --- old/mc-4.5.42/vfs/cpio.c Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.43/vfs/cpio.c Sat Mar 18 08:43:43 2000 @@ -0,0 +1,670 @@ +/* Virtual File System: GNU Tar file system. + Copyright (C) 2000 The Free Software Foundation + + Written by: 2000 Jan Hudec + + $Id: cpio.c,v 1.4 2000/02/25 12:53:06 pavel Exp $ + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License + as published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include "xdirentry.h" +#include "../src/util.h" +#include +#include +#ifdef SCO_FLAVOR +#include +#endif /* SCO_FLAVOR */ +#include + +/* #include "utilvfs.h" */ + +#include "../src/dialog.h" +//#include "cpio.h" +#include "names.h" + +enum { + STATUS_START, + STATUS_OK, + STATUS_TRAIL, + STATUS_FAIL, + STATUS_EOF +}; + +enum { + CPIO_UNKNOWN = 0, /* Not determined yet */ + CPIO_BIN, /* Binary format */ + CPIO_BINRE, /* Binary format, reverse endianity */ + CPIO_OLDC, /* Old ASCII format */ + CPIO_NEWC, /* New ASCII format */ + CPIO_CRC /* New ASCII format + CRC */ +}; + +struct old_cpio_header +{ + unsigned short c_magic; + short c_dev; + unsigned short c_ino; + unsigned short c_mode; + unsigned short c_uid; + unsigned short c_gid; + unsigned short c_nlink; + short c_rdev; + unsigned short c_mtimes[2]; + unsigned short c_namesize; + unsigned short c_filesizes[2]; +}; + +struct new_cpio_header +{ + unsigned short c_magic; + unsigned long c_ino; + unsigned long c_mode; + unsigned long c_uid; + unsigned long c_gid; + unsigned long c_nlink; + unsigned long c_mtime; + unsigned long c_filesize; + long c_dev; + long c_devmin; + long c_rdev; + long c_rdevmin; + unsigned long c_namesize; + unsigned long c_chksum; +}; + +struct defer_inode { + struct defer_inode *next; + unsigned long inumber; + unsigned short device; + vfs_s_inode *inode; +}; + +static int cpio_position; + +static int cpio_find_head(vfs *me, vfs_s_super *super); +static int cpio_read_bin_head(vfs *me, vfs_s_super *super); +static int cpio_read_oldc_head(vfs *me, vfs_s_super *super); +static int cpio_read_crc_head(vfs *me, vfs_s_super *super); +static int cpio_create_entry(vfs *me, vfs_s_super *super, struct stat *stat, char *name); +static int cpio_read(void *fh, char *buffer, int count); + +#define CPIO_POS(super) cpio_position +//#define CPIO_POS(super) (super)->u.cpio.fd /* If some time reentrancy should be needed */ + +#define CPIO_SEEK_SET(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) = (where), SEEK_SET) +#define CPIO_SEEK_CUR(super, where) mc_lseek((super)->u.cpio.fd, CPIO_POS(super) += (where), SEEK_SET) + +struct defer_inode * defer_find(struct defer_inode *l, struct defer_inode *i) +{ + if(!l) return NULL; + return l->inumber == i->inumber && l->device == i->device ? l : + defer_find(l->next, i); +} + +static int cpio_skip_padding(vfs_s_super *super) +{ + switch(super->u.cpio.type) { + case CPIO_BIN: + case CPIO_BINRE: + return CPIO_SEEK_CUR(super, (2 - (CPIO_POS(super) % 2)) % 2); + case CPIO_NEWC: + case CPIO_CRC: + return CPIO_SEEK_CUR(super, (4 - (CPIO_POS(super) % 4)) % 4); + } +} + +static void cpio_free_archive(vfs *me, vfs_s_super *super) +{ + if(super->u.cpio.fd != -1) + mc_close(super->u.cpio.fd); +} + +static int cpio_open_cpio_file(vfs *me, vfs_s_super *super, char *name) +{ + int fd, size, type; + mode_t mode; + vfs_s_inode *root; + + if((fd = mc_open(name, O_RDONLY)) == -1) { + message_2s(1, MSG_ERROR, _("Couldn't open cpio archive\n%s"), name); + return -1; + } + + super->name = g_strdup(name); + super->u.cpio.fd = -1; /* for now */ + mc_stat(name, &(super->u.cpio.stat)); + super->u.cpio.type = CPIO_UNKNOWN; + + size = is_gunzipable(fd, &type); + if(size > 0) { + char *s; + + mc_close(fd); + s = g_strconcat(name, decompress_extension(type), NULL); + if((fd = mc_open(s, O_RDONLY)) == -1) { + message_2s(1, MSG_ERROR, _("Couldn't open cpio archive\n%s"), s); + g_free(s); + return -1; + } + g_free(s); + } + + super->u.cpio.fd = fd; + mode = super->u.cpio.stat.st_mode & 07777; + mode |= (mode & 0444) >> 2; /* set eXec where Read is */ + mode |= S_IFDIR; + + root = vfs_s_new_inode(me, super, &(super->u.cpio.stat)); + root->st.st_mode = mode; + root->u.cpio.offset = -1; + root->st.st_nlink++; + root->st.st_dev = MEDATA->rdev++; + + vfs_s_add_dots(me, root, NULL); + super->root = root; + + CPIO_SEEK_SET(super, 0); + + return fd; +} + +static int cpio_read_head(vfs *me, vfs_s_super *super) +{ + cpio_find_head(me, super); + switch(super->u.cpio.type) { + case CPIO_UNKNOWN: + return -1; + case CPIO_BIN: + case CPIO_BINRE: + return cpio_read_bin_head(me, super); + case CPIO_OLDC: + return cpio_read_oldc_head(me, super); + case CPIO_NEWC: + case CPIO_CRC: + return cpio_read_crc_head(me, super); + default: + g_assert_not_reached(); + return 42; /* & the compiler is happy :-) */ + } +} + +#define MAGIC_LENGTH (6) /* How many bytes we have to read ahead */ +#define SEEKBACK CPIO_SEEK_CUR(super, ptr - top) +#define RETURN(x) return(super->u.cpio.type = (x)) +#define TYPEIS(x) ((super->u.cpio.type == CPIO_UNKNOWN) || (super->u.cpio.type == (x))) +static int cpio_find_head(vfs *me, vfs_s_super *super) +{ + char buf[256]; + int ptr = 0; + int top = 0; + int tmp; + + top = mc_read(super->u.cpio.fd, buf, 256); + CPIO_POS(super) += top; + for(;;) { + if(ptr + MAGIC_LENGTH >= top) { + if(top > 128) { + memmove(buf, buf + top - 128, 128); + top = 128; + ptr -= top - 128; + } + if((tmp = mc_read(super->u.cpio.fd, buf, top)) == 0 || tmp == -1) { + message_2s(1, MSG_ERROR, _("Premature end of cpio archive\n%s"), super->name); + cpio_free_archive(me, super); + return CPIO_UNKNOWN; + } + top += tmp; + } + if(TYPEIS(CPIO_BIN) && ((*(unsigned short *)(buf + ptr)) == 070707)) { + SEEKBACK; RETURN(CPIO_BIN); + } else if(TYPEIS(CPIO_BINRE) && ((*(unsigned short *)(buf + ptr)) == GUINT16_SWAP_LE_BE_CONSTANT(070707))) { + SEEKBACK; RETURN(CPIO_BINRE); + } else if(TYPEIS(CPIO_OLDC) && (!strncmp(buf + ptr, "070707", 6))) { + SEEKBACK; RETURN(CPIO_OLDC); + } else if(TYPEIS(CPIO_NEWC) && (!strncmp(buf + ptr, "070701", 6))) { + SEEKBACK; RETURN(CPIO_NEWC); + } else if(TYPEIS(CPIO_CRC) && (!strncmp(buf + ptr, "070702", 6))) { + SEEKBACK; RETURN(CPIO_CRC); + }; + ptr++; + } +} +#undef RETURN +#undef SEEKBACK + +#define HEAD_LENGTH (26) +static int cpio_read_bin_head(vfs *me, vfs_s_super *super) +{ + struct old_cpio_header buf; + int len; + char *name; + struct stat stat; + + if((len = mc_read(super->u.cpio.fd, (char *)&buf, HEAD_LENGTH)) < HEAD_LENGTH) + return STATUS_EOF; + CPIO_POS(super) += len; + if(super->u.cpio.type == CPIO_BINRE) { + int i; + for(i = 0; i < (HEAD_LENGTH >> 1); i++) + ((short *)&buf)[i] = GUINT16_SWAP_LE_BE(((short *)&buf)[i]); + } + g_assert(buf.c_magic == 070707); + + name = g_malloc(buf.c_namesize); + if((len = mc_read(super->u.cpio.fd, name, buf.c_namesize)) < buf.c_namesize) + return STATUS_EOF; + + CPIO_POS(super) += len; + cpio_skip_padding(super); + + if(!strcmp("TRAILER!!!", name)) { /* We got to the last record */ + g_free(name); + return STATUS_TRAIL; + } + + stat.st_dev = buf.c_dev; + stat.st_ino = buf.c_ino; + stat.st_mode = buf.c_mode; + stat.st_nlink = buf.c_nlink; + stat.st_uid = buf.c_uid; + stat.st_gid = buf.c_gid; + stat.st_rdev = buf.c_rdev; + stat.st_size = (buf.c_filesizes[0] << 16) | buf.c_filesizes[1]; + stat.st_atime = stat.st_mtime = stat.st_ctime = (buf.c_mtimes[0] << 16) | buf.c_mtimes[1]; + + return cpio_create_entry(me, super, &stat, name); +} +#undef HEAD_LENGTH + +#define HEAD_LENGTH (76) +static int cpio_read_oldc_head(vfs *me, vfs_s_super *super) +{ + struct new_cpio_header hd; + struct stat stat; + char *buf[HEAD_LENGTH + 1]; + int len; + char *name; + + if((len = mc_read(super->u.cpio.fd, (void *)buf, HEAD_LENGTH)) < HEAD_LENGTH) + return STATUS_EOF; + CPIO_POS(super) += len; + buf[HEAD_LENGTH + 1] = 0; + + if(sscanf((void *)buf, "070707%6lo%6lo%6lo%6lo%6lo%6lo%6lo%11lo%6lo%11lo", + &hd.c_dev, &hd.c_ino, &hd.c_mode, &hd.c_uid, &hd.c_gid, + &hd.c_nlink, &hd.c_rdev, &hd.c_mtime, + &hd.c_namesize, &hd.c_filesize) < 10) { + message_2s(1, MSG_ERROR, _("Corrupt cpio header encountered in\n%s"), super->name); + return STATUS_FAIL; + } + + name = g_malloc(hd.c_namesize); + if((len = mc_read(super->u.cpio.fd, name, hd.c_namesize)) < hd.c_namesize) + return STATUS_EOF; + + CPIO_POS(super) += len; + cpio_skip_padding(super); + + if(!strcmp("TRAILER!!!", name)) { /* We got to the last record */ + g_free(name); + return STATUS_TRAIL; + } + + stat.st_dev = hd.c_dev; + stat.st_ino = hd.c_ino; + stat.st_mode = hd.c_mode; + stat.st_nlink = hd.c_nlink; + stat.st_uid = hd.c_uid; + stat.st_gid = hd.c_gid; + stat.st_rdev = hd.c_rdev; + stat.st_size = hd.c_filesize; + stat.st_atime = stat.st_mtime = stat.st_ctime = hd.c_mtime; + + return cpio_create_entry(me, super, &stat, name); +} +#undef HEAD_LENGTH + +#define HEAD_LENGTH (110) +static int cpio_read_crc_head(vfs *me, vfs_s_super *super) +{ + struct new_cpio_header hd; + struct stat stat; + char buf[HEAD_LENGTH + 1]; + int len; + char *name; + + if((len = mc_read(super->u.cpio.fd, buf, HEAD_LENGTH)) < HEAD_LENGTH) + return STATUS_EOF; + CPIO_POS(super) += len; + buf[HEAD_LENGTH + 1] = 0; + + if(sscanf(buf, "%6ho%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx%8lx", + &hd.c_magic, &hd.c_ino, &hd.c_mode, &hd.c_uid, &hd.c_gid, + &hd.c_nlink, &hd.c_mtime, &hd.c_filesize, + &hd.c_dev, &hd.c_devmin, &hd.c_rdev, &hd.c_rdevmin, + &hd.c_namesize, &hd.c_chksum) < 14) { + message_2s(1, MSG_ERROR, _("Corrupt cpio header encountered in\n%s"), super->name); + return STATUS_FAIL; + } + + if((super->u.cpio.type == CPIO_NEWC && hd.c_magic != 070701) || + (super->u.cpio.type == CPIO_CRC && hd.c_magic != 070702)) + return STATUS_FAIL; + + name = g_malloc(hd.c_namesize); + if((len = mc_read(super->u.cpio.fd, name, hd.c_namesize)) < hd.c_namesize) + return STATUS_EOF; + + CPIO_POS(super) += len; + cpio_skip_padding(super); + + if(!strcmp("TRAILER!!!", name)) { /* We got to the last record */ + g_free(name); + return STATUS_TRAIL; + } + + stat.st_dev = (hd.c_dev << 8) + hd.c_devmin; + stat.st_ino = hd.c_ino; + stat.st_mode = hd.c_mode; + stat.st_nlink = hd.c_nlink; + stat.st_uid = hd.c_uid; + stat.st_gid = hd.c_gid; + stat.st_rdev = (hd.c_rdev << 8) + hd.c_rdevmin; + stat.st_size = hd.c_filesize; + stat.st_atime = stat.st_mtime = stat.st_ctime = hd.c_mtime; + + return cpio_create_entry(me, super, &stat, name); +} + +static int cpio_create_entry(vfs *me, vfs_s_super *super, struct stat *stat, char *name) +{ + vfs_s_inode *inode = NULL; + vfs_s_inode *root = super->root; + vfs_s_entry *entry = NULL; + char *tn; + + switch (stat->st_mode & S_IFMT) { /* For case of HP/UX archives */ + case S_IFCHR: + case S_IFBLK: +#ifdef S_IFSOCK + case S_IFSOCK: +#endif +#ifdef S_IFIFO + case S_IFIFO: +#endif + if((stat->st_size != 0) && + (stat->st_rdev == 0x0001)) { + stat->st_rdev = (unsigned) stat->st_size; + stat->st_size = 0; + } + break; + default: + break; + } + + if((stat->st_nlink > 1) && + (super->u.cpio.type == CPIO_NEWC || + super->u.cpio.type == CPIO_CRC)) { /* For case of harlinked files */ + struct defer_inode i, *l; + i.inumber = stat->st_ino; + i.device = stat->st_dev; + i.inode = NULL; + if((l = defer_find(super->u.cpio.defered, &i)) != NULL) { + inode = l->inode; + if(inode->st.st_size && stat->st_size && (inode->st.st_size != stat->st_size)) { + message_3s(1, MSG_ERROR, _("Inconsistent hardlinks of\n%s\nin cpio archive\n%s"), + name, super->name); + inode = NULL; + } + } + } + + while(name[strlen(name)-1] == PATH_SEP) name[strlen(name)-1] = 0; + if((tn = strrchr(name, PATH_SEP))) { + *tn = 0; + root = vfs_s_find_inode(me, root, name, LINK_FOLLOW, FL_MKDIR); /* CHECKME! What function here? */ + *tn = PATH_SEP; + tn++; + } else + tn = name; + + entry = vfs_s_find_entry_tree(me, root, tn, LINK_FOLLOW, FL_NONE); /* In case entry is already there */ + + if(entry) { /* This shouldn't happen! (well, it can happen if there is a record for a + file and than a record for a directory it is in; cpio would die with + 'No such file or directory' is such case) */ + + if(!S_ISDIR(entry->ino->st.st_mode)) { /* This can be considered archive inconsistency */ + message_2s(1, MSG_ERROR, _("%s contains duplicit entries! Skiping!"), super->name); + } else { + entry->ino->st.st_mode = stat->st_mode; + entry->ino->st.st_uid = stat->st_uid; + entry->ino->st.st_gid = stat->st_gid; + entry->ino->st.st_atime = stat->st_atime; + entry->ino->st.st_mtime = stat->st_mtime; + entry->ino->st.st_ctime = stat->st_ctime; + } + + } else { /* !entry */ + + if(!inode) { + inode = vfs_s_new_inode(me, super, stat); + if((stat->st_nlink > 0) && + (super->u.cpio.type == CPIO_NEWC || + super->u.cpio.type == CPIO_CRC)) { /* For case of hardlinked files */ + struct defer_inode *i; + i = g_new(struct defer_inode, 1); + i->inumber = stat->st_ino; + i->device = stat->st_dev; + i->inode = inode; + i->next = super->u.cpio.defered; + super->u.cpio.defered = i; + } + } + + if(stat->st_size) + inode->u.cpio.offset = CPIO_POS(super); + + entry = vfs_s_new_entry(me, tn, inode); + vfs_s_insert_entry(me, root, entry); + + if(S_ISDIR(stat->st_mode)) + vfs_s_add_dots(me, inode, root); + + if(S_ISLNK(stat->st_mode)) { + inode->linkname = g_malloc(stat->st_size + 1); + if(mc_read(super->u.cpio.fd, inode->linkname, stat->st_size) < stat->st_size) { + inode->linkname[0] = 0; + return STATUS_EOF; + } + inode->linkname[stat->st_size] = 0; /* Linkname stored without terminating \0 !!! */ + cpio_skip_padding(super); + } else { + CPIO_SEEK_CUR(super, stat->st_size); + } + + } /* !entry */ + + return STATUS_OK; +} + +/* Need to CPIO_SEEK_CUR to skip the file at the end of add entry!!!! */ + +static int cpio_open_archive(vfs *me, vfs_s_super *super, char *name, char *op) +{ + int status = STATUS_START; + + if(cpio_open_cpio_file(me, super, name) == -1) + return -1; + + for(;;) { + status = cpio_read_head(me, super); + + switch(status) { + case STATUS_EOF: + message_2s(1, MSG_ERROR, _("Unexpected end of file\n%s"), name); + return 0; + case STATUS_OK: + continue; + case STATUS_TRAIL: + break; + } + break; + } + + return 0; +} + +/* Remaining functions are exactly same as for tarfs (and were in fact just copied) */ +void *cpio_super_check(vfs *me, char *archive_name, char *op) +{ + static struct stat sb; + if(mc_stat(archive_name, &sb)) + return NULL; + return &sb; +} + +int cpio_super_same(vfs *me, struct vfs_s_super *parc, char *archive_name, char *op, void *cookie) +{ + struct stat *archive_stat = cookie; /* stat of main archive */ + + if(strcmp(parc->name, archive_name)) return 0; + + if(vfs_uid && (!(archive_stat->st_mode & 0004))) + if((archive_stat->st_gid != vfs_gid) || !(archive_stat->st_mode & 0040)) + if((archive_stat->st_uid != vfs_uid) || !(archive_stat->st_mode & 0400)) + return 0; +/* Has the cached archive been changed on the disk? */ + if(parc->u.cpio.stat.st_mtime < archive_stat->st_mtime) { /* Yes, reload! */ + (*vfs_cpiofs_ops.free) ((vfsid) parc); + vfs_rmstamp (&vfs_cpiofs_ops, (vfsid) parc, 0); + return 2; + } + /* Hasn't been modified, give it a new timeout */ + vfs_stamp (&vfs_cpiofs_ops, (vfsid) parc); + return 1; +} + +static int cpio_read(void *fh, char *buffer, int count) +{ + off_t begin = FH->ino->u.tar.data_offset; + int fd = FH_SUPER->u.tar.fd; + vfs *me = FH_SUPER->me; + + if (mc_lseek (fd, begin + FH->pos, SEEK_SET) != + begin + FH->pos) ERRNOR (EIO, -1); + + count = MIN(count, FH->ino->st.st_size - FH->pos); + + if ((count = mc_read (fd, buffer, count)) == -1) ERRNOR (errno, -1); + + FH->pos += count; + return count; +} + +static void cpio_ungetlocalcopy(vfs *me, char *path, char *local, int has_changed) +{ +/* We do just nothing. (We are read only and do not need to free local, + since it will be freed when tar archive will be freed */ +} + +static int cpio_fh_open(vfs *me, vfs_s_fh *fh, int flags, int mode) +{ + if ((flags & O_ACCMODE) != O_RDONLY) ERRNOR (EROFS, -1); + return 0; +} + +static struct vfs_s_data cpiofs_data = { + NULL, + 0, + 0, + NULL, + + NULL, /* init inode */ + NULL, /* free inode */ + NULL, /* init entry */ + + cpio_super_check, + cpio_super_same, + cpio_open_archive, + cpio_free_archive, + + cpio_fh_open, + NULL, + + vfs_s_find_entry_tree, + NULL, + NULL + /* ??? */ +}; + +vfs vfs_cpiofs_ops = { + NULL, /* next pointer */ + "CPIO dearchiver", + 0, /* flags */ + "ucpio", /* prefix */ + &cpiofs_data, /* vfs_s_data */ + 0, /* errno */ + + NULL, + NULL, + vfs_s_fill_names, + + NULL, + + vfs_s_open, + vfs_s_close, + cpio_read, + NULL, + + vfs_s_opendir, + vfs_s_readdir, + vfs_s_closedir, + vfs_s_telldir, + vfs_s_seekdir, + + vfs_s_stat, + vfs_s_lstat, + vfs_s_fstat, + + NULL, + NULL, + NULL, + + vfs_s_readlink, + NULL, + NULL, + NULL, + + NULL, + vfs_s_chdir, + vfs_s_ferrno, + vfs_s_lseek, + NULL, + + vfs_s_getid, + vfs_s_nothingisopen, + vfs_s_free, + + vfs_s_getlocalcopy, + cpio_ungetlocalcopy, + + NULL, + NULL, + NULL, + NULL + +MMAPNULL +}; diff -ruN old/mc-4.5.42/vfs/direntry.c new/mc-4.5.43/vfs/direntry.c --- old/mc-4.5.42/vfs/direntry.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/direntry.c Sat Mar 18 08:43:43 2000 @@ -3,6 +3,8 @@ * * Written at 1998 by Pavel Machek , distribute under LGPL. * + * $Id: direntry.c,v 1.27 2000/01/31 13:48:00 pavel Exp $ + * * Very loosely based on tar.c from midnight and archives.[ch] from * avfs by Miklos Szeredi (mszeredi@inf.bme.hu) * @@ -41,7 +43,6 @@ if (!ino) return NULL; - ino->linkname = ino->localname = NULL; ino->subdir = NULL; if (initstat) @@ -191,7 +192,6 @@ vfs_s_generate_entry (vfs *me, char *name, struct vfs_s_inode *parent, mode_t mode) { struct vfs_s_inode *inode; - struct vfs_s_entry *entry; struct stat *st; st = vfs_s_default_stat (me, mode); @@ -199,9 +199,7 @@ if (S_ISDIR (mode)) vfs_s_add_dots (me, inode, parent); - entry = vfs_s_new_entry (me, name, inode); - - return entry; + return vfs_s_new_entry (me, name, inode); } /* We were asked to create entries automagically */ @@ -298,13 +296,11 @@ if (!(flags & FL_DIR)){ char *dirname, *name, *save; vfs_s_inode *ino; - vfs_s_entry *ent; split_dir_name (me, path, &dirname, &name, &save); ino = vfs_s_find_inode (me, root, dirname, follow, flags | FL_DIR); if (save) *save = PATH_SEP; - ent = vfs_s_find_entry_tree (me, ino, name, follow, flags); - return ent; + return vfs_s_find_entry_tree (me, ino, name, follow, flags); } for (ent = root->subdir; ent != NULL; ent = ent->next) @@ -313,8 +309,7 @@ if (ent && (! (MEDATA->dir_uptodate) (me, ent->ino))){ #if 1 - print_vfs_message ("Dir cache expired for %s", path); - sleep(1); + print_vfs_message (_("Dir cache expired for %s"), path); #endif vfs_s_free_entry (me, ent); ent = NULL; @@ -374,6 +369,9 @@ linkname = entry->ino->linkname; + if (linkname == NULL) + ERRNOR (EFAULT, NULL); + if (MEDATA->find_entry == vfs_s_find_entry_linear) { if (*linkname == PATH_SEP) return (MEDATA->find_entry) (me, entry->dir->super->root, linkname, follow - 1, 0); @@ -440,13 +438,13 @@ super->root = NULL; } -#if 1 - /* We currently leak small ammount of memory, sometimes. Fix it if you can. */ +#if 0 + /* FIXME: We currently leak small ammount of memory, sometimes. Fix it if you can. */ if (super->ino_usage) - message_1s1d (1, " Direntry warning ", "Super ino_usage is %d, memory leak", super->ino_usage); + message_1s1d (1, _(" Direntry warning "), _("Super ino_usage is %d, memory leak"), super->ino_usage); if (super->want_stale) - message_1s (1, " Direntry warning ", "Super has want_stale set"); + message_1s (1, _(" Direntry warning "), _("Super has want_stale set")); #endif if (super->prevp){ @@ -534,11 +532,10 @@ { char *buf = g_strdup( inname ); char *res = vfs_s_get_path_mangle (me, buf, archive, flags); - char *res2 = NULL; if (res) - res2 = g_strdup(res); + res = g_strdup(res); g_free(buf); - return res2; + return res; } void @@ -557,8 +554,6 @@ if (MEDATA->find_entry != vfs_s_find_entry_linear) vfs_die ("Implement me!"); if (!ino->ent) /* That must be directory... */ - - if (!ino->ent) ERRNOR (EAGAIN, NULL); if ((!ino->ent->dir) || (!ino->ent->dir->ent)) /* It must be directory */ @@ -584,16 +579,12 @@ vfs_s_inode_from_path (vfs *me, char *name, int flags) { struct vfs_s_super *super; - struct vfs_s_inode *ino; char *q; if (!(q = vfs_s_get_path_mangle (me, name, &super, 0))) return NULL; - ino = vfs_s_find_inode (me, super->root, q, flags & FL_FOLLOW ? LINK_FOLLOW : LINK_NO_FOLLOW, flags & ~FL_FOLLOW); - if (ino) return ino; - - return ino; + return vfs_s_find_inode (me, super->root, q, flags & FL_FOLLOW ? LINK_FOLLOW : LINK_NO_FOLLOW, flags & ~FL_FOLLOW); } @@ -745,6 +736,10 @@ if (!S_ISLNK (ino->st.st_mode)) ERRNOR (EINVAL, -1); + + if (ino->linkname == NULL) + ERRNOR (EFAULT, -1); + strncpy (buf, ino->linkname, size); *(buf+size-1) = 0; return strlen (buf); @@ -823,7 +818,7 @@ vfs *me = FH_SUPER->me; if (FH->linear == LS_LINEAR_CLOSED){ - print_vfs_message ("Starting linear transfer..."); + print_vfs_message (_("Starting linear transfer...")); if (!MEDATA->linear_start (me, FH, 0)) return -1; } @@ -960,15 +955,13 @@ /* Clear the interrupt status */ - while (1) { - n = MEDATA->linear_read (me, &fh, buffer, sizeof(buffer)); + while ((n = MEDATA->linear_read (me, &fh, buffer, sizeof(buffer)))) { + if (n < 0) goto error_1; - if (!n) - break; total += n; - vfs_print_stats (me->name, "Getting file", ino->ent->name, total, stat_size); + vfs_print_stats (me->name, _("Getting file"), ino->ent->name, total, stat_size); if (write(handle, buffer, n) < 0) { me->verrno = errno; @@ -1022,20 +1015,16 @@ printf ("%s %s %d ", prefix, S_ISDIR (ino->st.st_mode) ? "DIR" : "FILE", ino->st.st_mode); if (!ino->subdir) printf ("FILE\n"); - else { struct vfs_s_entry *ent; - ent = ino->subdir; - while (ent){ - char *s; - s = g_strconcat (prefix, "/", ent->name, NULL); + for (ent = ino->subdir; ent ; ent = ent->next){ + char *s = g_strconcat (prefix, "/", ent->name, NULL); if (ent->name[0] == '.') printf ("%s IGNORED\n", s); else vfs_s_dump (me, s, ent->ino); g_free(s); - ent = ent->next; } } } @@ -1181,7 +1170,7 @@ vfs_s_get_line_interruptible (vfs *me, char *buffer, int size, int fd) { int n; - int i = 0; + int i; enable_interrupt_key (); for (i = 0; i < size-1; i++){ diff -ruN old/mc-4.5.42/vfs/extfs/deb.in new/mc-4.5.43/vfs/extfs/deb.in --- old/mc-4.5.42/vfs/extfs/deb.in Mon Dec 6 18:49:56 1999 +++ new/mc-4.5.43/vfs/extfs/deb.in Sat Mar 18 08:43:43 2000 @@ -12,6 +12,8 @@ # (add by Michael Bramer Debian-mc-maintainer ) # (to allow access to package control files) # +# Modified by Martin Bialasinski 1999 +# (deal with change in tar format) # # # Copyright (C) 1997 Free Software Foundation @@ -131,8 +133,9 @@ } else { + # files can be prepended with ./ or not, depending on the version of tar $filename=~s!^CONTENTS/!!; - system("dpkg-deb --fsys-tarfile $archive | tar xOf - $filename > $destfile"); + system("dpkg-deb --fsys-tarfile $archive | tar xOf - $filename ./$filename > $destfile 2>/dev/null"); } } @@ -167,7 +170,7 @@ $pressinstall=< "$3"; exit 0;; INFO/CHANGELOG) rpm -qp --qf "[* %{CHANGELOGTIME:date} %{CHANGELOGNAME}\n%{CHANGELOGTEXT}\n\n]\n" "$1" > "$3"; exit 0;; INFO/SIZE) rpm -qp --qf "%{SIZE} bytes\n" "$1" > "$3"; exit 0;; - *) - TMPDIR=/tmp/mctmpdir.$$ - mkdir $TMPDIR || exit 1 - cd $TMPDIR - rpm2cpio "$1" | cpio -iumd --quiet "$2" >/dev/null - mv "$2" "$3" - cd / - rm -rf $TMPDIR;; + CONTENTS.cpio) rpm2cpio "$1" > "$3"; exit 0;; esac } diff -ruN old/mc-4.5.42/vfs/extfs/uzip.in new/mc-4.5.43/vfs/extfs/uzip.in --- old/mc-4.5.42/vfs/extfs/uzip.in Mon Dec 6 18:49:56 1999 +++ new/mc-4.5.43/vfs/extfs/uzip.in Sat Mar 18 08:43:43 2000 @@ -64,10 +64,14 @@ if (hyphens < 1) next; if ($8 ~ /^\^/) $8=substr($8, 2) +## Y2K patch. if Year>=2000, unzip returns Year>=100 +split($5, a, "-") +if (a[3] > 99) + a[3] = substr(a[3],2) if ($8 ~ /\/$/) - printf "drwxr-xr-x 1 %-8d %-8d %8d %s %s %s\n", uid, 0, $1, $5, $6, $8 + printf "drwxr-xr-x 1 %-8d %-8d %8d %s-%s-%s %s %s\n", uid, 0, $1, a[1],a[2],a[3], $6, $8 else - printf "-rw-r--r-- 1 %-8d %-8d %8d %s %s %s\n", uid, 0, $1, $5, $6, substr($0, index($0, $7) + length($7 " ") -1 ) + printf "-rw-r--r-- 1 %-8d %-8d %8d %s-%s-%s %s %s\n", uid, 0, $1, a[1],a[2],a[3], $6, $8 }' 2>/dev/null fi } @@ -122,7 +126,7 @@ umask 077 -#echo "`date +%T` ${0##*/} $1 $2 to=$3 tmp=$4" >>/tmp/${0##*/}.log +#echo "`date +%T` ${0##*/} $1 $2 to=$3 tmp=$4" >>~/tmp/${0##*/}.log case "$1" in list) mczipfs_list "$2"; exit 0;; rm) mczipfs_rm "$2" "$3" ; exit 0;; diff -ruN old/mc-4.5.42/vfs/extfs.c new/mc-4.5.43/vfs/extfs.c --- old/mc-4.5.42/vfs/extfs.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/extfs.c Sat Mar 18 08:43:43 2000 @@ -5,6 +5,8 @@ Rewritten by: 1998 Pavel Machek Additional changes by: 1999 Andrew T. Veliath + $Id: extfs.c,v 1.32 2000/01/13 15:15:42 pavel Exp $ + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of @@ -208,9 +210,9 @@ " list ", local_name ? local_name : tmp, NULL); if (tmp) g_free (tmp); + g_free (mc_extfsdir); result = popen (cmd, "r"); g_free (cmd); - g_free (mc_extfsdir); if (result == NULL) { if (local_name != NULL && uses_archive) mc_ungetlocalcopy (name, local_name, 0); @@ -282,7 +284,7 @@ if (*cfn == '/') cfn++; p = strchr (cfn, 0); - if (p != NULL && p != cfn && *(p - 1) == '/') + if (p != cfn && *(p - 1) == '/') *(p - 1) = 0; p = strrchr (cfn, '/'); if (p == NULL) { @@ -367,7 +369,7 @@ } pclose (extfsd); #ifdef SCO_FLAVOR - waitpid(-1,NULL,WNOHANG); + waitpid(-1,NULL,WNOHANG); #endif /* SCO_FLAVOR */ *pparc = current_archive; g_free (buffer); @@ -395,10 +397,10 @@ fstype = extfs_which( NULL, op ); /* FIXME: we really should pass self pointer. But as we know that extfs_which does not touch vfs *me, it does not matter for now */ - if (!local) - local = ""; if (fstype == -1) return NULL; + if (!local) + local = ""; /* All filesystems should have some local archive, at least * it can be '/'. @@ -463,11 +465,11 @@ } if (len == 0) - return g_strdup (""); + return g_strdup (""); localpath = g_malloc (len); *localpath = '\0'; - for ( ; head; ) { + while (head) { strcat (localpath, head->name); if (head->next) strcat (localpath, "/"); @@ -564,6 +566,7 @@ if ((p = get_path (file, &archive, 0, 0)) == NULL) return; q = name_quote (p, 0); + g_free (p); archive_name = name_quote (get_archive_name(archive), 0); mc_extfsdir = concat_dir_and_file (mc_home, "extfs/"); @@ -578,7 +581,6 @@ vfs_die( "shell_execute: implement me!" ); #endif g_free(cmd); - g_free(p); } static void *extfs_open (vfs *me, char *file, int flags, int mode) @@ -609,7 +611,7 @@ handle = open(entry->inode->local_filename, O_RDWR | O_CREAT | O_EXCL, 0600); if (handle == -1) - return NULL; + return NULL; close(handle); } p = get_path_from_entry (entry); @@ -687,18 +689,19 @@ file->entry->inode->local_filename, NULL); g_free (archive_name); g_free (file_name); + g_free (mc_extfsdir); if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, shell, cmd)) errno_code = EIO; g_free (cmd); - g_free (mc_extfsdir); - { - struct stat file_status; - if( stat(file->entry->inode->local_filename,&file_status) != 0 ) - errno_code = EIO; - else file->entry->inode->size = file_status.st_size; - } + { + struct stat file_status; + if (stat(file->entry->inode->local_filename,&file_status) != 0) + errno_code = EIO; + else + file->entry->inode->size = file_status.st_size; + } - file->entry->inode->mtime = time (NULL); + file->entry->inode->mtime = time (NULL); } file->archive->fd_usage--; @@ -769,9 +772,9 @@ g_free (mc_extfsdir); g_free (archive_name); if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, shell, cmd)){ - g_free (cmd); - my_errno = EIO; - return -1; + g_free (cmd); + my_errno = EIO; + return -1; } g_free (cmd); remove_entry (entry); @@ -789,12 +792,12 @@ char *archive_name, *p; if ((q = get_path_mangle (path, &archive, 0, 0)) == NULL) - return -1; + return -1; entry = find_entry (archive->root_entry, q, 0, 0); if (entry != NULL) ERRNOR (EEXIST, -1); entry = find_entry (archive->root_entry, q, 1, 0); if (entry == NULL) - return -1; + return -1; if ((entry = my_resolve_symlinks (entry)) == NULL) return -1; if (!S_ISDIR (entry->inode->mode)) ERRNOR (ENOTDIR, -1); @@ -811,10 +814,10 @@ g_free (mc_extfsdir); g_free (archive_name); if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, shell, cmd)){ - g_free (cmd); - my_errno = EIO; - remove_entry (entry); - return -1; + g_free (cmd); + my_errno = EIO; + remove_entry (entry); + return -1; } g_free (cmd); @@ -851,9 +854,9 @@ g_free (mc_extfsdir); g_free (archive_name); if (my_system (EXECUTE_AS_SHELL | EXECUTE_SETUID | EXECUTE_WAIT, shell, cmd)){ - g_free (cmd); - my_errno = EIO; - return -1; + g_free (cmd); + my_errno = EIO; + return -1; } g_free (cmd); remove_entry (entry); @@ -864,7 +867,7 @@ static int extfs_chdir (vfs *me, char *path) { struct archive *archive; - char *q, *res; + char *q; struct entry *entry; my_errno = ENOTDIR; @@ -877,9 +880,6 @@ if ((!entry) || (!S_ISDIR (entry->inode->mode))) return -1; entry->inode->archive->current_dir = entry; - res = g_strconcat ( - entry->inode->archive->name, "#", extfs_prefixes [entry->inode->archive->fstype], - "/", q, NULL); my_errno = 0; return 0; } @@ -921,8 +921,7 @@ { if (((struct archive *)id)->fd_usage <= 0) return 1; - else - return 0; + return 0; } static void remove_entry (struct entry *e) @@ -937,19 +936,19 @@ } pe = e->dir; if (e == pe->inode->first_in_subdir) - pe->inode->first_in_subdir = e->next_in_dir; + pe->inode->first_in_subdir = e->next_in_dir; prev = NULL; for (ent = pe->inode->first_in_subdir; ent && ent->next_in_dir; ent = ent->next_in_dir) if (e == ent->next_in_dir) { - prev = ent; - break; + prev = ent; + break; } if (prev) - prev->next_in_dir = e->next_in_dir; + prev->next_in_dir = e->next_in_dir; if (e == pe->inode->last_in_subdir) - pe->inode->last_in_subdir = prev; + pe->inode->last_in_subdir = prev; if (i <= 0) { if (e->inode->local_filename != NULL) { @@ -1031,7 +1030,7 @@ (struct pseudofile *) extfs_open (me, path, O_WRONLY, 0); if (fp == NULL) - return; + return 0; if (!strcmp (fp->entry->inode->local_filename, local)) { fp->entry->inode->has_changed = has_changed; fp->archive->fd_usage--; diff -ruN old/mc-4.5.42/vfs/fish.c new/mc-4.5.43/vfs/fish.c --- old/mc-4.5.42/vfs/fish.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/fish.c Sat Mar 18 08:43:43 2000 @@ -5,6 +5,8 @@ Written by: 1998 Pavel Machek + $Id: fish.c,v 1.24 2000/02/25 12:53:06 pavel Exp $ + Derived from ftpfs.c. This program is free software; you can redistribute it and/or @@ -36,6 +38,7 @@ #undef HAVE_HACKED_SSH #include "utilvfs.h" +#include "../src/dialog.h" /* For MSG_ERROR */ #include "xdirentry.h" #include "vfs.h" @@ -221,12 +224,12 @@ /dev/tty, not from stdin :-(. */ #ifndef HAVE_HACKED_SSH - message_1s (1, _(" Error "), _("Sorry, we can not do password authenticated connections for now.")); + message_1s (1, MSG_ERROR, _("Sorry, we can not do password authenticated connections for now.")); ERRNOR (EPERM, -1); #endif if (!SUP.password){ char *p, *op; - p = g_strconcat (" fish: Password required for ", SUP.user, + p = g_strconcat (_(" fish: Password required for "), SUP.user, " ", NULL); op = vfs_get_password (p); g_free (p); @@ -470,10 +473,10 @@ disable_interrupt_key(); total += n; print_vfs_message(_("fish: storing %s %d (%d)"), - was_error ? "zeros" : "file", total, s.st_size); + was_error ? _("zeros") : _("file"), total, s.st_size); } if ((get_reply (me, SUP.sockr, NULL, 0) != COMPLETE) || was_error) - ERRNOR (E_REMOTE, 0); + ERRNOR (E_REMOTE, -1); close(h); return 0; error_return: diff -ruN old/mc-4.5.42/vfs/ftpfs.c new/mc-4.5.43/vfs/ftpfs.c --- old/mc-4.5.42/vfs/ftpfs.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/ftpfs.c Sat Mar 18 08:43:43 2000 @@ -6,7 +6,9 @@ 1995, 1996, 1997 Miguel de Icaza 1997 Norbert Warmuth 1998 Pavel Machek - + + $Id: ftpfs.c,v 1.59 2000/02/25 12:53:06 pavel Exp $ + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of @@ -29,34 +31,30 @@ etc., (tarfs as well), we should give there a user selectable timeout and assign a key sequence. - use hash table instead of linklist to cache ftpfs directory. - */ -/* Namespace pollution: horrible */ +What to do with this? + + + * NOTE: Usage of tildes is deprecated, consider: + * cd /#ftp:pavel@hobit + * cd ~ + * And now: what do I want to do? Do I want to go to /home/pavel or to + * /#ftp:hobit/home/pavel? I think first has better sense... + * + { + int f = !strcmp( remote_path, "/~" ); + if (f || !strncmp( remote_path, "/~/", 3 )) { + char *s; + s = concat_dir_and_file( qhome (*bucket), remote_path +3-f ); + g_free (remote_path); + remote_path = s; + } + } -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* For isdigit */ -#ifdef SCO_FLAVOR -# include /* alex: for struct timeb definition */ -#endif /* SCO_FLAVOR */ -#include -#include -#if defined(HAVE_UNISTD_H) -#include -#endif -#if HAVE_SYS_SELECT_H -# include -#endif -#include "../src/setup.h" + */ + +/* Namespace pollution: horrible */ #include /* struct hostent */ #include /* AF_INET */ @@ -78,6 +76,7 @@ #include "utilvfs.h" +#include "xdirentry.h" #include "vfs.h" #include "tcputil.h" #include "../src/dialog.h" @@ -87,8 +86,9 @@ # define MAXHOSTNAMELEN 64 #endif -#define ERRNOR(x,y) do { my_errno = x; return y; } while(0) #define UPLOAD_ZERO_LENGTH_FILE +#define SUP super->u.ftp +#define FH_SOCK fh->u.ftp.sock static int my_errno; static int code; @@ -115,11 +115,11 @@ extern char *home_dir; /* Anonymous setup */ -char *ftpfs_anonymous_passwd = 0; +char *ftpfs_anonymous_passwd = NULL; int ftpfs_directory_timeout; /* Proxy host */ -char *ftpfs_proxy_host = 0; +char *ftpfs_proxy_host = NULL; /* wether we have to use proxy by default? */ int ftpfs_always_use_proxy; @@ -141,20 +141,6 @@ #define WANT_STRING 0x02 static char reply_str [80]; -static struct direntry *_get_file_entry (struct connection *bucket, - char *file_name, int op, int flags); - -static char *ftpfs_get_current_directory (struct connection *bucket); -static int ftpfs_chdir_internal (struct connection *bucket, - char *remote_path); -static void free_bucket (void *data); -static void connection_destructor (void *data); -static void flush_all_directory (struct connection *bucket); -static int get_line (int sock, char *buf, int buf_len, - char term); -static char *get_path (struct connection **bucket, - char *path); - /* char *translate_path (struct ftpfs_connection *bucket, char *remote_path) Translate a Unix path, i.e. MC's internal path representation (e.g. /somedir/somefile) to a path valid for the remote server. Every path @@ -168,15 +154,16 @@ c) strip trailing "/." */ +static char *ftpfs_get_current_directory (vfs *me, vfs_s_super *super); +static int ftpfs_chdir_internal (vfs *me, vfs_s_super *super, char *remote_path); + static char * -translate_path (struct connection *bucket, char *remote_path) +translate_path (vfs *me, vfs_s_super *super, const char *remote_path) { - char *p; - - if (!bucket->remote_is_amiga) + if (!SUP.remote_is_amiga) return g_strdup (remote_path); else { - char *ret; + char *ret, *p; if (logfile) { fprintf (logfile, "MC -- translate_path: %s\n", remote_path); @@ -220,21 +207,24 @@ * */ +#define FTP_COMMAND_PORT 21 +#define HSC_PROXY_PORT 9875 + static char * my_get_host_and_username (char *path, char **host, char **user, int *port, char **pass) { - return vfs_split_url (path, host, user, port, pass, 21, URL_DEFAULTANON); + return vfs_split_url (path, host, user, port, pass, FTP_COMMAND_PORT, URL_DEFAULTANON); } /* Returns a reply code, check /usr/include/arpa/ftp.h for possible values */ static int -get_reply (int sock, char *string_buf, int string_len) +get_reply (vfs *me, int sock, char *string_buf, int string_len) { char answer[1024]; int i; for (;;) { - if (!get_line (sock, answer, sizeof (answer), '\n')){ + if (!vfs_s_get_line (me, sock, answer, sizeof (answer), '\n')){ if (string_buf) *string_buf = 0; code = 421; @@ -251,7 +241,7 @@ case 1: if (answer[3] == '-') { while (1) { - if (!get_line (sock, answer, sizeof(answer), '\n')){ + if (!vfs_s_get_line (me, sock, answer, sizeof(answer), '\n')){ if (string_buf) *string_buf = 0; code = 421; @@ -272,12 +262,12 @@ } static int -command (struct connection *bucket, int wait_reply, char *fmt, ...) +command (vfs *me, vfs_s_super *super, int wait_reply, char *fmt, ...) { va_list ap; char *str, *fmt_str; int status; - int sock = qsock (bucket); + int sock = SUP.sock; va_start (ap, fmt); @@ -300,7 +290,7 @@ got_sigpipe = 0; enable_interrupt_key (); - status = write (sock, str, strlen (str)); + status = write (SUP.sock, str, strlen (str)); g_free (str); if (status < 0){ @@ -315,20 +305,23 @@ disable_interrupt_key (); if (wait_reply) - return get_reply (sock, (wait_reply & WANT_STRING) ? reply_str : NULL, sizeof (reply_str)-1); + return get_reply (me, sock, (wait_reply & WANT_STRING) ? reply_str : NULL, sizeof (reply_str)-1); return COMPLETE; } static void -connection_close (void *data) +free_archive (vfs *me, vfs_s_super *super) { - struct connection *bucket = data; - - if (qsock (bucket) != -1){ - print_vfs_message (_("ftpfs: Disconnecting from %s"), qhost (bucket)); - command(bucket, NONE, "QUIT"); - close(qsock(bucket)); - } + if (SUP.sock != -1){ + print_vfs_message (_("ftpfs: Disconnecting from %s"), SUP.host); + command(me, super, NONE, "QUIT"); + close(SUP.sock); + } + ifree (SUP.host); + ifree (SUP.home); + ifree (SUP.user); + ifree (SUP.cwdir); + ifree (SUP.password); } /* some defines only used by changetype */ @@ -341,19 +334,19 @@ #define TYPE_UNKNOWN -1 static int -changetype (struct connection *bucket, int binary) +changetype (vfs *me, vfs_s_super *super, int binary) { - if (binary != bucket->isbinary) { - if (command (bucket, WAIT_REPLY, "TYPE %c", binary ? 'I' : 'A') != COMPLETE) + if (binary != SUP.isbinary) { + if (command (me, super, WAIT_REPLY, "TYPE %c", binary ? 'I' : 'A') != COMPLETE) ERRNOR (EIO, -1); - bucket->isbinary = binary; + SUP.isbinary = binary; } return binary; } /* This routine logs the user in */ static int -login_server (struct connection *bucket, char *netrcpass) +login_server (vfs *me, vfs_s_super *super, char *netrcpass) { #if defined(HSC_PROXY) char *proxypass, *proxyname; @@ -364,27 +357,29 @@ int anon = 0; char reply_string[255]; - bucket->isbinary = TYPE_UNKNOWN; + SUP.isbinary = TYPE_UNKNOWN; if (netrcpass) op = g_strdup (netrcpass); else { - if (!strcmp (quser (bucket), "anonymous") || - !strcmp (quser (bucket), "ftp")) { + if (!strcmp (SUP.user, "anonymous") || + !strcmp (SUP.user, "ftp")) { + if (!ftpfs_anonymous_passwd) + ftpfs_init_passwd(); op = g_strdup (ftpfs_anonymous_passwd); anon = 1; } else { char *p; - if (!bucket->password){ - p = g_strconcat (_(" FTP: Password required for "), quser (bucket), + if (!SUP.password){ + p = g_strconcat (_(" FTP: Password required for "), SUP.user, " ", NULL); op = vfs_get_password (p); g_free (p); if (op == NULL) ERRNOR (EPERM, 0); - bucket->password = g_strdup (op); + SUP.password = g_strdup (op); } else - op = g_strdup (bucket->password); + op = g_strdup (SUP.password); } } @@ -392,11 +387,12 @@ pass = g_strdup (op); else pass = g_strconcat ("-", op, NULL); - wipe_password (op); + if (op) + wipe_password (op); /* Proxy server accepts: username@host-we-want-to-connect*/ - if (qproxy (bucket)){ + if (SUP.proxy){ #if defined(HSC_PROXY) char *p, *host; int port; @@ -417,39 +413,39 @@ g_free (proxyname); ERRNOR (EPERM, 0); } - name = g_strdup (quser (bucket)); + name = g_strdup (SUP.user); #else - name = g_strconcat (quser (bucket), "@", - qhost (bucket)[0] == '!' ? qhost (bucket)+1 : qhost (bucket), NULL); + name = g_strconcat (SUP.user, "@", + SUP.host[0] == '!' ? SUP.host+1 : SUP.host, NULL); #endif } else - name = g_strdup (quser (bucket)); + name = g_strdup (SUP.user); - if (get_reply (qsock(bucket), reply_string, sizeof (reply_string) - 1) == COMPLETE) { + if (get_reply (me, SUP.sock, reply_string, sizeof (reply_string) - 1) == COMPLETE) { g_strup (reply_string); - bucket->remote_is_amiga = strstr (reply_string, "AMIGA") != 0; + SUP.remote_is_amiga = strstr (reply_string, "AMIGA") != 0; if (logfile) { - fprintf (logfile, "MC -- remote_is_amiga = %d\n", bucket->remote_is_amiga); + fprintf (logfile, "MC -- remote_is_amiga = %d\n", SUP.remote_is_amiga); fflush (logfile); } #if defined(HSC_PROXY) - if (qproxy (bucket)){ + if (SUP.proxy){ print_vfs_message (_("ftpfs: sending proxy login name")); - if (command (bucket, 1, "USER %s", proxyname) != CONTINUE) + if (command (me, super, 1, "USER %s", proxyname) != CONTINUE) goto proxyfail; print_vfs_message (_("ftpfs: sending proxy user password")); - if (command (bucket, 1, "PASS %s", proxypass) != COMPLETE) + if (command (me, super, 1, "PASS %s", proxypass) != COMPLETE) goto proxyfail; print_vfs_message (_("ftpfs: proxy authentication succeeded")); - if (command (bucket, 1, "SITE %s", qhost (bucket)+1) != COMPLETE) + if (command (me, super, 1, "SITE %s", SUP.host+1) != COMPLETE) goto proxyfail; - print_vfs_message (_("ftpfs: connected to %s"), qhost (bucket)+1); + print_vfs_message (_("ftpfs: connected to %s"), SUP.host+1); if (0) { proxyfail: - bucket->failed_on_login = 1; + SUP.failed_on_login = 1; /* my_errno = E; */ if (proxypass) wipe_password (proxypass); @@ -464,12 +460,12 @@ } #endif print_vfs_message (_("ftpfs: sending login name")); - code = command (bucket, WAIT_REPLY, "USER %s", name); + code = command (me, super, WAIT_REPLY, "USER %s", name); switch (code){ case CONTINUE: print_vfs_message (_("ftpfs: sending user password")); - if (command (bucket, WAIT_REPLY, "PASS %s", pass) != COMPLETE) + if (command (me, super, WAIT_REPLY, "PASS %s", pass) != COMPLETE) break; case COMPLETE: @@ -479,16 +475,16 @@ return 1; default: - bucket->failed_on_login = 1; + SUP.failed_on_login = 1; /* my_errno = E; */ - if (bucket->password) - wipe_password (bucket->password); - bucket->password = 0; + if (SUP.password) + wipe_password (SUP.password); + SUP.password = 0; goto login_fail; } } - print_vfs_message (_("ftpfs: Login incorrect for user %s "), quser (bucket)); + message_2s (1, MSG_ERROR, _("ftpfs: Login incorrect for user %s "), SUP.user); login_fail: wipe_password (pass); g_free (name); @@ -622,11 +618,10 @@ char *user, *pass, *dir; #if defined(HSC_PROXY) -#define PORT 9875 + dir = vfs_split_url (proxy, host, &user, port, &pass, HSC_PROXY_PORT, URL_DEFAULTANON); #else -#define PORT 21 + dir = vfs_split_url (proxy, host, &user, port, &pass, FTP_COMMAND_PORT, URL_DEFAULTANON); #endif - dir = vfs_split_url (proxy, host, &user, port, &pass, PORT, URL_DEFAULTANON); g_free (user); if (pass) @@ -636,17 +631,17 @@ } static int -ftpfs_open_socket (struct connection *bucket) +ftpfs_open_socket (vfs *me, vfs_s_super *super) { struct sockaddr_in server_address; struct hostent *hp; int my_socket; char *host; - int port; + int port = SUP.port; int free_host = 0; /* Use a proxy host? */ - host = qhost (bucket); + host = SUP.host; if (!host || !*host){ print_vfs_message (_("ftpfs: Invalid host name.")); @@ -655,7 +650,7 @@ } /* Hosts to connect to that start with a ! should use proxy */ - if (qproxy (bucket)){ + if (SUP.proxy){ ftpfs_get_proxy_host_and_port (ftpfs_proxy_host, &host, &port); free_host = 1; } @@ -681,9 +676,7 @@ bcopy ((char *) hp->h_addr, (char *) &server_address.sin_addr, 4); } -#define THE_PORT qproxy(bucket) ? port : qport (bucket) - - server_address.sin_port = htons (THE_PORT); + server_address.sin_port = htons (port); /* Connect */ if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0) { @@ -716,75 +709,33 @@ return my_socket; } -static struct connection * -open_command_connection (char *host, char *user, int port, char *netrcpass) +int +open_archive_int (vfs *me, vfs_s_super *super) { - struct connection *bucket; int retry_seconds, count_down; - - bucket = g_new (struct connection, 1); - - if (bucket == NULL) - ERRNOR (ENOMEM, NULL); -#ifdef HAVE_MAD - { - extern void *watch_free_pointer; - - if (!watch_free_pointer) - watch_free_pointer = host; - } -#endif - qhost (bucket) = g_strdup (host); - quser (bucket) = g_strdup (user); - qcdir (bucket) = NULL; - qport (bucket) = port; - qlock (bucket) = 0; - qhome (bucket) = NULL; - qproxy (bucket)= 0; - qupdir (bucket)= 0; - qdcache (bucket)=0; - bucket->__inode_counter = 0; - bucket->lock = 0; - bucket->use_proxy = ftpfs_check_proxy (host); - bucket->password = 0; - bucket->use_passive_connection = ftpfs_use_passive_connections | source_route; - bucket->use_source_route = source_route; - bucket->strict_rfc959_list_cmd = !ftpfs_use_unix_list_options; - bucket->isbinary = TYPE_UNKNOWN; - bucket->remote_is_amiga = 0; + char *netrcpass = NULL; /* We do not want to use the passive if we are using proxies */ - if (bucket->use_proxy) - bucket->use_passive_connection = 0; - - if ((qdcache (bucket) = linklist_init ()) == NULL) { - my_errno = ENOMEM; - g_free (qhost (bucket)); - g_free (quser (bucket)); - g_free (bucket); - return NULL; - } + if (SUP.use_proxy) + SUP.use_passive_connection = 0; retry_seconds = 0; do { - bucket->failed_on_login = 0; + SUP.failed_on_login = 0; - qsock (bucket) = ftpfs_open_socket (bucket); - if (qsock (bucket) == -1) { - free_bucket (bucket); - return NULL; - } + SUP.sock = ftpfs_open_socket (me, super); + if (SUP.sock == -1) + return -1; - if (login_server (bucket, netrcpass)) { + if (login_server (me, super, netrcpass)) { /* Logged in, no need to retry the connection */ break; } else { - if (bucket->failed_on_login){ + if (SUP.failed_on_login){ /* Close only the socket descriptor */ - close (qsock (bucket)); + close (SUP.sock); } else { - connection_destructor (bucket); - return NULL; + return -1; } if (ftpfs_retry_seconds){ retry_seconds = ftpfs_retry_seconds; @@ -795,8 +746,7 @@ if (got_interrupt ()){ /* my_errno = E; */ disable_interrupt_key (); - free_bucket (bucket); - return NULL; + return 0; } } disable_interrupt_key (); @@ -804,96 +754,76 @@ } } while (retry_seconds); - qhome (bucket) = ftpfs_get_current_directory (bucket); - if (!qhome (bucket)) - qhome (bucket) = g_strdup (PATH_SEP_STR); - qupdir (bucket) = g_strdup (PATH_SEP_STR); /* FIXME: I changed behavior to ignore last_current_dir */ - return bucket; + SUP.home = ftpfs_get_current_directory (me, super); + if (!SUP.home) + SUP.home = g_strdup (PATH_SEP_STR); + return 0; } static int -is_connection_closed (struct connection *bucket) +open_archive (vfs *me, vfs_s_super *super, char *archive_name, char *op) { - fd_set rset; - struct timeval t; + char *host, *user, *password; + int port; - if (got_sigpipe){ - return 1; - } - t.tv_sec = 0; - t.tv_usec = 0; - FD_ZERO (&rset); - FD_SET (qsock (bucket), &rset); - while (1) { - if (select (qsock (bucket) + 1, &rset, NULL, NULL, &t) < 0) - if (errno != EINTR) - return 1; - return 0; + vfs_split_url (strchr(op, ':')+1, &host, &user, &port, &password, FTP_COMMAND_PORT, URL_DEFAULTANON); + + SUP.host = g_strdup (host); + SUP.user = g_strdup (user); + SUP.port = port; + SUP.home = NULL; + SUP.proxy= 0; + SUP.use_proxy = ftpfs_check_proxy (host); + SUP.password = NULL; + SUP.use_passive_connection = ftpfs_use_passive_connections | source_route; + SUP.use_source_route = source_route; + SUP.strict = ftpfs_use_unix_list_options?RFC_AUTODETECT:RFC_STRICT; + SUP.isbinary = TYPE_UNKNOWN; + SUP.remote_is_amiga = 0; + super->name = g_strdup("/"); #if 0 - if (FD_ISSET (qsock(bucket), &rset)) { - n = read (qsock(bucket), &read_ahead, sizeof (read_ahead)); - if (n <= 0) - return 1; - } else + super->name = g_strconcat( "/#ftp:", SUP.user, "@", SUP.host, "/", NULL ); #endif - } + super->root = vfs_s_new_inode (me, super, vfs_s_default_stat(me, S_IFDIR | 0755)); + if (password) + SUP.password = g_strdup (password); + return open_archive_int (me, super); } -/* This routine keeps track of open connections */ -/* Returns a connected socket to host */ -static struct connection * -open_link (char *host, char *user, int port, char *netrcpass) +static int +archive_same(vfs *me, vfs_s_super *super, char *archive_name, char *op, void *cookie) +{ + char *host, *user, *dummy2; + int port; + vfs_split_url (strchr(op, ':')+1, &host, &user, &port, &dummy2, 21, URL_DEFAULTANON); + return ((strcmp (host, SUP.host) == 0) && + (strcmp (user, SUP.user) == 0) && + (port == SUP.port)); +} + +static int +dir_uptodate(vfs *me, vfs_s_inode *ino) { - int sock; - struct connection *bucket; - struct linklist *lptr; - - for (lptr = connections_list->next; - lptr != connections_list; lptr = lptr->next) { - bucket = lptr->data; - if ((strcmp (host, qhost (bucket)) == 0) && - (strcmp (user, quser (bucket)) == 0) && - (port == qport (bucket))) { - - /* check the connection is closed or not, just hack */ - if (is_connection_closed (bucket)) { - flush_all_directory (bucket); - sock = ftpfs_open_socket (bucket); - if (sock != -1) { - close (qsock (bucket)); - qsock (bucket) = sock; - if (login_server (bucket, netrcpass)) - return bucket; - } - - /* connection refused */ - lptr->prev->next = lptr->next; - lptr->next->prev = lptr->prev; - connection_destructor (bucket); - return NULL; - } - return bucket; - } - } - bucket = open_command_connection (host, user, port, netrcpass); - if (bucket == NULL) - return NULL; - if (!linklist_insert (connections_list, bucket)) { - my_errno = ENOMEM; - connection_destructor (bucket); - return NULL; + struct timeval tim; + + gettimeofday(&tim, NULL); + if (force_expiration) { + force_expiration = 0; + return 0; } - return bucket; + if (tim.tv_sec < ino->u.ftp.timestamp.tv_sec) + return 1; + return 0; } /* The returned directory should always contain a trailing slash */ static char * -ftpfs_get_current_directory (struct connection *bucket) +ftpfs_get_current_directory (vfs *me, vfs_s_super *super) { char buf[4096], *bufp, *bufq; - if (command (bucket, NONE, "PWD") == COMPLETE && - get_reply(qsock(bucket), buf, sizeof(buf)) == COMPLETE) { + if (command (me, super, NONE, "PWD") == COMPLETE && + get_reply(me, SUP.sock, buf, sizeof(buf)) == COMPLETE) { bufp = NULL; for (bufq = buf; *bufq; bufq++) if (*bufq == '"') { @@ -928,13 +858,13 @@ /* Setup Passive ftp connection, we use it for source routed connections */ static int -setup_passive (int my_socket, struct connection *bucket, struct sockaddr_in *sa) +setup_passive (vfs *me, vfs_s_super *super, int my_socket, struct sockaddr_in *sa) { int xa, xb, xc, xd, xe, xf; char n [6]; char *c = reply_str; - if (command (bucket, WAIT_REPLY | WANT_STRING, "PASV") != COMPLETE) + if (command (me, super, WAIT_REPLY | WANT_STRING, "PASV") != COMPLETE) return 0; /* Parse remote parameters */ @@ -962,13 +892,13 @@ } static int -initconn (struct connection *bucket) +initconn (vfs *me, vfs_s_super *super) { struct sockaddr_in data_addr; int data, len = sizeof(data_addr); struct protoent *pe; - getsockname(qsock(bucket), (struct sockaddr *) &data_addr, &len); + getsockname(SUP.sock, (struct sockaddr *) &data_addr, &len); data_addr.sin_port = 0; pe = getprotobyname("tcp"); @@ -978,25 +908,15 @@ if (data < 0) ERRNOR (EIO, -1); -#ifdef ORIGINAL_CONNECT_CODE - if (bucket->use_source_route){ - int c; - - if ((c = setup_passive (data, bucket, &data_addr))) - return data; - print_vfs_message(_("ftpfs: could not setup passive mode for source routing")); - bucket->use_source_route = 0; - } -#else - if (bucket->use_passive_connection){ - if ((bucket->use_passive_connection = setup_passive (data, bucket, &data_addr))) + if (SUP.use_passive_connection){ + if ((SUP.use_passive_connection = setup_passive (me, super, data, &data_addr))) return data; - bucket->use_source_route = 0; - bucket->use_passive_connection = 0; + SUP.use_source_route = 0; + SUP.use_passive_connection = 0; print_vfs_message (_("ftpfs: could not setup passive mode")); } -#endif + /* If passive setup fails, fallback to active connections */ /* Active FTP connection */ if (bind (data, (struct sockaddr *)&data_addr, len) < 0) @@ -1008,7 +928,7 @@ unsigned char *a = (unsigned char *)&data_addr.sin_addr; unsigned char *p = (unsigned char *)&data_addr.sin_port; - if (command (bucket, WAIT_REPLY, "PORT %d,%d,%d,%d,%d,%d", a[0], a[1], + if (command (me, super, WAIT_REPLY, "PORT %d,%d,%d,%d,%d,%d", a[0], a[1], a[2], a[3], p[0], p[1]) != COMPLETE) goto error_return; } @@ -1020,32 +940,31 @@ } static int -open_data_connection (struct connection *bucket, char *cmd, char *remote, +open_data_connection (vfs *me, vfs_s_super *super, char *cmd, char *remote, int isbinary, int reget) { struct sockaddr_in from; int s, j, data, fromlen = sizeof(from); - if ((s = initconn (bucket)) == -1) + if ((s = initconn (me, super)) == -1) return -1; - if (changetype (bucket, isbinary) == -1) + if (changetype (me, super, isbinary) == -1) return -1; if (reget > 0){ - j = command (bucket, WAIT_REPLY, "REST %d", reget); + j = command (me, super, WAIT_REPLY, "REST %d", reget); if (j != CONTINUE) return -1; } - if (remote){ - char *path = translate_path (bucket, remote); - - j = command (bucket, WAIT_REPLY, "%s %s", cmd, path); - g_free (path); + if (remote) { + char * remote_path = translate_path (me, super, remote); + j = command (me, super, WAIT_REPLY, "%s /%s", cmd, remote_path); + g_free (remote_path); } else - j = command (bucket, WAIT_REPLY, "%s", cmd); + j = command (me, super, WAIT_REPLY, "%s", cmd); if (j != PRELIM) - ERRNOR (EPERM, -1); + ERRNOR (EPERM, -1); enable_interrupt_key(); - if (bucket->use_passive_connection) + if (SUP.use_passive_connection) data = s; else { data = accept (s, (struct sockaddr *)&from, &fromlen); @@ -1061,19 +980,22 @@ } static void -my_abort (struct connection *bucket, int dsock) +linear_abort (vfs *me, vfs_s_fh *fh) { + vfs_s_super *super = FH_SUPER; static unsigned char ipbuf[3] = { IAC, IP, IAC }; fd_set mask; char buf[1024]; + int dsock = FH_SOCK; + FH_SOCK = -1; print_vfs_message(_("ftpfs: aborting transfer.")); - if (send(qsock(bucket), ipbuf, sizeof(ipbuf), MSG_OOB) != sizeof(ipbuf)) { + if (send(SUP.sock, ipbuf, sizeof(ipbuf), MSG_OOB) != sizeof(ipbuf)) { print_vfs_message(_("ftpfs: abort error: %s"), unix_error_string(errno)); return; } - if (command(bucket, NONE, "%cABOR", DM) != COMPLETE){ + if (command(me, super, NONE, "%cABOR", DM) != COMPLETE){ print_vfs_message (_("ftpfs: abort failed")); return; } @@ -1083,12 +1005,13 @@ if (select(dsock + 1, &mask, NULL, NULL, NULL) > 0) while (read(dsock, buf, sizeof(buf)) > 0); } - if ((get_reply(qsock(bucket), NULL, 0) == TRANSIENT) && (code == 426)) - get_reply(qsock(bucket), NULL, 0); + if ((get_reply(me, SUP.sock, NULL, 0) == TRANSIENT) && (code == 426)) + get_reply(me, SUP.sock, NULL, 0); } +#if 0 static void -resolve_symlink_without_ls_options(struct connection *bucket, struct dir *dir) +resolve_symlink_without_ls_options(vfs *me, vfs_s_super *super, vfs_s_inode *dir) { struct linklist *flist; struct direntry *fe, *fel; @@ -1149,7 +1072,7 @@ } static void -resolve_symlink_with_ls_options(struct connection *bucket, struct dir *dir) +resolve_symlink_with_ls_options(vfs *me, vfs_s_super *super, vfs_s_inode *dir) { char buffer[2048] = "", *filename; int sock; @@ -1198,6 +1121,7 @@ fputs (buffer, logfile); fflush (logfile); } +vfs_die("This code should be commented out\n"); if (vfs_parse_ls_lga (buffer, &s, &filename, NULL)) { int r = strcmp(fe->name, filename); g_free(filename); @@ -1223,322 +1147,144 @@ while (fgets(buffer, sizeof(buffer), fp) != NULL); disable_interrupt_key(); fclose(fp); - get_reply(qsock(bucket), NULL, 0); - if (switch_method) { - bucket->strict_rfc959_list_cmd = 1; - resolve_symlink_without_ls_options(bucket, dir); - } + get_reply(me, SUP.sock, NULL, 0); } static void -resolve_symlink(struct connection *bucket, struct dir *dir) +resolve_symlink(vfs *me, vfs_s_super *super, vfs_s_inode *dir) { print_vfs_message(_("Resolving symlink...")); - if (bucket->strict_rfc959_list_cmd) - resolve_symlink_without_ls_options(bucket, dir); + if (SUP.strict_rfc959_list_cmd) + resolve_symlink_without_ls_options(me, super, dir); else - resolve_symlink_with_ls_options(bucket, dir); -} - - -#define X "ftp" -#define X_myname "/#ftp:" -#define vfs_X_ops vfs_ftpfs_ops -#define X_fill_names ftpfs_fill_names -#define X_hint_reread ftpfs_hint_reread -#define X_flushdir ftpfs_flushdir -#define X_done ftpfs_done -#include "shared_ftp_fish.c" - -static char* -get_path (struct connection **bucket, char *path) -{ - return s_get_path (bucket, path, "/#ftp:"); -} - -/* Inserts an entry for "." (and "..") into the linked list. Ignore any - errors because "." isn't important (as fas as you don't try to save a - file in the root dir of the ftp server). - Actually the dot is needed when stating the root directory, e.g. - mc_stat ("/ftp#localhost", &buf). Down the call tree _get_file_entry - gets called with filename = "/" which will be transformed into "." - before searching for a fileentry. Whithout "." in the linked list - this search fails. -- Norbert. */ -static void -insert_dots (struct linklist *file_list, struct connection *bucket) -{ - struct direntry *fe; - int i; - char buffer[][58] = { - "drwxrwxrwx 1 0 0 1024 Jan 1 1970 .", - "drwxrwxrwx 1 0 0 1024 Jan 1 1970 .." - }; - - for (i = 0; i < 2; i++ ) { - fe = g_new (struct direntry, 1); - if (fe == NULL) - return; - if (vfs_parse_ls_lga (buffer[i], &fe->s, &fe->name, &fe->linkname)) { - fe->freshly_created = 0; - fe->count = 1; - fe->local_filename = fe->remote_filename = NULL; - fe->l_stat = NULL; - fe->bucket = bucket; - (fe->s).st_ino = bucket->__inode_counter++; - - if (!linklist_insert(file_list, fe)) - g_free(fe); - } else - g_free (fe); - } + resolve_symlink_with_ls_options(me, super, dir); } +#endif -static struct dir * -retrieve_dir(struct connection *bucket, char *remote_path, int resolve_symlinks) +static int +dir_load(vfs *me, vfs_s_inode *dir, char *remote_path) { -#ifdef OLD_READ - FILE *fp; -#endif - int sock, has_symlinks; - struct linklist *file_list, *p; - struct direntry *fe; + vfs_s_entry *ent; + vfs_s_super *super = dir->super; + int sock, has_symlinks = 0, num_entries = 0; char buffer[8192]; - struct dir *dcache; - int got_intr = 0; - int dot_found = 0; - int has_spaces = (strchr (remote_path, ' ') != NULL); - - canonicalize_pathname (remote_path); - for (p = qdcache(bucket)->next;p != qdcache(bucket); - p = p->next) { - dcache = p->data; - if (strcmp(dcache->remote_path, remote_path) == 0) { - struct timeval tim; - - gettimeofday(&tim, NULL); - if (((tim.tv_sec < dcache->timestamp.tv_sec) && !force_expiration) - || dcache->symlink_status == FTPFS_RESOLVING_SYMLINKS) { - if (resolve_symlinks && dcache->symlink_status == FTPFS_UNRESOLVED_SYMLINKS) - resolve_symlink(bucket, dcache); - return dcache; - } else { - force_expiration = 0; - p->next->prev = p->prev; - p->prev->next = p->next; - dir_destructor(dcache); - g_free (p); - break; - } - } - } + int cd_first = (strchr (remote_path, ' ') != NULL) || ftpfs_first_cd_then_ls || (SUP.strict == RFC_STRICT); - has_symlinks = 0; - if (bucket->strict_rfc959_list_cmd) - print_vfs_message(_("ftpfs: Reading FTP directory %s... (don't use UNIX ls options)"), remote_path); - else - print_vfs_message(_("ftpfs: Reading FTP directory %s..."), remote_path); - if (has_spaces || bucket->strict_rfc959_list_cmd || ftpfs_first_cd_then_ls) { - if (ftpfs_chdir_internal (bucket, remote_path) != COMPLETE) { + print_vfs_message(_("ftpfs: Reading FTP directory %s... %s%s"), remote_path, + SUP.strict == RFC_STRICT ? _("(strict rfc959)") : "", + cd_first ? _("(chdir first)"):""); + + if (cd_first) { + char *p; + + p = translate_path (me, super, remote_path); + if (ftpfs_chdir_internal (me, super, p) != COMPLETE) { + g_free (p); my_errno = ENOENT; print_vfs_message(_("ftpfs: CWD failed.")); - return NULL; + return -1; } + g_free (p); } - file_list = linklist_init(); - if (file_list == NULL) - ERRNOR (ENOMEM, NULL); - dcache = g_new (struct dir, 1); - if (dcache == NULL) { - my_errno = ENOMEM; - linklist_destroy(file_list, NULL); - print_vfs_message(_("ftpfs: FAIL")); - return NULL; - } - gettimeofday(&dcache->timestamp, NULL); - dcache->timestamp.tv_sec += ftpfs_directory_timeout; - dcache->file_list = file_list; - dcache->remote_path = g_strdup(remote_path); - dcache->count = 1; - dcache->symlink_status = FTPFS_NO_SYMLINKS; - - if (bucket->strict_rfc959_list_cmd == 1) - sock = open_data_connection (bucket, "LIST", 0, TYPE_ASCII, 0); - else if (has_spaces || ftpfs_first_cd_then_ls) - sock = open_data_connection (bucket, "LIST -la", ".", TYPE_ASCII, 0); + gettimeofday(&dir->u.ftp.timestamp, NULL); + dir->u.ftp.timestamp.tv_sec += ftpfs_directory_timeout; + + if (SUP.strict == RFC_STRICT) + sock = open_data_connection (me, super, "LIST", 0, TYPE_ASCII, 0); + else if (cd_first) + sock = open_data_connection (me, super, "LIST -la", ".", TYPE_ASCII, 0); else { /* Trailing "/." is necessary if remote_path is a symlink but don't generate "//." */ char *path = g_strconcat (remote_path, - remote_path[1] == '\0' ? "" : PATH_SEP_STR, - ".", (char *) 0); + (!*remote_path) ? "" : PATH_SEP_STR, + ".", + NULL); - sock = open_data_connection (bucket, "LIST -la", path, TYPE_ASCII, 0); + sock = open_data_connection (me, super, "LIST -la", path, TYPE_ASCII, 0); g_free (path); } if (sock == -1) goto fallback; -#ifdef OLD_READ -#define close_this_sock(x,y) fclose (x) - fp = fdopen(sock, "r"); - if (fp == NULL) { - my_errno = errno; - close(sock); - goto error_2; - } -#else -#define close_this_sock(x,y) close (y) -#endif - /* Clear the interrupt flag */ enable_interrupt_key (); - errno = 0; -#ifdef OLD_READ - while (fgets (buffer, sizeof (buffer), fp) != NULL) { - if (got_intr = got_interrupt ()) + while (1) { + int i, j; + int res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), sock); + if (!res) break; -#else - while ((got_intr = get_line_interruptible (buffer, sizeof (buffer), sock)) != EINTR){ -#endif - int eof = got_intr == 0; - + if (res == EINTR) { + me->verrno = ECONNRESET; + goto error; + } if (logfile){ fputs (buffer, logfile); fputs ("\n", logfile); fflush (logfile); } - if (buffer [0] == 0 && eof) - break; - fe = g_new (struct direntry, 1); - fe->freshly_created = 0; - fe->local_filename = NULL; - if (fe == NULL) { - my_errno = ENOMEM; - goto error_1; - } - if (vfs_parse_ls_lga (buffer, &fe->s, &fe->name, &fe->linkname)) { - if (strcmp (fe->name, ".") == 0) - dot_found = 1; - fe->count = 1; - fe->local_filename = fe->remote_filename = NULL; - fe->l_stat = NULL; - fe->bucket = bucket; - (fe->s).st_ino = bucket->__inode_counter++; - if (S_ISLNK(fe->s.st_mode)) - has_symlinks = 1; - - if (!linklist_insert(file_list, fe)) { - g_free(fe); - my_errno = ENOMEM; - goto error_1; - } + + ent = vfs_s_generate_entry(me, NULL, dir, 0); + i = ent->ino->st.st_nlink; + j = vfs_parse_ls_lga (buffer, &ent->ino->st, &ent->name, &ent->ino->linkname); + ent->ino->st.st_nlink = i; /* Ouch, we need to preserve our counts :-( */ + if (!j) { + vfs_s_free_entry (me, ent); + continue; } - else - g_free(fe); - if (eof) - break; - } - if (got_intr){ - disable_interrupt_key(); - print_vfs_message(_("ftpfs: reading FTP directory interrupt by user")); -#ifdef OLD_READ - my_abort(bucket, fileno(fp)); -#else - my_abort(bucket, sock); -#endif - close_this_sock(fp, sock); - my_errno = EINTR; - goto error_3; + num_entries++; + if ((!strcmp(ent->name, ".")) || (!strcmp (ent->name, ".."))) { + ent->name = NULL; /* Ouch, vfs_s_free_entry "knows" about . and .. being special :-( */ + vfs_s_free_entry (me, ent); + continue; + } + + vfs_s_insert_entry(me, dir, ent); } - close_this_sock(fp, sock); - disable_interrupt_key(); - if ((get_reply (qsock (bucket), NULL, 0) != COMPLETE) || - (file_list->next == file_list)) + + close(sock); + me->verrno = E_REMOTE; + if ((get_reply (me, SUP.sock, NULL, 0) != COMPLETE) || !num_entries) goto fallback; -ok: - if (!dot_found) - insert_dots (file_list, bucket); - - if (!linklist_insert(qdcache(bucket), dcache)) { - my_errno = ENOMEM; - goto error_3; - } + if (SUP.strict == RFC_AUTODETECT) + SUP.strict = RFC_DARING; + +#ifdef FIXME_LATER if (has_symlinks) { if (resolve_symlinks) - resolve_symlink(bucket, dcache); + resolve_symlink(me, super, dcache); else dcache->symlink_status = FTPFS_UNRESOLVED_SYMLINKS; } - print_vfs_message(_("ftpfs: got listing")); - return dcache; -error_1: - disable_interrupt_key(); - close_this_sock(fp, sock); -#ifdef OLD_READ -error_2: #endif - get_reply(qsock(bucket), NULL, 0); -error_3: - g_free(dcache->remote_path); - g_free(dcache); - linklist_destroy(file_list, direntry_destructor); + return 0; + +error: + disable_interrupt_key(); + get_reply(me, SUP.sock, NULL, 0); print_vfs_message(_("ftpfs: failed")); - return NULL; + return -1; fallback: - if (bucket->__inode_counter == 0 && (!bucket->strict_rfc959_list_cmd)) { + if (SUP.strict == RFC_AUTODETECT) { /* It's our first attempt to get a directory listing from this server (UNIX style LIST command) */ - bucket->strict_rfc959_list_cmd = 1; - g_free(dcache->remote_path); - g_free(dcache); - linklist_destroy(file_list, direntry_destructor); - return retrieve_dir (bucket, remote_path, resolve_symlinks); + SUP.strict = RFC_STRICT; + return dir_load (me, dir, remote_path); } - - /* Ok, maybe the directory exists but the remote server doesn't - list "." and "..". - Check whether the directory exists: - */ - if (has_spaces || bucket->strict_rfc959_list_cmd || - ftpfs_first_cd_then_ls) /* CWD has been already performed, i.e. - we know that remote_path exists */ - goto ok; - else { - if (bucket->remote_is_amiga) { - /* The Amiga ftp server needs extra processing because it - always gets relative pathes instead of absolute pathes - like anyone else */ - char *p = ftpfs_get_current_directory (bucket); - - if (ftpfs_chdir_internal (bucket, remote_path) == COMPLETE) { - ftpfs_chdir_internal (bucket, p); - g_free (p); - goto ok; - } - } else { - if (ftpfs_chdir_internal (bucket, remote_path) == COMPLETE) - goto ok; - } - } - - my_errno = EACCES; - g_free(dcache->remote_path); - g_free(dcache); - linklist_destroy(file_list, direntry_destructor); print_vfs_message(_("ftpfs: failed; nowhere to fallback to")); - return NULL; + ERRNOR(-1, EACCES); } static int -store_file(struct direntry *fe) +file_store(vfs *me, vfs_s_super *super, char *name, char *localname) { - int local_handle, sock, n, total; + int h, sock, n, total; #ifdef HAVE_STRUCT_LINGER struct linger li; #else @@ -1547,15 +1293,14 @@ char buffer[8192]; struct stat s; - local_handle = open(fe->local_filename, O_RDONLY); - unlink (fe->local_filename); - if (local_handle == -1) - ERRNOR (EIO, 0); - fstat(local_handle, &s); - sock = open_data_connection(fe->bucket, "STOR", fe->remote_filename, TYPE_BINARY, 0); + h = open(localname, O_RDONLY); + if (h == -1) + ERRNOR (EIO, -1); + fstat(h, &s); + sock = open_data_connection(me, super, "STOR", name, TYPE_BINARY, 0); if (sock < 0) { - close(local_handle); - return 0; + close(h); + return -1; } #ifdef HAVE_STRUCT_LINGER li.l_onoff = 1; @@ -1568,7 +1313,7 @@ enable_interrupt_key(); while (1) { - while ((n = read(local_handle, buffer, sizeof(buffer))) < 0) { + while ((n = read(h, buffer, sizeof(buffer))) < 0) { if (errno == EINTR) { if (got_interrupt()) { my_errno = EINTR; @@ -1600,82 +1345,79 @@ } disable_interrupt_key(); close(sock); - close(local_handle); - if (get_reply (qsock (fe->bucket), NULL, 0) != COMPLETE) - ERRNOR (EIO, 0); - return 1; + close(h); + if (get_reply (me, SUP.sock, NULL, 0) != COMPLETE) + ERRNOR (EIO, -1); + return 0; error_return: disable_interrupt_key(); close(sock); - close(local_handle); - get_reply(qsock(fe->bucket), NULL, 0); - return 0; + close(h); + get_reply(me, SUP.sock, NULL, 0); + return -1; } +#define FH_SOCK fh->u.ftp.sock + static int -linear_start(struct direntry *fe, int offset) +linear_start(vfs *me, vfs_s_fh *fh, int offset) { - fe->local_stat.st_mtime = 0; - fe->data_sock = open_data_connection(fe->bucket, "RETR", fe->remote_filename, TYPE_BINARY, offset); - if (fe->data_sock == -1) + char *name = vfs_s_fullpath (me, fh->ino); + + if (!name) + return 0; + FH_SOCK = open_data_connection(me, FH_SUPER, "RETR", name, TYPE_BINARY, offset); + if (FH_SOCK == -1) ERRNOR (EACCES, 0); - fe->linear_state = LS_LINEAR_OPEN; + fh->linear = LS_LINEAR_OPEN; return 1; } -static void -linear_abort (struct direntry *fe) -{ - my_abort(fe->bucket, fe->data_sock); - fe->data_sock = -1; -} - static int -linear_read (struct direntry *fe, void *buf, int len) +linear_read (vfs *me, vfs_s_fh *fh, void *buf, int len) { int n; - while ((n = read (fe->data_sock, buf, len))<0) { + vfs_s_super *super = FH_SUPER; + + while ((n = read (FH_SOCK, buf, len))<0) { if ((errno == EINTR) && !got_interrupt()) continue; break; } if (n<0) - linear_abort(fe); + linear_abort(me, fh); if (!n) { - close (fe->data_sock); - fe->data_sock = -1; - - if ((get_reply (qsock (fe->bucket), NULL, 0) != COMPLETE)) { - my_errno = EIO; - n=-1; - } + close (FH_SOCK); + FH_SOCK = -1; + if ((get_reply (me, SUP.sock, NULL, 0) != COMPLETE)) + ERRNOR (E_REMOTE, -1); + return 0; } ERRNOR (errno, n); } static void -linear_close (struct direntry *fe) +linear_close (vfs *me, vfs_s_fh *fh) { - if (fe->data_sock != -1) - linear_abort(fe); + if (FH_SOCK != -1) + linear_abort(me, fh); } -int ftpfs_ctl (void *data, int ctlop, int arg) +int ftpfs_ctl (void *fh, int ctlop, int arg) { - struct filp *fp = data; switch (ctlop) { case MCCTL_IS_NOTREADY: { int v; - if (!fp->fe->linear_state) + if (!FH->linear) vfs_die ("You may not do this"); - if (fp->fe->linear_state == LS_LINEAR_CLOSED) + if (FH->linear == LS_LINEAR_CLOSED) return 0; - v = select_on_two (fp->fe->data_sock, 0); + v = vfs_s_select_on_two (FH->u.ftp.sock, 0); if (((v < 0) && (errno == EINTR)) || v == 0) return 1; return 0; @@ -1685,27 +1427,28 @@ } } +/* Warning: filename passed to this command is damaged */ static int -send_ftp_command(char *filename, char *cmd, int flags) +send_ftp_command(vfs *me, char *filename, char *cmd, int flags) { - char *remote_path, *p; - struct connection *bucket; + char *rpath, *p; + vfs_s_super *super; int r; - int flush_directory_cache = (flags & OPT_FLUSH) && (normal_flush > 0); + int flush_directory_cache = (flags & OPT_FLUSH); - if (!(remote_path = get_path(&bucket, filename))) + if (!(rpath = vfs_s_get_path_mangle(me, filename, &super, 0))) return -1; - p = translate_path (bucket, remote_path); - r = command (bucket, WAIT_REPLY, cmd, p); + p = translate_path (me, super, rpath); + g_free(rpath); + r = command (me, super, WAIT_REPLY, cmd, p); g_free (p); - g_free(remote_path); - vfs_add_noncurrent_stamps (&vfs_ftpfs_ops, (vfsid) bucket, NULL); + vfs_add_noncurrent_stamps (&vfs_ftpfs_ops, (vfsid) super, NULL); if (flags & OPT_IGNORE_ERROR) r = COMPLETE; if (r != COMPLETE) ERRNOR (EPERM, -1); if (flush_directory_cache) - flush_all_directory(bucket); + vfs_s_invalidate(me, super); return 0; } @@ -1734,20 +1477,12 @@ endpwent (); } -int -ftpfs_init (vfs *me) -{ - connections_list = linklist_init(); - ftpfs_directory_timeout = FTPFS_DIRECTORY_TIMEOUT; - return 1; -} - static int ftpfs_chmod (vfs *me, char *path, int mode) { char buf[BUF_SMALL]; g_snprintf(buf, sizeof(buf), "SITE CHMOD %4.4o %%s", mode & 07777); - return send_ftp_command(path, buf, OPT_IGNORE_ERROR | OPT_FLUSH); + return send_ftp_command(me, path, buf, OPT_IGNORE_ERROR | OPT_FLUSH); } static int ftpfs_chown (vfs *me, char *path, int owner, int group) @@ -1764,58 +1499,58 @@ static int ftpfs_unlink (vfs *me, char *path) { - return send_ftp_command(path, "DELE %s", OPT_FLUSH); + return send_ftp_command(me, path, "DELE /%s", OPT_FLUSH); } /* Return true if path is the same directoy as the one we are on now */ static int -is_same_dir (char *path, struct connection *bucket) +is_same_dir (vfs *me, vfs_s_super *super, char *path) { - if (!qcdir (bucket)) + if (!SUP.cwdir) return 0; - if (strcmp (path, qcdir (bucket)) == 0) + if (strcmp (path, SUP.cwdir) == 0) return 1; return 0; } static int -ftpfs_chdir_internal (struct connection *bucket ,char *remote_path) +ftpfs_chdir_internal (vfs *me, vfs_s_super *super, char *remote_path) { int r; char *p; - if (!bucket->cwd_defered && is_same_dir (remote_path, bucket)) + if (!SUP.cwd_defered && is_same_dir (me, super, remote_path)) return COMPLETE; - p = translate_path (bucket, remote_path); - r = command (bucket, WAIT_REPLY, "CWD %s", p); + p = translate_path (me, super, remote_path); + r = command (me, super, WAIT_REPLY, "CWD /%s", p); g_free (p); - + if (r != COMPLETE) { my_errno = EIO; } else { - if (qcdir(bucket)) - g_free(qcdir(bucket)); - qcdir(bucket) = g_strdup (remote_path); - bucket->cwd_defered = 0; + if (SUP.cwdir) + g_free(SUP.cwdir); + SUP.cwdir = g_strdup (remote_path); + SUP.cwd_defered = 0; } return r; } static int ftpfs_rename (vfs *me, char *path1, char *path2) { - send_ftp_command(path1, "RNFR %s", OPT_FLUSH); - return send_ftp_command(path2, "RNTO %s", OPT_FLUSH); + send_ftp_command(me, path1, "RNFR /%s", OPT_FLUSH); + return send_ftp_command(me, path2, "RNTO /%s", OPT_FLUSH); } static int ftpfs_mkdir (vfs *me, char *path, mode_t mode) { - return send_ftp_command(path, "MKD %s", OPT_FLUSH); + return send_ftp_command(me, path, "MKD /%s", OPT_FLUSH); } static int ftpfs_rmdir (vfs *me, char *path) { - return send_ftp_command(path, "RMD %s", OPT_FLUSH); + return send_ftp_command(me, path, "RMD /%s", OPT_FLUSH); } void ftpfs_set_debug (const char *file) @@ -1823,6 +1558,7 @@ logfile = fopen (file, "w+"); } +#ifdef FIXME_LATER_ALIGATOR static void my_forget (char *file) { struct linklist *l; @@ -1852,9 +1588,9 @@ for (l = connections_list->next; l != connections_list; l = l->next){ struct connection *bucket = l->data; - if ((strcmp (host, qhost (bucket)) == 0) && - (strcmp (user, quser (bucket)) == 0) && - (port == qport (bucket))){ + if ((strcmp (host, SUP.host) == 0) && + (strcmp (user, SUP.user) == 0) && + (port == SUP.port)){ /* close socket: the child owns it now */ close (bucket->sock); @@ -1872,60 +1608,99 @@ if (pass) wipe_password (pass); } +#endif + +static int ftpfs_fh_open (vfs *me, vfs_s_fh *fh, int flags, int mode) +{ + if (!fh->ino->localname) + if (vfs_s_retrieve_file (me, fh->ino)==-1) + return -1; + if (!fh->ino->localname) + vfs_die( "retrieve_file failed to fill in localname" ); + return 0; +} + +static struct vfs_s_data ftp_data = { + NULL, + 0, + 0, + NULL, + + NULL, /* init_inode */ + NULL, /* free_inode */ + NULL, /* init_entry */ + + NULL, /* archive_check */ + archive_same, + open_archive, + free_archive, + + ftpfs_fh_open, /* fh_open */ + NULL, /* fh_close */ + + vfs_s_find_entry_linear, + dir_load, + dir_uptodate, + file_store, + + linear_start, + linear_read, + linear_close +}; vfs vfs_ftpfs_ops = { NULL, /* This is place of next pointer */ "File Tranfer Protocol (ftp)", F_NET, /* flags */ "ftp:", /* prefix */ - NULL, /* data */ + &ftp_data, /* data */ 0, /* errno */ - ftpfs_init, - ftpfs_done, - ftpfs_fill_names, + NULL, + NULL, + vfs_s_fill_names, NULL, - s_open, - s_close, - s_read, - s_write, - - s_opendir, - s_readdir, - s_closedir, - s_telldir, - s_seekdir, - - s_stat, - s_lstat, - s_fstat, + vfs_s_open, + vfs_s_close, + vfs_s_read, + vfs_s_write, + + vfs_s_opendir, + vfs_s_readdir, + vfs_s_closedir, + vfs_s_telldir, + vfs_s_seekdir, + + vfs_s_stat, + vfs_s_lstat, + vfs_s_fstat, ftpfs_chmod, ftpfs_chown, /* not really implemented but returns success */ NULL, - s_readlink, + vfs_s_readlink, NULL, NULL, ftpfs_unlink, ftpfs_rename, - s_chdir, - s_errno, - s_lseek, + vfs_s_chdir, + vfs_s_ferrno, + vfs_s_lseek, NULL, - s_getid, - s_nothingisopen, - s_free, + vfs_s_getid, + vfs_s_nothingisopen, + vfs_s_free, - s_getlocalcopy, - s_ungetlocalcopy, + NULL, + NULL, ftpfs_mkdir, ftpfs_rmdir, ftpfs_ctl, - s_setctl + vfs_s_setctl MMAPNULL }; @@ -1938,9 +1713,8 @@ { char *p; int i; - static char *keywords [] = { "default", "machine", - "login", "password", "passwd", - "account", "macdef" }; + static const char * const keywords [] = { "default", "machine", + "login", "password", "passwd", "account", "macdef" }; while (1) { netrcp = skip_separators (netrcp); @@ -1952,7 +1726,7 @@ return 0; p = buffer; if (*netrcp == '"') { - for (;*netrcp != '"' && *netrcp; netrcp++) { + for (netrcp++; *netrcp != '"' && *netrcp; netrcp++) { if (*netrcp == '\\') netrcp++; *p++ = *netrcp; @@ -1974,13 +1748,29 @@ return i + 1; } +static int netrc_has_incorrect_mode (char * netrcname, char * netrc) +{ + static int be_angry = 1; + struct stat mystat; + + if (stat (netrcname, &mystat) >= 0 && (mystat.st_mode & 077)) { + if (be_angry) { + message_1s (1, MSG_ERROR, _("~/.netrc file has not correct mode.\n" + "Remove password or correct mode.")); + be_angry = 0; + } + g_free (netrc); + g_free (netrcname); + return 1; + } + return 0; +} + int lookup_netrc (char *host, char **login, char **pass) { char *netrcname, *tmp; char hostname[MAXHOSTNAMELEN], *domain; int keyword; - struct stat mystat; - static int be_angry = 1; static struct rupcache { struct rupcache *next; char *host; @@ -2031,43 +1821,26 @@ case 4: case 5: if (strcmp (*login, "anonymous") && strcmp (*login, "ftp") && - stat (netrcname, &mystat) >= 0 && - (mystat.st_mode & 077)) { - if (be_angry) { - message_1s (1, MSG_ERROR, _("~/.netrc file has not correct mode.\n" - "Remove password or correct mode.")); - be_angry = 0; - } - g_free (netrc); - g_free (netrcname); + netrc_has_incorrect_mode (netrcname, netrc)) { return -1; } if (netrc_next () && *pass == NULL) *pass = g_strdup (buffer); break; case 6: - if (stat (netrcname, &mystat) >= 0 && - (mystat.st_mode & 077)) { - if (be_angry) { - message_1s (1, MSG_ERROR, _("~/.netrc file has not correct mode.\n" - "Remove password or correct mode.")); - be_angry = 0; - } - g_free (netrc); - g_free (netrcname); + if (netrc_has_incorrect_mode (netrcname, netrc)) { return -1; } netrc_next (); break; - case 7: - for (;;) { - while (*netrcp != '\n' && *netrcp); + case 7: /* macdef: skip it */ + do { + while (*netrcp && *netrcp != '\n') + netrcp++; if (*netrcp != '\n') break; netrcp++; - if (*netrcp == '\n' || !*netrcp) - break; - } + } while (*netrcp && *netrcp != '\n'); break; } if (keyword == 20) diff -ruN old/mc-4.5.42/vfs/ftpfs.h new/mc-4.5.43/vfs/ftpfs.h --- old/mc-4.5.42/vfs/ftpfs.h Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/ftpfs.h Sat Mar 18 08:43:43 2000 @@ -1,8 +1,12 @@ /* ftpfs.h */ +/* $Id: ftpfs.h,v 1.11 2000/02/25 12:53:06 pavel Exp $ */ + #if !defined(__FTPFS_H) #define __FTPFS_H +#include "vfs/xdirentry.h" + struct direntry { char *name; @@ -87,5 +91,9 @@ extern int ftpfs_directory_timeout; extern int ftpfs_always_use_proxy; -void ftpfs_init_passwd (); +void ftpfs_init_passwd (void); + +#define OPT_FLUSH 1 +#define OPT_IGNORE_ERROR 2 + #endif diff -ruN old/mc-4.5.42/vfs/mcfs.c new/mc-4.5.43/vfs/mcfs.c --- old/mc-4.5.42/vfs/mcfs.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/mcfs.c Sat Mar 18 08:43:43 2000 @@ -6,6 +6,8 @@ Andrej Borsenkow Norbert Warmuth + $Id: mcfs.c,v 1.16 1999/12/16 12:55:16 pavel Exp $ + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of @@ -173,7 +175,7 @@ " not be safe on the remote side. Continue? \n"), 3, 2, _(" Yes "), _(" No ")); #else - message_1s( 1, " MCFS ", _(" The remote server is running on strange port. Giving up.\n")); + message_1s( 1, _(" MCFS "), _(" The remote server is running on strange port. Giving up.\n")); v = 1; #endif @@ -199,7 +201,7 @@ return 0; if (result != MC_LOGINOK){ - message_1s (1, " MCFS ", _(" Invalid password ")); + message_1s (1, _(" MCFS "), _(" Invalid password ")); rpc_send (my_socket, RPC_INT, MC_QUIT, RPC_END); close (my_socket); return 0; @@ -230,7 +232,7 @@ sizeof (inaddr)); else { if ((hp = gethostbyname (host)) == NULL){ - message_2s (1, caller, " Can't locate hostname: %s ", host); + message_2s (1, caller, _(" Can't locate hostname: %s "), host); return 0; } bcopy ((char *) hp->h_addr, (char *) &server_address.sin_addr, @@ -248,13 +250,13 @@ server_address.sin_port = htons (*port); if ((my_socket = socket (AF_INET, SOCK_STREAM, 0)) < 0){ - message_2s (1, caller, " Can't create socket: %s ", + message_2s (1, caller, _(" Can't create socket: %s "), unix_error_string(errno)); return 0; } if (connect (my_socket, (struct sockaddr *) &server_address, sizeof (server_address)) < 0){ - message_2s (1, caller, " Can't connect to server: %s ", + message_2s (1, caller, _(" Can't connect to server: %s "), unix_error_string (errno)); close (my_socket); return 0; @@ -1122,7 +1124,7 @@ vfs vfs_mcfs_ops = { NULL, /* This is place of next pointer */ - "Midnight Commander's private remote filesystem", + N_("Midnight Commander's private remote filesystem"), F_NET, /* flags */ "mc:", /* prefix */ NULL, /* data */ diff -ruN old/mc-4.5.42/vfs/samba/include/config.h new/mc-4.5.43/vfs/samba/include/config.h --- old/mc-4.5.42/vfs/samba/include/config.h Mon Dec 6 18:49:57 1999 +++ new/mc-4.5.43/vfs/samba/include/config.h Sat Mar 18 08:43:43 2000 @@ -104,7 +104,7 @@ /* #undef HAVE_TRAPDOOR_UID */ /* #undef HAVE_ROOT */ /* #undef HAVE_UNION_SEMUN */ -#define HAVE_NETMASK_IFCONF 1 +/* #undef HAVE_NETMASK_IFCONF */ #define HAVE_GETTIMEOFDAY_TZ 1 /* #undef HAVE_SOCK_SIN_LEN */ /* #undef STAT_READ_FILSYS */ diff -ruN old/mc-4.5.42/vfs/samba/include/stamp-h new/mc-4.5.43/vfs/samba/include/stamp-h --- old/mc-4.5.42/vfs/samba/include/stamp-h Mon Dec 6 18:49:58 1999 +++ new/mc-4.5.43/vfs/samba/include/stamp-h Sat Mar 18 08:43:43 2000 @@ -1 +0,0 @@ -Thu Jun 24 19:21:18 UTC 1999 diff -ruN old/mc-4.5.42/vfs/shared_ftp_fish.c new/mc-4.5.43/vfs/shared_ftp_fish.c --- old/mc-4.5.42/vfs/shared_ftp_fish.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/shared_ftp_fish.c Sat Mar 18 08:43:43 2000 @@ -1,6 +1,8 @@ /* * Shared code between the fish.c and the ftp.c file systems * + * $Id: shared_ftp_fish.c,v 1.19 1999/12/16 12:55:16 pavel Exp $ + * * Actually, this code is not being used by fish.c any more :-). * * Namespace pollution: X_hint_reread, X_flushdir. @@ -861,7 +863,7 @@ break; total += n; - vfs_print_stats (X, "Getting file", fe->remote_filename, total, stat_size); + vfs_print_stats (X, _("Getting file"), fe->remote_filename, total, stat_size); while (write(local_handle, buffer, n) < 0) { if (errno == EINTR) { diff -ruN old/mc-4.5.42/vfs/smbfs.c new/mc-4.5.43/vfs/smbfs.c --- old/mc-4.5.42/vfs/smbfs.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/smbfs.c Sat Mar 18 08:43:43 2000 @@ -1239,7 +1239,7 @@ if (my_errno != EPERM) return 0; message_1s (1, MSG_ERROR, - " Authentication failed "); + _(" Authentication failed ")); /* authentication failed, try again */ authinfo_remove (bucket->host, bucket->service); diff -ruN old/mc-4.5.42/vfs/undelfs.c new/mc-4.5.43/vfs/undelfs.c --- old/mc-4.5.42/vfs/undelfs.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/undelfs.c Sat Mar 18 08:43:43 2000 @@ -10,6 +10,8 @@ Written by: 1995 Miguel de Icaza. 1997 Norbert Warmuth. + $Id: undelfs.c,v 1.12 2000/01/05 14:13:59 pavel Exp $ + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of @@ -75,7 +77,7 @@ static struct deleted_info *delarray; static int num_delarray, max_delarray; static char *block_buf; -static char *undelfserr = " undelfs: error "; +static char *undelfserr = N_(" undelfs: error "); static int readdir_ptr; static int undelfs_usage; @@ -178,27 +180,27 @@ num_delarray = 0; delarray = g_new (struct deleted_info, max_delarray); if (!delarray) { - message_1s (1, undelfserr, " not enough memory "); + message_1s (1, undelfserr, _(" not enough memory ")); return 0; } block_buf = g_malloc (fs->blocksize * 3); if (!block_buf) { - message_1s (1, undelfserr, " while allocating block buffer "); + message_1s (1, undelfserr, _(" while allocating block buffer ")); goto free_delarray; } if ((retval = ext2fs_open_inode_scan(fs, 0, &scan))){ - message_1s1d (1, undelfserr, " open_inode_scan: %d ", retval); + message_1s1d (1, undelfserr, _(" open_inode_scan: %d "), retval); goto free_block_buf; } if ((retval = ext2fs_get_next_inode(scan, &ino, &inode))){ - message_1s1d (1, undelfserr, " while starting inode scan %d ", retval); + message_1s1d (1, undelfserr, _(" while starting inode scan %d "), retval); goto error_out; } count = 0; while (ino) { if ((count++ % 1024) == 0) - print_vfs_message ("undelfs: loading deleted files information %d inodes", count); + print_vfs_message (_("undelfs: loading deleted files information %d inodes"), count); if (inode.i_dtime == 0) goto next; @@ -213,7 +215,7 @@ retval = ext2fs_block_iterate(fs, ino, 0, block_buf, lsdel_proc, &lsd); if (retval) { - message_1s1d (1, undelfserr, " while calling ext2_block_iterate %d ", retval); + message_1s1d (1, undelfserr, _(" while calling ext2_block_iterate %d "), retval); goto next; } if (lsd.free_blocks && !lsd.bad_blocks) { @@ -221,7 +223,7 @@ max_delarray += 50; delarray = g_renew (struct deleted_info, delarray, max_delarray); if (!delarray) { - message_1s (1, undelfserr, " no more memory while reallocating array "); + message_1s (1, undelfserr, _(" no more memory while reallocating array ")); goto error_out; } } @@ -240,7 +242,7 @@ next: retval = ext2fs_get_next_inode(scan, &ino, &inode); if (retval) { - message_1s1d(1, undelfserr, " while doing inode scan %d ", retval); + message_1s1d(1, undelfserr, _(" while doing inode scan %d "), retval); goto error_out; } } @@ -264,7 +266,7 @@ char *cptr; cptr = g_strdup_printf (" %s (%s: %ld) ", s2, str, err_code); - message_1s (1, " Ext2lib error ", cptr); + message_1s (1, _(" Ext2lib error "), cptr); g_free (cptr); } @@ -291,28 +293,28 @@ } if (ext2fs_open (ext2_fname, 0, 0, 0, unix_io_manager, &fs)){ - message_2s (1, undelfserr, " Could not open file %s ", ext2_fname); + message_2s (1, undelfserr, _(" Could not open file %s "), ext2_fname); return 0; } - print_vfs_message ("undelfs: reading inode bitmap..."); + print_vfs_message (_("undelfs: reading inode bitmap...")); if (ext2fs_read_inode_bitmap (fs)){ message_2s (1, undelfserr, - " Could not load inode bitmap from: \n %s \n", ext2_fname); + _(" Could not load inode bitmap from: \n %s \n"), ext2_fname); goto quit_opendir; } - print_vfs_message ("undelfs: reading block bitmap..."); + print_vfs_message (_("undelfs: reading block bitmap...")); if (ext2fs_read_block_bitmap (fs)){ message_2s (1, undelfserr, - " Could not load block bitmap from: \n %s \n", ext2_fname); + _(" Could not load block bitmap from: \n %s \n"), ext2_fname); goto quit_opendir; } /* Now load the deleted information */ if (!undelfs_loaddel ()) goto quit_opendir; - print_vfs_message ("undelfs: done."); + print_vfs_message (_("undelfs: done.")); return fs; quit_opendir: - print_vfs_message ("undelfs: failure"); + print_vfs_message (_("undelfs: failure")); ext2fs_close (fs); fs = NULL; return 0; @@ -336,8 +338,7 @@ char *dirent_dest; if (vfs_info != fs){ - message_1s (1, " delfs: internal error ", - " vfs_info is not fs! "); + message_1s (1, undelfserr, _(" vfs_info is not fs! ")); return NULL; } if (readdir_ptr == num_delarray) @@ -385,7 +386,7 @@ { char *file, *f; ino_t inode, i; - undelfs_file *p; + undelfs_file *p = 0; /* Only allow reads on this file system */ undelfs_get_path (fname, &file, &f); @@ -393,7 +394,7 @@ return 0; if (!ext2_fname || strcmp (ext2_fname, file)){ - message_1s (1, undelfserr, " You have to chdir to extract files first "); + message_1s (1, undelfserr, _(" You have to chdir to extract files first ")); g_free (file); g_free (f); return 0; @@ -516,7 +517,7 @@ retval = ext2fs_block_iterate(fs, p->inode, 0, NULL, dump_read, p); if (retval){ - message_1s (1, undelfserr, " while iterating over blocks "); + message_1s (1, undelfserr, _(" while iterating over blocks ")); return -1; } if (p->error_code && !p->finished) @@ -577,7 +578,7 @@ } if (!ext2_fname || strcmp (ext2_fname, file)){ - message_1s (1, undelfserr, " You have to chdir to extract files first "); + message_1s (1, undelfserr, _(" You have to chdir to extract files first ")); g_free (file); g_free (f); return 0; @@ -621,7 +622,7 @@ /* this could be fixed by making an ext2fs io manager to use */ /* our vfs, but that is left as an excercise for the reader */ if ((fd = open (file, O_RDONLY)) == -1){ - message_2s (1, undelfserr, " Could not open file: %s ", file); + message_2s (1, undelfserr, _(" Could not open file: %s "), file); g_free (f); g_free (file); return -1; @@ -667,14 +668,24 @@ undelfs_shutdown (); } +#ifdef ENABLE_NLS +static int +undelfs_init(vfs *me) { + undelfserr = _(undelfserr); + return 1; +} +#else +#define undelfs_init NULL +#endif + vfs vfs_undelfs_ops = { NULL, /* This is place of next pointer */ - "Undelete filesystem for ext2", + N_("Undelete filesystem for ext2"), 0, /* flags */ "undel:", /* prefix */ NULL, /* data */ 0, /* errno */ - NULL, + undelfs_init, NULL, NULL, /* fill_names */ NULL, diff -ruN old/mc-4.5.42/vfs/vfs.c new/mc-4.5.43/vfs/vfs.c --- old/mc-4.5.42/vfs/vfs.c Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/vfs.c Sat Mar 18 08:43:43 2000 @@ -5,6 +5,8 @@ 1995 Jakub Jelinek 1998 Pavel Machek + $Id: vfs.c,v 1.54 2000/03/06 16:31:37 pavel Exp $ + This program is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either version 2 of @@ -114,15 +116,12 @@ int vfs_register (vfs *vfs) { - int res; - if (!vfs) vfs_die("You can not register NULL."); - res = (vfs->init) ? (*vfs->init)(vfs) : 1; - - if (!res) - return 0; + if (vfs->init) /* vfs has own initialization function */ + if (!(*vfs->init)(vfs)) /* but it failed */ + return 0; vfs->next = vfs_list; vfs_list = vfs; @@ -315,7 +314,7 @@ stamp->id = id; if (parent){ struct vfs_stamping *st = stamp; - for (; parent;){ + while (parent){ st->parent = g_new (struct vfs_stamping, 1); *st->parent = *parent; parent = parent->parent; @@ -355,13 +354,12 @@ void vfs_rm_parents (struct vfs_stamping *stamp) { - struct vfs_stamping *st2, *st3; - - if (stamp){ - for (st2 = stamp, st3 = st2->parent; st3 != NULL; st2 = st3, st3 = st3->parent) - g_free (st2); + struct vfs_stamping *parent; - g_free (st2); + while (stamp) { + parent = stamp->parent; + g_free (stamp); + stamp = parent; } } @@ -396,16 +394,15 @@ } int -mc_open (char *file, int flags, ...) +mc_open (const char *filename, int flags, ...) { int handle; int mode; void *info; - vfs *vfs; va_list ap; - - file = vfs_canon (file); - vfs = vfs_type (file); + + char *file = vfs_canon (filename); + vfs *vfs = vfs_type (file); /* Get the mode flag */ /* FIXME: should look if O_CREAT is present */ va_start (ap, flags); @@ -456,12 +453,9 @@ int mc_ctl (int handle, int ctlop, int arg) { - vfs *vfs; - int result; + vfs *vfs = vfs_op (handle); - vfs = vfs_op (handle); - result = vfs->ctl ? (*vfs->ctl)(vfs_info (handle), ctlop, arg) : 0; - return result; + return vfs->ctl ? (*vfs->ctl)(vfs_info (handle), ctlop, arg) : 0; } int @@ -692,7 +686,7 @@ #define ISSLASH(a) (!a || (a == '/')) char * -vfs_canon (char *path) +vfs_canon (const char *path) { if (!path) vfs_die("Can not canonize NULL"); @@ -706,18 +700,14 @@ result = vfs_canon (local); g_free (local); return result; - } else - return g_strdup (path); + } } /* Relative to current directory */ if (*path != PATH_SEP){ char *local, *result; - if (current_dir [strlen (current_dir) - 1] == PATH_SEP) - local = g_strconcat (current_dir, path, NULL); - else - local = g_strconcat (current_dir, PATH_SEP_STR, path, NULL); + local = concat_dir_and_file (current_dir, path); result = vfs_canon (local); g_free (local); @@ -728,11 +718,15 @@ * So we have path of following form: * /p1/p2#op/.././././p3#op/p4. Good luck. */ - mad_check("(pre-canonicalize)", 0); - canonicalize_pathname (path); - mad_check("(post-canonicalize)", 0); + { + char *result = g_strdup (path); + + mad_check("(pre-canonicalize)", 0); + canonicalize_pathname (result); + mad_check("(post-canonicalize)", 0); - return g_strdup (path); + return result; + } } vfsid @@ -939,15 +933,20 @@ { return current_vfs == &vfs_tarfs_ops; } + +int +vfs_current_is_cpiofs (void) +{ + return current_vfs == &vfs_cpiofs_ops; +} #endif int -vfs_file_is_local (char *filename) +vfs_file_is_local (const char *file) { - vfs *vfs; + char *filename = vfs_canon (file); + vfs *vfs = vfs_type (filename); - filename = vfs_canon (filename); - vfs = vfs_type (filename); g_free (filename); return vfs == &vfs_local_ops; } @@ -967,10 +966,10 @@ #endif } -#ifdef WITH_SMBFS int vfs_file_is_smb (char *filename) { +#ifdef WITH_SMBFS #ifdef USE_NETCODE vfs *vfs; @@ -978,17 +977,10 @@ vfs = vfs_type (filename); g_free (filename); return vfs == &vfs_smbfs_ops; -#else +#endif /* USE_NETCODE */ +#endif /* WITH_SMBFS */ return 0; -#endif -} -#else -int -vfs_file_is_smb (char *filename) -{ - return 0; } -#endif char *vfs_get_current_dir (void) { @@ -1003,8 +995,6 @@ if (strlen(current_dir)>MC_MAXPATHLEN-2) vfs_die ("Current dir too long.\n"); - - return; } MC_NAMEOP (mkdir, (char *path, mode_t mode), (vfs, vfs_name (path), mode)) @@ -1103,18 +1093,17 @@ fail: if (fdout) close(fdout); if (fdin) mc_close (fdin); - g_free (tmp); + free (tmp); return NULL; } char * -mc_getlocalcopy (char *path) +mc_getlocalcopy (const char *pathname) { - vfs *vfs; char *result; + char *path = vfs_canon (pathname); + vfs *vfs = vfs_type (path); - path = vfs_canon (path); - vfs = vfs_type (path); result = vfs->getlocalcopy ? (*vfs->getlocalcopy)(vfs, vfs_name (path)) : mc_def_getlocalcopy (vfs, vfs_name (path)); g_free (path); @@ -1157,7 +1146,7 @@ return 0; failed: - message_1s (1, "Changes to file lost", filename); + message_1s (1, _("Changes to file lost"), filename); if (fdout) mc_close(fdout); if (fdin) close(fdin); unlink (local); @@ -1166,13 +1155,11 @@ } int -mc_ungetlocalcopy (char *path, char *local, int has_changed) +mc_ungetlocalcopy (const char *pathname, char *local, int has_changed) { - vfs *vfs; - int res; + char *path = vfs_canon (pathname); + vfs *vfs = vfs_type (path); - path = vfs_canon (path); - vfs = vfs_type (path); vfs->ungetlocalcopy ? (*vfs->ungetlocalcopy)(vfs, vfs_name (path), local, has_changed) : mc_def_ungetlocalcopy (vfs, vfs_name (path), local, has_changed); /* FIXME: errors are ignored at this point */ @@ -1255,6 +1242,7 @@ vfs_register (&vfs_extfs_ops); vfs_register (&vfs_sfs_ops); vfs_register (&vfs_tarfs_ops); + vfs_register (&vfs_cpiofs_ops); #ifdef USE_EXT2FSLIB vfs_register (&vfs_undelfs_ops); @@ -1602,10 +1590,10 @@ if (is_num (idx)) { if(is_time(columns[idx], &tim) || (got_year = is_year(columns[idx], &tim))) { - idx++; + idx++; /* This is a special case for ctime() or Mon DD YYYY hh:mm */ - if(is_num (idx) && + if(is_num (idx) && (columns[idx+1][0]) && ((got_year = is_year(columns[idx], &tim)) || is_time(columns[idx], &tim))) idx++; /* time & year or reverse */ } /* only time or date */ @@ -1731,8 +1719,11 @@ goto error; /* Use resulting time value */ s->st_atime = s->st_ctime = s->st_mtime; +#if 0 + /* These variables must be initialized by vfs_s_new_inode () */ s->st_dev = 0; s->st_ino = 0; +#endif #ifdef HAVE_ST_BLKSIZE s->st_blksize = 512; #endif @@ -1758,11 +1749,11 @@ } if (linkname){ s = g_strdup (p_copy + column_ptr [idx2+1]); - p = strlen (s); + p = strlen (s) - 1; + if (s [p] == '\r' || s [p] == '\n') + s [p] = 0; if (s [p-1] == '\r' || s [p-1] == '\n') s [p-1] = 0; - if (s [p-2] == '\r' || s [p-2] == '\n') - s [p-2] = 0; *linkname = s; } @@ -1778,12 +1769,12 @@ char *s; s = g_strdup (p_copy + column_ptr [idx++]); - p = strlen (s); + p = strlen (s) - 1; /* g_strchomp(); */ + if (s [p] == '\r' || s [p] == '\n') + s [p] = 0; if (s [p-1] == '\r' || s [p-1] == '\n') - s [p-1] = 0; - if (s [p-2] == '\r' || s [p-2] == '\n') - s [p-2] = 0; + s [p-1] = 0; *filename = s; } @@ -1798,9 +1789,9 @@ static int errorcount = 0; if (++errorcount < 5) { - message_1s (1, "Could not parse:", p_copy); + message_1s (1, _("Could not parse:"), p_copy); } else if (errorcount == 5) - message_1s (1, "More parsing errors will be ignored.", "(sorry)" ); + message_1s (1, _("More parsing errors will be ignored."), _("(sorry)")); } if (p_copy != p) /* Carefull! */ @@ -1811,7 +1802,7 @@ void vfs_die (char *m) { - message_1s (1, "Internal error:", m); + message_1s (1, _("Internal error:"), m); exit (1); } diff -ruN old/mc-4.5.42/vfs/vfs.h new/mc-4.5.43/vfs/vfs.h --- old/mc-4.5.42/vfs/vfs.h Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/vfs.h Sat Mar 18 08:43:43 2000 @@ -127,6 +127,7 @@ /* Other file systems */ extern vfs vfs_local_ops; extern vfs vfs_tarfs_ops; + extern vfs vfs_cpiofs_ops; extern vfs vfs_ftpfs_ops; extern vfs vfs_smbfs_ops; @@ -156,14 +157,15 @@ void vfs_rm_parents (struct vfs_stamping *stamp); char *vfs_path (char *path); char *vfs_strip_suffix_from_filename (char *filename); - char *vfs_canon (char *path); + char *vfs_canon (const char *path); char *mc_get_current_wd (char *buffer, int bufsize); int vfs_current_is_local (void); #if 0 int vfs_current_is_extfs (void); int vfs_current_is_tarfs (void); + int vfs_current_is_cpiofs (void); #endif - int vfs_file_is_local (char *name); + int vfs_file_is_local (const char *name); int vfs_file_is_ftp (char *filename); int vfs_file_is_smb (char *filename); char *vfs_get_current_dir (void); @@ -192,7 +194,7 @@ /* Only the routines outside of the VFS module need the emulation macros */ - int mc_open (char *file, int flags, ...); + int mc_open (const char *filename, int flags, ...); int mc_close (int handle); int mc_read (int handle, char *buffer, int count); int mc_write (int hanlde, char *buffer, int count); @@ -222,8 +224,8 @@ int mc_rmdir (char *path); int mc_mkdir (char *path, mode_t mode); - char *mc_getlocalcopy (char *filename); - int mc_ungetlocalcopy (char *filename, char *local, int has_changed); + char *mc_getlocalcopy (const char *pathname); + int mc_ungetlocalcopy (const char *pathname, char *local, int has_changed); char *mc_def_getlocalcopy (vfs *vfs, char *filename); int mc_def_ungetlocalcopy (vfs *vfs, char *filename, char *local, int has_changed); int mc_ctl (int fd, int ctlop, int arg); @@ -249,6 +251,7 @@ # define vfs_file_is_ftp(x) 0 # define vfs_file_is_smb(x) 0 # define vfs_current_is_tarfs() 0 +# define vfs_current_is_cpiofs() 0 # define vfs_current_is_extfs() 0 # define vfs_path(x) x # define vfs_strip_suffix_from_filename(x) g_strdup(x) @@ -378,7 +381,9 @@ listed above and O_APPEND */ #if (O_ALL & O_APPEND) +#ifdef __GNUC__ #warning Unexpected problem with flags, O_LINEAR disabled, contact pavel@ucw.cz +#endif #define O_LINEAR 0 #define IS_LINEAR(a) 0 #define NO_LINEAR(a) a diff -ruN old/mc-4.5.42/vfs/xdirentry.h new/mc-4.5.43/vfs/xdirentry.h --- old/mc-4.5.42/vfs/xdirentry.h Mon Dec 6 18:49:55 1999 +++ new/mc-4.5.43/vfs/xdirentry.h Sat Mar 18 08:43:43 2000 @@ -1,6 +1,8 @@ #ifndef DIRENTRY_H #define DIRENTRY_H +/* $Id: xdirentry.h,v 1.11 2000/02/25 12:53:07 pavel Exp $ */ + #include #include #include @@ -58,6 +60,9 @@ long data_offset; } tar; struct { + long offset; + } cpio; + struct { struct timeval timestamp; struct stat local_stat; } fish; @@ -114,6 +119,13 @@ #define RFC_DARING 1 #define RFC_STRICT 2 } ftp; + struct { + int fd; + struct stat stat; + int type; /* Type of the archive */ + /*int pos; In case reentrancy will be needed */ + struct defer_inode *defered; /* List of inodes for which another entries may appear */ + } cpio; } u; int magic; #define SUPER_MAGIC 0x915ac312 @@ -239,6 +251,9 @@ int vfs_s_select_on_two (int fd1, int fd2); int vfs_s_get_line (vfs *me, int sock, char *buf, int buf_len, char term); int vfs_s_get_line_interruptible (vfs *me, char *buffer, int size, int fd); + +/* misc */ +int vfs_s_retrieve_file (vfs *me, struct vfs_s_inode *ino); /* If non-null, FREE */ #define ifree(ptr) do { if (ptr) g_free(ptr); } while (0)