diff -ruN old/mc-4.5.44/VERSION new/mc-4.5.45/VERSION --- old/mc-4.5.44/VERSION Tue Apr 4 23:31:54 2000 +++ new/mc-4.5.45/VERSION Tue May 9 18:52:01 2000 @@ -1 +1 @@ -#define VERSION "4.5.44" +#define VERSION "4.5.45" diff -ruN old/mc-4.5.44/aclocal.m4 new/mc-4.5.45/aclocal.m4 --- old/mc-4.5.44/aclocal.m4 Tue Apr 4 23:31:54 2000 +++ new/mc-4.5.45/aclocal.m4 Tue May 9 18:52:01 2000 @@ -1,2464 +1,1852 @@ -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 -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - dnl -dnl XView & SlingShot library checking -dnl (c) 1995 Jakub Jelinek +dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) +dnl +dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh +dnl is not found. dnl -dnl Set xview_includes, xview_libraries, and no_xview (initially yes). -dnl Also sets xview_no_private_headers to yes if there are no xview_private -dnl headers in the system. -AC_DEFUN(AC_PATH_XVIEW, -[ -no_xview=yes -AC_ARG_WITH(xview, [--with-xview Use the XView toolkit],no_xview=) +AC_DEFUN([GNOME_INIT_HOOK],[ + AC_SUBST(GNOME_LIBS) + AC_SUBST(GNOMEUI_LIBS) + AC_SUBST(GNOMEGNORBA_LIBS) + AC_SUBST(GTKXMHTML_LIBS) + AC_SUBST(ZVT_LIBS) + AC_SUBST(GNOME_LIBDIR) + AC_SUBST(GNOME_INCLUDEDIR) -AC_ARG_WITH(xview-includes, [--with-xview-includes=path Specifies XView includes directory], -[ -if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-xview-includes=path) - xview_includes=NONE - no_xview= -else - xview_includes=$withval -fi -], -[ -xview_includes=NONE -])dnl -AC_ARG_WITH(xview-libraries, [--with-xview-libraries=path Specifies XView libraries directory], -[ -if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-xview-libraries=path) - xview_libraries=NONE - no_xview= -else - xview_libraries=$withval -fi -], -[ -xview_libraries=NONE -])dnl + AC_ARG_WITH(gnome-includes, + [ --with-gnome-includes Specify location of GNOME headers],[ + CFLAGS="$CFLAGS -I$withval" + ]) + + AC_ARG_WITH(gnome-libs, + [ --with-gnome-libs Specify location of GNOME libs],[ + LDFLAGS="$LDFLAGS -L$withval" + gnome_prefix=$withval + ]) -if test "$no_xview" != yes; then - if test "$no_x" = yes; then - no_xview=yes - fi -fi -if test "$no_xview" != yes; then -AC_MSG_CHECKING(for XView) -if test x$xview_libraries = xNONE; then - if test x$xview_includes = xNONE; then -AC_CACHE_VAL(ac_cv_path_xview, -[ - no_xview=yes -AC_PATH_XVIEW_XMKMF - if test "x$no_xview" = xyes; then -AC_PATH_XVIEW_DIRECT - fi - if test "x$no_xview" = xyes; then - ac_cv_path_xview="no_xview=yes" - else - ac_cv_path_xview="no_xview= ac_xview_includes=$ac_xview_includes ac_xview_libraries=$ac_xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" - fi -])dnl - eval "$ac_cv_path_xview" - fi -fi + AC_ARG_WITH(gnome, + [ --with-gnome Specify prefix for GNOME files], + if test x$withval = xyes; then + want_gnome=yes + dnl Note that an empty true branch is not + dnl valid sh syntax. + ifelse([$1], [], :, [$1]) + else + if test "x$withval" = xno; then + want_gnome=no + else + want_gnome=yes + LDFLAGS="$LDFLAGS -L$withval/lib" + CFLAGS="$CFLAGS -I$withval/include" + gnome_prefix=$withval/lib + fi + fi, + want_gnome=yes) -if test "x$no_xview" = xyes; then - AC_MSG_RESULT(no) -else - if test "x$xview_includes" = x || test "x$xview_includes" = xNONE; then - xview_includes=$ac_xview_includes - fi - if test "x$xview_libraries" = x || test "x$xview_libraries" = xNONE; then - xview_libraries=$ac_xview_libraries - fi - xview_no_private_headers=$ac_xview_no_private_headers - ac_cv_path_xview="no_xview= ac_xview_includes=$xview_includes ac_xview_libraries=$xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" - if test "x$xview_libraries" != x; then - ac_msg_xview="libraries $xview_libraries" - else - ac_msg_xview="" - fi - if test "x$xview_includes" != x; then - if test "x$ac_msg_xview" != x; then - ac_msg_xview="$ac_msg_xview, " + if test "x$want_gnome" = xyes; then + + AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) + if test "$GNOME_CONFIG" = "no"; then + no_gnome_config="yes" + else + AC_MSG_CHECKING(if $GNOME_CONFIG works) + if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then + AC_MSG_RESULT(yes) + GNOME_GNORBA_HOOK([],$2) + GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" + GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" + GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" + GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" + ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" + GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" + GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" + $1 + else + AC_MSG_RESULT(no) + no_gnome_config="yes" + fi + fi + + if test x$exec_prefix = xNONE; then + if test x$prefix = xNONE; then + gnome_prefix=$ac_default_prefix/lib + else + gnome_prefix=$prefix/lib + fi + else + gnome_prefix=`eval echo \`echo $libdir\`` + fi + + if test "$no_gnome_config" = "yes"; then + AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) + if test -f $gnome_prefix/gnomeConf.sh; then + AC_MSG_RESULT(found) + echo "loading gnome configuration from" \ + "$gnome_prefix/gnomeConf.sh" + . $gnome_prefix/gnomeConf.sh + $1 + else + AC_MSG_RESULT(not found) + if test x$2 = xfail; then + AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) + fi + fi + fi fi - ac_msg_xview="${ac_msg_xview}headers $xview_includes" - fi - if test "x$xview_no_private_headers" = xyes; then - if test "x$ac_msg_xview" != x; then - ac_msg_xview="$ac_msg_xview, " + + if test -n "$3"; then + n="$3" + for i in $n; do + AC_MSG_CHECKING(extra library \"$i\") + case $i in + applets) + AC_SUBST(GNOME_APPLETS_LIBS) + GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` + AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + docklets) + AC_SUBST(GNOME_DOCKLETS_LIBS) + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; + capplet) + AC_SUBST(GNOME_CAPPLET_LIBS) + GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` + AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; + *) + AC_MSG_RESULT(unknown library) + esac + done fi - ac_msg_xview="${ac_msg_xview}without xview_private headers" - fi - AC_MSG_RESULT([$ac_msg_xview]) -fi -fi ]) -dnl Internal subroutine of AC_PATH_XVIEW -dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). -AC_DEFUN(AC_PATH_XVIEW_XMKMF, -[rm -fr conftestdir -if mkdir conftestdir; then - cd conftestdir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' -#include -acfindxv: - @echo 'ac_im_library_dest="${LIBRARY_DEST}"; ac_im_header_dest="${HEADER_DEST}"' -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - no_xview= - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `make acfindxv 2>/dev/null | grep -v make` - # Screen out bogus values from the imake configuration. - if test -f "$ac_im_header_dest/xview/xview.h"; then - ac_xview_includes="$ac_im_header_dest" - else - no_xview=yes - fi - if test -d "$ac_im_library_dest"; then - ac_xview_libraries="$ac_im_library_dest" - else - no_xview=yes - fi - fi - if test "x$no_xview" != xyes; then - if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then - ac_xview_no_private_headers= - else - ac_xview_no_private_headers=yes - fi - fi - cd .. - rm -fr conftestdir -fi -]) +dnl +dnl GNOME_INIT ([additional-inits]) +dnl -dnl Internal subroutine of AC_PATH_XVIEW -dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). -AC_DEFUN(AC_PATH_XVIEW_DIRECT, -[test -z "$xview_direct_test_library" && xview_direct_test_library=xview -test -z "$xview_direct_test_function" && xview_direct_test_function=xv_unique_key -test -z "$xview_direct_test_include" && xview_direct_test_include=xview/xview.h -AC_TRY_CPP([#include <$xview_direct_test_include>], -[no_xview= ac_xview_includes=], -[ for ac_dir in \ - $OPENWINHOME/include \ - /usr/openwin/include \ - /usr/openwin/share/include \ - \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X11/include \ - /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - ; \ - do - if test -r "$ac_dir/$xview_direct_test_include"; then - no_xview= ac_xview_includes=$ac_dir - break - fi - done]) - -if test "x$no_xview" != xyes; then - if test "x$ac_xview_includes" != x; then - if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then - ac_xview_no_private_headers= - else - ac_xview_no_private_headers=yes - fi - else -AC_TRY_CPP([#include ], -[ac_xview_no_private_headers=],[ac_xview_no_private_headers=yes]) - fi -fi +AC_DEFUN([GNOME_INIT],[ + GNOME_INIT_HOOK([],fail,$1) +]) +dnl GNOME_VFS_CHECKS +dnl Check for various functions needed by libvfs. +dnl This has various effects: +dnl Sets GNOME_VFS_LIBS to libraries required +dnl Sets termnet to true or false depending on whether it is required. +dnl If yes, defines USE_TERMNET. +dnl Sets vfs_flags to "pretty" list of vfs implementations we include. +dnl Sets shell variable use_vfs to yes (default, --with-vfs) or +dnl "no" (--without-vfs). +dnl Calls AC_SUBST(mcserv), which is either empty or "mcserv". -# Check for the libraries. -# See if we find them without any special options. -# Don't add to $LIBS permanently. -ac_save_LIBS="$LIBS" -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $X_LIBS" -LIBS="-l$xview_direct_test_library -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" -AC_TRY_LINK([#include <$xview_direct_test_include> -], [${xview_direct_test_function}()], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_xview= ac_xview_libraries=], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" -# First see if replacing the include by lib works. -for ac_dir in `echo "$ac_xview_includes" | sed s/include/lib/` \ - $OPENWINHOME/lib \ - $OPENWINHOME/share/lib \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X11/lib \ - /usr/lib/X11 \ - /usr/local/X11/lib \ - /usr/local/lib/X11 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/lib${xview_direct_test_library}.$ac_extension; then - no_xview= ac_xview_libraries=$ac_dir - break 2 - fi - done -done])]) +dnl Private define +AC_DEFUN([GNOME_WITH_VFS],[ + dnl FIXME: network checks should probably be in their own macro. + AC_CHECK_LIB(nsl, t_accept) + AC_CHECK_LIB(socket, socket) -dnl Substitute XVIEW_LIBS and XVIEW_CFLAGS and -dnl HAVE_XVIEW, which is either yes or no. -dnl Both contain X_LIBS resp. X_CFLAGS inside -dnl Also substitutes HAVE_XVIEW_PRIVATE_HEADERS -dnl if there are xview_private headers in the system -AC_DEFUN(AC_PATH_XVIEW_XTRA, -[AC_REQUIRE([AC_PATH_XVIEW])dnl -if test "$no_xview" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - XVIEW_CFLAGS="$X_CFGLAGS $XVIEW_CFLAGS -DXVIEW_MISSING" -else - if test -n "$xview_includes"; then - XVIEW_CFLAGS="$X_CFLAGS $XVIEW_CFGLAGS" - if test "$xview_includes" != "$x_includes"; then - XVIEW_CPPFLAGS="-I$xview_includes" - fi + have_socket=no + AC_CHECK_FUNCS(socket, have_socket=yes) + if test $have_socket = no; then + # socket is not in the default libraries. See if it's in some other. + for lib in bsd socket inet; do + AC_CHECK_LIB($lib, socket, [ + LIBS="$LIBS -l$lib" + have_socket=yes + AC_DEFINE(HAVE_SOCKET) + break]) + done fi - # It would be nice to have a more robust check for the -R ld option than - # just checking for Solaris. - # It would also be nice to do this for all -L options, not just this one. - if test -n "$xview_libraries"; then - if test "$xview_libraries" = "$x_libraries"; then - XVIEW_LIBS="$X_LIBS $XVIEW_LIBS" - else - XVIEW_LIBS="$X_LIBS $XVIEW_LIBS -L$xview_libraries" - if test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - XVIEW_LIBS="$XVIEW_LIBS -R$xview_libraries" - fi - fi + have_gethostbyname=no + AC_CHECK_FUNC(gethostbyname, have_gethostbyname=yes) + if test $have_gethostbyname = no; then + # gethostbyname is not in the default libraries. See if it's in some other. + for lib in bsd socket inet; do + AC_CHECK_LIB($lib, gethostbyname, [LIBS="$LIBS -l$lib"; have_gethostbyname=yes; break]) + done fi -fi -if test "x$no_xview" = xyes; then - HAVE_XVIEW=no -else - HAVE_XVIEW=yes -fi -if test "x$xview_no_private_headers" = xyes; then - HAVE_XVIEW_PRIVATE_HEADERS=no -else - HAVE_XVIEW_PRIVATE_HEADERS=yes -fi -AC_SUBST(XVIEW_CFLAGS)dnl -AC_SUBST(XVIEW_CPPFLAGS)dnl -AC_SUBST(XVIEW_LIBS)dnl -AC_SUBST(HAVE_XVIEW)dnl -AC_SUBST(HAVE_XVIEW_PRIVATE_HEADERS)dnl -])dnl -dnl Internal subroutine of AC_PATH_SLINGSHOT -AC_DEFUN(AC_PATH_SLINGSHOT_DIRECT, -[ -AC_TRY_CPP([#include ],[no_ss= ac_ss_includes=], -[ for ac_dir in \ - $OPENWINHOME/include \ - /usr/openwin/include \ - /usr/openwin/share/include \ - \ - /usr/X11R6/include \ - /usr/X11R5/include \ - /usr/X11R4/include \ - \ - /usr/include/X11R6 \ - /usr/include/X11R5 \ - /usr/include/X11R4 \ - \ - /usr/local/X11R6/include \ - /usr/local/X11R5/include \ - /usr/local/X11R4/include \ - \ - /usr/local/include/X11R6 \ - /usr/local/include/X11R5 \ - /usr/local/include/X11R4 \ - \ - /usr/X11/include \ - /usr/include/X11 \ - /usr/local/X11/include \ - /usr/local/include/X11 \ - \ - /usr/X386/include \ - /usr/x386/include \ - /usr/XFree86/include/X11 \ - \ - /usr/include \ - /usr/local/include \ - /usr/unsupported/include \ - /usr/athena/include \ - /usr/local/x11r5/include \ - /usr/lpp/Xamples/include \ - ; \ - do - if test -r "$ac_dir/sspkg/rectobj.h"; then - no_ss= ac_ss_includes=$ac_dir - break - fi - done]) - -# Check for the libraries. -# See if we find them without any special options. -# Don't add to $LIBS permanently. -ac_save_LIBS="$LIBS" -ac_save_LDFLAGS="$LDFLAGS" -LDFLAGS="$LDFLAGS $XVIEW_LIBS" -LIBS="-lsspkg -lm -lxview -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" -AC_TRY_LINK([#include -], [rectobj_get_selected_list()], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_ss= ac_ss_libraries=], -[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" -# First see if replacing the include by lib works. -for ac_dir in `echo "$ac_ss_includes" | sed s/include/lib/` \ - $OPENWINHOME/lib \ - $OPENWINHOME/share/lib \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X11/lib \ - /usr/lib/X11 \ - /usr/local/X11/lib \ - /usr/local/lib/X11 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - ; \ -do - for ac_extension in a so sl; do - if test -r $ac_dir/libsspkg.$ac_extension; then - no_ss= ac_ss_libraries=$ac_dir - break 2 - fi - done -done])]) - -dnl Set ss_includes, ss_libraries, and no_ss (initially yes). -AC_DEFUN(AC_PATH_SLINGSHOT, -[AC_REQUIRE([AC_PATH_XVIEW_XTRA])dnl -AC_MSG_CHECKING(for SlingShot) -AC_ARG_WITH(ss, [--with-ss Use the SlingShot extension]) - -AC_ARG_WITH(ss-includes, [--with-ss-includes=path Specifies SlingShot includes directory], -[ -if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-ss-includes=path) - ss_includes=NONE -else - ss_includes=$withval -fi -], -[ -ss_includes=NONE -])dnl -AC_ARG_WITH(ss-libraries, [--with-ss-libraries=path Specifies SlingShot libraries directory], -[ -if test x$withval = xyes; then - AC_MSG_WARN(Usage is: --with-ss-libraries=path) - ss_libraries=NONE -else - ss_libraries=$withval -fi -], -[ -ss_libraries=NONE -])dnl + vfs_flags="tarfs" + use_net_code=false + if test $have_socket = yes; then + AC_STRUCT_LINGER + AC_CHECK_FUNCS(pmap_set, , [ + AC_CHECK_LIB(rpc, pmap_set, [ + LIBS="-lrpc $LIBS" + AC_DEFINE(HAVE_PMAP_SET) + ])]) + AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport) + dnl add for source routing support setsockopt + AC_CHECK_HEADERS(rpc/pmap_clnt.h) + vfs_flags="$vfs_flags, mcfs, ftpfs, fish" + use_net_code=true + fi -if test "x$with_ss" = xno; then - no_ss=yes -else - if test "x$ss_includes" != xNONE && test "x$ss_libraries" != xNONE; then - no_ss= - else -AC_CACHE_VAL(ac_cv_path_ss, -[ - no_ss=yes -AC_PATH_SLINGSHOT_DIRECT - if test "x$no_ss" = xyes; then - ac_cv_path_ss="ac_noss=yes" - else - ac_cv_path_ss="ac_ss_includes=$ac_ss_includes ac_ss_libraries=$ac_ss_libraries" - fi -])dnl - eval "$ac_cv_path_ss" - fi -fi -fi -if test "x$no_ss" = xyes; then - AC_MSG_RESULT(no) -else - if test "x$ss_includes" = x || test "x$ss_includes" = xNONE; then - ss_includes=$ac_ss_includes - fi - if test "x$ss_libraries" = x || test "x$ss_libraries" = xNONE; then - ss_libraries=$ac_ss_libraries - fi - ac_cv_path_ss="no_ss= ac_ss_includes=$ss_includes ac_ss_libraries=$ss_libraries" - if test "x$ss_libraries" = x; then - if test "x$ss_includes" = x; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT([headers $ss_includes]) - fi - else - if test "x$ss_includes" = x; then - AC_MSG_RESULT([libraries $ss_libraries]) - else - AC_MSG_RESULT([libraries $ss_libraries, headers $ss_includes]) - fi - fi -fi -]) + dnl + dnl Samba support + dnl + smbfs="" + SAMBAFILES="" + AC_ARG_WITH(samba, + [--with-samba Support smb virtual file system],[ + if test "x$withval != xno"; then + AC_DEFINE(WITH_SMBFS) + vfs_flags="$vfs_flags, smbfs" + smbfs="smbfs.o" + SAMBAFILES="\$(SAMBAFILES)" + fi + ]) + AC_SUBST(smbfs) + AC_SUBST(SAMBAFILES) + + dnl + dnl The termnet support + dnl + termnet=false + AC_ARG_WITH(termnet, + [--with-termnet If you want a termified net support],[ + if test x$withval = xyes; then + AC_DEFINE(USE_TERMNET) + termnet=true + fi + ]) -dnl Substitute SLINGSHOT_LIBS and SLINGSHOT_CFLAGS and -dnl HAVE_SLINGSHOT, which is either yes or no. -dnl Both contain XVIEW_LIBS resp. XVIEW_CFLAGS inside -AC_DEFUN(AC_PATH_SLINGSHOT_XTRA, -[AC_REQUIRE([AC_PATH_SLINGSHOT])dnl -if test "$no_ss" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - SLINGSHOT_CFLAGS="$XVIEW_CFGLAGS $SLINGSHOT_CFLAGS -DSLINGSHOT_MISSING" -else - if test -n "$ss_includes"; then - SLINGSHOT_CFLAGS="$XVIEW_CFLAGS $SLINGSHOT_CFGLAGS -I$ss_includes" + TERMNET="" + AC_DEFINE(USE_VFS) + if $use_net_code; then + AC_DEFINE(USE_NETCODE) fi - - # It would be nice to have a more robust check for the -R ld option than - # just checking for Solaris. - # It would also be nice to do this for all -L options, not just this one. - if test -n "$ss_libraries"; then - SLINGSHOT_LIBS="$XVIEW_LIBS $SLINGSHOT_LIBS -L$ss_libraries" - if test "`(uname) 2>/dev/null`" = SunOS && - uname -r | grep '^5' >/dev/null; then - SLINGSHOT_LIBS="$SLINGSHOT_LIBS -R$ss_libraries" - fi + mcserv= + if test $have_socket = yes; then + mcserv="mcserv" + if $termnet; then + TERMNET="-ltermnet" + fi fi -fi -if test "x$no_ss" = xyes; then - HAVE_SLINGSHOT=no -else - HAVE_SLINGSHOT=yes -fi -AC_SUBST(SLINGSHOT_CFLAGS)dnl -AC_SUBST(SLINGSHOT_LIBS)dnl -AC_SUBST(HAVE_SLINGSHOT)dnl -])dnl -dnl -dnl XView library checking end -dnl + AC_SUBST(TERMNET) + AC_SUBST(mcserv) + +dnl FIXME: +dnl GNOME_VFS_LIBS= + +]) +AC_DEFUN([GNOME_VFS_CHECKS],[ + use_vfs=yes + AC_ARG_WITH(vfs, + [--with-vfs Compile with the VFS code], + use_vfs=$withval + ) + case $use_vfs in + yes) GNOME_WITH_VFS;; + no) use_vfs=no;; + *) use_vfs=no;; + dnl Should we issue a warning? + esac +]) + + +dnl GNOME_UNDELFS_CHECKS +dnl Check for ext2fs undel support. +dnl Set shell variable ext2fs_undel to "yes" if we have it, +dnl "no" otherwise. May define USE_EXT2FSLIB for cpp. +dnl Will set EXT2FS_UNDEL_LIBS to required libraries. + +AC_DEFUN([GNOME_UNDELFS_CHECKS], [ + AC_CHECK_HEADERS(ext2fs/ext2fs.h linux/ext2_fs.h) + ext2fs_undel=no + EXT2FS_UNDEL_LIBS= + if test x$ac_cv_header_ext2fs_ext2fs_h = xyes + then + if test x$ac_cv_header_linux_ext2_fs_h = xyes + then + AC_DEFINE(USE_EXT2FSLIB) + ext2fs_undel=yes + EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err" + fi + fi +]) dnl -dnl Check for size of d_name dirent member +dnl Check for struct linger dnl -AC_DEFUN(AC_SHORT_D_NAME_LEN, [ -AC_MSG_CHECKING(filename fits on dirent.d_name) -AC_CACHE_VAL(ac_cv_dnamesize, [ -OCFLAGS="$CFLAGS" -CFLAGS="$CFLAGS -I$srcdir" +AC_DEFUN(AC_STRUCT_LINGER, [ +av_struct_linger=no +AC_MSG_CHECKING(struct linger is available) AC_TRY_RUN([ -#include +#include +#include + +struct linger li; main () { - struct dirent ddd; - - if (sizeof (ddd.d_name) < 12) - exit (0); - else - exit (1); + li.l_onoff = 1; + li.l_linger = 120; + exit (0); } - ],[ - ac_cv_dnamesize="no" -], [ - ac_cv_dnamesize="yes" -], [ -# Cannot find out, so assume no - ac_cv_dnamesize="no" -]) -CFLAGS="$OCFLAGS" +AC_DEFINE(HAVE_STRUCT_LINGER) +av_struct_linger=yes +],[ +av_struct_linger=no +],[ +av_struct_linger=no ]) -if test x$ac_cv_dnamesize = xno; then - AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER) -fi -AC_MSG_RESULT($ac_cv_dnamesize) +AC_MSG_RESULT($av_struct_linger) ]) - dnl -dnl Filesystem information detection -dnl -dnl To get information about the disk, mount points, etc. +dnl XView & SlingShot library checking +dnl (c) 1995 Jakub Jelinek dnl -AC_DEFUN(AC_GET_FS_INFO, [ - AC_CHECK_HEADERS(fcntl.h sys/dustat.h sys/param.h sys/statfs.h sys/fstyp.h) - AC_CHECK_HEADERS(mnttab.h mntent.h utime.h sys/statvfs.h sys/vfs.h) - AC_CHECK_HEADERS(sys/mount.h sys/filsys.h sys/fs_types.h) - AC_CHECK_FUNCS(getmntinfo) - - dnl This configure.in code has been stolen from GNU fileutils-3.12. Its - dnl job is to detect a method to get list of mounted filesystems. - - AC_MSG_CHECKING([for d_ino member in directory struct]) - AC_CACHE_VAL(fu_cv_sys_d_ino_in_dirent, - [AC_TRY_LINK([ -#include -#ifdef HAVE_DIRENT_H -# include -#else /* not HAVE_DIRENT_H */ -# define dirent direct -# ifdef HAVE_SYS_NDIR_H -# include -# endif /* HAVE_SYS_NDIR_H */ -# ifdef HAVE_SYS_DIR_H -# include -# endif /* HAVE_SYS_DIR_H */ -# ifdef HAVE_NDIR_H -# include -# endif /* HAVE_NDIR_H */ -#endif /* HAVE_DIRENT_H */ - ], - [struct dirent dp; dp.d_ino = 0;], - fu_cv_sys_d_ino_in_dirent=yes, - fu_cv_sys_d_ino_in_dirent=no)]) - AC_MSG_RESULT($fu_cv_sys_d_ino_in_dirent) - if test $fu_cv_sys_d_ino_in_dirent = yes; then - AC_DEFINE(D_INO_IN_DIRENT) - fi - - # Determine how to get the list of mounted filesystems. - list_mounted_fs= - - # If the getmntent function is available but not in the standard library, - # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). - AC_FUNC_GETMNTENT - - if test $ac_cv_func_getmntent = yes; then - - # This system has the getmntent function. - # Determine whether it's the one-argument variant or the two-argument one. - - if test -z "$list_mounted_fs"; then - # SVR4 - AC_MSG_CHECKING([for two-argument getmntent function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, - [AC_EGREP_HEADER(getmntent, sys/mnttab.h, - fu_cv_sys_mounted_getmntent2=yes, - fu_cv_sys_mounted_getmntent2=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) - if test $fu_cv_sys_mounted_getmntent2 = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTENT2) - fi - fi - - if test -z "$list_mounted_fs"; then - # 4.3BSD, SunOS, HP-UX, Dynix, Irix - AC_MSG_CHECKING([for one-argument getmntent function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, - [test $ac_cv_header_mntent_h = yes \ - && fu_cv_sys_mounted_getmntent1=yes \ - || fu_cv_sys_mounted_getmntent1=no]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) - if test $fu_cv_sys_mounted_getmntent1 = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTENT1) - fi - fi +dnl Set xview_includes, xview_libraries, and no_xview (initially yes). +dnl Also sets xview_no_private_headers to yes if there are no xview_private +dnl headers in the system. +AC_DEFUN(AC_PATH_XVIEW, +[ +no_xview=yes +AC_ARG_WITH(xview, [--with-xview Use the XView toolkit],no_xview=) - if test -z "$list_mounted_fs"; then - AC_WARN([could not determine how to read list of mounted fs]) - CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" - fi +AC_ARG_WITH(xview-includes, [--with-xview-includes=path Specifies XView includes directory], +[ +if test x$withval = xyes; then + AC_MSG_WARN(Usage is: --with-xview-includes=path) + xview_includes=NONE + no_xview= +else + xview_includes=$withval +fi +], +[ +xview_includes=NONE +])dnl +AC_ARG_WITH(xview-libraries, [--with-xview-libraries=path Specifies XView libraries directory], +[ +if test x$withval = xyes; then + AC_MSG_WARN(Usage is: --with-xview-libraries=path) + xview_libraries=NONE + no_xview= +else + xview_libraries=$withval +fi +], +[ +xview_libraries=NONE +])dnl +if test "$no_xview" != yes; then + if test "$no_x" = yes; then + no_xview=yes fi - - if test -z "$list_mounted_fs"; then - # DEC Alpha running OSF/1. - AC_MSG_CHECKING([for getfsstat function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, - [AC_TRY_LINK([ -#include -#include -#include ], - [struct statfs *stats; - numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], - fu_cv_sys_mounted_getsstat=yes, - fu_cv_sys_mounted_getsstat=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) - if test $fu_cv_sys_mounted_getsstat = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETFSSTAT) - fi +fi +if test "$no_xview" != yes; then +AC_MSG_CHECKING(for XView) +if test x$xview_libraries = xNONE; then + if test x$xview_includes = xNONE; then +AC_CACHE_VAL(ac_cv_path_xview, +[ + no_xview=yes +AC_PATH_XVIEW_XMKMF + if test "x$no_xview" = xyes; then +AC_PATH_XVIEW_DIRECT fi - - if test -z "$list_mounted_fs"; then - # AIX. - AC_MSG_CHECKING([for mntctl function and struct vmount]) - AC_CACHE_VAL(fu_cv_sys_mounted_vmount, - [AC_TRY_CPP([#include ], - fu_cv_sys_mounted_vmount=yes, - fu_cv_sys_mounted_vmount=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_vmount) - if test $fu_cv_sys_mounted_vmount = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_VMOUNT) - fi + if test "x$no_xview" = xyes; then + ac_cv_path_xview="no_xview=yes" + else + ac_cv_path_xview="no_xview= ac_xview_includes=$ac_xview_includes ac_xview_libraries=$ac_xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" fi - - if test -z "$list_mounted_fs"; then - # SVR3 - AC_MSG_CHECKING([for existence of three headers]) - AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, - [AC_TRY_CPP([ -#include -#include -#include ], - fu_cv_sys_mounted_fread_fstyp=yes, - fu_cv_sys_mounted_fread_fstyp=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp) - if test $fu_cv_sys_mounted_fread_fstyp = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_FREAD_FSTYP) - fi +])dnl + eval "$ac_cv_path_xview" fi +fi - if test -z "$list_mounted_fs"; then - # 4.4BSD and DEC OSF/1. - AC_MSG_CHECKING([for getmntinfo function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, - [ - ok= - if test $ac_cv_func_getmntinfo = yes; then - AC_EGREP_HEADER(f_type;, sys/mount.h, - ok=yes) - fi - test -n "$ok" \ - && fu_cv_sys_mounted_getmntinfo=yes \ - || fu_cv_sys_mounted_getmntinfo=no - ]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) - 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) +if test "x$no_xview" = xyes; then + AC_MSG_RESULT(no) +else + if test "x$xview_includes" = x || test "x$xview_includes" = xNONE; then + xview_includes=$ac_xview_includes + fi + if test "x$xview_libraries" = x || test "x$xview_libraries" = xNONE; then + xview_libraries=$ac_xview_libraries + fi + xview_no_private_headers=$ac_xview_no_private_headers + ac_cv_path_xview="no_xview= ac_xview_includes=$xview_includes ac_xview_libraries=$xview_libraries ac_xview_no_private_headers=$ac_xview_no_private_headers" + if test "x$xview_libraries" != x; then + ac_msg_xview="libraries $xview_libraries" + else + ac_msg_xview="" + fi + if test "x$xview_includes" != x; then + if test "x$ac_msg_xview" != x; then + ac_msg_xview="$ac_msg_xview, " fi - fi + ac_msg_xview="${ac_msg_xview}headers $xview_includes" fi + if test "x$xview_no_private_headers" = xyes; then + if test "x$ac_msg_xview" != x; then + ac_msg_xview="$ac_msg_xview, " + fi + ac_msg_xview="${ac_msg_xview}without xview_private headers" + fi + AC_MSG_RESULT([$ac_msg_xview]) +fi +fi +]) - if test -z "$list_mounted_fs"; then - # Ultrix - AC_MSG_CHECKING([for getmnt function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, - [AC_TRY_CPP([ -#include -#include ], - fu_cv_sys_mounted_getmnt=yes, - fu_cv_sys_mounted_getmnt=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) - if test $fu_cv_sys_mounted_getmnt = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNT) - fi +dnl Internal subroutine of AC_PATH_XVIEW +dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). +AC_DEFUN(AC_PATH_XVIEW_XMKMF, +[rm -fr conftestdir +if mkdir conftestdir; then + cd conftestdir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. + cat > Imakefile <<'EOF' +#include +acfindxv: + @echo 'ac_im_library_dest="${LIBRARY_DEST}"; ac_im_header_dest="${HEADER_DEST}"' +EOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then + no_xview= + # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + eval `make acfindxv 2>/dev/null | grep -v make` + # Screen out bogus values from the imake configuration. + if test -f "$ac_im_header_dest/xview/xview.h"; then + ac_xview_includes="$ac_im_header_dest" + else + no_xview=yes fi - - if test -z "$list_mounted_fs"; then - # SVR2 - AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) - AC_CACHE_VAL(fu_cv_sys_mounted_fread, - [AC_TRY_CPP([#include ], - fu_cv_sys_mounted_fread=yes, - fu_cv_sys_mounted_fread=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_fread) - if test $fu_cv_sys_mounted_fread = yes; then - list_mounted_fs=found - AC_DEFINE(MOUNTED_FREAD) - fi + if test -d "$ac_im_library_dest"; then + ac_xview_libraries="$ac_im_library_dest" + else + no_xview=yes fi - - if test -z "$list_mounted_fs"; then - AC_MSG_WARN([could not determine how to read list of mounted fs]) - CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" - # FIXME -- no need to abort building the whole package - # Can't build mountlist.c or anything that needs its functions + fi + if test "x$no_xview" != xyes; then + if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then + ac_xview_no_private_headers= + else + ac_xview_no_private_headers=yes fi + fi + cd .. + rm -fr conftestdir +fi +]) -dnl This configure.in code has been stolen from GNU fileutils-3.12. Its -dnl job is to detect a method to get file system information. - - AC_CHECKING(how to get filesystem space usage) - space=no +dnl Internal subroutine of AC_PATH_XVIEW +dnl Set ac_xview_includes, ac_xview_libraries, and no_xview (initially yes). +AC_DEFUN(AC_PATH_XVIEW_DIRECT, +[test -z "$xview_direct_test_library" && xview_direct_test_library=xview +test -z "$xview_direct_test_function" && xview_direct_test_function=xv_unique_key +test -z "$xview_direct_test_include" && xview_direct_test_include=xview/xview.h +AC_TRY_CPP([#include <$xview_direct_test_include>], +[no_xview= ac_xview_includes=], +[ for ac_dir in \ + $OPENWINHOME/include \ + /usr/openwin/include \ + /usr/openwin/share/include \ + \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X11/include \ + /usr/include/X11 \ + /usr/local/X11/include \ + /usr/local/include/X11 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + ; \ + do + if test -r "$ac_dir/$xview_direct_test_include"; then + no_xview= ac_xview_includes=$ac_dir + break + fi + done]) - # Here we'll compromise a little (and perform only the link test) - # since it seems there are no variants of the statvfs function. - if test $space = no; then - # SVR4 - AC_CHECK_FUNCS(statvfs) - if test $ac_cv_func_statvfs = yes; then - space=yes - AC_DEFINE(STAT_STATVFS) - fi +if test "x$no_xview" != xyes; then + if test "x$ac_xview_includes" != x; then + if test -f "$ac_xview_includes/xview_private/draw_impl.h"; then + ac_xview_no_private_headers= + else + ac_xview_no_private_headers=yes + fi + else +AC_TRY_CPP([#include ], +[ac_xview_no_private_headers=],[ac_xview_no_private_headers=yes]) fi +fi - if test $space = no; then - # DEC Alpha running OSF/1 - AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, - [AC_TRY_RUN([ -#include -#include -#include - main () - { - struct statfs fsd; - fsd.f_fsize = 0; - exit (statfs (".", &fsd, sizeof (struct statfs))); - }], - fu_cv_sys_stat_statfs3_osf1=yes, - fu_cv_sys_stat_statfs3_osf1=no, - fu_cv_sys_stat_statfs3_osf1=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) - if test $fu_cv_sys_stat_statfs3_osf1 = yes; then - space=yes - AC_DEFINE(STAT_STATFS3_OSF1) - fi +# Check for the libraries. +# See if we find them without any special options. +# Don't add to $LIBS permanently. +ac_save_LIBS="$LIBS" +ac_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS $X_LIBS" +LIBS="-l$xview_direct_test_library -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" +AC_TRY_LINK([#include <$xview_direct_test_include> +], [${xview_direct_test_function}()], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_xview= ac_xview_libraries=], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" +# First see if replacing the include by lib works. +for ac_dir in `echo "$ac_xview_includes" | sed s/include/lib/` \ + $OPENWINHOME/lib \ + $OPENWINHOME/share/lib \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X11/lib \ + /usr/lib/X11 \ + /usr/local/X11/lib \ + /usr/local/lib/X11 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/lib${xview_direct_test_library}.$ac_extension; then + no_xview= ac_xview_libraries=$ac_dir + break 2 fi + done +done])]) - if test $space = no; then - # AIX - AC_MSG_CHECKING([for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, - [AC_TRY_RUN([ -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_VFS_H -#include -#endif - main () - { - struct statfs fsd; - fsd.f_bsize = 0; - exit (statfs (".", &fsd)); - }], - fu_cv_sys_stat_statfs2_bsize=yes, - fu_cv_sys_stat_statfs2_bsize=no, - fu_cv_sys_stat_statfs2_bsize=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) - if test $fu_cv_sys_stat_statfs2_bsize = yes; then - space=yes - AC_DEFINE(STAT_STATFS2_BSIZE) - fi +dnl Substitute XVIEW_LIBS and XVIEW_CFLAGS and +dnl HAVE_XVIEW, which is either yes or no. +dnl Both contain X_LIBS resp. X_CFLAGS inside +dnl Also substitutes HAVE_XVIEW_PRIVATE_HEADERS +dnl if there are xview_private headers in the system +AC_DEFUN(AC_PATH_XVIEW_XTRA, +[AC_REQUIRE([AC_PATH_XVIEW])dnl +if test "$no_xview" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + XVIEW_CFLAGS="$X_CFGLAGS $XVIEW_CFLAGS -DXVIEW_MISSING" +else + if test -n "$xview_includes"; then + XVIEW_CFLAGS="$X_CFLAGS $XVIEW_CFGLAGS" + if test "$xview_includes" != "$x_includes"; then + XVIEW_CPPFLAGS="-I$xview_includes" fi + fi - if test $space = no; then - # SVR3 - AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs4, - [AC_TRY_RUN([#include -#include - main () - { - struct statfs fsd; - exit (statfs (".", &fsd, sizeof fsd, 0)); - }], - fu_cv_sys_stat_statfs4=yes, - fu_cv_sys_stat_statfs4=no, - fu_cv_sys_stat_statfs4=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs4) - if test $fu_cv_sys_stat_statfs4 = yes; then - space=yes - AC_DEFINE(STAT_STATFS4) + # It would be nice to have a more robust check for the -R ld option than + # just checking for Solaris. + # It would also be nice to do this for all -L options, not just this one. + if test -n "$xview_libraries"; then + if test "$xview_libraries" = "$x_libraries"; then + XVIEW_LIBS="$X_LIBS $XVIEW_LIBS" + else + XVIEW_LIBS="$X_LIBS $XVIEW_LIBS -L$xview_libraries" + if test "`(uname) 2>/dev/null`" = SunOS && + uname -r | grep '^5' >/dev/null; then + XVIEW_LIBS="$XVIEW_LIBS -R$xview_libraries" fi fi + fi +fi +if test "x$no_xview" = xyes; then + HAVE_XVIEW=no +else + HAVE_XVIEW=yes +fi +if test "x$xview_no_private_headers" = xyes; then + HAVE_XVIEW_PRIVATE_HEADERS=no +else + HAVE_XVIEW_PRIVATE_HEADERS=yes +fi +AC_SUBST(XVIEW_CFLAGS)dnl +AC_SUBST(XVIEW_CPPFLAGS)dnl +AC_SUBST(XVIEW_LIBS)dnl +AC_SUBST(HAVE_XVIEW)dnl +AC_SUBST(HAVE_XVIEW_PRIVATE_HEADERS)dnl +])dnl - if test $space = no; then - # 4.4BSD and NetBSD - AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl - member (4.4BSD and NetBSD)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, - [AC_TRY_RUN([#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif - main () - { - struct statfs fsd; - fsd.f_fsize = 0; - exit (statfs (".", &fsd)); - }], - fu_cv_sys_stat_statfs2_fsize=yes, - fu_cv_sys_stat_statfs2_fsize=no, - fu_cv_sys_stat_statfs2_fsize=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) - if test $fu_cv_sys_stat_statfs2_fsize = yes; then - space=yes - AC_DEFINE(STAT_STATFS2_FSIZE) - fi +dnl Internal subroutine of AC_PATH_SLINGSHOT +AC_DEFUN(AC_PATH_SLINGSHOT_DIRECT, +[ +AC_TRY_CPP([#include ],[no_ss= ac_ss_includes=], +[ for ac_dir in \ + $OPENWINHOME/include \ + /usr/openwin/include \ + /usr/openwin/share/include \ + \ + /usr/X11R6/include \ + /usr/X11R5/include \ + /usr/X11R4/include \ + \ + /usr/include/X11R6 \ + /usr/include/X11R5 \ + /usr/include/X11R4 \ + \ + /usr/local/X11R6/include \ + /usr/local/X11R5/include \ + /usr/local/X11R4/include \ + \ + /usr/local/include/X11R6 \ + /usr/local/include/X11R5 \ + /usr/local/include/X11R4 \ + \ + /usr/X11/include \ + /usr/include/X11 \ + /usr/local/X11/include \ + /usr/local/include/X11 \ + \ + /usr/X386/include \ + /usr/x386/include \ + /usr/XFree86/include/X11 \ + \ + /usr/include \ + /usr/local/include \ + /usr/unsupported/include \ + /usr/athena/include \ + /usr/local/x11r5/include \ + /usr/lpp/Xamples/include \ + ; \ + do + if test -r "$ac_dir/sspkg/rectobj.h"; then + no_ss= ac_ss_includes=$ac_dir + break fi + done]) - if test $space = no; then - # Ultrix - AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) - AC_CACHE_VAL(fu_cv_sys_stat_fs_data, - [AC_TRY_RUN([ -#include -#ifdef HAVE_SYS_PARAM_H -#include -#endif -#ifdef HAVE_SYS_MOUNT_H -#include -#endif -#ifdef HAVE_SYS_FS_TYPES_H -#include -#endif - main () - { - struct fs_data fsd; - /* Ultrix's statfs returns 1 for success, - 0 for not mounted, -1 for failure. */ - exit (statfs (".", &fsd) != 1); - }], - fu_cv_sys_stat_fs_data=yes, - fu_cv_sys_stat_fs_data=no, - fu_cv_sys_stat_fs_data=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_fs_data) - if test $fu_cv_sys_stat_fs_data = yes; then - space=yes - AC_DEFINE(STAT_STATFS2_FS_DATA) - fi +# Check for the libraries. +# See if we find them without any special options. +# Don't add to $LIBS permanently. +ac_save_LIBS="$LIBS" +ac_save_LDFLAGS="$LDFLAGS" +LDFLAGS="$LDFLAGS $XVIEW_LIBS" +LIBS="-lsspkg -lm -lxview -lolgx $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" +AC_TRY_LINK([#include +], [rectobj_get_selected_list()], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" no_ss= ac_ss_libraries=], +[LIBS="$ac_save_LIBS" LDFLAGS="$ac_save_LDFLAGS" +# First see if replacing the include by lib works. +for ac_dir in `echo "$ac_ss_includes" | sed s/include/lib/` \ + $OPENWINHOME/lib \ + $OPENWINHOME/share/lib \ + /usr/openwin/lib \ + /usr/openwin/share/lib \ + \ + /usr/X11R6/lib \ + /usr/X11R5/lib \ + /usr/X11R4/lib \ + \ + /usr/lib/X11R6 \ + /usr/lib/X11R5 \ + /usr/lib/X11R4 \ + \ + /usr/local/X11R6/lib \ + /usr/local/X11R5/lib \ + /usr/local/X11R4/lib \ + \ + /usr/local/lib/X11R6 \ + /usr/local/lib/X11R5 \ + /usr/local/lib/X11R4 \ + \ + /usr/X11/lib \ + /usr/lib/X11 \ + /usr/local/X11/lib \ + /usr/local/lib/X11 \ + \ + /usr/X386/lib \ + /usr/x386/lib \ + /usr/XFree86/lib/X11 \ + \ + /usr/lib \ + /usr/local/lib \ + /usr/unsupported/lib \ + /usr/athena/lib \ + /usr/local/x11r5/lib \ + /usr/lpp/Xamples/lib \ + ; \ +do + for ac_extension in a so sl; do + if test -r $ac_dir/libsspkg.$ac_extension; then + no_ss= ac_ss_libraries=$ac_dir + break 2 fi + done +done])]) - dnl Not supported - dnl if test $space = no; then - dnl # SVR2 - dnl AC_TRY_CPP([#include ], - dnl AC_DEFINE(STAT_READ_FILSYS) space=yes) - dnl fi -]) +dnl Set ss_includes, ss_libraries, and no_ss (initially yes). +AC_DEFUN(AC_PATH_SLINGSHOT, +[AC_REQUIRE([AC_PATH_XVIEW_XTRA])dnl +AC_MSG_CHECKING(for SlingShot) +AC_ARG_WITH(ss, [--with-ss Use the SlingShot extension]) -dnl AC_CHECK_HEADER_IN_PATH(HEADER-FILE, ADDITIONAL_PATH, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) -AC_DEFUN(AC_CHECK_HEADER_IN_PATH, -[dnl Do the transliteration at runtime so arg 1 can be a shell variable. -ac_safe=`echo "$1" | tr './\055' '___'` -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(ac_cv_header_in_path_$ac_safe, -[AC_TRY_CPP([#include <$1>], ac_header_in_path=yes, [ - ac_header_in_path_found=no - for ac_header_in_path_value in [$2]; do - ac_in_path_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS -I$ac_header_in_path_value" - AC_TRY_CPP([#include <$1>], [ -ac_header_in_path_found=yes -ac_header_in_path=$ac_header_in_path_value -], ) - CPPFLAGS=$ac_in_path_save_CPPFLAGS - if test x$ac_header_in_path_found = xyes; then - break - fi - done - if test $ac_header_in_path_found = xno; then - ac_header_in_path=no - fi -]) - eval "ac_cv_header_in_path_$ac_safe=$ac_header_in_path" -])dnl -eval "ac_header_in_path=`echo '$ac_cv_header_in_path_'$ac_safe`" -if test "$ac_header_in_path" = no; then - AC_MSG_RESULT(no) -ifelse([$4], , , [$4 -])dnl +AC_ARG_WITH(ss-includes, [--with-ss-includes=path Specifies SlingShot includes directory], +[ +if test x$withval = xyes; then + AC_MSG_WARN(Usage is: --with-ss-includes=path) + ss_includes=NONE else - if test -n "$ac_header_in_path"; then - AC_MSG_RESULT($ac_header_in_path) - else - AC_MSG_RESULT(yes) - fi - if test x$ac_header_in_path = xyes; then - ac_header_in_path= - eval "ac_cv_header_in_path_$ac_safe=" - fi - ifelse([$3], , , [$3 + ss_includes=$withval +fi +], +[ +ss_includes=NONE ])dnl +AC_ARG_WITH(ss-libraries, [--with-ss-libraries=path Specifies SlingShot libraries directory], +[ +if test x$withval = xyes; then + AC_MSG_WARN(Usage is: --with-ss-libraries=path) + ss_libraries=NONE +else + ss_libraries=$withval fi -]) - -dnl Hope I can check for libXpm only in the X11 library directory -AC_DEFUN(AC_LIB_XPM, [ -AC_MSG_CHECKING(for -lXpm) -AC_CACHE_VAL(ac_cv_has_xpm, [ - ac_cv_has_xpm=no - if test x$no_x = xyes; then - : - else - has_xpm_save_LIBS=$LIBS - LIBS="-lXpm $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" - has_xpm_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $X_LIBS" - has_xpm_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $X_CFLAGS" - AC_TRY_LINK([ -#include -#include -], [XpmLibraryVersion();], ac_cv_has_xpm=yes) - CFLAGS="$has_xpm_save_CFLAGS" - LDFLAGS="$has_xpm_save_LDFLAGS" - LIBS="$has_xpm_save_LIBS" - fi -]) -AC_MSG_RESULT($ac_cv_has_xpm) -]) +], +[ +ss_libraries=NONE +])dnl -dnl Hope I can check for libXext only in the X11 library directory -dnl and shape.h will be in X11/extensions/shape.h -AC_DEFUN(AC_X_SHAPE_EXTENSION, [ -AC_MSG_CHECKING(for X11 non-rectangular shape extension) -AC_CACHE_VAL(ac_cv_has_shape, [ - ac_cv_has_shape=no - if test x$no_x = xyes; then - : +if test "x$with_ss" = xno; then + no_ss=yes +else + if test "x$ss_includes" != xNONE && test "x$ss_libraries" != xNONE; then + no_ss= else - has_shape_save_LIBS=$LIBS - LIBS="-lXext $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" - has_shape_save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $X_LIBS" - has_shape_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS $X_CFLAGS" - AC_TRY_LINK([ -#include -#include -#include -], [ -Display *dpy = (Display *)NULL; -int a, b; -XShapeQueryVersion(dpy,&a,&b); -], ac_cv_has_shape=yes) - CFLAGS="$has_shape_save_CFLAGS" - LDFLAGS="$has_shape_save_LDFLAGS" - LIBS="$has_shape_save_LIBS" - fi -]) -AC_MSG_RESULT($ac_cv_has_shape) -]) - -dnl AC_TRY_WARNINGS(INCLUDES, FUNCTION-BODY, -dnl ACTION-IF-NO-WARNINGS [, ACTION-IF-WARNINGS-OR-ERROR]) -AC_DEFUN(AC_TRY_WARNINGS, -[cat > conftest.$ac_ext <&AC_FD_CC 2>&AC_FD_CC; then - ifelse([$4], , :, [rm -rf conftest* - $4]) -ifelse([$3], , , [else - rm -rf conftest* - $3 +AC_CACHE_VAL(ac_cv_path_ss, +[ + no_ss=yes +AC_PATH_SLINGSHOT_DIRECT + if test "x$no_ss" = xyes; then + ac_cv_path_ss="ac_noss=yes" + else + ac_cv_path_ss="ac_ss_includes=$ac_ss_includes ac_ss_libraries=$ac_ss_libraries" + fi ])dnl + eval "$ac_cv_path_ss" + fi fi -rm -f conftest*] -) - -dnl Find if make is GNU make. -AC_DEFUN(AC_PROG_GNU_MAKE, -[AC_MSG_CHECKING(whether we are using GNU make) -set dummy ${MAKE-make}; ac_make=[$]2 -AC_CACHE_VAL(ac_cv_prog_gnu_make, -[cat > conftestmake <<\EOF -all: - @echo ' ' -EOF -if ${MAKE-make} --version -f conftestmake 2>/dev/null | grep GNU >/dev/null 2>&1; then - ac_cv_prog_gnu_make=yes -else - ac_cv_prog_gnu_make=no fi -rm -f conftestmake])dnl -if test $ac_cv_prog_gnu_make = yes; then - AC_MSG_RESULT(yes) - GNU_MAKE="GNU_MAKE=yes" +if test "x$no_ss" = xyes; then + AC_MSG_RESULT(no) else - AC_MSG_RESULT(no) - GNU_MAKE= + if test "x$ss_includes" = x || test "x$ss_includes" = xNONE; then + ss_includes=$ac_ss_includes + fi + if test "x$ss_libraries" = x || test "x$ss_libraries" = xNONE; then + ss_libraries=$ac_ss_libraries + fi + ac_cv_path_ss="no_ss= ac_ss_includes=$ss_includes ac_ss_libraries=$ss_libraries" + if test "x$ss_libraries" = x; then + if test "x$ss_includes" = x; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT([headers $ss_includes]) + fi + else + if test "x$ss_includes" = x; then + AC_MSG_RESULT([libraries $ss_libraries]) + else + AC_MSG_RESULT([libraries $ss_libraries, headers $ss_includes]) + fi + fi fi -AC_SUBST([GNU_MAKE])dnl ]) -dnl -dnl Local additions to Autoconf macros. -dnl Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. -dnl François Pinard , 1992. +dnl Substitute SLINGSHOT_LIBS and SLINGSHOT_CFLAGS and +dnl HAVE_SLINGSHOT, which is either yes or no. +dnl Both contain XVIEW_LIBS resp. XVIEW_CFLAGS inside +AC_DEFUN(AC_PATH_SLINGSHOT_XTRA, +[AC_REQUIRE([AC_PATH_SLINGSHOT])dnl +if test "$no_ss" = yes; then + # Not all programs may use this symbol, but it does not hurt to define it. + SLINGSHOT_CFLAGS="$XVIEW_CFGLAGS $SLINGSHOT_CFLAGS -DSLINGSHOT_MISSING" +else + if test -n "$ss_includes"; then + SLINGSHOT_CFLAGS="$XVIEW_CFLAGS $SLINGSHOT_CFGLAGS -I$ss_includes" + fi -dnl ## ----------------------------------------- ## -dnl ## ANSIfy the C compiler whenever possible. ## -dnl ## ----------------------------------------- ## + # It would be nice to have a more robust check for the -R ld option than + # just checking for Solaris. + # It would also be nice to do this for all -L options, not just this one. + if test -n "$ss_libraries"; then + SLINGSHOT_LIBS="$XVIEW_LIBS $SLINGSHOT_LIBS -L$ss_libraries" + if test "`(uname) 2>/dev/null`" = SunOS && + uname -r | grep '^5' >/dev/null; then + SLINGSHOT_LIBS="$SLINGSHOT_LIBS -R$ss_libraries" + fi + fi +fi +if test "x$no_ss" = xyes; then + HAVE_SLINGSHOT=no +else + HAVE_SLINGSHOT=yes +fi +AC_SUBST(SLINGSHOT_CFLAGS)dnl +AC_SUBST(SLINGSHOT_LIBS)dnl +AC_SUBST(HAVE_SLINGSHOT)dnl +])dnl -dnl @defmac AC_PROG_CC_STDC -dnl @maindex PROG_CC_STDC -dnl @ovindex CC -dnl If the C compiler in not in ANSI C mode by default, try to add an option -dnl to output variable @code{CC} to make it so. This macro tries various -dnl options that select ANSI C on some system or another. It considers the -dnl compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and -dnl handles function prototypes correctly. -dnl -dnl If you use this macro, you should check after calling it whether the C -dnl compiler has been set to accept ANSI C; if not, the shell variable -dnl @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source -dnl code in ANSI C, you can make an un-ANSIfied copy of it by using the -dnl program @code{ansi2knr}, which comes with Ghostscript. -dnl @end defmac +dnl +dnl XView library checking end +dnl -dnl Unixware 2.1 defines __STDC__ to 1 only when some useful extensions are -dnl turned off. They are on by default and turned off with the option -Xc. -dnl The consequence is that __STDC__ is defined but e.g. struct sigaction -dnl is not defined. -- Norbert +dnl +dnl Check for size of d_name dirent member +dnl +AC_DEFUN(AC_SHORT_D_NAME_LEN, [ +AC_MSG_CHECKING(filename fits on dirent.d_name) +AC_CACHE_VAL(ac_cv_dnamesize, [ +OCFLAGS="$CFLAGS" +CFLAGS="$CFLAGS -I$srcdir" +AC_TRY_RUN([ +#include -dnl Below all tests but the one for HP-UX are removed. They caused more -dnl problems than they soved, sigh. -- Norbert +main () +{ + struct dirent ddd; -AC_DEFUN(MC_HPUX_PROG_CC_STDC, -[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) -AC_CACHE_VAL(ac_cv_prog_cc_stdc, -[ac_cv_prog_cc_stdc=no -ac_save_CFLAGS="$CFLAGS" -dnl Don't try gcc -ansi; that turns off useful extensions and -dnl breaks some systems' header files. -dnl AIX -qlanglvl=ansi (removed -- Norbert) -dnl Ultrix and OSF/1 -std1 (removed -- Norbert) -dnl HP-UX -Aa -D_HPUX_SOURCE -dnl SVR4 -Xc (removed -- Norbert) -for ac_arg in "" "-Aa -D_HPUX_SOURCE" -do - CFLAGS="$ac_save_CFLAGS $ac_arg" - AC_TRY_COMPILE( -[#include -#if !defined(__STDC__) || __STDC__ != 1 -choke me -#endif -], [int test (int i, double x); -struct sigaction sa; -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);};], -[ac_cv_prog_cc_stdc="$ac_arg"; break]) -done -CFLAGS="$ac_save_CFLAGS" + if (sizeof (ddd.d_name) < 12) + exit (0); + else + exit (1); +} + +],[ + ac_cv_dnamesize="no" +], [ + ac_cv_dnamesize="yes" +], [ +# Cannot find out, so assume no + ac_cv_dnamesize="no" ]) -AC_MSG_RESULT($ac_cv_prog_cc_stdc) -case "x$ac_cv_prog_cc_stdc" in - x|xno) ;; - *) CC="$CC $ac_cv_prog_cc_stdc" ;; -esac +CFLAGS="$OCFLAGS" ]) - -dnl aclocal.m4 generated automatically by aclocal 1.2f - -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - - -# progtest.m4 from gettext 0.32 -# Search path for a program which passes the given test. -# Ulrich Drepper , 1996. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. - -# serial 1 - -dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test -n "[$]$1"; then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) +if test x$ac_cv_dnamesize = xno; then + AC_DEFINE(NEED_EXTRA_DIRENT_BUFFER) fi -AC_SUBST($1)dnl +AC_MSG_RESULT($ac_cv_dnamesize) ]) +dnl +dnl Filesystem information detection +dnl +dnl To get information about the disk, mount points, etc. +dnl -# lcmessage.m4 from gettext 0.32 -# Check whether LC_MESSAGES is available in . -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +AC_DEFUN(AC_GET_FS_INFO, [ + AC_CHECK_HEADERS(fcntl.h sys/dustat.h sys/param.h sys/statfs.h sys/fstyp.h) + AC_CHECK_HEADERS(mnttab.h mntent.h utime.h sys/statvfs.h sys/vfs.h) + AC_CHECK_HEADERS(sys/mount.h sys/filsys.h sys/fs_types.h) + AC_CHECK_FUNCS(getmntinfo) -# serial 1 + dnl This configure.in code has been stolen from GNU fileutils-3.12. Its + dnl job is to detect a method to get list of mounted filesystems. -AC_DEFUN(AM_LC_MESSAGES, - [if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) + AC_MSG_CHECKING([for d_ino member in directory struct]) + AC_CACHE_VAL(fu_cv_sys_d_ino_in_dirent, + [AC_TRY_LINK([ +#include +#ifdef HAVE_DIRENT_H +# include +#else /* not HAVE_DIRENT_H */ +# define dirent direct +# ifdef HAVE_SYS_NDIR_H +# include +# endif /* HAVE_SYS_NDIR_H */ +# ifdef HAVE_SYS_DIR_H +# include +# endif /* HAVE_SYS_DIR_H */ +# ifdef HAVE_NDIR_H +# include +# endif /* HAVE_NDIR_H */ +#endif /* HAVE_DIRENT_H */ + ], + [struct dirent dp; dp.d_ino = 0;], + fu_cv_sys_d_ino_in_dirent=yes, + fu_cv_sys_d_ino_in_dirent=no)]) + AC_MSG_RESULT($fu_cv_sys_d_ino_in_dirent) + if test $fu_cv_sys_d_ino_in_dirent = yes; then + AC_DEFINE(D_INO_IN_DIRENT) fi - fi]) - + # Determine how to get the list of mounted filesystems. + list_mounted_fs= -# gettext.m4 from gettext 0.32 -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995. -# -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. + # If the getmntent function is available but not in the standard library, + # make sure LIBS contains -lsun (on Irix4) or -lseq (on PTX). + AC_FUNC_GETMNTENT -# serial 3 + if test $ac_cv_func_getmntent = yes; then -AC_DEFUN(AM_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + # This system has the getmntent function. + # Determine whether it's the one-argument variant or the two-argument one. - USE_INCLUDED_LIBINTL=no + if test -z "$list_mounted_fs"; then + # SVR4 + AC_MSG_CHECKING([for two-argument getmntent function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, + [AC_EGREP_HEADER(getmntent, sys/mnttab.h, + fu_cv_sys_mounted_getmntent2=yes, + fu_cv_sys_mounted_getmntent2=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) + if test $fu_cv_sys_mounted_getmntent2 = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNTENT2) + fi + fi - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + if test -z "$list_mounted_fs"; then + # 4.3BSD, SunOS, HP-UX, Dynix, Irix + AC_MSG_CHECKING([for one-argument getmntent function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, + [test $ac_cv_header_mntent_h = yes \ + && fu_cv_sys_mounted_getmntent1=yes \ + || fu_cv_sys_mounted_getmntent1=no]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) + if test $fu_cv_sys_mounted_getmntent1 = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNTENT1) + fi + fi - nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" - if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE + if test -z "$list_mounted_fs"; then + AC_WARN([could not determine how to read list of mounted fs]) + CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" + fi - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include ], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + fi - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_TRY_LINK([], [return (int) gettext ("")], - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)])]) - fi + if test -z "$list_mounted_fs"; then + # DEC Alpha running OSF/1. + AC_MSG_CHECKING([for getfsstat function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getsstat, + [AC_TRY_LINK([ +#include +#include +#include ], + [struct statfs *stats; + numsys = getfsstat ((struct statfs *)0, 0L, MNT_WAIT); ], + fu_cv_sys_mounted_getsstat=yes, + fu_cv_sys_mounted_getsstat=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_getsstat) + if test $fu_cv_sys_mounted_getsstat = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETFSSTAT) + fi + fi - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) + if test -z "$list_mounted_fs"; then + # AIX. + AC_MSG_CHECKING([for mntctl function and struct vmount]) + AC_CACHE_VAL(fu_cv_sys_mounted_vmount, + [AC_TRY_CPP([#include ], + fu_cv_sys_mounted_vmount=yes, + fu_cv_sys_mounted_vmount=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_vmount) + if test $fu_cv_sys_mounted_vmount = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_VMOUNT) + fi + fi - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) + if test -z "$list_mounted_fs"; then + # SVR3 + AC_MSG_CHECKING([for existence of three headers]) + AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, + [AC_TRY_CPP([ +#include +#include +#include ], + fu_cv_sys_mounted_fread_fstyp=yes, + fu_cv_sys_mounted_fread_fstyp=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp) + if test $fu_cv_sys_mounted_fread_fstyp = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_FREAD_FSTYP) + fi + fi - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) + if test -z "$list_mounted_fs"; then + # 4.4BSD and DEC OSF/1. + AC_MSG_CHECKING([for getmntinfo function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, + [ + ok= + if test $ac_cv_func_getmntinfo = yes; then + AC_EGREP_HEADER(f_type;, sys/mount.h, + ok=yes) fi - fi - - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes - fi + test -n "$ok" \ + && fu_cv_sys_mounted_getmntinfo=yes \ + || fu_cv_sys_mounted_getmntinfo=no + ]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) + 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 - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + if test -z "$list_mounted_fs"; then + # Ultrix + AC_MSG_CHECKING([for getmnt function]) + AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, + [AC_TRY_CPP([ +#include +#include ], + fu_cv_sys_mounted_getmnt=yes, + fu_cv_sys_mounted_getmnt=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) + if test $fu_cv_sys_mounted_getmnt = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_GETMNT) fi + fi - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext programs is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi + if test -z "$list_mounted_fs"; then + # SVR2 + AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) + AC_CACHE_VAL(fu_cv_sys_mounted_fread, + [AC_TRY_CPP([#include ], + fu_cv_sys_mounted_fread=yes, + fu_cv_sys_mounted_fread=no)]) + AC_MSG_RESULT($fu_cv_sys_mounted_fread) + if test $fu_cv_sys_mounted_fread = yes; then + list_mounted_fs=found + AC_DEFINE(MOUNTED_FREAD) fi - - # We need to process the po/ directory. - POSUB=po - else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h fi - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes + if test -z "$list_mounted_fs"; then + AC_MSG_WARN([could not determine how to read list of mounted fs]) + CPPFLAGS="$CPPFLAGS -DNO_INFOMOUNT" + # FIXME -- no need to abort building the whole package + # Can't build mountlist.c or anything that needs its functions fi - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done - - dnl Make all variables we use known to autoconf. - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) - -AC_DEFUN(AM_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h values.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -__argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi - - AM_LC_MESSAGES - AM_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi - - dnl The reference to in the installed file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include " - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header . Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) +dnl This configure.in code has been stolen from GNU fileutils-3.12. Its +dnl job is to detect a method to get file system information. - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + AC_CHECKING(how to get filesystem space usage) + space=no - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) + # Here we'll compromise a little (and perform only the link test) + # since it seems there are no variants of the statvfs function. + if test $space = no; then + # SVR4 + AC_CHECK_FUNCS(statvfs) + if test $ac_cv_func_statvfs = yes; then + space=yes + AC_DEFINE(STAT_STATVFS) + fi + fi - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) + if test $space = no; then + # DEC Alpha running OSF/1 + AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, + [AC_TRY_RUN([ +#include +#include +#include + main () + { + struct statfs fsd; + fsd.f_fsize = 0; + exit (statfs (".", &fsd, sizeof (struct statfs))); + }], + fu_cv_sys_stat_statfs3_osf1=yes, + fu_cv_sys_stat_statfs3_osf1=no, + fu_cv_sys_stat_statfs3_osf1=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) + if test $fu_cv_sys_stat_statfs3_osf1 = yes; then + space=yes + AC_DEFINE(STAT_STATFS3_OSF1) + fi + fi - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) + if test $space = no; then + # AIX + AC_MSG_CHECKING([for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, + [AC_TRY_RUN([ +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_VFS_H +#include +#endif + main () + { + struct statfs fsd; + fsd.f_bsize = 0; + exit (statfs (".", &fsd)); + }], + fu_cv_sys_stat_statfs2_bsize=yes, + fu_cv_sys_stat_statfs2_bsize=no, + fu_cv_sys_stat_statfs2_bsize=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) + if test $fu_cv_sys_stat_statfs2_bsize = yes; then + space=yes + AC_DEFINE(STAT_STATFS2_BSIZE) + fi + fi - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ]) + if test $space = no; then + # SVR3 + AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs4, + [AC_TRY_RUN([#include +#include + main () + { + struct statfs fsd; + exit (statfs (".", &fsd, sizeof fsd, 0)); + }], + fu_cv_sys_stat_statfs4=yes, + fu_cv_sys_stat_statfs4=no, + fu_cv_sys_stat_statfs4=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs4) + if test $fu_cv_sys_stat_statfs4 = yes; then + space=yes + AC_DEFINE(STAT_STATFS4) + fi + fi + if test $space = no; then + # 4.4BSD and NetBSD + AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl + member (4.4BSD and NetBSD)]) + AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, + [AC_TRY_RUN([#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif + main () + { + struct statfs fsd; + fsd.f_fsize = 0; + exit (statfs (".", &fsd)); + }], + fu_cv_sys_stat_statfs2_fsize=yes, + fu_cv_sys_stat_statfs2_fsize=no, + fu_cv_sys_stat_statfs2_fsize=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) + if test $fu_cv_sys_stat_statfs2_fsize = yes; then + space=yes + AC_DEFINE(STAT_STATFS2_FSIZE) + fi + fi -# Configure paths for GLIB -# Owen Taylor 97-11-3 + if test $space = no; then + # Ultrix + AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) + AC_CACHE_VAL(fu_cv_sys_stat_fs_data, + [AC_TRY_RUN([ +#include +#ifdef HAVE_SYS_PARAM_H +#include +#endif +#ifdef HAVE_SYS_MOUNT_H +#include +#endif +#ifdef HAVE_SYS_FS_TYPES_H +#include +#endif + main () + { + struct fs_data fsd; + /* Ultrix's statfs returns 1 for success, + 0 for not mounted, -1 for failure. */ + exit (statfs (".", &fsd) != 1); + }], + fu_cv_sys_stat_fs_data=yes, + fu_cv_sys_stat_fs_data=no, + fu_cv_sys_stat_fs_data=no)]) + AC_MSG_RESULT($fu_cv_sys_stat_fs_data) + if test $fu_cv_sys_stat_fs_data = yes; then + space=yes + AC_DEFINE(STAT_STATFS2_FS_DATA) + fi + fi -dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or -dnl gthread is specified in MODULES, pass to glib-config -dnl -AC_DEFUN(AM_PATH_GLIB, -[dnl -dnl Get the cflags and libraries from the glib-config script -dnl -AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], - glib_config_prefix="$withval", glib_config_prefix="") -AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], - glib_config_exec_prefix="$withval", glib_config_exec_prefix="") -AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - if test x$glib_config_exec_prefix != x ; then - glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config - fi - fi - if test x$glib_config_prefix != x ; then - glib_config_args="$glib_config_args --prefix=$glib_config_prefix" - if test x${GLIB_CONFIG+set} != xset ; then - GLIB_CONFIG=$glib_config_prefix/bin/glib-config - fi - fi + dnl Not supported + dnl if test $space = no; then + dnl # SVR2 + dnl AC_TRY_CPP([#include ], + dnl AC_DEFINE(STAT_READ_FILSYS) space=yes) + dnl fi +]) - for module in . $4 - do - case "$module" in - gmodule) - glib_config_args="$glib_config_args gmodule" - ;; - gthread) - glib_config_args="$glib_config_args gthread" - ;; - esac +dnl AC_CHECK_HEADER_IN_PATH(HEADER-FILE, ADDITIONAL_PATH, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]) +AC_DEFUN(AC_CHECK_HEADER_IN_PATH, +[dnl Do the transliteration at runtime so arg 1 can be a shell variable. +ac_safe=`echo "$1" | tr './\055' '___'` +AC_MSG_CHECKING([for $1]) +AC_CACHE_VAL(ac_cv_header_in_path_$ac_safe, +[AC_TRY_CPP([#include <$1>], ac_header_in_path=yes, [ + ac_header_in_path_found=no + for ac_header_in_path_value in [$2]; do + ac_in_path_save_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS -I$ac_header_in_path_value" + AC_TRY_CPP([#include <$1>], [ +ac_header_in_path_found=yes +ac_header_in_path=$ac_header_in_path_value +], ) + CPPFLAGS=$ac_in_path_save_CPPFLAGS + if test x$ac_header_in_path_found = xyes; then + break + fi done - - AC_PATH_PROG(GLIB_CONFIG, glib-config, no) - min_glib_version=ifelse([$1], ,0.99.7,$1) - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - no_glib="" - if test "$GLIB_CONFIG" = "no" ; then - no_glib=yes - else - GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` - GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` - glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of glib-config to some extent -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.glibtest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_glib_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If glib-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); - printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the glib-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); - printf("*** correct copy of glib-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi + if test $ac_header_in_path_found = xno; then + ac_header_in_path=no fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) +]) + eval "ac_cv_header_in_path_$ac_safe=$ac_header_in_path" +])dnl +eval "ac_header_in_path=`echo '$ac_cv_header_in_path_'$ac_safe`" +if test "$ac_header_in_path" = no; then + AC_MSG_RESULT(no) +ifelse([$4], , , [$4 +])dnl +else + if test -n "$ac_header_in_path"; then + AC_MSG_RESULT($ac_header_in_path) else - AC_MSG_RESULT(no) - if test "$GLIB_CONFIG" = "no" ; then - echo "*** The glib-config script installed by GLIB could not be found" - echo "*** If GLIB was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GLIB_CONFIG environment variable to the" - echo "*** full path to glib-config." - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" - echo "***" - echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" - echo "*** came with the system with the command" - echo "***" - echo "*** rpm --erase --nodeps gtk gtk-devel" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB was incorrectly installed" - echo "*** or that you have moved GLIB since it was installed. In the latter case, you" - echo "*** may want to edit the glib-config script: $GLIB_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - ifelse([$3], , :, [$3]) + AC_MSG_RESULT(yes) + fi + if test x$ac_header_in_path = xyes; then + ac_header_in_path= + eval "ac_cv_header_in_path_$ac_safe=" fi - AC_SUBST(GLIB_CFLAGS) - AC_SUBST(GLIB_LIBS) - rm -f conf.glibtest + ifelse([$3], , , [$3 +])dnl +fi ]) -dnl GNOME_VFS_CHECKS -dnl Check for various functions needed by libvfs. -dnl This has various effects: -dnl Sets GNOME_VFS_LIBS to libraries required -dnl Sets termnet to true or false depending on whether it is required. -dnl If yes, defines USE_TERMNET. -dnl Sets vfs_flags to "pretty" list of vfs implementations we include. -dnl Sets shell variable use_vfs to yes (default, --with-vfs) or -dnl "no" (--without-vfs). -dnl Calls AC_SUBST(mcserv), which is either empty or "mcserv". +dnl Hope I can check for libXpm only in the X11 library directory +AC_DEFUN(AC_LIB_XPM, [ +AC_MSG_CHECKING(for -lXpm) +AC_CACHE_VAL(ac_cv_has_xpm, [ + ac_cv_has_xpm=no + if test x$no_x = xyes; then + : + else + has_xpm_save_LIBS=$LIBS + LIBS="-lXpm $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" + has_xpm_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $X_LIBS" + has_xpm_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $X_CFLAGS" + AC_TRY_LINK([ +#include +#include +], [XpmLibraryVersion();], ac_cv_has_xpm=yes) + CFLAGS="$has_xpm_save_CFLAGS" + LDFLAGS="$has_xpm_save_LDFLAGS" + LIBS="$has_xpm_save_LIBS" + fi +]) +AC_MSG_RESULT($ac_cv_has_xpm) +]) -dnl Private define -AC_DEFUN([GNOME_WITH_VFS],[ - dnl FIXME: network checks should probably be in their own macro. - AC_CHECK_LIB(nsl, t_accept) - AC_CHECK_LIB(socket, socket) +dnl Hope I can check for libXext only in the X11 library directory +dnl and shape.h will be in X11/extensions/shape.h +AC_DEFUN(AC_X_SHAPE_EXTENSION, [ +AC_MSG_CHECKING(for X11 non-rectangular shape extension) +AC_CACHE_VAL(ac_cv_has_shape, [ + ac_cv_has_shape=no + if test x$no_x = xyes; then + : + else + has_shape_save_LIBS=$LIBS + LIBS="-lXext $X_EXTRA_LIBS -lX11 $X_PRE_LIBS $LIBS" + has_shape_save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS $X_LIBS" + has_shape_save_CFLAGS=$CFLAGS + CFLAGS="$CFLAGS $X_CFLAGS" + AC_TRY_LINK([ +#include +#include +#include +], [ +Display *dpy = (Display *)NULL; +int a, b; +XShapeQueryVersion(dpy,&a,&b); +], ac_cv_has_shape=yes) + CFLAGS="$has_shape_save_CFLAGS" + LDFLAGS="$has_shape_save_LDFLAGS" + LIBS="$has_shape_save_LIBS" + fi +]) +AC_MSG_RESULT($ac_cv_has_shape) +]) - have_socket=no - AC_CHECK_FUNCS(socket, have_socket=yes) - if test $have_socket = no; then - # socket is not in the default libraries. See if it's in some other. - for lib in bsd socket inet; do - AC_CHECK_LIB($lib, socket, [ - LIBS="$LIBS -l$lib" - have_socket=yes - AC_DEFINE(HAVE_SOCKET) - break]) - done - fi +dnl AC_TRY_WARNINGS(INCLUDES, FUNCTION-BODY, +dnl ACTION-IF-NO-WARNINGS [, ACTION-IF-WARNINGS-OR-ERROR]) +AC_DEFUN(AC_TRY_WARNINGS, +[cat > conftest.$ac_ext <&AC_FD_CC 2>&AC_FD_CC; then + ifelse([$4], , :, [rm -rf conftest* + $4]) +ifelse([$3], , , [else + rm -rf conftest* + $3 +])dnl +fi +rm -f conftest*] +) - have_gethostbyname=no - AC_CHECK_FUNC(gethostbyname, have_gethostbyname=yes) - if test $have_gethostbyname = no; then - # gethostbyname is not in the default libraries. See if it's in some other. - for lib in bsd socket inet; do - AC_CHECK_LIB($lib, gethostbyname, [LIBS="$LIBS -l$lib"; have_gethostbyname=yes; break]) - done - fi +dnl Find if make is GNU make. +AC_DEFUN(AC_PROG_GNU_MAKE, +[AC_MSG_CHECKING(whether we are using GNU make) +set dummy ${MAKE-make}; ac_make=[$]2 +AC_CACHE_VAL(ac_cv_prog_gnu_make, +[cat > conftestmake <<\EOF +all: + @echo ' ' +EOF +if ${MAKE-make} --version -f conftestmake 2>/dev/null | grep GNU >/dev/null 2>&1; then + ac_cv_prog_gnu_make=yes +else + ac_cv_prog_gnu_make=no +fi +rm -f conftestmake])dnl +if test $ac_cv_prog_gnu_make = yes; then + AC_MSG_RESULT(yes) + GNU_MAKE="GNU_MAKE=yes" +else + AC_MSG_RESULT(no) + GNU_MAKE= +fi +AC_SUBST([GNU_MAKE])dnl +]) - vfs_flags="tarfs" - use_net_code=false - if test $have_socket = yes; then - AC_STRUCT_LINGER - AC_CHECK_FUNCS(pmap_set, , [ - AC_CHECK_LIB(rpc, pmap_set, [ - LIBS="-lrpc $LIBS" - AC_DEFINE(HAVE_PMAP_SET) - ])]) - AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport) - dnl add for source routing support setsockopt - AC_CHECK_HEADERS(rpc/pmap_clnt.h) - vfs_flags="$vfs_flags, mcfs, ftpfs, fish" - use_net_code=true - fi +dnl +dnl Local additions to Autoconf macros. +dnl Copyright (C) 1992, 1994, 1995 Free Software Foundation, Inc. +dnl François Pinard , 1992. - dnl - dnl Samba support - dnl - smbfs="" - SAMBAFILES="" - AC_ARG_WITH(samba, - [--with-samba Support smb virtual file system],[ - if test "x$withval != xno"; then - AC_DEFINE(WITH_SMBFS) - vfs_flags="$vfs_flags, smbfs" - smbfs="smbfs.o" - SAMBAFILES="\$(SAMBAFILES)" - fi - ]) - AC_SUBST(smbfs) - AC_SUBST(SAMBAFILES) - - dnl - dnl The termnet support - dnl - termnet=false - AC_ARG_WITH(termnet, - [--with-termnet If you want a termified net support],[ - if test x$withval = xyes; then - AC_DEFINE(USE_TERMNET) - termnet=true - fi - ]) +dnl ## ----------------------------------------- ## +dnl ## ANSIfy the C compiler whenever possible. ## +dnl ## ----------------------------------------- ## - TERMNET="" - AC_DEFINE(USE_VFS) - if $use_net_code; then - AC_DEFINE(USE_NETCODE) - fi - mcserv= - if test $have_socket = yes; then - mcserv="mcserv" - if $termnet; then - TERMNET="-ltermnet" - fi - fi +dnl @defmac AC_PROG_CC_STDC +dnl @maindex PROG_CC_STDC +dnl @ovindex CC +dnl If the C compiler in not in ANSI C mode by default, try to add an option +dnl to output variable @code{CC} to make it so. This macro tries various +dnl options that select ANSI C on some system or another. It considers the +dnl compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and +dnl handles function prototypes correctly. +dnl +dnl If you use this macro, you should check after calling it whether the C +dnl compiler has been set to accept ANSI C; if not, the shell variable +dnl @code{ac_cv_prog_cc_stdc} is set to @samp{no}. If you wrote your source +dnl code in ANSI C, you can make an un-ANSIfied copy of it by using the +dnl program @code{ansi2knr}, which comes with Ghostscript. +dnl @end defmac - AC_SUBST(TERMNET) - AC_SUBST(mcserv) +dnl Unixware 2.1 defines __STDC__ to 1 only when some useful extensions are +dnl turned off. They are on by default and turned off with the option -Xc. +dnl The consequence is that __STDC__ is defined but e.g. struct sigaction +dnl is not defined. -- Norbert -dnl FIXME: -dnl GNOME_VFS_LIBS= +dnl Below all tests but the one for HP-UX are removed. They caused more +dnl problems than they soved, sigh. -- Norbert +AC_DEFUN(MC_HPUX_PROG_CC_STDC, +[AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C) +AC_CACHE_VAL(ac_cv_prog_cc_stdc, +[ac_cv_prog_cc_stdc=no +ac_save_CFLAGS="$CFLAGS" +dnl Don't try gcc -ansi; that turns off useful extensions and +dnl breaks some systems' header files. +dnl AIX -qlanglvl=ansi (removed -- Norbert) +dnl Ultrix and OSF/1 -std1 (removed -- Norbert) +dnl HP-UX -Aa -D_HPUX_SOURCE +dnl SVR4 -Xc (removed -- Norbert) +for ac_arg in "" "-Aa -D_HPUX_SOURCE" +do + CFLAGS="$ac_save_CFLAGS $ac_arg" + AC_TRY_COMPILE( +[#include +#if !defined(__STDC__) || __STDC__ != 1 +choke me +#endif +], [int test (int i, double x); +struct sigaction sa; +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);};], +[ac_cv_prog_cc_stdc="$ac_arg"; break]) +done +CFLAGS="$ac_save_CFLAGS" ]) - -AC_DEFUN([GNOME_VFS_CHECKS],[ - use_vfs=yes - AC_ARG_WITH(vfs, - [--with-vfs Compile with the VFS code], - use_vfs=$withval - ) - case $use_vfs in - yes) GNOME_WITH_VFS;; - no) use_vfs=no;; - *) use_vfs=no;; - dnl Should we issue a warning? - esac +AC_MSG_RESULT($ac_cv_prog_cc_stdc) +case "x$ac_cv_prog_cc_stdc" in + x|xno) ;; + *) CC="$CC $ac_cv_prog_cc_stdc" ;; +esac ]) +dnl aclocal.m4 generated automatically by aclocal 1.2f +dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +dnl This Makefile.in is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. -dnl -dnl Check for struct linger -dnl -AC_DEFUN(AC_STRUCT_LINGER, [ -av_struct_linger=no -AC_MSG_CHECKING(struct linger is available) -AC_TRY_RUN([ -#include -#include +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. -struct linger li; -main () -{ - li.l_onoff = 1; - li.l_linger = 120; - exit (0); -} -],[ -AC_DEFINE(HAVE_STRUCT_LINGER) -av_struct_linger=yes -],[ -av_struct_linger=no -],[ -av_struct_linger=no -]) -AC_MSG_RESULT($av_struct_linger) +# progtest.m4 from gettext 0.32 +# Search path for a program which passes the given test. +# Ulrich Drepper , 1996. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. + +# serial 1 + +dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +AC_DEFUN(AM_PATH_PROG_WITH_TEST, +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test -n "[$]$1"; then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl ]) -dnl Curses detection: Munged from Midnight Commander's configure.in -dnl -dnl What it does: -dnl ============= -dnl -dnl - Determine which version of curses is installed on your system -dnl and set the -I/-L/-l compiler entries and add a few preprocessor -dnl symbols -dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that -dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in -dnl Makefile.in's -dnl - Modify the following configure variables (these are the only -dnl curses.m4 variables you can access from within configure.in) -dnl CURSES_INCLUDEDIR - contains -I's and possibly -DRENAMED_CURSES if -dnl an ncurses.h that's been renamed to curses.h -dnl is found. -dnl CURSES_LIBS - sets -L and -l's appropriately -dnl CFLAGS - if --with-sco, add -D_SVID3 -dnl has_curses - exports result of tests to rest of configure -dnl -dnl Usage: -dnl ====== -dnl 1) Add lines indicated below to acconfig.h -dnl 2) call AC_CHECK_CURSES after AC_PROG_CC in your configure.in -dnl 3) Instead of #include you should use the following to -dnl properly locate ncurses or curses header file -dnl -dnl #if defined(USE_NCURSES) && !defined(RENAMED_NCURSES) -dnl #include -dnl #else -dnl #include -dnl #endif -dnl -dnl 4) Make sure to add @CURSES_INCLUDEDIR@ to your preprocessor flags -dnl 5) Make sure to add @CURSES_LIBS@ to your linker flags or LIBS -dnl -dnl Notes with automake: -dnl - call AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true) from -dnl configure.in -dnl - your Makefile.am can look something like this -dnl ----------------------------------------------- -dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR) -dnl if HAS_CURSES -dnl CURSES_TARGETS=name_of_curses_prog -dnl endif -dnl bin_PROGRAMS = other_programs $(CURSES_TARGETS) -dnl other_programs_SOURCES = blah blah blah -dnl name_of_curses_prog_SOURCES = blah blah blah -dnl other_programs_LDADD = blah -dnl name_of_curses_prog_LDADD = blah $(CURSES_LIBS) -dnl ----------------------------------------------- -dnl -dnl -dnl The following lines should be added to acconfig.h: -dnl ================================================== -dnl -dnl /*=== Curses version detection defines ===*/ -dnl /* Found some version of curses that we're going to use */ -dnl #undef HAS_CURSES -dnl -dnl /* Use SunOS SysV curses? */ -dnl #undef USE_SUNOS_CURSES -dnl -dnl /* Use old BSD curses - not used right now */ -dnl #undef USE_BSD_CURSES -dnl -dnl /* Use SystemV curses? */ -dnl #undef USE_SYSV_CURSES -dnl -dnl /* Use Ncurses? */ -dnl #undef USE_NCURSES -dnl -dnl /* If you Curses does not have color define this one */ -dnl #undef NO_COLOR_CURSES -dnl -dnl /* Define if you want to turn on SCO-specific code */ -dnl #undef SCO_FLAVOR -dnl -dnl /* Set to reflect version of ncurses * -dnl * 0 = version 1.* -dnl * 1 = version 1.9.9g -dnl * 2 = version 4.0/4.1 */ -dnl #undef NCURSES_970530 -dnl -dnl /*=== End new stuff for acconfig.h ===*/ -dnl - -AC_DEFUN(AC_CHECK_CURSES,[ - search_ncurses=true - screen_manager="" - has_curses=false - - CFLAGS=${CFLAGS--O} +# lcmessage.m4 from gettext 0.32 +# Check whether LC_MESSAGES is available in . +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. - AC_SUBST(CURSES_LIBS) - AC_SUBST(CURSES_INCLUDEDIR) +# serial 1 - AC_ARG_WITH(sco, - [ --with-sco Use this to turn on SCO-specific code],[ - if test x$withval = xyes; then - AC_DEFINE(SCO_FLAVOR) - CFLAGS="$CFLAGS -D_SVID3" - fi - ]) +AC_DEFUN(AM_LC_MESSAGES, + [if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES) + fi + fi]) - AC_ARG_WITH(sunos-curses, - [ --with-sunos-curses Used to force SunOS 4.x curses],[ - if test x$withval = xyes; then - AC_USE_SUNOS_CURSES - fi - ]) - AC_ARG_WITH(osf1-curses, - [ --with-osf1-curses Used to force OSF/1 curses],[ - if test x$withval = xyes; then - AC_USE_OSF1_CURSES - fi - ]) - AC_ARG_WITH(vcurses, - [ --with-vcurses[=incdir] Used to force SysV curses], - if test x$withval != xyes; then - CURSES_INCLUDEDIR="-I$withval" - fi - AC_USE_SYSV_CURSES - ) +# gettext.m4 from gettext 0.32 +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. - AC_ARG_WITH(ncurses, - [ --with-ncurses[=dir] Compile with ncurses/locate base dir], - if test x$withval = xno ; then - search_ncurses=false - elif test x$withval != xyes ; then - CURSES_LIBS="$LIBS -L$withval/lib -lncurses" - CURSES_INCLUDEDIR="-I$withval/include" - search_ncurses=false - screen_manager="ncurses" - AC_DEFINE(USE_NCURSES) - AC_DEFINE(HAS_CURSES) - has_curses=true - fi - ) +# serial 3 - if $search_ncurses - then - AC_SEARCH_NCURSES() - fi +AC_DEFUN(AM_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) + USE_INCLUDED_LIBINTL=no -]) + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS) + AC_MSG_CHECKING([whether included gettext is requested]) + AC_ARG_WITH(included-gettext, + [ --with-included-gettext use the GNU gettext library included here], + nls_cv_force_use_gnu_gettext=$withval, + nls_cv_force_use_gnu_gettext=no) + AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" + if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + dnl User does not insist on using GNU NLS library. Figure out what + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE -AC_DEFUN(AC_USE_SUNOS_CURSES, [ - search_ncurses=false - screen_manager="SunOS 4.x /usr/5include curses" - AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses) - AC_DEFINE(USE_SUNOS_CURSES) - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_INCLUDEDIR="-I/usr/5include" - CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a" - AC_MSG_RESULT(Please note that some screen refreshs may fail) -]) - -AC_DEFUN(AC_USE_OSF1_CURSES, [ - AC_MSG_RESULT(Using OSF1 curses) - search_ncurses=false - screen_manager="OSF1 curses" - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(NO_COLOR_CURSES) - AC_DEFINE(USE_SYSV_CURSES) - CURSES_LIBS="-lcurses" -]) - -AC_DEFUN(AC_USE_SYSV_CURSES, [ - AC_MSG_RESULT(Using SysV curses) - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(USE_SYSV_CURSES) - search_ncurses=false - screen_manager="SysV/curses" - CURSES_LIBS="-lcurses" -]) - -dnl AC_ARG_WITH(bsd-curses, -dnl [--with-bsd-curses Used to compile with bsd curses, not very fancy], -dnl search_ncurses=false -dnl screen_manager="Ultrix/cursesX" -dnl if test $system = ULTRIX -dnl then -dnl THIS_CURSES=cursesX -dnl else -dnl THIS_CURSES=curses -dnl fi -dnl -dnl CURSES_LIBS="-l$THIS_CURSES -ltermcap" -dnl AC_DEFINE(HAS_CURSES) -dnl has_curses=true -dnl AC_DEFINE(USE_BSD_CURSES) -dnl AC_MSG_RESULT(Please note that some screen refreshs may fail) -dnl AC_WARN(Use of the bsdcurses extension has some) -dnl AC_WARN(display/input problems.) -dnl AC_WARN(Reconsider using xcurses) -dnl) + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - -dnl -dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename -dnl -AC_DEFUN(AC_NCURSES, [ - if $search_ncurses - then - if test -f $1/$2 - then - AC_MSG_RESULT(Found ncurses on $1/$2) - CURSES_LIBS="$3" - CURSES_INCLUDEDIR="$4" - search_ncurses=false - screen_manager=$5 - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(USE_NCURSES) - fi - fi -]) + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_TRY_LINK([], [return (int) gettext ("")], + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)])]) + fi -AC_DEFUN(AC_SEARCH_NCURSES, [ - AC_CHECKING("location of ncurses.h file") + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi + ]) - AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include") - AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses") - AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local") - AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses") - - AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses") - - AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses") - - dnl - dnl We couldn't find ncurses, try SysV curses - dnl - if $search_ncurses - then - AC_EGREP_HEADER(init_color, /usr/include/curses.h, - AC_USE_SYSV_CURSES) - AC_EGREP_CPP(USE_NCURSES,[ -#include -#ifdef __NCURSES_H -#undef USE_NCURSES -USE_NCURSES -#endif -],[ - CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES" - AC_DEFINE(HAS_CURSES) - has_curses=true - AC_DEFINE(USE_NCURSES) - search_ncurses=false - screen_manager="ncurses installed as curses" -]) - fi + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) - dnl - dnl Try SunOS 4.x /usr/5{lib,include} ncurses - dnl The flags USE_SUNOS_CURSES, USE_BSD_CURSES and BUGGY_CURSES - dnl should be replaced by a more fine grained selection routine - dnl - if $search_ncurses - then - if test -f /usr/5include/curses.h - then - AC_USE_SUNOS_CURSES + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl + if test "$GENCAT" != "no"; then + AC_PATH_PROG(GMSGFMT, gmsgfmt, no) + if test "$GMSGFMT" = "no"; then + AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat + DATADIRNAME=lib + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi]) + fi fi - else - # check for ncurses version, to properly ifdef mouse-fix - AC_MSG_CHECKING(for ncurses version) - ncurses_version=unknown -cat > conftest.$ac_ext < -#else -#include -#endif -#undef VERSION -VERSION:NCURSES_VERSION -EOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | - egrep "VERSION:" >conftest.out 2>&1; then -changequote(,)dnl - ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'` -changequote([,])dnl - fi - rm -rf conftest* - AC_MSG_RESULT($ncurses_version) - case "$ncurses_version" in -changequote(,)dnl - 4.[01]) -changequote([,])dnl - AC_DEFINE(NCURSES_970530,2) - ;; - 1.9.9g) - AC_DEFINE(NCURSES_970530,1) - ;; - 1*) - AC_DEFINE(NCURSES_970530,0) - ;; - esac - fi -]) - - - + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes + fi + fi + if test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions used to generate GNU NLS library. + INTLOBJS="\$(GETTOBJS)" + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_SUBST(MSGFMT) + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo + DATADIRNAME=share + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi -# Define a conditional. - -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi]) - -dnl -dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) -dnl -dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh -dnl is not found. -dnl + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext programs is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + fi -AC_DEFUN([GNOME_INIT_HOOK],[ - AC_SUBST(GNOME_LIBS) - AC_SUBST(GNOMEUI_LIBS) - AC_SUBST(GNOMEGNORBA_LIBS) - AC_SUBST(GTKXMHTML_LIBS) - AC_SUBST(ZVT_LIBS) - AC_SUBST(GNOME_LIBDIR) - AC_SUBST(GNOME_INCLUDEDIR) + # We need to process the po/ directory. + POSUB=po + else + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi - AC_ARG_WITH(gnome-includes, - [ --with-gnome-includes Specify location of GNOME headers],[ - CFLAGS="$CFLAGS -I$withval" - ]) - - AC_ARG_WITH(gnome-libs, - [ --with-gnome-libs Specify location of GNOME libs],[ - LDFLAGS="$LDFLAGS -L$withval" - gnome_prefix=$withval - ]) + # If this is used in GNU gettext we have to set USE_NLS to `yes' + # because some of the sources are only built for this goal. + if test "$PACKAGE" = gettext; then + USE_NLS=yes + USE_INCLUDED_LIBINTL=yes + fi - AC_ARG_WITH(gnome, - [ --with-gnome Specify prefix for GNOME files], - if test x$withval = xyes; then - want_gnome=yes - dnl Note that an empty true branch is not - dnl valid sh syntax. - ifelse([$1], [], :, [$1]) - else - if test "x$withval" = xno; then - want_gnome=no - else - want_gnome=yes - LDFLAGS="$LDFLAGS -L$withval/lib" - CFLAGS="$CFLAGS -I$withval/include" - gnome_prefix=$withval/lib - fi - fi, - want_gnome=yes) + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done - if test "x$want_gnome" = xyes; then + dnl Make all variables we use known to autoconf. + AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) - AC_PATH_PROG(GNOME_CONFIG,gnome-config,no) - if test "$GNOME_CONFIG" = "no"; then - no_gnome_config="yes" - else - AC_MSG_CHECKING(if $GNOME_CONFIG works) - if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then - AC_MSG_RESULT(yes) - GNOME_GNORBA_HOOK([],$2) - GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`" - GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`" - GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`" - GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`" - ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`" - GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`" - GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`" - $1 - else - AC_MSG_RESULT(no) - no_gnome_config="yes" - fi - fi +AC_DEFUN(AM_GNU_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl - if test x$exec_prefix = xNONE; then - if test x$prefix = xNONE; then - gnome_prefix=$ac_default_prefix/lib - else - gnome_prefix=$prefix/lib - fi - else - gnome_prefix=`eval echo \`echo $libdir\`` - fi - - if test "$no_gnome_config" = "yes"; then - AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix) - if test -f $gnome_prefix/gnomeConf.sh; then - AC_MSG_RESULT(found) - echo "loading gnome configuration from" \ - "$gnome_prefix/gnomeConf.sh" - . $gnome_prefix/gnomeConf.sh - $1 - else - AC_MSG_RESULT(not found) - if test x$2 = xfail; then - AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install) - fi - fi - fi - fi + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h values.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +__argz_count __argz_stringify __argz_next]) - if test -n "$3"; then - n="$3" - for i in $n; do - AC_MSG_CHECKING(extra library \"$i\") - case $i in - applets) - AC_SUBST(GNOME_APPLETS_LIBS) - GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` - AC_MSG_RESULT($GNOME_APPLETS_LIBS);; - capplet) - AC_SUBST(GNOME_CAPPLET_LIBS) - GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` - AC_MSG_RESULT($GNOME_CAPPLET_LIBS);; - *) - AC_MSG_RESULT(unknown library) - esac - done - fi -]) + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY) + fi -dnl -dnl GNOME_INIT ([additional-inits]) -dnl + AM_LC_MESSAGES + AM_WITH_NLS -AC_DEFUN([GNOME_INIT],[ - GNOME_INIT_HOOK([],fail,$1) -]) + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for lang in ${LINGUAS=$ALL_LINGUAS}; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -dnl -dnl GNOME_GNORBA_HOOK (script-if-gnorba-found, failflag) -dnl -dnl if failflag is "failure" it aborts if gnorba is not found. -dnl + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -AC_DEFUN([GNOME_GNORBA_HOOK],[ - GNOME_ORBIT_HOOK([],$2) - AC_CACHE_CHECK([for gnorba libraries],gnome_cv_gnorba_found,[ - gnome_cv_gnorba_found=no - if test x$gnome_cv_orbit_found = xyes; then - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - if test -n "$GNORBA_LIBS"; then - gnome_cv_gnorba_found=yes - fi - fi - ]) - AM_CONDITIONAL(HAVE_GNORBA, test x$gnome_cv_gnorba_found = xyes) - if test x$gnome_cv_orbit_found = xyes; then - $1 - GNORBA_CFLAGS="`gnome-config --cflags gnorba gnomeui`" - GNORBA_LIBS="`gnome-config --libs gnorba gnomeui`" - AC_SUBST(GNORBA_CFLAGS) - AC_SUBST(GNORBA_LIBS) - else - if test x$2 = xfailure; then - AC_MSG_ERROR(gnorba library not installed or installation problem) - fi - fi -]) + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) -AC_DEFUN([GNOME_GNORBA_CHECK], [ - GNOME_GNORBA_HOOK([],failure) -]) + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) -dnl -dnl GNOME_ORBIT_HOOK (script-if-orbit-found, failflag) -dnl -dnl if failflag is "failure" it aborts if orbit is not found. -dnl + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed -AC_DEFUN([GNOME_ORBIT_HOOK],[ - AC_PATH_PROG(ORBIT_CONFIG,orbit-config,no) - AC_PATH_PROG(ORBIT_IDL,orbit-idl,no) - AC_CACHE_CHECK([for working ORBit environment],gnome_cv_orbit_found,[ - if test x$ORBIT_CONFIG = xno -o x$ORBIT_IDL = xno; then - gnome_cv_orbit_found=no - else - gnome_cv_orbit_found=yes - fi - ]) - AM_CONDITIONAL(HAVE_ORBIT, test x$gnome_cv_orbit_found = xyes) - if test x$gnome_cv_orbit_found = xyes; then - $1 - ORBIT_CFLAGS=`orbit-config --cflags client server` - ORBIT_LIBS=`orbit-config --use-service=name --libs client server` - AC_SUBST(ORBIT_CFLAGS) - AC_SUBST(ORBIT_LIBS) - else - if test x$2 = xfailure; then - AC_MSG_ERROR(ORBit not installed or installation problem) - fi - fi -]) + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) -AC_DEFUN([GNOME_ORBIT_CHECK], [ - GNOME_ORBIT_HOOK([],failure) -]) + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) -dnl GNOME_UNDELFS_CHECKS -dnl Check for ext2fs undel support. -dnl Set shell variable ext2fs_undel to "yes" if we have it, -dnl "no" otherwise. May define USE_EXT2FSLIB for cpp. -dnl Will set EXT2FS_UNDEL_LIBS to required libraries. + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) -AC_DEFUN([GNOME_UNDELFS_CHECKS], [ - AC_CHECK_HEADERS(ext2fs/ext2fs.h linux/ext2_fs.h) - ext2fs_undel=no - EXT2FS_UNDEL_LIBS= - if test x$ac_cv_header_ext2fs_ext2fs_h = xyes - then - if test x$ac_cv_header_linux_ext2_fs_h = xyes - then - AC_DEFINE(USE_EXT2FSLIB) - ext2fs_undel=yes - EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err" - fi - fi -]) + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ]) diff -ruN old/mc-4.5.44/config.h.in new/mc-4.5.45/config.h.in --- old/mc-4.5.44/config.h.in Tue Apr 4 23:31:54 2000 +++ new/mc-4.5.45/config.h.in Tue May 9 18:52:01 2000 @@ -176,9 +176,6 @@ /* If you don't have gcc, define this */ #undef OLD_TOOLS -/* Found some version of curses that we're going to use */ -#undef HAS_CURSES - /* Is the subshell the default or optional? */ #undef SUBSHELL_OPTIONAL @@ -394,11 +391,17 @@ /* Define if you have the strchr function. */ #undef HAVE_STRCHR +/* Define if you have the strcoll function. */ +#undef HAVE_STRCOLL + /* Define if you have the strdup function. */ #undef HAVE_STRDUP /* Define if you have the strerror function. */ #undef HAVE_STRERROR + +/* Define if you have the strftime function. */ +#undef HAVE_STRFTIME /* Define if you have the strncasecmp function. */ #undef HAVE_STRNCASECMP diff -ruN old/mc-4.5.44/configure new/mc-4.5.45/configure --- old/mc-4.5.44/configure Tue Apr 4 23:31:54 2000 +++ new/mc-4.5.45/configure Tue May 9 18:52:01 2000 @@ -588,7 +588,7 @@ PACKAGE=mc -VERSION=4.5.44 +VERSION=4.5.45 cat >> confdefs.h <&6 echo "configure:4469: checking for $ac_func" >&5 diff -ruN old/mc-4.5.44/configure.in new/mc-4.5.45/configure.in --- old/mc-4.5.44/configure.in Tue Apr 4 23:31:54 2000 +++ new/mc-4.5.45/configure.in Tue May 9 18:52:01 2000 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) PACKAGE=mc -VERSION=4.5.44 +VERSION=4.5.45 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(VERSION) @@ -170,7 +170,7 @@ dnl Check availability of some functions dnl -AC_CHECK_FUNCS(strerror statfs getwd strcasecmp strncasecmp) +AC_CHECK_FUNCS(strerror statfs getwd strcasecmp strncasecmp strcoll strftime) AC_CHECK_FUNCS(strdup memmove pwdauth truncate initgroups putenv) AC_CHECK_FUNCS(memset memcpy tcsetattr tcgetattr cfgetospeed) AC_CHECK_FUNCS(sigaction sigemptyset sigprocmask sigaddset) diff -ruN old/mc-4.5.44/doc/mc.1.in new/mc-4.5.45/doc/mc.1.in --- old/mc-4.5.44/doc/mc.1.in Tue Apr 4 23:31:56 2000 +++ new/mc-4.5.45/doc/mc.1.in Tue May 9 18:52:03 2000 @@ -1389,12 +1389,15 @@ Sub-condition is one of following: + y syntax of current file matching pattern? + for edit menu only. f current file matching pattern? F other file matching pattern? d current directory matching pattern? D other directory matching pattern? t current file of type? T other file of type? + x is it executable filename? ! negate the result of sub-condition .fi .PP @@ -1939,9 +1942,38 @@ .PP The macros are: .PP +.I "%i" +.IP +The indent of blank space, equal the cursor column +position. For edit menu only. +.PP +.I "%y" +.IP +The syntax type of current file. For edit menu only. +.PP +.I "%k" +.IP +The block file name. +.PP +.I "%e" +.IP +The error file name. +.PP +.I "%m" +.IP +The current menu name. +.PP .I "%f" .IP The current file name. +.PP +.I "%x" +.IP +The extension of current file name. +.PP +.I "%b" +.IP +The current file name without extension. .PP .I "%d" .IP diff -ruN old/mc-4.5.44/doc/mc.sgml new/mc-4.5.45/doc/mc.sgml --- old/mc-4.5.44/doc/mc.sgml Tue Apr 4 23:31:56 2000 +++ new/mc-4.5.45/doc/mc.sgml Tue May 9 18:52:03 2000 @@ -1110,12 +1110,15 @@ Sub-condition is one of following: +y syntax of current file matching pattern? + for edit menu only. f current file matching pattern F other file matching pattern d current directory matching pattern D other directory matching pattern t current file of type T other file of type +x is it executable filename ! negate the result of sub-condition @@ -1572,8 +1575,23 @@ The macros are: +. +Possible to use only in mc.ext . ]> - - - Gnome Midnight Commander Documentation +
+ + Dave @@ -15,761 +16,720 @@ - 1998,1999 - Red Hat Software and David A. Wheeler + 1998,1999, 2000 + Red Hat Software - This documentation is free software; you can redistribute - it and/or modify it under the terms of the GNU General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later - version. - - This program is distributed in the hope that it will be - useful, but WITHOUT ANY WARRANTY; without even the implied - warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR - PURPOSE. See the GNU General Public License for more - details. - - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, - MA 02111-1307 USA - - For more details see the file COPYING that should have - been included in this distribution of the Gnome Midnight Commander. + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation + License, Version 1.1 or any later version published by the + Free Software Foundation with no Invariant Sections, no Front-Cover + Texts, and no Back-Cover Texts. You may obtain a copy of the + GNU Free Documentation License from the Free + Software Foundation by visiting their Web site or by writing to +
+ Free Software Foundation, Inc. + 59 Temple Place - Suite 330 + Boston, MA 02111-1307 + USA +
+ + + Many of the names used by companies to distinguish their products and + services are claimed as trademarks. Where those names appear in any + GNOME documentation, and those trademarks are made aware to the members + of the GNOME Documentation Project, the names have been printed in caps + or initial caps. - - - - The GNOME File Manager - - Introduction - - - - GNOME File Manager - - - - - GMC - "Gnome File Manager" - - - - GNU Midnight Commander - "GNOME File Manager" - - GNOME includes a file manager that allows you to manipulate the files on - your system in a comfortable, powerful, graphical environment. This File - Manager is known as GMC for GNU Midnight Commander. GMC is based on the - Midnight Commander file manager which can be run in a terminal. - - - Midnight Commander has long been known for its power and ease of use. GMC - has taken the power and ease of use from MC and added the GNOME graphical - frontend. - - As mentioned in the previous chapter, the GNOME File Manager provides - the desktop functionality for GNOME. The GNOME File Manager also provides a - place to manipulate files on your system by using the GNOME File Manager - window. -
- GNU Midnight Commander - The GNOME File Manager - - GMC - - - -
- - - There are two main windows within the GNOME File Manager. On the left is the - tree view, which represents all of the directories on your system by their - hierarchical position. On the right is the directory window, which will show - you the contents of the directory which you have selected in the tree view. - - - To select a directory in the tree view simply use a single mouse click. This - will change the main directory view, showing the files in the directory you - have chosen. If there is a plus sign to the left of a directory name in the - tree window, you may click on it to show subdirectories. At this point the - plus sign will have changed to a minus sign. If you click on the minus - sign, the subdirectory once again becomes hidden in the tree view and the - plus sign reappears. - - - - - GNOME File Manager - - - Viewing Files - - - The directry window has a few viewing options you may wish to - take advantage of: the icon view and three list views: brief, - detailed and custom. - - - The Icon view is the default view and will display large icons for each - file. The Brief view shows the files and directories in a list. The - Detailed view expands this list to include information about the files. The - Custom view is a list view that allows you to select the information you - want to view about files. - - - In the Brief, Detailed, and Custom views if you click on one of the - information titles on the top of the window it will sort the files according - to that information. For example, if you want to find the largest files in - the directory you can click on the Size title and the files will be sorted - by size from largest to smallest. One more click on the Size title will - change the sorting from smallest to largest. - - - - Moving Around the GNOME File Manager - - - - GNOME File Manager - - - Moving around - - - Above the tree and main file windows in the GNOME File Manager there is a - Location text box. - - - Within this text box you can type the path location of the file which you - would like to view in the main window. - - - - - GNOME File Manager - - - FTP - - - The GNOME File Manager is also equipped to view FTP sites. To - view an FTP site you will need to be connected to the Internet either - through a dial up account or a network. Type the FTP address in the Location - text box and the GNOME File Manager will attempt to connect to the site. - - - Make sure you type in FTP addresses in the following manner: - ftp://[site address] - - - Above the Location text box are navigation buttons you might wish to - use. The buttons with the arrow icons allow you to move within the - directories adjacent to the one you are in. The left button will take you to - the previous directory you were in, the middle button will take you up one - level in the directory hierarchy, and the right button will take you to the - next directory if you have just moved backwards. - - - TIP - - You can open a secondary window by using your middle mouse button on any - directory. Press the middle mouse button (or both left and right mouse - buttons if you have emulation) on a directory in the main window and a new - window will open showing the contents of the directory you clicked on. - - - - - Selecting Files - - - - GNOME File Manager - - - Selecting Files - - - Selecting files is done with your mouse by clicking on the file or files in - the GNOME File Manager. The file that is selected will then highlight to - show you that it has been selected. - - - - - GNOME File Manager - - - Selecting multiple files - - - There are a couple of ways to select more than one file. One way is to use - the "rubber band" select by clicking and dragging the mouse cursor around - several files. This action will produce a small dotted line, the "rubber - band", to show you the area in which files will be selected. - -
- "Rubber Band Select" - - Rubber Band Select - - - -
- - If you wish to be more selective about the files you are choosing, or the - files you need do not reside next to one another, you may use the - CTRL key to keep the files you have selected while you - are selecting more. This works by selecting a file, pressing and holding - the CTRL key and selecting another file. While the - CTRL key is pressed you will be able to add to the "list" - of files that are selected. Once you have selected multiple files by - either method you may copy or move the files. - - - You may also select all files in a directory by selecting the - Select All menu item from the - Edit menu. - - - - - GNOME File Manager - - - filtering - - - You may also filter your selection by using the Select - Files menu item in the Edit menu. Using - Select Files will display a simple dialog which - will allow you to type in criteria for your selection. In this field, the - symbol * is interpreted as a wildcard, E.g., it matches any - string. For example, if you would like to select all files in the directory - that start with the letter D, you can type - D* (note that filenames in Unix are case-sensitive). - - - - Copying and Moving Files - - - - GNOME File Manager - - - Copying files - - - - - GNOME File Manager - - - Moving files - - - The default action for dragging and dropping files between the GNOME File - Manager and the desktop is to move them. But you can also use drag and drop - to copy a file by pressing the SHIFT key while dragging the - file(s). You can also drag a file within the file manager to another - directory. Select the file in the main window and drag it to the desired - directory in the tree window. Note, however, that when dragging to the tree - window the default action is to copy the file. As you drag the file to the - tree window, you will see a plus sign appear to remind you that theh file - will be copied. You can also use drag and drop to copy directories the same - way as you did for files. Again note the plus sign signifying that the - directory will be copied, not moved. - - - - - GNOME File Manager - - - Linking files - - - You may also bring up a menu which lets you decide what action to perform - with a drag by using the middle mouse button to drag a file or pressing the - ALT key while dragging a file. Once you release the drag - you will get a pop-up menu which contains the options Copy, Move, Link, and - Cancel Drag. - - - -
- The Move Dialog - - Move Dialog - - - -
- - - GNOME File Manager - - - Moving files - - - To use the move dialog you simply type in the path where you wish to move - the file. If you want to rename the file you may type the new name of the - file in the path string. The Copy dialog looks and works exactly the same - way as the Move/rename dialog. - - - If the file you are moving is a symbolic link — that is, a virtual - link to where the file actually resides (called a shortcut in some other - operating systems) — you may select the Advanced - Options tab and select Preserve symlinks. - Selecting this will make sure the link is preserved despite the move. - - - It is recommended that you use this method of moving a symbolic link. - - - - Renaming Files - - - - GNOME File Manager - - - Renaming files - - - Renaming files in the GNOME File Manager window or on the desktop - can be achieved in two ways. - - - One method of renaming a file is to right mouse click on the file and choose - the Properties menu item from the - pop-up menu. In the Filename text box you may type in - the new name as you wish it to appear. - -
- File Properties - - File Properties - - - -
- - A shortcut method to rename a file is to slowly double click on the filename - in the icon view or on the desktop. Make sure the double-click is slow so - you do not launch the file but you simply highlight and then click again. - At this point the name of the file will enter into the editing mode, your - mouse cursor will change to an editing line, and you can type in the new - name. Once the name is as you would like it to be you may press the - Enter key to end the editing process. - - - - Launching Applications From the GNOME File Manager - - - - GNOME File Manager - - - Launching applications from - - - The GNOME File Manager allows you to launch applications from the main - window by simply double clicking your mouse on a file which has an - application associated with it. You can change the way file types are - handled by reading the Mime Capplet Chapter in the GNOME User's Guide. - - - - - GNOME File Manager - - - Open with - - - If the file does not have an associated application you can right mouse - click on the file and select Open with from the - pop-up menu. This will bring up a dialog that - allows you to define the application which will launch the file. For example, - if you want to edit a file named test.txt with - Emacs (a popular text editor), you can right mouse - click on test.txt and choose Open with. When you - get the Open with dialog box simply type in emacs in front of the test.txt - file name. When you press OK - Emacs will open the file. - -
- The Open With Dialog - - Open With Dialog - - - -
- - File Properties and Actions - - - - GNOME File Manager - - - File properties - - - For any file in the main file display you may right mouse click on - it and choose a variety of properties and actions for it from the - pop-up menu: - - - - - Open - This will open the file with the default - application associated with it. You may read more about editing these - associations in Mime Capplet Chapter in the GNOME User's Guide.. - - - - - Open With - You may open a file with any - application using this menu item. You may read more about this in . - - - - - View - This will view the file with a basic - text viewer. - - - - - Edit - This will launch an editor to edit the - file. The editor launched is determined by the application associated with - that file type. You may read more about editing this association in Mime - Capplet Chapter in the GNOME User's Guide.. - - - - - Copy - This will copy the file to the - clipboard so that it can be pasted elsewhere. - - - - - Delete - This will delete the file. - - - - - Move - This will bring up the - Move dialog, which will allow you to move the - file. You can read more about this dialog and moving files in . - - - - - Symlink - Symlink allows you to create a - symbolic link to the file you have selected i another directory. When you - select Symlink you will see a dialog which allows you to type in the - directory and filename that you wish to be the symbolic link to the - file. This link will be a "shortcut" to the selected file. - - - - - Properties - The Properties menu item will - launch the Properties dialog. The Properties dialog allows you to edit and - view the properties for the selected file. - - - The Properties dialog consists of three tabs, Statistics, Options, - and Permissions. - -
- File Properties - - File Properties - - - -
- - - - Statistics - This tab will show you the file - information including the name, type, size, and history. You may change - the name of the file in the File Name text box. - - - - - Options - This tab will allow you to change the - action options for the file. You can define how to open, view, and edit - the file. If you need to open it in a terminal window you may select - the Needs terminal to run checkbox. - - - NOTE - - If you bring up the Properties dialog from an icon on the desktop you - will be able to change the icon for that file in the - Options tab. - - - - + Gnome Midnight Commander Documentation + + + The Gnome File Manager + + GNOME includes a file manager that allows you to manipulate the files on + your system in a comfortable, powerful, graphical environment. This File + Manager is known as GMC for GNU Midnight Commander. GMC is based on the + Midnight Commander file manager which can be run in a terminal. + + + Midnight Commander has long been known for its power and ease of + use. GMC has taken the power and ease of use from MC and added the GNOME + graphical frontend. + + + As mentioned in the previous chapter, the GNOME File Manager + provides the desktop functionality for GNOME. The GNOME File Manager + also provides a place to manipulate files on your system by using the + GNOME File Manager window. +
+ GNU Midnight Commander - The GNOME File Manager + + GMC + + + +
+ + + There are two main windows within the GNOME File Manager. On the left is + the tree view, which represents all of the directories on your system by + their hierarchical position. On the right is the directory window, which + will show you the contents of the directory which you have selected in + the tree view. + + + To select a directory in the tree view simply use a single mouse + click. This will change the main directory view, showing the files in + the directory you have chosen. If there is a plus sign to the left of a + directory name in the tree window, you may click on it to show + subdirectories. At this point the plus sign will have changed to a + minus sign. If you click on the minus sign, the subdirectory once again + becomes hidden in the tree view and the plus sign reappears. + + + + + Viewing Files + + + The directry window has a few viewing options you may wish + to take advantage of: the icon view and three list views: brief, + detailed and custom. + + + The Icon view is the default view and will display large icons for each + file. The Brief view shows the files and directories in a list. The + Detailed view expands this list to include information about the + files. The Custom view is a list view that allows you to select the + information you want to view about files. + + + In the Brief, Detailed, and Custom views if you click on one of the + information titles on the top of the window it will sort the files + according to that information. For example, if you want to find the + largest files in the directory you can click on the Size title and the + files will be sorted by size from largest to smallest. One more click on + the Size title will change the sorting from smallest to largest. + + + + Moving Around the GNOME File Manager + + + + Moving around + + + Above the tree and main file windows in the GNOME File Manager there is + a Location text box. + + + Within this text box you can type the path location of the file which + you would like to view in the main window. + + + + + FTP + + + The GNOME File Manager is also equipped to view FTP + sites. To view an FTP site you will need to be connected to the Internet + either through a dial up account or a network. Type the FTP address in + the Location text box and the GNOME File Manager will attempt to connect + to the site. + + + Make sure you type in FTP addresses in the following manner: + ftp://[site address] + + + Above the Location text box are navigation buttons you might wish to + use. The buttons with the arrow icons allow you to move within the + directories adjacent to the one you are in. The left button will take + you to the previous directory you were in, the middle button will take + you up one level in the directory hierarchy, and the right button will + take you to the next directory if you have just moved backwards. + + + TIP - Permissions - This tab allows you to change the - permissions and ownership of a file if you have access to do so. You - may select Read, Write, and Exec permissions for the User, Group, and - Others. You may also set the UID, GID and Sticky as well as define who - owns the file. - - - - - - - - Changing Your Preferences in The File Manager - - - - GNOME File Manager - - - Preferences - - - There are many settings you can configure for the GNOME File Manager. + You can open a secondary window by using your middle mouse button on + any directory. Press the middle mouse button (or both left and right + mouse buttons if you have emulation) on a directory in the main window + and a new window will open showing the contents of the directory you + clicked on. + + + + + Selecting Files + + + + Selecting Files + + + Selecting files is done with your mouse by clicking on the file or files + in the GNOME File Manager. The file that is selected will then + highlight to show you that it has been selected. + + + + + Selecting multiple files + + + There are a couple of ways to select more than one file. One way is to + use the "rubber band" select by clicking and dragging the mouse cursor + around several files. This action will produce a small dotted line, the + "rubber band", to show you the area in which files will be selected. + +
+ "Rubber Band Select" + + Rubber Band Select + + + +
+ + If you wish to be more selective about the files you are choosing, or + the files you need do not reside next to one another, you may use the + CTRL key to keep the files you have selected while you + are selecting more. This works by selecting a file, pressing and holding + the CTRL key and selecting another file. While the + CTRL key is pressed you will be able to add to the + "list" of files that are selected. Once you have selected multiple files + by either method you may copy or move the files. - - These settings may be accessed from the GMC - Preferences dialog. You may launch this dialog by selecting the - Preferences menu item from the - Edit menu. + You may also use the SHIFT button to select a range + of files. For example, if you are in list mode and you press the + SHIFT key while selecting the file at the top of the + list, and then select a file ten rows down with the SHIFT + key still pressed, you will select the ten files in that range. + + You may also select all files in a directory by selecting the + Select All menu item from the + Edit menu. + + + + + Filtering + + + You may also filter your selection by using the Select + Files menu item in the Edit menu. Using + Select Files will display a simple dialog + which will allow you to type in criteria for your selection. In this + field, the symbol * is interpreted as a wildcard, E.g., + it matches any string. For example, if you would like to select all + files in the directory that start with the letter D, + you can type D* (note that filenames in Unix are + case-sensitive). + + + + Copying and Moving Files + + + + Copying files + + + + + Moving files + + + The default action for dragging and dropping files between the GNOME + File Manager and the desktop is to move them. But you can also use drag + and drop to copy a file by pressing the SHIFT key while + dragging the file(s). You can also drag a file within the file manager + to another directory. Select the file in the main window and drag it to + the desired directory in the tree window. Note, however, that when + dragging to the tree window the default action is to copy the file. As + you drag the file to the tree window, you will see a plus sign appear to + remind you that theh file will be copied. You can also use drag and drop + to copy directories the same way as you did for files. Again note the + plus sign signifying that the directory will be copied, not moved. + + + + + Linking files + + + You may also bring up a menu which lets you decide what action to + perform with a drag by using the middle mouse button to drag a file or + pressing the ALT key while dragging a file. Once you + release the drag you will get a pop-up menu which contains the options + Copy, Move, Link, and Cancel Drag. + + + +
+ The Move Dialog + + Move Dialog + + + +
- - GNOME File Manager - - - Display - + + Moving files + - The File Display tab allows you to change the way - files are displayed in GMC. - - - + To use the move dialog you simply type in the path where you wish to + move the file. If you want to rename the file you may type the new name + of the file in the path string. The Copy dialog looks and works exactly + the same way as the Move/rename dialog. + + + If the file you are moving is a symbolic link — that is, a virtual + link to where the file actually resides (called a shortcut in some other + operating systems) — you may select the Advanced + Options tab and select Preserve + symlinks. Selecting this will make sure the link is + preserved despite the move. + + + It is recommended that you use this method of moving a symbolic link. + + + + Renaming Files + + + + Renaming files + + + Renaming files in the GNOME File Manager window or on the desktop can be + achieved in two ways. + + + One method of renaming a file is to right mouse click on the file and + choose the Properties menu item from the + pop-up menu. In the Filename text box you may type in + the new name as you wish it to appear. + +
+ File Properties + + File Properties + + + +
+ + A shortcut method to rename a file is to slowly double click on the + filename in the icon view or on the desktop. Make sure the double-click + is slow so you do not launch the file but you simply highlight and then + click again. At this point the name of the file will enter into the + editing mode, your mouse cursor will change to an editing line, and you + can type in the new name. Once the name is as you would like it to be + you may press the Enter key to end the editing process. + + + + Launching Applications From the GNOME File Manager + + + + Launching applications from + + + The GNOME File Manager allows you to launch applications from the main + window by simply double clicking your mouse on a file which has an + application associated with it. You can change the way file types are + handled by reading the Mime Capplet Chapter in the GNOME User's + Guide. Some files that are actually archives will allow you to "look + inside" them. For example, .tar files, .gz files, and .rpm files can all + be double clicked and the files archived inside them will appear in the + File Manager. + + + + + Open with + + + If the file does not have an associated application you can right mouse + click on the file and select Open with from + the pop-up menu. This will bring up a dialog + that allows you to define the application which will launch the + file. The dialog reproduces your Main Menu items so that you can browse + through your applications to find the one you would like to open the + file with. If you do not find the application in the tree you may + specify the path and application name in the Program to + run text box. + +
+ The Open With Dialog + + Open With Dialog + + + +
+ + File Properties and Actions + + + + File properties + + + For any file in the main file display you may right mouse click on it + and choose a variety of properties and actions for it from the + pop-up menu: + + + - Show backup files - This will show any backup - file that might be on your system. + Open - This will open the file with the + default application associated with it. You may read more about + editing these associations in Mime Capplet Chapter in the GNOME + User's Guide. Some files that are actually archives will allow you + to "look inside" them. For example, .tar files, .gz files, and .rpm + files can all be double clicked and the files archived inside them + will appear in the File Manager. - - + + - - - GNOME File Manager - - - Hidden Files - - - - - GNOME File Manager - - - Show hidden files - - - Show hidden files - This will show all "dot - files" or files that begin with a dot. These files typically include - configuration files and directories. + Open With - You may open a file with any + application using this menu item. You may read more about this in + . - - + + - Mix files and directories - This option will - display files and directories in the order you sort them instead of - always having directories shown above files. + View - This will view the file with a + basic text viewer. - - + + - Use shell patterns instead of regular - expressions - This option is for advanced users only. If - you are unfamiliar with Regular Expressions you should not use this - option. If you are familiar with how to create regular expressions - you may select this option to use them in your sorts and filters. + Edit - This will launch an editor to edit + the file. The editor launched is determined by the application + associated with that file type. You may read more about editing this + association in Mime Capplet Chapter in the GNOME User's Guide.. - - - - - - - Confirmation -
- Confirmation Preferences - - Confirmation Preferences - - - -
- + - - - - GNOME File Manager - - - Confirmations - - - This tab allows you to change which functions ask for your confirmation - before continuing. - - - - Confirm when deleting file - This will bring up - a confirmation screen before deleting a file. + Copy - This will copy the file to the + clipboard so that it can be pasted elsewhere. - - + + - Confirm when overwriting files - This will bring - up a confirmation screen before overwriting a file. + Delete - This will delete the file. - - + + - Confirm when executing files - This will bring - up a confirmation screen before executing a file. + Move - This will bring up the + Move dialog, which will allow you to move the + file. You can read more about this dialog and moving files in . - - + + - Show progress while operations are being - performed - This will bring up a progress bar while - certain operations are being performed such as copying, moving, - deleting, etc. + Symlink - Symlink allows you to create a + symbolic link to the file you have selected i another + directory. When you select Symlink you will see a dialog which + allows you to type in the directory and filename that you wish to be + the symbolic link to the file. This link will be a "shortcut" to the + selected file. If you do no understand symlinks you might want to + refer to the - - - + + + + Properties - The Properties menu item + will launch the Properties dialog. The Properties dialog allows you + to edit and view the properties for the selected file. + + + The Properties dialog consists of three tabs, Statistics, + Options, and Permissions. + +
+ File Properties + + File Properties + + + +
+ + + + Statistics - This tab will show you the + file information including the name, type, size, and + history. You may change the name of the file in the + File Name text box. Sizes for directories + will not show you the size of the directory + with all the files within it. + + + + + Options - This tab will allow you to change + the action options for the file. You can define how to open, + view, and edit the file. If you need to open it in a terminal + window you may select the Needs terminal to + run checkbox. + + + NOTE + + If you bring up the Properties dialog from an icon on the + desktop you will be able to change the icon for that file in + the Options tab. + + + + + + Permissions - This tab allows you to change + the permissions and ownership of a file if you have access to do + so. You may select Read, Write, and Exec permissions for the + User, Group, and Others. You may also set the UID, GID and + Sticky as well as define who owns the file. + + + + + + NOTE + + Changing properties on symlinks is meaningless in the File + Manager. If you need to change the properties on such a file you + need to change them on the actual file, not the link to it. + + + + + Changing Your Preferences in The File Manager + + + + Preferences + + + There are many settings you can configure for the GNOME File Manager. + + + These settings may be accessed from the GMC + Preferences dialog. You may launch this dialog by selecting + the Preferences menu item from the + Edit menu. + + + The GMC Preferences dialog is divided into Five major + sections: File Display, + Confirmation, VFS, + Caching, Desktop, and + Custom View. + + + File Display +
+ File Display Preferences + + File Display Preferences + + + +
+ + + + + + Display + + + The File Display tab allows you to change the way + files are displayed in GMC. + + + + + Show backup files - This will show any backup + file that might be on your system. + + + + + + + Hidden Files + + + + + Show hidden files + + + Show hidden files - This will show all + "dot files" or files that begin with a dot. These files + typically include configuration files and directories. + + + + + Mix files and directories - This option will + display files and directories in the order you sort them instead of + always having directories shown above files. + + + + + Use shell patterns instead of regular + expressions - This option is for advanced users only. If + you are unfamiliar with Regular Expressions you should not use this + option. If you are familiar with how to create regular expressions + you may select this option to use them in your sorts and filters. + + + + + + + + Confirmation +
+ Confirmation Preferences + + Confirmation Preferences + + + +
+ + + + + + Confirmations + + + This tab allows you to change which functions ask for your confirmation + before continuing. + + + + + Confirm when deleting file - This will bring up + a confirmation screen before deleting a file. + + + + + Confirm when overwriting files - This will bring + up a confirmation screen before overwriting a file. + + + + + Confirm when executing files - This will bring + up a confirmation screen before executing a file. + + + + + Show progress while operations are being + performed - This will bring up a progress bar while + certain operations are being performed such as copying, moving, + deleting, etc. + + + + + VFS
VFS Preferences - - VFS Preferences - - - + + VFS Preferences + + +
- - - - - - GNOME File Manager - - - VFS - - - - - Virtual File System - "GNOME File Manager - VFS" - - This tab allows you to configure the options for your Virtual File - System. - - - The Virtual File System allows you to manipulate files that are not - located on your local file system. There are different version of the - VFS including ftpfs and tarfs. The ftpfs allows you to work on FTP - sites while the tarfs gives you access inside .tar files. - - - NOTE - - The .tar file is the standard UNIX archive format - - - - - VFS Timeout - This will determine how long - you will be connected to any VFS without activity. The timeout is - measured in seconds. - - - - - Anonymous FTP password - This allows you to set - a password for logging into anonymous FTP sites. Usually you will - want to make this your email address. - - - - - Always use FTP proxy - If you need to use a - proxy to connect to FTP sites you will want to enable this. - - - - - + + + + + VFS + + + + + Virtual File System + "VFS" + + This tab allows you to configure the options for your Virtual File + System. + + + The Virtual File System allows you to manipulate files that are not + located on your local file system. There are different version of the + VFS including ftpfs and tarfs. The ftpfs allows you to work on FTP + sites while the tarfs gives you access inside .tar files. + + + NOTE + + The .tar file is the standard UNIX archive format + + + + + + VFS Timeout - This will determine how long + you will be connected to any VFS without activity. The timeout is + measured in seconds. + + + + + Anonymous FTP password - This allows you to set + a password for logging into anonymous FTP sites. Usually you will + want to make this your email address. + + + + + Always use FTP proxy - If you need to use a + proxy to connect to FTP sites you will want to enable this. + + + + + Caching @@ -777,7 +737,7 @@ Caching Preferences Caching Preferences - + @@ -843,11 +803,8 @@ - GNOME File Manager - - Desktop - + As you learned before, the GNOME desktop is controlled by the GNOME File Manager. The Desktop Dialog allows you to change the settings of the @@ -857,7 +814,7 @@ The Desktop Dialog The Desktop Dialog - + @@ -896,11 +853,8 @@ - GNOME File Manager - - Custom View - + The Custom View dialog allows you to set the way you would like the Custom View to look in the GNOME File Manager. @@ -909,7 +863,7 @@ The Custom View Dialog The Custom View Dialog - + @@ -941,11 +895,8 @@ - GNOME File Manager + Menus - - menus - In this section each menu item in the GNOME File Manager will be described. @@ -1259,11 +1210,8 @@ - GNOME - - Drag and Drop - + There are many tips and tricks to the Desktop in GNOME. The Drag and Drop functionality extends to many areas of GNOME making it easy to interconnect @@ -1322,13 +1270,6 @@ - Dragging Directories - You can drag a directory out of the GNOME File - Manger and place it on the Panel. This will create a new menu which allows - you easy access to the files in that directory. - - - - You may drag any sub menu from the Main Menu to the panel and a new menu launcher is added to the panel. This allows easier access to that sub-set of menus. @@ -1336,7 +1277,5 @@ - - - - +&INDEX; +
\ No newline at end of file Binary files old/mc-4.5.44/doc-gnome/C/gmc1.gif and new/mc-4.5.45/doc-gnome/C/gmc1.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmc1.png and new/mc-4.5.45/doc-gnome/C/gmc1.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmc_move.gif and new/mc-4.5.45/doc-gnome/C/gmc_move.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmc_move.png and new/mc-4.5.45/doc-gnome/C/gmc_move.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops1.gif and new/mc-4.5.45/doc-gnome/C/gmcprops1.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops1.png and new/mc-4.5.45/doc-gnome/C/gmcprops1.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops2.gif and new/mc-4.5.45/doc-gnome/C/gmcprops2.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops2.png and new/mc-4.5.45/doc-gnome/C/gmcprops2.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops3.gif and new/mc-4.5.45/doc-gnome/C/gmcprops3.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops3.png and new/mc-4.5.45/doc-gnome/C/gmcprops3.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops4.gif and new/mc-4.5.45/doc-gnome/C/gmcprops4.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops4.png and new/mc-4.5.45/doc-gnome/C/gmcprops4.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops5.gif and new/mc-4.5.45/doc-gnome/C/gmcprops5.gif differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops5.png and new/mc-4.5.45/doc-gnome/C/gmcprops5.png differ Binary files old/mc-4.5.44/doc-gnome/C/gmcprops6.png and new/mc-4.5.45/doc-gnome/C/gmcprops6.png differ Binary files old/mc-4.5.44/doc-gnome/C/open_with.gif and new/mc-4.5.45/doc-gnome/C/open_with.gif differ Binary files old/mc-4.5.44/doc-gnome/C/open_with.png and new/mc-4.5.45/doc-gnome/C/open_with.png differ Binary files old/mc-4.5.44/doc-gnome/C/rubberband.gif and new/mc-4.5.45/doc-gnome/C/rubberband.gif differ Binary files old/mc-4.5.44/doc-gnome/C/rubberband.png and new/mc-4.5.45/doc-gnome/C/rubberband.png differ diff -ruN old/mc-4.5.44/edit/edit_key_translator.c new/mc-4.5.45/edit/edit_key_translator.c --- old/mc-4.5.44/edit/edit_key_translator.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/edit/edit_key_translator.c Tue May 9 18:52:03 2000 @@ -51,6 +51,7 @@ KEY_F (6), CK_Move, KEY_F (8), CK_Remove, KEY_F (12), CK_Save_As, KEY_F (2), CK_Save, XCTRL ('n'), CK_New, XCTRL ('l'), CK_Refresh, ESC_CHAR, CK_Exit, KEY_F (10), CK_Exit, + KEY_F (11), /* edit user menu */ CK_User_Menu, KEY_F (19), /*C formatter */ CK_Pipe_Block (0), XCTRL ('p'), /*spell check */ CK_Pipe_Block (1), KEY_F (15), CK_Insert_File, @@ -89,6 +90,7 @@ ALT ('w'), CK_XStore, XCTRL ('l'), CK_Refresh, ESC_CHAR, CK_Exit, KEY_F (10), CK_Exit, + KEY_F (11), /* edit user menu */ CK_User_Menu, KEY_F (19), /*C formatter */ CK_Pipe_Block (0), ALT ('$'), /*spell check */ CK_Pipe_Block (1), KEY_F (15), CK_Insert_File, diff -ruN old/mc-4.5.44/gnome/ChangeLog new/mc-4.5.45/gnome/ChangeLog --- old/mc-4.5.44/gnome/ChangeLog Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/gnome/ChangeLog Tue May 9 18:52:05 2000 @@ -1,3 +1,24 @@ +2000-05-08 Miguel de Icaza + + * gnome-file-property-dialog.c (create_general_properties): Tag + the strftime format for translation to let the localization + efforts to localize the time display. + +2000-05-06 Jacob Berkman + + * gsession.c (session_set_restart): restart with priority 40 so we show + up in the splash screen + +2000-04-23 JP Rosevear + + * gview.c (view): Constify file parameter to match prototype and fix + build problem. + +2000-04-18 Pavel Machek + + * gcmd.c (gnome_open_terminal_with_cmd): Allow translating of + error message. + 2000-04-04 Jacob and Miguee, The Debugging Machines * gdesktop.c (click_proxy_button_press): Federico should make sure diff -ruN old/mc-4.5.44/gnome/application.x-gnumeric.desktop new/mc-4.5.45/gnome/application.x-gnumeric.desktop --- old/mc-4.5.44/gnome/application.x-gnumeric.desktop Tue Apr 4 23:31:59 2000 +++ new/mc-4.5.45/gnome/application.x-gnumeric.desktop Tue May 9 18:52:06 2000 @@ -1,5 +1,6 @@ [Desktop Entry] Name=Spreadsheet +Name[da]=Regneark Name[es]=Hoja de cálculo Name[fi]=Taulukko Name[fr]=Tableur @@ -7,6 +8,7 @@ Name[no]=Regneark Name[pl]=Arkusz kalkulacyjny Comment=Create a new spreadsheet +Comment[da]=Opret et nyt regneark Comment[es]=Crea una nueva hoja de cálculo Comment[fi]=Luo uusi taulukko Comment[fr]=Crée une nouvelle feuille de calcul diff -ruN old/mc-4.5.44/gnome/gcmd.c new/mc-4.5.45/gnome/gcmd.c --- old/mc-4.5.44/gnome/gcmd.c Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/gnome/gcmd.c Tue May 9 18:52:05 2000 @@ -82,7 +82,7 @@ g_free (p); } else - message (1, MSG_ERROR, " Could not start a terminal "); + message (1, MSG_ERROR, _(" Could not start a terminal ")); } void diff -ruN old/mc-4.5.44/gnome/gdesktop.c new/mc-4.5.45/gnome/gdesktop.c --- old/mc-4.5.44/gnome/gdesktop.c Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/gnome/gdesktop.c Tue May 9 18:52:05 2000 @@ -42,6 +42,7 @@ /* Configuration options for the desktop */ + int desktop_use_shaped_icons = TRUE; int desktop_auto_placement = FALSE; int desktop_snap_icons = FALSE; @@ -68,6 +69,8 @@ * array of slots. Each slot is an integer that specifies the number of icons * that belong to that slot. */ +static int layout_spacer_width; +static int layout_spacer_height; static int layout_screen_width; static int layout_screen_height; static int layout_cols; @@ -148,6 +151,22 @@ static GHashTable *icon_hash; +/* Convenience function to figure out the (x, y) position from a slot */ +static void +get_pos_from_slot (int u, int v, int *x, int *y) +{ + int xx, yy; + + xx = (layout_spacer_width / 2) + + (u * (DESKTOP_SNAP_X + layout_spacer_width)); + + yy = (layout_spacer_height / 2) + + (v * (DESKTOP_SNAP_Y + layout_spacer_height)); + + *x = CLAMP (xx, 0, layout_screen_width); + *y = CLAMP (yy, 0, layout_screen_height); + +} /* Convenience function to figure out the slot corresponding to an (x, y) position */ static void @@ -155,8 +174,8 @@ { int uu, vv; - uu = (x + DESKTOP_SNAP_X / 2) / DESKTOP_SNAP_X; - vv = (y + DESKTOP_SNAP_Y / 2) / DESKTOP_SNAP_Y; + uu = x / (DESKTOP_SNAP_X + layout_spacer_width); + vv = y / (DESKTOP_SNAP_Y + layout_spacer_height); *u = CLAMP (uu, 0, layout_cols - 1); *v = CLAMP (vv, 0, layout_rows - 1); @@ -252,6 +271,8 @@ int slot1; int slot; int sx, sy, ex, ey; + int u, v; + int xx, yy; #if 0 get_slot_from_pos (*x, *y, &sx, &sy); @@ -305,9 +326,14 @@ slot = slot2; } #endif + u = slot / layout_rows; + v = slot % layout_rows; + + get_pos_from_slot(u, v, &xx, &yy); + + *x = xx; + *y = yy; - *x = (slot / layout_rows) * DESKTOP_SNAP_X; - *y = (slot % layout_rows) * DESKTOP_SNAP_Y; } /* Snaps the specified position to the icon grid. It looks for the closest free spot on the grid, @@ -321,6 +347,7 @@ int u, v; int val, dist; int dx, dy; + int ux, vy; min = l_slots (0, 0).num_icons; min_x = min_y = 0; @@ -329,21 +356,22 @@ for (u = 0; u < layout_cols; u++) for (v = 0; v < layout_rows; v++) { val = l_slots (u, v).num_icons; - - dx = *x - u * DESKTOP_SNAP_X; - dy = *y - v * DESKTOP_SNAP_Y; + get_pos_from_slot(u, v, &ux, &vy); + dx = *x - ux; + dy = *y - vy; dist = dx * dx + dy * dy; if ((val == min && dist < min_dist) || (val < min)) { min = val; min_dist = dist; - min_x = u; - min_y = v; + min_x = ux; + min_y = vy; } } - *x = min_x * DESKTOP_SNAP_X; - *y = min_y * DESKTOP_SNAP_Y; + *x = min_x; + *y = min_y; + } /* Removes an icon from the slot it is in, if any */ @@ -373,15 +401,16 @@ remove_from_slot (dii); - if (xpos < 0) - xpos = 0; - else if (xpos > layout_screen_width) - xpos = layout_screen_width - DESKTOP_SNAP_X; - - if (ypos < 0) - ypos = 0; - else if (ypos > layout_screen_height) - ypos = layout_screen_height - DESKTOP_SNAP_Y; + if (xpos < (layout_spacer_width / 2)) + xpos = layout_spacer_width / 2; + else if (xpos > layout_screen_width - (DESKTOP_SNAP_X + (layout_spacer_width / 2))) + xpos = layout_screen_width - (DESKTOP_SNAP_X + (layout_spacer_width / 2)); + + if (ypos < (layout_spacer_height / 2)) + ypos = layout_spacer_height / 2; + else if (ypos > layout_screen_height - (DESKTOP_SNAP_Y + (layout_spacer_height / 2))) + ypos = layout_screen_height - (DESKTOP_SNAP_Y + (layout_spacer_height / 2)); + /* Increase the number of icons in the corresponding slot */ @@ -507,6 +536,64 @@ char *caption; } file_and_url_t; +/* get_drop_grid generates a compact organization for icons that are dragged out + * of applications on to the desktop. + */ +GSList * +get_drop_grid (gint xpos, gint ypos, gint need_position_list_length, GSList *grid_list) +{ + gint i = 1; + gint my_bool = 0; + gint j; + gint k; + gint new_xpos; + gint new_ypos; + + /* Determine size of a square grid in which to put the dropped icons */ + while (!my_bool) { + if (need_position_list_length <= i * i) + my_bool = 1; + else + i++; + } + + /* Make sure no icons are off the side of the screen */ + if ((xpos + (i * DESKTOP_SNAP_X) + ((i - 1) * layout_spacer_width) + + (layout_spacer_width / 2)) > layout_screen_width) { + xpos = layout_screen_width - (layout_spacer_width / 2) - + (i * DESKTOP_SNAP_X) - ((i - 1) * layout_spacer_width); + } + if ((ypos + (i * DESKTOP_SNAP_Y) + ((i - 1) * layout_spacer_height) + + (layout_spacer_height / 2)) > layout_screen_height) { + ypos = layout_screen_height - (layout_spacer_height / 2) - + (i * DESKTOP_SNAP_Y) - ((i - 1) * layout_spacer_height); + } + if (xpos < layout_spacer_width / 2) { + xpos = layout_spacer_width / 2; + } + if (ypos < layout_spacer_height / 2) { + ypos = layout_spacer_height / 2; + } + + /* Now write the (x, y) coordinates of the dropped icons */ + for (j = 0; j < i; j++) { + for (k = 0; k < i; k++) { + new_xpos = xpos + k * (DESKTOP_SNAP_X + layout_spacer_width); + new_ypos = ypos + j * (DESKTOP_SNAP_Y + layout_spacer_height); + + if (desktop_snap_icons) { + get_icon_snap_pos (&new_xpos, &new_ypos); + } + + grid_list = g_slist_append (grid_list, (void *) new_xpos); grid_list = g_slist_append (grid_list, (void *) new_ypos); + } + } + + return grid_list; + +} + + /* Reloads the desktop icons efficiently. If there are "new" files for which no * icons have been created, then icons for them will be created started at the * specified position if user_pos is TRUE. If it is FALSE, the icons will be @@ -518,13 +605,16 @@ struct dirent *dirent; DIR *dir; char *full_name; - int have_pos, x, y, size; + /* int have_pos, x, y, size; */ + int x, y, size; DesktopIconInfo *dii; - GSList *need_position_list, *sl; + GSList *need_position_list, *sl, *drop_grid_list, *drop_gl_copy; GList *all_icons, *l; char *desktop_url, *caption; const char *mime; int orig_xpos, orig_ypos; + guint need_position_list_length; + file_and_url_t *fau; dir = mc_opendir (desktop_directory); if (!dir) { @@ -538,9 +628,9 @@ gnome_metadata_lock (); /* Read the directory. For each file for which we do have an existing - * icon, do nothing. Otherwise, if the file has its metadata for icon - * position set, create an icon for it. Otherwise, store it in a list - * of new icons for which positioning is pending. + * icon, do nothing. Otherwise, store it in a list + * of new icons for which positioning is pending. If we have metadata for + * the file but no icon, delete the metadata and treat the file as new. */ need_position_list = NULL; @@ -583,7 +673,6 @@ } full_name = g_concat_dir_and_file (desktop_directory, dirent->d_name); - have_pos = gmeta_get_icon_pos (full_name, &x, &y); if (gnome_metadata_get (full_name, "desktop-url", &size, &desktop_url) != 0) desktop_url = NULL; @@ -591,23 +680,16 @@ caption = NULL; gnome_metadata_get (full_name, "icon-caption", &size, &caption); - if (have_pos) { - dii = desktop_icon_info_new (dirent->d_name, desktop_url, caption, x, y); - gtk_widget_show (dii->dicon); - } else { - file_and_url_t *fau; - - fau = g_new0 (file_and_url_t, 1); - fau->filename = g_strdup (dirent->d_name); + fau = g_new0 (file_and_url_t, 1); + fau->filename = g_strdup (dirent->d_name); - if (desktop_url) - fau->url = g_strdup (desktop_url); + if (desktop_url) + fau->url = g_strdup (desktop_url); - if (caption) - fau->caption = g_strdup (caption); + if (caption) + fau->caption = g_strdup (caption); - need_position_list = g_slist_prepend (need_position_list, fau); - } + need_position_list = g_slist_prepend (need_position_list, fau); g_free (full_name); @@ -643,6 +725,15 @@ need_position_list = g_slist_reverse (need_position_list); + need_position_list_length = g_slist_length (need_position_list); + + /* Get a position list for the dragged icons, to nicely place multiple icon drops */ + if (user_pos && (need_position_list_length != 0)) { + drop_grid_list = NULL; + drop_grid_list = get_drop_grid (xpos, ypos, need_position_list_length, drop_grid_list); + drop_gl_copy = drop_grid_list; + } + orig_xpos = orig_ypos = 0; for (sl = need_position_list; sl; sl = sl->next) { @@ -650,19 +741,16 @@ fau = sl->data; - if (user_pos && sl == need_position_list) { - /* If we are on the first icon, place it "by hand". - * Else, use automatic placement based on the position - * of the first icon of the series. - */ + if (user_pos) { if (desktop_auto_placement) { xpos = ypos = 0; get_icon_auto_pos (&xpos, &ypos); - } else if (desktop_snap_icons) - get_icon_snap_pos (&xpos, &ypos); - - orig_xpos = xpos; - orig_ypos = ypos; + } else { /* Place the icons according to the position list obtained above */ + xpos = (int) drop_gl_copy->data; + drop_gl_copy = drop_gl_copy->next; + ypos = (int) drop_gl_copy->data; + drop_gl_copy = drop_gl_copy->next; + } } else { xpos = orig_xpos; ypos = orig_ypos; @@ -721,7 +809,12 @@ g_free (fau); } + if ((need_position_list_length != 0) && user_pos) { + g_slist_free (drop_grid_list); + } + g_slist_free (need_position_list); + gnome_metadata_unlock (); } @@ -2002,26 +2095,31 @@ drop_desktop_icons (GdkDragContext *context, GtkSelectionData *data, int x, int y) { DesktopIconInfo *source_dii, *dii; - int dx, dy; + int dx, dy, sl_x, sl_y, sl_max_x, sl_max_y, sl_min_x, sl_min_y; int i; GList *l; - GSList *sel_icons, *sl; + GSList *sel_icons, *sl, *sl2, *sl2_p; /* Find the icon that the user is dragging */ source_dii = find_icon_by_drag_context (context); + if (!source_dii) { g_warning ("Eeeeek, could not find the icon that started the drag!"); return; } + x -= dnd_press_x; + y -= dnd_press_y; + /* Compute the distance to move icons */ if (desktop_snap_icons) get_icon_snap_pos (&x, &y); - dx = x - source_dii->x - dnd_press_x; - dy = y - source_dii->y - dnd_press_y; + dx = x - source_dii->x; + dy = y - source_dii->y; + /* Build a list of selected icons */ @@ -2038,12 +2136,66 @@ * icons in the proper place. */ - if (!desktop_auto_placement) + if (!desktop_auto_placement) { + sl2 = NULL; + sl2_p = NULL; + for (sl = sel_icons; sl; sl = sl->next) { + dii = sl->data; + sl2 = g_slist_prepend (sl2, (void *) (dii->x + dx)); + sl2 = g_slist_prepend (sl2, (void *) (dii->y + dy)); + } + + sl_max_x = 0; + sl_max_y = 0; + sl_min_x = INT_MAX; + sl_min_y = INT_MAX; + sl2_p = sl2; + + /* For multiple icon drags, get the min/max x and y coordinates */ + for (sl = sel_icons; sl; sl = sl->next) { + sl_y = (int) sl2_p->data; + sl2_p = sl2_p->next; + sl_x = (int) sl2_p->data; + sl2_p = sl2_p->next; + + if (sl_x > sl_max_x) { + sl_max_x = sl_x; + } + if (sl_x < sl_min_x) { + sl_min_x = sl_x; + } + if (sl_y > sl_max_y) { + sl_max_y = sl_y; + } + if (sl_x < sl_min_y) { + sl_min_y = sl_y; + } + } + + g_slist_free (sl2); + + /* Make sure that no icons are placed off the screen, and keep their relative positions */ + if (sl_max_x > layout_screen_width - (DESKTOP_SNAP_X + layout_spacer_width / 2)) { + dx -= (sl_max_x - (layout_screen_width - + (DESKTOP_SNAP_X + layout_spacer_width / 2))); + } + if (sl_max_y > layout_screen_height - (DESKTOP_SNAP_Y + layout_spacer_height / 2)) { + dy -= (sl_max_y - (layout_screen_height - + (DESKTOP_SNAP_Y + layout_spacer_width / 2))); + } + if (sl_min_x < layout_spacer_width / 2) { + dx += (layout_spacer_width / 2 - sl_min_x); + } + if (sl_min_y < layout_spacer_height / 2) { + dy += (layout_spacer_height / 2 - sl_min_y); + } + + /* Place the icons */ for (sl = sel_icons; sl; sl = sl->next) { dii = sl->data; desktop_icon_info_place (dii, dii->x + dx, dii->y + dy); } - + } /* Clean up */ g_slist_free (sel_icons); @@ -2202,8 +2354,14 @@ { layout_screen_width = gdk_screen_width (); layout_screen_height = gdk_screen_height (); - layout_cols = (layout_screen_width + DESKTOP_SNAP_X - 1) / DESKTOP_SNAP_X; - layout_rows = (layout_screen_height + DESKTOP_SNAP_Y - 1) / DESKTOP_SNAP_Y; + layout_cols = layout_screen_width / DESKTOP_SNAP_X; + layout_rows = layout_screen_height / DESKTOP_SNAP_Y; + + /* Adjust icon size to spread the icons evenly across the screen */ + layout_spacer_width = (layout_screen_width / layout_cols) - DESKTOP_SNAP_X; + layout_spacer_height = (layout_screen_height / layout_rows) - DESKTOP_SNAP_Y; + + layout_slots = g_new0 (struct layout_slot, layout_cols * layout_rows); } @@ -2745,7 +2903,7 @@ static void draw_rubberband (int x, int y) { - int x1, y1, x2, y2; + int x1, y1, x2, y2; if (click_start_x < x) { x1 = click_start_x; diff -ruN old/mc-4.5.44/gnome/gimp.image.desktop new/mc-4.5.45/gnome/gimp.image.desktop --- old/mc-4.5.44/gnome/gimp.image.desktop Tue Apr 4 23:31:59 2000 +++ new/mc-4.5.45/gnome/gimp.image.desktop Tue May 9 18:52:06 2000 @@ -1,6 +1,7 @@ [Desktop Entry] Name=Image Name[ca]=Imatge +Name[da]=Billede Name[de]=Grafik Name[es]=Imagen Name[fi]=Kuva @@ -11,6 +12,7 @@ Name[wa]=Imådje Comment=Create a new Image Comment[ca]=Crear una nova imatge +Comment[da]=Opret et nyt billede Comment[de]=Eine neue Grafik erzeugen Comment[es]=Crear una imagen Comment[fi]=Luo uusi kuva diff -ruN old/mc-4.5.44/gnome/gnome-file-property-dialog.c new/mc-4.5.45/gnome/gnome-file-property-dialog.c --- old/mc-4.5.44/gnome/gnome-file-property-dialog.c Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/gnome/gnome-file-property-dialog.c Tue May 9 18:52:05 2000 @@ -278,7 +278,7 @@ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 0, 1); time = localtime (&(fp_dlg->st.st_ctime)); - strftime (buf, MC_MAXPATHLEN, "%a, %b %d %Y, %I:%M:%S %p", time); + strftime (buf, MC_MAXPATHLEN, _("%a, %b %d %Y, %I:%M:%S %p"), time); label = gtk_label_new (buf); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); @@ -287,7 +287,7 @@ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 1, 2); time = localtime (&(fp_dlg->st.st_mtime)); - strftime (buf, MC_MAXPATHLEN, "%a, %b %d %Y, %I:%M:%S %p", time); + strftime (buf, MC_MAXPATHLEN, _("%a, %b %d %Y, %I:%M:%S %p"), time); label = gtk_label_new (buf); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2); @@ -296,7 +296,7 @@ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 0, 1, 2, 3); time = localtime (&(fp_dlg->st.st_atime)); - strftime (buf, MC_MAXPATHLEN, "%a, %b %d %Y, %I:%M:%S %p", time); + strftime (buf, MC_MAXPATHLEN, _("%a, %b %d %Y, %I:%M:%S %p"), time); label = gtk_label_new (buf); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3); diff -ruN old/mc-4.5.44/gnome/gsession.c new/mc-4.5.45/gnome/gsession.c --- old/mc-4.5.44/gnome/gsession.c Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/gnome/gsession.c Tue May 9 18:52:05 2000 @@ -255,6 +255,7 @@ void session_set_restart (int restart) { + gnome_client_set_priority (master_client, 40); gnome_client_set_restart_style (master_client, (restart ? GNOME_RESTART_IMMEDIATELY diff -ruN old/mc-4.5.44/gnome/gview.c new/mc-4.5.45/gnome/gview.c --- old/mc-4.5.44/gnome/gview.c Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/gnome/gview.c Tue May 9 18:52:05 2000 @@ -351,7 +351,7 @@ } int -view (char *_command, char *_file, int *move_dir_p, int start_line) +view (char *_command, const char *_file, int *move_dir_p, int start_line) { Dlg_head *our_dlg; GtkWidget *toplevel, *status, *scrollbar, *hbox; diff -ruN old/mc-4.5.44/gtkedit/edit.c new/mc-4.5.45/gtkedit/edit.c --- old/mc-4.5.44/gtkedit/edit.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/edit.c Tue May 9 18:52:03 2000 @@ -38,6 +38,10 @@ #include "mad.h" #endif +#include <../src/dialog.h> /* MSG_ERROR */ + +extern char *edit_one_file; + /* * * here's a quick sketch of the layout: (don't run this through indent.) @@ -2562,6 +2566,14 @@ case CK_Match_Bracket: edit_goto_matching_bracket (edit); break; + case CK_User_Menu: + if (edit_one_file) { + message (1, MSG_ERROR, _("User menu avalaible only in mcedit invoked from mc")); + break; + } + else + user_menu (edit); + break; #ifdef MIDNIGHT case CK_Sort: edit_sort_cmd (edit); @@ -2714,3 +2726,61 @@ edit_update_screen (edit); } +/* User edit menu, like user menu (F2) but only in editor. */ +void user_menu (WEdit *edit) +{ + FILE *fd; + int nomark; + struct stat status; + long start_mark, end_mark; + char *block_file = catstrs (home_dir, BLOCK_FILE, 0); + char *error_file = catstrs (home_dir, ERROR_FILE, 0); + int rc = 0; + + nomark = eval_marks (edit, &start_mark, &end_mark); + if (! nomark) /* remember marked or not */ + edit_save_block (edit, block_file = catstrs (home_dir, BLOCK_FILE, 0), + start_mark, end_mark); + + /* run shell scripts from menu */ + user_menu_cmd (edit); + + if (stat (error_file, &status) == 0) { + if (!status.st_size) { /* no error messages */ + if (stat (block_file, &status) == 0) + if (!status.st_size) + return; /* no block messages */ + if (! nomark) /* i.e. we have marked block */ + rc = edit_block_delete_cmd(edit); + if (!rc) { + edit_cursor_to_bol (edit); + edit_insert_file (edit, block_file); + edit_cursor_to_eol (edit); + if (fd = fopen (block_file, "w")) fclose(fd); + } + } else { /* it is error */ + edit_cursor_to_bol (edit); + edit_insert_file (edit, error_file); + if (fd = fopen (error_file, "w")) fclose(fd); + if (fd = fopen (block_file, "w")) fclose(fd); + } + } else { + edit_error_dialog (_(""), + get_sys_error (catstrs (_ ("Error trying to stat file:"), + error_file, 0))); + return; + } + edit_refresh_cmd (edit); + edit->force |= REDRAW_COMPLETELY; + return; +} + +void edit_init_file() +{ + FILE *f; + + if (f = fopen (catstrs (home_dir, ERROR_FILE, 0), "w")) fclose(f); + if (f = fopen (catstrs (home_dir, BLOCK_FILE, 0), "w")) fclose(f); + if (f = fopen (catstrs (home_dir, TEMP_FILE, 0) , "w")) fclose(f); + return; +} diff -ruN old/mc-4.5.44/gtkedit/edit.h new/mc-4.5.45/gtkedit/edit.h --- old/mc-4.5.44/gtkedit/edit.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/edit.h Tue May 9 18:52:03 2000 @@ -174,15 +174,6 @@ #define SEARCH_DIALOG_OPTION_BACKWARDS 8 #define SEARCH_DIALOG_OPTION_BOOKMARK 16 -#define SYNTAX_FILE "/.cedit/Syntax" -#define CLIP_FILE "/.cedit/cooledit.clip" -#define MACRO_FILE "/.cedit/cooledit.macros" -#define BLOCK_FILE "/.cedit/cooledit.block" -#define ERROR_FILE "/.cedit/cooledit.error" -#define TEMP_FILE "/.cedit/cooledit.temp" -#define SCRIPT_FILE "/.cedit/cooledit.script" -#define EDIT_DIR "/.cedit" - #define EDIT_KEY_EMULATION_NORMAL 0 #define EDIT_KEY_EMULATION_EMACS 1 @@ -225,10 +216,7 @@ #define EDIT_TOP_EXTREME option_edit_top_extreme #define EDIT_BOTTOM_EXTREME option_edit_bottom_extreme -#define MAX_MACRO_LENGTH 1024 - /*there are a maximum of ... */ -#define MAXBUFF 1024 /*... edit buffers, each of which is ... */ #define EDIT_BUF_SIZE 0x10000 /* ...bytes in size. */ @@ -265,26 +253,11 @@ #define TAB_SIZE option_tab_spacing #define HALF_TAB_SIZE ((int) option_tab_spacing / 2) -struct macro { - short command; - short ch; -}; - struct selection { unsigned char * text; int len; }; -struct syntax_rule { - unsigned short keyword; - unsigned char end; - unsigned char context; - unsigned char _context; -#define RULE_ON_LEFT_BORDER 1 -#define RULE_ON_RIGHT_BORDER 2 - unsigned char border; -}; - #define MAX_WORDS_PER_CONTEXT 1024 #define MAX_CONTEXTS 128 @@ -318,118 +291,7 @@ struct key_word **keyword; }; -struct _syntax_marker { - long offset; - struct syntax_rule rule; - struct _syntax_marker *next; -}; - -struct _book_mark { - int line; /* line number */ -// #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; -}; - -struct editor_widget { -#ifdef MIDNIGHT - Widget widget; -#elif defined(GTK) - GtkEdit *widget; -#else - struct cool_widget *widget; -#endif -#define from_here num_widget_lines - int num_widget_lines; - int num_widget_columns; - -#ifdef MIDNIGHT - int have_frame; -#else - int stopped; -#endif - - char *filename; /* Name of the file */ - char *dir; /* current directory */ - -/* dynamic buffers and cursor position for editor: */ - long curs1; /*position of the cursor from the beginning of the file. */ - long curs2; /*position from the end of the file */ - unsigned char *buffers1[MAXBUFF + 1]; /*all data up to curs1 */ - unsigned char *buffers2[MAXBUFF + 1]; /*all data from end of file down to curs2 */ - -/* search variables */ - long search_start; /* First character to start searching from */ - int found_len; /* Length of found string or 0 if none was found */ - long found_start; /* the found word from a search - start position */ - -/* display information */ - long last_byte; /* Last byte of file */ - long start_display; /* First char displayed */ - long start_col; /* First displayed column, negative */ - long max_column; /* The maximum cursor position ever reached used to calc hori scroll bar */ - long curs_row; /*row position of cursor on the screen */ - long curs_col; /*column position on screen */ - int force; /* how much of the screen do we redraw? */ - 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 - or saved */ -#endif - unsigned char highlight; - long prev_col; /*recent column position of the cursor - used when moving - up or down past lines that are shorter than the current line */ - long curs_line; /*line number of the cursor. */ - long start_line; /*line nummber of the top of the page */ - -/* file info */ - long total_lines; /*total lines in the file */ - long mark1; /*position of highlight start */ - long mark2; /*position of highlight end */ - int column1; /*position of column highlight start */ - int column2; /*position of column highlight end */ - long bracket; /*position of a matching bracket */ - -/* cache speedup for line lookups */ -#define N_LINE_CACHES 32 - int caches_valid; - int line_numbers[N_LINE_CACHES]; - long line_offsets[N_LINE_CACHES]; - - struct _book_mark *book_mark; - -/* undo stack and pointers */ - unsigned long stack_pointer; - long *undo_stack; - unsigned long stack_size; - unsigned long stack_size_mask; - unsigned long stack_bottom; - struct stat stat; - -/* syntax higlighting */ - struct _syntax_marker *syntax_marker; - struct context_rule **rules; - long last_get_rule; - struct syntax_rule rule; - char *syntax_type; /* description of syntax highlighting type being used */ - int explicit_syntax; /* have we forced the syntax hi. type in spite of the filename? */ - - int to_here; /* dummy marker */ - - -/* macro stuff */ - int macro_i; /* -1 if not recording index to macro[] otherwise */ - struct macro macro[MAX_MACRO_LENGTH]; -}; - -typedef struct editor_widget WEdit; +#include "edit-widget.h" #ifndef MIDNIGHT @@ -589,6 +451,8 @@ void book_mark_flush (WEdit * edit, int c); void book_mark_inc (WEdit * edit, int line); void book_mark_dec (WEdit * edit, int line); + +void user_menu (WEdit *edit); #ifdef MIDNIGHT diff -ruN old/mc-4.5.44/gtkedit/editcmd.c new/mc-4.5.45/gtkedit/editcmd.c --- old/mc-4.5.44/gtkedit/editcmd.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/editcmd.c Tue May 9 18:52:03 2000 @@ -1122,6 +1122,7 @@ } } +/* if success return 0 */ int edit_block_delete (WEdit * edit) { long count; @@ -2864,47 +2865,90 @@ { long start_mark, end_mark; struct stat s; - char *f = NULL, *b = NULL; - - if (block) { + char buf[BUFSIZ]; + FILE *script_home = NULL; + FILE *script_src = NULL; + FILE *block_file = NULL; + + char *o = catstrs (mc_home, shell_cmd, 0); /* original source script */ + char *h = catstrs (home_dir, EDIT_DIR, shell_cmd, 0); /* home script */ + char *b = catstrs (home_dir, BLOCK_FILE, 0); /* block file */ + char *e = catstrs (home_dir, ERROR_FILE, 0); /* error file */ + + if (! (script_home = fopen (h, "r"))) { + if (! (script_home = fopen (h, "w"))) { + edit_error_dialog (_(""), + get_sys_error (catstrs (_ ("Error create script:"), h, 0))); + return; + } else { + if (! (script_src = fopen (o, "r"))) { + fclose (script_home); unlink (h); + edit_error_dialog (_(""), + get_sys_error (catstrs (_ ("Error read script:"), o, 0))); + return; + } else { + while (fgets(buf, sizeof(buf), script_src)) + fprintf(script_home, "%s",buf); + if (fclose(script_home)) { + edit_error_dialog (_(""), + get_sys_error (catstrs (_ ("Error close script:"), h, 0))); + return; + } else { + chmod (h, 0700); + edit_error_dialog (_(""), + get_sys_error (catstrs (_ ("Script created:"), h, 0))); + } + } + } + } + if (block) { /* for marked block run indent formatter */ if (eval_marks (edit, &start_mark, &end_mark)) { - edit_error_dialog (_(" Process block "), + edit_error_dialog (_("Process block"), /* Not essential to translate */ _(" You must first highlight a block of text. ")); return; } - edit_save_block (edit, b = catstrs (home_dir, BLOCK_FILE, 0), start_mark, end_mark); - my_system (0, shell, catstrs (home_dir, shell_cmd, 0)); - edit_refresh_cmd (edit); - } else { - my_system (0, shell, shell_cmd); - edit_refresh_cmd (edit); + edit_save_block (edit, b, start_mark, end_mark); + + /* run your script */ + my_system (EXECUTE_AS_SHELL, shell, + catstrs (home_dir, EDIT_DIR, shell_cmd, " ", + edit->filename, " ", home_dir, BLOCK_FILE, " ", + home_dir, ERROR_FILE, 0)); + + edit_refresh_cmd (edit); + + } else { /* for missing marked block run ... */ + my_system (0, shell, catstrs (EDIT_DIR, shell_cmd)); + edit_refresh_cmd (edit); } - edit->force |= REDRAW_COMPLETELY; - - f = catstrs (home_dir, ERROR_FILE, 0); - + + /* insert result block */ if (block) { - if (stat (f, &s) == 0) { + if (stat (e, &s) == 0) { if (!s.st_size) { /* no error messages */ if (edit_block_delete_cmd (edit)) return; edit_insert_file (edit, b); + if (block_file = fopen (b, "w")) fclose(block_file); return; } else { - edit_insert_file (edit, f); + edit_insert_file (edit, e); + if (block_file = fopen (b, "w")) fclose(block_file); return; } } else { /* Not essential to translate */ - edit_error_dialog (_(" Process block "), + edit_error_dialog (_(""), /* Not essential to translate */ - get_sys_error (_(" Error trying to stat file "))); + get_sys_error (catstrs (_ ("Error trying to stat file:"), e, 0))); edit->force |= REDRAW_COMPLETELY; + if (block_file = fopen (b, "w")) fclose(block_file); return; } } + return; } #endif diff -ruN old/mc-4.5.44/gtkedit/editcmddef.h new/mc-4.5.45/gtkedit/editcmddef.h --- old/mc-4.5.44/gtkedit/editcmddef.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/editcmddef.h Tue May 9 18:52:03 2000 @@ -92,6 +92,7 @@ #define CK_Terminal 422 #define CK_Terminal_App 423 +#define CK_User_Menu 425 /* application control */ #define CK_Save_Desktop 451 #define CK_New_Window 452 diff -ruN old/mc-4.5.44/gtkedit/editdraw.c new/mc-4.5.45/gtkedit/editdraw.c --- old/mc-4.5.44/gtkedit/editdraw.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/editdraw.c Tue May 9 18:52:03 2000 @@ -42,14 +42,25 @@ #endif char t[160]; /* 160 just to be sure */ /* The field lengths just prevents the status line from shortening to much */ - sprintf (t, "[%c%c%c%c] %2ld:%3ld+%2ld=%3ld/%3ld - *%-4ld/%4ldb=%3d", - edit->mark1 != edit->mark2 ? ( column_highlighting ? 'C' : 'B') : '-', - edit->modified ? 'M' : '-', edit->macro_i < 0 ? '-' : 'R', - edit->overwrite == 0 ? '-' : 'O', - edit->curs_col / font_width, edit->start_line + 1, edit->curs_row, - edit->curs_line + 1, edit->total_lines + 1, edit->curs1, - edit->last_byte, edit->curs1 < edit->last_byte - ? edit_get_byte (edit, edit->curs1) : -1); +sprintf (t,"[%c%c%c%c] %2ld L:[%3ld+%2ld %3ld/%3ld] *(%-4ld/%4ldb)= %c %d %xH", + edit->mark1 != edit->mark2 ? ( column_highlighting ? 'C' : 'B') : '-', + edit->modified ? 'M' : '-', + edit->macro_i < 0 ? '-' : 'R', + edit->overwrite == 0 ? '-' : 'O', + edit->curs_col / font_width, + + edit->start_line + 1, + edit->curs_row, + edit->curs_line + 1, + edit->total_lines + 1, + + edit->curs1, + edit->last_byte, + + edit->curs1 < edit->last_byte ? edit_get_byte (edit, edit->curs1) : '?', + edit->curs1 < edit->last_byte ? edit_get_byte (edit, edit->curs1) : -1, + edit->curs1 < edit->last_byte ? edit_get_byte (edit, edit->curs1) : -1 + ); #ifdef MIDNIGHT sprintf (s, "%.*s", w + 1, t); i = strlen (s); diff -ruN old/mc-4.5.44/gtkedit/editmenu.c new/mc-4.5.45/gtkedit/editmenu.c --- old/mc-4.5.44/gtkedit/editmenu.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/editmenu.c Tue May 9 18:52:03 2000 @@ -22,6 +22,7 @@ #include #include "edit.h" +#include "../src/user.h" #include "editcmddef.h" @@ -118,6 +119,9 @@ void menu_format_paragraph (void) { menu_cmd (CK_Paragraph_Format); } void edit_options_dialog (void); void menu_options (void) { edit_options_dialog (); } +void menu_user_menu_cmd (void) { menu_key (KEY_F (11)); } + +void edit_user_menu_cmd (void) { menu_edit_cmd (1); } static menu_entry FileMenu[] = { @@ -130,6 +134,9 @@ {' ', N_("&Insert file... F15"), 'I', menu_insert_file_cmd}, {' ', N_("copy to &File... C-f"), 'F', menu_cut_cmd}, {' ', "", ' ', 0}, + {' ', N_("&User menu... F11"), 'U', menu_user_menu_cmd}, +/* {' ', N_("Menu edi&Tor edit "), 'T', edit_user_menu_cmd}, */ + {' ', "", ' ', 0}, {' ', N_("a&Bout... "), 'B', edit_about_cmd}, {' ', "", ' ', 0}, {' ', N_("&Quit F10"), 'Q', menu_quit_cmd} @@ -146,6 +153,9 @@ {' ', N_("&Insert file... F15"), 'I', menu_insert_file_cmd}, {' ', N_("copy to &File... "), 'F', menu_cut_cmd}, {' ', "", ' ', 0}, + {' ', N_("&User menu... F11"), 'U', menu_user_menu_cmd}, +/* {' ', N_("Menu edi&Tor edit "), 'T', edit_user_menu_cmd}, */ + {' ', "", ' ', 0}, {' ', N_("a&Bout... "), 'B', edit_about_cmd}, {' ', "", ' ', 0}, {' ', N_("&Quit F10"), 'Q', menu_quit_cmd} @@ -218,7 +228,7 @@ {' ', N_("format p&Aragraph M-p"), 'A', menu_format_paragraph}, {' ', N_("'ispell' s&Pell check C-p"), 'P', menu_ispell_cmd}, {' ', N_("sor&T... M-t"), 'T', menu_sort_cmd}, - {' ', N_("'indent' &C Formatter F19"), 'C', menu_c_form_cmd}, + {' ', N_("E&xternal Formatter F19"), 'C', menu_c_form_cmd}, {' ', N_("&Mail... "), 'M', menu_mail_cmd} }; @@ -241,7 +251,7 @@ {' ', N_("format p&Aragraph M-p"), 'a', menu_format_paragraph}, {' ', N_("'ispell' s&Pell check M-$"), 'P', menu_ispell_cmd}, {' ', N_("sor&T... M-t"), 'T', menu_sort_cmd}, - {' ', N_("'indent' &C Formatter F19"), 'C', menu_c_form_cmd} + {' ', N_("E&xternal Formatter F19"), 'C', menu_c_form_cmd} }; extern void menu_save_mode_cmd (void); diff -ruN old/mc-4.5.44/gtkedit/syntax.c new/mc-4.5.45/gtkedit/syntax.c --- old/mc-4.5.44/gtkedit/syntax.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/gtkedit/syntax.c Tue May 9 18:52:03 2000 @@ -374,9 +374,12 @@ *fg = k->fg; } +extern int use_colors; + void edit_get_syntax_color (WEdit * edit, long byte_index, int *fg, int *bg) { - if (edit->rules && byte_index < edit->last_byte && option_syntax_highlighting) { + if (edit->rules && byte_index < edit->last_byte && + option_syntax_highlighting && use_colors) { translate_rule_to_color (edit, edit_get_rule (edit, byte_index), fg, bg); } else { #ifdef MIDNIGHT @@ -1501,11 +1504,6 @@ edit_free_syntax_rules (edit); -#ifdef MIDNIGHT - if (!SLtt_Use_Ansi_Colors || !use_colors) - return; -#endif - if (edit) { if (!edit->filename) return; @@ -1546,6 +1544,11 @@ void edit_get_syntax_color (WEdit * edit, long byte_index, int *fg, int *bg) { *fg = NORMAL_COLOR; +} + +int edit_check_spelling (WEdit * edit) +{ + return 0; } #endif /* !defined(MIDNIGHT) || defined(HAVE_SYNTAXH) */ diff -ruN old/mc-4.5.44/intl/ChangeLog new/mc-4.5.45/intl/ChangeLog --- old/mc-4.5.44/intl/ChangeLog Mon Mar 29 14:34:01 1999 +++ new/mc-4.5.45/intl/ChangeLog Thu Apr 6 03:03:02 2000 @@ -1,7 +1,66 @@ -Sun Mar 28 16:32:00 1999 ape@spacetec.no (Asbjorn Pettersen) +1998-04-29 Ulrich Drepper - * loadmsgcat.c: include before - OS/2 version fails if not. + * intl/localealias.c (read_alias_file): Use unsigned char for + local variables. Remove unused variable tp. + * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * + for type of codeset. For loosing Solaris systems. + * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. + * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable + len if not needed. + Patches by Jim Meyering. + +1998-04-28 Ulrich Drepper + + * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if + mmap is not supported. + + * hash-string.h: Don't include . + +1998-04-27 Ulrich Drepper + + * textdomain.c: Use strdup is available. + + * localealias.c: Define HAVE_MEMPCPY so that we can use this + function. Define and use semapahores to protect modfication of + global objects when compiling for glibc. Add code to allow + freeing alias table. + + * l10nflist.c: Don't assume stpcpy not being a macro. + + * gettextP.h: Define internal_function macri if not already done. + Use glibc byte-swap macros instead of defining SWAP when compiled + for glibc. + (struct loaded_domain): Add elements to allow unloading. + + * Makefile.in (distclean): Don't remove libintl.h here. + + * bindtextdomain.c: Carry over changes from glibc. Use strdup if + available. + + * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal + functions. Add memory freeing code for glibc. + + * dgettext.c: Update copyright. + + * explodename.c: Include stdlib.h and string.h only if they exist. + Use strings.h eventually. + + * finddomain.c: Mark internal functions. Use strdup if available. + Add memory freeing code for glibc. + +1997-10-10 20:00 Ulrich Drepper + + * libgettext.h: Fix dummy textdomain and bindtextdomain macros. + They should return reasonable values. + Reported by Tom Tromey . + +1997-09-16 03:33 Ulrich Drepper + + * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. + * intlh.inst.in: Likewise. + Reported by Jean-Marc Lasgouttes . + + * libintl.glibc: Update from current glibc version. 1997-09-06 02:10 Ulrich Drepper diff -ruN old/mc-4.5.44/intl/bindtextdom.c new/mc-4.5.45/intl/bindtextdom.c --- old/mc-4.5.44/intl/bindtextdom.c Fri Feb 5 13:50:16 1999 +++ new/mc-4.5.45/intl/bindtextdom.c Thu Apr 6 03:03:02 2000 @@ -1,5 +1,5 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -61,7 +61,9 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define BINDTEXTDOMAIN __bindtextdomain -# define strdup(str) __strdup (str) +# ifndef strdup +# define strdup(str) __strdup (str) +# endif #else # define BINDTEXTDOMAIN bindtextdomain__ #endif @@ -133,7 +135,9 @@ else { /* We have to create a new binding. */ +#if !defined _LIBC && !defined HAVE_STRDUP size_t len; +#endif struct binding *new_binding = (struct binding *) malloc (sizeof (*new_binding)); diff -ruN old/mc-4.5.44/intl/dcgettext.c new/mc-4.5.45/intl/dcgettext.c --- old/mc-4.5.44/intl/dcgettext.c Fri Feb 5 13:50:18 1999 +++ new/mc-4.5.45/intl/dcgettext.c Thu Apr 6 03:03:02 2000 @@ -1,5 +1,5 @@ -/* Implementation of the dcgettext(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Implementation of the dcgettext(3) function. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -91,7 +91,9 @@ because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ # define getcwd __getcwd -# define stpcpy __stpcpy +# ifndef stpcpy +# define stpcpy __stpcpy +# endif #else # if !defined HAVE_GETCWD char *getwd (); @@ -162,10 +164,11 @@ /* Prototypes for local functions. */ static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, - const char *msgid)); -static const char *category_to_name PARAMS ((int category)); + const char *msgid)) internal_function; +static const char *category_to_name PARAMS ((int category)) internal_function; static const char *guess_category_value PARAMS ((int category, - const char *categoryname)); + const char *categoryname)) + internal_function; /* For those loosing systems which don't have `alloca' we have to add @@ -388,6 +391,7 @@ static char * +internal_function find_msg (domain_file, msgid) struct loaded_l10nfile *domain_file; const char *msgid; @@ -476,6 +480,7 @@ /* Return string representation of locale CATEGORY. */ static const char * +internal_function category_to_name (category) int category; { @@ -535,6 +540,7 @@ /* Guess value of current locale from value of the environment variables. */ static const char * +internal_function guess_category_value (category, categoryname) int category; const char *categoryname; @@ -590,4 +596,29 @@ /* Do nothing. */ ; return dest - 1; } +#endif + + +#ifdef _LIBC +/* If we want to free all resources we have to do some work at + program's end. */ +static void __attribute__ ((unused)) +free_mem (void) +{ + struct binding *runp; + + for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) + { + free (runp->domainname); + if (runp->dirname != _nl_default_dirname) + /* Yes, this is a pointer comparison. */ + free (runp->dirname); + } + + if (_nl_current_default_domain != _nl_default_default_domain) + /* Yes, again a pointer comparison. */ + free ((char *) _nl_current_default_domain); +} + +text_set_element (__libc_subfreeres, free_mem); #endif diff -ruN old/mc-4.5.44/intl/dgettext.c new/mc-4.5.45/intl/dgettext.c --- old/mc-4.5.44/intl/dgettext.c Fri Feb 5 13:50:19 1999 +++ new/mc-4.5.45/intl/dgettext.c Thu Apr 6 03:03:02 2000 @@ -1,19 +1,19 @@ -/* dgettext.c -- implementation of the dgettext(3) function - Copyright (C) 1995 Software Foundation, Inc. +/* Implementation of the dgettext(3) function + Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H # include diff -ruN old/mc-4.5.44/intl/explodename.c new/mc-4.5.45/intl/explodename.c --- old/mc-4.5.44/intl/explodename.c Fri Feb 5 13:50:20 1999 +++ new/mc-4.5.45/intl/explodename.c Thu Apr 6 03:03:02 2000 @@ -1,4 +1,4 @@ -/* Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -19,8 +19,15 @@ # include #endif -#include -#include +#if defined STDC_HEADERS || defined _LIBC +# include +#endif + +#if defined HAVE_STRING_H || defined _LIBC +# include +#else +# include +#endif #include #include "loadinfo.h" diff -ruN old/mc-4.5.44/intl/finddomain.c new/mc-4.5.45/intl/finddomain.c --- old/mc-4.5.44/intl/finddomain.c Fri Feb 5 13:50:21 1999 +++ new/mc-4.5.45/intl/finddomain.c Thu Apr 6 03:03:02 2000 @@ -1,5 +1,5 @@ /* Handle list of needed message catalogs - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -70,6 +70,7 @@ the DOMAINNAME and CATEGORY parameters with respect to the currently established bindings. */ struct loaded_l10nfile * +internal_function _nl_find_domain (dirname, locale, domainname) const char *dirname; char *locale; @@ -95,9 +96,9 @@ language[_territory][+audience][+special][,[sponsor][_revision]] - Beside the first all of them are allowed to be missing. If the - full specified locale is not found, the less specific one are - looked for. The various part will be stripped of according to + Beside the first part all of them are allowed to be missing. If + the full specified locale is not found, the less specific one are + looked for. The various parts will be stripped off according to the following order: (1) revision (2) sponsor @@ -142,12 +143,18 @@ alias_value = _nl_expand_alias (locale); if (alias_value != NULL) { +#if defined _LIBC || defined HAVE_STRDUP + locale = strdup (alias_value); + if (locale == NULL) + return NULL; +#else size_t len = strlen (alias_value) + 1; locale = (char *) malloc (len); if (locale == NULL) return NULL; memcpy (locale, alias_value, len); +#endif } /* Now we determine the single parts of the locale name. First @@ -187,3 +194,23 @@ return retval; } + + +#ifdef _LIBC +static void __attribute__ ((unused)) +free_mem (void) +{ + struct loaded_l10nfile *runp = _nl_loaded_domains; + + while (runp != NULL) + { + struct loaded_l10nfile *here = runp; + if (runp->data != NULL) + _nl_unload_domain ((struct loaded_domain *) runp->data); + runp = runp->next; + free (here); + } +} + +text_set_element (__libc_subfreeres, free_mem); +#endif diff -ruN old/mc-4.5.44/intl/gettext.c new/mc-4.5.45/intl/gettext.c --- old/mc-4.5.44/intl/gettext.c Fri Feb 5 13:50:22 1999 +++ new/mc-4.5.45/intl/gettext.c Thu Apr 6 03:03:02 2000 @@ -1,4 +1,4 @@ -/* Implementation of gettext(3) function +/* Implementation of gettext(3) function. Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff -ruN old/mc-4.5.44/intl/gettext.h new/mc-4.5.45/intl/gettext.h --- old/mc-4.5.44/intl/gettext.h Fri Feb 5 13:50:23 1999 +++ new/mc-4.5.45/intl/gettext.h Thu Apr 6 03:03:02 2000 @@ -1,4 +1,4 @@ -/* Internal header for GNU gettext internationalization functions +/* Internal header for GNU gettext internationalization functions. Copyright (C) 1995, 1997 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify diff -ruN old/mc-4.5.44/intl/gettextP.h new/mc-4.5.45/intl/gettextP.h --- old/mc-4.5.44/intl/gettextP.h Fri Feb 5 13:50:24 1999 +++ new/mc-4.5.45/intl/gettextP.h Thu Apr 6 03:03:02 2000 @@ -1,5 +1,6 @@ /* Header describing internals of gettext library - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,11 +31,19 @@ # endif #endif +#ifndef internal_function +# define internal_function +#endif + #ifndef W # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif +#ifdef _LIBC +# include +# define SWAP(i) bswap_32 (i) +#else static nls_uint32 SWAP PARAMS ((nls_uint32 i)); static inline nls_uint32 @@ -43,11 +52,14 @@ { return (i << 24) | ((i & 0xff00) << 8) | ((i >> 8) & 0xff00) | (i >> 24); } +#endif struct loaded_domain { const char *data; + int use_mmap; + size_t mmap_size; int must_swap; nls_uint32 nstrings; struct string_desc *orig_tab; @@ -65,8 +77,12 @@ struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, char *__locale, - const char *__domainname)); -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)); + const char *__domainname)) + internal_function; +void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) + internal_function; +void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) + internal_function; /* @@ begin of epilog @@ */ diff -ruN old/mc-4.5.44/intl/hash-string.h new/mc-4.5.45/intl/hash-string.h --- old/mc-4.5.44/intl/hash-string.h Fri Feb 5 13:50:26 1999 +++ new/mc-4.5.45/intl/hash-string.h Thu Apr 6 03:03:02 2000 @@ -16,10 +16,6 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_VALUES_H -# include -#endif - /* @@ end of prolog @@ */ #ifndef PARAMS diff -ruN old/mc-4.5.44/intl/l10nflist.c new/mc-4.5.45/intl/l10nflist.c --- old/mc-4.5.44/intl/l10nflist.c Fri Feb 5 13:50:29 1999 +++ new/mc-4.5.45/intl/l10nflist.c Thu Apr 6 03:03:05 2000 @@ -1,6 +1,6 @@ /* Handle list of needed message catalogs Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. - Written by Ulrich Drepper , 1995. + Contributed by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -65,7 +65,9 @@ /* Rename the non ANSI C functions. This is required by the standard because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ -# define stpcpy(dest, src) __stpcpy(dest, src) +# ifndef stpcpy +# define stpcpy(dest, src) __stpcpy(dest, src) +# endif #else # ifndef HAVE_STPCPY static char *stpcpy PARAMS ((char *dest, const char *src)); @@ -350,7 +352,7 @@ names. */ const char * _nl_normalize_codeset (codeset, name_len) - const char *codeset; + const unsigned char *codeset; size_t name_len; { int len = 0; diff -ruN old/mc-4.5.44/intl/libgettext.h new/mc-4.5.45/intl/libgettext.h --- old/mc-4.5.44/intl/libgettext.h Fri Feb 5 13:50:30 1999 +++ new/mc-4.5.45/intl/libgettext.h Thu Apr 6 03:03:05 2000 @@ -1,5 +1,5 @@ /* Message catalogs for internationalization. - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,8 +20,8 @@ include protection above. But the systems header might perhaps also define _LIBINTL_H and therefore we have to protect the definition here. */ -#if !defined (_LIBINTL_H) || !defined (_LIBGETTEXT_H) -#if !defined (_LIBINTL_H) +#if !defined _LIBINTL_H || !defined _LIBGETTEXT_H +#ifndef _LIBINTL_H # define _LIBINTL_H 1 #endif #define _LIBGETTEXT_H 1 @@ -44,7 +44,7 @@ /* @@ end of prolog @@ */ #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __cplusplus # define PARAMS(args) args # else # define PARAMS(args) () @@ -122,9 +122,6 @@ const char *__dirname)); #if ENABLE_NLS -#ifdef VFS_STANDALONE -#error This can never work -#endif /* Solaris 2.3 has the gettext function but dcgettext is missing. So we omit this optimization for Solaris 2.3. BTW, Solaris 2.4 @@ -171,8 +168,8 @@ # define gettext(Msgid) (Msgid) # define dgettext(Domainname, Msgid) (Msgid) # define dcgettext(Domainname, Msgid, Category) (Msgid) -# define textdomain(Domainname) while (0) /* nothing */ -# define bindtextdomain(Domainname, Dirname) while (0) /* nothing */ +# define textdomain(Domainname) ((char *) Domainname) +# define bindtextdomain(Domainname, Dirname) ((char *) Dirname) #endif diff -ruN old/mc-4.5.44/intl/loadinfo.h new/mc-4.5.45/intl/loadinfo.h --- old/mc-4.5.44/intl/loadinfo.h Fri Feb 5 13:50:33 1999 +++ new/mc-4.5.45/intl/loadinfo.h Thu Apr 6 03:03:05 2000 @@ -1,3 +1,21 @@ +/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + #ifndef PARAMS # if __STDC__ # define PARAMS(args) args @@ -32,7 +50,7 @@ }; -extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, +extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, size_t name_len)); extern struct loaded_l10nfile * diff -ruN old/mc-4.5.44/intl/loadmsgcat.c new/mc-4.5.45/intl/loadmsgcat.c --- old/mc-4.5.44/intl/loadmsgcat.c Mon Mar 29 14:34:01 1999 +++ new/mc-4.5.45/intl/loadmsgcat.c Thu Apr 6 03:03:05 2000 @@ -1,5 +1,5 @@ -/* Load needed message catalogs - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Load needed message catalogs. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,8 +19,8 @@ # include #endif -#include #include +#include #include #if defined STDC_HEADERS || defined _LIBC @@ -44,7 +44,6 @@ /* Rename the non ISO C functions. This is required by the standard because some ISO C functions will require linking with this object file and the name space must not be polluted. */ -# define fstat __fstat # define open __open # define close __close # define read __read @@ -61,10 +60,12 @@ /* Load the message catalogs specified by FILENAME. If it is no valid message catalog do nothing. */ void +internal_function _nl_load_domain (domain_file) struct loaded_l10nfile *domain_file; { int fd; + size_t size; struct stat st; struct mo_file_header *data = (struct mo_file_header *) -1; #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ @@ -90,7 +91,8 @@ /* We must know about the size of the file. */ if (fstat (fd, &st) != 0 - && st.st_size < (off_t) sizeof (struct mo_file_header)) + || (size = (size_t) st.st_size) != st.st_size + || size < sizeof (struct mo_file_header)) { /* Something went wrong. */ close (fd); @@ -101,7 +103,7 @@ || defined _LIBC /* Now we are ready to load the file. If mmap() is available we try this first. If not available or it failed we try to load it. */ - data = (struct mo_file_header *) mmap (NULL, st.st_size, PROT_READ, + data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); if (data != (struct mo_file_header *) -1) @@ -116,14 +118,14 @@ it manually. */ if (data == (struct mo_file_header *) -1) { - off_t to_read; + size_t to_read; char *read_ptr; - data = (struct mo_file_header *) malloc (st.st_size); + data = (struct mo_file_header *) malloc (size); if (data == NULL) return; - to_read = st.st_size; + to_read = size; read_ptr = (char *) data; do { @@ -150,7 +152,7 @@ #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ || defined _LIBC if (use_mmap) - munmap ((caddr_t) data, st.st_size); + munmap ((caddr_t) data, size); else #endif free (data); @@ -164,6 +166,11 @@ domain = (struct loaded_domain *) domain_file->data; domain->data = (char *) data; +#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || defined _LIBC + domain->use_mmap = use_mmap; +#endif + domain->mmap_size = size; domain->must_swap = data->magic != _MAGIC; /* Fill in the information about the available tables. */ @@ -184,7 +191,7 @@ #if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ || defined _LIBC if (use_mmap) - munmap ((caddr_t) data, st.st_size); + munmap ((caddr_t) data, size); else #endif free (data); @@ -197,3 +204,19 @@ translations invalid. */ ++_nl_msg_cat_cntr; } + + +#ifdef _LIBC +void +internal_function +_nl_unload_domain (domain) + struct loaded_domain *domain; +{ + if (domain->use_mmap) + munmap ((caddr_t) domain->data, domain->mmap_size); + else + free ((void *) domain->data); + + free (domain); +} +#endif diff -ruN old/mc-4.5.44/intl/localealias.c new/mc-4.5.45/intl/localealias.c --- old/mc-4.5.44/intl/localealias.c Fri Feb 5 13:50:35 1999 +++ new/mc-4.5.45/intl/localealias.c Thu Apr 6 03:03:05 2000 @@ -1,5 +1,5 @@ -/* Handle aliases for locale names - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Handle aliases for locale names. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -79,6 +79,14 @@ because some ANSI C functions will require linking with this object file and the name space must not be polluted. */ # define strcasecmp __strcasecmp + +# define mempcpy __mempcpy +# define HAVE_MEMPCPY 1 + +/* We need locking here since we can be called from different places. */ +# include + +__libc_lock_define_initialized (static, lock); #endif @@ -125,13 +133,17 @@ }; +static char *string_space = NULL; +static size_t string_space_act = 0; +static size_t string_space_max = 0; static struct alias_map *map; static size_t nmap = 0; static size_t maxmap = 0; /* Prototypes for local functions. */ -static size_t read_alias_file PARAMS ((const char *fname, int fname_len)); +static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) + internal_function; static void extend_alias_table PARAMS ((void)); static int alias_compare PARAMS ((const struct alias_map *map1, const struct alias_map *map2)); @@ -143,8 +155,13 @@ { static const char *locale_alias_path = LOCALE_ALIAS_PATH; struct alias_map *retval; + const char *result = NULL; size_t added; +#ifdef _LIBC + __libc_lock_lock (lock); +#endif + do { struct alias_map item; @@ -162,7 +179,10 @@ /* We really found an alias. Return the value. */ if (retval != NULL) - return retval->value; + { + result = retval->value; + break; + } /* Perhaps we can find another alias file. */ added = 0; @@ -183,11 +203,16 @@ } while (added != 0); - return NULL; +#ifdef _LIBC + __libc_lock_unlock (lock); +#endif + + return result; } static size_t +internal_function read_alias_file (fname, fname_len) const char *fname; int fname_len; @@ -202,8 +227,13 @@ full_fname = (char *) alloca (fname_len + sizeof aliasfile); ADD_BLOCK (block_list, full_fname); +#ifdef HAVE_MEMPCPY + mempcpy (mempcpy (full_fname, fname, fname_len), + aliasfile, sizeof aliasfile); +#else memcpy (full_fname, fname, fname_len); memcpy (&full_fname[fname_len], aliasfile, sizeof aliasfile); +#endif fp = fopen (full_fname, "r"); if (fp == NULL) @@ -220,15 +250,28 @@ b) these fields must be usable as file names and so must not be that long */ - char buf[BUFSIZ]; - char *alias; - char *value; - char *cp; + unsigned char buf[BUFSIZ]; + unsigned char *alias; + unsigned char *value; + unsigned char *cp; - if (fgets (buf, BUFSIZ, fp) == NULL) + if (fgets (buf, sizeof buf, fp) == NULL) /* EOF reached. */ break; + /* Possibly not the whole line fits into the buffer. Ignore + the rest of the line. */ + if (strchr (buf, '\n') == NULL) + { + char altbuf[BUFSIZ]; + do + if (fgets (altbuf, sizeof altbuf, fp) == NULL) + /* Make sure the inner loop will be left. The outer loop + will exit at the `feof' test. */ + break; + while (strchr (altbuf, '\n') == NULL); + } + cp = buf; /* Ignore leading white space. */ while (isspace (cp[0])) @@ -250,8 +293,8 @@ if (cp[0] != '\0') { - char *tp; - size_t len; + size_t alias_len; + size_t value_len; value = cp++; while (cp[0] != '\0' && !isspace (cp[0])) @@ -271,42 +314,37 @@ if (nmap >= maxmap) extend_alias_table (); - /* We cannot depend on strdup available in the libc. Sigh! */ - len = strlen (alias) + 1; - tp = (char *) malloc (len); - if (tp == NULL) - { - FREE_BLOCKS (block_list); - return added; - } - memcpy (tp, alias, len); - map[nmap].alias = tp; + alias_len = strlen (alias) + 1; + value_len = strlen (value) + 1; - len = strlen (value) + 1; - tp = (char *) malloc (len); - if (tp == NULL) + if (string_space_act + alias_len + value_len > string_space_max) { - FREE_BLOCKS (block_list); - return added; + /* Increase size of memory pool. */ + size_t new_size = (string_space_max + + (alias_len + value_len > 1024 + ? alias_len + value_len : 1024)); + char *new_pool = (char *) realloc (string_space, new_size); + if (new_pool == NULL) + { + FREE_BLOCKS (block_list); + return added; + } + string_space = new_pool; + string_space_max = new_size; } - memcpy (tp, value, len); - map[nmap].value = tp; + + map[nmap].alias = memcpy (&string_space[string_space_act], + alias, alias_len); + string_space_act += alias_len; + + map[nmap].value = memcpy (&string_space[string_space_act], + value, value_len); + string_space_act += value_len; ++nmap; ++added; } } - - /* Possibly not the whole line fits into the buffer. Ignore - the rest of the line. */ - while (strchr (cp, '\n') == NULL) - { - cp = buf; - if (fgets (buf, BUFSIZ, fp) == NULL) - /* Make sure the inner loop will be left. The outer loop - will exit at the `feof' test. */ - *cp = '\n'; - } } /* Should we test for ferror()? I think we have to silently ignore @@ -329,20 +367,28 @@ struct alias_map *new_map; new_size = maxmap == 0 ? 100 : 2 * maxmap; - new_map = (struct alias_map *) malloc (new_size - * sizeof (struct alias_map)); + new_map = (struct alias_map *) realloc (map, (new_size + * sizeof (struct alias_map))); if (new_map == NULL) /* Simply don't extend: we don't have any more core. */ return; - memcpy (new_map, map, nmap * sizeof (struct alias_map)); - - if (maxmap != 0) - free (map); - map = new_map; maxmap = new_size; } + + +#ifdef _LIBC +static void __attribute__ ((unused)) +free_mem (void) +{ + if (string_space != NULL) + free (string_space); + if (map != NULL) + free (map); +} +text_set_element (__libc_subfreeres, free_mem); +#endif static int diff -ruN old/mc-4.5.44/intl/textdomain.c new/mc-4.5.45/intl/textdomain.c --- old/mc-4.5.44/intl/textdomain.c Fri Feb 5 13:50:37 1999 +++ new/mc-4.5.45/intl/textdomain.c Thu Apr 6 03:03:05 2000 @@ -1,5 +1,5 @@ -/* Implementation of the textdomain(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Implementation of the textdomain(3) function. + Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. Written by Ulrich Drepper , 1995. This program is free software; you can redistribute it and/or modify @@ -54,7 +54,9 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define TEXTDOMAIN __textdomain -# define strdup(str) __strdup (str) +# ifndef strdup +# define strdup(str) __strdup (str) +# endif #else # define TEXTDOMAIN textdomain__ #endif diff -ruN old/mc-4.5.44/lib/Makefile.in new/mc-4.5.45/lib/Makefile.in --- old/mc-4.5.44/lib/Makefile.in Tue Apr 4 23:31:56 2000 +++ new/mc-4.5.45/lib/Makefile.in Tue May 9 18:52:03 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.hint.ru mc.lib mc.menu +LIBFILES_CONST = mc.hint mc.hint.es mc.hint.cs mc.hint.ru mc.lib mc.menu cedit.menu edit.indent.rc 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.44/lib/cedit.menu new/mc-4.5.45/lib/cedit.menu --- old/mc-4.5.44/lib/cedit.menu Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.45/lib/cedit.menu Tue May 9 18:52:03 2000 @@ -0,0 +1,458 @@ +shell_patterns=0 # expression type + +# The macros are: +# +# %i The indent of blank space, equal the cursor column +# position. For edit menu only. +# %y The syntax type of current file. For edit menu only. +# %k The block file name. +# %e The error file name. +# %m The menu name. +# %f The current file name. +# %b The current file name without extension. +# %x The extension of current file name. +# %d The current directory name. +# %F The current file in the unselected panel. +# %D The directory name of the unselected panel. +# %t The currently tagged files. +# %T The tagged files in the unselected panel. +# %u and %U Similar to the %t and %T macros, but in +# addition the files are untagged. You can use this macro +# only once per menu file entry or extension file entry, +# because next time there will be no tagged files. +# %s and %S The selected files: The tagged files if +# there are any. Otherwise the current file. +# +# %% The % character +# +# %{some text} Prompt for the substitution. An input box +# is shown and the text inside the braces is used as a +# prompt. The macro is substituted by the text typed by the +# user. The user can press ESC or F10 to cancel. This macro +# doesn't work on the command line yet. + +#----------------------- Begin [perl] language template ----------------------- ++ y Perl\ Program | f \.pl$ +1 Author description header + unset LANG + AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')" + cat >>%k < + # Created at: $(date) + # Computer: $(uname -n) + # System: $(uname -sr) on $(uname -m) + # + # Copyright (c) $(date +%%Y) $AUTHOR All rights reserved. + # + #---------------------------------------------------------------------- + # Configure section: + + #---------------------------------------------------------------------- + # + # main() + + EOF + ++ y Perl\ Program | f \.pl$ +2 while () + cat < %k + %iwhile() { + %i} # while + EOF + ++ y Perl\ Program | f \.pl$ +3 for () + cat < %k + %ifor ($i = ; $i < ; $i++) { + %i} # for + EOF + ++ y Perl\ Program | f \.pl$ +4 foreach () + cat < %k + %iforeach ($ ) { + %i} # foreach + EOF + ++ y Perl\ Program | f \.pl$ +5 if () + cat < %k + %iif () { + %i} # if + EOF + ++ y Perl\ Program | f \.pl$ +6 if () else + cat < %k + %iif () { + %i} else { + %i} # if + EOF + ++ y Perl\ Program | f \.pl$ +7 if () elsif () + cat < %k + %iif () { + %i} elsif () { + %i} # if + EOF + ++ y Perl\ Program | f \.pl$ +8 substr () + echo "%i$ = substr(\$str, \$off, \$cnt);" >%k + ++ y Perl\ Program | f \.pl$ +9 opendir () + cat < %k + %iopendir(DIR, \$dir) || die("\$0: can't open \$dir\n"); + EOF + ++ y Perl\ Program | f \.pl$ +a sub () + NAME=%{ Enter name of subroutine: } + cat < %k + sub + $NAME () + { + } # $NAME() + EOF +#----------------------- End [perl] language template ------------------------- + +#---------------------- Begin [shell] language template ----------------------- ++ y Shell\ Script | f \.sh$ +1 Author description header + unset LANG + AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')" + cat >>%k < + # Created at: $(date) + # Computer: $(uname -n) + # System: $(uname -sr) on $(uname -m) + # + # Copyright (c) $(date +%%Y) $AUTHOR All rights reserved. + # + #---------------------------------------------------------------------- + # Configure section: + + #---------------------------------------------------------------------- + # + # main() + + EOF + ++ y Shell\ Script | f \.sh$ +3 for + cat < %k + %ifor i in \$ + %ido + %idone + EOF + ++ y Shell\ Script | f \.sh$ +4 while + cat < %k + %iwhile + %ido + %idone + EOF + ++ y Shell\ Script | f \.sh$ +5 if [] then else + cat <> %k + %iif [ ];then + %ielse + %ifi + EOF + ++ y Shell\ Script | f \.sh$ +6 case + NUMBER=%{ Enter number elements of case:} + cat < %k + %icase "\$" in + EOF + while [ "$NUMBER" -gt 0 ] + do + cat <> %k + %i) + %i ;; + EOF + let NUMBER=$NUMBER-1 + done + cat <> %k + %i*) + %iesac + EOF + ++ y Shell\ Script | f \.sh$ +7 function + NAME=%{ Enter name of function:} + cat <> %k + $NAME() { + } # end of $NAME() + EOF + ++ y Shell\ Script | f \.sh$ +8 select of bash + cat <> %k + %iselect i in \$l + %ido + %i if [ -n "\$i" ];then + %i break + %i else + %i continue + %i fi + %idone + EOF + +#----------------------- End [shell] language template ------------------------ + +#------------------------- Begin [c] language template ------------------------ ++ f \.h$ | f \.c$ | f \.cc$ +1 Author description header + unset LANG + AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')" + cat >> %k < + * Created at: $(date) + * Computer: $(uname -n) + * System: $(uname -sr) on $(uname -m) + * + * Copyright (c) $(date +%%Y) $AUTHOR All rights reserved. + * + ********************************************************************/ + EOF + ++ f \.h$ | f \.c$ | f \.cc$ +2 GPL description header + cat >>%k < %k + %iif () { + %i} /* if */ + EOF + ++ f \.c$ | f \.cc$ +4 if () else + cat < %k + %iif () { + %i} else { + %i} /* if */ + EOF + ++ f \.c$ | f \.cc$ +5 if () else if () + cat < %k + %iif ( ) { + %i} else if ( ) { + %i} /* if */ + EOF + ++ f \.c$ | f \.cc$ +6 switch () + NUMBER=%{ Enter number elements of switch:} + echo "%iswitch () {" >%k + while [ "$NUMBER" -gt 0 ] + do + echo "%icase '':" >>%k + echo "%i break;" >>%k + let NUMBER=$NUMBER-1 + done + echo "%idefault:" >>%k + echo "%i} /* switch */" >>%k + ++ f \.c$ | f \.cc$ +7 for () + cat < %k + %ifor (i = ; i < ; i++) { + %i} /* for */ + EOF + ++ f \.c$ | f \.cc$ +8 while () + cat < %k + %iwhile () { + %i} /* while */ + EOF + ++ f \.c$ | f \.cc$ +9 do {} while () + cat < %k + %ido { + %i} while () + EOF + ++ f \.c$ | f \.cc$ +a array + cat < %k + %ichar const x[] = { + %i, , + %i}; + EOF + ++ f \.c$ | f \.cc$ +b enum + cat < %k + %ienum x { + %i, , + %i}; + EOF + ++ f \.c$ | f \.cc$ +c struct + cat < %k + %istruct ? { + %i; + %i}; + EOF + ++ f \.c$ | f \.cc$ +d union + cat < %k + %iunion ? { + %i; + %i}; + EOF + ++ f \.c$ | f \.cc$ +e typedef struct + cat < %k + %itypedef struct { + %i; + %i} ?; + EOF + ++ f \.c$ | f \.cc$ +f function + NAME=%{ Enter name of function:} + cat <> %k + $NAME() + { + } /* $NAME() */ + EOF + ++ f \.c$ | f \.h$ | f \.cc$ +g #include + INC=%{ Enter include name: } + if [ -r "$INC" ];then + echo \#include \"$INC\" >%k + else + echo \#include \<$INC\> >%k + fi + ++ f \.c$ | f \.h$ | f \.cc$ +d #define + echo "#define " >%k + ++ f \.c$ | f \.h$ | f \.cc$ +d #ifdef + cat < %k + #ifdef + #else + #endif + EOF + ++ f \.c$ | f \.h$ | f \.cc$ + ++ f \.c$ | f \.h$ | f \.cc$ +h View all *.h into current directory + cat *.h |less + ++ f \.c$ | f \.cc$ +d Run gdb for current file + [ -x "./%b" ] && gdb ./%b + += f \.c$ | f \.cc$ ++ f \.c$ | f \.cc$ +c Compile, link and run the current .c file + export CFLAGS="-g -Wall -O2" + make || make %b || cc $CFLAGS -o %b %f + [ -r "%b" ] && (echo "*** press any key for run... ***"; read) + [ -x "%b" ] && ./%b + (echo -ne "\n--- Press any key for return to edit. ---"; read) + ++ f \.c$ | f \.h$ +t Indent `C' formatter + indent -kr -pcs %k 1>/dev/null 2> %e + +#--------------------- End [c/c++] language template -------------------------- + +#------------------------- Begin unknown template ----------------------------- ++ y unknown & t r +s #!/bin/sh + echo "#!/bin/sh" >%k + ++ y unknown & t r +p #!/usr/bin/perl + echo "#!/usr/bin/perl" >%k + ++ y unknown & t r +a Author description header + unset LANG + AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')" + cat >>%k < + Created at: $(date) + Computer: $(uname -n) + System: $(uname -sr) on $(uname -m) + + Copyright (c) $(date +%%Y) $AUTHOR All rights reserved. + ---------------------------------------------------------------------- + + EOF +#--------------------------- End unknown template ----------------------------- + +#----------------------- Begin common section --------------------------------- +I Insert `ChangeLog' string + DATE=$(date +%%Y-%%m-%%d) + AUTHOR="$(cat /etc/passwd |grep ^$(id -un) |awk -F: '{print($5)}')" + EMAIL="<$(echo -ne $REPLYTO)>" + echo "$DATE $AUTHOR $EMAIL" >%k + ++ x /bin/sh +s Invoke `shell' + /bin/sh + +m view `man' + MAN=%{Enter name of man:} + TMPFILE=/tmp/mcview.$MAN.$$ + man -Pcat $MAN >$TMPFILE + mcview $TMPFILE + rm -f $TMPFILE + +i Insert an out of command + CMD=%{ Enter command: } + eval $CMD > %k + ++ x /usr/bin/open | x /usr/local/bin/open & x /bin/sh +o Open next a free console + open -s -- sh + +e Edit this menu + mcedit %m +#-------------------------- End of common section ----------------------------- diff -ruN old/mc-4.5.44/lib/edit.indent.rc new/mc-4.5.45/lib/edit.indent.rc --- old/mc-4.5.44/lib/edit.indent.rc Wed Dec 31 19:00:00 1969 +++ new/mc-4.5.45/lib/edit.indent.rc Tue May 9 18:52:03 2000 @@ -0,0 +1,22 @@ +#!/bin/sh +# *** External Formatter (Indenter) for key F19 cooledit. +# args: +# $1 - edit file name +# $2 - highlight block file name +# $3 - error file name + +case "$(echo $1 |sed s/^.*\\.//)" in #got extesion + c|C) + #ftp://ftp.gnu.org/pub/gnu/indent-2.2.5.tar.gz + indent -kr -pcs $2 1>/dev/null 2>$3 + ;; + cc|CC) + #http://gene.md.huji.ac.il/~tald/astyle/stable/src/astyle_1.11.5_src.tar.gz + astyle $2 1>/dev/null 2>$3 + ;; + *) + mv -f $2 $2.tmp + #ftp://alpha.gnu.org/gnu/fetish/textutils-2.0.tar.gz + fmt $2.tmp 1>$2 2>$3 + rm -f $2.tmp +esac diff -ruN old/mc-4.5.44/lib/mc.ext.in new/mc-4.5.45/lib/mc.ext.in --- old/mc-4.5.44/lib/mc.ext.in Tue Apr 4 23:31:56 2000 +++ new/mc-4.5.45/lib/mc.ext.in Tue May 9 18:52:03 2000 @@ -100,34 +100,29 @@ # wider usage than on one system. You can send your modifications to # via email to mc-devel@roxanne.nuclecu.unam.mx -# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z -regex/\.t([gp]?z|ar\.g?[zZ])$ - Open=%cd %p#utar - View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf - - Extract=gzip -dc %f 2>/dev/null | tar xf - - Icon=compressed.xpm +### Changes ### +# +# Reorganization: 2000-05-01 Michal Svec + + +### TODO ### +# +# Postscript Open: ps2svga [gs -DEVICE=jpeg|zgv or something] +# Images asciiview +# RTF rtf2html +# +# All X Apps [Nothing/Warning] if no DISPLAY +# Not found [Default/Warning] +# Empty Output [Default/Warning] +# Edit: CopyOut+EDIT+CopyIn +# Security Check gzip/bzip EDIT (mktemp) +# +# Maybe: Open/XOpen/GOpen/KOpen/... for Console/X/GNOME/KDE/etc. -regex/\.tar\.bz$ -# Open=%cd %p#utar - View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf - - Extract=bzip -dc %f 2>/dev/null | tar xf - - Icon=compressed.xpm -regex/\.tar\.bz2$ - Open=%cd %p#utar - View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - - Extract=bzip2 -dc %f 2>/dev/null | tar xf - - Icon=compressed.xpm +### Programs ### -# .tar -shell/.tar - Open=%cd %p#utar - View=%view{ascii} tar tvvf %f - Extract=tar xf %f - Icon=tar.xpm - -# Programs shell/rm Open=if test ! -d ~/.trash; then mkdir ~/.trash; fi; I=%{Enter file to be safely deleted}; if test -n "$I"; then mv -f -b -V numbered %q ~/.trash; fi Icon=rubbish.xpm @@ -176,158 +171,57 @@ Icon=bug.xpm Drop=gdb %q -# a directory -directory/^\.\.$ - Icon=parent_dir.xpm -directory/^News$ - Icon=news_dir.xpm -directory/^Mail$ - Icon=mail_dir.xpm -directory/^\..*$ - Icon=hidden_dir.xpm -directory/^.*$ - Start XTerm here=cd %p; exec xterm & - Make tar.gz=I=%{Enter destination file name:}; if test -n "$I"; then tar cvf - %p | gzip > $I; fi - Icon=plain_dir.xpm - -# ls-lR -regex/^ls-?lR$ - Open=%cd %p#lslR - View=%view{ascii} - Icon=plain_dir.xpm -regex/^ls-?lR\.(g?z|Z)$ - Open=%cd %p#lslR - View=%view{ascii} gunzip -c %f - Icon=plain_dir.xpm - -# ftplist -regex/\.ftplist$ - Open=%cd %p#ftplist - -# rpm -regex/\.rpm$ - Open=%cd %p#rpm - Install this RPM=rpm -i %f - Upgrade this RPM=rpm -U %f - -# deb -regex/\.deb$ - Open=%cd %p#deb - View=%view{ascii} dpkg-deb -c %f - -# zip -regex/\.(zip|ZIP|jar|JAR)$ - Open=%cd %p#uzip - View=%view{ascii} unzip -v %f - Icon=zip.xpm - Extract=unzip %f - Extract (with flags)=I=%{Enter any Unzip flags:}; if test -n "$I"; then unzip $I %f; fi - Unzip=unzip %f '*' - -# zoo -shell/.zoo - Open=%cd %p#uzoo - View=%view{ascii} zoo l %f - Icon=zoo.xpm - Extract=zoo x %f '*' - -# lha -regex/\.(lha|LHA|lzh|LZH)$ - Open=%cd %p#ulha - View=%view{ascii} lharc l %f - Icon=lharc.xpm - Extract=lharc x %f '*' - Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi - -# arj -regex/\.a(rj|[0-9][0-9])$ - Open=%cd %p#uarj - View=%view{ascii} unarj l %f - Icon=zip.xpm - Extract=unarj x %f '*' - Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi - -# ha -regex/\.(ha|HA|Ha)$ - Open=%cd %p#uha - View=%view{ascii} ha lf %f - Icon=ha.xpm - Extract=ha xy %f '*' - Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi -# ar library -regex/\.s?a$ - Open=%cd %p#uar - View=%view{ascii} nm %f +### Sources ### # C shell/.c - Open=%var{PAGER:more} %f + Open=%var{EDITOR:vi} %f View=%view{ascii} Compile=%var{CC:cc} -O -c %f Link=%var{CC:cc} -O -o %d/`basename %f .c` %f Icon=c.xpm +# Fortran shell/.f - Open=%var{PAGER:more} %f + Open=%var{EDITOR:vi} %f View=%view{ascii} Compile=f77 -O -c %f Compile and Link=f77 -O %f +# Header shell/.h Open=%var{EDITOR:vi} %f Icon=h.xpm +# Object shell/.o - Open=%var{PAGER:more} %f + #Open=%var{PAGER:more} %f Link=%var{CC:cc} -O %f Icon=o.xpm Display object file symbols=%view{ascii} nm %f Disassemble=%view{ascii} objdump -d -r %f +# Asm shell/.s - Open=%var{PAGER:more} %f + Open=%var{EDITOR:vi} %f Assemble=%var{CC:cc} -O -c %f Link=%var{CC:cc} -O -o %d/`basename %f .s` %f Icon=s.xpm -shell/.dvi - Open=xdvi %f - Icon=binary.xpm - View=xdvi %f - Convert file to Postscript=dvips %f - -shell/.tex - Open=%var{PAGER:more} %f - Icon=tex.xpm - TeX this file=tex %f - LaTeX this file=tex %f - -shell/^RMAIL$ - Start Emacs on this RMAIL file=emacs %f - Open=emacs %f - -regex/\.(te?xi)|(texinfo)$ - Icon=tex.xpm - # C++ regex/\.(C|cc)$ - Open=%var{PAGER:more} %f + Open=%var{EDITOR:vi} %f View=%view{ascii} Compile=c++ -O -c %f Link=c++ -O -o %d/`basename %f .c` %f Icon=cc.xpm -# ar library -regex/\.s?a$ - Open=%view{ascii} ar tv %f - View=%view{ascii} nm %f - Icon=a.xpm +### Documentation ### -# .so libraries are not manual pages -regex/\.so\.[0-9\.]*$ - View=%view{hex} - Icon=so.xpm +# Texinfo +regex/\.(te?xi)|(texinfo)$ + Icon=tex.xpm # GNU Info page type/Info\ text @@ -371,107 +265,185 @@ regex/(read\.?me$)|(README) Icon=info.xpm -shell/core - Icon=core.xpm -type/PostScript - Open=gv %f - Icon=postscript.xpm - View with GhostView=gv %f +### Images ### type/GIF\ image - Open=ee %f - Icon=gif.xpm Include=image-options + Icon=gif.xpm type/GIF\ picture - Open=ee %f + Include=image-options Icon=gif.xpm + +type/JPEG\ image Include=image-options + Icon=jpeg.xpm type/JPEG\ picture - Open=ee %f - Icon=jpeg.xpm Include=image-options + Icon=jpeg.xpm type/PC\ bitmap - Open=ee %f - Icon=bitmap.xpm Include=image-options + Icon=bitmap.xpm type/PNG\ image - Open=ee %f - Icon=gif.xpm Include=image-options + Icon=gif.xpm -type/JPEG\ image - Open=ee %f - Icon=jpeg.xpm - Include=image-options - type/TIFF\ file - Open=ee %f - Icon=tiff.xpm Include=image-options + Icon=tiff.xpm type/PBM - Open=ee %f - Icon=pbm.xpm Include=image-options + Icon=pbm.xpm type/PGM - Open=ee %f - Icon=pgm.xpm Include=image-options + Icon=pgm.xpm type/PPM - Open=ee %f - Icon=ppm.xpm Include=image-options + Icon=ppm.xpm shell/.xbm Open=bitmap %f Icon=xbm.xpm shell/.xpm - Open=ee %f - View=sxpm %f Include=image-options + View=sxpm %f Icon=xpm.xpm include/image-options + Open=if [ "$DISPLAY" = "" ]; then zgv %f; else (ee %f &); fi + View=%view{ascii} identify %f + #View=%view{ascii} asciiview %f Set root window to this image=background-properties --setwallpaper %f & Display this file=ee %f & -# Sound files -shell/.mod - Open=tracker %f - Icon=sound.xpm -regex/\.(wav)|(snd)|(voc)|(au)$ + +### Sound files ### + +regex/\.(wav|WAV|Wav|snd|SND|Snd|voc|VOC|Voc|au|AU|Au)$ Open=play %f Icon=sound.xpm +regex/\.(mod|MOD|Mod|s3m|S3M|S3m|xm|XM|Xm)$ + Open=mikmod %f + #Open=tracker %f + Icon=sound.xpm + +regex/\.(wav22|WAV22)$ + Open=vplay -s 22 %f + Icon=wav.xpm + +regex/\.(mp3|MP3|Mp3)$ + Open=mpg123 %f + View=%view{ascii} mpg123 -tn1 %f 2>&1|grep -E "^(Title|Album|Comment|MPEG|$)" + Icon=sound.xpm + + +### Multimedia ### + +regex/\.(mpe?g|MPE?G|Mpe?g)$ + Open=mtvp %f 2>/dev/null& + #Open=mtv %f 2>/dev/null& + #Open=gtv %f 2>/dev/null& + #Open=plaympeg %f 2>/dev/null& + #Open=mpeg_play %f & + #Open(big)=mpeg_play -dither 2x2 %f & + #Open(gray)=mpeg_play -dither gray %f & + +regex/\.(avi|AVI|Avi|mov|MOV|Mov)$ + Open=xanim %f 2>/dev/null& + +regex/\.(rm|RM|Rm|ram|RAM|Ram)$ + Open=realplay %f& + + +### Documents ### + +# Postscript +type/PostScript + Open=gv %f& + Icon=postscript.xpm + View=%view{ascii} ps2ascii %f + View with GhostView=gv %f + +# PDF +type/PDF + Open=xpdf %f& + #Open=acroread %f& + #Open=ghostview %f& + View=%view{ascii} pdftotext %f - + +# html +regex/\.([Hh]tml?|HTML?)$ + #Open=if echo "%d/%p" | grep ^ftp; then $viewer %d/%p; else $viewer file:%p; fi + Open=if [ x$DISPLAY = x ]; then lynx -force_html %f; else (@X11_WWW@ %f &); fi + View=%view{ascii} lynx -dump -force_html %f; + Icon=html.xpm + Run with AppletViewer=appletviewer %f + View with @X11_WWW@=@X11_WWW@ file://%f + +# Microsoft Word Document +regex/\.([Dd]oc|DOC)$ + #View=%view{ascii} catdoc -w %f + View=%view{ascii} word2x -f text %f - + Icon=word.xpm +type/Microsoft Word Document + #View=%view{ascii} catdoc -w %f + View=%view{ascii} word2x -f text %f - + Icon=word.xpm + +# Framemaker type/FrameMaker Open=fmclient -f %f Icon=framemaker.xpm +# DVI +regex/\.([Dd]vi|DVI)$ + Open=if [ x$DISPLAY = x ]; then dvisvga %f; else (xdvi %f &); fi + View=%view{ascii} dvi2tty %f + Icon=binary.xpm + Convert file to Postscript=dvips %f + +# TeX +regex/\.([Tt]ex|TEX|TeX)$ + Open=%var{EDITOR:vi} %f + Icon=tex.xpm + TeX this file=tex %f + LaTeX this file=latex %f + + +### Miscellaneous ### + +shell/^RMAIL$ + Start Emacs on this RMAIL file=emacs %f + Open=emacs %f + type/mail Open=elm -f %f Icon=mail.xpm View=%view{ascii} mcmfmt < %f +# core +shell/core + Icon=core.xpm + # Makefile regex/[Mm]akefile Open=make -f %f %{Enter parameters} Icon=makefile.xpm +# Imakefile shell/Imakefile Open=xmkmf -a Icon=makefile.xpm -type/PDF - Open=xpdf %f - # Executables type/executable Open=./%f @@ -482,88 +454,108 @@ Strip binary=strip %f Icon=application.xpm -# MPegs -regex/\.mpe?g$ - Open=mpeg_play %f & - View (big)=mpeg_play -dither 2x2 %f & - View (gray)=mpeg_play -dither gray %f & - -# HTML -regex/\.html?$ -# Open=if echo "%d/%p" | grep ^ftp; then $viewer %d/%p; else $viewer file:%p; fi - Open=if [ x$DISPLAY = x ]; then lynx -force_html %f; else (@X11_WWW@ %f &); fi - View=%view{ascii} lynx -dump -force_html %f; - Icon=html.xpm - Run with AppletViewer=appletviewer %f - View with @X11_WWW@=@X11_WWW@ file://%f - -# rar -regex/\.[rR]([aA][rR]|[0-9][0-9])$ - Open=%cd %p#urar - View=%view{ascii} rar v -c- %f - Extract=rar x -c- %f '*' - Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I %f; fi - # dbf regex/\.(dbf|DBF)$ Open=%view{ascii} dbview %f View=%view{ascii} dbview -b %f -# wav -regex/\.(wav|WAV)$ - Open=vplay %f - Icon=wav.xpm - -# wav22 -regex/\.(wav22|WAV22)$ - Open=vplay -s 22 %f - Icon=wav.xpm - # REXX script regex/\.(rexx)|(rex)|(cmd)$ Open=rexx %f %{Enter parameters};echo "Press ENTER";read y Icon=rexx.xpm -# Microsoft Word Document -regex/\.(doc|DOC)$ -# View=%view{ascii} catdoc -w %f - View=%view{ascii} word2x -f text %f - - Icon=word.xpm -type/Microsoft Word Document -# View=%view{ascii} catdoc -w %f - View=%view{ascii} word2x -f text %f - - Icon=word.xpm - -# cpio rules +### Archives ### + +# .tgz, .tpz, .tar.gz, .tar.z, .tar.Z +regex/\.t([gp]?z|ar\.g?[zZ])$ + Open=%cd %p#utar + View=%view{ascii} gzip -dc %f 2>/dev/null | tar tvvf - + Extract=gzip -dc %f 2>/dev/null | tar xf - + Icon=compressed.xpm +regex/\.tar\.bz$ + # Open=%cd %p#utar + View=%view{ascii} bzip -dc %f 2>/dev/null | tar tvvf - + Extract=bzip -dc %f 2>/dev/null | tar xf - + Icon=compressed.xpm +regex/\.tar\.bz2$ + Open=%cd %p#utar + View=%view{ascii} bzip2 -dc %f 2>/dev/null | tar tvvf - + Extract=bzip2 -dc %f 2>/dev/null | tar xf - + Icon=compressed.xpm + +# tar +regex/\.(tar|TAR)$ + Open=%cd %p#utar + View=%view{ascii} tar tvvf %f + Extract=tar xf %f + Icon=tar.xpm + +# zip +regex/\.(zip|ZIP|jar|JAR)$ + Open=%cd %p#uzip + View=%view{ascii} unzip -v %f + Icon=zip.xpm + Extract=unzip %f + Extract (with flags)=I=%{Enter any Unzip flags:}; if test -n "$I"; then unzip $I %f; fi + Unzip=unzip %f '*' + +# zoo +regex/\.(zoo|ZOO)$ + Open=%cd %p#uzoo + View=%view{ascii} zoo l %f + Icon=zoo.xpm + Extract=zoo x %f '*' + +# lha +regex/\.(lha|LHA|lzh|LZH)$ + Open=%cd %p#ulha + View=%view{ascii} lharc l %f + Icon=lharc.xpm + Extract=lharc x %f '*' + Extract (with flags)=I=%{Enter any LHarc flags:}; if test -n "$I"; then lharc x $I %f; fi + +# arj +regex/\.a(rj|[0-9][0-9])$ + Open=%cd %p#uarj + View=%view{ascii} unarj l %f + Icon=zip.xpm + Extract=unarj x %f '*' + Extract (with flags)=I=%{Enter any Unarj flags:}; if test -n "$I"; then unarj x $I %f; fi + +# ha +regex/\.(ha|HA|Ha)$ + Open=%cd %p#uha + View=%view{ascii} ha lf %f + Icon=ha.xpm + Extract=ha xy %f '*' + Extract (with flags)=I=%{Enter any HA flags:}; if test -n "$I"; then ha xy $I %f; fi + +# rar +regex/\.[rR]([aA][rR]|[0-9][0-9])$ + Open=%cd %p#urar + View=%view{ascii} rar v -c- %f + Extract=rar x -c- %f '*' + Extract (with flags)=I=%{Enter any RAR flags:}; if test -n "$I";then rar x $I %f; fi + +# cpio shell/.cpio.Z Open=%cd %d/%p#ucpio/ View=%view{ascii} compress -dc '%f' | cpio -ictv Extract=compress -dc '%f' | cpio -ic Icon=compressed.xpm - shell/.cpio.gz Open=%cd %d/%p#ucpio/ View=%view{ascii} gzip -dc '%f' | cpio -ictv Extract=gzip -dc '%f' | cpio -ic Icon=compressed.xpm - shell/.cpio Open=%cd %d/%p#ucpio/ View=%view{ascii} cat '%f' | cpio -ictv Extract=cat '%f' | cpio -ic Icon=cpio.xpm -shell/.mp3 - Open=mpg123 %f - View=mpg123 %f - Icon=sound.xpm - -regex/\.trpm$ - Open=%cd trpm:%p - View=%view{ascii} rpm -qivl --scripts `basename %p .trpm` - -# gzipped +# gzip type/gzip Open=gzip -dc %f | %var{PAGER:more} View=%view{ascii} gzip -dc %f 2>/dev/null @@ -571,7 +563,7 @@ Uncompress=gunzip %f Icon=compressed.xpm -# bzipped +# bzip2 type/bzip2 Open=bzip2 -dc %f | %var{PAGER:more} View=%view{ascii} bzip2 -dc %f 2>/dev/null @@ -579,6 +571,7 @@ Uncompress=bunzip2 %f Icon=compressed.xpm +# bzip type/bzip Open=bzip -dc %f | %var{PAGER:more} View=%view{ascii} bzip -dc %f 2>/dev/null @@ -586,12 +579,74 @@ Uncompress=bunzip %f Icon=compressed.xpm +# compress type/compress Open=gzip -dc %f | %var{PAGER:more} View=%view{ascii} gzip -dc %f 2>/dev/null Edit=I=`date +%%s`; export I; gzip -cd %f >/tmp/gzed.$I && %var{EDITOR:vi} /tmp/gzed.$I && gzip -c /tmp/gzed.$I > %f; rm -f /tmp/gzed.$I Icon=compressed.xpm +# ar library +regex/\.s?a$ + Open=%cd %p#uar + #Open=%view{ascii} ar tv %f + View=%view{ascii} nm %f + Icon=a.xpm + +# .so libraries are not manual pages +regex/\.(so|so\.[0-9\.]*)$ + View=%view{hex} + Icon=so.xpm + +# ls-lR +regex/^ls-?lR$ + Open=%cd %p#lslR + View=%view{ascii} + Icon=plain_dir.xpm +regex/^ls-?lR\.(g?z|Z)$ + Open=%cd %p#lslR + View=%view{ascii} gunzip -c %f + Icon=plain_dir.xpm + +# ftplist +regex/\.ftplist$ + Open=%cd %p#ftplist + +# trpm +regex/\.trpm$ + Open=%cd %p#trpm + View=%view{ascii} rpm -qivl --scripts `basename %p .trpm` + +# rpm +regex/\.rpm$ + Open=%cd %p#rpm + Install this RPM=rpm -i %f + Upgrade this RPM=rpm -U %f + +# deb +regex/\.deb$ + Open=%cd %p#deb + View=%view{ascii} dpkg-deb -c %f + + +### Directories ### + +directory/^\.\.$ + Icon=parent_dir.xpm +directory/^News$ + Icon=news_dir.xpm +directory/^Mail$ + Icon=mail_dir.xpm +directory/^\..*$ + Icon=hidden_dir.xpm +directory/^.*$ + Start XTerm here=cd %p; exec xterm & + Make tar.gz=I=%{Enter destination file name:}; if test -n "$I"; then tar cvf - %p | gzip > $I; fi + Icon=plain_dir.xpm + + +### Default ### + # Default target for anything not described above default/* Open= @@ -599,3 +654,6 @@ Drop= Icon=plain.xpm Title=%p + + +### EOF ### diff -ruN old/mc-4.5.44/lib/mc.menu new/mc-4.5.45/lib/mc.menu --- old/mc-4.5.44/lib/mc.menu Tue Apr 4 23:31:56 2000 +++ new/mc-4.5.45/lib/mc.menu Tue May 9 18:52:03 2000 @@ -335,3 +335,8 @@ fi shift done + ++ x /usr/bin/open | x /usr/local/bin/open & x /bin/sh +o Open next a free console + open -s -- sh + diff -ruN old/mc-4.5.44/macros/gnome.m4 new/mc-4.5.45/macros/gnome.m4 --- old/mc-4.5.44/macros/gnome.m4 Tue Apr 4 23:32:00 2000 +++ new/mc-4.5.45/macros/gnome.m4 Tue May 9 18:52:08 2000 @@ -104,6 +104,10 @@ AC_SUBST(GNOME_APPLETS_LIBS) GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets` AC_MSG_RESULT($GNOME_APPLETS_LIBS);; + docklets) + AC_SUBST(GNOME_DOCKLETS_LIBS) + GNOME_DOCKLETS_LIBS=`$GNOME_CONFIG --libs-only-l docklets` + AC_MSG_RESULT($GNOME_DOCKLETS_LIBS);; capplet) AC_SUBST(GNOME_CAPPLET_LIBS) GNOME_CAPPLET_LIBS=`$GNOME_CONFIG --libs-only-l capplet` diff -ruN old/mc-4.5.44/mc.spec new/mc-4.5.45/mc.spec --- old/mc-4.5.44/mc.spec Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/mc.spec Tue May 9 18:52:01 2000 @@ -1,5 +1,5 @@ # Note that this is NOT a relocatable package -%define ver 4.5.44 +%define ver 4.5.45 %define RELEASE 1 %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix /usr diff -ruN old/mc-4.5.44/po/ca.po new/mc-4.5.45/po/ca.po --- old/mc-4.5.44/po/ca.po Tue Apr 4 23:32:00 2000 +++ new/mc-4.5.45/po/ca.po Tue May 9 18:52:08 2000 @@ -1,12 +1,13 @@ # # Ivan Vilata i Balaguer 1999-2000 +# Softcatala , 2000 # msgid "" msgstr "" "Project-Id-Version: mc 4.5.29\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" +"Last-Translator: Softcatala \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" diff -ruN old/mc-4.5.44/po/cat-id-tbl.c new/mc-4.5.45/po/cat-id-tbl.c --- old/mc-4.5.44/po/cat-id-tbl.c Tue Apr 4 23:32:06 2000 +++ new/mc-4.5.45/po/cat-id-tbl.c Tue May 9 18:52:10 2000 @@ -37,547 +37,554 @@ {"edit", 12}, {"view", 13}, {" There is no other panel to compare contents to ", 14}, - {"The Midnight Commander Team", 15}, - {"bug reports: http://bugs.gnome.org, or use gnome-bug", 16}, - {"GNU Midnight Commander", 17}, - {"The GNOME edition of the Midnight Commander file manager.", 18}, - {"Sort By", 19}, - {"Ignore case sensitivity.", 20}, - {"Sort files by ", 21}, - {"Name", 22}, - {"File Type", 23}, - {"Size", 24}, - {"Time Last Accessed", 25}, - {"Time Last Modified", 26}, - {"Time Last Changed", 27}, - {"Reverse the order.", 28}, - {"Enter name.", 29}, - {"Enter label for command:", 30}, - {"Find all core files", 31}, - {"Find rejects after patching", 32}, - {"Run Command", 33}, - {"Preset Commands", 34}, - {"Add", 35}, - {"Remove", 36}, - {"Run this Command", 37}, - {"Command: ", 38}, - {"Set Filter", 39}, - {"Show all files", 40}, - {".", 41}, + {" Could not start a terminal ", 15}, + {"The Midnight Commander Team", 16}, + {"bug reports: http://bugs.gnome.org, or use gnome-bug", 17}, + {"GNU Midnight Commander", 18}, + {"The GNOME edition of the Midnight Commander file manager.", 19}, + {"Sort By", 20}, + {"Ignore case sensitivity.", 21}, + {"Sort files by ", 22}, + {"Name", 23}, + {"File Type", 24}, + {"Size", 25}, + {"Time Last Accessed", 26}, + {"Time Last Modified", 27}, + {"Time Last Changed", 28}, + {"Reverse the order.", 29}, + {"Enter name.", 30}, + {"Enter label for command:", 31}, + {"Find all core files", 32}, + {"Find rejects after patching", 33}, + {"Run Command", 34}, + {"Preset Commands", 35}, + {"Add", 36}, + {"Remove", 37}, + {"Run this Command", 38}, + {"Command: ", 39}, + {"Set Filter", 40}, + {"Show all files", 41}, + {".", 42}, {"\ Enter a filter here for files in the panel view.\n\ \n\ For example:\n\ -*.png will show just png images", 42}, - {"Enter a Regular Expression to filter files in the panel view.", 43}, - {" Open with...", 44}, - {"Enter extra arguments:", 45}, - {"Desktop entry properties", 46}, - {"Select File", 47}, +*.png will show just png images", 43}, + {"Enter a Regular Expression to filter files in the panel view.", 44}, + {" Open with...", 45}, + {"Enter extra arguments:", 46}, + {"Desktop entry properties", 47}, + {"Select File", 48}, {"\ Enter a filter here to select files in the panel view with.\n\ \n\ For example:\n\ -*.png will select all png images", 48}, - {"Enter a regular expression here to select files in the panel view with.", 49}, - {" Malformed regular expression ", 50}, - {"Creating a desktop link", 51}, - {"Enter the URL:", 52}, - {"Access Time", 53}, - {"Creation Time", 54}, - {"Group", 55}, - {"Group ID", 56}, - {"Inode Number", 57}, - {"Mode", 58}, - {"Modification Time", 59}, - {"Number of Hard Links", 60}, - {"Owner", 61}, - {"Permission", 62}, - {"Size (short)", 63}, - {"Type", 64}, - {"User ID", 65}, - {"Possible Columns", 66}, - {"Displayed Columns", 67}, - {"Custom View", 68}, - {"Warning", 69}, - {"Could not open %s; will not have desktop icons", 70}, - {"While running the mount/umount command", 71}, - {"While running the eject command", 72}, - {"Error", 73}, +*.png will select all png images", 49}, + {"Enter a regular expression here to select files in the panel view with.", 50}, + {" Malformed regular expression ", 51}, + {"Creating a desktop link", 52}, + {"Enter the URL:", 53}, + {"Access Time", 54}, + {"Creation Time", 55}, + {"Group", 56}, + {"Group ID", 57}, + {"Inode Number", 58}, + {"Mode", 59}, + {"Modification Time", 60}, + {"Number of Hard Links", 61}, + {"Owner", 62}, + {"Permission", 63}, + {"Size (short)", 64}, + {"Type", 65}, + {"User ID", 66}, + {"Possible Columns", 67}, + {"Displayed Columns", 68}, + {"Custom View", 69}, + {"Warning", 70}, + {"Could not open %s; will not have desktop icons", 71}, + {"While running the mount/umount command", 72}, + {"While running the eject command", 73}, + {"Error", 74}, {"\ Unable to locate the file:\n\ background-properties-capplet\n\ in your path.\n\ \n\ -We are unable to set the background.", 74}, - {"_Terminal", 75}, - {"Launch a new terminal in the current directory", 76}, - {"_Directory...", 77}, - {"Creates a new directory", 78}, - {"URL L_ink...", 79}, - {"Creates a new URL link", 80}, - {"_Launcher...", 81}, - {"Creates a new launcher", 82}, - {"By _Name", 83}, - {"By File _Type", 84}, - {"By _Size", 85}, - {"By Time Last _Accessed", 86}, - {"By Time Last _Modified", 87}, - {"By Time Last _Changed", 88}, - {"_Arrange Icons", 89}, - {"Create _New Window", 90}, - {"Rescan _Desktop Directory", 91}, - {"Rescan De_vices", 92}, - {"Recreate Default _Icons", 93}, - {"Configure _Background Image", 94}, - {"Icon position", 95}, - {"Automatic icon placement", 96}, - {"Snap icons to grid", 97}, - {"Use shaped icons", 98}, - {"Use shaped text", 99}, - {"Desktop", 100}, - {"Home directory", 101}, - {"To: ", 102}, - {"Copying from: ", 103}, - {"Deleting file: ", 104}, - {"Files Exist", 105}, +We are unable to set the background.", 75}, + {"_Terminal", 76}, + {"Launch a new terminal in the current directory", 77}, + {"_Directory...", 78}, + {"Creates a new directory", 79}, + {"URL L_ink...", 80}, + {"Creates a new URL link", 81}, + {"_Launcher...", 82}, + {"Creates a new launcher", 83}, + {"By _Name", 84}, + {"By File _Type", 85}, + {"By _Size", 86}, + {"By Time Last _Accessed", 87}, + {"By Time Last _Modified", 88}, + {"By Time Last _Changed", 89}, + {"_Arrange Icons", 90}, + {"Create _New Window", 91}, + {"Rescan _Desktop Directory", 92}, + {"Rescan De_vices", 93}, + {"Recreate Default _Icons", 94}, + {"Configure _Background Image", 95}, + {"Icon position", 96}, + {"Automatic icon placement", 97}, + {"Snap icons to grid", 98}, + {"Use shaped icons", 99}, + {"Use shaped text", 100}, + {"Desktop", 101}, + {"Home directory", 102}, + {"To: ", 103}, + {"Copying from: ", 104}, + {"Deleting file: ", 105}, + {"Files Exist", 106}, {"\ Some of the files you are trying to copy already exist in the destination \ -folder. Please select the action to be performed.", 106}, - {"Prompt me before overwriting any file.", 107}, - {"Don't overwrite any files.", 108}, - {"Overwrite:", 109}, - {"Older files.", 110}, - {"Files only if size differs.", 111}, - {"All files.", 112}, - {"File Exists", 113}, - {"The target file already exists: %s", 114}, - {"Replace it?", 115}, - {"Copy", 116}, - {"Move", 117}, - {"Destination", 118}, - {"Find Destination Folder", 119}, - {"Copy as a background process", 120}, - {"Advanced Options", 121}, - {"Preserve symlinks", 122}, - {"Follow links.", 123}, +folder. Please select the action to be performed.", 107}, + {"Prompt me before overwriting any file.", 108}, + {"Don't overwrite any files.", 109}, + {"Overwrite:", 110}, + {"Older files.", 111}, + {"Files only if size differs.", 112}, + {"All files.", 113}, + {"File Exists", 114}, + {"The target file already exists: %s", 115}, + {"Replace it?", 116}, + {"Copy", 117}, + {"Move", 118}, + {"Destination", 119}, + {"Find Destination Folder", 120}, + {"Copy as a background process", 121}, + {"Advanced Options", 122}, + {"Preserve symlinks", 123}, + {"Follow links.", 124}, {"\ Selecting this will copy the files that symlinks point to instead of just \ -copying the link.", 124}, - {"Preserve file attributes.", 125}, - {"Preserves the permissions and the UID/GID if possible", 126}, - {"Recursively copy subdirectories.", 127}, - {"If set, this will copy the directories recursively", 128}, +copying the link.", 125}, + {"Preserve file attributes.", 126}, + {"Preserves the permissions and the UID/GID if possible", 127}, + {"Recursively copy subdirectories.", 128}, + {"If set, this will copy the directories recursively", 129}, {"\ %s\n\ \n\ -Directory not empty. Delete it recursively?", 129}, - {" Delete: ", 130}, - {"Do the same for the rest", 131}, - {"Move Progress", 132}, - {"Copy Progress", 133}, - {"Delete Progress", 134}, - {"File ", 135}, - {"is ", 136}, - {"done.", 137}, - {"Password:", 138}, - {"Password", 139}, - {"Symbolic Link", 140}, - {"Existing filename (filename symlink will point to):", 141}, - {"Symbolic link filename:", 142}, - {"_Move here", 143}, - {"_Copy here", 144}, - {"_Link here", 145}, - {"Cancel drag", 146}, +Directory not empty. Delete it recursively?", 130}, + {" Delete: ", 131}, + {"Do the same for the rest", 132}, + {"Move Progress", 133}, + {"Copy Progress", 134}, + {"Delete Progress", 135}, + {"File ", 136}, + {"is ", 137}, + {"done.", 138}, + {"Password:", 139}, + {"Password", 140}, + {"Symbolic Link", 141}, + {"Existing filename (filename symlink will point to):", 142}, + {"Symbolic link filename:", 143}, + {"_Move here", 144}, + {"_Copy here", 145}, + {"_Link here", 146}, + {"Cancel drag", 147}, {"\ Could not stat %s\n\ -%s", 147}, - {"Default set of icons not found, check your installation", 148}, - {"_Icon View", 149}, - {"Switch view to an icon display", 150}, - {"_Brief View", 151}, - {"Switch view to show just file name and type", 152}, - {"_Detailed View", 153}, - {"Switch view to show detailed file statistics", 154}, - {"_Custom View", 155}, - {"Switch view to show user-defined statistics", 156}, - {"Icons", 157}, - {"Brief", 158}, - {"Detailed", 159}, - {"Custom", 160}, - {"Enter command to run", 161}, +%s", 148}, + {"Default set of icons not found, check your installation", 149}, + {"_Icon View", 150}, + {"Switch view to an icon display", 151}, + {"_Brief View", 152}, + {"Switch view to show just file name and type", 153}, + {"_Detailed View", 154}, + {"Switch view to show detailed file statistics", 155}, + {"_Custom View", 156}, + {"Switch view to show user-defined statistics", 157}, + {"Icons", 158}, + {"Brief", 159}, + {"Detailed", 160}, + {"Custom", 161}, + {"Enter command to run", 162}, {"\ 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?", 162}, +Are you sure you want to exit?", 163}, {"\ 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.", 163}, - {"_File...", 164}, - {"Creates a new file in this directory", 165}, - {"_Copy...", 166}, - {"Copy files", 167}, - {"_Delete...", 168}, - {"Delete files", 169}, - {"_Move...", 170}, - {"Rename or move files", 171}, - {"Show directory sizes", 172}, - {"Shows the disk space used by each directory", 173}, - {"Close window", 174}, - {"Closes this window", 175}, - {"Select _All", 176}, - {"Select all files in the current Panel", 177}, - {"_Select Files...", 178}, - {"Select a group of files", 179}, - {"_Invert Selection", 180}, - {"Reverses the list of tagged files", 181}, - {"Search", 182}, - {"Search for a file in the current Panel", 183}, - {"_Rescan Directory", 184}, - {"Rescan the directory contents", 185}, - {"_Sort By...", 186}, - {"Confirmation settings", 187}, - {"_Filter View...", 188}, - {"Global option settings", 189}, - {"_Find File...", 190}, - {"Locate files on disk", 191}, - {"_Edit mime types...", 192}, - {"Edits the MIME type bindings", 193}, - {"_Run Command...", 194}, - {"Runs a command", 195}, - {"_Run Command in panel...", 196}, - {"Run a command and put the results in a panel", 197}, - {"_Background jobs...", 198}, - {"List of background operations", 199}, - {"Exit", 200}, - {"Terminates the file manager and the desktop", 201}, - {"_Settings", 202}, - {"_Layout", 203}, - {"_Commands", 204}, - {"_Desktop", 205}, - {"_Help", 206}, - {"File/New/Directory...", 207}, +Press OK to terminate the application, or cancel to continue using it.", 164}, + {"_File...", 165}, + {"Creates a new file in this directory", 166}, + {"_Copy...", 167}, + {"Copy files", 168}, + {"_Delete...", 169}, + {"Delete files", 170}, + {"_Move...", 171}, + {"Rename or move files", 172}, + {"Show directory sizes", 173}, + {"Shows the disk space used by each directory", 174}, + {"Close window", 175}, + {"Closes this window", 176}, + {"Select _All", 177}, + {"Select all files in the current Panel", 178}, + {"_Select Files...", 179}, + {"Select a group of files", 180}, + {"_Invert Selection", 181}, + {"Reverses the list of tagged files", 182}, + {"Search", 183}, + {"Search for a file in the current Panel", 184}, + {"_Rescan Directory", 185}, + {"Rescan the directory contents", 186}, + {"_Sort By...", 187}, + {"Confirmation settings", 188}, + {"_Filter View...", 189}, + {"Global option settings", 190}, + {"_Find File...", 191}, + {"Locate files on disk", 192}, + {"_Edit mime types...", 193}, + {"Edits the MIME type bindings", 194}, + {"_Run Command...", 195}, + {"Runs a command", 196}, + {"_Run Command in panel...", 197}, + {"Run a command and put the results in a panel", 198}, + {"_Background jobs...", 199}, + {"List of background operations", 200}, + {"Exit", 201}, + {"Terminates the file manager and the desktop", 202}, + {"_Settings", 203}, + {"_Layout", 204}, + {"_Commands", 205}, + {"_Desktop", 206}, + {"_Help", 207}, + {"File/New/Directory...", 208}, {"\ 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.", 208}, - {"Could not open the /etc/fstab file", 209}, - {"Could not symlink %s to %s; will not have such a desktop device icon.", 210}, - {"CD-ROM %d", 211}, - {"Floppy %d", 212}, - {"Disk %d", 213}, - {"NFS dir %s", 214}, - {"Device %d", 215}, - {"Full Name: ", 216}, - {"File Name", 217}, - {"File Type: ", 218}, - {"File Type: Symbolic Link", 219}, - {"Target Name: INVALID LINK", 220}, - {"Target Name: ", 221}, - {"File Type: Directory", 222}, - {"File Type: Character Device", 223}, - {"File Type: Block Device", 224}, - {"File Type: Socket", 225}, - {"File Type: FIFO", 226}, - {"File Size: ", 227}, - {" bytes", 228}, - {" KBytes (", 229}, - {" bytes)", 230}, - {" MBytes (", 231}, - {"File Size: N/A", 232}, - {"File Created on: ", 233}, - {"Last Modified on: ", 234}, - {"Last Accessed on: ", 235}, - {"URL:", 236}, - {"Caption:", 237}, - {"Drop Action", 238}, - {"Use default Drop Action options", 239}, - {"View", 240}, - {"Use default View options", 241}, - {"Select an Icon", 242}, - {"Open", 243}, - {"Use default Open action", 244}, - {"Use default Drop action", 245}, - {"Use default View action", 246}, - {"Edit", 247}, - {"Use default Edit action", 248}, - {"Icon", 249}, - {"File Actions", 250}, - {"Open action", 251}, - {"Needs terminal to run", 252}, - {"File Permissions", 253}, - {"Current mode: ", 254}, - {"Read", 255}, - {"Write", 256}, - {"Exec", 257}, - {"Special", 258}, - {"User", 259}, - {"Other", 260}, - {"Set UID", 261}, - {"Set GID", 262}, - {"Sticky", 263}, - {" (%d)", 264}, - {"File ownership", 265}, - {"URL", 266}, - {"Statistics", 267}, - {"Options", 268}, - {"Permissions", 269}, - {" Properties", 270}, - {"You entered an invalid username", 271}, - {"You must rename your file to something", 272}, - {"You cannot rename a file to something containing a '/' character", 273}, - {"Select an application to open \"%s\" with.", 274}, - {"Select a file to run with", 275}, - {"Applications", 276}, - {"Program to run", 277}, - {"Mount device", 278}, - {"Unmount device", 279}, - {"Eject device", 280}, - {"Open with...", 281}, - {"View Unfiltered", 282}, - {"Copy...", 283}, - {"Delete", 284}, - {"Move...", 285}, - {"Hard Link...", 286}, - {"Symlink...", 287}, - {"Edit Symlink...", 288}, - {"Properties...", 289}, - {"Show backup files", 290}, - {"Show hidden files", 291}, - {"Mix files and directories", 292}, - {"Use shell patterns instead of regular expressions", 293}, - {"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}, +File Manager will not stop you from doing it.", 209}, + {"Could not open the /etc/fstab file", 210}, + {"Could not symlink %s to %s; will not have such a desktop device icon.", 211}, + {"CD-ROM %d", 212}, + {"Floppy %d", 213}, + {"Disk %d", 214}, + {"NFS dir %s", 215}, + {"Device %d", 216}, + {"Full Name: ", 217}, + {"File Name", 218}, + {"File Type: ", 219}, + {"File Type: Symbolic Link", 220}, + {"Target Name: INVALID LINK", 221}, + {"Target Name: ", 222}, + {"File Type: Directory", 223}, + {"File Type: Character Device", 224}, + {"File Type: Block Device", 225}, + {"File Type: Socket", 226}, + {"File Type: FIFO", 227}, + {"File Size: ", 228}, + {" bytes", 229}, + {" KBytes (", 230}, + {" bytes)", 231}, + {" MBytes (", 232}, + {"File Size: N/A", 233}, + {"File Created on: ", 234}, + {"%a, %b %d %Y, %I:%M:%S %p", 235}, + {"Last Modified on: ", 236}, + {"Last Accessed on: ", 237}, + {"URL:", 238}, + {"Caption:", 239}, + {"Drop Action", 240}, + {"Use default Drop Action options", 241}, + {"View", 242}, + {"Use default View options", 243}, + {"Select an Icon", 244}, + {"Open", 245}, + {"Use default Open action", 246}, + {"Use default Drop action", 247}, + {"Use default View action", 248}, + {"Edit", 249}, + {"Use default Edit action", 250}, + {"Icon", 251}, + {"File Actions", 252}, + {"Open action", 253}, + {"Needs terminal to run", 254}, + {"File Permissions", 255}, + {"Current mode: ", 256}, + {"Read", 257}, + {"Write", 258}, + {"Exec", 259}, + {"Special", 260}, + {"User", 261}, + {"Other", 262}, + {"Set UID", 263}, + {"Set GID", 264}, + {"Sticky", 265}, + {" (%d)", 266}, + {"File ownership", 267}, + {"URL", 268}, + {"Statistics", 269}, + {"Options", 270}, + {"Permissions", 271}, + {" Properties", 272}, + {"You entered an invalid username", 273}, + {"You must rename your file to something", 274}, + {"You cannot rename a file to something containing a '/' character", 275}, + {"Select an application to open \"%s\" with.", 276}, + {"Select a file to run with", 277}, + {"Applications", 278}, + {"Program to run", 279}, + {"Mount device", 280}, + {"Unmount device", 281}, + {"Eject device", 282}, + {"Open with...", 283}, + {"View Unfiltered", 284}, + {"Copy...", 285}, + {"Delete", 286}, + {"Move...", 287}, + {"Hard Link...", 288}, + {"Symlink...", 289}, + {"Edit Symlink...", 290}, + {"Properties...", 291}, + {"Show backup files", 292}, + {"Show hidden files", 293}, + {"Mix files and directories", 294}, + {"Use shell patterns instead of regular expressions", 295}, + {"Determine file types from file content instead of extensions", 296}, + {"Confirm when deleting file", 297}, + {"Confirm when overwriting files", 298}, + {"Confirm when executing files", 299}, + {"Show progress while operations are being performed", 300}, + {"VFS Timeout:", 301}, + {"Seconds", 302}, + {"Anonymous FTP password:", 303}, + {"Always use FTP proxy", 304}, + {"Fast directory reload", 305}, + {"Compute totals before copying files", 306}, + {"FTP directory cache timeout :", 307}, + {"Allow customization of icons in icon view", 308}, + {"File display", 309}, + {"Confirmation", 310}, + {"VFS", 311}, + {"Caching", 312}, + {"Preferences", 313}, + {"Filename", 314}, + {"Full name: ", 315}, + {"Command", 316}, + {"Command:", 317}, + {"Use terminal", 318}, + {"File mode (permissions)", 319}, + {"", 320}, + {"General", 321}, + {"Title", 322}, + {"Select icon", 323}, + {"Reloads the current directory", 324}, + {"New _Directory...", 325}, + {"Creates a new directory here", 326}, + {"New _File...", 327}, + {"Creates a new file here", 328}, + {"Search: %s", 329}, + {"%s bytes in %d file", 330}, + {"%s bytes in %d files", 331}, + {"", 332}, + {"Copy directory", 333}, + {"Delete directory", 334}, + {"Rename or move directory", 335}, + {"Back", 336}, + {"Go to the previously visited directory", 337}, + {"Up", 338}, + {"Go up a level in the directory heirarchy", 339}, + {"Forward", 340}, + {"Go to the next directory", 341}, + {"Rescan", 342}, + {"Rescan the current directory", 343}, + {"Home", 344}, + {"Go to your home directory", 345}, + {"Location:", 346}, + {"&Ok", 347}, + {"Offset 0x%08lx", 348}, + {"Col %d", 349}, + {"%s bytes", 350}, + {"_Goto line", 351}, + {"Jump to a specified line number", 352}, + {"_Monitor file", 353}, + {"Monitor file growing", 354}, + {"Regexp search", 355}, + {"Regular expression search", 356}, + {"_Wrap", 357}, + {"Wrap the text", 358}, + {"_Parsed view", 359}, + {"_Formatted", 360}, + {"_Hex", 361}, + {"_Search", 362}, + {"ok", 363}, + {"cancel", 364}, + {"help", 365}, + {"yes", 366}, + {"no", 367}, + {"exit", 368}, + {"abort", 369}, + {"Could not contact the file manager\n", 370}, + {"Could not get the desktop\n", 371}, + {"Unknown arrange type `%s'\n", 372}, + {"Create window showing the specified directory", 373}, + {"DIRECTORY", 374}, + {"Rescan the specified directory", 375}, + {"Rescan the desktop icons", 376}, + {"Rescan the desktop device icons", 377}, + {"Arrange the desktop icons", 378}, + {"name | type | size | atime | mtime | ctime", 379}, + {"Close windows whose directories cannot be reached", 380}, + {" Error ", 381}, + {" Failed trying to open file for reading: ", 382}, + {" Error reading from pipe: ", 383}, + {" Failed trying to open pipe for reading: ", 384}, + {" Error reading file: ", 385}, + {" Cannot get size/permissions info on file: ", 386}, + {" Not an ordinary file: ", 387}, + {" File is too large: ", 388}, {"\ \n\ - 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}, + Increase edit.h:MAXBUF and recompile the editor. ", 389}, + {"User menu avalaible only in mcedit invoked from mc", 390}, + {"Error trying to stat file:", 391}, + {" Error writing to pipe: ", 392}, + {" Failed trying to open pipe for writing: ", 393}, + {"Quick save ", 394}, + {"Safe save ", 395}, + {"Do backups -->", 396}, + {"&Cancel", 397}, + {"Extension:", 398}, + {" Edit Save Mode ", 399}, + {" Save As ", 400}, + {" Warning ", 401}, + {" A file already exists with this name. ", 402}, + {"Overwrite", 403}, + {"Cancel", 404}, + {" Save as ", 405}, + {" Error trying to save file. ", 406}, + {" Delete macro ", 407}, + {" Error trying to open temp file ", 408}, + {" Error trying to open macro file ", 409}, + {"key '%d 0': ", 410}, + {" Error trying to overwrite macro file ", 411}, + {" Macro ", 412}, + {" Press the macro's new hotkey: ", 413}, + {" Save macro ", 414}, + {" Delete Macro ", 415}, + {" Load macro ", 416}, + {" Confirm save file? : ", 417}, + {" Save file ", 418}, + {"Save", 419}, {"\ Current text was modified without a file save. \n\ - 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}, + Continue discards these changes. ", 420}, + {"Continue", 421}, + {" Load ", 422}, + {" Block is large, you may not be able to undo this action. ", 423}, + {" Continue ", 424}, + {" Cancel ", 425}, + {"o&Ne", 426}, + {"al&L", 427}, + {"&Skip", 428}, + {"&Replace", 429}, + {" Replace with: ", 430}, + {" Confirm replace ", 431}, + {"scanf &Expression", 432}, + {"replace &All", 433}, + {"pr&Ompt on replace", 434}, + {"&Backwards", 435}, + {"&Regular expression", 436}, + {"&Whole words only", 437}, + {"case &Sensitive", 438}, + {" Enter replacement argument order eg. 3,2,1,4 ", 439}, + {" Enter replacement string:", 440}, + {" Enter search string:", 441}, + {" Replace ", 442}, + {" Search ", 443}, + {" Enter search text : ", 444}, + {" Enter replace text : ", 445}, {"\ You can enter regexp substrings with %s\n\ -(not \\1, \\2 like sed) then use \"Enter...order\"", 442}, - {" Enter argument (or substring) order : ", 443}, +(not \\1, \\2 like sed) then use \"Enter...order\"", 446}, + {" Enter argument (or substring) order : ", 447}, {"\ Enter the order of replacement of your scanf\n\ -format specifiers or regexp substrings, eg 3,1,2", 444}, - {" Whole words only ", 445}, - {" Case sensitive ", 446}, - {" Regular expression ", 447}, +format specifiers or regexp substrings, eg 3,1,2", 448}, + {" Whole words only ", 449}, + {" Case sensitive ", 450}, + {" Regular expression ", 451}, {"\ See the regex man page for how\n\ -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}, +to compose a regular expression", 452}, + {" Backwards ", 453}, + {"Warning: Searching backward can be slow", 454}, + {" Prompt on replace ", 455}, + {"Ask before making each replacement", 456}, + {" Replace all ", 457}, + {"Replace repeatedly", 458}, + {" Bookmarks ", 459}, + {"Create bookmarks at all lines found", 460}, + {" Scanf expression ", 461}, {"\ Allows entering of a C format string,\n\ -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}, +see the scanf man page", 462}, + {"Begin search, Enter", 463}, + {"Abort this dialog, Esc", 464}, + {"Replace", 465}, + {"Skip", 466}, + {"Replace all", 467}, + {"Replace one", 468}, + {"\ + Invalid regular expression, or scanf expression with to many conversions ", 469}, + {" Error in replacement format string. ", 470}, + {" %ld replacements made. ", 471}, + {" Search string not found. ", 472}, + {" %d finds made, %d bookmarks added ", 473}, + {" Quit ", 474}, {"\ Current text was modified without a file save. \n\ - 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}, + Save with exit? ", 475}, + {" File was modified, Save with exit? ", 476}, + {"Cancel quit", 477}, + {"&Yes", 478}, + {"&No", 479}, + {" &Cancel quit ", 480}, + {" &Yes ", 481}, + {" &No ", 482}, + {" Copy to clipboard ", 483}, + {" Unable to save to file. ", 484}, + {" Cut to clipboard ", 485}, + {" Goto line ", 486}, + {" Enter line: ", 487}, + {" Save Block ", 488}, + {" Insert File ", 489}, + {" Insert file ", 490}, + {" Error trying to insert file. ", 491}, + {" Sort block ", 492}, + {" You must first highlight a block of text. ", 493}, + {" Run Sort ", 494}, + {" Enter sort options (see manpage) separated by whitespace: ", 495}, + {" Sort ", 496}, + {" Error trying to execute sort command ", 497}, + {" Sort returned non-zero: ", 498}, + {"Error create script:", 499}, + {"Error read script:", 500}, + {"Error close script:", 501}, + {"Script created:", 502}, + {"Process block", 503}, + {" Mail ", 504}, + {" Copies to", 505}, + {" Subject", 506}, + {" To", 507}, + {" mail -s -c ", 508}, + {" Word wrap ", 509}, + {" Enter line length, 0 for off: ", 510}, + {" About ", 511}, {"\ \n\ Cooledit v3.11.5\n\ @@ -585,706 +592,709 @@ Copyright (C) 1996 the Free Software Foundation\n\ \n\ A user friendly text editor written\n\ - 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}, + for the Midnight Commander.\n", 512}, + {"&Open/load... C-o", 513}, + {"&New C-n", 514}, + {"&Save F2", 515}, + {"save &As... F12", 516}, + {"&Insert file... F15", 517}, + {"copy to &File... C-f", 518}, + {"&User menu... F11", 519}, + {"a&Bout... ", 520}, + {"&Quit F10", 521}, + {"&New C-x k", 522}, + {"copy to &File... ", 523}, + {"&Toggle Mark F3", 524}, + {"&Mark Columns S-F3", 525}, + {"toggle &Ins/overw Ins", 526}, + {"&Copy F5", 527}, + {"&Move F6", 528}, + {"&Delete F8", 529}, + {"&Undo C-u", 530}, + {"&Beginning C-PgUp", 531}, + {"&End C-PgDn", 532}, + {"&Search... F7", 533}, + {"search &Again F17", 534}, + {"&Replace... F4", 535}, + {"&Goto line... M-l", 536}, + {"goto matching &Bracket M-b", 537}, + {"insert &Literal... C-q", 538}, + {"&Refresh screen C-l", 539}, + {"&Start record macro C-r", 540}, + {"&Finish record macro... C-r", 541}, + {"&Execute macro... C-a, KEY", 542}, + {"delete macr&O... ", 543}, + {"insert &Date/time ", 544}, + {"format p&Aragraph M-p", 545}, + {"'ispell' s&Pell check C-p", 546}, + {"sor&T... M-t", 547}, + {"E&xternal Formatter F19", 548}, + {"&Mail... ", 549}, + {"&Execute macro... C-x e, KEY", 550}, + {"'ispell' s&Pell check M-$", 551}, + {"&General... ", 552}, + {"&Save mode...", 553}, + {"&Layout...", 554}, + {" File ", 555}, + {" Edit ", 556}, + {" Sear/Repl ", 557}, + {" Command ", 558}, + {" Options ", 559}, + {"Open...\tC-o", 560}, + {"New\tC-n", 561}, + {"Save\tF2", 562}, + {"Save as...\tF12", 563}, + {"Insert file...\tF15", 564}, + {"Copy to file...\tC-f", 565}, + {"Disk operations and file indexing/searching", 566}, + {"Toggle mark\tF3", 567}, + {"Toggle mark columns\tC-b", 568}, + {"Toggle book mark\tC-M-Ins", 569}, + {"Previous book mark\tC-M-Up", 570}, + {"Next book mark\tC-M-Down", 571}, + {"Flush book marks", 572}, + {"Toggle insert/overwrite\tIns", 573}, + {"Copy block to cursor\tF5", 574}, + {"Move block to cursor\tF6", 575}, + {"Delete block\tF8/C-Del", 576}, + {"Copy block to clipbrd\tC-Ins", 577}, + {"Cut block to clipbrd\tS-Del", 578}, + {"Paste block from clipbrd\tS-Ins", 579}, + {"Selection history\tM-Ins", 580}, + {"Undo\tC-BackSpace", 581}, + {"Manipulating blocks of text", 582}, + {" Srch/Replce ", 583}, + {"Search...\tF7", 584}, + {"Search again\tF17", 585}, + {"Replace...\tF4", 586}, + {"Replace again\tF14", 587}, + {"Search for and replace text", 588}, + {"Goto line...\tM-l", 589}, + {"Goto matching bracket\tM-b", 590}, + {"Start record macro\tC-r", 591}, + {"Finish record macro...\tC-r", 592}, + {"Execute macro...\tC-a, KEY", 593}, + {"Delete macro...\t", 594}, + {"Insert date/time\tC-d", 595}, + {"Format paragraph\tM-p", 596}, + {"Refresh display\tC-l", 597}, + {"Macros and internal commands", 598}, + {"Intuitive", 599}, + {"Emacs", 600}, + {"None", 601}, + {"Dynamic paragraphing", 602}, + {"Type writer wrap", 603}, + {"Word wrap line length : ", 604}, + {"Tab spacing : ", 605}, + {"synta&X highlighting", 606}, + {"confir&M before saving", 607}, + {"fill tabs with &Spaces", 608}, + {"&Return does autoindent", 609}, + {"&Backspace through tabs", 610}, + {"&Fake half tabs", 611}, + {"Wrap mode", 612}, + {"Key emulation", 613}, + {" Editor options ", 614}, + {"Error initialising editor.\n", 615}, + {"Help", 616}, + {"Mark", 617}, + {"Replac", 618}, + {"PullDn", 619}, + {"Quit", 620}, + {"&Dismiss", 621}, + {" Enter file name: ", 622}, + {"The Quick Brown Fox Jumps Over The Lazy Dog", 623}, + {"\ +gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n", 624}, + {"Interactive help browser", 625}, + {"Save to current file name", 626}, + {"Toggle In/Off invisible marker to highlight text", 627}, + {"Replc", 628}, + {"Find and replace strings/regular expressions", 629}, + {"Copy highlighted block to cursor position", 630}, + {"Move highlighted block to cursor position", 631}, + {"Find", 632}, + {"Find strings/regular expressions", 633}, + {"Dlete", 634}, + {"Delete highlighted text", 635}, + {"Menu", 636}, + {"Pull down menu", 637}, + {"Exit editor", 638}, + {"Clear the edit buffer", 639}, + {"Insert File", 640}, + {"Insert text from a file", 641}, + {"Copy to file", 642}, + {"copy a block to a file", 643}, + {"Search/Replace", 644}, + {" Spelling Message ", 645}, {"\ 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. ", 638}, + Alternatively, disable spell checking from the Options menu. ", 646}, {"\ 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. ", 639}, + Alternatively, disable spell checking from the Options menu. ", 647}, {"\ 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. ", 640}, + Alternatively, disable spell checking from the Options menu. ", 648}, {"\ Error reading from ispell. \n\ - Ispell is being restarted. ", 641}, - {" Load Syntax Rules ", 642}, + Ispell is being restarted. ", 649}, + {" Load Syntax Rules ", 650}, {"\ 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. ", 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}, + Your old rule file has been saved with a .OLD extension. ", 651}, + {" Load syntax file ", 652}, + {" File access error ", 653}, + {" Error in file %s on line %d ", 654}, + {"&Set", 655}, + {"S&kip", 656}, + {"Set &all", 657}, + {"owner", 658}, + {"group", 659}, + {"other", 660}, + {"On", 661}, + {"Flag", 662}, + {"%6d of %d", 663}, + {" Chown advanced command ", 664}, {"\ Couldn't chmod \"%s\" \n\ - %s ", 657}, + %s ", 665}, {"\ Couldn't chown \"%s\" \n\ - %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}, + %s ", 666}, + {" Oops... ", 667}, + {" I can't run the Advanced Chown command on an extfs ", 668}, + {" I can't run the Advanced Chown command on a tarfs ", 669}, + {"Background process:", 670}, + {" Background process error ", 671}, + {" Child died unexpectedly ", 672}, + {" Unknown error in child ", 673}, + {" Background protocol error ", 674}, {"\ Background process sent us a request for more arguments \n\ - 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}, + than we can handle. \n", 675}, + {" Listing mode ", 676}, + {"&Full file list", 677}, + {"&Brief file list", 678}, + {"&Long file list", 679}, + {"&User defined:", 680}, + {"&Icon view", 681}, + {"user &Mini status", 682}, + {"Listing mode", 683}, + {"&Reverse", 684}, + {"case sensi&tive", 685}, + {"Sort order", 686}, + {" confirm &Exit ", 687}, + {" confirm e&Xecute ", 688}, + {" confirm o&Verwrite ", 689}, + {" confirm &Delete ", 690}, + {" Confirmation ", 691}, + {"Full 8 bits output", 692}, + {"ISO 8859-1", 693}, + {"7 bits", 694}, + {"F&ull 8 bits input", 695}, + {" Display bits ", 696}, + {"&Always use ftp proxy", 697}, + {"sec", 698}, + {"ftpfs directory cache timeout:", 699}, + {"ftp anonymous password:", 700}, + {"Timeout for freeing VFSs:", 701}, + {" Virtual File System Setting ", 702}, + {"Quick cd", 703}, + {"cd", 704}, + {"Symbolic link", 705}, + {"Running ", 706}, + {"Stopped", 707}, + {"&Stop", 708}, + {"&Resume", 709}, + {"&Kill", 710}, + {"Background Jobs", 711}, + {"execute/search by others", 712}, + {"write by others", 713}, + {"read by others", 714}, + {"execute/search by group", 715}, + {"write by group", 716}, + {"read by group", 717}, + {"execute/search by owner", 718}, + {"write by owner", 719}, + {"read by owner", 720}, + {"sticky bit", 721}, + {"set group ID on execution", 722}, + {"set user ID on execution", 723}, + {"C&lear marked", 724}, + {"S&et marked", 725}, + {"&Marked all", 726}, + {"Permissions (Octal)", 727}, + {"Owner name", 728}, + {"Group name", 729}, + {" Chmod command ", 730}, + {" Permission ", 731}, + {"Use SPACE to change", 732}, + {"an option, ARROW KEYS", 733}, + {"to move between options", 734}, + {"and T or INS to mark", 735}, + {"Chmod command", 736}, + {" I can't run the Chmod command on an extfs ", 737}, + {" I can't run the Chmod command on a tarfs ", 738}, + {"Set &users", 739}, + {"Set &groups", 740}, + {" Name ", 741}, + {" Owner name ", 742}, + {" Group name ", 743}, + {" Size ", 744}, + {" Chown command ", 745}, + {" User name ", 746}, + {"", 747}, + {"", 748}, + {" I can't run the Chown command on an extfs ", 749}, + {" I can't run the Chown command on a tarfs ", 750}, + {" Can not fetch a local copy of %s ", 751}, + {" CD ", 752}, + {"Files tagged, want to cd?", 753}, + {"Could not change directory", 754}, + {" View file ", 755}, + {" Filename:", 756}, + {" Filtered view ", 757}, + {" Filter command and arguments:", 758}, + {"Create a new Directory", 759}, + {" Enter directory name:", 760}, + {" Filter ", 761}, + {" Set expression for filtering filenames", 762}, + {" Select ", 763}, + {" Unselect ", 764}, + {"Extension file edit", 765}, + {" Which extension file you want to edit? ", 766}, + {"&User", 767}, + {"&System Wide", 768}, + {" Menu edit ", 769}, + {" Which menu file will you edit ? ", 770}, + {"&Local", 771}, + {"&Home", 772}, + {" Compare directories ", 773}, + {" Select compare method: ", 774}, + {"&Quick", 775}, + {"&Size only", 776}, + {"&Thorough", 777}, + {" Both panels should be on the listing view mode to use this command ", 778}, + {" The command history is empty ", 779}, + {" Command history ", 780}, {"\ Not an xterm or Linux console; \n\ - the panels cannot be toggled. ", 773}, - {"Type `exit' to return to the Midnight Commander", 774}, + the panels cannot be toggled. ", 781}, + {"Type `exit' to return to the Midnight Commander", 782}, {"\ Couldn't stat %s \n\ - %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}, + %s ", 783}, + {" Link ", 784}, + {" to:", 785}, + {" link: %s ", 786}, + {" symlink: %s ", 787}, + {" Symlink `%s' points to: ", 788}, + {" Edit symlink ", 789}, + {" edit symlink, unable to remove %s: %s ", 790}, + {" edit symlink: %s ", 791}, + {" Link symbolically ", 792}, + {" Relative symlink ", 793}, + {" relative symlink: %s ", 794}, + {"Using default locale", 795}, + {"Using locale \"%s\" (from environment variable %s)", 796}, + {" Enter machine name (F1 for details): ", 797}, + {" Could not chdir to %s ", 798}, + {" Link to a remote machine ", 799}, + {" FTP to machine ", 800}, + {" SMB link to machine ", 801}, + {" Socket source routing setup ", 802}, + {" Enter host name to use as a source routing hop: ", 803}, + {" Host name ", 804}, + {" Error while looking up IP address ", 805}, + {" Undelete files on an ext2 file system ", 806}, {"\ Enter device (without /dev/) to undelete\n\ - files on: (F1 for details)", 797}, - {" Setup saved to ~/", 798}, - {" Setup ", 799}, + files on: (F1 for details)", 807}, + {" Setup saved to ~/", 808}, + {" Setup ", 809}, {"\ Can't chdir to '%s' \n\ - %s ", 800}, - {" You can not execute commands on non-local filesystems", 801}, + %s ", 810}, + {" You can not execute commands on non-local filesystems", 811}, {"\ \n\ \n\ \n\ refresh stack underflow!\n\ \n\ -\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}, +\n", 812}, + {"&Unsorted", 813}, + {"&Name", 814}, + {"&Extension", 815}, + {"&Modify time", 816}, + {"&Access time", 817}, + {"&Change time", 818}, + {"&Size", 819}, + {"&Inode", 820}, + {"&Type", 821}, + {"&Links", 822}, + {"N&GID", 823}, + {"N&UID", 824}, + {"&Owner", 825}, + {"&Group", 826}, + {"File '%s' exists but can not be stat-ed: %s", 827}, + {"Unknown", 828}, {"\ Can't generate unique filename \n\ - %s ", 819}, + %s ", 829}, {"\ Can't create temporary command file \n\ - %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}, + %s ", 830}, + {" Parameter ", 831}, + {" Can't execute commands on a Virtual File System directory ", 832}, + {" file error", 833}, + {"Format of the ", 834}, + {" file error ", 835}, + {"Format of the ~/", 836}, {"\ file has changed\n\ with version 3.0. You may want either to\n\ -copy it from ", 827}, +copy it from ", 837}, {"\ mc.ext or use that\n\ -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}, +file as an example of how to write it.\n", 838}, + {"mc.ext will be used for this moment.", 839}, + {"Edition: ", 840}, + {"XView", 841}, + {"Tk", 842}, + {"text mode", 843}, + {" with X11 support to read modifiers", 844}, + {"Virtual File System: tarfs, extfs", 845}, + {", ftpfs", 846}, + {" (proxies: hsc proxy)", 847}, + {", mcfs", 848}, + {" (with termnet support)", 849}, + {", smbfs", 850}, + {", undelfs", 851}, + {"With builtin Editor\n", 852}, + {"Using ", 853}, + {"system-installed ", 854}, + {"S-lang library with ", 855}, + {"terminfo", 856}, + {"termcap", 857}, + {"an unknown terminal", 858}, + {" database", 859}, + {"the ncurses library", 860}, + {"some unknown curses library", 861}, + {"With subshell support: ", 862}, + {"optional", 863}, + {"as default", 864}, + {"With support for background operations\n", 865}, + {" Copy ", 866}, + {" Move ", 867}, + {" Delete ", 868}, + {" Invalid target mask ", 869}, + {" Could not make the hardlink ", 870}, {"\ Cannot read source link \"%s\" \n\ - %s ", 861}, + %s ", 871}, {"\ Cannot make stable symlinks across non-local filesystems: \n\ \n\ - Option Stable Symlinks will be disabled ", 862}, + Option Stable Symlinks will be disabled ", 872}, {"\ Cannot create target symlink \"%s\" \n\ - %s ", 863}, + %s ", 873}, {"\ Cannot overwrite directory \"%s\" \n\ - %s ", 864}, + %s ", 874}, {"\ Cannot stat source file \"%s\" \n\ - %s ", 865}, - {" `%s' and `%s' are the same file. ", 866}, + %s ", 875}, + {" `%s' and `%s' are the same file. ", 876}, {"\ Cannot create special file \"%s\" \n\ - %s ", 867}, + %s ", 877}, {"\ Cannot chown target file \"%s\" \n\ - %s ", 868}, + %s ", 878}, {"\ Cannot chmod target file \"%s\" \n\ - %s ", 869}, + %s ", 879}, {"\ Cannot open source file \"%s\" \n\ - %s ", 870}, - {" Reget failed, about to overwrite file ", 871}, + %s ", 880}, + {" Reget failed, about to overwrite file ", 881}, {"\ Cannot fstat source file \"%s\" \n\ - %s ", 872}, + %s ", 882}, {"\ Cannot create target file \"%s\" \n\ - %s ", 873}, + %s ", 883}, {"\ Cannot fstat target file \"%s\" \n\ - %s ", 874}, + %s ", 884}, {"\ Cannot read source file \"%s\" \n\ - %s ", 875}, + %s ", 885}, {"\ Cannot write target file \"%s\" \n\ - %s ", 876}, - {"(stalled)", 877}, + %s ", 886}, + {"(stalled)", 887}, {"\ Cannot close source file \"%s\" \n\ - %s ", 878}, + %s ", 888}, {"\ Cannot close target file \"%s\" \n\ - %s ", 879}, - {"Incomplete file was retrieved. Keep it?", 880}, - {"&Delete", 881}, - {"&Keep", 882}, + %s ", 889}, + {"Incomplete file was retrieved. Keep it?", 890}, + {"&Delete", 891}, + {"&Keep", 892}, {"\ Cannot stat source directory \"%s\" \n\ - %s ", 883}, + %s ", 893}, {"\ Source directory \"%s\" is not a directory \n\ - %s ", 884}, + %s ", 894}, {"\ Cannot copy cyclic symbolic link \n\ - `%s' ", 885}, + `%s' ", 895}, {"\ Cannot create target directory \"%s\" \n\ - %s ", 886}, + %s ", 896}, {"\ Cannot chown target directory \"%s\" \n\ - %s ", 887}, + %s ", 897}, {"\ Cannot stat file \"%s\" \n\ - %s ", 888}, - {" `%s' and `%s' are the same file ", 889}, - {" Cannot overwrite directory `%s' ", 890}, + %s ", 898}, + {" `%s' and `%s' are the same file ", 899}, + {" Cannot overwrite directory `%s' ", 900}, {"\ Cannot move file \"%s\" to \"%s\" \n\ - %s ", 891}, + %s ", 901}, {"\ Cannot remove file \"%s\" \n\ - %s ", 892}, - {" `%s' and `%s' are the same directory ", 893}, - {" Cannot overwrite directory \"%s\" %s ", 894}, - {" Cannot overwrite file \"%s\" %s ", 895}, + %s ", 902}, + {" `%s' and `%s' are the same directory ", 903}, + {" Cannot overwrite directory \"%s\" %s ", 904}, + {" Cannot overwrite file \"%s\" %s ", 905}, {"\ Cannot move directory \"%s\" to \"%s\" \n\ - %s ", 896}, + %s ", 906}, {"\ Cannot delete file \"%s\" \n\ - %s ", 897}, + %s ", 907}, {"\ Cannot remove directory \"%s\" \n\ - %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}, + %s ", 908}, + {" Internal error: get_file \n", 909}, + {"1Copy", 910}, + {"1Move", 911}, + {"1Delete", 912}, + {"%o %f \"%s\"%m", 913}, + {"%o %d %f%m", 914}, + {"%o %f \"%s\"%e", 915}, + {"%o %d %f%e", 916}, + {"file", 917}, + {"files", 918}, + {"directory", 919}, + {"directories", 920}, + {"files/directories", 921}, + {" with source mask:", 922}, + {" Can't operate on \"..\"! ", 923}, + {"Yes", 924}, + {"No", 925}, + {" Sorry, I could not put the job in background ", 926}, + {" Internal failure ", 927}, + {" Unknown file operation ", 928}, {"\ Destination \"%s\" must be a directory \n\ - %s ", 919}, - {"&Retry", 920}, - {"&Abort", 921}, + %s ", 929}, + {"&Retry", 930}, + {"&Abort", 931}, {"\ \n\ Directory not empty. \n\ - Delete it recursively? ", 922}, + Delete it recursively? ", 932}, {"\ \n\ Background process: Directory not empty \n\ - 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}, + Delete it recursively? ", 933}, + {"a&ll", 934}, + {"non&E", 935}, + {" Type 'yes' if you REALLY want to delete ", 936}, + {"all the directories ", 937}, + {" Recursive Delete ", 938}, + {" Background process: Recursive Delete ", 939}, + {"File", 940}, + {"Count", 941}, + {"Bytes", 942}, + {"Source", 943}, + {"Target", 944}, + {"Deleting", 945}, + {"Target file \"%s\" already exists!", 946}, + {"if &Size differs", 947}, + {"&Update", 948}, + {"Overwrite all targets?", 949}, + {"&Reget", 950}, + {"ap&Pend", 951}, + {"Overwrite this target?", 952}, + {"Target date: %s, size %d", 953}, + {"Source date: %s, size %d", 954}, + {" File exists ", 955}, + {" Background process: File exists ", 956}, + {"preserve &Attributes", 957}, + {"follow &Links", 958}, + {"to:", 959}, + {"&Using shell patterns", 960}, + {"&Background", 961}, + {"&Stable Symlinks", 962}, + {"&Dive into subdir if exists", 963}, {"\ Invalid source pattern `%s' \n\ - %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}, + %s ", 964}, + {"&Suspend", 965}, + {"Con&tinue", 966}, + {"&Chdir", 967}, + {"&Again", 968}, + {"&Quit", 969}, + {"Pane&lize", 970}, + {"&View - F3", 971}, + {"&Edit - F4", 972}, + {"Start at:", 973}, + {"Filename:", 974}, + {"Content: ", 975}, + {"&Tree", 976}, + {"Find File", 977}, + {"Grepping in %s", 978}, + {" Find/read ", 979}, + {" Problem reading from child ", 980}, + {"Finished", 981}, + {"Searching %s", 982}, + {"Suspend", 983}, + {"Restart", 984}, + {"Searching", 985}, + {"Find file", 986}, + {"Change to this directory", 987}, + {"Search again", 988}, + {"View this file", 989}, + {"Edit this file", 990}, + {"Send the results to a Panel", 991}, + {"Usage: fixhlp \n", 992}, + {"fixhlp: Cannot open toc for writing", 993}, {"\ [Contents]\n\ Topics:\n\ -\n", 984}, +\n", 994}, {"\ Help file format error\n\ -", 985}, - {" Internal bug: Double start of link area ", 986}, - {" Can't find node [Contents] in help file ", 987}, - {" Help ", 988}, +", 995}, + {" Internal bug: Double start of link area ", 996}, + {" Can't find node [Contents] in help file ", 997}, + {" Help ", 998}, {"\ Can't open file %s \n\ - %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}, + %s ", 999}, + {" Can't find node %s in help file ", 1000}, + {"Index", 1001}, + {"Prev", 1002}, + {"&Move", 1003}, + {"&Remove", 1004}, + {"&Append", 1005}, + {"&Insert", 1006}, + {"New &Entry", 1007}, + {"New &Group", 1008}, + {"&Up", 1009}, + {"&Add current", 1010}, + {"Change &To", 1011}, + {"Subgroup - press ENTER to see list", 1012}, + {"Active VFS directories", 1013}, + {"Directory hotlist", 1014}, + {" Directory path ", 1015}, + {" Directory label ", 1016}, + {"Moving ", 1017}, + {"New hotlist entry", 1018}, + {"Directory label", 1019}, + {"Directory path", 1020}, + {" New hotlist group ", 1021}, + {"Name of new group", 1022}, + {"Label for \"%s\":", 1023}, + {" Add to hotlist ", 1024}, + {" Remove: ", 1025}, {"\ \n\ Group not empty.\n\ - 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}, + Remove it?", 1026}, + {" Top level group ", 1027}, + {"Hotlist is now kept in file ~/", 1028}, + {"MC will load hotlist from ~/", 1029}, + {"and then delete [Hotlist] section there", 1030}, + {" Hotlist Load ", 1031}, + {"MC was unable to write ~/", 1032}, + {" file, your old hotlist entries were not deleted", 1033}, + {"You have ~/", 1034}, + {" file and [Hotlist] section in ~/", 1035}, + {"Your ~/", 1036}, + {" most probably was created\n", 1037}, {"\ by an earlier development version of MC\n\ -and is more actual than ~/", 1028}, +and is more actual than ~/", 1038}, {"\ entries\n\ -\n", 1029}, +\n", 1039}, {"\ You can choose between\n\ \n\ - Remove - remove old hotlist entries from ~/", 1030}, + Remove - remove old hotlist entries from ~/", 1040}, {"\ 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 ~/", 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}, + Merge - add old entries to hotlist as group \"Entries from ~/", 1041}, + {"&Merge", 1042}, + {" Entries from ~/", 1043}, + {" file your old hotlist entries were not deleted", 1044}, + {"Midnight Commander %s", 1045}, + {"File: %s", 1046}, + {"Free nodes %d (%d%%) of %d", 1047}, + {"No node information", 1048}, + {"Free space ", 1049}, + {" (%d%%) of ", 1050}, + {"No space information", 1051}, + {"Type: %s ", 1052}, + {"non-local vfs", 1053}, + {"Device: %s", 1054}, + {"Filesystem: %s", 1055}, + {"Accessed: %s", 1056}, + {"Modified: %s", 1057}, + {"Created: %s", 1058}, + {"Size: ", 1059}, + {" (%d blocks)", 1060}, + {"Owner: %s/%s", 1061}, + {"Links: %d", 1062}, + {"Mode: %s (%04o)", 1063}, + {"Location: %Xh:%Xh", 1064}, + {"File: None", 1065}, + {"&Vertical", 1066}, + {"&Horizontal", 1067}, + {"&Xterm hintbar", 1068}, + {"h&Intbar visible", 1069}, + {"&Keybar visible", 1070}, + {"command &Prompt", 1071}, + {"show &Mini status", 1072}, + {"menu&Bar visible", 1073}, + {"&Equal split", 1074}, + {"pe&Rmissions", 1075}, + {"&File types", 1076}, + {"&Save", 1077}, + {" Layout ", 1078}, + {" Panel split ", 1079}, + {" Highlight... ", 1080}, + {" Other options ", 1081}, + {"output lines", 1082}, + {"Layout", 1083}, + {" Learn keys ", 1084}, + {" Teach me a key ", 1085}, {"\ Please press the %s\n\ and then wait until this message disappears.\n\ @@ -1293,139 +1303,141 @@ next to its button.\n\ \n\ If you want to escape, press a single Escape key\n\ -and wait as well.", 1076}, - {" Cannot accept this key ", 1077}, - {" You have entered \"%s\"", 1078}, - {"OK", 1079}, +and wait as well.", 1086}, + {" Cannot accept this key ", 1087}, + {" You have entered \"%s\"", 1088}, + {"OK", 1089}, {"\ It seems that all your keys already\n\ -work fine. That's great.", 1080}, - {"&Discard", 1081}, +work fine. That's great.", 1090}, + {"&Discard", 1091}, {"\ Great! You have a complete terminal database!\n\ -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}, +All your keys work well.", 1092}, + {"Learn keys", 1093}, + {"Press all the keys mentioned here. After you have done it, check", 1094}, + {"which keys are not marked with OK. Press space on the missing", 1095}, + {"key, or click with the mouse to define it. Move around with Tab.", 1096}, {"\ 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? ", 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}, + extra access permissions with the \"su\" command? ", 1097}, + {"Press any key to continue...", 1098}, + {" The shell is already running a command ", 1099}, + {" The Midnight Commander ", 1100}, + {" Do you really want to quit the Midnight Commander? ", 1101}, + {"&Listing mode...", 1102}, + {"&Quick view C-x q", 1103}, + {"&Info C-x i", 1104}, + {"&Sort order...", 1105}, + {"&Filter...", 1106}, + {"&Network link...", 1107}, + {"FT&P link...", 1108}, + {"SM&B link...", 1109}, + {"&Drive... M-d", 1110}, + {"&Rescan C-r", 1111}, + {"&User menu F2", 1112}, + {"&View F3", 1113}, + {"Vie&w file... ", 1114}, + {"&Filtered view M-!", 1115}, + {"&Edit F4", 1116}, + {"&Copy F5", 1117}, + {"c&Hmod C-x c", 1118}, + {"&Link C-x l", 1119}, + {"&SymLink C-x s", 1120}, + {"edit s&Ymlink C-x C-s", 1121}, + {"ch&Own C-x o", 1122}, + {"&Advanced chown ", 1123}, + {"&Rename/Move F6", 1124}, + {"&Mkdir F7", 1125}, + {"&Delete F8", 1126}, + {"&Quick cd M-c", 1127}, + {"select &Group M-+", 1128}, + {"u&Nselect group M-\\", 1129}, + {"reverse selec&Tion M-*", 1130}, + {"e&Xit F10", 1131}, + {"&Directory tree", 1132}, + {"&Find file M-?", 1133}, + {"s&Wap panels C-u", 1134}, + {"switch &Panels on/off C-o", 1135}, + {"&Compare directories C-x d", 1136}, + {"e&Xternal panelize C-x !", 1137}, + {"show directory s&Izes", 1138}, + {"command &History", 1139}, + {"di&Rectory hotlist C-\\", 1140}, + {"&Active VFS list C-x a", 1141}, + {"Fr&ee VFSs now", 1142}, + {"&Background jobs C-x j", 1143}, + {"&Undelete files (ext2fs only)", 1144}, + {"&Listing format edit", 1145}, + {"&Extension file edit", 1146}, + {"&Menu file edit", 1147}, + {"Menu edi&Tor edit", 1148}, + {"&Configuration...", 1149}, + {"c&Onfirmation...", 1150}, + {"&Display bits...", 1151}, + {"learn &Keys...", 1152}, + {"&Virtual FS...", 1153}, + {"&Save setup", 1154}, + {" &Left ", 1155}, + {" &Above ", 1156}, + {" &File ", 1157}, + {" &Command ", 1158}, + {" &Options ", 1159}, + {" &Right ", 1160}, + {" &Below ", 1161}, + {" Information ", 1162}, {"\ 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. ", 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}, + the details. ", 1163}, + {"Thank you for using GNU Midnight Commander", 1164}, + {"with mouse support on xterm and the Linux console.\n", 1165}, + {"with mouse support on xterm.\n", 1166}, + {"The TERM environment variable is unset!\n", 1167}, {"\ 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}, +\n", 1168}, + {"-a, --stickchars Force use of +, -, | for line drawing.\n", 1169}, + {"-b, --nocolor Force black and white display.\n", 1170}, + {"-B, --background [DEVEL-ONLY: Debug the background code]\n", 1171}, {"\ -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}, +-d, --nomouse Disable mouse support.\n", 1172}, + {"-e, --edit Startup the internal editor.\n", 1173}, {"\ -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}, + default.\n", 1174}, + {"-l, --ftplog file Log ftpfs commands to the file.\n", 1175}, + {"-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n", 1176}, {"\ -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, --slow Disables verbose operation (for slow terminals).\n", 1177}, + {"-t, --termcap Activate support for the TERMCAP variable.\n", 1178}, {"\ --S, --createcmdile Create command file to set default directory upon exit.\n", 1168}, +-S, --createcmdile Create command file to set default directory upon exit.\n", 1179}, {"\ -u, --nosubshell Disable the concurrent subshell mode.\n\ -U, --subshell Force the concurrent subshell mode.\n\ --r, --forceexec Force subshell execution.\n", 1169}, +-r, --forceexec Force subshell execution.\n", 1180}, {"\ -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}, +-x, --xterm Force xterm mouse support and screen save/restore.\n\ ++number number it is the start line number of file for `mcedit'.\n", 1181}, + {"-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n", 1182}, {"\ \n\ Please send any bug reports (including the output of `mc -V')\n\ -to mc-bugs@nuclecu.unam.mx\n", 1172}, +to mc-bugs@nuclecu.unam.mx\n", 1183}, {"\ --colors KEYWORD={FORE},{BACK}\n\ \n\ @@ -1443,394 +1455,393 @@ 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}, +\n", 1184}, + {"Library directory for the Midnight Commander: %s\n", 1185}, {"\ -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}, +Option -m is obsolete. Please look at Display Bits... in the Option's menu\n", 1186}, + {"Use to debug the background code", 1187}, + {"Request to run in color mode", 1188}, + {"Specifies a color configuration", 1189}, + {"Edits one file", 1190}, + {"Displays this help message", 1191}, + {"Displays a help screen on how to change the color scheme", 1192}, + {"Log ftp dialog to specified file", 1193}, + {"Obsolete", 1194}, + {"Requests to run in black and white", 1195}, + {"Disable mouse support in text version", 1196}, + {"Disables subshell support", 1197}, + {"Prints working directory at program exit", 1198}, + {"Resets soft keys on HP terminals", 1199}, + {"To run on slow terminals", 1200}, + {"Use stickchars to draw", 1201}, + {"Enables subshell support (default)", 1202}, + {"Tries to use termcap instead of terminfo", 1203}, + {"Displays the current version", 1204}, + {"Launches the file viewer on a file", 1205}, + {"Forces xterm features", 1206}, + {"Geometry for the window", 1207}, + {"GEOMETRY", 1208}, + {"No windows opened at startup", 1209}, + {"No desktop icons", 1210}, + {"Look more like traditional gmc", 1211}, + {"Display the directory that holds the .links startup files and exit", 1212}, {"\ 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", 1202}, - {" Notice ", 1203}, +On some systems you may want to run # `which mc`\n", 1213}, + {" Notice ", 1214}, {"\ The Midnight Commander configuration files \n\ are now stored in the ~/.mc directory, the \n\ - 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 ", 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}, + files have been moved now\n", 1215}, + {"safe de&Lete", 1216}, + {"cd follows lin&Ks", 1217}, + {"advanced cho&Wn", 1218}, + {"l&Ynx-like motion", 1219}, + {"Animation", 1220}, + {"rotatin&G dash", 1221}, + {"co&Mplete: show all", 1222}, + {"&Use internal view", 1223}, + {"use internal ed&It", 1224}, + {"auto m&Enus", 1225}, + {"&Auto save setup", 1226}, + {"shell &Patterns", 1227}, + {"Compute &Totals", 1228}, + {"&Verbose operation", 1229}, + {"&Fast dir reload", 1230}, + {"mi&X all files", 1231}, + {"&Drop down menus", 1232}, + {"ma&Rk moves down", 1233}, + {"show &Hidden files", 1234}, + {"show &Backup files", 1235}, + {"&Never", 1236}, + {"on dumb &Terminals", 1237}, + {"alwa&Ys", 1238}, + {" Configure options ", 1239}, + {" Panel options ", 1240}, + {" Pause after run... ", 1241}, + {"Configure options", 1242}, + {"&Add new", 1243}, + {" External panelize ", 1244}, + {"External panelize", 1245}, + {"Other command", 1246}, + {" Add to external panelize ", 1247}, + {" Enter command label: ", 1248}, + {" I can't run external panelize while logged on a non local directory ", 1249}, + {"Find *.orig after patching", 1250}, + {"Find SUID and SGID programs", 1251}, + {"Cannot invoke command.", 1252}, + {"Pipe close failed", 1253}, + {"Show this help message", 1254}, + {"Display brief usage message", 1255}, + {"SUB-DIR", 1256}, + {"UP--DIR", 1257}, + {"MTime", 1258}, + {"ATime", 1259}, + {"CTime", 1260}, + {"Perm", 1261}, + {"Nl", 1262}, + {"Inode", 1263}, + {"UID", 1264}, + {"GID", 1265}, + {" %s bytes in %d file%s", 1266}, + {"Unknow tag on display format: ", 1267}, + {"User suplied format looks invalid, reverting to default.", 1268}, + {" Do you really want to execute? ", 1269}, + {" No action taken ", 1270}, + {"RenMov", 1271}, + {"Mkdir", 1272}, + {"\ + Can't chdir to \"%s\" \n\ + %s ", 1273}, + {"Couldn't open named pipe %s\n", 1274}, + {" The shell is still active. Quit anyway? ", 1275}, + {" There are stopped jobs.", 1276}, + {" Quit anyway? ", 1277}, + {"Warning: Couldn't change to %s.\n", 1278}, {"\ Can't open the %s file for writing:\n\ -%s\n", 1266}, - {"Copy \"%s\" directory to:", 1267}, - {"Move \"%s\" directory to:", 1268}, +%s\n", 1279}, + {"Copy \"%s\" directory to:", 1280}, + {"Move \"%s\" directory to:", 1281}, {"\ Can't stat the destination \n\ - %s ", 1269}, - {" The destination isn't a directory ", 1270}, - {" Delete %s? ", 1271}, - {"Static", 1272}, - {"Dynamc", 1273}, - {"\ - Can't chdir to \"%s\" \n\ - %s ", 1274}, - {"Forget", 1275}, - {"Rmdir", 1276}, + %s ", 1282}, + {" The destination isn't a directory ", 1283}, + {" Delete %s? ", 1284}, + {"Static", 1285}, + {"Dynamc", 1286}, + {"Forget", 1287}, + {"Rmdir", 1288}, {"\ Can't write to the %s file:\n\ -%s\n", 1277}, - {" Invalid shell pattern definition \"%c\". ", 1278}, - {" Debug ", 1279}, - {" ERROR: ", 1280}, - {" True: ", 1281}, - {" False: ", 1282}, - {" Warning -- ignoring file ", 1283}, +%s\n", 1289}, + {" Invalid shell pattern definition \"%c\". ", 1290}, + {" Debug ", 1291}, + {" ERROR: ", 1292}, + {" True: ", 1293}, + {" False: ", 1294}, + {" Warning -- ignoring file ", 1295}, {"\ File %s is not owned by root or you or is world writable.\n\ -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}, +Using it may compromise your security", 1296}, + {" I can't run programs while logged on a non local directory ", 1297}, + {" Empty file %s ", 1298}, + {" User menu ", 1299}, + {"name_trunc: too big", 1300}, + {"%b %e %H:%M", 1301}, + {"%b %e %Y", 1302}, + {" Pipe failed ", 1303}, + {" Dup failed ", 1304}, {"\ File: \n\ \n\ - ", 1293}, + ", 1305}, {"\ \n\ \n\ -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}, +has been modified, do you want to save the changes?\n", 1306}, + {" Save changes ", 1307}, + {" Can't spawn child program ", 1308}, + {" Empty output from child filter ", 1309}, + {" Could not open file ", 1310}, + {" Can't open file \"", 1311}, {"\ Can't stat file \n\ - ", 1300}, - {" Can't view: not a regular file ", 1301}, + ", 1312}, + {" Can't view: not a regular file ", 1313}, {"\ Can't open \"%s\"\n\ - %s ", 1302}, + %s ", 1314}, {"\ Can't stat \"%s\"\n\ - %s ", 1303}, - {"File: %s", 1304}, - {"Offset 0x%08x", 1305}, - {" [grow]", 1306}, - {"Searching for `%s'", 1307}, - {" Search string not found ", 1308}, - {" Invalid regular expression ", 1309}, + %s ", 1315}, + {"File: %s", 1316}, + {"Offset 0x%08x", 1317}, + {" [grow]", 1318}, + {"Searching for `%s'", 1319}, + {" Search string not found ", 1320}, + {" Invalid regular expression ", 1321}, {"\ The current line number is %d.\n\ - Enter the new line number:", 1310}, + Enter the new line number:", 1322}, {"\ The current address is 0x%lx.\n\ - 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}, + Enter the new address:", 1323}, + {" Goto Address ", 1324}, + {" Enter regexp:", 1325}, + {"Ascii", 1326}, + {"Hex", 1327}, + {"Goto", 1328}, + {"Line", 1329}, + {"RxSrch", 1330}, + {"EdText", 1331}, + {"EdHex", 1332}, + {"UnWrap", 1333}, + {"Wrap", 1334}, + {"HxSrch", 1335}, + {"Raw", 1336}, + {"Parse", 1337}, + {"Unform", 1338}, + {"Format", 1339}, + {" History ", 1340}, + {"Function key 1", 1341}, + {"Function key 2", 1342}, + {"Function key 3", 1343}, + {"Function key 4", 1344}, + {"Function key 5", 1345}, + {"Function key 6", 1346}, + {"Function key 7", 1347}, + {"Function key 8", 1348}, + {"Function key 9", 1349}, + {"Function key 10", 1350}, + {"Function key 11", 1351}, + {"Function key 12", 1352}, + {"Function key 13", 1353}, + {"Function key 14", 1354}, + {"Function key 15", 1355}, + {"Function key 16", 1356}, + {"Function key 17", 1357}, + {"Function key 18", 1358}, + {"Function key 19", 1359}, + {"Function key 20", 1360}, + {"Backspace key", 1361}, + {"End key", 1362}, + {"Up arrow key", 1363}, + {"Down arrow key", 1364}, + {"Left arrow key", 1365}, + {"Right arrow key", 1366}, + {"Home key", 1367}, + {"Page Down key", 1368}, + {"Page Up key", 1369}, + {"Insert key", 1370}, + {"Delete key", 1371}, + {"Completion/M-tab", 1372}, + {"+ on keypad", 1373}, + {"- on keypad", 1374}, + {"* on keypad", 1375}, + {"Left arrow keypad", 1376}, + {"Right arrow keypad", 1377}, + {"Up arrow keypad", 1378}, + {"Down arrow keypad", 1379}, + {"Home on keypad", 1380}, + {"End on keypad", 1381}, + {"Page Down keypad", 1382}, + {"Page Up keypad", 1383}, + {"Insert on keypad", 1384}, + {"Delete on keypad", 1385}, + {"Enter on keypad", 1386}, + {"Slash on keypad", 1387}, + {"NumLock on keypad", 1388}, {"\ Couldn't open cpio archive\n\ -%s", 1377}, +%s", 1389}, {"\ Premature end of cpio archive\n\ -%s", 1378}, +%s", 1390}, {"\ Corrupt cpio header encountered in\n\ -%s", 1379}, +%s", 1391}, {"\ Inconsistent hardlinks of\n\ %s\n\ in cpio archive\n\ -%s", 1380}, - {"%s contains duplicit entries! Skiping!", 1381}, +%s", 1392}, + {"%s contains duplicit entries! Skiping!", 1393}, {"\ 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}, +%s", 1394}, + {"Dir cache expired for %s", 1395}, + {" Direntry warning ", 1396}, + {"Super ino_usage is %d, memory leak", 1397}, + {"Super has want_stale set", 1398}, + {"Starting linear transfer...", 1399}, + {"Getting file", 1400}, {"\ Couldn't open %s archive\n\ -%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}, +%s", 1401}, + {"Inconsistent extfs archive", 1402}, + {"fish: Disconnecting from %s", 1403}, + {"fish: Waiting for initial line...", 1404}, + {"Sorry, we can not do password authenticated connections for now.", 1405}, + {" fish: Password required for ", 1406}, + {"fish: Sending password...", 1407}, + {"fish: Sending initial line...", 1408}, + {"fish: Handshaking version...", 1409}, + {"fish: Setting up current directory...", 1410}, + {"fish: Connected, home %s.", 1411}, + {"fish: Reading directory %s...", 1412}, + {"fish: failed", 1413}, + {"fish: store %s: sending command...", 1414}, + {"fish: Local read failed, sending zeros", 1415}, + {"fish: storing %s %d (%d)", 1416}, + {"zeros", 1417}, + {"Aborting transfer...", 1418}, + {"Error reported after abort.", 1419}, + {"Aborted transfer would be successful.", 1420}, + {"ftpfs: Disconnecting from %s", 1421}, + {" FTP: Password required for ", 1422}, + {" Proxy: Password required for ", 1423}, + {"ftpfs: sending proxy login name", 1424}, + {"ftpfs: sending proxy user password", 1425}, + {"ftpfs: proxy authentication succeeded", 1426}, + {"ftpfs: connected to %s", 1427}, + {"ftpfs: sending login name", 1428}, + {"ftpfs: sending user password", 1429}, + {"ftpfs: logged in", 1430}, + {"ftpfs: Login incorrect for user %s ", 1431}, + {" Could not set source routing (%s)", 1432}, + {"ftpfs: Invalid host name.", 1433}, + {"ftpfs: Invalid host address.", 1434}, + {"ftpfs: making connection to %s", 1435}, + {"ftpfs: connection interrupted by user", 1436}, + {"ftpfs: connection to server failed: %s", 1437}, + {"Waiting to retry... %d (Control-C to cancel)", 1438}, + {"ftpfs: could not setup passive mode", 1439}, + {"ftpfs: aborting transfer.", 1440}, + {"ftpfs: abort error: %s", 1441}, + {"ftpfs: abort failed", 1442}, + {"ftpfs: CWD failed.", 1443}, + {"ftpfs: couldn't resolve symlink", 1444}, + {"Resolving symlink...", 1445}, + {"ftpfs: Reading FTP directory %s... %s%s", 1446}, + {"(strict rfc959)", 1447}, + {"(chdir first)", 1448}, + {"ftpfs: failed", 1449}, + {"ftpfs: failed; nowhere to fallback to", 1450}, + {"ftpfs: storing file %d (%d)", 1451}, {"\ ~/.netrc file has not correct mode.\n\ -Remove password or correct mode.", 1440}, - {" MCFS ", 1441}, - {" The server does not support this version ", 1442}, +Remove password or correct mode.", 1452}, + {" MCFS ", 1453}, + {" The server does not support this version ", 1454}, {"\ 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", 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}, + not be safe on the remote side. Continue? \n", 1455}, + {" Yes ", 1456}, + {" No ", 1457}, + {" The remote server is running on strange port. Giving up.\n", 1458}, + {" MCFS Password required ", 1459}, + {" Invalid password ", 1460}, + {" Can't locate hostname: %s ", 1461}, + {" Can't create socket: %s ", 1462}, + {" Can't connect to server: %s ", 1463}, + {" Too many open connections ", 1464}, + {"Midnight Commander's private remote filesystem", 1465}, + {"Domain:", 1466}, + {"Username:", 1467}, + {"Password: ", 1468}, + {"Password for \\\\%s\\%s", 1469}, {"\ reconnect to %s failed\n\ - ", 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}, + ", 1470}, + {" Authentication failed ", 1471}, + {" %s mkdir'ing %s ", 1472}, + {" %s rmdir'ing %s ", 1473}, + {" %s opening remote file %s ", 1474}, + {" %s renaming files\n", 1475}, {"\ Couldn't open tar archive\n\ -%s", 1464}, - {"Unexpected EOF on archive file", 1465}, - {"Inconsistent tar archive", 1466}, +%s", 1476}, + {"Unexpected EOF on archive file", 1477}, + {"Inconsistent tar archive", 1478}, {"\ Hmm,...\n\ %s\n\ -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}, +doesn't look like a tar archive.", 1479}, + {"Changes to file lost", 1480}, + {"Could not parse:", 1481}, + {"More parsing errors will be ignored.", 1482}, + {"(sorry)", 1483}, + {"Internal error:", 1484}, + {"%s: %s: %s %3d%% (%ld bytes transfered)", 1485}, + {"%s: %s: %s %ld bytes transfered", 1486}, + {" undelfs: error ", 1487}, + {" not enough memory ", 1488}, + {" while allocating block buffer ", 1489}, + {" open_inode_scan: %d ", 1490}, + {" while starting inode scan %d ", 1491}, + {"undelfs: loading deleted files information %d inodes", 1492}, + {" while calling ext2_block_iterate %d ", 1493}, + {" no more memory while reallocating array ", 1494}, + {" while doing inode scan %d ", 1495}, + {" Ext2lib error ", 1496}, + {" Could not open file %s ", 1497}, + {"undelfs: reading inode bitmap...", 1498}, {"\ Could not load inode bitmap from: \n\ - %s \n", 1487}, - {"undelfs: reading block bitmap...", 1488}, + %s \n", 1499}, + {"undelfs: reading block bitmap...", 1500}, {"\ 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}, + %s \n", 1501}, + {"undelfs: done.", 1502}, + {"undelfs: failure", 1503}, + {" vfs_info is not fs! ", 1504}, + {" You have to chdir to extract files first ", 1505}, + {" while iterating over blocks ", 1506}, + {" Could not open file: %s ", 1507}, + {"Undelete filesystem for ext2", 1508}, }; -int _msg_tbl_length = 1496; +int _msg_tbl_length = 1508; diff -ruN old/mc-4.5.44/po/cs.po new/mc-4.5.45/po/cs.po --- old/mc-4.5.44/po/cs.po Tue Apr 4 23:32:00 2000 +++ new/mc-4.5.45/po/cs.po Tue May 9 18:52:08 2000 @@ -2,6 +2,7 @@ # Copyright (C) 1999 Free Software Foundation, Inc. # Pavel Machek , 1998, 1999. # David ©auer , 1999. +# Michal ©vec , 2000. # msgid "" msgstr "" @@ -4923,11 +4924,11 @@ #: src/main.c:1238 src/main.c:1262 msgid "&Quick view C-x q" -msgstr "&Rychloprohlí¾eè C-x q" +msgstr "&Rychlé prohlí¾ení C-x q" #: src/main.c:1239 src/main.c:1263 msgid "&Info C-x i" -msgstr "&Informace C-x i" +msgstr "&Informace C-x i" #: src/main.c:1242 src/main.c:1266 msgid "&Sort order..." @@ -4939,11 +4940,11 @@ #: src/main.c:1247 src/main.c:1271 msgid "&Network link..." -msgstr "sí»ové spo&Jení..." +msgstr "sí»ové spoje&Ní..." #: src/main.c:1248 src/main.c:1272 msgid "FT&P link..." -msgstr "F&TP spojení..." +msgstr "FT&P spojení..." #: src/main.c:1250 src/main.c:1274 msgid "SM&B link..." @@ -4955,19 +4956,19 @@ #: src/main.c:1257 src/main.c:1281 msgid "&Rescan C-r" -msgstr "&Znovu naèíst C-r" +msgstr "&Znovu naèíst C-r" #: src/main.c:1285 msgid "&User menu F2" -msgstr "u¾ivate&Lské menu F2" +msgstr "&U¾ivatelské menu F2" #: src/main.c:1286 msgid "&View F3" -msgstr "pro&Hlí¾et F3" +msgstr "pro&Hlédnout F3" #: src/main.c:1287 msgid "Vie&w file... " -msgstr "vi&Dìt soubor... " +msgstr "prohlé&Dnout soubor..." #: src/main.c:1288 msgid "&Filtered view M-!" @@ -4983,15 +4984,15 @@ #: src/main.c:1291 msgid "c&Hmod C-x c" -msgstr "zmìna &práv C-x c" +msgstr "zmìna &Práv C-x c" #: src/main.c:1293 msgid "&Link C-x l" -msgstr "Vyrobit &odkaz C-x l" +msgstr "vyrobit &Odkaz C-x l" #: src/main.c:1294 msgid "&SymLink C-x s" -msgstr "Vyrobit &symb. odkaz C-x s" +msgstr "vyrobit &Symb. odkaz C-x s" #: src/main.c:1295 msgid "edit s&Ymlink C-x C-s" @@ -4999,7 +5000,7 @@ #: src/main.c:1296 msgid "ch&Own C-x o" -msgstr "zmìna &vlastníka C-x o" +msgstr "zmìna &Vlastníka C-x o" #: src/main.c:1297 msgid "&Advanced chown " @@ -5007,15 +5008,15 @@ #: src/main.c:1299 msgid "&Rename/Move F6" -msgstr "pøesun/pøejmenova&T F6" +msgstr "pøesun/pøe&Jmenovat F6" #: src/main.c:1300 msgid "&Mkdir F7" -msgstr "&Nový adresáø F7" +msgstr "nový &Adresáø F7" #: src/main.c:1301 msgid "&Delete F8" -msgstr "s&mazat F8" +msgstr "s&Mazat F8" #: src/main.c:1302 msgid "&Quick cd M-c" @@ -5027,19 +5028,19 @@ #: src/main.c:1305 msgid "u&Nselect group M-\\" -msgstr "odznaèit sk&Upinu M-\\" +msgstr "odz&Naèit skupinu M-\\" #: src/main.c:1306 msgid "reverse selec&Tion M-*" -msgstr "p&Rohodit oznaèení M-*" +msgstr "prohodi&T oznaèení M-*" #: src/main.c:1308 msgid "e&Xit F10" -msgstr "Konec F10" +msgstr "kon&Ec F10" #: src/main.c:1318 msgid "&Directory tree" -msgstr "&Strom adresáøù" +msgstr "strom a&Dresáøù" #: src/main.c:1320 msgid "&Find file M-?" @@ -5047,15 +5048,15 @@ #: src/main.c:1321 msgid "s&Wap panels C-u" -msgstr "&Prohodit panely C-u" +msgstr "prohodit panel&Y C-u" #: src/main.c:1322 msgid "switch &Panels on/off C-o" -msgstr "Panely &ano/ne C-o" +msgstr "&Panely ano/ne C-o" #: src/main.c:1323 msgid "&Compare directories C-x d" -msgstr "po&Rovnat adresáøe C-x d" +msgstr "porovna&T adresáøe C-x d" #: src/main.c:1324 msgid "e&Xternal panelize C-x !" @@ -5071,15 +5072,15 @@ #: src/main.c:1328 msgid "di&Rectory hotlist C-\\" -msgstr "ho&Tlist adresáøù C-\\" +msgstr "hotlist ad&Resáøù C-\\" #: src/main.c:1330 msgid "&Active VFS list C-x a" -msgstr "Seznam aktivních &VFS C-x a" +msgstr "seznam &Aktivních VFS C-x a" #: src/main.c:1333 msgid "&Background jobs C-x j" -msgstr "úloh&Y na pozadí C-x j" +msgstr "úlohy &Bì¾ící na pozadí C-x j" #: src/main.c:1337 msgid "&Undelete files (ext2fs only)" @@ -5087,11 +5088,11 @@ #: src/main.c:1340 msgid "&Listing format edit" -msgstr "&Upravit formát výpisu" +msgstr "upravit formát &Výpisu" #: src/main.c:1342 msgid "&Extension file edit" -msgstr "&Upravit akce k pøíponám" +msgstr "upravit akc&E k pøíponám" #: src/main.c:1343 msgid "&Menu file edit" @@ -5103,11 +5104,11 @@ #: src/main.c:1350 msgid "c&Onfirmation..." -msgstr "&Potvrzování..." +msgstr "p&Otvrzování..." #: src/main.c:1351 msgid "&Display bits..." -msgstr "&7/8bitù display..." +msgstr "Nastavení &Zobrazení..." #: src/main.c:1353 msgid "learn &Keys..." @@ -5119,7 +5120,7 @@ #: src/main.c:1359 msgid "&Save setup" -msgstr "&Ulo¾it nastavení" +msgstr "ulo¾it na&Stavení" #: src/main.c:1375 src/main.c:1377 msgid " &Left " diff -ruN old/mc-4.5.44/po/da.po new/mc-4.5.45/po/da.po --- old/mc-4.5.44/po/da.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/da.po Tue May 9 18:52:08 2000 @@ -1,43 +1,47 @@ # Danish translation of Midnight Commander # Copyright (C) 1998 Free Software Foundation, Inc. -# Kenneth Christiansen ,1999 -# Birger Langkjer ,1999. +# Kenneth Christiansen , 1999-2000 +# Birger Langkjer , 1999. +# Keld Simonsen , 2000. # # Note: MC består af konsol- (mc) og gtkdel (gmc) # Genveje i konsolen er '&+stort bogstav', resten -# af linien er med småt, så kan sort/hvid brugere +# af linjen er med småt, så kan sort/hvid brugere # lettere se hvilken tast er genvejen. # +#. Not essential to translate +#: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 +#: gtkedit/editcmd.c:2893 gtkedit/editcmd.c:2898 gtkedit/editcmd.c:2943 msgid "" msgstr "" "Project-Id-Version: mc 4.5.41\n" -"POT-Creation-Date: 1999-12-01 16:58+0100\n" -"PO-Revision-Date: 1999-12-16 21:37+01:00\n" -"Last-Translator: Birger Langkjer \n" -"Language-Team: Danish \n" +"POT-Creation-Date: 2000-05-09 05:00+0200\n" +"PO-Revision-Date: 2000-05-07 17:37+01:00\n" +"Last-Translator: Keld Simonsen \n" +"Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:126 msgid " Emacs key: " msgstr " Emacs-tast: " -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 msgid " Execute Macro " msgstr " Kør makro " #. 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:138 edit/edit_key_translator.c:153 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr " Tryk makro genvejstast: " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:149 msgid " Insert Literal " msgstr " Indsæt bogstavlig " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:149 msgid " Press any key: " msgstr " Tryk på en tast: " @@ -64,7 +68,8 @@ msgstr "" "\".\n" "\n" -"For at ordne dette, brug mime-egenskabsredigeringen i GNOME Kontrolcenteret til at redigere standard %s-handling for \"%s\"." +"For at ordne dette, brug mime-egenskabsredigeringen i GNOME Kontrolcenteret " +"til at redigere standard %s-handling for \"%s\"." #: gnome/gaction.c:46 #, c-format @@ -92,15 +97,15 @@ "med kommandoen:\n" "\"%s\"%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "åbn" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "redigér" -#: gnome/gaction.c:331 +#: gnome/gaction.c:351 msgid "view" msgstr "vis" @@ -108,21 +113,25 @@ msgid " There is no other panel to compare contents to " msgstr " Det er ingen andre paneler at sammenligne indhold med " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " Kunne ikke starte en terminal " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "Midnight Commander-holdet" #: gnome/gcmd.c:102 msgid "bug reports: http://bugs.gnome.org, or use gnome-bug" -msgstr "bug-rapporter: http://bugs.gnome.org, eller brug gnome-bug" +msgstr "fejl-rapporter: http://bugs.gnome.org, eller brug bug-buddy" #: gnome/gcmd.c:114 msgid "GNU Midnight Commander" -msgstr "GNU Midnight Commander" +msgstr "Gnu Midnight Commander" #: gnome/gcmd.c:117 msgid "The GNOME edition of the Midnight Commander file manager." -msgstr "GNOME udgaven af Midnight Commander filhåndteringen." +msgstr "Gnome udgaven af Midnight Commander filhåndteringen." #: gnome/gcmd.c:290 msgid "Sort By" @@ -214,7 +223,7 @@ msgstr "Anvend 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" @@ -270,7 +279,7 @@ msgid "Enter a regular expression here to select files in the panel view with." msgstr "Indtast et regulært udtryk som filter til at vælge filer i filvinduet." -#: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 +#: gnome/gcmd.c:917 src/cmd.c:540 src/cmd.c:591 msgid " Malformed regular expression " msgstr " Ugyldigt regulært udtryk " @@ -280,7 +289,7 @@ #: gnome/gcmd.c:963 msgid "Enter the URL:" -msgstr "Indtast URL'en:" +msgstr "Indtast Url'en:" #: gnome/gcustom-layout.c:34 msgid "Access Time" @@ -291,15 +300,15 @@ msgstr "Oprettet den" #. 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" #: gnome/gcustom-layout.c:37 msgid "Group ID" -msgstr "Gruppe-ID" +msgstr "Gruppe-id" #: gnome/gcustom-layout.c:38 msgid "Inode Number" @@ -307,7 +316,7 @@ #: gnome/gcustom-layout.c:39 src/achown.c:378 msgid "Mode" -msgstr "Modus" +msgstr "Tilstand" #: gnome/gcustom-layout.c:40 msgid "Modification Time" @@ -318,7 +327,7 @@ msgstr "Antal hårde lænker" #. 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 "Ejer" @@ -337,7 +346,7 @@ #: gnome/gcustom-layout.c:48 msgid "User ID" -msgstr "Bruger-ID" +msgstr "Bruger-id" #: gnome/gcustom-layout.c:142 msgid "Possible Columns" @@ -351,28 +360,28 @@ msgid "Custom View" msgstr "Personlig visning" -#: gnome/gdesktop.c:521 gnome/gmount.c:389 +#: gnome/gdesktop.c:622 gnome/gmount.c:382 msgid "Warning" msgstr "Advarsel" -#: gnome/gdesktop.c:522 +#: gnome/gdesktop.c:623 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "Kunne ikke åbne %s; kan ikke få skrivebordsikoner" -#: gnome/gdesktop.c:1186 +#: gnome/gdesktop.c:1298 msgid "While running the mount/umount command" msgstr "Under kørsel af montér/afmontér kommando" -#: gnome/gdesktop.c:1255 +#: gnome/gdesktop.c:1367 msgid "While running the eject command" msgstr "Under kørsel af skub-ud kommando" -#: gnome/gdesktop.c:1439 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1551 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "Fejl" -#: gnome/gdesktop.c:2598 +#: gnome/gdesktop.c:2775 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -386,86 +395,86 @@ "\n" "Vi kan ikke lave baggrunden." -#: gnome/gdesktop.c:2621 gnome/glayout.c:362 +#: gnome/gdesktop.c:2798 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2621 gnome/glayout.c:363 +#: gnome/gdesktop.c:2798 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Starter en ny terminal i den nuværende mappe" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2623 gnome/glayout.c:365 +#: gnome/gdesktop.c:2800 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Mappe..." -#: gnome/gdesktop.c:2623 gnome/glayout.c:366 +#: gnome/gdesktop.c:2800 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Opretter en ny mappe" -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2801 msgid "URL L_ink..." -msgstr "_URL-genvej..." +msgstr "_Url-genvej..." -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2801 msgid "Creates a new URL link" -msgstr "Opretter en ny URL-genvej" +msgstr "Opretter en ny Url-genvej" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2802 msgid "_Launcher..." msgstr "_Genvej..." -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2802 msgid "Creates a new launcher" msgstr "Opretter en ny genvej" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2808 msgid "By _Name" msgstr "Efter _navn" -#: gnome/gdesktop.c:2632 +#: gnome/gdesktop.c:2809 msgid "By File _Type" msgstr "Efter _filtype" -#: gnome/gdesktop.c:2633 +#: gnome/gdesktop.c:2810 msgid "By _Size" msgstr "Efter _størrelse" -#: gnome/gdesktop.c:2634 +#: gnome/gdesktop.c:2811 msgid "By Time Last _Accessed" msgstr "Efter sidste _læsningsdato" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2812 msgid "By Time Last _Modified" msgstr "Efter sidste _modifikationsdato" -#: gnome/gdesktop.c:2636 +#: gnome/gdesktop.c:2813 msgid "By Time Last _Changed" msgstr "Efter sidste _ændringsdato" -#: gnome/gdesktop.c:2644 gnome/glayout.c:462 +#: gnome/gdesktop.c:2821 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Arrangér ikoner" -#: gnome/gdesktop.c:2645 +#: gnome/gdesktop.c:2822 msgid "Create _New Window" msgstr "Opret _nyt vindue" -#: gnome/gdesktop.c:2647 gnome/glayout.c:464 +#: gnome/gdesktop.c:2824 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Genindlæs _skrivebordsmappe" -#: gnome/gdesktop.c:2648 gnome/glayout.c:465 +#: gnome/gdesktop.c:2825 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Genindlæs _enheder" -#: gnome/gdesktop.c:2649 gnome/glayout.c:466 +#: gnome/gdesktop.c:2826 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Genskab standard_ikoner" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2828 msgid "Configure _Background Image" -msgstr "Indstil _baggundsbillede" +msgstr "Indstil _baggrundsbillede" #. Icon position #: gnome/gdesktop-prefs.c:242 @@ -559,12 +568,12 @@ msgid "Replace it?" msgstr "Erstat den?" -#: 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 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2400 src/screen.c:2430 src/tree.c:1014 msgid "Copy" msgstr "Kopiér" -#: 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 "Flyt" @@ -596,7 +605,9 @@ msgid "" "Selecting this will copy the files that symlinks point to instead of just " "copying the link." -msgstr "Dette valg vil kopiere de filer som symlænken peger på i stedet for bare at kopiere lænken." +msgstr "" +"Dette valg vil kopiere de filer som symlænken peger på i stedet for bare at " +"kopiere lænken." #: gnome/gdialogs.c:654 msgid "Preserve file attributes." @@ -659,7 +670,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:1833 msgid "Password:" msgstr "Adgangskode:" @@ -680,24 +691,24 @@ msgid "Symbolic link filename:" msgstr "Filnavn for symbolsk lænke:" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "_Flyt hertil" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "_Kopiér hertil" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "_Lav lænke hertil" -#: gnome/gdnd.c:56 +#: gnome/gdnd.c:57 msgid "Cancel drag" msgstr "Annullér træk" #. FIXME: this error message sucks -#: gnome/gdnd.c:192 +#: gnome/gdnd.c:193 #, c-format msgid "" "Could not stat %s\n" @@ -706,9 +717,9 @@ "Kunne ikke køre stat på %s\n" "%s" -#: gnome/gicon.c:218 -msgid "Default set of icons not found, please check your installation" -msgstr "Standardikoner blev ikke fundet, tjek venligst din installation" +#: gnome/gicon.c:282 +msgid "Default set of icons not found, check your installation" +msgstr "Standardsæt af ikoner blev ikke fundet, tjek venligst din installation" #: gnome/glayout.c:41 msgid "_Icon View" @@ -770,7 +781,7 @@ "Are you sure you want to exit?" msgstr "" "Bemærk at hvis du vælger at afslutte filhåndteringen, vil du også\n" -"afslutte GNOME skrivebordshåndteringen.\n" +"afslutte Gnome skrivebordshåndteringen.\n" "\n" "Er du sikker på at du vil afslutte?" @@ -786,9 +797,9 @@ "Filhåndteringen og skrivebordshåndteringen afslutter nu\n" "\n" "Hvis du vil starte filhåndteringen eller skrivebordshåndteringen igen,\n" -"kan du starte den fra panelet eller du kan køre UNIX kommandoen 'gmc'\n" +"kan du starte den fra panelet eller du kan køre Unix kommandoen 'gmc'\n" "\n" -"Tryk OK for at afslutte programmet eller annullér for fortsat at bruge det." +"Tryk Ok for at afslutte programmet eller annullér for fortsat at bruge det." #: gnome/glayout.c:367 msgid "_File..." @@ -799,7 +810,7 @@ msgstr "Opretter en ny fil i denne mappe" #. 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 "_Kopiér..." @@ -807,7 +818,7 @@ msgid "Copy files" msgstr "Kopiér filer" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "_Slet..." @@ -815,7 +826,7 @@ msgid "Delete files" msgstr "Slet filer " -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "_Flyt..." @@ -863,7 +874,7 @@ msgid "Reverses the list of tagged files" msgstr "Omvendt rækkefølge af mærkede filer" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2085 msgid "Search" msgstr "Søg" @@ -871,7 +882,7 @@ msgid "Search for a file in the current Panel" msgstr "Søg efter en fil i det aktive panel" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "_Opdatér mappe" @@ -975,291 +986,298 @@ "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 "" -"Du kører GNOME filhåndteringen som administrator (root).\n" +"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å.\n" -"GNOME filhåndteringen vil ikke forhindre dig i det." +"Gnome filhåndteringen vil ikke forhindre dig i det." -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "Kunne ikke åbne /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 lave symbolsk lænke fra %s til %s; kan ikke lave " "skrivebordsenhedsikon." -#: gnome/gmount.c:446 +#: gnome/gmount.c:439 #, c-format msgid "CD-ROM %d" -msgstr "Cd-rom %d" +msgstr "Cdrom %d" -#: gnome/gmount.c:458 +#: gnome/gmount.c:451 #, c-format msgid "Floppy %d" msgstr "Diskette %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 mappe %s" +msgstr "NFS-mappe %s" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "Enhed %d" #. we set the file part -#: gnome/gnome-file-property-dialog.c:170 +#: gnome/gnome-file-property-dialog.c:171 msgid "Full Name: " msgstr "Fulde 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 lænke" -#: gnome/gnome-file-property-dialog.c:212 +#: gnome/gnome-file-property-dialog.c:222 msgid "Target Name: INVALID LINK" msgstr "Målnavn: UGYLDIG LÆNKE" -#: 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: Mappe" -#: gnome/gnome-file-property-dialog.c:222 +#: gnome/gnome-file-property-dialog.c:232 msgid "File Type: Character Device" msgstr "Filtype: Tegnsæt-enhed" -#: gnome/gnome-file-property-dialog.c:224 +#: gnome/gnome-file-property-dialog.c:234 msgid "File Type: Block Device" msgstr "Filtype: Blok-enhed" -#: gnome/gnome-file-property-dialog.c:226 +#: gnome/gnome-file-property-dialog.c:236 msgid "File Type: Socket" -msgstr "Filtype: Socket" +msgstr "Filtype: Sokkel" -#: 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 " byte" -#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:252 msgid " KBytes (" -msgstr " KByte (" +msgstr " Kbyte (" -#: 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 " byte)" -#: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:258 msgid " MBytes (" -msgstr " MByte (" +msgstr " Mbyte (" -#: 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 oprettet den: " -#: gnome/gnome-file-property-dialog.c:276 +#: gnome/gnome-file-property-dialog.c:281 +#: gnome/gnome-file-property-dialog.c:290 +#: gnome/gnome-file-property-dialog.c:299 +msgid "%a, %b %d %Y, %I:%M:%S %p" +msgstr "%a, %b %d %Y, %I:%M:%S %p" + +#: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "Sidste modifikation: " -#: gnome/gnome-file-property-dialog.c:285 +#: gnome/gnome-file-property-dialog.c:295 msgid "Last Accessed on: " msgstr "Sidst læst den: " -#: gnome/gnome-file-property-dialog.c:303 +#: gnome/gnome-file-property-dialog.c:313 msgid "URL:" -msgstr "URL:" +msgstr "Url:" -#: gnome/gnome-file-property-dialog.c:310 +#: gnome/gnome-file-property-dialog.c:320 msgid "Caption:" msgstr "Overskrift:" -#: 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 "Slip handling" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 msgid "Use default Drop Action options" msgstr "Brug standard for \"slip\" handling" -#: 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 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 +#: src/screen.c:2398 src/screen.c:2428 msgid "View" msgstr "Vis" -#: gnome/gnome-file-property-dialog.c:404 +#: gnome/gnome-file-property-dialog.c:414 msgid "Use default View options" msgstr "Brug standard visning" -#: gnome/gnome-file-property-dialog.c:439 +#: gnome/gnome-file-property-dialog.c:449 msgid "Select an Icon" msgstr "Vælg en 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 "Åbn" -#: gnome/gnome-file-property-dialog.c:479 +#: gnome/gnome-file-property-dialog.c:489 msgid "Use default Open action" msgstr "Brug standard \"Åbn\" handling" -#: gnome/gnome-file-property-dialog.c:502 +#: gnome/gnome-file-property-dialog.c:512 msgid "Use default Drop action" msgstr "Brug standard \"Træk\" handling" -#: gnome/gnome-file-property-dialog.c:504 +#: gnome/gnome-file-property-dialog.c:514 msgid "Use default View action" msgstr "Brug standard \"Vis\" handling" -#: 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:2399 src/screen.c:2429 src/view.c:2081 msgid "Edit" msgstr "Redigér" -#: gnome/gnome-file-property-dialog.c:523 +#: gnome/gnome-file-property-dialog.c:533 msgid "Use default Edit action" msgstr "Brug standard redigeringsprogram" -#: 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 "Filbehandling" -#: gnome/gnome-file-property-dialog.c:616 +#: gnome/gnome-file-property-dialog.c:626 msgid "Open action" msgstr "Åbningshandling" -#: gnome/gnome-file-property-dialog.c:617 +#: gnome/gnome-file-property-dialog.c:627 msgid "Needs terminal to run" msgstr "Er afhængig af terminal" -#: gnome/gnome-file-property-dialog.c:742 +#: gnome/gnome-file-property-dialog.c:753 msgid "File Permissions" msgstr "Filrettigheder" -#: 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 "Nuværende modus: " +msgstr "Nuværende tilstand: " #. 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 "Læs" -#: 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 "Skriv" -#: 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 "Kør" -#: 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 "Speciel" #. 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 "Bruger" -#: 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 "Sæt 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 "Sæt 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 "Klæbrig" -#: 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 "Filejer" -#: gnome/gnome-file-property-dialog.c:1079 +#: gnome/gnome-file-property-dialog.c:1097 msgid "URL" -msgstr "URL" +msgstr "Url" -#: gnome/gnome-file-property-dialog.c:1082 +#: gnome/gnome-file-property-dialog.c:1100 msgid "Statistics" msgstr "Statistik" -#: gnome/gnome-file-property-dialog.c:1088 +#: gnome/gnome-file-property-dialog.c:1106 msgid "Options" msgstr "Indstillinger" -#: gnome/gnome-file-property-dialog.c:1091 +#: gnome/gnome-file-property-dialog.c:1109 msgid "Permissions" msgstr "Rettigheder" -#: gnome/gnome-file-property-dialog.c:1094 +#: gnome/gnome-file-property-dialog.c:1112 msgid " Properties" msgstr " Egenskaber" -#: 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 har indtastet et ugyldigt brugernavn" -#: gnome/gnome-file-property-dialog.c:1202 +#: gnome/gnome-file-property-dialog.c:1220 msgid "You must rename your file to something" msgstr "Du skal omdøbe filen til noget" -#: 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 omdøbe filen til et navn, der indeholder et '/' tegn" @@ -1305,8 +1323,8 @@ msgid "Copy..." msgstr "Kopiér..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2403 +#: src/screen.c:2433 msgid "Delete" msgstr "Slet" @@ -1346,71 +1364,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Brug skal-udtryk i stedet for regulære udtryk" -#: gnome/gprefs.c:113 +#: gnome/gprefs.c:108 +msgid "Determine file types from file content instead of extensions" +msgstr "Bestem filtyper fra indhold i stedet for efternavn" + +#: gnome/gprefs.c:117 msgid "Confirm when deleting file" msgstr "Bekræft sletning af fil" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "Bekræft overskrivning af filer" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "Bekræft kørsel af filer" -#: gnome/gprefs.c:125 +#: gnome/gprefs.c:129 msgid "Show progress while operations are being performed" msgstr "Vis fremgangsindikator mens operationer udføres" -#: gnome/gprefs.c:134 +#: gnome/gprefs.c:138 msgid "VFS Timeout:" msgstr "VFS tidudløb:" -#: 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 "Adgangskode for anonym FTP:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "Brug altid FTP-proxy" -#: gnome/gprefs.c:151 +#: gnome/gprefs.c:155 msgid "Fast directory reload" msgstr "Hurtig mappeopdatering" -#: 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 "FTP-mappe mellemlager timeout :" +msgstr "FTP-mappe buffer tidsudløb :" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:167 msgid "Allow customization of icons in icon view" msgstr "Indstil selv hvordan ikoner skal se ud" -#: gnome/gprefs.c:172 +#: gnome/gprefs.c:176 msgid "File display" msgstr "Filvisning" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:180 msgid "Confirmation" msgstr "Bekræftelse" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:184 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" -msgstr "Mellemlager" +msgstr "Bufring" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "Indstillinger" @@ -1436,7 +1458,7 @@ #: gnome/gprop.c:248 msgid "File mode (permissions)" -msgstr "Filmodus (rettigheder)" +msgstr "Filtilstand (rettigheder)" #: gnome/gprop.c:321 gnome/gprop.c:347 msgid "" @@ -1454,108 +1476,108 @@ msgid "Select icon" msgstr "Vælg ikon" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Genindlæs den aktuelle mappe" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "Ny _mappe..." -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "Opretter en ny mappe 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 "Opretter en ny fil her" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "Søg: %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "%s byte i %d fil" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "%s byte 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 "Kopiér mappe" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "Slet mappe" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "Omdøb eller flyt mappe" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Tilbage" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Gå tilbage til den forrige mappe" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Op" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Gå et niveau op i mappehierarkiet" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Fremad" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Gå til næste mappe" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Opdatér" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Opdatér den aktuelle mappe" -#: 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 hjemmemappe" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "Placering:" #. 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:1235 +#: gtkedit/editcmd.c:1320 gtkedit/editcmd.c:3027 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&OK" @@ -1564,12 +1586,12 @@ msgid "Offset 0x%08lx" msgstr "Afstand 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "Kol %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s byte" @@ -1659,201 +1681,239 @@ msgid "Could not get the desktop\n" msgstr "Kunne ikke få skrivebordet\n" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "Ukendt sorteringstype `%s'\n" + +#: gnome/gmc-client.c:206 msgid "Create window showing the specified directory" msgstr "Opret vindue som viser den angivede mappe" -#: gnome/gmc-client.c:171 gnome/gmc-client.c:173 +#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 msgid "DIRECTORY" msgstr "DIRECTORY" -#: gnome/gmc-client.c:173 +#: gnome/gmc-client.c:208 msgid "Rescan the specified directory" msgstr "Genindlæs den aktuelle mappe" -#: gnome/gmc-client.c:175 +#: gnome/gmc-client.c:210 msgid "Rescan the desktop icons" msgstr "Genindlæs skrivebordsikonerne" -#: gnome/gmc-client.c:177 +#: gnome/gmc-client.c:212 msgid "Rescan the desktop device icons" msgstr "Genindlæs skrivebordsenhedsikonerne" -#: gnome/gmc-client.c:179 +#: gnome/gmc-client.c:214 +msgid "Arrange the desktop icons" +msgstr "Ord skrivebordsikonerne" + +#: 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 "Luk de vinduer hvis mapper ikke kan nåes" #. 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:149 gtkedit/edit.c:318 gtkedit/edit.c:323 gtkedit/edit.c:337 +#: gtkedit/edit.c:341 gtkedit/edit.c:373 gtkedit/edit.c:379 gtkedit/edit.c:386 +#: gtkedit/edit.c:393 gtkedit/edit.c:399 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2031 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/tree.c:682 src/tree.c:688 src/wtools.c:222 msgid " Error " msgstr " Fejl " -#: gtkedit/edit.c:132 gtkedit/edit.c:234 +#: gtkedit/edit.c:149 gtkedit/edit.c:341 gtkedit/edit.c:379 msgid " Failed trying to open file for reading: " msgstr " Fejl under åbning af fil for læsning: " -#: gtkedit/edit.c:241 +#: gtkedit/edit.c:318 +msgid " Error reading from pipe: " +msgstr " Problem under læsning fra rør: " + +#: gtkedit/edit.c:323 +msgid " Failed trying to open pipe for reading: " +msgstr " Fejl ved forsøg på åbning af rør for læsning: " + +#: gtkedit/edit.c:337 +msgid " Error reading file: " +msgstr " Fejl ved læsning af fil " + +#: gtkedit/edit.c:386 msgid " Cannot get size/permissions info on file: " msgstr " Kan ikke finde størrelse-/rettighedsinformation for filen: " -#: gtkedit/edit.c:248 +#: gtkedit/edit.c:393 msgid " Not an ordinary file: " msgstr " Ikke en normal fil: " -#: gtkedit/edit.c:254 +#: gtkedit/edit.c:399 msgid " File is too large: " msgstr " Filen er for stor: " -#: gtkedit/edit.c:255 +#: gtkedit/edit.c:400 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " msgstr "" " \n" -" Gør edit.h:MAXBUF større og rekompilér editoren. " +" Gør edit.h:MAXBUF større og omkompilér editoren. " + +#: gtkedit/edit.c:2571 +msgid "User menu avalaible only in mcedit invoked from mc" +msgstr "Brugermenuen er kun tilgængelig i mcedit startet fra mc" -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr " Fejl under hukommelsestildeling " +#. Not essential to translate +#: gtkedit/edit.c:2769 gtkedit/editcmd.c:2945 +msgid "Error trying to stat file:" +msgstr " Fejl under stat af fil:" + +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " Fejl ved skrivning af fil " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr " Fejl ved forsøg på åbning af rør for skrivning: " -#: gtkedit/editcmd.c:334 +#: gtkedit/editcmd.c:379 msgid "Quick save " msgstr "Gem hurtigt " -#: gtkedit/editcmd.c:335 +#: gtkedit/editcmd.c:380 msgid "Safe save " msgstr "Gem sikkert " -#: gtkedit/editcmd.c:336 +#: gtkedit/editcmd.c:381 msgid "Do backups -->" msgstr "Lav sikkerhedskopier -->" #. 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:1189 gtkedit/editcmd.c:1233 +#: gtkedit/editcmd.c:1318 gtkedit/editcmd.c:3025 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/chmod.c:114 src/chown.c:79 src/cmd.c:858 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 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "&Annullér" -#: gtkedit/editcmd.c:345 +#: gtkedit/editcmd.c:390 msgid "Extension:" msgstr "Udvidelse" #. NLS ? -#: gtkedit/editcmd.c:352 +#: gtkedit/editcmd.c:397 msgid " Edit Save Mode " msgstr " Redigér gemmemåde " -#: gtkedit/editcmd.c:499 +#: gtkedit/editcmd.c:525 msgid " Save As " msgstr " Gem 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 -#: 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 +#: gtkedit/editcmd.c:539 gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 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 navn 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:1671 msgid "Cancel" msgstr "Annullér" -#: gtkedit/editcmd.c:535 +#: gtkedit/editcmd.c:561 msgid " Save as " msgstr " Gem som " -#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2771 msgid " Error trying to save file. " msgstr " Fejl under gemning af 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 " Slet makro " #. 'Open' = load temp file -#: gtkedit/editcmd.c:655 +#: gtkedit/editcmd.c:681 msgid " Error trying to open temp file " msgstr " Fejl under åbning af 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 " Fejl under åbning af 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 " Fejl under overskriving af 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 " Tryk makroens nye hurtigtast: " #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:724 +#: gtkedit/editcmd.c:750 msgid " Save macro " msgstr " Gem makro " -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:767 msgid " Delete Macro " msgstr " Slet makro " #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:791 +#: gtkedit/editcmd.c:817 msgid " Load macro " msgstr " Hent makro " -#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833 msgid " Confirm save file? : " msgstr " Bekræft gem fil? : " #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 msgid " Save file " msgstr " Gem 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:2077 msgid "Save" msgstr "Gem" -#: 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. " @@ -1861,118 +1921,113 @@ " Teksten er ændret uden at have været gemt. \n" " Fortsæt vil forkaste disse ændringer. " -#: 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 "Forsæt" -#. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +#: gtkedit/editcmd.c:893 msgid " Load " msgstr " Hent " -#: gtkedit/editcmd.c:859 -msgid " Error trying to open file for reading " -msgstr " Fejl under åbning af fil for læsning " - -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 msgid " Block is large, you may not be able to undo this action. " msgstr " Blokken er stor, du kan muligvis ikke fortryde denne handling. " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1136 msgid " Continue " msgstr " Fortsæt " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1136 msgid " Cancel " msgstr " Annullér " -#: gtkedit/editcmd.c:1173 +#: gtkedit/editcmd.c:1191 msgid "o&Ne" msgstr "é&N" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1193 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:1195 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Spring over" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1197 msgid "&Replace" msgstr "&Erstat" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1203 gtkedit/editcmd.c:1671 msgid " Replace with: " msgstr " Erstat med: " -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1207 msgid " Confirm replace " msgstr " Bekræft erstat " -#: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 +#: gtkedit/editcmd.c:1237 gtkedit/editcmd.c:1322 msgid "scanf &Expression" msgstr "scanf &Udtryk" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1239 msgid "replace &All" msgstr "&Erstat alle" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1241 msgid "pr&Ompt on replace" msgstr "s&Pørg før erstat" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1243 gtkedit/editcmd.c:1324 msgid "&Backwards" msgstr "&Baglæns" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1326 msgid "&Regular expression" msgstr "&Regulært udtryk" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1247 gtkedit/editcmd.c:1328 msgid "&Whole words only" msgstr "&Kun hele ord" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1249 gtkedit/editcmd.c:1330 msgid "case &Sensitive" msgstr "forskel på &Store og små bogstaver" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1253 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " Indtast argumentrækkefølge f.eks 3,2,1,4 : " -#: gtkedit/editcmd.c:1241 +#: gtkedit/editcmd.c:1257 msgid " Enter replacement string:" msgstr " Indtast erstatningstekst:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1261 gtkedit/editcmd.c:1334 src/view.c:2000 msgid " Enter search string:" msgstr " Indtast søgetekst:" #. 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:1280 gtkedit/editcmd.c:1584 gtkedit/editcmd.c:1671 +#: gtkedit/editcmd.c:2210 gtkedit/editcmd.c:2241 gtkedit/editcmd.c:2243 msgid " Replace " msgstr " Erstat " #. 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:1348 gtkedit/editcmd.c:1578 gtkedit/editcmd.c:2309 +#: gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 src/view.c:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 msgid " Search " msgstr " Søg " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1382 +#: gtkedit/editcmd.c:1402 msgid " Enter search text : " msgstr " Indtast søgetekst : " -#: gtkedit/editcmd.c:1389 +#: gtkedit/editcmd.c:1409 msgid " Enter replace text : " msgstr " Indtast erstatningstekst : " -#: gtkedit/editcmd.c:1392 gtkedit/editcmd.c:1393 +#: gtkedit/editcmd.c:1412 gtkedit/editcmd.c:1413 #, c-format msgid "" "You can enter regexp substrings with %s\n" @@ -1981,12 +2036,12 @@ "Du kan indtaste regex understrenge med %s\n" "(ikke \\1, \\2 ligesom sed) og så bruge \"Enter...orden\"" -#: gtkedit/editcmd.c:1395 +#: gtkedit/editcmd.c:1415 msgid " Enter argument (or substring) order : " msgstr " Indtast argumentrækkefølge : " #. Tool hint -#: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1419 gtkedit/editcmd.c:1420 msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" @@ -1995,54 +2050,68 @@ "format specificerer eller regexp understrenge, f.eks. 3,1,2" #. The following are check boxes -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1425 msgid " Whole words only " msgstr " Kun hele ord " -#: gtkedit/editcmd.c:1407 +#: gtkedit/editcmd.c:1427 msgid " Case sensitive " msgstr " Forskel på store og små bogstaver " -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1430 msgid " Regular expression " msgstr " Regulært udtryk " -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1431 gtkedit/editcmd.c:1432 msgid "" "See the regex man page for how\n" "to compose a regular expression" msgstr "" "Læs manualsiden for regex for at se\n" -"hvordan et regulart udtryk er sat sammen" +"hvordan et regulært udtryk er sat sammen" -#: gtkedit/editcmd.c:1418 +#: gtkedit/editcmd.c:1440 msgid " Backwards " msgstr " Baglæns " #. Tool hint -#: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 +#: gtkedit/editcmd.c:1442 gtkedit/editcmd.c:1443 msgid "Warning: Searching backward can be slow" msgstr "Advarsel: Baglæns søgning kan være tidskrævende" -#: gtkedit/editcmd.c:1434 +#: gtkedit/editcmd.c:1464 msgid " Prompt on replace " msgstr " Spørg ved erstatning " #. Tool hint -#: gtkedit/editcmd.c:1436 +#: gtkedit/editcmd.c:1466 msgid "Ask before making each replacement" msgstr "Spørg før udførelse af hver erstatning" -#: gtkedit/editcmd.c:1438 +#: gtkedit/editcmd.c:1468 msgid " Replace all " msgstr " Erstat alle " -#: gtkedit/editcmd.c:1441 +#. Tool hint +#: gtkedit/editcmd.c:1470 +msgid "Replace repeatedly" +msgstr "Gentagen erstat" + +#: gtkedit/editcmd.c:1474 +msgid " Bookmarks " +msgstr "Bogmærker " + +#. Tool hint +#: gtkedit/editcmd.c:1476 gtkedit/editcmd.c:1477 +msgid "Create bookmarks at all lines found" +msgstr "Opret bogmærker for alle linier som blev fundet" + +#: gtkedit/editcmd.c:1480 msgid " Scanf expression " msgstr " Scanf udtryk " #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1482 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2051,57 +2120,62 @@ "se manualsiden for scanf" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1507 msgid "Begin search, Enter" msgstr "Begynd søgning, tryk Enter" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1508 msgid "Abort this dialog, Esc" msgstr "Afbryd denne dialog, Tryk Esc" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Replace" msgstr "Erstat" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Skip" msgstr "Spring over" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Replace all" msgstr "Erstat alle" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Replace one" msgstr "Erstat én" -#: gtkedit/editcmd.c:1969 +#: gtkedit/editcmd.c:2031 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" " Ugyldig regulært udtryk, eller scanf udtryk med for mange omsætninger " #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2149 +#: gtkedit/editcmd.c:2212 msgid " Error in replacement format string. " msgstr " Fejl i erstatningstekstens format. " -#: gtkedit/editcmd.c:2177 +#: gtkedit/editcmd.c:2240 #, c-format msgid " %ld replacements made. " msgstr " %ld erstatninger udført. " -#: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 +#: gtkedit/editcmd.c:2243 gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 msgid " Search string not found. " msgstr " Søgetekst ikke fundet. " +#. in response to number of bookmarks added because of string being found %d times +#: gtkedit/editcmd.c:2308 +#, c-format +msgid " %d finds made, %d bookmarks added " +msgstr "%d fund gjort, %d bogmærker tilføjet" + #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2379 gtkedit/editcmd.c:2382 msgid " Quit " msgstr " Afslut " -#: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2365 gtkedit/editcmd.c:2383 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -2109,154 +2183,164 @@ " Teksten er ændret uden at have været gemt. \n" " Gem ved afslutning? " -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2379 msgid " File was modified, Save with exit? " msgstr " Filen blev ændret, Gem ved afslutning? " -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2379 msgid "Cancel quit" msgstr "Annullér afslut" -#: 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:2379 src/cmd.c:246 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:406 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:2379 src/cmd.c:246 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:406 msgid "&No" msgstr "&Nej" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2383 msgid " &Cancel quit " msgstr " &Annullér afslut " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2383 msgid " &Yes " msgstr " &Ja " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2383 msgid " &No " msgstr " &Nej " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2690 msgid " Copy to clipboard " msgstr " Kopiér til klipbord " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 -#: gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2690 +#: gtkedit/editcmd.c:2703 msgid " Unable to save to file. " msgstr " Kunne ikke gemme filen. " -#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2703 msgid " Cut to clipboard " msgstr " Klip til klipbord " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 src/view.c:1915 msgid " Goto line " -msgstr " Gå til linie " +msgstr " Gå til linje " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 msgid " Enter line: " -msgstr " Indtast linie: " +msgstr " Indtast linje: " -#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2758 gtkedit/editcmd.c:2771 msgid " Save Block " msgstr " Gem blok " -#: gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2785 msgid " Insert File " msgstr " Indsæt fil " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2798 msgid " Insert file " msgstr " Indsæt fil " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2798 msgid " Error trying to insert file. " msgstr " Fejl under indsætning af fil. " #. Not essential to translate -#: gtkedit/editcmd.c:2752 +#: gtkedit/editcmd.c:2820 msgid " Sort block " msgstr " Sortér blok " #. Not essential to translate -#: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 +#: gtkedit/editcmd.c:2820 gtkedit/editcmd.c:2908 msgid " You must first highlight a block of text. " msgstr " Du skal først markere en tekstblok. " -#: gtkedit/editcmd.c:2759 +#: gtkedit/editcmd.c:2827 msgid " Run Sort " msgstr " Kør sortering " #. Not essential to translate -#: gtkedit/editcmd.c:2761 +#: gtkedit/editcmd.c:2829 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Indtast sorteringsmuligheder (se manside) adskilt af mellemrum: " -#: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 +#: gtkedit/editcmd.c:2840 gtkedit/editcmd.c:2846 msgid " Sort " msgstr " Sortér " #. Not essential to translate -#: gtkedit/editcmd.c:2774 +#: gtkedit/editcmd.c:2842 msgid " Error trying to execute sort command " msgstr " Fejl under kørsel af sorteringskommando " #. Not essential to translate -#: gtkedit/editcmd.c:2780 +#: gtkedit/editcmd.c:2848 msgid " Sort returned non-zero: " -msgstr " Sortering returnede ikke-null: " +msgstr " Sortering returnede ikke-nul: " -#. Not essential to translate -#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 -msgid " Process block " -msgstr " Procesblok " +#: gtkedit/editcmd.c:2881 +msgid "Error create script:" +msgstr "Fejl ved oprettelse af skript:" -#. Not essential to translate -#: gtkedit/editcmd.c:2836 -msgid " Error trying to stat file " -msgstr " Fejl under stat af fil " +#: gtkedit/editcmd.c:2887 +msgid "Error read script:" +msgstr "Fejl ved læsning af skript:" + +#: gtkedit/editcmd.c:2894 +msgid "Error close script:" +msgstr "Fejl ved lukning af skript" -#: gtkedit/editcmd.c:2907 +#: gtkedit/editcmd.c:2899 +msgid "Script created:" +msgstr "Skript oprettet:" + +#: gtkedit/editcmd.c:2906 +msgid "Process block" +msgstr "Procesblok" + +#: gtkedit/editcmd.c:3018 msgid " Mail " msgstr " Send " -#: gtkedit/editcmd.c:2920 +#: gtkedit/editcmd.c:3031 msgid " Copies to" msgstr " Kopiér til" -#: gtkedit/editcmd.c:2924 +#: gtkedit/editcmd.c:3035 msgid " Subject" msgstr " Emne" -#: gtkedit/editcmd.c:2928 +#: gtkedit/editcmd.c:3039 msgid " To" msgstr " Til" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:3041 msgid " mail -s -c " msgstr " mail -s -c " -#: gtkedit/editmenu.c:61 +#: gtkedit/editmenu.c:62 msgid " Word wrap " msgstr " Tekstombrydning " #. Not essential to translate -#: gtkedit/editmenu.c:63 +#: gtkedit/editmenu.c:64 msgid " Enter line length, 0 for off: " msgstr " Indtast linielængden, 0 slår fra: " -#: gtkedit/editmenu.c:74 +#: gtkedit/editmenu.c:75 msgid " About " msgstr " Om... " -#: gtkedit/editmenu.c:75 +#: gtkedit/editmenu.c:76 msgid "" "\n" " Cooledit v3.11.5\n" @@ -2272,343 +2356,355 @@ " Ophavsret (C) 1996 the Free Software Foundation\n" "\n" " En brugervenlig teksteditor skrevet\n" -" for Midnight Commander.\n" +" til Midnight Commander.\n" -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:147 msgid "&Open/load... C-o" msgstr "å&Bn/indlæs... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:129 msgid "&New C-n" msgstr "&Ny C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:131 gtkedit/editmenu.c:150 msgid "&Save F2" msgstr "&Gem F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:151 msgid "save &As... F12" msgstr "gem &Som... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:153 msgid "&Insert file... F15" msgstr "&Indsæt fil... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:135 msgid "copy to &File... C-f" msgstr "kopiér til &Fil...C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:137 gtkedit/editmenu.c:156 +msgid "&User menu... F11" +msgstr "&Brugermenu... F11" + +#: gtkedit/editmenu.c:140 gtkedit/editmenu.c:159 msgid "a&Bout... " msgstr "&Om... " -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:142 gtkedit/editmenu.c:161 msgid "&Quit F10" msgstr "Af&slut F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:148 msgid "&New C-x k" msgstr "&Ny C-x k" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:154 msgid "copy to &File... " msgstr "kopiér til &Fil... " -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Toggle Mark F3" msgstr "Slå &Mærke til/fra F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Mark Columns S-F3" msgstr "&Mærk kolonner S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:169 gtkedit/editmenu.c:186 msgid "toggle &Ins/overw Ins" msgstr "&Indsæt/overskriv Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:171 gtkedit/editmenu.c:188 msgid "&Copy F5" msgstr "&Kopiér F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:172 gtkedit/editmenu.c:189 msgid "&Move F6" msgstr "&Flyt F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:173 gtkedit/editmenu.c:190 msgid "&Delete F8" msgstr "&Slet F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:175 gtkedit/editmenu.c:192 msgid "&Undo C-u" msgstr "&Fortryd C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:177 gtkedit/editmenu.c:194 msgid "&Beginning C-PgUp" msgstr "&Begyndelse C-PgUp" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:178 gtkedit/editmenu.c:195 msgid "&End C-PgDn" msgstr "s&Lutning C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:207 msgid "&Search... F7" msgstr "&Søg... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:208 msgid "search &Again F17" msgstr "&Gentag søgning F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:209 msgid "&Replace... F4" msgstr "&Erstat... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "&Goto line... M-l" msgstr "&Gå til linie... M-l" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:238 +msgid "goto matching &Bracket M-b" +msgstr "gå til passende &Klamme M-b" + +#: gtkedit/editmenu.c:217 gtkedit/editmenu.c:240 msgid "insert &Literal... C-q" msgstr "indsæt &Bogstavelig... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:242 msgid "&Refresh screen C-l" msgstr "&Opdatér skærmen C-l" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "&Start record macro C-r" msgstr "&Start makroindspilning C-r" -#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:222 gtkedit/editmenu.c:245 msgid "&Finish record macro... C-r" msgstr "S&top makroindspilning C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:223 msgid "&Execute macro... C-a, KEY" msgstr "&Kør makro... C-a, TAST" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:224 gtkedit/editmenu.c:247 msgid "delete macr&O... " msgstr "slet makr&O... " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:226 gtkedit/editmenu.c:249 msgid "insert &Date/time " msgstr "indsæt &Dato/tid " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:228 gtkedit/editmenu.c:251 msgid "format p&Aragraph M-p" msgstr "formatér &Afsnit M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:229 msgid "'ispell' s&Pell check C-p" msgstr "'&Ispell' stavekontrol C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:230 gtkedit/editmenu.c:253 msgid "sor&T... M-t" msgstr "sor&Tér... M-t" -#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 -msgid "'indent' &C Formatter F19" -msgstr "'indryk' &C-formatering F19" +#: gtkedit/editmenu.c:231 gtkedit/editmenu.c:254 +msgid "E&xternal Formatter F19" +msgstr "E&kstern formatering F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:232 msgid "&Mail... " msgstr "&Send... " -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:246 msgid "&Execute macro... C-x e, KEY" msgstr "&Kør makro... C-x e, TAST" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:252 msgid "'ispell' s&Pell check M-$" msgstr "'&Ispell' stavekontrol M-$" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:261 gtkedit/editmenu.c:270 msgid "&General... " msgstr "&Generelt... " -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:262 gtkedit/editmenu.c:271 msgid "&Save mode..." msgstr "Gemme&måde..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1353 +#: gtkedit/editmenu.c:264 gtkedit/editmenu.c:273 src/main.c:1357 msgid "&Layout..." msgstr "&Udseende..." #. 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:283 gtkedit/editmenu.c:292 gtkedit/editmenu.c:409 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr " Filer " -#: gtkedit/editmenu.c:271 gtkedit/editmenu.c:280 gtkedit/editmenu.c:412 +#: gtkedit/editmenu.c:284 gtkedit/editmenu.c:293 gtkedit/editmenu.c:425 msgid " Edit " msgstr " Redigér " -#: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 +#: gtkedit/editmenu.c:285 gtkedit/editmenu.c:294 msgid " Sear/Repl " msgstr " Søg/Erstat " -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 +#: gtkedit/editmenu.c:286 gtkedit/editmenu.c:295 gtkedit/editmenu.c:465 msgid " Command " msgstr " Kommando " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +#: gtkedit/editmenu.c:287 gtkedit/editmenu.c:296 msgid " Options " msgstr " Indstillinger " -#: gtkedit/editmenu.c:397 +#: gtkedit/editmenu.c:410 msgid "Open...\tC-o" msgstr "Åbn...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:411 msgid "New\tC-n" msgstr "Ny\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:413 msgid "Save\tF2" msgstr "Gem\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:414 msgid "Save as...\tF12" msgstr "Gem som...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:416 msgid "Insert file...\tF15" msgstr "Indsæt fil...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:417 msgid "Copy to file...\tC-f" msgstr "Kopiér til fil...\tC-f" #. Tool hint -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:420 msgid "Disk operations and file indexing/searching" msgstr "Diskoperationer og filindeksing/søgning" -#: gtkedit/editmenu.c:413 +#: gtkedit/editmenu.c:426 msgid "Toggle mark\tF3" msgstr "Mærke til/fra\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:427 msgid "Toggle mark columns\tC-b" msgstr "Kolonnemærke til/fra\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:429 msgid "Toggle book mark\tC-M-Ins" msgstr "Bogmærke til/fra\tF3" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:430 msgid "Previous book mark\tC-M-Up" msgstr "Forrige bogmærke\tC-M-Op" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:431 msgid "Next book mark\tC-M-Down" msgstr "Næste bogmærke\tC-M-Ned" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:432 msgid "Flush book marks" msgstr "Smid bogmærker væk" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:434 msgid "Toggle insert/overwrite\tIns" msgstr "Overskriv til/fra\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:436 msgid "Copy block to cursor\tF5" msgstr "Kopiér blok til markøren\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:437 msgid "Move block to cursor\tF6" msgstr "Flyt blok til markøren\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:438 msgid "Delete block\tF8/C-Del" msgstr "Slet blok\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:440 msgid "Copy block to clipbrd\tC-Ins" msgstr "Kopiér blok\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:441 msgid "Cut block to clipbrd\tS-Del" msgstr "Klip blok\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:442 msgid "Paste block from clipbrd\tS-Ins" msgstr "Indsæt blok\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:443 msgid "Selection history\tM-Ins" msgstr "Markeringshistorie\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:445 msgid "Undo\tC-BackSpace" msgstr "Fortryd\tC-Backspace" #. Tool hint -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:448 msgid "Manipulating blocks of text" msgstr "Manipulér blokke af tekst" -#: gtkedit/editmenu.c:440 +#: gtkedit/editmenu.c:453 msgid " Srch/Replce " msgstr " Søg/Erstat " -#: gtkedit/editmenu.c:441 +#: gtkedit/editmenu.c:454 msgid "Search...\tF7" msgstr "Søg...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:455 msgid "Search again\tF17" msgstr "Søg igen\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:456 msgid "Replace...\tF4" msgstr "Erstat...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:457 msgid "Replace again\tF14" msgstr "Erstat igen\tF14" #. Tool hint -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:460 msgid "Search for and replace text" msgstr "Søg efter og erstat tekst" -#: gtkedit/editmenu.c:453 +#: gtkedit/editmenu.c:466 msgid "Goto line...\tM-l" msgstr "Gå til linie...\tM-l" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:467 +msgid "Goto matching bracket\tM-b" +msgstr "Gå til passende klamme\tM-b" + +#: gtkedit/editmenu.c:469 msgid "Start record macro\tC-r" msgstr "Start makroindspilning\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:470 msgid "Finish record macro...\tC-r" msgstr "Afslut makroindspilning...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:471 msgid "Execute macro...\tC-a, KEY" msgstr "Kør makro...\tC-a, TAST" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:472 msgid "Delete macro...\t" msgstr "Slet makro...\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:474 msgid "Insert date/time\tC-d" msgstr "Indsæt dato/klokkeslet\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:475 msgid "Format paragraph\tM-p" msgstr "Formatér sætning\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:477 msgid "Refresh display\tC-l" msgstr "Opdatér skærmen\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:480 msgid "Macros and internal commands" msgstr "Makroer og interne kommandoer" @@ -2633,84 +2729,84 @@ msgstr "Skrivemaskineombrydning" #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "Indtast linielængde: " #. 4 -#: gtkedit/editoptions.c:80 +#: gtkedit/editoptions.c:78 msgid "Tab spacing : " msgstr "Tabulatorafstand : " -#: gtkedit/editoptions.c:88 +#: gtkedit/editoptions.c:86 msgid "synta&X highlighting" msgstr "synta&X farvning" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "&Bekræft før gemning" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "fyld tabs med &Mellemrum" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "&Return laver autoindryk" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "&Baglæns slet gennem tabs" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "&Falske halve tabs" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Ombrydningsmåde" #. 15 -#: gtkedit/editoptions.c:118 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "Taste-emulering" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr " Editorindstillinger " #. Not essential to translate -#: gtkedit/editwidget.c:317 +#: gtkedit/editwidget.c:323 msgid "Error initialising editor.\n" msgstr "Fejl under initialisering af 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:1723 src/screen.c:2396 src/screen.c:2426 src/tree.c:1008 +#: src/view.c:2070 msgid "Help" msgstr "Hjælp" -#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +#: gtkedit/editwidget.c:1138 gtkedit/gtkedit.c:1248 msgid "Mark" msgstr "Markér" -#: gtkedit/editwidget.c:1096 +#: gtkedit/editwidget.c:1139 msgid "Replac" msgstr "Erstat" -#: gtkedit/editwidget.c:1102 src/main.c:1721 +#: gtkedit/editwidget.c:1145 src/main.c:1725 msgid "PullDn" msgstr "TrækNd" #. 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:1726 src/view.c:2072 src/view.c:2094 msgid "Quit" msgstr "Slut" @@ -2777,7 +2873,7 @@ msgid "Delete highlighted text" msgstr "Slet markeret tekst" -#: gtkedit/gtkedit.c:1255 src/main.c:1720 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1724 src/screen.c:2397 src/screen.c:2427 msgid "Menu" msgstr "Menu" @@ -2813,42 +2909,42 @@ msgid "Search/Replace" msgstr "Søg/Erstat" -#: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1072 gtkedit/syntax.c:1081 gtkedit/syntax.c:1090 +#: gtkedit/syntax.c:1099 msgid " Spelling Message " msgstr " Stavningsmeddelelse " -#: gtkedit/syntax.c:1051 +#: gtkedit/syntax.c:1072 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 "" " Det lykkedes ikke at åbne ispell program. \n" -" Tjek at det er i din søgesti og fungerer med -a alternativen. \n" +" Tjek at det er i din søgesti og fungerer med -a alternativet. \n" " Eller slå stavekontrol fra i indstillinger-menuen. " -#: gtkedit/syntax.c:1060 +#: gtkedit/syntax.c:1081 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 "" " Det lykkedes ikke at åbne ispell piber. \n" -" Tjek at det er i din søgesti og fungerer med -a alternativen. \n" +" Tjek at det er i din søgesti og fungerer med -a alternativet. \n" " Eller slå stavekontrol fra i indstillinger-menuen. " -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1090 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 "" " Det lykkedes ikke at åbne ispell piber. \n" -" Tjek at det er i din søgesti og fungerer med -a alternativen. \n" +" Tjek at det er i din søgesti og fungerer med -a alternativet. \n" " Eller slå stavekontrol fra i indstillinger-menuen. " -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1099 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2856,11 +2952,11 @@ " Fejl under læsning fra ispell. \n" " Ispell genstartes. " -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid " Load Syntax Rules " msgstr " Hent syntaksregler " -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid "" " Your syntax rule file is outdated \n" " A new rule file is being installed. \n" @@ -2870,15 +2966,15 @@ " En ny regelfil bliver installeret. \n" " Din gamle regelfil er blevet gemt med en .OLD endelse. " -#: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 +#: gtkedit/syntax.c:1517 gtkedit/syntax.c:1524 msgid " Load syntax file " msgstr " Hent syntaksfil " -#: gtkedit/syntax.c:1487 +#: gtkedit/syntax.c:1517 msgid " File access error " msgstr " Fejl ved tilgang til fil " -#: gtkedit/syntax.c:1493 +#: gtkedit/syntax.c:1523 #, c-format msgid " Error in file %s on line %d " msgstr " Syntaksfejl i filen %s ved linie %d " @@ -2945,7 +3041,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:621 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 msgid " Oops... " msgstr " Ups... " @@ -3287,129 +3383,129 @@ msgid " I can't run the Chown command on a tarfs " msgstr " Jeg kan ikke køre chown-kommandoen på et tarfs " -#: src/cmd.c:198 +#: src/cmd.c:195 #, c-format msgid " Can not fetch a local copy of %s " msgstr " Kan ikke hente en lokal kopi af %s " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid " CD " msgstr " CD " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid "Files tagged, want to cd?" msgstr "Filer mærket, vil du skifte mappe?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 +#: src/cmd.c:251 src/cmd.c:712 src/cmd.c:731 msgid "Could not change directory" msgstr " Kunne ikke skifte mappe" -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " View file " msgstr " Se på fil " -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " Filename:" msgstr " Filnavn:" -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filtered view " msgstr " Filtreret visning " -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filter command and arguments:" msgstr " Filterkommando og -argumenter:" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid "Create a new Directory" msgstr "Opret en ny mappe" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid " Enter directory name:" msgstr " Indtast mappenavn:" -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Filter " msgstr " Filter " -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Set expression for filtering filenames" msgstr " Sæt udtryk for filtrering af filnavn" -#: src/cmd.c:515 +#: src/cmd.c:512 msgid " Select " msgstr " Vælg " -#: src/cmd.c:567 +#: src/cmd.c:564 msgid " Unselect " msgstr " Umarker " -#: src/cmd.c:640 +#: src/cmd.c:637 msgid "Extension file edit" msgstr "Redigér udvidelsesfil" -#: src/cmd.c:641 +#: src/cmd.c:638 msgid " Which extension file you want to edit? " msgstr " Hvilken udvidelsesfil vil du redigere? " -#: src/cmd.c:642 +#: src/cmd.c:639 msgid "&User" msgstr "&Bruger" -#: src/cmd.c:642 src/cmd.c:668 +#: src/cmd.c:639 src/cmd.c:667 msgid "&System Wide" msgstr "Hele &Systemet" -#: src/cmd.c:665 -msgid "Menu file edit" -msgstr "Redigér menufil" +#: src/cmd.c:664 +msgid " Menu edit " +msgstr " Redigér menu" -#: src/cmd.c:666 -msgid " Which menu file will you edit? " +#: src/cmd.c:665 +msgid " Which menu file will you edit ? " msgstr " Hvilken menufil vil du redigere? " -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Local" msgstr "&Lokal" -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Home" msgstr "&Hjem" -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Compare directories " msgstr " Sammenlign mapper " -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Select compare method: " msgstr " Vælg metode for sammenligning: " -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Quick" msgstr "&Hurtig" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Size only" msgstr "Kun &Størrelse" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Thorough" msgstr "&Grundig" -#: src/cmd.c:869 +#: src/cmd.c:868 msgid " Both panels should be on the listing view mode to use this command " msgstr "" " Begge paneler bør være i listevisningsmodus for at bruge denne kommando " -#: src/cmd.c:883 +#: src/cmd.c:882 msgid " The command history is empty " msgstr " Kommandohistorien er tom " -#: src/cmd.c:889 +#: src/cmd.c:888 msgid " Command history " msgstr " Kommandohistorie " -#: src/cmd.c:931 +#: src/cmd.c:930 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3417,11 +3513,11 @@ " Ikke en xterm eller Linux-konsol; \n" " panelerne kan ikke slås til til og fra. " -#: src/cmd.c:970 +#: src/cmd.c:969 msgid "Type `exit' to return to the Midnight Commander" msgstr "Skriv `exit' for at returnere til Midnight Commander" -#: src/cmd.c:1025 +#: src/cmd.c:1024 #, c-format msgid "" " Couldn't stat %s \n" @@ -3430,98 +3526,107 @@ " Kunne ikke køre stat på %s \n" " %s " -#: src/cmd.c:1034 src/cmd.c:1036 +#: src/cmd.c:1033 src/cmd.c:1035 msgid " Link " msgstr " Lænke " -#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 +#: src/cmd.c:1034 src/cmd.c:1173 src/file.c:1704 msgid " to:" msgstr " til:" -#: src/cmd.c:1046 +#: src/cmd.c:1045 #, c-format msgid " link: %s " msgstr " lænke: %s " -#: src/cmd.c:1079 +#: src/cmd.c:1078 #, c-format msgid " symlink: %s " msgstr " symlænke: %s " -#: src/cmd.c:1133 +#: src/cmd.c:1132 #, c-format msgid " Symlink `%s' points to: " msgstr " Symlænke '%s' peger på: " -#: src/cmd.c:1138 +#: src/cmd.c:1137 msgid " Edit symlink " msgstr " Redigér symlænke " -#: src/cmd.c:1143 +#: src/cmd.c:1142 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " redigér symlænke, kunne ikke fjerne %s: %s " -#: src/cmd.c:1147 +#: src/cmd.c:1146 #, c-format msgid " edit symlink: %s " msgstr " redigér symlænke: %s " -#: src/cmd.c:1174 +#: src/cmd.c:1173 msgid " Link symbolically " msgstr " Lav symbolsk lænke " -#: src/cmd.c:1175 +#: src/cmd.c:1174 msgid " Relative symlink " msgstr " Relativ symlænke " -#: src/cmd.c:1186 +#: src/cmd.c:1185 #, c-format msgid " relative symlink: %s " msgstr " relativ symlænke: %s " -#: src/cmd.c:1336 +#: src/cmd.c:1260 +msgid "Using default locale" +msgstr "Benyt standard lokale" + +#: src/cmd.c:1262 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "Benyt locale \"%s\" (fra miljøvariablen %s)" + +#: src/cmd.c:1348 msgid " Enter machine name (F1 for details): " msgstr " Indtast maskinenavn (F1 for detaljer): " -#: src/cmd.c:1360 +#: src/cmd.c:1375 #, c-format msgid " Could not chdir to %s " msgstr " Kunne ikke skifte mappe til %s " -#: src/cmd.c:1367 +#: src/cmd.c:1382 src/widget.c:1163 msgid " Link to a remote machine " msgstr " Lænke til en fremmed maskine " -#: src/cmd.c:1373 +#: src/cmd.c:1388 src/widget.c:1164 msgid " FTP to machine " msgstr " FTP til maskine " -#: src/cmd.c:1379 +#: src/cmd.c:1394 src/widget.c:1165 msgid " SMB link to machine " msgstr " SMB-lænke til maskine " -#: src/cmd.c:1389 +#: src/cmd.c:1404 msgid " Socket source routing setup " msgstr " Opsætning af kontaktens kilderuting" -#: src/cmd.c:1390 +#: src/cmd.c:1405 msgid " Enter host name to use as a source routing hop: " msgstr " Indtast værtsnavn som skal bruges som kilderutingshop: " -#: src/cmd.c:1397 +#: src/cmd.c:1413 msgid " Host name " msgstr " Værtsnavn " -#: src/cmd.c:1397 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr " Fejl under opslag af IP-adresse " -#: src/cmd.c:1408 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr " Gendan filer på et ext2 filsystem " -#: src/cmd.c:1409 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3529,11 +3634,11 @@ " Indtast enhed (uden /dev/) som der skal gendannes\n" " filer på: (F1 for detaljer)" -#: src/cmd.c:1459 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr " Opsætning gemt i ~/" -#: src/cmd.c:1464 +#: src/cmd.c:1480 msgid " Setup " msgstr " Opsætning " @@ -3632,7 +3737,7 @@ msgid "Unknown" msgstr "Ukendt" -#: src/ext.c:143 src/user.c:499 +#: src/ext.c:143 src/user.c:542 #, c-format msgid "" " Can't generate unique filename \n" @@ -3641,7 +3746,7 @@ " Kan ikke oprette unikt filnavn \n" " %s " -#: src/ext.c:150 src/user.c:511 +#: src/ext.c:150 src/user.c:554 #, c-format msgid "" " Can't create temporary command file \n" @@ -3650,7 +3755,7 @@ " Kan ikke oprette midlertidig kommandofil \n" " %s " -#: src/ext.c:165 src/user.c:533 +#: src/ext.c:165 src/user.c:576 msgid " Parameter " msgstr " Parameter " @@ -3696,6 +3801,110 @@ msgid "mc.ext will be used for this moment." msgstr "mc.ext vil blive brugt indtil videre." +#: src/features.inc:8 +msgid "Edition: " +msgstr " Udgave: " + +#: src/features.inc:11 +msgid "XView" +msgstr "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: src/features.inc:16 +msgid "text mode" +msgstr "tekst tilstand" + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" +msgstr " med X11 støtte for læsemodifikatorer" + +#: src/features.inc:24 +msgid "Virtual File System: tarfs, extfs" +msgstr "Virtuelt filsystem: tarfs, extfs " + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr " (proxyer: hsc proxy)" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (med termnet støtte)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "Med indbygget editor\n" + +#: src/features.inc:48 +msgid "Using " +msgstr "Bruger " + +#: src/features.inc:51 +msgid "system-installed " +msgstr "system-installeret " + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "S-lang bibliotek med " + +#: src/features.inc:56 +msgid "terminfo" +msgstr "terminfo" + +#: src/features.inc:59 +msgid "termcap" +msgstr "termcap" + +#: src/features.inc:61 +msgid "an unknown terminal" +msgstr "en ukendt terminal" + +#: src/features.inc:64 +msgid " database" +msgstr " database" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "ncurses biblioteket" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "et ukendt curses bibliotek" + +#: src/features.inc:74 +msgid "With subshell support: " +msgstr "Med underskal understøttelse: " + +#: src/features.inc:76 +msgid "optional" +msgstr "optionel" + +#: src/features.inc:78 +msgid "as default" +msgstr "som standard" + +#: src/features.inc:84 +msgid "With support for background operations\n" +msgstr "Med understøttelse for baggrundsoperationer\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " Kopiér " @@ -4057,7 +4266,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "fil" @@ -4085,11 +4294,11 @@ msgid " Can't operate on \"..\"! " msgstr " Kan ikke arbejde på \"..\"! " -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "Ja" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "Nej" @@ -4280,7 +4489,7 @@ #: src/find.c:130 msgid "&Suspend" -msgstr "&Suspender" +msgstr "&Suspendér" #: src/find.c:131 msgid "Con&tinue" @@ -4322,7 +4531,7 @@ msgid "Content: " msgstr "Indhold: " -#: 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 "&Træ" @@ -4347,7 +4556,7 @@ msgid "Finished" msgstr "Færdig" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "Søger i %s" @@ -4417,7 +4626,7 @@ #: src/help.c:318 msgid " Internal bug: Double start of link area " -msgstr " Intern fejl: Dobbel start på link område " +msgstr " Intern fejl: Dobbelt start på link område " #: src/help.c:572 msgid " Can't find node [Contents] in help file " @@ -4427,7 +4636,7 @@ msgid " Help " msgstr " Hjælp " -#: src/help.c:766 src/user.c:637 +#: src/help.c:766 src/user.c:687 #, c-format msgid "" " Can't open file %s \n" @@ -4487,7 +4696,7 @@ #: src/hotlist.c:201 msgid "Subgroup - press ENTER to see list" -msgstr "Undergruppe - tryk ENTER for at se listen" +msgstr "Undergruppe - tryk RETUR for at se listen" #: src/hotlist.c:620 msgid "Active VFS directories" @@ -4602,7 +4811,7 @@ "by an earlier development version of MC\n" "and is more actual than ~/" msgstr "" -"af en tidligere udviklingsversion av MC\n" +"af en tidligere udviklingsversion af MC\n" "og er mere aktuel end ~/" #: src/hotlist.c:1434 @@ -4610,7 +4819,7 @@ " entries\n" "\n" msgstr "" -" pinkter\n" +" indgange\n" "\n" #: src/hotlist.c:1435 @@ -4657,7 +4866,7 @@ #: src/info.c:122 msgid "Free nodes %d (%d%%) of %d" -msgstr "Ledige noder %d (%d%%) av %d" +msgstr "Ledige noder %d (%d%%) af %d" #: src/info.c:128 msgid "No node information" @@ -4744,15 +4953,15 @@ #: src/layout.c:159 msgid "&Vertical" -msgstr "&Vertikal" +msgstr "&Lodret" #: src/layout.c:160 msgid "&Horizontal" -msgstr "&Horisontal" +msgstr "&Vandret" #: src/layout.c:170 msgid "&Xterm hintbar" -msgstr "&Xterm hintlinie" +msgstr "&Xterm hintlinje" #: src/layout.c:171 msgid "h&Intbar visible" @@ -4772,7 +4981,7 @@ #: src/layout.c:175 msgid "menu&Bar visible" -msgstr "menulinie synlig" +msgstr "menulinje synlig" #: src/layout.c:176 msgid "&Equal split" @@ -4780,7 +4989,7 @@ #: src/layout.c:177 msgid "pe&Rmissions" -msgstr "rettigheter" +msgstr "rettigheder" #: src/layout.c:178 msgid "&File types" @@ -4797,7 +5006,7 @@ #: src/layout.c:381 msgid " Panel split " -msgstr " Opslit panel " +msgstr " Opsplit panel " #: src/layout.c:382 msgid " Highlight... " @@ -4855,7 +5064,7 @@ #: src/learn.c:170 msgid "OK" -msgstr "OK" +msgstr "Ok" #: src/learn.c:177 msgid "" @@ -4888,13 +5097,13 @@ #: src/learn.c:302 msgid "which keys are not marked with OK. Press space on the missing" msgstr "" -"hvilke taster som ikke er markert med OK. Tryk mellemrum på den manglende" +"hvilke taster som ikke er markeret med OK. Tryk mellemrum på den manglende" #: src/learn.c:304 msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "tast, eller klik med musen for at definere den. Flyt 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" @@ -4906,263 +5115,267 @@ " slettet den aktuelle mappe eller givet dig selv \n" " ekstra adgangstilladelser med \"su\" kommandoen? " -#: src/main.c:782 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "Tryk på en tast for at fortsætte..." -#: src/main.c:832 +#: src/main.c:834 msgid " The shell is already running a command " -msgstr " Shell'en kører allerede en kommando " +msgstr " Skallen kører allerede en kommando " -#: src/main.c:859 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander'en " -#: src/main.c:860 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr " Vil du virkelig afslutte Midnight Commander? " -#: src/main.c:1240 src/main.c:1264 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "&Listemåde..." -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "Hurtig 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 "&Sorteringsrækkefø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 "&Netværkslænke..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "FT&P lænke..." -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "SM&B lænke..." -#: 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 "&Genindlæs C-r" -#: src/main.c:1288 +#: src/main.c:1290 msgid "&User menu F2" msgstr "&Brugermenu 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 "V&is fil... " -#: src/main.c:1291 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "&Filtreret visning M-!" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Edit F4" msgstr "&Redigér F4" -#: src/main.c:1293 +#: src/main.c:1295 msgid "&Copy F5" msgstr "&Kopiér F5" -#: src/main.c:1294 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "c&Hmod C-x c" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "&Lænke C-x l" -#: src/main.c:1297 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "&Symlænke C-x s" -#: src/main.c:1298 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" -msgstr "rediger s&Ymlænke C-x C-s" +msgstr "redigér s&Ymlænke C-x C-s" -#: src/main.c:1299 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "ch&Own C-x o" -#: src/main.c:1300 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "&Avanceret chown " -#: src/main.c:1302 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "Om&Døb/flyt F6" -#: src/main.c:1303 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "Opret &Mappe F7" -#: src/main.c:1304 +#: src/main.c:1306 msgid "&Delete F8" msgstr "Sle&T F8" -#: src/main.c:1305 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "Hurtig cd M-c" -#: src/main.c:1307 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "vælg &Gruppe M-+" -#: src/main.c:1308 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "Bortvælg gruppe M-\\" -#: src/main.c:1309 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "Omvendt valg M-*" -#: src/main.c:1311 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "afslut F10" -#: src/main.c:1321 +#: src/main.c:1323 msgid "&Directory tree" msgstr "&Mappetræ" -#: src/main.c:1323 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "&Find fil M-?" -#: src/main.c:1324 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "om&Byt paneler C-u" -#: src/main.c:1325 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "slå &Paneler til/fra C-o" -#: src/main.c:1326 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "Sammenlign mapper C-x d" -#: src/main.c:1327 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "e&Ksternt panel C-x !" -#: src/main.c:1328 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "vis mappest&Ørrelser" -#: src/main.c:1330 +#: src/main.c:1332 msgid "command &History" msgstr "kommando&Historie" -#: src/main.c:1331 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "ma&Ppe hurtigliste C-\\" -#: src/main.c:1333 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "&Aktiv VFS liste C-x a" -#: src/main.c:1334 +#: src/main.c:1336 msgid "Fr&ee VFSs now" msgstr "L&edig VFS'er nu" -#: src/main.c:1337 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "&Baggrundsjob C-x j" -#: src/main.c:1341 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "&Undelete filer (kun ext2fs)" -#: src/main.c:1344 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "Redigering af &Listeformat" -#: src/main.c:1346 +#: src/main.c:1349 msgid "&Extension file edit" msgstr "Redigér fil&Endelser" -#: src/main.c:1347 +#: src/main.c:1350 msgid "&Menu file edit" -msgstr "&Menufilredigering" +msgstr "&Menufilsredigering" + +#: src/main.c:1351 +msgid "Menu edi&Tor edit" +msgstr "Menuedi&Torsredigering" -#: src/main.c:1352 +#: src/main.c:1356 msgid "&Configuration..." msgstr "&Opsætning..." -#: src/main.c:1354 +#: src/main.c:1358 msgid "c&Onfirmation..." msgstr "&Bekræftelser..." -#: src/main.c:1355 +#: src/main.c:1359 msgid "&Display bits..." msgstr "&Vis bits..." -#: src/main.c:1357 +#: src/main.c:1361 msgid "learn &Keys..." msgstr "lær &Taster..." -#: src/main.c:1360 +#: src/main.c:1364 msgid "&Virtual FS..." msgstr "&Virtuelt FS..." -#: src/main.c:1363 +#: src/main.c:1367 msgid "&Save setup" msgstr "&Gem opsætning" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1383 src/main.c:1385 msgid " &Left " msgstr " &Venstre " -#: src/main.c:1381 +#: src/main.c:1385 msgid " &Above " msgstr " &Over " -#: src/main.c:1384 +#: src/main.c:1388 msgid " &File " msgstr " &Filer " -#: src/main.c:1385 +#: src/main.c:1389 msgid " &Command " msgstr " &Kommando " -#: src/main.c:1386 +#: src/main.c:1390 msgid " &Options " msgstr " &Indstillinger " -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1392 src/main.c:1394 msgid " &Right " msgstr " &Højre " -#: src/main.c:1390 +#: src/main.c:1394 msgid " &Below " msgstr " &Under " -#: src/main.c:1445 +#: src/main.c:1449 msgid " Information " msgstr " Information " -#: src/main.c:1446 +#: src/main.c:1450 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5174,130 +5387,292 @@ " indhold. Isåfald må du bruge manuel genopfriskning. \n" " Tjek mansiden for detaljer. " -#: src/main.c:1925 +#: src/main.c:1929 msgid "Thank you for using GNU Midnight Commander" msgstr "Tak fordi du brugte GNU Midnight Commander" -#: src/main.c:2284 -#, c-format -msgid "with mouse support on xterm%s.\n" -msgstr "med museunderstøttelse i xterm%s.\n" - -#: src/main.c:2285 -msgid " and the Linux console" -msgstr " og Linuxkonsollen" +#: src/main.c:2287 +msgid "with mouse support on xterm and the Linux console.\n" +msgstr "med museunderstøttelse i xterm og Linux konsollen.\n" + +#: src/main.c:2288 +msgid "with mouse support on xterm.\n" +msgstr "med museunderstøttelse i xterm.\n" -#: src/main.c:2381 +#: src/main.c:2389 msgid "The TERM environment variable is unset!\n" msgstr "TERM-miljøvariabelen er ikke sat!\n" -#: src/main.c:2592 +#: src/main.c:2495 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" +"Brug:\n" +"\n" +"mc [flag] [dette_katalog] [andet_panels_katalog]\n" +"\n" + +#: src/main.c:2498 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "-a, --sickchars Tvungen brug af +, -, | for linieoptegning.\n" + +#: src/main.c:2500 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "-b, --nocolor Tvunget sort/hvid skærm.\n" + +#: src/main.c:2502 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "-B, --background [KUN-UDVIKLERE: Debug baggrundskoden]\n" + +#: src/main.c:2504 +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 brug af farvemodus.\n" +"-C, --colors Specificér farver (brug --help-colors for at få en " +"liste).\n" +"-d, --nomouse Slå musestøtte fra.\n" + +#: src/main.c:2508 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "-e, --edit Start den interne editor op.\n" + +#: src/main.c:2510 +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 Udskriv konfigurerede stier.\n" +"-h, --help Viser denne hjælpetekst.\n" +"-k, --resetsoft Nulstiller softkeys (kun HP terminaler) til sine " +"terminfo/termcap\n" +" standardværdier.\n" + +#: src/main.c:2515 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "-l, --ftplog fil Logger ftpfs kommandoer til filen.\n" + +#: src/main.c:2518 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "-M, --memory fil [KUN-UDVIKLERE: Log MAD beskeder til filen.]\n" + +#: src/main.c:2520 +msgid "" +"-P, --printwd At exit, print the last working directory.\n" +"-s, --slow Disables verbose operation (for slow terminals).\n" +msgstr "" +"-P, --printwd Udskriv sidste arbejdskatalog ved afslutning.\n" +"-s, --slow Slår detaljeret operation fra (for langsomme " +"terminaler).\n" + +#: src/main.c:2523 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "-t, --termcap Aktivér støtte for TERMCAP variablen.\n" + +#: src/main.c:2526 +msgid "" +"-S, --createcmdile Create command file to set default directory upon exit.\n" +msgstr "" +"-S, --createcmdfile Opret kommandofil for at sætte standard katalog ved " +"afslutning.\n" + +#: src/main.c:2529 +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å samtidig underskal modus fra.\n" +"-U, --subshell Tvungen brug af samtidig underskal modus.\n" +"-r, --forceexec Tvungen kørsel af underskal.\n" + +#: src/main.c:2533 +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" +"+number number it is the start line number of file for `mcedit'.\n" +msgstr "" +"-v, --view fname Start op i visningstilstand.\n" +"-V, --version Vis version og konfigurationsvalg.\n" +"-x, --xterm Tvungen brug af mus i xterm og gem/genopret.skærm.\n" +"+nummer nummer er startlinjen for filen for `mcedit'.\n" + +#: src/main.c:2538 +msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" +msgstr "-X, --dbgsubshell [KUN-UDVIKLERE: Debug underskallen].\n" + +#: src/main.c:2540 +msgid "" +"\n" +"Please send any bug reports (including the output of `mc -V')\n" +"to mc-bugs@nuclecu.unam.mx\n" +msgstr "" +"\n" +"Venligst send fejlrapporter (inkluderet udskrift af `mc -V')\n" +"til mc-bugs@nuclecu.unam.mx\n" + +#: src/main.c:2556 +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 udelades, så vil standardværdierne bruges\n" +"\n" +"Nøgleord:\n" +" Global: errors, reverse, gauge, input\n" +" Filvisning: normal, ,selected, marked, markselect\n" +" Dialogbokse: dnormal, dfocus, dhotnormalm dhotfoucus\n" +" Menuer: menu, menuhot, menuselm menuhotsel\n" +" Hjælp: helpnormal, helpitalic, helplink, helpslink\n" +" Filtyper: directory, execute, link, device, special, core\n" +"\n" +"Farver:\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:2605 #, c-format msgid "Library directory for the Midnight Commander: %s\n" -msgstr "Biblioteksmappe for Midnight Commander: %s\n" +msgstr "Bibliotekskatalog for Midnight Commander: %s\n" -#: src/main.c:2606 +#: src/main.c:2619 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "Optionen -m er forældet. Tjek venligst Visning... i optionsmenuen\n" -#: src/main.c:2683 +#: src/main.c:2696 msgid "Use to debug the background code" msgstr "Brug til at afluse baggrundskode" -#: src/main.c:2689 +#: src/main.c:2702 msgid "Request to run in color mode" msgstr "Forsøg at køre med farver" -#: src/main.c:2691 +#: src/main.c:2704 msgid "Specifies a color configuration" -msgstr "Specificer en farveindstilling" +msgstr "Specificerer en farveindstilling" -#: src/main.c:2696 +#: src/main.c:2709 msgid "Edits one file" msgstr "Redigerer en fil" -#: src/main.c:2700 +#: src/main.c:2713 msgid "Displays this help message" -msgstr "Viser denne hjælpmeddelelse" +msgstr "Viser denne hjælpemeddelelse" -#: src/main.c:2703 +#: src/main.c:2716 msgid "Displays a help screen on how to change the color scheme" msgstr "Viser en hjælpeskærm der hjælper dig med at ændre farveskemaet" -#: src/main.c:2706 +#: src/main.c:2719 msgid "Log ftp dialog to specified file" msgstr "Gem ftp meddelelser i angivet fil" -#: src/main.c:2713 +#: src/main.c:2726 msgid "Obsolete" msgstr "Forældet" -#: src/main.c:2715 +#: src/main.c:2728 msgid "Requests to run in black and white" msgstr "Kør i sort-hvid" -#: src/main.c:2717 +#: src/main.c:2730 msgid "Disable mouse support in text version" msgstr "Fjern museunderstøttelse i tekstversion" -#: src/main.c:2720 +#: src/main.c:2733 msgid "Disables subshell support" -msgstr "Slå underskal understøttelse fra" +msgstr "Deaktivér underskal understøttelse" -#: src/main.c:2724 +#: src/main.c:2737 msgid "Prints working directory at program exit" msgstr "Viser nuværende mappe ved programafslut" -#: src/main.c:2726 +#: src/main.c:2739 msgid "Resets soft keys on HP terminals" msgstr "Genstarter soft keys på HP terminaler" -#: src/main.c:2728 +#: src/main.c:2741 msgid "To run on slow terminals" msgstr "For at køre på langsomme terminaler" -#: src/main.c:2731 +#: src/main.c:2744 msgid "Use stickchars to draw" msgstr "Brug tændstiktegn til at tegne" -#: src/main.c:2735 +#: src/main.c:2748 msgid "Enables subshell support (default)" -msgstr "Slå underskal understøttelse til (forvalgt)" +msgstr "Aktivér underskal understøttelse (forvalgt)" -#: src/main.c:2740 +#: src/main.c:2753 msgid "Tries to use termcap instead of terminfo" msgstr "Prøver at bruge termcap istedetfor terminfo" -#: src/main.c:2744 +#: src/main.c:2757 msgid "Displays the current version" msgstr "Udskriver versionsnummer" -#: src/main.c:2746 +#: src/main.c:2759 msgid "Launches the file viewer on a file" msgstr "Bruger filfremviseren på en fil" -#: src/main.c:2748 +#: src/main.c:2761 msgid "Forces xterm features" msgstr "Tvinger xterm funktioner" -#: src/main.c:2750 +#: src/main.c:2763 msgid "Geometry for the window" msgstr "Vinduesgeometri" -#: src/main.c:2750 +#: src/main.c:2763 msgid "GEOMETRY" msgstr "GEOMETRY" -#: src/main.c:2751 +#: src/main.c:2764 msgid "No windows opened at startup" msgstr "Ingen vinduer åbnet ved opstart" -#: src/main.c:2753 +#: src/main.c:2765 +msgid "No desktop icons" +msgstr "Ingen skrivebordsikoner" + +#: src/main.c:2766 +msgid "Look more like traditional gmc" +msgstr "Lign mere den traditionelle gmc" + +#: src/main.c:2768 msgid "Display the directory that holds the .links startup files and exit" msgstr "Vis mappen som indeholder .links opstarts filerne og afslut" -#: src/main.c:3051 +#: src/main.c:3081 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" @@ -5305,17 +5680,17 @@ "Kunne ikke åbne tty linie. Du må køre mc uden -P flaget.\n" "På nogle systemer er det en god ide at køre # 'which mc'\n" -#: src/main.c:3129 +#: src/main.c:3159 msgid " Notice " -msgstr " Notits " +msgstr " Notér " -#: src/main.c:3130 +#: src/main.c:3160 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" " files have been moved now\n" msgstr "" -" Midknight Commanders konfigurationsfiler \n" +" Midnight Commanders konfigurationsfiler \n" " er nu gemt i ~/.mc mappen, filerne er\n" " blevet flyttet nu\n" @@ -5458,7 +5833,7 @@ #: src/panelize.c:351 msgid "Find *.orig after patching" -msgstr "Find *.orig etter patching" +msgstr "Find *.orig efter patchning" #: src/panelize.c:352 msgid "Find SUID and SGID programs" @@ -5470,7 +5845,7 @@ #: src/panelize.c:458 msgid "Pipe close failed" -msgstr "Fejl under lukning af pibe" +msgstr "Fejl under lukning af rør" #: src/popthelp.c:31 msgid "Show this help message" @@ -5480,6 +5855,14 @@ msgid "Display brief usage message" msgstr "Vis kort brugsmeddelelse" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "SUB-DIR" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "UP--DIR" + #: src/screen.c:417 msgid "MTime" msgstr "MTime" @@ -5523,31 +5906,31 @@ #: src/screen.c:1451 msgid "User suplied format looks invalid, reverting to default." -msgstr "Brugerdefineret format ser skummelt ud, bruger standard." +msgstr "Brugerdefineret format ser ugyldigt ud, bruger standard." -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " Vil du virkelig køre? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr " Ingen handling udført " -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1016 msgid "RenMov" msgstr "Flyt" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2402 src/screen.c:2432 src/tree.c:1020 msgid "Mkdir" msgstr "Mkdir" -#: src/screen.c:2417 +#: src/screen.c:2418 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" Kan ikke skifte mappe til %s \n" +"Kan ikke skifte mappe til \"%s\" \n" " %s " #: src/subshell.c:287 @@ -5617,15 +6000,6 @@ msgid "Dynamc" msgstr "Dynamisk" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -"Kan ikke skifte mappe til \"%s\" \n" -" %s " - #: src/tree.c:1012 msgid "Forget" msgstr "Glem" @@ -5643,32 +6017,32 @@ "Kan ikke skrive til %s filen::\n" "%s\n" -#: src/user.c:250 +#: src/user.c:271 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " Ugyldig mønsterdefinition for skal \"%c\". " -#: src/user.c:383 +#: src/user.c:424 msgid " Debug " msgstr " Aflus " -#: src/user.c:392 +#: src/user.c:433 msgid " ERROR: " msgstr " FEJL: " -#: src/user.c:396 +#: src/user.c:437 msgid " True: " msgstr " Sand: " -#: src/user.c:398 +#: src/user.c:439 msgid " False: " msgstr " Falsk: " -#: src/user.c:602 +#: src/user.c:645 msgid " Warning -- ignoring file " msgstr " Advarsel -- ignorerer filen " -#: src/user.c:603 +#: src/user.c:646 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5677,19 +6051,19 @@ "Filen %s er hverken ejet af root, dig eller globalt skrivbar.\n" "At bruge den kan muligvis kompromittere din sikkerhed" -#: src/user.c:622 +#: src/user.c:670 msgid " I can't run programs while logged on a non local directory " msgstr "" " Jeg kan ikke køre programmer når jeg er logget på en ikke-lokal mappe " #. FIXME: this message is not quite right -#: src/user.c:720 +#: src/user.c:770 #, c-format msgid " Empty file %s " msgstr "Tøm fil %s" #. Create listbox -#: src/user.c:730 +#: src/user.c:779 msgid " User menu " msgstr " Brugermenu " @@ -5707,15 +6081,15 @@ msgid "%b %e %Y" msgstr "%b %e %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr " Pibe fejlede " -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr " Dup fejlede " -#: src/view.c:401 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5725,7 +6099,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5733,41 +6107,41 @@ msgstr "" "\n" "\n" -"er blivet ændret. Vil du gemme ændringerne?\n" +"er blevet ændret. Vil du gemme ændringerne?\n" -#: src/view.c:404 +#: src/view.c:406 msgid " Save changes " msgstr " Gem ændringer " -#: src/view.c:446 +#: src/view.c:448 msgid " Can't spawn child program " msgstr " Kan ikke starte barneprogram " -#: src/view.c:455 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " Tom udskrift fra underfilter " -#: src/view.c:460 +#: src/view.c:462 msgid " Could not open file " msgstr " Kunne ikke åbne filen " -#: src/view.c:475 +#: src/view.c:477 msgid " Can't open file \"" msgstr " Kan ikke åbne filen \"" -#: src/view.c:482 +#: src/view.c:484 msgid "" " Can't stat file \n" " " msgstr "" -" Kan ikke køre stat på filen \n" +" Kan ikke lave stat på filen \n" " " -#: src/view.c:488 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " Kan ikke vise: ikke en normal fil " -#: src/view.c:569 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5776,7 +6150,7 @@ " Kan ikke åbne \"%s\" \n" " %s " -#: src/view.c:578 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5785,34 +6159,34 @@ " Kunne ikke køre stat på %s \n" " %s " -#: src/view.c:714 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "Fil: %s" -#: src/view.c:728 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "Afstand 0x%08x" -#: src/view.c:739 +#: src/view.c:741 msgid " [grow]" msgstr " [voks]" -#: src/view.c:1518 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "Søger efter %s" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " Søgetekst ikke fundet " -#: src/view.c:1787 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " Ugyldigt regulært udtryk " -#: src/view.c:1911 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5821,7 +6195,7 @@ " Det aktuelle linienummer er %d.\n" " Indtast det nye linienummer:" -#: src/view.c:1933 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5830,71 +6204,71 @@ " Den aktuelle adresse er 0%lx.\n" " Indtast den nye adresse:" -#: src/view.c:1935 +#: src/view.c:1937 msgid " Goto Address " msgstr " Gå til adresse " -#: src/view.c:1966 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " Indtast regexp:" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Ascii" msgstr "ASCII" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Hex" msgstr "Hex" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Goto" msgstr "Gåtil" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Line" msgstr "Linie" -#: src/view.c:2075 +#: src/view.c:2077 msgid "RxSrch" msgstr "RxpSøg" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdText" msgstr "RedTekst" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdHex" msgstr "RedHex" -#: src/view.c:2080 +#: src/view.c:2082 msgid "UnWrap" msgstr "Ubrudt" -#: src/view.c:2080 +#: src/view.c:2082 msgid "Wrap" msgstr "Ombryd" -#: src/view.c:2083 +#: src/view.c:2085 msgid "HxSrch" msgstr "HexSøg" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Raw" msgstr "Rå" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Parse" msgstr "Parse" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Unform" msgstr "U-form" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Format" msgstr "Format" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr " Historie " @@ -6093,7 +6467,91 @@ msgid "NumLock on keypad" msgstr "NumLock på numerisk tastatur" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"Kunne ikke åbne cpio arkiv\n" +"%s" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" +"Prematur slutning på cpio arkiv\n" +"%s" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "" +"Korrupt cpio header fundet i\n" +"%s" + +#: vfs/cpio.c:427 +#, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "" +"Inkonsistent tar-arkiv%s\n" +"i cpio arkiv\n" +"%s" + +#. 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 "%s indeholder duplikerede indgange! Hopper over!" + +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" +"Uventet EOF\n" +"%s" + +#: vfs/direntry.c:300 +#, c-format +msgid "Dir cache expired for %s" +msgstr "Katalog-cache udløbet for %s" + +#: vfs/direntry.c:430 vfs/direntry.c:433 +msgid " Direntry warning " +msgstr " Katalogindgang advarsel " + +#: vfs/direntry.c:430 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage er %d, lagerlækage" + +#: vfs/direntry.c:433 +msgid "Super has want_stale set" +msgstr "Super har want_stale sat" + +#: vfs/direntry.c:811 +msgid "Starting linear transfer..." +msgstr "Begynder lineær overførsel..." + +#: vfs/direntry.c:956 +msgid "Getting file" +msgstr "Henter fil: " + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -6102,228 +6560,223 @@ "Kunne ikke åbne %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" +msgstr "Inkonsistent extfs-arkiv" -#: vfs/fish.c:136 +#: vfs/fish.c:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fisk: Afkobler fra %s" -#: vfs/fish.c:214 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fisk: Venter på begyndelseslinie..." -#: vfs/fish.c:224 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Beklager, vi kan ikke lave adgangskodebekræftede forbindelser endnu." -#: vfs/fish.c:238 +#: vfs/fish.c:233 +msgid " fish: Password required for " +msgstr " fish: Behøver adgangskode til" + +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fisk: Sender adgangskode..." -#: vfs/fish.c:244 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fisk: Sender begyndelseslinie..." -#: vfs/fish.c:248 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fisk: Håndrystende version..." -#: vfs/fish.c:252 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fisk: Indstiller den aktive mappe..." -#: vfs/fish.c:254 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fisk: forbundet, hjem %s" -#: vfs/fish.c:330 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fisk: Læser mappe %s..." -#: vfs/fish.c:426 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fisk: fejlede" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fisk: gem %s: sender kommando..." -#: vfs/fish.c:460 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fisk: Lokal læsning fejlede, sender nuller" -#: vfs/fish.c:472 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fisk: gemmer fil %s %d (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "nuller" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "Afbryder overførsel..." -#: vfs/fish.c:521 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "Fejl meldt tilbage efter afbrydelse." -#: vfs/fish.c:523 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "Afbrudt overførsel ville være lykkedes." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Afkobler fra %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: Behøver adgangskode til" -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: Behøver adgangskode til " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: sender proxy loginnavn" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: sender proxy brugeradgangskode" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: proxy bekræftelse lykkedes" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: forbundet til %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: sender loginnavn" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: sender brugeradgangskode" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: logget ind" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Forkert login for bruger %s " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " Kunne ikke sætte kilderuting op (%s)" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Ugyldig værtsnavn." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Ugyldig værtsadresse." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: laver forbindelse til %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: forbindelse afbrudt af bruger" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: forbindelse til server mislykkedes: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Venter på at forsøge igen... %d (Ctrl-C annullerer)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: kunne ikke indstille passiv måde for kilderutning" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: kunne ikke indstille passiv måde" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: afbryder overførsel." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: afbrydelsesfejl: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: afbryd mislykkedes" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD mislykkedes" -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: kunne ikke læse symlænke" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "Læser symlænke..." -#: vfs/ftpfs.c:1338 -#, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: Læser FTP-mappe %s... (brug ikke UNIX ls argumenter)" - -#: vfs/ftpfs.c:1340 +#: vfs/ftpfs.c:1188 #, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: Læser FTP-mappe %s..." +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: Læser FTP-mappe %s... %s%s" -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: FEJL" +#: vfs/ftpfs.c:1189 +msgid "(strict rfc959)" +msgstr "(følg rfc959)" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: læsning af FTP mappe afbrudt af brugeren" +#: vfs/ftpfs.c:1190 +msgid "(chdir first)" +msgstr "(chdir først)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: fik liste" - -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "ftpfs: fejlede" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: fejlede; ingen steder at falde tilbage på" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: gemmer fil %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6331,15 +6784,15 @@ "~/.netrc-filen har ikke korrekt modus.\n" "Fjern adgangskode 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 " Serveren understøtter ikke denne 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" @@ -6349,48 +6802,68 @@ " du skal bruge en adgangskode for at logge ind, men informationen \n" " er ikke nødvendigvis sikker på den anden side. Fortsæt? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Ja " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:175 msgid " No " msgstr " Nej " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " Den fremmede server kører på en mærkelig port. Opgiver.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " MCFS-adgangskode påkrævet" -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " Ugyldig adgangskode " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr " Kan ikke finde værtsnavn: %s " + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr " Kan ikke oprette sokkel %s " + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr "Kan ikke forbinde til server %s" + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " For mange åbne forbindelser " -#: vfs/smbfs.c:115 +#. 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:116 msgid "Domain:" msgstr "Domæne:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "Brugernavn:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "Adgangskode: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "Adgangskode for \\\\%s\\%s" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6399,22 +6872,26 @@ " genopkobling til %s mislykkedes\n" " " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr " Autentisering fejlet " + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s mkdir'er %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s rmdir'er %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s åbner fremmed fil %s " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s omdøber filer\n" @@ -6447,192 +6924,138 @@ "%s\n" "ser ikke ud til at være et tar-arkiv." -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1151 +msgid "Changes to file lost" +msgstr "Ændringer til fil tabt" + +#: vfs/vfs.c:1794 +msgid "Could not parse:" +msgstr "Kunne ikke fortolke:" + +#: vfs/vfs.c:1796 +msgid "More parsing errors will be ignored." +msgstr "Flere fortolkningsfejl vil blive ignoreret." + +#: vfs/vfs.c:1796 +msgid "(sorry)" +msgstr "(beklager)" + +#: vfs/vfs.c:1807 +msgid "Internal error:" +msgstr " Intern fejl:" + +#: vfs/vfs.c:1817 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld byte overført)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1818 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld byte overført" -#~ msgid "fish: got listing" -#~ msgstr "fisk: fik liste" - -#~ msgid "Could not symlink %s to %s; will not have initial home desktop icon." -#~ msgstr "" -#~ "Kunne ikke lave symbolsk lænke fra %s til %s; vil ikke have skrivebordsikon." - -#~ msgid "Rescan _Desktop" -#~ msgstr "Op_dater Skrivebord" - -#~ msgid "Info about Mcedit" -#~ msgstr "Info om Mcedit" +#: vfs/undelfs.c:81 +msgid " undelfs: error " +msgstr " undelfs: fejl " -#~ msgid "About..." -#~ msgstr "Om..." +#: vfs/undelfs.c:184 +msgid " not enough memory " +msgstr " ikke nok lager " -#~ msgid "Repeat most recent search" -#~ msgstr "Gentag sidste søgning" +#: vfs/undelfs.c:189 +msgid " while allocating block buffer " +msgstr " under allokering af blokbuffer " -#~ msgid "Find again" -#~ msgstr "Find igen" - -#~ msgid "Go back in time one key press" -#~ msgstr "Gå tilbage til forrige tastetryk" - -#~ msgid "Undo" -#~ msgstr "Fortryd" - -#~ msgid "Paste clipboard" -#~ msgstr "Indsæt klippebordet" - -#~ msgid "Paste" -#~ msgstr "Indsæt" - -#~ msgid "Cut selection to clipboard" -#~ msgstr "Klip til klippebordet" - -#~ msgid "Cut" -#~ msgstr "Klip" - -#~ msgid "Copy selection to clipboard" -#~ msgstr "Kopier til klippebordet" - -#~ msgid "Save the current edit buffer as filename" -#~ msgstr "Gemmer redigeringsbufferen i en fil" - -#~ msgid "Save As" -#~ msgstr "Gem som" - -#~ msgid "New" -#~ msgstr "Ny" - -#~ msgid "Load a different/new file" -#~ msgstr "Indlæs en anden/ny fil" - -#~ msgid "Open/Load" -#~ msgstr "Åbn/Indlæs" - -#~ msgid "Ok" -#~ msgstr "Ok" - -#~ msgid "Force activation even if a server is already running" -#~ msgstr "Tvungen aktivering hvis en server allerede kører" - -#~ msgid " Symlink " -#~ msgstr " Symlink " - -#~ msgid "_Mode" -#~ msgstr "_Mode" - -#~ msgid "Move/rename..." -#~ msgstr "Flyt/omdøb..." - -#~ msgid "Open with" -#~ msgstr "Åben med" - -#~ msgid "_Edit" -#~ msgstr "R_ediger" - -#~ msgid "_File" -#~ msgstr "_Fil" - -#~ msgid "Information on this program" -#~ msgstr "Information om dette program" - -#~ msgid "_About" -#~ msgstr "Om..." - -#~ msgid "List of active virtual file systems" -#~ msgstr "Liste over aktive, virtuelle filsystemer" - -#~ msgid "_Active VFS list..." -#~ msgstr "Liste over aktive VFS..." - -#~ msgid "Full View" -#~ msgstr "Detaljeret visning" - -#~ msgid "Partial View" -#~ msgstr "Delvis visning" - -#~ msgid "C_lose" -#~ msgstr "_Luk" - -#~ msgid "Delete files from disk" -#~ msgstr "Slet filer fra disk" - -#~ msgid "Opens the selected files" -#~ msgstr "Åbner de valgte filer" - -#~ msgid "_Open" -#~ msgstr "_Åbn" - -#~ msgid "_New" -#~ msgstr "Ny" - -#~ msgid "Opens a new window" -#~ msgstr "Åbner et nyt vindue" - -#~ msgid "Trashcan" -#~ msgstr "Papirkurv" - -#~ msgid "Filter" -#~ msgstr "Filter" +#: vfs/undelfs.c:193 +#, c-format +msgid " open_inode_scan: %d " +msgstr " open_inode_scan: %d " -#~ msgid "Font files" -#~ msgstr "Skrifttypefiler" +#: vfs/undelfs.c:197 +#, c-format +msgid " while starting inode scan %d " +msgstr " under start af inodeskan %d " -#~ msgid "Misc. program files" -#~ msgstr "Forsk. programfiler" +#: vfs/undelfs.c:204 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "undelfs: henter information om slettede filer %d inoder" -#~ msgid "Assembler program files" -#~ msgstr "Assembler-programfiler" +#: vfs/undelfs.c:219 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr " ved kald til ext2_block_iterate %d " -#~ msgid "Scheme program files" -#~ msgstr "Scheme-programfiler" +#: vfs/undelfs.c:227 +msgid " no more memory while reallocating array " +msgstr " ikke mere lager ved reallokering af matrice " -#~ msgid "Objective-C program files" -#~ msgstr "Objektiv-C programfiler" +#: vfs/undelfs.c:246 +#, c-format +msgid " while doing inode scan %d " +msgstr " under skanning af inode %d " -#~ msgid "C++ program files" -#~ msgstr "C++ programfiler" +#: vfs/undelfs.c:270 +msgid " Ext2lib error " +msgstr " Ext2lib fejl " -#~ msgid "C program files" -#~ msgstr "C-programfiler" +#: vfs/undelfs.c:297 +#, c-format +msgid " Could not open file %s " +msgstr " Kunne ikke åbne filen %s " -#~ msgid "Audio files" -#~ msgstr "Lydfiler" +#: vfs/undelfs.c:300 +msgid "undelfs: reading inode bitmap..." +msgstr "undelfs: læser inode bitmap..." -#~ msgid "Video/animation files" -#~ msgstr "Video/animationsfiler" +#: vfs/undelfs.c:303 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" +" Kunne ikke hente bitmap fra: \n" +" %s \n" -#~ msgid "Image files" -#~ msgstr "Billedfiler" +#: vfs/undelfs.c:306 +msgid "undelfs: reading block bitmap..." +msgstr "undelfs: læser blok bitmap..." -#~ msgid "Spreadsheet files" -#~ msgstr "Regnearksfiler" +#: vfs/undelfs.c:309 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" +" Kunne ikke hente blok bitmap fra: \n" +" %s \n" -#~ msgid "Postscript and PDF files" -#~ msgstr "Postscript- og PDF-filer" +#: vfs/undelfs.c:315 +msgid "undelfs: done." +msgstr "undelfs: færdig." -#~ msgid "HTML and SGML files" -#~ msgstr "HTML- og SGML-filer" +#: vfs/undelfs.c:318 +msgid "undelfs: failure" +msgstr "undelfs: fejl " -#~ msgid "Text/Document files" -#~ msgstr "Tekst/dokument-filer" +#: vfs/undelfs.c:342 +msgid " vfs_info is not fs! " +msgstr "vfs_info er ikke fs! " -#~ msgid "RPM/DEB files" -#~ msgstr "RPM/DEB-filer" +#: vfs/undelfs.c:398 vfs/undelfs.c:582 +msgid " You have to chdir to extract files first " +msgstr "Du må ændre katalog før du henter filerne " -#~ msgid "Archives and compressed files" -#~ msgstr "Arkiver og komprimerede filer" +#: vfs/undelfs.c:521 +msgid " while iterating over blocks " +msgstr " ved iteration over blokke " -#~ msgid "All files" -#~ msgstr "Alle filer" +#: vfs/undelfs.c:626 +#, c-format +msgid " Could not open file: %s " +msgstr " Kunne ikke åbne filen %s " -#~ msgid "Disk operations" -#~ msgstr "Diskoperationer" +#. This is place of next pointer +#: vfs/undelfs.c:684 +msgid "Undelete filesystem for ext2" +msgstr "Undelete filsystem for ext2" -#~ msgid "Auto place icons" -#~ msgstr "Autoplacer ikoner" diff -ruN old/mc-4.5.44/po/es.po new/mc-4.5.45/po/es.po --- old/mc-4.5.44/po/es.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/es.po Tue May 9 18:52:08 2000 @@ -3,9 +3,9 @@ # David Martín , 1998-1999. msgid "" msgstr "" -"Project-Id-Version: 4.5.43\n" -"POT-Creation-Date: 2000-03-16 19:20+0100\n" -"PO-Revision-Date: 2000-03-16 20:00+0100\n" +"Project-Id-Version: 4.5.45\n" +"POT-Creation-Date: 2000-04-15 23:03+0200\n" +"PO-Revision-Date: 2000-04-16 00:00+0100\n" "Last-Translator: David Martín \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -86,15 +86,15 @@ "con el comando:\n" "\"%s\"%s" -#: gnome/gaction.c:135 gnome/gaction.c:151 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "abrir" -#: gnome/gaction.c:188 gnome/gaction.c:205 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "editar" -#: gnome/gaction.c:345 +#: gnome/gaction.c:351 msgid "view" msgstr "ver" @@ -1551,11 +1551,11 @@ #. 1 #: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 -#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:71 +#: 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&Aceptar" @@ -1764,14 +1764,14 @@ #. NLS for hotkeys? #: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 -#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:68 +#: 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:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 -#: vfs/smbfs.c:116 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "&Cancelar" @@ -2686,55 +2686,55 @@ msgstr "Máquina de escribir" #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "Ancho del parrafo auto: " #. 4 -#: gtkedit/editoptions.c:80 +#: gtkedit/editoptions.c:78 msgid "Tab spacing : " msgstr "Tamaño de tabulaciones: " -#: gtkedit/editoptions.c:88 +#: gtkedit/editoptions.c:86 msgid "synta&X highlighting" msgstr "sinta&Xis coloreada" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "confir&Mar al guardar" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "tabulaciones x e&Spacios" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "autoindenta&R" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "&Borrar en tabulaciones" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "&Fingir medias tabulaciones" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Autoajuste de párrafo" #. 15 -#: gtkedit/editoptions.c:118 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "Emulación de teclas" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr " Opciones del editor " @@ -3466,8 +3466,8 @@ " Not an xterm or Linux console; \n" " the panels cannot be toggled. " msgstr "" -" No se está usando ni xterm ni la consola de Linux; \n" -" Los paneles no pueden ser ocultados. " +" No se está usando ni xterm ni la consola Linux; \n" +" los paneles no pueden ser ocultados. " #: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" @@ -3532,48 +3532,57 @@ msgid " relative symlink: %s " msgstr " enlace simbólico relativo: %s " -#: src/cmd.c:1336 +#: src/cmd.c:1261 +msgid "Using default locale" +msgstr "Empleando localización genérica" + +#: src/cmd.c:1263 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "Empleando localización \"%s\" (por la variable de entorno %s)" + +#: src/cmd.c:1349 msgid " Enter machine name (F1 for details): " msgstr " Teclee el nombre de la máquina (F1 para más detalles): " -#: src/cmd.c:1363 +#: src/cmd.c:1376 #, c-format msgid " Could not chdir to %s " msgstr " No puedo cambiar al directorio %s " -#: src/cmd.c:1370 +#: src/cmd.c:1383 msgid " Link to a remote machine " msgstr " Conexión por red " -#: src/cmd.c:1376 +#: src/cmd.c:1389 msgid " FTP to machine " msgstr " Conexión por FTP " -#: src/cmd.c:1382 +#: src/cmd.c:1395 msgid " SMB link to machine " msgstr " Conexión por SMB " -#: src/cmd.c:1392 +#: src/cmd.c:1405 msgid " Socket source routing setup " msgstr " Configuración del ruteo específico " -#: src/cmd.c:1393 +#: src/cmd.c:1406 msgid " Enter host name to use as a source routing hop: " msgstr " Teclee el nombre de la máquina que será la intermediaria: " -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Host name " msgstr " Nombre de la máquina " -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr " Error al buscar la dirección IP " -#: src/cmd.c:1411 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr " Recuperar archivos de un sistema de archivos ext2 " -#: src/cmd.c:1412 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3581,11 +3590,11 @@ " Introduzca el dispositivo (sin /dev/) donde quiere\n" " recuperar archivos: (F1 para más detalles)" -#: src/cmd.c:1462 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr " Configuración almacenada en ~/" -#: src/cmd.c:1467 +#: src/cmd.c:1480 msgid " Setup " msgstr " Configuración " @@ -3765,7 +3774,7 @@ #: src/features.inc:18 msgid " with X11 support to read modifiers" -msgstr " con soporte teclado de X11" +msgstr " con soporte para teclado de X11" #: src/features.inc:24 msgid "Virtual File System: tarfs, extfs" @@ -3797,7 +3806,7 @@ #: src/features.inc:45 msgid "With builtin Editor\n" -msgstr "Con Editor propio incorporado\n" +msgstr "Editor de texto propio incluido\n" #: src/features.inc:48 msgid "Using " @@ -3805,11 +3814,11 @@ #: src/features.inc:51 msgid "system-installed " -msgstr "instalada en el sistema " +msgstr "(estaba ya instalado) " #: src/features.inc:53 msgid "S-lang library with " -msgstr "biblioteca S-lang con " +msgstr "S-lang con " #: src/features.inc:56 msgid "terminfo" @@ -3825,7 +3834,7 @@ #: src/features.inc:64 msgid " database" -msgstr " base de datos" +msgstr " como origen de datos" #: src/features.inc:67 msgid "the ncurses library" @@ -3837,7 +3846,7 @@ #: src/features.inc:74 msgid "With subshell support: " -msgstr "Con soporte subshell: " +msgstr "Soporte subshell: " #: src/features.inc:76 msgid "optional" @@ -3849,7 +3858,7 @@ #: src/features.inc:84 msgid "With support for background operations\n" -msgstr "Con soporte para operaciones en 2º plano\n" +msgstr "Soporte para operaciones en 2º plano\n" #: src/file.c:154 src/tree.c:639 msgid " Copy " @@ -4215,7 +4224,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 vfs/fish.c:476 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "archivo" @@ -5334,20 +5343,19 @@ msgid "Thank you for using GNU Midnight Commander" msgstr "Gracias por usar el GNU Midnight Commander" -#: src/main.c:2284 -#, c-format -msgid "with mouse support on xterm%s.\n" -msgstr "con soporte para ratón en xterm%s.\n" - -#: src/main.c:2285 -msgid " and the Linux console" -msgstr " y la consola Linux" +#: src/main.c:2286 +msgid "with mouse support on xterm and the Linux console.\n" +msgstr "Soporte para ratón en xterm y consola Linux\n" + +#: src/main.c:2287 +msgid "with mouse support on xterm.\n" +msgstr "Soporte para ratón en xterm\n" -#: src/main.c:2381 +#: src/main.c:2388 msgid "The TERM environment variable is unset!\n" msgstr "¡La variable de entorno TERM está sin definir!\n" -#: src/main.c:2487 +#: src/main.c:2494 msgid "" "Usage is:\n" "\n" @@ -5359,19 +5367,19 @@ "mc [OPCIONES] [DIRECTORIO] [SEGUNDO_DIRECTORIO]\n" "\n" -#: src/main.c:2490 +#: src/main.c:2497 msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" msgstr "-a, --stickchars Trazar líneas con +, -, |.\n" -#: src/main.c:2492 +#: src/main.c:2499 msgid "-b, --nocolor Force black and white display.\n" msgstr "-b, --nocolor Visualización modo monocromo.\n" -#: src/main.c:2494 +#: src/main.c:2501 msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" -msgstr "-B, --background [SOLO-PROGRAMADORES: Depurar código 2º plano]\n" +msgstr "-B, --background [SOLO-PROGRAMADORES: Depurar código 2º plano.]\n" -#: src/main.c:2496 +#: src/main.c:2503 msgid "" "-c, --color Force color mode.\n" "-C, --colors Specify colors (use --help-colors to get a list).\n" @@ -5381,11 +5389,11 @@ "-C, --colors Configurar colores (--help-colors muestra la lista).\n" "-d, --nomouse Deshabilitar soporte para ratón.\n" -#: src/main.c:2500 +#: src/main.c:2507 msgid "-e, --edit Startup the internal editor.\n" msgstr "-e, --edit Ejecutar el editor interno.\n" -#: src/main.c:2502 +#: src/main.c:2509 msgid "" "-f, --libdir Print configured paths.\n" "-h, --help Shows this help message.\n" @@ -5398,15 +5406,15 @@ "-k, --resetsoft Reponer teclas (sólo terminales HP) a los valores\n" " comunes establecidos en terminfo/termcap\n" -#: src/main.c:2507 +#: src/main.c:2514 msgid "-l, --ftplog file Log ftpfs commands to the file.\n" msgstr "-l, --ftplog archivo Registrar las conexiones ftpfs en el archivo.\n" -#: src/main.c:2510 +#: src/main.c:2517 msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" msgstr "-M, --memory archivo [SOLO-PROGRAMADORES: Registrar mensajes MAD.]\n" -#: src/main.c:2512 +#: src/main.c:2519 msgid "" "-P, --printwd At exit, print the last working directory.\n" "-s, --slow Disables verbose operation (for slow terminals).\n" @@ -5415,18 +5423,18 @@ "-s, --slow Deshabilitar operación detallada (para terminales " "lentos).\n" -#: src/main.c:2515 +#: src/main.c:2522 msgid "-t, --termcap Activate support for the TERMCAP variable.\n" msgstr "-t, --termcap Activar soporte para la variable TERMCAP.\n" -#: src/main.c:2518 +#: src/main.c:2525 msgid "" "-S, --createcmdile Create command file to set default directory upon exit.\n" msgstr "" "-S, --createcmdile Crear archivo de comandos para fijar directorio al " "salir.\n" -#: src/main.c:2521 +#: src/main.c:2528 msgid "" "-u, --nosubshell Disable the concurrent subshell mode.\n" "-U, --subshell Force the concurrent subshell mode.\n" @@ -5436,7 +5444,7 @@ "-U, --subshell Activar el modo de subshell concurrente.\n" "-r, --forceexec Forzar ejecución de subshell.\n" -#: src/main.c:2525 +#: src/main.c:2532 msgid "" "-v, --view fname Start up into the viewer mode.\n" "-V, --version Report version and configuration options.\n" @@ -5446,11 +5454,11 @@ "-V, --version Mostrar versión y opciones de configuración.\n" "-x, --xterm Activar ratón y restauración de pantalla en xterm.\n" -#: src/main.c:2529 +#: src/main.c:2536 msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" -msgstr "-X, --dbgsubshell [SOLO-PROGRAMADORES: Depurar subshell].\n" +msgstr "-X, --dbgsubshell [SOLO-PROGRAMADORES: Depurar subshell.]\n" -#: src/main.c:2531 +#: src/main.c:2538 msgid "" "\n" "Please send any bug reports (including the output of `mc -V')\n" @@ -5458,9 +5466,9 @@ msgstr "" "\n" "Si detecta algún fallo puede comunicarlo a mc-bugs@nuclecu.unam.mx\n" -"incluyendo la descripción obtenida con `mc -V'\n" +"incluyendo la descripción obtenida con `mc -V'.\n" -#: src/main.c:2547 +#: src/main.c:2554 msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -5498,123 +5506,123 @@ " brightcyan, lightgray and white\n" "\n" -#: src/main.c:2596 +#: src/main.c:2603 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Directorio para archivos del Midnight Commander: %s\n" -#: src/main.c:2610 +#: src/main.c:2617 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:2687 +#: src/main.c:2694 msgid "Use to debug the background code" msgstr "Se usa para depurar código de 2º plano" -#: src/main.c:2693 +#: src/main.c:2700 msgid "Request to run in color mode" msgstr "Solicitar la ejecución en color" -#: src/main.c:2695 +#: src/main.c:2702 msgid "Specifies a color configuration" msgstr "Indicar una configuración de colores" -#: src/main.c:2700 +#: src/main.c:2707 msgid "Edits one file" msgstr "Editar un archivo" -#: src/main.c:2704 +#: src/main.c:2711 msgid "Displays this help message" msgstr "Mostrar este mensaje de ayuda" -#: src/main.c:2707 +#: src/main.c:2714 msgid "Displays a help screen on how to change the color scheme" msgstr "Mostrar ayuda sobre cómo cambiar colores" -#: src/main.c:2710 +#: src/main.c:2717 msgid "Log ftp dialog to specified file" msgstr "Registrar diálogos ftp en un archivo" -#: src/main.c:2717 +#: src/main.c:2724 msgid "Obsolete" msgstr "Obsoleto" -#: src/main.c:2719 +#: src/main.c:2726 msgid "Requests to run in black and white" msgstr "Solicitar ejecución en blanco y negro" -#: src/main.c:2721 +#: src/main.c:2728 msgid "Disable mouse support in text version" msgstr "Desactivar ratón en la versión texto" -#: src/main.c:2724 +#: src/main.c:2731 msgid "Disables subshell support" msgstr "Desactivar el uso de subshell" -#: src/main.c:2728 +#: src/main.c:2735 msgid "Prints working directory at program exit" msgstr "Mostrar el nombre del directorio al salir" -#: src/main.c:2730 +#: src/main.c:2737 msgid "Resets soft keys on HP terminals" msgstr "Restablecer teclas en terminales HP" -#: src/main.c:2732 +#: src/main.c:2739 msgid "To run on slow terminals" msgstr "Para ejecutar en terminales lentos" -#: src/main.c:2735 +#: src/main.c:2742 msgid "Use stickchars to draw" msgstr "Usar caracteres simples para recuadros" -#: src/main.c:2739 +#: src/main.c:2746 msgid "Enables subshell support (default)" msgstr "Activar uso de subshell (por defecto)" -#: src/main.c:2744 +#: src/main.c:2751 msgid "Tries to use termcap instead of terminfo" msgstr "Intentar utilizar termcap en vez de terminfo" -#: src/main.c:2748 +#: src/main.c:2755 msgid "Displays the current version" msgstr "Mostrar el número de versión" -#: src/main.c:2750 +#: src/main.c:2757 msgid "Launches the file viewer on a file" msgstr "Abrir un archivo con el visor" -#: src/main.c:2752 +#: src/main.c:2759 msgid "Forces xterm features" msgstr "Utilizar las posibilidades de xterm" -#: src/main.c:2754 +#: src/main.c:2761 msgid "Geometry for the window" msgstr "Geometría de la ventana" -#: src/main.c:2754 +#: src/main.c:2761 msgid "GEOMETRY" msgstr "GEOMETRIA" -#: src/main.c:2755 +#: src/main.c:2762 msgid "No windows opened at startup" msgstr "No abrir ninguna ventana al inicio" -#: src/main.c:2756 +#: src/main.c:2763 msgid "No desktop icons" msgstr "No hay iconos de escritorio" -#: src/main.c:2757 +#: src/main.c:2764 msgid "Look more like traditional gmc" msgstr "Aparentar el gmc tradicional" -#: src/main.c:2759 +#: src/main.c:2766 msgid "Display the directory that holds the .links startup files and exit" msgstr "Mostrar el directorio con archivos de inicio y salir" -#: src/main.c:3071 +#: src/main.c:3078 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" @@ -5622,11 +5630,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:3149 +#: src/main.c:3156 msgid " Notice " msgstr " Aviso " -#: src/main.c:3150 +#: src/main.c:3157 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -6471,29 +6479,29 @@ "Fin de archivo inesperado\n" "%s" -#: vfs/direntry.c:312 +#: vfs/direntry.c:310 #, c-format msgid "Dir cache expired for %s" msgstr "El cache para %s ha expirado" -#: vfs/direntry.c:444 vfs/direntry.c:447 +#: vfs/direntry.c:440 vfs/direntry.c:443 msgid " Direntry warning " msgstr " Aviso en una entrada de directorio " -#: vfs/direntry.c:444 +#: vfs/direntry.c:440 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "Super ino_usage vale %d, fuga de memoria" -#: vfs/direntry.c:447 +#: vfs/direntry.c:443 msgid "Super has want_stale set" msgstr "Super tiene want_stale activo" -#: vfs/direntry.c:821 +#: vfs/direntry.c:817 msgid "Starting linear transfer..." msgstr "Iniciando transferencia en línea..." -#: vfs/direntry.c:964 +#: vfs/direntry.c:962 msgid "Getting file" msgstr "Trayendo archivo" @@ -6510,132 +6518,132 @@ msgid "Inconsistent extfs archive" msgstr "Archivo extfs inconsistente" -#: vfs/fish.c:139 +#: vfs/fish.c:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Desconectando de %s" -#: vfs/fish.c:217 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: Esperando línea de inicio..." -#: vfs/fish.c:227 +#: vfs/fish.c:228 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:232 +#: vfs/fish.c:233 msgid " fish: Password required for " msgstr " fish: Contraseña requerida para " -#: vfs/fish.c:241 +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: Enviando contraseña de usuario" -#: vfs/fish.c:247 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: Enviando línea de inicio..." -#: vfs/fish.c:251 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: Negociando versión..." -#: vfs/fish.c:255 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: Preparando directorio actual..." -#: vfs/fish.c:257 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Conectado, inicio en %s" -#: vfs/fish.c:333 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Leyendo el directorio %s..." -#: vfs/fish.c:429 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: falló" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:449 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: guardar %s: enviando comando..." -#: vfs/fish.c:463 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: Fallo de lectura local, enviando ceros" -#: vfs/fish.c:475 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: guardando %s %d (%d)" -#: vfs/fish.c:476 +#: vfs/fish.c:509 msgid "zeros" msgstr "ceros" -#: vfs/fish.c:515 +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "Abortando transferencia." -#: vfs/fish.c:524 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "Error denunciado tras abortar." -#: vfs/fish.c:526 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "Abortada transferencia con éxito." -#: vfs/ftpfs.c:316 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Desconectando de %s" -#: vfs/ftpfs.c:374 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: Contraseña requerida para " -#: vfs/ftpfs.c:407 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: Contraseña requerida para " -#: vfs/ftpfs.c:433 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: Enviando nombre de usuario al proxy" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: Enviando contraseña de usuario al proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: La identificación ante el proxy tuvo éxito" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: Conectado a %s" -#: vfs/ftpfs.c:462 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: Enviando nombre de usuario" -#: vfs/ftpfs.c:467 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: Enviando contraseña de usuario" -#: vfs/ftpfs.c:472 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: Autorizados" -#: vfs/ftpfs.c:487 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: denegada autorización al usuario %s" -#: vfs/ftpfs.c:519 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " No se pudo prefijar la ruta (%s)" @@ -6667,62 +6675,62 @@ msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Esperando antes de insistir... %d (Ctrl-C para cancelar)" -#: vfs/ftpfs.c:917 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: No se pudo aplicar el \"modo pasivo\"" -#: vfs/ftpfs.c:992 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: Abortando transferencia." -#: vfs/ftpfs.c:994 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: Error al abortar: %s" -#: vfs/ftpfs.c:999 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: Aborto fracasado" -#: vfs/ftpfs.c:1088 vfs/ftpfs.c:1185 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: Fallo al ejecutar CWD" -#: vfs/ftpfs.c:1098 vfs/ftpfs.c:1105 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: No se pudo resolver el enlace simbólico" -#: vfs/ftpfs.c:1156 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "Resolviendo enlace simbólico..." -#: vfs/ftpfs.c:1174 +#: vfs/ftpfs.c:1188 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: Leyendo vía FTP el directorio %s... %s%s" -#: vfs/ftpfs.c:1175 +#: vfs/ftpfs.c:1189 msgid "(strict rfc959)" msgstr "(rfc959)" -#: vfs/ftpfs.c:1176 +#: vfs/ftpfs.c:1190 msgid "(chdir first)" msgstr "(chdir)" -#: vfs/ftpfs.c:1270 +#: vfs/ftpfs.c:1286 msgid "ftpfs: failed" msgstr "ftpfs: Falló" -#: vfs/ftpfs.c:1280 +#: vfs/ftpfs.c:1296 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Falló; no hay dónde replegarse" -#: vfs/ftpfs.c:1343 +#: vfs/ftpfs.c:1359 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: Guardando archivo %d (%d)" -#: vfs/ftpfs.c:1758 +#: vfs/ftpfs.c:1774 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6792,24 +6800,24 @@ msgid "Midnight Commander's private remote filesystem" msgstr "Sistema de archivos remoto de Midnight Commander" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "Dominio:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "Usuario:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "Contraseña: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr " Contraseña para \\\\%s\\%s " -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6818,26 +6826,26 @@ " falló la reconexión con %s\n" " " -#: vfs/smbfs.c:1242 +#: vfs/smbfs.c:1243 msgid " Authentication failed " msgstr " Autentificación fallida " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s creando %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s eliminando %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s abriendo archivo remoto %s " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s renombrando archivos\n" @@ -6899,61 +6907,61 @@ msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes transfered" -#: vfs/undelfs.c:80 +#: vfs/undelfs.c:81 msgid " undelfs: error " msgstr " undelfs: error " -#: vfs/undelfs.c:183 +#: vfs/undelfs.c:184 msgid " not enough memory " msgstr " memoria insuficiente " -#: vfs/undelfs.c:188 +#: vfs/undelfs.c:189 msgid " while allocating block buffer " msgstr " al reservar buffer de bloque " -#: vfs/undelfs.c:192 +#: vfs/undelfs.c:193 #, c-format msgid " open_inode_scan: %d " msgstr " open_inode_scan: %d " -#: vfs/undelfs.c:196 +#: vfs/undelfs.c:197 #, c-format msgid " while starting inode scan %d " msgstr " al iniciar rastreo de inodos %d " -#: vfs/undelfs.c:203 +#: vfs/undelfs.c:204 #, c-format msgid "undelfs: loading deleted files information %d inodes" msgstr "undelfs: cargando información de archivos eliminados %d inodos" -#: vfs/undelfs.c:218 +#: vfs/undelfs.c:219 #, c-format msgid " while calling ext2_block_iterate %d " msgstr " al llamar a ext2_block_iterate %d " -#: vfs/undelfs.c:226 +#: vfs/undelfs.c:227 msgid " no more memory while reallocating array " msgstr " se agotó la memoria mientras se reubicaba la tabla " -#: vfs/undelfs.c:245 +#: vfs/undelfs.c:246 #, c-format msgid " while doing inode scan %d " msgstr " mientras se hacía el rastreo de inodos %d" -#: vfs/undelfs.c:269 +#: vfs/undelfs.c:270 msgid " Ext2lib error " msgstr " error Ext2lib " -#: vfs/undelfs.c:296 +#: vfs/undelfs.c:297 #, c-format msgid " Could not open file %s " msgstr " No puedo abrir el archivo %s " -#: vfs/undelfs.c:299 +#: vfs/undelfs.c:300 msgid "undelfs: reading inode bitmap..." msgstr "undelfs: leyendo mapa de inodos..." -#: vfs/undelfs.c:302 +#: vfs/undelfs.c:303 #, c-format msgid "" " Could not load inode bitmap from: \n" @@ -6962,11 +6970,11 @@ " No puedo cargar el inodo de: \n" " %s \n" -#: vfs/undelfs.c:305 +#: vfs/undelfs.c:306 msgid "undelfs: reading block bitmap..." msgstr "undelfs: leyendo mapa de bloques..." -#: vfs/undelfs.c:308 +#: vfs/undelfs.c:309 #, c-format msgid "" " Could not load block bitmap from: \n" @@ -6975,32 +6983,32 @@ " No puedo cargar bloques de: \n" " %s \n" -#: vfs/undelfs.c:314 +#: vfs/undelfs.c:315 msgid "undelfs: done." msgstr "undelfs: hecho." -#: vfs/undelfs.c:317 +#: vfs/undelfs.c:318 msgid "undelfs: failure" msgstr "undelfs: fallo" -#: vfs/undelfs.c:341 +#: vfs/undelfs.c:342 msgid " vfs_info is not fs! " msgstr " ¡vfs_info no es fs! " -#: vfs/undelfs.c:397 vfs/undelfs.c:581 +#: vfs/undelfs.c:398 vfs/undelfs.c:582 msgid " You have to chdir to extract files first " msgstr " Tiene que ir al directorio antes de extraer archivos " -#: vfs/undelfs.c:520 +#: vfs/undelfs.c:521 msgid " while iterating over blocks " msgstr " al iterar entre bloques " -#: vfs/undelfs.c:625 +#: vfs/undelfs.c:626 #, c-format msgid " Could not open file: %s " msgstr " No puedo abrir el archivo: %s " #. This is place of next pointer -#: vfs/undelfs.c:683 +#: vfs/undelfs.c:684 msgid "Undelete filesystem for ext2" msgstr "Sistema de archivos ext2 en recuperación" diff -ruN old/mc-4.5.44/po/es_ES.po new/mc-4.5.45/po/es_ES.po --- old/mc-4.5.44/po/es_ES.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/es_ES.po Tue May 9 18:52:08 2000 @@ -3,9 +3,9 @@ # David Martín , 1998-1999. msgid "" msgstr "" -"Project-Id-Version: 4.5.43\n" -"POT-Creation-Date: 2000-03-16 19:20+0100\n" -"PO-Revision-Date: 2000-03-16 20:00+0100\n" +"Project-Id-Version: 4.5.45\n" +"POT-Creation-Date: 2000-04-15 23:03+0200\n" +"PO-Revision-Date: 2000-04-16 00:00+0100\n" "Last-Translator: David Martín \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -86,15 +86,15 @@ "con el comando:\n" "\"%s\"%s" -#: gnome/gaction.c:135 gnome/gaction.c:151 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "abrir" -#: gnome/gaction.c:188 gnome/gaction.c:205 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "editar" -#: gnome/gaction.c:345 +#: gnome/gaction.c:351 msgid "view" msgstr "ver" @@ -1551,11 +1551,11 @@ #. 1 #: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 -#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:71 +#: 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&Aceptar" @@ -1764,14 +1764,14 @@ #. NLS for hotkeys? #: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 -#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:68 +#: 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:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 -#: vfs/smbfs.c:116 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "&Cancelar" @@ -2686,55 +2686,55 @@ msgstr "Máquina de escribir" #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "Ancho del parrafo auto: " #. 4 -#: gtkedit/editoptions.c:80 +#: gtkedit/editoptions.c:78 msgid "Tab spacing : " msgstr "Tamaño de tabulaciones: " -#: gtkedit/editoptions.c:88 +#: gtkedit/editoptions.c:86 msgid "synta&X highlighting" msgstr "sinta&Xis coloreada" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "confir&Mar al guardar" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "tabulaciones x e&Spacios" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "autoindenta&R" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "&Borrar en tabulaciones" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "&Fingir medias tabulaciones" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Autoajuste de párrafo" #. 15 -#: gtkedit/editoptions.c:118 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "Emulación de teclas" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr " Opciones del editor " @@ -3466,8 +3466,8 @@ " Not an xterm or Linux console; \n" " the panels cannot be toggled. " msgstr "" -" No se está usando ni xterm ni la consola de Linux; \n" -" Los paneles no pueden ser ocultados. " +" No se está usando ni xterm ni la consola Linux; \n" +" los paneles no pueden ser ocultados. " #: src/cmd.c:970 msgid "Type `exit' to return to the Midnight Commander" @@ -3532,48 +3532,57 @@ msgid " relative symlink: %s " msgstr " enlace simbólico relativo: %s " -#: src/cmd.c:1336 +#: src/cmd.c:1261 +msgid "Using default locale" +msgstr "Empleando localización genérica" + +#: src/cmd.c:1263 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "Empleando localización \"%s\" (por la variable de entorno %s)" + +#: src/cmd.c:1349 msgid " Enter machine name (F1 for details): " msgstr " Teclee el nombre de la máquina (F1 para más detalles): " -#: src/cmd.c:1363 +#: src/cmd.c:1376 #, c-format msgid " Could not chdir to %s " msgstr " No puedo cambiar al directorio %s " -#: src/cmd.c:1370 +#: src/cmd.c:1383 msgid " Link to a remote machine " msgstr " Conexión por red " -#: src/cmd.c:1376 +#: src/cmd.c:1389 msgid " FTP to machine " msgstr " Conexión por FTP " -#: src/cmd.c:1382 +#: src/cmd.c:1395 msgid " SMB link to machine " msgstr " Conexión por SMB " -#: src/cmd.c:1392 +#: src/cmd.c:1405 msgid " Socket source routing setup " msgstr " Configuración del ruteo específico " -#: src/cmd.c:1393 +#: src/cmd.c:1406 msgid " Enter host name to use as a source routing hop: " msgstr " Teclee el nombre de la máquina que será la intermediaria: " -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Host name " msgstr " Nombre de la máquina " -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr " Error al buscar la dirección IP " -#: src/cmd.c:1411 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr " Recuperar ficheros de un sistema de ficheros ext2 " -#: src/cmd.c:1412 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3581,11 +3590,11 @@ " Introduzca el dispositivo (sin /dev/) donde quiere\n" " recuperar ficheros: (F1 para más detalles)" -#: src/cmd.c:1462 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr " Configuración almacenada en ~/" -#: src/cmd.c:1467 +#: src/cmd.c:1480 msgid " Setup " msgstr " Configuración " @@ -3765,7 +3774,7 @@ #: src/features.inc:18 msgid " with X11 support to read modifiers" -msgstr " con soporte teclado de X11" +msgstr " con soporte para teclado de X11" #: src/features.inc:24 msgid "Virtual File System: tarfs, extfs" @@ -3797,7 +3806,7 @@ #: src/features.inc:45 msgid "With builtin Editor\n" -msgstr "Con Editor propio incorporado\n" +msgstr "Editor de texto propio incluido\n" #: src/features.inc:48 msgid "Using " @@ -3805,11 +3814,11 @@ #: src/features.inc:51 msgid "system-installed " -msgstr "instalada en el sistema " +msgstr "(estaba ya instalado) " #: src/features.inc:53 msgid "S-lang library with " -msgstr "biblioteca S-lang con " +msgstr "S-lang con " #: src/features.inc:56 msgid "terminfo" @@ -3825,7 +3834,7 @@ #: src/features.inc:64 msgid " database" -msgstr " base de datos" +msgstr " como origen de datos" #: src/features.inc:67 msgid "the ncurses library" @@ -3837,7 +3846,7 @@ #: src/features.inc:74 msgid "With subshell support: " -msgstr "Con soporte subshell: " +msgstr "Soporte subshell: " #: src/features.inc:76 msgid "optional" @@ -3849,7 +3858,7 @@ #: src/features.inc:84 msgid "With support for background operations\n" -msgstr "Con soporte para operaciones en 2º plano\n" +msgstr "Soporte para operaciones en 2º plano\n" #: src/file.c:154 src/tree.c:639 msgid " Copy " @@ -4215,7 +4224,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 vfs/fish.c:476 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "fichero" @@ -5334,20 +5343,19 @@ msgid "Thank you for using GNU Midnight Commander" msgstr "Gracias por usar el GNU Midnight Commander" -#: src/main.c:2284 -#, c-format -msgid "with mouse support on xterm%s.\n" -msgstr "con soporte para ratón en xterm%s.\n" - -#: src/main.c:2285 -msgid " and the Linux console" -msgstr " y la consola Linux" +#: src/main.c:2286 +msgid "with mouse support on xterm and the Linux console.\n" +msgstr "Soporte para ratón en xterm y consola Linux\n" + +#: src/main.c:2287 +msgid "with mouse support on xterm.\n" +msgstr "Soporte para ratón en xterm\n" -#: src/main.c:2381 +#: src/main.c:2388 msgid "The TERM environment variable is unset!\n" msgstr "¡La variable de entorno TERM está sin definir!\n" -#: src/main.c:2487 +#: src/main.c:2494 msgid "" "Usage is:\n" "\n" @@ -5359,19 +5367,19 @@ "mc [OPCIONES] [DIRECTORIO] [SEGUNDO_DIRECTORIO]\n" "\n" -#: src/main.c:2490 +#: src/main.c:2497 msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" msgstr "-a, --stickchars Trazar líneas con +, -, |.\n" -#: src/main.c:2492 +#: src/main.c:2499 msgid "-b, --nocolor Force black and white display.\n" msgstr "-b, --nocolor Visualización modo monocromo.\n" -#: src/main.c:2494 +#: src/main.c:2501 msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" -msgstr "-B, --background [SOLO-PROGRAMADORES: Depurar código 2º plano]\n" +msgstr "-B, --background [SOLO-PROGRAMADORES: Depurar código 2º plano.]\n" -#: src/main.c:2496 +#: src/main.c:2503 msgid "" "-c, --color Force color mode.\n" "-C, --colors Specify colors (use --help-colors to get a list).\n" @@ -5381,11 +5389,11 @@ "-C, --colors Configurar colores (--help-colors muestra la lista).\n" "-d, --nomouse Deshabilitar soporte para ratón.\n" -#: src/main.c:2500 +#: src/main.c:2507 msgid "-e, --edit Startup the internal editor.\n" msgstr "-e, --edit Ejecutar el editor interno.\n" -#: src/main.c:2502 +#: src/main.c:2509 msgid "" "-f, --libdir Print configured paths.\n" "-h, --help Shows this help message.\n" @@ -5398,15 +5406,15 @@ "-k, --resetsoft Reponer teclas (sólo terminales HP) a los valores\n" " comunes establecidos en terminfo/termcap\n" -#: src/main.c:2507 +#: src/main.c:2514 msgid "-l, --ftplog file Log ftpfs commands to the file.\n" msgstr "-l, --ftplog fichero Registrar las conexiones ftpfs en el fichero.\n" -#: src/main.c:2510 +#: src/main.c:2517 msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" msgstr "-M, --memory fichero [SOLO-PROGRAMADORES: Registrar mensajes MAD.]\n" -#: src/main.c:2512 +#: src/main.c:2519 msgid "" "-P, --printwd At exit, print the last working directory.\n" "-s, --slow Disables verbose operation (for slow terminals).\n" @@ -5415,18 +5423,18 @@ "-s, --slow Deshabilitar operación detallada (para terminales " "lentos).\n" -#: src/main.c:2515 +#: src/main.c:2522 msgid "-t, --termcap Activate support for the TERMCAP variable.\n" msgstr "-t, --termcap Activar soporte para la variable TERMCAP.\n" -#: src/main.c:2518 +#: src/main.c:2525 msgid "" "-S, --createcmdile Create command file to set default directory upon exit.\n" msgstr "" "-S, --createcmdile Crear fichero de comandos para fijar directorio al " "salir.\n" -#: src/main.c:2521 +#: src/main.c:2528 msgid "" "-u, --nosubshell Disable the concurrent subshell mode.\n" "-U, --subshell Force the concurrent subshell mode.\n" @@ -5436,7 +5444,7 @@ "-U, --subshell Activar el modo de subshell concurrente.\n" "-r, --forceexec Forzar ejecución de subshell.\n" -#: src/main.c:2525 +#: src/main.c:2532 msgid "" "-v, --view fname Start up into the viewer mode.\n" "-V, --version Report version and configuration options.\n" @@ -5446,11 +5454,11 @@ "-V, --version Mostrar versión y opciones de configuración.\n" "-x, --xterm Activar ratón y restauración de pantalla en xterm.\n" -#: src/main.c:2529 +#: src/main.c:2536 msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" -msgstr "-X, --dbgsubshell [SOLO-PROGRAMADORES: Depurar subshell].\n" +msgstr "-X, --dbgsubshell [SOLO-PROGRAMADORES: Depurar subshell.]\n" -#: src/main.c:2531 +#: src/main.c:2538 msgid "" "\n" "Please send any bug reports (including the output of `mc -V')\n" @@ -5458,9 +5466,9 @@ msgstr "" "\n" "Si detecta algún fallo puede comunicarlo a mc-bugs@nuclecu.unam.mx\n" -"incluyendo la descripción obtenida con `mc -V'\n" +"incluyendo la descripción obtenida con `mc -V'.\n" -#: src/main.c:2547 +#: src/main.c:2554 msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -5498,123 +5506,123 @@ " brightcyan, lightgray and white\n" "\n" -#: src/main.c:2596 +#: src/main.c:2603 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Directorio para ficheros del Midnight Commander: %s\n" -#: src/main.c:2610 +#: src/main.c:2617 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:2687 +#: src/main.c:2694 msgid "Use to debug the background code" msgstr "Se usa para depurar código de 2º plano" -#: src/main.c:2693 +#: src/main.c:2700 msgid "Request to run in color mode" msgstr "Solicitar la ejecución en color" -#: src/main.c:2695 +#: src/main.c:2702 msgid "Specifies a color configuration" msgstr "Indicar una configuración de colores" -#: src/main.c:2700 +#: src/main.c:2707 msgid "Edits one file" msgstr "Editar un fichero" -#: src/main.c:2704 +#: src/main.c:2711 msgid "Displays this help message" msgstr "Mostrar este mensaje de ayuda" -#: src/main.c:2707 +#: src/main.c:2714 msgid "Displays a help screen on how to change the color scheme" msgstr "Mostrar ayuda sobre cómo cambiar colores" -#: src/main.c:2710 +#: src/main.c:2717 msgid "Log ftp dialog to specified file" msgstr "Registrar diálogos ftp en un fichero" -#: src/main.c:2717 +#: src/main.c:2724 msgid "Obsolete" msgstr "Obsoleto" -#: src/main.c:2719 +#: src/main.c:2726 msgid "Requests to run in black and white" msgstr "Solicitar ejecución en blanco y negro" -#: src/main.c:2721 +#: src/main.c:2728 msgid "Disable mouse support in text version" msgstr "Desactivar ratón en la versión texto" -#: src/main.c:2724 +#: src/main.c:2731 msgid "Disables subshell support" msgstr "Desactivar el uso de subshell" -#: src/main.c:2728 +#: src/main.c:2735 msgid "Prints working directory at program exit" msgstr "Mostrar el nombre del directorio al salir" -#: src/main.c:2730 +#: src/main.c:2737 msgid "Resets soft keys on HP terminals" msgstr "Restablecer teclas en terminales HP" -#: src/main.c:2732 +#: src/main.c:2739 msgid "To run on slow terminals" msgstr "Para ejecutar en terminales lentos" -#: src/main.c:2735 +#: src/main.c:2742 msgid "Use stickchars to draw" msgstr "Usar caracteres simples para recuadros" -#: src/main.c:2739 +#: src/main.c:2746 msgid "Enables subshell support (default)" msgstr "Activar uso de subshell (por defecto)" -#: src/main.c:2744 +#: src/main.c:2751 msgid "Tries to use termcap instead of terminfo" msgstr "Intentar utilizar termcap en vez de terminfo" -#: src/main.c:2748 +#: src/main.c:2755 msgid "Displays the current version" msgstr "Mostrar el número de versión" -#: src/main.c:2750 +#: src/main.c:2757 msgid "Launches the file viewer on a file" msgstr "Abrir un fichero con el visor" -#: src/main.c:2752 +#: src/main.c:2759 msgid "Forces xterm features" msgstr "Utilizar las posibilidades de xterm" -#: src/main.c:2754 +#: src/main.c:2761 msgid "Geometry for the window" msgstr "Geometría de la ventana" -#: src/main.c:2754 +#: src/main.c:2761 msgid "GEOMETRY" msgstr "GEOMETRIA" -#: src/main.c:2755 +#: src/main.c:2762 msgid "No windows opened at startup" msgstr "No abrir ninguna ventana al inicio" -#: src/main.c:2756 +#: src/main.c:2763 msgid "No desktop icons" msgstr "No hay iconos de escritorio" -#: src/main.c:2757 +#: src/main.c:2764 msgid "Look more like traditional gmc" msgstr "Aparentar el gmc tradicional" -#: src/main.c:2759 +#: src/main.c:2766 msgid "Display the directory that holds the .links startup files and exit" msgstr "Mostrar el directorio con ficheros de inicio y salir" -#: src/main.c:3071 +#: src/main.c:3078 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" @@ -5622,11 +5630,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:3149 +#: src/main.c:3156 msgid " Notice " msgstr " Aviso " -#: src/main.c:3150 +#: src/main.c:3157 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -6471,29 +6479,29 @@ "Fin de fichero inesperado\n" "%s" -#: vfs/direntry.c:312 +#: vfs/direntry.c:310 #, c-format msgid "Dir cache expired for %s" msgstr "El cache para %s ha expirado" -#: vfs/direntry.c:444 vfs/direntry.c:447 +#: vfs/direntry.c:440 vfs/direntry.c:443 msgid " Direntry warning " msgstr " Aviso en una entrada de directorio " -#: vfs/direntry.c:444 +#: vfs/direntry.c:440 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "Super ino_usage vale %d, fuga de memoria" -#: vfs/direntry.c:447 +#: vfs/direntry.c:443 msgid "Super has want_stale set" msgstr "Super tiene want_stale activo" -#: vfs/direntry.c:821 +#: vfs/direntry.c:817 msgid "Starting linear transfer..." msgstr "Iniciando transferencia en línea..." -#: vfs/direntry.c:964 +#: vfs/direntry.c:962 msgid "Getting file" msgstr "Trayendo fichero" @@ -6510,132 +6518,132 @@ msgid "Inconsistent extfs archive" msgstr "Fichero extfs inconsistente" -#: vfs/fish.c:139 +#: vfs/fish.c:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Desconectando de %s" -#: vfs/fish.c:217 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: Esperando línea de inicio..." -#: vfs/fish.c:227 +#: vfs/fish.c:228 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:232 +#: vfs/fish.c:233 msgid " fish: Password required for " msgstr " fish: Contraseña requerida para " -#: vfs/fish.c:241 +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: Enviando contraseña de usuario" -#: vfs/fish.c:247 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: Enviando línea de inicio..." -#: vfs/fish.c:251 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: Negociando versión..." -#: vfs/fish.c:255 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: Preparando directorio actual..." -#: vfs/fish.c:257 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Conectado, inicio en %s" -#: vfs/fish.c:333 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Leyendo el directorio %s..." -#: vfs/fish.c:429 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: falló" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:449 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: guardar %s: enviando comando..." -#: vfs/fish.c:463 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: Fallo de lectura local, enviando ceros" -#: vfs/fish.c:475 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: guardando %s %d (%d)" -#: vfs/fish.c:476 +#: vfs/fish.c:509 msgid "zeros" msgstr "ceros" -#: vfs/fish.c:515 +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "Abortando transferencia." -#: vfs/fish.c:524 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "Error denunciado tras abortar." -#: vfs/fish.c:526 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "Abortada transferencia con éxito." -#: vfs/ftpfs.c:316 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Desconectando de %s" -#: vfs/ftpfs.c:374 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: Contraseña requerida para " -#: vfs/ftpfs.c:407 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: Contraseña requerida para " -#: vfs/ftpfs.c:433 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: Enviando nombre de usuario al proxy" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: Enviando contraseña de usuario al proxy" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: La identificación ante el proxy tuvo éxito" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: Conectado a %s" -#: vfs/ftpfs.c:462 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: Enviando nombre de usuario" -#: vfs/ftpfs.c:467 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: Enviando contraseña de usuario" -#: vfs/ftpfs.c:472 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: Autorizados" -#: vfs/ftpfs.c:487 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: denegada autorización al usuario %s" -#: vfs/ftpfs.c:519 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " No se pudo prefijar la ruta (%s)" @@ -6667,62 +6675,62 @@ msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Esperando antes de insistir... %d (Ctrl-C para cancelar)" -#: vfs/ftpfs.c:917 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: No se pudo aplicar el \"modo pasivo\"" -#: vfs/ftpfs.c:992 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: Abortando transferencia." -#: vfs/ftpfs.c:994 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: Error al abortar: %s" -#: vfs/ftpfs.c:999 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: Aborto fracasado" -#: vfs/ftpfs.c:1088 vfs/ftpfs.c:1185 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: Fallo al ejecutar CWD" -#: vfs/ftpfs.c:1098 vfs/ftpfs.c:1105 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: No se pudo resolver el enlace simbólico" -#: vfs/ftpfs.c:1156 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "Resolviendo enlace simbólico..." -#: vfs/ftpfs.c:1174 +#: vfs/ftpfs.c:1188 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: Leyendo vía FTP el directorio %s... %s%s" -#: vfs/ftpfs.c:1175 +#: vfs/ftpfs.c:1189 msgid "(strict rfc959)" msgstr "(rfc959)" -#: vfs/ftpfs.c:1176 +#: vfs/ftpfs.c:1190 msgid "(chdir first)" msgstr "(chdir)" -#: vfs/ftpfs.c:1270 +#: vfs/ftpfs.c:1286 msgid "ftpfs: failed" msgstr "ftpfs: Falló" -#: vfs/ftpfs.c:1280 +#: vfs/ftpfs.c:1296 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: Falló; no hay dónde replegarse" -#: vfs/ftpfs.c:1343 +#: vfs/ftpfs.c:1359 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: Guardando fichero %d (%d)" -#: vfs/ftpfs.c:1758 +#: vfs/ftpfs.c:1774 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6792,24 +6800,24 @@ msgid "Midnight Commander's private remote filesystem" msgstr "Sistema de ficheros remoto de Midnight Commander" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "Dominio:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "Usuario:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "Contraseña: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr " Contraseña para \\\\%s\\%s " -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6818,26 +6826,26 @@ " falló la reconexión con %s\n" " " -#: vfs/smbfs.c:1242 +#: vfs/smbfs.c:1243 msgid " Authentication failed " msgstr " Autentificación fallida " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s creando %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s eliminando %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s abriendo fichero remoto %s " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s renombrando ficheros\n" @@ -6899,61 +6907,61 @@ msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes transfered" -#: vfs/undelfs.c:80 +#: vfs/undelfs.c:81 msgid " undelfs: error " msgstr " undelfs: error " -#: vfs/undelfs.c:183 +#: vfs/undelfs.c:184 msgid " not enough memory " msgstr " memoria insuficiente " -#: vfs/undelfs.c:188 +#: vfs/undelfs.c:189 msgid " while allocating block buffer " msgstr " al reservar buffer de bloque " -#: vfs/undelfs.c:192 +#: vfs/undelfs.c:193 #, c-format msgid " open_inode_scan: %d " msgstr " open_inode_scan: %d " -#: vfs/undelfs.c:196 +#: vfs/undelfs.c:197 #, c-format msgid " while starting inode scan %d " msgstr " al iniciar rastreo de inodos %d " -#: vfs/undelfs.c:203 +#: vfs/undelfs.c:204 #, c-format msgid "undelfs: loading deleted files information %d inodes" msgstr "undelfs: cargando información de ficheros eliminados %d inodos" -#: vfs/undelfs.c:218 +#: vfs/undelfs.c:219 #, c-format msgid " while calling ext2_block_iterate %d " msgstr " al llamar a ext2_block_iterate %d " -#: vfs/undelfs.c:226 +#: vfs/undelfs.c:227 msgid " no more memory while reallocating array " msgstr " se agotó la memoria mientras se reubicaba la tabla " -#: vfs/undelfs.c:245 +#: vfs/undelfs.c:246 #, c-format msgid " while doing inode scan %d " msgstr " mientras se hacía el rastreo de inodos %d" -#: vfs/undelfs.c:269 +#: vfs/undelfs.c:270 msgid " Ext2lib error " msgstr " error Ext2lib " -#: vfs/undelfs.c:296 +#: vfs/undelfs.c:297 #, c-format msgid " Could not open file %s " msgstr " No puedo abrir el fichero %s " -#: vfs/undelfs.c:299 +#: vfs/undelfs.c:300 msgid "undelfs: reading inode bitmap..." msgstr "undelfs: leyendo mapa de inodos..." -#: vfs/undelfs.c:302 +#: vfs/undelfs.c:303 #, c-format msgid "" " Could not load inode bitmap from: \n" @@ -6962,11 +6970,11 @@ " No puedo cargar el inodo de: \n" " %s \n" -#: vfs/undelfs.c:305 +#: vfs/undelfs.c:306 msgid "undelfs: reading block bitmap..." msgstr "undelfs: leyendo mapa de bloques..." -#: vfs/undelfs.c:308 +#: vfs/undelfs.c:309 #, c-format msgid "" " Could not load block bitmap from: \n" @@ -6975,32 +6983,32 @@ " No puedo cargar bloques de: \n" " %s \n" -#: vfs/undelfs.c:314 +#: vfs/undelfs.c:315 msgid "undelfs: done." msgstr "undelfs: hecho." -#: vfs/undelfs.c:317 +#: vfs/undelfs.c:318 msgid "undelfs: failure" msgstr "undelfs: fallo" -#: vfs/undelfs.c:341 +#: vfs/undelfs.c:342 msgid " vfs_info is not fs! " msgstr " ¡vfs_info no es fs! " -#: vfs/undelfs.c:397 vfs/undelfs.c:581 +#: vfs/undelfs.c:398 vfs/undelfs.c:582 msgid " You have to chdir to extract files first " msgstr " Tiene que ir al directorio antes de extraer ficheros " -#: vfs/undelfs.c:520 +#: vfs/undelfs.c:521 msgid " while iterating over blocks " msgstr " al iterar entre bloques " -#: vfs/undelfs.c:625 +#: vfs/undelfs.c:626 #, c-format msgid " Could not open file: %s " msgstr " No puedo abrir el fichero: %s " #. This is place of next pointer -#: vfs/undelfs.c:683 +#: vfs/undelfs.c:684 msgid "Undelete filesystem for ext2" msgstr "Sistema de ficheros ext2 en recuperación" diff -ruN old/mc-4.5.44/po/hu.po new/mc-4.5.45/po/hu.po --- old/mc-4.5.44/po/hu.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/hu.po Tue May 9 18:52:08 2000 @@ -1,6 +1,6 @@ # mc hu.po # Copyright (C) 1999 Free Software Foundation, Inc. -# Shooby Ban , 1999. +# Szabolcs Ban , 2000. # Hungarian translation by Kádár András and # Tamas Fejos # @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: control-center 4.5.38\n" "POT-Creation-Date: 1999-08-30 13:07+0200\n" -"PO-Revision-Date: 1998-03-27 01:22+0100\n" -"Last-Translator: Shooby Ban \n" +"PO-Revision-Date: 2000-05-09 01:22+0100\n" +"Last-Translator: Szabolcs Ban \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-2\n" @@ -46,6 +46,10 @@ "\n" "Please check it to see if it points to a valid command." msgstr "" +"Nem tudom elindítani\n" +"\"%s\".\n" +"\n" +"Kérlek vizsgáld meg, hogy helyes programra mutat-e." #: gnome/gaction.c:40 #, c-format @@ -55,6 +59,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" +"A hiba kijavításához kattints a mime típusokra a GNOME vezérlõpulton" +" és szerkeszd a %s-action beállítást \"%s\"-nek." #: gnome/gaction.c:46 #, c-format @@ -64,6 +72,10 @@ "To fix this error, bring up this file's properties and change the default " "%s-action." msgstr "" +"\".\n" +"\n" +"A hiba javításához hozd be a fájl beállításait és cseréld ki az alap " +"%s-action-t." #: gnome/gaction.c:51 #, c-format @@ -73,21 +85,22 @@ "with the command:\n" "\"%s\"%s" msgstr "" +"Nem megy: %s\n" +"\"%s\"\n" +"a parancs:\n" +"\"%s\"%s" #: gnome/gaction.c:134 gnome/gaction.c:150 -#, fuzzy msgid "open" -msgstr "Megnyitás" +msgstr "megnyitás" #: gnome/gaction.c:185 gnome/gaction.c:198 -#, fuzzy msgid "edit" -msgstr "Szerk" +msgstr "szerk" #: gnome/gaction.c:331 -#, fuzzy msgid "view" -msgstr "Megnéz" +msgstr "megnéz" #: gnome/gcmd.c:48 msgid " There is no other panel to compare contents to " @@ -205,7 +218,7 @@ #: gnome/gcmd.c:685 msgid "." -msgstr "" +msgstr "." #: gnome/gcmd.c:701 msgid "" @@ -339,12 +352,12 @@ #. Icon position #: gnome/gdesktop-prefs.c:242 msgid "Icon position" -msgstr "" +msgstr "Ikon pozíció" #. Snap and placement #: gnome/gdesktop-prefs.c:258 msgid "Automatic icon placement" -msgstr "" +msgstr "Automatikus ikon helyezés" #: gnome/gdesktop-prefs.c:262 msgid "Snap icons to grid" @@ -355,9 +368,8 @@ msgstr "Árnyékolt ikonok használata" #: gnome/gdesktop-prefs.c:281 -#, fuzzy msgid "Use shaped text" -msgstr "Árnyékolt ikonok használata" +msgstr "Árnyékolt szöveg használata" #: gnome/gdesktop-prefs.c:335 msgid "Desktop" @@ -432,7 +444,7 @@ #: gnome/gdesktop.c:2613 msgid "URL L_ink..." -msgstr "" +msgstr "URL L_ink..." #: gnome/gdesktop.c:2614 msgid "Creates a new launcher" @@ -443,59 +455,48 @@ msgstr "I_ndító..." #: gnome/gdesktop.c:2620 -#, fuzzy msgid "By _Name" -msgstr " Fájlnév " +msgstr "_Név szerint" #: gnome/gdesktop.c:2621 -#, fuzzy msgid "By File _Type" -msgstr "Fájl típusok" +msgstr "_Típus szerint" #: gnome/gdesktop.c:2622 -#, fuzzy msgid "By _Size" -msgstr " Hossz " +msgstr "Ho_ssz szerint" #: gnome/gdesktop.c:2623 -#, fuzzy msgid "By Time Last _Accessed" -msgstr "Utolsó elérés ideje" +msgstr "Utolsó _elérés szerint" #: gnome/gdesktop.c:2624 -#, fuzzy msgid "By Time Last _Modified" -msgstr "Utolsó módosítás ideje" +msgstr "Utolsó _módosítás szerint" #: gnome/gdesktop.c:2625 -#, fuzzy msgid "By Time Last _Changed" -msgstr "Utolsó változás ideje" +msgstr "Utolsó _változás szerint" #: gnome/gdesktop.c:2633 gnome/glayout.c:455 -#, fuzzy msgid "_Arrange Icons" msgstr "Ikonok elrendezése" #: gnome/gdesktop.c:2634 -#, fuzzy msgid "Create _New Window" -msgstr "Új ablak készítése" +msgstr "Új _ablak készítése" #: gnome/gdesktop.c:2636 gnome/glayout.c:457 -#, fuzzy msgid "Recreate Desktop _Shortcuts" -msgstr "Készítsd el újra a munkaasztal-linkeket" +msgstr "_Készítsd el újra a munkaasztal-linkeket" #: gnome/gdesktop.c:2637 gnome/glayout.c:458 -#, fuzzy msgid "Rescan _Desktop" -msgstr "Munkaasztal újraolvasása" +msgstr "Munkaaszta_l újraolvasása" #: gnome/gdesktop.c:2638 -#, fuzzy msgid "Configure _Background Image" -msgstr "Háttérkép beállítása" +msgstr "Háttérkép _beállítása" #: gnome/gdialogs.c:60 msgid "To: " @@ -932,7 +933,7 @@ #: gnome/glayout.c:465 gnome/glayout.c:476 msgid "_Settings" -msgstr "" +msgstr "_Beállítások" #: gnome/glayout.c:466 gnome/glayout.c:477 msgid "_Layout" @@ -1088,7 +1089,7 @@ #: gnome/gnome-file-property-dialog.c:303 msgid "URL:" -msgstr "" +msgstr "URL:" #: gnome/gnome-file-property-dialog.c:310 msgid "Caption:" @@ -1100,9 +1101,8 @@ msgstr "Elejtés akció" #: gnome/gnome-file-property-dialog.c:388 -#, fuzzy msgid "Use default Drop Action options" -msgstr "Használd az alapértelmezett elejtést" +msgstr "Használd az _alapértelmezett elejtést" #: gnome/gnome-file-property-dialog.c:403 #: gnome/gnome-file-property-dialog.c:491 gnome/gpopup2.c:194 @@ -1210,9 +1210,9 @@ #: gnome/gnome-file-property-dialog.c:815 #: gnome/gnome-file-property-dialog.c:905 -#, fuzzy, c-format +#, c-format msgid " (%d)" -msgstr "" +msgstr " (%d)" #: gnome/gnome-file-property-dialog.c:919 msgid "File ownership" @@ -1220,7 +1220,7 @@ #: gnome/gnome-file-property-dialog.c:1079 msgid "URL" -msgstr "" +msgstr "URL" #: gnome/gnome-file-property-dialog.c:1082 msgid "Statistics" @@ -1251,9 +1251,9 @@ msgstr "Nem nevezheted át a fájlodat olyan névre, amiben van '/'" #: gnome/gnome-open-dialog.c:384 -#, fuzzy, c-format +#, c-format msgid "Select an application to open \"%s\" with." -msgstr "Válassz egy alkalmazást hogy megnyisd \"" +msgstr "Válassz egy alkalmazást hogy megnyisd \"%s\"-t." #: gnome/gnome-open-dialog.c:394 msgid "Select a file to run with" @@ -1391,11 +1391,11 @@ #: gnome/gprefs.c:180 msgid "VFS" -msgstr "" +msgstr "VFS" #: gnome/gprefs.c:184 msgid "Caching" -msgstr "" +msgstr "Gyorstár" #: gnome/gprefs.c:474 msgid "Preferences" @@ -1539,9 +1539,9 @@ msgstr "&Oké" #: gnome/gview.c:136 -#, fuzzy, c-format +#, c-format msgid "Offset 0x%08lx" -msgstr "Offset 0x%08x" +msgstr "Offset 0x%08lx" #: gnome/gview.c:138 src/view.c:730 #, c-format @@ -1835,7 +1835,7 @@ #: gtkedit/editcmd.c:1151 #, fuzzy msgid "o&Ne" -msgstr "&Név" +msgstr "e&Gy" #: gtkedit/editcmd.c:1153 src/filegui.c:597 msgid "al&L" @@ -1920,12 +1920,13 @@ msgstr " Csere erre : " #: gtkedit/editcmd.c:1370 gtkedit/editcmd.c:1371 -#, fuzzy, c-format +#, c-format msgid "" "You can enter regexp substrings with %s\n" "(not \\1, \\2 like sed) then use \"Enter...order\"" msgstr "" -"Beírhatsz egy reguláris kifejezést %s-el (nem \\1, \\2 mint a sed-ben)majd " +"Beírhatsz egy reguláris kifejezést %s-el\n" +"(nem \\1, \\2 mint a sed-ben) majd " "használd az 'Írd be..rendezési'" #: gtkedit/editcmd.c:1373 @@ -1934,12 +1935,12 @@ #. Tool hint #: gtkedit/editcmd.c:1377 gtkedit/editcmd.c:1378 -#, fuzzy msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" msgstr "" -"Írd be a rendezési elvet a scanf formátumú vagy reguláris kifejezés helyett" +"Írd be a rendezési elvet a scanf\n" +"formátumú vagy reguláris kifejezés helyett, pl. 3,1,2" #. The following are check boxes #: gtkedit/editcmd.c:1383 @@ -1955,11 +1956,12 @@ msgstr " Szabályos kifejezés " #: gtkedit/editcmd.c:1389 gtkedit/editcmd.c:1390 -#, fuzzy msgid "" "See the regex man page for how\n" "to compose a regular expression" -msgstr "Szabályos kifelyezések alkotásához nézd meg a regexp man oldalt" +msgstr +"Szabályos kifelyezések alkotásához\n" +"nézd meg a regexp man oldalt" #: gtkedit/editcmd.c:1396 msgid " Backwards " @@ -1989,11 +1991,12 @@ #. Tool hint #: gtkedit/editcmd.c:1421 -#, fuzzy msgid "" "Allows entering of a C format string,\n" "see the scanf man page" -msgstr "A `scanf' C függvényben használt formátummegadást tesz lehetõvé" +msgstr +"A `scanf' C függvényben használt \n" +"formátummegadást tesz lehetõvé, lásd man scanf" #. Tool hint #: gtkedit/editcmd.c:1426 @@ -2014,9 +2017,8 @@ msgstr "Mindet cseréli" #: gtkedit/editcmd.c:1585 -#, fuzzy msgid "Replace one" -msgstr " Csere " +msgstr "Egyet cserél" #: gtkedit/editcmd.c:1585 msgid "Skip" @@ -2203,7 +2205,6 @@ msgstr " Névjegy " #: gtkedit/editmenu.c:75 -#, fuzzy msgid "" "\n" " Cooledit v3.11.5\n" @@ -2214,7 +2215,7 @@ " for the Midnight Commander.\n" msgstr "" "\n" -" Cooledit v2.1\n" +" Cooledit v3.11.5\n" "\n" " Copyright (C) 1996 the Free Software Foundation\n" "\n" @@ -2430,7 +2431,7 @@ #. Tool hint #: gtkedit/editmenu.c:407 msgid "Disk operations and file indexing/searching" -msgstr "" +msgstr "Lemez mûveletek és fájl indexelés/keresés" #: gtkedit/editmenu.c:413 msgid "Toggle mark\tF3" @@ -2561,7 +2562,7 @@ #: gtkedit/editoptions.c:36 msgid "Emacs" -msgstr "" +msgstr "Emacs" #: gtkedit/editoptions.c:36 msgid "Intuitive" @@ -2682,53 +2683,45 @@ #: gtkedit/gtkedit.c:1246 msgid "Interactive help browser" -msgstr "" +msgstr "Interaktív súgó böngészõ" #: gtkedit/gtkedit.c:1247 -#, fuzzy msgid "Save to current file name" -msgstr " Írd be a fájlnevet: " +msgstr "Jelenlegi fájlnévre ments" #: gtkedit/gtkedit.c:1248 msgid "Toggle In/Off invisible marker to highlight text" -msgstr "" +msgstr "Ki/be kapcsolja a láthatatlan jelölõt a kijelölt szöveghez" #: gtkedit/gtkedit.c:1249 -#, fuzzy msgid "Find and replace strings/regular expressions" -msgstr " Hibás reguláris kifejezés " +msgstr "Reguláris kifejezés, sztringek keresése, cseréje" #: gtkedit/gtkedit.c:1249 -#, fuzzy msgid "Replc" msgstr "Csere" #: gtkedit/gtkedit.c:1250 -#, fuzzy msgid "Copy highlighted block to cursor position" -msgstr "Kijelölés másolása\tF5" +msgstr "Kijelölés másolása kurzor pozícióba" #: gtkedit/gtkedit.c:1252 -#, fuzzy msgid "Move highlighted block to cursor position" -msgstr "Kijelölés áthelyezése\tF6" +msgstr "Kijelölés áthelyezése kurzor pozícióba" #: gtkedit/gtkedit.c:1253 -#, fuzzy msgid "Find" -msgstr "Befejezve" +msgstr "Keres" #: gtkedit/gtkedit.c:1253 -#, fuzzy msgid "Find strings/regular expressions" -msgstr " Hibás reguláris kifejezés " +msgstr "Reguláris kifejezések/szövegek keresése" #: gtkedit/gtkedit.c:1254 msgid "Delete highlighted text" -msgstr "" +msgstr "Törli a kijelölt szöveget" #: gtkedit/gtkedit.c:1254 -#, fuzzy msgid "Dlete" msgstr "Töröl" @@ -2737,13 +2730,12 @@ msgstr "Menü" #: gtkedit/gtkedit.c:1255 -#, fuzzy msgid "Pull down menu" -msgstr "&Legördülõ menük" +msgstr "Legördülõ menük" #: gtkedit/gtkedit.c:1256 msgid "Exit editor" -msgstr "" +msgstr "Kilép a szerkesztõbõl" #: gtkedit/gtkedit.c:1290 msgid "Clear the edit buffer" @@ -2779,7 +2771,7 @@ #: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 #: gtkedit/syntax.c:1078 msgid " Spelling Message " -msgstr "" +msgstr " Helyesírási üzenet " #: gtkedit/syntax.c:1060 msgid "" @@ -2802,7 +2794,6 @@ msgstr "" #: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 -#, fuzzy msgid " Load Syntax Rules " msgstr " Szintaxis fájl betöltése" @@ -3440,9 +3431,8 @@ msgstr " FTP kapcsolat " #: src/cmd.c:1374 -#, fuzzy msgid " SMB link to machine " -msgstr " FTP kapcsolat " +msgstr " SMB kapcsolat " #: src/cmd.c:1384 msgid " Socket source routing setup " @@ -3820,7 +3810,7 @@ #: src/file.c:802 msgid "Incomplete file was retrieved. Keep it?" -msgstr "" +msgstr "Nem jött le a teljes fájl. Megtartod?" #: src/file.c:803 msgid "&Delete" @@ -3915,9 +3905,9 @@ " %s " #: src/file.c:1246 -#, fuzzy, c-format +#, c-format msgid " `%s' and `%s' are the same directory " -msgstr " %s' és %s' ugyanaz a fájl " +msgstr " %s' és %s' ugyanaz a könyvtár " #: src/file.c:1265 #, c-format @@ -3984,22 +3974,22 @@ #: src/file.c:1695 #, c-format msgid "%o %f \"%s\"%m" -msgstr "" +msgstr "%o %f \"%s\"%m" #: src/file.c:1696 #, c-format msgid "%o %d %f%m" -msgstr "" +msgstr "%o %d %f%m" #: src/file.c:1698 #, c-format msgid "%o %f \"%s\"%e" -msgstr "" +msgstr "%o %f \"%s\"%e" #: src/file.c:1699 #, c-format msgid "%o %d %f%e" -msgstr "" +msgstr "%o %d %f%e" #: src/file.c:1703 msgid "directories" @@ -4893,9 +4883,8 @@ msgstr "F&TP kapcsolat..." #: src/main.c:1246 src/main.c:1270 -#, fuzzy msgid "SM&B link..." -msgstr "F&TP kapcsolat..." +msgstr "&SMB kapcsolat..." #: src/main.c:1251 src/main.c:1275 msgid "&Drive... M-d" @@ -5224,7 +5213,7 @@ #: src/main.c:2740 msgid "GEOMETRY" -msgstr "" +msgstr "GEOMETRY" #: src/main.c:2740 msgid "Geometry for the window" @@ -5643,12 +5632,12 @@ #. strftime() format string for recent dates #: src/util.c:599 src/util.c:624 msgid "%b %e %H:%M" -msgstr "" +msgstr "%b %e %H:%M" #. strftime() format string for old dates #: src/util.c:600 src/util.c:622 msgid "%b %e %Y" -msgstr "" +msgstr "%b %e %Y" #: src/utilunix.c:390 msgid " Pipe failed " @@ -5722,7 +5711,7 @@ " %s " #: src/view.c:578 -#, fuzzy, c-format +#, c-format msgid "" " Can't stat \"%s\"\n" " %s " @@ -5767,18 +5756,17 @@ " Írd be az kívánt sor számát:" #: src/view.c:1933 -#, fuzzy, c-format +#, c-format msgid "" " The current address is 0x%lx.\n" " Enter the new address:" msgstr "" -" Az aktuális sor száma %d.\n" +" Az aktuális sor száma 0x%lx.\n" " Írd be az kívánt sor számát:" #: src/view.c:1935 -#, fuzzy msgid " Goto Address " -msgstr " Ugrás sorra " +msgstr " Ugrás címre " #: src/view.c:1966 msgid " Enter regexp:" @@ -5794,7 +5782,7 @@ #: src/view.c:2072 msgid "Goto" -msgstr "" +msgstr "Menj" #: src/view.c:2072 msgid "Line" @@ -5841,9 +5829,8 @@ msgstr "NForm" #: src/widget.c:999 -#, fuzzy msgid " History " -msgstr "Parancssor &elõzmények" +msgstr " Elõzmények " #. 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 :( @@ -6054,88 +6041,83 @@ msgstr "Nem konzisztens extfs archív" #: vfs/fish.c:136 -#, fuzzy, c-format +#, c-format msgid "fish: Disconnecting from %s" -msgstr "ftpfs: Lecsatlakozás %s-rõl" +msgstr "fish: Lecsatlakozás %s-rõl" #: vfs/fish.c:214 msgid "fish: Waiting for initial line..." -msgstr "" +msgstr "fish: Kezdõ sorra várva..." #: vfs/fish.c:224 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Bocs, nem tudok jelszóellenõrzött kapcsolatot létesíteni most." #: vfs/fish.c:238 -#, fuzzy msgid "fish: Sending password..." -msgstr "ftpfs: felhasználójelszó küldése" +msgstr "fish: Jelszó küldése..." #: vfs/fish.c:244 msgid "fish: Sending initial line..." -msgstr "" +msgstr "fish: Kezdõsor küldése..." #: vfs/fish.c:248 msgid "fish: Handshaking version..." -msgstr "" +msgstr "fish: Kézfogás verzió..." #: vfs/fish.c:252 -#, fuzzy msgid "fish: Setting up current directory..." -msgstr "Könyvtár tartalmat újra olvas" +msgstr "fish: Könyvtár beállítása..." #: vfs/fish.c:254 -#, fuzzy, c-format +#, c-format msgid "fish: Connected, home %s." -msgstr "ftpfs: csatlakozva: " +msgstr "fish: Csatlakozva, %s a könyvtár." #: vfs/fish.c:331 -#, fuzzy, c-format +#, c-format msgid "fish: Reading directory %s..." -msgstr "ftpfs: %s FTP könyvtár olvasása" +msgstr "fish: %s könyvtár olvasása..." #: vfs/fish.c:426 -#, fuzzy msgid "fish: got listing" -msgstr "ftpfs: listázva" +msgstr "fish: listázva" #: vfs/fish.c:430 -#, fuzzy msgid "fish: failed" -msgstr "ftpfs: nem sikerült" +msgstr "fish: nem sikerült" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) #: vfs/fish.c:450 #, c-format msgid "fish: store %s: sending command..." -msgstr "" +msgstr "fish: store %s: parancs küldése..." #: vfs/fish.c:464 msgid "fish: Local read failed, sending zeros" -msgstr "" +msgstr "fish: Helyi olvasás sikertelen, 0-k küldése" #: vfs/fish.c:476 #, fuzzy, c-format msgid "fish: storing %s %d (%d)" -msgstr "ftpfs: fájl feltöltése %d (%s)" +msgstr "fish: %s fájl feltöltése %d (%d)" #: vfs/fish.c:516 -#, fuzzy msgid "Aborting transfer..." -msgstr "ftpfs: átvitel megszakítása." +msgstr "fish: átvitel megszakítása..." #: vfs/fish.c:525 msgid "Error reported after abort." -msgstr "" +msgstr "Hiba a megszakítás után." #: vfs/fish.c:527 msgid "Aborted transfer would be successful." -msgstr "" +msgstr "A megszakított átvitel sikeres lehet." #: vfs/ftpfs.c:326 #, c-format msgid "ftpfs: Disconnecting from %s" -msgstr "ftpfs: Lecsatlakozás %s-rõl" +msgstr "fish: Lecsatlakozás %s-rõl" #: vfs/ftpfs.c:377 msgid " FTP: Password required for " @@ -6289,7 +6271,7 @@ #: vfs/mcfs.c:154 msgid " MCFS " -msgstr "" +msgstr " MCFS " #: vfs/mcfs.c:154 msgid " The server does not support this version " @@ -6330,26 +6312,24 @@ msgstr " Túl sok nyitott kapcsolat" #: vfs/smbfs.c:1421 -#, fuzzy, c-format +#, c-format msgid " %s mkdir'ing %s " -msgstr " szimbolikus link: %s" +msgstr " %s mkdir-ezi: %s" #: vfs/smbfs.c:1442 -#, fuzzy, c-format +#, c-format msgid " %s rmdir'ing %s " -msgstr " szimbolikus link: %s" +msgstr " %s rmdir-ezi: %s" #: vfs/smbfs.c:1550 vfs/smbfs.c:1570 vfs/smbfs.c:1631 -#, fuzzy, c-format +#, c-format msgid " %s opening remote file %s " -msgstr "" -" A(z) \"%s\" fájlt nem sikerült törölni.\n" -" %s " +msgstr " %s megnyitja a %s távoli fájlt " #: vfs/smbfs.c:1654 -#, fuzzy, c-format +#, c-format msgid " %s renaming files\n" -msgstr " %s bájt %d fájlban" +msgstr " %s fájl van hátra\n" #: vfs/tar.c:84 vfs/tar.c:101 #, c-format @@ -6381,69 +6361,9 @@ #: vfs/vfs.c:1792 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" -msgstr "" +msgstr "%s: %s: %s %3d%% (%ld byte átment)" #: vfs/vfs.c:1793 #, c-format msgid "%s: %s: %s %ld bytes transfered" -msgstr "" - -#~ msgid "Rescan System Devices" -#~ msgstr "A rendszereszközök újraellenõrzése" - -#~ msgid "Auto place icons" -#~ msgstr "Ikonok elrendezése" - -#~ msgid "All files" -#~ msgstr "Minden fájl" - -#~ msgid "Archives and compressed files" -#~ msgstr "Archív és tömörített fájlok" - -#~ msgid "RPM/DEB files" -#~ msgstr "RPM/DEB fájlok" - -#~ msgid "Text/Document files" -#~ msgstr "Szöveg/Dokumentum fájlok" - -#~ msgid "HTML and SGML files" -#~ msgstr "HTML és SGML fájlok" - -#~ msgid "Postscript and PDF files" -#~ msgstr "Postscript és PDF fájlok" - -#~ msgid "Spreadsheet files" -#~ msgstr "Táblázat fájlok" - -#~ msgid "Image files" -#~ msgstr "Kép fájlok" - -#~ msgid "Video/animation files" -#~ msgstr "Video/animáció fájlok" - -#~ msgid "Audio files" -#~ msgstr "Hang fájlok" - -#~ msgid "C program files" -#~ msgstr "C program fájlok" - -#~ msgid "C++ program files" -#~ msgstr "C++ program fájlok" - -#~ msgid "Objective-C program files" -#~ msgstr "Objective-C program fájlok" - -#~ msgid "Scheme program files" -#~ msgstr "Scheme program fájlok" - -#~ msgid "Assembler program files" -#~ msgstr "Assembler program fájlok" - -#~ msgid "Misc. program files" -#~ msgstr "Vegyes program fájlok" - -#~ msgid "Font files" -#~ msgstr "Font fájlok" - -#~ msgid "Disk operations" -#~ msgstr "Lemezmûveletek" +msgstr "%s: %s: %s %ld byte átment" diff -ruN old/mc-4.5.44/po/it.po new/mc-4.5.45/po/it.po --- old/mc-4.5.44/po/it.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/it.po Tue May 9 18:52:08 2000 @@ -1927,11 +1927,11 @@ #: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 msgid "&Skip" -msgstr "Ignora" +msgstr "&Ignora" #: gtkedit/editcmd.c:1196 msgid "&Replace" -msgstr "Sostituisci" +msgstr "&Sostituisci" #: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 msgid " Replace with: " @@ -1947,15 +1947,15 @@ #: gtkedit/editcmd.c:1238 msgid "replace &All" -msgstr "sostituisci tutto" +msgstr "sostituisci &Tutto" #: gtkedit/editcmd.c:1240 msgid "pr&Ompt on replace" -msgstr "chiedi a &Ogni sostituzione" +msgstr "&Chiedi sempre" #: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 msgid "&Backwards" -msgstr "Indietro" +msgstr "&Indietro" #: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 msgid "&Regular expression" @@ -1963,23 +1963,23 @@ #: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 msgid "&Whole words only" -msgstr "solo parole intere" +msgstr "solo &Parole intere" #: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 msgid "case &Sensitive" -msgstr "controlla maiuscole/minuscole" +msgstr "controllare &Maiuscole/minuscole" #: gtkedit/editcmd.c:1252 msgid " Enter replacement argument order eg. 3,2,1,4 " -msgstr " Inserisci l'ordine dell'argomento di sostituzione es. 3,2,1,4 " +msgstr " Ordine dell'argomento di sostituzione es. 3,2,1,4 " #: gtkedit/editcmd.c:1256 msgid " Enter replacement string:" -msgstr " Inserisci stringa di sostituzione:" +msgstr " Inserire stringa di sostituzione:" #: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2003 msgid " Enter search string:" -msgstr " Inserisci stringa di ricerca" +msgstr " Inserire stringa di ricerca" #. Heads the 'Replace' dialog box #: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 @@ -5360,6 +5360,10 @@ "mc [flags] [this_dir] [other_panel_dir]\n" "\n" msgstr "" +"Uso:\n" +"\n" +"mc [flag] [questa_dir] [altra_dir_pannello]\n" +"\n" #: src/main.c:2490 msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" @@ -6420,6 +6424,8 @@ "Premature end of cpio archive\n" "%s" msgstr "" +"Fine prematura di un archivio cpio\n" +"%s" #: vfs/cpio.c:309 vfs/cpio.c:358 #, c-format @@ -6765,12 +6771,12 @@ msgstr "Nome host irraggiungibile: %s " #: vfs/mcfs.c:253 -#, fuzzy, c-format +#, c-format msgid " Can't create socket: %s " msgstr " Non riesco a creare il socket: %s " #: vfs/mcfs.c:259 -#, fuzzy, c-format +#, c-format msgid " Can't connect to server: %s " msgstr " Non riesco a connettermi al server: %s " @@ -6811,7 +6817,7 @@ #: vfs/smbfs.c:1242 msgid " Authentication failed " -msgstr "" +msgstr " Autenticazione fallita " #: vfs/smbfs.c:1737 #, c-format diff -ruN old/mc-4.5.44/po/ja.po new/mc-4.5.45/po/ja.po --- old/mc-4.5.44/po/ja.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/ja.po Tue May 9 18:52:09 2000 @@ -5,35 +5,35 @@ # Akira TAGOH , 2000. msgid "" msgstr "" -"Project-Id-Version: mc 4.5.42\n" -"POT-Creation-Date: 1999-09-27 17:14+0900\n" -"PO-Revision-Date: 2000-01-26 04:13+0900\n" -"First-Translator: Yasuyuki Furukawa \n" +"Project-Id-Version: mc CVS-20000420\n" +"POT-Creation-Date: 2000-04-20 23:31+0900\n" +"PO-Revision-Date: 2000-04-20 23:37+0900\n" "Last-Translator: Akira TAGOH \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=EUC-JP\n" +"Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8bit\n" +"First-Translator: Yasuyuki Furukawa \n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr " 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 " ¥Þ¥¯¥í¤ò¼Â¹Ô " #. 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 " ¥­¡¼¤ò²¡¤·¤Æ¤¯¤À¤µ¤¤: " @@ -86,15 +86,15 @@ "\"%s\"\n" "¥³¥Þ¥ó¥É: \"%s\"%s" -#: gnome/gaction.c:130 gnome/gaction.c:146 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "³«¤¯" -#: gnome/gaction.c:181 gnome/gaction.c:194 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "ÊÔ½¸" -#: gnome/gaction.c:327 +#: gnome/gaction.c:351 msgid "view" msgstr "ɽ¼¨" @@ -102,6 +102,10 @@ msgid " There is no other panel to compare contents to " msgstr " ¥³¥ó¥Æ¥ó¥Ä¤òÈæ³Ó¤¹¤ë¥Ñ¥Í¥ë¤¬Â¾¤Ë¤¢¤ê¤Þ¤»¤ó " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " ¥¿¡¼¥ß¥Ê¥ë¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "The Midnight Commander Team" @@ -162,11 +166,11 @@ #: 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" @@ -223,7 +227,7 @@ "For example:\n" "*.png will show just png images" msgstr "" -"¥Ñ¥Í¥ë¤Ëɽ¼¨¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥£¥ë¥¿¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤.\n" +"¥Ñ¥Í¥ë¤Ëɽ¼¨¤¹¤ë¥Õ¥¡¥¤¥ë¤Î¥Õ¥£¥ë¥¿¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤\n" "\n" "Îã:\n" "¡Ø*.png¡Ù¤Ç¤ÏPNG²èÁü¤Î¤ß¤òɽ¼¨¤¹¤ë¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹" @@ -274,7 +278,7 @@ #: gnome/gcmd.c:963 msgid "Enter the URL:" -msgstr "URL¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" +msgstr "URL¤òÆþÎÏ:" #: gnome/gcustom-layout.c:34 msgid "Access Time" @@ -285,8 +289,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 "¥°¥ë¡¼¥×" @@ -312,7 +316,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 "½êÍ­¼Ô" @@ -345,28 +349,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 "%s¤ò³«¤±¤Þ¤»¤ó; ¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥¤¥³¥ó¤¬¤¢¤ê¤Þ¤»¤ó" -#: gnome/gdesktop.c:1186 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "mount/umount¥³¥Þ¥ó¥É¼Â¹ÔÃæ" -#: gnome/gdesktop.c:1255 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "eject¥³¥Þ¥ó¥É¼Â¹ÔÃæ" -#: 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" @@ -380,84 +384,84 @@ "\n" "ÇطʤòÀßÄê¤Ç¤­¤Þ¤»¤ó." -#: gnome/gdesktop.c:2621 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "üËö (_T)" -#: 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 "¥Ç¥£¥ì¥¯¥È¥ê (_D)..." -#: 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 "URL¥ê¥ó¥¯ (_L)..." -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" msgstr "¿·µ¬URL¥ê¥ó¥¯¤òºîÀ®¤¹¤ë" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "¥é¥ó¥Á¥ã (_L)..." -#: 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 "̾Á° (_N)" -#: gnome/gdesktop.c:2632 +#: gnome/gdesktop.c:2651 msgid "By File _Type" msgstr "¥Õ¥¡¥¤¥ë¥¿¥¤¥× (_T)" -#: gnome/gdesktop.c:2633 +#: gnome/gdesktop.c:2652 msgid "By _Size" msgstr "¥µ¥¤¥º (_S)" -#: gnome/gdesktop.c:2634 +#: gnome/gdesktop.c:2653 msgid "By Time Last _Accessed" msgstr "ºÇ½ª¥¢¥¯¥»¥¹»þ¹ï (_A)" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2654 msgid "By Time Last _Modified" msgstr "ºÇ½ª¹¹¿·»þ¹ï (_M)" -#: gnome/gdesktop.c:2636 +#: gnome/gdesktop.c:2655 msgid "By Time Last _Changed" msgstr "ºÇ½ªÊѹ¹»þ¹ï (_C)" -#: gnome/gdesktop.c:2644 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "¥¢¥¤¥³¥ó¤ÎÀ°Îó (_A)" -#: gnome/gdesktop.c:2645 +#: gnome/gdesktop.c:2664 msgid "Create _New Window" msgstr "¿·µ¬¥¦¥£¥ó¥É¥¦¤ÎºîÀ® (_N)" -#: gnome/gdesktop.c:2647 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" -msgstr "¥Ç¥£¥ì¥¯¥È¥êºÆ¥¹¥­¥ã¥ó (_D)" +msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¥Ç¥£¥ì¥¯¥È¥ê¤òºÆ¥¹¥­¥ã¥ó (_D)" -#: gnome/gdesktop.c:2648 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "¥Ç¥Ð¥¤¥¹¤òºÆ¥¹¥­¥ã¥ó (_V)" -#: gnome/gdesktop.c:2649 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "¥Ç¥Õ¥©¥ë¥È¤Î¥¢¥¤¥³¥ó¤òºÆºîÀ® (_I)" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2670 msgid "Configure _Background Image" msgstr "ÇطʲèÁü¤òÀßÄê (_B)" @@ -513,8 +517,8 @@ "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." @@ -522,7 +526,7 @@ #: gnome/gdialogs.c:406 msgid "Don't overwrite any files." -msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤Ê¤¤." +msgstr "¥Õ¥¡¥¤¥ë¤ò¾å½ñ¤­¤·¤Ê¤¤" #: gnome/gdialogs.c:422 msgid "Overwrite:" @@ -530,15 +534,15 @@ #: 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" @@ -553,12 +557,12 @@ msgid "Replace it?" 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 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2398 src/screen.c:2428 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 "°ÜÆ°" @@ -584,7 +588,7 @@ #: gnome/gdialogs.c:643 msgid "Follow links." -msgstr "¥ê¥ó¥¯¤òÄɤ¤¤«¤±¤ë." +msgstr "¥ê¥ó¥¯¤òÄɤ¤¤«¤±¤ë" #: gnome/gdialogs.c:649 msgid "" @@ -646,15 +650,15 @@ #: gnome/gdialogs.c:943 msgid "is " -msgstr "¤Ï" +msgstr "¤Ï " #: gnome/gdialogs.c:946 msgid "done." -msgstr "½ªÎ»¤·¤Þ¤·¤¿." +msgstr "½ªÎ»¤·¤Þ¤·¤¿" #. 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:1837 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1834 msgid "Password:" msgstr "¥Ñ¥¹¥ï¡¼¥É:" @@ -675,24 +679,24 @@ msgid "Symbolic link filename:" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥Õ¥¡¥¤¥ë̾:" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "¤³¤Î¾ì½ê¤Ç°ÜÆ° (_M)" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "¤³¤Î¾ì½ê¤Ç¥³¥Ô¡¼ (_C)" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "¤³¤Î¾ì½ê¤Ç¥ê¥ó¥¯ (_L)" -#: 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" @@ -701,8 +705,8 @@ "%s¤òstat¤Ç¤­¤Þ¤»¤ó\n" "%s" -#: 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 "" "ɸ½à¤Î¥¢¥¤¥³¥ó¥»¥Ã¥È¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó, ¥¤¥ó¥¹¥È¡¼¥ë¤Î»ÅÊý¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤" @@ -765,8 +769,8 @@ "\n" "Are you sure you want to exit?" msgstr "" -"¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤¬½ªÎ»¤¹¤ë¤È¡¢\n" -"GNOME¥Ç¥¹¥¯¥È¥Ã¥×¥Ï¥ó¥É¥é¤âƱ»þ¤Ë½ªÎ»¤·¤Æ¤·¤Þ¤¤¤Þ¤¹.\n" +"¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤¬½ªÎ»¤¹¤ë¤È¡¤\n" +"GNOME¥Ç¥¹¥¯¥È¥Ã¥×¥Ï¥ó¥É¥é¤âƱ»þ¤Ë½ªÎ»¤·¤Æ¤·¤Þ¤¤¤Þ¤¹\n" "\n" "ËÜÅö¤Ë½ªÎ»¤·¤Æ¤â¤è¤í¤·¤¤¤Ç¤¹¤«?" @@ -859,7 +863,7 @@ msgid "Reverses the list of tagged files" msgstr "¥Õ¥¡¥¤¥ë¥¹¥¤¥Ã¥Á¤Î°ìÍ÷¤òȿž¤¹¤ë" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2088 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2085 msgid "Search" msgstr "¸¡º÷" @@ -976,285 +980,286 @@ "root ¤Ç¼Â¹Ô¤¹¤ë¤È, ÉÔÃí°Õ¤Ç¥·¥¹¥Æ¥à¤òÇ˲õ¤·¤Æ¤·¤Þ¤¤¤Þ¤¹. " "GNOME¥Õ¥¡¥¤¥ë¥Þ¥Í¡¼¥¸¥ã¤ÏÇ˲õ¹Ô°Ù¤ò»ß¤á¤ë¤è¤¦¤Ê¤³¤È¤Ï¤·¤Þ¤»¤ó" -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "¥Õ¥¡¥¤¥ë /etc/fstab ¤ò³«¤±¤Þ¤»¤ó" -#: 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 "" "%s¤ò%s¤Øsymlink¤Ç¤­¤Þ¤»¤ó; ¥Ç¥¹¥¯¥È¥Ã¥×¡¦¥Ç¥Ð¥¤¥¹¡¦¥¢¥¤¥³¥ó¤Ï¤Ê¤¯¤Ê¤ê¤Þ¤¹" -#: 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 "¥Õ¥í¥Ã¥Ô¡¼ %d" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "¥Ç¥£¥¹¥¯ %d" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "NFS¥Ç¥£¥ì¥¯¥È¥ê %s" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "¥Ç¥Ð¥¤¥¹ %d" #. 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 "¥Õ¥¡¥¤¥ë·Á¼°: 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 "¥Õ¥¡¥¤¥ë¥µ¥¤¥º: " -#: 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 "¥Õ¥¡¥¤¥ë¥µ¥¤¥º: N/A" -#: 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 "URL:" -#: 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 -#: src/screen.c:2397 src/screen.c:2427 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 +#: src/screen.c:2396 src/screen.c:2426 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:2084 +#: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 +#: src/screen.c:2397 src/screen.c:2427 src/view.c:2081 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 "¤³¤Î¥æ¡¼¥¶¸¢¸Â¤ò¸ÇÄê(Set 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 "¤³¤Î¥°¥ë¡¼¥×¸¢¸Â¤ò¸ÇÄê(Set 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 "¥¹¥Æ¥£¥Ã¥­¡¼" -#: 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 "¥Õ¥¡¥¤¥ë½êÍ­¸¢" -#: 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 "Åý·×" -#: 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 "ʸ»ú '/' ¤ò´Þ¤à̾Á°¤ËÊѹ¹¤¹¤ë¤³¤È¤Ï¤Ç¤­¤Þ¤»¤ó" @@ -1300,8 +1305,8 @@ msgid "Copy..." msgstr "¥³¥Ô¡¼..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2401 +#: src/screen.c:2431 msgid "Delete" msgstr "ºï½ü" @@ -1341,71 +1346,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Àµµ¬É½¸½¤Î¤«¤ï¤ê¤Ë¥·¥§¥ë¥Ñ¥¿¡¼¥ó¤òÍѤ¤¤ë" -#: 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 "¥Õ¥¡¥¤¥ëºï½ü»þ¤Ë³Îǧ¤ò¤È¤ë" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "¥Õ¥¡¥¤¥ë¾å½ñ¤­»þ¤Ë³Îǧ¤ò¤È¤ë" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "¥Õ¥¡¥¤¥ë¼Â¹Ô»þ¤Ë³Îǧ¤ò¤È¤ë" -#: gnome/gprefs.c:125 +#: 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 "VFS »þ´Ö¥¢¥¦¥È:" -#: 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 "Anonymous FTP¥Ñ¥¹¥ï¡¼¥É:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "ɬ¤ºFTP¥×¥í¥­¥·¤òÍøÍѤ¹¤ë" -#: 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 "FTP¥Ç¥£¥ì¥¯¥È¥ê¥­¥ã¥Ã¥·¥å»þ´Ö¥¢¥¦¥È :" -#: 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 "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "¥­¥ã¥Ã¥·¥å" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "ÀßÄê" @@ -1545,12 +1554,12 @@ 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "¤Ï¤¤ (&O)" @@ -1559,12 +1568,12 @@ msgid "Offset 0x%08lx" msgstr "¥ª¥Õ¥»¥Ã¥È 0x%08lx" -#: gnome/gview.c:138 src/view.c:735 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "Îó %d" -#: gnome/gview.c:142 src/view.c:739 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s¥Ð¥¤¥È" @@ -1654,199 +1663,228 @@ msgid "Could not get the desktop\n" msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¤ò¼èÆÀ¤Ç¤­¤Þ¤»¤ó\n" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "À°Î󥿥¤¥× '%s' ¤Ï̤ÃΤΤâ¤Î¤Ç¤¹\n" + +#: 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 "DIRECTORY" -#: 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:226 +#: 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/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 "edit.h ¤Î MAXBUF ¤òÁý¤ä¤·¤Æ¥¨¥Ç¥£¥¿¤òºÆ¥³¥ó¥Ñ¥¤¥ë¤·¤Æ¤¯¤À¤µ¤¤" -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr "¥á¥â¥ê¤Î³ÎÊݤ˼ºÇÔ¤·¤Þ¤·¤¿" +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " ¥Ñ¥¤¥×¤Ø¤Î½ñ¤­½Ð¤·¥¨¥é¡¼: " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr "½ñ¤­¹þ¤à¤¿¤á¤Î¥Ñ¥¤¥×¤ò³«¤¯»î¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: " -#: gtkedit/editcmd.c:334 +#: 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:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 -#: vfs/smbfs.c:116 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "¥­¥ã¥ó¥»¥ë (&C)" -#: 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: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:172 +#: 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:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 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 "key '%d 0': " -#: 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:2080 +#: gtkedit/editcmd.c:836 gtkedit/editwidget.c:1137 gtkedit/gtkedit.c:1247 +#: src/view.c:2077 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. " @@ -1854,118 +1892,113 @@ "¥Æ¥­¥¹¥È¤ËÊѹ¹¤¬²Ã¤¨¤é¤ì¤Æ¤¤¤Þ¤¹¤¬Êݸ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡£\n" "Êѹ¹¤òÇË´þ¤·¤Æ³¤±¤Þ¤¹¡£" -#: 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 "°ì¤Ä (&N)" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1192 src/filegui.c:597 msgid "al&L" msgstr "Á´Éô (&L)" -#: 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 "¥¹¥­¥Ã¥× (&S)" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1196 msgid "&Replace" msgstr "ÃÖ´¹ (&R)" -#: 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 "scanf ·Á¼° (&E)" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1238 msgid "replace &All" msgstr "Á´¤ÆÃÖ¤­´¹¤¨¤ë (&A)" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1240 msgid "pr&Ompt on replace" msgstr "ÃÖ´¹»þ¤Ë¥×¥í¥ó¥×¥È (&O)" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 msgid "&Backwards" msgstr "¸åÊý (&B)" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 msgid "&Regular expression" msgstr "Àµµ¬É½¸½ (&R)" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 msgid "&Whole words only" msgstr "ñ¸ì¤Î¤ß (&W)" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 msgid "case &Sensitive" msgstr "Âçʸ»ú¡¦¾®Ê¸»ú¤ò¶èÊÌ (&S)" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1252 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr "ÃÖ´¹¤Î°ú¿ô¤Î½çÈÖ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (Îã) 3,2,1,4 " -#: gtkedit/editcmd.c:1241 +#: gtkedit/editcmd.c:1256 msgid " Enter replacement string:" msgstr "ÃÖ´¹Ê¸»úÎó¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:2003 +#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2000 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:1531 src/view.c:1630 src/view.c:1753 src/view.c:1971 -#: src/view.c:2003 +#: gtkedit/editcmd.c:1347 gtkedit/editcmd.c:1577 gtkedit/editcmd.c:2308 +#: gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 src/view.c:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 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" @@ -1974,12 +2007,12 @@ "Àµµ¬É½¸½¤ÎÉôʬʸ»úÎó¤ò %s ¤ÇÆþÎϤǤ­¤Þ¤¹\n" "(sed ¤Î¤è¤¦¤Ë \\1 ¤ä \\2 ¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó) ¤½¤ì¤«¤é \"°ú¿ô¤Î¡ÁÆþÎÏ\" ¤ò»È¤¤¤Þ¤¹" -#: 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" @@ -1988,19 +2021,19 @@ "ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤ (Îã) 3,1,2" #. 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" @@ -2008,34 +2041,48 @@ "Àµµ¬É½¸½¤Î½ñ¤­Êý¤Ë¤Ä¤¤¤Æ¤Ï\n" "Àµµ¬É½¸½¤Î¥Þ¥Ë¥å¥¢¥ë¤òÆɤó¤Ç¤¯¤À¤µ¤¤" -#: 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 "Scanf ·Á¼° " #. 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,56 +2091,61 @@ "scanf ¤Î¥Þ¥Ë¥å¥¢¥ë¤ò»²¾È" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1506 msgid "Begin search, Enter" msgstr "¸¡º÷¤Î³«»Ï, ENTER" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "¤³¤Î¥À¥¤¥¢¥í¥°¤òÃæÃÇ, ESC" -#: 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 "¤ª¤«¤·¤ÊÀµµ¬É½¸½¡¢¤¢¤ë¤¤¤Ï scanf ·Á¼°¤Ç¤¹¡£ÊÑ´¹¤¬Â¿¤¹¤®¤Þ¤¹ " #. "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 "%ld ¸ÄÃÖ´¹¤·¤Þ¤·¤¿" -#: 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 " %d ¸Äȯ¸«¤·¡¤ %d ¸Ä¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¤òÄɲä·¤Þ¤·¤¿ " + #. 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? " @@ -2101,138 +2153,138 @@ "¸½ºß¤Î¥Æ¥­¥¹¥È¤ËÊѹ¹¤¬²Ã¤¨¤é¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢Êݸ¤·¤Æ¤¤¤Þ¤»¤ó¡£\n" "Êݸ¤·¤Æ½ªÎ»¤·¤Þ¤¹¤«?" -#: 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:862 src/screen.c:2165 -#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:409 +#: 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:406 msgid "&Yes" msgstr "¤Ï¤¤ (&Y)" -#: 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 +#: 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:406 msgid "&No" msgstr "¤¤¤¤¤¨ (&N)" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Cancel quit " msgstr " ½ªÎ»¤òÃæ»ß (&C) " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Yes " msgstr " ¤Ï¤¤ (&Y) " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &No " msgstr " ¤¤¤¤¤¨ (&N) " -#: 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:1918 +#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 +#: gtkedit/editcmd.c:2736 src/view.c:1915 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 " ¥Õ¥¡¥¤¥ë¤Î stat ¤ò¤·¤è¤¦¤È¤·¤Æ¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿ " -#: 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 " To" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:2997 msgid " mail -s -c " msgstr " mail -s -c " @@ -2247,7 +2299,7 @@ #: gtkedit/editmenu.c:74 msgid " About " -msgstr " ¾ðÊó " +msgstr " Cooledit ¤Ë¤Ä¤¤¤Æ " #: gtkedit/editmenu.c:75 msgid "" @@ -2262,346 +2314,354 @@ "\n" " Cooledit v3.11.5\n" "\n" -"Copyright (C) 1996 the Free Software Foundation\n" +" Copyright (C) 1996 the Free Software Foundation\n" "\n" -" Midnight Command ¸þ¤±¤Î¥æ¡¼¥¶¥Õ¥ì¥ó¥É¥ê¤Ê\n" -" ¥Æ¥­¥¹¥È¥¨¥Ç¥£¥¿\n" +" Midnight Commander ÍѤÎ\n" +" ¥æ¡¼¥¶¤Ë¿ÆÀڤʥ¨¥Ç¥£¥¿¤Ç¤¹\n" -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 msgid "&Open/load... C-o" msgstr "³«¤¯ (&O)... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "¿·µ¬ºîÀ® (&N) C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "Êݸ (&S) F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "ÊÌ̾¤ÇÊݸ (&A)... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ (&I)... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼ (&F)... C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 msgid "a&Bout... " msgstr "¾ðÊó (&B)... " -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 msgid "&Quit F10" msgstr "½ªÎ» (&Q) F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" msgstr "¿·µ¬ (&N) C-x k" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:147 msgid "copy to &File... " msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼ (&F)... " -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Toggle Mark F3" msgstr "¥Þ¡¼¥¯¤òÀÚÂؤ¨ (&T) F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Mark Columns S-F3" msgstr "Îó¤Ë¥Þ¡¼¥¯ (&M) S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "toggle &Ins/overw Ins" msgstr "ÁÞÆþ¡¦¾å½ñ¤­¤òÀÚÂؤ¨(&I) Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Copy F5" msgstr "¥³¥Ô¡¼ (&C) F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "°ÜÆ° (&M) F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "ºï½ü (&D) F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "¤ä¤ê¤Ê¤ª¤· (&U) C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "ÀèƬ (&B) C-PgUp" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "ËöÈø (&E) C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "¸¡º÷ (&S)... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "ºÆ¸¡º÷ (&A) F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "ÃÖ´¹ (&R)... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "¹Ô°ÜÆ° (&G)... 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 "ÂФγç¸Ì¤Ø°ÜÆ° M-b" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 msgid "insert &Literal... C-q" msgstr "ʸ»ú¤òÁÞÆþ (&L)... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "²èÌ̤òºÆÉÁ²è (&R) 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 "¥Þ¥¯¥í¤Îµ­Ï¿¤ò³«»Ï (&S) 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 "¥Þ¥¯¥í¤Îµ­Ï¿¤ò½ªÎ» (&F)... C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô (&E)... C-a, KEY" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "delete macr&O... " msgstr "¥Þ¥¯¥í¤òºï½ü (&O) " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 msgid "insert &Date/time " msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ (&D) " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 msgid "format p&Aragraph M-p" msgstr "ÃÊÍî¤òÀ°·Á (&A) M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:219 msgid "'ispell' s&Pell check C-p" msgstr "'ispell' ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯(&P) C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 msgid "sor&T... M-t" msgstr "ʤÙÂؤ¨ (&T) 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¥×¥í¥°¥é¥àÀ°·Á F19" +msgstr "'indent' ¥×¥í¥°¥é¥àÀ°·Á (&C) F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:222 msgid "&Mail... " msgstr "¥á¥¤¥ë (&M)... " -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:236 msgid "&Execute macro... C-x e, KEY" msgstr "¥Þ¥¯¥í¤ò¼Â¹Ô (&E)... C-x e, KEY" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:242 msgid "'ispell' s&Pell check M-$" msgstr "'ispell' ¥¹¥Ú¥ë¥Á¥§¥Ã¥¯(&P) M-$" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 msgid "&General... " msgstr "°ìÈÌ (&G)... " -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 msgid "&Save mode..." msgstr "ÊݸÊýË¡(&S)..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1354 +#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 msgid "&Layout..." msgstr "¥ì¥¤¥¢¥¦¥È(&L)..." #. 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 "³«¤¯...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "¿·µ¬\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "Êݸ\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "ÊÌ̾Êݸ...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "¥Õ¥¡¥¤¥ëÁÞÆþ...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "¥Õ¥¡¥¤¥ë¤Ø¥³¥Ô¡¼...\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 "¥Þ¡¼¥¯¤Î¥È¥°¥ë\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:417 msgid "Toggle mark columns\tC-b" msgstr "Îó¤Î¥Þ¡¼¥¯¤ò¥È¥°¥ë\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:419 msgid "Toggle book mark\tC-M-Ins" msgstr "¥Ö¥Ã¥¯¥Þ¡¼¥¯¤ò¥È¥°¥ë\tC-M-Ins" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:420 msgid "Previous book mark\tC-M-Up" msgstr "Á°¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯\tC-M-Up" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:421 msgid "Next book mark\tC-M-Down" msgstr "¼¡¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯\tC-M-Down" -#: 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 "ÁÞÆþ¡¦¾å½ñ¤­¤ÎÀÚÂؤ¨\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:426 msgid "Copy block to cursor\tF5" msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤إ³¥Ô¡¼\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "¥Ö¥í¥Ã¥¯¤ò¥«¡¼¥½¥ë°ÌÃ֤ذÜÆ°\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "¥Ö¥í¥Ã¥¯¤òºï½ü\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤Ø¥³¥Ô¡¼\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤ØÀÚ¤ê¤À¤·\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "¥Ö¥í¥Ã¥¯¤ò¥¯¥ê¥Ã¥×¥Ü¡¼¥É¤«¤éÄ¥¤êÉÕ¤±\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:433 msgid "Selection history\tM-Ins" msgstr "ÁªÂò¤ÎÍúÎò\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:435 msgid "Undo\tC-BackSpace" msgstr "¤ä¤ê¤Ê¤ª¤·\tC-BackSpace" #. 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 "¸¡º÷...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "ºÆ¸¡º÷\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "ÃÖ´¹...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "ºÆÃÖ´¹\tF14" #. 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 "»ØÄê¹Ô¤Ø...\tM-l" +msgstr "¹Ô°ÜÆ°...\tM-l" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:457 +msgid "Goto matching bracket\tM-b" +msgstr "ÂФγç¸Ì¤Ø°ÜÆ°\tM-b" + +#: gtkedit/editmenu.c:459 msgid "Start record macro\tC-r" msgstr "¥Þ¥¯¥í¤Îµ­Ï¿³«»Ï\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "¥Þ¥¯¥í¤Îµ­Ï¿½ªÎ»...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "¥Þ¥¯¥í¼Â¹Ô...\tC-a, KEY" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "¥Þ¥¯¥íºï½ü...\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "ÆüÉÕ¡¦»þ´Ö¤òÁÞÆþ\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "ÃÊÍî¤òÀ°·Á\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "ɽ¼¨¤ò¥ê¥Õ¥ì¥Ã¥·¥å\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "¥Þ¥¯¥í¤ª¤è¤ÓÆâÉô¥³¥Þ¥ó¥É" @@ -2626,84 +2686,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 "ʸˡ¥Ï¥¤¥é¥¤¥È (&S)" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "ÊݸÁ°¤Ë³Îǧ (&M)" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "¥¿¥Ö¤ò¶õÇò¤ÇËä¤á¤ë (&S)" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "¥ê¥¿¡¼¥ó¤Ç¼«Æ°Åª¤Ë¥¤¥ó¥Ç¥ó¥È (&R)" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "¥Ð¥Ã¥¯¥¹¥Ú¡¼¥¹¤ÇTAB¤ò°ìµ¤¤Ë¾Ãµî (&B)" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "µ¿»÷Ⱦ¥¿¥Ö (&F)" #. 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 "¥¨¥Ç¥£¥¿¤Î½é´ü²½¤Ë¥¨¥é¡¼¤¬µ¯¤³¤ê¤Þ¤·¤¿.\n" -#: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1720 src/screen.c:2395 src/screen.c:2425 src/tree.c:1008 -#: src/view.c:2073 +#: gtkedit/editwidget.c:1136 gtkedit/gtkedit.c:1246 src/help.c:806 +#: src/main.c:1721 src/screen.c:2394 src/screen.c:2424 src/tree.c:1008 +#: src/view.c:2070 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:1722 +#: gtkedit/editwidget.c:1145 src/main.c:1723 msgid "PullDn" msgstr "PullDn" #. gtk_edit_menu -#: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1723 src/view.c:2075 src/view.c:2097 +#: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 +#: src/main.c:1724 src/view.c:2072 src/view.c:2094 msgid "Quit" msgstr "½ªÎ»" @@ -2770,7 +2830,7 @@ msgid "Delete highlighted text" msgstr "¥Ï¥¤¥é¥¤¥È¤·¤¿¥Æ¥­¥¹¥È¤òºï½ü" -#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2395 src/screen.c:2425 msgid "Menu" msgstr "¥á¥Ë¥å" @@ -2806,12 +2866,12 @@ 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" @@ -2821,7 +2881,7 @@ "PATH ¤¬Ä̤äƤ¤¤ë¤«¤É¤¦¤«¡¢-a ¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤ë¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: 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 +2891,7 @@ "PATH ¤¬Ä̤äƤ¤¤ë¤«¤É¤¦¤«¡¢-a ¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤ë¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: 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 +2901,7 @@ "PATH ¤¬Ä̤äƤ¤¤ë¤«¤É¤¦¤«¡¢-a ¥ª¥×¥·¥ç¥ó¤¬»È¤¨¤ë¤«¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£\n" "¤½¤¦¤Ç¤Ê¤±¤ì¤Ð¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Ç¥¹¥Ú¥ë¥Á¥§¥Ã¥¯¤ò̵¸ú¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£" -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1096 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2849,29 +2909,29 @@ "ispell ¤«¤é¤ÎÆɤߤÀ¤·Ãæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤Þ¤·¤¿¡£\n" "ispell ¤òºÆµ¯Æ°¤·¤Þ¤¹" -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 msgid " Load Syntax Rules " -msgstr "ʸˡ¥ë¡¼¥ë¤òÆɤ߹þ¤ß" +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 "" -"ʸˡ¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤¬¸Å¤¯¤Ê¤Ã¤Æ¤Þ¤¹¡£\n" -"¿·¤·¤¤¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤ò¥¤¥ó¥¹¥È¡¼¥ë¤·¤Þ¤·¤¿¡£\n" -"¸Å¤¤¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï .OLD ³ÈÄ¥»Ò¤ÇÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£" +" ¤¢¤Ê¤¿¤Î¹½Ê¸¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï»þÂåÃÙ¤ì¤Ç¤¹ \n" +" ¿·¤·¤¤¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤Æ¤¤¤Þ¤¹ \n" +" ¸Å¤¤¥ë¡¼¥ë¥Õ¥¡¥¤¥ë¤Ï .OLD ³ÈÄ¥»Ò¤ò¤Ä¤±¤ÆÊݸ¤µ¤ì¤Æ¤¤¤Þ¤¹ " -#: 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 " ¥Õ¥¡¥¤¥ë %s ¤Î %d ¹ÔÌܤǥ¨¥é¡¼ " @@ -3477,44 +3537,44 @@ msgid " Enter machine name (F1 for details): " msgstr " ¥Þ¥·¥ó̾¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤(¾ÜºÙ¤ÏF1¥­¡¼): " -#: src/cmd.c:1360 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr " ¥Ç¥£¥ì¥¯¥È¥ê¤ò%s¤ØÊѹ¹¤Ç¤­¤Þ¤»¤ó " -#: src/cmd.c:1367 +#: src/cmd.c:1370 src/widget.c:1163 msgid " Link to a remote machine " msgstr " ¥ê¥â¡¼¥È¡¦¥Þ¥·¥ó¤Ø¤Î¥ê¥ó¥¯ " -#: src/cmd.c:1373 +#: src/cmd.c:1376 src/widget.c:1164 msgid " FTP to machine " msgstr " ¥Þ¥·¥ó¤Ø¤ÎFTP " -#: src/cmd.c:1379 +#: src/cmd.c:1382 src/widget.c:1165 msgid " SMB link to machine " msgstr " ¥Þ¥·¥ó¤Ø¤ÎSMB¥ê¥ó¥¯ " -#: 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 " ¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Î hop ¤Ë»È¤¦¥Û¥¹¥È¤Î̾Á°¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: " -#: src/cmd.c:1397 +#: src/cmd.c:1401 msgid " Host name " msgstr " ¥Û¥¹¥È̾ " -#: src/cmd.c:1397 +#: src/cmd.c:1401 msgid " Error while looking up IP address " msgstr " IP¥¢¥É¥ì¥¹¤ò¸«ÉÕ¤±¤ëºÝ¤Î¥¨¥é¡¼ " -#: src/cmd.c:1408 +#: src/cmd.c:1412 msgid " Undelete files on an ext2 file system " msgstr " ext2¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Î¥Õ¥¡¥¤¥ëºï½ü¤Î¤ä¤êľ¤· " -#: src/cmd.c:1409 +#: src/cmd.c:1413 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3522,11 +3582,11 @@ " ¥Õ¥¡¥¤¥ë¤òÉü³è¤µ¤»¤ë¥Ç¥Ð¥¤¥¹¤Î¥Ç¥Ð¥¤¥¹Ì¾ (/dev/ ¤Ï¾Ê¤¯) ¤ò\n" " ÆþÎϤ·¤Æ¤¯¤À¤µ¤¤: (F1 ¤Ç¾ÜºÙ)" -#: src/cmd.c:1459 +#: src/cmd.c:1463 msgid " Setup saved to ~/" msgstr " ÀßÄê¤Ï ~/ ¤ØÊݸ¤µ¤ì¤Þ¤·¤¿" -#: src/cmd.c:1464 +#: src/cmd.c:1468 msgid " Setup " msgstr " ÀßÄê " @@ -3689,6 +3749,110 @@ msgid "mc.ext will be used for this moment." msgstr "mc.ext ¤ò¤È¤ê¤¢¤¨¤º»È¤¤¤Þ¤¹¡£" +#: src/features.inc:8 +msgid "Edition: " +msgstr "Edition: " + +#: src/features.inc:11 +msgid "XView" +msgstr "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: src/features.inc:16 +msgid "text mode" +msgstr "¥Æ¥­¥¹¥È¥â¡¼¥É" + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" +msgstr "X11 ¥Æ¥­¥¹¥È¥â¡¼¥É¥µ¥Ý¡¼¥È" + +#: src/features.inc:24 +msgid "Virtual File System: tarfs, extfs" +msgstr "²¾ÁÛ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à: tarfs, extfs" + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr " (proxies: hsc proxy)" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (termnet ¥µ¥Ý¡¼¥È)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "Æ⢥¨¥Ç¥£¥¿»ÈÍÑ\n" + +#: src/features.inc:48 +msgid "Using " +msgstr "Using " + +#: src/features.inc:51 +msgid "system-installed " +msgstr "system-installed " + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "S-lang library with " + +#: src/features.inc:56 +msgid "terminfo" +msgstr "terminfo" + +#: src/features.inc:59 +msgid "termcap" +msgstr "termcap" + +#: src/features.inc:61 +msgid "an unknown terminal" +msgstr "¸«ÃΤé¤ÌüËö" + +#: src/features.inc:64 +msgid " database" +msgstr " database" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "the ncurses library" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "¤¤¤¯¤Ä¤«¤Î¸«ÃΤé¤Ì curses library" + +#: 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 "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥ÉÁàºî¤Î¥µ¥Ý¡¼¥È\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " ¥³¥Ô¡¼ " @@ -4050,7 +4214,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "file" @@ -4078,11 +4242,11 @@ msgid " Can't operate on \"..\"! " msgstr "\"..\" ¤ËÂФ·¤ÆÁàºî¤Ç¤­¤Þ¤»¤ó!" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "¤Ï¤¤" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "¤¤¤¤¤¨" @@ -4315,7 +4479,7 @@ msgid "Content: " msgstr "ÆâÍÆ:" -#: src/find.c:171 src/main.c:1244 src/main.c:1268 +#: src/find.c:171 src/main.c:1245 src/main.c:1269 msgid "&Tree" msgstr "¥Ä¥ê¡¼ (&T)" @@ -4340,7 +4504,7 @@ msgid "Finished" msgstr "½ªÎ»" -#: src/find.c:561 src/view.c:1531 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "%s¤ò¸¡º÷Ãæ" @@ -4884,7 +5048,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "¥¹¤«¥Þ¥¦¥¹¤ò²¡¤·¤Æ¥­¡¼ÄêµÁ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£TAB¤Ç°ÜÆ°¤Ç¤­¤Þ¤¹" -#: src/main.c:708 +#: 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" @@ -4896,263 +5060,263 @@ "\"su\" ¥³¥Þ¥ó¥É¤ÇÆÃÊ̤ʸ¢¸Â¤ò¹Ô»È¤·¤¿¤Î¤Ç¤Ï¤Ê¤¤¤Ç\n" "¤¹¤«?" -#: src/main.c:783 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "¤Ê¤Ë¤«¥­¡¼¤ò²¡¤»¤Ð³¹Ô¤·¤Þ¤¹..." -#: src/main.c:833 +#: src/main.c:834 msgid " The shell is already running a command " msgstr " ¥·¥§¥ë¤Ï¤¹¤Ç¤Ë¥³¥Þ¥ó¥É¤ò¼Â¹ÔÃæ¤Ç¤¹ " -#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: src/main.c:861 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr "ËÜÅö¤ËMidnight Commander¤ò½ªÎ»¤µ¤»¤Þ¤¹¤«?" -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "°ìÍ÷ÊýË¡ (&L)..." -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "´Ê°×ɽ¼¨ (&Q) C-x q" -#: src/main.c:1243 src/main.c:1267 +#: src/main.c:1244 src/main.c:1268 msgid "&Info C-x i" msgstr "¾ðÊó (&I) C-x i" -#: src/main.c:1246 src/main.c:1270 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "À°Îó½ç (&S)..." -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "¥Õ¥£¥ë¥¿ (&F)..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "¥Í¥Ã¥È¥ï¡¼¥¯¥ê¥ó¥¯ (&N)..." -#: src/main.c:1252 src/main.c:1276 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "FTP ¥ê¥ó¥¯ (&P)..." -#: src/main.c:1254 src/main.c:1278 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "SMB¥ê¥ó¥¯ (&B)..." -#: src/main.c:1259 src/main.c:1283 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "¥É¥é¥¤¥Ö (&D)... M-d" -#: src/main.c:1261 src/main.c:1285 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "ºÆ¥¹¥­¥ã¥ó (&R) C-r" -#: src/main.c:1289 +#: src/main.c:1290 msgid "&User menu F2" msgstr "¥æ¡¼¥¶¥á¥Ë¥å¡¼(&U) F2" -#: src/main.c:1290 +#: src/main.c:1291 msgid "&View F3" msgstr "ɽ¼¨(&V) F3" -#: src/main.c:1291 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "¥Õ¥¡¥¤¥ë¤òɽ¼¨(&W)... " -#: src/main.c:1292 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "¥Õ¥£¥ë¥¿¥ê¥ó¥°¤·¤Æɽ¼¨(&F) M-!" -#: src/main.c:1293 +#: src/main.c:1294 msgid "&Edit F4" msgstr "ÊÔ½¸(&E) F4" -#: src/main.c:1294 +#: src/main.c:1295 msgid "&Copy F5" msgstr "¥³¥Ô¡¼(&C) F5" -#: src/main.c:1295 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "chmod(&H) C-x c" -#: src/main.c:1297 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "¥ê¥ó¥¯(&L) C-x l" -#: src/main.c:1298 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯(&S) C-x s" -#: src/main.c:1299 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎÊÔ½¸(&Y) C-x C-s" -#: src/main.c:1300 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "chown(&O) C-x o" -#: src/main.c:1301 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "¾åµéchown(&A) " -#: src/main.c:1303 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "̾Á°Êѹ¹¡¦°ÜÆ°(&R) F6" -#: src/main.c:1304 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "¥Ç¥£¥ì¥¯¥È¥êºîÀ®(&M) F7" -#: src/main.c:1305 +#: src/main.c:1306 msgid "&Delete F8" msgstr "ºï½ü(&D) F8" -#: src/main.c:1306 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "¥¯¥¤¥Ã¥¯cd(&Q) M-c" -#: src/main.c:1308 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "¥°¥ë¡¼¥×ÁªÂò(&G) M-+" -#: src/main.c:1309 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "¥°¥ë¡¼¥×ÁªÂò²ò½ü(&N) M-\\" -#: src/main.c:1310 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "ÁªÂòȿž(&N) M-*" -#: src/main.c:1312 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "½ªÎ»(&X) F10" -#: src/main.c:1322 +#: src/main.c:1323 msgid "&Directory tree" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥Ä¥ê¡¼(&D)" -#: src/main.c:1324 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "¥Õ¥¡¥¤¥ë¸¡º÷(&F) M-?" -#: src/main.c:1325 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "¥Ñ¥Í¥ë¤òÆþ¤ì´¹¤¨(&W) C-u" -#: src/main.c:1326 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "¥Ñ¥Í¥ë¤Îon/offÀÚÂØ(&P) C-o" -#: src/main.c:1327 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "¥Ç¥£¥ì¥¯¥È¥êÈæ³Ó(&C) C-x d" -#: src/main.c:1328 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "³°Éô¥Ñ¥Í¥ë(&X) C-x !" -#: src/main.c:1329 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥µ¥¤¥ºÉ½¼¨(&I)" -#: src/main.c:1331 +#: src/main.c:1332 msgid "command &History" msgstr "¥³¥Þ¥ó¥ÉÍúÎò(&H)" -#: src/main.c:1332 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "¥Ç¥£¥ì¥¯¥È¥ê¥Û¥Ã¥È¥ê¥¹¥È(&R) C-\\" -#: src/main.c:1334 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "¥¢¥¯¥Æ¥£¥Ö¤ÊVFS°ìÍ÷(&V) C-x a" -#: src/main.c:1335 +#: src/main.c:1336 msgid "Fr&ee VFSs now" msgstr "VFS ¤ò²òÊü" -#: src/main.c:1338 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥¸¥ç¥Ö(&B) C-x j" -#: src/main.c:1342 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "¥Õ¥¡¥¤¥ë¤ÎÉü³è(&U) (ext2fs¤Î¤ß)" -#: src/main.c:1345 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "°ìÍ÷·Á¼°ÊÔ½¸(&L)" -#: src/main.c:1347 +#: src/main.c:1348 msgid "&Extension file edit" msgstr "³ÈÄ¥¥Õ¥¡¥¤¥ë¤òÊÔ½¸(&E)" -#: src/main.c:1348 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "¥á¥Ë¥å¡¼¥Õ¥¡¥¤¥ëÊÔ½¸(&M)" -#: src/main.c:1353 +#: src/main.c:1354 msgid "&Configuration..." msgstr "ÀßÄê(&C)..." -#: src/main.c:1355 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "³Îǧ(&O)..." -#: src/main.c:1356 +#: src/main.c:1357 msgid "&Display bits..." msgstr "ɽ¼¨¥Ó¥Ã¥È¿ô(&D)..." -#: src/main.c:1358 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "¥­¡¼¤Î³Ø½¬(&K)..." -#: src/main.c:1361 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "²¾ÁÛFS(&V)..." -#: src/main.c:1364 +#: src/main.c:1365 msgid "&Save setup" msgstr "ÀßÄêÊݸ(&S)" -#: src/main.c:1380 src/main.c:1382 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr "º¸(&L)" -#: src/main.c:1382 +#: src/main.c:1383 msgid " &Above " msgstr "¾å(&A)" -#: src/main.c:1385 +#: src/main.c:1386 msgid " &File " msgstr " ¥Õ¥¡¥¤¥ë(&F) " -#: src/main.c:1386 +#: src/main.c:1387 msgid " &Command " msgstr " ¥³¥Þ¥ó¥É(&C) " -#: src/main.c:1387 +#: src/main.c:1388 msgid " &Options " msgstr " ¥ª¥×¥·¥ç¥ó(&O) " -#: src/main.c:1389 src/main.c:1391 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr " ±¦(&R) " -#: src/main.c:1391 +#: src/main.c:1392 msgid " &Below " msgstr " ²¼(&B) " -#: src/main.c:1446 +#: src/main.c:1447 msgid " Information " msgstr " ¾ðÊó " -#: src/main.c:1447 +#: 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" @@ -5164,132 +5328,295 @@ " ¥ì¥¯¥È¥ê¤ÎºÆÆɹþ¤ò¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£¾Ü¤·¤¯¤Ï¥Þ¥Ë¥å\n" " ¥¢¥ë¤ò¸«¤Æ¤¯¤À¤µ¤¤" -#: src/main.c:1926 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr " GNU Midnight Command ¤Î¤´ÍøÍÑ¡¢¤¢¤ê¤¬¤È¤´¤¶¤¤¤Þ¤·¤¿" -#: src/main.c:2283 +#: src/main.c:2284 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "xterm%s ¤Ë¤è¤ë¥Þ¥¦¥¹¥µ¥Ý¡¼¥ÈÍ­¤ê\n" -#: src/main.c:2284 +#: src/main.c:2285 msgid " and the Linux console" msgstr "Linux console ¤Ç¤Î¥µ¥Ý¡¼¥È¤âÍ­¤ê" -#: src/main.c:2380 +#: src/main.c:2381 msgid "The TERM environment variable is unset!\n" msgstr "´Ä¶­ÊÑ¿ô TERM ¤¬¥»¥Ã¥È¤µ¤ì¤Æ¤¤¤Þ¤»¤ó\n" -#: src/main.c:2591 +#: src/main.c:2487 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" + +#: src/main.c:2490 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "-a, --stickchars ¶¯À©Åª¤Ë +, -, | ¤ò»È¤Ã¤Æ¥é¥¤¥óÉÁ²è¤ò¤¹¤ë\n" + +#: src/main.c:2492 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "-b, --nocolor ¶¯À©Åª¤Ë¥â¥Î¥¯¥íɽ¼¨¤¹¤ë\n" + +#: src/main.c:2494 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "" +"-B, --background [³«È¯¥Ð¡¼¥¸¥ç¥ó¤Î¤ß: ¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¥³¡¼¥É¤Î¥Ç¥Ð¥Ã¥°]\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 ¶¯À©Åª¤Ë¥«¥é¡¼¥â¡¼¥É¤Ë¤¹¤ë\n" +"-C, --colors ¿§¤ò»ØÄꤹ¤ë (--help-colors ¤ò»È¤Ã¤Æ¥ê¥¹¥È¤òÆÀ¤Ê¤µ¤¤)\n" +"-d, --nomouse ¥Þ¥¦¥¹¥µ¥Ý¡¼¥È¤ò̵¸ú¤Ë¤¹¤ë\n" + +#: src/main.c:2500 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "-e, --edit ÆâÉô¥¨¥Ç¥£¥¿¤Îµ¯Æ°\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 ¹½À®¤µ¤ì¤¿¥Ñ¥¹¤òɽ¼¨¤¹¤ë\n" +"-h, --help ¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë\n" +"-k, --resetsoft ¥½¥Õ¥È¥­¡¼¤ò¥ê¥»¥Ã¥È (HP ¥¿¡¼¥ß¥Ê¥ë¤Î¤ß)¤· " +"terminfo/termcap ¤ò\n" +" ¥Ç¥Õ¥©¥ë¥È¤Ë¤¹¤ë\n" + +#: src/main.c:2507 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "-l, --ftplog file ftpfs ¥³¥Þ¥ó¥É¤Î¥í¥°¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë\n" + +#: src/main.c:2510 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "" +"-M, --memory file [³«È¯¥Ð¡¼¥¸¥ç¥ó¤Î¤ß: MAD " +"¥á¥Ã¥»¡¼¥¸¤Î¥í¥°¤ò¥Õ¥¡¥¤¥ë¤Ë½ÐÎϤ¹¤ë]\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 ½ªÎ»»þ¡¤ºÇ¸å¤Îºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨¤¹¤ë\n" +"-s, --slow ¤¯¤É¤¤Áàºî¤ò̵»ë¤¹¤ë (¥¿¡¼¥ß¥Ê¥ë¤Î®ÅÙ¤òÍî¤È¤¹¤¿¤á)\n" + +#: src/main.c:2515 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "-t, --termcap ´Ä¶­ÊÑ¿ô TERMCAP ¤ËÂФ¹¤ë¥µ¥Ý¡¼¥È¤ò³èÀ­²½¤¹¤ë\n" + +#: src/main.c:2518 +msgid "" +"-S, --createcmdile Create command file to set default directory upon exit.\n" +msgstr "" +"-S, --createcmdile " +"¥Ç¥Õ¥©¥ë¥È¥Ç¥£¥ì¥¯¥È¥ê¤ò½ªÎ»»þ¤ËÀßÄꤹ¤ë¤¿¤á¤Ë¥³¥Þ¥ó¥É¥Õ¥¡¥¤¥ë¤òºîÀ®¤¹¤ë\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 Ʊ»þ¤Ë¥µ¥Ö¥·¥§¥ë¥â¡¼¥É¤ò»ÈÍѤ·¤Ê¤¤\n" +"-U, --subshell Ʊ»þ¤Ë¥µ¥Ö¥·¥§¥ë¥â¡¼¥É¤ò¶¯À©»ÈÍѤ¹¤ë\n" +"-r, --forceexec ¶¯À©Åª¤Ë¥µ¥Ö¥·¥§¥ë¤ò¼Â¹Ô¤¹¤ë\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 ¥Ó¥å¡¼¥¢¥â¡¼¥É¤ÎÃæ¤ØΩ¤Á¾å¤²¤ë\n" +"-V, --version ¥Ð¡¼¥¸¥ç¥ó¤È¥³¥ó¥Õ¥£¥°¥ª¥×¥·¥ç¥ó¤òɽ¼¨\n" +"-x, --xterm ¶¯À©Åª¤Ë xterm ¤Ç¥Þ¥¦¥¹¤ò¥µ¥Ý¡¼¥È¤·²èÌ̤ÎÊݸ/Éü¸µ¤ò¤¹¤ë\n" + +#: src/main.c:2529 +msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" +msgstr "-X, --dbgsubshell [³«È¯¥Ð¡¼¥¸¥ç¥ó¤Î¤ß: ¥µ¥Ö¥·¥§¥ë¤Î¥Ç¥Ð¥Ã¥°\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" +"ÉÔ¶ñ¹çÊó¹ð¤ò ('mc -V' ¤Î½ÐÎϤò´Þ¤á¤Æ) mc-bugs@nuclecu.unam.mx\n" +"¤Þ¤ÇÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤\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 ¥­¡¼¥ï¡¼¥É={FORE},{BACK}\n" +"\n" +"{FORE} ¤È {BACK} " +"¤Ï¾Êά¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤¹¡¥¤½¤·¤Æ¥Ç¥Õ¥©¥ë¥ÈÃͤ¬»È¤ï¤ì¤ë¤Ç¤·¤ç¤¦\n" +"\n" +"¥­¡¼¥ï¡¼¥É:\n" +" Global: ¥¨¥é¡¼¡¤È¿Å¾¡¤¥²¡¼¥¸¡¤ÆþÎÏ\n" +" File display: Ä̾ÁªÂò¡¤¥Þ¡¼¥¯¡¤ÁªÂò¥Þ¡¼¥¯\n" +" Dialog boxes: ¥À¥¤¥¢¥í¥°Á´ÈÌ\n" +" Menus: ¥á¥Ë¥å¡¼Á´ÈÌ\n" +" Help: ¥Ø¥ë¥×Á´ÈÌ\n" +" File types: ¥Ç¥£¥ì¥¯¥È¥ê¡¤¼Â¹Ô°À­¡¤¥ê¥ó¥¯¡¤¥Ç¥Ð¥¤¥¹¡¤Æü졤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" + +#: src/main.c:2596 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Midnight Commander ¤Î¥é¥¤¥Ö¥é¥ê¥Ç¥£¥ì¥¯¥È¥ê: %s\n" -#: src/main.c:2605 +#: src/main.c:2610 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "¥ª¥×¥·¥ç¥ó -m " "¤ÏÇѻߤµ¤ì¤Þ¤·¤¿¡£¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î¡Öɽ¼¨¥Ó¥Ã¥È¿ô...¡×¤ò¤´Í÷¤¯¤À¤µ¤¤\n" -#: src/main.c:2682 +#: src/main.c:2687 msgid "Use to debug the background code" msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î¥³¡¼¥É¤Î¥Ç¥Ð¥Ã¥°¤Ë»ÈÍÑ" -#: src/main.c:2688 +#: src/main.c:2693 msgid "Request to run in color mode" msgstr "¥«¥é¡¼¥â¡¼¥É¤Ç¤Î¼Â¹Ô¤òÍ×µá" -#: src/main.c:2690 +#: src/main.c:2695 msgid "Specifies a color configuration" msgstr "¥«¥é¡¼ÀßÄê¤ò»ØÄê" -#: src/main.c:2695 +#: src/main.c:2700 msgid "Edits one file" msgstr "¥Õ¥¡¥¤¥ë¤òÊÔ½¸" -#: src/main.c:2699 +#: src/main.c:2704 msgid "Displays this help message" msgstr "¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨" -#: src/main.c:2702 +#: src/main.c:2707 msgid "Displays a help screen on how to change the color scheme" msgstr "¥«¥é¡¼¥¹¥­¡¼¥à¤ÎÊѹ¹ÊýË¡¤ò²èÌ̤Ëɽ¼¨" -#: src/main.c:2705 +#: src/main.c:2710 msgid "Log ftp dialog to specified file" msgstr "ftp ¤ÎÂÐÏõ­Ï¿¤ò»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ËÊݸ" -#: src/main.c:2712 +#: src/main.c:2717 msgid "Obsolete" msgstr "ÇÑ»ß" -#: src/main.c:2714 +#: src/main.c:2719 msgid "Requests to run in black and white" msgstr "Çò¹õ¥â¡¼¥É¤Ç¤Î¼Â¹Ô¤òÍ×µá" -#: src/main.c:2716 +#: src/main.c:2721 msgid "Disable mouse support in text version" msgstr "¥Æ¥­¥¹¥ÈÈǤǤΥޥ¦¥¹¤Î¥µ¥Ý¡¼¥È¤ò̵¸ú²½" -#: src/main.c:2719 +#: src/main.c:2724 msgid "Disables subshell support" msgstr "¥µ¥Ö¥·¥§¥ë¤Î¥µ¥Ý¡¼¥È¤ò̵¸ú²½" -#: src/main.c:2723 +#: src/main.c:2728 msgid "Prints working directory at program exit" msgstr "¥×¥í¥°¥é¥à½ªÎ»»þ¤Ëºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨" -#: src/main.c:2725 +#: src/main.c:2730 msgid "Resets soft keys on HP terminals" msgstr "HP¥¿¡¼¥ß¥Ê¥ë¤Ç¥½¥Õ¥È¥¦¥§¥¢¥­¡¼¥Ü¡¼¥É¤òÍ×µá" -#: src/main.c:2727 +#: src/main.c:2732 msgid "To run on slow terminals" msgstr "ÃÙ¤¤Ã¼Ëö¤Ç¼Â¹Ô" -#: src/main.c:2730 +#: src/main.c:2735 msgid "Use stickchars to draw" msgstr "stickchars ¤ÇÉÁ²è" -#: src/main.c:2734 +#: src/main.c:2739 msgid "Enables subshell support (default)" msgstr "¥µ¥Ö¥·¥§¥ë¤Î¥µ¥Ý¡¼¥È (¥Ç¥Õ¥©¥ë¥È)" -#: src/main.c:2739 +#: src/main.c:2744 msgid "Tries to use termcap instead of terminfo" msgstr "terminfo¤ÎÂå¤ï¤ê¤Ëtermcap¤ò»î¤¹" -#: src/main.c:2743 +#: src/main.c:2748 msgid "Displays the current version" msgstr "¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨" -#: src/main.c:2745 +#: src/main.c:2750 msgid "Launches the file viewer on a file" msgstr "¥Õ¥¡¥¤¥ë¥Ó¥å¡¼¥¢¤òµ¯Æ°" -#: src/main.c:2747 +#: src/main.c:2752 msgid "Forces xterm features" msgstr "¶¯À©Åª¤Ë xterm µ¡Ç½¤ò»È¤¦" -#: src/main.c:2749 +#: src/main.c:2754 msgid "Geometry for the window" msgstr "¥¦¥¤¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê" -#: src/main.c:2749 +#: src/main.c:2754 msgid "GEOMETRY" msgstr "GEOMETRY" -#: src/main.c:2750 +#: src/main.c:2755 msgid "No windows opened at startup" msgstr "µ¯Æ°»þ¤Ë¥¦¥¤¥ó¥É¥¦¤òɽ¼¨¤·¤Ê¤¤" -#: src/main.c:2752 +#: src/main.c:2756 +msgid "No desktop icons" +msgstr "¥Ç¥¹¥¯¥È¥Ã¥×¥¢¥¤¥³¥ó¤¬¤Ê¤¤" + +#: src/main.c:2757 +msgid "Look more like traditional gmc" +msgstr "ÅÁÅýŪ¤Ê gmc ¤Ë¶á¤¤³°´Ñ" + +#: src/main.c:2759 msgid "Display the directory that holds the .links startup files and exit" msgstr ".links µ¯Æ°¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¥Ç¥£¥ì¥¯¥È¥ê¤òɽ¼¨¤·, ½ªÎ»" -#: src/main.c:3062 +#: 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" @@ -5297,11 +5624,11 @@ "tty ¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Þ¤»¤ó. -P ¥Õ¥é¥°¤òÉÕ¤±¤º¤Ëµ¯Æ°¤·¤Ê¤¯¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó.\n" "¤¤¤¯¤Ä¤«¤Î¥·¥¹¥Æ¥à¤Ç¤Ï # `which mc` ¤ò¼Â¹Ô¤·¤¿¤Û¤¦¤¬Îɤ¤¤«¤â¤·¤ì¤Þ¤»¤ó\n" -#: src/main.c:3140 +#: src/main.c:3149 msgid " Notice " msgstr " Ãí°Õ " -#: src/main.c:3141 +#: src/main.c:3150 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5472,6 +5799,14 @@ msgid "Display brief usage message" msgstr "û¤¤»È¤¤Êý¤òɽ¼¨" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "SUB-DIR" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "UP--DIR" + #: src/screen.c:417 msgid "MTime" msgstr "¹¹¿·»þ¹ï" @@ -5517,29 +5852,29 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "¥æ¡¼¥¶¤Î»ØÄꤷ¤¿·Á¼°¤ÏÉÔÀµ¤Ê¤è¤¦¤Ç¤¹. ¥Ç¥Õ¥©¥ë¥È¤ËÌᤷ¤Þ¤¹" -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " ËÜÅö¤Ë¼Â¹Ô¤·¤Þ¤¹¤«? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr " ²¿¤â¼Â¹Ô¤·¤Þ¤»¤ó¤Ç¤·¤¿ " -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2399 src/screen.c:2429 src/tree.c:1016 msgid "RenMov" msgstr "RenMov" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1020 msgid "Mkdir" msgstr "MkDir" -#: src/screen.c:2417 +#: src/screen.c:2416 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" %s ¤Ø chdir ¤Ç¤­¤Þ¤»¤ó \n" +"\"%s\" ¤Ø chdir ¤Ç¤­¤Þ¤»¤ó \n" " %s " #: src/subshell.c:287 @@ -5609,15 +5944,6 @@ msgid "Dynamc" msgstr "ưŪ" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -"\"%s\" ¤Ø chdir ¤Ç¤­¤Þ¤»¤ó \n" -" %s " - #: src/tree.c:1012 msgid "Forget" msgstr "Forget" @@ -5698,15 +6024,15 @@ msgid "%b %e %Y" msgstr "%b %e %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr "pipe ¼ºÇÔ " -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr " dup ¼ºÇÔ " -#: src/view.c:406 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5716,7 +6042,7 @@ "\n" " " -#: src/view.c:407 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5726,37 +6052,37 @@ "\n" "¤ÏÊѹ¹¤µ¤ì¤Þ¤·¤¿. Êѹ¹ÅÀ¤òÊݸ¤·¤Þ¤¹¤«?\n" -#: src/view.c:409 +#: src/view.c:406 msgid " Save changes " msgstr " Êѹ¹ÅÀ¤òÊݸ " -#: src/view.c:451 +#: src/view.c:448 msgid " Can't spawn child program " msgstr " »Ò¥×¥í¥»¥¹¤òµ¯Æ°¤Ç¤­¤Þ¤»¤ó " -#: src/view.c:460 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " ¥Õ¥£¥ë¥¿¤«¤é¶õ¤Î½ÐÎϤǤ¹ " -#: src/view.c:465 +#: src/view.c:462 msgid " Could not open file " msgstr " ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó " -#: src/view.c:480 +#: src/view.c:477 msgid " Can't open file \"" msgstr " ¥Õ¥¡¥¤¥ë¤ò³«¤±¤Þ¤»¤ó \"" -#: src/view.c:487 +#: src/view.c:484 msgid "" " Can't stat file \n" " " msgstr " ¥Õ¥¡¥¤¥ë¤ò stat ¤Ç¤­¤Þ¤»¤ó \"" -#: src/view.c:493 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " ɽ¼¨¤Ç¤­¤Þ¤»¤ó: Ä̾ï¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó " -#: src/view.c:574 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5765,7 +6091,7 @@ " \"%s\" ¤ò³«¤¯¤³¤È¤¬¤Ç¤­¤Þ¤»¤ó \n" " %s " -#: src/view.c:583 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5774,34 +6100,34 @@ " \"%s\" ¤òstat¤Ç¤­¤Þ¤»¤ó\n" " %s " -#: src/view.c:719 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "¥Õ¥¡¥¤¥ë: %s" -#: src/view.c:733 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "¥ª¥Õ¥»¥Ã¥È 0x%08x" -#: src/view.c:744 +#: src/view.c:741 msgid " [grow]" msgstr " [grow]" -#: src/view.c:1523 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "`%s'¤ò¸¡º÷Ãæ" -#: src/view.c:1630 src/view.c:1753 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " ¸¡º÷ʸ»úÎ󤬸«ÉÕ¤«¤ê¤Þ¤»¤ó " -#: src/view.c:1792 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " ÉÔÀµ¤ÊÀµµ¬É½¸½¤Ç¤¹ " -#: src/view.c:1916 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5810,7 +6136,7 @@ " ¸½ºß¤Î¹ÔÈÖ¹æ¤Ï %d ¤Ç¤¹.\n" " ¿·¤·¤¤¹ÔÈÖ¹æ¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: src/view.c:1938 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5819,71 +6145,71 @@ " ¸½ºß¤Î¥¢¥É¥ì¥¹¤Ï0x%lx¤Ç¤¹.\n" " ¿·¤·¤¤¥¢¥É¥ì¥¹¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: src/view.c:1940 +#: src/view.c:1937 msgid " Goto Address " msgstr " ¥¢¥É¥ì¥¹°ÜÆ° " -#: src/view.c:1971 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " Àµµ¬É½¸½¤òÆþÎϤ·¤Æ¤¯¤À¤µ¤¤:" -#: src/view.c:2076 +#: src/view.c:2073 msgid "Ascii" msgstr "ASCII" -#: src/view.c:2076 +#: src/view.c:2073 msgid "Hex" msgstr "HEX" -#: src/view.c:2077 +#: src/view.c:2074 msgid "Goto" msgstr "°ÜÆ°" -#: src/view.c:2077 +#: src/view.c:2074 msgid "Line" msgstr "¹Ô" -#: src/view.c:2080 +#: src/view.c:2077 msgid "RxSrch" msgstr "RxSrch" -#: src/view.c:2083 +#: src/view.c:2080 msgid "EdText" msgstr "EdText" -#: src/view.c:2083 +#: src/view.c:2080 msgid "EdHex" msgstr "EdHex" -#: src/view.c:2085 +#: src/view.c:2082 msgid "UnWrap" msgstr "ÈóÀÞÊÖ" -#: src/view.c:2085 +#: src/view.c:2082 msgid "Wrap" msgstr "ÀÞÊÖ" -#: src/view.c:2088 +#: src/view.c:2085 msgid "HxSrch" msgstr "HxSrch" -#: src/view.c:2091 +#: src/view.c:2088 msgid "Raw" msgstr "Raw" -#: src/view.c:2091 +#: src/view.c:2088 msgid "Parse" msgstr "Parse" -#: src/view.c:2095 +#: src/view.c:2092 msgid "Unform" msgstr "Unform" -#: src/view.c:2095 +#: src/view.c:2092 msgid "Format" msgstr "Format" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr "ÍúÎò" @@ -6082,29 +6408,85 @@ msgid "NumLock on keypad" msgstr "10¥­¡¼¤Î NumLock" -#: vfs/direntry.c:318 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"cpio ¥¢¡¼¥«¥¤¥Ö¤ò³«¤±¤Þ¤»¤ó\n" +"%s" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" +"cpio ¥¢¡¼¥«¥¤¥Ö¤Î½ª¤ê¤¬Á᤹¤®¤Þ¤¹\n" +"%s" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "%s ¤ÎÃæ¤Ç²õ¤ì¤¿ cpio ¥Ø¥Ã¥À¤ËÁø¶ø¤·¤¿" + +#: vfs/cpio.c:427 +#, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "" +"cpio ¥¢¡¼¥«¥¤¥ÖÆâ %s ¤Î¥Ï¡¼¥É¥ê¥ó¥¯¤¬\n" +"Ì·½â¤·¤Æ¤¤¤Þ¤¹\n" +"%s" + +#. 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 "%s ÉÔÀµ¤Ê¥¨¥ó¥È¥ê¤¬´Þ¤Þ¤ì¤Þ¤¹! ¥¹¥­¥Ã¥×!" + +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" +"ͽ´ü¤·¤Ê¤¤ EOF ¤Ç¤¹\n" +"%s" + +#: vfs/direntry.c:310 #, c-format msgid "Dir cache expired for %s" msgstr "'%s' ¤Î Dir ¥­¥ã¥Ã¥·¥å¤¬½ªÎ»¤·¤Þ¤·¤¿" -#: vfs/direntry.c:448 vfs/direntry.c:451 +#: vfs/direntry.c:440 vfs/direntry.c:443 msgid " Direntry warning " msgstr "Direntry ¤Î·Ù¹ð" -#: vfs/direntry.c:448 +#: vfs/direntry.c:440 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "Super ino_usage ¤Ï %d ¤Ç¡¤¤³¤ì¤Ï¥á¥â¥ê¥ê¡¼¥¯¤Ç¤¹" -#: vfs/direntry.c:451 +#: vfs/direntry.c:443 msgid "Super has want_stale set" -msgstr "" +msgstr "Super has want_stable set" -#: vfs/direntry.c:822 +#: vfs/direntry.c:823 msgid "Starting linear transfer..." msgstr "¥ê¥Ë¥¢Å¾Á÷¤ò³«»Ï¤·¤Þ¤¹..." -#: vfs/direntry.c:967 +#: vfs/direntry.c:968 msgid "Getting file" msgstr "¥Õ¥¡¥¤¥ë¼èÆÀÃæ" @@ -6121,215 +6503,219 @@ msgid "Inconsistent extfs archive" msgstr "ÉÔÀ°¹ç¤Ê extfs ¥¢¡¼¥«¥¤¥Ö¤Ç¤¹" -#: vfs/fish.c:138 +#: vfs/fish.c:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: %s ¤«¤éÀÚÃǤ·¤Æ¤¤¤Þ¤¹" -#: vfs/fish.c:216 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: ºÇ½é¤Î¹Ô¤òÂԤäƤ¤¤Þ¤¹..." -#: vfs/fish.c:226 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "¤¹¤¤¤Þ¤»¤ó¤¬¡¤º£¤Î¤È¤³¤í¥Ñ¥¹¥ï¡¼¥É¤ò¾ÚÌÀ¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó" -#: vfs/fish.c:231 +#: vfs/fish.c:233 msgid " fish: Password required for " msgstr "fish: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹ " -#: vfs/fish.c:240 +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: ¥Ñ¥¹¥ï¡¼¥ÉÁ÷¿®Ãæ..." -#: vfs/fish.c:246 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: ºÇ½é¤Î¹Ô¤òÁ÷¿®..." -#: vfs/fish.c:250 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: ¥Ð¡¼¥¸¥ç¥ó¤Î¥Ï¥ó¥É¥·¥§¥¤¥¯..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: ¥«¥ì¥ó¥È¥Ç¥£¥ì¥¯¥È¥ê¤òÀßÄꤷ¤Þ¤¹..." -#: vfs/fish.c:256 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Àܳ¤·¤Þ¤·¤¿¡£¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤Ï %s ¤Ç¤¹¡£" -#: vfs/fish.c:332 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: ¥Ç¥£¥ì¥¯¥È¥ê%s¤òÆɤ߹þ¤ßÃæ... " -#: vfs/fish.c:428 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: ¼ºÇÔ¤·¤Þ¤·¤¿" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:448 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: store %s: ¥³¥Þ¥ó¥É¤òÁ÷¿®Ãæ..." -#: vfs/fish.c:462 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: ¶ÉÉôÆɤ߹þ¤ß¤Ë¼ºÇÔ¤·¤Þ¤·¤¿¡£zero¤òÁ÷¿®¤·¤Þ¤¹" -#: vfs/fish.c:474 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: %s ¤òÊݸÃæ %d (%d)" -#: vfs/fish.c:514 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "zeros" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "žÁ÷¤òÃæÃǤ·¤Þ¤¹..." -#: vfs/fish.c:523 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "ÃæÃǸå¤Ë¥¨¥é¡¼¤¬Êó¹ð¤µ¤ì¤Þ¤·¤¿" -#: vfs/fish.c:525 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "žÁ÷ÃæÃǤËÀ®¸ù¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:291 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: %s ¤«¤éÀÚÃÇÃæ¤Ç¤¹" -#: vfs/ftpfs.c:349 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹ " -#: vfs/ftpfs.c:382 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: ¥Ñ¥¹¥ï¡¼¥É¤¬É¬ÍפǤ¹ " -#: vfs/ftpfs.c:408 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: proxy ¤Î¥í¥°¥¤¥ó̾¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:412 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: proxy ¤Î¥æ¡¼¥¶¥Ñ¥¹¥ï¡¼¥É¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:416 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: proxy ¤Îǧ¾Ú¤¬À®¸ù¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:420 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: %s ¤ËÀܳ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: ¥í¥°¥¤¥ó̾¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:442 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: ¥Ñ¥¹¥ï¡¼¥É¤òÁ÷¿®Ãæ" -#: vfs/ftpfs.c:447 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: ¥í¥°¥¤¥ó¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:462 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: ¥æ¡¼¥¶ %s ¤Î¥í¥°¥¤¥ó¤¬¼ºÇÔ¤·¤Þ¤·¤¿ " -#: vfs/ftpfs.c:494 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " ¥½¡¼¥¹¥ë¡¼¥Æ¥£¥ó¥°¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ (%s)" -#: vfs/ftpfs.c:623 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: ÉÔÀµ¤Ê¥Û¥¹¥È̾¤Ç¤¹" -#: vfs/ftpfs.c:643 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: ÉÔÀµ¤Ê¥Û¥¹¥È¤Î¥¢¥É¥ì¥¹¤Ç¤¹" -#: vfs/ftpfs.c:666 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: %s ¤ØÀܳÃæ" -#: vfs/ftpfs.c:676 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: ¥æ¡¼¥¶¤Ë¤è¤Ã¤ÆÀܳ¤¬ÃǤ¿¤ì¤Þ¤·¤¿" -#: vfs/ftpfs.c:678 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: ¥µ¡¼¥Ð¤Ø¤ÎÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿: %s" -#: vfs/ftpfs.c:720 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "ºÆ»î¹Ô¤¹¤ë¤Î¤Ç¤ªÂÔ¤Á¤¯¤À¤µ¤¤... %d (Control-C ¤ÇÃæ»ß)" -#: vfs/ftpfs.c:893 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: ¥Ñ¥Ã¥·¥Ö¥â¡¼¥É¤Ë¼ºÇÔ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:968 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: žÁ÷¤òÃæÃǤ·¤Þ¤¹" -#: vfs/ftpfs.c:970 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: ÃæÃÇ: %s" -#: vfs/ftpfs.c:975 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: ÃæÃǤ˼ºÇÔ" -#: vfs/ftpfs.c:1064 vfs/ftpfs.c:1161 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD ¼ºÇÔ" -#: vfs/ftpfs.c:1074 vfs/ftpfs.c:1081 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: ¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤ÎŸ³«¤Ë¼ºÇÔ" -#: vfs/ftpfs.c:1132 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "¥·¥ó¥Ü¥ê¥Ã¥¯¥ê¥ó¥¯¤òŸ³«¤¹¤ë..." -#: vfs/ftpfs.c:1150 +#: vfs/ftpfs.c:1188 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: FTP¥Ç¥£¥ì¥¯¥È¥ê %s ¤òÆɤ߹þ¤ßÃæ... %s%s" -#: vfs/ftpfs.c:1151 +#: vfs/ftpfs.c:1189 msgid "(strict rfc959)" msgstr "(¸·Ì©¤Ê rfc959)" -#: vfs/ftpfs.c:1152 +#: vfs/ftpfs.c:1190 msgid "(chdir first)" msgstr "(½é¤á¤Ë chdir)" -#: vfs/ftpfs.c:1247 +#: vfs/ftpfs.c:1286 msgid "ftpfs: failed" msgstr "ftpfs: ¼ºÇÔ¤·¤Þ¤·¤¿" -#: vfs/ftpfs.c:1257 +#: vfs/ftpfs.c:1296 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ¼ºÇÔ¤·¤Þ¤·¤¿¡£¥Õ¥©¡¼¥ë¥Ð¥Ã¥¯¤Ç¤­¤Þ¤»¤ó" -#: vfs/ftpfs.c:1320 +#: vfs/ftpfs.c:1359 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ¥Õ¥¡¥¤¥ë¤ÎÊݸÃæ %d (%d)" -#: vfs/ftpfs.c:1788 vfs/ftpfs.c:1803 +#: vfs/ftpfs.c:1774 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6399,24 +6785,24 @@ msgid "Midnight Commander's private remote filesystem" msgstr "Midnight Commander's private remote filesystem" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "¥É¥á¥¤¥ó:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "¥æ¡¼¥¶Ì¾:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "¥Ñ¥¹¥ï¡¼¥É:" -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "\\\\%s\\%s¤Î¥Ñ¥¹¥ï¡¼¥É" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6425,22 +6811,26 @@ " %s ¤Ø¤ÎºÆÀܳ¤Ë¼ºÇÔ¤·¤Þ¤·¤¿\n" " " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr " ǧ¾Ú¤Ë¼ºÇÔ¤·¤Þ¤·¤¿ " + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s: mkdir %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s: rmdir %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s: ¥ê¥â¡¼¥È¥Õ¥¡¥¤¥ë %s ¤ò³«¤¯ºÝ¤Ë " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s: ¥Õ¥¡¥¤¥ë̾Êѹ¹Ãæ¤Ë\n" @@ -6473,133 +6863,133 @@ "%s\n" "¤³¤ì¤Ïtar¥¢¡¼¥«¥¤¥Ö¤Ç¤Ï¤Ê¤¤¤è¤¦¤Ç¤¹" -#: vfs/vfs.c:1158 +#: vfs/vfs.c:1152 msgid "Changes to file lost" msgstr "ʶ¼º¤·¤¿¥Õ¥¡¥¤¥ë¤ËÊѹ¹¤·¤Þ¤¹" -#: vfs/vfs.c:1798 +#: vfs/vfs.c:1795 msgid "Could not parse:" msgstr "¹½Ê¸²òÀϤ¬½ÐÍè¤Þ¤»¤ó:" -#: vfs/vfs.c:1800 +#: vfs/vfs.c:1797 msgid "More parsing errors will be ignored." msgstr "¿¤¯¤Î¹½Ê¸²òÀÏ¥¨¥é¡¼¤¬¤Ç¤Þ¤·¤¿¤¬Ìµ»ë¤·¤Þ¤¹" -#: vfs/vfs.c:1800 +#: vfs/vfs.c:1797 msgid "(sorry)" msgstr "(sorry)" -#: vfs/vfs.c:1811 +#: vfs/vfs.c:1808 msgid "Internal error:" msgstr "ÆâÉô¥¨¥é¡¼:" -#: vfs/vfs.c:1821 +#: vfs/vfs.c:1818 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ¥Ð¥¤¥ÈžÁ÷)" -#: vfs/vfs.c:1822 +#: vfs/vfs.c:1819 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ¥Ð¥¤¥ÈžÁ÷¤·¤Þ¤·¤¿" -#: vfs/undelfs.c:80 +#: vfs/undelfs.c:81 msgid " undelfs: error " msgstr " undelfs: ¥¨¥é¡¼ " -#: vfs/undelfs.c:183 +#: vfs/undelfs.c:184 msgid " not enough memory " msgstr " ½½Ê¬¤Ê¥á¥â¥ê¤¬¤¢¤ê¤Þ¤»¤ó " -#: vfs/undelfs.c:188 +#: vfs/undelfs.c:189 msgid " while allocating block buffer " msgstr " ¥Ö¥í¥Ã¥¯¥Ð¥Ã¥Õ¥¡¤ò³ä¤êÅö¤Æ¤ë´Ö¤Ë " -#: vfs/undelfs.c:192 +#: vfs/undelfs.c:193 #, c-format msgid " open_inode_scan: %d " msgstr " open_inode_scan: %d " -#: vfs/undelfs.c:196 +#: vfs/undelfs.c:197 #, c-format msgid " while starting inode scan %d " msgstr " i¥Î¡¼¥É¥¹¥­¥ã¥ó %d ¤ò³«»Ï¤·¤Æ¤¤¤ë´Ö¤Ë " -#: vfs/undelfs.c:203 +#: vfs/undelfs.c:204 #, c-format msgid "undelfs: loading deleted files information %d inodes" msgstr "undelfs: %d i¥Î¡¼¥É¤Îºï½ü¥Õ¥¡¥¤¥ë¾ðÊó¤ò¥í¡¼¥ÉÃæ¤Ç¤¹" -#: vfs/undelfs.c:218 +#: vfs/undelfs.c:219 #, c-format msgid " while calling ext2_block_iterate %d " msgstr " ext2_block_iterate %d ¤ò¸Æ¤ó¤Ç¤¤¤ë´Ö¤Ë " -#: vfs/undelfs.c:226 +#: vfs/undelfs.c:227 msgid " no more memory while reallocating array " msgstr " ¥á¥â¥ê¤Î´Ö¤ËºÆÇÛʬ¤·¤Æ¤¤¤ëÇÛÎó¤Ï¤¢¤ê¤Þ¤»¤ó " -#: vfs/undelfs.c:245 +#: vfs/undelfs.c:246 #, c-format msgid " while doing inode scan %d " msgstr "i¥Î¡¼¥É¥¹¥­¥ã¥ó %d ¤ò¤¹¤ë´Ö¤Ë " -#: vfs/undelfs.c:269 +#: vfs/undelfs.c:270 msgid " Ext2lib error " msgstr " Ext2lib ¥¨¥é¡¼ " -#: vfs/undelfs.c:296 +#: vfs/undelfs.c:297 #, c-format msgid " Could not open file %s " msgstr " ¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó " -#: vfs/undelfs.c:299 +#: vfs/undelfs.c:300 msgid "undelfs: reading inode bitmap..." msgstr "undelfs: i¥Î¡¼¥É¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò¥í¡¼¥ÉÃæ¤Ç¤¹..." -#: vfs/undelfs.c:302 +#: vfs/undelfs.c:303 #, c-format msgid "" " Could not load inode bitmap from: \n" " %s \n" msgstr "'%s' ¤«¤éi¥Î¡¼¥É¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó \n" -#: vfs/undelfs.c:305 +#: vfs/undelfs.c:306 msgid "undelfs: reading block bitmap..." msgstr "undelfs: ¥Ö¥í¥Ã¥¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤òÆɤ߹þ¤ßÃæ¤Ç¤¹..." -#: vfs/undelfs.c:308 +#: vfs/undelfs.c:309 #, c-format msgid "" " Could not load block bitmap from: \n" " %s \n" msgstr " '%s' ¤«¤é¥Ö¥í¥Ã¥¯¥Ó¥Ã¥È¥Þ¥Ã¥×¤ò¥í¡¼¥É½ÐÍè¤Þ¤»¤ó¤Ç¤·¤¿\n" -#: vfs/undelfs.c:314 +#: vfs/undelfs.c:315 msgid "undelfs: done." msgstr "undelfs: ´°Î»" -#: vfs/undelfs.c:317 +#: vfs/undelfs.c:318 msgid "undelfs: failure" msgstr "undelfs: ¼ºÇÔ" -#: vfs/undelfs.c:341 +#: vfs/undelfs.c:342 msgid " vfs_info is not fs! " msgstr " vfs_info ¤Ï¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó! " -#: vfs/undelfs.c:397 vfs/undelfs.c:581 +#: vfs/undelfs.c:398 vfs/undelfs.c:582 msgid " You have to chdir to extract files first " msgstr "½é¤á¤ËÃê½Ð¤·¤¿¥Õ¥¡¥¤¥ë¤Ø chdir ¤·¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó" -#: vfs/undelfs.c:520 +#: vfs/undelfs.c:521 msgid " while iterating over blocks " msgstr " ¥Ö¥í¥Ã¥¯¤Î½ª¤ï¤ê¤Þ¤Ç¤ò·«¤êÊÖ¤¹´Ö¤Ë " -#: vfs/undelfs.c:625 +#: vfs/undelfs.c:626 #, c-format msgid " Could not open file: %s " msgstr " ¥Õ¥¡¥¤¥ë '%s' ¤ò³«¤±¤Þ¤»¤ó " #. This is place of next pointer -#: vfs/undelfs.c:683 +#: vfs/undelfs.c:684 msgid "Undelete filesystem for ext2" msgstr "ext2 ¥Õ¥¡¥¤¥ë¥·¥¹¥Æ¥à¤ÎÉü¸µ" diff -ruN old/mc-4.5.44/po/ko.po new/mc-4.5.45/po/ko.po --- old/mc-4.5.44/po/ko.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/ko.po Tue May 9 18:52:09 2000 @@ -1,36 +1,36 @@ # mc ko.po -# Copyright (C) 1998, 1999 Free Software Foundation, Inc. -# Sung-Hyun Nam , 1998, 1999 +# Copyright (C) 2000 Free Software Foundation, Inc. +# Sung-Hyun Nam , 2000 msgid "" msgstr "" -"Project-Id-Version: mc 4.5.41\n" -"POT-Creation-Date: 1999-11-29 12:00+0900\n" -"PO-Revision-Date: 1999-11-29 04:05:19+0900\n" +"Project-Id-Version: mc 4.5.44\n" +"POT-Creation-Date: 2000-05-04 17:37+0900\n" +"PO-Revision-Date: 2000-05-07 05:11:31+0900\n" "Last-Translator: Sung-Hyun Nam \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=euc-kr\n" "Content-Transfer-Encoding: 8bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr " 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 " ¸ÅÅ©·Î ½ÇÇà " #. 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 " Literal ÀÔ·Â " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Press any key: " msgstr " ¾Æ¹« ±Û¼è³ª ´©¸£½Ê½Ã¿À: " @@ -85,15 +85,15 @@ "with the command:\n" "\"%s\"%s" -#: 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 "º¸±â" @@ -101,6 +101,10 @@ msgid " There is no other panel to compare contents to " msgstr " There is no other panel to compare contents to " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " Å͹̳ÎÀ» ¿­ ¼ö ¾ø½À´Ï´Ù " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr " The Midnight Commander ÆÀ" @@ -207,7 +211,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 "¸ðµç ÆÄÀÏ º¸¿©ÁÖ±â" @@ -284,8 +288,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 "Áý´Ü" @@ -311,7 +315,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 "¼ÒÀ¯ÀÚ" @@ -344,28 +348,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 "%s ¿­ ¼ö ¾øÀ½; Ãʱ⠵¥½ºÅ©Å¾ ¾ÆÀÌÄÜÀ» °¡Áú ¼ö ¾øÀ» °ÍÀÓ" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "mount/unmount ¸í·ÉÀ» ½ÇÇàÇÏ´Â µµÁß" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "eject ¸í·ÉÀ» ½ÇÇàÇÏ´Â µµÁß" -#: 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 "¿¡·¯" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2617 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -378,84 +382,84 @@ "\n" "¹è°æÀ» ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "Å͹̳Î(_T)" -#: 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 "ÇöÀç µð·ºÅ丮¿¡¼­ »õ Å͹̳Π¿­±â" #. 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 "µð·ºÅ丮(_D)..." -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2642 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "»õ·Î¿î µð·ºÅ丮À» »ý¼º" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2643 msgid "URL L_ink..." msgstr "URL ¸µÅ©(_i)..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" msgstr "»õ·Î¿î URL ¸µÅ© »ý¼º" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "_Launcher..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2644 msgid "Creates a new launcher" msgstr "»õ·Î¿î launcher »ý¼º" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2650 msgid "By _Name" msgstr "À̸§À¸·Î(_N)" -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2651 msgid "By File _Type" msgstr "ÆÄÀÏ Á¾·ù·Î(_T)" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2652 msgid "By _Size" msgstr "Å©±â·Î(_S)" -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2653 msgid "By Time Last _Accessed" msgstr "¸¶Áö¸· ¾×¼¼½º ½Ã°£À¸·Î(_A)" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2654 msgid "By Time Last _Modified" msgstr "¸¶Áö¸· ¼öÁ¤ ½Ã°£À¸·Î(_M)" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2655 msgid "By Time Last _Changed" msgstr "¸¶Áö¸· °íÃÄÁø ½Ã°£À¸·Î(_C)" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "¾ÆÀÌÄÜ Á¤·Ä(_A)" -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2664 msgid "Create _New Window" msgstr "»õ â »ý¼º(_N)" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "µð·ºÅ丮 ´Ù½Ã Àбâ(_D)" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "ÀåÄ¡ ´Ù½Ã Àбâ(_v)" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "±âº» ¾ÆÀÌÄÜ Àç»ý¼º(_I)" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2670 msgid "Configure _Background Image" msgstr "¹è°æ ±×¸² ¼³Á¤(_B)" @@ -551,12 +555,12 @@ msgid "Replace it?" 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 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2398 src/screen.c:2428 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 "À̵¿" @@ -653,7 +657,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:1893 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1886 msgid "Password:" msgstr "ºñ¹Ð¹øÈ£:" @@ -674,24 +678,24 @@ msgid "Symbolic link filename:" msgstr "½Éº¼¸¯¸µÅ© ÆÄÀϸí:" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "¿©±â·Î À̵¿(_M)" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "¿©±â·Î º¹»ç(_C)" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "¿©±â·Î ¿¬°á(_L)" -#: 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" @@ -700,8 +704,8 @@ "%s ÆÄÀÏÁ¤º¸¸¦ ¾òÀ» ¼ö ¾ø¾î¿ä\n" "%s" -#: 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 @@ -794,7 +798,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 "º¹»ç(_C)..." @@ -802,7 +806,7 @@ msgid "Copy files" msgstr "ÆÄÀÏ º¹»ç" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "Áö¿ì±â(_D)..." @@ -810,7 +814,7 @@ msgid "Delete files" msgstr "ÆÄÀÏ Áö¿ò" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "À̵¿(_M)..." @@ -858,7 +862,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:2085 msgid "Search" msgstr "ã±â" @@ -866,7 +870,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 "µð·ºÅ丮 ´Ù½Ã Àбâ(_R)" @@ -975,285 +979,286 @@ "Á¶½ÉÇÏÁö ¾ÊÀ¸¸é ½Ã½ºÅÛÀ» Æı«½Ãų ¼öµµ ÀÖÀ¸¸ç, ±×³ð ÆÄÀÏ °ü¸®ÀÚ´Â ´ç½ÅÀÌ " "±×·± ÀÏÀ» ÇÏ´Â °ÍÀ» ¾Ë ¼ö ¾ø½À´Ï´Ù." -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "/etc/fstab ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù" -#: 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 "" "%s¸¦ %s·Î ½Éº¼¸¯¸µÅ© ¸¸µé ¼ö ¾øÀ½; ±×·± µ¥½ºÅ©Å¾ ¾ÆÀÌÄÜÀ» °¡Áú ¼ö ¾øÀ» °ÍÀÓ" -#: 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 "Ç÷ÎÇÇ %d" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "µð½ºÅ© %d" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "NFS dir %s" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "µð¹ÙÀ̽º %d" #. 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 "ÆÄÀÏ Å©±â: N/A" -#: 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 "URL:" -#: 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 "Drop µ¿ÀÛ" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 msgid "Use default Drop Action options" msgstr "±âº»ÀûÀÎ Drop µ¿ÀÛ »ç¿ë" -#: 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 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 +#: src/screen.c:2396 src/screen.c:2426 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 "±âº»ÀûÀÎ Drop µ¿ÀÛ »ç¿ë" -#: 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:2397 src/screen.c:2427 src/view.c:2081 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 "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 "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 "ÆÄÀÏ ¼ÒÀ¯°ü°è" -#: 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 "Åë°è" -#: 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 "'/' ¹®ÀÚ¸¦ Æ÷ÇÔÇÏ´Â ÆÄÀϸíÀ¸·Î´Â ¹Ù²Ü ¼ö ¾ø½À´Ï´Ù" @@ -1299,8 +1304,8 @@ msgid "Copy..." msgstr "º¹»ç..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2401 +#: src/screen.c:2431 msgid "Delete" msgstr "Áö¿ì±â" @@ -1340,71 +1345,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Á¤±ÔÇ¥Çö½Ä ´ë½Å ½© ÆÐÅÏ »ç¿ë" -#: 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 "ÆÄÀÏ »èÁ¦Àü¿¡ È®ÀÎ" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "ÆÄÀÏ °ãÃľ²±âÀü¿¡ È®ÀÎ" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "ÆÄÀÏ ½ÇÇàÀü¿¡ È®ÀÎ" -#: gnome/gprefs.c:125 +#: 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 "VFS ŸÀӾƿô:" -#: 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 "Anonymous FTP ºñ¹Ð¹øÈ£:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "Ç×»ó FTP proxy »ç¿ë" -#: 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 "FTP µð·ºÅ丮 ij½¬ ŸÀӾƿô:" -#: 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 "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "ij½¬" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "¼Ó¼º" @@ -1448,108 +1457,108 @@ 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)..." -#: 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)..." -#: 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 "ã±â: %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" msgstr "%s bytes in %d file" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" msgstr "%s bytes in %d files" -#: 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 "Rescan" -#: 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "È®ÀÎ(&O)" @@ -1558,12 +1567,12 @@ msgid "Offset 0x%08lx" msgstr "¿É¼Â 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "Col %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s ¹ÙÀÌÆ®" @@ -1653,56 +1662,81 @@ msgid "Could not get the desktop\n" msgstr "µ¥½ºÅ©Å¾À» ¾òÀ» ¼ö ¾ø½À´Ï´Ù\n" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "¸ð¸£´Â Á¤·Ä Çü½Ä `%s'\n" + +#: 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 "À̸§ | Çü½Ä | Å©±â | atime | mtime | ctime" + +#: 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/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. " @@ -1710,144 +1744,148 @@ " \n" " edit.hÀÇ MAXBUF °ªÀ» Å°¿î ÈÄ ´Ù½Ã ÄÄÆÄÀÏÇϽʽÿÀ. " -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr " ±â¾ïÀåÄ¡ ¹èÁ¤ ¿¡·¯ " +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " ÆÄÀÌÇÁ ¾²±â ¿¡·¯: " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr " ¾²±âÀ§ÇÑ ÆÄÀÌÇÁ ¿­±â ½ÇÆÐ: " -#: gtkedit/editcmd.c:334 +#: 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 -#: vfs/smbfs.c:116 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "Ãë¼Ò(&C)" -#: 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 -#: 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 +#: 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:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 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 "±Û¼è '%d 0': " -#: 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:2077 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. " @@ -1855,118 +1893,113 @@ " ÆÄÀÏÀÌ ¹Ù²î¾ú½À´Ï´Ù. \n" " ÀúÀå ¾ÊÇÏ°í °è¼ÓÇÏ½Ç °Ì´Ï±î? " -#: 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 "Çϳª(&N)" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1192 src/filegui.c:597 msgid "al&L" msgstr "¸ðµÎ(&L)" -#: 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 "°Ç³Ê¶Ü(&S)" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1196 msgid "&Replace" msgstr "¹Ù²Þ(&R)" -#: 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 "scanf Ç¥Çö(&E)" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1238 msgid "replace &All" msgstr "¸ðµÎ ¹Ù²Þ(&A)" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1240 msgid "pr&Ompt on replace" msgstr "¹Ù²Ü ¶§¸¶´Ù ¹°¾îº½(&O)" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 msgid "&Backwards" msgstr "µÚ·Î(&B)" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 msgid "&Regular expression" msgstr "Á¤±ÔÇ¥Çö½Ä(&R)" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 msgid "&Whole words only" msgstr "´Ü¾î ´ÜÀ§·Î(&W)" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 msgid "case &Sensitive" msgstr "´ë¼Ò¹®ÀÚ ±¸ºÐ(&S)" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1252 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " ÀÎÀÚ ¼ø¼­ ÀÔ·Â (°¡·É: 3,2,1,4): " -#: 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:2000 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:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 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" @@ -1975,12 +2008,12 @@ "You can enter regexp substrings with %s\n" "(not \\1, \\2 like sed) then use \"Enter...order\"" -#: 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" @@ -1989,19 +2022,19 @@ "°°ÀÌ ÀÔ·ÂÇϽʽÿä" #. 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" @@ -2009,34 +2042,48 @@ "regex(Á¤±ÔÇ¥Çö½Ä)À» ¾î¶»°Ô ¾µ ¼ö ÀÖ´ÂÁö¸¦\n" "¾Ë·Á¸é regex µµ¿ò¸» ÆäÀÌÁö¸¦ º¸½Ê½Ã¿À " -#: 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 " scanf Ç¥Çö " #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1481 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2045,56 +2092,61 @@ "scanf ¼³¸í¼­¸¦ º¸½Ê½Ã¿À" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1506 msgid "Begin search, Enter" msgstr "ã±â ½ÃÀÛ, Enter" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "´ëÈ­»óÀÚ Ãë¼Ò, Esc" -#: 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 " ÀÌ»óÇÑ Á¤±ÔÇ¥Çö½Ä ȤÀº ³Ê¹« ¸¹ÀÌ ¹Ù²ã¾ß ÇÏ´Â scanf Ç¥Çö " #. "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 " %ld °³°¡ ¹Ù²î¾ú½À´Ï´Ù. " -#: 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? " @@ -2102,137 +2154,137 @@ " ÇöÀç ¹®¼­°¡ ¹Ù²î¾ú½À´Ï´Ù. \n" " ÀúÀåÇÏ°í Á¾·áÇÒ±î¿ä? " -#: 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:406 msgid "&Yes" msgstr "¿¹(&Y)" -#: 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:406 msgid "&No" msgstr "¾Æ´Ï¿À(&N)" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Cancel quit " msgstr " Á¾·á Ãë¼Ò(&C) " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Yes " msgstr " ¿¹(&Y) " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &No " msgstr " ¾Æ´Ï¿À(&N) " -#: 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:1915 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 " You must first highlight a block of text. " -#: 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 " Sort returned non-zero: " #. Not essential to translate -#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 +#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 msgid " Process block " msgstr " Process block " #. Not essential to translate -#: gtkedit/editcmd.c:2836 +#: gtkedit/editcmd.c:2903 msgid " Error trying to stat file " msgstr " Error trying to stat file " -#: gtkedit/editcmd.c:2907 +#: gtkedit/editcmd.c:2974 msgid " Mail " msgstr " ÀüÀÚ¿ìÆí " -#: gtkedit/editcmd.c:2920 +#: gtkedit/editcmd.c:2987 msgid " Copies to" msgstr " Copies to" -#: gtkedit/editcmd.c:2924 +#: gtkedit/editcmd.c:2991 msgid " Subject" msgstr " Á¦¸ñ" -#: gtkedit/editcmd.c:2928 +#: gtkedit/editcmd.c:2995 msgid " To" msgstr " To" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:2997 msgid " mail -s -c " msgstr " mail -s -c " @@ -2267,341 +2319,349 @@ " Midnight Commander¸¦ À§ÇØ °³¹ßµÈ\n" " »ç¿ëÀÚ¿Í Ä£±ÙÇÑ ÅؽºÆ® ÆíÁý±â.\n" -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 msgid "&Open/load... C-o" msgstr "¿­±â/ºÒ·¯¿À±â(&O)... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "»õ ÆÄÀÏ(&N) C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "ÀúÀå(_S) F3" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "´Ù¸¥ À̸§À¸·Î ÀúÀå(&A)... M-d" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "ÆÄÀÏ ³¢¿ö³Ö±â(&I)... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "ÆÄÀÏ·Î º¹»ç(&F)... C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 msgid "a&Bout... " msgstr "ÀÌ ÇÁ·Î±×·¥Àº(&B)... " -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 msgid "&Quit F10" msgstr "Á¾·á(&Q) F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" msgstr "»õ ÆÄÀÏ(&N) C-x l" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:147 msgid "copy to &File... " msgstr "ÆÄÀÏ·Î º¹»ç(&F)... " -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 msgid "&Toggle Mark F3" msgstr "¸¶Å© Åä±Û(&T) F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Mark Columns S-F3" msgstr "Ä÷³ ¸¶Å©(&M) S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "toggle &Ins/overw Ins" msgstr "»ðÀÔ/°ãħ Åä±Û(&I) Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Copy F5" msgstr "º¹»ç(&C) F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "À̵¿(&M) F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "Áö¿ì±â(&D) F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "Ãë¼Ò(&U) C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "ÆÄÀÏ Ã³À½(&B) C-PgUp" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "ÆÄÀÏ ³¡(&E) C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "ã±â(&S)... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "´Ù½Ã ã±â(&A) F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "¹Ù²Ù±â(&R)... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "¶óÀΠã¾Æ°¡±â(&G)... 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 "Literal ÀÔ·Â(&L) C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "È­¸é °»½Å(&R) 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 "¸ÅÅ©·Î ÀúÀå ½ÃÀÛ(&S) 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 "¸ÅÅ©·Î ÀúÀå ³¡(&F) C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "¸ÅÅ©·Î ½ÇÇà(&E)... C-a, KEY" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "delete macr&O... " msgstr "¸ÅÅ©·Î »èÁ¦(&O)... " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 msgid "insert &Date/time " msgstr "³¯Â¥/½Ã°£ »ðÀÔ(&D) " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 msgid "format p&Aragraph M-p" msgstr "format p&Aragraph M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:219 msgid "'ispell' s&Pell check C-p" msgstr "'ispell' öÀÚ °Ë»ç(&P) C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 msgid "sor&T... M-t" msgstr "Á¤·Ä(&T) 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 Formatter F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:222 msgid "&Mail... " msgstr "ÀüÀÚ¿ìÆí(&M)... " -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:236 msgid "&Execute macro... C-x e, KEY" msgstr "¸ÅÅ©·Î ½ÇÇà(&E)... C-x e, KEY" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:242 msgid "'ispell' s&Pell check M-$" msgstr "'ispell' öÀÚ °Ë»ç(&P) M-$" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 msgid "&General... " msgstr "ÀϹÝ(&G)... " -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 msgid "&Save mode..." msgstr "¸ðµå ÀúÀå(&S)..." -#: 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 "¹èÄ¡(&L)..." #. 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 "¿­±â...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "»õ ±Û\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "ÀúÀå\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "»õÀ̸§À¸·Î ÀúÀå\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "ÆÄÀÏ ³¢¿ö³Ö±â...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "ÆÄÀÏ·Î º¹»ç...\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 "¸¶Å© Åä±Û\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:417 msgid "Toggle mark columns\tC-b" msgstr "Ä÷³ ¸¶Å© Åä±Û\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:419 msgid "Toggle book mark\tC-M-Ins" msgstr "Ã¥°¥ÇÇ Åä±Û\tC-M-Ins" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:420 msgid "Previous book mark\tC-M-Up" msgstr "ÀÌÀü Ã¥°¥ÇÇ\tC-M-Up" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:421 msgid "Next book mark\tC-M-Down" msgstr "´ÙÀ½ Ã¥°¥ÇÇ\tC-M-Down" -#: 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 "»ðÀÔ/°ãħ Åä±Û\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:426 msgid "Copy block to cursor\tF5" msgstr "ºí·°À» Ä¿¼­À§Ä¡·Î º¹»ç\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "ºí·°À» Ä¿¼­À§Ä¡·Î À̵¿\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "ºí·° »èÁ¦\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "ºí·°À» Ŭ¸³º¸µå·Î º¹»ç\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "ºí·°À» Ŭ¸³º¸µå·Î ¿À·ÁµÎ±â\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "Ŭ¸³º¸µå¿¡¼­ ºí·° ºÙÀ̱â\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:433 msgid "Selection history\tM-Ins" msgstr "¼±Åà È÷½ºÅ丮\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:435 msgid "Undo\tC-BackSpace" msgstr "Ãë¼Ò\tC-BackSpace" #. 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 "ã±â...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "´Ù½Ã ã±â\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "¹Ù²Þ...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "¸ðµÎ ¹Ù²Þ\tF14" #. 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 "¶óÀΠã¾Æ°¡±â...\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 "¸ÅÅ©·Î ÀúÀå ½ÃÀÛ\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "¸ÅÅ©·Î ÀúÀå ³¡...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "¸ÅÅ©·Î ½ÇÇà...\tC-a, KEY" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "¸ÅÅ©·Î »èÁ¦...\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "³¯Â¥/½Ã°£ »ðÀÔ\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "Format paragraph\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "È­¸é °»½Å\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "¸ÅÅ©·Î¿Í ³»Àå ¸í·É" @@ -2626,84 +2686,84 @@ msgstr "Type writer wrap" #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "Word wrap line length : " #. 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 "synta&X highlighting" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "ÀúÀå Àü È®ÀÎ(&M)" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "ÅÇÀ» °ø¹éÀ¸·Î ä¿ò(&S)" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "¸®ÅÏÅ° ÀԷ½à autoindent(&R)" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "¹é½ºÆäÀ̽º¿¡ ÅÇ°£°Ý »ç¿ë(&B)" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "&Fake half tabs" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Wrap ¸ðµå" #. 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 "Error initialising 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:2394 src/screen.c:2424 src/tree.c:1008 +#: src/view.c:2070 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:2072 src/view.c:2094 msgid "Quit" msgstr "Á¾·á" @@ -2769,7 +2829,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:2395 src/screen.c:2425 msgid "Menu" msgstr "¸Þ´º" @@ -2805,12 +2865,12 @@ 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 " Spelling Message " -#: 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" @@ -2820,7 +2880,7 @@ " °æ·Î¿¡ ÀÖ°í, -a ¿É¼ÇÀÌ µ¿ÀÛÇÏ´Â Áö¸¦ È®ÀÎÇϽñ⠹ٶø´Ï´Ù. \n" " ±×·¸Áö ¾ÊÀ¸¸é ¿É¼Ç ¸Þ´º¿¡¼­ spell È®Àαâ´ÉÀ» ²ô½Ê½Ã¿ä. " -#: 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" @@ -2830,7 +2890,7 @@ " °æ·Î¿¡ ÀÖ°í, -a ¿É¼ÇÀÌ µ¿ÀÛÇÏ´Â Áö¸¦ È®ÀÎÇϽñ⠹ٶø´Ï´Ù. \n" " ±×·¸Áö ¾ÊÀ¸¸é ¿É¼Ç ¸Þ´º¿¡¼­ spell È®Àαâ´ÉÀ» ²ô½Ê½Ã¿ä. " -#: 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" @@ -2840,7 +2900,7 @@ " °æ·Î¿¡ ÀÖ°í, -a ¿É¼ÇÀÌ µ¿ÀÛÇÏ´Â Áö¸¦ È®ÀÎÇϽñ⠹ٶø´Ï´Ù. \n" " ±×·¸Áö ¾ÊÀ¸¸é ¿É¼Ç ¸Þ´º¿¡¼­ spell È®Àαâ´ÉÀ» ²ô½Ê½Ã¿ä. " -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1096 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2848,11 +2908,11 @@ " ispell¿¡¼­ Àб⠿¡·¯°¡ »ý°å½À´Ï´Ù. \n" " IspellÀÌ ´Ù½Ã ½ÃÀÛµÉ °ÍÀÔ´Ï´Ù. " -#: 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" @@ -2862,15 +2922,15 @@ " »õ·Î¿î ±ÔÄ¢ ÆÄÀÏÀÌ ÀνºÅçµÉ °ÍÀÔ´Ï´Ù. \n" " ¿À·¡µÈ ±ÔÄ¢ ÆÄÀÏÀ» .OLD È®ÀåÀÚ¸¦ ºÙ¿© º¸°üÇÕ´Ï´Ù. " -#: 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 " ÆÄÀÏ %sÀÇ %d ¶óÀο¡ ¿¡·¯ " @@ -3475,44 +3535,44 @@ msgid " Enter machine name (F1 for details): " msgstr " È£½ºÆ® À̸§ ÀÔ·Â (µµ¿ò¸» F1): " -#: src/cmd.c:1360 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr " %s·Î µð·ºÅ丮À» ¹Ù²Ü ¼ö ¾øÀ½ " -#: src/cmd.c:1367 +#: src/cmd.c:1370 src/widget.c:1163 msgid " Link to a remote machine " msgstr " ¿ø°Ý È£½ºÆ®¿¡ ¿¬°á " -#: src/cmd.c:1373 +#: src/cmd.c:1376 src/widget.c:1164 msgid " FTP to machine " msgstr " FTP ¿¬°á " -#: src/cmd.c:1379 +#: src/cmd.c:1382 src/widget.c:1165 msgid " SMB link to machine " msgstr " SMB ¿¬°á " -#: 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:1401 msgid " Host name " msgstr " È£½ºÆ® À̸§ " -#: src/cmd.c:1397 +#: src/cmd.c:1401 msgid " Error while looking up IP address " msgstr " IP ÁÖ¼Ò Ã£´Â Áß ¿À·ù ¹ß»ý " -#: src/cmd.c:1408 +#: src/cmd.c:1412 msgid " Undelete files on an ext2 file system " msgstr " ext2 ÆÄÀÏü°è¿¡¼­ ÆÄÀÏ µÇ»ì¸² " -#: src/cmd.c:1409 +#: src/cmd.c:1413 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3520,11 +3580,11 @@ " ÆÄÀÏÀ» º¹±¸Çϱâ À§ÇØ '/dev/'¸¦ »ý·«ÇÑ µð¹ÙÀ̽º¸í\n" " ÀÔ·Â: (ÀÚ¼¼È÷ ¾Ë±â ¿øÇϸé F1)" -#: src/cmd.c:1459 +#: src/cmd.c:1463 msgid " Setup saved to ~/" msgstr " Setup saved to ~/" -#: src/cmd.c:1464 +#: src/cmd.c:1468 msgid " Setup " msgstr " ȯ°æ¼³Á¤ " @@ -3687,6 +3747,110 @@ msgid "mc.ext will be used for this moment." msgstr "Áö±ÝÀº mc.ext¸¦ »ç¿ëÇÏ½Ç ¼ö ÀÖ½À´Ï´Ù." +#: src/features.inc:8 +msgid "Edition: " +msgstr "ȣȭÆÇ: " + +#: src/features.inc:11 +msgid "XView" +msgstr "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: 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 "°¡»ó ÆÄÀÏ ½Ã½ºÅÛ: tarfs, extfs" + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr " (proxies: hsc proxy)" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (with termnet support)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "With builtin Editor\n" + +#: src/features.inc:48 +msgid "Using " +msgstr "Using " + +#: src/features.inc:51 +msgid "system-installed " +msgstr "system-installed " + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "S-lang library with " + +#: src/features.inc:56 +msgid "terminfo" +msgstr "terminfo" + +#: src/features.inc:59 +msgid "termcap" +msgstr "termcap" + +#: src/features.inc:61 +msgid "an unknown terminal" +msgstr "an unknown terminal" + +#: src/features.inc:64 +msgid " database" +msgstr " database" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "the ncurses library" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "some unknown curses library" + +#: src/features.inc:74 +msgid "With subshell support: " +msgstr "With subshell support: " + +#: src/features.inc:76 +msgid "optional" +msgstr "optional" + +#: src/features.inc:78 +msgid "as default" +msgstr "as default" + +#: src/features.inc:84 +msgid "With support for background operations\n" +msgstr "With support for background operations\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " º¹»ç " @@ -4048,7 +4212,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "file" @@ -4076,11 +4240,11 @@ msgid " Can't operate on \"..\"! " msgstr " \"..\"¿¡ ´ëÇؼ­´Â ÀÛ¾÷ÇÒ ¼ö ¾ø½À´Ï´Ù! " -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "¿¹" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "¾Æ´Ï¿À" @@ -4313,7 +4477,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 "³ª¹«²Ã(&T)" @@ -4338,7 +4502,7 @@ msgid "Finished" msgstr "³¡³µ¾î¿ä" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "%s ã´Â Áß" @@ -4884,7 +5048,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "³ª ¸¶¿ì½º·Î Ŭ¸¯ÇÑ ÈÄ ±Û¼è¸¦ Á¤ÀÇÇϽʽÿÀ. ÅDZۼè·Î À̵¿ÇϽʽÿÀ" -#: 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" @@ -4896,263 +5060,263 @@ " ÀÛ¾÷ µð·ºÅ丮À» Áö¿ü°Å³ª, ¾Æ´Ï¸é \"su\" ¸í·ÉÀ»\n" " »ç¿ëÇÏ¿© Ưº°ÇÑ ¾×¼¼½º ±ÇÇÑÀ» °¡Áø °Í ¾Æ³é¿ä? " -#: 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:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr " The Midnight Commander " -#: src/main.c:860 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr " Á¤¸»·Î Midnight Commander¸¦ Á¾·áÇϽðÚÀ¾´Ï±î? " -#: src/main.c:1240 src/main.c:1264 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "ÆÄÀϸñ·Ïº¸±â ¼³Á¤(&L)..." -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "ºü¸£°Ô º¸±â(&Q) 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 "Á¤º¸(&I) C-x i" -#: src/main.c:1245 src/main.c:1269 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "Á¤·Ä ¼ø¼­(&S)..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "ÇÊÅÍ(&F)..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "³×Æ®¿öÅ© ¿¬°á(&N)..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "FTP ¿¬°á(&P)..." -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "SMB ¿¬°á(&B)..." -#: src/main.c:1258 src/main.c:1282 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "µå¶óÀ̺ê(&D)... M-d" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "´Ù½Ã Àбâ(&R) C-r" -#: src/main.c:1288 +#: src/main.c:1290 msgid "&User menu F2" msgstr "»ç¿ëÀÚ ¸Þ´º(&U) F2" -#: src/main.c:1289 +#: src/main.c:1291 msgid "&View F3" msgstr "º¸±â(&V) F3" -#: src/main.c:1290 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "ÆÄÀÏ º¸±â(&w)... " -#: src/main.c:1291 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "ÇÊÅÍ·Î º¸±â(&F) M-!" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Edit F4" msgstr "ÆíÁý(&E) F4" -#: src/main.c:1293 +#: src/main.c:1295 msgid "&Copy F5" msgstr "º¹»ç(&C) F5" -#: src/main.c:1294 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "ÆÄÀÏ ¸ðµå ¹Ù²Ù±â(&H) C-x c" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "¸µÅ©(&L) C-x l" -#: src/main.c:1297 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "½Éº¼¸¯¸µÅ©(&S) C-x s" -#: src/main.c:1298 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "½Éº¼¸¯¸µÅ© ¼öÁ¤(&Y) C-x C-s" -#: src/main.c:1299 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "¼ÒÀ¯ÀÚ ¹Ù²Ù±â(&O) C-x o" -#: src/main.c:1300 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "°í±Þ ¼ÒÀ¯ÀÚ ¹Ù²Ù±â(&A) " -#: src/main.c:1302 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "¹Ù²Ù±â/À̵¿(&R) F6" -#: src/main.c:1303 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "µð·ºÅ丮 »ý¼º(&M) F7" -#: src/main.c:1304 +#: src/main.c:1306 msgid "&Delete F8" msgstr "Áö¿ì±â(&D) F8" -#: src/main.c:1305 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "µð·ºÅ丮 »¡¸® ¹Ù²Ù±â(&Q) M-c" -#: src/main.c:1307 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "Áý´Ü¼±ÅÃ(&G) M-+" -#: src/main.c:1308 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "Áý´Ü¼±Åà ÇØÁ¦(&N) M-\\" -#: src/main.c:1309 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "¼±ÅùÝÀü(&T) M-*" -#: src/main.c:1311 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "Á¾·á(&X) F10" -#: src/main.c:1321 +#: src/main.c:1323 msgid "&Directory tree" msgstr "µð·ºÅ丮 ³ª¹«²Ã(&D)" -#: src/main.c:1323 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "ÆÄÀÏ Ã£±â(&F) M-?" -#: src/main.c:1324 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "ÆгΠ¹Ù²Ù±â(&W) C-u" -#: src/main.c:1325 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "ÆгΠ¿­±â/´Ý±â(&P) C-o" -#: src/main.c:1326 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "µð·ºÅ丮 ºñ±³(&C) C-x d" -#: src/main.c:1327 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "¿ÜºÎ¸í·É ÆгÎÈ­Çϱâ(&X) C-x !" -#: src/main.c:1328 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "µð·ºÅ丮 Å©±â º¸±â(&I)" -#: src/main.c:1330 +#: src/main.c:1332 msgid "command &History" msgstr "¸í·É È÷½ºÅ丮(&H)" -#: src/main.c:1331 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "µð·ºÅ丮 ´ÜÃà¸ñ·Ï(&R) C-\\" -#: src/main.c:1333 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "È°¼º VFS ¸ñ·Ï(&A) C-x a" -#: src/main.c:1334 +#: src/main.c:1336 msgid "Fr&ee VFSs now" msgstr "VFS¸¦ Áö±Ý ÇØÁ¦(_e)" -#: src/main.c:1337 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "¹é±×¶ó¿îµå jobs(&B) C-x j" -#: src/main.c:1341 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "ÆÄÀÏ µÇ»ì¸² (est2fs¸¸ °¡´É)" -#: src/main.c:1344 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "ÆÄÀÏ ¸ñ·Ï Çü½Ä ¹Ù²Ù±â(&L)" -#: src/main.c:1346 +#: src/main.c:1348 msgid "&Extension file edit" msgstr "È®ÀåÀÚ ÆÄÀÏ ¼öÁ¤(&E)" -#: src/main.c:1347 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "¸Þ´º ÆÄÀÏ ¼öÁ¤(&M)" -#: src/main.c:1352 +#: src/main.c:1354 msgid "&Configuration..." msgstr "ȯ°æ¼³Á¤(&C)..." -#: src/main.c:1354 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "È®ÀÎ(&O)..." -#: src/main.c:1355 +#: src/main.c:1357 msgid "&Display bits..." msgstr "Ãâ·Â ºñÆ®(&D)..." -#: src/main.c:1357 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "±Û¼è ¹è¿ì±â(&K)..." -#: src/main.c:1360 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "°¡»ó ÆÄÀÏü°è(&V)..." -#: src/main.c:1363 +#: src/main.c:1365 msgid "&Save setup" msgstr "ȯ°æ ÀúÀå(&S)" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr " ¿ÞÂÊ(&L) " -#: src/main.c:1381 +#: src/main.c:1383 msgid " &Above " msgstr " À§(&A) " -#: src/main.c:1384 +#: src/main.c:1386 msgid " &File " msgstr " ÆÄÀÏ(&F) " -#: src/main.c:1385 +#: src/main.c:1387 msgid " &Command " msgstr " ¸í·É(&C) " -#: src/main.c:1386 +#: src/main.c:1388 msgid " &Options " msgstr " ¼±ÅÃÇ׸ñ(&O) " -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr " ¿À¸¥ÂÊ(&R) " -#: src/main.c:1390 +#: src/main.c:1392 msgid " &Below " msgstr " ¾Æ·¡(&B) " -#: 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" @@ -5164,7 +5328,7 @@ " ´ç½ÅÀº ¼öµ¿À¸·Î µð·ºÅ丮À» ´Ù½Ã Àоî¾ß¸¸ ÇÕ´Ï´Ù. \n" " ÀÚ¼¼ÇÑ ³»¿ëÀ» ¾Ë°í ½ÍÀ¸½Ã¸é ¼³¸í¼­¸¦ º¸½Ê½Ã¿À. " -#: src/main.c:1925 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "GNU Midnight Commander¸¦ »ç¿ëÇØÁּż­ °¨»çÇÕ´Ï´Ù" @@ -5181,114 +5345,238 @@ msgid "The TERM environment variable is unset!\n" msgstr "TERM ȯ°æº¯¼ö°¡ ¼³Á¤µÇ¾îÀÖÁö ¾Ê½À´Ï´Ù!\n" -#: src/main.c:2592 +#: src/main.c:2487 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" +"»ç¿ë¹ý:\n" +"\n" +"mc [¿É¼Ç] [ÀÌ µð·ºÅ丮] [´Ù¸¥ ÆгΠµð·ºÅ丮]\n" +"\n" + +#: src/main.c:2490 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "-a, --stickchars ¼±À» ±×¸± ¶§ ¹«Á¶°Ç +, -, | À» »ç¿ë.\n" + +#: src/main.c:2492 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "-b, --nocolor Èæ¹éÀ¸·Î Ç¥½Ã.\n" + +#: src/main.c:2494 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "-B, --background [°³¹ßÀÚ¸¸: ¹é±×¶ó¿îµå ÄÚµå µð¹ö±×]\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 ¹«Á¶°Ç Ä÷¯ »ç¿ë.\n" +"-C, --colors Ä÷¯ ¸í½Ã (¸ñ·ÏÀ» ¾òÀ¸·Á¸é --help-colors »ç¿ë).\n" +"-d, --nomouse ¸¶¿ì½º »ç¿ë¾ÊÇÔ.\n" + +#: src/main.c:2500 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "-e, --edit ³»Àå ÆíÁý±â ½ÃÀÛ.\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 "" + +#: 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 "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 "" "-m ¼±ÅÃÇ׸ñÀº Àǹ̰¡ ¾ø½À´Ï´Ù. ¼±ÅÃÇ׸ñ ¸Þ´ºÀÇ 'Ãâ·Â ºñÆ®'¸¦ º¸½Ê½Ã¿À\n" -#: 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 "ÁÖ¾îÁø ÆÄÀÏ·Î ftp ´ÙÀÌ¾Ë·Î±× ·Î±ë" -#: 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 "subshell Áö¿ø ¾ÊÇÔ" -#: 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 "HP Å͹̳ο¡¼­ ¼ÒÇÁÆ® ±Û¼è ¸®¼Â" -#: 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 "Use stickchars to draw" -#: src/main.c:2735 +#: src/main.c:2739 msgid "Enables subshell support (default)" msgstr "subshell Áö¿øÇÔ (±âº»°ª)" -#: src/main.c:2740 +#: src/main.c:2744 msgid "Tries to use termcap instead of terminfo" msgstr "terminfo ´ë½Å termcap »ç¿ë ½Ãµµ" -#: 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 "xterm ±â´ÉÀ» ¹«Á¶°Ç »ç¿ë" -#: 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 "GEOMETRY" -#: 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 "ÀüÅëÀûÀÎ gmcó·³ º¸±â" + +#: src/main.c:2759 msgid "Display the directory that holds the .links startup files and exit" msgstr ".links ½ÃÀÛÆÄÀÏÀ» °¡Áø µð·ºÅ丮 Ãâ·ÂÇÏ°í Á¾·á" -#: 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" @@ -5296,11 +5584,11 @@ "tty ¼±À» ¿­¼ö ¾ø³×¿ä. ´ç½ÅÀº -P ¼±ÅÃÇ׸ñ¾øÀÌ MC¸¦ ½ÇÇàÇØ¾ß ÇÕ´Ï´Ù.\n" "ƯÁ¤ ü°è¿¡¼­´Â # `which mc` ¿Í °°ÀÌ ½ÇÇàÇÒ ¼öµµ ÀÖ½À´Ï´Ù.\n" -#: src/main.c:3129 +#: src/main.c:3149 msgid " Notice " msgstr " Notice " -#: src/main.c:3130 +#: src/main.c:3150 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5472,6 +5760,14 @@ msgid "Display brief usage message" msgstr "°£´ÜÇÑ »ç¿ë ¸Þ½ÃÁö Ãâ·Â" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "" + #: src/screen.c:417 msgid "MTime" msgstr "MTime" @@ -5517,29 +5813,29 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "»ç¿ëÀÚ°¡ Á¦°øÇÑ Çü½ÄÀº À߸øµÇ¾ú½À´Ï´Ù. ±âº»°ª »ç¿ë." -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " Á¤¸»·Î ½ÇÇàÇϽðÚÀ¾´Ï±î? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr " No action taken " -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2399 src/screen.c:2429 src/tree.c:1016 msgid "RenMov" msgstr "RenMov" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1020 msgid "Mkdir" msgstr "Mkdir" -#: src/screen.c:2417 +#: src/screen.c:2416 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" %s·Î µð·ºÅ丮 ¹Ù²Ü ¼ö ¾øÀ½ \n" +" \"%s\"·Î µð·ºÅ丮À» ¹Ù²Ü ¼ö ¾ø¾î¿ä \n" " %s " #: src/subshell.c:287 @@ -5609,15 +5905,6 @@ msgid "Dynamc" msgstr "Dynamc" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -" \"%s\"·Î µð·ºÅ丮À» ¹Ù²Ü ¼ö ¾ø¾î¿ä \n" -" %s " - #: src/tree.c:1012 msgid "Forget" msgstr "Forget" @@ -5698,15 +5985,15 @@ msgid "%b %e %Y" msgstr "%b %e %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr " ÆÄÀÌÇÁ ½ÇÆÐ " -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr " º¹Á¦ ½ÇÆÐ " -#: src/view.c:401 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5716,7 +6003,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5726,27 +6013,27 @@ "\n" "ÀÌ ¹Ù²î¾ú¾î¿ä. ¹Ù²ï ³»¿ëÀ» ÀúÀåÇÒ±î¿ä?\n" -#: src/view.c:404 +#: src/view.c:406 msgid " Save changes " msgstr " ¹Ù²ï ³»¿ë ÀúÀå " -#: src/view.c:446 +#: src/view.c:448 msgid " Can't spawn child program " msgstr " ÀÚ½Ä(child) Ç®±×¸²À» ½ÇÇàÇÒ ¼ö ¾ø½À´Ï´Ù " -#: src/view.c:455 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " ÀÚ½Ä(child) ÇÊÅÍÀÇ Ãâ·ÂÀÌ ¾Æ¹«°Íµµ ¾ø¾î¿ä " -#: src/view.c:460 +#: src/view.c:462 msgid " Could not open file " msgstr " ÆÄÀÏ ¿­±â ½ÇÆÐ " -#: src/view.c:475 +#: src/view.c:477 msgid " Can't open file \"" msgstr " ¿­ ¼ö ¾ø´Â ÆÄÀÏ: \"" -#: src/view.c:482 +#: src/view.c:484 msgid "" " Can't stat file \n" " " @@ -5754,11 +6041,11 @@ " ÆÄÀÏ Á¤º¸¸¦ ¾òÀ» ¼ö ¾ø½À´Ï´Ù \n" " " -#: src/view.c:488 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " ÀϹÝÆÄÀÏÀÌ ¾Æ´Ï¶ó º¼ ¼ö ¾ø½À´Ï´Ù " -#: src/view.c:569 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5767,7 +6054,7 @@ " \"%s\"¸¦ ¿­ ¼ö ¾ø½À´Ï´Ù \n" " %s " -#: src/view.c:578 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5776,34 +6063,34 @@ " \"%s\" ÆÄÀÏÁ¤º¸¸¦ ¾òÀ» ¼ö ¾ø¾î¿ä\n" " %s " -#: src/view.c:714 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "ÆÄÀÏ: %s" -#: src/view.c:728 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "¿É¼Â 0x%08x" -#: src/view.c:739 +#: src/view.c:741 msgid " [grow]" msgstr " [grow]" -#: src/view.c:1518 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "`%s' ã´Â Áß" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " ±Û¿ùÀ» ãÀ» ¼ö ¾ø±º¿ä " -#: src/view.c:1787 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " ¾Ë¼ö ¾ø´Â Á¤±Ô Ç¥Çö½Ä " -#: src/view.c:1911 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5812,7 +6099,7 @@ " ÇöÀç ÁÙ ¹øÈ£´Â %dÀÔ´Ï´Ù.\n" " »õ·Î¿î ÁÙ ¹øÈ£À» ÀÔ·Â:" -#: src/view.c:1933 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5821,71 +6108,71 @@ " ÇöÀç ÁÖ¼Ò´Â 0x%lxÀÔ´Ï´Ù.\n" " »õ·Î¿î ÁÖ¼Ò ÀÔ·Â:" -#: src/view.c:1935 +#: src/view.c:1937 msgid " Goto Address " msgstr " ÁÖ¼Ò Ã£±â " -#: src/view.c:1966 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " Á¤±ÔÇ¥Çö½Ä ÀÔ·Â:" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Ascii" msgstr "¾Æ½ºÅ°" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Hex" msgstr "½ÊÀ°Áø" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Goto" msgstr "Goto" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Line" msgstr "ÁÙ" -#: src/view.c:2075 +#: src/view.c:2077 msgid "RxSrch" msgstr "RxSrch" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdText" msgstr "EdText" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdHex" msgstr "EdHex" -#: src/view.c:2080 +#: src/view.c:2082 msgid "UnWrap" msgstr "UnWrap" -#: src/view.c:2080 +#: src/view.c:2082 msgid "Wrap" msgstr "Wrap" -#: src/view.c:2083 +#: src/view.c:2085 msgid "HxSrch" msgstr "HxSrch" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Raw" msgstr "Raw" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Parse" msgstr "Parse" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Unform" msgstr "Unform" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Format" msgstr "Format" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr " È÷½ºÅ丮 " @@ -6084,7 +6371,84 @@ msgid "NumLock on keypad" msgstr "NumLock on keypad" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"cpio ¾ÆÄ«À̺ê ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù\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 +#, 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 "%s°¡ ÀÌ»óÇÑ ¿£Æ®¸®¸¦ Æ÷ÇÔÇÏ°í ÀÖ½À´Ï´Ù! °Ç³Ê¶Ü!" + +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" +"ÆÄÀÏ %s¿¡¼­\n" +"±â´ëµÇÁö ¾ÊÀº EOF" + +#: vfs/direntry.c:300 +#, c-format +msgid "Dir cache expired for %s" +msgstr "%sÀÇ µð·ºÅ丮 ij½¬ ¸¸·áµÊ" + +#: vfs/direntry.c:430 vfs/direntry.c:433 +msgid " Direntry warning " +msgstr " µð·ºÅ丮 °æ°í " + +#: vfs/direntry.c:430 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "" + +#: vfs/direntry.c:433 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:811 +msgid "Starting linear transfer..." +msgstr "Linear Àü¼Û ½ÃÀÛÇÔ..." + +#: vfs/direntry.c:956 +msgid "Getting file" +msgstr "ÆÄÀÏ ¹ÞÀ½" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -6093,228 +6457,223 @@ "%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:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: %s·ÎºÎÅÍ ¿¬°á ²÷¾îÁü" -#: vfs/fish.c:214 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: Ãʱ⠶óÀÎÀ» ±â´Ù¸®´Â Áß..." -#: vfs/fish.c:224 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "¹Ì¾ÈÇÕ´Ï´Ù. ¾ÆÁ÷ ºñ¹Ð¹øÈ£ ÀÎÁõ ¿¬°áÀº ÇÒ ¼ö ¾ø½À´Ï´Ù." -#: vfs/fish.c:238 +#: vfs/fish.c:233 +msgid " fish: Password required for " +msgstr " fish: Password required for " + +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: »ç¿ëÀÚ ºñ¹Ð¹øÈ£ º¸³¿..." -#: vfs/fish.c:244 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: Ãʱ⠶óÀÎ º¸³¿..." -#: vfs/fish.c:248 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: Çڵ彦ÀÌÅ· ¹öÁ¯..." -#: vfs/fish.c:252 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: ÇöÀç µð·ºÅ丮 ¼³Á¤Áß..." -#: vfs/fish.c:254 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: ¿¬°áµÊ, ȨÀº %s." -#: vfs/fish.c:330 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: µð·ºÅ丮 %s Àд Áß..." -#: vfs/fish.c:426 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: ½ÇÆÐ" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: %s ÀúÀå: ¸í·É º¸³¿..." -#: vfs/fish.c:460 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: ·ÎÄà Àб⠽ÇÆÐ. 0À» º¸³¿" -#: vfs/fish.c:472 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: %s %d ÀúÀå (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "¼Û½Å Áß´Ü..." -#: vfs/fish.c:521 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "Áß´Ü ÈÄ¿¡ ¿¡·¯ º¸°íµÊ." -#: vfs/fish.c:523 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "¼Û½ÅÀÌ ¼º°øÀûÀ¸·Î ÁߴܵǾú½À´Ï´Ù." -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: %s·ÎºÎÅÍ ¿¬°á ²÷¾îÁü" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: Password required for " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: Password required for " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: ÇÁ·Ï½Ã ·Î±×ÀÎ À̸§ º¸³¿" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: ÇÁ·Ï½Ã »ç¿ëÀÚ ºñ¹Ð¹øÈ£ º¸³¿" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: ÇÁ·Ï½Ã ÀÎÁõ ¼º°ø" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: %s·Î ¿¬°áµÊ" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: ·Î±×ÀÎ À̸§ º¸³¿" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: »ç¿ëÀÚ ºñ¹Ð¹øÈ£ º¸³¿" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: ·Î±× ÀÎ" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Login incorrect for user %s " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " ¼Ò½º ¶ó¿ìÆà (%s)¸¦ ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: À¯È¿ÇÏÁö ¾ÊÀº È£½ºÆ® À̸§." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: À¯È¿ÇÏÁö ¾ÊÀº È£½ºÆ® ÁÖ¼Ò." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: %s·Î ¿¬°á ½ÃµµÁß" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: »ç¿ëÀÚ¿¡ ÀÇÇØ ¿¬°á ÁߴܵÊ" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: ¼­¹ö·Î ¿¬°á ½ÇÆÐ: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:744 #, 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:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: ¼öµ¿ ¸ðµå·Î ¼³Á¤ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: ¼Û½Å ÁߴܵÊ." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: Áß´Ü ¿¡·¯: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: Áß´Ü ½ÇÆÐ" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD ½ÇÆÐ." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: ½Éº¼¸¯¸µÅ©¸¦ Çؼ®ÇÒ ¼ö ¾ø½À´Ï´Ù" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "½Éº¼¸¯¸µÅ© Çؼ®..." -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1188 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: FTP µð·ºÅ丮 %s Àд Áß... (UNIX ls ¿É¼Ç »ç¿ë¾ÊÇÔ)" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: FTP µð·ºÅ丮 %s Àд Áß... %s%s" -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: FTP µð·ºÅ丮 %s Àд Áß..." +#: vfs/ftpfs.c:1189 +msgid "(strict rfc959)" +msgstr "(strict rfc959)" -#: 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:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: ¸ñ·Ï ¾ò¾î¿È" +#: vfs/ftpfs.c:1190 +msgid "(chdir first)" +msgstr "(chdir first)" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "ftpfs: ½ÇÆÐ" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ½ÇÆÐ; nowhere to fallback to" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ÆÄÀÏ ÀúÀå %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6322,15 +6681,15 @@ "~/.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" @@ -6340,48 +6699,68 @@ " ·Î±×ÀÎÇÏ·Á¸é ºñ¹Ð¹øÈ£°¡ ÇÊ¿äÇÕ´Ï´Ù¸¸ ºñ¹Ð¹øÈ£ÀÇ »ç¿ëÀº \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 " È£½ºÆ® À§Ä¡¸¦ ¾Ë ¼ö ¾øÀ½: %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 " ³Ê¹« ¸¹Àº ¿¬°áÀÌ ÀÌ·ç¾îÁü " -#: vfs/smbfs.c:115 +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "" + +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "µµ¸ÞÀÎ:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "»ç¿ëÀÚ¸í:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "ºñ¹Ð¹øÈ£: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "\\\\%s\\%sÀÇ ºñ¹Ð¹øÈ£" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6390,22 +6769,26 @@ " %s·ÎÀÇ À翬°á ½ÇÆÐ\n" " " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr "" + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s mkdir'ing %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s rmdir'ing %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s opening remote file %s " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s renaming files\n" @@ -6438,11 +6821,135 @@ "%s\n" "Å×ÀÙ ¾ÆÄ«À̺ê ÆÄÀÏ°°Áö ¾Ê½À´Ï´Ù." -#: vfs/vfs.c:1877 +#: vfs/vfs.c:1153 +msgid "Changes to file lost" +msgstr "" + +#: vfs/vfs.c:1847 +msgid "Could not parse:" +msgstr "ºÐ¼®ÇÒ ¼ö ¾øÀ½:" + +#: vfs/vfs.c:1849 +msgid "More parsing errors will be ignored." +msgstr "¾ÕÀ¸·ÎÀÇ ºÐ¼®¿¡·¯´Â ¹«½ÃµÉ °ÍÀÔ´Ï´Ù." + +#: vfs/vfs.c:1849 +msgid "(sorry)" +msgstr "(¹Ì¾È)" + +#: vfs/vfs.c:1860 +msgid "Internal error:" +msgstr "³»ºÎ ¿À·ù:" + +#: vfs/vfs.c:1870 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ¹ÙÀÌÆ® ¼Û½Å)" -#: vfs/vfs.c:1878 +#: vfs/vfs.c:1871 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ¹ÙÀÌÆ® ¼Û½ÅµÊ" + +#: vfs/undelfs.c:81 +msgid " undelfs: error " +msgstr " undelfs: ¿¡·¯ " + +#: vfs/undelfs.c:184 +msgid " not enough memory " +msgstr "" + +#: vfs/undelfs.c:189 +msgid " while allocating block buffer " +msgstr "" + +#: vfs/undelfs.c:193 +#, c-format +msgid " open_inode_scan: %d " +msgstr "" + +#: vfs/undelfs.c:197 +#, c-format +msgid " while starting inode scan %d " +msgstr "" + +#: vfs/undelfs.c:204 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "" + +#: vfs/undelfs.c:219 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr "" + +#: vfs/undelfs.c:227 +msgid " no more memory while reallocating array " +msgstr "" + +#: vfs/undelfs.c:246 +#, c-format +msgid " while doing inode scan %d " +msgstr "" + +#: vfs/undelfs.c:270 +msgid " Ext2lib error " +msgstr " Ext2lib ¿¡·¯ " + +#: vfs/undelfs.c:297 +#, c-format +msgid " Could not open file %s " +msgstr " %s ÆÄÀÏÀ» ¿­ ¼ö ¾ø½À´Ï´Ù " + +#: vfs/undelfs.c:300 +msgid "undelfs: reading inode bitmap..." +msgstr "undelfs: inode ºñÆ®¸ÊÀ» Àд Áß..." + +#: vfs/undelfs.c:303 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" +" ´ÙÀ½¿¡¼­ inode ºñÆ®¸ÊÀ» ÀÐÀ» ¼ö ¾øÀ½: \n" +" %s \n" + +#: vfs/undelfs.c:306 +msgid "undelfs: reading block bitmap..." +msgstr "" + +#: vfs/undelfs.c:309 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:315 +msgid "undelfs: done." +msgstr "undelfs: ³¡³²." + +#: vfs/undelfs.c:318 +msgid "undelfs: failure" +msgstr "undelfs: ½ÇÆÐ" + +#: vfs/undelfs.c:342 +msgid " vfs_info is not fs! " +msgstr "" + +#: vfs/undelfs.c:398 vfs/undelfs.c:582 +msgid " You have to chdir to extract files first " +msgstr "" + +#: vfs/undelfs.c:521 +msgid " while iterating over blocks " +msgstr "" + +#: vfs/undelfs.c:626 +#, c-format +msgid " Could not open file: %s " +msgstr " ÆÄÀÏ ¿­±â ½ÇÆÐ: %s " + +#. This is place of next pointer +#: vfs/undelfs.c:684 +msgid "Undelete filesystem for ext2" +msgstr "ext2¿¡¼­ÀÇ ÆÄÀϺ¹±¸ ½Ã½ºÅÛ" diff -ruN old/mc-4.5.44/po/mc.pot new/mc-4.5.45/po/mc.pot --- old/mc-4.5.44/po/mc.pot Tue Apr 4 23:32:06 2000 +++ new/mc-4.5.45/po/mc.pot Tue May 9 18:52:10 2000 @@ -2,11 +2,14 @@ # Copyright (C) YEAR Free Software Foundation, Inc. # FIRST AUTHOR , YEAR. # +#. Not essential to translate +#: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 +#: gtkedit/editcmd.c:2893 gtkedit/editcmd.c:2898 gtkedit/editcmd.c:2943 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2000-04-04 23:31-0400\n" +"POT-Creation-Date: 2000-05-09 18:42-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,25 +17,25 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: edit/edit_key_translator.c:124 +#: edit/edit_key_translator.c:126 msgid " Emacs key: " msgstr "" -#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 msgid " Execute Macro " msgstr "" #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:136 edit/edit_key_translator.c:151 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 #: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr "" -#: edit/edit_key_translator.c:147 +#: edit/edit_key_translator.c:149 msgid " Insert Literal " msgstr "" -#: edit/edit_key_translator.c:147 +#: edit/edit_key_translator.c:149 msgid " Press any key: " msgstr "" @@ -88,6 +91,10 @@ msgid " There is no other panel to compare contents to " msgstr "" +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr "" + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "" @@ -242,7 +249,7 @@ msgid "Enter a regular expression here to select files in the panel view with." msgstr "" -#: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 +#: gnome/gcmd.c:917 src/cmd.c:540 src/cmd.c:591 msgid " Malformed regular expression " msgstr "" @@ -323,28 +330,28 @@ msgid "Custom View" msgstr "" -#: gnome/gdesktop.c:532 gnome/gmount.c:382 +#: gnome/gdesktop.c:622 gnome/gmount.c:382 msgid "Warning" msgstr "" -#: gnome/gdesktop.c:533 +#: gnome/gdesktop.c:623 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "" -#: gnome/gdesktop.c:1205 +#: gnome/gdesktop.c:1298 msgid "While running the mount/umount command" msgstr "" -#: gnome/gdesktop.c:1274 +#: gnome/gdesktop.c:1367 msgid "While running the eject command" msgstr "" -#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 +#: gnome/gdesktop.c:1551 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "" -#: gnome/gdesktop.c:2617 +#: gnome/gdesktop.c:2775 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -353,84 +360,84 @@ "We are unable to set the background." msgstr "" -#: gnome/gdesktop.c:2640 gnome/glayout.c:362 +#: gnome/gdesktop.c:2798 gnome/glayout.c:362 msgid "_Terminal" msgstr "" -#: gnome/gdesktop.c:2640 gnome/glayout.c:363 +#: gnome/gdesktop.c:2798 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:2642 gnome/glayout.c:365 +#: gnome/gdesktop.c:2800 gnome/glayout.c:365 msgid "_Directory..." msgstr "" -#: gnome/gdesktop.c:2642 gnome/glayout.c:366 +#: gnome/gdesktop.c:2800 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "" -#: gnome/gdesktop.c:2643 +#: gnome/gdesktop.c:2801 msgid "URL L_ink..." msgstr "" -#: gnome/gdesktop.c:2643 +#: gnome/gdesktop.c:2801 msgid "Creates a new URL link" msgstr "" -#: gnome/gdesktop.c:2644 +#: gnome/gdesktop.c:2802 msgid "_Launcher..." msgstr "" -#: gnome/gdesktop.c:2644 +#: gnome/gdesktop.c:2802 msgid "Creates a new launcher" msgstr "" -#: gnome/gdesktop.c:2650 +#: gnome/gdesktop.c:2808 msgid "By _Name" msgstr "" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2809 msgid "By File _Type" msgstr "" -#: gnome/gdesktop.c:2652 +#: gnome/gdesktop.c:2810 msgid "By _Size" msgstr "" -#: gnome/gdesktop.c:2653 +#: gnome/gdesktop.c:2811 msgid "By Time Last _Accessed" msgstr "" -#: gnome/gdesktop.c:2654 +#: gnome/gdesktop.c:2812 msgid "By Time Last _Modified" msgstr "" -#: gnome/gdesktop.c:2655 +#: gnome/gdesktop.c:2813 msgid "By Time Last _Changed" msgstr "" -#: gnome/gdesktop.c:2663 gnome/glayout.c:462 +#: gnome/gdesktop.c:2821 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "" -#: gnome/gdesktop.c:2664 +#: gnome/gdesktop.c:2822 msgid "Create _New Window" msgstr "" -#: gnome/gdesktop.c:2666 gnome/glayout.c:464 +#: gnome/gdesktop.c:2824 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "" -#: gnome/gdesktop.c:2667 gnome/glayout.c:465 +#: gnome/gdesktop.c:2825 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "" -#: gnome/gdesktop.c:2668 gnome/glayout.c:466 +#: gnome/gdesktop.c:2826 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "" -#: gnome/gdesktop.c:2670 +#: gnome/gdesktop.c:2828 msgid "Configure _Background Image" msgstr "" @@ -525,7 +532,7 @@ msgstr "" #: 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 +#: src/file.c:802 src/screen.c:2400 src/screen.c:2430 src/tree.c:1014 msgid "Copy" msgstr "" @@ -621,7 +628,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:1831 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833 msgid "Password:" msgstr "" @@ -813,7 +820,7 @@ msgid "Reverses the list of tagged files" msgstr "" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2088 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2085 msgid "Search" msgstr "" @@ -1037,6 +1044,12 @@ msgid "File Created on: " msgstr "" +#: gnome/gnome-file-property-dialog.c:281 +#: gnome/gnome-file-property-dialog.c:290 +#: gnome/gnome-file-property-dialog.c:299 +msgid "%a, %b %d %Y, %I:%M:%S %p" +msgstr "" + #: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "" @@ -1064,7 +1077,7 @@ #: 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 +#: src/screen.c:2398 src/screen.c:2428 msgid "View" msgstr "" @@ -1094,7 +1107,7 @@ msgstr "" #: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 +#: src/screen.c:2399 src/screen.c:2429 src/view.c:2081 msgid "Edit" msgstr "" @@ -1250,8 +1263,8 @@ msgid "Copy..." msgstr "" -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2403 +#: src/screen.c:2433 msgid "Delete" msgstr "" @@ -1499,12 +1512,12 @@ msgstr "" #. 1 -#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 -#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:69 +#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1235 +#: gtkedit/editcmd.c:1320 gtkedit/editcmd.c:3027 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "" @@ -1513,12 +1526,12 @@ msgid "Offset 0x%08lx" msgstr "" -#: gnome/gview.c:138 src/view.c:735 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "" -#: gnome/gview.c:142 src/view.c:739 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "" @@ -1646,49 +1659,57 @@ msgstr "" #. The file-name is printed after the ':' -#: 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 +#: gtkedit/edit.c:149 gtkedit/edit.c:318 gtkedit/edit.c:323 gtkedit/edit.c:337 +#: gtkedit/edit.c:341 gtkedit/edit.c:373 gtkedit/edit.c:379 gtkedit/edit.c:386 +#: gtkedit/edit.c:393 gtkedit/edit.c:399 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2031 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/tree.c:682 src/tree.c:688 src/wtools.c:222 msgid " Error " msgstr "" -#: gtkedit/edit.c:145 gtkedit/edit.c:337 gtkedit/edit.c:375 +#: gtkedit/edit.c:149 gtkedit/edit.c:341 gtkedit/edit.c:379 msgid " Failed trying to open file for reading: " msgstr "" -#: gtkedit/edit.c:314 +#: gtkedit/edit.c:318 msgid " Error reading from pipe: " msgstr "" -#: gtkedit/edit.c:319 +#: gtkedit/edit.c:323 msgid " Failed trying to open pipe for reading: " msgstr "" -#: gtkedit/edit.c:333 +#: gtkedit/edit.c:337 msgid " Error reading file: " msgstr "" -#: gtkedit/edit.c:382 +#: gtkedit/edit.c:386 msgid " Cannot get size/permissions info on file: " msgstr "" -#: gtkedit/edit.c:389 +#: gtkedit/edit.c:393 msgid " Not an ordinary file: " msgstr "" -#: gtkedit/edit.c:395 +#: gtkedit/edit.c:399 msgid " File is too large: " msgstr "" -#: gtkedit/edit.c:396 +#: gtkedit/edit.c:400 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " msgstr "" +#: gtkedit/edit.c:2571 +msgid "User menu avalaible only in mcedit invoked from mc" +msgstr "" + +#. Not essential to translate +#: gtkedit/edit.c:2769 gtkedit/editcmd.c:2945 +msgid "Error trying to stat file:" +msgstr "" + #: gtkedit/editcmd.c:298 msgid " Error writing to pipe: " msgstr "" @@ -1710,15 +1731,15 @@ msgstr "" #. NLS for hotkeys? -#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 -#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:66 +#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1233 +#: gtkedit/editcmd.c:1318 gtkedit/editcmd.c:3025 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/chmod.c:114 src/chown.c:79 src/cmd.c:858 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:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 -#: vfs/smbfs.c:116 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "" @@ -1737,10 +1758,10 @@ #. Warning message with a query to continue or cancel the operation #: 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:172 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 vfs/mcfs.c:172 msgid " Warning " msgstr "" @@ -1755,7 +1776,7 @@ #: 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 +#: gtkedit/editcmd.c:1671 msgid "Cancel" msgstr "" @@ -1763,7 +1784,7 @@ msgid " Save as " msgstr "" -#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2771 msgid " Error trying to save file. " msgstr "" @@ -1826,7 +1847,7 @@ msgstr "" #: gtkedit/editcmd.c:836 gtkedit/editwidget.c:1137 gtkedit/gtkedit.c:1247 -#: src/view.c:2080 +#: src/view.c:2077 msgid "Save" msgstr "" @@ -1844,397 +1865,407 @@ msgid " Load " msgstr "" -#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 msgid " Block is large, you may not be able to undo this action. " msgstr "" -#: gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1136 msgid " Continue " msgstr "" -#: gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1136 msgid " Cancel " msgstr "" -#: gtkedit/editcmd.c:1190 +#: gtkedit/editcmd.c:1191 msgid "o&Ne" msgstr "" -#: gtkedit/editcmd.c:1192 src/filegui.c:597 +#: gtkedit/editcmd.c:1193 src/filegui.c:597 msgid "al&L" msgstr "" -#: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 +#: gtkedit/editcmd.c:1195 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "" -#: gtkedit/editcmd.c:1196 +#: gtkedit/editcmd.c:1197 msgid "&Replace" msgstr "" -#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1203 gtkedit/editcmd.c:1671 msgid " Replace with: " msgstr "" -#: gtkedit/editcmd.c:1206 +#: gtkedit/editcmd.c:1207 msgid " Confirm replace " msgstr "" -#: gtkedit/editcmd.c:1236 gtkedit/editcmd.c:1321 +#: gtkedit/editcmd.c:1237 gtkedit/editcmd.c:1322 msgid "scanf &Expression" msgstr "" -#: gtkedit/editcmd.c:1238 +#: gtkedit/editcmd.c:1239 msgid "replace &All" msgstr "" -#: gtkedit/editcmd.c:1240 +#: gtkedit/editcmd.c:1241 msgid "pr&Ompt on replace" msgstr "" -#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 +#: gtkedit/editcmd.c:1243 gtkedit/editcmd.c:1324 msgid "&Backwards" msgstr "" -#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1326 msgid "&Regular expression" msgstr "" -#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 +#: gtkedit/editcmd.c:1247 gtkedit/editcmd.c:1328 msgid "&Whole words only" msgstr "" -#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 +#: gtkedit/editcmd.c:1249 gtkedit/editcmd.c:1330 msgid "case &Sensitive" msgstr "" -#: gtkedit/editcmd.c:1252 +#: gtkedit/editcmd.c:1253 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr "" -#: gtkedit/editcmd.c:1256 +#: gtkedit/editcmd.c:1257 msgid " Enter replacement string:" msgstr "" -#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2003 +#: gtkedit/editcmd.c:1261 gtkedit/editcmd.c:1334 src/view.c:2000 msgid " Enter search string:" msgstr "" #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 -#: gtkedit/editcmd.c:2209 gtkedit/editcmd.c:2240 gtkedit/editcmd.c:2242 +#: gtkedit/editcmd.c:1280 gtkedit/editcmd.c:1584 gtkedit/editcmd.c:1671 +#: gtkedit/editcmd.c:2210 gtkedit/editcmd.c:2241 gtkedit/editcmd.c:2243 msgid " Replace " msgstr "" #. Heads the 'Search' dialog box -#: 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 +#: gtkedit/editcmd.c:1348 gtkedit/editcmd.c:1578 gtkedit/editcmd.c:2309 +#: gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 src/view.c:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 msgid " Search " msgstr "" #. An input line comes after the ':' -#: gtkedit/editcmd.c:1401 +#: gtkedit/editcmd.c:1402 msgid " Enter search text : " msgstr "" -#: gtkedit/editcmd.c:1408 +#: gtkedit/editcmd.c:1409 msgid " Enter replace text : " msgstr "" -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1412 gtkedit/editcmd.c:1413 #, c-format msgid "" "You can enter regexp substrings with %s\n" "(not \\1, \\2 like sed) then use \"Enter...order\"" msgstr "" -#: gtkedit/editcmd.c:1414 +#: gtkedit/editcmd.c:1415 msgid " Enter argument (or substring) order : " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1418 gtkedit/editcmd.c:1419 +#: gtkedit/editcmd.c:1419 gtkedit/editcmd.c:1420 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:1424 +#: gtkedit/editcmd.c:1425 msgid " Whole words only " msgstr "" -#: gtkedit/editcmd.c:1426 +#: gtkedit/editcmd.c:1427 msgid " Case sensitive " msgstr "" -#: gtkedit/editcmd.c:1429 +#: gtkedit/editcmd.c:1430 msgid " Regular expression " msgstr "" -#: gtkedit/editcmd.c:1430 gtkedit/editcmd.c:1431 +#: gtkedit/editcmd.c:1431 gtkedit/editcmd.c:1432 msgid "" "See the regex man page for how\n" "to compose a regular expression" msgstr "" -#: gtkedit/editcmd.c:1439 +#: gtkedit/editcmd.c:1440 msgid " Backwards " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1441 gtkedit/editcmd.c:1442 +#: gtkedit/editcmd.c:1442 gtkedit/editcmd.c:1443 msgid "Warning: Searching backward can be slow" msgstr "" -#: gtkedit/editcmd.c:1463 +#: gtkedit/editcmd.c:1464 msgid " Prompt on replace " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1465 +#: gtkedit/editcmd.c:1466 msgid "Ask before making each replacement" msgstr "" -#: gtkedit/editcmd.c:1467 +#: gtkedit/editcmd.c:1468 msgid " Replace all " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1469 +#: gtkedit/editcmd.c:1470 msgid "Replace repeatedly" msgstr "" -#: gtkedit/editcmd.c:1473 +#: gtkedit/editcmd.c:1474 msgid " Bookmarks " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1475 gtkedit/editcmd.c:1476 +#: gtkedit/editcmd.c:1476 gtkedit/editcmd.c:1477 msgid "Create bookmarks at all lines found" msgstr "" -#: gtkedit/editcmd.c:1479 +#: gtkedit/editcmd.c:1480 msgid " Scanf expression " msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1481 +#: gtkedit/editcmd.c:1482 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" msgstr "" #. Tool hint -#: gtkedit/editcmd.c:1506 +#: gtkedit/editcmd.c:1507 msgid "Begin search, Enter" msgstr "" -#: gtkedit/editcmd.c:1507 +#: gtkedit/editcmd.c:1508 msgid "Abort this dialog, Esc" msgstr "" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace" msgstr "" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Skip" msgstr "" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace all" msgstr "" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace one" msgstr "" -#: gtkedit/editcmd.c:2030 +#: gtkedit/editcmd.c:2031 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2211 +#: gtkedit/editcmd.c:2212 msgid " Error in replacement format string. " msgstr "" -#: gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2240 #, c-format msgid " %ld replacements made. " msgstr "" -#: gtkedit/editcmd.c:2242 gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 +#: gtkedit/editcmd.c:2243 gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 msgid " Search string not found. " msgstr "" #. in response to number of bookmarks added because of string being found %d times -#: gtkedit/editcmd.c:2307 +#: gtkedit/editcmd.c:2308 #, c-format msgid " %d finds made, %d bookmarks added " msgstr "" #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2363 gtkedit/editcmd.c:2378 gtkedit/editcmd.c:2381 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2379 gtkedit/editcmd.c:2382 msgid " Quit " msgstr "" -#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2365 gtkedit/editcmd.c:2383 msgid "" " Current text was modified without a file save. \n" " Save with exit? " msgstr "" -#: gtkedit/editcmd.c:2378 +#: gtkedit/editcmd.c:2379 msgid " File was modified, Save with exit? " msgstr "" -#: gtkedit/editcmd.c:2378 +#: gtkedit/editcmd.c:2379 msgid "Cancel quit" msgstr "" -#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: gtkedit/editcmd.c:2379 src/cmd.c:246 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 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:406 msgid "&Yes" msgstr "" -#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: gtkedit/editcmd.c:2379 src/cmd.c:246 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 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:406 msgid "&No" msgstr "" -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &Cancel quit " msgstr "" -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &Yes " msgstr "" -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &No " msgstr "" -#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2690 msgid " Copy to clipboard " msgstr "" -#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2689 -#: gtkedit/editcmd.c:2702 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2690 +#: gtkedit/editcmd.c:2703 msgid " Unable to save to file. " msgstr "" -#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 +#: gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2703 msgid " Cut to clipboard " msgstr "" -#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 -#: gtkedit/editcmd.c:2736 src/view.c:1918 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 src/view.c:1915 msgid " Goto line " msgstr "" -#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 -#: gtkedit/editcmd.c:2736 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 msgid " Enter line: " msgstr "" -#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 +#: gtkedit/editcmd.c:2758 gtkedit/editcmd.c:2771 msgid " Save Block " msgstr "" -#: gtkedit/editcmd.c:2784 +#: gtkedit/editcmd.c:2785 msgid " Insert File " msgstr "" -#: gtkedit/editcmd.c:2797 +#: gtkedit/editcmd.c:2798 msgid " Insert file " msgstr "" -#: gtkedit/editcmd.c:2797 +#: gtkedit/editcmd.c:2798 msgid " Error trying to insert file. " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2819 +#: gtkedit/editcmd.c:2820 msgid " Sort block " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2819 gtkedit/editcmd.c:2873 +#: gtkedit/editcmd.c:2820 gtkedit/editcmd.c:2908 msgid " You must first highlight a block of text. " msgstr "" -#: gtkedit/editcmd.c:2826 +#: gtkedit/editcmd.c:2827 msgid " Run Sort " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2828 +#: gtkedit/editcmd.c:2829 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr "" -#: gtkedit/editcmd.c:2839 gtkedit/editcmd.c:2845 +#: gtkedit/editcmd.c:2840 gtkedit/editcmd.c:2846 msgid " Sort " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2841 +#: gtkedit/editcmd.c:2842 msgid " Error trying to execute sort command " msgstr "" #. Not essential to translate -#: gtkedit/editcmd.c:2847 +#: gtkedit/editcmd.c:2848 msgid " Sort returned non-zero: " msgstr "" -#. Not essential to translate -#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 -msgid " Process block " +#: gtkedit/editcmd.c:2881 +msgid "Error create script:" msgstr "" -#. Not essential to translate -#: gtkedit/editcmd.c:2903 -msgid " Error trying to stat file " +#: gtkedit/editcmd.c:2887 +msgid "Error read script:" +msgstr "" + +#: gtkedit/editcmd.c:2894 +msgid "Error close script:" +msgstr "" + +#: gtkedit/editcmd.c:2899 +msgid "Script created:" +msgstr "" + +#: gtkedit/editcmd.c:2906 +msgid "Process block" msgstr "" -#: gtkedit/editcmd.c:2974 +#: gtkedit/editcmd.c:3018 msgid " Mail " msgstr "" -#: gtkedit/editcmd.c:2987 +#: gtkedit/editcmd.c:3031 msgid " Copies to" msgstr "" -#: gtkedit/editcmd.c:2991 +#: gtkedit/editcmd.c:3035 msgid " Subject" msgstr "" -#: gtkedit/editcmd.c:2995 +#: gtkedit/editcmd.c:3039 msgid " To" msgstr "" -#: gtkedit/editcmd.c:2997 +#: gtkedit/editcmd.c:3041 msgid " mail -s -c " msgstr "" -#: gtkedit/editmenu.c:61 +#: gtkedit/editmenu.c:62 msgid " Word wrap " msgstr "" #. Not essential to translate -#: gtkedit/editmenu.c:63 +#: gtkedit/editmenu.c:64 msgid " Enter line length, 0 for off: " msgstr "" -#: gtkedit/editmenu.c:74 +#: gtkedit/editmenu.c:75 msgid " About " msgstr "" -#: gtkedit/editmenu.c:75 +#: gtkedit/editmenu.c:76 msgid "" "\n" " Cooledit v3.11.5\n" @@ -2245,349 +2276,353 @@ " for the Midnight Commander.\n" msgstr "" -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:147 msgid "&Open/load... C-o" msgstr "" -#: gtkedit/editmenu.c:125 +#: gtkedit/editmenu.c:129 msgid "&New C-n" msgstr "" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:131 gtkedit/editmenu.c:150 msgid "&Save F2" msgstr "" -#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 +#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:151 msgid "save &As... F12" msgstr "" -#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:153 msgid "&Insert file... F15" msgstr "" -#: gtkedit/editmenu.c:131 +#: gtkedit/editmenu.c:135 msgid "copy to &File... C-f" msgstr "" -#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 +#: gtkedit/editmenu.c:137 gtkedit/editmenu.c:156 +msgid "&User menu... F11" +msgstr "" + +#: gtkedit/editmenu.c:140 gtkedit/editmenu.c:159 msgid "a&Bout... " msgstr "" -#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 +#: gtkedit/editmenu.c:142 gtkedit/editmenu.c:161 msgid "&Quit F10" msgstr "" -#: gtkedit/editmenu.c:141 +#: gtkedit/editmenu.c:148 msgid "&New C-x k" msgstr "" -#: gtkedit/editmenu.c:147 +#: gtkedit/editmenu.c:154 msgid "copy to &File... " msgstr "" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Toggle Mark F3" msgstr "" -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Mark Columns S-F3" msgstr "" -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 +#: gtkedit/editmenu.c:169 gtkedit/editmenu.c:186 msgid "toggle &Ins/overw Ins" msgstr "" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:171 gtkedit/editmenu.c:188 msgid "&Copy F5" msgstr "" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:172 gtkedit/editmenu.c:189 msgid "&Move F6" msgstr "" -#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 +#: gtkedit/editmenu.c:173 gtkedit/editmenu.c:190 msgid "&Delete F8" msgstr "" -#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 +#: gtkedit/editmenu.c:175 gtkedit/editmenu.c:192 msgid "&Undo C-u" msgstr "" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:177 gtkedit/editmenu.c:194 msgid "&Beginning C-PgUp" msgstr "" -#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 +#: gtkedit/editmenu.c:178 gtkedit/editmenu.c:195 msgid "&End C-PgDn" msgstr "" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:207 msgid "&Search... F7" msgstr "" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:208 msgid "search &Again F17" msgstr "" -#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:209 msgid "&Replace... F4" msgstr "" -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "&Goto line... M-l" msgstr "" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:238 msgid "goto matching &Bracket M-b" msgstr "" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 +#: gtkedit/editmenu.c:217 gtkedit/editmenu.c:240 msgid "insert &Literal... C-q" msgstr "" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:242 msgid "&Refresh screen C-l" msgstr "" -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "&Start record macro C-r" msgstr "" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:235 +#: gtkedit/editmenu.c:222 gtkedit/editmenu.c:245 msgid "&Finish record macro... C-r" msgstr "" -#: gtkedit/editmenu.c:213 +#: gtkedit/editmenu.c:223 msgid "&Execute macro... C-a, KEY" msgstr "" -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 +#: gtkedit/editmenu.c:224 gtkedit/editmenu.c:247 msgid "delete macr&O... " msgstr "" -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:226 gtkedit/editmenu.c:249 msgid "insert &Date/time " msgstr "" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:228 gtkedit/editmenu.c:251 msgid "format p&Aragraph M-p" msgstr "" -#: gtkedit/editmenu.c:219 +#: gtkedit/editmenu.c:229 msgid "'ispell' s&Pell check C-p" msgstr "" -#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 +#: gtkedit/editmenu.c:230 gtkedit/editmenu.c:253 msgid "sor&T... M-t" msgstr "" -#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 -msgid "'indent' &C Formatter F19" +#: gtkedit/editmenu.c:231 gtkedit/editmenu.c:254 +msgid "E&xternal Formatter F19" msgstr "" -#: gtkedit/editmenu.c:222 +#: gtkedit/editmenu.c:232 msgid "&Mail... " msgstr "" -#: gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:246 msgid "&Execute macro... C-x e, KEY" msgstr "" -#: gtkedit/editmenu.c:242 +#: gtkedit/editmenu.c:252 msgid "'ispell' s&Pell check M-$" msgstr "" -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 +#: gtkedit/editmenu.c:261 gtkedit/editmenu.c:270 msgid "&General... " msgstr "" -#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 +#: gtkedit/editmenu.c:262 gtkedit/editmenu.c:271 msgid "&Save mode..." msgstr "" -#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 +#: gtkedit/editmenu.c:264 gtkedit/editmenu.c:273 src/main.c:1357 msgid "&Layout..." msgstr "" #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 +#: gtkedit/editmenu.c:283 gtkedit/editmenu.c:292 gtkedit/editmenu.c:409 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr "" -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 gtkedit/editmenu.c:415 +#: gtkedit/editmenu.c:284 gtkedit/editmenu.c:293 gtkedit/editmenu.c:425 msgid " Edit " msgstr "" -#: gtkedit/editmenu.c:275 gtkedit/editmenu.c:284 +#: gtkedit/editmenu.c:285 gtkedit/editmenu.c:294 msgid " Sear/Repl " msgstr "" -#: gtkedit/editmenu.c:276 gtkedit/editmenu.c:285 gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:286 gtkedit/editmenu.c:295 gtkedit/editmenu.c:465 msgid " Command " msgstr "" -#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 +#: gtkedit/editmenu.c:287 gtkedit/editmenu.c:296 msgid " Options " msgstr "" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:410 msgid "Open...\tC-o" msgstr "" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:411 msgid "New\tC-n" msgstr "" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:413 msgid "Save\tF2" msgstr "" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:414 msgid "Save as...\tF12" msgstr "" -#: gtkedit/editmenu.c:406 +#: gtkedit/editmenu.c:416 msgid "Insert file...\tF15" msgstr "" -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:417 msgid "Copy to file...\tC-f" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:410 +#: gtkedit/editmenu.c:420 msgid "Disk operations and file indexing/searching" msgstr "" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:426 msgid "Toggle mark\tF3" msgstr "" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:427 msgid "Toggle mark columns\tC-b" msgstr "" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:429 msgid "Toggle book mark\tC-M-Ins" msgstr "" -#: gtkedit/editmenu.c:420 +#: gtkedit/editmenu.c:430 msgid "Previous book mark\tC-M-Up" msgstr "" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:431 msgid "Next book mark\tC-M-Down" msgstr "" -#: gtkedit/editmenu.c:422 +#: gtkedit/editmenu.c:432 msgid "Flush book marks" msgstr "" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:434 msgid "Toggle insert/overwrite\tIns" msgstr "" -#: gtkedit/editmenu.c:426 +#: gtkedit/editmenu.c:436 msgid "Copy block to cursor\tF5" msgstr "" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:437 msgid "Move block to cursor\tF6" msgstr "" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:438 msgid "Delete block\tF8/C-Del" msgstr "" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:440 msgid "Copy block to clipbrd\tC-Ins" msgstr "" -#: gtkedit/editmenu.c:431 +#: gtkedit/editmenu.c:441 msgid "Cut block to clipbrd\tS-Del" msgstr "" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:442 msgid "Paste block from clipbrd\tS-Ins" msgstr "" -#: gtkedit/editmenu.c:433 +#: gtkedit/editmenu.c:443 msgid "Selection history\tM-Ins" msgstr "" -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:445 msgid "Undo\tC-BackSpace" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:438 +#: gtkedit/editmenu.c:448 msgid "Manipulating blocks of text" msgstr "" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:453 msgid " Srch/Replce " msgstr "" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:454 msgid "Search...\tF7" msgstr "" -#: gtkedit/editmenu.c:445 +#: gtkedit/editmenu.c:455 msgid "Search again\tF17" msgstr "" -#: gtkedit/editmenu.c:446 +#: gtkedit/editmenu.c:456 msgid "Replace...\tF4" msgstr "" -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:457 msgid "Replace again\tF14" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:450 +#: gtkedit/editmenu.c:460 msgid "Search for and replace text" msgstr "" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:466 msgid "Goto line...\tM-l" msgstr "" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:467 msgid "Goto matching bracket\tM-b" msgstr "" -#: gtkedit/editmenu.c:459 +#: gtkedit/editmenu.c:469 msgid "Start record macro\tC-r" msgstr "" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:470 msgid "Finish record macro...\tC-r" msgstr "" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:471 msgid "Execute macro...\tC-a, KEY" msgstr "" -#: gtkedit/editmenu.c:462 +#: gtkedit/editmenu.c:472 msgid "Delete macro...\t" msgstr "" -#: gtkedit/editmenu.c:464 +#: gtkedit/editmenu.c:474 msgid "Insert date/time\tC-d" msgstr "" -#: gtkedit/editmenu.c:465 +#: gtkedit/editmenu.c:475 msgid "Format paragraph\tM-p" msgstr "" -#: gtkedit/editmenu.c:467 +#: gtkedit/editmenu.c:477 msgid "Refresh display\tC-l" msgstr "" #. Tool hint -#: gtkedit/editmenu.c:470 +#: gtkedit/editmenu.c:480 msgid "Macros and internal commands" msgstr "" @@ -2670,8 +2705,8 @@ msgstr "" #: 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 +#: src/main.c:1723 src/screen.c:2396 src/screen.c:2426 src/tree.c:1008 +#: src/view.c:2070 msgid "Help" msgstr "" @@ -2683,13 +2718,13 @@ msgid "Replac" msgstr "" -#: gtkedit/editwidget.c:1145 src/main.c:1723 +#: gtkedit/editwidget.c:1145 src/main.c:1725 msgid "PullDn" msgstr "" #. gtk_edit_menu #: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1724 src/view.c:2075 src/view.c:2097 +#: src/main.c:1726 src/view.c:2072 src/view.c:2094 msgid "Quit" msgstr "" @@ -2754,7 +2789,7 @@ msgid "Delete highlighted text" msgstr "" -#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1724 src/screen.c:2397 src/screen.c:2427 msgid "Menu" msgstr "" @@ -2790,58 +2825,58 @@ msgid "Search/Replace" msgstr "" -#: gtkedit/syntax.c:1069 gtkedit/syntax.c:1078 gtkedit/syntax.c:1087 -#: gtkedit/syntax.c:1096 +#: gtkedit/syntax.c:1072 gtkedit/syntax.c:1081 gtkedit/syntax.c:1090 +#: gtkedit/syntax.c:1099 msgid " Spelling Message " msgstr "" -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1072 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:1078 +#: gtkedit/syntax.c:1081 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:1087 +#: gtkedit/syntax.c:1090 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:1096 +#: gtkedit/syntax.c:1099 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " msgstr "" -#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid " Load Syntax Rules " msgstr "" -#: gtkedit/syntax.c:1369 gtkedit/syntax.c:1371 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 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:1519 gtkedit/syntax.c:1526 +#: gtkedit/syntax.c:1517 gtkedit/syntax.c:1524 msgid " Load syntax file " msgstr "" -#: gtkedit/syntax.c:1519 +#: gtkedit/syntax.c:1517 msgid " File access error " msgstr "" -#: gtkedit/syntax.c:1525 +#: gtkedit/syntax.c:1523 #, c-format msgid " Error in file %s on line %d " msgstr "" @@ -2904,7 +2939,7 @@ 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 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 msgid " Oops... " msgstr "" @@ -3244,246 +3279,255 @@ msgid " I can't run the Chown command on a tarfs " msgstr "" -#: src/cmd.c:198 +#: src/cmd.c:195 #, c-format msgid " Can not fetch a local copy of %s " msgstr "" -#: src/cmd.c:248 +#: src/cmd.c:245 msgid " CD " msgstr "" -#: src/cmd.c:248 +#: src/cmd.c:245 msgid "Files tagged, want to cd?" msgstr "" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 +#: src/cmd.c:251 src/cmd.c:712 src/cmd.c:731 msgid "Could not change directory" msgstr "" -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " View file " msgstr "" -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " Filename:" msgstr "" -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filtered view " msgstr "" -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filter command and arguments:" msgstr "" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid "Create a new Directory" msgstr "" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid " Enter directory name:" msgstr "" -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Filter " msgstr "" -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Set expression for filtering filenames" msgstr "" -#: src/cmd.c:515 +#: src/cmd.c:512 msgid " Select " msgstr "" -#: src/cmd.c:567 +#: src/cmd.c:564 msgid " Unselect " msgstr "" -#: src/cmd.c:640 +#: src/cmd.c:637 msgid "Extension file edit" msgstr "" -#: src/cmd.c:641 +#: src/cmd.c:638 msgid " Which extension file you want to edit? " msgstr "" -#: src/cmd.c:642 +#: src/cmd.c:639 msgid "&User" msgstr "" -#: src/cmd.c:642 src/cmd.c:668 +#: src/cmd.c:639 src/cmd.c:667 msgid "&System Wide" msgstr "" -#: src/cmd.c:665 -msgid "Menu file edit" +#: src/cmd.c:664 +msgid " Menu edit " msgstr "" -#: src/cmd.c:666 -msgid " Which menu file will you edit? " +#: src/cmd.c:665 +msgid " Which menu file will you edit ? " msgstr "" -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Local" msgstr "" -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Home" msgstr "" -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Compare directories " msgstr "" -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Select compare method: " msgstr "" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Quick" msgstr "" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Size only" msgstr "" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Thorough" msgstr "" -#: src/cmd.c:869 +#: src/cmd.c:868 msgid " Both panels should be on the listing view mode to use this command " msgstr "" -#: src/cmd.c:883 +#: src/cmd.c:882 msgid " The command history is empty " msgstr "" -#: src/cmd.c:889 +#: src/cmd.c:888 msgid " Command history " msgstr "" -#: src/cmd.c:931 +#: src/cmd.c:930 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " msgstr "" -#: src/cmd.c:970 +#: src/cmd.c:969 msgid "Type `exit' to return to the Midnight Commander" msgstr "" -#: src/cmd.c:1025 +#: src/cmd.c:1024 #, c-format msgid "" " Couldn't stat %s \n" " %s " msgstr "" -#: src/cmd.c:1034 src/cmd.c:1036 +#: src/cmd.c:1033 src/cmd.c:1035 msgid " Link " msgstr "" -#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 +#: src/cmd.c:1034 src/cmd.c:1173 src/file.c:1704 msgid " to:" msgstr "" -#: src/cmd.c:1046 +#: src/cmd.c:1045 #, c-format msgid " link: %s " msgstr "" -#: src/cmd.c:1079 +#: src/cmd.c:1078 #, c-format msgid " symlink: %s " msgstr "" -#: src/cmd.c:1133 +#: src/cmd.c:1132 #, c-format msgid " Symlink `%s' points to: " msgstr "" -#: src/cmd.c:1138 +#: src/cmd.c:1137 msgid " Edit symlink " msgstr "" -#: src/cmd.c:1143 +#: src/cmd.c:1142 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr "" -#: src/cmd.c:1147 +#: src/cmd.c:1146 #, c-format msgid " edit symlink: %s " msgstr "" -#: src/cmd.c:1174 +#: src/cmd.c:1173 msgid " Link symbolically " msgstr "" -#: src/cmd.c:1175 +#: src/cmd.c:1174 msgid " Relative symlink " msgstr "" -#: src/cmd.c:1186 +#: src/cmd.c:1185 #, c-format msgid " relative symlink: %s " msgstr "" -#: src/cmd.c:1336 +#: src/cmd.c:1260 +msgid "Using default locale" +msgstr "" + +#: src/cmd.c:1262 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "" + +#: src/cmd.c:1348 msgid " Enter machine name (F1 for details): " msgstr "" -#: src/cmd.c:1363 +#: src/cmd.c:1375 #, c-format msgid " Could not chdir to %s " msgstr "" -#: src/cmd.c:1370 +#: src/cmd.c:1382 src/widget.c:1163 msgid " Link to a remote machine " msgstr "" -#: src/cmd.c:1376 +#: src/cmd.c:1388 src/widget.c:1164 msgid " FTP to machine " msgstr "" -#: src/cmd.c:1382 +#: src/cmd.c:1394 src/widget.c:1165 msgid " SMB link to machine " msgstr "" -#: src/cmd.c:1392 +#: src/cmd.c:1404 msgid " Socket source routing setup " msgstr "" -#: src/cmd.c:1393 +#: src/cmd.c:1405 msgid " Enter host name to use as a source routing hop: " msgstr "" -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Host name " msgstr "" -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1411 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr "" -#: src/cmd.c:1412 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1462 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr "" -#: src/cmd.c:1467 +#: src/cmd.c:1480 msgid " Setup " msgstr "" @@ -3574,21 +3618,21 @@ msgid "Unknown" msgstr "" -#: src/ext.c:143 src/user.c:499 +#: src/ext.c:143 src/user.c:542 #, c-format msgid "" " Can't generate unique filename \n" " %s " msgstr "" -#: src/ext.c:150 src/user.c:511 +#: src/ext.c:150 src/user.c:554 #, c-format msgid "" " Can't create temporary command file \n" " %s " msgstr "" -#: src/ext.c:165 src/user.c:533 +#: src/ext.c:165 src/user.c:576 msgid " Parameter " msgstr "" @@ -4039,7 +4083,7 @@ msgid "%o %d %f%e" msgstr "" -#: src/file.c:1703 vfs/fish.c:496 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "" @@ -4067,11 +4111,11 @@ msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "" @@ -4319,7 +4363,7 @@ msgid "Finished" msgstr "" -#: src/find.c:561 src/view.c:1531 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "" @@ -4394,7 +4438,7 @@ msgid " Help " msgstr "" -#: src/help.c:766 src/user.c:637 +#: src/help.c:766 src/user.c:687 #, c-format msgid "" " Can't open file %s \n" @@ -4849,7 +4893,7 @@ msgid " The shell is already running a command " msgstr "" -#: src/main.c:861 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr "" @@ -5033,71 +5077,75 @@ msgid "&Listing format edit" msgstr "" -#: src/main.c:1348 +#: src/main.c:1349 msgid "&Extension file edit" msgstr "" -#: src/main.c:1349 +#: src/main.c:1350 msgid "&Menu file edit" msgstr "" -#: src/main.c:1354 -msgid "&Configuration..." +#: src/main.c:1351 +msgid "Menu edi&Tor edit" msgstr "" #: src/main.c:1356 +msgid "&Configuration..." +msgstr "" + +#: src/main.c:1358 msgid "c&Onfirmation..." msgstr "" -#: src/main.c:1357 +#: src/main.c:1359 msgid "&Display bits..." msgstr "" -#: src/main.c:1359 +#: src/main.c:1361 msgid "learn &Keys..." msgstr "" -#: src/main.c:1362 +#: src/main.c:1364 msgid "&Virtual FS..." msgstr "" -#: src/main.c:1365 +#: src/main.c:1367 msgid "&Save setup" msgstr "" -#: src/main.c:1381 src/main.c:1383 +#: src/main.c:1383 src/main.c:1385 msgid " &Left " msgstr "" -#: src/main.c:1383 +#: src/main.c:1385 msgid " &Above " msgstr "" -#: src/main.c:1386 +#: src/main.c:1388 msgid " &File " msgstr "" -#: src/main.c:1387 +#: src/main.c:1389 msgid " &Command " msgstr "" -#: src/main.c:1388 +#: src/main.c:1390 msgid " &Options " msgstr "" -#: src/main.c:1390 src/main.c:1392 +#: src/main.c:1392 src/main.c:1394 msgid " &Right " msgstr "" -#: src/main.c:1392 +#: src/main.c:1394 msgid " &Below " msgstr "" -#: src/main.c:1447 +#: src/main.c:1449 msgid " Information " msgstr "" -#: src/main.c:1448 +#: src/main.c:1450 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5105,24 +5153,23 @@ " the details. " msgstr "" -#: src/main.c:1927 +#: src/main.c:1929 msgid "Thank you for using GNU Midnight Commander" msgstr "" -#: src/main.c:2284 -#, c-format -msgid "with mouse support on xterm%s.\n" +#: src/main.c:2287 +msgid "with mouse support on xterm and the Linux console.\n" msgstr "" -#: src/main.c:2285 -msgid " and the Linux console" +#: src/main.c:2288 +msgid "with mouse support on xterm.\n" msgstr "" -#: src/main.c:2381 +#: src/main.c:2389 msgid "The TERM environment variable is unset!\n" msgstr "" -#: src/main.c:2487 +#: src/main.c:2495 msgid "" "Usage is:\n" "\n" @@ -5130,30 +5177,30 @@ "\n" msgstr "" -#: src/main.c:2490 +#: src/main.c:2498 msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" msgstr "" -#: src/main.c:2492 +#: src/main.c:2500 msgid "-b, --nocolor Force black and white display.\n" msgstr "" -#: src/main.c:2494 +#: src/main.c:2502 msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" msgstr "" -#: src/main.c:2496 +#: src/main.c:2504 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 +#: src/main.c:2508 msgid "-e, --edit Startup the internal editor.\n" msgstr "" -#: src/main.c:2502 +#: src/main.c:2510 msgid "" "-f, --libdir Print configured paths.\n" "-h, --help Shows this help message.\n" @@ -5162,55 +5209,56 @@ " default.\n" msgstr "" -#: src/main.c:2507 +#: src/main.c:2515 msgid "-l, --ftplog file Log ftpfs commands to the file.\n" msgstr "" -#: src/main.c:2510 +#: src/main.c:2518 msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" msgstr "" -#: src/main.c:2512 +#: src/main.c:2520 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 +#: src/main.c:2523 msgid "-t, --termcap Activate support for the TERMCAP variable.\n" msgstr "" -#: src/main.c:2518 +#: src/main.c:2526 msgid "" "-S, --createcmdile Create command file to set default directory upon exit.\n" msgstr "" -#: src/main.c:2521 +#: src/main.c:2529 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 +#: src/main.c:2533 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" +"+number number it is the start line number of file for `mcedit'.\n" msgstr "" -#: src/main.c:2529 +#: src/main.c:2538 msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" msgstr "" -#: src/main.c:2531 +#: src/main.c:2540 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 +#: src/main.c:2556 msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -5231,131 +5279,131 @@ "\n" msgstr "" -#: src/main.c:2596 +#: src/main.c:2605 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "" -#: src/main.c:2610 +#: src/main.c:2619 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" -#: src/main.c:2687 +#: src/main.c:2696 msgid "Use to debug the background code" msgstr "" -#: src/main.c:2693 +#: src/main.c:2702 msgid "Request to run in color mode" msgstr "" -#: src/main.c:2695 +#: src/main.c:2704 msgid "Specifies a color configuration" msgstr "" -#: src/main.c:2700 +#: src/main.c:2709 msgid "Edits one file" msgstr "" -#: src/main.c:2704 +#: src/main.c:2713 msgid "Displays this help message" msgstr "" -#: src/main.c:2707 +#: src/main.c:2716 msgid "Displays a help screen on how to change the color scheme" msgstr "" -#: src/main.c:2710 +#: src/main.c:2719 msgid "Log ftp dialog to specified file" msgstr "" -#: src/main.c:2717 +#: src/main.c:2726 msgid "Obsolete" msgstr "" -#: src/main.c:2719 +#: src/main.c:2728 msgid "Requests to run in black and white" msgstr "" -#: src/main.c:2721 +#: src/main.c:2730 msgid "Disable mouse support in text version" msgstr "" -#: src/main.c:2724 +#: src/main.c:2733 msgid "Disables subshell support" msgstr "" -#: src/main.c:2728 +#: src/main.c:2737 msgid "Prints working directory at program exit" msgstr "" -#: src/main.c:2730 +#: src/main.c:2739 msgid "Resets soft keys on HP terminals" msgstr "" -#: src/main.c:2732 +#: src/main.c:2741 msgid "To run on slow terminals" msgstr "" -#: src/main.c:2735 +#: src/main.c:2744 msgid "Use stickchars to draw" msgstr "" -#: src/main.c:2739 +#: src/main.c:2748 msgid "Enables subshell support (default)" msgstr "" -#: src/main.c:2744 +#: src/main.c:2753 msgid "Tries to use termcap instead of terminfo" msgstr "" -#: src/main.c:2748 +#: src/main.c:2757 msgid "Displays the current version" msgstr "" -#: src/main.c:2750 +#: src/main.c:2759 msgid "Launches the file viewer on a file" msgstr "" -#: src/main.c:2752 +#: src/main.c:2761 msgid "Forces xterm features" msgstr "" -#: src/main.c:2754 +#: src/main.c:2763 msgid "Geometry for the window" msgstr "" -#: src/main.c:2754 +#: src/main.c:2763 msgid "GEOMETRY" msgstr "" -#: src/main.c:2755 +#: src/main.c:2764 msgid "No windows opened at startup" msgstr "" -#: src/main.c:2756 +#: src/main.c:2765 msgid "No desktop icons" msgstr "" -#: src/main.c:2757 +#: src/main.c:2766 msgid "Look more like traditional gmc" msgstr "" -#: src/main.c:2759 +#: src/main.c:2768 msgid "Display the directory that holds the .links startup files and exit" msgstr "" -#: src/main.c:3071 +#: src/main.c:3081 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:3149 +#: src/main.c:3159 msgid " Notice " msgstr "" -#: src/main.c:3150 +#: src/main.c:3160 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5523,6 +5571,14 @@ msgid "Display brief usage message" msgstr "" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "" + #: src/screen.c:417 msgid "MTime" msgstr "" @@ -5568,26 +5624,26 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "" -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr "" -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr "" -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1016 msgid "RenMov" msgstr "" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2402 src/screen.c:2432 src/tree.c:1020 msgid "Mkdir" msgstr "" -#: src/screen.c:2417 +#: src/screen.c:2418 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" @@ -5654,13 +5710,6 @@ msgid "Dynamc" msgstr "" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" - #: src/tree.c:1012 msgid "Forget" msgstr "" @@ -5676,50 +5725,50 @@ "%s\n" msgstr "" -#: src/user.c:250 +#: src/user.c:271 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr "" -#: src/user.c:383 +#: src/user.c:424 msgid " Debug " msgstr "" -#: src/user.c:392 +#: src/user.c:433 msgid " ERROR: " msgstr "" -#: src/user.c:396 +#: src/user.c:437 msgid " True: " msgstr "" -#: src/user.c:398 +#: src/user.c:439 msgid " False: " msgstr "" -#: src/user.c:602 +#: src/user.c:645 msgid " Warning -- ignoring file " msgstr "" -#: src/user.c:603 +#: src/user.c:646 #, 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 +#: src/user.c:670 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 +#: src/user.c:770 #, c-format msgid " Empty file %s " msgstr "" #. Create listbox -#: src/user.c:730 +#: src/user.c:779 msgid " User menu " msgstr "" @@ -5737,178 +5786,178 @@ msgid "%b %e %Y" msgstr "" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr "" -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr "" -#: src/view.c:406 +#: src/view.c:403 msgid "" "File: \n" "\n" " " msgstr "" -#: src/view.c:407 +#: src/view.c:404 msgid "" "\n" "\n" "has been modified, do you want to save the changes?\n" msgstr "" -#: src/view.c:409 +#: src/view.c:406 msgid " Save changes " msgstr "" -#: src/view.c:451 +#: src/view.c:448 msgid " Can't spawn child program " msgstr "" -#: src/view.c:460 +#: src/view.c:457 msgid " Empty output from child filter " msgstr "" -#: src/view.c:465 +#: src/view.c:462 msgid " Could not open file " msgstr "" -#: src/view.c:480 +#: src/view.c:477 msgid " Can't open file \"" msgstr "" -#: src/view.c:487 +#: src/view.c:484 msgid "" " Can't stat file \n" " " msgstr "" -#: src/view.c:493 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr "" -#: src/view.c:574 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" " %s " msgstr "" -#: src/view.c:583 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" " %s " msgstr "" -#: src/view.c:719 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "" -#: src/view.c:733 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "" -#: src/view.c:744 +#: src/view.c:741 msgid " [grow]" msgstr "" -#: src/view.c:1523 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "" -#: src/view.c:1630 src/view.c:1753 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr "" -#: src/view.c:1792 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr "" -#: src/view.c:1916 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" " Enter the new line number:" msgstr "" -#: src/view.c:1938 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" " Enter the new address:" msgstr "" -#: src/view.c:1940 +#: src/view.c:1937 msgid " Goto Address " msgstr "" -#: src/view.c:1971 +#: src/view.c:1968 msgid " Enter regexp:" msgstr "" -#: src/view.c:2076 +#: src/view.c:2073 msgid "Ascii" msgstr "" -#: src/view.c:2076 +#: src/view.c:2073 msgid "Hex" msgstr "" -#: src/view.c:2077 +#: src/view.c:2074 msgid "Goto" msgstr "" -#: src/view.c:2077 +#: src/view.c:2074 msgid "Line" msgstr "" -#: src/view.c:2080 +#: src/view.c:2077 msgid "RxSrch" msgstr "" -#: src/view.c:2083 +#: src/view.c:2080 msgid "EdText" msgstr "" -#: src/view.c:2083 +#: src/view.c:2080 msgid "EdHex" msgstr "" -#: src/view.c:2085 +#: src/view.c:2082 msgid "UnWrap" msgstr "" -#: src/view.c:2085 +#: src/view.c:2082 msgid "Wrap" msgstr "" -#: src/view.c:2088 +#: src/view.c:2085 msgid "HxSrch" msgstr "" -#: src/view.c:2091 +#: src/view.c:2088 msgid "Raw" msgstr "" -#: src/view.c:2091 +#: src/view.c:2088 msgid "Parse" msgstr "" -#: src/view.c:2095 +#: src/view.c:2092 msgid "Unform" msgstr "" -#: src/view.c:2095 +#: src/view.c:2092 msgid "Format" msgstr "" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr "" @@ -6154,29 +6203,29 @@ "%s" msgstr "" -#: vfs/direntry.c:312 +#: vfs/direntry.c:300 #, c-format msgid "Dir cache expired for %s" msgstr "" -#: vfs/direntry.c:444 vfs/direntry.c:447 +#: vfs/direntry.c:430 vfs/direntry.c:433 msgid " Direntry warning " msgstr "" -#: vfs/direntry.c:444 +#: vfs/direntry.c:430 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "" -#: vfs/direntry.c:447 +#: vfs/direntry.c:433 msgid "Super has want_stale set" msgstr "" -#: vfs/direntry.c:821 +#: vfs/direntry.c:811 msgid "Starting linear transfer..." msgstr "" -#: vfs/direntry.c:964 +#: vfs/direntry.c:956 msgid "Getting file" msgstr "" @@ -6229,181 +6278,181 @@ msgid "fish: Connected, home %s." msgstr "" -#: vfs/fish.c:334 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: vfs/fish.c:438 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:458 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: vfs/fish.c:483 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "" -#: vfs/fish.c:495 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "" -#: vfs/fish.c:496 +#: vfs/fish.c:509 msgid "zeros" msgstr "" -#: vfs/fish.c:542 +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "" -#: vfs/fish.c:551 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "" -#: vfs/fish.c:553 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "" -#: vfs/ftpfs.c:317 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "" -#: vfs/ftpfs.c:375 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr "" -#: vfs/ftpfs.c:408 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr "" -#: vfs/ftpfs.c:434 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "" -#: vfs/ftpfs.c:438 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "" -#: vfs/ftpfs.c:442 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "" -#: vfs/ftpfs.c:446 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "" -#: vfs/ftpfs.c:463 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "" -#: vfs/ftpfs.c:468 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "" -#: vfs/ftpfs.c:473 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "" -#: vfs/ftpfs.c:488 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "" -#: vfs/ftpfs.c:520 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr "" -#: vfs/ftpfs.c:648 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "" -#: vfs/ftpfs.c:668 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "" -#: vfs/ftpfs.c:691 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "" -#: vfs/ftpfs.c:701 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "" -#: vfs/ftpfs.c:703 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "" -#: vfs/ftpfs.c:745 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "" -#: vfs/ftpfs.c:918 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "" -#: vfs/ftpfs.c:993 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "" -#: vfs/ftpfs.c:995 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "" -#: vfs/ftpfs.c:1000 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "" -#: vfs/ftpfs.c:1089 vfs/ftpfs.c:1186 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "" -#: vfs/ftpfs.c:1099 vfs/ftpfs.c:1106 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "" -#: vfs/ftpfs.c:1157 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "" -#: vfs/ftpfs.c:1175 +#: vfs/ftpfs.c:1188 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "" -#: vfs/ftpfs.c:1176 +#: vfs/ftpfs.c:1189 msgid "(strict rfc959)" msgstr "" -#: vfs/ftpfs.c:1177 +#: vfs/ftpfs.c:1190 msgid "(chdir first)" msgstr "" -#: vfs/ftpfs.c:1271 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "" -#: vfs/ftpfs.c:1281 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "" -#: vfs/ftpfs.c:1758 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6468,50 +6517,50 @@ msgid "Midnight Commander's private remote filesystem" msgstr "" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "" -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" " " msgstr "" -#: vfs/smbfs.c:1242 +#: vfs/smbfs.c:1243 msgid " Authentication failed " msgstr "" -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr "" -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr "" -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr "" -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr "" @@ -6539,133 +6588,133 @@ "doesn't look like a tar archive." msgstr "" -#: vfs/vfs.c:1149 +#: vfs/vfs.c:1151 msgid "Changes to file lost" msgstr "" -#: vfs/vfs.c:1792 +#: vfs/vfs.c:1794 msgid "Could not parse:" msgstr "" -#: vfs/vfs.c:1794 +#: vfs/vfs.c:1796 msgid "More parsing errors will be ignored." msgstr "" -#: vfs/vfs.c:1794 +#: vfs/vfs.c:1796 msgid "(sorry)" msgstr "" -#: vfs/vfs.c:1805 +#: vfs/vfs.c:1807 msgid "Internal error:" msgstr "" -#: vfs/vfs.c:1815 +#: vfs/vfs.c:1817 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "" -#: vfs/vfs.c:1816 +#: vfs/vfs.c:1818 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "" -#: vfs/undelfs.c:80 +#: vfs/undelfs.c:81 msgid " undelfs: error " msgstr "" -#: vfs/undelfs.c:183 +#: vfs/undelfs.c:184 msgid " not enough memory " msgstr "" -#: vfs/undelfs.c:188 +#: vfs/undelfs.c:189 msgid " while allocating block buffer " msgstr "" -#: vfs/undelfs.c:192 +#: vfs/undelfs.c:193 #, c-format msgid " open_inode_scan: %d " msgstr "" -#: vfs/undelfs.c:196 +#: vfs/undelfs.c:197 #, c-format msgid " while starting inode scan %d " msgstr "" -#: vfs/undelfs.c:203 +#: vfs/undelfs.c:204 #, c-format msgid "undelfs: loading deleted files information %d inodes" msgstr "" -#: vfs/undelfs.c:218 +#: vfs/undelfs.c:219 #, c-format msgid " while calling ext2_block_iterate %d " msgstr "" -#: vfs/undelfs.c:226 +#: vfs/undelfs.c:227 msgid " no more memory while reallocating array " msgstr "" -#: vfs/undelfs.c:245 +#: vfs/undelfs.c:246 #, c-format msgid " while doing inode scan %d " msgstr "" -#: vfs/undelfs.c:269 +#: vfs/undelfs.c:270 msgid " Ext2lib error " msgstr "" -#: vfs/undelfs.c:296 +#: vfs/undelfs.c:297 #, c-format msgid " Could not open file %s " msgstr "" -#: vfs/undelfs.c:299 +#: vfs/undelfs.c:300 msgid "undelfs: reading inode bitmap..." msgstr "" -#: vfs/undelfs.c:302 +#: vfs/undelfs.c:303 #, c-format msgid "" " Could not load inode bitmap from: \n" " %s \n" msgstr "" -#: vfs/undelfs.c:305 +#: vfs/undelfs.c:306 msgid "undelfs: reading block bitmap..." msgstr "" -#: vfs/undelfs.c:308 +#: vfs/undelfs.c:309 #, c-format msgid "" " Could not load block bitmap from: \n" " %s \n" msgstr "" -#: vfs/undelfs.c:314 +#: vfs/undelfs.c:315 msgid "undelfs: done." msgstr "" -#: vfs/undelfs.c:317 +#: vfs/undelfs.c:318 msgid "undelfs: failure" msgstr "" -#: vfs/undelfs.c:341 +#: vfs/undelfs.c:342 msgid " vfs_info is not fs! " msgstr "" -#: vfs/undelfs.c:397 vfs/undelfs.c:581 +#: vfs/undelfs.c:398 vfs/undelfs.c:582 msgid " You have to chdir to extract files first " msgstr "" -#: vfs/undelfs.c:520 +#: vfs/undelfs.c:521 msgid " while iterating over blocks " msgstr "" -#: vfs/undelfs.c:625 +#: vfs/undelfs.c:626 #, c-format msgid " Could not open file: %s " msgstr "" #. This is place of next pointer -#: vfs/undelfs.c:683 +#: vfs/undelfs.c:684 msgid "Undelete filesystem for ext2" msgstr "" diff -ruN old/mc-4.5.44/po/no.po new/mc-4.5.45/po/no.po --- old/mc-4.5.44/po/no.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/no.po Tue May 9 18:52:09 2000 @@ -1,36 +1,39 @@ # Copyright (C) 1998, 1999 Free Software Foundation, Inc. # Kjartan Maraas , 1998,1999. # +#. Not essential to translate +#: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 +#: gtkedit/editcmd.c:2893 gtkedit/editcmd.c:2898 gtkedit/editcmd.c:2943 msgid "" msgstr "" "Project-Id-Version: mc 4.5.34\n" -"POT-Creation-Date: 2000-02-19 20:21+0100\n" -"PO-Revision-Date: 2000-02-19 20:51+01:00\n" +"POT-Creation-Date: 2000-05-09 11:31+0200\n" +"PO-Revision-Date: 2000-05-09 11:41+02:00\n" "Last-Translator: Kjartan Maraas \n" "Language-Team: Norwegian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:126 msgid " Emacs key: " msgstr " Emacs-tast: " -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 msgid " Execute Macro " msgstr " Kjør makro " #. Input line for a single key press follows the ':' -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 #: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr " Trykk hurtigtast for makro: " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:149 msgid " Insert Literal " msgstr " Sett inn literal " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:149 msgid " Press any key: " msgstr " Trykk en tast: " @@ -84,15 +87,15 @@ "med kommandoen:\n" "\"%s\"%s" -#: gnome/gaction.c:135 gnome/gaction.c:151 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "åpne" -#: gnome/gaction.c:188 gnome/gaction.c:205 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "rediger" -#: gnome/gaction.c:345 +#: gnome/gaction.c:351 msgid "view" msgstr "se på" @@ -100,6 +103,10 @@ msgid " There is no other panel to compare contents to " msgstr " Det er ingen andre paneler å sammenligne innholdet med " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " Kunne ikke starte en terminal " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "Midnight Commander Teamet" @@ -262,7 +269,7 @@ msgid "Enter a regular expression here to select files in the panel view with." msgstr "Skriv inn et vanlig uttrykk for bruk som filter i panelvisningen." -#: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 +#: gnome/gcmd.c:917 src/cmd.c:540 src/cmd.c:591 msgid " Malformed regular expression " msgstr " Malformert vanlig uttrykk " @@ -343,28 +350,28 @@ msgid "Custom View" msgstr "Egendefinert visning" -#: gnome/gdesktop.c:532 gnome/gmount.c:382 +#: gnome/gdesktop.c:622 gnome/gmount.c:382 msgid "Warning" msgstr "Advarsel" -#: gnome/gdesktop.c:533 +#: gnome/gdesktop.c:623 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "Kunne ikke åpne %s; vil ikke ha skrivebordsikoner" -#: gnome/gdesktop.c:1205 +#: gnome/gdesktop.c:1298 msgid "While running the mount/umount command" msgstr "Under kjøring av mount/umount kommandoen" -#: gnome/gdesktop.c:1274 +#: gnome/gdesktop.c:1367 msgid "While running the eject command" msgstr "Under kjøring av eject kommandoen" -#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 +#: gnome/gdesktop.c:1551 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "Feil" -#: gnome/gdesktop.c:2617 +#: gnome/gdesktop.c:2775 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -378,84 +385,84 @@ "\n" "Kan ikke sette bakgrunnen." -#: gnome/gdesktop.c:2640 gnome/glayout.c:362 +#: gnome/gdesktop.c:2798 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2640 gnome/glayout.c:363 +#: gnome/gdesktop.c:2798 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:2642 gnome/glayout.c:365 +#: gnome/gdesktop.c:2800 gnome/glayout.c:365 msgid "_Directory..." msgstr "Katalog..." -#: gnome/gdesktop.c:2642 gnome/glayout.c:366 +#: gnome/gdesktop.c:2800 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Oppretter en ny katalog" -#: gnome/gdesktop.c:2643 +#: gnome/gdesktop.c:2801 msgid "URL L_ink..." msgstr "URL-snarve_i..." -#: gnome/gdesktop.c:2643 +#: gnome/gdesktop.c:2801 msgid "Creates a new URL link" msgstr "Oppretter en ny URL-snarvei" -#: gnome/gdesktop.c:2644 +#: gnome/gdesktop.c:2802 msgid "_Launcher..." msgstr "_Oppstarter..." -#: gnome/gdesktop.c:2644 +#: gnome/gdesktop.c:2802 msgid "Creates a new launcher" msgstr "Oppretter en ny oppstarter" -#: gnome/gdesktop.c:2650 +#: gnome/gdesktop.c:2808 msgid "By _Name" msgstr "Etter _navn" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2809 msgid "By File _Type" msgstr "Etter _filtype" -#: gnome/gdesktop.c:2652 +#: gnome/gdesktop.c:2810 msgid "By _Size" msgstr "Etter _størrelse" -#: gnome/gdesktop.c:2653 +#: gnome/gdesktop.c:2811 msgid "By Time Last _Accessed" msgstr "Etter tid for siste _aksess" -#: gnome/gdesktop.c:2654 +#: gnome/gdesktop.c:2812 msgid "By Time Last _Modified" msgstr "Etter tid for siste _modifikasjon" -#: gnome/gdesktop.c:2655 +#: gnome/gdesktop.c:2813 msgid "By Time Last _Changed" msgstr "Etter tid for siste _endring" -#: gnome/gdesktop.c:2663 gnome/glayout.c:462 +#: gnome/gdesktop.c:2821 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Plasser ikonene" -#: gnome/gdesktop.c:2664 +#: gnome/gdesktop.c:2822 msgid "Create _New Window" msgstr "Opprett _nytt vindu" -#: gnome/gdesktop.c:2666 gnome/glayout.c:464 +#: gnome/gdesktop.c:2824 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Oppdater skrivebor_dskatalogen" -#: gnome/gdesktop.c:2667 gnome/glayout.c:465 +#: gnome/gdesktop.c:2825 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Oppdater en_heter" -#: gnome/gdesktop.c:2668 gnome/glayout.c:466 +#: gnome/gdesktop.c:2826 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Lag standard_ikonene på nytt" -#: gnome/gdesktop.c:2670 +#: gnome/gdesktop.c:2828 msgid "Configure _Background Image" msgstr "Konfigurer _bakgrunnsbilde" @@ -552,7 +559,7 @@ msgstr "Erstatt den?" #: 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 +#: src/file.c:802 src/screen.c:2400 src/screen.c:2430 src/tree.c:1014 msgid "Copy" msgstr "Kopier" @@ -653,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:1837 +#: gnome/gdialogs.c:1007 src/wtools.c:587 vfs/vfs.c:1833 msgid "Password:" msgstr "Passord:" @@ -857,7 +864,7 @@ msgid "Reverses the list of tagged files" msgstr "Reverserer listen med merkede filer" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2088 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2085 msgid "Search" msgstr "Søk" @@ -1086,6 +1093,12 @@ msgid "File Created on: " msgstr "Fil opprettet: " +#: gnome/gnome-file-property-dialog.c:281 +#: gnome/gnome-file-property-dialog.c:290 +#: gnome/gnome-file-property-dialog.c:299 +msgid "%a, %b %d %Y, %I:%M:%S %p" +msgstr "%a, %b %d %Y, %I:%M:%S %p" + #: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "Sist modifisert: " @@ -1113,7 +1126,7 @@ #: 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 +#: src/screen.c:2398 src/screen.c:2428 msgid "View" msgstr "Se på" @@ -1143,7 +1156,7 @@ msgstr "Bruk standard handling for visning" #: gnome/gnome-file-property-dialog.c:523 gnome/gpopup2.c:205 -#: src/screen.c:2398 src/screen.c:2428 src/view.c:2084 +#: src/screen.c:2399 src/screen.c:2429 src/view.c:2081 msgid "Edit" msgstr "Rediger" @@ -1299,8 +1312,8 @@ msgid "Copy..." msgstr "Kopier..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2403 +#: src/screen.c:2433 msgid "Delete" msgstr "Slett" @@ -1548,12 +1561,12 @@ msgstr "Plassering:" #. 1 -#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1234 -#: gtkedit/editcmd.c:1319 gtkedit/editcmd.c:2983 gtkedit/editoptions.c:71 +#: gnome/gtools.c:105 gtkedit/editcmd.c:386 gtkedit/editcmd.c:1235 +#: gtkedit/editcmd.c:1320 gtkedit/editcmd.c:3027 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&Ok" @@ -1562,12 +1575,12 @@ msgid "Offset 0x%08lx" msgstr "Offset 0x%08lx" -#: gnome/gview.c:138 src/view.c:735 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "Kol %d" -#: gnome/gview.c:142 src/view.c:739 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s bytes" @@ -1695,44 +1708,43 @@ msgstr "Lukk vinduer hvis kataloger ikke kan nås" #. The file-name is printed after the ':' -#: 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 +#: gtkedit/edit.c:149 gtkedit/edit.c:318 gtkedit/edit.c:323 gtkedit/edit.c:337 +#: gtkedit/edit.c:341 gtkedit/edit.c:373 gtkedit/edit.c:379 gtkedit/edit.c:386 +#: gtkedit/edit.c:393 gtkedit/edit.c:399 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2031 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/tree.c:682 src/tree.c:688 src/wtools.c:222 msgid " Error " msgstr " Feil " -#: gtkedit/edit.c:145 gtkedit/edit.c:337 gtkedit/edit.c:375 +#: gtkedit/edit.c:149 gtkedit/edit.c:341 gtkedit/edit.c:379 msgid " Failed trying to open file for reading: " msgstr " Feil under åpning av fil for lesing: " -#: gtkedit/edit.c:314 +#: gtkedit/edit.c:318 msgid " Error reading from pipe: " msgstr " Feil under lesing fra rør: " -#: gtkedit/edit.c:319 +#: gtkedit/edit.c:323 msgid " Failed trying to open pipe for reading: " msgstr " Feil under åpning av rør for lesing: " -#: gtkedit/edit.c:333 +#: gtkedit/edit.c:337 msgid " Error reading file: " msgstr " Feil under lesing av fil: " -#: gtkedit/edit.c:382 +#: gtkedit/edit.c:386 msgid " Cannot get size/permissions info on file: " msgstr " Kan ikke finne størrelse-/rettighetsinformasjon for filen: " -#: gtkedit/edit.c:389 +#: gtkedit/edit.c:393 msgid " Not an ordinary file: " msgstr " Ikke en vanlig fil: " -#: gtkedit/edit.c:395 +#: gtkedit/edit.c:399 msgid " File is too large: " msgstr " Filen er for stor: " -#: gtkedit/edit.c:396 +#: gtkedit/edit.c:400 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " @@ -1740,6 +1752,15 @@ " \n" " Gjør edit.h:MAXBUF større og rekompiler editoren. " +#: gtkedit/edit.c:2571 +msgid "User menu avalaible only in mcedit invoked from mc" +msgstr "Brukermenyen er kun tilgjengelig i mcedit startet fra mc" + +#. Not essential to translate +#: gtkedit/edit.c:2769 gtkedit/editcmd.c:2945 +msgid "Error trying to stat file:" +msgstr "Feil under kjøring av stat på fil:" + #: gtkedit/editcmd.c:298 msgid " Error writing to pipe: " msgstr " Feil under skriving til rør: " @@ -1761,15 +1782,15 @@ msgstr "Lag sikkerhetskopi -->" #. NLS for hotkeys? -#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1188 gtkedit/editcmd.c:1232 -#: gtkedit/editcmd.c:1317 gtkedit/editcmd.c:2981 gtkedit/editoptions.c:68 +#: gtkedit/editcmd.c:384 gtkedit/editcmd.c:1189 gtkedit/editcmd.c:1233 +#: gtkedit/editcmd.c:1318 gtkedit/editcmd.c:3025 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/chmod.c:114 src/chown.c:79 src/cmd.c:858 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:409 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 -#: vfs/smbfs.c:116 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "&Avbryt" @@ -1788,10 +1809,10 @@ #. Warning message with a query to continue or cancel the operation #: 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:172 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 vfs/mcfs.c:172 msgid " Warning " msgstr " Advarsel " @@ -1806,7 +1827,7 @@ #: 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 +#: gtkedit/editcmd.c:1671 msgid "Cancel" msgstr "Avbryt" @@ -1814,7 +1835,7 @@ msgid " Save as " msgstr " Lagre som " -#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2771 msgid " Error trying to save file. " msgstr " Feil under lagring av fil. " @@ -1877,7 +1898,7 @@ msgstr " Lagre fil " #: gtkedit/editcmd.c:836 gtkedit/editwidget.c:1137 gtkedit/gtkedit.c:1247 -#: src/view.c:2080 +#: src/view.c:2077 msgid "Save" msgstr "Lagre" @@ -1897,105 +1918,105 @@ msgid " Load " msgstr " Last " -#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 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:1135 +#: gtkedit/editcmd.c:1136 msgid " Continue " msgstr " Fortsett " -#: gtkedit/editcmd.c:1135 +#: gtkedit/editcmd.c:1136 msgid " Cancel " msgstr " Avbryt " -#: gtkedit/editcmd.c:1190 +#: gtkedit/editcmd.c:1191 msgid "o&Ne" msgstr "e&N" -#: gtkedit/editcmd.c:1192 src/filegui.c:597 +#: gtkedit/editcmd.c:1193 src/filegui.c:597 msgid "al&L" msgstr "al&Le" -#: gtkedit/editcmd.c:1194 src/file.c:2190 src/filegui.c:267 +#: gtkedit/editcmd.c:1195 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Hopp over" -#: gtkedit/editcmd.c:1196 +#: gtkedit/editcmd.c:1197 msgid "&Replace" msgstr "E&rstatt" -#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1203 gtkedit/editcmd.c:1671 msgid " Replace with: " msgstr " Erstatt med: " -#: gtkedit/editcmd.c:1206 +#: gtkedit/editcmd.c:1207 msgid " Confirm replace " msgstr " Bekreft erstatt " -#: gtkedit/editcmd.c:1236 gtkedit/editcmd.c:1321 +#: gtkedit/editcmd.c:1237 gtkedit/editcmd.c:1322 msgid "scanf &Expression" msgstr "scanf uttrykk" -#: gtkedit/editcmd.c:1238 +#: gtkedit/editcmd.c:1239 msgid "replace &All" msgstr "erstatt alle" -#: gtkedit/editcmd.c:1240 +#: gtkedit/editcmd.c:1241 msgid "pr&Ompt on replace" msgstr "spør ved erstatning" -#: gtkedit/editcmd.c:1242 gtkedit/editcmd.c:1323 +#: gtkedit/editcmd.c:1243 gtkedit/editcmd.c:1324 msgid "&Backwards" msgstr "Bakover" -#: gtkedit/editcmd.c:1244 gtkedit/editcmd.c:1325 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1326 msgid "&Regular expression" msgstr "Vanlig uttrykk" -#: gtkedit/editcmd.c:1246 gtkedit/editcmd.c:1327 +#: gtkedit/editcmd.c:1247 gtkedit/editcmd.c:1328 msgid "&Whole words only" msgstr "Kun hele ord" -#: gtkedit/editcmd.c:1248 gtkedit/editcmd.c:1329 +#: gtkedit/editcmd.c:1249 gtkedit/editcmd.c:1330 msgid "case &Sensitive" msgstr "skill mellom &store/små tegn" -#: gtkedit/editcmd.c:1252 +#: gtkedit/editcmd.c:1253 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " Skriv inn argumentrekkefølge f.eks. 3,2,1,4 " -#: gtkedit/editcmd.c:1256 +#: gtkedit/editcmd.c:1257 msgid " Enter replacement string:" msgstr " Skriv inn erstatningsstreng:" -#: gtkedit/editcmd.c:1260 gtkedit/editcmd.c:1333 src/view.c:2003 +#: gtkedit/editcmd.c:1261 gtkedit/editcmd.c:1334 src/view.c:2000 msgid " Enter search string:" msgstr " Skriv inn søkestreng:" #. Heads the 'Replace' dialog box -#: gtkedit/editcmd.c:1279 gtkedit/editcmd.c:1583 gtkedit/editcmd.c:1670 -#: gtkedit/editcmd.c:2209 gtkedit/editcmd.c:2240 gtkedit/editcmd.c:2242 +#: gtkedit/editcmd.c:1280 gtkedit/editcmd.c:1584 gtkedit/editcmd.c:1671 +#: gtkedit/editcmd.c:2210 gtkedit/editcmd.c:2241 gtkedit/editcmd.c:2243 msgid " Replace " msgstr " Erstatt " #. Heads the 'Search' dialog box -#: 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 +#: gtkedit/editcmd.c:1348 gtkedit/editcmd.c:1578 gtkedit/editcmd.c:2309 +#: gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 src/view.c:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 msgid " Search " msgstr " Søk " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1401 +#: gtkedit/editcmd.c:1402 msgid " Enter search text : " msgstr " Skriv inn søketekst : " -#: gtkedit/editcmd.c:1408 +#: gtkedit/editcmd.c:1409 msgid " Enter replace text : " msgstr " Skriv inn erstatningstekst : " -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1412 gtkedit/editcmd.c:1413 #, c-format msgid "" "You can enter regexp substrings with %s\n" @@ -2004,12 +2025,12 @@ "Du kan skrive inn regexp understrenger med %s\n" "(ikke \\1, \\2 som sed), siden brukes \"Enter...order\"" -#: gtkedit/editcmd.c:1414 +#: gtkedit/editcmd.c:1415 msgid " Enter argument (or substring) order : " msgstr " Skriv inn argument- (eller understreng) rekkefølge : " #. Tool hint -#: gtkedit/editcmd.c:1418 gtkedit/editcmd.c:1419 +#: gtkedit/editcmd.c:1419 gtkedit/editcmd.c:1420 msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" @@ -2018,19 +2039,19 @@ "format spesifikatorene eller regexp understrengene, f.eks. 3,1,2" #. The following are check boxes -#: gtkedit/editcmd.c:1424 +#: gtkedit/editcmd.c:1425 msgid " Whole words only " msgstr " Bare hele ord " -#: gtkedit/editcmd.c:1426 +#: gtkedit/editcmd.c:1427 msgid " Case sensitive " msgstr " Skill mellom store og små bokstaver " -#: gtkedit/editcmd.c:1429 +#: gtkedit/editcmd.c:1430 msgid " Regular expression " msgstr " Vanlig uttrykk " -#: gtkedit/editcmd.c:1430 gtkedit/editcmd.c:1431 +#: gtkedit/editcmd.c:1431 gtkedit/editcmd.c:1432 msgid "" "See the regex man page for how\n" "to compose a regular expression" @@ -2038,48 +2059,48 @@ "Se manualsiden for regex for eksempel\n" "på hvordan et vanlig uttrykk er satt sammen" -#: gtkedit/editcmd.c:1439 +#: gtkedit/editcmd.c:1440 msgid " Backwards " msgstr " Bakover " #. Tool hint -#: gtkedit/editcmd.c:1441 gtkedit/editcmd.c:1442 +#: gtkedit/editcmd.c:1442 gtkedit/editcmd.c:1443 msgid "Warning: Searching backward can be slow" msgstr "Advarsel: Søking bakover kan være tidkrevende" -#: gtkedit/editcmd.c:1463 +#: gtkedit/editcmd.c:1464 msgid " Prompt on replace " msgstr " Spør ved erstatning " #. Tool hint -#: gtkedit/editcmd.c:1465 +#: gtkedit/editcmd.c:1466 msgid "Ask before making each replacement" msgstr "Spør før utførelse av hver erstatning" -#: gtkedit/editcmd.c:1467 +#: gtkedit/editcmd.c:1468 msgid " Replace all " msgstr " Erstatt alle " #. Tool hint -#: gtkedit/editcmd.c:1469 +#: gtkedit/editcmd.c:1470 msgid "Replace repeatedly" msgstr "Erstatt flere" -#: gtkedit/editcmd.c:1473 +#: gtkedit/editcmd.c:1474 msgid " Bookmarks " msgstr "Bokmerker" #. Tool hint -#: gtkedit/editcmd.c:1475 gtkedit/editcmd.c:1476 +#: gtkedit/editcmd.c:1476 gtkedit/editcmd.c:1477 msgid "Create bookmarks at all lines found" msgstr "Opprett bokmerker for alle linjer som ble funnet" -#: gtkedit/editcmd.c:1479 +#: gtkedit/editcmd.c:1480 msgid " Scanf expression " msgstr " Scanf uttrykk " #. Tool hint -#: gtkedit/editcmd.c:1481 +#: gtkedit/editcmd.c:1482 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2088,62 +2109,62 @@ "C-format, se manualsiden for scanf" #. Tool hint -#: gtkedit/editcmd.c:1506 +#: gtkedit/editcmd.c:1507 msgid "Begin search, Enter" msgstr "Begynn søk, Linjeskift" -#: gtkedit/editcmd.c:1507 +#: gtkedit/editcmd.c:1508 msgid "Abort this dialog, Esc" msgstr "Avbryt denne dialogen, Esc" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace" msgstr "Erstatt" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Skip" msgstr "Hopp over" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace all" msgstr "Erstatt alle" -#: gtkedit/editcmd.c:1670 +#: gtkedit/editcmd.c:1671 msgid "Replace one" msgstr "Erstatt en" -#: gtkedit/editcmd.c:2030 +#: gtkedit/editcmd.c:2031 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:2211 +#: gtkedit/editcmd.c:2212 msgid " Error in replacement format string. " msgstr " Feil i erstatningsstrengen for format. " -#: gtkedit/editcmd.c:2239 +#: gtkedit/editcmd.c:2240 #, c-format msgid " %ld replacements made. " msgstr " %ld erstatninger utført. " -#: gtkedit/editcmd.c:2242 gtkedit/editcmd.c:2310 gtkedit/editcmd.c:2338 +#: gtkedit/editcmd.c:2243 gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 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 +#: gtkedit/editcmd.c:2308 #, c-format msgid " %d finds made, %d bookmarks added " msgstr "%d funn gjort, %d bokmerker lagt til" #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2363 gtkedit/editcmd.c:2378 gtkedit/editcmd.c:2381 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2379 gtkedit/editcmd.c:2382 msgid " Quit " msgstr " Avslutt " -#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2365 gtkedit/editcmd.c:2383 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -2151,492 +2172,528 @@ " Teksten er endret uten å ha vært lagret. \n" " Lagre ved avslutting? " -#: gtkedit/editcmd.c:2378 +#: gtkedit/editcmd.c:2379 msgid " File was modified, Save with exit? " msgstr " Filen ble endret, Lagre ved avslutting? " -#: gtkedit/editcmd.c:2378 +#: gtkedit/editcmd.c:2379 msgid "Cancel quit" msgstr "Avbryt avslutt" -#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: gtkedit/editcmd.c:2379 src/cmd.c:246 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 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:406 msgid "&Yes" msgstr "&Ja" -#: gtkedit/editcmd.c:2378 src/cmd.c:249 src/file.c:1878 src/file.c:2249 +#: gtkedit/editcmd.c:2379 src/cmd.c:246 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 +#: src/subshell.c:706 src/subshell.c:732 src/tree.c:745 src/view.c:406 msgid "&No" msgstr "&Nei" -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &Cancel quit " msgstr " &Avbryt avslutt " -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &Yes " msgstr " &Ja " -#: gtkedit/editcmd.c:2382 +#: gtkedit/editcmd.c:2383 msgid " &No " msgstr " &Nei " -#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2690 msgid " Copy to clipboard " msgstr " Kopier til utklippstavlen " -#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2689 -#: gtkedit/editcmd.c:2702 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2690 +#: gtkedit/editcmd.c:2703 msgid " Unable to save to file. " msgstr " Ute av stand til å lagre filen. " -#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 +#: gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2703 msgid " Cut to clipboard " msgstr " Klipp ut til utklippstavlen " -#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 -#: gtkedit/editcmd.c:2736 src/view.c:1918 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 src/view.c:1915 msgid " Goto line " msgstr " Gå til linje " -#: gtkedit/editcmd.c:2724 gtkedit/editcmd.c:2728 gtkedit/editcmd.c:2733 -#: gtkedit/editcmd.c:2736 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 msgid " Enter line: " msgstr " Skriv inn linje: " -#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 +#: gtkedit/editcmd.c:2758 gtkedit/editcmd.c:2771 msgid " Save Block " msgstr " Lagre blokk " -#: gtkedit/editcmd.c:2784 +#: gtkedit/editcmd.c:2785 msgid " Insert File " msgstr " Sett inn fil " -#: gtkedit/editcmd.c:2797 +#: gtkedit/editcmd.c:2798 msgid " Insert file " msgstr " Sett inn fil " -#: gtkedit/editcmd.c:2797 +#: gtkedit/editcmd.c:2798 msgid " Error trying to insert file. " msgstr " Feil under innsetting av fil. " #. Not essential to translate -#: gtkedit/editcmd.c:2819 +#: gtkedit/editcmd.c:2820 msgid " Sort block " msgstr " Sorter blokk " #. Not essential to translate -#: gtkedit/editcmd.c:2819 gtkedit/editcmd.c:2873 +#: gtkedit/editcmd.c:2820 gtkedit/editcmd.c:2908 msgid " You must first highlight a block of text. " msgstr " Du må først merke en tekstblokk. " -#: gtkedit/editcmd.c:2826 +#: gtkedit/editcmd.c:2827 msgid " Run Sort " msgstr " Kjør sortering " #. Not essential to translate -#: gtkedit/editcmd.c:2828 +#: gtkedit/editcmd.c:2829 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Skriv inn flagg for sortering (se manualside), skilt av tomrom: " -#: gtkedit/editcmd.c:2839 gtkedit/editcmd.c:2845 +#: gtkedit/editcmd.c:2840 gtkedit/editcmd.c:2846 msgid " Sort " msgstr " Sorter " #. Not essential to translate -#: gtkedit/editcmd.c:2841 +#: gtkedit/editcmd.c:2842 msgid " Error trying to execute sort command " msgstr " Feil under kjøring av sorteringskommando " #. Not essential to translate -#: gtkedit/editcmd.c:2847 +#: gtkedit/editcmd.c:2848 msgid " Sort returned non-zero: " msgstr " Sortering returnerte ikke-null: " -#. Not essential to translate -#: gtkedit/editcmd.c:2871 gtkedit/editcmd.c:2901 -msgid " Process block " -msgstr " Prosesser blokk " +#: gtkedit/editcmd.c:2881 +msgid "Error create script:" +msgstr "Feil under oppretting av skript:" + +#: gtkedit/editcmd.c:2887 +msgid "Error read script:" +msgstr "Feil under lesing av skript:" + +#: gtkedit/editcmd.c:2894 +msgid "Error close script:" +msgstr "Feil under lukking av skript:" + +#: gtkedit/editcmd.c:2899 +msgid "Script created:" +msgstr "Skript opprettet:" + +#: gtkedit/editcmd.c:2906 +msgid "Process block" +msgstr "Prosessér blokk" -#. Not essential to translate -#: gtkedit/editcmd.c:2903 -msgid " Error trying to stat file " -msgstr " Feil under stat av fil " - -#: gtkedit/editcmd.c:2974 +#: gtkedit/editcmd.c:3018 msgid " Mail " msgstr " Send " -#: gtkedit/editcmd.c:2987 +#: gtkedit/editcmd.c:3031 msgid " Copies to" msgstr " Kopier til:" -#: gtkedit/editcmd.c:2991 +#: gtkedit/editcmd.c:3035 msgid " Subject" msgstr " Emne " -#: gtkedit/editcmd.c:2995 +#: gtkedit/editcmd.c:3039 msgid " To" msgstr " Til" -#: gtkedit/editcmd.c:2997 +#: gtkedit/editcmd.c:3041 msgid " mail -s -c " msgstr " mail -s -c " -#: gtkedit/editmenu.c:61 +#: gtkedit/editmenu.c:62 msgid " Word wrap " msgstr " Ordbryting " #. Not essential to translate -#: gtkedit/editmenu.c:63 +#: gtkedit/editmenu.c:64 msgid " Enter line length, 0 for off: " msgstr " Skriv inn linjelengden, 0 for av: " -#: gtkedit/editmenu.c:124 gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:75 +msgid " About " +msgstr " Om " + +#: gtkedit/editmenu.c:76 +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 teksteditor skrevet\n" +" for Midnight Commander.\n" + +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:147 msgid "&Open/load... C-o" msgstr "&Åpne/laste... C-o" -#: gtkedit/editmenu.c:125 +#: gtkedit/editmenu.c:129 msgid "&New C-n" msgstr "&Ny C-n" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:131 gtkedit/editmenu.c:150 msgid "&Save F2" msgstr "&Lagre F2" -#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 +#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:151 msgid "save &As... F12" msgstr "l&Agre som... F12" -#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:153 msgid "&Insert file... F15" msgstr "sett &Inn fil... F15" -#: gtkedit/editmenu.c:131 +#: gtkedit/editmenu.c:135 msgid "copy to &File... C-f" msgstr "kopier til &Fil...C-f" -#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 +#: gtkedit/editmenu.c:137 gtkedit/editmenu.c:156 +msgid "&User menu... F11" +msgstr "Br&ukermeny... F11" + +#: gtkedit/editmenu.c:140 gtkedit/editmenu.c:159 msgid "a&Bout... " msgstr "Om " -#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 +#: gtkedit/editmenu.c:142 gtkedit/editmenu.c:161 msgid "&Quit F10" msgstr "A&vslutt F10" -#: gtkedit/editmenu.c:141 +#: gtkedit/editmenu.c:148 msgid "&New C-x k" msgstr "&Ny C-x k" -#: gtkedit/editmenu.c:147 +#: gtkedit/editmenu.c:154 msgid "copy to &File... " msgstr "kopier til &Fil... " -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Toggle Mark F3" msgstr "slå av/på merking F3" -#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Mark Columns S-F3" msgstr "&Merk kolonner S-F3" -#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 +#: gtkedit/editmenu.c:169 gtkedit/editmenu.c:186 msgid "toggle &Ins/overw Ins" msgstr "slå av/på sett inn/overskriv Ins" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:171 gtkedit/editmenu.c:188 msgid "&Copy F5" msgstr "Kopier F5" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:172 gtkedit/editmenu.c:189 msgid "&Move F6" msgstr "Flytt F6" -#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 +#: gtkedit/editmenu.c:173 gtkedit/editmenu.c:190 msgid "&Delete F8" msgstr "Slett F8" -#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 +#: gtkedit/editmenu.c:175 gtkedit/editmenu.c:192 msgid "&Undo C-u" msgstr "Angre C-u" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:177 gtkedit/editmenu.c:194 msgid "&Beginning C-PgUp" msgstr "&Begynnelsen C-PgUp" -#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 +#: gtkedit/editmenu.c:178 gtkedit/editmenu.c:195 msgid "&End C-PgDn" msgstr "Slutt C-PgDn" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:207 msgid "&Search... F7" msgstr "Søk... F7" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:208 msgid "search &Again F17" msgstr "søk igjen F17" -#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:209 msgid "&Replace... F4" msgstr "Erstatt... F4" -#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "&Goto line... M-l" msgstr "Gå til linje... M-l" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:238 msgid "goto matching &Bracket M-b" msgstr "gå til passende &Klamme M-b" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 +#: gtkedit/editmenu.c:217 gtkedit/editmenu.c:240 msgid "insert &Literal... C-q" msgstr "sett inn &Literal... C-q" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:242 msgid "&Refresh screen C-l" msgstr "Oppdater skjermen C-l" -#: gtkedit/editmenu.c:211 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "&Start record macro C-r" msgstr "&Start makroinnspilling C-r" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:235 +#: gtkedit/editmenu.c:222 gtkedit/editmenu.c:245 msgid "&Finish record macro... C-r" msgstr "stopp makroinnspilling...C-r" -#: gtkedit/editmenu.c:213 +#: gtkedit/editmenu.c:223 msgid "&Execute macro... C-a, KEY" msgstr "Kjør makro... C-a, TAST" -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 +#: gtkedit/editmenu.c:224 gtkedit/editmenu.c:247 msgid "delete macr&O... " msgstr "slett makro... " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:226 gtkedit/editmenu.c:249 msgid "insert &Date/time " msgstr "sett inn dato/klokke " -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:228 gtkedit/editmenu.c:251 msgid "format p&Aragraph M-p" msgstr "formater p&Aragraf M-p" -#: gtkedit/editmenu.c:219 +#: gtkedit/editmenu.c:229 msgid "'ispell' s&Pell check C-p" msgstr "'ispell' stavekontroll C-p" -#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 +#: gtkedit/editmenu.c:230 gtkedit/editmenu.c:253 msgid "sor&T... M-t" msgstr "sor&Ter... M-t" -#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 -msgid "'indent' &C Formatter F19" -msgstr "'indent' C formatering F19" +#: gtkedit/editmenu.c:231 gtkedit/editmenu.c:254 +msgid "E&xternal Formatter F19" +msgstr "E&kstern formaterer F19" -#: gtkedit/editmenu.c:222 +#: gtkedit/editmenu.c:232 msgid "&Mail... " msgstr "Send... " -#: gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:246 msgid "&Execute macro... C-x e, KEY" msgstr "Kjør makro... C-x e, TAST" -#: gtkedit/editmenu.c:242 +#: gtkedit/editmenu.c:252 msgid "'ispell' s&Pell check M-$" msgstr "'ispell' stavekontroll M-$" -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 +#: gtkedit/editmenu.c:261 gtkedit/editmenu.c:270 msgid "&General... " msgstr "Generelt... " -#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 +#: gtkedit/editmenu.c:262 gtkedit/editmenu.c:271 msgid "&Save mode..." msgstr "Lagringsmodus..." -#: gtkedit/editmenu.c:254 gtkedit/editmenu.c:263 src/main.c:1355 +#: gtkedit/editmenu.c:264 gtkedit/editmenu.c:273 src/main.c:1357 msgid "&Layout..." msgstr "Utseende." #. The following are menu options. Do not change the key bindings (eg. C-o) and preserve '\t' -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 +#: gtkedit/editmenu.c:283 gtkedit/editmenu.c:292 gtkedit/editmenu.c:409 #: src/chmod.c:164 src/chown.c:130 msgid " File " msgstr " Fil " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 gtkedit/editmenu.c:415 +#: gtkedit/editmenu.c:284 gtkedit/editmenu.c:293 gtkedit/editmenu.c:425 msgid " Edit " msgstr " Rediger " -#: gtkedit/editmenu.c:275 gtkedit/editmenu.c:284 +#: gtkedit/editmenu.c:285 gtkedit/editmenu.c:294 msgid " Sear/Repl " msgstr " Søk/Erstatt " -#: gtkedit/editmenu.c:276 gtkedit/editmenu.c:285 gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:286 gtkedit/editmenu.c:295 gtkedit/editmenu.c:465 msgid " Command " msgstr " Kommando " -#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 +#: gtkedit/editmenu.c:287 gtkedit/editmenu.c:296 msgid " Options " msgstr " Alternativer " -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:410 msgid "Open...\tC-o" msgstr "Åpne...\tC-o" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:411 msgid "New\tC-n" msgstr "Ny\tC-n" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:413 msgid "Save\tF2" msgstr "Lagre\tF2" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:414 msgid "Save as...\tF12" msgstr "Lagre som...\tF12" -#: gtkedit/editmenu.c:406 +#: gtkedit/editmenu.c:416 msgid "Insert file...\tF15" msgstr "Sett inn fil...\tF15" -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:417 msgid "Copy to file...\tC-f" msgstr "Kopier til fil...\tC-f" #. Tool hint -#: gtkedit/editmenu.c:410 +#: gtkedit/editmenu.c:420 msgid "Disk operations and file indexing/searching" msgstr "Diskoperasjoner og filindeksering-/søking" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:426 msgid "Toggle mark\tF3" msgstr "Slå av/på marker\tF3" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:427 msgid "Toggle mark columns\tC-b" msgstr "Slå av/på marker kolonner\tC-b" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:429 msgid "Toggle book mark\tC-M-Ins" msgstr "Slå av/på bokmerker\tC-M-Ins" -#: gtkedit/editmenu.c:420 +#: gtkedit/editmenu.c:430 msgid "Previous book mark\tC-M-Up" msgstr "Forrige bokmerke\tC-M-Opp" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:431 msgid "Next book mark\tC-M-Down" msgstr "Neste bokmerke\tC-M-Ned" -#: gtkedit/editmenu.c:422 +#: gtkedit/editmenu.c:432 msgid "Flush book marks" msgstr "Fjern bokmerker" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:434 msgid "Toggle insert/overwrite\tIns" msgstr "Slå av/på overskriv\tIns" -#: gtkedit/editmenu.c:426 +#: gtkedit/editmenu.c:436 msgid "Copy block to cursor\tF5" msgstr "Kopier blokk til markøren\tF5" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:437 msgid "Move block to cursor\tF6" msgstr "Flytt blokk til markøren\tF6" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:438 msgid "Delete block\tF8/C-Del" msgstr "Slett blokk\tF8/C-Del" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:440 msgid "Copy block to clipbrd\tC-Ins" msgstr "Kopier blokk til utklippstavle\tC-Ins" -#: gtkedit/editmenu.c:431 +#: gtkedit/editmenu.c:441 msgid "Cut block to clipbrd\tS-Del" msgstr "Klipp ut blokk til utklippstavle\tS-Del" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:442 msgid "Paste block from clipbrd\tS-Ins" msgstr "Lim inn blokk fra utklippstavlen\tS-Ins" -#: gtkedit/editmenu.c:433 +#: gtkedit/editmenu.c:443 msgid "Selection history\tM-Ins" msgstr "Utvalgshistorikk\tM-Ins" -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:445 msgid "Undo\tC-BackSpace" msgstr "Angre\tC-Tilbake" #. Tool hint -#: gtkedit/editmenu.c:438 +#: gtkedit/editmenu.c:448 msgid "Manipulating blocks of text" msgstr "Manipulering av tekstblokker" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:453 msgid " Srch/Replce " msgstr " Søk/Erstatt " -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:454 msgid "Search...\tF7" msgstr "Søk...\tF7" -#: gtkedit/editmenu.c:445 +#: gtkedit/editmenu.c:455 msgid "Search again\tF17" msgstr "Søk igjen\tF17" -#: gtkedit/editmenu.c:446 +#: gtkedit/editmenu.c:456 msgid "Replace...\tF4" msgstr "Erstatt...\tF4" -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:457 msgid "Replace again\tF14" msgstr "Erstatt igjen\tF14" #. Tool hint -#: gtkedit/editmenu.c:450 +#: gtkedit/editmenu.c:460 msgid "Search for and replace text" msgstr "Søk etter og erstatt tekst" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:466 msgid "Goto line...\tM-l" msgstr "Gå til linje...\tM-l" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:467 msgid "Goto matching bracket\tM-b" msgstr "Gå til passende klamme\tM-b" -#: gtkedit/editmenu.c:459 +#: gtkedit/editmenu.c:469 msgid "Start record macro\tC-r" msgstr "Start makroinnspilling\tC-r" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:470 msgid "Finish record macro...\tC-r" msgstr "Avslutt makroinnspilling...\tC-r" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:471 msgid "Execute macro...\tC-a, KEY" msgstr "Kjør makro...\tC-a, TAST" -#: gtkedit/editmenu.c:462 +#: gtkedit/editmenu.c:472 msgid "Delete macro...\t" msgstr "Slett makro...\t" -#: gtkedit/editmenu.c:464 +#: gtkedit/editmenu.c:474 msgid "Insert date/time\tC-d" msgstr "Sett inn dato/klokkeslett\tC-d" -#: gtkedit/editmenu.c:465 +#: gtkedit/editmenu.c:475 msgid "Format paragraph\tM-p" msgstr "Formater paragraf\tM-p" -#: gtkedit/editmenu.c:467 +#: gtkedit/editmenu.c:477 msgid "Refresh display\tC-l" msgstr "Oppdater skjermen\tC-l" #. Tool hint -#: gtkedit/editmenu.c:470 +#: gtkedit/editmenu.c:480 msgid "Macros and internal commands" msgstr "Makroer og interne kommandoer" @@ -2661,55 +2718,55 @@ msgstr "Skrivemaskinsbryting" #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "Linjelengde for ordbryting : " #. 4 -#: gtkedit/editoptions.c:80 +#: gtkedit/editoptions.c:78 msgid "Tab spacing : " msgstr "Tabulatormellomrom : " -#: gtkedit/editoptions.c:88 +#: gtkedit/editoptions.c:86 msgid "synta&X highlighting" msgstr "syntaksutheving" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "bekreft før lagring" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "fyll tabulatorer med mellomrom" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "Linjeskift utfører autoindentering" #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "&Tilbake gjennom tabulatorer" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "&Falske halvtabulatorer" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Brytningsmodus" #. 15 -#: gtkedit/editoptions.c:118 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "Tasteemulering" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr " Alternativer for redigerer " @@ -2719,8 +2776,8 @@ msgstr "Feil under initialisering av editor.\n" #: 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 +#: src/main.c:1723 src/screen.c:2396 src/screen.c:2426 src/tree.c:1008 +#: src/view.c:2070 msgid "Help" msgstr "Hjelp" @@ -2732,13 +2789,13 @@ msgid "Replac" msgstr "Erstatt" -#: gtkedit/editwidget.c:1145 src/main.c:1723 +#: gtkedit/editwidget.c:1145 src/main.c:1725 msgid "PullDn" msgstr "Meny" #. gtk_edit_menu #: gtkedit/editwidget.c:1146 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1724 src/view.c:2075 src/view.c:2097 +#: src/main.c:1726 src/view.c:2072 src/view.c:2094 msgid "Quit" msgstr "Slutt" @@ -2805,7 +2862,7 @@ msgid "Delete highlighted text" msgstr "Slett markert tekst" -#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1724 src/screen.c:2397 src/screen.c:2427 msgid "Menu" msgstr "Meny" @@ -2841,12 +2898,12 @@ msgid "Search/Replace" msgstr "Søk/Erstatt" -#: gtkedit/syntax.c:1069 gtkedit/syntax.c:1078 gtkedit/syntax.c:1087 -#: gtkedit/syntax.c:1096 +#: gtkedit/syntax.c:1072 gtkedit/syntax.c:1081 gtkedit/syntax.c:1090 +#: gtkedit/syntax.c:1099 msgid " Spelling Message " msgstr " Stavemelding " -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1072 msgid "" " Fail trying to open ispell program. \n" " Check that it is in your path and works with the -a option. \n" @@ -2856,7 +2913,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:1078 +#: gtkedit/syntax.c:1081 msgid "" " Fail trying to open ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2866,7 +2923,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:1087 +#: gtkedit/syntax.c:1090 msgid "" " Fail trying to read ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2876,7 +2933,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:1096 +#: gtkedit/syntax.c:1099 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2884,15 +2941,29 @@ " Feil under lesing fra ispell. \n" " Ispell startes på nytt. " -#: gtkedit/syntax.c:1519 gtkedit/syntax.c:1526 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 +msgid " Load Syntax Rules " +msgstr " Les syntaksregler " + +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 +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 "" +" Syntaksfilen din er utdatert \n" +" En ny regel blir installert. \n" +" Din gamle regelfil er lagret med .OLD som etternavn. " + +#: gtkedit/syntax.c:1517 gtkedit/syntax.c:1524 msgid " Load syntax file " msgstr " Les syntaksfil " -#: gtkedit/syntax.c:1519 +#: gtkedit/syntax.c:1517 msgid " File access error " msgstr " Tilgangsfeil for fil " -#: gtkedit/syntax.c:1525 +#: gtkedit/syntax.c:1523 #, c-format msgid " Error in file %s on line %d " msgstr " Feil i filen %s ved linje %d " @@ -2959,7 +3030,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:621 +#: src/chown.c:260 src/chown.c:264 src/panelize.c:300 src/user.c:669 msgid " Oops... " msgstr " Oops... " @@ -3301,130 +3372,130 @@ msgid " I can't run the Chown command on a tarfs " msgstr " Jeg kan ikke kjøre chown kommandoen på et tarfs " -#: src/cmd.c:198 +#: src/cmd.c:195 #, c-format msgid " Can not fetch a local copy of %s " msgstr " Kan ikke hente en lokal kopi av %s " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid " CD " msgstr " CD " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid "Files tagged, want to cd?" msgstr "Filer merket, vil du skifte katalog?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:732 +#: src/cmd.c:251 src/cmd.c:712 src/cmd.c:731 msgid "Could not change directory" msgstr " Kunne ikke skifte katalog" -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " View file " msgstr " Se på fil " -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " Filename:" msgstr " Filnavn:" -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filtered view " msgstr " Filtrert visning " -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filter command and arguments:" msgstr " Filterkommando og argumenter:" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid "Create a new Directory" msgstr "Opprett en ny katalog" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid " Enter directory name:" msgstr " Skriv inn katalognavnet:" -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Filter " msgstr " Filter " -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Set expression for filtering filenames" msgstr " Sett uttrykk for filtrering av filnavn" -#: src/cmd.c:515 +#: src/cmd.c:512 msgid " Select " msgstr " Velg " -#: src/cmd.c:567 +#: src/cmd.c:564 msgid " Unselect " msgstr " Velg bort " -#: src/cmd.c:640 +#: src/cmd.c:637 msgid "Extension file edit" msgstr "Rediger utvidelsesfil" -#: src/cmd.c:641 +#: src/cmd.c:638 msgid " Which extension file you want to edit? " msgstr " Hvilken utvidelsesfil vil du redigere? " -#: src/cmd.c:642 +#: src/cmd.c:639 msgid "&User" msgstr "&Bruker" -#: src/cmd.c:642 src/cmd.c:668 +#: src/cmd.c:639 src/cmd.c:667 msgid "&System Wide" msgstr "&System" -#: src/cmd.c:665 -msgid "Menu file edit" -msgstr "Rediger menyfil" +#: src/cmd.c:664 +msgid " Menu edit " +msgstr " Menyredigering " -#: src/cmd.c:666 -msgid " Which menu file will you edit? " +#: src/cmd.c:665 +msgid " Which menu file will you edit ? " msgstr " Hvilken menyfil vil du redigere? " -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Local" msgstr "&Lokal" -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Home" msgstr "&Hjemme" -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Compare directories " msgstr " Sammenlign kataloger " -#: src/cmd.c:858 +#: src/cmd.c:857 msgid " Select compare method: " msgstr " Velg metode for sammenligning: " -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Quick" msgstr "&Rask" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Size only" msgstr "Bare &Størrelse" -#: src/cmd.c:859 +#: src/cmd.c:858 msgid "&Thorough" msgstr "&Grundig" -#: src/cmd.c:869 +#: src/cmd.c:868 msgid " Both panels should be on the listing view mode to use this command " msgstr "" " Begge panelene bør være i visningsmodus for liste for å bruke denne " "kommandoen " -#: src/cmd.c:883 +#: src/cmd.c:882 msgid " The command history is empty " msgstr " Kommandohistorikken er tom " -#: src/cmd.c:889 +#: src/cmd.c:888 msgid " Command history " msgstr " Kommandohistorikk " -#: src/cmd.c:931 +#: src/cmd.c:930 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3432,11 +3503,11 @@ " Ikke en xterm eller Linux konsoll; \n" " panelene kan ikke slås av og på. " -#: src/cmd.c:970 +#: src/cmd.c:969 msgid "Type `exit' to return to the Midnight Commander" msgstr "Skriv `exit' for å gå tilbake til Midnight Commander" -#: src/cmd.c:1025 +#: src/cmd.c:1024 #, c-format msgid "" " Couldn't stat %s \n" @@ -3445,98 +3516,107 @@ " Kunne ikke kjøre stat på %s \n" " %s " -#: src/cmd.c:1034 src/cmd.c:1036 +#: src/cmd.c:1033 src/cmd.c:1035 msgid " Link " msgstr " Lenke " -#: src/cmd.c:1035 src/cmd.c:1174 src/file.c:1704 +#: src/cmd.c:1034 src/cmd.c:1173 src/file.c:1704 msgid " to:" msgstr " til:" -#: src/cmd.c:1046 +#: src/cmd.c:1045 #, c-format msgid " link: %s " msgstr " lenke: %s " -#: src/cmd.c:1079 +#: src/cmd.c:1078 #, c-format msgid " symlink: %s " msgstr " symlink: %s " -#: src/cmd.c:1133 +#: src/cmd.c:1132 #, c-format msgid " Symlink `%s' points to: " msgstr " Lenken `%s' peker til: " -#: src/cmd.c:1138 +#: src/cmd.c:1137 msgid " Edit symlink " msgstr " Rediger symlink " -#: src/cmd.c:1143 +#: src/cmd.c:1142 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " rediger symlink, kan ikke fjerne %s: %s " -#: src/cmd.c:1147 +#: src/cmd.c:1146 #, c-format msgid " edit symlink: %s " msgstr " rediger symlink: %s " -#: src/cmd.c:1174 +#: src/cmd.c:1173 msgid " Link symbolically " msgstr " Lag symbolsk lenke " -#: src/cmd.c:1175 +#: src/cmd.c:1174 msgid " Relative symlink " msgstr " Relativ symlink " -#: src/cmd.c:1186 +#: src/cmd.c:1185 #, c-format msgid " relative symlink: %s " msgstr " relativ symlink: %s " -#: src/cmd.c:1336 +#: src/cmd.c:1260 +msgid "Using default locale" +msgstr "Bruker standard locale" + +#: src/cmd.c:1262 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "Bruker locale \"%s\" (fra miljøvariabelen %s)" + +#: src/cmd.c:1348 msgid " Enter machine name (F1 for details): " msgstr " Skriv inn maskinnavn (F1 for detaljer): " -#: src/cmd.c:1363 +#: src/cmd.c:1375 #, c-format msgid " Could not chdir to %s " msgstr " Kunne ikke skifte katalog til %s " -#: src/cmd.c:1370 +#: src/cmd.c:1382 src/widget.c:1163 msgid " Link to a remote machine " msgstr " Lenke til en fjern maskin " -#: src/cmd.c:1376 +#: src/cmd.c:1388 src/widget.c:1164 msgid " FTP to machine " msgstr " FTP til maskin " -#: src/cmd.c:1382 +#: src/cmd.c:1394 src/widget.c:1165 msgid " SMB link to machine " msgstr " SMB-tilkobling til maskin " -#: src/cmd.c:1392 +#: src/cmd.c:1404 msgid " Socket source routing setup " msgstr " Oppsett av kontaktens kilderuting" -#: src/cmd.c:1393 +#: src/cmd.c:1405 msgid " Enter host name to use as a source routing hop: " msgstr " Skriv inn vertsnavnet som skal brukes som kilderutingshop: " -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Host name " msgstr " Vertsnavn " -#: src/cmd.c:1400 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr " Feil under oppslag av IP-adresse " -#: src/cmd.c:1411 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr " Gjenopprett filer på et ext2 filsystem " -#: src/cmd.c:1412 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3544,11 +3624,11 @@ " Skriv inn enhet (uten /dev/) som det skal gjenopprettes\n" " filer på: (F1 for detaljer)" -#: src/cmd.c:1462 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr " Oppsett lagret til ~/" -#: src/cmd.c:1467 +#: src/cmd.c:1480 msgid " Setup " msgstr " Oppsett " @@ -3647,7 +3727,7 @@ msgid "Unknown" msgstr "Ukjent" -#: src/ext.c:143 src/user.c:499 +#: src/ext.c:143 src/user.c:542 #, c-format msgid "" " Can't generate unique filename \n" @@ -3656,7 +3736,7 @@ " Kan ikke generere et unikt filnavn \n" " %s " -#: src/ext.c:150 src/user.c:511 +#: src/ext.c:150 src/user.c:554 #, c-format msgid "" " Can't create temporary command file \n" @@ -3665,7 +3745,7 @@ "Kan ikke opprette midlertidig kommandofil \n" " %s " -#: src/ext.c:165 src/user.c:533 +#: src/ext.c:165 src/user.c:576 msgid " Parameter " msgstr " Parameter " @@ -3711,6 +3791,110 @@ msgid "mc.ext will be used for this moment." msgstr "mc.ext vil bli brukt foreløpig." +#: src/features.inc:8 +msgid "Edition: " +msgstr "Utgave: " + +#: src/features.inc:11 +msgid "XView" +msgstr "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: src/features.inc:16 +msgid "text mode" +msgstr "tekstmodus" + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" +msgstr " med X11 støtte for lesemodifikatorer" + +#: src/features.inc:24 +msgid "Virtual File System: tarfs, extfs" +msgstr "Virtuelt filsystem: tarfs, extfs" + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr " (proxies: hsc proxy)" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (med termnet støtte)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "Med innebygget editor\n" + +#: src/features.inc:48 +msgid "Using " +msgstr "Bruker " + +#: src/features.inc:51 +msgid "system-installed " +msgstr "system-installert" + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "S-lang bibliotek med " + +#: src/features.inc:56 +msgid "terminfo" +msgstr "terminfo" + +#: src/features.inc:59 +msgid "termcap" +msgstr "termcap" + +#: src/features.inc:61 +msgid "an unknown terminal" +msgstr "en ukjent terminal" + +#: src/features.inc:64 +msgid " database" +msgstr " database" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "ncurses biblioteket" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "et ukjent curses bibliotek" + +#: src/features.inc:74 +msgid "With subshell support: " +msgstr "Med støtte for underskall: " + +#: src/features.inc:76 +msgid "optional" +msgstr "alternativ" + +#: src/features.inc:78 +msgid "as default" +msgstr "som standard" + +#: src/features.inc:84 +msgid "With support for background operations\n" +msgstr "Med støtte for bakgrunnsoperasjoner\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " Kopier " @@ -4072,7 +4256,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "fil" @@ -4100,11 +4284,11 @@ msgid " Can't operate on \"..\"! " msgstr " Kan ikke arbeide på \"..\"! " -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "Ja" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "Nei" @@ -4362,7 +4546,7 @@ msgid "Finished" msgstr "Ferdig" -#: src/find.c:561 src/view.c:1531 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "Søker etter %s" @@ -4442,7 +4626,7 @@ msgid " Help " msgstr " Hjelp " -#: src/help.c:766 src/user.c:637 +#: src/help.c:766 src/user.c:687 #, c-format msgid "" " Can't open file %s \n" @@ -4928,7 +5112,7 @@ msgid " The shell is already running a command " msgstr " Skallet kjører allerede en kommando " -#: src/main.c:861 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander " @@ -5112,71 +5296,75 @@ msgid "&Listing format edit" msgstr "Redigering av listeformat" -#: src/main.c:1348 +#: src/main.c:1349 msgid "&Extension file edit" msgstr "Redigering av utvidelsesfil" -#: src/main.c:1349 +#: src/main.c:1350 msgid "&Menu file edit" msgstr "Menyfilredigering" -#: src/main.c:1354 +#: src/main.c:1351 +msgid "Menu edi&Tor edit" +msgstr "Redigering av menyedi&Tor" + +#: src/main.c:1356 msgid "&Configuration..." msgstr "Konfigurasjon..." -#: src/main.c:1356 +#: src/main.c:1358 msgid "c&Onfirmation..." msgstr "bekreftelse..." -#: src/main.c:1357 +#: src/main.c:1359 msgid "&Display bits..." msgstr "Tastaturdefinisjon..." -#: src/main.c:1359 +#: src/main.c:1361 msgid "learn &Keys..." msgstr "lær taster..." -#: src/main.c:1362 +#: src/main.c:1364 msgid "&Virtual FS..." msgstr "Virtuelt FS..." -#: src/main.c:1365 +#: src/main.c:1367 msgid "&Save setup" msgstr "Lagre oppsett" -#: src/main.c:1381 src/main.c:1383 +#: src/main.c:1383 src/main.c:1385 msgid " &Left " msgstr " Venstre " -#: src/main.c:1383 +#: src/main.c:1385 msgid " &Above " msgstr " Over " -#: src/main.c:1386 +#: src/main.c:1388 msgid " &File " msgstr " Fil " -#: src/main.c:1387 +#: src/main.c:1389 msgid " &Command " msgstr " Kommando " -#: src/main.c:1388 +#: src/main.c:1390 msgid " &Options " msgstr " Alternativer " -#: src/main.c:1390 src/main.c:1392 +#: src/main.c:1392 src/main.c:1394 msgid " &Right " msgstr " Høyre " -#: src/main.c:1392 +#: src/main.c:1394 msgid " &Below " msgstr " Under " -#: src/main.c:1447 +#: src/main.c:1449 msgid " Information " msgstr " Informasjon " -#: src/main.c:1448 +#: src/main.c:1450 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5188,24 +5376,23 @@ " du utføre en manuell gjenlesing av katalogen. Se manualsiden for \n" " detaljene." -#: src/main.c:1927 +#: src/main.c:1929 msgid "Thank you for using GNU Midnight Commander" msgstr "Takk for at du bruker GNU Midnight Commander" -#: src/main.c:2284 -#, c-format -msgid "with mouse support on xterm%s.\n" -msgstr "med musstøtte i xterm%s.\n" - -#: src/main.c:2285 -msgid " and the Linux console" -msgstr " og Linux konsollet" +#: src/main.c:2287 +msgid "with mouse support on xterm and the Linux console.\n" +msgstr "med musstøtte i xterm og på Linux konsollet.\n" + +#: src/main.c:2288 +msgid "with mouse support on xterm.\n" +msgstr "med musstøtte i xterm.\n" -#: src/main.c:2381 +#: src/main.c:2389 msgid "The TERM environment variable is unset!\n" msgstr "TERM miljøvariabelen er ikke satt!\n" -#: src/main.c:2487 +#: src/main.c:2495 msgid "" "Usage is:\n" "\n" @@ -5217,33 +5404,34 @@ "mc [flagg] [denne_katalogen] [annet_panels_katalog]\n" "\n" -#: src/main.c:2490 +#: src/main.c:2498 msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" msgstr "-a, --sickchars Tvungen bruk av +, -, | for linjeopptegning.\n" -#: src/main.c:2492 +#: src/main.c:2500 msgid "-b, --nocolor Force black and white display.\n" msgstr "-b, --nocolor Tvunget sort/hvit skjerm.\n" -#: src/main.c:2494 +#: src/main.c:2502 msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" msgstr "-B, --background [KUN-UTVIKLERE: Debug bakgrunnskoden]\n" -#: src/main.c:2496 +#: src/main.c:2504 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" +"-C, --colors Spesifiser farger (bruk --help-colors for å få en " +"liste).\n" "-d, --nomouse Slå av musstøtte.\n" -#: src/main.c:2500 +#: src/main.c:2508 msgid "-e, --edit Startup the internal editor.\n" msgstr "-e, --edit Start opp den interne editoren.\n" -#: src/main.c:2502 +#: src/main.c:2510 msgid "" "-f, --libdir Print configured paths.\n" "-h, --help Shows this help message.\n" @@ -5253,18 +5441,19 @@ 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" +"-k, --resetsoft Nullstiller softkeys (kun HP terminaler) til sine " +"terminfo/termcap\n" " standardverdier.\n" -#: src/main.c:2507 +#: src/main.c:2515 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 +#: src/main.c:2518 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 +#: src/main.c:2520 msgid "" "-P, --printwd At exit, print the last working directory.\n" "-s, --slow Disables verbose operation (for slow terminals).\n" @@ -5272,16 +5461,18 @@ "-P, --printwd Skriv ut siste arbeidskatalog ved avslutting.\n" "-s, --slow Slår av detaljert operasjon (for trege terminaler).\n" -#: src/main.c:2515 +#: src/main.c:2523 msgid "-t, --termcap Activate support for the TERMCAP variable.\n" msgstr "-t, --termcap Aktiver støtte for TERMCAP variabelen.\n" -#: src/main.c:2518 +#: src/main.c:2526 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" +msgstr "" +"-S, --createcmdfile Opprett kommandofil for å sette standard katalog ved " +"avslutting.\n" -#: src/main.c:2521 +#: src/main.c:2529 msgid "" "-u, --nosubshell Disable the concurrent subshell mode.\n" "-U, --subshell Force the concurrent subshell mode.\n" @@ -5291,21 +5482,23 @@ "-U, --subshell Tvungen bruk av samtidig underskall modus.\n" "-r, --forceexec Tvungen kjøring av underskall.\n" -#: src/main.c:2525 +#: src/main.c:2533 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" +"+number number it is the start line number of file for `mcedit'.\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" +"-x, --xterm Tvungen bruk av mus i xterm og lagring/gjenoppretting av skjerm\n" +"+number Startplassering for markøren i filen som kjøres i `mcedit'.\n" -#: src/main.c:2529 +#: src/main.c:2538 msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" msgstr "-X, --dbgsubshell [KUN-UTVIKLERE: Debug underskallet].\n" -#: src/main.c:2531 +#: src/main.c:2540 msgid "" "\n" "Please send any bug reports (including the output of `mc -V')\n" @@ -5315,7 +5508,7 @@ "Vennligst send feilrapporter (inkludert utskrift av `mc -V')\n" "til mc-bugs@nuclecu.unam.mx\n" -#: src/main.c:2547 +#: src/main.c:2556 msgid "" "--colors KEYWORD={FORE},{BACK}\n" "\n" @@ -5353,123 +5546,123 @@ " brightcyan, lightgray and white\n" "\n" -#: src/main.c:2596 +#: src/main.c:2605 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Bibliotekkatalog for Midnight Commander: %s\n" -#: src/main.c:2610 +#: src/main.c:2619 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:2687 +#: src/main.c:2696 msgid "Use to debug the background code" msgstr "Bruk til å avluse bakgrunnskoden" -#: src/main.c:2693 +#: src/main.c:2702 msgid "Request to run in color mode" msgstr "Be om å kjøre i fargemodus" -#: src/main.c:2695 +#: src/main.c:2704 msgid "Specifies a color configuration" msgstr "Spesifiserer en fargekonfigurasjon" -#: src/main.c:2700 +#: src/main.c:2709 msgid "Edits one file" msgstr "Redigerer en fil" -#: src/main.c:2704 +#: src/main.c:2713 msgid "Displays this help message" msgstr "Viser denne hjelpeteksten" -#: src/main.c:2707 +#: src/main.c:2716 msgid "Displays a help screen on how to change the color scheme" msgstr "Viser en hjelpskjerm for endring av fargeplanen" -#: src/main.c:2710 +#: src/main.c:2719 msgid "Log ftp dialog to specified file" msgstr "Logg ftp dialogen til spesifisert fil" -#: src/main.c:2717 +#: src/main.c:2726 msgid "Obsolete" msgstr "Utgått" -#: src/main.c:2719 +#: src/main.c:2728 msgid "Requests to run in black and white" msgstr "Be om å kjøre i sort-hvitt" -#: src/main.c:2721 +#: src/main.c:2730 msgid "Disable mouse support in text version" msgstr "Slå av musstøtte i tekstversjonen" -#: src/main.c:2724 +#: src/main.c:2733 msgid "Disables subshell support" msgstr "Slå av støtte for underskall" -#: src/main.c:2728 +#: src/main.c:2737 msgid "Prints working directory at program exit" msgstr "Skriv ut arbeidskatalogen ved avslutting av programmet" -#: src/main.c:2730 +#: src/main.c:2739 msgid "Resets soft keys on HP terminals" msgstr "Setter tilbake myke taster på HP terminaler" -#: src/main.c:2732 +#: src/main.c:2741 msgid "To run on slow terminals" msgstr "For kjøring på trege terminaler" -#: src/main.c:2735 +#: src/main.c:2744 msgid "Use stickchars to draw" msgstr "Tegn med klebende tegn" -#: src/main.c:2739 +#: src/main.c:2748 msgid "Enables subshell support (default)" msgstr "Slår på støtte for underskall (standard)" -#: src/main.c:2744 +#: src/main.c:2753 msgid "Tries to use termcap instead of terminfo" msgstr "Prøver å bruke termcap i stedet for terminfo" -#: src/main.c:2748 +#: src/main.c:2757 msgid "Displays the current version" msgstr "Viser nåværende versjon" -#: src/main.c:2750 +#: src/main.c:2759 msgid "Launches the file viewer on a file" msgstr "Starter filvisning for en fil" -#: src/main.c:2752 +#: src/main.c:2761 msgid "Forces xterm features" msgstr "Tvungen bruk av xterm funksjoner" -#: src/main.c:2754 +#: src/main.c:2763 msgid "Geometry for the window" msgstr "Geometri for vinduet" -#: src/main.c:2754 +#: src/main.c:2763 msgid "GEOMETRY" msgstr "GEOMETRI" -#: src/main.c:2755 +#: src/main.c:2764 msgid "No windows opened at startup" msgstr "Ingen vinduer åpnet ved oppstart" -#: src/main.c:2756 +#: src/main.c:2765 msgid "No desktop icons" msgstr "Ingen skrivebordsikonene" -#: src/main.c:2757 +#: src/main.c:2766 msgid "Look more like traditional gmc" msgstr "Se mer ut som den tradisjonelle gmc" -#: src/main.c:2759 +#: src/main.c:2768 msgid "Display the directory that holds the .links startup files and exit" msgstr "Viser katalogen som inneholder .links oppstartsfilene og avslutt" -#: src/main.c:3071 +#: src/main.c:3081 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" @@ -5477,11 +5670,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:3149 +#: src/main.c:3159 msgid " Notice " msgstr " Notis " -#: src/main.c:3150 +#: src/main.c:3160 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5652,6 +5845,14 @@ msgid "Display brief usage message" msgstr "Vis kort bruksmelding" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "SUB-DIR" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "UP--DIR" + #: src/screen.c:417 msgid "MTime" msgstr "MTime" @@ -5697,29 +5898,29 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "Oppgitt format ser ut til å være ugyldig. Går tilbake til standard." -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " Vil du virkelig kjøre? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr " Ingen handling utført " -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1016 msgid "RenMov" msgstr "RenMov" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2402 src/screen.c:2432 src/tree.c:1020 msgid "Mkdir" msgstr "Mkdir" -#: src/screen.c:2417 +#: src/screen.c:2418 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" Kan ikke skifte katalog til %s \n" +"Kan ikke skifte katalog til \"%s\" \n" " %s " #: src/subshell.c:287 @@ -5789,15 +5990,6 @@ msgid "Dynamc" msgstr "Dynamisk" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -"Kan ikke skifte katalog til \"%s\" \n" -" %s " - #: src/tree.c:1012 msgid "Forget" msgstr "Glem" @@ -5815,32 +6007,32 @@ "Kan ikke skrive til %s filen:\n" "%s\n" -#: src/user.c:250 +#: src/user.c:271 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " Ugyldig mønsterdefinisjon for skall \"%c\". " -#: src/user.c:383 +#: src/user.c:424 msgid " Debug " msgstr " Avlus " -#: src/user.c:392 +#: src/user.c:433 msgid " ERROR: " msgstr " FEIL: " -#: src/user.c:396 +#: src/user.c:437 msgid " True: " msgstr " Sann: " -#: src/user.c:398 +#: src/user.c:439 msgid " False: " msgstr " Usann: " -#: src/user.c:602 +#: src/user.c:645 msgid " Warning -- ignoring file " msgstr " Advarsel -- ignorerer filen " -#: src/user.c:603 +#: src/user.c:646 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5849,19 +6041,19 @@ "Filen %s er ikke eid av root eller er skrivbar for alle.\n" "Bruk av den kan kompromittere sikkerheten" -#: src/user.c:622 +#: src/user.c:670 msgid " I can't run programs while logged on a non local directory " msgstr "" " Jeg kan ikke kjøre programmer når jeg er logget på en ekstern katalog " #. FIXME: this message is not quite right -#: src/user.c:720 +#: src/user.c:770 #, c-format msgid " Empty file %s " msgstr " Tom fil %s " #. Create listbox -#: src/user.c:730 +#: src/user.c:779 msgid " User menu " msgstr " Brukermeny " @@ -5879,15 +6071,15 @@ msgid "%b %e %Y" msgstr "%b %e %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr " Rør feilet " -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr " Dup feilet " -#: src/view.c:406 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5897,7 +6089,7 @@ "\n" " " -#: src/view.c:407 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5907,27 +6099,27 @@ "\n" "har blitt endret, vil du lagre endringene?\n" -#: src/view.c:409 +#: src/view.c:406 msgid " Save changes " msgstr " Lagre endringer " -#: src/view.c:451 +#: src/view.c:448 msgid " Can't spawn child program " msgstr " Kan ikke starte underprogram " -#: src/view.c:460 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " Tom utskrift fra underfilter " -#: src/view.c:465 +#: src/view.c:462 msgid " Could not open file " msgstr " Kunne ikke åpne filen " -#: src/view.c:480 +#: src/view.c:477 msgid " Can't open file \"" msgstr " Kan ikke åpne filen \"" -#: src/view.c:487 +#: src/view.c:484 msgid "" " Can't stat file \n" " " @@ -5935,11 +6127,11 @@ " Kan ikke kjøre stat på filen \n" " " -#: src/view.c:493 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " Kan ikke vise: ikke en vanlig fil " -#: src/view.c:574 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5948,7 +6140,7 @@ " Kan ikke åpne \"%s\"\n" " %s " -#: src/view.c:583 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5957,34 +6149,34 @@ " Kunne ikke kjøre stat på \"%s\"\n" " %s " -#: src/view.c:719 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "Fil: %s" -#: src/view.c:733 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "Offset 0x%08x" -#: src/view.c:744 +#: src/view.c:741 msgid " [grow]" msgstr " [voks]" -#: src/view.c:1523 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "Søker etter `%s'" -#: src/view.c:1630 src/view.c:1753 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " Søkestrengen ikke funnet " -#: src/view.c:1792 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " Ugyldig vanlig uttrykk " -#: src/view.c:1916 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5993,7 +6185,7 @@ " Det nåværende linjenummeret er %d.\n" " Skriv inn det nye linjenummeret:" -#: src/view.c:1938 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -6002,71 +6194,71 @@ " Det nåværende adressen er 0x%lx.\n" " Skriv inn den nye adressen:" -#: src/view.c:1940 +#: src/view.c:1937 msgid " Goto Address " msgstr " Gå til adresse " -#: src/view.c:1971 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " Skriv inn vanlig uttrykk:" -#: src/view.c:2076 +#: src/view.c:2073 msgid "Ascii" msgstr "Ascii" -#: src/view.c:2076 +#: src/view.c:2073 msgid "Hex" msgstr "Hex" -#: src/view.c:2077 +#: src/view.c:2074 msgid "Goto" msgstr "Gåtil" -#: src/view.c:2077 +#: src/view.c:2074 msgid "Line" msgstr "Linje" -#: src/view.c:2080 +#: src/view.c:2077 msgid "RxSrch" msgstr "VanUtSøk" -#: src/view.c:2083 +#: src/view.c:2080 msgid "EdText" msgstr "RedTekst" -#: src/view.c:2083 +#: src/view.c:2080 msgid "EdHex" msgstr "RedHeks" -#: src/view.c:2085 +#: src/view.c:2082 msgid "UnWrap" msgstr "Fjern bryting" -#: src/view.c:2085 +#: src/view.c:2082 msgid "Wrap" msgstr "Bryt" -#: src/view.c:2088 +#: src/view.c:2085 msgid "HxSrch" msgstr "HexSøk" -#: src/view.c:2091 +#: src/view.c:2088 msgid "Raw" msgstr "Rått" -#: src/view.c:2091 +#: src/view.c:2088 msgid "Parse" msgstr "Tolk" -#: src/view.c:2095 +#: src/view.c:2092 msgid "Unform" msgstr "Fjern format" -#: src/view.c:2095 +#: src/view.c:2092 msgid "Format" msgstr "Format" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr " Historikk " @@ -6265,29 +6457,88 @@ msgid "NumLock on keypad" msgstr "NumLock på numerisk tastatur" -#: vfs/direntry.c:312 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"Kunne ikke åpne cpio arkiv\n" +"%s" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" +"Prematur slutt på cpio arkiv\n" +"%s" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "" +"Korrupt cpio header funnet i\n" +"%s" + +#: vfs/cpio.c:427 +#, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "" +"Ukonsistente harde lenker til\n" +"%s\n" +"i cpio arkiv\n" +"%s" + +#. 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 "%s inneholder duplikerte oppføringer! Hopper over!" + +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" +"Uventet slutt på fil\n" +"%s" + +#: vfs/direntry.c:300 #, c-format msgid "Dir cache expired for %s" msgstr "Katalog-cache utgått for %s" -#: vfs/direntry.c:444 vfs/direntry.c:447 +#: vfs/direntry.c:430 vfs/direntry.c:433 msgid " Direntry warning " msgstr " Advarsel for katalogoppføring " -#: vfs/direntry.c:444 +#: vfs/direntry.c:430 #, c-format msgid "Super ino_usage is %d, memory leak" msgstr "Super ino_usage er %d, minnelekkasje" -#: vfs/direntry.c:447 +#: vfs/direntry.c:433 msgid "Super has want_stale set" msgstr "Super har want_stale sett" -#: vfs/direntry.c:821 +#: vfs/direntry.c:811 msgid "Starting linear transfer..." msgstr "Starter lineær overføring..." -#: vfs/direntry.c:964 +#: vfs/direntry.c:956 msgid "Getting file" msgstr "Henter fil" @@ -6304,215 +6555,219 @@ msgid "Inconsistent extfs archive" msgstr "Ukonsistent extfs arkiv" -#: vfs/fish.c:138 +#: vfs/fish.c:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Kobler fra %s" -#: vfs/fish.c:216 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: Venter på innledende linje..." -#: vfs/fish.c:226 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Beklager, vi kan ikke gjøre passordautentiserte forbindelser ennå." -#: vfs/fish.c:231 +#: vfs/fish.c:233 msgid " fish: Password required for " msgstr " fish: Passord nødvendig for " -#: vfs/fish.c:240 +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: Sender passord..." -#: vfs/fish.c:246 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: Sender innledende linje..." -#: vfs/fish.c:250 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: Handshaking versjon..." -#: vfs/fish.c:254 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: Setter opp aktiv katalog..." -#: vfs/fish.c:256 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Tilkoblet, hjemme %s." -#: vfs/fish.c:332 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Leser katalog %s..." -#: vfs/fish.c:428 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: feilet" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:448 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: lager %s: sender kommando..." -#: vfs/fish.c:462 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: Lokal lesekommando feilet, sender nuller" -#: vfs/fish.c:474 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: lagrer %s %d (%d)" -#: vfs/fish.c:514 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "nuller" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "Avbryter overføring..." -#: vfs/fish.c:523 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "Feil rapportert etter avbrudd." -#: vfs/fish.c:525 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "Avbrutt overføring ville vært i orden." -#: vfs/ftpfs.c:312 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Kobler fra %s" -#: vfs/ftpfs.c:370 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: Passord nødvendig for " -#: vfs/ftpfs.c:403 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: Passord nødvendig for " -#: vfs/ftpfs.c:429 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: sender innloggingsnavn for proxy" -#: vfs/ftpfs.c:433 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: sender brukers passord til proxy" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: autentisering mot proxy i orden" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: tilkoblet til %s" -#: vfs/ftpfs.c:458 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: sender innloggingsnavn" -#: vfs/ftpfs.c:463 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: sender brukers passord" -#: vfs/ftpfs.c:468 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: logget inn" -#: vfs/ftpfs.c:483 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Innlogging ukorrekt for bruker %s " -#: vfs/ftpfs.c:515 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " Kunne ikke sette opp kilderuting (%s)" -#: vfs/ftpfs.c:644 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Ugyldig vertsnavn." -#: vfs/ftpfs.c:664 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Ugyldig vertsadresse." -#: vfs/ftpfs.c:687 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: setter opp forbindelse til %s" -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: tilkobling avbrutt av bruker" -#: vfs/ftpfs.c:699 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: tilkobling til tjener feilet: %s" -#: vfs/ftpfs.c:741 +#: vfs/ftpfs.c:744 #, 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:914 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: kunne ikke sette opp passiv modus" -#: vfs/ftpfs.c:989 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: avbryter overføring." -#: vfs/ftpfs.c:991 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: avbrytlsesfeil: %s" -#: vfs/ftpfs.c:996 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: avbrudd feilet" -#: vfs/ftpfs.c:1085 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD feilet." -#: vfs/ftpfs.c:1095 vfs/ftpfs.c:1102 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: kunne ikke følge symbolsk lenke" -#: vfs/ftpfs.c:1153 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "Finner symlink..." -#: vfs/ftpfs.c:1171 +#: vfs/ftpfs.c:1188 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: Leser FTP katalog %s... %s%s" -#: vfs/ftpfs.c:1172 +#: vfs/ftpfs.c:1189 msgid "(strict rfc959)" msgstr "(følg rfc959)" -#: vfs/ftpfs.c:1173 +#: vfs/ftpfs.c:1190 msgid "(chdir first)" msgstr "(chdir først)" -#: vfs/ftpfs.c:1268 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "ftpfs: feilet" -#: vfs/ftpfs.c:1278 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: feilet; ingen steder å falle tilbake til" -#: vfs/ftpfs.c:1341 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: lagrer fil %d (%d)" -#: vfs/ftpfs.c:1756 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6582,24 +6837,24 @@ msgid "Midnight Commander's private remote filesystem" msgstr "Midnight Commander's private eksterne filsystem" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "Domene:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "Brukernavn:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "Passord: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "Passord for \\\\%s\\%s" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6608,22 +6863,26 @@ "forsøk på å koble til %s på nytt feilet\n" " " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr " Autentisering feilet " + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s lager katalog %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s sletter katalog %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s åpner ekstern fil %s" -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s endrer navn på filer\n" @@ -6656,90 +6915,90 @@ "%s\n" "ser ikke ut som et tar-arkiv." -#: vfs/vfs.c:1158 +#: vfs/vfs.c:1151 msgid "Changes to file lost" msgstr "Endringer i filen tapt" -#: vfs/vfs.c:1798 +#: vfs/vfs.c:1794 msgid "Could not parse:" msgstr "Kunne ikke fortolke:" -#: vfs/vfs.c:1800 +#: vfs/vfs.c:1796 msgid "More parsing errors will be ignored." msgstr "Flere fortolkningsfeil vil bli ignorert." -#: vfs/vfs.c:1800 +#: vfs/vfs.c:1796 msgid "(sorry)" msgstr "(beklager)" -#: vfs/vfs.c:1811 +#: vfs/vfs.c:1807 msgid "Internal error:" msgstr "Intern feil:" -#: vfs/vfs.c:1821 +#: vfs/vfs.c:1817 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld bytes overført)" -#: vfs/vfs.c:1822 +#: vfs/vfs.c:1818 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes overført" -#: vfs/undelfs.c:80 +#: vfs/undelfs.c:81 msgid " undelfs: error " msgstr " undelfs: feil " -#: vfs/undelfs.c:183 +#: vfs/undelfs.c:184 msgid " not enough memory " msgstr " ikke nok minne " -#: vfs/undelfs.c:188 +#: vfs/undelfs.c:189 msgid " while allocating block buffer " msgstr " under allokering av blokkbuffer " -#: vfs/undelfs.c:192 +#: vfs/undelfs.c:193 #, c-format msgid " open_inode_scan: %d " msgstr " open_inode_scan: %d " -#: vfs/undelfs.c:196 +#: vfs/undelfs.c:197 #, c-format msgid " while starting inode scan %d " msgstr " under start av inodeskann %d " -#: vfs/undelfs.c:203 +#: vfs/undelfs.c:204 #, c-format msgid "undelfs: loading deleted files information %d inodes" msgstr "undelfs: laster informasjon om slettede filer %d inoder" -#: vfs/undelfs.c:218 +#: vfs/undelfs.c:219 #, c-format msgid " while calling ext2_block_iterate %d " msgstr " under kall til ext2_block_iterate %d " -#: vfs/undelfs.c:226 +#: vfs/undelfs.c:227 msgid " no more memory while reallocating array " msgstr " ikke mer minne under reallokasjon av matrise " -#: vfs/undelfs.c:245 +#: vfs/undelfs.c:246 #, c-format msgid " while doing inode scan %d " msgstr " under skanning av inode %d " -#: vfs/undelfs.c:269 +#: vfs/undelfs.c:270 msgid " Ext2lib error " msgstr " Ext2lib feil " -#: vfs/undelfs.c:296 +#: vfs/undelfs.c:297 #, c-format msgid " Could not open file %s " msgstr " Kunne ikke åpne filen %s " -#: vfs/undelfs.c:299 +#: vfs/undelfs.c:300 msgid "undelfs: reading inode bitmap..." msgstr "undelfs: leser inode bitmap..." -#: vfs/undelfs.c:302 +#: vfs/undelfs.c:303 #, c-format msgid "" " Could not load inode bitmap from: \n" @@ -6748,11 +7007,11 @@ " Kunne ikke laste inode bitmap fra: \n" " %s \n" -#: vfs/undelfs.c:305 +#: vfs/undelfs.c:306 msgid "undelfs: reading block bitmap..." msgstr "undelfs: leser blokk bitmap..." -#: vfs/undelfs.c:308 +#: vfs/undelfs.c:309 #, c-format msgid "" " Could not load block bitmap from: \n" @@ -6761,32 +7020,32 @@ " Kunne ikke laste blokk bitmap fra: \n" " %s \n" -#: vfs/undelfs.c:314 +#: vfs/undelfs.c:315 msgid "undelfs: done." msgstr "undelfs: ferdig." -#: vfs/undelfs.c:317 +#: vfs/undelfs.c:318 msgid "undelfs: failure" msgstr " undelfs: feilet " -#: vfs/undelfs.c:341 +#: vfs/undelfs.c:342 msgid " vfs_info is not fs! " msgstr "vfs_info er ikke fs! " -#: vfs/undelfs.c:397 vfs/undelfs.c:581 +#: vfs/undelfs.c:398 vfs/undelfs.c:582 msgid " You have to chdir to extract files first " msgstr "Du må endre katalog før du henter ut filene " -#: vfs/undelfs.c:520 +#: vfs/undelfs.c:521 msgid " while iterating over blocks " msgstr " under iterasjon over blokker " -#: vfs/undelfs.c:625 +#: vfs/undelfs.c:626 #, c-format msgid " Could not open file: %s " msgstr " Kunne ikke åpne fil: %s " #. This is place of next pointer -#: vfs/undelfs.c:683 +#: vfs/undelfs.c:684 msgid "Undelete filesystem for ext2" msgstr "Undelete filsystem for ext2" diff -ruN old/mc-4.5.44/po/ru.po new/mc-4.5.45/po/ru.po --- old/mc-4.5.44/po/ru.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/ru.po Tue May 9 18:52:09 2000 @@ -6,38 +6,38 @@ # Andrew V. Samoilov , 1999, # and Alex Tkachenko , 1998. # -# $Id: ru.po,v 1.26 1999/12/13 14:22:02 sipan Exp $ +# $Id: ru.po,v 1.27 2000/05/07 10:35:31 frob Exp $ # msgid "" msgstr "" "Project-Id-Version: mc 4.5.40\n" -"POT-Creation-Date: 1999-12-13 03:51-0500\n" -"PO-Revision-Date: 1999-12-12 23:56-0200\n" +"POT-Creation-Date: 2000-05-05 20:19+0000\n" +"PO-Revision-Date: 2000-05-07 14:42+00:00\n" "Last-Translator: Evgeny Bulgakov \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8\n" "Content-Transfer-Encoding: 8bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr " ëÌÁ×ÉÛÁ 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 " ÷ÙÐÏÌÎÉÔØ ÍÁËÒÏÓ " #. 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 " îÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ: " @@ -93,15 +93,15 @@ "ËÏÍÁÎÄÏÊ:\n" "\"%s\"%s" -#: 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 "ÐÒÏÓÍÏÔÒ" @@ -109,6 +109,10 @@ msgid " There is no other panel to compare contents to " msgstr " îÅÔ ÄÒÕÇÏÊ ÐÁÎÅÌÉ ÄÌÑ ÓÒÁ×ÎÅÎÉÑ ÓÏÄÅÒÖÉÍÏÇÏ " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ ÔÅÒÍÉÎÁÌ " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "ëÏÍÁÎÄÁ Midnight Commander" @@ -215,7 +219,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 "ðÏËÁÚÙ×ÁÔØ ×ÓÅ ÆÁÊÌÙ" @@ -292,8 +296,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 "çÒÕÐÐÁ" @@ -319,7 +323,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 "÷ÌÁÄÅÌÅÃ" @@ -352,28 +356,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 "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %s; ÎÅ ÂÕÄÅÔ ÐÉËÔÏÇÒÁÍÍ ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ" -#: gnome/gdesktop.c:1186 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "ðÒÉ ÉÓÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ mount/umount" -#: gnome/gdesktop.c:1255 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "ðÒÉ ÉÓÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ eject" -#: 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" @@ -387,84 +391,84 @@ "\n" "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÆÏÎÏ×ÏÅ ÉÚÏÂÒÁÖÅÎÉÅ." -#: 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 "óÓÙÌËÁ URL..." -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" msgstr "óÏÚÄÁÔØ ÎÏ×ÕÀ ÓÓÙÌËÕ URL" -#: 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 "îÁÓÔÒÏÉÔØ ÆÏÎ" @@ -560,12 +564,12 @@ msgid "Replace it?" 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 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2398 src/screen.c:2428 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 "ðÅÒÅÍÅÓÔÉÔØ" @@ -662,7 +666,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:1833 msgid "Password:" msgstr "ðÁÒÏÌØ:" @@ -683,24 +687,24 @@ 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" @@ -709,8 +713,8 @@ "îÅ×ÏÚÍÏÖÎÏ ÐÒÏ×ÅÒÉÔØ %s\n" "%s" -#: 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 "" "óÔÁÎÄÁÒÔÎÙÊ ÎÁÂÏÒ ÐÉËÔÏÇÒÁÍÍ ÎÅ ÎÁÊÄÅÎ, ÐÒÏ×ÅÒØÔÅ ÐÒÁ×ÉÌØÎÏÓÔØ ÕÓÔÁÎÏ×ËÉ" @@ -803,7 +807,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 "ëÏÐÉÒÏ×ÁÔØ..." @@ -811,7 +815,7 @@ msgid "Copy files" msgstr "ëÏÐÉÒÏ×ÁÔØ ÆÁÊÌÙ" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "õÄÁÌÉÔØ..." @@ -819,7 +823,7 @@ msgid "Delete files" msgstr "õÄÁÌÉÔØ ÆÁÊÌÙ" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "ðÅÒÅÍÅÓÔÉÔØ..." @@ -867,7 +871,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:2085 msgid "Search" msgstr "ðÏÉÓË" @@ -875,7 +879,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 "ðÅÒÅÓÍÏÔÒÅÔØ ËÁÔÁÌÏÇ" @@ -984,285 +988,286 @@ "ëÁË root, ×Ù ÍÏÖÅÔÅ ÓÌÕÞÁÊÎÏ ÐÏ×ÒÅÄÉÔØ ×ÁÛÕ ÓÉÓÔÅÍÕ.äÉÓÐÅÔÞÅÒ ÆÁÊÌÏ× GNOME " "ÎÅ ÓÍÏÖÅÔ ÐÏÍÅÛÁÔØ ×ÁÍ × ÜÔÏÍ." -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ /etc/fstab" -#: 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 "" "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ÓÓÙÌËÕ %s Ë %s. îÅ ÂÕÄÅÔ ÐÉËÔÏÇÒÁÍÍÙ ÎÁ ÒÁÂÏÞÅÍ ÓÔÏÌÅ." -#: 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 "äÉÓËÅÔÁ %d" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "äÉÓË %d" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "NFS ËÁÔÁÌÏÇ %s" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "õÓÔÒÏÊÓÔ×Ï %d" #. 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 "ôÉÐ ÆÁÊÌÁ: Socket" -#: gnome/gnome-file-property-dialog.c:228 +#: gnome/gnome-file-property-dialog.c:238 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 +#: 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 "URL:" -#: 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 -#: src/screen.c:2397 src/screen.c:2427 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 +#: src/screen.c:2396 src/screen.c:2426 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:2397 src/screen.c:2427 src/view.c:2081 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 "ðÒÉÓ×ÏÉÔØ 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 "ðÒÉÓ×ÏÉÔØ 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 "úÁËÒÅÐÌÅÎÉÅ" -#: 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 "ðÒÉÎÁÄÌÅÖÎÏÓÔØ" -#: 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 "óÔÁÔÉÓÔÉËÁ" -#: 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 "÷Ù ÎÅ ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÓÉÍ×ÏÌ '/' × ÉÍÅÎÉ ÆÁÊÌÁ" @@ -1308,8 +1313,8 @@ msgid "Copy..." msgstr "ëÏÐÉÒÏ×ÁÔØ..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2401 +#: src/screen.c:2431 msgid "Delete" msgstr "õÄÁÌÉÔØ" @@ -1349,71 +1354,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÏÂÒÁÚÃÙ ËÏÍÁÎÄÎÏÊ ÓÔÒÏËÉ ×ÍÅÓÔÏ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" -#: 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 "ðÏÄÔ×ÅÒÖÄÅÎÉÅ ÐÒÉ ÕÄÁÌÅÎÉÉ ÆÁÊÌÁ" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "ðÏÄÔ×ÅÒÖÄÅÎÉÅ ÐÅÒÅÄ ÐÅÒÅÚÁÐÉÓØÀ ÆÁÊÌÏ×" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "ðÏÄÔ×ÅÒÖÄÅÎÉÅ ÐÅÒÅÄ ÚÁÐÕÓËÏÍ ÆÁÊÌÏ×" -#: gnome/gprefs.c:125 +#: 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 "ðÁÒÏÌØ ÁÎÏÎÉÍÎÏÇÏ FTP:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "÷ÓÅÇÄÁ ÉÓÐÏÌØÚÏ×ÁÔØ FTP ÐÒÏËÓÉ" -#: 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 "ôÁÊÍ-ÁÕÔ ËÅÛÁ ËÁÔÁÌÏÇÁ FTP:" -#: 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 "ó×ÏÊÓÔ×Á" @@ -1457,108 +1466,108 @@ 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 "éÝÅÍ: %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 "íÅÓÔÏ:" #. 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&äÁÌØÛÅ" @@ -1567,12 +1576,12 @@ msgid "Offset 0x%08lx" msgstr "óÍÅÝÅÎ. 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "óÔ. %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s ÂÁÊÔ" @@ -1662,56 +1671,81 @@ msgid "Could not get the desktop\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÒÁÂÏÞÉÊ ÓÔÏÌ\n" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "îÅÉÚ×ÅÓÔÎÙÊ ÔÉÐ ËÌÁÓÓÉÆÉËÁÃÉÉ `%s'\n" + +#: 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/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. " @@ -1719,144 +1753,148 @@ " \n" " õ×ÅÌÉÞØÔÅ edit.h:MAXBUF É ÐÅÒÅËÏÍÐÉÌÉÒÕÊÔÅ ÒÅÄÁËÔÏÒ. " -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr " ïÛÉÂËÁ ×ÙÄÅÌÅÎÉÑ ÐÁÍÑÔÉ " +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " ïÛÉÂËÁ ÚÁÐÉÓÉ × ËÁÎÁÌ: " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr " óÂÏÊ ÏÔËÒÙÔÉÑ ËÁÎÁÌÁ ÄÌÑ ÚÁÐÉÓÉ: " -#: gtkedit/editcmd.c:334 +#: 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 -#: vfs/smbfs.c:116 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 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: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 +#: 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:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 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 "ËÌÁ×ÉÛÁ '%d 0': " -#: 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:2077 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. " @@ -1864,118 +1902,113 @@ " ôÅËÕÝÉÊ ÔÅËÓÔ ÂÙÌ ÍÏÄÉÆÉÃÉÒÏ×ÁÎ É ÎÅ ÓÏÈÒÁÎÅÎ. \n" " ðÒÏÄÏÌÖÅÎÉÅ ÏÐÅÒÁÃÉÉ ÐÒÉ×ÅÄÅÔ Ë ÐÏÔÅÒÅ ÉÚÍÅÎÅÎÉÊ. " -#: 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 "×ÙÒÁÖÅÎÉÅ &scanf" -#: 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 " ÷×ÅÄÉÔÅ ÐÏÒÑÄÏË ÁÒÇÕÍÅÎÔÏ× ÚÁÍÅÎÙ, ÎÁÐÒ. 3,2,1,4 " -#: 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:2000 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:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 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" @@ -1984,12 +2017,12 @@ "÷Ù ÍÏÖÅÔÅ ××ÅÓÔÉ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ Ó %s\n" "(ÎÅ \\1, \\2 ËÁË sed), ÚÁÔÅÍ \"÷×ÅÓÔÉ...ÐÏÒÑÄÏË\"" -#: 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" @@ -1998,19 +2031,19 @@ "ÉÌÉ ÐÏÄÓÔÒÏË regexp, ÎÁÐÒÉÍÅÒ 3,1,2" #. 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" @@ -2018,34 +2051,48 @@ "óÍ. ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ regex ÄÌÑ ÐÏÌÕÞÅÎÉÑ\n" "ÐÒÁ×ÉÌ ÓÏÓÔÁ×ÌÅÎÉÑ ÒÅÇÕÌÑÒÎÙÈ ×ÙÒÁÖÅÎÉÊ" -#: 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 " ×ÙÒÁÖÅÎÉÑ scanf " #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1481 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2054,57 +2101,62 @@ "ÓÍ. ÒÕËÏ×ÏÄÓÔ×Ï ÐÏ ËÏÍÁÎÄÅ scanf" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1506 msgid "Begin search, Enter" msgstr "îÁÞÁÔØ ÐÏÉÓË, Enter" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "ðÒÅÒ×ÁÔØ ÜÔÏÔ ÄÉÁÌÏÇ, Esc" -#: 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 "" " îÅ×ÅÒÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ ÉÌÉ × scanf-ÆÏÒÍÁÔÅ ÍÎÏÇÏ ÐÒÅÏÂÒÁÚÏ×ÁÎÉÊ" #. "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 " ïÓÕÝÅÓÔ×ÌÅÎÏ ÐÏÄÓÔÁÎÏ×ÏË: %ld " -#: 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 " %d ÎÁÊÄÅÎÏ, %d ÚÁËÌÁÄÏË ÄÏÂÁ×ÌÅÎÏ " + #. 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? " @@ -2112,137 +2164,137 @@ " ôÅËÕÝÉÊ ÔÅËÓÔ ÂÙÌ ÍÏÄÉÆÉÃÉÒÏ×ÁÎ É ÎÅ ÓÏÈÒÁÎÅÎ. \n" " óÏÈÒÁÎÉÔØ ÐÒÉ ×ÙÈÏÄÅ? " -#: 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:862 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:406 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:862 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:406 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:1915 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 " ÷×ÅÄÉÔÅ ÐÁÒÁÍÅÔÒÙ ÓÏÒÔÉÒÏ×ËÉ (man sort(1)), ÒÁÚÄÅÌÅÎÎÙÅ ÐÒÏÂÅÌÁÍÉ " -#: 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 " ïÛÉÂËÁ ÐÒÉ ×ÙÐÏÌÎÅÎÉÉ ËÏÍÁÎÄÙ sort " #. 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 " mail -s <ôÅÍÁ> -c <ëÏÐÉÉ> <ëÏÍÕ>" @@ -2277,341 +2329,349 @@ " ôÅËÓÔÏ×ÙÊ ÒÅÄÁËÔÏÒ Ó ÄÒÕÖÅÓÔ×ÅÎÎÙÍ ÉÎÔÅÒÆÅÊÓÏÍ ÐÏÌØÚÏ×ÁÔÅÌÑ.\n" " óÏÚÄÁÎ ÄÌÑ 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 "&ïÔËÒÙÔØ ÆÁÊÌ... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "&îÏ×ÙÊ ÆÁÊÌ C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "&óÏÈÒÁÎÉÔØ F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "óÏÈÒÁÎÉÔØ &ËÁË... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "&÷ÓÔÁ×ÉÔØ ÆÁÊÌ... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "&ëÏÐÉÒÏ×ÁÔØ × ÆÁÊÌ... C-f" -#: 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 "÷Ù&ÈÏÄ F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" msgstr "&îÏ×ÙÊ ÆÁÊÌ C-x k" -#: 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 "&÷ÙÄÅÌÅÎÉÅ ÂÌÏËÁ F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:157 gtkedit/editmenu.c:174 msgid "&Mark Columns S-F3" msgstr "÷ÙÄÅÌÉÔØ &ÓÔÏÌÂÃÙ S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:159 gtkedit/editmenu.c:176 msgid "toggle &Ins/overw Ins" msgstr "&òÅÖÉÍ ×ÓÔÁ×ËÉ/ÚÁÍÅÎÙ Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 msgid "&Copy F5" msgstr "&ëÏÐÉÒÏ×ÁÔØ ÂÌÏË F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "&ðÅÒÅÍÅÓÔÉÔØ ÂÌÏË F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "&õÄÁÌÉÔØ ÂÌÏË F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "&ïÔËÁÔ ÏÐÅÒÁÃÉÉ C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "&îÁÞÁÌÏ ÆÁÊÌÁ C-PgUp" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "ëÏÎÅà &ÆÁÊÌÁ C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "&ðÏÉÓË... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "&úÁÍÅÎÁ... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "&ðÅÒÅÊÔÉ Ë ÓÔÒÏËÅ 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 "ÐÅÒÅÊÔÉ Ë ÐÁÒÎÏÊ ÓËÏÂËÅ M-b" + +#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:230 msgid "insert &Literal... C-q" msgstr "÷ÓÔÁ×ÉÔØ &ÌÉÔÅÒÁÌ... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "ðÅÒÅ&ÒÉÓÏ×ÁÔØ ÜËÒÁÎ 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 "&îÁÞÁÔØ ÚÁÐÉÓØ ÍÁËÒÏÓÁ 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 "&ïËÏÎÞÉÔØ ÚÁÐÉÓØ ÍÁËÒÏÓÁ... C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "&÷ÙÐÏÌÎÉÔØ ÍÁËÒÏÓ... C-a, KEY" -#: 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 "æÏÒÍÁÔÉÒÏ×ÁÔØ &ÁÂÚÁà M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:219 msgid "'ispell' s&Pell check C-p" msgstr "&ëÏÎÔÒÏÌØ ÏÒÆÏÇÒÁÆÉÉ C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:220 gtkedit/editmenu.c:243 msgid "sor&T... M-t" msgstr "&óÏÒÔÉÒÏ×ËÁ M-t" -#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "'indent' &C Formatter F19" msgstr "&æÏÒÍÁÔÉÒÏ×ÁÔØ ó-ÐÒÏÇÒÁÍÍÕ F19" -#: 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 "&÷ÙÐÏÌÎÉÔØ ÍÁËÒÏÓ... C-x e, KEY" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:242 msgid "'ispell' s&Pell check M-$" msgstr "&ëÏÎÔÒÏÌØ ÏÒÆÏÇÒÁÆÉÉ M-$" -#: 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:1354 +#: 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 "ïÔËÒÙÔØ...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "îÏ×ÙÊ\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "óÏÈÒÁÎÉÔØ\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "óÏÈÒÁÎÉÔØ ËÁË...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "÷ÓÔÁ×ÉÔØ ÆÁÊÌ...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "ëÏÐÉÒÏ×ÁÔØ × ÆÁÊÌ... C-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 "÷ÙÄÅÌÅÎÉÅ ÂÌÏËÁ\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:417 msgid "Toggle mark columns\tC-b" msgstr "÷ÙÄÅÌÅÎÉÅ ÓÔÏÌÂÃÏ×\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:419 msgid "Toggle book mark\tC-M-Ins" msgstr "õÓÔÁÎÏ×ÉÔØ ÚÁËÌÁÄËÕ\tC-M-Ins" -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:420 msgid "Previous book mark\tC-M-Up" msgstr "ðÒÅÄÙÄÕÝÁÑ ÚÁËÌÁÄËÁ\tC-M-Up" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:421 msgid "Next book mark\tC-M-Down" msgstr "óÌÅÄÕÀÝÁÑ ÚÁËÌÁÄËÁ\tC-M-Down" -#: 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 "òÅÖÉÍ ×ÓÔÁ×ËÉ/ÚÁÍÅÎÙ\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:426 msgid "Copy block to cursor\tF5" msgstr "ëÏÐÉÒÏ×ÁÔØ ÂÌÏË × ÐÏÚÉÃÉÀ\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "ðÅÒÅÍÅÓÔÉÔØ ÂÌÏË × ÐÏÚÉÃÉÀ\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "õÄÁÌÉÔØ ÂÌÏË\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "ëÏÐÉÒÏ×ÁÔØ ÂÌÏË × ÂÕÆÅÒ\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "÷ÙÒÅÚÁÔØ ÂÌÏË × ÂÕÆÅÒ\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "÷ÓÔÁ×ÉÔØ ÂÌÏË ÉÚ ÂÕÆÅÒÁ\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:433 msgid "Selection history\tM-Ins" msgstr "éÓÔÏÒÉÑ ×ÙÂÏÒÁ\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:435 msgid "Undo\tC-BackSpace" msgstr "ïÔËÁÔ\tC-BackSpace" #. 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 "ðÏÉÓË...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "ðÒÏÄÏÌÖÉÔØ ÐÏÉÓË\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "&úÁÍÅÎÁ...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "ðÒÏÄÏÌÖÉÔØ ÚÁÍÅÎÕ\tF14" #. 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 "ðÅÒÅÊÔÉ Ë ÓÔÒÏËÅ...\tM-l" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:457 +msgid "Goto matching bracket\tM-b" +msgstr "ðÅÒÅÊÔÉ Ë ÐÁÒÎÏÊ ÓËÏÂËÅ M-b" + +#: gtkedit/editmenu.c:459 msgid "Start record macro\tC-r" msgstr "îÁÞÁÔØ ÚÁÐÉÓØ ÍÁËÒÏÓÁ\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "úÁËÏÎÞÉÔØ ÚÁÐÉÓØ ÍÁËÒÏÓÁ...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "÷ÙÐÏÌÎÉÔØ ÍÁËÒÏÓ...\tC-a, KEY" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "õÄÁÌÉÔØ ÍÁËÒÏÓ...\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "÷ÓÔÁ×ÉÔØ ÄÁÔÕ/×ÒÅÍÑ\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "æÏÒÍÁÔÉÒÏ×ÁÔØ ÁÂÚÁÃ\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ ÜËÒÁÎ C-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "íÁËÒÏÓÙ É ×ÎÕÔÒÅÎÎÉÅ ËÏÍÁÎÄÙ" @@ -2636,84 +2696,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 "ïÛÉÂËÁ ÉÎÉÃÉÁÌÉÚÁÃÉÉ ÒÅÄÁËÔÏÒÁ.\n" -#: gtkedit/editwidget.c:1093 gtkedit/gtkedit.c:1246 src/help.c:806 -#: src/main.c:1720 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:2394 src/screen.c:2424 src/tree.c:1008 +#: src/view.c:2070 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:1722 +#: gtkedit/editwidget.c:1145 src/main.c:1723 msgid "PullDn" msgstr "íÅÎÀMC" #. gtk_edit_menu -#: gtkedit/editwidget.c:1103 gtkedit/gtkedit.c:1256 src/help.c:818 -#: src/main.c:1723 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:2072 src/view.c:2094 msgid "Quit" msgstr "÷ÙÈÏÄ" @@ -2780,7 +2840,7 @@ msgid "Delete highlighted text" msgstr "õÄÁÌÉÔØ ×ÙÄÅÌÅÎÎÙÊ ÔÅËÓÔ" -#: gtkedit/gtkedit.c:1255 src/main.c:1721 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2395 src/screen.c:2425 msgid "Menu" msgstr "íÅÎÀ" @@ -2816,12 +2876,12 @@ 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" @@ -2831,7 +2891,7 @@ " ðÒÏ×ÅÒØÔÅ, ÞÔÏ ispell ÄÏÓÔÕÐÎÁ ÞÅÒÅÚ PATH É ÒÁÂÏÔÁÅÔ Ó ËÌÀÞÏÍ -a. \n" " ÷ÏÚÍÏÖÎÏ ÔÁËÖÅ ÏÔËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ÏÒÆÏÇÒÁÆÉÉ × ÍÅÎÀ ëÏÍÁÎÄÁ. " -#: 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" @@ -2841,7 +2901,7 @@ " ðÒÏ×ÅÒØÔÅ, ÞÔÏ ispell ÄÏÓÔÕÐÎÁ ÞÅÒÅÚ PATH É ÒÁÂÏÔÁÅÔ Ó ËÌÀÞÏÍ -a. \n" " ÷ÏÚÍÏÖÎÏ ÔÁËÖÅ ÏÔËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ÏÒÆÏÇÒÁÆÉÉ × ÍÅÎÀ ëÏÍÁÎÄÁ. " -#: 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" @@ -2851,7 +2911,7 @@ " ðÒÏ×ÅÒØÔÅ, ÞÔÏ ispell ÄÏÓÔÕÐÎÁ ÞÅÒÅÚ PATH É ÒÁÂÏÔÁÅÔ Ó ËÌÀÞÏÍ -a. \n" " ÷ÏÚÍÏÖÎÏ ÔÁËÖÅ ÏÔËÌÀÞÉÔØ ÐÒÏ×ÅÒËÕ ÏÒÆÏÇÒÁÆÉÉ × ÍÅÎÀ ëÏÍÁÎÄÁ. " -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1096 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2859,11 +2919,11 @@ " ïÛÉÂËÁ ÞÔÅÎÉÑ ÉÚ ispell. \n" " ðÅÒÅÚÁÐÕÓË ispell. " -#: 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" @@ -2873,15 +2933,15 @@ " îÏ×ÙÊ ÆÁÊÌ ÐÒÁ×ÉÌ ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ. \n" " ÷ÁÛ ÓÔÁÒÙÊ ÆÁÊÌ ÐÒÁ×ÉÌ ÓÏÈÒÁÎÅÎ Ó ÒÁÓÛÉÒÅÎÉÅÍ .OLD. " -#: 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 " ïÛÉÂËÁ × ÆÁÊÌÅ %s × ÓÔÒÏËÅ %d " @@ -3486,44 +3546,44 @@ msgid " Enter machine name (F1 for details): " msgstr " ÷×ÅÄÉÔÅ ÉÍÑ ÍÁÛÉÎÙ (ÄÅÔÁÌÉ ÐÏ F1): " -#: src/cmd.c:1360 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr " îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × %s " -#: src/cmd.c:1367 +#: src/cmd.c:1370 src/widget.c:1163 msgid " Link to a remote machine " msgstr " óÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ " -#: src/cmd.c:1373 +#: src/cmd.c:1376 src/widget.c:1164 msgid " FTP to machine " msgstr " FTP-ÓÏÅÄÉÎÅÎÉÅ Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÏÊ " -#: src/cmd.c:1379 +#: src/cmd.c:1382 src/widget.c:1165 msgid " SMB link to machine " msgstr " SMB Ó×ÑÚØ Ó ÍÁÛÉÎÏÊ " -#: 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:1401 msgid " Host name " msgstr " éÍÑ ÓÉÓÔÅÍÙ " -#: src/cmd.c:1397 +#: src/cmd.c:1401 msgid " Error while looking up IP address " msgstr " ïÛÉÂËÁ ÐÏÉÓËÁ IP ÁÄÒÅÓÁ " -#: src/cmd.c:1408 +#: src/cmd.c:1412 msgid " Undelete files on an ext2 file system " msgstr " ÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÆÁÊÌÏ× ÎÁ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÅ ext2 " -#: src/cmd.c:1409 +#: src/cmd.c:1413 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3531,11 +3591,11 @@ " ÷×ÅÄÉÔÅ ÉÍÑ ÕÓÔÒÏÊÓÔ×Á (ÂÅÚ /dev/) ÎÁ ËÏÔÏÒÏÍ\n" " ×ÏÓÓÔÁÎÁ×ÌÉ×ÁÔØ ÆÁÊÌÙ ÐÏÓÌÅ ÕÄÁÌÅÎÉÑ: (ÄÅÔÁÌÉ ÐÏ F1)" -#: src/cmd.c:1459 +#: src/cmd.c:1463 msgid " Setup saved to ~/" msgstr " ðÁÒÁÍÅÔÒÙ ÓÏÈÒÁÎÅÎÙ × ~/" -#: src/cmd.c:1464 +#: src/cmd.c:1468 msgid " Setup " msgstr " îÁÓÔÒÏÊËÁ " @@ -3698,6 +3758,110 @@ msgid "mc.ext will be used for this moment." msgstr "mc.ext ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ × ÎÁÓÔÏÑÝÉÊ ÍÏÍÅÎÔ." +#: src/features.inc:8 +msgid "Edition: " +msgstr "éÚÄÁÎÉÅ: " + +#: src/features.inc:11 +msgid "XView" +msgstr "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: 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 "÷ÉÒÔÕÁÌØÎÁÑ æÁÊÌÏ×ÁÑ óÉÓÔÅÍÁ: tarfs, extfs" + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr "" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (c ÐÏÄÄÅÒÖËÏÊ termnet)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "óÏ ×ÓÔÒÏÅÎÎÙÍ ÒÅÄÁËÔÏÒÏÍ\n" + +#: 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 "S-lang ÂÉÂÌÉÏÔÅËÁ Ó " + +#: src/features.inc:56 +msgid "terminfo" +msgstr "terminfo" + +#: src/features.inc:59 +msgid "termcap" +msgstr "termcap" + +#: 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 "ÂÉÂÌÉÏÔÅËÁ ncurses" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "ÎÅËÏÔÏÒÙÅ ÎÅÉÚ×ÅÓÔÎÙÅ ÂÉÂÌÉÏÔÅËÉ curses" + +#: src/features.inc:74 +msgid "With subshell support: " +msgstr "C ÐÏÄÄÅÒÖËÏÊ ×ÎÕÔÒÅÎÎÅÊ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ: " + +#: 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 "ó ÐÏÄÄÅÒÖËÏÊ ÆÏÎÏ×ÙÈ ÏÐÅÒÁÃÉÊ\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " ëÏÐÉÒÏ×ÁÎÉÅ " @@ -4060,7 +4224,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "ÆÁÊÌ" @@ -4088,11 +4252,11 @@ msgid " Can't operate on \"..\"! " msgstr " îÅ×ÏÚÍÏÖÎÏ ×ÙÐÏÌÎÉÔØ ÕËÁÚÁÎÎÕÀ ÏÐÅÒÁÃÉÀ ÎÁ \"..\"! " -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "äÁ" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "îÅÔ" @@ -4325,7 +4489,7 @@ msgid "Content: " msgstr "óÏÄÅÒÖÉÔ ÔÅËÓÔ" -#: src/find.c:171 src/main.c:1244 src/main.c:1268 +#: src/find.c:171 src/main.c:1245 src/main.c:1269 msgid "&Tree" msgstr "ä&ÅÒÅ×Ï" @@ -4350,7 +4514,7 @@ msgid "Finished" msgstr "çÏÔÏ×Ï" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "éÝÅÍ %s" @@ -4896,7 +5060,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "ÅÅ ÐÒÉ ÐÏÍÏÝÉ Tab ÉÌÉ ÍÙÛËÏÊ É ÎÁÖÍÉÔÅ ÐÒÏÂÅÌ." -#: src/main.c:708 +#: 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" @@ -4908,263 +5072,263 @@ " ÕÄÁÌÉÌÉ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÉÌÉ ÄÁÌÉ ÓÅÂÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ \n" " ÐÒÉ×ÉÌÅÇÉÉ ÄÏÓÔÕÐÁ ÐÒÉ ÐÏÍÏÝÉ ËÏÍÁÎÄÙ \"su\"? " -#: src/main.c:783 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "äÌÑ ÐÒÏÄÏÌÖÅÎÉÑ ÎÁÖÍÉÔÅ ÌÀÂÕÀ ËÌÁ×ÉÛÕ..." -#: src/main.c:833 +#: src/main.c:834 msgid " The shell is already running a command " msgstr " éÎÔÅÒÐÒÅÔÁÔÏÒ ÕÖÅ ÏÚÁÂÏÞÅÎ ×ÙÐÏÌÎÅÎÉÅÍ ËÏÍÁÎÄÙ " -#: src/main.c:860 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander " -#: src/main.c:861 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr " ÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÊÔÉ ÉÚ Midnight Commander? " -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "æÏÒ&ÍÁÔ ÓÐÉÓËÁ..." -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "&âÙÓÔÒÙÊ ÐÒÏÓÍÏÔÒ C-x q" -#: src/main.c:1243 src/main.c:1267 +#: src/main.c:1244 src/main.c:1268 msgid "&Info C-x i" msgstr "&éÎÆÏÒÍÁÃÉÑ C-x i" -#: src/main.c:1246 src/main.c:1270 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "ðÏÒÑÄÏË &ÓÏÒÔÉÒÏ×ËÉ" -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "&æÉÌØÔÒ" -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "óÅ&ÔÅ×ÏÅ ÓÏÅÄÉÎÅÎÉÅ..." -#: src/main.c:1252 src/main.c:1276 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "&FTP-ÓÏÅÄÉÎÅÎÉÅ" -#: src/main.c:1254 src/main.c:1278 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "SM&B Ó×ÑÚØ..." -#: src/main.c:1259 src/main.c:1283 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "&äÉÓË... M-d" -#: src/main.c:1261 src/main.c:1285 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "&ðÅÒÅÓÍÏÔÒÅÔØ C-r" -#: src/main.c:1289 +#: src/main.c:1290 msgid "&User menu F2" msgstr "&íÅÎÀ ÐÏÌØÚÏ×ÁÔÅÌÑ F2" -#: src/main.c:1290 +#: src/main.c:1291 msgid "&View F3" msgstr "ðÒÏÓÍÏÔÒ &ÆÁÊÌÁ F3" -#: src/main.c:1291 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "&ðÒÏÓÍÏÔÒ ÆÁÊÌÁ..." -#: src/main.c:1292 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "&ðÒÏÓÍÏÔÒ ËÏÍÁÎÄÙ M-!" -#: src/main.c:1293 +#: src/main.c:1294 msgid "&Edit F4" msgstr "&òÅÄÁËÔÉÒÏ×ÁÎÉÅ F4" -#: src/main.c:1294 +#: src/main.c:1295 msgid "&Copy F5" msgstr "&ëÏÐÉÒÏ×ÁÎÉÅ F5" -#: src/main.c:1295 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "ðÒÁ×Á &ÄÏÓÔÕÐÁ C-x c" -#: src/main.c:1297 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "&öÅÓÔËÁÑ ÓÓÙÌËÁ C-x l" -#: src/main.c:1298 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "&óÉÍ×ÏÌÉÞ. ÓÓÙÌËÁ C-x s" -#: src/main.c:1299 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "ðÒÁ×ËÁ ÓÓÙ&ÌËÉ C-x C-s" -#: src/main.c:1300 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "&÷ÌÁÄÅÌÅÃ/ÇÒÕÐÐÁ C-x o" -#: src/main.c:1301 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "ðÒ&Á×Á (ÒÁÓÛÉÒÅÎÎÙÅ) " -#: src/main.c:1303 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "ðÅÒÅ&ÉÍÅÎÏ×ÁÎÉÅ F6" -#: src/main.c:1304 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "óÏ&ÚÄÁÎÉÅ ËÁÔÁÌÏÇÁ F7" -#: src/main.c:1305 +#: src/main.c:1306 msgid "&Delete F8" msgstr "&õÄÁÌÅÎÉÅ F8" -#: src/main.c:1306 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "óÍÅ&ÎÁ ËÁÔÁÌÏÇÁ M-c" -#: src/main.c:1308 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "ïÔÍÅÔÉÔØ &ÇÒÕÐÐÕ M-+" -#: src/main.c:1309 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "óÎÑÔØ &ÏÔÍÅÔËÕ M-\\" -#: src/main.c:1310 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "éÎ×ÅÒ&ÔÉÒÏ×ÁÔØ ÏÔÍÅÔËÕ *" -#: src/main.c:1312 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "÷Ù&ÈÏÄ F10" -#: src/main.c:1322 +#: src/main.c:1323 msgid "&Directory tree" msgstr "&äÅÒÅ×Ï ËÁÔÁÌÏÇÏ×" -#: src/main.c:1324 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "ðÏÉÓË &ÆÁÊÌÁ M-?" -#: src/main.c:1325 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "&ðÅÒÅÓÔÁ×ÉÔØ ÐÁÎÅÌÉ C-u" -#: src/main.c:1326 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "&ïÔËÌÀÞÉÔØ ÐÁÎÅÌÉ C-o" -#: src/main.c:1327 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "&óÒÁ×ÎÉÔØ ËÁÔÁÌÏÇÉ C-x d" -#: src/main.c:1328 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "&ëÒÉÔÅÒÉÊ ÐÁÎÅÌÉÚÁÃÉÉ C-x !" -#: src/main.c:1329 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "&òÁÚÍÅÒÙ ËÁÔÁÌÏÇÏ×" -#: src/main.c:1331 +#: src/main.c:1332 msgid "command &History" msgstr "&éÓÔÏÒÉÑ ËÏÍÁÎÄ" -#: src/main.c:1332 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "óÐÒÁ×ÏÞÎÉË ËÁÔÁ&ÌÏÇÏ× C-\\" -#: src/main.c:1334 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "óÐÉÓÏË &ÁËÔÉ×ÎÙÈ ÷æó C-x a" -#: src/main.c:1335 +#: src/main.c:1336 msgid "Fr&ee VFSs now" -msgstr "" +msgstr "ïÓ×ÏÂÏÄÉÔØ ÷æó ÓÅÊÞÁÓ" -#: src/main.c:1338 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "æÏ&ÎÏ×ÙÅ ÚÁÄÁÎÉÑ C-x j" -#: src/main.c:1342 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "&÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÆÁÊÌÏ×" -#: src/main.c:1345 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "&òÅÄÁËÔÉÒÏ×ÁÎÉÅ ÆÏÒÍÁÔÁ" -#: src/main.c:1347 +#: src/main.c:1348 msgid "&Extension file edit" msgstr "æÁÊÌ ÒÁÓ&ÛÉÒÅÎÉÊ" -#: src/main.c:1348 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "æÁÊÌ &ÍÅÎÀ" -#: src/main.c:1353 +#: src/main.c:1354 msgid "&Configuration..." msgstr "&ëÏÎÆÉÇÕÒÁÃÉÑ" -#: src/main.c:1355 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "&ðÏÄÔ×ÅÒÖÄÅÎÉÅ" -#: src/main.c:1356 +#: src/main.c:1357 msgid "&Display bits..." msgstr "&âÉÔÙ ÓÉÍ×ÏÌÏ×..." -#: src/main.c:1358 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "&òÁÓÐÏÚÎÁ×ÁÎÉÅ ËÌÁ×ÉÛ..." -#: src/main.c:1361 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "÷ÉÒÔÕÁÌØÎÙÅ &æó..." -#: src/main.c:1364 +#: src/main.c:1365 msgid "&Save setup" msgstr "&óÏÈÒÁÎÉÔØ ÎÁÓÔÒÏÊËÉ" -#: src/main.c:1380 src/main.c:1382 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr " &ìÅ×ÁÑ ÐÁÎÅÌØ" -#: src/main.c:1382 +#: src/main.c:1383 msgid " &Above " msgstr " ÷ÅÒÈÎÑÑ " -#: src/main.c:1385 +#: src/main.c:1386 msgid " &File " msgstr " &æÁÊÌ " -#: src/main.c:1386 +#: src/main.c:1387 msgid " &Command " msgstr " &ëÏÍÁÎÄÁ " -#: src/main.c:1387 +#: src/main.c:1388 msgid " &Options " msgstr " &îÁÓÔÒÏÊËÉ " -#: src/main.c:1389 src/main.c:1391 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr " &ðÒÁ×ÁÑ ÐÁÎÅÌØ" -#: src/main.c:1391 +#: src/main.c:1392 msgid " &Below " msgstr " îÉÖÎÑÑ " -#: src/main.c:1446 +#: src/main.c:1447 msgid " Information " msgstr " éÎÆÏÒÍÁÃÉÑ " -#: src/main.c:1447 +#: 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" @@ -5176,131 +5340,268 @@ " ÐÅÒÅÚÁÇÒÕÚÉÔØ ËÁÔÁÌÏÇ. äÌÑ ÄÏÐÏÌÎÉÔÅÌØÎÏÊ ÉÎÆÏÒÍÁÃÉÉ ÓÍÏÔÒÉÔÅ \n" " ÒÕËÏ×ÏÄÓÔ×Ï (man)." -#: src/main.c:1926 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "âÌÁÇÏÄÁÒÉÍ ÷ÁÓ ÚÁ ÉÓÐÏÌØÚÏ×ÁÎÉÅ GNU Midnight Commander" -#: src/main.c:2283 +#: src/main.c:2284 #, c-format msgid "with mouse support on xterm%s.\n" msgstr "Ó ÐÏÄÄÅÒÖËÏÊ ÍÙÛÉ ÎÁ xterm%s.\n" -#: src/main.c:2284 +#: src/main.c:2285 msgid " and the Linux console" msgstr " É Linux-ËÏÎÓÏÌÉ" -#: src/main.c:2380 +#: src/main.c:2381 msgid "The TERM environment variable is unset!\n" msgstr "ðÅÒÅÍÅÎÎÁÑ ÓÒÅÄÙ TERM ÎÅ ÏÐÒÅÄÅÌÅÎÁ!\n" -#: src/main.c:2591 +#: src/main.c:2487 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" +"éÓÐÏÌØÚÕÊÔÅ:\n" +"\n" +"mc [ÆÌÁÇÉ] [ÜÔÏÔ_ËÁÔÁÌÏÇ] [ËÁÔÁÌÏÇ_ÄÒÕÇÏÊ_ÐÁÎÅÌÉ]\n" +"\n" + +#: src/main.c:2490 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "-a, --stickchars ðÒÉÎÕÄÉÔÅÌØÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ +, -, | ÄÌÑ ÒÉÓÏ×ÁÎÉÑ ÌÉÎÉÊ.\n" + +#: src/main.c:2492 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "-b, --nocolor éÓÐÏÌØÚÏ×ÁÔØ ÞÅÒÎÏ-ÂÅÌÏÅ ÉÚÏÂÒÁÖÅÎÉÅ.\n" + +#: src/main.c:2494 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "-B, --background [ôïìøëï ÄÌÑ òáúòáâïôþéëï÷: ïÔÌÁÄËÁ ÆÏÎÏ×ÏÇÏ ËÏÄÁ]\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 éÓÐÏÌØÚÏ×ÁÔØ Ã×ÅÔÎÏÊ ÒÅÖÉÍ.\n" +"-C, --colors õËÁÚÁÔØ Ã×ÅÔÁ (ÉÓÐÏÌØÚÕÊÔÅ --help-colors, ÞÔÏÂÙ ÐÏÌÕÞÉÔØ ÓÐÉÓÏË).\n" +"-d, --nomouse ïÔËÌÀÞÉÔØ ÐÏÄÄÅÒÖËÕ ÍÙÛÉ.\n" + +#: src/main.c:2500 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "-e, --edit úÁÐÕÓË ×ÓÔÒÏÅÎÎÏÇÏ ÒÅÄÁËÔÏÒÁ.\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 ðÅÞÁÔØ ÎÁÓÔÒÏÅÎÎÙÈ ÐÕÔÅÊ.\n" +"-h, --help ðÏËÁÚÁÔØ ÜÔÕ ÉÎÓÔÒÕËÃÉÀ.\n" +"-k, --resetsoft óÂÒÏÓÉÔØ ÚÁÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÎÙÅ ËÌÁ×ÉÛÉ (ÔÏÌØËÏ HP-ÔÅÒÍÉÎÁÌÙ) ÄÏ ÉÓÈÏÄÎÙÈ \n" +"terminfo/termcap\n" +" ÚÎÁÞÅÎÉÊ.\n" + +#: src/main.c:2507 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "-l, --ftplog ÆÁÊÌ úÁÐÉÓÙ×ÁÔØ ËÏÍÁÎÄÙ ftpfs × ÆÁÊÌ.\n" + +#: src/main.c:2510 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "-M, --memory ÆÁÊÌ [ôïìøëï ÄÌÑ òáúòáâïôþéëï÷: úÁÐÉÓØ óÕÍÁÓÛÅÄÛÉÈ ÓÏÏÂÝÅÎÉÊ × ÆÁÊÌ.]\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 ðÅÞÁÔÁÔØ ÐÏÓÌÅÄÎÉÊ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÐÒÉ ×ÙÈÏÄÅ.\n" +"-s, --slow ïÔËÌÀÞÉÔØ ÍÎÏÇÏÓÌÏ×ÎÙÅ ÏÐÅÒÁÃÉÉ (ÄÌÑ ÍÅÄÌÅÎÎÙÈ ÔÅÒÍÉÎÁÌÏ×).\n" + +#: src/main.c:2515 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "-t, --termcap áËÔÉ×ÉÒÏ×ÁÔØ ÐÏÄÄÅÒÖËÕ ÐÅÒÅÍÅÎÎÙÈ TERMCAP.\n" + +#: 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 "" +"-v, --view fname úÁÐÕÓË × ÒÅÖÉÍÅ ÐÒÏÓÍÏÔÒÁ ÆÁÊÌ.\n" +"\"-V, --version óÏÏÂÝÉÔØ ×ÅÒÓÉÀ É ÐÁÒÁÍÅÔÒÙ ÎÁÓÔÒÏÊËÉ.\\n\"\n" +"\"-x, --xterm ðÏÄÄÅÒÖËÁ ÍÙÛÉ × xterm É ÓÏÈÒÁÎÅÎÉÑ/×ÏÓÓÔÁÎÏ×ÌÅÎÉÑ ÜËÒÁÎÁ.\n" + +#: 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 "" +"\n" +"ðÏÖÁÌÕÊÓÔÁ, ÐÏÓÙÌÁÊÔÅ ÌÀÂÙÅ ÓÏÏÂÝÅÎÉÑ Ï ÏÛÉÂËÁ (×ËÌÀÞÁÑ ×Ù×ÏÄ 'mc -V')\n" +"ÐÏ ÁÄÒÅÓÕ 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 "" + +#: src/main.c:2596 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "âÉÂÌÉÏÔÅÞÎÙÊ ËÁÔÁÌÏÇ Midnight Commander: %s\n" -#: src/main.c:2605 +#: src/main.c:2610 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "ïÐÃÉÑ -m ÕÓÔÁÒÅÌÁ. ðÏÖÁÌÕÊÓÔÁ ×ÚÇÌÑÎÉÔÅ ÎÁ `âÉÔÙ ÓÉÍ×ÏÌÏ×' × ÍÅÎÀ îÁÓÔÒÏÊËÉ\n" -#: src/main.c:2682 +#: src/main.c:2687 msgid "Use to debug the background code" msgstr "éÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÏÔÌÁÄËÉ ÆÏÎÏ×ÏÇÏ ËÏÄÁ" -#: src/main.c:2688 +#: src/main.c:2693 msgid "Request to run in color mode" msgstr "úÁÐÒÏÓ ÎÁ ÚÁÐÕÓË × Ã×ÅÔÎÏÍ ÒÅÖÉÍÅ" -#: src/main.c:2690 +#: src/main.c:2695 msgid "Specifies a color configuration" msgstr "ïÐÒÅÄÅÌÑÅÔ ÎÁÓÔÒÏÊËÉ Ã×ÅÔÏ×" -#: src/main.c:2695 +#: src/main.c:2700 msgid "Edits one file" msgstr "òÅÄÁËÔÉÒÕÅÔ ÏÄÉÎ ÆÁÊÌ" -#: src/main.c:2699 +#: src/main.c:2704 msgid "Displays this help message" msgstr "ïÔÏÂÒÁÖÁÅÔ ÜÔÏ ÓÏÏÂÝÅÎÉÅ ÐÏÍÏÝÉ" -#: src/main.c:2702 +#: src/main.c:2707 msgid "Displays a help screen on how to change the color scheme" msgstr "ïÔÏÂÒÁÖÁÅÔ ÜËÒÁÎ ÐÏÍÏÝÉ Ï ÔÏÍ, ËÁË ÉÚÍÅÎÉÔØ Ã×ÅÔÏ×ÕÀ ÓÈÅÍÕ" -#: src/main.c:2705 +#: src/main.c:2710 msgid "Log ftp dialog to specified file" msgstr "ðÒÏÔÏËÏÌÉÒÏ×ÁÔØ ÄÉÁÌÏÇ Ó FTP × ÏÐÒÅÄÅÌÅÎÎÙÊ ÆÁÊÌ" -#: src/main.c:2712 +#: src/main.c:2717 msgid "Obsolete" msgstr "õÓÔÁÒÅ×ÛÅÅ" -#: src/main.c:2714 +#: src/main.c:2719 msgid "Requests to run in black and white" msgstr "úÁÐÒÏÓ ÎÁ ÚÁÐÕÓË × ÞÅÒÎÏ-ÂÅÌÏÍ ÒÅÖÉÍÅ" -#: src/main.c:2716 +#: src/main.c:2721 msgid "Disable mouse support in text version" msgstr "ïÔËÌÀÞÉÔØ ÐÏÄÄÅÒÖËÕ ÍÙÛÉ × ÔÅËÓÔÏ×ÏÊ ×ÅÒÓÉÉ" -#: src/main.c:2719 +#: src/main.c:2724 msgid "Disables subshell support" msgstr "ïÔËÌÀÞÁÅÔ ÐÏÄÄÅÒÖËÕ ×ÓÔÒÏÅÎÎÏÊ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ" -#: src/main.c:2723 +#: src/main.c:2728 msgid "Prints working directory at program exit" msgstr "ðÅÞÁÔÁÅÔ ÒÁÂÏÞÉÊ ËÁÔÁÌÏÇ ÐÏ ÚÁ×ÅÒÛÅÎÉÉ ÐÒÏÇÒÁÍÍÙ" -#: src/main.c:2725 +#: src/main.c:2730 msgid "Resets soft keys on HP terminals" msgstr "óÂÒÁÓÙ×ÁÅÔ ÐÒÏÇÒÁÍÍÎÙÅ ËÌÁ×ÉÛÉ ÎÁ ÔÅÒÍÉÎÁÌÁÈ HP" -#: src/main.c:2727 +#: src/main.c:2732 msgid "To run on slow terminals" msgstr "úÁÐÕÓË ÎÁ ÍÅÄÌÅÎÎÙÈ ÔÅÒÍÉÎÁÌÁÈ" -#: src/main.c:2730 +#: src/main.c:2735 msgid "Use stickchars to draw" msgstr "ðÓÅ×ÄÏÇÒÁÆÉËÁ ÄÌÑ ÒÉÓÏ×ÁÎÉÑ" -#: src/main.c:2734 +#: src/main.c:2739 msgid "Enables subshell support (default)" msgstr "÷ËÌÀÞÁÅÔ ÐÏÄÄÅÒÖËÕ ×ÓÔÒÏÅÎÎÏÊ ËÏÍÁÎÄÎÏÊ ÏÂÏÌÏÞËÉ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" -#: src/main.c:2739 +#: src/main.c:2744 msgid "Tries to use termcap instead of terminfo" msgstr "ðÙÔÁÅÔÓÑ ÉÓÐÏÌØÚÏ×ÁÔØ termcaps ×ÍÅÓÔÏ terminfo" -#: src/main.c:2743 +#: src/main.c:2748 msgid "Displays the current version" msgstr "ïÔÏÂÒÁÖÁÅÔ ÔÅËÕÝÕÀ ×ÅÒÓÉÀ" -#: src/main.c:2745 +#: src/main.c:2750 msgid "Launches the file viewer on a file" msgstr "úÁÐÕÓËÁÅÔ ÆÁÊÌÏ×ÙÊ ÐÒÏÓÍÏÔÒÝÉË ÄÌÑ ÆÁÊÌÁ" -#: src/main.c:2747 +#: src/main.c:2752 msgid "Forces xterm features" msgstr "îÁ×ÑÚÙ×ÁÅÔ Ó×ÏÊÓÔ×Á xterm" -#: src/main.c:2749 +#: src/main.c:2754 msgid "Geometry for the window" msgstr "çÅÏÍÅÔÒÉÑ ÏËÎÁ" -#: src/main.c:2749 +#: src/main.c:2754 msgid "GEOMETRY" msgstr "çåïíåôòéñ" -#: src/main.c:2750 +#: src/main.c:2755 msgid "No windows opened at startup" msgstr "îÅÔ ÏÔËÒÙÔÙÈ ÏËÏÎ ÐÒÉ ÚÁÇÒÕÚËÅ" -#: src/main.c:2752 +#: src/main.c:2756 +msgid "No desktop icons" +msgstr "îÅÔ ÐÉËÔÏÇÒÁÍÍ ÒÁÂÏÞÅÇÏ ÓÔÏÌÁ" + +#: src/main.c:2757 +msgid "Look more like traditional gmc" +msgstr "âÏÌÅÅ ÐÏÈÏÖÉÊ ÎÁ ÔÒÁÄÉÃÉÏÎÎÙÊ gmc ×ÉÄ." + +#: src/main.c:2759 msgid "Display the directory that holds the .links startup files and exit" msgstr "ðÏËÁÚÁÔØ ËÁÔÁÌÏÇ Ó .ÓÓÙÌËÁÍÉ ÓÔÁÒÔÏ×ÙÈ ÆÁÊÌÏ× É ×ÙÊÔÉ" -#: src/main.c:3062 +#: 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" @@ -5308,11 +5609,11 @@ "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ tty ÌÉÎÉÀ. ÷Ù ÄÏÌÖÎÙ ÚÁÐÕÓÔÉÔØ mc ÂÅÚ ÆÌÁÇÁ -P.\n" "îÁ ÎÅËÏÔÏÒÙÈ ÓÉÓÔÅÍÁÈ ×Ù ÍÏÖÅÔÅ ÚÁÈÏÔÅÔØ ÚÁÐÕÓÔÉÔØ # `which mc`\n" -#: src/main.c:3140 +#: src/main.c:3149 msgid " Notice " msgstr " ðÒÅÄÕÐÒÅÖÄÅÎÉÅ " -#: src/main.c:3141 +#: src/main.c:3150 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5483,6 +5784,14 @@ msgid "Display brief usage message" msgstr "ðÏËÁÚÁÔØ ËÒÁÔËÕÀ ÉÎÓÔÒÕËÃÉÀ" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "ðÏÄËÁÔÁÌÏÇ" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "" + #: src/screen.c:417 msgid "MTime" msgstr "÷ÒÅÍÑ ÐÒÁ×ËÉ" @@ -5518,7 +5827,7 @@ #: src/screen.c:661 #, c-format msgid " %s bytes in %d file%s" -msgstr " %s ÂÁÊÔ × %d ÆÁÊÌÁÈ" +msgstr " %s ÂÁÊÔ × %d ÆÁÊÌÁÈ %s" #: src/screen.c:1325 msgid "Unknow tag on display format: " @@ -5528,29 +5837,29 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "ðÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÆÏÒÍÁÔ ×ÙÇÌÑÄÉÔ ÎÅ×ÅÒÎÙÍ, ×ÏÚ×ÒÁÝÁÀ Ë ÓÔÁÎÄÁÒÔÎÏÍÕ." -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " ÷Ù ÄÅÊÓÔ×ÉÔÅÌØÎÏ ÈÏÔÉÔÅ ×ÙÐÏÌÎÉÔØ ÜÔÏ? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr " äÅÊÓÔ×ÉÅ ÎÅ ×ÙÐÏÌÎÅÎÏ " -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2399 src/screen.c:2429 src/tree.c:1016 msgid "RenMov" msgstr "ðÅÒÅÍÅÓ" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1020 msgid "Mkdir" msgstr "î×ëÔÌÏÇ" -#: src/screen.c:2417 +#: src/screen.c:2416 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × %s \n" +" îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × \"%s\" \n" " %s " #: src/subshell.c:287 @@ -5620,15 +5929,6 @@ msgid "Dynamc" msgstr "äÉÎÁÍÞ" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -" îÅ×ÏÚÍÏÖÎÏ ÐÅÒÅÊÔÉ × \"%s\" \n" -" %s " - #: src/tree.c:1012 msgid "Forget" msgstr "úÁÂÙÔØ" @@ -5710,15 +6010,15 @@ msgid "%b %e %Y" msgstr "%b %e %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr " óÂÏÊ ËÁÎÁÌÁ " -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr " óÂÏÊ ÄÕÂÌÉÒÏ×ÁÎÉÑ ÄÅÓËÒÉÐÔÏÒÁ " -#: src/view.c:401 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5728,7 +6028,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5738,27 +6038,27 @@ "\n" "ÂÙÌ ÍÏÄÉÆÉÃÉÒÏ×ÁÎ, ÷Ù ÈÏÔÉÔÅ ÓÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ?\n" -#: src/view.c:404 +#: src/view.c:406 msgid " Save changes " msgstr " óÏÈÒÁÎÉÔØ ÉÚÍÅÎÅÎÉÑ " -#: src/view.c:446 +#: src/view.c:448 msgid " Can't spawn child program " msgstr " îÅ×ÏÚÍÏÖÎÏ ÐÏÒÏÄÉÔØ ÄÏÞÅÒÎÉÊ ÐÒÏÃÅÓÓ " -#: src/view.c:455 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " ïÔÓÕÔÓÔ×ÕÅÔ ×Ù×ÏÄ ÏÔ ÄÏÞÅÒÎÅÇÏ ÐÒÏÃÅÓÓÁ " -#: src/view.c:460 +#: src/view.c:462 msgid " Could not open file " msgstr " îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ " -#: src/view.c:475 +#: src/view.c:477 msgid " Can't open file \"" msgstr " îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ \"" -#: src/view.c:482 +#: src/view.c:484 msgid "" " Can't stat file \n" " " @@ -5766,11 +6066,11 @@ " îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ Ó×ÏÊÓÔ×Á ÆÁÊÌÁ \n" " " -#: src/view.c:488 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " ðÒÏÓÍÏÔÒ ÎÅ×ÏÚÍÏÖÅÎ: ÎÅ ÏÂÙÞÎÙÊ ÆÁÊÌ " -#: src/view.c:569 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5779,7 +6079,7 @@ " îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ \"%s\"\n" " %s " -#: src/view.c:578 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5788,34 +6088,34 @@ " îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ Ó×ÏÊÓÔ×Á \"%s\"\n" " %s " -#: src/view.c:714 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "æÁÊÌ: %s" -#: src/view.c:728 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "óÍÅÝÅÎÉÅ 0x%08x" -#: src/view.c:739 +#: src/view.c:741 msgid " [grow]" msgstr " [ÒÏÓÔ]" -#: src/view.c:1518 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "éÝÅÍ %s" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " éÓËÏÍÁÑ ÓÔÒÏËÁ ÎÅ ÎÁÊÄÅÎÁ " -#: src/view.c:1787 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " îÅ×ÅÒÎÏÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ " -#: src/view.c:1911 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5824,7 +6124,7 @@ " îÏÍÅÒ ÔÅËÕÝÅÊ ÓÔÒÏËÉ %d.\n" " ÷×ÅÄÉÔÅ ÎÏÍÅÒ ÎÏ×ÏÊ ÓÔÒÏËÉ:" -#: src/view.c:1933 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5833,71 +6133,71 @@ " ôÅËÕÝÉÊ ÁÄÒÅÓ - 0x%lx.\n" " ÷×ÅÄÉÔÅ ÎÏ×ÙÊ ÁÄÒÅÓ:" -#: src/view.c:1935 +#: src/view.c:1937 msgid " Goto Address " msgstr " ðÅÒÅÊÔÉ ÎÁ ÁÄÒÅÓ " -#: src/view.c:1966 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " ÷×ÅÄÉÔÅ ÒÅÇÕÌÑÒÎÏÅ ×ÙÒÁÖÅÎÉÅ:" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Ascii" msgstr "ôÅËÓÔ" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Hex" msgstr "Hex" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Goto" msgstr "ðÅÒÅÈÏÄ" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Line" msgstr "óÔÒÏËÁ" -#: src/view.c:2075 +#: src/view.c:2077 msgid "RxSrch" msgstr "òÅÇ÷ÙÒ" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdText" msgstr "ôËÓÔòÅÄ" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdHex" msgstr "HxòÅÄÁË" -#: src/view.c:2080 +#: src/view.c:2082 msgid "UnWrap" msgstr "îÅðÅÒÅÎ" -#: src/view.c:2080 +#: src/view.c:2082 msgid "Wrap" msgstr "ðÅÒÅÎÏÓ" -#: src/view.c:2083 +#: src/view.c:2085 msgid "HxSrch" msgstr "HxðÏÉÓË" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Raw" msgstr "óÙÒÏÊ" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Parse" msgstr "çÏÔÏ×ÙÊ" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Unform" msgstr "îÅæÏÒÍÔ" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Format" msgstr "æÏÒÍÁÔ" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr "éÓÔÏÒÉÑ ËÏÍÁÎÄ" @@ -6096,7 +6396,92 @@ msgid "NumLock on keypad" msgstr "NumLock on keypad" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ cpio-ÁÒÈÉ×\n" +"%s" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" +"ðÒÅÖÄÅ×ÒÅÍÅÎÎÙÊ ËÏÎÅà ÁÒÈÉ×Á cpio\n" +"%s" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "" +"ðÏ×ÒÅÖÄÅÎÎÙÊ ÚÁÇÏÌÏ×ÏË cpio ÏÂÎÁÒÕÖÅÎ ×\n" +"%s" + +#: vfs/cpio.c:427 +#, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "" +"îÅÓÏÇÌÁÓÏ×ÁÎÎÁÑ ÖÅÓÔËÁÑ ÓÓÙÌËÁ\n" +"%s\n" +"× ÁÒÈÉ×Å cpio\n" +"%s" + +#. 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 "%s ÓÏÄÅÒÖÉÔ ÓÄ×ÏÅÎÎÙÅ ÚÁÐÉÓÉ! ðÒÏÐÕÝÅÎÏ!" + +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" +"îÅÏÖÉÄÁÎÎÙÊ ËÏÎÅà ÆÁÊÌÁ\n" +"%s" + +#: vfs/direntry.c:300 +#, c-format +msgid "Dir cache expired for %s" +msgstr "ëÜÛ ËÁÔÁÌÏÇÁ ÕÓÔÁÒÅÌ ÄÌÑ %s" + +#: vfs/direntry.c:430 vfs/direntry.c:433 +msgid " Direntry warning " +msgstr "ðÒÅÄÕÐÒÅÖÄÅÎÉÅ ÓÔÒÏËÉ ËÁÔÁÌÏÇÁ" + +#: vfs/direntry.c:430 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage -- %d, ÕÔÅÞËÁ ÐÁÍÑÔÉ" + +#: vfs/direntry.c:433 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:811 +msgid "Starting linear transfer..." +msgstr "úÁÐÕÓË ÌÉÎÅÊÎÏÊ ÐÅÒÅÄÁÞÉ..." + +#: vfs/direntry.c:956 +msgid "Getting file" +msgstr "ðÏÌÕÞÅÎÉÅ ÆÁÊÌÁ" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -6105,216 +6490,224 @@ "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ %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:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: ïÔÓÏÅÄÉÎÅÎÉÅ ÏÔ %s" -#: vfs/fish.c:214 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: ïÖÉÄÁÅÔÓÑ ÎÁÞÁÌØÎÁÑ ÓÔÒÏËÁ..." -#: vfs/fish.c:224 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" "éÚ×ÉÎÉÔÅ, ÍÙ ÎÅ ÍÏÖÅÍ ÓÄÅÌÁÔØ Á×ÔÏÒÉÚÏ×ÁÎÎÙÅ ÐÁÒÏÌÅÍ ÓÏÅÄÉÎÅÎÉÑ ÓÅÊÞÁÓ." -#: vfs/fish.c:238 +#: vfs/fish.c:233 +msgid " fish: Password required for " +msgstr "fish: ôÒÅÂÕÅÔÓÑ ÐÁÒÏÌØ ÄÌÑ " + +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: ðÏÓÙÌÁÅÔÓÑ ÐÁÒÏÌØ..." -#: vfs/fish.c:244 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: ðÏÓÙÌÁÅÔÓÑ ÎÁÞÁÌØÎÁÑ ÓÔÒÏËÁ..." -#: vfs/fish.c:248 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: ÷ÅÒÓÉÑ ÐÏÄÔ×ÅÒÖÄÅÎÉÑ Ó×ÑÚÉ..." -#: vfs/fish.c:252 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: õÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÔÅËÕÝÉÊ ËÁÔÁÌÏÇ..." -#: vfs/fish.c:254 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: óÏÅÄÉÎÅÎÉÅ ÕÓÐÅÛÎÏ, ÐÅÒÓÏÎÁÌØÎÙÊ ËÁÔÁÌÏÇ %s." -#: vfs/fish.c:330 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ %s..." -#: vfs/fish.c:426 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: ÏÛÉÂËÁ" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: ÚÁÐÉÓØ %s: ÐÏÓÙÌÁÅÔÓÑ ËÏÍÁÎÄÁ..." -#: vfs/fish.c:460 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: óÂÏÊ ÌÏËÁÌØÎÏÇÏ ÞÔÅÎÉÑ, ÐÏÓÙÌÁÀÔÓÑ ÎÕÌÉ" -#: vfs/fish.c:472 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: ÚÁÐÉÓØ %s %d (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "ÎÕÌÉ" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "ðÒÅÒÙ×ÁÎÉÅ ÐÅÒÅÄÁÞÉ..." -#: vfs/fish.c:521 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "ïÔÍÅÞÅÎÁ ÏÛÉÂËÁ ÐÏÓÌÅ ÐÒÅÒÙ×ÁÎÉÑ." -#: vfs/fish.c:523 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "ðÅÒÅÄÁÞÁ ÕÓÐÅÛÎÏ ÐÒÅÒ×ÁÎÁ." -#: vfs/ftpfs.c:291 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: ïÔÓÏÅÄÉÎÅÎÉÅ ÏÔ %s" -#: vfs/ftpfs.c:349 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: ôÒÅÂÕÅÔÓÑ ÐÁÒÏÌØ ÄÌÑ " -#: vfs/ftpfs.c:382 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " ðÒÏËÓÉ: ôÒÅÂÕÅÔÓÑ ÐÁÒÏÌØ ÄÌÑ " -#: vfs/ftpfs.c:408 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÏËÓÉ" -#: vfs/ftpfs.c:412 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÐÁÒÏÌØ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÏËÓÉ" -#: vfs/ftpfs.c:416 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: á×ÔÏÒÉÚÁÃÉÑ ÎÁ ÐÒÏËÓÉ ÕÓÐÅÛÎÁ" -#: vfs/ftpfs.c:420 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: ðÏÄËÌÀÞÅÎ Ë %s" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÉÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: vfs/ftpfs.c:442 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: ðÏÓÙÌÁÅÔÓÑ ÐÁÒÏÌØ ÐÏÌØÚÏ×ÁÔÅÌÑ" -#: vfs/ftpfs.c:447 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: ÚÁÒÅÇÉÓÔÒÉÒÏ×ÁÎ" -#: vfs/ftpfs.c:462 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: ïÛÉÂËÁ ÒÅÇÉÓÔÒÁÃÉÉ ÐÏÌØÚÏ×ÁÔÅÌÑ %s " -#: vfs/ftpfs.c:494 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÒÁÓÐÒÅÄÅÌÅÎÉÅ ÉÓÔÏÞÎÉËÁ (%s)" -#: vfs/ftpfs.c:623 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: îÅ×ÅÒÎÏÅ ÉÍÑ ÓÉÓÔÅÍÙ." -#: vfs/ftpfs.c:643 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: îÅ×ÅÒÎÙÊ ÁÄÒÅÓ ÓÉÓÔÅÍÙ." -#: vfs/ftpfs.c:666 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: ÏÓÕÝÅÓÔ×ÌÑÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó %s" -#: vfs/ftpfs.c:676 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: ÓÏÅÄÉÎÅÎÉÅ ÐÒÅÒ×ÁÎÏ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" -#: vfs/ftpfs.c:678 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: ÓÂÏÊ ÓÏÅÄÉÎÅÎÉÑ Ó ÓÅÒ×ÅÒÏÍ: %s" -#: vfs/ftpfs.c:720 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "ïÖÉÄÁÎÉÅ ÐÏ×ÔÏÒÁ ÐÏÐÙÔËÉ... %d (Control-C ÄÌÑ ÏÔÍÅÎÙ)" -#: vfs/ftpfs.c:893 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ" -#: vfs/ftpfs.c:967 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: ÐÒÅÒÙ×ÁÎÉÅ ÐÅÒÅÄÁÞÉ." -#: vfs/ftpfs.c:969 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: ïÛÉÂËÁ ÐÒÅÒÙ×ÁÎÉÑ: %s" -#: vfs/ftpfs.c:974 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: ÓÂÏÊ ÐÒÅÒÙ×ÁÎÉÑ" -#: vfs/ftpfs.c:1063 vfs/ftpfs.c:1159 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: ÓÂÏÊ ÐÏÉÓËÁ ÔÅËÕÝÅÇÏ ÒÁÂÏÞÅÇÏ ËÁÔÁÌÏÇÁ." -#: vfs/ftpfs.c:1073 vfs/ftpfs.c:1080 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓÐÏÚÎÁÔØ ÓÉÍ×ÏÌÉÞÅÓËÕÀ ÓÓÙÌËÕ" -#: vfs/ftpfs.c:1131 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "òÁÓÐÏÚÎÁÅÔÓÑ ÓÉÍ×ÏÌÉÞÅÓËÁÑ ÓÓÙÌËÁ..." -#: vfs/ftpfs.c:1149 +#: vfs/ftpfs.c:1188 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "ftpfs: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP %s... %s%s" -#: vfs/ftpfs.c:1150 +#: vfs/ftpfs.c:1189 msgid "(strict rfc959)" -msgstr "" +msgstr "(ÏÇÒÁÎÉÞÅÎÉÅ rfc959)" -#: vfs/ftpfs.c:1151 +#: vfs/ftpfs.c:1190 msgid "(chdir first)" -msgstr "" +msgstr "(ÓÎÁÞÁÌÁ chdir)" -#: vfs/ftpfs.c:1245 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "ftpfs: ÏÛÉÂËÁ" -#: vfs/ftpfs.c:1255 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: ÏÛÉÂËÁ; ÎÅËÕÄÁ ÐÅÒÅÊÔÉ ÎÁ Á×ÁÒÉÊÎÙÊ ÒÅÖÉÍ" -#: vfs/ftpfs.c:1318 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ÚÁÐÉÓØ ÆÁÊÌÁ %d (%d)" -#: vfs/ftpfs.c:1786 vfs/ftpfs.c:1801 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6322,15 +6715,15 @@ "æÁÊÌ ~/.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" @@ -6340,48 +6733,68 @@ " ôÒÅÂÕÅÔÓÑ ÐÁÒÏÌØ ÄÌÑ ×ÈÏÄÁ × ÓÉÓÔÅÍÕ, ÎÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ \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 " îÅ×ÏÚÍÏÖÎÏ ÏÐÒÅÄÅÌÉÔØ ÉÍÑ ÈÏÓÔÁ: %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 " óÌÉÛËÏÍ ÍÎÏÇÏ ÏÔËÒÙÔÙÈ ÓÏÅÄÉÎÅÎÉÊ " -#: vfs/smbfs.c:115 +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "þÁÓÔÎÁÑ ÕÄÁÌÅÎÎÁÑ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ Midnight Commander" + +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "äÏÍÅÎ:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "ðÁÒÏÌØ: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "ðÁÒÏÌØ ÄÌÑ \\\\%s\\%s" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6390,22 +6803,26 @@ " óÂÏÊ ÐÏ×ÔÏÒÎÏÇÏ ÓÏÅÄÉÎÅÎÉÑ Ë %s\n" " " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr " éÄÅÎÔÉÆÉËÁÃÉÑ ÎÅ ÕÄÁÌÁÓØ " + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s ÓÏÚÄÁÅÔ ËÁÔÁÌÏÇ %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s ÕÄÁÌÑÅÔ ËÁÔÁÌÏÇ %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s ÏÔËÒÙ×ÁÅÔ ÆÁÊÌ %s Ó ÕÄÁÌÅÎÎÏÊ ÍÁÛÉÎÙ" -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s ÐÅÒÅÉÍÅÎÏ×Ù×ÁÅÔ ÆÁÊÌÙ\n" @@ -6438,30 +6855,137 @@ "%s\n" "ÎÅ ÐÏÈÏÖ ÎÁ tar-ÁÒÈÉ×." -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1151 +msgid "Changes to file lost" +msgstr "éÚÍÅÎÅÎÉÑ ÄÌÑ ÆÁÊÌÁ ÐÏÔÅÒÑÎÙ" + +#: vfs/vfs.c:1794 +msgid "Could not parse:" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÁÎÁÌÉÚÉÒÏ×ÁÔØ:" + +#: vfs/vfs.c:1796 +msgid "More parsing errors will be ignored." +msgstr "ïÓÔÁÌØÎÙÅ ÏÛÉÂËÉ ÁÎÁÌÉÚÁ ÂÕÄÕÔ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ." + +#: vfs/vfs.c:1796 +msgid "(sorry)" +msgstr "(ÉÚ×ÉÎÉÔÅ)" + +#: vfs/vfs.c:1807 +msgid "Internal error:" +msgstr " ÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ:" + +#: vfs/vfs.c:1817 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ÂÁÊÔ ÐÅÒÅÎÅÓÅÎÏ)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1818 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ÂÁÊÔ ÐÅÒÅÎÅÓÅÎÏ" -#~ msgid "fish: got listing" -#~ msgstr "fish: ÐÏÌÕÞÉÌ ÓÐÉÓÏË" +#: vfs/undelfs.c:81 +msgid " undelfs: error " +msgstr " undelfs: ÏÛÉÂËÁ " + +#: vfs/undelfs.c:184 +msgid " not enough memory " +msgstr " ÎÅÄÏÓÔÁÔÏÞÎÏ ÐÁÍÑÔÉ " + +#: vfs/undelfs.c:189 +msgid " while allocating block buffer " +msgstr " ÐÒÉ ÐÏÌÕÞÅÎÉÉ ÂÌÏËÁ ÂÕÆÅÒÏ× " + +#: vfs/undelfs.c:193 +#, c-format +msgid " open_inode_scan: %d " +msgstr " open_inode_scan: %d " + +#: vfs/undelfs.c:197 +#, c-format +msgid " while starting inode scan %d " +msgstr " ÐÒÉ ÎÁÞÁÌÅ ÓËÁÎÉÒÏ×ÁÎÉÑ inode %d " + +#: vfs/undelfs.c:204 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "undelfs: ÚÁÇÒÕÚËÁ ÉÎÆÏÒÍÁÃÉÉ Ï ÕÄÁÌÅÎÎÙÈ ÆÁÊÌÁÈ %d inodes" + +#: vfs/undelfs.c:219 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr " ÐÒÉ ×ÙÚÏ×Å ext2_block_iterate %d " + +#: vfs/undelfs.c:227 +msgid " no more memory while reallocating array " +msgstr " ÎÅÈ×ÁÔÉÌÏ ÐÁÍÑÔÉ ÐÒÉ ÐÅÒÅÏÔËÒÙÔÉÉ ÍÁÓÓÉ×Á " + +#: vfs/undelfs.c:246 +#, c-format +msgid " while doing inode scan %d " +msgstr " ÐÒÉ ÓËÁÎÉÒÏ×ÁÎÉÉ inode %d " + +#: vfs/undelfs.c:270 +msgid " Ext2lib error " +msgstr " Ext2lib ÏÛÉÂËÁ " + +#: vfs/undelfs.c:297 +#, c-format +msgid " Could not open file %s " +msgstr " îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ %s " + +#: vfs/undelfs.c:300 +msgid "undelfs: reading inode bitmap..." +msgstr "undelfs: ÞÔÅÎÉÅ ÂÉÔÏ×ÏÊ ËÁÒÔÙ inode..." + +#: vfs/undelfs.c:303 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" +" îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÂÉÔÏ×ÕÀ ËÁÒÔÕ inode Ó:\n" +" %s \n" + +#: vfs/undelfs.c:306 +msgid "undelfs: reading block bitmap..." +msgstr "undelfs: ÞÔÅÎÉÅ ÂÌÏËÁ ÂÉÔÏ×ÏÊ ËÁÒÔÙ..." + +#: vfs/undelfs.c:309 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" +" îÅ×ÏÚÍÏÖÎÏ ÚÁÇÒÕÚÉÔØ ÂÌÏË ÂÉÔÏ×ÏÊ ËÁÒÔÙ Ó:\n" +" %s \n" + +#: vfs/undelfs.c:315 +msgid "undelfs: done." +msgstr "undelfs: ÓÄÅÌÁÎÏ." -#~ msgid "ftpfs: could not setup passive mode for source routing" -#~ msgstr "" -#~ "ftpfs: ÎÅ×ÏÚÍÏÖÎÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁÓÓÉ×ÎÙÊ ÒÅÖÉÍ ÄÌÑ ÒÁÓÐÒÅÄÅÌÅÎÉÑ ÉÓÔÏÞÎÉËÁ" +#: vfs/undelfs.c:318 +msgid "undelfs: failure" +msgstr "undelfs: ÓÂÏÊ " -#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -#~ msgstr "ftpfs: þÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP %s...(îÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÉ ËÏÍÁÎÄÙ ls)" +#: vfs/undelfs.c:342 +msgid " vfs_info is not fs! " +msgstr " vfs_info ÎÅ ÆÁÊÌÏ×ÁÑ ÓÉÓÔÅÍÁ! " -#~ msgid "ftpfs: FAIL" -#~ msgstr "ftpfs: óâïê" +#: vfs/undelfs.c:398 vfs/undelfs.c:582 +msgid " You have to chdir to extract files first " +msgstr " ÷Ù ÄÏÌÖÎÙ ÓÎÁÞÁÌÁ ÓÍÅÎÉÔØ ËÁÔÁÌÏÇ ÞÔÏÂÙ ÉÚ×ÌÅÞØ ÆÁÊÌÙ " -#~ msgid "ftpfs: reading FTP directory interrupt by user" -#~ msgstr "ftpfs: ÞÔÅÎÉÅ ËÁÔÁÌÏÇÁ FTP ÐÒÅÒ×ÁÎÏ ÐÏÌØÚÏ×ÁÔÅÌÅÍ" +#: vfs/undelfs.c:521 +msgid " while iterating over blocks " +msgstr "" + +#: vfs/undelfs.c:626 +#, c-format +msgid " Could not open file: %s " +msgstr " îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ÆÁÊÌ: %s " -#~ msgid "ftpfs: got listing" -#~ msgstr "ftpfs: ÐÏÌÕÞÉÌ ÓÐÉÓÏË" +#. This is place of next pointer +#: vfs/undelfs.c:684 +msgid "Undelete filesystem for ext2" +msgstr "÷ÏÓÓÔÁÎÏ×ÌÅÎÉÅ ÆÁÊÌÏ×ÏÊ ÓÉÓÔÅÍÙ ÄÌÑ ext2" diff -ruN old/mc-4.5.44/po/sv.po new/mc-4.5.45/po/sv.po --- old/mc-4.5.44/po/sv.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/sv.po Tue May 9 18:52:09 2000 @@ -6,36 +6,39 @@ # ERROR på rad: 5594 # I original källkoden antas att pluralformen av 'File' alltid fås genom # att lägga till ett 's'. Fixa källkoden!!! (Någon med CVS rättighet.) +#. Not essential to translate +#: gtkedit/edit.c:2768 gtkedit/editcmd.c:2880 gtkedit/editcmd.c:2886 +#: gtkedit/editcmd.c:2893 gtkedit/editcmd.c:2898 gtkedit/editcmd.c:2943 msgid "" msgstr "" "Project-Id-Version: mc 4.5.38\n" -"POT-Creation-Date: 1999-10-31 16:57+0100\n" -"PO-Revision-Date: 1999-09-27 18:20+0100\n" -"Last-Translator: Richard Hult \n" +"POT-Creation-Date: 2000-05-09 10:51+0200\n" +"PO-Revision-Date: 2000-04-20 17:22+0200\n" +"Last-Translator: Martin Norbäck \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:126 msgid " Emacs key: " msgstr " Emacstangent: " -#: edit/edit_key_translator.c:133 edit/edit_key_translator.c:148 +#: edit/edit_key_translator.c:138 edit/edit_key_translator.c:153 msgid " Execute Macro " msgstr " Kör makro " #. 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:138 edit/edit_key_translator.c:153 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:769 msgid " Press macro hotkey: " msgstr " Tryck snabbtangent för makro: " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:149 msgid " Insert Literal " msgstr " Klistra in bokstavlig " -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:149 msgid " Press any key: " msgstr " Tryck valfri tangent:" @@ -62,7 +65,7 @@ msgstr "" "\".\n" "\n" -"För att fixa det här, ta fram editorn för mime-egenskaper (den finns i GNOME " +"För att fixa det här, ta fram editorn för MIME-egenskaper (den finns i GNOME " "kontrollcenter) och editera standard %s-aktionen för \"%s\"." #: gnome/gaction.c:46 @@ -91,15 +94,15 @@ "med kommandot:\n" "\"%s\"%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "öppna" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" -msgstr "edit" +msgstr "redigera" -#: gnome/gaction.c:331 +#: gnome/gaction.c:351 msgid "view" msgstr "vy" @@ -107,6 +110,10 @@ msgid " There is no other panel to compare contents to " msgstr " Det finns ingen annan panel att jämföra innehållet med " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " Kunde inte starta ett terminalfönster " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "Människorna bakom Midnight Commander" @@ -114,7 +121,7 @@ #: gnome/gcmd.c:102 msgid "bug reports: http://bugs.gnome.org, or use gnome-bug" msgstr "" -"buggrapporter: http://bugs.gnome.org, eller använd 'gnome-bug' scriptet" +"buggrapporter: http://bugs.gnome.org, eller använd gnome-bug" #: gnome/gcmd.c:114 msgid "GNU Midnight Commander" @@ -160,7 +167,7 @@ #: gnome/gcmd.c:334 msgid "Time Last Changed" -msgstr "Senst ändrad" +msgstr "Senast ändrad" #: gnome/gcmd.c:348 msgid "Reverse the order." @@ -214,7 +221,7 @@ msgstr "Sätt 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 "Visa alla filer" @@ -272,7 +279,7 @@ "Mata in ett reguljärt uttryck för att välja vilka filer som skall visas i " "panelvyn." -#: gnome/gcmd.c:917 src/cmd.c:543 src/cmd.c:594 +#: gnome/gcmd.c:917 src/cmd.c:540 src/cmd.c:591 msgid " Malformed regular expression " msgstr " Felaktigt formulerat reguljärt uttryck " @@ -293,8 +300,8 @@ msgstr "Skapad vid tidpunkt" #. 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 "Grupp" @@ -320,7 +327,7 @@ msgstr "Antal hårda länkar" #. 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 "Ägare" @@ -353,28 +360,28 @@ msgid "Custom View" msgstr "Egen vy" -#: gnome/gdesktop.c:521 gnome/gmount.c:389 +#: gnome/gdesktop.c:622 gnome/gmount.c:382 msgid "Warning" msgstr "Varning" -#: gnome/gdesktop.c:522 +#: gnome/gdesktop.c:623 #, c-format msgid "Could not open %s; will not have desktop icons" msgstr "Kan inte öppna %s, kommer inte att finnas några ikoner på skrivbordet" -#: gnome/gdesktop.c:1181 +#: gnome/gdesktop.c:1298 msgid "While running the mount/umount command" msgstr "Under körning av montera/avmontera kommandot" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1367 msgid "While running the eject command" msgstr "Vid körning av kommandot \"eject\"" -#: gnome/gdesktop.c:1434 gnome/gicon.c:218 gnome/gtools.c:46 +#: gnome/gdesktop.c:1551 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "Fel" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2775 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -388,84 +395,84 @@ "\n" "Kan inte sätta bakgrund." -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2798 gnome/glayout.c:362 msgid "_Terminal" msgstr "_Terminal" -#: gnome/gdesktop.c:2616 gnome/glayout.c:363 +#: gnome/gdesktop.c:2798 gnome/glayout.c:363 msgid "Launch a new terminal in the current directory" msgstr "Starta en ny terminal i den aktuella katalogen" #. If this ever changes, make sure you update create_new_menu accordingly. -#: gnome/gdesktop.c:2618 gnome/glayout.c:365 +#: gnome/gdesktop.c:2800 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Katalog..." -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2800 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Skapar en ny katalog" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2801 msgid "URL L_ink..." msgstr "URL-_länk..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2801 msgid "Creates a new URL link" msgstr "Skapar en ny URL-länk" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2802 msgid "_Launcher..." msgstr "_Startare..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2802 msgid "Creates a new launcher" msgstr "Skapar en ny startare" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2808 msgid "By _Name" msgstr "Efter _namn" -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2809 msgid "By File _Type" msgstr "Efter _filtyp" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2810 msgid "By _Size" msgstr "I _storleksordning" -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2811 msgid "By Time Last _Accessed" msgstr "Efter tid, senast _accessad" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2812 msgid "By Time Last _Modified" msgstr "Efter tid, senast _modified" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2813 msgid "By Time Last _Changed" msgstr "Efter tid, senast _ändrad" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2821 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "_Arrangera ikoner" -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2822 msgid "Create _New Window" msgstr "Öppna _nytt fönster" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2824 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "_Ladda om skrivbordet" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2825 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Ladda om _enheter" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2826 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Återskapa skrivbords_ikoner" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2828 msgid "Configure _Background Image" msgstr "Konfigurera _bakgrundsbild" @@ -565,12 +572,12 @@ msgid "Replace it?" msgstr "Ersätt den?" -#: 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 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2400 src/screen.c:2430 src/tree.c:1014 msgid "Copy" msgstr "Kopiera" -#: 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 "Flytta" @@ -633,7 +640,7 @@ "\n" "Katalogen är inte tom. Radera den rekursivt?" -#: gnome/gdialogs.c:790 src/file.c:2247 +#: gnome/gdialogs.c:790 src/file.c:2244 msgid " Delete: " msgstr " Radera: " @@ -669,7 +676,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:1833 msgid "Password:" msgstr "Lösenord:" @@ -693,27 +700,27 @@ # låter mycket bättre än "symbolisk länknamn" # antagligen har man redan valt 'symbolisk länk' # någonstans så det borde inte vara något problem vara kortfattad -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "_Flytta hit" # rätt betydelse? -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "_Kopiera hit" # rätt betydelse -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "_Länka hit" # rätt betydelse -#: gnome/gdnd.c:56 +#: gnome/gdnd.c:57 msgid "Cancel drag" msgstr "Avbryt drag" #. FIXME: this error message sucks -#: gnome/gdnd.c:192 +#: gnome/gdnd.c:193 #, c-format msgid "" "Could not stat %s\n" @@ -722,8 +729,8 @@ "Kan inte inhämta status för filen \"%s\"\n" "%s" -#: 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 "Standardikonerna kunde inte hittas, kontrollera din installation" #: gnome/glayout.c:41 @@ -817,7 +824,7 @@ msgstr "Skapa en ny fil i den här 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 "_Kopiera..." @@ -825,7 +832,7 @@ msgid "Copy files" msgstr "Kopiera filer" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "_Radera..." @@ -833,7 +840,7 @@ msgid "Delete files" msgstr "Radera filer" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "_Flytta..." @@ -881,7 +888,7 @@ msgid "Reverses the list of tagged files" msgstr "Vänd listan av markerade filer" -#: gnome/glayout.c:408 gtkedit/editwidget.c:1099 src/view.c:2083 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2085 msgid "Search" msgstr "Sök" @@ -889,7 +896,7 @@ msgid "Search for a file in the current Panel" msgstr "Sök efter en fil i den aktuella panelen" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "_Ladda om katalog" @@ -998,289 +1005,296 @@ "Som root kan det hända att du skadar ditt system om du inte är försiktig. " "GNOME filhanterare kommer inte att hindra dig från att göra det." -#: gnome/gmount.c:225 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "Kan inte öppna /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 "" "Kunde inte symlänka %s till %s: kommer inte att finnas en enhetsikon på " "skrivbordet." -#: 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 "Floppy %d" # flexskiva??? nja -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "Enhet %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 "Fullständigt namn:" -#: gnome/gnome-file-property-dialog.c:178 +#: gnome/gnome-file-property-dialog.c:179 msgid "File Name" msgstr "Filnamn" -#: 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 "Filtyp: " -#: gnome/gnome-file-property-dialog.c:207 +#: gnome/gnome-file-property-dialog.c:217 msgid "File Type: Symbolic Link" msgstr "Filtyp: Symbolisk länk" -#: gnome/gnome-file-property-dialog.c:212 +#: gnome/gnome-file-property-dialog.c:222 msgid "Target Name: INVALID LINK" msgstr "Målnamn: OGILTIG LÄNK" -#: gnome/gnome-file-property-dialog.c:215 +#: gnome/gnome-file-property-dialog.c:225 msgid "Target Name: " msgstr "Målnamn:" -#: gnome/gnome-file-property-dialog.c:220 +#: gnome/gnome-file-property-dialog.c:230 msgid "File Type: Directory" msgstr "Filtyp: Katalog" -#: gnome/gnome-file-property-dialog.c:222 +#: gnome/gnome-file-property-dialog.c:232 msgid "File Type: Character Device" msgstr "Filtyp: Teckenenhet" -#: gnome/gnome-file-property-dialog.c:224 +#: gnome/gnome-file-property-dialog.c:234 msgid "File Type: Block Device" msgstr "Filtyp: Blockenhet" -#: gnome/gnome-file-property-dialog.c:226 +#: gnome/gnome-file-property-dialog.c:236 msgid "File Type: Socket" msgstr "Filtyp: Socket" -#: gnome/gnome-file-property-dialog.c:228 +#: gnome/gnome-file-property-dialog.c:238 msgid "File Type: FIFO" msgstr "Filtyp: 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 "Filstorlek:" -#: 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 "Filstorlek: inte tillgänglig" -#: gnome/gnome-file-property-dialog.c:267 +#: gnome/gnome-file-property-dialog.c:277 msgid "File Created on: " -msgstr "Filen skapades den: " +msgstr "Filen skapades: " + +#: gnome/gnome-file-property-dialog.c:281 +#: gnome/gnome-file-property-dialog.c:290 +#: gnome/gnome-file-property-dialog.c:299 +msgid "%a, %b %d %Y, %I:%M:%S %p" +msgstr "%a %d %b %Y %H:%M:%S" -#: gnome/gnome-file-property-dialog.c:276 +#: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "Senast modifierad den: " -#: gnome/gnome-file-property-dialog.c:285 +#: gnome/gnome-file-property-dialog.c:295 msgid "Last Accessed on: " msgstr "Senast accessad den: " -#: 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 "Namn:" -#: 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 "Handling för drag-och-släpp" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 msgid "Use default Drop Action options" msgstr "Använd standardhandling när filen släpps" -#: 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 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 +#: src/screen.c:2398 src/screen.c:2428 msgid "View" msgstr "Visa" -#: gnome/gnome-file-property-dialog.c:404 +#: gnome/gnome-file-property-dialog.c:414 msgid "Use default View options" msgstr "Använd standardmetod för att visa" -#: gnome/gnome-file-property-dialog.c:439 +#: gnome/gnome-file-property-dialog.c:449 msgid "Select an Icon" msgstr "Välj en 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 "Öppna" -#: gnome/gnome-file-property-dialog.c:479 +#: gnome/gnome-file-property-dialog.c:489 msgid "Use default Open action" msgstr "Använd standardmetod för att öppna" -#: gnome/gnome-file-property-dialog.c:502 +#: gnome/gnome-file-property-dialog.c:512 msgid "Use default Drop action" msgstr "Använd standardhandling då filen släpps" -#: gnome/gnome-file-property-dialog.c:504 +#: gnome/gnome-file-property-dialog.c:514 msgid "Use default View action" msgstr "Använd standardmetod för att visa" -#: 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:2399 src/screen.c:2429 src/view.c:2081 msgid "Edit" msgstr "Redigera" -#: gnome/gnome-file-property-dialog.c:523 +#: gnome/gnome-file-property-dialog.c:533 msgid "Use default Edit action" msgstr "Använd standardmetod för att redigera" -#: 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 "Filhandlingar" -#: gnome/gnome-file-property-dialog.c:616 +#: gnome/gnome-file-property-dialog.c:626 msgid "Open action" msgstr "Metod för att öppna" -#: gnome/gnome-file-property-dialog.c:617 +#: gnome/gnome-file-property-dialog.c:627 msgid "Needs terminal to run" msgstr "Behöver terminal för att köra" -#: gnome/gnome-file-property-dialog.c:742 +#: gnome/gnome-file-property-dialog.c:753 msgid "File Permissions" msgstr "Filrättigheter" -#: 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 "Aktuell inställning:" #. 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 "Läs" -#: 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 "Skriv" -#: 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 "Kör" # Exekvera är mer rätt men längre och nästan samma sak -#: 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 "Special" #. 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 "Användare" -#: 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 "Annan" #. 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 "Sätt 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 "Sätt 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 "Ägare av filen" -#: 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 "Statistik" -#: gnome/gnome-file-property-dialog.c:1088 +#: gnome/gnome-file-property-dialog.c:1106 msgid "Options" msgstr "Inställningar" -#: gnome/gnome-file-property-dialog.c:1091 +#: gnome/gnome-file-property-dialog.c:1109 msgid "Permissions" msgstr "Rättigheter" -#: 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 har matat in ett ogiltigt användarnamn" -#: 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åste ge din fil ett namn" # detta kommer väl upp när man försöker ge filen ett tomt namn? -#: 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 måste ge din fil ett namn som inte INTE innehåller ett '/' tecken" @@ -1326,8 +1340,8 @@ msgid "Copy..." msgstr "Kopiera..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2403 +#: src/screen.c:2433 msgid "Delete" msgstr "Radera" @@ -1368,71 +1382,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Använd skalmönster istället för reguljära uttryck" -#: gnome/gprefs.c:113 +#: gnome/gprefs.c:108 +msgid "Determine file types from file content instead of extensions" +msgstr "Avgör filtyp genom innehåll i stället för genom suffix" + +#: gnome/gprefs.c:117 msgid "Confirm when deleting file" msgstr "Bekräfta vid radering av fil" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "Bekräfta vid överskrivning av fil" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "Bekräfta vid exekvering av fil" -#: gnome/gprefs.c:125 +#: gnome/gprefs.c:129 msgid "Show progress while operations are being performed" msgstr "Visa framsteg under tiden operationen genomförs" -#: gnome/gprefs.c:134 +#: gnome/gprefs.c:138 msgid "VFS Timeout:" msgstr "VFS-timeout:" -#: 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 "Anonymt FTP-lösenord:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "Använd alltid FTP-proxy" -#: gnome/gprefs.c:151 +#: gnome/gprefs.c:155 msgid "Fast directory reload" msgstr "Snabb katalogomladdning" -#: gnome/gprefs.c:155 +#: gnome/gprefs.c:159 msgid "Compute totals before copying files" msgstr "Beräkna summan innan filkopiering" -#: gnome/gprefs.c:159 +#: gnome/gprefs.c:163 msgid "FTP directory cache timeout :" msgstr "FTP-katalog cache timeout :" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:167 msgid "Allow customization of icons in icon view" msgstr "Tillåt anpassning av ikoner i ikonvyn" -#: gnome/gprefs.c:172 +#: gnome/gprefs.c:176 msgid "File display" msgstr "Filvy" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:180 msgid "Confirmation" msgstr "Bekräftelse" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:184 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "Cachning" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "Alternativ" @@ -1476,108 +1494,108 @@ msgid "Select icon" msgstr "Välj ikon" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Laddar om den aktuella katalogen" -#: 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 "Skapar en ny katalog här" -#: 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 "Skapar en ny fil här" -#: 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 "Kopiera katalog" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "Radera katalog" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "Byt namn eller flytta katalog" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Bakåt" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Gå till den tidigare besökta katalogen" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Upp" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Gå upp en nivå i kataloghierarkin" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Framåt" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Gå till nästa katalog" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Ladda om" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Ladda om den aktuella katalogen" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "Hem" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "Gå till din hemkatalog" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 msgid "Location:" msgstr "Placering:" #. 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:1235 +#: gtkedit/editcmd.c:1320 gtkedit/editcmd.c:3027 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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&Ok" @@ -1587,12 +1605,12 @@ msgstr "Offset 0x%08lx" # svängelska? -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "Kol %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s bytes" @@ -1649,31 +1667,31 @@ msgid "_Search" msgstr "_Sök" -#: gnome/gwidget.c:90 +#: gnome/gwidget.c:95 msgid "ok" msgstr "ok" -#: gnome/gwidget.c:92 +#: gnome/gwidget.c:97 msgid "cancel" msgstr "avbryt" -#: gnome/gwidget.c:94 +#: gnome/gwidget.c:99 msgid "help" msgstr "hjälp" -#: gnome/gwidget.c:96 src/file.c:2271 +#: gnome/gwidget.c:101 src/file.c:2268 msgid "yes" msgstr "ja" -#: gnome/gwidget.c:98 src/file.c:2269 +#: gnome/gwidget.c:103 src/file.c:2266 msgid "no" msgstr "nej" -#: gnome/gwidget.c:100 +#: gnome/gwidget.c:105 msgid "exit" msgstr "avsluta" -#: gnome/gwidget.c:102 +#: gnome/gwidget.c:107 msgid "abort" msgstr "avbryt" @@ -1685,56 +1703,81 @@ msgid "Could not get the desktop\n" msgstr "Kan inte hämta skrivbordet\n" -#: gnome/gmc-client.c:171 +#: gnome/gmc-client.c:142 +#, c-format +msgid "Unknown arrange type `%s'\n" +msgstr "Okänd ordningstyp \"%s\"\n" + +#: gnome/gmc-client.c:206 msgid "Create window showing the specified directory" msgstr "Skapa fönster som visar den specificerade 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 "Ladda om den specificerade katalogen" -#: gnome/gmc-client.c:175 +#: gnome/gmc-client.c:210 msgid "Rescan the desktop icons" msgstr "Ladda om skrivbordets ikoner" -#: gnome/gmc-client.c:177 +#: gnome/gmc-client.c:212 msgid "Rescan the desktop device icons" msgstr "Ladda om skrivbordets enhetsikoner" -#: gnome/gmc-client.c:179 +#: gnome/gmc-client.c:214 +msgid "Arrange the desktop icons" +msgstr "Ordna skrivbordets ikoner" + +#: gnome/gmc-client.c:215 +msgid "name | type | size | atime | mtime | ctime" +msgstr "namn | typ | storlek | atid | mtid | ätid" + +#: gnome/gmc-client.c:217 msgid "Close windows whose directories cannot be reached" msgstr "Stäng fönster vars kataloger inte 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:149 gtkedit/edit.c:318 gtkedit/edit.c:323 gtkedit/edit.c:337 +#: gtkedit/edit.c:341 gtkedit/edit.c:373 gtkedit/edit.c:379 gtkedit/edit.c:386 +#: gtkedit/edit.c:393 gtkedit/edit.c:399 gtkedit/editcmd.c:298 +#: gtkedit/editcmd.c:304 gtkedit/editcmd.c:2031 gtkedit/editwidget.c:1023 +#: src/dir.c:386 src/tree.c:682 src/tree.c:688 src/wtools.c:222 msgid " Error " msgstr " Fel " -#: gtkedit/edit.c:132 gtkedit/edit.c:234 +#: gtkedit/edit.c:149 gtkedit/edit.c:341 gtkedit/edit.c:379 msgid " Failed trying to open file for reading: " msgstr " Misslyckades med att öppna fil för läsning: " -#: gtkedit/edit.c:241 +#: gtkedit/edit.c:318 +msgid " Error reading from pipe: " +msgstr " Problem att läsa från rör: " + +#: gtkedit/edit.c:323 +msgid " Failed trying to open pipe for reading: " +msgstr " Misslyckades med att öppna rör för läsning: " + +#: gtkedit/edit.c:337 +msgid " Error reading file: " +msgstr " Fel vid läsning av fil: " + +#: gtkedit/edit.c:386 msgid " Cannot get size/permissions info on file: " msgstr " Kan inte hämta information om storlek/rättigheter från fil: " -#: gtkedit/edit.c:248 +#: gtkedit/edit.c:393 msgid " Not an ordinary file: " msgstr " Inte en vanlig fil: " -#: gtkedit/edit.c:254 +#: gtkedit/edit.c:399 msgid " File is too large: " msgstr " Filen är för stor: " -#: gtkedit/edit.c:255 +#: gtkedit/edit.c:400 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " @@ -1742,148 +1785,161 @@ " \n" " Öka värdet på edit.h::MAXBUF och kompilera om editorn. " -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr " Fel vid allokering av minne " +#: gtkedit/edit.c:2571 +msgid "User menu avalaible only in mcedit invoked from mc" +msgstr "Användarmenyn är tillgänglig endast i mcedit som startats från mc" + +#. Not essential to translate +#: gtkedit/edit.c:2769 gtkedit/editcmd.c:2945 +msgid "Error trying to stat file:" +msgstr " Kan inte inhämta status om fil:" + +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " Fel vid skrivning till rör: " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr " Misslyckades med att öppna rör för läsning: " -#: gtkedit/editcmd.c:334 +#: gtkedit/editcmd.c:379 msgid "Quick save " msgstr "Snabbspara" -#: gtkedit/editcmd.c:335 +#: gtkedit/editcmd.c:380 msgid "Safe save " msgstr "Spara " # snabb spara är osäker men spara då är allt sparat så att säga # säker är standard IMHO -#: gtkedit/editcmd.c:336 +#: gtkedit/editcmd.c:381 msgid "Do backups -->" msgstr "Gör backup -->" #. 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:1189 gtkedit/editcmd.c:1233 +#: gtkedit/editcmd.c:1318 gtkedit/editcmd.c:3025 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:854 src/filegui.c:822 +#: src/chmod.c:114 src/chown.c:79 src/cmd.c:858 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 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 msgid "&Cancel" msgstr "&Avbryt" -#: gtkedit/editcmd.c:345 +#: gtkedit/editcmd.c:390 msgid "Extension:" msgstr "Utökning:" # eller kanske suffix #. NLS ? -#: gtkedit/editcmd.c:352 +#: gtkedit/editcmd.c:397 msgid " Edit Save Mode " msgstr " Redigera sparläge " # urk låter som APM e.dy -#: gtkedit/editcmd.c:499 +#: gtkedit/editcmd.c:525 msgid " Save As " msgstr " Spara 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:703 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 +#: gtkedit/editcmd.c:539 gtkedit/editcmd.c:862 gtkedit/editcmd.c:887 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 src/ext.c:315 src/file.c:619 +#: src/help.c:318 src/main.c:708 src/screen.c:1451 src/screen.c:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 vfs/mcfs.c:172 msgid " Warning " msgstr " Varning " -#: gtkedit/editcmd.c:514 +#: gtkedit/editcmd.c:540 msgid " A file already exists with this name. " msgstr " Det existerar redan en fil med det namnet. " #. Push buttons to over-write the current file, or cancel the operation -#: gtkedit/editcmd.c:516 +#: gtkedit/editcmd.c:542 msgid "Overwrite" msgstr "Skriv över" -#: 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:1671 msgid "Cancel" msgstr "Avbryt" -#: gtkedit/editcmd.c:535 +#: gtkedit/editcmd.c:561 msgid " Save as " msgstr " Spara som " -#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2771 msgid " Error trying to save file. " msgstr " Fel vid försök att spara 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 " Radera makro " #. 'Open' = load temp file -#: gtkedit/editcmd.c:655 +#: gtkedit/editcmd.c:681 msgid " Error trying to open temp file " msgstr " Fel vid försök att öppna temporär 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 " Fel vid försök att öppna 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 "tangent '%d 0'" -#: gtkedit/editcmd.c:687 +#: gtkedit/editcmd.c:713 msgid " Error trying to overwrite macro file " msgstr " Fel vid försök att skriva över 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 " Tryck ned makrots nya snabbtangent: " #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:724 +#: gtkedit/editcmd.c:750 msgid " Save macro " msgstr " Spara makro " -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:767 msgid " Delete Macro " msgstr " Radera makro " #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:791 +#: gtkedit/editcmd.c:817 msgid " Load macro " msgstr " Ladda makro " -#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833 msgid " Confirm save file? : " msgstr " Bekräfta spara? : " #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 msgid " Save file " msgstr " Spara 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:2077 msgid "Save" msgstr "Spara" -#: 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. " @@ -1891,120 +1947,113 @@ " Den aktuella texten har modifierats men inte sparats. \n" " Fortsätt och förlora de ändringar som gjorts." -#: 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 "Fortsätt" -#. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +#: gtkedit/editcmd.c:893 msgid " Load " msgstr " Öppna " -# ladda låter lite knäppt, vad säger windoze? -# inte laddar vi väl filer som vi skall editera? -#: gtkedit/editcmd.c:859 -msgid " Error trying to open file for reading " -msgstr " Fel vid försök att öppna fil för läsning " - -#: gtkedit/editcmd.c:1020 gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1136 msgid " Block is large, you may not be able to undo this action. " msgstr " Blocket är stort, det kanske inte går att ångra operationen. " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1136 msgid " Continue " msgstr " Fortsätt " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1136 msgid " Cancel " msgstr " Avbryt " -#: gtkedit/editcmd.c:1173 +#: gtkedit/editcmd.c:1191 msgid "o&Ne" msgstr "e&N" -#: gtkedit/editcmd.c:1175 src/filegui.c:597 +#: gtkedit/editcmd.c:1193 src/filegui.c:597 msgid "al&L" msgstr "a&Lla" -#: gtkedit/editcmd.c:1177 src/file.c:2193 src/filegui.c:267 +#: gtkedit/editcmd.c:1195 src/file.c:2190 src/filegui.c:267 msgid "&Skip" msgstr "&Skippa" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1197 msgid "&Replace" msgstr "&Ersätt" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1203 gtkedit/editcmd.c:1671 msgid " Replace with: " msgstr " Ersätt med: " -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1207 msgid " Confirm replace " msgstr " Bekräfta ersättningar " -#: gtkedit/editcmd.c:1221 gtkedit/editcmd.c:1306 +#: gtkedit/editcmd.c:1237 gtkedit/editcmd.c:1322 msgid "scanf &Expression" msgstr "scanf &Uttryck" -#: gtkedit/editcmd.c:1223 +#: gtkedit/editcmd.c:1239 msgid "replace &All" msgstr "ersätt &Alla" -#: gtkedit/editcmd.c:1225 +#: gtkedit/editcmd.c:1241 msgid "pr&Ompt on replace" msgstr "fr&Åga vid ersätt" -#: gtkedit/editcmd.c:1227 gtkedit/editcmd.c:1308 +#: gtkedit/editcmd.c:1243 gtkedit/editcmd.c:1324 msgid "&Backwards" msgstr "&Bakåt" -#: gtkedit/editcmd.c:1229 gtkedit/editcmd.c:1310 +#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1326 msgid "&Regular expression" msgstr "&Reguljära uttryck" -#: gtkedit/editcmd.c:1231 gtkedit/editcmd.c:1312 +#: gtkedit/editcmd.c:1247 gtkedit/editcmd.c:1328 msgid "&Whole words only" msgstr "Endast &Hela ord" -#: gtkedit/editcmd.c:1233 gtkedit/editcmd.c:1314 +#: gtkedit/editcmd.c:1249 gtkedit/editcmd.c:1330 msgid "case &Sensitive" msgstr "&Skilj gemener/versaler" -#: gtkedit/editcmd.c:1237 +#: gtkedit/editcmd.c:1253 msgid " Enter replacement argument order eg. 3,2,1,4 " msgstr " Mata in ordning för ersättningsargument, tex 3,2,1,4 " -#: gtkedit/editcmd.c:1241 +#: gtkedit/editcmd.c:1257 msgid " Enter replacement string:" msgstr " Mata in ersättningssträng:" -#: gtkedit/editcmd.c:1245 gtkedit/editcmd.c:1318 src/view.c:1998 +#: gtkedit/editcmd.c:1261 gtkedit/editcmd.c:1334 src/view.c:2000 msgid " Enter search string:" msgstr " Mata in söksträng:" #. 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:1280 gtkedit/editcmd.c:1584 gtkedit/editcmd.c:1671 +#: gtkedit/editcmd.c:2210 gtkedit/editcmd.c:2241 gtkedit/editcmd.c:2243 msgid " Replace " msgstr " Ersätt " #. 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:1348 gtkedit/editcmd.c:1578 gtkedit/editcmd.c:2309 +#: gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 src/view.c:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 msgid " Search " msgstr " Sök " #. An input line comes after the ':' -#: gtkedit/editcmd.c:1382 +#: gtkedit/editcmd.c:1402 msgid " Enter search text : " msgstr " Mata in söktext : " -#: gtkedit/editcmd.c:1389 +#: gtkedit/editcmd.c:1409 msgid " Enter replace text : " msgstr " Mata in ersättningstext : " -#: gtkedit/editcmd.c:1392 gtkedit/editcmd.c:1393 +#: gtkedit/editcmd.c:1412 gtkedit/editcmd.c:1413 #, c-format msgid "" "You can enter regexp substrings with %s\n" @@ -2014,12 +2063,12 @@ "(inte \\1, \\2 som i 'sed'). Använd sedan \"Mata in...ordningen\"" # får plats? -#: gtkedit/editcmd.c:1395 +#: gtkedit/editcmd.c:1415 msgid " Enter argument (or substring) order : " msgstr " Mata in argument (eller delsträngs) ordning : " #. Tool hint -#: gtkedit/editcmd.c:1399 gtkedit/editcmd.c:1400 +#: gtkedit/editcmd.c:1419 gtkedit/editcmd.c:1420 msgid "" "Enter the order of replacement of your scanf\n" "format specifiers or regexp substrings, eg 3,1,2" @@ -2028,19 +2077,19 @@ "uttryck eller 'scanf' formatssträng, tex 3,1,2" #. The following are check boxes -#: gtkedit/editcmd.c:1405 +#: gtkedit/editcmd.c:1425 msgid " Whole words only " msgstr " Endast hela ord " -#: gtkedit/editcmd.c:1407 +#: gtkedit/editcmd.c:1427 msgid " Case sensitive " msgstr " Skilj på versaler/gemener " -#: gtkedit/editcmd.c:1410 +#: gtkedit/editcmd.c:1430 msgid " Regular expression " msgstr " Reguljärt uttryck " -#: gtkedit/editcmd.c:1411 gtkedit/editcmd.c:1412 +#: gtkedit/editcmd.c:1431 gtkedit/editcmd.c:1432 msgid "" "See the regex man page for how\n" "to compose a regular expression" @@ -2048,34 +2097,48 @@ "För tips om hur man bygger reguljära\n" "uttryck. Se mansidan för 'regex'" -#: gtkedit/editcmd.c:1418 +#: gtkedit/editcmd.c:1440 msgid " Backwards " msgstr " Baklänges " #. Tool hint -#: gtkedit/editcmd.c:1420 gtkedit/editcmd.c:1421 +#: gtkedit/editcmd.c:1442 gtkedit/editcmd.c:1443 msgid "Warning: Searching backward can be slow" msgstr "Warning: Att söka baklänges kan gå långsamt" -#: gtkedit/editcmd.c:1434 +#: gtkedit/editcmd.c:1464 msgid " Prompt on replace " msgstr " Fråga innan ersätt " #. Tool hint -#: gtkedit/editcmd.c:1436 +#: gtkedit/editcmd.c:1466 msgid "Ask before making each replacement" msgstr "Fråga innan ersätt" -#: gtkedit/editcmd.c:1438 +#: gtkedit/editcmd.c:1468 msgid " Replace all " msgstr " Ersätt alla " -#: gtkedit/editcmd.c:1441 +#. Tool hint +#: gtkedit/editcmd.c:1470 +msgid "Replace repeatedly" +msgstr "Ersätt flera gånger" + +#: gtkedit/editcmd.c:1474 +msgid " Bookmarks " +msgstr "Bokmärken" + +#. Tool hint +#: gtkedit/editcmd.c:1476 gtkedit/editcmd.c:1477 +msgid "Create bookmarks at all lines found" +msgstr "Skapa bokmärken för alla funna rader" + +#: gtkedit/editcmd.c:1480 msgid " Scanf expression " msgstr " Scanf uttryck " #. Tool hint -#: gtkedit/editcmd.c:1443 +#: gtkedit/editcmd.c:1482 msgid "" "Allows entering of a C format string,\n" "see the scanf man page" @@ -2084,58 +2147,63 @@ "Se mansidan för 'scanf'" #. Tool hint -#: gtkedit/editcmd.c:1448 +#: gtkedit/editcmd.c:1507 msgid "Begin search, Enter" msgstr "Börja sökning, Enter" # tänker inte ersätta 'enter' med retur -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1508 msgid "Abort this dialog, Esc" msgstr "Avbryt den här dialogen, Esc" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Replace" msgstr "Ersätt" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Skip" msgstr "Skippa" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Replace all" msgstr "Ersätt alla" -#: gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1671 msgid "Replace one" msgstr "Ersätt en" -#: gtkedit/editcmd.c:1969 +#: gtkedit/editcmd.c:2031 msgid "" " Invalid regular expression, or scanf expression with to many conversions " msgstr "" " Ogiltigt reguljärt uttryck, eller scanfuttryck med för många konverteringar " #. "Invalid regexp string or scanf string" -#: gtkedit/editcmd.c:2149 +#: gtkedit/editcmd.c:2212 msgid " Error in replacement format string. " msgstr " Fel i formatsträngen för ersättningar." -#: gtkedit/editcmd.c:2177 +#: gtkedit/editcmd.c:2240 #, c-format msgid " %ld replacements made. " msgstr " %ld ersättningar gjorda. " -#: gtkedit/editcmd.c:2180 gtkedit/editcmd.c:2249 +#: gtkedit/editcmd.c:2243 gtkedit/editcmd.c:2311 gtkedit/editcmd.c:2339 msgid " Search string not found. " msgstr " Söksträngen kunde inte hittas. " +#. in response to number of bookmarks added because of string being found %d times +#: gtkedit/editcmd.c:2308 +#, c-format +msgid " %d finds made, %d bookmarks added " +msgstr " %d sökningar gjorda, %d bokmärken tillagda" + #. Confirm 'Quit' dialog box -#: gtkedit/editcmd.c:2273 gtkedit/editcmd.c:2288 gtkedit/editcmd.c:2291 +#: gtkedit/editcmd.c:2364 gtkedit/editcmd.c:2379 gtkedit/editcmd.c:2382 msgid " Quit " msgstr " Avsluta " -#: gtkedit/editcmd.c:2274 gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2365 gtkedit/editcmd.c:2383 msgid "" " Current text was modified without a file save. \n" " Save with exit? " @@ -2144,156 +2212,166 @@ " Spara och avsluta? " # stämmer detta semantiskt i sammanhanget alltså? -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2379 msgid " File was modified, Save with exit? " msgstr " Filen har modifierats, spara och avsluta? " # stämmer detta semantiskt i sammanhanget? -#: gtkedit/editcmd.c:2288 +#: gtkedit/editcmd.c:2379 msgid "Cancel quit" msgstr "Avbryt avsluta" -#: 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:2379 src/cmd.c:246 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:406 msgid "&Yes" msgstr "&Ja" -#: 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:2379 src/cmd.c:246 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:406 msgid "&No" msgstr "&Nej" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2383 msgid " &Cancel quit " msgstr " &Avbryt avsluta " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2383 msgid " &Yes " msgstr " &Ja " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2383 msgid " &No " msgstr " &Nej " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2690 msgid " Copy to clipboard " msgstr " Kopiera till klippbordet " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2599 -#: gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2615 gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2690 +#: gtkedit/editcmd.c:2703 msgid " Unable to save to file. " msgstr " Kunde inte spara till filen. " -#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2637 gtkedit/editcmd.c:2703 msgid " Cut to clipboard " msgstr " Klipp ut till klippbordet " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 src/view.c:1913 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 src/view.c:1915 msgid " Goto line " msgstr " Gå till rad " -#: gtkedit/editcmd.c:2634 gtkedit/editcmd.c:2638 gtkedit/editcmd.c:2643 -#: gtkedit/editcmd.c:2646 +#: gtkedit/editcmd.c:2725 gtkedit/editcmd.c:2729 gtkedit/editcmd.c:2734 +#: gtkedit/editcmd.c:2737 msgid " Enter line: " msgstr " Mata in radnummer: " -#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2758 gtkedit/editcmd.c:2771 msgid " Save Block " msgstr " Spara block " -#: gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2785 msgid " Insert File " msgstr " Infoga fil " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2798 msgid " Insert file " msgstr " Infoga fil " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2798 msgid " Error trying to insert file. " msgstr " Fel vid infogning av fil. " #. Not essential to translate -#: gtkedit/editcmd.c:2752 +#: gtkedit/editcmd.c:2820 msgid " Sort block " msgstr " Sortera block " # varför är texten lokaliserad om den inte skall översättas? #. Not essential to translate -#: gtkedit/editcmd.c:2752 gtkedit/editcmd.c:2806 +#: gtkedit/editcmd.c:2820 gtkedit/editcmd.c:2908 msgid " You must first highlight a block of text. " msgstr " Du måste först markera ett textblock. " -#: gtkedit/editcmd.c:2759 +#: gtkedit/editcmd.c:2827 msgid " Run Sort " msgstr " Kör 'sort' " #. Not essential to translate -#: gtkedit/editcmd.c:2761 +#: gtkedit/editcmd.c:2829 msgid " Enter sort options (see manpage) separated by whitespace: " msgstr " Mata in flaggor för 'sort' (see mansidan) skilda av blanktecken: " -#: gtkedit/editcmd.c:2772 gtkedit/editcmd.c:2778 +#: gtkedit/editcmd.c:2840 gtkedit/editcmd.c:2846 msgid " Sort " msgstr " Sortera " #. Not essential to translate -#: gtkedit/editcmd.c:2774 +#: gtkedit/editcmd.c:2842 msgid " Error trying to execute sort command " msgstr " Fel vid exekvering av 'sort' kommandot " #. Not essential to translate -#: gtkedit/editcmd.c:2780 +#: gtkedit/editcmd.c:2848 msgid " Sort returned non-zero: " msgstr " Sortera returnerade icke-nollor: " -#. Not essential to translate -#: gtkedit/editcmd.c:2804 gtkedit/editcmd.c:2834 -msgid " Process block " -msgstr " Processblock " +#: gtkedit/editcmd.c:2881 +msgid "Error create script:" +msgstr "Fel vid skapande av skript:" + +#: gtkedit/editcmd.c:2887 +msgid "Error read script:" +msgstr "Fel vid läsning av skript:" + +#: gtkedit/editcmd.c:2894 +msgid "Error close script:" +msgstr "Fel vid stängning av skript:" + +#: gtkedit/editcmd.c:2899 +msgid "Script created:" +msgstr "Skript skapat:" + +#: gtkedit/editcmd.c:2906 +msgid "Process block" +msgstr "Processblock" -#. Not essential to translate -#: gtkedit/editcmd.c:2836 -msgid " Error trying to stat file " -msgstr " Kan inte inhämta status om fil " - -#: gtkedit/editcmd.c:2907 +#: gtkedit/editcmd.c:3018 msgid " Mail " msgstr " Brev " -#: gtkedit/editcmd.c:2920 +#: gtkedit/editcmd.c:3031 msgid " Copies to" msgstr " Kopior till" -#: gtkedit/editcmd.c:2924 +#: gtkedit/editcmd.c:3035 msgid " Subject" msgstr " Ämne" -#: gtkedit/editcmd.c:2928 +#: gtkedit/editcmd.c:3039 msgid " To" msgstr " Till" -#: gtkedit/editcmd.c:2930 +#: gtkedit/editcmd.c:3041 msgid " mail -s -c " msgstr " mail -s <ämne> -c " -#: gtkedit/editmenu.c:61 +#: gtkedit/editmenu.c:62 msgid " Word wrap " msgstr " Radbrytning " #. Not essential to translate -#: gtkedit/editmenu.c:63 +#: gtkedit/editmenu.c:64 msgid " Enter line length, 0 for off: " msgstr " Mata in radlängd, 0 för av: " -#: gtkedit/editmenu.c:74 +#: gtkedit/editmenu.c:75 msgid " About " msgstr " Om " -#: gtkedit/editmenu.c:75 +#: gtkedit/editmenu.c:76 msgid "" "\n" " Cooledit v3.11.5\n" @@ -2311,345 +2389,360 @@ " En användarvänlig texteditor skriven för \n" " Midnight Commander. \n" -#: gtkedit/editmenu.c:123 gtkedit/editmenu.c:139 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:147 msgid "&Open/load... C-o" msgstr "&Öppna C-o" # ladda låter inte så bra i sammanhanget -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:129 msgid "&New C-n" msgstr "&Ny C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:131 gtkedit/editmenu.c:150 msgid "&Save F2" msgstr "&Spara F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:151 msgid "save &As... F12" msgstr "spara s&Om... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:153 msgid "&Insert file... F15" msgstr "&Infoga fil... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:135 msgid "copy to &File... C-f" msgstr "kopiera till &Fil... C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +# #>>--<< +#: gtkedit/editmenu.c:137 gtkedit/editmenu.c:156 +msgid "&User menu... F11" +msgstr "anv&Ändarmeny... F11" + +#: gtkedit/editmenu.c:140 gtkedit/editmenu.c:159 msgid "a&Bout... " msgstr "&Om... " -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:142 gtkedit/editmenu.c:161 msgid "&Quit F10" msgstr "&Avsluta F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:148 msgid "&New C-x k" msgstr "&Ny C-x k" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:154 msgid "copy to &File... " msgstr "kopiera till &Fil... " -#: gtkedit/editmenu.c:155 gtkedit/editmenu.c:172 +#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 msgid "&Toggle Mark F3" msgstr "&Markera av/på F3" -#: gtkedit/editmenu.c:156 gtkedit/editmenu.c:173 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Mark Columns S-F3" msgstr "markera &Kolumner S-F3" -#: gtkedit/editmenu.c:158 gtkedit/editmenu.c:175 +#: gtkedit/editmenu.c:169 gtkedit/editmenu.c:186 msgid "toggle &Ins/overw Ins" msgstr "&Infoga/skriv över Ins" -#: gtkedit/editmenu.c:160 gtkedit/editmenu.c:177 +#: gtkedit/editmenu.c:171 gtkedit/editmenu.c:188 msgid "&Copy F5" msgstr "&Kopiera F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:172 gtkedit/editmenu.c:189 msgid "&Move F6" msgstr "&Flytta F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:173 gtkedit/editmenu.c:190 msgid "&Delete F8" msgstr "&Radera F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:175 gtkedit/editmenu.c:192 msgid "&Undo C-u" msgstr "&Ångra C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:177 gtkedit/editmenu.c:194 msgid "&Beginning C-PgUp" msgstr "&Början C-Pgup" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:178 gtkedit/editmenu.c:195 msgid "&End C-PgDn" msgstr "e&Nd C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:200 gtkedit/editmenu.c:207 msgid "&Search... F7" msgstr "&Sök... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:201 gtkedit/editmenu.c:208 msgid "search &Again F17" msgstr "sök i&Gen F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:202 gtkedit/editmenu.c:209 msgid "&Replace... F4" msgstr "&Ersätt... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:237 msgid "&Goto line... M-l" msgstr "&Gå till rad... M-l" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +#: gtkedit/editmenu.c:215 gtkedit/editmenu.c:238 +msgid "goto matching &Bracket M-b" +msgstr "gå till matchande &parentes M-b" + +#: gtkedit/editmenu.c:217 gtkedit/editmenu.c:240 msgid "insert &Literal... C-q" msgstr "klistra in &Bokstavlig... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:242 msgid "&Refresh screen C-l" msgstr "&Rita om skärmen C-l" -#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:231 +#: gtkedit/editmenu.c:221 gtkedit/editmenu.c:244 msgid "&Start record macro C-r" msgstr "&Starta makroinspelning C-r" -#: gtkedit/editmenu.c:210 gtkedit/editmenu.c:232 +#: gtkedit/editmenu.c:222 gtkedit/editmenu.c:245 msgid "&Finish record macro... C-r" msgstr "&Avsluta makroinspelning... C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:223 msgid "&Execute macro... C-a, KEY" msgstr "&Exekvera makro... C-a, KEY" -#: gtkedit/editmenu.c:212 gtkedit/editmenu.c:234 +#: gtkedit/editmenu.c:224 gtkedit/editmenu.c:247 msgid "delete macr&O... " msgstr "radera makr&O... " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:226 gtkedit/editmenu.c:249 msgid "insert &Date/time " msgstr "klistra in &Datum/tid " -#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:238 +#: gtkedit/editmenu.c:228 gtkedit/editmenu.c:251 msgid "format p&Aragraph M-p" msgstr "formatera &Paragraf M-p" -#: gtkedit/editmenu.c:217 +#: gtkedit/editmenu.c:229 msgid "'ispell' s&Pell check C-p" msgstr "'ispell' sta&Vningskontroll C-p" -#: gtkedit/editmenu.c:218 gtkedit/editmenu.c:240 +#: gtkedit/editmenu.c:230 gtkedit/editmenu.c:253 msgid "sor&T... M-t" msgstr "sor&Tera... M-t" -#: gtkedit/editmenu.c:219 gtkedit/editmenu.c:241 -msgid "'indent' &C Formatter F19" -msgstr "'indent' &C-formaterare F19" +#: gtkedit/editmenu.c:231 gtkedit/editmenu.c:254 +msgid "E&xternal Formatter F19" +msgstr "E&xtern textformaterare F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:232 msgid "&Mail... " msgstr "&Brev... " -#: gtkedit/editmenu.c:233 +#: gtkedit/editmenu.c:246 msgid "&Execute macro... C-x e, KEY" msgstr "&Kör makro... C-x e, KEY" -#: gtkedit/editmenu.c:239 +#: gtkedit/editmenu.c:252 msgid "'ispell' s&Pell check M-$" msgstr "'ispell' sta&Vningskontroll M-$" -#: gtkedit/editmenu.c:248 gtkedit/editmenu.c:257 +#: gtkedit/editmenu.c:261 gtkedit/editmenu.c:270 msgid "&General... " msgstr "&Generellt..." -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:262 gtkedit/editmenu.c:271 msgid "&Save mode..." msgstr "&Spara läge..." -#: gtkedit/editmenu.c:251 gtkedit/editmenu.c:260 src/main.c:1349 +#: gtkedit/editmenu.c:264 gtkedit/editmenu.c:273 src/main.c:1357 msgid "&Layout..." msgstr "&Layout..." #. 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:283 gtkedit/editmenu.c:292 gtkedit/editmenu.c:409 #: 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:284 gtkedit/editmenu.c:293 gtkedit/editmenu.c:425 msgid " Edit " msgstr " Edit " # eller redigera -#: gtkedit/editmenu.c:272 gtkedit/editmenu.c:281 +#: gtkedit/editmenu.c:285 gtkedit/editmenu.c:294 msgid " Sear/Repl " msgstr " Sök/Ersätt" # felstavat i original eller ont om plats? -#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:452 +#: gtkedit/editmenu.c:286 gtkedit/editmenu.c:295 gtkedit/editmenu.c:465 msgid " Command " msgstr " Kommando " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +#: gtkedit/editmenu.c:287 gtkedit/editmenu.c:296 msgid " Options " msgstr " Inställningar " -#: gtkedit/editmenu.c:397 +#: gtkedit/editmenu.c:410 msgid "Open...\tC-o" msgstr "Öppna...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:411 msgid "New\tC-n" msgstr "Ny\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:413 msgid "Save\tF2" msgstr "Spara\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:414 msgid "Save as...\tF12" msgstr "Spara som...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:416 msgid "Insert file...\tF15" msgstr "Klistra in fil...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:417 msgid "Copy to file...\tC-f" msgstr "Kopiera till fil...\tC-f" #. Tool hint -#: gtkedit/editmenu.c:407 +#: gtkedit/editmenu.c:420 msgid "Disk operations and file indexing/searching" msgstr "Diskoperationer och indexering/sökning av filer" -#: gtkedit/editmenu.c:413 +#: gtkedit/editmenu.c:426 msgid "Toggle mark\tF3" msgstr "Markering av/på\tF3" -#: gtkedit/editmenu.c:414 +#: gtkedit/editmenu.c:427 msgid "Toggle mark columns\tC-b" msgstr "Markera columner av/på\tC-b" -#: gtkedit/editmenu.c:416 +#: gtkedit/editmenu.c:429 msgid "Toggle book mark\tC-M-Ins" msgstr "Bokmärken av/på\tC-M-Ins " # vad kan man översätta toggle till? -#: gtkedit/editmenu.c:417 +#: gtkedit/editmenu.c:430 msgid "Previous book mark\tC-M-Up" msgstr "Tidigare bokmärke\tC-M-Upp" -#: gtkedit/editmenu.c:418 +#: gtkedit/editmenu.c:431 msgid "Next book mark\tC-M-Down" msgstr "Nästa bokmärke\tC-M-Ner" -#: gtkedit/editmenu.c:419 +#: gtkedit/editmenu.c:432 msgid "Flush book marks" msgstr "Töm bokmärken" -#: gtkedit/editmenu.c:421 +#: gtkedit/editmenu.c:434 msgid "Toggle insert/overwrite\tIns" msgstr "Infoga/skriv över\tIns" -#: gtkedit/editmenu.c:423 +#: gtkedit/editmenu.c:436 msgid "Copy block to cursor\tF5" msgstr "Kopiera blocket till markören\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:437 msgid "Move block to cursor\tF6" msgstr "Flytta block till markör\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:438 msgid "Delete block\tF8/C-Del" msgstr "Radera block\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:440 msgid "Copy block to clipbrd\tC-Ins" msgstr "Kopiera block till klippbordet\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:441 msgid "Cut block to clipbrd\tS-Del" msgstr "Klipp ut block till klippbordet\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:442 msgid "Paste block from clipbrd\tS-Ins" msgstr "Klistra in block från klippbordet\tS-Ins" -#: gtkedit/editmenu.c:430 +#: gtkedit/editmenu.c:443 msgid "Selection history\tM-Ins" msgstr "Valhistoria\tM-Ins" -#: gtkedit/editmenu.c:432 +#: gtkedit/editmenu.c:445 msgid "Undo\tC-BackSpace" msgstr "Ångra\tC-BackSpace" #. Tool hint -#: gtkedit/editmenu.c:435 +#: gtkedit/editmenu.c:448 msgid "Manipulating blocks of text" msgstr "Manipulerar block av text" -#: gtkedit/editmenu.c:440 +#: gtkedit/editmenu.c:453 msgid " Srch/Replce " msgstr " Sök/Ersätt " -#: gtkedit/editmenu.c:441 +#: gtkedit/editmenu.c:454 msgid "Search...\tF7" msgstr "Sök...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:455 msgid "Search again\tF17" msgstr "Sök igen\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:456 msgid "Replace...\tF4" msgstr "Ersätt...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:457 msgid "Replace again\tF14" msgstr "Ersätt igen\tF14" #. Tool hint -#: gtkedit/editmenu.c:447 +#: gtkedit/editmenu.c:460 msgid "Search for and replace text" msgstr "Sök efter och ersätt text" -#: gtkedit/editmenu.c:453 +#: gtkedit/editmenu.c:466 msgid "Goto line...\tM-l" msgstr "Gå till linje...\tM-l" -#: gtkedit/editmenu.c:455 +#: gtkedit/editmenu.c:467 +msgid "Goto matching bracket\tM-b" +msgstr "" +"Gå till matchande parentes\n" +"M-b" + +#: gtkedit/editmenu.c:469 msgid "Start record macro\tC-r" msgstr "Starta makroinspelning\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:470 msgid "Finish record macro...\tC-r" msgstr "Avsluta makroinspelning...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:471 msgid "Execute macro...\tC-a, KEY" msgstr "Exekvera makro...\tC-a, KEY" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:472 msgid "Delete macro...\t" msgstr "Radera makro..\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:474 msgid "Insert date/time\tC-d" msgstr "Infoga datum/tid\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:475 msgid "Format paragraph\tM-p" msgstr "Formatera paragraf\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:477 msgid "Refresh display\tC-l" msgstr "Rita om display\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:480 msgid "Macros and internal commands" msgstr "Makron och interna kommandon" @@ -2675,89 +2768,89 @@ # får plats? #. 2 -#: gtkedit/editoptions.c:74 +#: gtkedit/editoptions.c:72 msgid "Word wrap line length : " msgstr "Linjelängd vid radbrytning : " # får plats? #. 4 -#: gtkedit/editoptions.c:80 +#: gtkedit/editoptions.c:78 msgid "Tab spacing : " msgstr "Tabstorlek : " -#: gtkedit/editoptions.c:88 +#: gtkedit/editoptions.c:86 msgid "synta&X highlighting" msgstr "markera synta&X" #. 7 -#: gtkedit/editoptions.c:94 +#: gtkedit/editoptions.c:92 msgid "confir&M before saving" msgstr "fr&Åga innan spara" #. 8 -#: gtkedit/editoptions.c:97 +#: gtkedit/editoptions.c:95 msgid "fill tabs with &Spaces" msgstr "fyll tabbar med &Mellanslag" #. 9 -#: gtkedit/editoptions.c:100 +#: gtkedit/editoptions.c:98 msgid "&Return does autoindent" msgstr "&Enter gör automatisk indentering" # får plats? #. 10 -#: gtkedit/editoptions.c:103 +#: gtkedit/editoptions.c:101 msgid "&Backspace through tabs" msgstr "&Backspace raderar tabbar" #. 11 -#: gtkedit/editoptions.c:106 +#: gtkedit/editoptions.c:104 msgid "&Fake half tabs" msgstr "&Falska halva tabbar" #. 13 -#: gtkedit/editoptions.c:112 +#: gtkedit/editoptions.c:110 msgid "Wrap mode" msgstr "Automatisk radbrytning" # får plats #. 15 -#: gtkedit/editoptions.c:118 +#: gtkedit/editoptions.c:116 msgid "Key emulation" msgstr "Tangentemulering" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr "Inställningar" #. Not essential to translate -#: gtkedit/editwidget.c:317 +#: gtkedit/editwidget.c:323 msgid "Error initialising editor.\n" msgstr "Fel vid initiering.\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:1723 src/screen.c:2396 src/screen.c:2426 src/tree.c:1008 +#: src/view.c:2070 msgid "Help" msgstr "Hjälp" -#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +#: gtkedit/editwidget.c:1138 gtkedit/gtkedit.c:1248 msgid "Mark" msgstr "Markera" -#: gtkedit/editwidget.c:1096 +#: gtkedit/editwidget.c:1139 msgid "Replac" msgstr "Ersätt" -#: gtkedit/editwidget.c:1102 src/main.c:1717 +#: gtkedit/editwidget.c:1145 src/main.c:1725 msgid "PullDn" msgstr "Rullgardin" # ? # får plats #. 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:1726 src/view.c:2072 src/view.c:2094 msgid "Quit" msgstr "Avsluta" @@ -2828,7 +2921,7 @@ msgid "Delete highlighted text" msgstr "Radera markerad text" -#: gtkedit/gtkedit.c:1255 src/main.c:1716 src/screen.c:2396 src/screen.c:2426 +#: gtkedit/gtkedit.c:1255 src/main.c:1724 src/screen.c:2397 src/screen.c:2427 msgid "Menu" msgstr "Meny" @@ -2864,12 +2957,12 @@ msgid "Search/Replace" msgstr "Sök/Ersätt" -#: gtkedit/syntax.c:1051 gtkedit/syntax.c:1060 gtkedit/syntax.c:1069 -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1072 gtkedit/syntax.c:1081 gtkedit/syntax.c:1090 +#: gtkedit/syntax.c:1099 msgid " Spelling Message " msgstr " Stavningskontrollerar meddelande " -#: gtkedit/syntax.c:1051 +#: gtkedit/syntax.c:1072 msgid "" " Fail trying to open ispell program. \n" " Check that it is in your path and works with the -a option. \n" @@ -2880,7 +2973,7 @@ " Ett annat alternativ är att deaktivera stavningskontroll i " "inställningsmenyn." -#: gtkedit/syntax.c:1060 +#: gtkedit/syntax.c:1081 msgid "" " Fail trying to open ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2891,7 +2984,7 @@ " Ett annat alternativ är att deaktivera stavningskontroll i " "inställningsmenyn." -#: gtkedit/syntax.c:1069 +#: gtkedit/syntax.c:1090 msgid "" " Fail trying to read ispell pipes. \n" " Check that it is in your path and works with the -a option. \n" @@ -2902,7 +2995,7 @@ " Ett annat alternativ är att deaktivera stavningskontroll i " "inställningsmenyn." -#: gtkedit/syntax.c:1078 +#: gtkedit/syntax.c:1099 msgid "" " Error reading from ispell. \n" " Ispell is being restarted. " @@ -2910,11 +3003,11 @@ " Fel vid läsning från \"ispell\". \n" " \"ispell\" håller på att startas om. " -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid " Load Syntax Rules " msgstr " Ladda syntaxregler " -#: gtkedit/syntax.c:1351 gtkedit/syntax.c:1353 +#: gtkedit/syntax.c:1372 gtkedit/syntax.c:1374 msgid "" " Your syntax rule file is outdated \n" " A new rule file is being installed. \n" @@ -2924,15 +3017,15 @@ " En ny fil kommer att installeras. \n" " Din gamla regelfil har sparats med ett .OLD suffix. " -#: gtkedit/syntax.c:1487 gtkedit/syntax.c:1494 +#: gtkedit/syntax.c:1517 gtkedit/syntax.c:1524 msgid " Load syntax file " msgstr " Ladda syntaxfil " -#: gtkedit/syntax.c:1487 +#: gtkedit/syntax.c:1517 msgid " File access error " msgstr " Filåtkomst nekas " -#: gtkedit/syntax.c:1493 +#: gtkedit/syntax.c:1523 #, c-format msgid " Error in file %s on line %d " msgstr " Fel i fil \"%s\" på rad %d " @@ -2999,7 +3092,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:669 msgid " Oops... " msgstr " Hoppsan..." @@ -3015,7 +3108,7 @@ msgid "Background process:" msgstr "Bakgrundsprocess:" -#: src/background.c:287 src/file.c:2192 +#: src/background.c:287 src/file.c:2189 msgid " Background process error " msgstr " Bakgrundsprocessfel " @@ -3344,130 +3437,130 @@ msgid " I can't run the Chown command on a tarfs " msgstr " Kan inte använda chown kommandot på tarfs " -#: src/cmd.c:198 +#: src/cmd.c:195 #, c-format msgid " Can not fetch a local copy of %s " msgstr " Kan inte hämta en lokal kopia av %s " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid " CD " msgstr " CD " -#: src/cmd.c:248 +#: src/cmd.c:245 msgid "Files tagged, want to cd?" msgstr "Filerna är markerade, vill du byta katalog?" -#: src/cmd.c:254 src/cmd.c:713 src/cmd.c:727 +#: src/cmd.c:251 src/cmd.c:712 src/cmd.c:731 msgid "Could not change directory" msgstr "Kan inte ändra katalog" -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " View file " msgstr " Visa fil " -#: src/cmd.c:283 +#: src/cmd.c:280 msgid " Filename:" msgstr " Filnamn:" -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filtered view " msgstr " Filtrerad vy " -#: src/cmd.c:300 +#: src/cmd.c:297 msgid " Filter command and arguments:" msgstr " Filterkommando och argument:" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid "Create a new Directory" msgstr "Skapa en ny katalog" -#: src/cmd.c:388 +#: src/cmd.c:385 msgid " Enter directory name:" msgstr " Mata in katalognamnet:" -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Filter " msgstr " Filter " -#: src/cmd.c:449 +#: src/cmd.c:446 msgid " Set expression for filtering filenames" msgstr " Sätt uttryck för filtrering av filnamn" -#: src/cmd.c:515 +#: src/cmd.c:512 msgid " Select " msgstr " Välj " -#: src/cmd.c:567 +#: src/cmd.c:564 msgid " Unselect " msgstr " Välj bort " -#: src/cmd.c:640 +#: src/cmd.c:637 msgid "Extension file edit" msgstr "Redigera utökningsfilen" -#: src/cmd.c:641 +#: src/cmd.c:638 msgid " Which extension file you want to edit? " msgstr " Vilken utökningsfil vill du redigera? " -#: src/cmd.c:642 +#: src/cmd.c:639 msgid "&User" msgstr "&Användare" -#: src/cmd.c:642 src/cmd.c:668 +#: src/cmd.c:639 src/cmd.c:667 msgid "&System Wide" msgstr "Global &System" -#: src/cmd.c:665 -msgid "Menu file edit" -msgstr "Redigera menyfilen" +#: src/cmd.c:664 +msgid " Menu edit " +msgstr " Menyredigering " -#: src/cmd.c:666 -msgid " Which menu file will you edit? " -msgstr " Vilken meny vill du redigera? " +#: src/cmd.c:665 +msgid " Which menu file will you edit ? " +msgstr " Vilken menyfil vill du redigera? " -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Local" msgstr "&Lokal" -#: src/cmd.c:668 +#: src/cmd.c:667 msgid "&Home" msgstr "&Hem" -#: src/cmd.c:853 +#: src/cmd.c:857 msgid " Compare directories " msgstr " Jämför kataloger " -#: src/cmd.c:853 +#: src/cmd.c:857 msgid " Select compare method: " msgstr " Välj jämförelsemetod: " -#: src/cmd.c:854 +#: src/cmd.c:858 msgid "&Quick" msgstr "&Snabb" -#: src/cmd.c:854 +#: src/cmd.c:858 msgid "&Size only" msgstr "&Endast storlek" -#: src/cmd.c:854 +#: src/cmd.c:858 msgid "&Thorough" msgstr "&Noggrann" -#: src/cmd.c:864 +#: src/cmd.c:868 msgid " Both panels should be on the listing view mode to use this command " msgstr "" " Båda panelerna måste vara i listningsläge vid användning av detta kommando " # undersök om raden är för lång -#: src/cmd.c:878 +#: src/cmd.c:882 msgid " The command history is empty " msgstr " Kommandohistorien är tom " -#: src/cmd.c:884 +#: src/cmd.c:888 msgid " Command history " msgstr " Kommandohistoria " -#: src/cmd.c:926 +#: src/cmd.c:930 msgid "" " Not an xterm or Linux console; \n" " the panels cannot be toggled. " @@ -3475,11 +3568,11 @@ " Inte en xterm eller Linuxkonsol. \n" " Panelerna kan inte aktiveras/deaktiveras." -#: src/cmd.c:965 +#: src/cmd.c:969 msgid "Type `exit' to return to the Midnight Commander" msgstr "Skriv `exit' för att återvända till Midnight Commander" -#: src/cmd.c:1020 +#: src/cmd.c:1024 #, c-format msgid "" " Couldn't stat %s \n" @@ -3488,98 +3581,107 @@ " Kan inte inhämta information om filen \"%s\" \n" " %s " -#: src/cmd.c:1029 src/cmd.c:1031 +#: src/cmd.c:1033 src/cmd.c:1035 msgid " Link " msgstr " Länk " -#: src/cmd.c:1030 src/cmd.c:1169 src/file.c:1704 +#: src/cmd.c:1034 src/cmd.c:1173 src/file.c:1704 msgid " to:" msgstr " till:" -#: src/cmd.c:1041 +#: src/cmd.c:1045 #, c-format msgid " link: %s " msgstr " länk: %s " -#: src/cmd.c:1074 +#: src/cmd.c:1078 #, c-format msgid " symlink: %s " msgstr " symlänk: %s " -#: src/cmd.c:1128 +#: src/cmd.c:1132 #, c-format msgid " Symlink `%s' points to: " msgstr " Symlänk `%s' pekar på: " -#: src/cmd.c:1133 +#: src/cmd.c:1137 msgid " Edit symlink " msgstr " Redigera symlänk " -#: src/cmd.c:1138 +#: src/cmd.c:1142 #, c-format msgid " edit symlink, unable to remove %s: %s " msgstr " redigera symlänk, kunde inte radera %s: %s " -#: src/cmd.c:1142 +#: src/cmd.c:1146 #, c-format msgid " edit symlink: %s " msgstr " redigera symlänk: %s " -#: src/cmd.c:1169 +#: src/cmd.c:1173 msgid " Link symbolically " msgstr " Länka symboliskt " -#: src/cmd.c:1170 +#: src/cmd.c:1174 msgid " Relative symlink " msgstr "Relativ symlänk " -#: src/cmd.c:1181 +#: src/cmd.c:1185 #, c-format msgid " relative symlink: %s " msgstr " relativ symlänk: %s " -#: src/cmd.c:1331 +#: src/cmd.c:1260 +msgid "Using default locale" +msgstr "Använd standardlokalisering" + +#: src/cmd.c:1262 +#, c-format +msgid "Using locale \"%s\" (from environment variable %s)" +msgstr "Använd lokalisering \"%s\" (från omgivningsvariabel %s)" + +#: src/cmd.c:1348 msgid " Enter machine name (F1 for details): " msgstr " Mata in maskinnamnet (F1 för detaljer): " -#: src/cmd.c:1355 +#: src/cmd.c:1375 #, c-format msgid " Could not chdir to %s " msgstr " Kunde inte byta katalog till %s " -#: src/cmd.c:1362 +#: src/cmd.c:1382 src/widget.c:1163 msgid " Link to a remote machine " msgstr " Länk till en avlägsen maskin " -#: src/cmd.c:1368 +#: src/cmd.c:1388 src/widget.c:1164 msgid " FTP to machine " msgstr " FTP till maskin" -#: src/cmd.c:1374 +#: src/cmd.c:1394 src/widget.c:1165 msgid " SMB link to machine " msgstr " SMB-länk till maskin " -#: src/cmd.c:1384 +#: src/cmd.c:1404 msgid " Socket source routing setup " msgstr "Inställning för \"socket source routing\"" -#: src/cmd.c:1385 +#: src/cmd.c:1405 msgid " Enter host name to use as a source routing hop: " msgstr "Ange namn på värddator att användas som \"source routing hop\": " -#: src/cmd.c:1392 +#: src/cmd.c:1413 msgid " Host name " msgstr " Namnet på värddatorn " -#: src/cmd.c:1392 +#: src/cmd.c:1413 msgid " Error while looking up IP address " msgstr " Fel vid uppslagning av IP adress " -#: src/cmd.c:1403 +#: src/cmd.c:1424 msgid " Undelete files on an ext2 file system " msgstr " Återskapa filer på ett ext2 filsystem " -#: src/cmd.c:1404 +#: src/cmd.c:1425 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" @@ -3587,11 +3689,11 @@ " Mata in namnet på enheten (utan /dev/) som du \n" " vill återskapa filer på: (F1 för detaljer)" -#: src/cmd.c:1454 +#: src/cmd.c:1475 msgid " Setup saved to ~/" msgstr " Inställningarna sparade till ~/" -#: src/cmd.c:1459 +#: src/cmd.c:1480 msgid " Setup " msgstr " Inställningar " @@ -3686,14 +3788,14 @@ #: src/dir.c:386 #, c-format -msgid "File exists but can not be stat-ed: %s %s" -msgstr "Filen existerar men status kan inte inhämtas: %s %s" +msgid "File '%s' exists but can not be stat-ed: %s" +msgstr "Filen \"%s\" existerar men status kan inte inhämtas: %s" #: src/dir.c:657 msgid "Unknown" msgstr "Okänd" -#: src/ext.c:143 src/user.c:501 +#: src/ext.c:143 src/user.c:542 #, c-format msgid "" " Can't generate unique filename \n" @@ -3702,7 +3804,7 @@ " Kan inte generera unika filnamn \n" " %s " -#: src/ext.c:150 src/user.c:513 +#: src/ext.c:150 src/user.c:554 #, c-format msgid "" " Can't create temporary command file \n" @@ -3711,7 +3813,7 @@ " Kan inte skapa temporär kommandofil \n" " %s " -#: src/ext.c:165 src/user.c:542 +#: src/ext.c:165 src/user.c:576 msgid " Parameter " msgstr " Parameter " @@ -3757,6 +3859,110 @@ msgid "mc.ext will be used for this moment." msgstr "För tillfället kommer mc.ext att användas." +#: src/features.inc:8 +msgid "Edition: " +msgstr " Utgåva: " + +#: src/features.inc:11 +msgid "XView" +msgstr "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: src/features.inc:16 +msgid "text mode" +msgstr "textläge" + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" +msgstr " med X11-stöd för att läsa modifierartangenter" + +#: src/features.inc:24 +msgid "Virtual File System: tarfs, extfs" +msgstr " Virtuellt filsystem: tarfs, extfs " + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr " (proxyar: hsc proxy)" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (med termnet-stöd)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "Med inbyggd editor\n" + +#: src/features.inc:48 +msgid "Using " +msgstr "Använder " + +#: src/features.inc:51 +msgid "system-installed " +msgstr "systeminstallerad" + +#: src/features.inc:53 +msgid "S-lang library with " +msgstr "S-lang-bibliotek med" + +#: src/features.inc:56 +msgid "terminfo" +msgstr "terminfo" + +#: src/features.inc:59 +msgid "termcap" +msgstr "termcap" + +#: src/features.inc:61 +msgid "an unknown terminal" +msgstr "en okänd terminal" + +#: src/features.inc:64 +msgid " database" +msgstr " databas" + +#: src/features.inc:67 +msgid "the ncurses library" +msgstr "ncurses-biblioteket" + +#: src/features.inc:69 +msgid "some unknown curses library" +msgstr "ett okänt curses-bibliotek" + +#: src/features.inc:74 +msgid "With subshell support: " +msgstr "Med stöd för subshell" + +#: src/features.inc:76 +msgid "optional" +msgstr "valfri" + +#: src/features.inc:78 +msgid "as default" +msgstr "som standard" + +#: src/features.inc:84 +msgid "With support for background operations\n" +msgstr "Med stöd för bakgrundsoperationer\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " Kopiera " @@ -4120,7 +4326,7 @@ msgid "%o %d %f%e" msgstr "%o %d %f%e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "fil" @@ -4148,11 +4354,11 @@ msgid " Can't operate on \"..\"! " msgstr " Kan inte operera på \"..\"! " -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "Ja" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "Nej" @@ -4160,15 +4366,15 @@ msgid " Sorry, I could not put the job in background " msgstr " Tyvärr, kunde inte lägga jobbet i bakgrunden " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Internal failure " msgstr " Internt fel " -#: src/file.c:2016 src/file.c:2100 +#: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " msgstr " Okänd filoperation" -#: src/file.c:2031 +#: src/file.c:2029 #, c-format msgid "" " Destination \"%s\" must be a directory \n" @@ -4177,15 +4383,15 @@ " Målet \"%s\" måste vara en katalog \n" " %s" -#: src/file.c:2193 +#: src/file.c:2190 msgid "&Retry" msgstr "försök &Igen" -#: 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 "&Avbryt" -#: src/file.c:2245 +#: src/file.c:2242 msgid "" "\n" " Directory not empty. \n" @@ -4195,7 +4401,7 @@ " Katalogen är inte tom. \n" " Radera den rekursivt? " -#: src/file.c:2246 +#: src/file.c:2243 msgid "" "\n" " Background process: Directory not empty \n" @@ -4205,28 +4411,28 @@ " Bakgrundsprocessen: Katalogen är inte tom \n" " Vill du radera den rekursivt?" -#: src/file.c:2253 +#: src/file.c:2250 msgid "a&ll" msgstr "&Alla" -#: src/file.c:2253 src/filegui.c:595 +#: src/file.c:2250 src/filegui.c:595 msgid "non&E" msgstr "&Ingen" -#: src/file.c:2263 +#: src/file.c:2260 msgid " Type 'yes' if you REALLY want to delete " msgstr " Skriv 'ja' om du VERKLIGEN vill radera " # hoppas att ja fungerar som svar KONTROLLERA! -#: src/file.c:2265 +#: src/file.c:2262 msgid "all the directories " msgstr "alla kataloger" -#: src/file.c:2267 +#: src/file.c:2264 msgid " Recursive Delete " msgstr " Rekursiv radering" -#: src/file.c:2268 +#: src/file.c:2265 msgid " Background process: Recursive Delete " msgstr " Bakgrundsprocess: Rekursiv radering" @@ -4391,7 +4597,7 @@ msgid "Content: " msgstr "Innehåll: " -#: 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 "&Träd" @@ -4417,7 +4623,7 @@ msgid "Finished" msgstr "Klar" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "Söker efter %s" @@ -4498,7 +4704,7 @@ msgid " Help " msgstr " Hjälp " -#: src/help.c:766 src/user.c:650 +#: src/help.c:766 src/user.c:687 #, c-format msgid "" " Can't open file %s \n" @@ -4969,7 +5175,7 @@ msgstr "den saknade tangenten för att definiera den. Flytta runt med tab." # ändra inte översättningen om raderna blir längre. -#: 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" @@ -4982,264 +5188,272 @@ " arbetskatalog, eller gett dig själv extra \n" " rättigheter mha \"su\" kommandot? " -#: src/main.c:779 +#: src/main.c:784 msgid "Press any key to continue..." msgstr "Tryck valfri tangent för att fortsätta..." -#: src/main.c:829 +#: src/main.c:834 msgid " The shell is already running a command " msgstr " Skalet kör redan ett kommando " -#: src/main.c:856 src/screen.c:2115 src/screen.c:2163 +#: src/main.c:861 src/screen.c:2116 src/screen.c:2163 msgid " The Midnight Commander " msgstr " Midnight Commander " -#: src/main.c:857 +#: src/main.c:862 msgid " Do you really want to quit the Midnight Commander? " msgstr " Vill du verkligen avsluta Midnight Commander? " # #>>--<< -#: src/main.c:1237 src/main.c:1261 +#: src/main.c:1242 src/main.c:1266 msgid "&Listing mode..." msgstr "visnings&Läge..." # kontrollera att detta stämmer med tidigare översättningen -#: src/main.c:1238 src/main.c:1262 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "snabb&Visa 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 "&Information C-x i" -#: src/main.c:1242 src/main.c:1266 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "&Sorteringsordning" -#: src/main.c:1244 src/main.c:1268 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "&Filter" -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "&Nätverkslänk..." -#: src/main.c:1248 src/main.c:1272 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "FT&Plänk..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "SM&B länk..." -#: src/main.c:1255 src/main.c:1279 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "&Enhet... M-d" -#: src/main.c:1257 src/main.c:1281 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "&Ladda om C-r" # #>>--<< -#: src/main.c:1285 +#: src/main.c:1290 msgid "&User menu F2" msgstr "anv&Ändarmeny F2" -#: src/main.c:1286 +#: src/main.c:1291 msgid "&View F3" msgstr "&Visa F3" -#: src/main.c:1287 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "V&Isa fil... " -#: src/main.c:1288 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "&Filtrerad vy M-!" -#: src/main.c:1289 +#: src/main.c:1294 msgid "&Edit F4" msgstr "r&Edigera F4" -#: src/main.c:1290 +#: src/main.c:1295 msgid "&Copy F5" msgstr "ko&Piera F5" -#: src/main.c:1291 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "c&Hmod C-x c" -#: src/main.c:1293 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "&Länk C-x l" -#: src/main.c:1294 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "&SymLänk C-x s" -#: src/main.c:1295 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "ändra s&YmLänk C-x C-s" -#: src/main.c:1296 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "ch&Own C-x o" -#: src/main.c:1297 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "ava&Ncerad chown " -#: src/main.c:1299 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "byt namn/&Flytta F6" -#: src/main.c:1300 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "Skapa &Katalog F7" -#: src/main.c:1301 +#: src/main.c:1306 msgid "&Delete F8" msgstr "&Radera F8" -#: src/main.c:1302 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "snabb &Cd M-c" -#: src/main.c:1304 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "välj &Grupp M-+" -#: src/main.c:1305 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "o&Mvälj grupp M-\\" -#: src/main.c:1306 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "omvänt &Urval M-*" -#: src/main.c:1308 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "&Avsluta F10" # # >>---<< -#: src/main.c:1318 +#: src/main.c:1323 msgid "&Directory tree" msgstr "katalogtr&Äd" -#: src/main.c:1320 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "sÖk &Fil M-?" -#: src/main.c:1321 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "vä&Xla paneler C-u" -#: src/main.c:1322 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "&Paneler av/på C-o" -#: src/main.c:1323 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "&Jämför kataloger C-x d" -#: src/main.c:1324 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "&Yttre panelisering C-x !" -#: src/main.c:1325 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "visa katalogsto&Rlek" -#: src/main.c:1327 +#: src/main.c:1332 msgid "command &History" msgstr "kommando&Historia" -#: src/main.c:1328 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "&Katalogfavoriter C-\\" -#: src/main.c:1330 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "&Aktivera VFS-listan C-x a" -#: src/main.c:1333 +#: src/main.c:1336 +msgid "Fr&ee VFSs now" +msgstr "Frigör VFS:er nu" + +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "bak&Grundsjobb C-x j" -#: src/main.c:1337 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "&Återskapa raderade filer (endast ext2fs)" -#: src/main.c:1340 +#: src/main.c:1346 msgid "&Listing format edit" msgstr "ändra &Listningsformatet" -#: src/main.c:1342 +#: src/main.c:1349 msgid "&Extension file edit" msgstr "ändra &Utökningsfilen" -#: src/main.c:1343 +#: src/main.c:1350 msgid "&Menu file edit" msgstr "ändra &Menyfilen" -#: src/main.c:1348 +#: src/main.c:1351 +msgid "Menu edi&Tor edit" +msgstr "Redigera meny&redigeraren" + +#: src/main.c:1356 msgid "&Configuration..." msgstr "k&Onfiguration..." -#: src/main.c:1350 +#: src/main.c:1358 msgid "c&Onfirmation..." msgstr "&Bekräftelse..." -#: src/main.c:1351 +#: src/main.c:1359 msgid "&Display bits..." msgstr "&Display bitar..." -#: src/main.c:1353 +#: src/main.c:1361 msgid "learn &Keys..." msgstr "lär MC dina &Tangenter..." -#: src/main.c:1356 +#: src/main.c:1364 msgid "&Virtual FS..." msgstr "&Virtuellt FS.." -#: src/main.c:1359 +#: src/main.c:1367 msgid "&Save setup" msgstr "&Spara inställningar" # >>---<< -#: src/main.c:1375 src/main.c:1377 +#: src/main.c:1383 src/main.c:1385 msgid " &Left " msgstr " &Vänster " -#: src/main.c:1377 +#: src/main.c:1385 msgid " &Above " msgstr " &Över " -#: src/main.c:1380 +#: src/main.c:1388 msgid " &File " msgstr " &Fil " -#: src/main.c:1381 +#: src/main.c:1389 msgid " &Command " msgstr " &Kommando " -#: src/main.c:1382 +#: src/main.c:1390 msgid " &Options " msgstr " &Inställningar " -#: src/main.c:1384 src/main.c:1386 +#: src/main.c:1392 src/main.c:1394 msgid " &Right " msgstr " &Höger " -#: src/main.c:1386 +#: src/main.c:1394 msgid " &Below " msgstr " &Under " -#: src/main.c:1441 +#: src/main.c:1449 msgid " Information " msgstr " Information " -#: src/main.c:1442 +#: src/main.c:1450 msgid "" " Using the fast reload option may not reflect the exact \n" " directory contents. In this cases you'll need to do a \n" @@ -5251,133 +5465,291 @@ " I så fall behöver du göra en manuell omladdning av katalogen. \n" " Se man-sidan för detaljer." -#: src/main.c:1921 +#: src/main.c:1929 msgid "Thank you for using GNU Midnight Commander" msgstr "Tack för att du använder GNU Midnight Commander" -#: src/main.c:2280 -#, c-format -msgid "with mouse support on xterm%s.\n" -msgstr "med stöd för mus på xterm%s.\n" - -#: src/main.c:2281 -msgid " and the Linux console" -msgstr " och Linuxkonsoler" +#: src/main.c:2287 +msgid "with mouse support on xterm and the Linux console.\n" +msgstr "med stöd för mus på xterm och linuxkonsollen\n" + +#: src/main.c:2288 +msgid "with mouse support on xterm.\n" +msgstr "med stöd för mus på xterm.\n" -#: src/main.c:2376 +#: src/main.c:2389 msgid "The TERM environment variable is unset!\n" msgstr "Omgivningsvariablen TERM är inte satt!\n" -#: src/main.c:2586 +#: src/main.c:2495 +msgid "" +"Usage is:\n" +"\n" +"mc [flags] [this_dir] [other_panel_dir]\n" +"\n" +msgstr "" +"Användning:\n" +"\n" +"mc [flaggor] [denna katalog] [annan panels katalog]\n" + +#: src/main.c:2498 +msgid "-a, --stickchars Force use of +, -, | for line drawing.\n" +msgstr "-a, --stickchars Använd +,-,| för linjeritning.\n" + +#: src/main.c:2500 +msgid "-b, --nocolor Force black and white display.\n" +msgstr "-b, --nocolor Använd svartvitt.\n" + +#: src/main.c:2502 +msgid "-B, --background [DEVEL-ONLY: Debug the background code]\n" +msgstr "-B, --background [Bara för utvecklare: Avlusa bakgrundskoden]\n" + +#: src/main.c:2504 +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 Använd färgläge.\n" +"-C, --colors Specifiera färger (använd --help-colors för lista).\n" +"-d, --nomouse Inget musstöd.\n" + +#: src/main.c:2508 +msgid "-e, --edit Startup the internal editor.\n" +msgstr "-e, --edit Starta den interna editorn.\n" + +#: src/main.c:2510 +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 konfigurerade sökvägar.\n" +"-h, --help Visa detta hjälpmeddelande.\n" +"-k, --resetsoft Återställ softkeys (bara HP-terminaler) till deras\n" +" terminfo/termcap standardinställningar\n" + +#: src/main.c:2515 +msgid "-l, --ftplog file Log ftpfs commands to the file.\n" +msgstr "-l, --ftplog fil Logga ftpfs-kommandon till fil.\n" + +#: src/main.c:2518 +msgid "-M, --memory file [DEVEL-ONLY: Log MAD messages to the file.]\n" +msgstr "" +"-M, --memory fil [Bara för utvecklare: Logga MAD-meddelanden till fil.]\n" + +#: src/main.c:2520 +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 senaste arbetskatalog vid avslutning.\n" +"-s, --slow Stänger av högljutt läge (för långsamma terminaler).\n" + +#: src/main.c:2523 +msgid "-t, --termcap Activate support for the TERMCAP variable.\n" +msgstr "-t, --termcap Aktivera stöd för TERMCAP-variablen.\n" + +#: src/main.c:2526 +msgid "" +"-S, --createcmdile Create command file to set default directory upon exit.\n" +msgstr "" +"-S, --createcmdile Skapa kommandofil för att sätta katalog vid avslutning.\n" + +#: src/main.c:2529 +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 Stäng av parallelläge för underskal.\n" +"-U, --subshell Slå på parallelläge för underskal.\n" +"-r, --forceexec Tvinga fram exekvering i underskal.\n" + +#: src/main.c:2533 +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" +"+number number it is the start line number of file for `mcedit'.\n" +msgstr "" +"-v, --view fname Starta i visarläge.\n" +"-V, --version Visa version och konfigurationsinställningar.\n" +"-x, --xterm Använd musstöd och skärmåterställning i xterm.\n" +"+nummer radnummer som \"mcedit\" skall starta på.\n" + +#: src/main.c:2538 +msgid "-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n" +msgstr "-X, --dbgsubshell [Endast för utvecklare: Avlusa underskalet.]\n" + +#: src/main.c:2540 +msgid "" +"\n" +"Please send any bug reports (including the output of `mc -V')\n" +"to mc-bugs@nuclecu.unam.mx\n" +msgstr "" +"\n" +"Skicka felrapporter (ta med utdata från \"mc -V\") till\n" +"mc-bugs@nuclecu.unam.mx och kommentarer på översättningen till sv@li.org\n" + +#: src/main.c:2556 +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 TYP={FÖRGRUND},{BAKGRUND}\n" +"\n" +"{FÖRGRUND} och {BAKGRUND} behöver inte skrivas, då används standardvärden\n" +"\n" +"Typer:\n" +" Globala: errors, reverse, gauge, input\n" +" Filvisning: normal, selevted, marked, markselect\n" +" Dialogrutor: dnormal, dfocus, dnotnormal, dnotfocus\n" +" Menyer: menu, menuhot, menusel, menuhotsel\n" +" Hjälp: helpnormal, helpitalic, helplink, helpslink\n" +" Filtyper: directory, execute, link, device, special, core\n" +"\n" +"Färger:\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:2605 #, c-format msgid "Library directory for the Midnight Commander: %s\n" msgstr "Bibliotekskatalog för Midnight Commander: %s\n" -#: src/main.c:2600 +#: src/main.c:2619 msgid "" "Option -m is obsolete. Please look at Display Bits... in the Option's menu\n" msgstr "" "-m inställningen är förlegad. Titta på Vy-Bitarna... i Inställningsmenyn\n" -#: src/main.c:2677 +#: src/main.c:2696 msgid "Use to debug the background code" msgstr "Använd för att avlusa bakgrundskod" -#: src/main.c:2683 +#: src/main.c:2702 msgid "Request to run in color mode" msgstr "Begär att få köra i färgläge" -#: src/main.c:2685 +#: src/main.c:2704 msgid "Specifies a color configuration" msgstr "Specificera en färgkonfiguration" -#: src/main.c:2690 +#: src/main.c:2709 msgid "Edits one file" msgstr "Redigera en fil" -#: src/main.c:2694 +#: src/main.c:2713 msgid "Displays this help message" msgstr "Visa det här hjälpmeddelandet" -#: src/main.c:2697 +#: src/main.c:2716 msgid "Displays a help screen on how to change the color scheme" msgstr "Visa ett hjälpfönster över hur man ändrar färgschema" -#: src/main.c:2700 +#: src/main.c:2719 msgid "Log ftp dialog to specified file" msgstr "Logga ftpdialog till specificerad fil" -#: src/main.c:2707 +#: src/main.c:2726 msgid "Obsolete" msgstr "Förlegad" -#: src/main.c:2709 +#: src/main.c:2728 msgid "Requests to run in black and white" msgstr "Begäran att köra i svartvitt" -#: src/main.c:2711 +#: src/main.c:2730 msgid "Disable mouse support in text version" msgstr "Stäng av musstödet i text versionen" -#: src/main.c:2714 +#: src/main.c:2733 msgid "Disables subshell support" msgstr "Stäng av stöd för subshell" -#: src/main.c:2718 +#: src/main.c:2737 msgid "Prints working directory at program exit" msgstr "Skriver ut arbetskatalogen vid programmavslutning" -#: src/main.c:2720 +#: src/main.c:2739 msgid "Resets soft keys on HP terminals" msgstr "Nollställ mjuka tangenter på HP-terminaler" -#: src/main.c:2722 +#: src/main.c:2741 msgid "To run on slow terminals" msgstr "Att köra på långsamma terminaler" -#: src/main.c:2725 +#: src/main.c:2744 msgid "Use stickchars to draw" msgstr "Använd 'stickchars' för att rita" # incomplete -#: src/main.c:2729 +#: src/main.c:2748 msgid "Enables subshell support (default)" msgstr "Aktiverar stöd för subshell (default)" # svängelska -#: src/main.c:2734 +#: src/main.c:2753 msgid "Tries to use termcap instead of terminfo" msgstr "Försöker använda termcap istället för terminfo" -#: src/main.c:2738 +#: src/main.c:2757 msgid "Displays the current version" msgstr "Visa den aktuella versionen" -#: src/main.c:2740 +#: src/main.c:2759 msgid "Launches the file viewer on a file" msgstr "Startar filläsaren" -#: src/main.c:2742 +#: src/main.c:2761 msgid "Forces xterm features" msgstr "Tvinga fram xtermfinesser" -#: src/main.c:2744 +#: src/main.c:2763 msgid "Geometry for the window" msgstr "Geometri för fönstret" -#: src/main.c:2744 +#: src/main.c:2763 msgid "GEOMETRY" msgstr "GEOMETRI" -#: src/main.c:2745 +#: src/main.c:2764 msgid "No windows opened at startup" msgstr "Inga fönster öppnade vid programstart" -#: src/main.c:2747 +#: src/main.c:2765 +msgid "No desktop icons" +msgstr "Inga skrivbordsikoner" + +#: src/main.c:2766 +msgid "Look more like traditional gmc" +msgstr "Se ut som traditionell gmc" + +#: src/main.c:2768 msgid "Display the directory that holds the .links startup files and exit" msgstr "Visa katalogen som innehåller .links startfilerna och avsluta" -#: src/main.c:3045 +#: src/main.c:3081 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" @@ -5385,11 +5757,11 @@ "Kan inte öppna tty linje. Du måste starta mc utan -P flaggan.\n" "På vissa system kan det vara lämpligt att köra en # 'which mc'\n" -#: src/main.c:3123 +#: src/main.c:3159 msgid " Notice " msgstr " Notera " -#: src/main.c:3124 +#: src/main.c:3160 msgid "" " The Midnight Commander configuration files \n" " are now stored in the ~/.mc directory, the \n" @@ -5563,6 +5935,14 @@ msgid "Display brief usage message" msgstr "Visa korta användningsmeddelanden" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "Underkatalog" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "Förälderkatalog" + #: src/screen.c:417 msgid "MTime" msgstr "MTime" @@ -5608,30 +5988,30 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "Det angivna formatet ser ogiltigt ut, faller tillbaka till standard." -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " Vill du verkligen exekvera? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr " Ingen aktion utförd " -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1016 msgid "RenMov" msgstr "RenMov" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2402 src/screen.c:2432 src/tree.c:1020 msgid "Mkdir" msgstr "Mkdir" -#: src/screen.c:2417 +#: src/screen.c:2418 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" Kan inte byta katalog till %s \n" -" %s " +" Kan inte byta katalog till \"%s\" \n" +" %s" #: src/subshell.c:287 #, c-format @@ -5700,15 +6080,6 @@ msgid "Dynamc" msgstr "Dynamisk" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -" Kan inte byta katalog till \"%s\" \n" -" %s" - #: src/tree.c:1012 msgid "Forget" msgstr "Glöm" @@ -5726,32 +6097,32 @@ "Kan inte skriva till filen %s:\n" "%s\n" -#: src/user.c:256 +#: src/user.c:271 #, c-format msgid " Invalid shell pattern definition \"%c\". " msgstr " Ogiltig skalmönsterdefinition \"%c\". " -#: src/user.c:389 +#: src/user.c:424 msgid " Debug " msgstr " Debug " -#: src/user.c:398 +#: src/user.c:433 msgid " ERROR: " msgstr " FEL: " -#: src/user.c:402 +#: src/user.c:437 msgid " True: " msgstr " Sant: " -#: src/user.c:404 +#: src/user.c:439 msgid " False: " msgstr " Falskt: " -#: src/user.c:616 +#: src/user.c:645 msgid " Warning -- ignoring file " msgstr " Varning -- ignorerarar fil " -#: src/user.c:617 +#: src/user.c:646 #, c-format msgid "" "File %s is not owned by root or you or is world writable.\n" @@ -5760,18 +6131,19 @@ "Fil %s ägs varken av dig eller root, eller är skrivbar för alla.\n" "Att använda den kan äventyra din säkerhet" -#: src/user.c:635 +#: src/user.c:670 msgid " I can't run programs while logged on a non local directory " msgstr "" " Det går inte att köra program om man är inloggad på en icke lokal katalog " -#: src/user.c:719 +#. FIXME: this message is not quite right +#: src/user.c:770 #, c-format msgid " Empty file %s " msgstr " Tom fil %s " #. Create listbox -#: src/user.c:728 +#: src/user.c:779 msgid " User menu " msgstr " Användarmeny " @@ -5782,22 +6154,22 @@ #. strftime() format string for recent dates #: src/util.c:599 src/util.c:624 msgid "%b %e %H:%M" -msgstr "%b %e %H:%M" +msgstr "%e %b %H:%M" #. strftime() format string for old dates #: src/util.c:600 src/util.c:622 msgid "%b %e %Y" -msgstr "%b %e %Y" +msgstr "%e %d %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr " Pipe misslyckades" -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr " Dup misslyckades" -#: src/view.c:401 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5807,7 +6179,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5817,27 +6189,27 @@ "\n" "har modifierats, vill du spara ändringarna?\n" -#: src/view.c:404 +#: src/view.c:406 msgid " Save changes " msgstr " Spara ändringar " -#: src/view.c:446 +#: src/view.c:448 msgid " Can't spawn child program " msgstr " Kan inte skapa barnprogram " -#: src/view.c:455 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " Tom utmatning från barnfilter " -#: src/view.c:460 +#: src/view.c:462 msgid " Could not open file " msgstr " Kan inte öppna fil " -#: src/view.c:475 +#: src/view.c:477 msgid " Can't open file \"" msgstr " Kan inte öppna fil \"" -#: src/view.c:482 +#: src/view.c:484 msgid "" " Can't stat file \n" " " @@ -5845,11 +6217,11 @@ " Kan inte inhämta status om fil \n" " " -#: src/view.c:488 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " Kan inte visa: inte en vanlig fil " -#: src/view.c:569 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5858,7 +6230,7 @@ " Kan inte öppna \"%s\"\n" " %s " -#: src/view.c:578 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" @@ -5867,34 +6239,34 @@ " Kan inte inhämta status om \"%s\"\n" " %s " -#: src/view.c:714 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "Fil: %s" -#: src/view.c:728 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "Offset 0x%08x" -#: src/view.c:739 +#: src/view.c:741 msgid " [grow]" msgstr " [väx]" -#: src/view.c:1518 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "Söker efter `%s'" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " Söksträngen ej funnen " -#: src/view.c:1787 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " Ogiltigt reguljärt uttryck" -#: src/view.c:1911 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5903,7 +6275,7 @@ " Det nuvarande radnumret är %d.\n" " Mata in det nya radnumret:" -#: src/view.c:1933 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5912,77 +6284,77 @@ " Den aktuella adressen är 0x%lx.\n" " Mata in den nya adressen:" -#: src/view.c:1935 +#: src/view.c:1937 msgid " Goto Address " msgstr " Gå till adress " -#: src/view.c:1966 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " Mata in regexp:" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Ascii" msgstr "Ascii" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Hex" msgstr "Hex" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Goto" msgstr "Gå till" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Line" msgstr "Linje" -#: src/view.c:2075 +#: src/view.c:2077 msgid "RxSrch" msgstr "RxSrch" # ? -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdText" msgstr "EdText" # ? -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdHex" msgstr "EdHex" # ? -#: src/view.c:2080 +#: src/view.c:2082 msgid "UnWrap" msgstr "UnWrap" # ? -#: src/view.c:2080 +#: src/view.c:2082 msgid "Wrap" msgstr "Wrap" # ? -#: src/view.c:2083 +#: src/view.c:2085 msgid "HxSrch" msgstr "HxSrch" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Raw" msgstr "Rå" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Parse" msgstr "Parsa" # ? -#: src/view.c:2090 +#: src/view.c:2092 msgid "Unform" msgstr "Oformera" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Format" msgstr "Formera" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr " Historik " @@ -6181,7 +6553,93 @@ msgid "NumLock on keypad" msgstr "Numlock, numeriska" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"Kan inte öppna cpio-arkivet\n" +"%s" + +#: vfs/cpio.c:224 +#, c-format +msgid "" +"Premature end of cpio archive\n" +"%s" +msgstr "" +"För tidigt slut på cpio-arkivet\n" +"%s" + +#: vfs/cpio.c:309 vfs/cpio.c:358 +#, c-format +msgid "" +"Corrupt cpio header encountered in\n" +"%s" +msgstr "" +"Felaktig cpio-header påträffad i\n" +"%s" + +#: vfs/cpio.c:427 +#, c-format +msgid "" +"Inconsistent hardlinks of\n" +"%s\n" +"in cpio archive\n" +"%s" +msgstr "" +"Felaktiga hårda länkar för\n" +"%s\n" +"i cpio-arkivet\n" +"%s" + +#. 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 "%s innehåller dubbla poster! Hoppar över den!" + +# ? +#: vfs/cpio.c:517 +#, c-format +msgid "" +"Unexpected end of file\n" +"%s" +msgstr "" +"Oväntat filslut\n" +"%s" + +#: vfs/direntry.c:300 +#, c-format +msgid "Dir cache expired for %s" +msgstr "Katalogcache för gammal för %s" + +#: vfs/direntry.c:430 vfs/direntry.c:433 +msgid " Direntry warning " +msgstr " Katalogpostsvarning " + +#: vfs/direntry.c:430 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "Super ino_usage är %d, minnesläcka" + +#: vfs/direntry.c:433 +msgid "Super has want_stale set" +msgstr "Super har satt want_stale" + +#: vfs/direntry.c:811 +msgid "Starting linear transfer..." +msgstr "Startar linjär överföring..." + +#: vfs/direntry.c:956 +msgid "Getting file" +msgstr "Hämtar fil: " + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -6190,238 +6648,229 @@ "Kan inte öppna %s arkivet\n" "%s" -#: vfs/extfs.c:300 vfs/extfs.c:320 +#: vfs/extfs.c:302 vfs/extfs.c:322 msgid "Inconsistent extfs archive" msgstr "Inkonsistent extfsfil" -#: vfs/fish.c:136 +#: vfs/fish.c:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: Kopplar ned från %s" -#: vfs/fish.c:214 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "fish: Väntar på första raden..." -#: vfs/fish.c:224 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "Kan inte göra lösenords autenticerade anslutningar för närvarande." -#: vfs/fish.c:238 +#: vfs/fish.c:233 +msgid " fish: Password required for " +msgstr " fish: Lösenord behövs för " + +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: Sänder lösenord..." -#: vfs/fish.c:244 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "fish: Sänder första raden..." -#: vfs/fish.c:248 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "fish: Handskakning version..." -#: vfs/fish.c:252 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "fish: Sätter upp aktuell katalog..." -#: vfs/fish.c:254 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "fish: Ansluten, hem %s." -#: vfs/fish.c:331 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: Läser katalog %s..." -#: vfs/fish.c:426 -msgid "fish: got listing" -msgstr "fish: fått listning" - -#: vfs/fish.c:430 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "fish: misslyckades" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:450 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "fish: lagrar %s: sänder kommando..." -#: vfs/fish.c:464 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "fish: Lokal läsning misslyckades, sänder nollor" -#: vfs/fish.c:476 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: lagrar %s %d (%d)" -#: vfs/fish.c:516 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "nollor" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "Avbryter överföringen..." -#: vfs/fish.c:525 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "Fel rapporterades efter avslutningen." -#: vfs/fish.c:527 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "Avbruten överföring skulle ha varit lyckad." # ??? -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: Kopplar ned från %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: Lösenord behövs för " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " Proxy: Lösenord behövs för " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: sänder proxyn loginnamn" # ??? -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: sänder proxyn användarlösenord" # ??? -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: proxy autenticationen lyckades" # ??? -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: ansluten till %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: sänder loginnamn" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: sänder användarlösenord" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: Inloggad" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs: Inloggningen felaktig för användare %s " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr " Kan inte sätta \"source routing\" (%s)" # incomplete -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: Ogiltigt värdnamn." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: Ogiltig värdadress." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: skapar anslutning till %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: anslutningen har avbrutits av användaren" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: misslyckades att ansluta till servern: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:744 #, c-format msgid "Waiting to retry... %d (Control-C to cancel)" msgstr "Försöker igen... %d (Control-C för att avbryta)" -#: vfs/ftpfs.c:987 -msgid "ftpfs: could not setup passive mode for source routing" -msgstr "ftpfs: kan inte sätta upp passivt läge för \"source routing\"" - # incomplete -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: kan inte sätta upp passivt läge" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: avbryter överföringen." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: abort fel: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: abort kommandot misslyckades" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: CWD kommandot misslyckades." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: kunde inte hitta filen som den symboliska länken pekar på" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "Analyserar en symbolisk länk..." -#: vfs/ftpfs.c:1338 -#, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "ftpfs: Läser FTP-katalogen %s...(använd inte finesser från UNIX ls)" - -#: vfs/ftpfs.c:1340 +#: vfs/ftpfs.c:1188 #, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: Läser FTP-katalogen %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" -msgstr "ftpfs: MISSLYCKADES" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: Läser FTP-katalogen %s... %s%s" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: läsning av FTP-katalogen avbruten av användaren" +#: vfs/ftpfs.c:1189 +msgid "(strict rfc959)" +msgstr "(strikt rfc959)" -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" -msgstr "ftpfs: fick listning" +#: vfs/ftpfs.c:1190 +msgid "(chdir first)" +msgstr "(chdir först)" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1287 msgid "ftpfs: failed" msgstr "ftpfs: misslyckades" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1297 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs: misslyckades: det finns ingenstans att falla tillbaka på" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1360 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: lagrar fil %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1775 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6429,15 +6878,15 @@ "~/.netrc filen har inte korrekt rättigheter. \n" "Ta bort lösenordet från filen, eller ge filen korrekta rättigheter." -#: 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 " Servern stöder inte den här versionen" -#: 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" @@ -6447,48 +6896,68 @@ " För att kunna logga in måste du ange ett lösenord, men det går inte \n" " att garantera att detta är säkert. Vill du fortsätta? \n" -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Ja " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " Nej " -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 msgid " The remote server is running on strange port. Giving up.\n" msgstr " Den avlägsna servern är aktiv på en underlig port. Ger upp.\n" -#: vfs/mcfs.c:188 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " Behöver MCFS lösenord " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " Ogiltigt lösenord " -#: vfs/mcfs.c:322 +#: vfs/mcfs.c:235 +#, c-format +msgid " Can't locate hostname: %s " +msgstr " Kan inte hitta värden: %s " + +#: vfs/mcfs.c:253 +#, c-format +msgid " Can't create socket: %s " +msgstr " Kan inte skapa uttag: %s " + +#: vfs/mcfs.c:259 +#, c-format +msgid " Can't connect to server: %s " +msgstr "Kan inte ansluta till värd: %s" + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " För många aktiva anslutningar " -#: vfs/smbfs.c:115 +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "Midnight Commanders privata fjärrfilsystem" + +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "Domän:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "Användarnamn:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "Lösenord: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "Lösenord för \\\\%s\\%s" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" @@ -6497,22 +6966,26 @@ " misslyckades att koppla upp till %s\n" " " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr " Autentisering misslyckades " + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s skapar katalog %s" -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s raderar %s" -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s öppnar avlägsen fil %s " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s byter namn på filerna\n" @@ -6546,11 +7019,166 @@ "%s\n" "ser inte ut att vara en tarfil" -#: vfs/vfs.c:1792 +#: vfs/vfs.c:1151 +msgid "Changes to file lost" +msgstr "Ändringar i filen förlorade" + +#: vfs/vfs.c:1794 +msgid "Could not parse:" +msgstr "Kunde inte tolka:" + +#: vfs/vfs.c:1796 +msgid "More parsing errors will be ignored." +msgstr "Resten av tolkningsfelen ignoreras." + +#: vfs/vfs.c:1796 +msgid "(sorry)" +msgstr "(tyvärr)" + +#: vfs/vfs.c:1807 +msgid "Internal error:" +msgstr " Internt fel:" + +#: vfs/vfs.c:1817 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld bytes överförda)" -#: vfs/vfs.c:1793 +#: vfs/vfs.c:1818 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld bytes överförda" + +#: vfs/undelfs.c:81 +msgid " undelfs: error " +msgstr " undelfs: fel " + +#: vfs/undelfs.c:184 +msgid " not enough memory " +msgstr " för lite minne " + +#: vfs/undelfs.c:189 +msgid " while allocating block buffer " +msgstr " vid allokerandet av blockbuffer" + +#: vfs/undelfs.c:193 +#, c-format +msgid " open_inode_scan: %d " +msgstr " open_inode_scan: %d " + +#: vfs/undelfs.c:197 +#, c-format +msgid " while starting inode scan %d " +msgstr " vid startandet av inodsökning %d" + +#: vfs/undelfs.c:204 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "undelfs: laddar information för raderade filer %d inoder" + +#: vfs/undelfs.c:219 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr " vid anrop av ext2_block_iterate %d " + +#: vfs/undelfs.c:227 +msgid " no more memory while reallocating array " +msgstr " slut på minne vid allokering av fält " + +#: vfs/undelfs.c:246 +#, c-format +msgid " while doing inode scan %d " +msgstr " under inodsökning %d" + +#: vfs/undelfs.c:270 +msgid " Ext2lib error " +msgstr " Ext2lib-fel " + +#: vfs/undelfs.c:297 +#, c-format +msgid " Could not open file %s " +msgstr " Kan inte öppna fil %s" + +#: vfs/undelfs.c:300 +msgid "undelfs: reading inode bitmap..." +msgstr "undelfs: läser inodbitmap..." + +#: vfs/undelfs.c:303 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" +" Kunde inte ladda inodbitmap från: \n" +" %s \n" + +#: vfs/undelfs.c:306 +msgid "undelfs: reading block bitmap..." +msgstr "undelfs: läser blockbitmap..." + +#: vfs/undelfs.c:309 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" +"Kunde inte ladda in blockbitmap från: \n" +" %s \n" + +#: vfs/undelfs.c:315 +msgid "undelfs: done." +msgstr "undelfs: klar." + +#: vfs/undelfs.c:318 +msgid "undelfs: failure" +msgstr "undelfs: fel" + +#: vfs/undelfs.c:342 +msgid " vfs_info is not fs! " +msgstr " vsf_info är inte fs! " + +#: vfs/undelfs.c:398 vfs/undelfs.c:582 +msgid " You have to chdir to extract files first " +msgstr " Du måste göra chdir först för att hämta filer " + +#: vfs/undelfs.c:521 +msgid " while iterating over blocks " +msgstr " vid genomsökning av block " + +#: vfs/undelfs.c:626 +#, c-format +msgid " Could not open file: %s " +msgstr " Kan inte öppna fil: %s " + +#. This is place of next pointer +#: vfs/undelfs.c:684 +msgid "Undelete filesystem for ext2" +msgstr "Återskapa raderade filer för ext2" + +#~ msgid " and the Linux console" +#~ msgstr " och Linuxkonsoler" + +#~ msgid " Error allocating memory " +#~ msgstr " Fel vid allokering av minne " + +# ladda låter lite knäppt, vad säger windoze? +# inte laddar vi väl filer som vi skall editera? +#~ msgid " Error trying to open file for reading " +#~ msgstr " Fel vid försök att öppna fil för läsning " + +#~ msgid "fish: got listing" +#~ msgstr "fish: fått listning" + +#~ msgid "ftpfs: could not setup passive mode for source routing" +#~ msgstr "ftpfs: kan inte sätta upp passivt läge för \"source routing\"" + +#~ msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" +#~ msgstr "ftpfs: Läser FTP-katalogen %s...(använd inte finesser från UNIX ls)" + +#~ msgid "ftpfs: FAIL" +#~ msgstr "ftpfs: MISSLYCKADES" + +#~ msgid "ftpfs: reading FTP directory interrupt by user" +#~ msgstr "ftpfs: läsning av FTP-katalogen avbruten av användaren" + +#~ msgid "ftpfs: got listing" +#~ msgstr "ftpfs: fick listning" diff -ruN old/mc-4.5.44/po/tr.po new/mc-4.5.45/po/tr.po --- old/mc-4.5.44/po/tr.po Tue Apr 4 23:32:01 2000 +++ new/mc-4.5.45/po/tr.po Tue May 9 18:52:09 2000 @@ -2,37 +2,36 @@ # 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" +"Project-Id-Version: mc 4.5.44\n" +"POT-Creation-Date: 2000-04-18 12:46+0200\n" +"PO-Revision-Date: 2000-04-18 12:55+0100\n" "Last-Translator: Fatih Demir \n" -"Language-Team: Turkish Gnome Tranlation Team \n" +"Language-Team: Turkish \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 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr " Emacs tuþu :" -#: 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 " 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 +#: 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 " Macro tuþuna bas :" -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Insert Literal " msgstr " Harfi içer" -#: edit/edit_key_translator.c:144 +#: edit/edit_key_translator.c:147 msgid " Press any key: " msgstr " Istediðin tuþa bas :" @@ -88,15 +87,15 @@ "(bu komutayla) :\n" "\"%s\"%s" -#: gnome/gaction.c:134 gnome/gaction.c:150 +#: gnome/gaction.c:137 gnome/gaction.c:154 msgid "open" msgstr "open" -#: gnome/gaction.c:185 gnome/gaction.c:198 +#: gnome/gaction.c:194 gnome/gaction.c:211 msgid "edit" msgstr "edit" -#: gnome/gaction.c:331 +#: gnome/gaction.c:351 msgid "view" msgstr "view" @@ -110,7 +109,8 @@ #: 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" +msgstr "" +"hata raporlarý sitesi: http://bugs.gnome.org ; istersen gnome-bug'ý kullan" #: gnome/gcmd.c:114 msgid "GNU Midnight Commander" @@ -210,7 +210,7 @@ msgstr "Filtra kullan" #: 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 "Yekin dosyalarý göster" @@ -264,7 +264,8 @@ #: 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 ." +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 " @@ -287,8 +288,8 @@ 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 +#: 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" @@ -314,7 +315,7 @@ msgstr "Sert baðlarýn sayýsý" #. 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 "Iye" @@ -347,28 +348,28 @@ msgid "Custom View" msgstr "Özelleþmiþ bakýþ" -#: gnome/gdesktop.c:521 gnome/gmount.c:389 +#: gnome/gdesktop.c:532 gnome/gmount.c:382 msgid "Warning" msgstr "Ikaz" -#: gnome/gdesktop.c:522 +#: gnome/gdesktop.c:533 #, 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 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "Mount/umount komutasýný çalýþtýrýrken" -#: gnome/gdesktop.c:1255 +#: gnome/gdesktop.c:1274 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 +#: gnome/gdesktop.c:1458 gnome/gicon.c:282 gnome/gtools.c:46 msgid "Error" msgstr "Hata" -#: gnome/gdesktop.c:2598 +#: gnome/gdesktop.c:2617 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -382,84 +383,84 @@ "\n" "Ardalaný belirleyemeyeceðiz ." -#: gnome/gdesktop.c:2621 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "Komu_ta" -#: 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 "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 +#: gnome/gdesktop.c:2642 gnome/glayout.c:365 msgid "_Directory..." msgstr "_Dizin ..." -#: gnome/gdesktop.c:2623 gnome/glayout.c:366 +#: gnome/gdesktop.c:2642 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "Yeni bir dizin yaratýr" -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "URL L_ink..." -msgstr "Adres badý ..." +msgstr "Adres baðý ..." -#: gnome/gdesktop.c:2624 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" msgstr "Yeni bir adres badý yaratýr" -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "Baþlatýcý ..." -#: gnome/gdesktop.c:2625 +#: gnome/gdesktop.c:2644 msgid "Creates a new launcher" msgstr "Yeni bir baþlatýcý yaratýr" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2650 msgid "By _Name" msgstr "Adlarýndan" -#: gnome/gdesktop.c:2632 +#: gnome/gdesktop.c:2651 msgid "By File _Type" msgstr "Tiplerinden" -#: gnome/gdesktop.c:2633 +#: gnome/gdesktop.c:2652 msgid "By _Size" msgstr "Büyüklüklerinden" -#: gnome/gdesktop.c:2634 +#: gnome/gdesktop.c:2653 msgid "By Time Last _Accessed" msgstr "Son eriþim vaktinden" -#: gnome/gdesktop.c:2635 +#: gnome/gdesktop.c:2654 msgid "By Time Last _Modified" msgstr "Son deðiþim vaktinden" -#: gnome/gdesktop.c:2636 +#: gnome/gdesktop.c:2655 msgid "By Time Last _Changed" msgstr "Son deðiþim vaktinden" -#: gnome/gdesktop.c:2644 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "Ikonalarý diz" -#: gnome/gdesktop.c:2645 +#: gnome/gdesktop.c:2664 msgid "Create _New Window" msgstr "Ye_ni pencere yarat" -#: gnome/gdesktop.c:2647 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "Masaüstü _dizini yeniden tara" -#: gnome/gdesktop.c:2648 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "Ahizeleri yeniden tara" -#: gnome/gdesktop.c:2649 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "Önayarlý ikonalarý yeniden yarat" -#: gnome/gdesktop.c:2651 +#: gnome/gdesktop.c:2670 msgid "Configure _Background Image" msgstr "Ardalan resmini ayarla" @@ -515,8 +516,8 @@ "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ç ." +"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." @@ -555,12 +556,12 @@ msgid "Replace it?" msgstr "Yerine yazamayým mý ?" -#: 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 "Kopyala" -#: 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 "Taþý" @@ -593,8 +594,8 @@ "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 ." +"Bunu seçersen , sadece baðlarýn yerine baðýn hedeflediði dosya " +"dakopyalanýyor ." #: gnome/gdialogs.c:654 msgid "Preserve file attributes." @@ -657,7 +658,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 "Parola :" @@ -678,24 +679,24 @@ msgid "Symbolic link filename:" msgstr "Yumþak baðýn adý :" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" msgstr "Buraya taþý" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" msgstr "Buraya kopyala" -#: gnome/gdnd.c:54 +#: gnome/gdnd.c:55 msgid "_Link here" msgstr "Buraya bað baðla" -#: gnome/gdnd.c:56 +#: gnome/gdnd.c:57 msgid "Cancel drag" msgstr "Taþýmayý iptal et" #. FIXME: this error message sucks -#: gnome/gdnd.c:192 +#: gnome/gdnd.c:193 #, c-format msgid "" "Could not stat %s\n" @@ -704,8 +705,9 @@ "%s'yi stat edemedim\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 "Önayarlý ikonalar bulunamadý , lütfen yüklenimi gözden geçir" #: gnome/glayout.c:41 @@ -784,7 +786,7 @@ "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" +"panelden çaðýrabilirsin veya UNIX `gmc` komutasýný çalýþtýrýrsýn\n" "\n" "Vallahi çýkmak için \"Oldu\" de veya iptal edip yöneticiyi kullan." @@ -797,7 +799,7 @@ 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 +#: gnome/glayout.c:389 gnome/gscreen.c:2098 msgid "_Copy..." msgstr "Kopyala" @@ -805,7 +807,7 @@ msgid "Copy files" msgstr "Dosyalarý kopyala" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "Sil ..." @@ -813,7 +815,7 @@ msgid "Delete files" msgstr "Dosyalarý sil" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "Taþý ..." @@ -861,7 +863,7 @@ 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 +#: gnome/glayout.c:408 gtkedit/editwidget.c:1142 src/view.c:2088 msgid "Search" msgstr "Ara" @@ -869,7 +871,7 @@ msgid "Search for a file in the current Panel" msgstr "Þu anki panelde bir dosya ara" -#: gnome/glayout.c:411 gnome/gscreen.c:1415 +#: gnome/glayout.c:411 gnome/gscreen.c:1428 msgid "_Rescan Directory" msgstr "Dizini yeniden ta_ra" @@ -978,284 +980,286 @@ "'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 +#: gnome/gmount.c:218 msgid "Could not open the /etc/fstab file" msgstr "/etc/fstab dosyasýný açamadým" -#: 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 "%s'yi %s'ye badlayamadým ; öyle bir ahize ikonan masaüstünde olmayacaktýr." +msgstr "" +"%s'yi %s'ye badlayamadým ; öyle bir ahize ikonan masaüstünde olmayacaktýr." -#: gnome/gmount.c:446 +#: gnome/gmount.c:439 #, c-format msgid "CD-ROM %d" msgstr "%d Cd-sürücüsü" -#: gnome/gmount.c:458 +#: gnome/gmount.c:451 #, c-format msgid "Floppy %d" msgstr "%d Floppy-sürücüsü" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "%d Sabit disk" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "%s NFS dizini" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "%d Ahizesi" #. we set the file part -#: gnome/gnome-file-property-dialog.c:170 +#: gnome/gnome-file-property-dialog.c:171 msgid "Full Name: " msgstr "Tam adý :" -#: gnome/gnome-file-property-dialog.c:178 +#: gnome/gnome-file-property-dialog.c:179 msgid "File Name" msgstr "Dosya adý" -#: 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 "Dosya tipi : " -#: gnome/gnome-file-property-dialog.c:207 +#: gnome/gnome-file-property-dialog.c:217 msgid "File Type: Symbolic Link" msgstr "Dosya tipi : Yumþak bað" -#: gnome/gnome-file-property-dialog.c:212 +#: gnome/gnome-file-property-dialog.c:222 msgid "Target Name: INVALID LINK" msgstr "Hedef adý : GEÇERSiZ BAÐ" -#: gnome/gnome-file-property-dialog.c:215 +#: gnome/gnome-file-property-dialog.c:225 msgid "Target Name: " msgstr "Hedef adý : " -#: gnome/gnome-file-property-dialog.c:220 +#: gnome/gnome-file-property-dialog.c:230 msgid "File Type: Directory" msgstr "Dosya tipi : Dizin" -#: gnome/gnome-file-property-dialog.c:222 +#: gnome/gnome-file-property-dialog.c:232 msgid "File Type: Character Device" msgstr "Dosya tipi : Harf ahizesi" -#: gnome/gnome-file-property-dialog.c:224 +#: gnome/gnome-file-property-dialog.c:234 msgid "File Type: Block Device" msgstr "Dosya tipi : Blok ahizesi" -#: gnome/gnome-file-property-dialog.c:226 +#: gnome/gnome-file-property-dialog.c:236 msgid "File Type: Socket" msgstr "Dosya tipi : Socket" -#: gnome/gnome-file-property-dialog.c:228 +#: gnome/gnome-file-property-dialog.c:238 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 +#: gnome/gnome-file-property-dialog.c:252 +#: gnome/gnome-file-property-dialog.c:258 msgid "File Size: " msgstr "Dosya büyüklüðü : " -#: gnome/gnome-file-property-dialog.c:238 +#: gnome/gnome-file-property-dialog.c:248 msgid " bytes" msgstr " byte" -#: gnome/gnome-file-property-dialog.c:242 +#: gnome/gnome-file-property-dialog.c:252 msgid " KBytes (" msgstr " KByte (" -#: 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 " byte)" -#: gnome/gnome-file-property-dialog.c:248 +#: gnome/gnome-file-property-dialog.c:258 msgid " MBytes (" msgstr " MByte (" -#: gnome/gnome-file-property-dialog.c:256 +#: gnome/gnome-file-property-dialog.c:266 msgid "File Size: N/A" msgstr "dosya büyüklüðü : Belirlenemedi" -#: gnome/gnome-file-property-dialog.c:267 +#: gnome/gnome-file-property-dialog.c:277 msgid "File Created on: " msgstr "Dosyanýn yaratýlýþ tarihi : " -#: gnome/gnome-file-property-dialog.c:276 +#: gnome/gnome-file-property-dialog.c:286 msgid "Last Modified on: " msgstr "Son deðiþim tarihi : " -#: gnome/gnome-file-property-dialog.c:285 +#: gnome/gnome-file-property-dialog.c:295 msgid "Last Accessed on: " msgstr "Son eriþim tarihi : " -#: gnome/gnome-file-property-dialog.c:303 +#: gnome/gnome-file-property-dialog.c:313 msgid "URL:" msgstr "Adres :" -#: gnome/gnome-file-property-dialog.c:310 +#: gnome/gnome-file-property-dialog.c:320 msgid "Caption:" msgstr "Üstyazý :" -#: 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 "Býrakýlýþ eylemi" -#: gnome/gnome-file-property-dialog.c:388 +#: gnome/gnome-file-property-dialog.c:398 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 +#: 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 "Göster" -#: gnome/gnome-file-property-dialog.c:404 +#: gnome/gnome-file-property-dialog.c:414 msgid "Use default View options" msgstr "Önayarlý gösterme ayarlarýný kullan" -#: gnome/gnome-file-property-dialog.c:439 +#: gnome/gnome-file-property-dialog.c:449 msgid "Select an Icon" msgstr "Bir ikona seç" #. 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 "Aç" -#: gnome/gnome-file-property-dialog.c:479 +#: gnome/gnome-file-property-dialog.c:489 msgid "Use default Open action" msgstr "Önayarlý açma eylemi" -#: gnome/gnome-file-property-dialog.c:502 +#: gnome/gnome-file-property-dialog.c:512 msgid "Use default Drop action" msgstr "Önayarlý býrakma eylemi" -#: gnome/gnome-file-property-dialog.c:504 +#: gnome/gnome-file-property-dialog.c:514 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 +#: 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 "Deðiþtir" -#: gnome/gnome-file-property-dialog.c:523 +#: gnome/gnome-file-property-dialog.c:533 msgid "Use default Edit action" msgstr "Önayarlý deðiþtirme eylemini kullan" -#: 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 "Ikona" #. 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 "Dosya eylemleri" -#: gnome/gnome-file-property-dialog.c:616 +#: gnome/gnome-file-property-dialog.c:626 msgid "Open action" msgstr "Açma eylemi" -#: gnome/gnome-file-property-dialog.c:617 +#: gnome/gnome-file-property-dialog.c:627 msgid "Needs terminal to run" msgstr "Çalýþmasý için komuta lazým" -#: gnome/gnome-file-property-dialog.c:742 +#: gnome/gnome-file-property-dialog.c:753 msgid "File Permissions" msgstr "Eriþim haklarý" -#: 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 "Þu anki haklar : " #. 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 "Okuma" -#: 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 "Yazma" -#: 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 "Çalýþtýrma" -#: 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 "Özel" #. 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 "Kullançiý" -#: 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 "Baþka" #. 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 "UID'i belirle" -#: 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 "GID'i belirle" -#: 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 "Yapýþýk" -#: 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 "Dosya iyeliði" -#: gnome/gnome-file-property-dialog.c:1079 +#: gnome/gnome-file-property-dialog.c:1097 msgid "URL" msgstr "Adres" -#: gnome/gnome-file-property-dialog.c:1082 +#: gnome/gnome-file-property-dialog.c:1100 msgid "Statistics" msgstr "Istatistikler" -#: gnome/gnome-file-property-dialog.c:1088 +#: gnome/gnome-file-property-dialog.c:1106 msgid "Options" msgstr "Ayarlar" -#: gnome/gnome-file-property-dialog.c:1091 +#: gnome/gnome-file-property-dialog.c:1109 msgid "Permissions" msgstr "Eriþim haklarý" -#: gnome/gnome-file-property-dialog.c:1094 +#: gnome/gnome-file-property-dialog.c:1112 msgid " Properties" msgstr " Özellikler" -#: 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 "Geçersiz bir kullanýcý verdin" -#: gnome/gnome-file-property-dialog.c:1202 +#: gnome/gnome-file-property-dialog.c:1220 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 +#: gnome/gnome-file-property-dialog.c:1226 msgid "You cannot rename a file to something containing a '/' character" msgstr "Bir dosya dý hiç ´/´ içermez" @@ -1301,7 +1305,7 @@ msgid "Copy..." msgstr "Kopyala ..." -#: 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 "Sil" @@ -1342,71 +1346,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "Tanýmlanmýþ tabirler yerine komuta teþkilini kullan" -#: 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 "Silerken sorgula" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "Üstüne yazarken sorgula" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "Çalýþýrken sorgula" -#: gnome/gprefs.c:125 +#: gnome/gprefs.c:129 msgid "Show progress while operations are being performed" msgstr "Eylemlerin ilerlemelerini göster" -#: gnome/gprefs.c:134 +#: gnome/gprefs.c:138 msgid "VFS Timeout:" msgstr "VFS zaman arasý :" -#: gnome/gprefs.c:135 gnome/gprefs.c:160 +#: gnome/gprefs.c:139 gnome/gprefs.c:164 msgid "Seconds" msgstr "Saniye" -#: gnome/gprefs.c:138 +#: gnome/gprefs.c:142 msgid "Anonymous FTP password:" msgstr "Adsýz FTP parolasý :" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "Her zaman FTP ara belleðini kullan" -#: gnome/gprefs.c:151 +#: gnome/gprefs.c:155 msgid "Fast directory reload" msgstr "hýzlý dizin yüklemesini kullan" -#: gnome/gprefs.c:155 +#: gnome/gprefs.c:159 msgid "Compute totals before copying files" msgstr "Hepsini kopyalamadan önce toplamý hesapla" -#: gnome/gprefs.c:159 +#: gnome/gprefs.c:163 msgid "FTP directory cache timeout :" msgstr "FTP dizin ara belleði için zaman arasý :" -#: gnome/gprefs.c:163 +#: gnome/gprefs.c:167 msgid "Allow customization of icons in icon view" msgstr "Ikona bakýþýnda ikonalarýn özelleþmesine izin ver" -#: gnome/gprefs.c:172 +#: gnome/gprefs.c:176 msgid "File display" msgstr "Dosya gösterimi" -#: gnome/gprefs.c:176 +#: gnome/gprefs.c:180 msgid "Confirmation" msgstr "Sorgulama" -#: gnome/gprefs.c:180 +#: gnome/gprefs.c:184 msgid "VFS" msgstr "VFS" -#: gnome/gprefs.c:184 +#: gnome/gprefs.c:188 msgid "Caching" msgstr "Belleme" -#: gnome/gprefs.c:474 +#: gnome/gprefs.c:478 msgid "Preferences" msgstr "Ayarlar" @@ -1450,104 +1458,104 @@ msgid "Select icon" msgstr "Ikona seç" -#: gnome/gscreen.c:1415 +#: gnome/gscreen.c:1428 msgid "Reloads the current directory" msgstr "Geçerli dizini yeniden yükle" -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "New _Directory..." msgstr "Yeni _dizin .." -#: gnome/gscreen.c:1417 +#: gnome/gscreen.c:1430 msgid "Creates a new directory here" msgstr "burada yeni bir dizin yaratýr" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "New _File..." msgstr "Yeni dosya" -#: gnome/gscreen.c:1419 +#: gnome/gscreen.c:1432 msgid "Creates a new file here" msgstr "Burada yeni bir dosya yaratýr" -#: gnome/gscreen.c:1620 +#: gnome/gscreen.c:1633 #, c-format msgid "Search: %s" msgstr "Ara : %s" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d file" -msgstr "%d dosyasýnda %s byte" +msgstr "%s bayt : %d dosya" -#: gnome/gscreen.c:1630 +#: gnome/gscreen.c:1643 #, c-format msgid "%s bytes in %d files" -msgstr "%d dosyada %s byte" +msgstr "%s bayt : %d dosya" -#: gnome/gscreen.c:1656 src/screen.c:688 +#: gnome/gscreen.c:1669 src/screen.c:688 msgid "" -msgstr "" +msgstr "" -#: gnome/gscreen.c:2085 +#: gnome/gscreen.c:2098 msgid "Copy directory" msgstr "Dizini kopyala" -#: gnome/gscreen.c:2086 +#: gnome/gscreen.c:2099 msgid "Delete directory" msgstr "Dizini sil" -#: gnome/gscreen.c:2087 +#: gnome/gscreen.c:2100 msgid "Rename or move directory" msgstr "Dizini yeniden adlandýt yada taþý" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Back" msgstr "Geri" -#: gnome/gscreen.c:2245 +#: gnome/gscreen.c:2258 msgid "Go to the previously visited directory" msgstr "Önceki dizine geç" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Up" msgstr "Yukarý" -#: gnome/gscreen.c:2247 +#: gnome/gscreen.c:2260 msgid "Go up a level in the directory heirarchy" msgstr "Üst dizine geç" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Forward" msgstr "Ileri" -#: gnome/gscreen.c:2249 +#: gnome/gscreen.c:2262 msgid "Go to the next directory" msgstr "Ileri dizine geç" -#: gnome/gscreen.c:2252 src/tree.c:1010 +#: gnome/gscreen.c:2265 src/tree.c:1010 msgid "Rescan" msgstr "Yeniden tara" -#: gnome/gscreen.c:2252 +#: gnome/gscreen.c:2265 msgid "Rescan the current directory" msgstr "Geçerli dizini yeniden tara" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Home" msgstr "Bark" -#: gnome/gscreen.c:2255 +#: gnome/gscreen.c:2268 msgid "Go to your home directory" msgstr "Ev dizinine geç" -#: gnome/gscreen.c:2395 +#: gnome/gscreen.c:2408 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 +#: 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 @@ -1560,12 +1568,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 "Sütun %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:739 #, c-format msgid "%s bytes" msgstr "%s byte" @@ -1605,8 +1613,7 @@ #. 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ýþ" +msgstr "_Taranmýþ bakýþ" #: gnome/gview.c:333 msgid "_Formatted" @@ -1656,56 +1663,86 @@ msgid "Could not get the desktop\n" msgstr "Masaüstüne ulaþamadým\n" -#: 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 "Belirtilen dizini gösteren bir pencere aç" -#: gnome/gmc-client.c:171 gnome/gmc-client.c:173 +#: gnome/gmc-client.c:206 gnome/gmc-client.c:208 msgid "DIRECTORY" msgstr "DIZIN" -#: gnome/gmc-client.c:173 +#: gnome/gmc-client.c:208 msgid "Rescan the specified directory" msgstr "Belirlenmiþ dizini yeniden tara" -#: gnome/gmc-client.c:175 +#: gnome/gmc-client.c:210 msgid "Rescan the desktop icons" msgstr "Masaüstü ikonalarýný yeniden tara" -#: gnome/gmc-client.c:177 +#: gnome/gmc-client.c:212 msgid "Rescan the desktop device icons" msgstr "Masaüstü ahize ikonalarý yeniden tara" -#: gnome/gmc-client.c:179 +#: gnome/gmc-client.c:214 +#, fuzzy +msgid "Arrange the desktop icons" +msgstr "Masaüstü ikonalarýný yeniden tara" + +#: 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 "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 +#: 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 " HATA " -#: 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 " Dosyayý okumaya açarken hata oldu : " -#: gtkedit/edit.c:241 +#: gtkedit/edit.c:314 +#, fuzzy +msgid " Error reading from pipe: " +msgstr " Dosyayý kaydederken hata oldu . " + +#: gtkedit/edit.c:319 +#, fuzzy +msgid " Failed trying to open pipe for reading: " +msgstr " Dosyayý okumaya açarken hata oldu : " + +#: gtkedit/edit.c:333 +#, fuzzy +msgid " Error reading file: " +msgstr " Dosyayý kaydederken hata oldu . " + +#: gtkedit/edit.c:382 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 +#: gtkedit/edit.c:389 msgid " Not an ordinary file: " msgstr " Normal bir dosya deðil : " -#: gtkedit/edit.c:254 +#: gtkedit/edit.c:395 msgid " File is too large: " msgstr " Dosya çok fazla büyük : " -#: gtkedit/edit.c:255 +#: gtkedit/edit.c:396 msgid "" " \n" " Increase edit.h:MAXBUF and recompile the editor. " @@ -1713,517 +1750,538 @@ " \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:298 +#, fuzzy +msgid " Error writing to pipe: " +msgstr " Dosyayý kaydederken hata oldu . " + +#: gtkedit/editcmd.c:304 +#, fuzzy +msgid " Failed trying to open pipe for writing: " +msgstr " Dosyayý okumaya açarken hata oldu : " -#: gtkedit/editcmd.c:334 +#: gtkedit/editcmd.c:379 msgid "Quick save " msgstr "Hýzlý kaydet " -#: gtkedit/editcmd.c:335 +#: gtkedit/editcmd.c:380 msgid "Safe save " msgstr "Güvenilir kaydet " -#: gtkedit/editcmd.c:336 +#: gtkedit/editcmd.c:381 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 +#: 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 "&Iptal" -#: gtkedit/editcmd.c:345 +#: gtkedit/editcmd.c:390 msgid "Extension:" msgstr "Sonek :" #. NLS ? -#: gtkedit/editcmd.c:352 +#: gtkedit/editcmd.c:397 msgid " Edit Save Mode " msgstr " Kaydetme þeklini deðiþtir " -#: gtkedit/editcmd.c:499 +#: gtkedit/editcmd.c:525 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 +#: 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 " Ikaz " -#: gtkedit/editcmd.c:514 +#: gtkedit/editcmd.c:540 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 +#: gtkedit/editcmd.c:542 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 +#: 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 "Iptal" -#: gtkedit/editcmd.c:535 +#: gtkedit/editcmd.c:561 msgid " Save as " msgstr " Farklý kaydet" -#: gtkedit/editcmd.c:535 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:561 gtkedit/editcmd.c:2770 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 +#: gtkedit/editcmd.c:679 gtkedit/editcmd.c:687 gtkedit/editcmd.c:712 msgid " Delete macro " msgstr " Macro'yu sil " #. 'Open' = load temp file -#: gtkedit/editcmd.c:655 +#: gtkedit/editcmd.c:681 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 +#: gtkedit/editcmd.c:689 gtkedit/editcmd.c:750 gtkedit/editcmd.c:818 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 +#: gtkedit/editcmd.c:694 gtkedit/editcmd.c:702 gtkedit/editcmd.c:738 +#: gtkedit/editcmd.c:793 #, c-format msgid "key '%d 0': " msgstr "Tuþ ´5d 0´ : " -#: gtkedit/editcmd.c:687 +#: gtkedit/editcmd.c:713 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 +#: 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 " Macro'nun yeni basayýný belirle : " #. This heads the 'Save Macro' dialog box -#: gtkedit/editcmd.c:724 +#: gtkedit/editcmd.c:750 msgid " Save macro " msgstr " Macro'yu kaydet " -#: gtkedit/editcmd.c:734 gtkedit/editcmd.c:741 +#: gtkedit/editcmd.c:760 gtkedit/editcmd.c:767 msgid " Delete Macro " msgstr " Macro'yu sil " #. This heads the 'Load Macro' dialog box -#: gtkedit/editcmd.c:791 +#: gtkedit/editcmd.c:817 msgid " Load macro " msgstr " Macro'yu yükle " -#: gtkedit/editcmd.c:805 gtkedit/editcmd.c:807 +#: gtkedit/editcmd.c:831 gtkedit/editcmd.c:833 msgid " Confirm save file? : " msgstr " Dosyayý kaydedeyim mi ? :" #. Buttons to 'Confirm save file' query -#: gtkedit/editcmd.c:810 +#: gtkedit/editcmd.c:836 msgid " Save file " msgstr " Dosyayý kaydet" -#: 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 "Kaydet" -#: 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 "Devam et" -#. Heads the 'Load' file dialog box -#: gtkedit/editcmd.c:859 gtkedit/editcmd.c:875 +#: gtkedit/editcmd.c:893 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 +#: gtkedit/editcmd.c:1038 gtkedit/editcmd.c:1135 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 +#: gtkedit/editcmd.c:1135 msgid " Continue " msgstr " Devam et " -#: gtkedit/editcmd.c:1117 +#: gtkedit/editcmd.c:1135 msgid " Cancel " msgstr " Iptal " -#: 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 "&Atla" -#: gtkedit/editcmd.c:1179 +#: gtkedit/editcmd.c:1196 msgid "&Replace" msgstr "&Yerleþtir" -#: gtkedit/editcmd.c:1185 gtkedit/editcmd.c:1607 +#: gtkedit/editcmd.c:1202 gtkedit/editcmd.c:1670 msgid " Replace with: " msgstr " Bunla yerleþtir : " -#: gtkedit/editcmd.c:1189 +#: gtkedit/editcmd.c:1206 msgid " Confirm replace " msgstr " Yerleþmeyi doðrula " -#: 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 "hepsine yerleþtir" -#: 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 "" +msgstr "&geriye dönük" -#: 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 +#, fuzzy +msgid "Replace repeatedly" +msgstr "Yerine yazamayým mý ?" + +#: 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 "" +msgstr " Çýk " -#: 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 "" +msgstr "Çýkýþý durdur" -#: 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 "&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 +#: 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 "&Hayýr" -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Cancel quit " -msgstr "" +msgstr " &Çýkýþý durdur " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &Yes " msgstr " &Evet " -#: gtkedit/editcmd.c:2292 +#: gtkedit/editcmd.c:2382 msgid " &No " msgstr " &Hayýr " -#: gtkedit/editcmd.c:2524 gtkedit/editcmd.c:2599 +#: gtkedit/editcmd.c:2614 gtkedit/editcmd.c:2689 msgid " Copy to clipboard " -msgstr "" +msgstr " Arabelleðe kopyala " -#: 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 "" +msgstr " Dosyaya kaydedemedim. " -#: gtkedit/editcmd.c:2546 gtkedit/editcmd.c:2612 +#: gtkedit/editcmd.c:2636 gtkedit/editcmd.c:2702 msgid " Cut to clipboard " -msgstr "" +msgstr " Arabelleðe kes " -#: 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 "" +msgstr " Satra git " -#: 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 "" +msgstr " Satrý belirle: " -#: gtkedit/editcmd.c:2667 gtkedit/editcmd.c:2680 +#: gtkedit/editcmd.c:2757 gtkedit/editcmd.c:2770 msgid " Save Block " -msgstr "" +msgstr " Bloku kaydet " -#: gtkedit/editcmd.c:2717 +#: gtkedit/editcmd.c:2784 msgid " Insert File " -msgstr "" +msgstr " Dosyayý içer " -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Insert file " -msgstr "" +msgstr " Dosyayý içer" -#: gtkedit/editcmd.c:2730 +#: gtkedit/editcmd.c:2797 msgid " Error trying to insert file. " -msgstr "" +msgstr " Dosyayý içerirken hata oldu. " #. Not essential to translate -#: gtkedit/editcmd.c:2752 +#: gtkedit/editcmd.c:2819 msgid " Sort block " -msgstr "" +msgstr " Bloku sýrala " #. 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 "" +msgstr " Sýralamayý çalýþtýr " #. 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 "" +msgstr " Sýrala " #. 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 "" @@ -2251,341 +2309,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 "" +msgstr "&Aç/yükle .. C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" -msgstr "" +msgstr "&Yeni C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" -msgstr "" +msgstr "&Kaydet F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" -msgstr "" +msgstr "&Farklý kaydet F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" -msgstr "" +msgstr "Dosyayý &içer .. F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" -msgstr "" +msgstr "Dosyaya kopyala C-f" -#: gtkedit/editmenu.c:132 gtkedit/editmenu.c:148 +#: gtkedit/editmenu.c:133 gtkedit/editmenu.c:149 msgid "a&Bout... " -msgstr "" +msgstr "&Bilgi ..." -#: gtkedit/editmenu.c:134 gtkedit/editmenu.c:150 +#: gtkedit/editmenu.c:135 gtkedit/editmenu.c:151 msgid "&Quit F10" -msgstr "" +msgstr "Çý&k F10" -#: gtkedit/editmenu.c:140 +#: gtkedit/editmenu.c:141 msgid "&New C-x k" -msgstr "" +msgstr "&Yeni C-x k" -#: gtkedit/editmenu.c:146 +#: gtkedit/editmenu.c:147 msgid "copy to &File... " -msgstr "" +msgstr "&Dosyaya kopyala ... " -#: 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 "" +msgstr "&Kopyala F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" -msgstr "" +msgstr "&Taþý F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" -msgstr "" +msgstr "&Sil F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" -msgstr "" +msgstr "&Geriye al C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" -msgstr "" +msgstr "&Baþ C-SaYu" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" -msgstr "" +msgstr "&Son C-SaAþ" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" -msgstr "" +msgstr "&Ara ... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" -msgstr "" +msgstr "Yeniden b&ul F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" -msgstr "" +msgstr "&Yerleþtir .... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" +msgstr "&Satra git ... M-l" + +#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:228 +msgid "goto matching &Bracket M-b" msgstr "" -#: gtkedit/editmenu.c:205 gtkedit/editmenu.c:227 +#: 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 "" +msgstr "makr&oyu sil ... " -#: gtkedit/editmenu.c:214 gtkedit/editmenu.c:236 +#: gtkedit/editmenu.c:216 gtkedit/editmenu.c:239 msgid "insert &Date/time " -msgstr "" +msgstr "t&arih/zamaný içer " -#: 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 "" +msgstr "'indent' &C imleþtiricisi F19" -#: gtkedit/editmenu.c:220 +#: gtkedit/editmenu.c:222 msgid "&Mail... " -msgstr "" +msgstr "&ePostala ... " -#: 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 "&Genel ..." -#: gtkedit/editmenu.c:249 gtkedit/editmenu.c:258 +#: gtkedit/editmenu.c:252 gtkedit/editmenu.c:261 msgid "&Save mode..." msgstr "Ka&ydetme türü ..." -#: 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 "&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 +#: gtkedit/editmenu.c:273 gtkedit/editmenu.c:282 gtkedit/editmenu.c:399 #: src/chmod.c:164 src/chown.c:130 msgid " File " -msgstr "" +msgstr " Dosya " -#: 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 "" +msgstr " Deðiþtir " -#: 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 "" +msgstr " Komuta " -#: gtkedit/editmenu.c:274 gtkedit/editmenu.c:283 +#: gtkedit/editmenu.c:277 gtkedit/editmenu.c:286 msgid " Options " -msgstr "" +msgstr " Ayarlar " -#: gtkedit/editmenu.c:397 +#: gtkedit/editmenu.c:400 msgid "Open...\tC-o" -msgstr "" +msgstr "Aç ...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" -msgstr "" +msgstr "Yeni\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" -msgstr "" +msgstr "Kaydet\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" -msgstr "" +msgstr "Farklý kaydet.... \tF12" -#: 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 "" @@ -2610,84 +2676,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 "Tuþ ayarlarý" -#: gtkedit/editoptions.c:159 +#: gtkedit/editoptions.c:157 msgid " Editor options " msgstr " Yazman ayaralarý" #. 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 "Yardým" -#: gtkedit/editwidget.c:1095 gtkedit/gtkedit.c:1248 +#: gtkedit/editwidget.c:1138 gtkedit/gtkedit.c:1248 msgid "Mark" msgstr "Iþaretle" -#: gtkedit/editwidget.c:1096 +#: gtkedit/editwidget.c:1139 msgid "Replac" msgstr "Yerleþle" -#: gtkedit/editwidget.c:1102 src/main.c:1721 +#: gtkedit/editwidget.c:1145 src/main.c:1723 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 +#: 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 "Çýk" @@ -2697,7 +2763,7 @@ #: gtkedit/gtkedit.c:66 msgid " Enter file name: " -msgstr "" +msgstr " Dosya adýný ver: " #: gtkedit/gtkedit.c:111 msgid "The Quick Brown Fox Jumps Over The Lazy Dog" @@ -2705,7 +2771,7 @@ #: gtkedit/gtkedit.c:802 msgid "" -"gtkedit.c: 22ME environment variable not set and no passwd entry - aborting\n" +"gtkedit.c: HOME environment variable not set and no passwd entry - aborting\n" msgstr "" #: gtkedit/gtkedit.c:1246 @@ -2738,7 +2804,7 @@ #: gtkedit/gtkedit.c:1253 msgid "Find" -msgstr "" +msgstr "Bul" #: gtkedit/gtkedit.c:1253 msgid "Find strings/regular expressions" @@ -2746,13 +2812,13 @@ #: gtkedit/gtkedit.c:1254 msgid "Dlete" -msgstr "" +msgstr "Sil" #: 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 +#: gtkedit/gtkedit.c:1255 src/main.c:1722 src/screen.c:2396 src/screen.c:2426 msgid "Menu" msgstr "Mönü" @@ -2788,58 +2854,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 "" @@ -2870,11 +2936,11 @@ #: src/achown.c:374 msgid "On" -msgstr "" +msgstr "Aç" #: src/achown.c:376 msgid "Flag" -msgstr "" +msgstr "Derek" #: src/achown.c:383 #, c-format @@ -3329,7 +3395,7 @@ #: src/cmd.c:668 msgid "&Home" -msgstr "" +msgstr "&Bark" #: src/cmd.c:858 msgid " Compare directories " @@ -3434,54 +3500,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 "" @@ -3627,71 +3693,181 @@ msgid "mc.ext will be used for this moment." msgstr "" -#: src/file.c:154 src/tree.c:639 -msgid " Copy " +#: src/features.inc:8 +#, fuzzy +msgid "Edition: " +msgstr " Deðiþtir " + +#: src/features.inc:11 +#, fuzzy +msgid "XView" +msgstr "Göster" + +#: src/features.inc:13 +msgid "Tk" msgstr "" -#: src/file.c:155 src/tree.c:677 -msgid " Move " +#: src/features.inc:16 +#, fuzzy +msgid "text mode" +msgstr "Þu anki haklar : " + +#: src/features.inc:18 +msgid " with X11 support to read modifiers" msgstr "" -#: src/file.c:156 src/tree.c:745 -msgid " Delete " +#: src/features.inc:24 +msgid "Virtual File System: tarfs, extfs" msgstr "" -#: src/file.c:244 -msgid " Invalid target mask " +#: src/features.inc:26 +msgid ", ftpfs" msgstr "" -#: src/file.c:342 -msgid " Could not make the hardlink " +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" msgstr "" -#: src/file.c:384 -#, c-format -msgid "" -" Cannot read source link \"%s\" \n" -" %s " +#: src/features.inc:30 +msgid ", mcfs" msgstr "" -#: src/file.c:394 -msgid "" -" Cannot make stable symlinks across non-local filesystems: \n" -"\n" -" Option Stable Symlinks will be disabled " +#: src/features.inc:32 +msgid " (with termnet support)" msgstr "" -#: src/file.c:442 -#, c-format -msgid "" -" Cannot create target symlink \"%s\" \n" -" %s " +#: src/features.inc:35 +msgid ", smbfs" msgstr "" -#: src/file.c:509 -#, c-format -msgid "" -" Cannot overwrite directory \"%s\" \n" -" %s " +#: src/features.inc:39 +msgid ", undelfs" msgstr "" -#: src/file.c:518 -#, c-format -msgid "" -" Cannot stat source file \"%s\" \n" -" %s " +#: src/features.inc:45 +msgid "With builtin Editor\n" msgstr "" -#: src/file.c:531 -#, c-format -msgid " `%s' and `%s' are the same file. " +#: src/features.inc:48 +msgid "Using " msgstr "" -#: src/file.c:574 -#, c-format -msgid "" -" Cannot create special file \"%s\" \n" -" %s " +#: 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 "Komutayý kullan" + +#: 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 +#, fuzzy +msgid "optional" +msgstr "Ayarlar" + +#: src/features.inc:78 +msgid "as default" +msgstr "" + +#: src/features.inc:84 +#, fuzzy +msgid "With support for background operations\n" +msgstr "Ardalan iþlemlerinin listeleri" + +#: src/file.c:154 src/tree.c:639 +msgid " Copy " +msgstr " Kopyala " + +#: src/file.c:155 src/tree.c:677 +msgid " Move " +msgstr " Taþý " + +#: src/file.c:156 src/tree.c:745 +msgid " Delete " +msgstr " Sil " + +#: src/file.c:244 +msgid " Invalid target mask " +msgstr " Geçersiz dosya aðý " + +#: 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 @@ -3831,12 +4007,12 @@ #: src/file.c:1122 #, c-format msgid " `%s' and `%s' are the same file " -msgstr "" +msgstr " `%s' ve `%s' ayný dosyadýr " #: src/file.c:1129 #, c-format msgid " Cannot overwrite directory `%s' " -msgstr "" +msgstr " %s dizinin üstünü yazaman " #: src/file.c:1172 #, c-format @@ -3851,11 +4027,13 @@ " Cannot remove file \"%s\" \n" " %s " msgstr "" +" \"%s\" dosyasýný silemedim \n" +" %s " #: src/file.c:1246 #, c-format msgid " `%s' and `%s' are the same directory " -msgstr "" +msgstr " `%s' ve `%s' ayný dizindir " #: src/file.c:1265 #, c-format @@ -3933,7 +4111,7 @@ msgid "%o %d %f%e" msgstr "" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:496 msgid "file" msgstr "" @@ -3963,11 +4141,11 @@ #: src/file.c:1875 src/screen.c:2117 msgid "Yes" -msgstr "" +msgstr "Evet" #: src/file.c:1875 src/screen.c:2117 msgid "No" -msgstr "" +msgstr "Hayýr" #: src/file.c:1928 msgid " Sorry, I could not put the job in background " @@ -3990,11 +4168,11 @@ #: src/file.c:2190 msgid "&Retry" -msgstr "" +msgstr "Yeniden &dene" #: src/file.c:2190 src/file.c:2251 src/filegui.c:264 src/filegui.c:592 msgid "&Abort" -msgstr "" +msgstr "I&ptal" #: src/file.c:2242 msgid "" @@ -4036,27 +4214,27 @@ #: src/filegui.c:424 msgid "File" -msgstr "" +msgstr "Dosya" #: src/filegui.c:447 msgid "Count" -msgstr "" +msgstr "Sayý" #: src/filegui.c:468 msgid "Bytes" -msgstr "" +msgstr "Byte" #: src/filegui.c:505 msgid "Source" -msgstr "" +msgstr "Kaynak" #: src/filegui.c:528 msgid "Target" -msgstr "" +msgstr "Hedef" #: src/filegui.c:550 msgid "Deleting" -msgstr "" +msgstr "Siliniyor" #: src/filegui.c:590 #, c-format @@ -4069,7 +4247,7 @@ #: src/filegui.c:596 msgid "&Update" -msgstr "" +msgstr "&Yenile" #: src/filegui.c:598 msgid "Overwrite all targets?" @@ -4188,13 +4366,13 @@ 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 "&Aðaç" #: src/find.c:223 msgid "Find File" -msgstr "" +msgstr "Dosyayý bul" #: src/find.c:452 #, c-format @@ -4213,7 +4391,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 "" @@ -4727,7 +4905,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" @@ -4735,263 +4913,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 "Sýra&lama türü ..." -#: src/main.c:1241 src/main.c:1265 +#: src/main.c:1243 src/main.c:1267 msgid "&Quick view C-x q" msgstr "Çab&uk bakýþ 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 "B&ilgi C-x i" -#: src/main.c:1245 src/main.c:1269 +#: src/main.c:1247 src/main.c:1271 msgid "&Sort order..." msgstr "&sýralama türü ..." -#: src/main.c:1247 src/main.c:1271 +#: src/main.c:1249 src/main.c:1273 msgid "&Filter..." msgstr "&Filtra ..." -#: src/main.c:1250 src/main.c:1274 +#: src/main.c:1252 src/main.c:1276 msgid "&Network link..." msgstr "Þ&ebeke baðý ..." -#: src/main.c:1251 src/main.c:1275 +#: src/main.c:1253 src/main.c:1277 msgid "FT&P link..." msgstr "FT&P baðý ..." -#: 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 "Sürü&cü .. M-d" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "Yeniden ta&ra C-r" -#: src/main.c:1288 +#: src/main.c:1290 msgid "&User menu F2" msgstr "K&ullanýcý mönüsü F2" -#: src/main.c:1289 +#: src/main.c:1291 msgid "&View F3" msgstr "&Göster F3" -#: src/main.c:1290 +#: src/main.c:1292 msgid "Vie&w file... " msgstr "Dosyaya ba&k ..." -#: src/main.c:1291 +#: src/main.c:1293 msgid "&Filtered view M-!" msgstr "&Filtralý bakýþ M-!" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Edit F4" msgstr "D&eðiþtir F4" -#: src/main.c:1293 +#: src/main.c:1295 msgid "&Copy F5" msgstr "&Kopyala F5" -#: src/main.c:1294 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "y&ömlr C-x x" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "Bað&la C-x l" -#: src/main.c:1297 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "Yumþak&Baðla C-x s" -#: src/main.c:1298 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "YBaðý deðiþtir C-x C-s" -#: src/main.c:1299 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "yö&mle C-x o" -#: src/main.c:1300 +#: src/main.c:1302 msgid "&Advanced chown " msgstr "Geliþmiþ y&ömle " -#: src/main.c:1302 +#: src/main.c:1304 msgid "&Rename/Move F6" msgstr "YenidenAd/&Taþý F6" -#: src/main.c:1303 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "D&izin yarat F7" -#: src/main.c:1304 +#: src/main.c:1306 msgid "&Delete F8" msgstr "&Sil F8" -#: src/main.c:1305 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "Çabuk dizine geç M-c" -#: src/main.c:1307 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "&Kitle seç M-+" -#: src/main.c:1308 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "Kitle&yi seçme M-\\" -#: src/main.c:1309 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "Kitleyi te&rsle M-*" -#: src/main.c:1311 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "Çýk F10" -#: src/main.c:1321 +#: src/main.c:1323 msgid "&Directory tree" msgstr "&Dizinler aðaçý" -#: src/main.c:1323 +#: src/main.c:1325 msgid "&Find file M-?" msgstr "Dosya b&ul M-?" -#: src/main.c:1324 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "Panelleri &deðiþtir C-u" -#: src/main.c:1325 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "&Panelleri kapat/aç C-o" -#: src/main.c:1326 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "Dizinleri karþýlaþtýr C-x d" -#: src/main.c:1327 +#: src/main.c:1329 msgid "e&Xternal panelize C-x !" msgstr "D6ýþarýdan panelle C-x !" -#: src/main.c:1328 +#: src/main.c:1330 msgid "show directory s&Izes" msgstr "diz&inlerin boyutunu göster" -#: src/main.c:1330 +#: src/main.c:1332 msgid "command &History" msgstr "komuta geçmiþi" -#: src/main.c:1331 +#: src/main.c:1333 msgid "di&Rectory hotlist C-\\" msgstr "Di&zinler geçmiþi C-\\" -#: src/main.c:1333 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "&Geçerli VFS listesi C-x a" -#: src/main.c:1334 +#: src/main.c:1336 msgid "Fr&ee VFSs now" msgstr "VFS'i þimdi boþalt" -#: src/main.c:1337 +#: src/main.c:1339 msgid "&Background jobs C-x j" msgstr "&Ardalan iþlemleri C-x j" -#: src/main.c:1341 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "Dosyalarý k&urtar (sadece ext2fs'de)" -#: 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 "Dosya son&eklerini deðiþtir" -#: src/main.c:1347 +#: src/main.c:1349 msgid "&Menu file edit" msgstr "Mön&üyü deðiþtir" -#: src/main.c:1352 +#: src/main.c:1354 msgid "&Configuration..." msgstr "&Ayarlar ..." -#: src/main.c:1354 +#: src/main.c:1356 msgid "c&Onfirmation..." msgstr "&Onaylama ..." -#: src/main.c:1355 +#: src/main.c:1357 msgid "&Display bits..." msgstr "Bitleri &göster ..." -#: src/main.c:1357 +#: src/main.c:1359 msgid "learn &Keys..." msgstr "Tu&þlarý öðren ..." -#: src/main.c:1360 +#: src/main.c:1362 msgid "&Virtual FS..." msgstr "&Sanal DYS (VFS) ..." -#: src/main.c:1363 +#: src/main.c:1365 msgid "&Save setup" msgstr "A&yarlarý kaydet" -#: src/main.c:1379 src/main.c:1381 +#: src/main.c:1381 src/main.c:1383 msgid " &Left " msgstr " &Sol " -#: src/main.c:1381 +#: src/main.c:1383 msgid " &Above " msgstr " &Üst " -#: src/main.c:1384 +#: src/main.c:1386 msgid " &File " msgstr " &Dosya " -#: src/main.c:1385 +#: src/main.c:1387 msgid " &Command " msgstr " &Komuta " -#: src/main.c:1386 +#: src/main.c:1388 msgid " &Options " msgstr " &Ayarlar " -#: src/main.c:1388 src/main.c:1390 +#: src/main.c:1390 src/main.c:1392 msgid " &Right " msgstr " &Sað " -#: src/main.c:1390 +#: src/main.c:1392 msgid " &Below " msgstr " &Alt" -#: src/main.c:1445 +#: src/main.c:1447 msgid " Information " msgstr " Bilgi " -#: 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" @@ -4999,7 +5177,7 @@ " the details. " msgstr "" -#: src/main.c:1925 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "GNU Midinight Commander'i kullandýðýn için teþekkürler" @@ -5016,123 +5194,241 @@ 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 +#, fuzzy +msgid "No desktop icons" +msgstr "Masaüstü ikonalarýný yeniden tara" + +#: 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" @@ -5294,7 +5590,7 @@ #: src/popthelp.c:31 msgid "Show this help message" -msgstr "Bu yardým ileitisini göster" +msgstr "Bu yardým iletisini göster" #: src/popthelp.c:32 msgid "Display brief usage message" @@ -5388,7 +5684,7 @@ #: src/subshell.c:785 #, c-format msgid "Warning: Couldn't change to %s.\n" -msgstr "" +msgstr "Ikaz : %s'ye geçemedim .\n" #: src/tree.c:192 #, c-format @@ -5396,6 +5692,8 @@ "Can't open the %s file for writing:\n" "%s\n" msgstr "" +"%s dosyasýný yazmak için açanmadým :\n" +"%s\n" #: src/tree.c:637 #, c-format @@ -5493,7 +5791,7 @@ #: src/user.c:720 #, c-format msgid " Empty file %s " -msgstr "" +msgstr " %s boþ bir dosya " #. Create listbox #: src/user.c:730 @@ -5522,166 +5820,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 "Ascii" -#: src/view.c:2071 +#: src/view.c:2076 msgid "Hex" msgstr "Heksades." -#: src/view.c:2072 +#: src/view.c:2077 msgid "Goto" msgstr "Git" -#: src/view.c:2072 +#: src/view.c:2077 msgid "Line" msgstr "Fýkra" -#: 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 "Kýrma" -#: src/view.c:2080 +#: src/view.c:2085 msgid "Wrap" msgstr "Kýr" -#: src/view.c:2083 +#: src/view.c:2088 msgid "HxSrch" msgstr "" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Raw" msgstr "Saf" -#: src/view.c:2086 +#: src/view.c:2091 msgid "Parse" msgstr "Tara" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Unform" msgstr "" -#: src/view.c:2090 +#: src/view.c:2095 msgid "Format" msgstr "" @@ -5884,235 +6182,308 @@ msgid "NumLock on keypad" msgstr "" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, fuzzy, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"%s\n" +"tar arþivini açamdým" + +#: 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 "Tar arþivi düzgün deðil" + +#. 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 "Arþiv dosyasýnda beklenmeyen EOF yakalandý" + +#: vfs/direntry.c:310 +#, c-format +msgid "Dir cache expired for %s" +msgstr "" + +#: vfs/direntry.c:440 vfs/direntry.c:443 +msgid " Direntry warning " +msgstr "" + +#: vfs/direntry.c:440 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "" + +#: vfs/direntry.c:443 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:817 +#, fuzzy +msgid "Starting linear transfer..." +msgstr "ftpfs : " + +#: vfs/direntry.c:962 +#, fuzzy +msgid "Getting file" +msgstr "Dosyayý siliyorum :" + +#: 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:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "" -#: vfs/fish.c:214 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "" -#: vfs/fish.c:224 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" -#: vfs/fish.c:238 +#: vfs/fish.c:233 +#, fuzzy +msgid " fish: Password required for " +msgstr " MCFS parolasý gerekli " + +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "" -#: vfs/fish.c:244 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "" -#: vfs/fish.c:248 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "" -#: vfs/fish.c:252 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "" -#: vfs/fish.c:254 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "" -#: vfs/fish.c:330 +#: vfs/fish.c:334 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: vfs/fish.c:426 +#: vfs/fish.c:438 msgid "fish: failed" msgstr "" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:458 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: vfs/fish.c:460 +#: vfs/fish.c:483 msgid "fish: Local read failed, sending zeros" msgstr "" -#: vfs/fish.c:472 +#: vfs/fish.c:495 #, c-format msgid "fish: storing %s %d (%d)" msgstr "" -#: vfs/fish.c:512 +#: vfs/fish.c:496 +msgid "zeros" +msgstr "" + +#: vfs/fish.c:543 msgid "Aborting transfer..." msgstr "" -#: vfs/fish.c:521 +#: vfs/fish.c:552 msgid "Error reported after abort." msgstr "" -#: vfs/fish.c:523 +#: vfs/fish.c:554 msgid "Aborted transfer would be successful." msgstr "" -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs : " -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr "" -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr "" -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs : " -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs : " -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs : " -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs : " -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs : " -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs : " -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs : " -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "ftpfs : " -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr "ftpfs : " -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:649 msgid "ftpfs: Invalid host name." msgstr "ftpfs : " -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:669 msgid "ftpfs: Invalid host address." msgstr "ftpfs : " -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:692 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs : " -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:702 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs : " -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:704 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs : " -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:746 #, 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 +#: vfs/ftpfs.c:919 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs : " -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:994 msgid "ftpfs: aborting transfer." msgstr "ftpfs : " -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:996 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs : " -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:1001 msgid "ftpfs: abort failed" msgstr "ftpfs : " -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1090 vfs/ftpfs.c:1187 msgid "ftpfs: CWD failed." msgstr "ftpfs : " -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1100 vfs/ftpfs.c:1107 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs : yumþak baðý çözemedim" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1158 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..." +#: vfs/ftpfs.c:1176 +#, fuzzy, c-format +msgid "ftpfs: Reading FTP directory %s... %s%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:1177 +msgid "(strict rfc959)" +msgstr "" + +#: vfs/ftpfs.c:1178 +msgid "(chdir first)" +msgstr "" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1272 msgid "ftpfs: failed" msgstr "ftpfs : baþarýsýz" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1282 msgid "ftpfs: failed; nowhere to fallback to" msgstr "ftpfs : baþarýsýzlýk ..; geriye dönülcek nokta yok" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1345 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs : %d dosyasýný uzakta kaydediyorum (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1760 msgid "" "~/.netrc file has not correct mode.\n" "Remove password or correct mode." @@ -6120,15 +6491,15 @@ "+/.netrc dosyasý doðru eriþilebilir deðil .\n" "Parolayý sil yada eriþilebiliriði saðla ." -#: 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 " Sunucu bu versiyonu desteklemiyor " -#: 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" @@ -6138,30 +6509,50 @@ " 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 +#: vfs/mcfs.c:176 msgid " Yes " msgstr " Evet " -#: vfs/mcfs.c:174 +#: vfs/mcfs.c:176 msgid " No " msgstr " Hayýr" -#: vfs/mcfs.c:176 +#: vfs/mcfs.c:178 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 +#: vfs/mcfs.c:190 msgid " MCFS Password required " msgstr " MCFS parolasý gerekli " -#: vfs/mcfs.c:202 +#: vfs/mcfs.c:204 msgid " Invalid password " msgstr " Yanlýþ parola " -#: 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 +#, fuzzy, c-format +msgid " Can't connect to server: %s " +msgstr "ftpfs : " + +#: vfs/mcfs.c:324 msgid " Too many open connections " msgstr " Çok fazla açýk baðlantý var " +#. 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 "Sunucu : " @@ -6188,6 +6579,10 @@ " %s'ye bir daha baðlanamadý \n" " " +#: vfs/smbfs.c:1242 +msgid " Authentication failed " +msgstr "" + #: vfs/smbfs.c:1737 #, c-format msgid " %s mkdir'ing %s " @@ -6201,12 +6596,12 @@ #: 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 " +msgstr " %s uzaktaki %s dosyasýný açýyor " #: vfs/smbfs.c:1971 #, c-format msgid " %s renaming files\n" -msgstr " %s dosyalarý yeniden adlandýrýyor \n" +msgstr " %s dosyalarý yeniden adlandýrýlýyor \n" #: vfs/tar.c:84 vfs/tar.c:101 #, c-format @@ -6236,11 +6631,140 @@ "%s\n" "bir tar arþivine benzemiyor. " -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1149 +#, fuzzy +msgid "Changes to file lost" +msgstr "&Uzun dosya bakýþý" + +#: vfs/vfs.c:1792 +#, fuzzy +msgid "Could not parse:" +msgstr "" +"%s'yi stat edemedim\n" +"%s" + +#: 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 "%s : %s : %s %3d%% (%ld byte transfer edildi)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1816 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s : %s : %s %ld byte tansfer edildi" + +#: 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 +#, fuzzy +msgid " Ext2lib error " +msgstr " HATA " + +#: vfs/undelfs.c:296 +#, fuzzy, c-format +msgid " Could not open file %s " +msgstr "/etc/fstab dosyasýný açamadým" + +#: 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 +#, fuzzy +msgid "undelfs: failure" +msgstr "ftpfs : baþarýsýz" + +#: 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 "/etc/fstab dosyasýný açamadým" + +#. This is place of next pointer +#: vfs/undelfs.c:683 +#, fuzzy +msgid "Undelete filesystem for ext2" +msgstr "Dosyalarý k&urtar (sadece ext2fs'de)" diff -ruN old/mc-4.5.44/po/uk.po new/mc-4.5.45/po/uk.po --- old/mc-4.5.44/po/uk.po Tue Apr 4 23:32:02 2000 +++ new/mc-4.5.45/po/uk.po Tue May 9 18:52:09 2000 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: mc 4.5.40\n" -"POT-Creation-Date: 1999-11-25 12:24+0200\n" +"POT-Creation-Date: 2000-04-19 14:59+0300\n" "PO-Revision-Date: 1999-11-25 12:24+0200\n" "Last-Translator: Yuri Syrota \n" "Language-Team: Ukrainian \n" @@ -13,25 +13,25 @@ "Content-Type: text/plain; charset=koi8-u\n" "Content-Transfer-Encoding: 8-bit\n" -#: edit/edit_key_translator.c:121 +#: edit/edit_key_translator.c:124 msgid " Emacs key: " msgstr " ëÌÁצÛÁ 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 " ÷ÉËÏÎÁÔÉ ÍÁËÒÏÓ " #. 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 " îÁÔÉÓΦÔØ ËÌÁצÛÕ: " @@ -58,8 +58,8 @@ msgstr "" "\".\n" "\n" -"äÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ, ÚÁÐÕÓÔ¦ÔØ ÒÅÄÁËÔÏÒ mime-×ÌÁÓÔÉ×ÏÓÔÅÊ × ãÅÎÔÒ¦ ëÅÒÕ×ÁÎÎÑ GNOME, " -"ÔÁ ×ÉÐÒÁ×ÔÅ ÔÉÐÏ×Õ %s-ĦÀ ÄÌÑ \"%s\"." +"äÌÑ ×ÉÐÒÁ×ÌÅÎÎÑ, ÚÁÐÕÓÔ¦ÔØ ÒÅÄÁËÔÏÒ mime-×ÌÁÓÔÉ×ÏÓÔÅÊ × ãÅÎÔÒ¦ ëÅÒÕ×ÁÎÎÑ " +"GNOME, ÔÁ ×ÉÐÒÁ×ÔÅ ÔÉÐÏ×Õ %s-ĦÀ ÄÌÑ \"%s\"." #: gnome/gaction.c:46 #, c-format @@ -87,15 +87,15 @@ "ËÏÍÁÎÄÏÀ:\n" "\"%s\"%s" -#: 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 "ÐÅÒÅÇÌÑÄÁÔÉ" @@ -103,6 +103,10 @@ msgid " There is no other panel to compare contents to " msgstr " îÅÍÁ¤ ¦ÎÛϧ ÐÁÎÅ̦ ÄÌÑ ÐÏÒ¦×ÎÑÎÎÑ ×ͦÓÔÕ " +#: gnome/gcmd.c:85 +msgid " Could not start a terminal " +msgstr " îÅ ×ÄÁÌÏÓØ ÚÁÐÕÓÔÉÔÉ ÔÅÒͦÎÁÌ " + #: gnome/gcmd.c:100 msgid "The Midnight Commander Team" msgstr "ëÏÍÁÎÄÁ ÒÏÚÒÏÂÎÉË¦× Midnight Commander" @@ -184,7 +188,7 @@ #. Frame 1 #: gnome/gcmd.c:559 msgid "Preset Commands" -msgstr "" +msgstr "úÁÔÏ×ÁΦ ËÏÍÁÎÄÉ" #. add add/remove buttons in center #: gnome/gcmd.c:576 gnome/gcustom-layout.c:183 @@ -209,7 +213,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 "ðÏËÁÚÁÔÉ ×Ó¦ ÆÁÊÌÉ" @@ -286,8 +290,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 "çÒÕÐÁ" @@ -313,7 +317,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 "÷ÌÁÓÎÉË" @@ -346,28 +350,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:1181 +#: gnome/gdesktop.c:1205 msgid "While running the mount/umount command" msgstr "ðÒÉ ×ÉËÏÎÁÎΦ ËÏÍÁÎÄÉ mount/umount" -#: gnome/gdesktop.c:1250 +#: gnome/gdesktop.c:1274 msgid "While running the eject command" msgstr "ðÒÉ ×ÉËÏÎÁÎΦ ËÏÍÁÎÄÉ eject" -#: 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 "ðÏÍÉÌËÁ" -#: gnome/gdesktop.c:2593 +#: gnome/gdesktop.c:2617 msgid "" "Unable to locate the file:\n" "background-properties-capplet\n" @@ -376,86 +380,86 @@ "We are unable to set the background." msgstr "" -#: gnome/gdesktop.c:2616 gnome/glayout.c:362 +#: gnome/gdesktop.c:2640 gnome/glayout.c:362 msgid "_Terminal" msgstr "ôÅÒͦÎÁÌ" -#: 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 "úÁÐÕÓÔÉÔÉ ÔÅÒͦÎÁÌ × ÐÏÔÏÞÎÏÍÕ ËÁÔÁÌÏÇÕ" #. 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 "ëÁÔÁÌÏÇ..." -#: gnome/gdesktop.c:2618 gnome/glayout.c:366 +#: gnome/gdesktop.c:2642 gnome/glayout.c:366 msgid "Creates a new directory" msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ËÁÔÁÌÏÇ" -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2643 msgid "URL L_ink..." -msgstr "" +msgstr "ðÏÓÉÌÁÎÎÑ ÎÁ URL..." -#: gnome/gdesktop.c:2619 +#: gnome/gdesktop.c:2643 msgid "Creates a new URL link" -msgstr "" +msgstr "óÔ×ÏÒÀ¤ ÎÏ×Å ÐÏÓÉÌÁÎÎÑ ÎÁ URL" -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2644 msgid "_Launcher..." msgstr "úÁÐÕÓËÁÞ..." -#: gnome/gdesktop.c:2620 +#: gnome/gdesktop.c:2644 msgid "Creates a new launcher" msgstr "óÔ×ÏÒÉÔÉ ÎÏ×ÉÊ ÚÁÐÕÓËÁÞ" -#: gnome/gdesktop.c:2626 +#: gnome/gdesktop.c:2650 msgid "By _Name" msgstr "úÁ ÎÁÚ×ÏÀ" -#: gnome/gdesktop.c:2627 +#: gnome/gdesktop.c:2651 msgid "By File _Type" msgstr "úÁ ÔÉÐÏÍ ÆÁÊÌÕ" -#: gnome/gdesktop.c:2628 +#: gnome/gdesktop.c:2652 msgid "By _Size" msgstr "úÁ ÒÏÚͦÒÏÍ" -#: gnome/gdesktop.c:2629 +#: gnome/gdesktop.c:2653 msgid "By Time Last _Accessed" msgstr "úÁ ÞÁÓÏÍ ÏÓÔÁÎÎØÏÇÏ ÄÏÓÔÕÐÕ" -#: gnome/gdesktop.c:2630 +#: gnome/gdesktop.c:2654 msgid "By Time Last _Modified" msgstr "úÁ ÞÁÓÏÍ ÏÓÔÁÎÎØϧ ÍÏÄÉƦËÁæ§" -#: gnome/gdesktop.c:2631 +#: gnome/gdesktop.c:2655 msgid "By Time Last _Changed" msgstr "úÁ ÞÁÓÏÍ ÏÓÔÁÎÎØϧ ÚͦÎÉ" -#: gnome/gdesktop.c:2639 gnome/glayout.c:462 +#: gnome/gdesktop.c:2663 gnome/glayout.c:462 msgid "_Arrange Icons" msgstr "÷ÐÏÒÑÄËÕ×ÁÔÉ Ð¦ËÔÏÇÒÁÍÉ" -#: gnome/gdesktop.c:2640 +#: gnome/gdesktop.c:2664 msgid "Create _New Window" msgstr "óÔ×ÏÒÉÔÉ ÎÏ׊צËÎÏ" -#: gnome/gdesktop.c:2642 gnome/glayout.c:464 +#: gnome/gdesktop.c:2666 gnome/glayout.c:464 msgid "Rescan _Desktop Directory" msgstr "ðÅÒÅÓËÁÎÕ×ÁÔÉ ËÁÔÁÌÏÇ ËÏÒÉÓÔÕ×ÁÞÁ" -#: gnome/gdesktop.c:2643 gnome/glayout.c:465 +#: gnome/gdesktop.c:2667 gnome/glayout.c:465 msgid "Rescan De_vices" msgstr "ðÅÒÅÓËÁÎÕ×ÁÔÉ ÐÒÉÓÔÒϧ" -#: gnome/gdesktop.c:2644 gnome/glayout.c:466 +#: gnome/gdesktop.c:2668 gnome/glayout.c:466 msgid "Recreate Default _Icons" msgstr "" -#: gnome/gdesktop.c:2646 +#: gnome/gdesktop.c:2670 msgid "Configure _Background Image" -msgstr "" +msgstr "óËÏÎƦÇÕÒÕ×ÁÔÉ ÚÏÂÒÁÖÅÎÎÑ ÎÁ Ô̦" #. Icon position #: gnome/gdesktop-prefs.c:242 @@ -549,12 +553,12 @@ msgid "Replace it?" 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 +#: gnome/gdialogs.c:568 gtkedit/editwidget.c:1140 gtkedit/gtkedit.c:1250 +#: src/file.c:802 src/screen.c:2398 src/screen.c:2428 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 "ðÅÒÅÎÅÓÔÉ" @@ -649,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:1834 msgid "Password:" msgstr "ðÁÒÏÌØ:" @@ -670,32 +674,32 @@ msgid "Symbolic link filename:" msgstr "îÁÚ×Á ÓÉÍ×ÏÌØÎÏÇÏ ÐÏÓÉÌÁÎÎÑ:" -#: gnome/gdnd.c:52 +#: gnome/gdnd.c:53 msgid "_Move here" -msgstr "" +msgstr "ðÅÒÅÎÅÓÔÉ ÓÀÄÉ" -#: gnome/gdnd.c:53 +#: gnome/gdnd.c:54 msgid "_Copy here" -msgstr "" +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 @@ -777,7 +781,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 "ëÏЦÀ×ÁÔÉ..." @@ -785,7 +789,7 @@ msgid "Copy files" msgstr "ëÏЦÀ×ÁÔÉ ÆÁÊÌÉ" -#: gnome/glayout.c:390 gnome/gscreen.c:2086 +#: gnome/glayout.c:390 gnome/gscreen.c:2099 msgid "_Delete..." msgstr "_óÔÅÒÔÉ..." @@ -793,7 +797,7 @@ msgid "Delete files" msgstr "óÔÅÒÔÉ ÆÁÊÌÉ" -#: gnome/glayout.c:391 gnome/gscreen.c:2087 +#: gnome/glayout.c:391 gnome/gscreen.c:2100 msgid "_Move..." msgstr "_ðÅÒÅͦÓÔÉÔÉ..." @@ -841,7 +845,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:2085 msgid "Search" msgstr "ðÏÛÕË" @@ -849,7 +853,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 "ðÅÒÅÓËÁÎÕ×ÁÔÉ ËÁÔÁÌÏÇ" @@ -954,284 +958,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 "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ /etc/fstab" -#: 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 "CD-ROM %d" -#: gnome/gmount.c:458 +#: gnome/gmount.c:451 #, c-format msgid "Floppy %d" msgstr "æÌÏЦ %d" -#: gnome/gmount.c:464 +#: gnome/gmount.c:457 #, c-format msgid "Disk %d" msgstr "äÉÓË %d" -#: gnome/gmount.c:469 +#: gnome/gmount.c:462 #, c-format msgid "NFS dir %s" msgstr "NFS-ËÁÔÁÌÏÇ %s" -#: gnome/gmount.c:473 +#: gnome/gmount.c:466 #, c-format msgid "Device %d" msgstr "ðÒÉÓÔÒ¦Ê %d" #. 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 "ôÉÐ ÆÁÊÌÕ: 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 "òÏÚÍ¦Ò ÆÁÊÌÕ: " -#: 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 "URL:" -#: 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 -#: src/screen.c:2397 src/screen.c:2427 +#: gnome/gnome-file-property-dialog.c:413 +#: gnome/gnome-file-property-dialog.c:501 gnome/gpopup2.c:203 +#: src/screen.c:2396 src/screen.c:2426 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:2397 src/screen.c:2427 src/view.c:2081 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 "÷ÓÔÁÎÏ×ÌÅÎÎÑ 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 "÷ÓÔÁÎÏ×ÌÅÎÎÑ 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 "úÁËÒ¦ÐÌÅÎÎÑ" -#: 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 "URL" -#: 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 "" @@ -1277,8 +1282,8 @@ msgid "Copy..." msgstr "ëÏЦÀ×ÁÎÎÑ..." -#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1100 src/screen.c:2402 -#: src/screen.c:2432 +#: gnome/gpopup2.c:208 gtkedit/editwidget.c:1143 src/screen.c:2401 +#: src/screen.c:2431 msgid "Delete" msgstr "óÔÅÒÔÉ" @@ -1318,71 +1323,75 @@ msgid "Use shell patterns instead of regular expressions" msgstr "" -#: 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 "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ×ÉÄÁÌÅÎÎÑ ÆÁÊÌÕ" -#: gnome/gprefs.c:117 +#: gnome/gprefs.c:121 msgid "Confirm when overwriting files" msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ÚÁͦÝÅÎÎÑ ÆÁÊÌÕ" -#: gnome/gprefs.c:121 +#: gnome/gprefs.c:125 msgid "Confirm when executing files" msgstr "ð¦ÄÔ×ÅÒÄÖÅÎÎÑ ÎÁ ×ÉËÏÎÁÎÎÑ ÆÁÊÌÕ" -#: gnome/gprefs.c:125 +#: 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 "ðÁÒÏÌØ ÄÌÑ ÁÎÏΦÍÎÏÇÏ FTP:" -#: gnome/gprefs.c:142 +#: gnome/gprefs.c:146 msgid "Always use FTP proxy" msgstr "úÁ×ÖÄÉ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ FTP-ÐÒÏËÓ¦" -#: 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 "õÓÔÁÎÏ×ËÉ" @@ -1426,108 +1435,108 @@ 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 "ðÏÛÕË: %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 "÷×ÅÒÈ" +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 -#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:116 +#: src/wtools.c:289 src/wtools.c:563 vfs/smbfs.c:117 msgid "&Ok" msgstr "&çÁÒÁÚÄ" @@ -1536,12 +1545,12 @@ msgid "Offset 0x%08lx" msgstr "úͦÝÅÎÎÑ 0x%08lx" -#: gnome/gview.c:138 src/view.c:730 +#: gnome/gview.c:138 src/view.c:732 #, c-format msgid "Col %d" msgstr "óÔÏ×ÐÞÉË %d" -#: gnome/gview.c:142 src/view.c:734 +#: gnome/gview.c:142 src/view.c:736 #, c-format msgid "%s bytes" msgstr "%s ÂÁÊÔ" @@ -1631,56 +1640,81 @@ 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 "" +msgstr "ðÅÒÅÓËÁÎÕ×ÁÔÉ Ð¦ËÔÏÇÒÁÍÉ ÐÒÉÓÔÒÏ§× ÎÁ ÒÏÂÏÞÏÍÕ ÓÔÏ̦" + +#: gnome/gmc-client.c:214 +msgid "Arrange the desktop icons" +msgstr "÷ÐÏÒÑÄËÕ×ÁÔÉ Ð¦ËÔÏÇÒÁÍÉ ÎÁ ÒÏÂÏÞÏÍÕ ÓÔÏ̦" -#: gnome/gmc-client.c:179 +#: 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/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 "" +msgstr " ðÏÍÉÌËÁ ÐÒÉ ÓÐÒϦ צÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÚÞÉÔÕ×ÁÎÎÑ: " + +#: 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:241 +#: 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. " @@ -1688,144 +1722,148 @@ " \n" " ú¦ÌØÛ¦ÔØ ÚÎÁÞÅÎÎÑ edit.h:MAXBUF ÔÁ ÐÅÒÅËÏÍЦÌÀÊÔÅ ÒÅÄÁËÔÏÒ. " -#: gtkedit/edit.c:311 gtkedit/edit.c:347 -msgid " Error allocating memory " -msgstr "" +#: gtkedit/editcmd.c:298 +msgid " Error writing to pipe: " +msgstr " ðÏÍÉÌËÁ ÚÁÐÉÓÕ × ËÁÎÁÌ: " + +#: gtkedit/editcmd.c:304 +msgid " Failed trying to open pipe for writing: " +msgstr " ðÏÍÉÌËÁ ÎÁ ÓÐÒϦ צÄËÒÉÔÉ ÆÁÊÌ ÄÌÑ ÚÁÐÉÓÕ: " -#: gtkedit/editcmd.c:334 +#: 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 -#: vfs/smbfs.c:116 +#: src/view.c:406 src/wtools.c:111 src/wtools.c:386 src/wtools.c:561 +#: vfs/smbfs.c:117 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 -#: 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 +#: 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:2128 +#: src/screen.c:2178 src/subshell.c:705 src/subshell.c:731 src/utilunix.c:382 +#: src/utilunix.c:386 src/utilunix.c:406 src/utilunix.c:457 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 "ËÌÁצÛÁ '%d 0': " -#: 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:2077 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. " @@ -1833,238 +1871,252 @@ " ðÏÔÏÞÎÉÊ ÔÅËÓÔ ÂÕÌÏ ÍÏÄÉƦËÏ×ÁÎÏ ¦ ÎÅ ÚÂÅÒÅÖÅÎÏ. \n" " ðÒÏÄÏ×ÖÅÎÎÑ ÐÒÉÚ×ÅÄÅ ÄÏ ×ÔÒÁÔÉ ÃÉÈ ÚͦÎ. " -#: 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 "÷ÉÒÁÚ &scanf" -#: 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 " ÷×ÅĦÔØ ÐÏÒÑÄÏË ÁÒÇÕÍÅÎÔ¦× ÚÁͦÎÉ, ÎÁÐÒ. 3,2,1,4 " -#: 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:2000 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:1528 +#: src/view.c:1627 src/view.c:1750 src/view.c:1968 src/view.c:2000 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 " ÷ÉÒÁÚ scanf " #. 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 "òÏÚÐÏÞÁÔÉ ÐÏÛÕË, Enter" -#. Tool hint -#: gtkedit/editcmd.c:1451 +#: gtkedit/editcmd.c:1507 msgid "Abort this dialog, Esc" msgstr "÷¦ÄͦÎÉÔÉ Ä¦À, Esc" -#: 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 " %ld ÚÁͦΠÚÒÏÂÌÅÎÏ. " -#: 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? " @@ -2072,137 +2124,137 @@ " ðÏÔÏÞÎÉÊ ÔÅËÓÔ ÂÕÌÏ ÚͦÎÅÎÏ ¦ ÎÅ ÚÂÅÒÅÖÅÎÏ. \n" " úÂÅÒÅÇÔÉ ÂÅÒÅÚ ×ÉÈÏÄÏÍ? " -#: 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:406 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:406 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:1915 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 " ÷×ÅĦÔØ ÐÁÒÁÍÅÔÒÉ sort ÒÏÚĦÌÅΦ ÐÒÏÐÕÓËÁÍÉ: " -#: 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 " ðÏÍÉÌËÁ ÎÁ ÓÐÒϦ ×ÉËÏÎÁÔÉ ËÏÍÁÎÄÕ sort" #. 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 " mail -s <ÚÁÇÏÌÏ×ÏË> -c <ËÏЦ§> <ÄÏ>" @@ -2237,341 +2289,349 @@ "ôÅËÓÔÏ×ÉÊ ÒÅÄÁËÔÏÒ Ú ÄÒÕÖÎ¦Í ¦ÎÔÅÒÆÅÊÓÏÍ ËÏÒÉÓÔÕ×ÁÞÁ.\n" " óÔ×ÏÒÅÎÏ ÄÌÑ 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 "&úÁ×ÁÎÔÁÖÉÔÉ... C-o" -#: gtkedit/editmenu.c:124 +#: gtkedit/editmenu.c:125 msgid "&New C-n" msgstr "&îÏ×ÉÊ C-n" -#: gtkedit/editmenu.c:126 gtkedit/editmenu.c:142 +#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 msgid "&Save F2" msgstr "ú&ÂÅÒÅÔÉ F2" -#: gtkedit/editmenu.c:127 gtkedit/editmenu.c:143 +#: gtkedit/editmenu.c:128 gtkedit/editmenu.c:144 msgid "save &As... F12" msgstr "úÂÅÒÅÇÔÉ &ÑË... F12" -#: gtkedit/editmenu.c:129 gtkedit/editmenu.c:145 +#: gtkedit/editmenu.c:130 gtkedit/editmenu.c:146 msgid "&Insert file... F15" msgstr "&÷ÓÔÁ×ÉÔÉ ÆÁÊÌ... F15" -#: gtkedit/editmenu.c:130 +#: gtkedit/editmenu.c:131 msgid "copy to &File... C-f" msgstr "óËÏЦÀ×ÁÔÉ Õ ÆÁÊÌ... C-f" -#: 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 "&÷ÉÊÔÉ F10" -#: 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 "&óËÏЦÀ×ÁÔÉ F5" -#: gtkedit/editmenu.c:161 gtkedit/editmenu.c:178 +#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 msgid "&Move F6" msgstr "ðÅÒÅ&ÎÅÓÔÉ F6" -#: gtkedit/editmenu.c:162 gtkedit/editmenu.c:179 +#: gtkedit/editmenu.c:163 gtkedit/editmenu.c:180 msgid "&Delete F8" msgstr "&óÔÅÒÔÉ F8" -#: gtkedit/editmenu.c:164 gtkedit/editmenu.c:181 +#: gtkedit/editmenu.c:165 gtkedit/editmenu.c:182 msgid "&Undo C-u" msgstr "÷¦Ä&ËÁÔ C-u" -#: gtkedit/editmenu.c:166 gtkedit/editmenu.c:183 +#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 msgid "&Beginning C-PgUp" msgstr "îÁ &ÐÏÞÁÔÏË C-PgUp" -#: gtkedit/editmenu.c:167 gtkedit/editmenu.c:184 +#: gtkedit/editmenu.c:168 gtkedit/editmenu.c:185 msgid "&End C-PgDn" msgstr "îÁ &˦ÎÅÃØ C-PgDn" -#: gtkedit/editmenu.c:189 gtkedit/editmenu.c:196 +#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 msgid "&Search... F7" msgstr "&ûÕËÁÔÉ... F7" -#: gtkedit/editmenu.c:190 gtkedit/editmenu.c:197 +#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 msgid "search &Again F17" msgstr "ûÕËÁÔÉ &ÚÎÏ×Õ F17" -#: gtkedit/editmenu.c:191 gtkedit/editmenu.c:198 +#: gtkedit/editmenu.c:192 gtkedit/editmenu.c:199 msgid "&Replace... F4" msgstr "&úÁͦÎÉÔÉ... F4" -#: gtkedit/editmenu.c:203 gtkedit/editmenu.c:225 +#: gtkedit/editmenu.c:204 gtkedit/editmenu.c:227 msgid "&Goto line... M-l" msgstr "&ðÅÒÅÊÔÉ ÎÁ ÒÑÄÏË 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 "÷ÓÔÁ×ÉÔÉ &̦ÔÅÒÁÌ... C-q" -#: gtkedit/editmenu.c:207 gtkedit/editmenu.c:229 +#: gtkedit/editmenu.c:209 gtkedit/editmenu.c:232 msgid "&Refresh screen C-l" msgstr "&ðÏÎÏ×ÉÔÉ ÅËÒÁÎ 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 "&òÏÚÐÏÞÁÔÉ ÚÁÐÉÓ ÍÁËÒÏÓÕ 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 "&úÁ×ÅÒÛÉÔÉ ÚÁÐÉÓ ÍÁËÒÏÓÕ... C-r" -#: gtkedit/editmenu.c:211 +#: gtkedit/editmenu.c:213 msgid "&Execute macro... C-a, KEY" msgstr "&÷ÉËÏÎÁÔÉ ÍÁËÒÏÓ... C-a, KÌÁצÛÁ" -#: 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 "÷¦ÄÆÏÒÍÁÔÕ×ÁÔÉ &ÐÁÒÁÇÒÁÆ M-p" -#: 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 "&óÏÒÔÕ×ÁÔÉ 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 æÏÒÍÁÔÕ×ÁÌØÎÉË F19" -#: 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 "÷¦ÄËÒÉÔÉ...\tC-o" -#: gtkedit/editmenu.c:398 +#: gtkedit/editmenu.c:401 msgid "New\tC-n" msgstr "îÏ×ÉÊ\tC-n" -#: gtkedit/editmenu.c:400 +#: gtkedit/editmenu.c:403 msgid "Save\tF2" msgstr "úÂÅÒÅÇÔÉ\tF2" -#: gtkedit/editmenu.c:401 +#: gtkedit/editmenu.c:404 msgid "Save as...\tF12" msgstr "úÂÅÒÅÇÔÉ ÑË...\tF12" -#: gtkedit/editmenu.c:403 +#: gtkedit/editmenu.c:406 msgid "Insert file...\tF15" msgstr "÷ÓÔÁ×ÉÔÉ ÆÁÊÌ...\tF15" -#: gtkedit/editmenu.c:404 +#: gtkedit/editmenu.c:407 msgid "Copy to file...\tC-f" msgstr "óËÏЦÀ×ÁÔÉ Õ ÆÁÊÌ...\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 "" -#: 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 "óËÏЦÀ×ÁÔÉ ÂÌÏË\tF5" -#: gtkedit/editmenu.c:424 +#: gtkedit/editmenu.c:427 msgid "Move block to cursor\tF6" msgstr "ðÅÒÅÎÅÓÔÉ ÂÌÏË\tF6" -#: gtkedit/editmenu.c:425 +#: gtkedit/editmenu.c:428 msgid "Delete block\tF8/C-Del" msgstr "óÔÅÒÔÉ ÂÌÏË\tF8/C-Del" -#: gtkedit/editmenu.c:427 +#: gtkedit/editmenu.c:430 msgid "Copy block to clipbrd\tC-Ins" msgstr "óËÏЦÀ×ÁÔÉ ÂÌÏË Õ ÂÕÆÅÒ ÏÂͦÎÕ\tC-Ins" -#: gtkedit/editmenu.c:428 +#: gtkedit/editmenu.c:431 msgid "Cut block to clipbrd\tS-Del" msgstr "÷ÉÒ¦ÚÁÔÉ ÂÌÏË Õ ÂÕÆÅÒ ÏÂͦÎÕ\tS-Del" -#: gtkedit/editmenu.c:429 +#: gtkedit/editmenu.c:432 msgid "Paste block from clipbrd\tS-Ins" msgstr "÷ÓÔÁ×ÉÔÉ ÂÌÏË Ú ÂÕÆÅÒÕ ÏÂͦÎÕ\tS-Ins" -#: 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 "ûÕËÁÔÉ...\tF7" -#: gtkedit/editmenu.c:442 +#: gtkedit/editmenu.c:445 msgid "Search again\tF17" msgstr "ûÕËÁÔÉ ÚÎÏ×Õ\tF17" -#: gtkedit/editmenu.c:443 +#: gtkedit/editmenu.c:446 msgid "Replace...\tF4" msgstr "úÁͦÎÉÔÉ...\tF4" -#: gtkedit/editmenu.c:444 +#: gtkedit/editmenu.c:447 msgid "Replace again\tF14" msgstr "úÁͦÎÉÔÉ ÚÎÏ×Õ\tF14" #. 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 "ðÅÒÅÊÔÉ ÎÁ ÒÑÄÏË...\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 "òÏÚÐÏÞÁÔÉ ÚÁÐÉÓ ÍÁËÒÏÓÕ\tC-r" -#: gtkedit/editmenu.c:456 +#: gtkedit/editmenu.c:460 msgid "Finish record macro...\tC-r" msgstr "úÁ×ÅÒÛÉÔÉ ÚÁÐÉÓ ÍÁËÒÏÓÕ...\tC-r" -#: gtkedit/editmenu.c:457 +#: gtkedit/editmenu.c:461 msgid "Execute macro...\tC-a, KEY" msgstr "÷ÉËÏÎÁÔÉ ÍÁËÒÏÓ...\tC-a, ëÌÁצÛÁ" -#: gtkedit/editmenu.c:458 +#: gtkedit/editmenu.c:462 msgid "Delete macro...\t" msgstr "÷ÉÄÁÌÉÔÉ ÍÁËÒÏÓ..\t" -#: gtkedit/editmenu.c:460 +#: gtkedit/editmenu.c:464 msgid "Insert date/time\tC-d" msgstr "÷ÓÔÁ×ÉÔÉ ÄÁÔÕ/ÞÁÓ\tC-d" -#: gtkedit/editmenu.c:461 +#: gtkedit/editmenu.c:465 msgid "Format paragraph\tM-p" msgstr "æÏÒÍÁÔÕ×ÁÔÉ ÐÁÒÁÇÒÁÆ\tM-p" -#: gtkedit/editmenu.c:463 +#: gtkedit/editmenu.c:467 msgid "Refresh display\tC-l" msgstr "ïÎÏ×ÉÔÉ ÚÏÂÒÁÖÅÎÎÑ\tC-l" #. Tool hint -#: gtkedit/editmenu.c:466 +#: gtkedit/editmenu.c:470 msgid "Macros and internal commands" msgstr "íÁËÒÏÓÉ ÔÁ ×ÎÕÔÒ¦ÛΦ ËÏÍÁÎÄÉ" @@ -2596,84 +2656,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 "ðÏÍÉÌËÁ ¦Î¦Ã¦Á̦ÚÁæ§ ÒÅÄÁËÔÏÒÁ.\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:2394 src/screen.c:2424 src/tree.c:1008 +#: src/view.c:2070 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 "íÅÎÀMC" #. 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:2072 src/view.c:2094 msgid "Quit" msgstr "÷ÉȦÄ" @@ -2738,7 +2798,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:2395 src/screen.c:2425 msgid "Menu" msgstr "íÅÎÀ" @@ -2774,58 +2834,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 " ðÏÍÉÌËÁ Õ ÆÁÊ̦ %s × ÒÑÄËÕ %d " @@ -3422,54 +3482,54 @@ msgid " Enter machine name (F1 for details): " msgstr " ÷×ÅĦÔØ ÎÁÚ×Õ ÍÁÛÉÎÉ (F1 - ÐÏÄÒÏÂÉæ): " -#: src/cmd.c:1360 +#: src/cmd.c:1363 #, c-format msgid " Could not chdir to %s " msgstr " îÅÍÏÖÌÉ×Ï ÐÅÒÅÊÔÉ × ËÁÔÁÌÏÇ %s " -#: src/cmd.c:1367 +#: src/cmd.c:1370 src/widget.c:1163 msgid " Link to a remote machine " msgstr " ú×'ÑÚÏË ¦Ú צÄÄÁÌÅÎÏÀ ÍÁÛÉÎÏÀ " -#: src/cmd.c:1373 +#: src/cmd.c:1376 src/widget.c:1164 msgid " FTP to machine " msgstr " FTP-Ú×'ÑÚÏË ¦Ú ÍÁÛÉÎÏÀ " -#: src/cmd.c:1379 +#: src/cmd.c:1382 src/widget.c:1165 msgid " SMB link to machine " msgstr " SMB-Ú×'ÑÚÏË ¦Ú ÍÁÛÉÎÏÀ " -#: 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:1401 msgid " Host name " msgstr " îÁÚ×Á ÈÏÓÔÁ " -#: src/cmd.c:1397 +#: src/cmd.c:1401 msgid " Error while looking up IP address " msgstr "" -#: src/cmd.c:1408 +#: src/cmd.c:1412 msgid " Undelete files on an ext2 file system " msgstr " ÷¦ÄÎÏ×ÌÅÎÎÑ ÆÁÊÌ¦× ÎÁ ÆÁÊÌÏ×¦Ê ÓÉÓÔÅͦ ext2" -#: src/cmd.c:1409 +#: src/cmd.c:1413 msgid "" " Enter device (without /dev/) to undelete\n" " files on: (F1 for details)" msgstr "" -#: src/cmd.c:1459 +#: src/cmd.c:1463 msgid " Setup saved to ~/" msgstr " õÓÔÁÎÏ×ËÉ ÚÂÅÒÅÖÅÎÏ × ~/" -#: src/cmd.c:1464 +#: src/cmd.c:1468 msgid " Setup " msgstr " õÓÔÁÎÏ×ËÉ " @@ -3619,6 +3679,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 "XView" + +#: src/features.inc:13 +msgid "Tk" +msgstr "Tk" + +#: 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 "÷¦ÒÔÕÁÌØÎÁ æÁÊÌÏ×Á óÉÓÔÅÍÁ: tarfs, extfs" + +#: src/features.inc:26 +msgid ", ftpfs" +msgstr ", ftpfs" + +#: src/features.inc:28 +msgid " (proxies: hsc proxy)" +msgstr " (ÐÒÏËÓ¦: hsc-ÐÒÏËÓ¦)" + +#: src/features.inc:30 +msgid ", mcfs" +msgstr ", mcfs" + +#: src/features.inc:32 +msgid " (with termnet support)" +msgstr " (Ú Ð¦ÄÔÒÉÍËÏÀ termnet)" + +#: src/features.inc:35 +msgid ", smbfs" +msgstr ", smbfs" + +#: src/features.inc:39 +msgid ", undelfs" +msgstr ", undelfs" + +#: src/features.inc:45 +msgid "With builtin Editor\n" +msgstr "ú ×ÌÁÄÎÁÎÉÍ ÒÅÄÁËÔÏÒÏÍ\n" + +#: 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 "ú ЦÄÔÒÉÍËÏÀ ÏÐÅÒÁÃ¦Ê ÎÁ Ô̦\n" + #: src/file.c:154 src/tree.c:639 msgid " Copy " msgstr " ëÏЦÀ×ÁÎÎÑ " @@ -3685,6 +3849,8 @@ " Cannot create special file \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ ÓÐÅæÁÌØÎÉÊ ÆÁÊÌ \"%s\" \n" +" %s " #: src/file.c:583 src/file.c:812 #, c-format @@ -3692,6 +3858,8 @@ " Cannot chown target file \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ×ÌÁÓÎÉËÁ æÌØÏ×ÏÇÏ ÆÁÊÌÕ \"%s\" \n" +" %s " #: src/file.c:592 src/file.c:831 #, c-format @@ -3699,6 +3867,8 @@ " Cannot chmod target file \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ÐÒÁ×Á ÄÏÓÔÕÐÕ ÄÏ Ã¦ÌØÏ×ÏÇÏ ÆÁÊÌÕ \"%s\" \n" +" %s " #: src/file.c:609 #, c-format @@ -3724,6 +3894,8 @@ " Cannot create target file \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÓÔ×ÏÒÉÔÉ Ã¦ÌØÏ×ÉÊ ÆÁÊÌ \"%s\" \n" +" %s " #: src/file.c:665 #, c-format @@ -3834,7 +4006,7 @@ #: src/file.c:1129 #, c-format msgid " Cannot overwrite directory `%s' " -msgstr "" +msgstr " îÅÍÏÖÌÉ×Ï ÐÅÒÅÐÉÓÁÔÉ ËÁÔÁÌÏÇ \"%s\" " #: src/file.c:1172 #, c-format @@ -3842,6 +4014,8 @@ " Cannot move file \"%s\" to \"%s\" \n" " %s " msgstr "" +" îÅÍÏÖÌÉ×Ï ÐÅÒÅÎÅÓÔÉ ÆÁÊÌ \"%s\" Õ \"%s\" \n" +" %s " #: src/file.c:1192 #, c-format @@ -3939,7 +4113,7 @@ msgid "%o %d %f%e" msgstr "%o æ %f (%d ÛÔ) %e" -#: src/file.c:1703 +#: src/file.c:1703 vfs/fish.c:509 msgid "file" msgstr "ÆÁÊÌ" @@ -3967,11 +4141,11 @@ msgid " Can't operate on \"..\"! " msgstr "" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "Yes" msgstr "ôÁË" -#: src/file.c:1875 src/screen.c:2117 +#: src/file.c:1875 src/screen.c:2118 msgid "No" msgstr "î¦" @@ -3981,11 +4155,11 @@ #: src/file.c:2014 src/file.c:2098 msgid " Internal failure " -msgstr "" +msgstr " ÷ÎÕÔÒ¦ÛÎ¦Ê ÚÂ¦Ê " #: src/file.c:2014 src/file.c:2098 msgid " Unknown file operation " -msgstr "" +msgstr " îÅצÄÏÍÁ ÆÁÊÌÏ×Á ÏÐÅÒÁÃ¦Ñ " #: src/file.c:2029 #, c-format @@ -3993,6 +4167,8 @@ " Destination \"%s\" must be a directory \n" " %s " msgstr "" +" í¦ÓÃÅ ÐÒÉÚÁÞÅÎÎÑ \"%s\" ÍÕÓÉÔØ ÂÕÔÉ ËÁÔÁÌÏÇÏÍ \n" +" %s " #: src/file.c:2190 msgid "&Retry" @@ -4166,7 +4342,7 @@ #: src/find.c:132 msgid "&Chdir" -msgstr "" +msgstr "&Chdir" #: src/find.c:133 msgid "&Again" @@ -4178,7 +4354,7 @@ #: src/find.c:135 src/panelize.c:89 msgid "Pane&lize" -msgstr "" +msgstr "ðÁÎÅ&̦ÚÕ×ÁÔÉ" #: src/find.c:136 msgid "&View - F3" @@ -4200,7 +4376,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 "&äÅÒÅ×Ï" @@ -4225,7 +4401,7 @@ msgid "Finished" msgstr "úÁ×ÅÒÛÅÎÏ" -#: src/find.c:561 src/view.c:1526 +#: src/find.c:561 src/view.c:1528 #, c-format msgid "Searching %s" msgstr "ðÏÛÕË %s" @@ -4324,11 +4500,11 @@ #: 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" @@ -4348,7 +4524,7 @@ #: src/hotlist.c:139 msgid "&Up" -msgstr "" +msgstr "÷ÇÏÒ&Õ" #: src/hotlist.c:140 msgid "&Add current" @@ -4389,7 +4565,7 @@ #: src/hotlist.c:892 msgid "Directory label" -msgstr "í¦ÔËÁ ËÁÔÁÌÏÇÕ" +msgstr "ðÏÚÎÁÞËÁ ËÁÔÁÌÏÇÕ" #: src/hotlist.c:892 msgid "Directory path" @@ -4406,7 +4582,7 @@ #: src/hotlist.c:988 #, c-format msgid "Label for \"%s\":" -msgstr "í¦ÔËÁ ÄÏ \"%s\":" +msgstr "ðÏÚÎÁÞËÁ ÄÏ \"%s\":" #: src/hotlist.c:992 msgid " Add to hotlist " @@ -4756,7 +4932,7 @@ msgid "key, or click with the mouse to define it. Move around with Tab." msgstr "×ÉÂÅÒ¦ÔØ §§ ÚÁ ÄÏÐÏÍÏÇÏÀ 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" @@ -4768,263 +4944,263 @@ " ËÁÔÁÌÏÇ ÞÉ ÄÁÌÉ ÓϦ ÄÏÄÁÔËÏצ ÐÒÁ×Á ÄÏÓÔÕÐÕ ÚÁ \n" " ÄÏÐÏÍÏÇÏÀ ËÏÍÁÎÄÉ \"su\"? " -#: 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:2116 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 " ÷É ÓÐÒÁ×Ħ ÈÏÞÅÔÅ ×ÉÊÔÉ Ú Midnight Commander? " -#: 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 "&û×ÉÄËÉÊ ÐÅÒÅÇÌÑÄ 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 "&¶ÎÆÏÒÍÁÃ¦Ñ C-x i" -#: 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 "&FTP-Ú×'ÑÚÏË..." -#: src/main.c:1253 src/main.c:1277 +#: src/main.c:1255 src/main.c:1279 msgid "SM&B link..." msgstr "&SMB-Ú×'ÑÚÏË..." -#: src/main.c:1258 src/main.c:1282 +#: src/main.c:1260 src/main.c:1284 msgid "&Drive... M-d" msgstr "&ðÒÉÓÔÒ¦Ê... M-d" -#: src/main.c:1260 src/main.c:1284 +#: src/main.c:1262 src/main.c:1286 msgid "&Rescan C-r" msgstr "&ðÅÒÅÓËÁÎÕ×ÁÔÉ C-r" -#: src/main.c:1288 +#: src/main.c:1290 msgid "&User menu F2" msgstr "íÅÎÀ &ËÏÒÉÓÔÕ×ÁÞÁ F2" -#: src/main.c:1289 +#: src/main.c:1291 msgid "&View F3" msgstr "&ðÅÒÅÇÌÑÎÕÔÉ F3" -#: 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 "&æ¦ÌØÔÒÏ×ÁÎÉÊ ÐÅÒÅÇÌÑÄ M-!" -#: src/main.c:1292 +#: src/main.c:1294 msgid "&Edit F4" msgstr "&òÅÄÁÇÕ×ÁÔÉ F4" -#: src/main.c:1293 +#: src/main.c:1295 msgid "&Copy F5" msgstr "&óËÏЦÀ×ÁÔÉ F5" -#: src/main.c:1294 +#: src/main.c:1296 msgid "c&Hmod C-x c" msgstr "úͦÎÁ &ÐÒÁ× C-x c" -#: src/main.c:1296 +#: src/main.c:1298 msgid "&Link C-x l" msgstr "&ðÏÓÉÌÁÎÎÑ C-x l" -#: src/main.c:1297 +#: src/main.c:1299 msgid "&SymLink C-x s" msgstr "&óÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ C-x s" -#: src/main.c:1298 +#: src/main.c:1300 msgid "edit s&Ymlink C-x C-s" msgstr "&úͦÎÉÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ C-x C-s" -#: src/main.c:1299 +#: src/main.c:1301 msgid "ch&Own C-x o" msgstr "úͦÎÉÔÉ ×ÌÁÓÎÉËÁ C-x o" -#: 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 "&ðÅÒÅÊÍÅÎÕ×ÁÔÉ/ðÅÒÅÎÅÓÔÉ F6" -#: src/main.c:1303 +#: src/main.c:1305 msgid "&Mkdir F7" msgstr "&óÔ×ÏÒÉÔÉ ËÁÌÏÇ F7" -#: src/main.c:1304 +#: src/main.c:1306 msgid "&Delete F8" msgstr "&óÔÅÒÔÉ F8" -#: src/main.c:1305 +#: src/main.c:1307 msgid "&Quick cd M-c" msgstr "&û×ÉÄËÁ ÚͦÎÁ ËÁÌÏÇÕ M-c" -#: src/main.c:1307 +#: src/main.c:1309 msgid "select &Group M-+" msgstr "÷ÉÂÒÁÔÉ &ÇÒÕÐÕ M-+" -#: src/main.c:1308 +#: src/main.c:1310 msgid "u&Nselect group M-\\" msgstr "&úÎÑÔÉ ×ÉÂ¦Ò Ú ÇÒÕÐÉ M-\\" -#: src/main.c:1309 +#: src/main.c:1311 msgid "reverse selec&Tion M-*" msgstr "&¶Î×ÅÒÔÕ×ÁÔÉ ×ÉÂ¦Ò M-*" -#: src/main.c:1311 +#: src/main.c:1313 msgid "e&Xit F10" msgstr "úÁ×ÅÒÛÉÔÉ F10" -#: 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 "&ûÕËÁÔÉ ÆÁÊÌ M-?" -#: src/main.c:1324 +#: src/main.c:1326 msgid "s&Wap panels C-u" msgstr "&ïÂͦÎÑÔÉ ÐÁÎÅ̦ C-u" -#: src/main.c:1325 +#: src/main.c:1327 msgid "switch &Panels on/off C-o" msgstr "÷×ÍË/×ÉÍË &ÐÁÎÅ̦ C-o" -#: src/main.c:1326 +#: src/main.c:1328 msgid "&Compare directories C-x d" msgstr "&ðÏÒ¦×ÎÑÔÉ ËÁÔÁÌÏÇÉ C-x d" -#: 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 "&ð¦ÄÒÕÞΦ ËÁÔÁÌÏÇÉ C-\\" -#: src/main.c:1333 +#: src/main.c:1335 msgid "&Active VFS list C-x a" msgstr "óÐÉÓÏË ÁËÔÉ×ÎÉÈ &÷æó C-x a" -#: 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 "úÁ×ÄÁÎÎÑ ÎÁ &Ô̦ C-x j" -#: src/main.c:1341 +#: src/main.c:1343 msgid "&Undelete files (ext2fs only)" msgstr "&÷¦ÄÎÏ×ÌÅÎÎÑ ÆÁÊÌ¦× (ÌÉÛÅ ext2fs)" -#: 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" @@ -5032,7 +5208,7 @@ " the details. " msgstr "" -#: src/main.c:1925 +#: src/main.c:1927 msgid "Thank you for using GNU Midnight Commander" msgstr "äÑËÕ¤ÍÏ ×ÁÍ ÚÁ ×ÉËÏÒÉÓÔÁÎÎÑ GNU Midnight Commander" @@ -5049,124 +5225,241 @@ msgid "The TERM environment variable is unset!\n" msgstr "úͦÎÎÕ ÓÅÒÅÄÏ×ÉÝÁ TERM ÎÅ ×ÓÔÁÎÏ×ÌÅÎÏ!\n" -#: 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 "" "ðÁÒÁÍÅÔÒ -m ÚÁÓÔÁÒ¦×. ðÏÄÉצÔØÓÑ Õ ÷¦ÄÏÂÒÁÖÅÎÎÑ Â¦Ô¦×... × ÍÅÎÀ ðÁÒÁÍÅÔÒÉ\n" -#: 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 "öÕÒÎÁÌÀ×ÁÔÉ Ä¦ÁÌÏÇ Ú ftp Õ ×ËÁÚÁÎÉÊ ÆÁÊÌ" -#: 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 "óÐÒÏÂÕ×ÁÔÉ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ termcap ÚÁͦÓÔØ terminfo" -#: 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 "" +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" @@ -5334,6 +5627,14 @@ msgid "Display brief usage message" msgstr "ðÏËÁÚÁÔÉ ËÏÒÏÔËÕ ÄÏצÄËÕ ÐÒÏ ×ÉËÏÒÉÓÔÁÎÎÑ" +#: src/screen.c:227 +msgid "SUB-DIR" +msgstr "ëáôáìïç" + +#: src/screen.c:227 +msgid "UP--DIR" +msgstr "÷çïòõ " + #: src/screen.c:417 msgid "MTime" msgstr "þÁÓí" @@ -5379,29 +5680,29 @@ msgid "User suplied format looks invalid, reverting to default." msgstr "" -#: src/screen.c:2116 src/screen.c:2164 +#: src/screen.c:2117 src/screen.c:2164 msgid " Do you really want to execute? " msgstr " ÷É ÓÐÒÁ×Ħ ÈÏÞÅÔÅ ×ÉËÏÎÁÔÉ? " -#: src/screen.c:2129 src/screen.c:2179 +#: src/screen.c:2128 src/screen.c:2178 msgid " No action taken " msgstr "" -#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1016 +#: src/screen.c:2399 src/screen.c:2429 src/tree.c:1016 msgid "RenMov" msgstr "ðÅÒÅÍ" -#: src/screen.c:2401 src/screen.c:2431 src/tree.c:1020 +#: src/screen.c:2400 src/screen.c:2430 src/tree.c:1020 msgid "Mkdir" msgstr "óÔ×ëÁÔ" -#: src/screen.c:2417 +#: src/screen.c:2416 src/tree.c:866 #, c-format msgid "" -" Can't chdir to %s \n" +" Can't chdir to \"%s\" \n" " %s " msgstr "" -" îÅÍÏÖÌÉ×Ï ÐÅÒÅÊÔÉ × ËÁÔÁÌÏÇ %s \n" +" îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ËÁÔÁÌÏÇ ÎÁ \"%s\" \n" " %s " #: src/subshell.c:287 @@ -5469,22 +5770,13 @@ msgid "Dynamc" msgstr "" -#: src/tree.c:866 -#, c-format -msgid "" -" Can't chdir to \"%s\" \n" -" %s " -msgstr "" -" îÅÍÏÖÌÉ×Ï ÚͦÎÉÔÉ ËÁÔÁÌÏÇ ÎÁ \"%s\" \n" -" %s " - #: src/tree.c:1012 msgid "Forget" msgstr "" #: src/tree.c:1025 msgid "Rmdir" -msgstr "" +msgstr "Rmdir" #: src/treestore.c:360 #, c-format @@ -5556,15 +5848,15 @@ msgid "%b %e %Y" msgstr "%b %e %Y" -#: src/utilunix.c:390 +#: src/utilunix.c:382 msgid " Pipe failed " msgstr "" -#: src/utilunix.c:394 +#: src/utilunix.c:386 msgid " Dup failed " msgstr "" -#: src/view.c:401 +#: src/view.c:403 msgid "" "File: \n" "\n" @@ -5574,7 +5866,7 @@ "\n" " " -#: src/view.c:402 +#: src/view.c:404 msgid "" "\n" "\n" @@ -5584,37 +5876,37 @@ "\n" "ÂÕÌÏ ÚͦÎÅÎÏ, ÈÏÞÅÔÅ ÚÂÅÒÅÇÔÉ ÚͦÎÉ?\n" -#: src/view.c:404 +#: src/view.c:406 msgid " Save changes " msgstr " úÂÅÒÅÇÔÉ ÚͦÎÉ " -#: src/view.c:446 +#: src/view.c:448 msgid " Can't spawn child program " msgstr "" -#: src/view.c:455 +#: src/view.c:457 msgid " Empty output from child filter " msgstr " ðÕÓÔÉÊ ×É×¦Ä Ú Æ¦ÌØÔÒÕ " -#: src/view.c:460 +#: src/view.c:462 msgid " Could not open file " msgstr " îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ " -#: src/view.c:475 +#: src/view.c:477 msgid " Can't open file \"" msgstr " îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÆÁÊÌ \"" -#: src/view.c:482 +#: src/view.c:484 msgid "" " Can't stat file \n" " " msgstr "" -#: src/view.c:488 +#: src/view.c:490 msgid " Can't view: not a regular file " msgstr " îÅÍÏÖÌÉ×Ï ÐÏËÁÚÁÔÉ: ÎÅ Ú×ÉÞÁÊÎÉÊ ÆÁÊÌ " -#: src/view.c:569 +#: src/view.c:571 #, c-format msgid "" " Can't open \"%s\"\n" @@ -5623,41 +5915,41 @@ " îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ \"%s\"\n" " %s " -#: src/view.c:578 +#: src/view.c:580 #, c-format msgid "" " Can't stat \"%s\"\n" " %s " msgstr "" -#: src/view.c:714 +#: src/view.c:716 #, c-format msgid "File: %s" msgstr "æÁÊÌ: %s" -#: src/view.c:728 +#: src/view.c:730 #, c-format msgid "Offset 0x%08x" msgstr "úͦÝÅÎÎÑ 0x%08x" -#: src/view.c:739 +#: src/view.c:741 msgid " [grow]" msgstr "" -#: src/view.c:1518 +#: src/view.c:1520 #, c-format msgid "Searching for `%s'" msgstr "ðÏÛÕË \"%s\"" -#: src/view.c:1625 src/view.c:1748 +#: src/view.c:1627 src/view.c:1750 msgid " Search string not found " msgstr " òÑÄÏË ÎÅÚÎÁÊÄÅÎÏ " -#: src/view.c:1787 +#: src/view.c:1789 msgid " Invalid regular expression " msgstr " îÅצÒÎÉÊ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ " -#: src/view.c:1911 +#: src/view.c:1913 #, c-format msgid "" " The current line number is %d.\n" @@ -5666,7 +5958,7 @@ " ðÏÔÏÞÎÉÊ ÎÏÍÅÒ ÒÑÄËÁ - %d.\n" " ÷×ÅĦÔØ ÎÏ×ÉÊ ÎÏÍÅÒ ÒÑÄËÁ:" -#: src/view.c:1933 +#: src/view.c:1935 #, c-format msgid "" " The current address is 0x%lx.\n" @@ -5675,71 +5967,71 @@ " ðÏÔÏÞÎÅ ÚͦÝÅÎÎÑ - 0x%lx.\n" " ÷×ÅĦÔØ ÎÏ×Å ÚͦÝÅÎÎÑ:" -#: src/view.c:1935 +#: src/view.c:1937 msgid " Goto Address " msgstr " ðÅÒÅÈ¦Ä ÚÁ ÁÄÒÅÓÏÀ " -#: src/view.c:1966 +#: src/view.c:1968 msgid " Enter regexp:" msgstr " ÷×ÅĦÔØ ÒÅÇÕÌÑÒÎÉÊ ×ÉÒÁÚ:" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Ascii" msgstr "Ascii" -#: src/view.c:2071 +#: src/view.c:2073 msgid "Hex" msgstr "" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Goto" msgstr "ðÅÒÅÊÔÉ" -#: src/view.c:2072 +#: src/view.c:2074 msgid "Line" msgstr "òÑÄÏË" -#: src/view.c:2075 +#: src/view.c:2077 msgid "RxSrch" msgstr "" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdText" msgstr "" -#: src/view.c:2078 +#: src/view.c:2080 msgid "EdHex" msgstr "" -#: src/view.c:2080 +#: src/view.c:2082 msgid "UnWrap" msgstr "" -#: src/view.c:2080 +#: src/view.c:2082 msgid "Wrap" msgstr "" -#: src/view.c:2083 +#: src/view.c:2085 msgid "HxSrch" msgstr "" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Raw" msgstr "" -#: src/view.c:2086 +#: src/view.c:2088 msgid "Parse" msgstr "" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Unform" msgstr "" -#: src/view.c:2090 +#: src/view.c:2092 msgid "Format" msgstr "" -#: src/widget.c:999 +#: src/widget.c:995 msgid " History " msgstr " ¶ÓÔÏÒ¦Ñ " @@ -5835,7 +6127,7 @@ #: src/win.c:246 msgid "Up arrow key" -msgstr "óÔÒ¦ÌËÁ ××ÅÒÈ" +msgstr "óÔÒ¦ÌËÁ ×ÇÏÒÕ" #: src/win.c:247 msgid "Down arrow key" @@ -5938,7 +6230,84 @@ msgid "NumLock on keypad" msgstr "NumLock" -#: vfs/extfs.c:268 +#: vfs/cpio.c:141 vfs/cpio.c:157 +#, c-format +msgid "" +"Couldn't open cpio archive\n" +"%s" +msgstr "" +"îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ cpio-ÁÒȦ×\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 +#, 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 "" +"îÅÏÞ¦ËÕ×ÁÎÉÊ Ë¦ÎÅÃØ ÆÁÊÌÕ\n" +"%s" + +#: vfs/direntry.c:310 +#, c-format +msgid "Dir cache expired for %s" +msgstr "" + +#: vfs/direntry.c:440 vfs/direntry.c:443 +msgid " Direntry warning " +msgstr "" + +#: vfs/direntry.c:440 +#, c-format +msgid "Super ino_usage is %d, memory leak" +msgstr "" + +#: vfs/direntry.c:443 +msgid "Super has want_stale set" +msgstr "" + +#: vfs/direntry.c:823 +msgid "Starting linear transfer..." +msgstr "ðÏÞÁÔÏË Ì¦Î¦ÊÎϧ ÐÅÒÅÄÁÞ¦..." + +#: vfs/direntry.c:968 +msgid "Getting file" +msgstr "ïÔÒÉÍÁÎÎÑ ÆÁÊÌÕ" + +#: vfs/extfs.c:270 #, c-format msgid "" "Couldn't open %s archive\n" @@ -5947,312 +6316,333 @@ "îÅÍÏÖÌÉ×Ï ×¦ÄËÒÉÔÉ ÁÒÈ¦× %s\n" "%s" -#: 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:140 #, c-format msgid "fish: Disconnecting from %s" msgstr "fish: òÏÚÒÉ× Ú'¤ÄÎÁÎÎÑ Ú %s" -#: vfs/fish.c:214 +#: vfs/fish.c:218 msgid "fish: Waiting for initial line..." msgstr "" -#: vfs/fish.c:224 +#: vfs/fish.c:228 msgid "Sorry, we can not do password authenticated connections for now." msgstr "" -#: vfs/fish.c:238 +#: vfs/fish.c:233 +msgid " fish: Password required for " +msgstr " fish: îÅÏÂȦÄÎÉÊ ÐÁÒÏÌØ ÄÌÑ " + +#: vfs/fish.c:242 msgid "fish: Sending password..." msgstr "fish: ÷¦ÄÓÉÌÁÎÎÑ ÐÁÒÏÌÀ..." -#: vfs/fish.c:244 +#: vfs/fish.c:248 msgid "fish: Sending initial line..." msgstr "" -#: vfs/fish.c:248 +#: vfs/fish.c:252 msgid "fish: Handshaking version..." msgstr "" -#: vfs/fish.c:252 +#: vfs/fish.c:256 msgid "fish: Setting up current directory..." msgstr "" -#: vfs/fish.c:254 +#: vfs/fish.c:258 #, c-format msgid "fish: Connected, home %s." msgstr "" -#: vfs/fish.c:330 +#: vfs/fish.c:347 #, c-format msgid "fish: Reading directory %s..." msgstr "fish: úÞÉÔÕ×ÁÎÎÑ ËÁÔÁÌÏÇÕ %s..." -#: vfs/fish.c:426 +#: vfs/fish.c:451 msgid "fish: failed" msgstr "" #. Use this as stor: ( dd block ; dd smallblock ) | ( cat > file; cat > /dev/null ) -#: vfs/fish.c:446 +#: vfs/fish.c:471 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: vfs/fish.c:460 +#: vfs/fish.c:496 msgid "fish: Local read failed, sending zeros" msgstr "" -#: vfs/fish.c:472 +#: vfs/fish.c:508 #, c-format msgid "fish: storing %s %d (%d)" msgstr "fish: ÚÂÅÒÅÖÅÎÎÑ %s %d (%d)" -#: vfs/fish.c:512 +#: vfs/fish.c:509 +msgid "zeros" +msgstr "" + +#: vfs/fish.c:556 msgid "Aborting transfer..." msgstr "ðÅÒÅÒÉ×ÁÎÎÑ ÐÅÒÅÄÁÞ¦..." -#: vfs/fish.c:521 +#: vfs/fish.c:565 msgid "Error reported after abort." msgstr "" -#: vfs/fish.c:523 +#: vfs/fish.c:567 msgid "Aborted transfer would be successful." msgstr "" -#: vfs/ftpfs.c:328 +#: vfs/ftpfs.c:318 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "ftpfs: ÷¦Ä'¤ÄÎÁÎÎÑ ×¦Ä %s" -#: vfs/ftpfs.c:379 +#: vfs/ftpfs.c:376 msgid " FTP: Password required for " msgstr " FTP: îÅÏÂȦÄÎÉÊ ÐÁÒÏÌØ ÄÌÑ " -#: vfs/ftpfs.c:411 +#: vfs/ftpfs.c:409 msgid " Proxy: Password required for " msgstr " ðÒÏËÓ¦: îÅÏÂȦÄÎÉÊ ÐÁÒÏÌØ ÄÌÑ " -#: vfs/ftpfs.c:437 +#: vfs/ftpfs.c:435 msgid "ftpfs: sending proxy login name" msgstr "ftpfs: צÄÓÉÌÁÎÎÑ ÎÁÚ×É ËÏÒÉÓÔÕ×Á ÐÒÏËÓ¦" -#: vfs/ftpfs.c:441 +#: vfs/ftpfs.c:439 msgid "ftpfs: sending proxy user password" msgstr "ftpfs: צÄÓÉÌÁÎÎÑ ÐÁÒÏÌÀ ËÏÒÉÓÔÕ×Á ÐÒÏËÓ¦" -#: vfs/ftpfs.c:445 +#: vfs/ftpfs.c:443 msgid "ftpfs: proxy authentication succeeded" msgstr "ftpfs: ÁÕÔÅÎƦËÁÃ¦Ñ ÎÁ ÐÒÏËÓ¦ ÐÒÏÊÛÌÁ ÕÓЦÛÎÏ" -#: vfs/ftpfs.c:449 +#: vfs/ftpfs.c:447 #, c-format msgid "ftpfs: connected to %s" msgstr "ftpfs: Ú'¤ÄÎÁÎÏ Ú %s" -#: vfs/ftpfs.c:466 +#: vfs/ftpfs.c:464 msgid "ftpfs: sending login name" msgstr "ftpfs: sending login name" -#: vfs/ftpfs.c:471 +#: vfs/ftpfs.c:469 msgid "ftpfs: sending user password" msgstr "ftpfs: צÄÓÉÌÁÎÎÑ ÐÁÒÏÌÀ ËÏÒÉÓÔÕ×ÁÞÁ" -#: vfs/ftpfs.c:476 +#: vfs/ftpfs.c:474 msgid "ftpfs: logged in" msgstr "ftpfs: ÒÏÚÐÏÞÁÔÏ ÒÏÂÏÔÕ" -#: vfs/ftpfs.c:491 +#: vfs/ftpfs.c:489 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "" -#: vfs/ftpfs.c:523 +#: vfs/ftpfs.c:521 #, c-format msgid " Could not set source routing (%s)" msgstr "" -#: vfs/ftpfs.c:652 +#: vfs/ftpfs.c:647 msgid "ftpfs: Invalid host name." msgstr "ftpfs: îÅצÒÎÁ ÎÁÚ×Á ÈÏÓÔÁ." -#: vfs/ftpfs.c:672 +#: vfs/ftpfs.c:667 msgid "ftpfs: Invalid host address." msgstr "ftpfs: îÅצÒÎÁ ÁÄÒÅÓÁ ÈÏÓÔÁ." -#: vfs/ftpfs.c:697 +#: vfs/ftpfs.c:690 #, c-format msgid "ftpfs: making connection to %s" msgstr "ftpfs: ÓÔ×ÏÒÅÎÎÑ Ú'¤ÄÎÁÎÎÑ Ú %s" -#: vfs/ftpfs.c:707 +#: vfs/ftpfs.c:700 msgid "ftpfs: connection interrupted by user" msgstr "ftpfs: Ú'¤ÄÎÁÎÎÑ ÐÅÒÅÒ×ÁÎÏ ËÏÒÉÓÔÕ×ÁÞÅÍ" -#: vfs/ftpfs.c:709 +#: vfs/ftpfs.c:702 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "ftpfs: ÎÅ×ÄÁÌÁ ÓÐÒÏÂÁ Ú'¤ÄÎÁÎÎÑ ÄÏ ÓÅÒ×ÅÒÁ: %s" -#: vfs/ftpfs.c:793 +#: vfs/ftpfs.c:744 #, 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 "" - -#: vfs/ftpfs.c:997 +#: vfs/ftpfs.c:930 msgid "ftpfs: could not setup passive mode" msgstr "ftpfs: ÎÅ ×ÄÁÌÏÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÐÁÓÉ×ÎÉÊ ÒÅÖÉÍ" -#: vfs/ftpfs.c:1070 +#: vfs/ftpfs.c:1005 msgid "ftpfs: aborting transfer." msgstr "ftpfs: ÐÅÒÅÒÉ×ÁÎÎÑ ÐÅÒÅÄÁÞ¦." -#: vfs/ftpfs.c:1072 +#: vfs/ftpfs.c:1007 #, c-format msgid "ftpfs: abort error: %s" msgstr "ftpfs: ÐÏÍÉÌËÁ ÐÅÒÅÒÉ×ÁÎÎÑ: %s" -#: vfs/ftpfs.c:1077 +#: vfs/ftpfs.c:1012 msgid "ftpfs: abort failed" msgstr "ftpfs: ÎÅ ×ÄÁÌÏÓÑ ÐÅÒÅÒ×ÁÔÉ" -#: vfs/ftpfs.c:1165 vfs/ftpfs.c:1344 +#: vfs/ftpfs.c:1101 vfs/ftpfs.c:1200 msgid "ftpfs: CWD failed." msgstr "ftpfs: ÎÅ ×ÄÁÌÏÓÑ ÚͦÎÉÔÉ ËÁÔÁÌÏÇ." -#: vfs/ftpfs.c:1175 vfs/ftpfs.c:1182 +#: vfs/ftpfs.c:1111 vfs/ftpfs.c:1118 msgid "ftpfs: couldn't resolve symlink" msgstr "ftpfs: ÎÅÍÏÖÌÉ×Ï ÒÏÚ¦ÍÅÎÕ×ÁÔÉ ÓÉÍ×ÏÌØÎÅ ÐÏÓÉÌÁÎÎÑ" -#: vfs/ftpfs.c:1236 +#: vfs/ftpfs.c:1169 msgid "Resolving symlink..." msgstr "" -#: vfs/ftpfs.c:1338 +#: vfs/ftpfs.c:1188 #, c-format -msgid "ftpfs: Reading FTP directory %s... (don't use UNIX ls options)" -msgstr "" +msgid "ftpfs: Reading FTP directory %s... %s%s" +msgstr "ftpfs: úÞÉÔÕ×ÁÎÎÑ FTP-ËÁÔÁÌÏÇÕ %s... %s%s" -#: vfs/ftpfs.c:1340 -#, c-format -msgid "ftpfs: Reading FTP directory %s..." -msgstr "ftpfs: úÞÉÔÕ×ÁÎÎÑ FTP-ËÁÔÁÌÏÇÕ %s..." - -#: vfs/ftpfs.c:1356 -msgid "ftpfs: FAIL" +#: vfs/ftpfs.c:1189 +msgid "(strict rfc959)" msgstr "" -#: vfs/ftpfs.c:1447 -msgid "ftpfs: reading FTP directory interrupt by user" -msgstr "ftpfs: ÚÞÉÔÕ×ÁÎÎÑ ËÁÔÁÌÏÇÕ FTP ÐÅÒÅÒ×ÁÎÏ ËÏÒÉÓÔÕ×ÁÞÅÍ" - -#: vfs/ftpfs.c:1477 -msgid "ftpfs: got listing" +#: vfs/ftpfs.c:1190 +msgid "(chdir first)" msgstr "" -#: vfs/ftpfs.c:1490 +#: vfs/ftpfs.c:1286 msgid "ftpfs: failed" msgstr "" -#: vfs/ftpfs.c:1534 +#: vfs/ftpfs.c:1296 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: vfs/ftpfs.c:1598 +#: vfs/ftpfs.c:1359 #, c-format msgid "ftpfs: storing file %d (%d)" msgstr "ftpfs: ÚÂÅÒÅÖÅÎÎÑ ÆÁÊÌÕ %d (%d)" -#: vfs/ftpfs.c:2037 vfs/ftpfs.c:2052 +#: vfs/ftpfs.c:1774 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 " óÅÒ×ÅÒ ÎŠЦÄÔÒÉÍÕ¤ ÃÀ ×ÅÒÓ¦À " -#: 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 " îÅÏÂȦÄÎÉÊ ÐÁÒÏÌØ 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 "" + +#: 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 " îÁÄÔÏ ÂÁÇÁÔÏ ×¦ÄËÒÉÔÉÈ Ú'¤ÄÎÁÎØ " -#: vfs/smbfs.c:115 +#. This is place of next pointer +#: vfs/mcfs.c:1127 +msgid "Midnight Commander's private remote filesystem" +msgstr "" + +#: vfs/smbfs.c:116 msgid "Domain:" msgstr "äÏÍÅÎ:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Username:" msgstr "¶Í'Ñ ËÏÒÉÓÔÕ×ÁÞÁ:" -#: vfs/smbfs.c:115 +#: vfs/smbfs.c:116 msgid "Password: " msgstr "ðÁÒÏÌØ: " -#: vfs/smbfs.c:170 +#: vfs/smbfs.c:171 #, c-format msgid "Password for \\\\%s\\%s" msgstr "ðÁÒÏÌØ ÄÌÑ \\\\%s\\%s" -#: vfs/smbfs.c:666 +#: vfs/smbfs.c:667 #, c-format msgid "" " reconnect to %s failed\n" " " msgstr "" +" ÐÏ×ÔÏÒÎÅ Ú'¤ÄÎÁÎÎÑ Ú %s ÎÅ ×ÄÁÌÏÓØ\n" +" " -#: vfs/smbfs.c:1737 +#: vfs/smbfs.c:1243 +msgid " Authentication failed " +msgstr "" + +#: vfs/smbfs.c:1738 #, c-format msgid " %s mkdir'ing %s " msgstr " %s ÓÔ×ÏÒÅÎÎÑ ËÁÔÁÌÏÇÕ %s " -#: vfs/smbfs.c:1758 +#: vfs/smbfs.c:1759 #, c-format msgid " %s rmdir'ing %s " msgstr " %s ×ÉÄÁÌÅÎÎÑ ËÁÔÁÌÏÇÕ %s " -#: vfs/smbfs.c:1867 vfs/smbfs.c:1887 vfs/smbfs.c:1948 +#: vfs/smbfs.c:1868 vfs/smbfs.c:1888 vfs/smbfs.c:1949 #, c-format msgid " %s opening remote file %s " msgstr " %s צÄËÒÉÔÔÑ ×¦ÄÄÁÌÅÎÏÇÏ ÆÁÊÌÕ %s " -#: vfs/smbfs.c:1971 +#: vfs/smbfs.c:1972 #, c-format msgid " %s renaming files\n" msgstr " %s ÐÅÒÅÊÍÅÎÕ×ÁÎÎÑ ÆÁÊ̦×\n" @@ -6272,7 +6662,7 @@ #: vfs/tar.c:339 vfs/tar.c:346 msgid "Inconsistent tar archive" -msgstr "" +msgstr "îÅÕÚÇÏÄÖÅÎÉÊ tar-ÁÒȦ×" #: vfs/tar.c:411 #, c-format @@ -6285,11 +6675,133 @@ "%s\n" "ÎÅ ÓÈÏÖÅ ÎÁ tar-ÁÒȦ×." -#: vfs/vfs.c:1824 +#: vfs/vfs.c:1152 +msgid "Changes to file lost" +msgstr "" + +#: vfs/vfs.c:1795 +msgid "Could not parse:" +msgstr "îÅ ×ÄÁÌÏÓØ ÐÒÏÁÎÁ̦ÚÕ×ÁÔÉ:" + +#: vfs/vfs.c:1797 +msgid "More parsing errors will be ignored." +msgstr "" + +#: vfs/vfs.c:1797 +msgid "(sorry)" +msgstr "" + +#: vfs/vfs.c:1808 +msgid "Internal error:" +msgstr "÷ÎÕÔÒ¦ÛÎÑ ÐÏÍÉÌËÁ:" + +#: vfs/vfs.c:1818 msgid "%s: %s: %s %3d%% (%ld bytes transfered)" msgstr "%s: %s: %s %3d%% (%ld ÂÁÊÔ ÐÅÒÅÎÅÓÅÎÏ)" -#: vfs/vfs.c:1825 +#: vfs/vfs.c:1819 #, c-format msgid "%s: %s: %s %ld bytes transfered" msgstr "%s: %s: %s %ld ÂÁÊÔ ÐÅÒÅÎÅÓÅÎÏ" + +#: vfs/undelfs.c:81 +msgid " undelfs: error " +msgstr "" + +#: vfs/undelfs.c:184 +msgid " not enough memory " +msgstr "" + +#: vfs/undelfs.c:189 +msgid " while allocating block buffer " +msgstr "" + +#: vfs/undelfs.c:193 +#, c-format +msgid " open_inode_scan: %d " +msgstr "" + +#: vfs/undelfs.c:197 +#, c-format +msgid " while starting inode scan %d " +msgstr "" + +#: vfs/undelfs.c:204 +#, c-format +msgid "undelfs: loading deleted files information %d inodes" +msgstr "" + +#: vfs/undelfs.c:219 +#, c-format +msgid " while calling ext2_block_iterate %d " +msgstr "" + +#: vfs/undelfs.c:227 +msgid " no more memory while reallocating array " +msgstr "" + +#: vfs/undelfs.c:246 +#, c-format +msgid " while doing inode scan %d " +msgstr "" + +#: vfs/undelfs.c:270 +msgid " Ext2lib error " +msgstr " ðÏÍÉÌËÁ ext2lib " + +#: vfs/undelfs.c:297 +#, c-format +msgid " Could not open file %s " +msgstr " îÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÆÁÊÌ %s " + +#: vfs/undelfs.c:300 +msgid "undelfs: reading inode bitmap..." +msgstr "" + +#: vfs/undelfs.c:303 +#, c-format +msgid "" +" Could not load inode bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:306 +msgid "undelfs: reading block bitmap..." +msgstr "" + +#: vfs/undelfs.c:309 +#, c-format +msgid "" +" Could not load block bitmap from: \n" +" %s \n" +msgstr "" + +#: vfs/undelfs.c:315 +msgid "undelfs: done." +msgstr "" + +#: vfs/undelfs.c:318 +msgid "undelfs: failure" +msgstr "" + +#: vfs/undelfs.c:342 +msgid " vfs_info is not fs! " +msgstr "" + +#: vfs/undelfs.c:398 vfs/undelfs.c:582 +msgid " You have to chdir to extract files first " +msgstr "" + +#: vfs/undelfs.c:521 +msgid " while iterating over blocks " +msgstr "" + +#: vfs/undelfs.c:626 +#, c-format +msgid " Could not open file: %s " +msgstr " îÅ ×ÄÁÌÏÓØ ×¦ÄËÒÉÔÉ ÆÁÊÌ: %s " + +#. This is place of next pointer +#: vfs/undelfs.c:684 +msgid "Undelete filesystem for ext2" +msgstr "" diff -ruN old/mc-4.5.44/po/wa.po new/mc-4.5.45/po/wa.po --- old/mc-4.5.44/po/wa.po Tue Apr 4 23:32:02 2000 +++ new/mc-4.5.45/po/wa.po Tue May 9 18:52:09 2000 @@ -7,6 +7,8 @@ # Copyright (C) 1999 Free Software Foundation, Inc. # Lorint Hendschel , 1999-2000 # Pablo Saratxaga , 2000 +# Lucyin Mahin, 2000 +# msgid "" msgstr "" "Project-Id-Version: mc 4.5.38\n" @@ -792,7 +794,7 @@ msgid "Copy files" msgstr "Copyî des fitchîs" -# _Copyî is the normal way, but we alreadi have _Cloyu on the same menu +# _Copyî is the normal way, but we alreadi have _Clôre 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:2098 msgid "_Copy..." @@ -825,11 +827,11 @@ #: gnome/glayout.c:395 msgid "Close window" -msgstr "Cloyu li purnea" +msgstr "Clôre li purnea" #: gnome/glayout.c:395 msgid "Closes this window" -msgstr "Cloyu ci purnea chal" +msgstr "Clôre ci purnea chal" #: gnome/glayout.c:402 msgid "Select _All" @@ -3856,7 +3858,7 @@ " Cannot close source file \"%s\" \n" " %s " msgstr "" -" Dji n' sai cloyu li fitchî soûrdant \"%s\" \n" +" Dji n' sai clôre li fitchî soûrdant \"%s\" \n" " %s " #: src/file.c:792 @@ -3865,7 +3867,7 @@ " Cannot close target file \"%s\" \n" " %s " msgstr "" -" Dji n' sai cloyu li fitchî såme \"%s\" \n" +" Dji n' sai clôre li fitchî såme \"%s\" \n" " %s " #: src/file.c:802 diff -ruN old/mc-4.5.44/src/ChangeLog new/mc-4.5.45/src/ChangeLog --- old/mc-4.5.44/src/ChangeLog Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/src/ChangeLog Tue May 9 18:52:04 2000 @@ -1,3 +1,110 @@ +2000-05-04 Valery Kornienkov + + * src/user.c: Add macro %k it is block file name + Add macro %e it is error file name + Add macro %i it is cursor column indent of spaces, only for edit + Add macro %y, it is syntax of current file in editor, only for edit + Add condition y , it is syntax pattern of current file in edit + Add macro %x it is extension of current file + Add macro %m it is current menu filename + +2000-05-04 Valery Kornienkov + + * gtkedit/editcmd.c: Modify External Formatter (was C indent formatter) . + Autocreate a scripts in home, from templates /usr/lib/mc/edit.indent.rc, + edit.ispell.rc, etc. Remove leading and trailing spaces into _(""), + (the message of David H. Martin ) + +2000-05-05 Valery Kornienkov + + * src/user.c: Add condition (x filename) into mc.menu . + for "Open next a free console" and like. + +2000-05-04 Valery Kornienkov + + src/user.c: fix segfault in chunk_alloc of glibc, when into condition + of .mnu we have quoted space. (~.mc/menu: + f \.\ test$). + +2000-05-04 Valery Kornienkov + + * gtkedit/edit.c: + Add ability user edit menus: system: /usr/lib/mc/cedit.menu, + * gtkedit/editmenu.c: home: ~/.cedit.menu, local: .cedit.menu + Marked block is access now from an user edit menu + Access ~/.cedit/cooledit.block for insert to cursor place from + user edit menu. + Created system cedit.menu + +2000-05-04 Valery Kornienkov + + * gtkedit/editdraw.c: + Improved a status string of cool editor for best understand, + and to add char,hex view. + +2000-04-17 Andrew V. Samoilov + + * widget.c: (history_put): profile is free()d if chmod failed, + (input_map): added const qualifier + * utilunix.c, util.h: (tilde_expand): added const qualifier + * cmd.c: (nice_cd): i18n update, + (source_routing): typo fixed, source is free()d after use + * screen.c: i18n changes, (panel_keymap): added const qualifier + * view.[ch]: (view, view_init, do_view_init): added const qualifier + +2000-04-15 Timur Bakeyev + + * dir.c (string_sortcomp): strcmp() replaced with strcoll() to make + directory listing LOCALE sensitive. I assume, strcoll exists everywhere, + as it is in POSIX. + +2000-04-15 Timur Bakeyev + + * dlg.c: Commited at last patch, that fixes screwed up right panel in + a long format. Occasionaly, all my colors problems also gone. All thanks + to Norbert Warmuth , who tracked down the + problem, blames to me and Federico :) + +2000-04-12 Timur Bakeyev + + * widget.c ([forward|backward]_word): Changed one more time - now it + skips alpnums and THEN spaces+punct. That gives almost the same re- + sults, but twice quicker. Hope, this will be accepted. + +2000-04-06 Timur Bakeyev + + * widget.c ([forward|backward]_word): Changed logic of moving - now, + it skips only spaces+punct OR alnum. Reason to do it so - deleting lines + like "lynx http://www.gnome.org", where "lynx http:" part was erased + in one operation. That's nasty, IMHO. Made this a separate commit, so, + if it seriously breaks compatability it's easy to revert it. Still hope, + nobody'll do that. + +2000-04-06 Timur Bakeyev + + * file.c, widget.[ch]: Fixed long existing problems with filenames + and input widgets, then char is greater than 128. They were processed + incorrectly. As usual, char != unsigned char problem. + +2000-03-03 Björn Eriksson + + * Similar patches came from Andrew V. Samoilov . + + * mad.[ch]: Some functions wrongly by-passed mad_alloc*() (causing + problems when later g_free()ed. + + * Added mad_strndup(). + + * Repeated code collected in mad_fatal_error(). + + * The gcc-extension/C99-standard variable argument macros (adding + __FILE__, __LINE__ before ', ...') would be nice. + + * Alloc_idx_hint and code added, the mad code was way too slow for my + poor computer. A hash-table would be nice. + + * (mad_strconcat, mad_strdup_vprintf): g_malloc and g_new are + undefined at the top of mad.c, so mad_alloc must be used. + 2000-02-23 Norbert Warmuth * main.c (parse_control_file): add missing right parentheses diff -ruN old/mc-4.5.44/src/background.c new/mc-4.5.45/src/background.c --- old/mc-4.5.44/src/background.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/background.c Tue May 9 18:52:04 2000 @@ -393,6 +393,7 @@ resstr = (*(char * (*)(char *, char *, char *, char *))routine) (data [0], data [1], data [2], data [3]); break; + default: g_assert_not_reached(); } if (resstr){ len = strlen (resstr); diff -ruN old/mc-4.5.44/src/cmd.c new/mc-4.5.45/src/cmd.c --- old/mc-4.5.44/src/cmd.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/cmd.c Tue May 9 18:52:04 2000 @@ -79,9 +79,6 @@ #include "profile.h" #define MIDNIGHT -#ifdef USE_INTERNAL_EDIT - extern int edit (const char *file, int line); -#endif #include "../vfs/vfs.h" #define WANT_WIDGETS #include "main.h" /* global variables, global functions */ @@ -655,34 +652,36 @@ flush_extension_file (); } -void menu_edit_cmd (void) +/* where = 0 - do edit a file menu for mc */ +/* where = 1 - do edit a file menu for cool edit */ +void menu_edit_cmd (int where) { char *buffer; char *menufile; int dir = 0; dir = query_dialog ( - _("Menu file edit"), - _(" Which menu file will you edit? "), + _(" Menu edit "), + _(" Which menu file will you edit ? "), 0, geteuid() ? 2 : 3, _("&Local"), _("&Home"), _("&System Wide") ); - menufile = concat_dir_and_file(mc_home, MC_GLOBAL_MENU); + menufile = concat_dir_and_file (mc_home, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); - switch (dir){ + switch (dir) { case 0: - buffer = g_strdup (MC_LOCAL_MENU); + buffer = g_strdup (where ? CEDIT_LOCAL_MENU : MC_LOCAL_MENU); check_for_default (menufile, buffer); break; case 1: - buffer = concat_dir_and_file (home_dir, MC_HOME_MENU); + buffer = concat_dir_and_file (home_dir, where ? CEDIT_HOME_MENU : MC_HOME_MENU); check_for_default (menufile, buffer); break; case 2: - buffer = concat_dir_and_file (mc_home, MC_GLOBAL_MENU); + buffer = concat_dir_and_file (mc_home, where ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); break; default: @@ -737,7 +736,6 @@ static int compare_files (char *name1, char *name2, long size) { int file1, file2; - char *data1, *data2; int result = -1; /* Different by default */ file1 = open (name1, O_RDONLY); @@ -745,6 +743,7 @@ file2 = open (name2, O_RDONLY); if (file2 >= 0){ #ifdef HAVE_MMAP + char *data1, *data2; /* Ugly if jungle */ data1 = mmap (0, size, PROT_READ, MAP_FILE | MAP_PRIVATE, file1, 0); if (data1 != (char*) -1){ @@ -1222,43 +1221,55 @@ } /* partly taken from dcgettect.c, returns "" for C locale */ -static const char * -guess_message_value (void) +/* value should be gfreed by calling function */ +char *guess_message_value (unsigned want_info) { - const char *retval; - - /* The highest priority value is the `LANGUAGE' environment - variable. This is a GNU extension. */ - retval = getenv ("LANGUAGE"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Setting of LC_ALL overwrites all other. */ - retval = getenv ("LC_ALL"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Next comes the name of the desired category. */ - retval = getenv ("LC_MESSAGE"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Last possibility is the LANG environment variable. */ - retval = getenv ("LANG"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* We use C as the default domain. POSIX says this is implementation - defined. */ - return ""; + const char *var[] = { + /* The highest priority value is the `LANGUAGE' environment + variable. This is a GNU extension. */ + "LANGUAGE", + /* Setting of LC_ALL overwrites all other. */ + "LC_ALL", + /* Next comes the name of the desired category. */ + "LC_MESSAGE", + /* Last possibility is the LANG environment variable. */ + "LANG", + /* NULL exit loops */ + NULL + }; + + gchar *retval; + + unsigned i = 0; + char *locale = NULL; + + while (var[i] != NULL) { + locale = getenv (var[i]); + if (locale != NULL && locale[0] != '\0') + break; + i++; + } + if (var[i] == NULL) + locale = ""; + + if (want_info == 0) + retval = g_strdup (locale); + else + if (var[i] == NULL) + retval = g_strdup (_("Using default locale")); + else + retval = g_strdup_printf (_("Using locale \"%s\" (from environment variable %s)"), locale, var[i]); + + return retval; } + /* Returns a random hint */ char *get_random_hint (void) { char *data, *result, *eol; char *hintfile_base, *hintfile; - const char *lang; + char *lang; int len; int start; @@ -1283,7 +1294,7 @@ #endif hintfile_base = concat_dir_and_file (mc_home, MC_HINT); - lang = guess_message_value (); + lang = guess_message_value (0); hintfile = g_strdup_printf ("%s.%s", hintfile_base, lang); data = load_file (hintfile); @@ -1298,6 +1309,7 @@ data = load_file (hintfile_base); } + g_free (lang); g_free (hintfile_base); if (!data) return 0; @@ -1360,7 +1372,7 @@ if (do_panel_cd (MENU_PANEL, cd_path, 0)) directory_history_add (MENU_PANEL, (MENU_PANEL)->cwd); else - message (1, MSG_ERROR, N_(" Could not chdir to %s "), cd_path); + message (1, MSG_ERROR, _(" Could not chdir to %s "), cd_path); g_free (cd_path); g_free (machine); } @@ -1390,12 +1402,13 @@ struct hostent *hp; source = input_dialog (_(" Socket source routing setup "), - _(" Enter host name to use as a source routing hop: ")n, + _(" Enter host name to use as a source routing hop: "), ""); if (!source) return; hp = gethostbyname (source); + g_free (source); if (!hp){ message (1, _(" Host name "), _(" Error while looking up IP address ")); return; @@ -1556,7 +1569,7 @@ void quick_view_cmd (void) { - if (get_panel_widget (MENU_PANEL_IDX) == cpanel) + if ((WPanel *) get_panel_widget (MENU_PANEL_IDX) == cpanel) change_panel (); set_display_type (MENU_PANEL_IDX, view_quick); } diff -ruN old/mc-4.5.44/src/cmd.h new/mc-4.5.45/src/cmd.h --- old/mc-4.5.44/src/cmd.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/cmd.h Tue May 9 18:52:04 2000 @@ -8,7 +8,7 @@ void dirsizes_cmd (void); int view_file_at_line (char *filename, int plain_view, int internal, int start_line); -int view_file (char *filename, int normal, int internal); +int view_file (char *filename, int normal, int internal); void view_cmd (WPanel *panel); void view_file_cmd (WPanel *panel); void view_simple_cmd (WPanel *panel); @@ -35,7 +35,7 @@ void quick_view_cmd (void); void tree_view_cmd (void); void ext_cmd (void); -void menu_edit_cmd (void); +void menu_edit_cmd (int select); void quick_chdir_cmd (void); void compare_dirs_cmd (void); void history_cmd (void); @@ -59,6 +59,8 @@ void save_setup_cmd (void); char *get_random_hint (void); void source_routing (void); +void user_file_menu_cmd (void); +char *guess_message_value (unsigned want_info); /* Display mode code */ void info_cmd (void); @@ -71,4 +73,10 @@ void quick_view_cmd (void); void toggle_listing_cmd (void); void configure_panel_listing (WPanel *p, int view_type, int use_msformat, char *user, char *status); + +#ifdef USE_INTERNAL_EDIT +extern int edit (const char *file, int line); +extern int edit_run; +#endif + #endif /* __CMD_H */ diff -ruN old/mc-4.5.44/src/dir.c new/mc-4.5.45/src/dir.c --- old/mc-4.5.44/src/dir.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/dir.c Tue May 9 18:52:04 2000 @@ -30,7 +30,7 @@ #include "tree.h" #include "../vfs/vfs.h" -/* "$Id: dir.c,v 1.20 1999/11/03 12:50:54 pavel Exp $" */ +/* "$Id: dir.c,v 1.21 2000/04/14 08:58:37 timur Exp $" */ /* * If true show files starting with a dot. @@ -76,7 +76,7 @@ { N_("&Group"), sort_group } }; -#define string_sortcomp(a,b) (case_sensitive ? strcmp (a,b) : g_strcasecmp (a,b)) +#define string_sortcomp(a,b) (case_sensitive ? strcoll (a,b) : g_strcasecmp (a,b)) int unsorted (const file_entry *a, const file_entry *b) diff -ruN old/mc-4.5.44/src/dlg.c new/mc-4.5.45/src/dlg.c --- old/mc-4.5.44/src/dlg.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/dlg.c Tue May 9 18:52:04 2000 @@ -17,7 +17,7 @@ */ #include -/* "$Id: dlg.c,v 1.30 1999/09/21 21:24:08 unammx Exp $" */ +/* "$Id: dlg.c,v 1.31 2000/04/14 01:19:58 timur Exp $" */ #include #include #include @@ -414,12 +414,11 @@ was_panel = FALSE; #endif do { + wi = p; if (reverse) p = p->prev; else p = p->next; - - wi = p; /* if (p->widget->options & flags) */ #ifdef HAVE_GNOME if (is_a_panel (wi->widget)) diff -ruN old/mc-4.5.44/src/features.inc new/mc-4.5.45/src/features.inc --- old/mc-4.5.44/src/features.inc Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/features.inc Tue May 9 18:52:04 2000 @@ -18,7 +18,7 @@ N_(" with X11 support to read modifiers"), #endif #endif - ".\n", + "\n", #ifdef USE_VFS N_("Virtual File System: tarfs, extfs"), @@ -38,7 +38,7 @@ #ifdef USE_EXT2FSLIB N_(", undelfs"), #endif - ".\n", + "\n", #endif #ifdef USE_INTERNAL_EDIT diff -ruN old/mc-4.5.44/src/file.c new/mc-4.5.45/src/file.c --- old/mc-4.5.44/src/file.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/file.c Tue May 9 18:52:04 2000 @@ -107,7 +107,7 @@ /* }}} */ -/* rcsid [] = "$Id: file.c,v 1.59 1999/11/03 12:50:54 pavel Exp $" */ +/* rcsid [] = "$Id: file.c,v 1.60 2000/04/09 22:37:51 timur Exp $" */ int verbose = 1; @@ -188,14 +188,14 @@ static int transform_error = 0; -static char * -do_transform_source (FileOpContext *ctx, char *source) +static unsigned char * +do_transform_source (FileOpContext *ctx, unsigned char *source) { int j, k, l, len; - char *fnsource = x_basename (source); + unsigned char *fnsource = x_basename (source); int next_reg; enum CaseConvs case_conv = NO_CONV; - static char fntarget [MC_MAXPATHLEN]; + static unsigned char fntarget [MC_MAXPATHLEN]; len = strlen (fnsource); j = re_match (&ctx->rx, fnsource, len, 0, &ctx->regs); @@ -259,11 +259,11 @@ return fntarget; } -static char * -transform_source (FileOpContext *ctx, char *source) +static unsigned char * +transform_source (FileOpContext *ctx, unsigned char *source) { - char *s = g_strdup (source); - char *q; + unsigned char *s = g_strdup (source); + unsigned char *q; /* We remove \n from the filename since regex routines would use \n as an anchor */ /* this is just to be allowed to maniupulate file names with \n on it */ diff -ruN old/mc-4.5.44/src/mad.c new/mc-4.5.45/src/mad.c --- old/mc-4.5.44/src/mad.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/mad.c Tue May 9 18:52:04 2000 @@ -27,6 +27,7 @@ #undef realloc #undef xmalloc #undef strdup +#undef strndup #undef free #undef g_malloc @@ -34,6 +35,7 @@ #undef g_calloc #undef g_realloc #undef g_strdup +#undef g_strndup #undef g_free #include @@ -50,7 +52,7 @@ /* Maximum number of memory area handles, increase this if you run out of handles */ -#define MAD_MAX_AREAS 10000 +#define MAD_MAX_AREAS 20000 /* vfs leaks Lots of memory*/ /* Maximum file name length */ #define MAD_MAX_FILE 50 /* Signature for detecting overwrites */ @@ -68,9 +70,17 @@ static mad_mem_area mem_areas [MAD_MAX_AREAS]; static FILE *memlog; +#define MAD_CHECK_CALL_FACTOR 30 /* Perform actual test every N call. */ +static int Mad_check_call_delay; +static int Alloc_idx_hint = 0; +static struct /*mad_stats_struct*/ { + int last_max_i; + long check_call_cnt; +} Stats = { -1, 0 } ; + void *watch_free_pointer = 0; -void +void mad_init (void) { memlog = stderr; @@ -95,6 +105,20 @@ kill (getpid (), 3); } +/* Code repeated in lots of places. Could be merged with mad_abort() above. */ +static void mad_fatal_error(const char *problem, void *ptr, const char *file, int line) +{ + if (NULL != ptr) { + fprintf(memlog, "MAD: %s: %p.\r\n", problem, ptr); + } else { + fprintf(memlog, "MAD: %s.\r\n", problem); + } + fprintf(memlog, " Discovered in file \"%s\" at line %d.\r\n", file, line); + fprintf(memlog, "MAD: Aborting...\r\n"); + fflush(memlog); + abort(); +} + /* Checks all the allocated memory areas. This is called everytime memory is allocated or freed. You can also call it anytime you think memory might be corrupted. */ @@ -102,6 +126,10 @@ { int i; + if (--Mad_check_call_delay > 0) + return; + Mad_check_call_delay = MAD_CHECK_CALL_FACTOR; + for (i = 0; i < MAD_MAX_AREAS; i++){ if (! mem_areas [i].in_use) continue; @@ -110,6 +138,7 @@ if (*(mem_areas [i].end_sig) != MAD_SIGNATURE) mad_abort ("Overwrite error: Bad end signature", i, file, line); } + Stats.check_call_cnt++; fflush (memlog); } @@ -121,30 +150,22 @@ mad_check (file, line); - for (i = 0; i < MAD_MAX_AREAS; i++){ - if (! mem_areas [i].in_use) - break; - } - if (i >= MAD_MAX_AREAS){ - fprintf (memlog, "MAD: Out of memory area handles. Increase the value of MAD_MAX_AREAS.\r\n"); - fprintf (memlog, " Discovered in file \"%s\" at line %d.\r\n", - file, line); - fprintf (memlog, "MAD: Aborting...\r\n"); - fflush (memlog); - abort (); - } + for (i = Alloc_idx_hint; i < MAD_MAX_AREAS; i++) { + if (! mem_areas [i].in_use) + break; + } + if (i >= MAD_MAX_AREAS) + mad_fatal_error("Out of memory area handles. Increase the value of MAD_MAX_AREAS.", NULL, file, line); + + Alloc_idx_hint = i+1; + if (i > Stats.last_max_i) + Stats.last_max_i = i; mem_areas [i].in_use = 1; size = (size + 3) & (~3); /* Alignment */ area = (char*) g_malloc (size + 2 * sizeof (long)); - if (!area){ - fprintf (memlog, "MAD: Out of memory.\r\n"); - fprintf (memlog, " Discovered in file \"%s\" at line %d.\r\n", - file, line); - fprintf (memlog, "MAD: Aborting...\r\n"); - fflush (memlog); - abort (); - } + if (!area) + mad_fatal_error("Out of memory.", NULL, file, line); mem_areas [i].start_sig = (long*) area; mem_areas [i].data = (area + sizeof (long)); @@ -177,26 +198,15 @@ if (mem_areas [i].data == ptr) break; } - if (i >= MAD_MAX_AREAS){ - fprintf (memlog, "MAD: Attempted to realloc unallocated pointer: %p.\r\n", ptr); - fprintf (memlog, " Discovered in file \"%s\" at line %d.\r\n", - file, line); - fprintf (memlog, "MAD: Aborting...\r\n"); - fflush (memlog); - abort (); - } + if (i >= MAD_MAX_AREAS) + mad_fatal_error("Attempted to realloc unallocated pointer", ptr, file, line); newsize = (newsize + 3) & (~3); /* Alignment */ area = (char*) g_realloc (mem_areas [i].start_sig, newsize + 2 * sizeof (long)); - if (!area){ - fprintf (memlog, "MAD: Out of memory.\r\n"); - fprintf (memlog, " Discovered in file \"%s\" at line %d.\r\n", - file, line); - fprintf (memlog, "MAD: Aborting...\r\n"); - fflush (memlog); - abort (); - } + if (!area) + mad_fatal_error("Out of memory", NULL, file, line); + /* Reuses a position in mem_areas[] and thus does not set .in_use */ mem_areas [i].start_sig = (long*) area; mem_areas [i].data = (area + sizeof (long)); mem_areas [i].end_sig = (long*) (area + newsize + sizeof (long)); @@ -215,7 +225,7 @@ void *mad_alloc0 (int size, char *file, int line) { char *t; - + t = (char *) mad_alloc (size, file, line); memset (t, 0, size); return (void *) t; @@ -231,11 +241,25 @@ return t; } +/* Duplicates a character string. Used instead of strndup. */ +/* Dup of GLib's gstrfuncs.c:g_strndup() */ +char *mad_strndup (const char *s, int n, char *file, int line) +{ + if(s) { + char *new_str = mad_alloc(n + 1, file, line); + strncpy(new_str, s, n); + new_str[n] = '\0'; + return new_str; + } else { + return NULL; + } +} + /* Frees a memory area. Used instead of free. */ void mad_free (void *ptr, char *file, int line) { int i; - + mad_check (file, line); if (watch_free_pointer && ptr == watch_free_pointer){ @@ -243,7 +267,7 @@ file, line); fflush (memlog); } - + if (ptr == NULL){ fprintf (memlog, "MAD: Attempted to free a NULL pointer in file \"%s\" at line %d.\r\n", file, line); @@ -251,23 +275,28 @@ return; } - for (i = 0; i < MAD_MAX_AREAS; i++){ - if (! mem_areas [i].in_use) - continue; - if (mem_areas [i].data == ptr) - break; - } - if (i >= MAD_MAX_AREAS){ - fprintf (memlog, "MAD: Attempted to free an unallocated pointer: %p.\r\n", ptr); - fprintf (memlog, " Discovered in file \"%s\" at line %d.\r\n", - file, line); - fprintf (memlog, "MAD: Aborting...\r\n"); - fflush (memlog); - abort (); - } - + /* Do a quick search in the neighborhood of Alloc_idx_hint. */ + for ( i = MAX(Alloc_idx_hint-100, 0); i <= Alloc_idx_hint; i++ ) + if ( mem_areas [i].data == ptr ) + goto found_it; + + for ( i = MIN(Alloc_idx_hint+100, MAD_MAX_AREAS-1); i > Alloc_idx_hint; i-- ) + if ( mem_areas [i].data == ptr ) + goto found_it; + + for (i = 0; i < MAD_MAX_AREAS; i++) + if ( mem_areas [i].data == ptr ) + goto found_it; + + mad_fatal_error("Attempted to free an unallocated pointer", ptr, file, line); + + found_it: g_free (mem_areas [i].start_sig); mem_areas [i].in_use = 0; + + mem_areas[i].data = NULL; /* Kill the pointer - no need to check .in_use above.*/ + if ( i < Alloc_idx_hint ) + Alloc_idx_hint = i; } char *mad_tempnam (char *a, char *b) @@ -275,8 +304,8 @@ char *t, *u; t = tempnam(a,b); /* This malloc's internal buffer.. */ u = mad_strdup(t, "(mad_tempnam)", 0); - free(t); - return u; + free(t); + return u; } /* Outputs a list of unfreed memory areas, @@ -284,7 +313,8 @@ void mad_finalize (char *file, int line) { int i; - + + Mad_check_call_delay = 0; mad_check (file, line); /* Following can be commented out if you don't want to see the @@ -300,6 +330,10 @@ file, line); fflush (memlog); } + fprintf(memlog, + "MAD: Stats -\n last_max_i:%d\n check_call_cnt:%ld\n", + Stats.last_max_i, Stats.check_call_cnt + ); #endif } @@ -312,15 +346,15 @@ if (!first) return 0; - + len = strlen (first) + 1; va_start (ap, first); while ((data = va_arg (ap, char *)) != 0) len += strlen (data); - result = g_malloc (len); - + result = mad_alloc(len, "(mad_strconcat)", 0); + va_end (ap); va_start (ap, first); @@ -334,7 +368,8 @@ return result; } -/* This two functions grabbed from GLib's gstrfuncs.c */ + +/* These two functions grabbed from GLib's gstrfuncs.c */ char* mad_strdup_vprintf (const char *format, va_list args1) { @@ -343,7 +378,7 @@ G_VA_COPY (args2, args1); - buffer = g_new (char, g_printf_string_upper_bound (format, args1)); + buffer = mad_alloc(g_printf_string_upper_bound(format, args1), "(mad_strdup_vprintf)", 0); vsprintf (buffer, format, args2); va_end (args2); @@ -358,7 +393,7 @@ va_list args; va_start (args, format); - buffer = g_strdup_vprintf (format, args); + buffer = mad_strdup_vprintf(format, args); va_end (args); return buffer; diff -ruN old/mc-4.5.44/src/mad.h new/mc-4.5.45/src/mad.h --- old/mc-4.5.44/src/mad.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/mad.h Tue May 9 18:52:03 2000 @@ -3,10 +3,10 @@ /* To prevent molesting these files with the malloc/calloc/free macros. */ #include -#include +#include #ifdef HAVE_MAD -# define INLINE +# define INLINE #else # ifndef INLINE # define INLINE inline @@ -33,11 +33,17 @@ #define calloc(x, y) mad_alloc ((x) * (y), __FILE__, __LINE__) #define realloc(x, y) mad_realloc (x, y, __FILE__, __LINE__) #define xmalloc(x, y) mad_alloc (x, __FILE__, __LINE__) -#undef strdup +#ifdef strdup +# undef strdup +#endif #define strdup(x) mad_strdup (x, __FILE__, __LINE__) +#ifdef strndup +# undef strndup +#endif +#define strndup(x, n) mad_strndup (x, n, __FILE__, __LINE__) #define free(x) mad_free (x, __FILE__, __LINE__) -/* This defenitions are grabbed from GLib.h */ +/* These definitions are grabbed from GLib.h */ #define g_new(type, count) \ ((type *) g_malloc ((unsigned) sizeof (type) * (count))) #define g_new0(type, count) \ @@ -50,6 +56,7 @@ #define g_calloc(x, y) mad_alloc ((x) * (y), __FILE__, __LINE__) #define g_realloc(x, y) mad_realloc (x, y, __FILE__, __LINE__) #define g_strdup(x) mad_strdup (x, __FILE__, __LINE__) +#define g_strndup(x, n) mad_strndup (x, n, __FILE__, __LINE__) #define g_free(x) mad_free (x, __FILE__, __LINE__) #define g_strconcat mad_strconcat #define g_strdup_printf mad_strdup_printf @@ -62,6 +69,7 @@ void *mad_alloc0 (int size, char *file, int line); void *mad_realloc (void *ptr, int newsize, char *file, int line); char *mad_strdup (const char *s, char *file, int line); +char *mad_strndup (const char *s, int n, char *file, int line); void mad_free (void *ptr, char *file, int line); void mad_finalize (char *file, int line); char *mad_tempnam (char *s1, char *s2); diff -ruN old/mc-4.5.44/src/main.c new/mc-4.5.45/src/main.c --- old/mc-4.5.44/src/main.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/main.c Tue May 9 18:52:04 2000 @@ -144,7 +144,7 @@ #include "gsession.h" #endif -/* "$Id: main.c,v 1.111 2000/02/23 07:43:16 norbert Exp $" */ +/* "$Id: main.c,v 1.112 2000/05/09 01:18:30 miguel 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 */ @@ -1287,7 +1287,7 @@ }; static menu_entry FileMenu [] = { - { ' ', N_("&User menu F2"), 'U', user_menu_cmd }, + { ' ', N_("&User menu F2"), 'U', user_file_menu_cmd }, { ' ', N_("&View F3"), 'V', view_cmd }, { ' ', N_("Vie&w file... "), 'W', view_file_cmd }, { ' ', N_("&Filtered view M-!"), 'F', filtered_view_cmd }, @@ -1345,8 +1345,10 @@ #ifdef VERSION_4 { ' ', N_("&Listing format edit"), 'L', listmode_cmd}, #endif + { ' ', "", ' ', 0 }, { ' ', N_("&Extension file edit"), 'E', ext_cmd }, - { ' ', N_("&Menu file edit"), 'M', menu_edit_cmd } + { ' ', N_("&Menu file edit"), 'M', menu_edit_cmd }, + {' ', N_("Menu edi&Tor edit"), 'T', edit_user_menu_cmd} }; /* Must keep in sync with the constants in menu_cmd */ @@ -1719,7 +1721,7 @@ init_labels (Widget *paneletc) { define_label (midnight_dlg, paneletc, 1, _("Help"), help_cmd); - define_label (midnight_dlg, paneletc, 2, _("Menu"), user_menu_cmd); + define_label (midnight_dlg, paneletc, 2, _("Menu"), user_file_menu_cmd); define_label (midnight_dlg, paneletc, 9, _("PullDn"), menu_cmd); define_label (midnight_dlg, paneletc, 10, _("Quit"), (voidfn) quit_cmd); } @@ -2196,7 +2198,6 @@ } #ifdef USE_INTERNAL_EDIT -void edit (const char *file_name, int startline); static int mc_maybe_editor_or_viewer (void) @@ -2275,17 +2276,24 @@ static void version (int verbose) { + char *str; + fprintf (stderr, "The Midnight Commander %s\n", VERSION); if (!verbose) return; #ifndef HAVE_X - fprintf (stderr, - _("with mouse support on xterm%s.\n"), - status_mouse_support ? _(" and the Linux console") : ""); + fprintf (stderr, status_mouse_support ? + _("with mouse support on xterm and the Linux console.\n") : + _("with mouse support on xterm.\n")); #endif /* HAVE_X */ for (verbose = 0; features [verbose]; verbose++) fprintf (stderr, _(features [verbose])); + + str = guess_message_value (1); + fprintf (stderr, "%s\n", str); + g_free (str); + if (print_last_wd) write (stdout_fd, ".", 1); } @@ -2524,7 +2532,8 @@ #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"), + "-x, --xterm Force xterm mouse support and screen save/restore.\n" + "+number number it is the start line number of file for `mcedit'.\n"), #ifdef HAVE_SUBSHELL_SUPPORT N_("-X, --dbgsubshell [DEVEL-ONLY: Debug the subshell].\n"), #endif @@ -3004,9 +3013,10 @@ /* mc_home was computed by OS_Setup */ home_dir = mc_home; } - + vfs_init (); - + edit_init_file(); + #ifdef HAVE_X /* NOTE: This call has to be before any our argument handling :) */ diff -ruN old/mc-4.5.44/src/main.h new/mc-4.5.45/src/main.h --- old/mc-4.5.44/src/main.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/main.h Tue May 9 18:52:03 2000 @@ -46,6 +46,7 @@ extern int use_internal_view; extern int use_internal_edit; #ifdef USE_INTERNAL_EDIT +extern int edit (const char *file, int line); extern int option_word_wrap_line_length; extern int edit_key_emulation; extern int option_tab_spacing; @@ -161,6 +162,8 @@ void load_hint (void); void print_vfs_message(char *msg, ...); + +void edit_user_menu_cmd (void); extern char *prompt; extern char *mc_home; diff -ruN old/mc-4.5.44/src/mc.hlp new/mc-4.5.45/src/mc.hlp --- old/mc-4.5.44/src/mc.hlp Tue Apr 4 23:31:58 2000 +++ new/mc-4.5.45/src/mc.hlp Tue May 9 18:52:05 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 -attacks in a world writable /tmp. +attachs in a world writable /tmp. "-s" Turns on the slow terminal mode, in this mode the program will not draw expensive line drawing characters @@ -1238,12 +1238,15 @@ Sub-condition is one of following: + y syntax of current file matching pattern? + for edit menu only. f current file matching pattern? F other file matching pattern? d current directory matching pattern? D other directory matching pattern? t current file of type? T other file of type? + x is it executable filename? ! negate the result of sub-condition Pattern is a normal shell pattern or a regular expression, @@ -1310,7 +1313,7 @@ The Midnight Commander has some options that may be toggled on and off in several dialogs which are accessible -from this menu. Options are enabled if they have an +from this menue. 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 +1359,7 @@ either C-t or the Insert key) the selection bar will move down. -Drop down menus. When this option is enabled, when you +Drop down menues. 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 +1477,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 -directories has to be confirmed by entering the word yes -By default this option is disabled. +direcories has to be confirmed by entering the word yes By +default this option is disabled. [Display bits] Display bits @@ -1543,7 +1546,7 @@ directory listings fetched from ftp servers). Moreover in order to access the contents of compressed -files (for example, compressed tar files) the Midnight +files (for eaxample, compressed tar files) the Midnight Commander has to create a temporary uncompressed file on your disk. @@ -1701,8 +1704,23 @@ The macros are: +"%i" The indent of blank space, equal the cursor column + position. For edit menu only. + +"%y" The syntax type of current file. For edit menu only. + +"%k" The block file name. + +"%e" The error file name. + +"%m" The current menu name. + "%f" The current file name. +"%n" Only the current file name without extension. + +"%x" The extension of current file name. + "%d" The current directory name. "%F" The current file in the unselected panel. @@ -1738,7 +1756,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; unformatted to tell the +and underline sequences of nroff; unformated to tell the viewer to not interpret nroff commands for making the text bold or underlined. @@ -2158,24 +2176,21 @@ executed if you press Meta, Ctrl, or Esc and the assigned key, provided that the key is not used for any other function. Once defined, the macro commands go into the -file cedit/cooledit.macros in your home directory. You can +file ~/.cedit/cooledit.macros in your home directory. You can delete a macro by deleting the appropriate line in this file. -F19 will format C code when it is highlighted. For this to -work, make an executable file called cedit/edit.indent.rc -in your home directory containing the following: - -#!/bin/sh -/usr/bin/indent -kr -pcs ~/cedit/cooledit.block >& /dev/null -cat /dev/null > ~/cedit/cooledit.error +F19 will format text (C , C++ code or another) when it is +block highlighted. For this to work, first time, will create +executable file called ~/.cedit/edit.indent.rc in your +home directory. To edit this script if needed. You can use scanf search and replace to search and replace 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 occurrences of say, an open bracket, three -comma separated numbers, and a close bracket, with the +replace all occurences of say, an open bracket, three +comma seperated 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,10 +2297,9 @@ 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 recommended (nor keeping this -in your hotlist, unless you set the appropriate -permissions there, and then, it may not be entirely safe -anyways). +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). Examples: @@ -2563,7 +2577,7 @@ ftpfs_use_passive_connections. This option is by off default. This makes the ftpfs code use the passive open -mode for transferring files. This is used by people that +mode for transfering 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.44/src/screen.c new/mc-4.5.45/src/screen.c --- old/mc-4.5.44/src/screen.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/screen.c Tue May 9 18:52:04 2000 @@ -224,7 +224,7 @@ static char buffer [BUF_TINY]; if (S_ISDIR (fe->buf.st_mode)){ - strcpy (buffer, (strcmp (fe->fname, "..") ? "SUB-DIR" : "UP--DIR")); + strcpy (buffer, _(strcmp (fe->fname, "..") ? N_("SUB-DIR") : N_("UP--DIR"))); return buffer; } @@ -2112,12 +2112,11 @@ { char *tmp = name_quote (fe->fname, 0); char *cmd = g_strconcat (".", PATH_SEP_STR, tmp, NULL); + g_free (tmp); if (!confirm_execute || (query_dialog (_(" The Midnight Commander "), _(" Do you really want to execute? "), 0, 2, _("Yes"), _("No")) == 0)) execute (cmd); - - g_free (tmp); g_free (cmd); } #ifdef USE_VFS @@ -2160,11 +2159,11 @@ { char *tmp = name_quote (fe->fname, 0); char *cmd = g_strconcat (".", PATH_SEP_STR, tmp, NULL); + g_free (tmp); if (!confirm_execute || (query_dialog (_(" The Midnight Commander "), _(" Do you really want to execute? "), 0, 2, _("&Yes"), _("&No")) == 0)) execute (cmd); - g_free (tmp); g_free (cmd); } #ifdef USE_VFS @@ -2268,7 +2267,7 @@ } } -static key_map panel_keymap [] = { +static const key_map panel_keymap [] = { { KEY_DOWN, move_down }, { KEY_UP, move_up }, @@ -2386,6 +2385,8 @@ return 0; } +void user_file_menu_cmd (void) { user_menu_cmd (NULL); } + static int panel_callback (Dlg_head *h, WPanel *panel, int msg, int par) { @@ -2393,7 +2394,7 @@ case WIDGET_INIT: #ifdef HAVE_X define_label (h, (Widget *)panel, 1, _("Help"), help_cmd); - define_label (h, (Widget *)panel, 2, _("Menu"), user_menu_cmd); + define_label (h, (Widget *)panel, 2, _("Menu"), user_file_menu_cmd); define_label (h, (Widget *)panel, 3, _("View"), view_panel_cmd); define_label (h, (Widget *)panel, 4, _("Edit"), edit_panel_cmd); define_label (h, (Widget *)panel, 5, _("Copy"), copy_cmd); @@ -2414,7 +2415,7 @@ #endif panel->active = 1; if (mc_chdir (panel->cwd) != 0){ - message (1, _(" Error "), _(" Can't chdir to %s \n %s "), + message (1, MSG_ERROR, _(" Can't chdir to \"%s\" \n %s "), panel->cwd, unix_error_string (errno)); } else subshell_chdir (panel->cwd); @@ -2423,7 +2424,7 @@ focus_select_item (panel); #ifndef HAVE_X define_label (h, (Widget *)panel, 1, _("Help"), help_cmd); - define_label (h, (Widget *)panel, 2, _("Menu"), user_menu_cmd); + define_label (h, (Widget *)panel, 2, _("Menu"), user_file_menu_cmd); define_label (h, (Widget *)panel, 3, _("View"), view_panel_cmd); define_label (h, (Widget *)panel, 4, _("Edit"), edit_panel_cmd); define_label (h, (Widget *)panel, 5, _("Copy"), copy_cmd); diff -ruN old/mc-4.5.44/src/setup.c new/mc-4.5.45/src/setup.c --- old/mc-4.5.44/src/setup.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/setup.c Tue May 9 18:52:04 2000 @@ -70,7 +70,7 @@ int use_magic = 0; #endif -/* "$Id: setup.c,v 1.36 2000/02/11 00:33:28 pavel Exp $" */ +/* "$Id: setup.c,v 1.37 2000/04/14 01:19:58 timur Exp $" */ #ifdef USE_VFS extern int vfs_timeout; @@ -527,10 +527,10 @@ static char * do_load_string (char *s, char *ss, char *def) { - char *buffer = g_malloc (128); + char *buffer = g_malloc (BUF_SMALL); char *p; - load_string (s, ss, def, buffer, 128); + load_string (s, ss, def, buffer, BUF_SMALL); p = g_strdup (buffer); g_free (buffer); diff -ruN old/mc-4.5.44/src/user.c new/mc-4.5.45/src/user.c --- old/mc-4.5.44/src/user.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/user.c Tue May 9 18:52:04 2000 @@ -31,6 +31,7 @@ #include "dir.h" #include "panel.h" #include "main.h" +#include "subshell.h" /* for subshell_pty */ #include "user.h" #include "layout.h" #include "setup.h" @@ -43,13 +44,15 @@ #include "view.h" /* for default_* externs */ -/* "$Id: user.c,v 1.15 1999/11/01 20:49:03 unammx Exp $" */ +/* "$Id: user.c,v 1.16 2000/05/09 01:18:30 miguel Exp $" */ #define MAX_ENTRIES 16 #define MAX_ENTRY_LEN 60 static int debug_flag = 0; static int debug_error = 0; +static WEdit *s_editwidget; +static char *menu; /* Formats defined: %% The % character @@ -203,9 +206,27 @@ case 'f': case 'p': return (*quote_func) (fname, 0); case 'b': return strip_ext((*quote_func) (fname, 0)); + case 'x': return (*quote_func) (extension(fname), 0); case 'd': return (*quote_func) (panel->cwd, 0); case 's': if (!panel->marked) return (*quote_func) (fname, 0); + case 'i': /* indent equal number cursor position in line */ + if (s_editwidget) + return g_strnfill (s_editwidget->curs_col, ' '); + break; + case 'y': /* syntax type */ + if (s_editwidget) + return g_strdup (s_editwidget->syntax_type); + break; + case 'e': + /* error file name */ + return (*quote_func) (g_strconcat (home_dir, ERROR_FILE, NULL), 0); + case 'k': + /* block file name */ + return (*quote_func) (g_strconcat (home_dir, BLOCK_FILE, NULL), 0); + case 'm': + /* menu file name */ + return (*quote_func) (menu, 0); /* Fall through */ @@ -259,7 +280,8 @@ { while (*p && (*p == ' ' || *p == '\t' || *p == '\n')) p++; - while (*p && *p != ' ' && *p != '\t' && *p != '\n') + /* support quote space .mnu */ + while (*p && (*p != ' ' || *(p-1) == '\\') && *p != '\t' && *p != '\n') *arg++ = *p++; *arg = 0; if (!*p || *p == '\n') @@ -323,7 +345,8 @@ /* Handle one condition */ for (;*p != '\n' && *p != '&' && *p != '|'; p++){ - if (*p == ' ' || *p == '\t') + /* support quote space .mnu */ + if ((*p == ' ' && *(p-1) != '\\') || *p == '\t') continue; if (*p >= 'a') panel = cpanel; @@ -341,10 +364,17 @@ *condition = ! *condition; p--; break; - case 'f': + case 'f': /* file name pattern */ p = extract_arg (p, arg); *condition = panel && regexp_match (arg, panel->dir.list [panel->selected].fname, match_file); break; + case 'y': /* syntax pattern */ + if (s_editwidget) { + p = extract_arg (p, arg); + *condition = panel && + regexp_match (arg, s_editwidget->syntax_type, match_normal); + } + break; case 'd': p = extract_arg (p, arg); *condition = panel && regexp_match (arg, panel->cwd, match_file); @@ -353,6 +383,17 @@ p = extract_arg (p, arg); *condition = panel && test_type (panel, arg); break; + case 'x': /* executable */ + { + struct stat status; + + p = extract_arg (p, arg); + if (stat (arg, &status) == 0) + *condition = is_exe (status.st_mode); + else + *condition = 0; + break; + } default: debug_error = 1; break; @@ -424,8 +465,9 @@ /* Init debugger */ debug_out (NULL, NULL, 0); /* Repeat till end of line */ - while (*p && *p != '\n'){ - while (*p == ' ' || *p == '\t') + while (*p && *p != '\n') { + /* support quote space .mnu */ + while ((*p == ' ' && *(p-1) != '\\' ) || *p == '\t') p++; if (!*p || *p == '\n') break; @@ -434,7 +476,8 @@ debug_flag = 1; p++; } - while (*p == ' ' || *p == '\t') + /* support quote space .mnu */ + while ((*p == ' ' && *(p-1) != '\\' ) || *p == '\t') p++; if (!*p || *p == '\n') break; @@ -482,7 +525,7 @@ int cmd_file_fd; int expand_prefix_found = 0; char *parameter = 0; - int do_quote; + int do_quote = 0; char prompt [80]; int col; char *file_name; @@ -608,14 +651,19 @@ return 0; } -void user_menu_cmd (void) +/* + if edit_widget = pointer then it is file menu from cool edit + if edit_widget = NULL then routine is invoke from file menu of mc. +*/ +void user_menu_cmd (WEdit *edit_widget) { - char *menu, *p; + char *p; char *data, **entries; int max_cols, menu_lines, menu_limit; int col, i, accept_entry = 1; int selected, old_patterns; Listbox *listbox; + s_editwidget = edit_widget; if (!vfs_current_is_local ()){ message (1, _(" Oops... "), @@ -623,13 +671,15 @@ return; } - menu = g_strdup (MC_LOCAL_MENU); + menu = g_strdup (edit_widget ? CEDIT_LOCAL_MENU : MC_LOCAL_MENU); if (!exist_file (menu) || !menu_file_own (menu)){ g_free (menu); - menu = concat_dir_and_file (home_dir, MC_HOME_MENU); + menu = concat_dir_and_file \ + (home_dir, edit_widget ? CEDIT_HOME_MENU : MC_HOME_MENU); if (!exist_file (menu)){ g_free (menu); - menu = concat_dir_and_file (mc_home, MC_GLOBAL_MENU); + menu = concat_dir_and_file \ + (mc_home, edit_widget ? CEDIT_GLOBAL_MENU : MC_GLOBAL_MENU); } } @@ -722,7 +772,6 @@ easy_patterns = old_patterns; return; } - g_free (menu); max_cols = min (max (max_cols, col), MAX_ENTRY_LEN); @@ -745,6 +794,7 @@ easy_patterns = old_patterns; do_refresh (); + g_free (menu); g_free (entries); g_free (data); } diff -ruN old/mc-4.5.44/src/user.h new/mc-4.5.45/src/user.h --- old/mc-4.5.44/src/user.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/user.h Tue May 9 18:52:03 2000 @@ -1,7 +1,14 @@ #ifndef __USER_H #define __USER_H -void user_menu_cmd (void); +#ifndef MIDNIGHT +#include "panel.h" +#define MIDNIGHT +#include "../gtkedit/edit-widget.h" +#undef MIDNIGHT +void user_menu_cmd (WEdit *edit_widget); +#endif + char *expand_format (char, int); int check_format_view (const char *); int check_format_var (const char *, char **); @@ -9,15 +16,21 @@ char *check_patterns (char*); #ifdef OS2_NT -# define MC_LOCAL_MENU "mc.mnu" -# define MC_GLOBAL_MENU "mc.mnu" -# define MC_HOME_MENU "mc.mnu" -# define MC_HINT "mc.hnt" +# define CEDIT_LOCAL_MENU "cedit.mnu" +# define CEDIT_GLOBAL_MENU "cedit.mnu" +# define CEDIT_HOME_MENU "cedit.mnu" +# define MC_LOCAL_MENU "mc.mnu" +# define MC_GLOBAL_MENU "mc.mnu" +# define MC_HOME_MENU "mc.mnu" +# define MC_HINT "mc.hnt" #else -# define MC_GLOBAL_MENU "mc.menu" -# define MC_LOCAL_MENU ".mc.menu" -# define MC_HOME_MENU ".mc/menu" -# define MC_HINT "mc.hint" +# define CEDIT_GLOBAL_MENU "cedit.menu" +# define CEDIT_LOCAL_MENU ".cedit.menu" +# define CEDIT_HOME_MENU ".cedit/menu" +# define MC_GLOBAL_MENU "mc.menu" +# define MC_LOCAL_MENU ".mc.menu" +# define MC_HOME_MENU ".mc/menu" +# define MC_HINT "mc.hint" #endif #endif diff -ruN old/mc-4.5.44/src/util.h new/mc-4.5.45/src/util.h --- old/mc-4.5.44/src/util.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/util.h Tue May 9 18:52:03 2000 @@ -113,7 +113,7 @@ extern struct sigaction startup_handler; /* Tilde expansion */ -char *tilde_expand (char *); +char *tilde_expand (const char *); /* Pathname canonicalization */ char *canonicalize_pathname (char *); diff -ruN old/mc-4.5.44/src/utilunix.c new/mc-4.5.45/src/utilunix.c --- old/mc-4.5.44/src/utilunix.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/utilunix.c Tue May 9 18:52:04 2000 @@ -63,7 +63,6 @@ #endif #include "global.h" #include "fsusage.h" -#include "fsusage.h" #include "mountlist.h" #include "dialog.h" /* message() */ #include "../vfs/vfs.h" /* mc_read() */ @@ -320,12 +319,11 @@ #endif /* Returns a newly allocated string, if directory does not exist, return 0 */ -char *tilde_expand (char *directory) +char *tilde_expand (const char *directory) { struct passwd *passwd; - char *p; + const char *p; char *name; - int len; if (*directory != '~') return g_strdup (directory); @@ -340,14 +338,13 @@ p = (*directory == PATH_SEP) ? directory+1 : ""; } else { if (!p){ - p = ""; passwd = getpwnam (directory); } else { name = g_malloc (p - directory + 1); strncpy (name, directory, p - directory); name [p - directory] = 0; passwd = getpwnam (name); - g_free (name); + g_free (name); } } @@ -355,12 +352,7 @@ if (!passwd) return 0; - len = strlen (passwd->pw_dir) + strlen (p) + 2; - directory = g_malloc (len); - strcpy (directory, passwd->pw_dir); - strcat (directory, PATH_SEP_STR); - strcat (directory, p); - return directory; + return g_strconcat (passwd->pw_dir, PATH_SEP_STR, p, NULL); } #ifndef VFS_STANDALONE @@ -411,7 +403,7 @@ if (error) title = MSG_ERROR; else - title = " Warning "; + title = _(" Warning "); if (old_error >= 0){ close (2); dup (old_error); @@ -601,9 +593,7 @@ /* Walk along path looking for things to compact. */ i = 0; - for (;;) { - if (!path[i]) - break; + while (path[i]) { while (path[i] && path[i] != PATH_SEP) i++; diff -ruN old/mc-4.5.44/src/view.c new/mc-4.5.45/src/view.c --- old/mc-4.5.44/src/view.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/view.c Tue May 9 18:52:04 2000 @@ -121,7 +121,7 @@ int altered_nroff_flag = 0; /* }}} */ -/* "$Id: view.c,v 1.39 1999/12/22 04:04:23 proskin Exp $" */ +/* "$Id: view.c,v 1.40 2000/04/18 08:58:42 pavel Exp $" */ static const char hex_char[] = "0123456789ABCDEF"; @@ -304,11 +304,8 @@ /* Has there been a change at this position ? */ node = view->change_list; - while (node) { - if (node->offset != view->edit_cursor) - node = node->next; - else - break; + while (node && (node->offset != view->edit_cursor)) { + node = node->next; } if (view->view_side == view_side_left) { @@ -532,7 +529,7 @@ /* Return zero on success, -1 on failure */ static int -do_view_init (WView *view, char *_command, char *_file, int start_line) +do_view_init (WView *view, char *_command, const char *_file, int start_line) { char *error = 0; int i, type; @@ -667,7 +664,7 @@ /* Both views */ /* Return zero on success, -1 on failure */ int -view_init (WView *view, char *_command, char *_file, int start_line) +view_init (WView *view, char *_command, const char *_file, int start_line) { view_update_bytes_per_line(view); @@ -2408,7 +2405,7 @@ /* Real view only */ int -view (char *_command, char *_file, int *move_dir_p, int start_line) +view (char *_command, const char *_file, int *move_dir_p, int start_line) { int midnight_colors [4]; int error; @@ -2491,9 +2488,8 @@ } static int -view_callback (Dlg_head *h, WView *v, int msg, int par) +view_callback (Dlg_head *h, WView *view, int msg, int par) { - WView *view = (WView *) v; int i; switch (msg){ diff -ruN old/mc-4.5.44/src/view.h new/mc-4.5.45/src/view.h --- old/mc-4.5.44/src/view.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/view.h Tue May 9 18:52:03 2000 @@ -103,7 +103,7 @@ /* Creation/initialization of a new view widget */ WView *view_new (int y, int x, int cols, int lines, int is_panel); -int view_init (WView *view, char *_command, char *_file, int start_line); +int view_init (WView *view, char *_command, const char *_file, int start_line); void view_update_bytes_per_line(WView *view); int view_file (char *filename, int normal, int internal); @@ -129,7 +129,7 @@ /* Command: view a file, if _command != NULL we use popen on _command */ /* move direction should be apointer that will hold the direction in which the user */ /* wants to move (-1 previous file, 1 next file, 0 do nothing) */ -int view (char *_command, char *_file, int *move_direction, int start_line); +int view (char *_command, const char *_file, int *move_direction, int start_line); extern int mouse_move_pages_viewer; extern int max_dirt_limit; diff -ruN old/mc-4.5.44/src/widget.c new/mc-4.5.45/src/widget.c --- old/mc-4.5.44/src/widget.c Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/widget.c Tue May 9 18:52:04 2000 @@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* "$Id: widget.c,v 1.35 2000/02/03 15:00:12 pavel Exp $" */ +/* "$Id: widget.c,v 1.39 2000/04/18 08:58:42 pavel Exp $" */ #include #include @@ -79,7 +79,7 @@ button_callback (Dlg_head *h, WButton *b, int Msg, int Par) { #ifndef HAVE_X - char *txt, buf[BUF_SMALL]; + char buf[BUF_SMALL]; #endif int stop = 0; int off = 0; @@ -154,12 +154,11 @@ off = 0; break; } - txt = buf; attrset ((b->selected) ? FOCUSC : NORMALC); widget_move (&b->widget, 0, 0); - addstr (txt); + addstr (buf); if (b->hotpos >= 0){ attrset ((b->selected) ? HOT_FOCUSC : HOT_NORMALC); @@ -927,9 +926,9 @@ return new; /* return pointer to last entry in list */ } -#ifdef PORT_WIDGET_WANTS_HISTORY void history_put (char *input_name, Hist *h) { +#ifdef PORT_WIDGET_WANTS_HISTORY int i; char *profile; @@ -950,8 +949,10 @@ if ((i = open (profile, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR)) != -1) close (i); /* Just in case I forgot to strip passwords somewhere -- Norbert */ - if (chmod (profile, S_IRUSR | S_IWUSR) == -1 && errno != ENOENT) + if (chmod (profile, S_IRUSR | S_IWUSR) == -1 && errno != ENOENT){ + g_free (profile); return; + } while (h->next) /* go to end of list */ h = h->next; @@ -959,7 +960,6 @@ /* go back 60 places */ for (i = 0; i < num_history_items_recorded - 1 && h->prev; i++) h = h->prev; - i = 0; if (input_name) profile_clean_section (input_name, profile); @@ -978,12 +978,8 @@ h = h->next; } g_free (profile); -} -#else -void history_put (char *input_name, Hist *h) -{ -} #endif +} /* }}} history saving and loading */ @@ -1164,9 +1160,9 @@ /* input widget where urls with passwords are entered without any vfs prefix */ static const char *password_input_fields[] = { - " Link to a remote machine ", - " FTP to machine ", - " SMB link to machine " + N_(" Link to a remote machine "), + N_(" FTP to machine "), + N_(" SMB link to machine ") }; Hist *new; char *p; @@ -1285,24 +1281,26 @@ static void forward_word (WInput *in) { - char *p = in->buffer+in->point; - - while ((*p && isspace (*p)) || ispunct (*p)) - p++; + unsigned char *p = in->buffer+in->point; + + /* We really want to delete either words or separators */ while (*p && isalnum (*p)) - p++; + p++; + while (*p && (isspace (*p) || ispunct (*p))) + p++; in->point = p - in->buffer; } static void backward_word (WInput *in) { - char *p = in->buffer+in->point; + unsigned char *p = in->buffer+in->point; - while (p-1 > in->buffer-1 && (isspace (*(p-1)) || ispunct (*(p-1)))) - p--; + /* We really want to delete either words or separators */ while (p-1 > in->buffer-1 && isalnum (*(p-1))) - p--; + p--; + while (p-1 > in->buffer-1 && (isspace (*(p-1)) || ispunct (*(p-1)))) + p--; in->point = p - in->buffer; } @@ -1508,7 +1506,7 @@ in->need_push = 0; } -static struct { +static const struct { int key_code; void (*fn)(WInput *in); } input_map [] = { @@ -1750,7 +1748,7 @@ } if (!def_text) - def_text=""; + def_text = ""; if (def_text == INPUT_LAST_TEXT) { def_text = ""; @@ -1839,14 +1837,13 @@ WLEntry *e; int i; int sel_line; - int normalc, selc; + int normalc = NORMALC; + int selc; char *text; if (focused){ - normalc = NORMALC; selc = FOCUSC; } else { - normalc = NORMALC; selc = HOT_FOCUSC; } sel_line = -1; diff -ruN old/mc-4.5.44/src/widget.h new/mc-4.5.45/src/widget.h --- old/mc-4.5.44/src/widget.h Tue Apr 4 23:31:57 2000 +++ new/mc-4.5.45/src/widget.h Tue May 9 18:52:03 2000 @@ -79,7 +79,7 @@ int first; /* Is first keystroke? */ int disable_update; /* Do we want to skip updates? */ int is_password; /* Is this a password input line? */ - char *buffer; /* pointer to editing buffer */ + unsigned char *buffer; /* pointer to editing buffer */ Hist *history; /* The history */ int need_push; /* need to push the current Input on hist? */ char **completions; /* Possible completions array */ diff -ruN old/mc-4.5.44/syntax/perl.syntax new/mc-4.5.45/syntax/perl.syntax --- old/mc-4.5.44/syntax/perl.syntax Tue Apr 4 23:32:00 2000 +++ new/mc-4.5.45/syntax/perl.syntax Tue May 9 18:52:07 2000 @@ -109,6 +109,9 @@ keyword \\" brightred/18 keyword \\' brightred/18 + keyword whole and magenta/23 + keyword whole or magenta/23 + keyword whole not magenta/23 keyword whole do magenta/23 keyword whole if magenta/23 keyword whole until magenta/23 @@ -117,6 +120,7 @@ keyword whole unless magenta/23 keyword whole while magenta/23 keyword whole foreach magenta/23 + keyword whole for magenta/23 keyword whole goto magenta/23 keyword whole last magenta/23 keyword whole next magenta/23 diff -ruN old/mc-4.5.44/vfs/ChangeLog new/mc-4.5.45/vfs/ChangeLog --- old/mc-4.5.44/vfs/ChangeLog Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/ChangeLog Tue May 9 18:52:01 2000 @@ -1,3 +1,92 @@ +2000-05-08 Valery Kornienkov + + vfs/extfs/uha.in: add HSC type archives + +2000-05-01 Pavel Machek + + * direntry.c (vfs_s_inode_from_path): fix for stating / directory + done properly + + * vfs.c: == 0 is right test of eof. + +2000-04-28 Pavel Machek + + * direntry.c (vfs_s_internal_stat): added ugly special case for / + of archive to always exist. It seems I'm hiding some underlying + problem :-(. + +2000-04-26 Andrew V. Samoilov + + * direntry.c (vfs_s_find_entry_tree): segfault fixed when root is NULL + + (vfs_s_new_inode, vfs_s_new_entry): g_new replaced by g_new0 + + * ftpfs.c (dir_load): ent->name is free()d for "." and ".." + + (ftpfs_directory_timeout): default value changed to 900 + + (netrc_next): "const char * const keywords" go to rodata and is shared + +2000-04-16 Pavel Machek + + * vfs.c (vfs_type): FL_NO_LOCALHASH for prevention of obscure + deadlocks with podfuk + + * direntry.c: fix behaviour when stating / directory of ftp + archive + +2000-04-15 Timur Bakeyev + + * ftpfs.c (netrc_next): "const char * keywords" is pretty nice. + + * ftpfs.c (dir_load): At last, found place, that broke handling + directories with spaces in name. Problem was in prepending "/" + to "." for current directory. Which was, obviously, wrong. Hacked + to make just "LIST -la ." instead. + +2000-04-12 Pavel Machek + + * extfs/lslR.in: Patch by tnovak@ipex.cz: allow spaces in filenames + +2000-04-10 Pavel Machek + + * extfs/audio: Added a way to browse audio CDs conviently + + * undelfs.c: use NULLs instead of 0s when you assign to pointers! + +2000-04-05 Andrew V. Samoilov + + * utilfs.c (vfs_split_url): don't assign *pass if pass is NULL + * fish.c (archive_open, archive_same): memory allocated by + vfs_split_url () must be released after use, don't strdup() + values allocated by vfs_split_url () and NULL passed to + vfs_split_url () when password value is unused + * ftpfs.c (archive_open, archive_same): ditto plus same for + ftpfs_get_proxy_host_and_port () + +2000-04-06 Timur Bakeyev + + * ftpfs.c (netrc_next): Turned strange "const char * const keywords" + into more alike "const char const * keywords". Still, think, it's + too strict. + + * smbfs.c: Add #define BOOL_DEFINED before inclusion of samba headers. + Libncurses(or slang?) defines BOOL and that can cause problems. (In fact, + I can't find references to that const, but sure, I hade reason to do that:) + + * util-alone.h: Declare load_anon_passwd() to avoid warnings. + +2000-03-31 Andrew V. Samoilov + + * vfs.c (mc_def_getlocalcopy): free() replaced by g_free() to prevent + crushes with mad, thanks to Timur I. Bakeyev + * fish.c (linear_start): name wasn't freed after usage + * cpio.c (cpio_ungetlocalcopy): return type changed to int, + function return 0 now + * direntry.c (vfs_s_close, vfs_s_resolve_symlink): memory, allocated + by vfs_s_fullpath () is freed after use + * ftpfs.c (linear_start): ditto; + 2000-04-03 Pavel Machek * ftpfs.c (send_ftp_command): return from vfs_s_get_path_mangle is @@ -105,6 +194,11 @@ "filename". * From debian: added deba, debd, dpkg, apt script file systems. + +1999-12-28 Andrew V. Samoilov + + * vfs.c (vfs_parse_filedate): don't decode last columns as year + 1999-12-21 Pavel Roskin diff -ruN old/mc-4.5.44/vfs/cpio.c new/mc-4.5.45/vfs/cpio.c --- old/mc-4.5.44/vfs/cpio.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/cpio.c Tue May 9 18:52:01 2000 @@ -3,7 +3,7 @@ Written by: 2000 Jan Hudec - $Id: cpio.c,v 1.4 2000/02/25 12:53:06 pavel Exp $ + $Id: cpio.c,v 1.5 2000/04/05 13:08:43 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 @@ -31,7 +31,7 @@ /* #include "utilvfs.h" */ #include "../src/dialog.h" -//#include "cpio.h" +/* #include "cpio.h" */ #include "names.h" enum { @@ -574,10 +574,11 @@ return count; } -static void cpio_ungetlocalcopy(vfs *me, char *path, char *local, int has_changed) +static int 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 */ + return 0; } static int cpio_fh_open(vfs *me, vfs_s_fh *fh, int flags, int mode) diff -ruN old/mc-4.5.44/vfs/direntry.c new/mc-4.5.45/vfs/direntry.c --- old/mc-4.5.44/vfs/direntry.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/direntry.c Tue May 9 18:52:01 2000 @@ -3,7 +3,7 @@ * * Written at 1998 by Pavel Machek , distribute under LGPL. * - * $Id: direntry.c,v 1.27 2000/01/31 13:48:00 pavel Exp $ + * $Id: direntry.c,v 1.32 2000/05/03 19:10:52 pavel Exp $ * * Very loosely based on tar.c from midnight and archives.[ch] from * avfs by Miklos Szeredi (mszeredi@inf.bme.hu) @@ -39,18 +39,13 @@ { vfs_s_inode *ino; - ino = g_new (vfs_s_inode, 1); + ino = g_new0 (vfs_s_inode, 1); if (!ino) return NULL; - ino->linkname = ino->localname = NULL; - ino->subdir = NULL; if (initstat) ino->st = *initstat; ino->super = super; - ino->ent = NULL; - ino->flags = 0; - ino->st.st_nlink = 0; ino->st.st_ino = MEDATA->inode_counter++; ino->st.st_dev = MEDATA->rdev; @@ -67,16 +62,12 @@ { vfs_s_entry *entry; - entry = g_new (struct vfs_s_entry, 1); + entry = g_new0 (struct vfs_s_entry, 1); total_entries++; if (name) entry->name = g_strdup (name); - else - entry->name = NULL; - entry->dir = NULL; - entry->next = NULL; - entry->prevp = NULL; + entry->ino = inode; entry->ino->ent = entry; CALL (init_entry) (me, entry); @@ -229,17 +220,16 @@ { unsigned int pseg; vfs_s_entry *ent = NULL; - int found; char p[MC_MAXPATHLEN] = ""; - while (1){ + while (root){ int t; - for (pseg = 0; path [pseg] == PATH_SEP; pseg++) - ; - if (!path [pseg]) + while (*path == PATH_SEP) /* Strip leading '/' */ + path++; + + if (!path [0]) return ent; - path += pseg; for (pseg = 0; path[pseg] && path[pseg] != PATH_SEP; pseg++) ; @@ -248,7 +238,6 @@ strncpy (p + (t = strlen (p)), path, pseg); p[t + pseg] = '\0'; - found = 0; for (ent = root->subdir; ent != NULL; ent = ent->next) if (strlen (ent->name) == pseg && (!strncmp (ent->name, path, pseg))) /* FOUND! */ @@ -263,6 +252,8 @@ return NULL; root = ent->ino; } + + return NULL; } static void @@ -278,10 +269,7 @@ *save = s; *dir = path; *s++ = 0; - if (!*s) /* This can happen if someone does stat("/"); */ - *name = ""; - else - *name = s; + *name = s; } } @@ -376,7 +364,9 @@ if (*linkname == PATH_SEP) return (MEDATA->find_entry) (me, entry->dir->super->root, linkname, follow - 1, 0); else { /* FIXME: this does not work */ - sprintf(buf, "%s/%s", vfs_s_fullpath(me, entry->dir), linkname); + char *fullpath = vfs_s_fullpath(me, entry->dir); + sprintf(buf, "%s/%s", fullpath, linkname); + g_free (fullpath); return (MEDATA->find_entry) (me, entry->dir->super->root, buf, follow - 1, 0); } } @@ -411,10 +401,6 @@ vfs_s_super *super; super = g_new0 (struct vfs_s_super, 1); - super->root = NULL; - super->name = NULL; - super->fd_usage = 0; - super->ino_usage = 0; super->me = me; return super; } @@ -486,7 +472,7 @@ char *local, *op, *archive_name; int result = -1; struct vfs_s_super *super; - void *cookie; + void *cookie = NULL; archive_name = inname; vfs_split (inname, &local, &op); @@ -557,7 +543,7 @@ ERRNOR (EAGAIN, NULL); if ((!ino->ent->dir) || (!ino->ent->dir->ent)) /* It must be directory */ - return g_strconcat( ino->ent->name, NULL ); + return g_strdup (ino->ent->name); return g_strconcat (ino->ent->dir->ent->name, PATH_SEP_STR, ino->ent->name, NULL); @@ -579,13 +565,17 @@ 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; - return vfs_s_find_inode (me, super->root, q, flags & FL_FOLLOW ? LINK_FOLLOW : LINK_NO_FOLLOW, flags & ~FL_FOLLOW); - + ino = vfs_s_find_inode (me, super->root, q, flags & FL_FOLLOW ? LINK_FOLLOW : LINK_NO_FOLLOW, flags & ~FL_FOLLOW); + if ((!ino) && (!*q)) + /* We are asking about / directory of ftp server: assume it exists */ + ino = vfs_s_find_inode (me, super->root, q, flags & FL_FOLLOW ? LINK_FOLLOW : LINK_NO_FOLLOW, FL_DIR | (flags & ~FL_FOLLOW)); + return ino; } struct dirhandle { @@ -701,7 +691,7 @@ struct vfs_s_inode *ino; if (!(ino = vfs_s_inode_from_path (me, path, flag))) - return -1; + return -1; *buf = ino->st; return 0; } @@ -917,8 +907,10 @@ char *s = vfs_s_fullpath (me, FH->ino); if (!s) res = -1; - else + else { res = MEDATA->file_store (me, FH_SUPER, s, FH->ino->localname); + g_free (s); + } vfs_s_invalidate (me, FH_SUPER); } if (FH->handle) diff -ruN old/mc-4.5.44/vfs/extfs/extfs.ini new/mc-4.5.45/vfs/extfs/extfs.ini --- old/mc-4.5.44/vfs/extfs/extfs.ini Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/extfs/extfs.ini Tue May 9 18:52:02 2000 @@ -48,3 +48,6 @@ # apt frontend apt: deba + +# Simple filesystem for audio cdroms. Use /dev/cdrom#audio (or /#audio). +audio diff -ruN old/mc-4.5.44/vfs/extfs/lslR.in new/mc-4.5.45/vfs/extfs/lslR.in --- old/mc-4.5.44/vfs/extfs/lslR.in Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/extfs/lslR.in Tue May 9 18:52:02 2000 @@ -1,41 +1,39 @@ #! /bin/sh -FILE=file + +# Based on previous version of lslR +# Modified by Tomas Novak April 2000 +# (to allow spaces in filenames) + ZCAT="gunzip -c" -CAT=cat +CAT="cat" -mclslRfs_list () -{ -MYCAT="$CAT" +mclslRfs_list () { case "$1" in - *.gz) MYCAT="$ZCAT";; - *.z) MYCAT="$ZCAT";; - *.Z) MYCAT="$ZCAT";; + *.gz) MYCAT="$ZCAT";; + *.z) MYCAT="$ZCAT";; + *.Z) MYCAT="$ZCAT";; + *) MYCAT="$CAT";; esac - $MYCAT $1 | @AWK@ ' + +$MYCAT "$1" | gawk ' BEGIN { dir="" } /^total\ [0-9]*$/ { next } /^$/ { next } -/^[^\ \ ]*:$/ { -if ($0 ~ /^\//) - dir=substr($0, 2) -else - dir=$0 -if (dir ~ /\/:$/) - sub(/:$/, "", dir) -else - sub(/:$/, "/", dir) -next +/^[^[:blank:]].*:$/ { + if ($0 ~ /^\//) dir=substr($0, 2); + else dir=$0; + if (dir ~ /\/:$/) sub(/:$/, "", dir); + else sub(/:$/, "/", dir); + next; } { -printf "%s %3d %-8s %-8s %8d %3s %2d %5s %s%s", $1, $2, $3, $4, $5, $6, $7, $8, dir, $9 -if (NF > 9) - printf " %s %s\n", $10, $11 -else - printf "\n" + printf "%s %3d %-8s %-8s %8d %3s %2d %5s %s", $1, $2, $3, $4, $5, $6, $7, $8, dir + for (i=1; i<9; i++) sub("[^[:blank:]]+[[:blank:]]+", ""); + printf "%s\n", $0 }' 2>/dev/null } case "$1" in - list) mclslRfs_list $2; exit 0;; + list) mclslRfs_list "$2"; exit 0;; esac exit 1 diff -ruN old/mc-4.5.44/vfs/extfs/uha.in new/mc-4.5.45/vfs/extfs/uha.in --- old/mc-4.5.44/vfs/extfs/uha.in Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/extfs/uha.in Tue May 9 18:52:02 2000 @@ -1,7 +1,7 @@ #!/bin/sh # # It is the uhafs Valery Kornienkov vlk@st.simbirsk.su 2:5051/30@fidonet -# ver ? :) +# ver 0.1 Thu Apr 6 12:05:08 2000 HA=ha # for HA 0.999 Copyright (c) 1995 Harri Hirvola # Source: ftp://sunsite.unc.edu/pub/Linux/compress/ha0999p-linux.tar.gz @@ -12,7 +12,7 @@ { date="JanFebMarAprMayJunJulAugSepOctNovDec" } /^===========/ {next} { - if ($5="%" && $8~/DIR|ASC|CPY/) { + if ($5="%" && $8~/DIR|ASC|HSC|CPY/) { split($6, a, "-") split($7, t, ":") filename=$1 diff -ruN old/mc-4.5.44/vfs/fish.c new/mc-4.5.45/vfs/fish.c --- old/mc-4.5.44/vfs/fish.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/fish.c Tue May 9 18:52:01 2000 @@ -6,7 +6,7 @@ Written by: 1998 Pavel Machek Spaces fix: 2000 Michal Svec - $Id: fish.c,v 1.25 2000/03/29 13:36:55 pavel Exp $ + $Id: fish.c,v 1.27 2000/04/10 12:00:43 pavel Exp $ Derived from ftpfs.c. @@ -268,30 +268,43 @@ static int open_archive (vfs *me, vfs_s_super *super, char *archive_name, char *op) { - char *host, *user, *password; + char *host, *user, *password, *p; int flags; - vfs_split_url (strchr(op, ':')+1, &host, &user, &flags, &password, 0, URL_NOSLASH); - SUP.host = g_strdup (host); - SUP.user = g_strdup (user); + p = vfs_split_url (strchr(op, ':')+1, &host, &user, &flags, &password, 0, URL_NOSLASH); + + if (p) + g_free (p); + + SUP.host = host; + SUP.user = user; SUP.flags = flags; if (!strncmp( op, "rsh:", 4 )) SUP.flags |= FISH_FLAG_RSH; SUP.home = NULL; if (password) - SUP.password = g_strdup (password); + SUP.password = password; return open_archive_int (me, super); } static int archive_same(vfs *me, vfs_s_super *super, char *archive_name, char *op, void *cookie) { - char *host, *user, *dummy2; + char *host, *user; int flags; - vfs_split_url (strchr(op, ':')+1, &host, &user, &flags, &dummy2, 0, URL_NOSLASH); - return ((strcmp (host, SUP.host) == 0) && + + op = vfs_split_url (strchr(op, ':')+1, &host, &user, &flags, 0, 0, URL_NOSLASH); + + if (op) + g_free (op); + + flags = ((strcmp (host, SUP.host) == 0) && (strcmp (user, SUP.user) == 0) && (flags == SUP.flags)); + g_free (host); + g_free (user); + + return flags; } int @@ -514,7 +527,7 @@ name = vfs_s_fullpath (me, fh->ino); if (!name) return 0; - if (command(me, FH_SUPER, WANT_STRING, + offset = command(me, FH_SUPER, WANT_STRING, "#RETR /%s\n" "ls -l \"/%s\" | (\n" "read var1 var2 var3 var4 var5 var6\n" @@ -523,8 +536,9 @@ "echo '### 100'\n" "cat \"/%s\"\n" "echo '### 200'\n", - name, name, name ) - != PRELIM) ERRNOR (E_REMOTE, 0); + name, name, name ); + g_free (name); + if (offset != PRELIM) ERRNOR (E_REMOTE, 0); fh->linear = LS_LINEAR_OPEN; fh->u.fish.got = 0; if (sscanf( reply_str, "%d", &fh->u.fish.total )!=1) diff -ruN old/mc-4.5.44/vfs/ftpfs.c new/mc-4.5.45/vfs/ftpfs.c --- old/mc-4.5.44/vfs/ftpfs.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/ftpfs.c Tue May 9 18:52:01 2000 @@ -7,7 +7,7 @@ 1997 Norbert Warmuth 1998 Pavel Machek - $Id: ftpfs.c,v 1.61 2000/04/03 10:35:48 pavel Exp $ + $Id: ftpfs.c,v 1.66 2000/04/28 07:43:13 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 @@ -81,6 +81,7 @@ #include "vfs.h" #include "tcputil.h" #include "../src/dialog.h" +#include "../src/setup.h" /* for load_anon_passwd */ #include "container.h" #include "ftpfs.h" #ifndef MAXHOSTNAMELEN @@ -117,7 +118,7 @@ /* Anonymous setup */ char *ftpfs_anonymous_passwd = NULL; -int ftpfs_directory_timeout; +int ftpfs_directory_timeout = 900; /* Proxy host */ char *ftpfs_proxy_host = NULL; @@ -221,7 +222,7 @@ static int get_reply (vfs *me, int sock, char *string_buf, int string_len) { - char answer[1024]; + char answer[BUF_1K]; int i; for (;;) { @@ -356,7 +357,7 @@ char *op; char *name; /* login user name */ int anon = 0; - char reply_string[255]; + char reply_string[BUF_MEDIUM]; SUP.isbinary = TYPE_UNKNOWN; if (netrcpass) @@ -574,7 +575,7 @@ } static int -ftpfs_check_proxy (char *host) +ftpfs_check_proxy (const char *host) { struct no_proxy_entry *npe; @@ -616,17 +617,15 @@ static void ftpfs_get_proxy_host_and_port (char *proxy, char **host, int *port) { - char *user, *pass, *dir; + char *user, *dir; #if defined(HSC_PROXY) - dir = vfs_split_url (proxy, host, &user, port, &pass, HSC_PROXY_PORT, URL_DEFAULTANON); + dir = vfs_split_url (proxy, host, &user, port, 0, HSC_PROXY_PORT, URL_DEFAULTANON); #else - dir = vfs_split_url (proxy, host, &user, port, &pass, FTP_COMMAND_PORT, URL_DEFAULTANON); + dir = vfs_split_url (proxy, host, &user, port, 0, FTP_COMMAND_PORT, URL_DEFAULTANON); #endif g_free (user); - if (pass) - wipe_password (pass); if (dir) g_free (dir); } @@ -767,10 +766,13 @@ char *host, *user, *password; int port; - vfs_split_url (strchr(op, ':')+1, &host, &user, &port, &password, FTP_COMMAND_PORT, URL_DEFAULTANON); + op = vfs_split_url (strchr(op, ':')+1, &host, &user, &port, &password, FTP_COMMAND_PORT, URL_DEFAULTANON); + + if (op) + g_free (op); - SUP.host = g_strdup (host); - SUP.user = g_strdup (user); + SUP.host = host; + SUP.user = user; SUP.port = port; SUP.home = NULL; SUP.proxy= 0; @@ -783,23 +785,33 @@ SUP.remote_is_amiga = 0; super->name = g_strdup("/"); #if 0 - super->name = g_strconcat( "/#ftp:", SUP.user, "@", SUP.host, "/", NULL ); + super->name = g_strconcat( "/#ftp:", user, "@", 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); + SUP.password = password; return open_archive_int (me, super); } static int archive_same(vfs *me, vfs_s_super *super, char *archive_name, char *op, void *cookie) { - char *host, *user, *dummy2; + char *host, *user; int port; - vfs_split_url (strchr(op, ':')+1, &host, &user, &port, &dummy2, 21, URL_DEFAULTANON); - return ((strcmp (host, SUP.host) == 0) && + + op = vfs_split_url (strchr(op, ':')+1, &host, &user, &port, 0, 21, URL_DEFAULTANON); + + if (op) + g_free (op); + + port = ((strcmp (host, SUP.host) == 0) && (strcmp (user, SUP.user) == 0) && (port == SUP.port)); + + g_free (host); + g_free (user); + + return port; } static int @@ -821,7 +833,7 @@ static char * ftpfs_get_current_directory (vfs *me, vfs_s_super *super) { - char buf[4096], *bufp, *bufq; + char buf[BUF_8K], *bufp, *bufq; if (command (me, super, NONE, "PWD") == COMPLETE && get_reply(me, SUP.sock, buf, sizeof(buf)) == COMPLETE) { @@ -1169,7 +1181,8 @@ vfs_s_entry *ent; vfs_s_super *super = dir->super; int sock, has_symlinks = 0, num_entries = 0; - char buffer[8192]; + char buffer[BUF_8K]; + int cd_first = (strchr (remote_path, ' ') != NULL) || ftpfs_first_cd_then_ls || (SUP.strict == RFC_STRICT); print_vfs_message(_("ftpfs: Reading FTP directory %s... %s%s"), remote_path, @@ -1178,8 +1191,9 @@ 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; @@ -1195,7 +1209,8 @@ 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); + /* Dirty hack to avoid autoprepending / to . */ + sock = open_data_connection (me, super, "LIST -la .", 0, TYPE_ASCII, 0); else { /* Trailing "/." is necessary if remote_path is a symlink but don't generate "//." */ @@ -1239,6 +1254,7 @@ } num_entries++; if ((!strcmp(ent->name, ".")) || (!strcmp (ent->name, ".."))) { + g_free (ent->name); ent->name = NULL; /* Ouch, vfs_s_free_entry "knows" about . and .. being special :-( */ vfs_s_free_entry (me, ent); continue; @@ -1368,6 +1384,7 @@ if (!name) return 0; FH_SOCK = open_data_connection(me, FH_SUPER, "RETR", name, TYPE_BINARY, offset); + g_free (name); if (FH_SOCK == -1) ERRNOR (EACCES, 0); fh->linear = LS_LINEAR_OPEN; @@ -1812,11 +1829,12 @@ while ((keyword = netrc_next ()) > 2) { switch (keyword) { case 3: - if (netrc_next ()) + if (netrc_next ()) { if (*login == NULL) *login = g_strdup (buffer); else if (strcmp (*login, buffer)) keyword = 20; + } break; case 4: case 5: @@ -1846,11 +1864,13 @@ if (keyword == 20) break; } - if (keyword == 20) - continue; - else + if (keyword != 20) break; } + + g_free (netrc); + g_free (netrcname); + rupp = g_new (struct rupcache, 1); rupp->host = g_strdup (host); rupp->login = rupp->pass = 0; @@ -1862,8 +1882,6 @@ rupp->next = rup_cache; rup_cache = rupp; - g_free (netrc); - g_free (netrcname); return 0; } diff -ruN old/mc-4.5.44/vfs/local.c new/mc-4.5.45/vfs/local.c --- old/mc-4.5.44/vfs/local.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/local.c Tue May 9 18:52:01 2000 @@ -352,3 +352,63 @@ local_munmap #endif }; + +vfs vfs_nil_ops = { + NULL, /* This is place of next pointer */ + "Filesystem which just returns failure", + 0, /* flags */ + NULL, /* prefix */ + NULL, /* data */ + 0, /* errno */ + NULL, + NULL, + NULL, + NULL, + + NULL, + NULL, + NULL, + NULL, + + NULL, + NULL, + NULL, + NULL, + NULL, + + NULL, + NULL, + NULL, + + NULL, + NULL, + NULL, + + NULL, + NULL, + NULL, + NULL, + + NULL, + NULL, + NULL, + NULL, + NULL, + + local_getid, + local_nothingisopen, + local_free, + + NULL, + NULL, + + NULL, + NULL, + + NULL, + NULL +#ifdef HAVE_MMAP + , NULL, + NULL +#endif +}; diff -ruN old/mc-4.5.44/vfs/samba/include/config.h new/mc-4.5.45/vfs/samba/include/config.h --- old/mc-4.5.44/vfs/samba/include/config.h Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/samba/include/config.h Tue May 9 18:52:02 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.44/vfs/smbfs.c new/mc-4.5.45/vfs/smbfs.c --- old/mc-4.5.44/vfs/smbfs.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/smbfs.c Tue May 9 18:52:01 2000 @@ -29,6 +29,7 @@ confilcts with definitions in other includes */ #undef HAVE_LIBREADLINE #define NO_CONFIG_H +#define BOOL_DEFINED #include "samba/include/includes.h" #include diff -ruN old/mc-4.5.44/vfs/undelfs.c new/mc-4.5.45/vfs/undelfs.c --- old/mc-4.5.44/vfs/undelfs.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/undelfs.c Tue May 9 18:52:01 2000 @@ -9,8 +9,9 @@ Copyright (C) 1995, 1997 the Free Software Foundation Written by: 1995 Miguel de Icaza. 1997 Norbert Warmuth. + 2000 Pavel Machek - $Id: undelfs.c,v 1.12 2000/01/05 14:13:59 pavel Exp $ + $Id: undelfs.c,v 1.13 2000/04/10 12:23:00 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 @@ -89,16 +90,16 @@ { if (fs) ext2fs_close (fs); - fs = 0; + fs = NULL; if (ext2_fname) g_free (ext2_fname); - ext2_fname = 0; + ext2_fname = NULL; if (delarray) g_free (delarray); - delarray = 0; + delarray = NULL; if (block_buf) g_free (block_buf); - block_buf = 0; + block_buf = NULL; } static void @@ -111,7 +112,7 @@ hda5, sdb8 etc, which is assumed to live under /dev. -- pavel@ucw.cz */ - *ext2_fname = 0; + *ext2_fname = NULL; if (strncmp (dirname, "/#undel:", 8)) return; @@ -254,10 +255,10 @@ ext2fs_close_inode_scan (scan); free_block_buf: g_free (block_buf); - block_buf = 0; + block_buf = NULL; free_delarray: g_free (delarray); - delarray = 0; + delarray = NULL; return 0; } @@ -386,7 +387,7 @@ { char *file, *f; ino_t inode, i; - undelfs_file *p = 0; + undelfs_file *p = NULL; /* Only allow reads on this file system */ undelfs_get_path (fname, &file, &f); diff -ruN old/mc-4.5.44/vfs/util-alone.h new/mc-4.5.45/vfs/util-alone.h --- old/mc-4.5.44/vfs/util-alone.h Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/util-alone.h Tue May 9 18:52:02 2000 @@ -0,0 +1,6 @@ +#ifndef _UTIL_ALONE_H_ +#define _UTIL_ALONE_H_ + +char *load_anon_passwd (void); + +#endif diff -ruN old/mc-4.5.44/vfs/utilvfs.c new/mc-4.5.45/vfs/utilvfs.c --- old/mc-4.5.44/vfs/utilvfs.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/utilvfs.c Tue May 9 18:52:01 2000 @@ -56,7 +56,7 @@ * If the user is empty, e.g. ftp://@roxanne/private, then your login name * is supplied. * - * returns malloced host, user. + * returns malloced host, user and pass if pass is not null. * returns a malloced strings with the pathname relative to the host. * */ @@ -70,7 +70,8 @@ char *pend = pcopy + strlen (pcopy); int default_is_anon = flags & URL_DEFAULTANON; - *pass = NULL; + if (pass) + *pass = NULL; *port = default_port; *user = NULL; retval = NULL; @@ -97,9 +98,7 @@ if (inner_colon){ *inner_colon = 0; inner_colon++; - if (*inner_colon == '@') - *pass = NULL; - else + if (pass && (*inner_colon != '@')) *pass = g_strdup (inner_colon); } if (*pcopy != 0) @@ -134,19 +133,17 @@ if (*port <= 0 || *port >= 65536) *port = default_port; } else { - while(1) { - colon++; + while(*(++colon)){ switch(*colon) { case 'C': *port = 1; break; case 'r': *port = 2; break; - case 0: goto done; } } } } -done: + *host = g_strdup (rest); g_free (pcopy); diff -ruN old/mc-4.5.44/vfs/vfs.c new/mc-4.5.45/vfs/vfs.c --- old/mc-4.5.44/vfs/vfs.c Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/vfs.c Tue May 9 18:52:02 2000 @@ -5,7 +5,7 @@ 1995 Jakub Jelinek 1998 Pavel Machek - $Id: vfs.c,v 1.54 2000/03/06 16:31:37 pavel Exp $ + $Id: vfs.c,v 1.58 2000/05/03 19:10:52 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 @@ -234,6 +234,7 @@ return ret; } + if (slash) *slash = PATH_SEP; ret = vfs_split (path, inpath, op); @@ -248,11 +249,9 @@ char *slash; vfs *ret; - if (!path) - vfs_die ("Can not rosplit NULL"); - + g_return_val_if_fail(path, NULL); + semi = strrchr (path, '#'); - if (!semi || !path_magic (path)) return NULL; @@ -262,6 +261,8 @@ *slash = 0; ret = vfs_type_from_op (semi+1); + if (!ret && (vfs_flags & FL_NO_LOCALHASH)) + return &vfs_nil_ops; if (slash) *slash = PATH_SEP; @@ -280,7 +281,7 @@ vfs = vfs_rosplit(path); if (!vfs) - vfs = &vfs_local_ops; + vfs = &vfs_local_ops; return vfs; } @@ -409,8 +410,10 @@ mode = va_arg (ap, int); va_end (ap); - if (!vfs->open) - vfs_die ("VFS must support open.\n"); + if (!vfs->open) { + errno = -EOPNOTSUPP; + return -1; + } info = (*vfs->open) (vfs, file, flags, mode); /* open must be supported */ g_free (file); @@ -1071,9 +1074,8 @@ fdout = open (tmp, O_CREAT|O_WRONLY|O_TRUNC|O_EXCL, 0600); if (fdout == -1) goto fail; - while ((i = mc_read (fdin, buffer, sizeof (buffer))) == sizeof (buffer)){ + while ((i = mc_read (fdin, buffer, sizeof (buffer))) > 0) write (fdout, buffer, i); - } if (i == -1) goto fail; if (write (fdout, buffer, i)==-1) @@ -1093,7 +1095,7 @@ fail: if (fdout) close(fdout); if (fdin) mc_close (fdin); - free (tmp); + g_free (tmp); return NULL; } @@ -1790,7 +1792,7 @@ if (++errorcount < 5) { message_1s (1, _("Could not parse:"), p_copy); - } else if (errorcount == 5) + } else if (errorcount >= 5) message_1s (1, _("More parsing errors will be ignored."), _("(sorry)")); } diff -ruN old/mc-4.5.44/vfs/vfs.h new/mc-4.5.45/vfs/vfs.h --- old/mc-4.5.44/vfs/vfs.h Tue Apr 4 23:31:55 2000 +++ new/mc-4.5.45/vfs/vfs.h Tue May 9 18:52:02 2000 @@ -126,6 +126,7 @@ /* Other file systems */ extern vfs vfs_local_ops; + extern vfs vfs_nil_ops; extern vfs vfs_tarfs_ops; extern vfs vfs_cpiofs_ops; @@ -369,7 +370,9 @@ #define FL_NO_SFS 64 #define FL_NO_FISH 128 +#define FL_NO_LOCALHASH 0x20000000 /* When you never ever want vfs to work with regular files with # in name */ #define FL_NO_CWDSETUP 0x40000000 + #ifdef VFS_STANDALONE extern void mc_vfs_init( void );