diff -Nru mc-4.8.25/aclocal.m4 mc-4.8.26/aclocal.m4 --- mc-4.8.25/aclocal.m4 2020-07-12 20:16:51.000000000 +0000 +++ mc-4.8.26/aclocal.m4 2021-01-21 17:14:02.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.16.2 -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES -# Copyright (C) 2002-2018 Free Software Foundation, Inc. +# Copyright (C) 2002-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -379,7 +379,7 @@ [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.1], [], +m4_if([$1], [1.16.2], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -395,14 +395,14 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.1])dnl +[AM_AUTOMAKE_VERSION([1.16.2])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -454,7 +454,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -485,7 +485,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -676,7 +676,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -715,7 +715,9 @@ done if test $am_rc -ne 0; then AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE="gmake" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking).]) fi @@ -742,7 +744,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -939,7 +941,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -960,7 +962,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -982,7 +984,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1017,7 +1019,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1060,7 +1062,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 Free Software Foundation, Inc. +# Copyright (C) 1997-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1097,7 +1099,7 @@ fi ]) -# Copyright (C) 2003-2018 Free Software Foundation, Inc. +# Copyright (C) 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1131,7 +1133,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1160,7 +1162,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1207,7 +1209,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1226,7 +1228,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1307,7 +1309,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 Free Software Foundation, Inc. +# Copyright (C) 2009-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1367,7 +1369,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 Free Software Foundation, Inc. +# Copyright (C) 2001-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1395,7 +1397,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 Free Software Foundation, Inc. +# Copyright (C) 2006-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1414,7 +1416,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 Free Software Foundation, Inc. +# Copyright (C) 2004-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/AUTHORS mc-4.8.26/AUTHORS --- mc-4.8.25/AUTHORS 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/AUTHORS 2021-01-10 11:50:16.000000000 +0000 @@ -43,6 +43,9 @@ Alessandro Rubini Mouse support. +Aleš Janda + Shadows of dialog windows and menus. + Alexander Dong OS/2 port. diff -Nru mc-4.8.25/build-glib2.sh mc-4.8.26/build-glib2.sh --- mc-4.8.25/build-glib2.sh 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/build-glib2.sh 2021-01-10 11:50:16.000000000 +0000 @@ -30,8 +30,8 @@ : ${GETTEXT_VERSION=0.17} GLIB_DIR="glib-$GLIB_VERSION" -GLIB_TARBALL="glib-$GLIB_VERSION.tar.gz" -GLIB_URL="ftp://ftp.gnome.org/pub/gnome/sources/glib/2.30/$GLIB_TARBALL" +GLIB_TARBALL="glib-$GLIB_VERSION.tar.bz2" +GLIB_URL="https://download.gnome.org/sources/glib/2.30/$GLIB_TARBALL" PKGC_DIR="pkg-config-$PKGC_VERSION" PKGC_TARBALL="pkg-config-$PKGC_VERSION.tar.gz" diff -Nru mc-4.8.25/config/compile mc-4.8.26/config/compile --- mc-4.8.25/config/compile 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/config/compile 2021-01-21 17:14:04.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) diff -Nru mc-4.8.25/config/depcomp mc-4.8.26/config/depcomp --- mc-4.8.25/config/depcomp 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/config/depcomp 2021-01-21 17:14:06.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2020 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 diff -Nru mc-4.8.25/config/install-sh mc-4.8.26/config/install-sh --- mc-4.8.25/config/install-sh 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/config/install-sh 2021-01-21 17:14:04.000000000 +0000 @@ -451,7 +451,18 @@ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + (umask $cp_umask && + { test -z "$stripcmd" || { + # Create $dsttmp read-write so that cp doesn't create it read-only, + # which would cause strip to fail. + if test -z "$doit"; then + : >"$dsttmp" # No need to fork-exec 'touch'. + else + $doit touch "$dsttmp" + fi + } + } && + $doit_exec $cpprog "$src" "$dsttmp") && # and set any options; do chmod last to preserve setuid bits. # diff -Nru mc-4.8.25/config/missing mc-4.8.26/config/missing --- mc-4.8.25/config/missing 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/config/missing 2021-01-21 17:14:04.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2020 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru mc-4.8.25/config/test-driver mc-4.8.26/config/test-driver --- mc-4.8.25/config/test-driver 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/config/test-driver 2021-01-21 17:14:06.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 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 diff -Nru mc-4.8.25/configure mc-4.8.26/configure --- mc-4.8.25/configure 2020-07-12 20:16:52.000000000 +0000 +++ mc-4.8.26/configure 2021-01-21 17:14:03.000000000 +0000 @@ -19522,7 +19522,7 @@ # Don't call AC_STRUCT_ST_BLOCKS because it causes bugs. Details at - # http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00051.html + # https://lists.gnu.org/r/bug-gnulib/2011-06/msg00051.html @@ -20669,8 +20669,6 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to get file system space usage" >&5 -$as_echo_n "checking how to get file system space usage... " >&6; } ac_fsusage_space=no # Perform only the link test since it seems there are no variants of the @@ -27255,7 +27253,7 @@ ac_config_files="$ac_config_files src/man2hlp/man2hlp" -ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in" +ac_config_files="$ac_config_files Makefile contrib/Makefile contrib/dist/Makefile contrib/dist/gentoo/Makefile contrib/dist/redhat/Makefile contrib/dist/redhat/mc.spec contrib/dist/pkginfo contrib/dist/prototype misc/Makefile misc/mc.charsets misc/mc.menu misc/mcedit.menu misc/skins/Makefile misc/ext.d/Makefile misc/ext.d/doc.sh misc/ext.d/misc.sh misc/ext.d/text.sh misc/ext.d/web.sh misc/macros.d/Makefile misc/mc.ext src/Makefile src/consaver/Makefile src/editor/Makefile src/man2hlp/Makefile src/subshell/Makefile src/viewer/Makefile src/diffviewer/Makefile src/filemanager/Makefile src/vfs/Makefile src/vfs/cpio/Makefile src/vfs/extfs/Makefile src/vfs/extfs/helpers/Makefile src/vfs/extfs/helpers/a+ src/vfs/extfs/helpers/apt+ src/vfs/extfs/helpers/audio src/vfs/extfs/helpers/deb src/vfs/extfs/helpers/deba src/vfs/extfs/helpers/debd src/vfs/extfs/helpers/dpkg+ src/vfs/extfs/helpers/iso9660 src/vfs/extfs/helpers/hp48+ src/vfs/extfs/helpers/lslR src/vfs/extfs/helpers/mailfs src/vfs/extfs/helpers/patchfs src/vfs/extfs/helpers/rpms+ src/vfs/extfs/helpers/s3+ src/vfs/extfs/helpers/uace src/vfs/extfs/helpers/ualz src/vfs/extfs/helpers/uar src/vfs/extfs/helpers/uarc src/vfs/extfs/helpers/uarj src/vfs/extfs/helpers/ucab src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib src/vfs/extfs/helpers/unar src/vfs/extfs/helpers/urar src/vfs/extfs/helpers/uwim src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo src/vfs/fish/Makefile src/vfs/fish/helpers/Makefile src/vfs/ftpfs/Makefile src/vfs/sftpfs/Makefile src/vfs/local/Makefile src/vfs/sfs/Makefile src/vfs/smbfs/Makefile src/vfs/tar/Makefile src/vfs/undelfs/Makefile lib/Makefile lib/event/Makefile lib/filehighlight/Makefile lib/mcconfig/Makefile lib/search/Makefile lib/skin/Makefile lib/strutil/Makefile lib/tty/Makefile lib/vfs/Makefile lib/widget/Makefile misc/syntax/Makefile misc/syntax/Syntax doc/Makefile doc/hints/Makefile doc/hints/l10n/Makefile doc/man/Makefile doc/man/es/Makefile doc/man/hu/Makefile doc/man/it/Makefile doc/man/pl/Makefile doc/man/ru/Makefile doc/man/sr/Makefile doc/hlp/Makefile doc/hlp/es/Makefile doc/hlp/hu/Makefile doc/hlp/it/Makefile doc/hlp/pl/Makefile doc/hlp/ru/Makefile doc/hlp/sr/Makefile po/Makefile.in" ac_config_files="$ac_config_files tests/Makefile tests/lib/Makefile tests/lib/mcconfig/Makefile tests/lib/search/Makefile tests/lib/strutil/Makefile tests/lib/vfs/Makefile tests/lib/widget/Makefile tests/src/Makefile tests/src/filemanager/Makefile tests/src/editor/Makefile tests/src/editor/test-data.txt tests/src/vfs/Makefile tests/src/vfs/extfs/Makefile tests/src/vfs/extfs/helpers-list/Makefile tests/src/vfs/extfs/helpers-list/data/config.sh tests/src/vfs/extfs/helpers-list/misc/Makefile" @@ -28536,7 +28534,9 @@ "src/vfs/extfs/helpers/uha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uha" ;; "src/vfs/extfs/helpers/ulha") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulha" ;; "src/vfs/extfs/helpers/ulib") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/ulib" ;; + "src/vfs/extfs/helpers/unar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/unar" ;; "src/vfs/extfs/helpers/urar") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/urar" ;; + "src/vfs/extfs/helpers/uwim") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uwim" ;; "src/vfs/extfs/helpers/uzip") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzip" ;; "src/vfs/extfs/helpers/uzoo") CONFIG_FILES="$CONFIG_FILES src/vfs/extfs/helpers/uzoo" ;; "src/vfs/fish/Makefile") CONFIG_FILES="$CONFIG_FILES src/vfs/fish/Makefile" ;; @@ -29271,7 +29271,9 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } diff -Nru mc-4.8.25/configure.ac mc-4.8.26/configure.ac --- mc-4.8.25/configure.ac 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/configure.ac 2021-01-10 11:50:16.000000000 +0000 @@ -625,7 +625,9 @@ src/vfs/extfs/helpers/uha src/vfs/extfs/helpers/ulha src/vfs/extfs/helpers/ulib +src/vfs/extfs/helpers/unar src/vfs/extfs/helpers/urar +src/vfs/extfs/helpers/uwim src/vfs/extfs/helpers/uzip src/vfs/extfs/helpers/uzoo diff -Nru mc-4.8.25/contrib/dist/gentoo/Makefile.in mc-4.8.26/contrib/dist/gentoo/Makefile.in --- mc-4.8.25/contrib/dist/gentoo/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/contrib/dist/gentoo/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/contrib/dist/Makefile.in mc-4.8.26/contrib/dist/Makefile.in --- mc-4.8.25/contrib/dist/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/contrib/dist/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/contrib/dist/redhat/Makefile.in mc-4.8.26/contrib/dist/redhat/Makefile.in --- mc-4.8.25/contrib/dist/redhat/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/contrib/dist/redhat/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/contrib/Makefile.in mc-4.8.26/contrib/Makefile.in --- mc-4.8.25/contrib/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/contrib/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/debian/changelog mc-4.8.26/debian/changelog --- mc-4.8.25/debian/changelog 2020-10-02 08:04:08.000000000 +0000 +++ mc-4.8.26/debian/changelog 2021-02-01 01:44:43.000000000 +0000 @@ -1,3 +1,10 @@ +mc (3:4.8.26-1) unstable; urgency=medium + + * New upstream release. + * Suggests += "unar, wimtools". + + -- Dmitry Smirnov Mon, 01 Feb 2021 12:44:43 +1100 + mc (3:4.8.25-1) unstable; urgency=low * New upstream release. diff -Nru mc-4.8.25/debian/control mc-4.8.26/debian/control --- mc-4.8.25/debian/control 2020-10-02 08:04:08.000000000 +0000 +++ mc-4.8.26/debian/control 2021-02-01 01:44:43.000000000 +0000 @@ -45,6 +45,8 @@ ,python ,python-boto ,python-tz + ,unar + ,wimtools ,xpdf | pdf-viewer ,zip Provides: mcedit diff -Nru mc-4.8.25/debian/copyright mc-4.8.26/debian/copyright --- mc-4.8.25/debian/copyright 2020-10-02 08:04:08.000000000 +0000 +++ mc-4.8.26/debian/copyright 2021-02-01 01:44:43.000000000 +0000 @@ -1,14 +1,14 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Midnight Commander Source: http://www.midnight-commander.org/downloads -Copyright: 1996-2020 Free Software Foundation +Copyright: 1996-2021 Free Software Foundation License: GPL-3+ Comment: This package was debianized on Tue Apr 1 14:32:15 1997 by Paul Seelig . Files: * -Copyright: 1991-1992,1994-2020 Free Software Foundation +Copyright: 1991-1992,1994-2021 Free Software Foundation 1996 andrey joukov <2:5020/337.13@fidonet.org> 2002 ARJ Software Russia 2003 Alexander Serkov @@ -59,7 +59,7 @@ 2011 Andreas Tille 2002 Colin Watson 2008-2015 Denis Briand - 2012-2020 Dmitry Smirnov + 2012-2021 Dmitry Smirnov 1997 Fernando Alegre 2004-2007 Ludovic Drolez 1999-2001 Martin Bialasinski diff -Nru mc-4.8.25/debian/patches/2987.patch mc-4.8.26/debian/patches/2987.patch --- mc-4.8.25/debian/patches/2987.patch 2020-10-02 07:59:17.000000000 +0000 +++ mc-4.8.26/debian/patches/2987.patch 2021-02-01 01:44:43.000000000 +0000 @@ -12,9 +12,9 @@ --- a/src/subshell/common.c +++ b/src/subshell/common.c -@@ -1260,9 +1260,9 @@ +@@ -1665,9 +1665,9 @@ + feed_subshell (QUIETLY, FALSE); } - /* The initial space keeps this out of the command history (in bash because we set "HISTCONTROL=ignorespace") */ - write_all (mc_global.tty.subshell_pty, " cd ", 4); diff -Nru mc-4.8.25/debian/patches/ext_use_default_editor.patch mc-4.8.26/debian/patches/ext_use_default_editor.patch --- mc-4.8.25/debian/patches/ext_use_default_editor.patch 2020-10-02 08:03:09.000000000 +0000 +++ mc-4.8.26/debian/patches/ext_use_default_editor.patch 2021-02-01 01:44:43.000000000 +0000 @@ -5,7 +5,7 @@ --- a/misc/mc.ext.in +++ b/misc/mc.ext.in -@@ -824,9 +824,9 @@ +@@ -822,9 +822,9 @@ ### Includes # includes should be at end of bindings diff -Nru mc-4.8.25/doc/FAQ mc-4.8.26/doc/FAQ --- mc-4.8.25/doc/FAQ 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/doc/FAQ 2021-01-10 11:50:16.000000000 +0000 @@ -152,12 +152,12 @@ You need a POSIX (Unix compatible) operating system. If you are running Windows, use Cygwin. - To compile any edition you need to have glib 2.x installed. - It's available at ftp://ftp.gtk.org/pub/gtk/. + To compile any edition you need to have glib >= 2.30 installed. + It's available at https://download.gnome.org/sources/glib/. If you want to use mouse on the Linux console you need the gpm daemon - from ftp://ftp.systemy.it/pub/develop/. You need nothing extra to - use mouse on xterm. + from https://www.nico.schottelius.org/software/gpm/. You need nothing + extra to use mouse on xterm. If you do not want to use the S-Lang library you could try using ncurses version 4.1 and above. @@ -294,10 +294,11 @@ 2.8 How do I change the key bindings? - There is no generic way to reconfigure the key bindings. You can use - the "Learn Keys" dialog to assign keys to some actions listed in that - dialog. However, most actions cannot be redefined to use different - keys. + Key binding con be reconfigure via keymap files: /etc/mc/mc.keymap + and ~/.config/mc/mc.keymap. + + You can use the "Learn Keys" dialog to assign keys to some actions + listed in that dialog. 3 Mouse @@ -314,11 +315,6 @@ Hold down shift key while using mouse to cut and paste. -3.3 How do I get the extension dependent pop-up menu to pop up? - - It was developed for the GNOME edition. The text-mode edition - doesn't support this feature yet. - 4 Display @@ -340,9 +336,8 @@ 4.2 Why don't line drawing characters work? Since version 4.0.13 there's the command line option -a to force use - of charaters +, |, - for line drawing (only available when compiled - with S-Lang). Use the -a option if any of the suggestions below - doesn't help. + of charaters +, |, - for line drawing. Use the -a option if any + of the suggestions below doesn't help. In general, there are three cases: * Lines are shown as ASCII characters like this @@ -421,8 +416,6 @@ 4.4 I have problems with entering/viewing national characters! - Upgrade to version 4.0.12 or newer. - From the Options - Display Bits dialog select Full 8 bits or ISO 8859-1. In addition, select 8 bit input from the same dialog. @@ -514,7 +507,7 @@ Thomas Dickey maintains his more advanced version of xterm at ftp://dickey.his.com/xterm/ - rxvt has its own site http://www.rxvt.org/ - get the latest version + rxvt has its own site http://www.rxvt.net/ - get the latest version there. 4.8 I got colors working with MC but the other programs don't work at @@ -613,6 +606,36 @@ Only few terminals support screen saving. It's xterm, rxvt and other xterm-like terminals and virtual terminals on Linux and FreeBSD. +6.8 Why I see lot of strange 'cd "printf ' lines into my .history file? + + Add + + export HISTCONTROL="ignoreboth" + + into your ~/.profile file (.bash_profile) for avoid this. + +6.9 I have a problem with Screen which makes using Midnight Commander +problematic. I use Ctrl-O to disable panels. Output of previous commands, +just a clear, screen is blanked. + + Update GNU Screen to the last version. This bug was fixed in + + commit ad56f746c6243d45124485d198d577bdbb78071c + Author: Sadrul Habib Chowdhury + Date: Sun Nov 29 23:34:25 2009 -0500 + + Fix using alternate screen buffers in some cases. + + Screen would reset the 'main' screen buffer if an app tries to + switch to an alternate buffer while it is already using one (in + other words, sends multiple 'smcup' without an 'rmcup'). This should + fix debian #558724 + + (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=558724) + + or do not rewrite TERM (mustbe TERM=screen) andrun mc as follow: + + echo -e '\e[?1000h' && mc -x 7 Virtual file systems @@ -622,7 +645,7 @@ press enter. If you use mouse just double-click on the tar file. The recognized suffixes for tar archives are .tar, .tar.gz and .tgz. - You can also enter a tar archive by typing "cd filename#utar" where + You can also enter a tar archive by typing "cd filename/utar://" where filename is the name of the archive. In this case, the suffix is not important. @@ -773,7 +796,7 @@ http://www.midnight-commander.org/wiki/McDevelopers This page lists everbody who has provided a patch or - has written code for the midnight-commander in the past: + has written code for the Midnight Commander in the past: http://www.midnight-commander.org/wiki/McContributors 10.2 Do I dare to use a development version? @@ -793,7 +816,7 @@ You might first want to get the newest development version to see if the bug is fixed or the feature is added already. - If this is not the case, feel free to add a ticket in our ticket-system, + If this is not the case, feel free to add a ticket in our ticket system, which is located here: http://www.midnight-commander.org/newticket If you want to send an email instead write your report to mc-devel@gnome.org diff -Nru mc-4.8.25/doc/hints/l10n/Makefile.in mc-4.8.26/doc/hints/l10n/Makefile.in --- mc-4.8.25/doc/hints/l10n/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.af mc-4.8.26/doc/hints/l10n/mc.hint.af --- mc-4.8.25/doc/hints/l10n/mc.hint.af 2020-07-05 18:20:06.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.af 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.ar mc-4.8.26/doc/hints/l10n/mc.hint.ar --- mc-4.8.25/doc/hints/l10n/mc.hint.ar 2020-07-05 18:20:14.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.ar 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.az mc-4.8.26/doc/hints/l10n/mc.hint.az --- mc-4.8.25/doc/hints/l10n/mc.hint.az 2020-07-05 18:20:23.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.az 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.be mc-4.8.26/doc/hints/l10n/mc.hint.be --- mc-4.8.25/doc/hints/l10n/mc.hint.be 2020-07-05 18:27:50.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.be 2021-01-10 13:49:14.000000000 +0000 @@ -1,8 +1,8 @@ Намінка. «C-x t» перапісвае ў загадны радок назвы пазначаных файлаў. -Намінка. «C-x p» перапісвае у загадны радок дзейны шлях. +Намінка. «C-x p» перапісвае у загадны радок дзейны шлях. -Намінка. «M-Tab» ці «Esc+Tab» дапаўняе набранае. Каб убачыць сьпіс, націсьніце двойчы. +Намінка. «M-Tab» ці «Esc+Tab» дапаўняе набранае. Каб убачыць сьпіс, націсьніце двойчы. Намінка. «M-p» і «M-n» дае доступ да гісторыі загадаў. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.br mc-4.8.26/doc/hints/l10n/mc.hint.br --- mc-4.8.25/doc/hints/l10n/mc.hint.br 2020-07-05 18:20:48.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.br 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.ca mc-4.8.26/doc/hints/l10n/mc.hint.ca --- mc-4.8.25/doc/hints/l10n/mc.hint.ca 2020-07-05 18:46:40.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.ca 2021-01-10 13:59:48.000000000 +0000 @@ -44,7 +44,7 @@ Consell: La compleció funciona en totes les línies d'entrada en tots els diàlegs. Simplement premeu «M-Tab». -Consell: En terminals lents, el paràmetre «-s» pot ajudar. +Consell: En terminals lents, l'indicador «-s» pot ajudar. Consell: Trobar fitxers: podeu treballar en trobar fitxers amb el botó «Quadre de cerca». diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.fi mc-4.8.26/doc/hints/l10n/mc.hint.fi --- mc-4.8.25/doc/hints/l10n/mc.hint.fi 2020-07-05 19:06:45.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.fi 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.he mc-4.8.26/doc/hints/l10n/mc.hint.he --- mc-4.8.25/doc/hints/l10n/mc.hint.he 2020-07-05 19:14:59.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.he 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.hr mc-4.8.26/doc/hints/l10n/mc.hint.hr --- mc-4.8.25/doc/hints/l10n/mc.hint.hr 2020-07-05 19:15:17.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.hr 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.ia mc-4.8.26/doc/hints/l10n/mc.hint.ia --- mc-4.8.25/doc/hints/l10n/mc.hint.ia 2020-07-05 19:18:05.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.ia 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.ka mc-4.8.26/doc/hints/l10n/mc.hint.ka --- mc-4.8.25/doc/hints/l10n/mc.hint.ka 2020-07-05 19:26:10.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.ka 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.kk mc-4.8.26/doc/hints/l10n/mc.hint.kk --- mc-4.8.25/doc/hints/l10n/mc.hint.kk 2020-07-05 19:26:18.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.kk 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.nl mc-4.8.26/doc/hints/l10n/mc.hint.nl --- mc-4.8.25/doc/hints/l10n/mc.hint.nl 2020-01-18 21:51:14.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.nl 2021-01-10 13:52:08.000000000 +0000 @@ -8,7 +8,7 @@ Hint: Een character quoten? Gebruik Control-q en dan het character. -Hint: Moe van deze hints? Zet ze uit in het Opties/Vormgeving menu. +Hint: Moe van deze hints? Zet ze uit in Opties/Vormgeving. Hint: Directories selecteren: zet een slash aan het eind van het zoekpatroon. @@ -18,9 +18,9 @@ Hint: Stuur bug rapporten naar mc-devel@gnome.org -Hint: Tab verandert huidig paneel. +Hint: Tab verandert focus huidig paneel (links/rechts). -Hint: VFS coolheid: druk op enter op een tar file om zijn inhoud te onderzoeken. +Hint: VFS-coolheid: druk op 'enter' op een tar file om de inhoud ervan te zien. Hint: We hebben ook een aardige handleiding. @@ -46,13 +46,13 @@ Hint: Op trage terminals zou de -s vlag weleens kunnen helpen. -Hint: Vind bestanden: gebruik de gevonden bestanden met de Extern Venster optie. +Hint: Vinden bestanden: gebruik de gevonden bestanden met de optie Extern Venster. -Hint: Wil je complexe zoekopdrachten? Gebruik het Externe Venster commando. +Hint: Wil je complexe zoekopdrachten? Gebruik het commando Externe Venster. Hint: M-c (snelle cd) is om middenin een commando van directorie te wisselen. -NB: Shell commandos werken niet in niet-locale bestandssystemen. +NB: Shell-commandos werken niet in niet-locale bestandssystemen. Hint: Laat tekst herleven met C-y. @@ -76,12 +76,12 @@ Hint: M-t verandert snel van lijst modus. -Hint: Geef als volgt je gebruikersnaam op met ftps: 'cd ftp://naam@machine.edu' +Hint: Geef alsvolgt je gebruikersnaam op met ftps: 'cd ftp://naam@machine.edu' -Hint: Je kunt RPM bestanden bekijken door er op te enteren. +Hint: Je kunt RPM-bestanden bekijken door er op te enteren. Hint: Om directories toe te voegen aan de selectie, moet je een slash toevoegen. -Hint: Voor de normale cut and paste muisfuncties moet je de shift key inhouden. +Hint: Voor de normale cut-and-paste muisfuncties moet je de shift key inhouden. Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.sl mc-4.8.26/doc/hints/l10n/mc.hint.sl --- mc-4.8.25/doc/hints/l10n/mc.hint.sl 2020-01-18 21:51:36.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.sl 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.szl mc-4.8.26/doc/hints/l10n/mc.hint.szl --- mc-4.8.25/doc/hints/l10n/mc.hint.szl 2020-01-18 21:51:41.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.szl 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.te mc-4.8.26/doc/hints/l10n/mc.hint.te --- mc-4.8.25/doc/hints/l10n/mc.hint.te 2020-01-18 21:51:42.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.te 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.uz mc-4.8.26/doc/hints/l10n/mc.hint.uz --- mc-4.8.25/doc/hints/l10n/mc.hint.uz 2020-01-18 21:51:46.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.uz 1970-01-01 00:00:00.000000000 +0000 @@ -1,87 +0,0 @@ -Hint: Use C-x t to copy tagged file names to the command line. - -Hint: Use C-x p to copy the current pathname to the command line. - -Hint: Completion: use M-Tab (or Esc+Tab). Type it twice to get a list. - -Hint: Use M-p and M-n to access the command history. - -Hint: Need to quote a character? Use Control-q and the character. - -Hint: Tired of these messages? Turn them off from the Options/Layout menu. - -Hint: Selecting directories: add a slash to the end of the matching pattern. - -Hint: If your terminal lacks functions keys, use the ESC+number sequence. - -Hint: The homepage of GNU Midnight Commander: http://www.midnight-commander.org/ - -Hint: Please send any bug reports to mc-devel@gnome.org - -Hint: Tab changes your current panel. - -Hint: VFS coolness: tap enter on a tar file to examine its contents. - -Hint: We also have a nice manual page. - -Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. - -Hint: % macros work even on the command line. - -Hint: M-! will allow you to execute programs and see the output in the viewer. - -Hint: The file listing format can be customized; do "man mc" for details. - -Hint: %D/%T expands to the tagged files in the opposite directory. - -Hint: Want your plain shell? Press C-o, and get back to MC with C-o again. - -Hint: Setting the CDPATH variable can save you keystrokes in cd commands. - -Hint: If you want to see your .* files, say so in the Configuration dialog. - -Hint: Want to see your *~ backup files? Set it in the Configuration dialog. - -Hint: Completion works on all input lines in all dialogs. Just press M-Tab. - -Hint: On slow terminals the -s flag may help. - -Hint: Find File: you can work on the files found using the Panelize button. - -Hint: Want to do complex searches? Use the External Panelize command. - -Hint: To change directory halfway through typing a command, use M-c (quick cd). - -Note: Shell commands will not work when you are on a non-local file system. - -Hint: Bring text back from the dead with C-y. - -Hint: Are some of your keys not working? Look at Options/Learn keys. - -Hint: To look at the output of a command in the viewer, use M-! - -Hint: F13 (or Shift-F3) invokes the viewer in raw mode. - -Hint: You may specify the editor for F4 with the shell variable EDITOR. - -Hint: You may specify the external viewer with the shell vars VIEWER or PAGER. - -Hint: You can disable all requests for confirmation in Options/Confirmation. - -Hint: Leap to frequently used directories in a single bound with C-\. - -Hint: You can do anonymous FTP with mc by typing 'cd ftp://machine.edu' - -Hint: FTP is built in the Midnight Commander, check the File/FTP link menu. - -Hint: M-t changes quickly the listing mode. - -Hint: You can specify the username when doing ftps: 'cd ftp://user@machine.edu' - -Hint: You can browse RPM files by tapping enter on top of an rpm file. - -Hint: To mark directories on the select dialog box, append a slash. - -Hint: To use the mouse cut and paste may require holding the shift key - -Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/l10n/mc.hint.zh_TW mc-4.8.26/doc/hints/l10n/mc.hint.zh_TW --- mc-4.8.25/doc/hints/l10n/mc.hint.zh_TW 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/doc/hints/l10n/mc.hint.zh_TW 2021-01-10 13:53:37.000000000 +0000 @@ -0,0 +1,87 @@ +提示: 使用 C-x 來複製已選擇的檔案名稱到命令列。 + +提示: 使用 C-p 來複製目前的路徑到命令列。 + +提示: 補齊: 使用 M-Tab ( 或 Esc+Tab)。 按兩次來查看列表。 + +提示: 使用 M-p 和 M-n 來存取指令紀錄。 + +提示: 要使用跳脫字元嗎? 使用 Control-q 再加上要輸入的字即可。 + +提示: 是否對這些訊息感到厭倦了? 可在選單中的【選項/樣式】來關閉它。 + +提示: 選取資料夾: 在比對結果的後方加上 "/" + +提示: 若您的終端機沒有功能鍵，可使用【ESC+數字鍵】來代替。 + +提示: GNU Midnight Commander 的網頁: http://www.midnight-commander.org/ + +提示: 任何錯誤報告請傳送至 mc-devel@gnome.org + +提示: Tab 可切換使用中的面板。 + +提示: VFS 的好處: 在 tar 檔案上按 Enter 按鍵可查看它的內容。 + +提示: 我們有一個很棒的手冊頁。 + +Hint: Do you want Lynx-style navigation? Set it in the Configuration dialog. + +提示: % 巨集也可在命令列中使用。 + +提示: M-! 可讓您執行程式並在檢視器中查看輸出結果。 + +提示: 您可以自訂檔案列表的格式；輸入 "mac mc" 指令查看更多資訊。 + +提示: %D/%T 會改變成另一側資料夾中被標記的檔案。 + +提示: 您想要使用一般的 shell 嗎? 按一下 C-o 即可，再按一下 C-o 又可回到 MC。 + +提示: 設定 CDPATH 環境變數可讓您儲存一些 cd 指令。 + +提示: 若您想要查看 .* 的檔案，請到設定中進行更改。 + +提示: 想查看您的 *~ 備份檔? 請到設定中進行更改。 + +提示: 補齊可以在任何對話框中，輸入任何文字時使用。只要按下 M-Tab 即可。 + +提示: 在反應較慢的終端機裡使用 -s 選項或許會有幫助。 + +提示: 尋找檔案: 您可以使用面板上的按鈕來進行檔案的尋找。 + +提示: 想要做較複雜的搜尋? 可使用外部面板的指令來進行。 + +提示: 要在輸入指令時中途改變目錄，可使用 M-c 指令 (快速的 cd) + +注意: 無法在非本地端的檔案系統中使用 Shell 指令。 + +提示: 可使用 C-y 將已刪除的文字重新顯示出來。 + +提示: 是否有功能鍵無法使用? 可看看 【選項/學習快捷鍵】中的功能鍵是否設定正確。 + +提示: 要在檢視器中查看指令輸出的結果，請使用 M-! + +提示: F13 (或 Shift-F3) 會使用原生模式開啟檢視器。 + +提示: 您可以使用環境變數 EDITOR 來指定按下 F4 後的檔案編輯器。 + +提示: 您可以使用環境變數 VIEWER 或 PAGER 來指定外部的檔案檢視器。 + +提示: 您可以在【選項/確認】中關閉所有的確認請求。 + +Hint: Leap to frequently used directories in a single bound with C-\. + +提示: 您可以在 mc 中使用匿名模式的 FTP，方法是輸入 'cd ftp://machine.edu' + +提示: FTP 是 Midnight Commander 的內建功能，可在【檔案 / 連結到 FTP ...】中察看。 + +提示: M-t 可快速切換列表模式。 + +提示: 您可以在使用 FTP 時指定使用者，例如: 'cd ftp://user@machine.edu' + +提示: 您可以在 rpm 格式的檔案上按 Enter 來瀏覽 RPM 裡的檔案。 + +提示: 在選取對話框中標記目錄，需在後方加入一個 "/" + +提示: 要使用滑鼠來剪下和貼上需同時按住 Shift 鍵。 + +Hint: Key frequently visited ftp sites in the hotlist: type C-\. diff -Nru mc-4.8.25/doc/hints/Makefile.in mc-4.8.26/doc/hints/Makefile.in --- mc-4.8.25/doc/hints/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/doc/hints/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/es/Makefile.in mc-4.8.26/doc/hlp/es/Makefile.in --- mc-4.8.25/doc/hlp/es/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/doc/hlp/es/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/hu/Makefile.in mc-4.8.26/doc/hlp/hu/Makefile.in --- mc-4.8.25/doc/hlp/hu/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/hlp/hu/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/it/Makefile.in mc-4.8.26/doc/hlp/it/Makefile.in --- mc-4.8.25/doc/hlp/it/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/hlp/it/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/Makefile.in mc-4.8.26/doc/hlp/Makefile.in --- mc-4.8.25/doc/hlp/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/doc/hlp/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/pl/Makefile.in mc-4.8.26/doc/hlp/pl/Makefile.in --- mc-4.8.25/doc/hlp/pl/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/hlp/pl/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/ru/Makefile.in mc-4.8.26/doc/hlp/ru/Makefile.in --- mc-4.8.25/doc/hlp/ru/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/hlp/ru/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/hlp/sr/Makefile.in mc-4.8.26/doc/hlp/sr/Makefile.in --- mc-4.8.25/doc/hlp/sr/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/hlp/sr/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/INSTALL mc-4.8.26/doc/INSTALL --- mc-4.8.25/doc/INSTALL 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/doc/INSTALL 2021-01-10 11:50:16.000000000 +0000 @@ -20,7 +20,7 @@ - gettext >= 0.18.1 - libssh2 >= 1.2.5 is required only for sftp vfs (1.2.7 if you need ssh-agent support) - libaspell to support spell checking in the internal editor -- ext2fs >= 1.42.4 to suport ext{2,3,4}fs extended attributes +- ext2fs >= 1.42.4 to support ext{2,3,4}fs extended attributes Installation instructions for GNU Midnight Commander diff -Nru mc-4.8.25/doc/Makefile.in mc-4.8.26/doc/Makefile.in --- mc-4.8.25/doc/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/doc/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/es/Makefile.in mc-4.8.26/doc/man/es/Makefile.in --- mc-4.8.25/doc/man/es/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/es/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/hu/Makefile.in mc-4.8.26/doc/man/hu/Makefile.in --- mc-4.8.25/doc/man/hu/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/hu/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/it/Makefile.in mc-4.8.26/doc/man/it/Makefile.in --- mc-4.8.25/doc/man/it/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/it/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/Makefile.in mc-4.8.26/doc/man/Makefile.in --- mc-4.8.25/doc/man/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/mc.1.in mc-4.8.26/doc/man/mc.1.in --- mc-4.8.25/doc/man/mc.1.in 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/doc/man/mc.1.in 2021-01-10 11:50:16.000000000 +0000 @@ -2113,13 +2113,17 @@ directory hotlist entries deletion and history cleanup. .\"NODE " Appearance" .SH " Appearance" -In this dialog you can select the skin to be used. +In this dialog you can select the skin to be used and enable shadow +for dialogs and drop down menus. .PP See the .\"LINK2" Skins .\"Skins" section for technical details about the skin definition files. +.PP +.I Shadows. +If this option is enabled, all dialogs and drop down menus will have a shadow. .\"NODE " Display bits" .SH " Display bits" This is used to configure the range of visible characters on the diff -Nru mc-4.8.25/doc/man/pl/Makefile.in mc-4.8.26/doc/man/pl/Makefile.in --- mc-4.8.25/doc/man/pl/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/pl/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/ru/Makefile.in mc-4.8.26/doc/man/ru/Makefile.in --- mc-4.8.25/doc/man/ru/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/ru/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/man/ru/mc.1.in mc-4.8.26/doc/man/ru/mc.1.in --- mc-4.8.25/doc/man/ru/mc.1.in 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/doc/man/ru/mc.1.in 2021-01-10 11:50:16.000000000 +0000 @@ -2411,12 +2411,17 @@ на подтверждение. .\"NODE " Appearance" .SH " Оформление" -Используя это диалоговое окно, вы можете выбрать скин. +Используя это диалоговое окно, вы можете выбрать скин и разрещить отрисовку +теней у диалоговых окон и выпадающих меню. .PP Для получения более подробной информации о скинах обратитесь к разделу .\"LINK2" Внешний вид\&. .\"Skins" +.PP +.I Тени. +Если эта опция включена, все диалоговые окна и выпадающие меню будут иметь +тени. .\"NODE " Display bits" .SH " Биты символов..." Этот пункт меню используется для задания диапазона отображаемых на diff -Nru mc-4.8.25/doc/man/sr/Makefile.in mc-4.8.26/doc/man/sr/Makefile.in --- mc-4.8.25/doc/man/sr/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/doc/man/sr/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/doc/NEWS mc-4.8.26/doc/NEWS --- mc-4.8.25/doc/NEWS 2020-07-05 19:34:53.000000000 +0000 +++ mc-4.8.26/doc/NEWS 2021-01-10 14:16:53.000000000 +0000 @@ -1,62 +1,106 @@ +Version 4.8.26 + +- Core + + * Support file names of any length (#4145) + * Implement persistent command line buffer for subshell (bash >= 4, zsh and fish are supported) (#4114, #4124, #4126) + * Implement shadows of dialog windows and menus (#4102) + * Allow running clipboard commands if DISPLAY is not set (#4133) + * Add support of "alacritty", "tmux", and "tmux-256color" terminals (#4149) + +- VFS + + * Support wim archive format (using wimtools (https://wimlib.net/)) (#4100) + * Support pak archive format (using unar (https://theunarchiver.com/)) (#4130) + +- Editor + + * Add Swift syntax highlighting (MidnightCommander/mc#159) + +- Misc + + * Code cleanup (#4103, #4127, #4131) + * ext.d/sound.sh: replace xmms with audacious (part of #4127) + * mc.ext: improve handling of compressed content (#4128, #2117) + * mc.ext: add support for OpenDocument flax xml formats: fodt, fods, fodp, fodg (#4157) + * Filehighlight fodg, fodp, fods, fodt, odg files as documents + * modarcon16 skin: make consistent with whitespaces (#4158) + +- Fixes + + * 0000 permissions are not preserved on copy/move file (#4155) + * Chattr dialog doesn't work with mouse (#4104) + * Wrong copy ETA displaying if "Follow links" option is set (#4101) + * C-i ("change panel" shortcut) has no effect (#4107) + * C-l ("refresh screen") and A-` ("switch screens") shortcuts have no effect (#4142, #4153) + * Cancel of history or completion window marks input lines as modified (#4152) + * Unexpected subshell execution at panel switch (#2110) + * Lock up after pressing Tab in subshell (#2269) + * tcsh: error: "The Commander can't change to the directory" (#4120) + * vfs: extfs: cannot handle files with name started with dash or space (#4077) + * vfs: hang on accessing files within a nested VFS for first 60 seconds (#4147) + * vfs: lose content of the current directory on a mounted CIFS share (on Linux >= 5.1) (#3987) + + Version 4.8.25 - Core - * Minimal version of GLib is 2.30.0 - * Avoid subshell warning for standalone mcedit/mcview/mcdiffview run from mc (#4056) - * Implement chattr command (change ext{2,3,4}fs extended attributes). Default shortcut is "C-x e" (#3847) - * Implement a WGroup widget -- a base class for widgets which contain other widgets (#2919, #4075) - * Implement key bindings for radiobuttons (#212) + * Minimal version of GLib is 2.30.0 + * Avoid subshell warning for standalone mcedit/mcview/mcdiffview run from mc (#4056) + * Implement chattr command (change ext{2,3,4}fs extended attributes). Default shortcut is "C-x e" (#3847) + * Implement a WGroup widget -- a base class for widgets which contain other widgets (#2919, #4075) + * Implement key bindings for radiobuttons (#212) - VFS - * RPM VFS improvements: - * Support weak dependency tags: ENHANCES, SUGGESTS, RECOMMENDS, SUPPLEMENTS (#4091) + * RPM VFS improvements: + - Support weak dependency tags: ENHANCES, SUGGESTS, RECOMMENDS, SUPPLEMENTS (#4091) - Editor - * Improvements of syntax highlighting: - * php (#4060) - * tcl: add shebangs with wish and tclsh (#4062) - * Cobol (#1987) - * Verilog/SystemVerilog (#4087) - * New syntax highlighting: - * Kotlin (#4088) - * ino (Arduino IDE and a number of other IDEs) (#4098) + * Improvements of syntax highlighting: + - php (#4060) + - tcl: add shebangs with wish and tclsh (#4062) + - Cobol (#1987) + - Verilog/SystemVerilog (#4087) + * New syntax highlighting: + - Kotlin (#4088) + - ino (Arduino IDE and a number of other IDEs) (#4098) - Misc - * Code cleanup (#4050, #4085) - * Add support for opus audio (#4061) - * mc-wrapper: don't cd to the same directory (#3355) - * Improve archive support: more binaries to view archive content (#4086) - * lha: jlha, lhasa - * arj: 7za - * cab: 7za - * zip; 7z - * zipx: 7za - * iso: 7za - * Clean up in video.sh handler (#4045) - * RealPlayer is a proprietary application which can't be installed in most distros and has long been abandoned. - * gtv hasn't been developed since 2003. - * xanim barely plays anything. - * Various fixups and updates of man page + * Code cleanup (#4050, #4085) + * Add support for opus audio (#4061) + * mc-wrapper: don't cd to the same directory (#3355) + * Improve archive support: more binaries to view archive content (#4086) + - lha: jlha, lhasa + - arj: 7za + - cab: 7za + - zip; 7z + - zipx: 7za + - iso: 7za + * Clean up in video.sh handler (#4045) + - RealPlayer is a proprietary application which can't be installed in most distros and has long been abandoned. + - gtv hasn't been developed since 2003. + - xanim barely plays anything. + * Various fixups and updates of man page - Fixes - * FTBFS on OSes w/o O_CLOEXEC (#4052) - * FTBFS with glib2 >= 2.63.3 (#4053) - * Undefined "__linux__" macro on non-Linux systems (#4058) - * Mouse is not handled with ncurses-6 (#3964) - * Mouse is not handled with S-Lang on some old terminal emulators (#4063) - * Terminal size is always 80x24 in subshell on Solaris 11.4 SPARC (#4099) - * Double clicking on empty area of file panel executes last item (#3722) - * Garbage in input line history (#4064) - * Speed of file copy is not displayed for single file (#4081) - * mcedit: blank screen with invisible error (#4057) - * mcedit: broken syntax highlighting for shell scripts (#4054) - * VFS: broken browsing of .deb packages (#4055) - * mc.lib installed twice (#4070) + * FTBFS on OSes w/o O_CLOEXEC (#4052) + * FTBFS with glib2 >= 2.63.3 (#4053) + * Undefined "__linux__" macro on non-Linux systems (#4058) + * Mouse is not handled with ncurses-6 (#3954) + * Mouse is not handled with S-Lang on some old terminal emulators (#4063) + * Terminal size is always 80x24 in subshell on Solaris 11.4 SPARC (#4099) + * Double clicking on empty area of file panel executes last item (#3722) + * Garbage in input line history (#4064) + * Speed of file copy is not displayed for single file (#4081) + * mcedit: blank screen with invisible error (#4057) + * mcedit: broken syntax highlighting for shell scripts (#4054) + * VFS: broken browsing of .deb packages (#4055) + * mc.lib installed twice (#4070) Version 4.8.24 diff -Nru mc-4.8.25/INSTALL mc-4.8.26/INSTALL --- mc-4.8.25/INSTALL 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/INSTALL 2021-01-10 11:50:16.000000000 +0000 @@ -20,7 +20,7 @@ - gettext >= 0.18.1 - libssh2 >= 1.2.5 is required only for sftp vfs (1.2.7 if you need ssh-agent support) - libaspell to support spell checking in the internal editor -- ext2fs >= 1.42.4 to suport ext{2,3,4}fs extended attributes +- ext2fs >= 1.42.4 to support ext{2,3,4}fs extended attributes Installation instructions for GNU Midnight Commander diff -Nru mc-4.8.25/lib/event/Makefile.in mc-4.8.26/lib/event/Makefile.in --- mc-4.8.25/lib/event/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/event/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/filehighlight/Makefile.in mc-4.8.26/lib/filehighlight/Makefile.in --- mc-4.8.25/lib/filehighlight/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/filehighlight/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/glibcompat.c mc-4.8.26/lib/glibcompat.c --- mc-4.8.25/lib/glibcompat.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/glibcompat.c 2021-01-10 11:50:16.000000000 +0000 @@ -160,3 +160,29 @@ #endif /* ! GLIB_CHECK_VERSION (2, 60, 0) */ /* --------------------------------------------------------------------------------------------- */ + +/** + * mc_g_string_copy: + * @dest: (not nullable): the destination #GString. Its current contents are destroyed + * @src: (not nullable): the source #GString + * @return: @dest + * + * Copies the bytes from a #GString into a #GString, destroying any previous contents. + * It is rather like the standard strcpy() function, except that you do not have to worry about + * having enough space to copy the string. + * + * There is no such API in GLib2. + */ +GString * +mc_g_string_copy (GString * dest, const GString * src) +{ + g_return_val_if_fail (src != NULL, NULL); + g_return_val_if_fail (dest != NULL, NULL); + + g_string_set_size (dest, 0); + g_string_append_len (dest, src->str, src->len); + + return dest; +} + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/lib/glibcompat.h mc-4.8.26/lib/glibcompat.h --- mc-4.8.25/lib/glibcompat.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/glibcompat.h 2021-01-10 11:50:16.000000000 +0000 @@ -24,6 +24,9 @@ void g_queue_clear_full (GQueue * queue, GDestroyNotify free_func); #endif /* ! GLIB_CHECK_VERSION (2, 60, 0) */ +/* There is no such API in GLib2 */ +GString *mc_g_string_copy (GString * dest, const GString * src); + /*** inline functions ****************************************************************************/ #endif /* MC_GLIBCOMPAT_H */ diff -Nru mc-4.8.25/lib/global.c mc-4.8.26/lib/global.c --- mc-4.8.25/lib/global.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/global.c 2021-01-10 11:50:16.000000000 +0000 @@ -31,7 +31,6 @@ #include #include "global.h" -#include "lib/timer.h" /* *INDENT-OFF* */ #ifdef ENABLE_SUBSHELL @@ -51,7 +50,6 @@ mc_global_t mc_global = { .mc_run_mode = MC_RUN_FULL, .run_from_parent_mc = FALSE, - .timer = NULL, .midnight_shutdown = FALSE, .sysconfig_dir = NULL, @@ -85,6 +83,7 @@ .tty = { .skin = NULL, + .shadows = TRUE, .setup_color_string = NULL, .term_color_string = NULL, .color_terminal_string = NULL, diff -Nru mc-4.8.25/lib/global.h mc-4.8.26/lib/global.h --- mc-4.8.25/lib/global.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/global.h 2021-01-10 11:50:16.000000000 +0000 @@ -148,8 +148,6 @@ #define DEFAULT_CHARSET "ASCII" -#include "lib/timer.h" /* mc_timer_t */ - /*** enums ***************************************************************************************/ /* run mode and params */ @@ -167,8 +165,6 @@ { mc_run_mode_t mc_run_mode; gboolean run_from_parent_mc; - /* global timer */ - mc_timer_t *timer; /* Used so that widgets know if they are being destroyed or shut down */ gboolean midnight_shutdown; @@ -230,6 +226,8 @@ { /* Use the specified skin */ char *skin; + /* Dialog window and frop down menu have a shadow */ + gboolean shadows; char *setup_color_string; char *term_color_string; diff -Nru mc-4.8.25/lib/keybind.c mc-4.8.26/lib/keybind.c --- mc-4.8.25/lib/keybind.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/keybind.c 2021-01-10 11:50:16.000000000 +0000 @@ -7,7 +7,7 @@ Written by: Vitja Makarov, 2005 Ilia Maslakov , 2009, 2012 - Andrew Borodin , 2009, 2010, 2011, 2012 + Andrew Borodin , 2009-2020 This file is part of the Midnight Commander. @@ -40,333 +40,336 @@ /*** file scope macro definitions ****************************************************************/ +#define ADD_KEYMAP_NAME(name) \ + { #name, CK_##name } + /*** file scope type declarations ****************************************************************/ /*** file scope variables ************************************************************************/ static name_keymap_t command_names[] = { /* common */ - {"InsertChar", CK_InsertChar}, - {"Enter", CK_Enter}, - {"ChangePanel", CK_ChangePanel}, - {"Up", CK_Up}, - {"Down", CK_Down}, - {"Left", CK_Left}, - {"Right", CK_Right}, - {"LeftQuick", CK_LeftQuick}, - {"RightQuick", CK_RightQuick}, - {"Home", CK_Home}, - {"End", CK_End}, - {"PageUp", CK_PageUp}, - {"PageDown", CK_PageDown}, - {"HalfPageUp", CK_HalfPageUp}, - {"HalfPageDown", CK_HalfPageDown}, - {"Top", CK_Top}, - {"Bottom", CK_Bottom}, - {"TopOnScreen", CK_TopOnScreen}, - {"MiddleOnScreen", CK_MiddleOnScreen}, - {"BottomOnScreen", CK_BottomOnScreen}, - {"WordLeft", CK_WordLeft}, - {"WordRight", CK_WordRight}, - {"Copy", CK_Copy}, - {"Move", CK_Move}, - {"Delete", CK_Delete}, - {"MakeDir", CK_MakeDir}, - {"ChangeMode", CK_ChangeMode}, - {"ChangeOwn", CK_ChangeOwn}, - {"ChangeOwnAdvanced", CK_ChangeOwnAdvanced}, + ADD_KEYMAP_NAME (InsertChar), + ADD_KEYMAP_NAME (Enter), + ADD_KEYMAP_NAME (ChangePanel), + ADD_KEYMAP_NAME (Up), + ADD_KEYMAP_NAME (Down), + ADD_KEYMAP_NAME (Left), + ADD_KEYMAP_NAME (Right), + ADD_KEYMAP_NAME (LeftQuick), + ADD_KEYMAP_NAME (RightQuick), + ADD_KEYMAP_NAME (Home), + ADD_KEYMAP_NAME (End), + ADD_KEYMAP_NAME (PageUp), + ADD_KEYMAP_NAME (PageDown), + ADD_KEYMAP_NAME (HalfPageUp), + ADD_KEYMAP_NAME (HalfPageDown), + ADD_KEYMAP_NAME (Top), + ADD_KEYMAP_NAME (Bottom), + ADD_KEYMAP_NAME (TopOnScreen), + ADD_KEYMAP_NAME (MiddleOnScreen), + ADD_KEYMAP_NAME (BottomOnScreen), + ADD_KEYMAP_NAME (WordLeft), + ADD_KEYMAP_NAME (WordRight), + ADD_KEYMAP_NAME (Copy), + ADD_KEYMAP_NAME (Move), + ADD_KEYMAP_NAME (Delete), + ADD_KEYMAP_NAME (MakeDir), + ADD_KEYMAP_NAME (ChangeMode), + ADD_KEYMAP_NAME (ChangeOwn), + ADD_KEYMAP_NAME (ChangeOwnAdvanced), #ifdef ENABLE_EXT2FS_ATTR - {"ChangeAttributes", CK_ChangeAttributes}, + ADD_KEYMAP_NAME (ChangeAttributes), #endif - {"Remove", CK_Remove}, - {"BackSpace", CK_BackSpace}, - {"Redo", CK_Redo}, - {"Clear", CK_Clear}, - {"Menu", CK_Menu}, - {"MenuLastSelected", CK_MenuLastSelected}, - {"UserMenu", CK_UserMenu}, - {"EditUserMenu", CK_EditUserMenu}, - {"Search", CK_Search}, - {"SearchContinue", CK_SearchContinue}, - {"Replace", CK_Replace}, - {"ReplaceContinue", CK_ReplaceContinue}, - {"Help", CK_Help}, - {"Shell", CK_Shell}, - {"Edit", CK_Edit}, - {"EditNew", CK_EditNew}, + ADD_KEYMAP_NAME (Remove), + ADD_KEYMAP_NAME (BackSpace), + ADD_KEYMAP_NAME (Redo), + ADD_KEYMAP_NAME (Clear), + ADD_KEYMAP_NAME (Menu), + ADD_KEYMAP_NAME (MenuLastSelected), + ADD_KEYMAP_NAME (UserMenu), + ADD_KEYMAP_NAME (EditUserMenu), + ADD_KEYMAP_NAME (Search), + ADD_KEYMAP_NAME (SearchContinue), + ADD_KEYMAP_NAME (Replace), + ADD_KEYMAP_NAME (ReplaceContinue), + ADD_KEYMAP_NAME (Help), + ADD_KEYMAP_NAME (Shell), + ADD_KEYMAP_NAME (Edit), + ADD_KEYMAP_NAME (EditNew), #ifdef HAVE_CHARSET - {"SelectCodepage", CK_SelectCodepage}, + ADD_KEYMAP_NAME (SelectCodepage), #endif - {"EditorViewerHistory", CK_EditorViewerHistory}, - {"History", CK_History}, - {"HistoryNext", CK_HistoryNext}, - {"HistoryPrev", CK_HistoryPrev}, - {"Complete", CK_Complete}, - {"Save", CK_Save}, - {"SaveAs", CK_SaveAs}, - {"Goto", CK_Goto}, - {"Reread", CK_Reread}, - {"Refresh", CK_Refresh}, - {"Suspend", CK_Suspend}, - {"Swap", CK_Swap}, - {"HotList", CK_HotList}, - {"SelectInvert", CK_SelectInvert}, - {"ScreenList", CK_ScreenList}, - {"ScreenNext", CK_ScreenNext}, - {"ScreenPrev", CK_ScreenPrev}, - {"FileNext", CK_FileNext}, - {"FilePrev", CK_FilePrev}, - {"DeleteToHome", CK_DeleteToHome}, - {"DeleteToEnd", CK_DeleteToEnd}, - {"DeleteToWordBegin", CK_DeleteToWordBegin}, - {"DeleteToWordEnd", CK_DeleteToWordEnd}, - {"Cut", CK_Cut}, - {"Store", CK_Store}, - {"Paste", CK_Paste}, - {"Mark", CK_Mark}, - {"MarkLeft", CK_MarkLeft}, - {"MarkRight", CK_MarkRight}, - {"MarkUp", CK_MarkUp}, - {"MarkDown", CK_MarkDown}, - {"MarkToWordBegin", CK_MarkToWordBegin}, - {"MarkToWordEnd", CK_MarkToWordEnd}, - {"MarkToHome", CK_MarkToHome}, - {"MarkToEnd", CK_MarkToEnd}, - {"ToggleNavigation", CK_ToggleNavigation}, - {"Sort", CK_Sort}, - {"Options", CK_Options}, - {"LearnKeys", CK_LearnKeys}, - {"Bookmark", CK_Bookmark}, - {"Quit", CK_Quit}, - {"QuitQuiet", CK_QuitQuiet}, - {"ExtendedKeyMap", CK_ExtendedKeyMap}, + ADD_KEYMAP_NAME (EditorViewerHistory), + ADD_KEYMAP_NAME (History), + ADD_KEYMAP_NAME (HistoryNext), + ADD_KEYMAP_NAME (HistoryPrev), + ADD_KEYMAP_NAME (Complete), + ADD_KEYMAP_NAME (Save), + ADD_KEYMAP_NAME (SaveAs), + ADD_KEYMAP_NAME (Goto), + ADD_KEYMAP_NAME (Reread), + ADD_KEYMAP_NAME (Refresh), + ADD_KEYMAP_NAME (Suspend), + ADD_KEYMAP_NAME (Swap), + ADD_KEYMAP_NAME (HotList), + ADD_KEYMAP_NAME (SelectInvert), + ADD_KEYMAP_NAME (ScreenList), + ADD_KEYMAP_NAME (ScreenNext), + ADD_KEYMAP_NAME (ScreenPrev), + ADD_KEYMAP_NAME (FileNext), + ADD_KEYMAP_NAME (FilePrev), + ADD_KEYMAP_NAME (DeleteToHome), + ADD_KEYMAP_NAME (DeleteToEnd), + ADD_KEYMAP_NAME (DeleteToWordBegin), + ADD_KEYMAP_NAME (DeleteToWordEnd), + ADD_KEYMAP_NAME (Cut), + ADD_KEYMAP_NAME (Store), + ADD_KEYMAP_NAME (Paste), + ADD_KEYMAP_NAME (Mark), + ADD_KEYMAP_NAME (MarkLeft), + ADD_KEYMAP_NAME (MarkRight), + ADD_KEYMAP_NAME (MarkUp), + ADD_KEYMAP_NAME (MarkDown), + ADD_KEYMAP_NAME (MarkToWordBegin), + ADD_KEYMAP_NAME (MarkToWordEnd), + ADD_KEYMAP_NAME (MarkToHome), + ADD_KEYMAP_NAME (MarkToEnd), + ADD_KEYMAP_NAME (ToggleNavigation), + ADD_KEYMAP_NAME (Sort), + ADD_KEYMAP_NAME (Options), + ADD_KEYMAP_NAME (LearnKeys), + ADD_KEYMAP_NAME (Bookmark), + ADD_KEYMAP_NAME (Quit), + ADD_KEYMAP_NAME (QuitQuiet), + ADD_KEYMAP_NAME (ExtendedKeyMap), /* main commands */ #ifdef USE_INTERNAL_EDIT - {"EditForceInternal", CK_EditForceInternal}, + ADD_KEYMAP_NAME (EditForceInternal), #endif - {"View", CK_View}, - {"ViewRaw", CK_ViewRaw}, - {"ViewFile", CK_ViewFile}, - {"ViewFiltered", CK_ViewFiltered}, - {"Find", CK_Find}, - {"DirSize", CK_DirSize}, - {"CompareDirs", CK_CompareDirs}, + ADD_KEYMAP_NAME (View), + ADD_KEYMAP_NAME (ViewRaw), + ADD_KEYMAP_NAME (ViewFile), + ADD_KEYMAP_NAME (ViewFiltered), + ADD_KEYMAP_NAME (Find), + ADD_KEYMAP_NAME (DirSize), + ADD_KEYMAP_NAME (CompareDirs), #ifdef USE_DIFF_VIEW - {"CompareFiles", CK_CompareFiles}, + ADD_KEYMAP_NAME (CompareFiles), #endif - {"OptionsVfs", CK_OptionsVfs}, - {"OptionsConfirm", CK_OptionsConfirm}, - {"OptionsDisplayBits", CK_OptionsDisplayBits}, - {"EditExtensionsFile", CK_EditExtensionsFile}, - {"EditFileHighlightFile", CK_EditFileHighlightFile}, - {"LinkSymbolicEdit", CK_LinkSymbolicEdit}, - {"ExternalPanelize", CK_ExternalPanelize}, - {"Filter", CK_Filter}, + ADD_KEYMAP_NAME (OptionsVfs), + ADD_KEYMAP_NAME (OptionsConfirm), + ADD_KEYMAP_NAME (OptionsDisplayBits), + ADD_KEYMAP_NAME (EditExtensionsFile), + ADD_KEYMAP_NAME (EditFileHighlightFile), + ADD_KEYMAP_NAME (LinkSymbolicEdit), + ADD_KEYMAP_NAME (ExternalPanelize), + ADD_KEYMAP_NAME (Filter), #ifdef ENABLE_VFS_FISH - {"ConnectFish", CK_ConnectFish}, + ADD_KEYMAP_NAME (ConnectFish), #endif #ifdef ENABLE_VFS_FTP - {"ConnectFtp", CK_ConnectFtp}, + ADD_KEYMAP_NAME (ConnectFtp), #endif #ifdef ENABLE_VFS_SFTP - {"ConnectSftp", CK_ConnectSftp}, + ADD_KEYMAP_NAME (ConnectSftp), #endif #ifdef ENABLE_VFS_SMB - {"ConnectSmb", CK_ConnectSmb}, + ADD_KEYMAP_NAME (ConnectSmb), #endif - {"PanelInfo", CK_PanelInfo}, + ADD_KEYMAP_NAME (PanelInfo), #ifdef ENABLE_BACKGROUND - {"Jobs", CK_Jobs}, + ADD_KEYMAP_NAME (Jobs), #endif - {"OptionsLayout", CK_OptionsLayout}, - {"OptionsAppearance", CK_OptionsAppearance}, - {"Link", CK_Link}, - {"SetupListingFormat", CK_SetupListingFormat}, - {"PanelListing", CK_PanelListing}, + ADD_KEYMAP_NAME (OptionsLayout), + ADD_KEYMAP_NAME (OptionsAppearance), + ADD_KEYMAP_NAME (Link), + ADD_KEYMAP_NAME (SetupListingFormat), + ADD_KEYMAP_NAME (PanelListing), #ifdef LISTMODE_EDITOR - {"ListMode", CK_ListMode}. + ADD_KEYMAP_NAME (ListMode), #endif - {"OptionsPanel", CK_OptionsPanel}, - {"CdQuick", CK_CdQuick}, - {"PanelQuickView", CK_PanelQuickView}, - {"LinkSymbolicRelative", CK_LinkSymbolicRelative}, - {"VfsList", CK_VfsList}, - {"SaveSetup", CK_SaveSetup}, - {"LinkSymbolic", CK_LinkSymbolic}, - {"PanelTree", CK_PanelTree}, - {"Tree", CK_Tree}, + ADD_KEYMAP_NAME (OptionsPanel), + ADD_KEYMAP_NAME (CdQuick), + ADD_KEYMAP_NAME (PanelQuickView), + ADD_KEYMAP_NAME (LinkSymbolicRelative), + ADD_KEYMAP_NAME (VfsList), + ADD_KEYMAP_NAME (SaveSetup), + ADD_KEYMAP_NAME (LinkSymbolic), + ADD_KEYMAP_NAME (PanelTree), + ADD_KEYMAP_NAME (Tree), #ifdef ENABLE_VFS_UNDELFS - {"Undelete", CK_Undelete}, + ADD_KEYMAP_NAME (Undelete), #endif - {"PutCurrentLink", CK_PutCurrentLink}, - {"PutOtherLink", CK_PutOtherLink}, - {"HotListAdd", CK_HotListAdd}, - {"ShowHidden", CK_ShowHidden}, - {"SplitVertHoriz", CK_SplitVertHoriz}, - {"SplitEqual", CK_SplitEqual}, - {"SplitMore", CK_SplitMore}, - {"SplitLess", CK_SplitLess}, - {"PutCurrentPath", CK_PutCurrentPath}, - {"PutOtherPath", CK_PutOtherPath}, - {"PutCurrentSelected", CK_PutCurrentSelected}, - {"PutCurrentFullSelected", CK_PutCurrentFullSelected}, - {"PutCurrentTagged", CK_PutCurrentTagged}, - {"PutOtherTagged", CK_PutOtherTagged}, - {"Select", CK_Select}, - {"Unselect", CK_Unselect}, + ADD_KEYMAP_NAME (PutCurrentLink), + ADD_KEYMAP_NAME (PutOtherLink), + ADD_KEYMAP_NAME (HotListAdd), + ADD_KEYMAP_NAME (ShowHidden), + ADD_KEYMAP_NAME (SplitVertHoriz), + ADD_KEYMAP_NAME (SplitEqual), + ADD_KEYMAP_NAME (SplitMore), + ADD_KEYMAP_NAME (SplitLess), + ADD_KEYMAP_NAME (PutCurrentPath), + ADD_KEYMAP_NAME (PutOtherPath), + ADD_KEYMAP_NAME (PutCurrentSelected), + ADD_KEYMAP_NAME (PutCurrentFullSelected), + ADD_KEYMAP_NAME (PutCurrentTagged), + ADD_KEYMAP_NAME (PutOtherTagged), + ADD_KEYMAP_NAME (Select), + ADD_KEYMAP_NAME (Unselect), /* panel */ - {"SelectExt", CK_SelectExt}, - {"ScrollLeft", CK_ScrollLeft}, - {"ScrollRight", CK_ScrollRight}, - {"PanelOtherCd", CK_PanelOtherCd}, - {"PanelOtherCdLink", CK_PanelOtherCdLink}, - {"CopySingle", CK_CopySingle}, - {"MoveSingle", CK_MoveSingle}, - {"DeleteSingle", CK_DeleteSingle}, - {"CdParent", CK_CdParent}, - {"CdChild", CK_CdChild}, - {"Panelize", CK_Panelize}, - {"PanelOtherSync", CK_PanelOtherSync}, - {"SortNext", CK_SortNext}, - {"SortPrev", CK_SortPrev}, - {"SortReverse", CK_SortReverse}, - {"SortByName", CK_SortByName}, - {"SortByExt", CK_SortByExt}, - {"SortBySize", CK_SortBySize}, - {"SortByMTime", CK_SortByMTime}, - {"CdParentSmart", CK_CdParentSmart}, - {"CycleListingFormat", CK_CycleListingFormat}, + ADD_KEYMAP_NAME (SelectExt), + ADD_KEYMAP_NAME (ScrollLeft), + ADD_KEYMAP_NAME (ScrollRight), + ADD_KEYMAP_NAME (PanelOtherCd), + ADD_KEYMAP_NAME (PanelOtherCdLink), + ADD_KEYMAP_NAME (CopySingle), + ADD_KEYMAP_NAME (MoveSingle), + ADD_KEYMAP_NAME (DeleteSingle), + ADD_KEYMAP_NAME (CdParent), + ADD_KEYMAP_NAME (CdChild), + ADD_KEYMAP_NAME (Panelize), + ADD_KEYMAP_NAME (PanelOtherSync), + ADD_KEYMAP_NAME (SortNext), + ADD_KEYMAP_NAME (SortPrev), + ADD_KEYMAP_NAME (SortReverse), + ADD_KEYMAP_NAME (SortByName), + ADD_KEYMAP_NAME (SortByExt), + ADD_KEYMAP_NAME (SortBySize), + ADD_KEYMAP_NAME (SortByMTime), + ADD_KEYMAP_NAME (CdParentSmart), + ADD_KEYMAP_NAME (CycleListingFormat), /* dialog */ - {"Ok", CK_Ok}, - {"Cancel", CK_Cancel}, + ADD_KEYMAP_NAME (Ok), + ADD_KEYMAP_NAME (Cancel), /* input line */ - {"Yank", CK_Yank}, + ADD_KEYMAP_NAME (Yank), /* help */ - {"Index", CK_Index}, - {"Back", CK_Back}, - {"LinkNext", CK_LinkNext}, - {"LinkPrev", CK_LinkPrev}, - {"NodeNext", CK_NodeNext}, - {"NodePrev", CK_NodePrev}, + ADD_KEYMAP_NAME (Index), + ADD_KEYMAP_NAME (Back), + ADD_KEYMAP_NAME (LinkNext), + ADD_KEYMAP_NAME (LinkPrev), + ADD_KEYMAP_NAME (NodeNext), + ADD_KEYMAP_NAME (NodePrev), /* tree */ - {"Forget", CK_Forget}, + ADD_KEYMAP_NAME (Forget), #if defined (USE_INTERNAL_EDIT) || defined (USE_DIFF_VIEW) - {"ShowNumbers", CK_ShowNumbers}, + ADD_KEYMAP_NAME (ShowNumbers), #endif /* chattr dialog */ - {"MarkAndDown", CK_MarkAndDown}, + ADD_KEYMAP_NAME (MarkAndDown), #ifdef USE_INTERNAL_EDIT - {"Close", CK_Close}, - {"Tab", CK_Tab}, - {"Undo", CK_Undo}, - {"ScrollUp", CK_ScrollUp}, - {"ScrollDown", CK_ScrollDown}, - {"Return", CK_Return}, - {"ParagraphUp", CK_ParagraphUp}, - {"ParagraphDown", CK_ParagraphDown}, - {"EditFile", CK_EditFile}, - {"MarkWord", CK_MarkWord}, - {"MarkLine", CK_MarkLine}, - {"MarkAll", CK_MarkAll}, - {"Unmark", CK_Unmark}, - {"MarkColumn", CK_MarkColumn}, - {"BlockSave", CK_BlockSave}, - {"InsertFile", CK_InsertFile}, - {"InsertOverwrite", CK_InsertOverwrite}, - {"Date", CK_Date}, - {"DeleteLine", CK_DeleteLine}, - {"EditMail", CK_Mail}, - {"ParagraphFormat", CK_ParagraphFormat}, - {"MatchBracket", CK_MatchBracket}, - {"ExternalCommand", CK_ExternalCommand}, - {"MacroStartRecord", CK_MacroStartRecord}, - {"MacroStopRecord", CK_MacroStopRecord}, - {"MacroStartStopRecord", CK_MacroStartStopRecord}, - {"MacroDelete", CK_MacroDelete}, - {"RepeatStartStopRecord", CK_RepeatStartStopRecord}, + ADD_KEYMAP_NAME (Close), + ADD_KEYMAP_NAME (Tab), + ADD_KEYMAP_NAME (Undo), + ADD_KEYMAP_NAME (ScrollUp), + ADD_KEYMAP_NAME (ScrollDown), + ADD_KEYMAP_NAME (Return), + ADD_KEYMAP_NAME (ParagraphUp), + ADD_KEYMAP_NAME (ParagraphDown), + ADD_KEYMAP_NAME (EditFile), + ADD_KEYMAP_NAME (MarkWord), + ADD_KEYMAP_NAME (MarkLine), + ADD_KEYMAP_NAME (MarkAll), + ADD_KEYMAP_NAME (Unmark), + ADD_KEYMAP_NAME (MarkColumn), + ADD_KEYMAP_NAME (BlockSave), + ADD_KEYMAP_NAME (InsertFile), + ADD_KEYMAP_NAME (InsertOverwrite), + ADD_KEYMAP_NAME (Date), + ADD_KEYMAP_NAME (DeleteLine), + ADD_KEYMAP_NAME (EditMail), + ADD_KEYMAP_NAME (ParagraphFormat), + ADD_KEYMAP_NAME (MatchBracket), + ADD_KEYMAP_NAME (ExternalCommand), + ADD_KEYMAP_NAME (MacroStartRecord), + ADD_KEYMAP_NAME (MacroStopRecord), + ADD_KEYMAP_NAME (MacroStartStopRecord), + ADD_KEYMAP_NAME (MacroDelete), + ADD_KEYMAP_NAME (RepeatStartStopRecord), #ifdef HAVE_ASPELL - {"SpellCheck", CK_SpellCheck}, - {"SpellCheckCurrentWord", CK_SpellCheckCurrentWord}, - {"SpellCheckSelectLang", CK_SpellCheckSelectLang}, + ADD_KEYMAP_NAME (SpellCheck), + ADD_KEYMAP_NAME (SpellCheckCurrentWord), + ADD_KEYMAP_NAME (SpellCheckSelectLang), #endif /* HAVE_ASPELL */ - {"BookmarkFlush", CK_BookmarkFlush}, - {"BookmarkNext", CK_BookmarkNext}, - {"BookmarkPrev", CK_BookmarkPrev}, - {"MarkPageUp", CK_MarkPageUp}, - {"MarkPageDown", CK_MarkPageDown}, - {"MarkToFileBegin", CK_MarkToFileBegin}, - {"MarkToFileEnd", CK_MarkToFileEnd}, - {"MarkToPageBegin", CK_MarkToPageBegin}, - {"MarkToPageEnd", CK_MarkToPageEnd}, - {"MarkScrollUp", CK_MarkScrollUp}, - {"MarkScrollDown", CK_MarkScrollDown}, - {"MarkParagraphUp", CK_MarkParagraphUp}, - {"MarkParagraphDown", CK_MarkParagraphDown}, - {"MarkColumnPageUp", CK_MarkColumnPageUp}, - {"MarkColumnPageDown", CK_MarkColumnPageDown}, - {"MarkColumnLeft", CK_MarkColumnLeft}, - {"MarkColumnRight", CK_MarkColumnRight}, - {"MarkColumnUp", CK_MarkColumnUp}, - {"MarkColumnDown", CK_MarkColumnDown}, - {"MarkColumnScrollUp", CK_MarkColumnScrollUp}, - {"MarkColumnScrollDown", CK_MarkColumnScrollDown}, - {"MarkColumnParagraphUp", CK_MarkColumnParagraphUp}, - {"MarkColumnParagraphDown", CK_MarkColumnParagraphDown}, - {"BlockShiftLeft", CK_BlockShiftLeft}, - {"BlockShiftRight", CK_BlockShiftRight}, - {"InsertLiteral", CK_InsertLiteral}, - {"ShowTabTws", CK_ShowTabTws}, - {"SyntaxOnOff", CK_SyntaxOnOff}, - {"SyntaxChoose", CK_SyntaxChoose}, - {"ShowMargin", CK_ShowMargin}, - {"OptionsSaveMode", CK_OptionsSaveMode}, - {"About", CK_About}, + ADD_KEYMAP_NAME (BookmarkFlush), + ADD_KEYMAP_NAME (BookmarkNext), + ADD_KEYMAP_NAME (BookmarkPrev), + ADD_KEYMAP_NAME (MarkPageUp), + ADD_KEYMAP_NAME (MarkPageDown), + ADD_KEYMAP_NAME (MarkToFileBegin), + ADD_KEYMAP_NAME (MarkToFileEnd), + ADD_KEYMAP_NAME (MarkToPageBegin), + ADD_KEYMAP_NAME (MarkToPageEnd), + ADD_KEYMAP_NAME (MarkScrollUp), + ADD_KEYMAP_NAME (MarkScrollDown), + ADD_KEYMAP_NAME (MarkParagraphUp), + ADD_KEYMAP_NAME (MarkParagraphDown), + ADD_KEYMAP_NAME (MarkColumnPageUp), + ADD_KEYMAP_NAME (MarkColumnPageDown), + ADD_KEYMAP_NAME (MarkColumnLeft), + ADD_KEYMAP_NAME (MarkColumnRight), + ADD_KEYMAP_NAME (MarkColumnUp), + ADD_KEYMAP_NAME (MarkColumnDown), + ADD_KEYMAP_NAME (MarkColumnScrollUp), + ADD_KEYMAP_NAME (MarkColumnScrollDown), + ADD_KEYMAP_NAME (MarkColumnParagraphUp), + ADD_KEYMAP_NAME (MarkColumnParagraphDown), + ADD_KEYMAP_NAME (BlockShiftLeft), + ADD_KEYMAP_NAME (BlockShiftRight), + ADD_KEYMAP_NAME (InsertLiteral), + ADD_KEYMAP_NAME (ShowTabTws), + ADD_KEYMAP_NAME (SyntaxOnOff), + ADD_KEYMAP_NAME (SyntaxChoose), + ADD_KEYMAP_NAME (ShowMargin), + ADD_KEYMAP_NAME (OptionsSaveMode), + ADD_KEYMAP_NAME (About), /* An action to run external script from macro */ {"ExecuteScript", CK_PipeBlock (0)}, - {"WindowMove", CK_WindowMove}, - {"WindowResize", CK_WindowResize}, - {"WindowFullscreen", CK_WindowFullscreen}, - {"WindowList", CK_WindowList}, - {"WindowNext", CK_WindowNext}, - {"WindowPrev", CK_WindowPrev}, + ADD_KEYMAP_NAME (WindowMove), + ADD_KEYMAP_NAME (WindowResize), + ADD_KEYMAP_NAME (WindowFullscreen), + ADD_KEYMAP_NAME (WindowList), + ADD_KEYMAP_NAME (WindowNext), + ADD_KEYMAP_NAME (WindowPrev), #endif /* USE_INTERNAL_EDIT */ /* viewer */ - {"WrapMode", CK_WrapMode}, - {"HexEditMode", CK_HexEditMode}, - {"HexMode", CK_HexMode}, - {"MagicMode", CK_MagicMode}, - {"NroffMode", CK_NroffMode}, - {"BookmarkGoto", CK_BookmarkGoto}, - {"Ruler", CK_Ruler}, - {"SearchForward", CK_SearchForward}, - {"SearchBackward", CK_SearchBackward}, - {"SearchForwardContinue", CK_SearchForwardContinue}, - {"SearchBackwardContinue", CK_SearchBackwardContinue}, - {"SearchOppositeContinue", CK_SearchOppositeContinue}, + ADD_KEYMAP_NAME (WrapMode), + ADD_KEYMAP_NAME (HexEditMode), + ADD_KEYMAP_NAME (HexMode), + ADD_KEYMAP_NAME (MagicMode), + ADD_KEYMAP_NAME (NroffMode), + ADD_KEYMAP_NAME (BookmarkGoto), + ADD_KEYMAP_NAME (Ruler), + ADD_KEYMAP_NAME (SearchForward), + ADD_KEYMAP_NAME (SearchBackward), + ADD_KEYMAP_NAME (SearchForwardContinue), + ADD_KEYMAP_NAME (SearchBackwardContinue), + ADD_KEYMAP_NAME (SearchOppositeContinue), #ifdef USE_DIFF_VIEW /* diff viewer */ - {"ShowSymbols", CK_ShowSymbols}, - {"SplitFull", CK_SplitFull}, - {"Tab2", CK_Tab2}, - {"Tab3", CK_Tab3}, - {"Tab4", CK_Tab4}, - {"Tab8", CK_Tab8}, - {"HunkNext", CK_HunkNext}, - {"HunkPrev", CK_HunkPrev}, - {"EditOther", CK_EditOther}, - {"Merge", CK_Merge}, - {"MergeOther", CK_MergeOther}, + ADD_KEYMAP_NAME (ShowSymbols), + ADD_KEYMAP_NAME (SplitFull), + ADD_KEYMAP_NAME (Tab2), + ADD_KEYMAP_NAME (Tab3), + ADD_KEYMAP_NAME (Tab4), + ADD_KEYMAP_NAME (Tab8), + ADD_KEYMAP_NAME (HunkNext), + ADD_KEYMAP_NAME (HunkPrev), + ADD_KEYMAP_NAME (EditOther), + ADD_KEYMAP_NAME (Merge), + ADD_KEYMAP_NAME (MergeOther), #endif /* USE_DIFF_VIEW */ {NULL, CK_IgnoreKey} diff -Nru mc-4.8.25/lib/keybind.h mc-4.8.26/lib/keybind.h --- mc-4.8.25/lib/keybind.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/keybind.h 2021-01-10 11:50:16.000000000 +0000 @@ -9,8 +9,8 @@ /*** typedefs(not structures) and defined constants **********************************************/ /* keymap sections */ -#define KEYMAP_SECTION_MAIN "main" -#define KEYMAP_SECTION_MAIN_EXT "main:xmap" +#define KEYMAP_SECTION_FILEMANAGER "filemanager" +#define KEYMAP_SECTION_FILEMANAGER_EXT "filemanager:xmap" #define KEYMAP_SECTION_PANEL "panel" #define KEYMAP_SECTION_DIALOG "dialog" #define KEYMAP_SECTION_MENU "menu" @@ -316,7 +316,7 @@ CK_InsertLiteral, CK_ExternalCommand, CK_Date, - CK_Mail, + CK_EditMail, /* viewer */ CK_WrapMode = 600L, diff -Nru mc-4.8.25/lib/Makefile.am mc-4.8.26/lib/Makefile.am --- mc-4.8.25/lib/Makefile.am 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/Makefile.am 2021-01-10 11:50:16.000000000 +0000 @@ -42,8 +42,7 @@ serialize.c serialize.h \ shell.c shell.h \ stat-size.h \ - timefmt.c timefmt.h \ - timer.c timer.h + timefmt.c timefmt.h if USE_MAINTAINER_MODE libmc_la_SOURCES += logging.c logging.h diff -Nru mc-4.8.25/lib/Makefile.in mc-4.8.26/lib/Makefile.in --- mc-4.8.25/lib/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -193,15 +193,15 @@ utilunix.c utilunix.h unixcompat.h util.c util.h fileloc.h \ fs.h hook.c hook.h glibcompat.c glibcompat.h global.c global.h \ keybind.c keybind.h lock.c lock.h serialize.c serialize.h \ - shell.c shell.h stat-size.h timefmt.c timefmt.h timer.c \ - timer.h logging.c logging.h charsets.c charsets.h + shell.c shell.h stat-size.h timefmt.c timefmt.h logging.c \ + logging.h charsets.c charsets.h am__objects_1 = am__objects_2 = utilunix.lo util.lo @USE_MAINTAINER_MODE_TRUE@am__objects_3 = logging.lo @CHARSET_TRUE@am__objects_4 = charsets.lo am_libmc_la_OBJECTS = $(am__objects_1) $(am__objects_2) hook.lo \ glibcompat.lo global.lo keybind.lo lock.lo serialize.lo \ - shell.lo timefmt.lo timer.lo $(am__objects_3) $(am__objects_4) + shell.lo timefmt.lo $(am__objects_3) $(am__objects_4) libmc_la_OBJECTS = $(am_libmc_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -229,8 +229,8 @@ ./$(DEPDIR)/hook.Plo ./$(DEPDIR)/keybind.Plo \ ./$(DEPDIR)/lock.Plo ./$(DEPDIR)/logging.Plo \ ./$(DEPDIR)/serialize.Plo ./$(DEPDIR)/shell.Plo \ - ./$(DEPDIR)/timefmt.Plo ./$(DEPDIR)/timer.Plo \ - ./$(DEPDIR)/util.Plo ./$(DEPDIR)/utilunix.Plo + ./$(DEPDIR)/timefmt.Plo ./$(DEPDIR)/util.Plo \ + ./$(DEPDIR)/utilunix.Plo am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -550,8 +550,8 @@ libmc_la_SOURCES = $(SUBLIB_includes) $(SRC_mc_utils) fileloc.h fs.h \ hook.c hook.h glibcompat.c glibcompat.h global.c global.h \ keybind.c keybind.h lock.c lock.h serialize.c serialize.h \ - shell.c shell.h stat-size.h timefmt.c timefmt.h timer.c \ - timer.h $(am__append_1) $(am__append_2) + shell.c shell.h stat-size.h timefmt.c timefmt.h \ + $(am__append_1) $(am__append_2) AM_CPPFLAGS = $(GLIB_CFLAGS) -I$(top_srcdir) libmc_la_LIBADD = event/libmcevent.la \ filehighlight/libmcfilehighlight.la mcconfig/libmcconfig.la \ @@ -658,7 +658,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/serialize.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/shell.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timefmt.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/utilunix.Plo@am__quote@ # am--include-marker @@ -906,7 +905,6 @@ -rm -f ./$(DEPDIR)/serialize.Plo -rm -f ./$(DEPDIR)/shell.Plo -rm -f ./$(DEPDIR)/timefmt.Plo - -rm -f ./$(DEPDIR)/timer.Plo -rm -f ./$(DEPDIR)/util.Plo -rm -f ./$(DEPDIR)/utilunix.Plo -rm -f Makefile @@ -964,7 +962,6 @@ -rm -f ./$(DEPDIR)/serialize.Plo -rm -f ./$(DEPDIR)/shell.Plo -rm -f ./$(DEPDIR)/timefmt.Plo - -rm -f ./$(DEPDIR)/timer.Plo -rm -f ./$(DEPDIR)/util.Plo -rm -f ./$(DEPDIR)/utilunix.Plo -rm -f Makefile diff -Nru mc-4.8.25/lib/mcconfig/Makefile.in mc-4.8.26/lib/mcconfig/Makefile.in --- mc-4.8.25/lib/mcconfig/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/mcconfig/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/search/Makefile.in mc-4.8.26/lib/search/Makefile.in --- mc-4.8.25/lib/search/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/search/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/shell.h mc-4.8.26/lib/shell.h --- mc-4.8.25/lib/shell.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/shell.h 2021-01-10 11:50:16.000000000 +0000 @@ -1,4 +1,4 @@ -/** \file timer.h +/** \file shell.h * \brief Header: shell structure */ diff -Nru mc-4.8.25/lib/skin/colors.c mc-4.8.26/lib/skin/colors.c --- mc-4.8.25/lib/skin/colors.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/skin/colors.c 2021-01-10 11:50:16.000000000 +0000 @@ -249,6 +249,7 @@ REVERSE_COLOR = mc_skin_color_get ("core", "reverse"); HEADER_COLOR = mc_skin_color_get ("core", "header"); COMMAND_MARK_COLOR = mc_skin_color_get ("core", "commandlinemark"); + SHADOW_COLOR = mc_skin_color_get ("core", "shadow"); COLOR_NORMAL = mc_skin_color_get ("dialog", "_default_"); COLOR_FOCUS = mc_skin_color_get ("dialog", "dfocus"); diff -Nru mc-4.8.25/lib/skin/Makefile.in mc-4.8.26/lib/skin/Makefile.in --- mc-4.8.25/lib/skin/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/skin/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/skin.h mc-4.8.26/lib/skin.h --- mc-4.8.25/lib/skin.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/skin.h 2021-01-10 11:50:16.000000000 +0000 @@ -22,92 +22,93 @@ #define REVERSE_COLOR mc_skin_color__cache[6] #define COMMAND_MARK_COLOR mc_skin_color__cache[7] #define HEADER_COLOR mc_skin_color__cache[8] +#define SHADOW_COLOR mc_skin_color__cache[9] /* Dialog colors */ -#define COLOR_NORMAL mc_skin_color__cache[9] -#define COLOR_FOCUS mc_skin_color__cache[10] -#define COLOR_HOT_NORMAL mc_skin_color__cache[11] -#define COLOR_HOT_FOCUS mc_skin_color__cache[12] -#define COLOR_TITLE mc_skin_color__cache[13] +#define COLOR_NORMAL mc_skin_color__cache[10] +#define COLOR_FOCUS mc_skin_color__cache[11] +#define COLOR_HOT_NORMAL mc_skin_color__cache[12] +#define COLOR_HOT_FOCUS mc_skin_color__cache[13] +#define COLOR_TITLE mc_skin_color__cache[14] /* Error dialog colors */ -#define ERROR_COLOR mc_skin_color__cache[14] -#define ERROR_FOCUS mc_skin_color__cache[15] -#define ERROR_HOT_NORMAL mc_skin_color__cache[16] -#define ERROR_HOT_FOCUS mc_skin_color__cache[17] -#define ERROR_TITLE mc_skin_color__cache[18] +#define ERROR_COLOR mc_skin_color__cache[15] +#define ERROR_FOCUS mc_skin_color__cache[16] +#define ERROR_HOT_NORMAL mc_skin_color__cache[17] +#define ERROR_HOT_FOCUS mc_skin_color__cache[18] +#define ERROR_TITLE mc_skin_color__cache[19] /* Menu colors */ -#define MENU_ENTRY_COLOR mc_skin_color__cache[19] -#define MENU_SELECTED_COLOR mc_skin_color__cache[20] -#define MENU_HOT_COLOR mc_skin_color__cache[21] -#define MENU_HOTSEL_COLOR mc_skin_color__cache[22] -#define MENU_INACTIVE_COLOR mc_skin_color__cache[23] +#define MENU_ENTRY_COLOR mc_skin_color__cache[20] +#define MENU_SELECTED_COLOR mc_skin_color__cache[21] +#define MENU_HOT_COLOR mc_skin_color__cache[22] +#define MENU_HOTSEL_COLOR mc_skin_color__cache[23] +#define MENU_INACTIVE_COLOR mc_skin_color__cache[24] /* Popup menu colors */ -#define PMENU_ENTRY_COLOR mc_skin_color__cache[24] -#define PMENU_SELECTED_COLOR mc_skin_color__cache[25] -#define PMENU_HOT_COLOR mc_skin_color__cache[26] /* unused: not implemented yet */ -#define PMENU_HOTSEL_COLOR mc_skin_color__cache[27] /* unused: not implemented yet */ -#define PMENU_TITLE_COLOR mc_skin_color__cache[28] +#define PMENU_ENTRY_COLOR mc_skin_color__cache[25] +#define PMENU_SELECTED_COLOR mc_skin_color__cache[26] +#define PMENU_HOT_COLOR mc_skin_color__cache[27] /* unused: not implemented yet */ +#define PMENU_HOTSEL_COLOR mc_skin_color__cache[28] /* unused: not implemented yet */ +#define PMENU_TITLE_COLOR mc_skin_color__cache[29] -#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[29] -#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[30] +#define BUTTONBAR_HOTKEY_COLOR mc_skin_color__cache[30] +#define BUTTONBAR_BUTTON_COLOR mc_skin_color__cache[31] -#define STATUSBAR_COLOR mc_skin_color__cache[31] +#define STATUSBAR_COLOR mc_skin_color__cache[32] /* * This should be selectable independently. Default has to be black background * foreground does not matter at all. */ -#define GAUGE_COLOR mc_skin_color__cache[32] -#define INPUT_COLOR mc_skin_color__cache[33] -#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[34] -#define INPUT_MARK_COLOR mc_skin_color__cache[35] -#define INPUT_HISTORY_COLOR mc_skin_color__cache[36] -#define COMMAND_HISTORY_COLOR mc_skin_color__cache[37] - -#define HELP_NORMAL_COLOR mc_skin_color__cache[38] -#define HELP_ITALIC_COLOR mc_skin_color__cache[39] -#define HELP_BOLD_COLOR mc_skin_color__cache[40] -#define HELP_LINK_COLOR mc_skin_color__cache[41] -#define HELP_SLINK_COLOR mc_skin_color__cache[42] -#define HELP_TITLE_COLOR mc_skin_color__cache[43] - - -#define VIEW_NORMAL_COLOR mc_skin_color__cache[44] -#define VIEW_BOLD_COLOR mc_skin_color__cache[45] -#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[46] -#define VIEW_SELECTED_COLOR mc_skin_color__cache[47] +#define GAUGE_COLOR mc_skin_color__cache[33] +#define INPUT_COLOR mc_skin_color__cache[34] +#define INPUT_UNCHANGED_COLOR mc_skin_color__cache[35] +#define INPUT_MARK_COLOR mc_skin_color__cache[36] +#define INPUT_HISTORY_COLOR mc_skin_color__cache[37] +#define COMMAND_HISTORY_COLOR mc_skin_color__cache[38] + +#define HELP_NORMAL_COLOR mc_skin_color__cache[39] +#define HELP_ITALIC_COLOR mc_skin_color__cache[40] +#define HELP_BOLD_COLOR mc_skin_color__cache[41] +#define HELP_LINK_COLOR mc_skin_color__cache[42] +#define HELP_SLINK_COLOR mc_skin_color__cache[43] +#define HELP_TITLE_COLOR mc_skin_color__cache[44] + + +#define VIEW_NORMAL_COLOR mc_skin_color__cache[45] +#define VIEW_BOLD_COLOR mc_skin_color__cache[46] +#define VIEW_UNDERLINED_COLOR mc_skin_color__cache[47] +#define VIEW_SELECTED_COLOR mc_skin_color__cache[48] /* * editor colors - only 4 for normal, search->found, select, and whitespace * respectively * Last is defined to view color. */ -#define EDITOR_NORMAL_COLOR mc_skin_color__cache[48] -#define EDITOR_BOLD_COLOR mc_skin_color__cache[49] -#define EDITOR_MARKED_COLOR mc_skin_color__cache[50] -#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[51] -#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[52] -#define EDITOR_BACKGROUND mc_skin_color__cache[53] -#define EDITOR_FRAME mc_skin_color__cache[54] -#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[55] -#define EDITOR_FRAME_DRAG mc_skin_color__cache[56] +#define EDITOR_NORMAL_COLOR mc_skin_color__cache[49] +#define EDITOR_BOLD_COLOR mc_skin_color__cache[50] +#define EDITOR_MARKED_COLOR mc_skin_color__cache[51] +#define EDITOR_WHITESPACE_COLOR mc_skin_color__cache[52] +#define EDITOR_RIGHT_MARGIN_COLOR mc_skin_color__cache[53] +#define EDITOR_BACKGROUND mc_skin_color__cache[54] +#define EDITOR_FRAME mc_skin_color__cache[55] +#define EDITOR_FRAME_ACTIVE mc_skin_color__cache[56] +#define EDITOR_FRAME_DRAG mc_skin_color__cache[57] /* color of left 8 char status per line */ -#define LINE_STATE_COLOR mc_skin_color__cache[57] -#define BOOK_MARK_COLOR mc_skin_color__cache[58] -#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[59] +#define LINE_STATE_COLOR mc_skin_color__cache[58] +#define BOOK_MARK_COLOR mc_skin_color__cache[59] +#define BOOK_MARK_FOUND_COLOR mc_skin_color__cache[60] /* Diff colors */ -#define DFF_ADD_COLOR mc_skin_color__cache[60] -#define DFF_CHG_COLOR mc_skin_color__cache[61] -#define DFF_CHH_COLOR mc_skin_color__cache[62] -#define DFF_CHD_COLOR mc_skin_color__cache[63] -#define DFF_DEL_COLOR mc_skin_color__cache[64] -#define DFF_ERROR_COLOR mc_skin_color__cache[65] +#define DFF_ADD_COLOR mc_skin_color__cache[61] +#define DFF_CHG_COLOR mc_skin_color__cache[62] +#define DFF_CHH_COLOR mc_skin_color__cache[63] +#define DFF_CHD_COLOR mc_skin_color__cache[64] +#define DFF_DEL_COLOR mc_skin_color__cache[65] +#define DFF_ERROR_COLOR mc_skin_color__cache[66] -#define MC_SKIN_COLOR_CACHE_COUNT 66 +#define MC_SKIN_COLOR_CACHE_COUNT 67 /*** enums ***************************************************************************************/ diff -Nru mc-4.8.25/lib/stat-size.h mc-4.8.26/lib/stat-size.h --- mc-4.8.25/lib/stat-size.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/stat-size.h 2021-01-10 11:50:16.000000000 +0000 @@ -81,12 +81,6 @@ /* HP-UX counts st_blocks in 1024-byte units. This loses when mixing HP-UX and BSD file systems with NFS. */ #define ST_NBLOCKSIZE 1024 -#else /* !hpux */ -#if defined _CRAY -#define ST_NBLOCKS(statbuf) \ - (S_ISREG ((statbuf).st_mode) || S_ISDIR ((statbuf).st_mode) \ - ? (statbuf).st_blocks * ST_BLKSIZE (statbuf) / ST_NBLOCKSIZE : 0) -#endif #endif #endif diff -Nru mc-4.8.25/lib/strutil/Makefile.in mc-4.8.26/lib/strutil/Makefile.in --- mc-4.8.25/lib/strutil/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/strutil/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/strutil/strutilutf8.c mc-4.8.26/lib/strutil/strutilutf8.c --- mc-4.8.25/lib/strutil/strutilutf8.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/strutil/strutilutf8.c 2021-01-10 11:50:16.000000000 +0000 @@ -70,7 +70,7 @@ GUnicodeType type; type = g_unichar_type (uni); - return (type == G_UNICODE_COMBINING_MARK) + return (type == G_UNICODE_SPACING_MARK) || (type == G_UNICODE_ENCLOSING_MARK) || (type == G_UNICODE_NON_SPACING_MARK); } diff -Nru mc-4.8.25/lib/strutil/xstrtol.c mc-4.8.26/lib/strutil/xstrtol.c --- mc-4.8.25/lib/strutil/xstrtol.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/strutil/xstrtol.c 2021-01-10 11:50:16.000000000 +0000 @@ -176,6 +176,7 @@ break; } } + break; default: break; } diff -Nru mc-4.8.25/lib/timer.c mc-4.8.26/lib/timer.c --- mc-4.8.25/lib/timer.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/timer.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,114 +0,0 @@ -/* - Simple timer for the Midnight Commander. - - Copyright (C) 2013-2020 - Free Software Foundation, Inc. - - Written by: - Andrew Borodin 2013 - - This file is part of the Midnight Commander. - - The Midnight Commander 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 3 of the License, - or (at your option) any later version. - - The Midnight Commander 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, see . - */ - -/** \file - * \brief Source: simple timer - */ - -#include - -#include - -#include "lib/global.h" -#include "lib/timer.h" - -/*** global variables ****************************************************************************/ - -/** - * mc_timer_t: - * - * Opaque datatype that records a start time. - * #mc_timer_t records a start time, and counts microseconds elapsed since - * that time. - **/ -struct mc_timer_t -{ - guint64 start; -}; - -/*** file scope macro definitions ****************************************************************/ - -/*** file scope type declarations ****************************************************************/ - -/*** file scope variables ************************************************************************/ - -/*** file scope functions ************************************************************************/ - -/* --------------------------------------------------------------------------------------------- */ -/*** public functions ****************************************************************************/ -/* --------------------------------------------------------------------------------------------- */ - -/** - * Creates a new timer, and starts timing. - * - * @return: a new #mc_timer_t. - **/ -mc_timer_t * -mc_timer_new (void) -{ - mc_timer_t *timer; - struct timeval tv; - - timer = g_new (mc_timer_t, 1); - gettimeofday (&tv, NULL); - timer->start = (guint64) tv.tv_sec * G_USEC_PER_SEC + (guint64) tv.tv_usec; - - return timer; -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Destroys a timer, freeing associated resources. - * - * @timer: an #mc_timer_t to destroy. - **/ -void -mc_timer_destroy (mc_timer_t * timer) -{ - g_free (timer); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Obtains the time since the timer was started. - * - * @timer: an #mc_timer_t. - * - * @return: microseconds elapsed, the time since the timer was started - * - **/ -guint64 -mc_timer_elapsed (const mc_timer_t * timer) -{ - struct timeval tv; - - gettimeofday (&tv, NULL); - - return ((guint64) tv.tv_sec * G_USEC_PER_SEC + (guint64) tv.tv_usec - timer->start); -} - -/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/lib/timer.h mc-4.8.26/lib/timer.h --- mc-4.8.25/lib/timer.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/timer.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/** \file timer.h - * \brief Header: simple timer - */ - -#ifndef MC_TIMER_H -#define MC_TIMER_H - -/*** typedefs(not structures) and defined constants **********************************************/ - -/*** enums ***************************************************************************************/ - -/*** structures declarations (and typedefs of structures)*****************************************/ - -struct mc_timer_t; -typedef struct mc_timer_t mc_timer_t; - -/*** global variables defined in .c file *********************************************************/ - -/*** declarations of public functions ************************************************************/ - -mc_timer_t *mc_timer_new (void); -void mc_timer_destroy (mc_timer_t * timer); -guint64 mc_timer_elapsed (const mc_timer_t * timer); - -/*** inline functions **************************************************/ - -#endif /* MC_TIMER_H */ diff -Nru mc-4.8.25/lib/tty/Makefile.in mc-4.8.26/lib/tty/Makefile.in --- mc-4.8.25/lib/tty/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/tty/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/tty/tty.c mc-4.8.26/lib/tty/tty.c --- mc-4.8.25/lib/tty/tty.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/tty/tty.c 2021-01-10 11:50:16.000000000 +0000 @@ -56,6 +56,7 @@ #include "tty.h" #include "tty-internal.h" +#include "color.h" /* tty_set_normal_attrs() */ #include "mouse.h" /* use_mouse_p */ #include "win.h" @@ -264,6 +265,17 @@ /* --------------------------------------------------------------------------------------------- */ +void +tty_draw_box_shadow (int y, int x, int rows, int cols, int shadow_color) +{ + /* draw right shadow */ + tty_colorize_area (y + 1, x + cols, rows - 1, 2, shadow_color); + /* draw bottom shadow */ + tty_colorize_area (y + rows, x + 2, 1, cols, shadow_color); +} + +/* --------------------------------------------------------------------------------------------- */ + char * mc_tty_normalize_from_utf8 (const char *str) { @@ -311,6 +323,17 @@ } /* --------------------------------------------------------------------------------------------- */ + +/** Clear screen */ +void +tty_clear_screen (void) +{ + tty_set_normal_attrs (); + tty_fill_region (0, 0, LINES, COLS, ' '); + tty_refresh (); +} + +/* --------------------------------------------------------------------------------------------- */ void tty_init_xterm_support (gboolean is_xterm) diff -Nru mc-4.8.25/lib/tty/tty.h mc-4.8.26/lib/tty/tty.h --- mc-4.8.25/lib/tty/tty.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/tty/tty.h 2021-01-10 11:50:16.000000000 +0000 @@ -126,12 +126,16 @@ extern void tty_draw_hline (int y, int x, int ch, int len); extern void tty_draw_vline (int y, int x, int ch, int len); extern void tty_draw_box (int y, int x, int rows, int cols, gboolean single); +extern void tty_draw_box_shadow (int y, int x, int rows, int cols, int shadow_color); extern void tty_fill_region (int y, int x, int rows, int cols, unsigned char ch); extern int tty_resize (int fd); extern void tty_refresh (void); extern void tty_change_screen_size (void); +/* Clear screen */ +extern void tty_clear_screen (void); + extern int mc_tty_normalize_lines_char (const char *); extern void tty_enter_ca_mode (void); diff -Nru mc-4.8.25/lib/tty/tty-internal.h mc-4.8.26/lib/tty/tty-internal.h --- mc-4.8.25/lib/tty/tty-internal.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/tty/tty-internal.h 2021-01-10 11:50:16.000000000 +0000 @@ -42,6 +42,8 @@ void tty_init_xterm_support (gboolean is_xterm); int tty_lowlevel_getch (void); +void tty_colorize_area (int y, int x, int rows, int cols, int color); + /*** inline functions ****************************************************************************/ #endif /* MC_TTY_INTERNAL_H */ diff -Nru mc-4.8.25/lib/tty/tty-ncurses.c mc-4.8.26/lib/tty/tty-ncurses.c --- mc-4.8.25/lib/tty/tty-ncurses.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/tty/tty-ncurses.c 2021-01-10 11:50:16.000000000 +0000 @@ -48,6 +48,7 @@ #include "tty-internal.h" /* mc_tty_normalize_from_utf8() */ #include "tty.h" +#include "color.h" /* tty_setcolor */ #include "color-internal.h" #include "key.h" #include "mouse.h" @@ -120,6 +121,44 @@ } /* --------------------------------------------------------------------------------------------- */ + +/** + * Get visible part of area. + * + * @returns TRUE if any part of area is in screen bounds, FALSE otherwise. + */ +static gboolean +tty_clip (int *y, int *x, int *rows, int *cols) +{ + if (*y < 0) + { + *rows += *y; + + if (*rows <= 0) + return FALSE; + + *y = 0; + } + + if (*x < 0) + { + *cols += *x; + + if (*cols <= 0) + return FALSE; + + *x = 0; + } + + if (*y + *rows > LINES) + *rows = LINES - *y; + if (*x + *cols > COLS) + *cols = COLS - *x; + + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -494,30 +533,8 @@ { int i; - if (y < 0) - { - rows += y; - - if (rows <= 0) - return; - - y = 0; - } - - if (x < 0) - { - cols += x; - - if (cols <= 0) - return; - - x = 0; - } - - if (y + rows > LINES) - rows = LINES - y; - if (x + cols > COLS) - cols = COLS - x; + if (!tty_clip (&y, &x, &rows, &cols)) + return; for (i = 0; i < rows; i++) { @@ -532,6 +549,38 @@ } /* --------------------------------------------------------------------------------------------- */ + +void +tty_colorize_area (int y, int x, int rows, int cols, int color) +{ + cchar_t *ctext; + wchar_t wch[10]; /* TODO not sure if the length is correct */ + attr_t attrs; + short color_pair; + + if (!use_colors || !tty_clip (&y, &x, &rows, &cols)) + return; + + tty_setcolor (color); + ctext = g_malloc (sizeof (cchar_t) * (cols + 1)); + + for (int row = 0; row < rows; row++) + { + mvin_wchnstr (y + row, x, ctext, cols); + + for (int col = 0; col < cols; col++) + { + getcchar (&ctext[col], wch, &attrs, &color_pair, NULL); + setcchar (&ctext[col], wch, attrs, color, NULL); + } + + mvadd_wchnstr (y + row, x, ctext, cols); + } + + g_free (ctext); +} + +/* --------------------------------------------------------------------------------------------- */ void tty_set_alt_charset (gboolean alt_charset) diff -Nru mc-4.8.25/lib/tty/tty-slang.c mc-4.8.26/lib/tty/tty-slang.c --- mc-4.8.25/lib/tty/tty-slang.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/tty/tty-slang.c 2021-01-10 11:50:16.000000000 +0000 @@ -623,6 +623,15 @@ /* --------------------------------------------------------------------------------------------- */ void +tty_colorize_area (int y, int x, int rows, int cols, int color) +{ + if (use_colors) + SLsmg_set_color_in_region (color, y, x, rows, cols); +} + +/* --------------------------------------------------------------------------------------------- */ + +void tty_set_alt_charset (gboolean alt_charset) { SLsmg_set_char_set ((int) alt_charset); diff -Nru mc-4.8.25/lib/util.c mc-4.8.26/lib/util.c --- mc-4.8.25/lib/util.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/util.c 2021-01-10 11:50:16.000000000 +0000 @@ -51,7 +51,6 @@ #include "lib/vfs/vfs.h" #include "lib/strutil.h" #include "lib/util.h" -#include "lib/timer.h" /*** global variables ****************************************************************************/ @@ -664,7 +663,7 @@ { /* avoid trailing PATH_SEP, if present */ if (!IS_PATH_SEP (s[strlen (s) - 1])) - return (path_sep != NULL) ? path_sep + 1 : s; + return path_sep + 1; while (--path_sep > s && !IS_PATH_SEP (*path_sep)) ; @@ -783,6 +782,7 @@ r = new_r + 1; goto osc_out; } + break; default: break; } @@ -1513,16 +1513,16 @@ * and if it has then updates the timestamp. * * @param timestamp the last timestamp in microseconds, updated if the given time elapsed - * @param deleay amount of time in microseconds + * @param delay amount of time in microseconds * @return TRUE if clock skew detected, FALSE otherwise */ gboolean -mc_time_elapsed (guint64 * timestamp, guint64 delay) +mc_time_elapsed (gint64 * timestamp, gint64 delay) { - guint64 now; + gint64 now; - now = mc_timer_elapsed (mc_global.timer); + now = g_get_real_time (); if (now >= *timestamp && now < *timestamp + delay) return FALSE; diff -Nru mc-4.8.25/lib/util.h mc-4.8.26/lib/util.h --- mc-4.8.25/lib/util.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/util.h 2021-01-10 11:50:16.000000000 +0000 @@ -38,6 +38,22 @@ #define MC_PIPE_ERROR_CREATE_PIPE_STREAM -4 #define MC_PIPE_ERROR_READ -5 +/* gnulib efa15594e17fc20827dba66414fb391e99905394 + + *_GL_CMP (n1, n2) performs a three-valued comparison on n1 vs. n2. + * It returns + * 1 if n1 > n2 + * 0 if n1 == n2 + * -1 if n1 < n2 + * The native code (n1 > n2 ? 1 : n1 < n2 ? -1 : 0) produces a conditional + * jump with nearly all GCC versions up to GCC 10. + * This variant (n1 < n2 ? -1 : n1 > n2) produces a conditional with many + * GCC versions up to GCC 9. + * The better code (n1 > n2) - (n1 < n2) from Hacker's Delight para 2-9 + * avoids conditional jumps in all GCC versions >= 3.4. + */ +#define _GL_CMP(n1, n2) (((n1) > (n2)) - ((n1) < (n2))) + /*** enums ***************************************************************************************/ /* Pathname canonicalization */ @@ -256,7 +272,7 @@ void mc_replace_error (GError ** dest, int code, const char *format, ...) G_GNUC_PRINTF (3, 4); /* *INDENT-ON* */ -gboolean mc_time_elapsed (guint64 * timestamp, guint64 delay); +gboolean mc_time_elapsed (gint64 * timestamp, gint64 delay); /*** inline functions **************************************************/ diff -Nru mc-4.8.25/lib/utilunix.c mc-4.8.26/lib/utilunix.c --- mc-4.8.25/lib/utilunix.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/utilunix.c 2021-01-10 11:50:16.000000000 +0000 @@ -715,11 +715,14 @@ void open_error_pipe (void) { + int error_fd = -1; + if (pipe (error_pipe) < 0) message (D_NORMAL, _("Warning"), _("Pipe failed")); old_error = dup (STDERR_FILENO); - if (old_error < 0 || close (STDERR_FILENO) != 0 || dup (error_pipe[1]) != STDERR_FILENO) + if (old_error < 0 || close (STDERR_FILENO) != 0 + || (error_fd = dup (error_pipe[1])) != STDERR_FILENO) { message (D_NORMAL, _("Warning"), _("Dup failed")); @@ -749,6 +752,8 @@ } } } + if (error_fd >= 0) + close (error_fd); /* we never write there */ close (error_pipe[1]); error_pipe[1] = -1; diff -Nru mc-4.8.25/lib/vfs/direntry.c mc-4.8.26/lib/vfs/direntry.c --- mc-4.8.25/lib/vfs/direntry.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/vfs/direntry.c 2021-01-10 11:50:16.000000000 +0000 @@ -70,7 +70,6 @@ #include "lib/tty/tty.h" /* enable/disable interrupt key */ #include "lib/util.h" /* custom_canonicalize_pathname() */ -#include "lib/timer.h" #if 0 #include "lib/widget.h" /* message() */ #endif @@ -453,10 +452,10 @@ /* --------------------------------------------------------------------------------------------- */ -static void * +static struct vfs_dirent * vfs_s_readdir (void *data) { - static union vfs_dirent dir; + struct vfs_dirent *dir = NULL; struct dirhandle *info = (struct dirhandle *) data; const char *name; @@ -465,13 +464,13 @@ name = VFS_ENTRY (info->cur->data)->name; if (name != NULL) - g_strlcpy (dir.dent.d_name, name, MC_MAXPATHLEN); + dir = vfs_dirent_init (NULL, name, 0); else vfs_die ("Null in structure-cannot happen"); info->cur = g_list_next (info->cur); - return (void *) &dir; + return dir; } /* --------------------------------------------------------------------------------------------- */ @@ -863,7 +862,7 @@ static gboolean vfs_s_dir_uptodate (struct vfs_class *me, struct vfs_s_inode *ino) { - guint64 tim; + gint64 tim; if (me->flush) { @@ -871,7 +870,7 @@ return 0; } - tim = mc_timer_elapsed (mc_global.timer); + tim = g_get_real_time (); return (tim < ino->timestamp); } diff -Nru mc-4.8.25/lib/vfs/gc.c mc-4.8.26/lib/vfs/gc.c --- mc-4.8.25/lib/vfs/gc.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/vfs/gc.c 2021-01-10 11:50:16.000000000 +0000 @@ -44,7 +44,6 @@ #include "lib/global.h" #include "lib/event.h" #include "lib/util.h" /* MC_PTR_FREE */ -#include "lib/timer.h" #include "vfs.h" #include "utilvfs.h" @@ -98,7 +97,7 @@ { struct vfs_class *v; vfsid id; - guint64 time; + gint64 time; }; /*** file scope variables ************************************************************************/ @@ -130,7 +129,7 @@ stamp = g_new (struct vfs_stamping, 1); stamp->v = v; stamp->id = id; - stamp->time = mc_timer_elapsed (mc_global.timer); + stamp->time = g_get_real_time (); stamps = g_slist_append (stamps, stamp); } @@ -153,7 +152,7 @@ stamp = g_slist_find_custom (stamps, &what, vfs_stamp_compare); if (stamp != NULL && stamp->data != NULL) { - VFS_STAMPING (stamp->data)->time = mc_timer_elapsed (mc_global.timer); + VFS_STAMPING (stamp->data)->time = g_get_real_time (); ret = TRUE; } @@ -239,7 +238,7 @@ vfs_expire (gboolean now) { static gboolean locked = FALSE; - guint64 curr_time, exp_time; + gint64 curr_time, exp_time; GSList *stamp; /* Avoid recursive invocation, e.g. when one of the free functions @@ -248,7 +247,7 @@ return; locked = TRUE; - curr_time = mc_timer_elapsed (mc_global.timer); + curr_time = g_get_real_time (); exp_time = curr_time - vfs_timeout * G_USEC_PER_SEC; if (now) diff -Nru mc-4.8.25/lib/vfs/interface.c mc-4.8.26/lib/vfs/interface.c --- mc-4.8.25/lib/vfs/interface.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/vfs/interface.c 2021-01-10 11:50:16.000000000 +0000 @@ -62,12 +62,10 @@ /* TODO: move it to separate private .h */ extern GString *vfs_str_buffer; extern vfs_class *current_vfs; -extern struct dirent *mc_readdir_result; +extern struct vfs_dirent *mc_readdir_result; /*** global variables ****************************************************************************/ -struct dirent *mc_readdir_result = NULL; - /*** file scope macro definitions ****************************************************************/ /*** file scope type declarations ****************************************************************/ @@ -458,30 +456,15 @@ /* --------------------------------------------------------------------------------------------- */ -struct dirent * +struct vfs_dirent * mc_readdir (DIR * dirp) { int handle; struct vfs_class *vfs; void *fsinfo = NULL; - struct dirent *entry = NULL; + struct vfs_dirent *entry = NULL; vfs_path_element_t *vfs_path_element; - if (mc_readdir_result == NULL) - { - /* We can't just allocate struct dirent as (see man dirent.h) - * struct dirent has VERY nonnaive semantics of allocating - * d_name in it. Moreover, linux's glibc-2.9 allocates dirents _less_, - * than 'sizeof (struct dirent)' making full bitwise (sizeof dirent) copy - * heap corrupter. So, allocate longliving dirent with at least - * (MAXNAMLEN + 1) for d_name in it. - * Strictly saying resulting dirent is unusable as we don't adjust internal - * structures, holding dirent size. But we don't use it in libc infrastructure. - * TODO: to make simpler homemade dirent-alike structure. - */ - mc_readdir_result = (struct dirent *) g_malloc (sizeof (struct dirent) + MAXNAMLEN + 1); - } - if (dirp == NULL) { errno = EFAULT; @@ -507,8 +490,8 @@ #else g_string_assign (vfs_str_buffer, entry->d_name); #endif - mc_readdir_result->d_ino = entry->d_ino; - g_strlcpy (mc_readdir_result->d_name, vfs_str_buffer->str, MAXNAMLEN + 1); + vfs_dirent_assign (mc_readdir_result, vfs_str_buffer->str, entry->d_ino); + vfs_dirent_free (entry); } if (entry == NULL) errno = vfs->readdir ? vfs_ferrno (vfs) : E_NOTSUPP; diff -Nru mc-4.8.25/lib/vfs/Makefile.in mc-4.8.26/lib/vfs/Makefile.in --- mc-4.8.25/lib/vfs/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/vfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/vfs/vfs.c mc-4.8.26/lib/vfs/vfs.c --- mc-4.8.25/lib/vfs/vfs.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/vfs/vfs.c 2021-01-10 11:50:16.000000000 +0000 @@ -69,13 +69,14 @@ #include "gc.h" /* TODO: move it to the separate .h */ -extern struct dirent *mc_readdir_result; +extern struct vfs_dirent *mc_readdir_result; extern GPtrArray *vfs__classes_list; extern GString *vfs_str_buffer; extern vfs_class *current_vfs; /*** global variables ****************************************************************************/ +struct vfs_dirent *mc_readdir_result = NULL; GPtrArray *vfs__classes_list = NULL; GString *vfs_str_buffer = NULL; vfs_class *current_vfs = NULL; @@ -469,6 +470,7 @@ vfs_str_buffer = g_string_new (""); + mc_readdir_result = vfs_dirent_init (NULL, "", -1); } /* --------------------------------------------------------------------------------------------- */ @@ -518,11 +520,71 @@ vfs_str_buffer = NULL; current_vfs = NULL; vfs_free_handle_list = -1; - MC_PTR_FREE (mc_readdir_result); + vfs_dirent_free (mc_readdir_result); + mc_readdir_result = NULL; } /* --------------------------------------------------------------------------------------------- */ /** + * Init or create vfs_dirent structure + * + * @d vfs_dirent structure to init. If NULL, new structure is created. + * @fname file name + * @ino file inode number + * + * @return pointer to d if d isn't NULL, or pointer to newly created structure. + */ + +struct vfs_dirent * +vfs_dirent_init (struct vfs_dirent *d, const char *fname, ino_t ino) +{ + struct vfs_dirent *ret = d; + + if (ret == NULL) + ret = g_new0 (struct vfs_dirent, 1); + + if (ret->d_name_str == NULL) + ret->d_name_str = g_string_sized_new (MC_MAXFILENAMELEN); + + vfs_dirent_assign (ret, fname, ino); + + return ret; +} + +/* --------------------------------------------------------------------------------------------- */ +/** + * Assign members of vfs_dirent structure + * + * @d vfs_dirent structure for assignment + * @fname file name + * @ino file inode number + */ + +void +vfs_dirent_assign (struct vfs_dirent *d, const char *fname, ino_t ino) +{ + g_string_assign (d->d_name_str, fname); + d->d_name = d->d_name_str->str; + d->d_ino = ino; +} + +/* --------------------------------------------------------------------------------------------- */ +/** + * Destroy vfs_dirent structure + * + * @d vfs_dirent structure to destroy. + */ + +void +vfs_dirent_free (struct vfs_dirent *d) +{ + g_string_free (d->d_name_str, TRUE); + g_free (d); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** * These ones grab information from the VFS * and handles them to an upper layer */ diff -Nru mc-4.8.25/lib/vfs/vfs.h mc-4.8.26/lib/vfs/vfs.h --- mc-4.8.25/lib/vfs/vfs.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/vfs/vfs.h 2021-01-10 11:50:16.000000000 +0000 @@ -9,7 +9,7 @@ #include #include -#include +#include /* DIR */ #ifdef HAVE_UTIMENSAT #include #elif defined (HAVE_UTIME_H) @@ -20,7 +20,6 @@ #include #include "lib/global.h" -#include "lib/fs.h" /* MC_MAXPATHLEN */ #include "path.h" @@ -172,7 +171,7 @@ ssize_t (*write) (void *vfs_info, const char *buf, size_t count); void *(*opendir) (const vfs_path_t * vpath); - void *(*readdir) (void *vfs_info); + struct vfs_dirent *(*readdir) (void *vfs_info); int (*closedir) (void *vfs_info); int (*stat) (const vfs_path_t * vpath, struct stat * buf); @@ -211,13 +210,17 @@ } vfs_class; /* - * This union is used to ensure that there is enough space for the - * filename (d_name) when the dirent structure is created. + * This struct is used instead of standard dirent to hold file name of any length + * (not limited to NAME_MAX). */ -union vfs_dirent +struct vfs_dirent { - struct dirent dent; - char _extra_buffer[offsetof (struct dirent, d_name) + MC_MAXPATHLEN + 1]; + /* private */ + GString *d_name_str; + + /* public */ + ino_t d_ino; + char *d_name; /* Alias of d_name_str->str */ }; /*** global variables defined in .c file *********************************************************/ @@ -278,6 +281,10 @@ void vfs_release_path (const vfs_path_t * vpath); +struct vfs_dirent *vfs_dirent_init (struct vfs_dirent *d, const char *fname, ino_t ino); +void vfs_dirent_assign (struct vfs_dirent *d, const char *fname, ino_t ino); +void vfs_dirent_free (struct vfs_dirent *d); + void vfs_fill_names (fill_names_f); /* *INDENT-OFF* */ @@ -309,7 +316,7 @@ int mc_close (int handle); off_t mc_lseek (int fd, off_t offset, int whence); DIR *mc_opendir (const vfs_path_t * vpath); -struct dirent *mc_readdir (DIR * dirp); +struct vfs_dirent *mc_readdir (DIR * dirp); int mc_closedir (DIR * dir); int mc_stat (const vfs_path_t * vpath, struct stat *buf); int mc_mknod (const vfs_path_t * vpath, mode_t mode, dev_t dev); diff -Nru mc-4.8.25/lib/vfs/xdirentry.h mc-4.8.26/lib/vfs/xdirentry.h --- mc-4.8.25/lib/vfs/xdirentry.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/vfs/xdirentry.h 2021-01-10 11:50:16.000000000 +0000 @@ -91,7 +91,7 @@ struct stat st; /* Parameters of this inode */ char *linkname; /* Symlink's contents */ char *localname; /* Filename of local file, if we have one */ - guint64 timestamp; /* Subclass specific */ + gint64 timestamp; /* Subclass specific */ off_t data_offset; /* Subclass specific */ }; diff -Nru mc-4.8.25/lib/widget/dialog.c mc-4.8.26/lib/widget/dialog.c --- mc-4.8.25/lib/widget/dialog.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/dialog.c 2021-01-10 11:50:16.000000000 +0000 @@ -121,7 +121,7 @@ mc_refresh (); #else /* Use this if the refreshes fail */ - clr_scr (); + tty_clear_screen (); repaint_screen (); #endif /* HAVE_SLANG */ } @@ -206,6 +206,8 @@ long command; command = widget_lookup_key (WIDGET (h), d_key); + if (command == CK_IgnoreKey) + command = keybind_lookup_keymap_command (dialog_map, d_key); if (command != CK_IgnoreKey) return dlg_execute_cmd (h, command); diff -Nru mc-4.8.25/lib/widget/dialog.h mc-4.8.26/lib/widget/dialog.h --- mc-4.8.25/lib/widget/dialog.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/dialog.h 2021-01-10 11:50:16.000000000 +0000 @@ -13,6 +13,7 @@ #include "lib/global.h" #include "lib/hook.h" /* hook_t */ +#include "lib/keybind.h" /* global_keymap_t */ /*** typedefs(not structures) and defined constants **********************************************/ diff -Nru mc-4.8.25/lib/widget/dialog-switch.c mc-4.8.26/lib/widget/dialog-switch.c --- mc-4.8.25/lib/widget/dialog-switch.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/dialog-switch.c 2021-01-10 11:50:16.000000000 +0000 @@ -313,16 +313,6 @@ /* --------------------------------------------------------------------------------------------- */ void -clr_scr (void) -{ - tty_set_normal_attrs (); - tty_fill_region (0, 0, LINES, COLS, ' '); - tty_refresh (); -} - -/* --------------------------------------------------------------------------------------------- */ - -void repaint_screen (void) { do_refresh (); diff -Nru mc-4.8.25/lib/widget/dialog-switch.h mc-4.8.26/lib/widget/dialog-switch.h --- mc-4.8.25/lib/widget/dialog-switch.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/widget/dialog-switch.h 2021-01-10 11:50:16.000000000 +0000 @@ -28,8 +28,6 @@ void dialog_switch_got_winch (void); void dialog_switch_shutdown (void); -/* Clear screen */ -void clr_scr (void); void repaint_screen (void); void mc_refresh (void); void dialog_change_screen_size (void); diff -Nru mc-4.8.25/lib/widget/frame.c mc-4.8.26/lib/widget/frame.c --- mc-4.8.25/lib/widget/frame.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/frame.c 2021-01-10 11:50:16.000000000 +0000 @@ -76,6 +76,9 @@ colors = widget_get_colors (w); + if (mc_global.tty.shadows) + tty_draw_box_shadow (w->y, w->x, w->lines, w->cols, SHADOW_COLOR); + tty_setcolor (colors[FRAME_COLOR_NORMAL]); tty_fill_region (w->y, w->x, w->lines, w->cols, ' '); tty_draw_box (w->y + d, w->x + d, w->lines - 2 * d, w->cols - 2 * d, f->single); diff -Nru mc-4.8.25/lib/widget/input.c mc-4.8.26/lib/widget/input.c --- mc-4.8.25/lib/widget/input.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/input.c 2021-01-10 11:50:16.000000000 +0000 @@ -941,12 +941,12 @@ { case MSG_MOUSE_DOWN: widget_select (w); - in->first = FALSE; if (event->x >= w->cols - HISTORY_BUTTON_WIDTH && should_show_history_button (in)) do_show_hist (in); else { + in->first = FALSE; input_mark_cmd (in, FALSE); input_set_point (in, input_screen_to_point (in, event->x)); /* save point for the possible following MSG_MOUSE_DRAG action */ @@ -1146,18 +1146,22 @@ port_region_marked_for_delete (in); input_complete_free (in); v = insert_char (in, key); + input_update (in, TRUE); } else { + gboolean keep_first; + if (command != CK_Complete) input_complete_free (in); input_execute_cmd (in, command); v = MSG_HANDLED; - if (in->first) - input_update (in, TRUE); /* needed to clear in->first */ + /* if in->first == TRUE and history or completion window was cancelled, + keep "first" state */ + keep_first = in->first && (command == CK_History || command == CK_Complete); + input_update (in, !keep_first); } - input_update (in, TRUE); return v; } @@ -1244,6 +1248,9 @@ if (w->owner == NULL || !widget_get_state (WIDGET (w->owner), WST_ACTIVE)) return; + if (clear_first) + in->first = FALSE; + if (should_show_history_button (in)) has_history = HISTORY_BUTTON_WIDTH; @@ -1325,9 +1332,6 @@ str_cnext_char (&cp); } } - - if (clear_first) - in->first = FALSE; } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/lib/widget/input_complete.c mc-4.8.26/lib/widget/input_complete.c --- mc-4.8.25/lib/widget/input_complete.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/input_complete.c 2021-01-10 11:50:16.000000000 +0000 @@ -139,7 +139,7 @@ static vfs_path_t *dirname_vpath = NULL; gboolean isdir = TRUE, isexec = FALSE; - struct dirent *entry = NULL; + struct vfs_dirent *entry = NULL; SHOW_C_CTX ("filename_completion_function"); diff -Nru mc-4.8.25/lib/widget/Makefile.in mc-4.8.26/lib/widget/Makefile.in --- mc-4.8.25/lib/widget/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/lib/widget/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/lib/widget/menu.c mc-4.8.26/lib/widget/menu.c --- mc-4.8.25/lib/widget/menu.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/menu.c 2021-01-10 11:50:16.000000000 +0000 @@ -187,6 +187,10 @@ if (column + menu->max_entry_len + 5 > (gsize) w->cols) column = w->cols - menu->max_entry_len - 5; + if (mc_global.tty.shadows) + tty_draw_box_shadow (w->y + 1, w->x + column, count + 2, menu->max_entry_len + 5, + SHADOW_COLOR); + tty_setcolor (MENU_ENTRY_COLOR); tty_draw_box (w->y + 1, w->x + column, count + 2, menu->max_entry_len + 5, FALSE); diff -Nru mc-4.8.25/lib/widget/widget-common.c mc-4.8.26/lib/widget/widget-common.c --- mc-4.8.25/lib/widget/widget-common.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/widget-common.c 2021-01-10 11:50:16.000000000 +0000 @@ -798,13 +798,9 @@ { Gpm_Event local; + memset (&local, 0, sizeof (local)); + local.buttons = global->buttons; -#ifdef HAVE_LIBGPM - local.clicks = 0; - local.margin = 0; - local.modifiers = 0; - local.vc = 0; -#endif local.x = global->x - w->x; local.y = global->y - w->y; local.type = global->type; diff -Nru mc-4.8.25/lib/widget/wtools.c mc-4.8.26/lib/widget/wtools.c --- mc-4.8.25/lib/widget/wtools.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/lib/widget/wtools.c 2021-01-10 11:50:16.000000000 +0000 @@ -583,17 +583,17 @@ status_msg_init (status_msg_t * sm, const char *title, double delay, status_msg_cb init_cb, status_msg_update_cb update_cb, status_msg_cb deinit_cb) { - guint64 start; + gint64 start; /* repaint screen to remove previous finished dialog */ mc_refresh (); - start = mc_timer_elapsed (mc_global.timer); + start = g_get_real_time (); sm->dlg = dlg_create (TRUE, 0, 0, 7, MIN (MAX (40, COLS / 2), COLS), WPOS_CENTER, FALSE, dialog_colors, NULL, NULL, NULL, title); sm->start = start; - sm->delay = (guint64) (delay * G_USEC_PER_SEC); + sm->delay = (gint64) (delay * G_USEC_PER_SEC); sm->block = FALSE; sm->init = init_cb; @@ -658,7 +658,7 @@ /* dialog is not shown yet */ /* do not change sm->start */ - guint64 start = sm->start; + gint64 start = sm->start; if (mc_time_elapsed (&start, sm->delay)) dlg_init (sm->dlg); diff -Nru mc-4.8.25/lib/widget/wtools.h mc-4.8.26/lib/widget/wtools.h --- mc-4.8.25/lib/widget/wtools.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/lib/widget/wtools.h 2021-01-10 11:50:16.000000000 +0000 @@ -5,8 +5,6 @@ #ifndef MC__WTOOLS_H #define MC__WTOOLS_H -#include "lib/timer.h" - /*** typedefs(not structures) and defined constants **********************************************/ /* Pass this as def_text to request a password */ @@ -42,8 +40,8 @@ struct status_msg_t { WDialog *dlg; /* pointer to status message dialog */ - guint64 start; /* start time in microseconds */ - guint64 delay; /* delay before raise the 'dlg' in microseconds */ + gint64 start; /* start time in microseconds */ + gint64 delay; /* delay before raise the 'dlg' in microseconds */ gboolean block; /* how to get event using tty_get_event() */ status_msg_cb init; /* callback to init derived classes */ diff -Nru mc-4.8.25/m4.include/gnulib/fsusage.m4 mc-4.8.26/m4.include/gnulib/fsusage.m4 --- mc-4.8.25/m4.include/gnulib/fsusage.m4 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/m4.include/gnulib/fsusage.m4 2021-01-10 11:50:16.000000000 +0000 @@ -1,7 +1,7 @@ -# serial 34 +# serial 35 # Obtaining file system usage information. -# Copyright (C) 1997-1998, 2000-2001, 2003-2017 Free Software Foundation, Inc. +# Copyright (C) 1997-1998, 2000-2001, 2003-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -36,7 +36,6 @@ dnl Mac OS X >= 10.5 (32-bit mode). AC_REQUIRE([AC_SYS_LARGEFILE]) - AC_MSG_CHECKING([how to get file system space usage]) ac_fsusage_space=no # Perform only the link test since it seems there are no variants of the diff -Nru mc-4.8.25/m4.include/gnulib/mountlist.m4 mc-4.8.26/m4.include/gnulib/mountlist.m4 --- mc-4.8.25/m4.include/gnulib/mountlist.m4 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/m4.include/gnulib/mountlist.m4 2021-01-10 11:50:16.000000000 +0000 @@ -1,4 +1,4 @@ -# serial 13 +# serial 14 dnl Copyright (C) 2002-2006, 2009-2019 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -244,7 +244,7 @@ "C" #endif int getmntinfo (struct statfs **, int); - ]], [])], + ]], [[]])], [fu_cv_sys_mounted_getmntinfo2=no], [fu_cv_sys_mounted_getmntinfo2=yes]) ]) diff -Nru mc-4.8.25/m4.include/gnulib/stat-size.m4 mc-4.8.26/m4.include/gnulib/stat-size.m4 --- mc-4.8.25/m4.include/gnulib/stat-size.m4 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/m4.include/gnulib/stat-size.m4 2021-01-10 11:50:16.000000000 +0000 @@ -1,6 +1,6 @@ #serial 1 -# Copyright (C) 2011-2016 Free Software Foundation, Inc. +# Copyright (C) 2011-2020 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9,6 +9,6 @@ AC_DEFUN([gl_STAT_SIZE], [ # Don't call AC_STRUCT_ST_BLOCKS because it causes bugs. Details at - # http://lists.gnu.org/archive/html/bug-gnulib/2011-06/msg00051.html + # https://lists.gnu.org/r/bug-gnulib/2011-06/msg00051.html AC_CHECK_HEADERS_ONCE([sys/param.h]) ]) diff -Nru mc-4.8.25/Makefile.in mc-4.8.26/Makefile.in --- mc-4.8.25/Makefile.in 2020-07-12 20:16:53.000000000 +0000 +++ mc-4.8.26/Makefile.in 2021-01-21 17:14:04.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -189,8 +189,8 @@ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ cscope distdir distdir-am dist dist-all distcheck -am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ - $(LISP)config.h.in +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) \ + config.h.in # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is # *not* preserved. @@ -763,6 +763,10 @@ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__post_remove_distdir) +dist-zstd: distdir + tardir=$(distdir) && $(am__tar) | zstd -c $${ZSTD_CLEVEL-$${ZSTD_OPT--19}} >$(distdir).tar.zst + $(am__post_remove_distdir) + dist-tarZ: distdir @echo WARNING: "Support for distribution archives compressed with" \ "legacy program 'compress' is deprecated." >&2 @@ -805,6 +809,8 @@ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ + *.tar.zst*) \ + zstd -dc $(distdir).tar.zst | $(am__untar) ;;\ esac chmod -R a-w $(distdir) chmod u+w $(distdir) @@ -982,18 +988,18 @@ am--refresh check check-am clean clean-cscope clean-generic \ clean-libtool cscope cscopelist-am ctags ctags-am dist \ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \ - dist-xz dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-dvi install-dvi-am install-exec install-exec-am \ - install-html install-html-am install-info install-info-am \ - install-man install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ - uninstall-am + dist-xz dist-zip dist-zstd distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + installcheck installcheck-am installdirs installdirs-am \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am .PRECIOUS: Makefile diff -Nru mc-4.8.25/misc/ext.d/archive.sh mc-4.8.26/misc/ext.d/archive.sh --- mc-4.8.25/misc/ext.d/archive.sh 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/ext.d/archive.sh 2021-01-10 11:50:16.000000000 +0000 @@ -146,6 +146,9 @@ zoo) zoo l "${MC_EXT_FILENAME}" ;; + wim) + wimlib-imagex info "${MC_EXT_FILENAME}" 2> /dev/null + ;; *) ;; esac diff -Nru mc-4.8.25/misc/ext.d/doc.sh.in mc-4.8.26/misc/ext.d/doc.sh.in --- mc-4.8.25/misc/ext.d/doc.sh.in 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/misc/ext.d/doc.sh.in 2021-01-10 11:50:16.000000000 +0000 @@ -25,9 +25,9 @@ } get_ooffice_executable() { - if loffice >/dev/null 2>&1; then + if which loffice >/dev/null 2>&1; then echo "loffice" - elif ooffice >/dev/null 2>&1; then + elif which ooffice >/dev/null 2>&1; then echo "ooffice" else echo -n @@ -52,28 +52,28 @@ fi ;; msdoc) - if wvHtml >/dev/null 2>&1; then + if which wvHtml >/dev/null 2>&1; then tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` wvHtml "${MC_EXT_FILENAME}" --targetdir="$tmp" page.html elinks -dump "$tmp/page.html" rm -rf "$tmp" - elif antiword >/dev/null 2>&1; then + elif which antiword >/dev/null 2>&1; then antiword -t "${MC_EXT_FILENAME}" - elif catdoc >/dev/null 2>&1; then + elif which catdoc >/dev/null 2>&1; then catdoc -w "${MC_EXT_FILENAME}" - elif word2x >/dev/null 2>&1; then + elif which word2x >/dev/null 2>&1; then word2x -f text "${MC_EXT_FILENAME}" - else strings "${MC_EXT_FILENAME}" fi ;; msxls) - if xlhtml >/dev/null 2>&1; then + if which xlhtml >/dev/null 2>&1; then tmp=`mktemp -d ${TMPDIR:-/tmp}/%p.XXXXXX` xlhtml -a "${MC_EXT_FILENAME}" > "$tmp/page.html" elinks -dump "$tmp/page.html" rm -rf "$tmp" - elif xls2csv >/dev/null 2>&1; then + elif which xls2csv >/dev/null 2>&1; then xls2csv "${MC_EXT_FILENAME}" else strings "${MC_EXT_FILENAME}" diff -Nru mc-4.8.25/misc/ext.d/image.sh mc-4.8.26/misc/ext.d/image.sh --- mc-4.8.25/misc/ext.d/image.sh 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/misc/ext.d/image.sh 2021-01-10 11:50:16.000000000 +0000 @@ -45,7 +45,7 @@ else (gqview "${MC_EXT_FILENAME}" &) fi - elif see >/dev/null 2>&1; then + elif which see >/dev/null 2>&1; then (see "${MC_EXT_FILENAME}" &) else (zgv "${MC_EXT_FILENAME}" &) diff -Nru mc-4.8.25/misc/ext.d/Makefile.in mc-4.8.26/misc/ext.d/Makefile.in --- mc-4.8.25/misc/ext.d/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/misc/ext.d/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/misc/ext.d/misc.sh.in mc-4.8.26/misc/ext.d/misc.sh.in --- mc-4.8.25/misc/ext.d/misc.sh.in 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/ext.d/misc.sh.in 2021-01-10 11:50:16.000000000 +0000 @@ -71,7 +71,7 @@ sqlite3 "${MC_EXT_FILENAME}" ;; glade) - if glade-3 --version >/dev/null 2>&1; then + if which glade-3 >/dev/null 2>&1; then (glade-3 "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) else (glade-2 "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) diff -Nru mc-4.8.25/misc/ext.d/sound.sh mc-4.8.26/misc/ext.d/sound.sh --- mc-4.8.25/misc/ext.d/sound.sh 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/ext.d/sound.sh 2021-01-10 11:50:16.000000000 +0000 @@ -38,7 +38,7 @@ case "${filetype}" in common) if [ -n "$DISPLAY" ]; then - (xmms "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) + (audacious "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) else play "${MC_EXT_FILENAME}" fi @@ -52,21 +52,21 @@ ;; mp3) if [ -n "$DISPLAY" ]; then - (xmms "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) + (audacious "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) else mpg123 "${MC_EXT_FILENAME}" fi ;; ogg) if [ -n "$DISPLAY" ]; then - (xmms "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) + (audacious "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) else ogg123 "${MC_EXT_FILENAME}" fi ;; opus) if [ -n "$DISPLAY" ]; then - (xmms "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) + (audacious "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) else play "${MC_EXT_FILENAME}" fi @@ -79,7 +79,7 @@ ;; playlist) if [ -n "$DISPLAY" ]; then - (xmms -p "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) + (audacious -p "${MC_EXT_FILENAME}" >/dev/null 2>&1 &) else mplayer -vo null -playlist "${MC_EXT_FILENAME}" fi diff -Nru mc-4.8.25/misc/ext.d/video.sh mc-4.8.26/misc/ext.d/video.sh --- mc-4.8.25/misc/ext.d/video.sh 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/ext.d/video.sh 2021-01-10 11:50:16.000000000 +0000 @@ -13,7 +13,7 @@ case "${filetype}" in *) - if mplayer >/dev/null 2>&1; then + if which mplayer >/dev/null 2>&1; then mplayer -identify -vo null -ao null -frames 0 "${MC_EXT_FILENAME}" 2>&1 | \ sed -n 's/^ID_//p' elif which mpv_identify.sh >/dev/null 2>&1; then @@ -28,9 +28,9 @@ do_open_action() { filetype=$1 - if mpv >/dev/null 2>&1; then + if which mpv >/dev/null 2>&1; then PLAYER=mpv - elif mplayer >/dev/null 2>&1; then + elif which mplayer >/dev/null 2>&1; then PLAYER=mplayer else echo "Please install either mplayer or mpv to play this file" diff -Nru mc-4.8.25/misc/filehighlight.ini mc-4.8.26/misc/filehighlight.ini --- mc-4.8.25/misc/filehighlight.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/filehighlight.ini 2021-01-10 11:50:16.000000000 +0000 @@ -31,10 +31,10 @@ extensions=7z;Z;ace;apk;arc;arj;ark;bz2;cab;cpio;deb;gz;lha;lz;lz4;lzh;lzma;rar;rpm;tar;tbz;tbz2;tgz;tlz;txz;tzst;xz;zip;zoo;zst [doc] - extensions=chm;css;ctl;diz;doc;docm;docx;dtd;htm;html;letter;lsm;mail;man;me;msg;nroff;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt + extensions=chm;css;ctl;diz;doc;docm;docx;dtd;fodg;fodp;fods;fodt;htm;html;letter;lsm;mail;man;me;msg;nroff;odg;odp;ods;odt;pdf;po;ppt;pptm;pptx;ps;rtf;sgml;shtml;tex;text;txt;xls;xlsm;xlsx;xml;xsd;xslt [source] - extensions=ada;asm;awk;bash;c;caml;cc;cgi;cpp;cxx;diff;erl;go;h;hh;hi;hpp;hs;inc;jasm;jav;java;js;m4;mak;mjs;ml;mli;mll;mlp;mly;pas;patch;php;phps;pl;pm;prg;py;rb;s;sas;sh;sl;st;tcl;tk;xq + extensions=ada;asm;awk;bash;c;caml;cc;cgi;cpp;cxx;diff;erl;go;h;hh;hi;hpp;hs;inc;jasm;jav;java;js;m4;mak;mjs;ml;mli;mll;mlp;mly;pas;patch;php;phps;pl;pm;prg;py;rb;s;sas;sh;sl;st;swift;tcl;tk;xq [media] extensions=3gp;aac;ac3;ape;asf;avi;dts;flac;flv;it;m3u;m4a;m4v;med;mid;midi;mkv;mod;mol;mov;mp2;mp3;mp4;mpeg;mpg;mpl;ogg;ogv;opus;s3m;ts;umx;vob;wav;webm;wma;wmv;xm diff -Nru mc-4.8.25/misc/macros.d/Makefile.in mc-4.8.26/misc/macros.d/Makefile.in --- mc-4.8.25/misc/macros.d/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/misc/macros.d/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/misc/Makefile.in mc-4.8.26/misc/Makefile.in --- mc-4.8.25/misc/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/misc/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/misc/mc.default.keymap mc-4.8.26/misc/mc.default.keymap --- mc-4.8.25/misc/mc.default.keymap 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/mc.default.keymap 2021-01-10 11:50:16.000000000 +0000 @@ -1,5 +1,5 @@ -[main] -ChangePanel = tab +[filemanager] +ChangePanel = tab; ctrl-i Help = f1 UserMenu = f2 View = f3 @@ -57,7 +57,7 @@ EditorViewerHistory = alt-shift-e ExtendedKeyMap = ctrl-x -[main:xmap] +[filemanager:xmap] ChangeMode = c ChangeOwn = o ChangeAttributes = e diff -Nru mc-4.8.25/misc/mc.emacs.keymap mc-4.8.26/misc/mc.emacs.keymap --- mc-4.8.25/misc/mc.emacs.keymap 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/mc.emacs.keymap 2021-01-10 11:50:16.000000000 +0000 @@ -1,5 +1,5 @@ -[main] -ChangePanel = tab +[filemanager] +ChangePanel = tab; ctrl-i Help = f1 UserMenu = f2 View = f3 @@ -57,7 +57,7 @@ EditorViewerHistory = alt-shift-e ExtendedKeyMap = ctrl-x -[main:xmap] +[filemanager:xmap] ChangeMode = c ChangeOwn = o ChangeAttributes = e diff -Nru mc-4.8.25/misc/mc.ext.in mc-4.8.26/misc/mc.ext.in --- mc-4.8.25/misc/mc.ext.in 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/mc.ext.in 2021-01-10 11:50:16.000000000 +0000 @@ -176,6 +176,11 @@ Open=%cd %p/ulha:// View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lha +# PAK +type/^PAK\ .*archive + Open=%cd %p/unar:// + View=%view{ascii} @EXTHELPERSDIR@/archive.sh view pak + # arj regex/i/\.a(rj|[0-9][0-9])$ Open=%cd %p/uarj:// @@ -361,16 +366,6 @@ shell/i/.3gp Include=video -# Manual page -regex/(([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])|\.man)$ - Open=@EXTHELPERSDIR@/text.sh open man %var{PAGER:more} - View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man %var{PAGER:more} - -# Perl pod page -shell/.pod - Open=@EXTHELPERSDIR@/text.sh open pod %var{PAGER:more} - View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view pod %var{PAGER:more} - # Troff with me macros. # Exception - "read.me" is not a nroff file. shell/read.me @@ -387,18 +382,28 @@ View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view nroff.ms %var{PAGER:more} # Manual page - compressed -regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.g?[Zz]$ +type/^(ASCII )?troff.*gzip compressed Open=@EXTHELPERSDIR@/text.sh open man.gz %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.gz %var{PAGER:more} -regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz$ +type/^(ASCII )?troff.*bzip compressed Open=@EXTHELPERSDIR@/text.sh open man.bz %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.bz %var{PAGER:more} -regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.bz2$ +type/^(ASCII )?troff.*bzip2 compressed Open=@EXTHELPERSDIR@/text.sh open man.bz2 %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.bz2 %var{PAGER:more} +# Manual page +type/^(ASCII )?troff + Open=@EXTHELPERSDIR@/text.sh open man %var{PAGER:more} + View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man %var{PAGER:more} + +# Perl pod page +shell/.pod + Open=@EXTHELPERSDIR@/text.sh open pod %var{PAGER:more} + View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view pod %var{PAGER:more} + regex/([^0-9]|^[^\.]*)\.([1-9][A-Za-z]*|[ln])\.lz$ Open=@EXTHELPERSDIR@/text.sh open man.lz %var{PAGER:more} View=%view{ascii,nroff} @EXTHELPERSDIR@/text.sh view man.lz %var{PAGER:more} @@ -590,7 +595,7 @@ Open=@EXTHELPERSDIR@/doc.sh open ooffice # StarOffice 6 and OpenOffice.org formats -regex/i/\.(odt|ott|sxw|stw|ods|ots|sxc|stc|odp|otp|sxi|sti|odg|otg|sxd|std|odb|odf|sxm|odm|sxg)$ +regex/i/\.(odt|fodt|ott|sxw|stw|ods|fods|ots|sxc|stc|odp|fodp|otp|sxi|sti|odg|fodg|otg|sxd|std|odb|odf|sxm|odm|sxg)$ Open=@EXTHELPERSDIR@/doc.sh open ooffice View=%view{ascii} @EXTHELPERSDIR@/doc.sh view odt @@ -671,10 +676,6 @@ shell/.class View=%view{ascii} @EXTHELPERSDIR@/misc.sh view javaclass -# Makefile -regex/^[Mm]akefile$ - Open=make -f %f %{Enter parameters} - # Imakefile shell/Imakefile Open=xmkmf -a @@ -683,6 +684,10 @@ regex/^Makefile\.(PL|pl)$ Open=%var{PERL:perl} %f +# Makefile +regex/[Mm]akefile + Open=make -f %f %{Enter parameters} + # sqlite3.db type/^SQLite 3.x database Open=@EXTHELPERSDIR@/misc.sh open sqlite @@ -761,38 +766,27 @@ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zoo # gzip -type/^gzip +type/\(gzip compressed Open=@EXTHELPERSDIR@/archive.sh view gz %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view gz -regex/\.(gz|Z)$ - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view gz - # bzip2 -type/^bzip2 +type/\(bzip2 compressed Open=@EXTHELPERSDIR@/archive.sh view bzip2 %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view bz2 -regex/\.bz2?$ - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view bz2 - # bzip -type/^bzip +type/\(bzip compressed Open=@EXTHELPERSDIR@/archive.sh view bzip %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view bzip # compress -type/^compress +type/\(compress'd Open=@EXTHELPERSDIR@/archive.sh view gz %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view gz # lz -regex/\.lz$ - Open=@EXTHELPERSDIR@/archive.sh view lz %var{PAGER:more} - View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lz - -# lz -type/^LZIP +type/\(lzip compressed Open=@EXTHELPERSDIR@/archive.sh view lz %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lz @@ -802,17 +796,17 @@ View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lz4 # lzma -regex/\.lzma$ +type/\(LZMA compressed Open=@EXTHELPERSDIR@/archive.sh view lzma %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view lzma # xz -regex/\.xz$ +type/\(XZ compressed Open=@EXTHELPERSDIR@/archive.sh view xz %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view xz # zstd -regex/\.zst$ +type/\(Zstandard compressed Open=@EXTHELPERSDIR@/archive.sh view zst %var{PAGER:more} View=%view{ascii} @EXTHELPERSDIR@/archive.sh view zst @@ -820,6 +814,10 @@ type/^Parity\ Archive\ Volume\ Set Open=@EXTHELPERSDIR@/archive.sh open par2 +# WIM +shell/i/\.wim + Open=%cd %p/uwim:// + View=%view{ascii} @EXTHELPERSDIR@/archive.sh view wim ### Includes # includes should be at end of bindings diff -Nru mc-4.8.25/misc/mc.lib mc-4.8.26/misc/mc.lib --- mc-4.8.25/misc/mc.lib 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/misc/mc.lib 2021-01-10 11:50:16.000000000 +0000 @@ -116,6 +116,9 @@ alt-shift-up=\\e[1\;4A alt-shift-down=\\e[1\;4B +[terminal:alacritty] +copy=xterm + [terminal:gnome] copy=xterm @@ -137,6 +140,12 @@ [terminal:screen-256color] copy=xterm +[terminal:tmux] +copy=xterm + +[terminal:tmux-256color] +copy=xterm + [terminal:ibmpc3] f11=\\e[Y f12=\\e[Z diff -Nru mc-4.8.25/misc/skins/darkfar.ini mc-4.8.26/misc/skins/darkfar.ini --- mc-4.8.25/misc/skins/darkfar.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/darkfar.ini 2021-01-10 11:50:16.000000000 +0000 @@ -39,6 +39,7 @@ header = yellow;black inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = brightcyan;blue diff -Nru mc-4.8.25/misc/skins/dark.ini mc-4.8.26/misc/skins/dark.ini --- mc-4.8.25/misc/skins/dark.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/dark.ini 2021-01-10 11:50:16.000000000 +0000 @@ -39,6 +39,7 @@ header = yellow;black inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = brightcyan;blue diff -Nru mc-4.8.25/misc/skins/default.ini mc-4.8.26/misc/skins/default.ini --- mc-4.8.25/misc/skins/default.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/default.ini 2021-01-10 11:50:16.000000000 +0000 @@ -39,6 +39,7 @@ header = yellow;blue inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = black;lightgray diff -Nru mc-4.8.25/misc/skins/double-lines.ini mc-4.8.26/misc/skins/double-lines.ini --- mc-4.8.25/misc/skins/double-lines.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/double-lines.ini 2021-01-10 11:50:16.000000000 +0000 @@ -39,6 +39,7 @@ header = yellow;blue inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = black;lightgray diff -Nru mc-4.8.25/misc/skins/featured.ini mc-4.8.26/misc/skins/featured.ini --- mc-4.8.25/misc/skins/featured.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/featured.ini 2021-01-10 11:50:16.000000000 +0000 @@ -41,6 +41,7 @@ header = yellow;blue inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = black;lightgray diff -Nru mc-4.8.25/misc/skins/featured-plus.ini mc-4.8.26/misc/skins/featured-plus.ini --- mc-4.8.25/misc/skins/featured-plus.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/featured-plus.ini 2021-01-10 11:50:16.000000000 +0000 @@ -41,6 +41,7 @@ header = yellow;blue inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = black;lightgray diff -Nru mc-4.8.25/misc/skins/gotar.ini mc-4.8.26/misc/skins/gotar.ini --- mc-4.8.25/misc/skins/gotar.ini 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/misc/skins/gotar.ini 2021-01-10 11:50:16.000000000 +0000 @@ -36,6 +36,7 @@ header = brightred; inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = brightcyan;blue diff -Nru mc-4.8.25/misc/skins/gray-green-purple256.ini mc-4.8.26/misc/skins/gray-green-purple256.ini --- mc-4.8.25/misc/skins/gray-green-purple256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/gray-green-purple256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -45,6 +45,7 @@ reverse = commandlinemark = ;main1 header = main2 + shadow = black;gray12 [dialog] _default_ = black;bgdarker diff -Nru mc-4.8.25/misc/skins/gray-orange-blue256.ini mc-4.8.26/misc/skins/gray-orange-blue256.ini --- mc-4.8.25/misc/skins/gray-orange-blue256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/gray-orange-blue256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -45,6 +45,7 @@ reverse = commandlinemark = ;main1 header = main2 + shadow = black;gray12 [dialog] _default_ = black;bgdarker diff -Nru mc-4.8.25/misc/skins/julia256.ini mc-4.8.26/misc/skins/julia256.ini --- mc-4.8.25/misc/skins/julia256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/julia256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -42,6 +42,7 @@ header = yellow;color237 inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = black;lightgray diff -Nru mc-4.8.25/misc/skins/Makefile.in mc-4.8.26/misc/skins/Makefile.in --- mc-4.8.25/misc/skins/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/misc/skins/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/misc/skins/mc46.ini mc-4.8.26/misc/skins/mc46.ini --- mc-4.8.25/misc/skins/mc46.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/mc46.ini 2021-01-10 11:50:16.000000000 +0000 @@ -39,6 +39,7 @@ header = yellow;blue inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = black;lightgray diff -Nru mc-4.8.25/misc/skins/modarcon16-defbg.ini mc-4.8.26/misc/skins/modarcon16-defbg.ini --- mc-4.8.25/misc/skins/modarcon16-defbg.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarcon16-defbg.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color8;color7 #inputhistory = #commandhistory = + shadow = color7;color0 [dialog] _default_ = color0;color7 diff -Nru mc-4.8.25/misc/skins/modarcon16.ini mc-4.8.26/misc/skins/modarcon16.ini --- mc-4.8.25/misc/skins/modarcon16.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarcon16.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color8;color7 #inputhistory = #commandhistory = + shadow = color7;color0 [dialog] _default_ = color0;color7 @@ -144,7 +145,7 @@ _default_ = color7;color0 editbold = color15;;bold editmarked = color11;color2;bold - editwhitespace = color12;color4 + editwhitespace = color2;color0 editlinestate = color2;color0 bookmark = color0;color7 bookmarkfound = color0;color7 diff -Nru mc-4.8.25/misc/skins/modarcon16root-defbg.ini mc-4.8.26/misc/skins/modarcon16root-defbg.ini --- mc-4.8.25/misc/skins/modarcon16root-defbg.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarcon16root-defbg.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color8;color7 #inputhistory = #commandhistory = + shadow = color7;color0 [dialog] _default_ = color0;color7 diff -Nru mc-4.8.25/misc/skins/modarcon16root.ini mc-4.8.26/misc/skins/modarcon16root.ini --- mc-4.8.25/misc/skins/modarcon16root.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarcon16root.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color8;color7 #inputhistory = #commandhistory = + shadow = color7;color0 [dialog] _default_ = color0;color7 diff -Nru mc-4.8.25/misc/skins/modarin256-defbg.ini mc-4.8.26/misc/skins/modarin256-defbg.ini --- mc-4.8.25/misc/skins/modarin256-defbg.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarin256-defbg.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color246;color239 #inputhistory = #commandhistory = + shadow = color240;color0 [dialog] _default_ = color252;color239 diff -Nru mc-4.8.25/misc/skins/modarin256.ini mc-4.8.26/misc/skins/modarin256.ini --- mc-4.8.25/misc/skins/modarin256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarin256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color246;color239 #inputhistory = #commandhistory = + shadow = color240;color0 [dialog] _default_ = color252;color239 diff -Nru mc-4.8.25/misc/skins/modarin256root-defbg.ini mc-4.8.26/misc/skins/modarin256root-defbg.ini --- mc-4.8.25/misc/skins/modarin256root-defbg.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarin256root-defbg.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color246;color239 #inputhistory = #commandhistory = + shadow = color240;color0 [dialog] _default_ = color252;color239 diff -Nru mc-4.8.25/misc/skins/modarin256root.ini mc-4.8.26/misc/skins/modarin256root.ini --- mc-4.8.25/misc/skins/modarin256root.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/modarin256root.ini 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ disabled = color246;color239 #inputhistory = #commandhistory = + shadow = color240;color0 [dialog] _default_ = color252;color239 diff -Nru mc-4.8.25/misc/skins/nicedark.ini mc-4.8.26/misc/skins/nicedark.ini --- mc-4.8.25/misc/skins/nicedark.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/nicedark.ini 2021-01-10 11:50:16.000000000 +0000 @@ -39,6 +39,7 @@ header = lightgray;black inputhistory = commandhistory = + shadow = gray;black [dialog] _default_ = lightgray;black diff -Nru mc-4.8.25/misc/skins/sand256.ini mc-4.8.26/misc/skins/sand256.ini --- mc-4.8.25/misc/skins/sand256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/sand256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -94,6 +94,7 @@ reverse = ;rgb452 commandlinemark = white;gray header = red;;italic + shadow = black;rgb221 [dialog] _default_ = black;rgb553 diff -Nru mc-4.8.25/misc/skins/seasons-autumn16M.ini mc-4.8.26/misc/skins/seasons-autumn16M.ini --- mc-4.8.25/misc/skins/seasons-autumn16M.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/seasons-autumn16M.ini 2021-01-10 11:50:16.000000000 +0000 @@ -65,6 +65,8 @@ DialogFocus = #69880c Input = #b5c400 PaleFg = #555 + ShadowFg = #7f7f55 + ShadowBg = #4c1002 Error = #840000 ErrorFocus = #b00 Top = #ff9909 @@ -106,6 +108,7 @@ reverse = #000;Bottom commandlinemark = #000;DialogFocus header = HeaderFg + shadow = ShadowFg;ShadowBg [dialog] _default_ = #000;Dialog diff -Nru mc-4.8.25/misc/skins/seasons-spring16M.ini mc-4.8.26/misc/skins/seasons-spring16M.ini --- mc-4.8.25/misc/skins/seasons-spring16M.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/seasons-spring16M.ini 2021-01-10 11:50:16.000000000 +0000 @@ -65,6 +65,8 @@ DialogFocus = #b3de85 Input = Main PaleFg = #777 + ShadowFg = #000 + ShadowBg = #797f73 Error = #c62b41 ErrorFocus = #e16d7e Top = #f699a6 @@ -106,6 +108,7 @@ reverse = #000;Bottom commandlinemark = #000;DialogFocus header = HeaderFg + shadow = ShadowFg;ShadowBg [dialog] _default_ = #000;Dialog diff -Nru mc-4.8.25/misc/skins/seasons-summer16M.ini mc-4.8.26/misc/skins/seasons-summer16M.ini --- mc-4.8.25/misc/skins/seasons-summer16M.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/seasons-summer16M.ini 2021-01-10 11:50:16.000000000 +0000 @@ -65,6 +65,8 @@ DialogFocus = #f864f6 Input = #d7ffad PaleFg = #777 + ShadowFg = #000 + ShadowBg = #7f7659 Error = #d40707 ErrorFocus = #db7b7b Top = #46cef3 @@ -106,6 +108,7 @@ reverse = #000;Bottom commandlinemark = #000;DialogFocus header = HeaderFg + shadow = ShadowFg;ShadowBg [dialog] _default_ = #000;Dialog diff -Nru mc-4.8.25/misc/skins/seasons-winter16M.ini mc-4.8.26/misc/skins/seasons-winter16M.ini --- mc-4.8.25/misc/skins/seasons-winter16M.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/seasons-winter16M.ini 2021-01-10 11:50:16.000000000 +0000 @@ -65,6 +65,8 @@ DialogFocus = #afbad8 Input = Main PaleFg = #777 + ShadowFg = #000 + ShadowBg = #727176 Error = #3c4766 ErrorFocus = #586896 Top = #6b99d7 @@ -106,6 +108,7 @@ reverse = #000;Bottom commandlinemark = #000;DialogFocus header = HeaderFg + shadow = ShadowFg;ShadowBg [dialog] _default_ = #000;Dialog diff -Nru mc-4.8.25/misc/skins/xoria256.ini mc-4.8.26/misc/skins/xoria256.ini --- mc-4.8.25/misc/skins/xoria256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/xoria256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -82,6 +82,8 @@ #commandhistory = #commandlinemark = black;lightgray + shadow = color239;black + [dialog] _default_ = black;color250 dhotnormal = color88;; diff -Nru mc-4.8.25/misc/skins/yadt256-defbg.ini mc-4.8.26/misc/skins/yadt256-defbg.ini --- mc-4.8.25/misc/skins/yadt256-defbg.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/yadt256-defbg.ini 2021-01-10 11:50:16.000000000 +0000 @@ -48,6 +48,7 @@ disabled = color246;color239 #inputhistory = #commandhistory = + shadow = color239;black [dialog] _default_ = color252;color239 diff -Nru mc-4.8.25/misc/skins/yadt256.ini mc-4.8.26/misc/skins/yadt256.ini --- mc-4.8.25/misc/skins/yadt256.ini 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/skins/yadt256.ini 2021-01-10 11:50:16.000000000 +0000 @@ -47,6 +47,7 @@ disabled = color246;color239 #inputhistory = #commandhistory = + shadow = color239;black [dialog] _default_ = color252;color239 diff -Nru mc-4.8.25/misc/syntax/Makefile.am mc-4.8.26/misc/syntax/Makefile.am --- mc-4.8.25/misc/syntax/Makefile.am 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/syntax/Makefile.am 2021-01-10 11:50:16.000000000 +0000 @@ -81,6 +81,7 @@ spec.syntax \ sql.syntax \ strace.syntax \ + swift.syntax \ swig.syntax \ syntax.syntax \ tcl.syntax \ diff -Nru mc-4.8.25/misc/syntax/Makefile.in mc-4.8.26/misc/syntax/Makefile.in --- mc-4.8.25/misc/syntax/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/misc/syntax/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -482,6 +482,7 @@ spec.syntax \ sql.syntax \ strace.syntax \ + swift.syntax \ swig.syntax \ syntax.syntax \ tcl.syntax \ diff -Nru mc-4.8.25/misc/syntax/swift.syntax mc-4.8.26/misc/syntax/swift.syntax --- mc-4.8.25/misc/syntax/swift.syntax 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/misc/syntax/swift.syntax 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,223 @@ +define keywords yellow +define attributes yellow +define operators brightcyan +define comments red +define strings green +define escapedchars brightgreen +define interpolation brightgreen +define unicode brightgreen +define brackets brightcyan +define punctuation brightcyan +define range brightcyan +define semicolon brightmagenta +define compilerstatements brightred + +context default + keyword whole associatedtype keywords + keyword whole class keywords + keyword whole deinit keywords + keyword whole enum keywords + keyword whole extension keywords + keyword whole fileprivate keywords + keyword whole func keywords + keyword whole import keywords + keyword whole init keywords + keyword whole inout keywords + keyword whole internal keywords + keyword whole let keywords + keyword whole open keywords + keyword whole operator keywords + keyword whole private keywords + keyword whole protocol keywords + keyword whole public keywords + keyword whole rethrows keywords + keyword whole static keywords + keyword whole struct keywords + keyword whole subscript keywords + keyword whole typealias keywords + keyword whole var keywords + + keyword whole break keywords + keyword whole case keywords + keyword whole continue keywords + keyword whole default keywords + keyword whole defer keywords + keyword whole do keywords + keyword whole else keywords + keyword whole fallthrough keywords + keyword whole for keywords + keyword whole guard keywords + keyword whole if keywords + keyword whole in keywords + keyword whole repeat keywords + keyword whole return keywords + keyword whole switch keywords + keyword whole where keywords + keyword whole while keywords + + keyword whole as keywords + keyword whole catch keywords + keyword whole false keywords + keyword whole is keywords + keyword whole nil keywords + keyword whole self keywords + keyword whole Self keywords + keyword whole super keywords + keyword whole throws keywords + keyword whole throw keywords + keyword whole true keywords + keyword whole try keywords + + keyword whole associativity keywords + keyword whole convenience keywords + keyword whole didSet keywords + keyword whole dynamic keywords + keyword whole final keywords + keyword whole get keywords + keyword whole indirect keywords + keyword whole infix keywords + keyword whole lazy keywords + keyword whole left keywords + keyword whole mutating keywords + keyword whole none keywords + keyword whole nonmutating keywords + keyword whole optional keywords + keyword whole override keywords + keyword whole postfix keywords + keyword whole precedence keywords + keyword whole prefix keywords + keyword whole Protocol keywords + keyword whole required keywords + keyword whole right keywords + keyword whole set keywords + keyword whole Type keywords + keyword whole unowned keywords + keyword whole weak keywords + keyword whole willSet keywords + + keyword whole Any keywords + keyword whole Bool keywords + keyword whole Double keywords + keyword whole Float keywords + keyword whole Character keywords + keyword whole Int keywords + keyword whole Int16 keywords + keyword whole Int32 keywords + keyword whole Int64 keywords + keyword whole Int8 keywords + keyword whole String keywords + keyword whole UInt keywords + keyword whole UInt16 keywords + keyword whole UInt32 keywords + keyword whole UInt64 keywords + keyword whole UInt8 keywords + + keyword whole assert keywords + keyword whole precondition keywords + + keyword // comments + keyword /\* comments + keyword *\*/ comments + + keyword > operators + keyword < operators + keyword \+ operators + keyword - operators + keyword \* operators + keyword / operators + keyword % operators + keyword = operators + keyword != operators + keyword == operators + keyword | operators + keyword & operators + keyword ^ operators + keyword ~ operators + keyword ! operators + keyword whole _ operatots + keyword { brackets + keyword } brackets + keyword ( brackets + keyword ) brackets + keyword [ brackets + keyword ] brackets + keyword . punctuation + keyword , punctuation + keyword : punctuation + keyword ? punctuation + keyword ... range + keyword ..< range + keyword ; semicolon + + keyword `*` base + + keyword whole @available attributes + keyword whole @escaping attributes + keyword whole @unavailable attributes + keyword whole @introduced attributes + keyword whole @deprecated attributes + keyword whole @obsolete attributes + keyword whole @message attributes + keyword whole @main attributes + keyword whole @renamed attributes + keyword whole @discardableResult attributes + keyword whole @dynamicCallable attributes + keyword whole @dynamicMemberLookup attributes + keyword whole @frozen attributes + keyword whole @GKInspectable attributes + keyword whole @inlinable attributes + keyword whole @nonobjc attributes + keyword whole @NSApplicationMain attributes + keyword whole @NSCopying attributes + keyword whole @objc attributes + keyword whole @NSManaged attributes + keyword whole @objcMembers attributes + keyword whole @propertyWrapper attributes + keyword whole @requires_stored_property_inits attributes + keyword whole @testable attributes + keyword whole @UIApplicationMain attributes + keyword whole @usableFromInline attributes + keyword whole @warn_unqualified_access attributes + keyword whole @autoclosure attributes + keyword whole @convention attributes + keyword whole @escaping attributes + keyword whole @unknown attributes + + +context exclusive /\* \*/ comments + spellcheck + + +context exclusive // \n comments + spellcheck + + +context linestart # \n compilerstatements + + +context #""" """# string + spellcheck + keyword \\(*) interpolation + keyword \\\{0tnr"'\\\} escapedchars + keyword \\u{*} unicode + + +context """ """ string + spellcheck + keyword \\(*) interpolation + keyword \\\{0tnr"'\\\} escapedchars + keyword \\u{*} unicode + + +context #" "# string + spellcheck + keyword \\(*) interpolation + keyword \\\{0tnr"'\\\} escapedchars + keyword \\u{*} unicode + + +context " " string + spellcheck + keyword \\(*) interpolation + keyword \\\{0tnr"'\\\} escapedchars + keyword \\u{*} unicode diff -Nru mc-4.8.25/misc/syntax/Syntax.in mc-4.8.26/misc/syntax/Syntax.in --- mc-4.8.25/misc/syntax/Syntax.in 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/misc/syntax/Syntax.in 2021-01-10 11:50:16.000000000 +0000 @@ -299,7 +299,7 @@ include protobuf.syntax file ..\*\\.(?i:yab)$ Yabasic\s(Yet\sAnother\sBASIC) -include markdown.syntax +include yabasic.syntax file ..\*\\.(?i:cbl|cob)$ Cobol\sProgram include cobol.syntax @@ -307,5 +307,8 @@ file ..\*\\.kt$ Kotliin\sSource include kotlin.syntax +file ..\*\\.swift$ Swift\sProgram +include swift.syntax + file .\* unknown include unknown.syntax diff -Nru mc-4.8.25/NEWS mc-4.8.26/NEWS --- mc-4.8.25/NEWS 2020-07-05 19:34:53.000000000 +0000 +++ mc-4.8.26/NEWS 2021-01-10 14:16:53.000000000 +0000 @@ -1,62 +1,106 @@ +Version 4.8.26 + +- Core + + * Support file names of any length (#4145) + * Implement persistent command line buffer for subshell (bash >= 4, zsh and fish are supported) (#4114, #4124, #4126) + * Implement shadows of dialog windows and menus (#4102) + * Allow running clipboard commands if DISPLAY is not set (#4133) + * Add support of "alacritty", "tmux", and "tmux-256color" terminals (#4149) + +- VFS + + * Support wim archive format (using wimtools (https://wimlib.net/)) (#4100) + * Support pak archive format (using unar (https://theunarchiver.com/)) (#4130) + +- Editor + + * Add Swift syntax highlighting (MidnightCommander/mc#159) + +- Misc + + * Code cleanup (#4103, #4127, #4131) + * ext.d/sound.sh: replace xmms with audacious (part of #4127) + * mc.ext: improve handling of compressed content (#4128, #2117) + * mc.ext: add support for OpenDocument flax xml formats: fodt, fods, fodp, fodg (#4157) + * Filehighlight fodg, fodp, fods, fodt, odg files as documents + * modarcon16 skin: make consistent with whitespaces (#4158) + +- Fixes + + * 0000 permissions are not preserved on copy/move file (#4155) + * Chattr dialog doesn't work with mouse (#4104) + * Wrong copy ETA displaying if "Follow links" option is set (#4101) + * C-i ("change panel" shortcut) has no effect (#4107) + * C-l ("refresh screen") and A-` ("switch screens") shortcuts have no effect (#4142, #4153) + * Cancel of history or completion window marks input lines as modified (#4152) + * Unexpected subshell execution at panel switch (#2110) + * Lock up after pressing Tab in subshell (#2269) + * tcsh: error: "The Commander can't change to the directory" (#4120) + * vfs: extfs: cannot handle files with name started with dash or space (#4077) + * vfs: hang on accessing files within a nested VFS for first 60 seconds (#4147) + * vfs: lose content of the current directory on a mounted CIFS share (on Linux >= 5.1) (#3987) + + Version 4.8.25 - Core - * Minimal version of GLib is 2.30.0 - * Avoid subshell warning for standalone mcedit/mcview/mcdiffview run from mc (#4056) - * Implement chattr command (change ext{2,3,4}fs extended attributes). Default shortcut is "C-x e" (#3847) - * Implement a WGroup widget -- a base class for widgets which contain other widgets (#2919, #4075) - * Implement key bindings for radiobuttons (#212) + * Minimal version of GLib is 2.30.0 + * Avoid subshell warning for standalone mcedit/mcview/mcdiffview run from mc (#4056) + * Implement chattr command (change ext{2,3,4}fs extended attributes). Default shortcut is "C-x e" (#3847) + * Implement a WGroup widget -- a base class for widgets which contain other widgets (#2919, #4075) + * Implement key bindings for radiobuttons (#212) - VFS - * RPM VFS improvements: - * Support weak dependency tags: ENHANCES, SUGGESTS, RECOMMENDS, SUPPLEMENTS (#4091) + * RPM VFS improvements: + - Support weak dependency tags: ENHANCES, SUGGESTS, RECOMMENDS, SUPPLEMENTS (#4091) - Editor - * Improvements of syntax highlighting: - * php (#4060) - * tcl: add shebangs with wish and tclsh (#4062) - * Cobol (#1987) - * Verilog/SystemVerilog (#4087) - * New syntax highlighting: - * Kotlin (#4088) - * ino (Arduino IDE and a number of other IDEs) (#4098) + * Improvements of syntax highlighting: + - php (#4060) + - tcl: add shebangs with wish and tclsh (#4062) + - Cobol (#1987) + - Verilog/SystemVerilog (#4087) + * New syntax highlighting: + - Kotlin (#4088) + - ino (Arduino IDE and a number of other IDEs) (#4098) - Misc - * Code cleanup (#4050, #4085) - * Add support for opus audio (#4061) - * mc-wrapper: don't cd to the same directory (#3355) - * Improve archive support: more binaries to view archive content (#4086) - * lha: jlha, lhasa - * arj: 7za - * cab: 7za - * zip; 7z - * zipx: 7za - * iso: 7za - * Clean up in video.sh handler (#4045) - * RealPlayer is a proprietary application which can't be installed in most distros and has long been abandoned. - * gtv hasn't been developed since 2003. - * xanim barely plays anything. - * Various fixups and updates of man page + * Code cleanup (#4050, #4085) + * Add support for opus audio (#4061) + * mc-wrapper: don't cd to the same directory (#3355) + * Improve archive support: more binaries to view archive content (#4086) + - lha: jlha, lhasa + - arj: 7za + - cab: 7za + - zip; 7z + - zipx: 7za + - iso: 7za + * Clean up in video.sh handler (#4045) + - RealPlayer is a proprietary application which can't be installed in most distros and has long been abandoned. + - gtv hasn't been developed since 2003. + - xanim barely plays anything. + * Various fixups and updates of man page - Fixes - * FTBFS on OSes w/o O_CLOEXEC (#4052) - * FTBFS with glib2 >= 2.63.3 (#4053) - * Undefined "__linux__" macro on non-Linux systems (#4058) - * Mouse is not handled with ncurses-6 (#3964) - * Mouse is not handled with S-Lang on some old terminal emulators (#4063) - * Terminal size is always 80x24 in subshell on Solaris 11.4 SPARC (#4099) - * Double clicking on empty area of file panel executes last item (#3722) - * Garbage in input line history (#4064) - * Speed of file copy is not displayed for single file (#4081) - * mcedit: blank screen with invisible error (#4057) - * mcedit: broken syntax highlighting for shell scripts (#4054) - * VFS: broken browsing of .deb packages (#4055) - * mc.lib installed twice (#4070) + * FTBFS on OSes w/o O_CLOEXEC (#4052) + * FTBFS with glib2 >= 2.63.3 (#4053) + * Undefined "__linux__" macro on non-Linux systems (#4058) + * Mouse is not handled with ncurses-6 (#3954) + * Mouse is not handled with S-Lang on some old terminal emulators (#4063) + * Terminal size is always 80x24 in subshell on Solaris 11.4 SPARC (#4099) + * Double clicking on empty area of file panel executes last item (#3722) + * Garbage in input line history (#4064) + * Speed of file copy is not displayed for single file (#4081) + * mcedit: blank screen with invisible error (#4057) + * mcedit: broken syntax highlighting for shell scripts (#4054) + * VFS: broken browsing of .deb packages (#4055) + * mc.lib installed twice (#4070) Version 4.8.24 Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/az.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/az.gmo differ diff -Nru mc-4.8.25/po/az.po mc-4.8.26/po/az.po --- mc-4.8.25/po/az.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/az.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Azerbaijani (http://www.transifex.com/mc/mc/language/az/)\n" "Language: az\n" @@ -1881,6 +1881,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2100,6 +2103,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2160,6 +2169,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2432,12 +2444,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2889,6 +2895,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "&Ağac" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "&Sıralama əmri..." + +msgid "&Filter..." +msgstr "&Süzgəc ..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "FT&P bağı ..." + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SM&B bağı..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "&Qovluqlar ağaçı" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "Faylları q&urtar (sadəcə olaraq ext2fs'də)" + +msgid "&Listing format edit" +msgstr "Şəkilləndirmə düzəldicisinin &Sıralaması " + +msgid "Edit &extension file" +msgstr "Fayl suf&fikslərini dəyişdir" + +msgid "Edit &menu file" +msgstr "&Menyunu dəyişdir" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Qurğular..." + +msgid "&Layout..." +msgstr "&Düzülüş ..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "Bitləri &göstər ..." + +msgid "&Virtual FS..." +msgstr "&Virtual DYS (VFS) ..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "&Chdir" @@ -2935,9 +3160,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Ağac" - msgid "Find File" msgstr "Faylı tap" @@ -3192,222 +3414,6 @@ msgid "Layout" msgstr "Düzülüş" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "&Sıralama əmri..." - -msgid "&Filter..." -msgstr "&Süzgəc ..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "FT&P bağı ..." - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SM&B bağı..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "&Qovluqlar ağaçı" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "Faylları q&urtar (sadəcə olaraq ext2fs'də)" - -msgid "&Listing format edit" -msgstr "Şəkilləndirmə düzəldicisinin &Sıralaması " - -msgid "Edit &extension file" -msgstr "Fayl suf&fikslərini dəyişdir" - -msgid "Edit &menu file" -msgstr "&Menyunu dəyişdir" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Qurğular..." - -msgid "&Layout..." -msgstr "&Düzülüş ..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "Bitləri &göstər ..." - -msgid "&Virtual FS..." -msgstr "&Virtual DYS (VFS) ..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/be.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/be.gmo differ diff -Nru mc-4.8.25/po/be.po mc-4.8.26/po/be.po --- mc-4.8.25/po/be.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/be.po 2021-01-21 17:18:34.000000000 +0000 @@ -6,16 +6,16 @@ # Slava Zanko , 2011 # Viktar Palstsiuk , 2015 # Yury V. Zaytsev , 2019 -# Zmicer Turok , 2018 -# Zmicer Turok , 2018 +# Źmicier Turok , 2018 +# Źmicier Turok , 2018 # Zmicer Turok , 2017-2018 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-06-03 11:35+0000\n" -"Last-Translator: Zmicer Turok \n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Belarusian (http://www.transifex.com/mc/mc/language/be/)\n" "Language: be\n" "MIME-Version: 1.0\n" @@ -1989,6 +1989,9 @@ msgid "Skin:" msgstr "Абалонка:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Выгляд" @@ -2212,6 +2215,14 @@ msgid "SMB authentication" msgstr "Аўтэнтыфікацыя SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Немагчыма перайсці ў «%s»\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2272,6 +2283,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2548,14 +2562,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "На нелакальных файлавых сістэмах нельга выконваць загады" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Немагчыма перайсці ў «%s»\n" -"%s" - msgid "Parameter" msgstr "Параметр" @@ -3088,6 +3094,227 @@ msgid "Invalid source pattern '%s'" msgstr "Хібны шаблон крыніцы '%s'" +msgid "File listin&g" +msgstr "Спіс файлаў(&G)" + +msgid "&Quick view" +msgstr "Хуткі прагляд(&Q)" + +msgid "&Info" +msgstr "Звесткі(&I)" + +msgid "&Tree" +msgstr "Дрэва(&T)" + +msgid "&Listing format..." +msgstr "Фармат спіса(&L)..." + +msgid "&Sort order..." +msgstr "Упарадкаваць(&S)..." + +msgid "&Filter..." +msgstr "Фільтраваць(&F)..." + +msgid "&Encoding..." +msgstr "Кадаванне(&E)..." + +msgid "FT&P link..." +msgstr "Злучэнне праз FTP(&F)..." + +msgid "S&hell link..." +msgstr "Злучэнне праз абалонку(&H)..." + +msgid "S&FTP link..." +msgstr "Злучэнне праз SFTP(&F)..." + +msgid "SM&B link..." +msgstr "Злучэнне праз SMB(&B)..." + +msgid "Paneli&ze" +msgstr "На панэлі(&Z)" + +msgid "&Rescan" +msgstr "Перасканаваць(&R)" + +msgid "&View" +msgstr "Праглядзець(&V)" + +msgid "Vie&w file..." +msgstr "Паказаць файл(&W)..." + +msgid "&Filtered view" +msgstr "Прагляд вываду загада(&F)" + +msgid "&Copy" +msgstr "Капіяваць(&C)" + +msgid "C&hmod" +msgstr "Змяніць дазволы(&H)" + +msgid "&Link" +msgstr "Спасылка(&L)" + +msgid "&Symlink" +msgstr "Сімвалічная спасылка(&S)" + +msgid "Relative symlin&k" +msgstr "Адносная сімвалічная спасылка(&K)" + +msgid "Edit s&ymlink" +msgstr "Рэдагаваць спасылку(&Y)" + +msgid "Ch&own" +msgstr "Змяніць уладальніка(&O)" + +msgid "&Advanced chown" +msgstr "Дазволы (пашыраныя)(&A)" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Змяніць назву або перамясціць(&R)" + +msgid "&Mkdir" +msgstr "Стварыць каталог(&M)" + +msgid "&Quick cd" +msgstr "Змяніць каталог(&Q)" + +msgid "Select &group" +msgstr "Абраць групу(&G)" + +msgid "U&nselect group" +msgstr "Не абіраць групу(&N)" + +msgid "&Invert selection" +msgstr "Адвярнуць вылучэнне(&I)" + +msgid "E&xit" +msgstr "Выйсці(&X)" + +msgid "&User menu" +msgstr "Меню карыстальніка(&U)" + +msgid "&Directory tree" +msgstr "Дрэва каталогаў(&D)" + +msgid "&Find file" +msgstr "Шукаць файл(&F)" + +msgid "S&wap panels" +msgstr "Пераставіць панэлі(&W)" + +msgid "Switch &panels on/off" +msgstr "Схаваць (паказаць) панэлі(&P)" + +msgid "&Compare directories" +msgstr "Параўнаць каталогі(&)" + +msgid "C&ompare files" +msgstr "Параўнаць файлы(&O)" + +msgid "E&xternal panelize" +msgstr "Загад на вонкавую панэль(&X)" + +msgid "Show directory s&izes" +msgstr "Памеры каталогаў(&I)" + +msgid "Command &history" +msgstr "Гісторыя загадаў(&H)" + +msgid "Viewed/edited files hi&story" +msgstr "Гісторыя прагледжаных / рэдагаваных файлаў" + +msgid "Di&rectory hotlist" +msgstr "Спіс каталогаў(&R)" + +msgid "&Active VFS list" +msgstr "Спіс актыўных VFS(&A)" + +msgid "&Background jobs" +msgstr "Задачы ў фоне(&B)" + +msgid "Screen lis&t" +msgstr "Спіс экранаў(&T)" + +msgid "&Undelete files (ext2fs only)" +msgstr "Аднавіць файлы (толькі на ext2)(&U)" + +msgid "&Listing format edit" +msgstr "Змяніць выгляд спіса(&L)" + +msgid "Edit &extension file" +msgstr "Рэдагаваць файл пашырэнняў(&E)" + +msgid "Edit &menu file" +msgstr "Файл меню(&M)" + +msgid "Edit hi&ghlighting group file" +msgstr "Рэдагаваць файл падсвятлення назваў(&G)" + +msgid "&Configuration..." +msgstr "Канфігурацыя(&C)..." + +msgid "&Layout..." +msgstr "Выгляд(&L)..." + +msgid "&Panel options..." +msgstr "Параметры панэляў(&P)..." + +msgid "C&onfirmation..." +msgstr "Пацвярджэнне(&O)…" + +msgid "&Appearance..." +msgstr "Выгляд(&A)..." + +msgid "&Display bits..." +msgstr "Кадаванне адлюстравання(&D)..." + +msgid "&Virtual FS..." +msgstr "Віртуальныя ФС(&V)..." + +msgid "Panels:" +msgstr "Панэлі:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Вы адкрылі %zu экран. Усё адно выйсці?" +msgstr[1] "Вы адкрылі %zu экраны. Усё адно выйсці?" +msgstr[2] "Вы адкрылі %zu экранаў. Усё адно выйсці?" +msgstr[3] "Вы адкрылі %zu экранаў. Усё адно выйсці?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Сапраўды выйсці з «Midnight Commander»?" + +msgid "&Above" +msgstr "Верхняя панэль(&A)" + +msgid "&Left" +msgstr "Левая(&L)" + +msgid "&Below" +msgstr "Ніжняя(&B)" + +msgid "&Right" +msgstr "Правая(&R)" + +msgid "ButtonBar|Menu" +msgstr "Меню" + +msgid "ButtonBar|View" +msgstr "Праглядзець" + +msgid "ButtonBar|RenMov" +msgstr "Назваць" + +msgid "ButtonBar|Mkdir" +msgstr "Новы каталог" + msgid "&Chdir" msgstr "Перайсці(&C)" @@ -3134,9 +3361,6 @@ msgid "Fir&st hit" msgstr "Да першага знойдзенага(&S)" -msgid "&Tree" -msgstr "Дрэва(&T)" - msgid "Find File" msgstr "Шукаць файл" @@ -3399,224 +3623,6 @@ msgid "Layout" msgstr "Выгляд" -msgid "File listin&g" -msgstr "Спіс файлаў(&G)" - -msgid "&Quick view" -msgstr "Хуткі прагляд(&Q)" - -msgid "&Info" -msgstr "Звесткі(&I)" - -msgid "&Listing format..." -msgstr "Фармат спіса(&L)..." - -msgid "&Sort order..." -msgstr "Упарадкаваць(&S)..." - -msgid "&Filter..." -msgstr "Фільтраваць(&F)..." - -msgid "&Encoding..." -msgstr "Кадаванне(&E)..." - -msgid "FT&P link..." -msgstr "Злучэнне праз FTP(&F)..." - -msgid "S&hell link..." -msgstr "Злучэнне праз абалонку(&H)..." - -msgid "S&FTP link..." -msgstr "Злучэнне праз SFTP(&F)..." - -msgid "SM&B link..." -msgstr "Злучэнне праз SMB(&B)..." - -msgid "Paneli&ze" -msgstr "На панэлі(&Z)" - -msgid "&Rescan" -msgstr "Перасканаваць(&R)" - -msgid "&View" -msgstr "Праглядзець(&V)" - -msgid "Vie&w file..." -msgstr "Паказаць файл(&W)..." - -msgid "&Filtered view" -msgstr "Прагляд вываду загада(&F)" - -msgid "&Copy" -msgstr "Капіяваць(&C)" - -msgid "C&hmod" -msgstr "Змяніць дазволы(&H)" - -msgid "&Link" -msgstr "Спасылка(&L)" - -msgid "&Symlink" -msgstr "Сімвалічная спасылка(&S)" - -msgid "Relative symlin&k" -msgstr "Адносная сімвалічная спасылка(&K)" - -msgid "Edit s&ymlink" -msgstr "Рэдагаваць спасылку(&Y)" - -msgid "Ch&own" -msgstr "Змяніць уладальніка(&O)" - -msgid "&Advanced chown" -msgstr "Дазволы (пашыраныя)(&A)" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Змяніць назву або перамясціць(&R)" - -msgid "&Mkdir" -msgstr "Стварыць каталог(&M)" - -msgid "&Quick cd" -msgstr "Змяніць каталог(&Q)" - -msgid "Select &group" -msgstr "Абраць групу(&G)" - -msgid "U&nselect group" -msgstr "Не абіраць групу(&N)" - -msgid "&Invert selection" -msgstr "Адвярнуць вылучэнне(&I)" - -msgid "E&xit" -msgstr "Выйсці(&X)" - -msgid "&User menu" -msgstr "Меню карыстальніка(&U)" - -msgid "&Directory tree" -msgstr "Дрэва каталогаў(&D)" - -msgid "&Find file" -msgstr "Шукаць файл(&F)" - -msgid "S&wap panels" -msgstr "Пераставіць панэлі(&W)" - -msgid "Switch &panels on/off" -msgstr "Схаваць (паказаць) панэлі(&P)" - -msgid "&Compare directories" -msgstr "Параўнаць каталогі(&)" - -msgid "C&ompare files" -msgstr "Параўнаць файлы(&O)" - -msgid "E&xternal panelize" -msgstr "Загад на вонкавую панэль(&X)" - -msgid "Show directory s&izes" -msgstr "Памеры каталогаў(&I)" - -msgid "Command &history" -msgstr "Гісторыя загадаў(&H)" - -msgid "Viewed/edited files hi&story" -msgstr "Гісторыя прагледжаных / рэдагаваных файлаў" - -msgid "Di&rectory hotlist" -msgstr "Спіс каталогаў(&R)" - -msgid "&Active VFS list" -msgstr "Спіс актыўных VFS(&A)" - -msgid "&Background jobs" -msgstr "Задачы ў фоне(&B)" - -msgid "Screen lis&t" -msgstr "Спіс экранаў(&T)" - -msgid "&Undelete files (ext2fs only)" -msgstr "Аднавіць файлы (толькі на ext2)(&U)" - -msgid "&Listing format edit" -msgstr "Змяніць выгляд спіса(&L)" - -msgid "Edit &extension file" -msgstr "Рэдагаваць файл пашырэнняў(&E)" - -msgid "Edit &menu file" -msgstr "Файл меню(&M)" - -msgid "Edit hi&ghlighting group file" -msgstr "Рэдагаваць файл падсвятлення назваў(&G)" - -msgid "&Configuration..." -msgstr "Канфігурацыя(&C)..." - -msgid "&Layout..." -msgstr "Выгляд(&L)..." - -msgid "&Panel options..." -msgstr "Параметры панэляў(&P)..." - -msgid "C&onfirmation..." -msgstr "Пацвярджэнне(&O)…" - -msgid "&Appearance..." -msgstr "Выгляд(&A)..." - -msgid "&Display bits..." -msgstr "Кадаванне адлюстравання(&D)..." - -msgid "&Virtual FS..." -msgstr "Віртуальныя ФС(&V)..." - -msgid "Panels:" -msgstr "Панэлі:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Вы адкрылі %zu экран. Усё адно выйсці?" -msgstr[1] "Вы адкрылі %zu экраны. Усё адно выйсці?" -msgstr[2] "Вы адкрылі %zu экранаў. Усё адно выйсці?" -msgstr[3] "Вы адкрылі %zu экранаў. Усё адно выйсці?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Сапраўды выйсці з «Midnight Commander»?" - -msgid "&Above" -msgstr "Верхняя панэль(&A)" - -msgid "&Left" -msgstr "Левая(&L)" - -msgid "&Below" -msgstr "Ніжняя(&B)" - -msgid "&Right" -msgstr "Правая(&R)" - -msgid "ButtonBar|Menu" -msgstr "Меню" - -msgid "ButtonBar|View" -msgstr "Праглядзець" - -msgid "ButtonBar|RenMov" -msgstr "Назваць" - -msgid "ButtonBar|Mkdir" -msgstr "Новы каталог" - msgid "Memory exhausted!" msgstr "Памяць вычарпаная!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/bg.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/bg.gmo differ diff -Nru mc-4.8.25/po/bg.po mc-4.8.26/po/bg.po --- mc-4.8.25/po/bg.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/bg.po 2021-01-21 17:18:34.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Bulgarian (http://www.transifex.com/mc/mc/language/bg/)\n" "Language: bg\n" @@ -1964,6 +1964,9 @@ msgid "Skin:" msgstr "Тема:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Изглед" @@ -2187,6 +2190,14 @@ msgid "SMB authentication" msgstr "SMB удостоверяване" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Не може да се chdir в \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2247,6 +2258,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2523,14 +2537,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Не може да се изпълняват команди на не-локални файлови системи" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Не може да се chdir в \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Параметър" @@ -3063,6 +3069,225 @@ msgid "Invalid source pattern '%s'" msgstr "Невалиден изходен модел '%s'" +msgid "File listin&g" +msgstr "Файлово изреж&дане" + +msgid "&Quick view" +msgstr "&Бърз преглед" + +msgid "&Info" +msgstr "&Информация" + +msgid "&Tree" +msgstr "Дърво" + +msgid "&Listing format..." +msgstr "&Формат на списък" + +msgid "&Sort order..." +msgstr "Ред на сортиране..." + +msgid "&Filter..." +msgstr "Филтър..." + +msgid "&Encoding..." +msgstr "&Кодировка" + +msgid "FT&P link..." +msgstr "FTP връзка..." + +msgid "S&hell link..." +msgstr "S&hell връзка..." + +msgid "S&FTP link..." +msgstr "S&FTP връзка..." + +msgid "SM&B link..." +msgstr "SMB връзка..." + +msgid "Paneli&ze" +msgstr "Покажи в панел" + +msgid "&Rescan" +msgstr "&Сканиране отново" + +msgid "&View" +msgstr "&Преглед" + +msgid "Vie&w file..." +msgstr "Преглед на &файла" + +msgid "&Filtered view" +msgstr "&Филтриран изглед" + +msgid "&Copy" +msgstr "&Копиране" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Линк" + +msgid "&Symlink" +msgstr "&Символичен линк" + +msgid "Relative symlin&k" +msgstr "Релативен символи&чен линк" + +msgid "Edit s&ymlink" +msgstr "Редактиране на сим&воличен линк" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "&Разширена chown" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Преименуване или местене" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "&Бързо cd" + +msgid "Select &group" +msgstr "Избор на &група" + +msgid "U&nselect group" +msgstr "Де&избиране на група" + +msgid "&Invert selection" +msgstr "&Преобръщане на селекция" + +msgid "E&xit" +msgstr "&Изход" + +msgid "&User menu" +msgstr "&Потребителско меню" + +msgid "&Directory tree" +msgstr "Дърво на директориите" + +msgid "&Find file" +msgstr "&Намиране на файл" + +msgid "S&wap panels" +msgstr "Разм&яна на панели" + +msgid "Switch &panels on/off" +msgstr "Включване/Изключване на &панелите" + +msgid "&Compare directories" +msgstr "&Сравнение на директории" + +msgid "C&ompare files" +msgstr "С&равнение на файлове" + +msgid "E&xternal panelize" +msgstr "В&ъншна панелизация" + +msgid "Show directory s&izes" +msgstr "Показване на &размерите на директориите" + +msgid "Command &history" +msgstr "Командна &история" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "Списък за бърз достъп до дире&ктории" + +msgid "&Active VFS list" +msgstr "&Активни списък от ВФС" + +msgid "&Background jobs" +msgstr "&Фонови задачи" + +msgid "Screen lis&t" +msgstr "Спис&ък на екрани" + +msgid "&Undelete files (ext2fs only)" +msgstr "Възстанови файлове (само ext2fs)" + +msgid "&Listing format edit" +msgstr "Редактирай формата на списъка" + +msgid "Edit &extension file" +msgstr "Редактирай файл с разширения" + +msgid "Edit &menu file" +msgstr "Редактирай меню-файл" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "Конфигурация..." + +msgid "&Layout..." +msgstr "Разположение..." + +msgid "&Panel options..." +msgstr "Настройки на &панел" + +msgid "C&onfirmation..." +msgstr "По&твърждение..." + +msgid "&Appearance..." +msgstr "&Изглед" + +msgid "&Display bits..." +msgstr "Екран..." + +msgid "&Virtual FS..." +msgstr "Виртуална ФС..." + +msgid "Panels:" +msgstr "Панели:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Имате %zu отворен прозорец. Изход все пак?" +msgstr[1] "Имате %zu отворени прозорци. Изход все пак?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander-а" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Наистина ли искате да напуснете Midnight Commander?" + +msgid "&Above" +msgstr "&Отгоре" + +msgid "&Left" +msgstr "&Вляво" + +msgid "&Below" +msgstr "&Отдолу" + +msgid "&Right" +msgstr "&Вдясно" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Меню" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Изглед" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "Смени директорията" @@ -3109,9 +3334,6 @@ msgid "Fir&st hit" msgstr "Пър&во попадение" -msgid "&Tree" -msgstr "Дърво" - msgid "Find File" msgstr "Търси файл" @@ -3370,222 +3592,6 @@ msgid "Layout" msgstr "Изглед" -msgid "File listin&g" -msgstr "Файлово изреж&дане" - -msgid "&Quick view" -msgstr "&Бърз преглед" - -msgid "&Info" -msgstr "&Информация" - -msgid "&Listing format..." -msgstr "&Формат на списък" - -msgid "&Sort order..." -msgstr "Ред на сортиране..." - -msgid "&Filter..." -msgstr "Филтър..." - -msgid "&Encoding..." -msgstr "&Кодировка" - -msgid "FT&P link..." -msgstr "FTP връзка..." - -msgid "S&hell link..." -msgstr "S&hell връзка..." - -msgid "S&FTP link..." -msgstr "S&FTP връзка..." - -msgid "SM&B link..." -msgstr "SMB връзка..." - -msgid "Paneli&ze" -msgstr "Покажи в панел" - -msgid "&Rescan" -msgstr "&Сканиране отново" - -msgid "&View" -msgstr "&Преглед" - -msgid "Vie&w file..." -msgstr "Преглед на &файла" - -msgid "&Filtered view" -msgstr "&Филтриран изглед" - -msgid "&Copy" -msgstr "&Копиране" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Линк" - -msgid "&Symlink" -msgstr "&Символичен линк" - -msgid "Relative symlin&k" -msgstr "Релативен символи&чен линк" - -msgid "Edit s&ymlink" -msgstr "Редактиране на сим&воличен линк" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "&Разширена chown" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Преименуване или местене" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "&Бързо cd" - -msgid "Select &group" -msgstr "Избор на &група" - -msgid "U&nselect group" -msgstr "Де&избиране на група" - -msgid "&Invert selection" -msgstr "&Преобръщане на селекция" - -msgid "E&xit" -msgstr "&Изход" - -msgid "&User menu" -msgstr "&Потребителско меню" - -msgid "&Directory tree" -msgstr "Дърво на директориите" - -msgid "&Find file" -msgstr "&Намиране на файл" - -msgid "S&wap panels" -msgstr "Разм&яна на панели" - -msgid "Switch &panels on/off" -msgstr "Включване/Изключване на &панелите" - -msgid "&Compare directories" -msgstr "&Сравнение на директории" - -msgid "C&ompare files" -msgstr "С&равнение на файлове" - -msgid "E&xternal panelize" -msgstr "В&ъншна панелизация" - -msgid "Show directory s&izes" -msgstr "Показване на &размерите на директориите" - -msgid "Command &history" -msgstr "Командна &история" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "Списък за бърз достъп до дире&ктории" - -msgid "&Active VFS list" -msgstr "&Активни списък от ВФС" - -msgid "&Background jobs" -msgstr "&Фонови задачи" - -msgid "Screen lis&t" -msgstr "Спис&ък на екрани" - -msgid "&Undelete files (ext2fs only)" -msgstr "Възстанови файлове (само ext2fs)" - -msgid "&Listing format edit" -msgstr "Редактирай формата на списъка" - -msgid "Edit &extension file" -msgstr "Редактирай файл с разширения" - -msgid "Edit &menu file" -msgstr "Редактирай меню-файл" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "Конфигурация..." - -msgid "&Layout..." -msgstr "Разположение..." - -msgid "&Panel options..." -msgstr "Настройки на &панел" - -msgid "C&onfirmation..." -msgstr "По&твърждение..." - -msgid "&Appearance..." -msgstr "&Изглед" - -msgid "&Display bits..." -msgstr "Екран..." - -msgid "&Virtual FS..." -msgstr "Виртуална ФС..." - -msgid "Panels:" -msgstr "Панели:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Имате %zu отворен прозорец. Изход все пак?" -msgstr[1] "Имате %zu отворени прозорци. Изход все пак?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander-а" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Наистина ли искате да напуснете Midnight Commander?" - -msgid "&Above" -msgstr "&Отгоре" - -msgid "&Left" -msgstr "&Вляво" - -msgid "&Below" -msgstr "&Отдолу" - -msgid "&Right" -msgstr "&Вдясно" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Меню" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Изглед" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Паметта е изразходвана!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ca.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ca.gmo differ diff -Nru mc-4.8.25/po/ca.po mc-4.8.26/po/ca.po --- mc-4.8.25/po/ca.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ca.po 2021-01-21 17:18:34.000000000 +0000 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the mc package. # # Translators: -# Antoni Bella Pérez , 2017-2020 +# Antoni Bella Pérez , 2017-2021 # Daniel , 2011 # Daniel , 2011-2012 # Daniel , 2012 @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-18 08:43+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2021-01-03 19:08+0000\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan (http://www.transifex.com/mc/mc/language/ca/)\n" "Language: ca\n" @@ -1869,7 +1869,7 @@ msgstr "altres" msgid "Flag" -msgstr "Bandera" +msgstr "Indicador" #, c-format msgid "Permissions (octal): %o" @@ -1999,6 +1999,9 @@ msgid "Skin:" msgstr "Tema:" +msgid "&Shadows" +msgstr "Ombre&s" + msgid "Appearance" msgstr "Aparença" @@ -2222,6 +2225,14 @@ msgid "SMB authentication" msgstr "Autenticació SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"No s'ha pogut fer chdir a «%s»\n" +"%s" + msgid "Secure deletion" msgstr "Supressió segura" @@ -2274,25 +2285,28 @@ msgstr "Començament de les jerarquies de directori" msgid "Inode uses extents" -msgstr "" +msgstr "L'ínode usa extensions" msgid "Huge_file" -msgstr "" +msgstr "Fitxer_enorme" msgid "No COW" -msgstr "" +msgstr "Sense COW" + +msgid "Direct access for files" +msgstr "Accés directe als fitxers" msgid "Casefolded file" -msgstr "" +msgstr "Fitxer insensible a majúscules" msgid "Inode has inline data" -msgstr "" +msgstr "L'ínode té dades incloses" msgid "Project hierarchy" -msgstr "" +msgstr "Jerarquia del projecte" msgid "Verity protected inode" -msgstr "" +msgstr "Ínode protegit de veritat" msgid "&Marked all" msgstr "&Marca'ls tots" @@ -2304,22 +2318,26 @@ msgstr "&Esborra els marcats" msgid "Chattr command" -msgstr "" +msgstr "Ordre «chattr»" #, c-format msgid "" "Cannot chattr \"%s\"\n" "%s" msgstr "" +"No s'ha pogut fer chattr «%s»\n" +"%s" msgid "Cannot change attributes on non-local filesystems" -msgstr "" +msgstr "No es poden canviar els atributs en sistemes de fitxers no locals" #, c-format msgid "" "Cannot get flags of \"%s\"\n" "%s" msgstr "" +"No s'han pogut obtenir els indicadors de «%s»\n" +"%s" msgid "set &user ID on execution" msgstr "estableix l'ID d'&usuari en l'execució" @@ -2558,14 +2576,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "No es poden executar ordres en sistemes de fitxers no locals" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"No s'ha pogut fer chdir a «%s»\n" -"%s" - msgid "Parameter" msgstr "Paràmetre" @@ -3101,6 +3111,225 @@ msgid "Invalid source pattern '%s'" msgstr "Patró d'origen «%s» no vàlid" +msgid "File listin&g" +msgstr "&Llistat de fitxers" + +msgid "&Quick view" +msgstr "Vista &ràpida" + +msgid "&Info" +msgstr "&Informació" + +msgid "&Tree" +msgstr "Ar&bre" + +msgid "&Listing format..." +msgstr "Format del &llistat..." + +msgid "&Sort order..." +msgstr "&Ordenació..." + +msgid "&Filter..." +msgstr "&Filtra..." + +msgid "&Encoding..." +msgstr "&Codificació..." + +msgid "FT&P link..." +msgstr "Enllaç per a F&TP..." + +msgid "S&hell link..." +msgstr "Enllaç per a l'i&ntèrpret..." + +msgid "S&FTP link..." +msgstr "Enllaç per a &SFTP..." + +msgid "SM&B link..." +msgstr "Enllaç per a SM&B..." + +msgid "Paneli&ze" +msgstr "&Quadre de cerca" + +msgid "&Rescan" +msgstr "To&rna a escanejar" + +msgid "&View" +msgstr "&Visualitza" + +msgid "Vie&w file..." +msgstr "Visualit&za el fitxer..." + +msgid "&Filtered view" +msgstr "Vista &filtrada" + +msgid "&Copy" +msgstr "&Copia" + +msgid "C&hmod" +msgstr "Ca&nvia els permisos" + +msgid "&Link" +msgstr "En&llaça" + +msgid "&Symlink" +msgstr "Enllaç si&mbòlic" + +msgid "Relative symlin&k" +msgstr "Enllaç sim&bòlic relatiu" + +msgid "Edit s&ymlink" +msgstr "Edi&ta l'enllaç simbòlic" + +msgid "Ch&own" +msgstr "Can&via el propietari" + +msgid "&Advanced chown" +msgstr "C&anvi avançat del propietari" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "&Reanomena/Mou" + +msgid "&Mkdir" +msgstr "Crea un &directori" + +msgid "&Quick cd" +msgstr "Canvia ràpidament de direct&ori" + +msgid "Select &group" +msgstr "Selecciona un &grup" + +msgid "U&nselect group" +msgstr "Deseleccio&na un grup" + +msgid "&Invert selection" +msgstr "&Inverteix la selecció" + +msgid "E&xit" +msgstr "S&urt" + +msgid "&User menu" +msgstr "Menú d'&usuari" + +msgid "&Directory tree" +msgstr "Arbre de &directoris" + +msgid "&Find file" +msgstr "Troba el &fitxer" + +msgid "S&wap panels" +msgstr "Intercan&via els plafons" + +msgid "Switch &panels on/off" +msgstr "Mostra/oculta els &plafons" + +msgid "&Compare directories" +msgstr "&Compara els directoris" + +msgid "C&ompare files" +msgstr "C&ompara els fitxers" + +msgid "E&xternal panelize" +msgstr "Quadre de cerca e&xtern" + +msgid "Show directory s&izes" +msgstr "Mostra les m&ides dels directoris" + +msgid "Command &history" +msgstr "&Historial de les ordres" + +msgid "Viewed/edited files hi&story" +msgstr "Hi&storial dels fitxers vistos/editats" + +msgid "Di&rectory hotlist" +msgstr "Favorits dels di&rectoris" + +msgid "&Active VFS list" +msgstr "Llista el VFS &activu" + +msgid "&Background jobs" +msgstr "Tasques en se&gon pla" + +msgid "Screen lis&t" +msgstr "Llis&ta les pantalles" + +msgid "&Undelete files (ext2fs only)" +msgstr "Recupera el&s fitxers (només ext2fs)" + +msgid "&Listing format edit" +msgstr "Edita el format del &llistat" + +msgid "Edit &extension file" +msgstr "Edita el fitxer d'&extensions" + +msgid "Edit &menu file" +msgstr "Edita el fitxer de &menús" + +msgid "Edit hi&ghlighting group file" +msgstr "Edita el fitxer dels grups de &ressaltat" + +msgid "&Configuration..." +msgstr "&Configuració..." + +msgid "&Layout..." +msgstr "&Disposició..." + +msgid "&Panel options..." +msgstr "Opcions del &plafó..." + +msgid "C&onfirmation..." +msgstr "C&onfirmació..." + +msgid "&Appearance..." +msgstr "&Aparença..." + +msgid "&Display bits..." +msgstr "&Bits de visualització..." + +msgid "&Virtual FS..." +msgstr "Sistema de fitxers &virtual..." + +msgid "Panels:" +msgstr "Plafons:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Teniu oberta %zu pantalla. Surto igualment?" +msgstr[1] "Teniu obertes %zu pantalles. Surto igualment?" + +msgid "The Midnight Commander" +msgstr "El Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Segur que voleu sortir del Midnight Commander?" + +msgid "&Above" +msgstr "Qu&ant al" + +msgid "&Left" +msgstr "&Esquerra" + +msgid "&Below" +msgstr "A &sota" + +msgid "&Right" +msgstr "&Dreta" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menú" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Visualitza" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|ReanMou" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|CreaDir" + msgid "&Chdir" msgstr "Canvia de &dirextori" @@ -3147,9 +3376,6 @@ msgid "Fir&st hit" msgstr "Pr&Imera coincidència" -msgid "&Tree" -msgstr "Ar&bre" - msgid "Find File" msgstr "Cerca el fitxer" @@ -3408,222 +3634,6 @@ msgid "Layout" msgstr "Disposició" -msgid "File listin&g" -msgstr "&Llistat de fitxers" - -msgid "&Quick view" -msgstr "Vista &ràpida" - -msgid "&Info" -msgstr "&Informació" - -msgid "&Listing format..." -msgstr "Format del &llistat..." - -msgid "&Sort order..." -msgstr "&Ordenació..." - -msgid "&Filter..." -msgstr "&Filtra..." - -msgid "&Encoding..." -msgstr "&Codificació..." - -msgid "FT&P link..." -msgstr "Enllaç per a F&TP..." - -msgid "S&hell link..." -msgstr "Enllaç per a l'i&ntèrpret..." - -msgid "S&FTP link..." -msgstr "Enllaç per a &SFTP..." - -msgid "SM&B link..." -msgstr "Enllaç per a SM&B..." - -msgid "Paneli&ze" -msgstr "&Quadre de cerca" - -msgid "&Rescan" -msgstr "To&rna a escanejar" - -msgid "&View" -msgstr "&Visualitza" - -msgid "Vie&w file..." -msgstr "Visualit&za el fitxer..." - -msgid "&Filtered view" -msgstr "Vista &filtrada" - -msgid "&Copy" -msgstr "&Copia" - -msgid "C&hmod" -msgstr "Ca&nvia els permisos" - -msgid "&Link" -msgstr "En&llaça" - -msgid "&Symlink" -msgstr "Enllaç si&mbòlic" - -msgid "Relative symlin&k" -msgstr "Enllaç sim&bòlic relatiu" - -msgid "Edit s&ymlink" -msgstr "Edi&ta l'enllaç simbòlic" - -msgid "Ch&own" -msgstr "Can&via el propietari" - -msgid "&Advanced chown" -msgstr "C&anvi avançat del propietari" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Reanomena/Mou" - -msgid "&Mkdir" -msgstr "Crea un &directori" - -msgid "&Quick cd" -msgstr "Canvia ràpidament de direct&ori" - -msgid "Select &group" -msgstr "Selecciona un &grup" - -msgid "U&nselect group" -msgstr "Deseleccio&na un grup" - -msgid "&Invert selection" -msgstr "&Inverteix la selecció" - -msgid "E&xit" -msgstr "S&urt" - -msgid "&User menu" -msgstr "Menú d'&usuari" - -msgid "&Directory tree" -msgstr "Arbre de &directoris" - -msgid "&Find file" -msgstr "Troba el &fitxer" - -msgid "S&wap panels" -msgstr "Intercan&via els plafons" - -msgid "Switch &panels on/off" -msgstr "Mostra/oculta els &plafons" - -msgid "&Compare directories" -msgstr "&Compara els directoris" - -msgid "C&ompare files" -msgstr "C&ompara els fitxers" - -msgid "E&xternal panelize" -msgstr "Quadre de cerca e&xtern" - -msgid "Show directory s&izes" -msgstr "Mostra les m&ides dels directoris" - -msgid "Command &history" -msgstr "&Historial de les ordres" - -msgid "Viewed/edited files hi&story" -msgstr "Hi&storial dels fitxers vistos/editats" - -msgid "Di&rectory hotlist" -msgstr "Favorits dels di&rectoris" - -msgid "&Active VFS list" -msgstr "Llista el VFS &activu" - -msgid "&Background jobs" -msgstr "Tasques en se&gon pla" - -msgid "Screen lis&t" -msgstr "Llis&ta les pantalles" - -msgid "&Undelete files (ext2fs only)" -msgstr "Recupera el&s fitxers (només ext2fs)" - -msgid "&Listing format edit" -msgstr "Edita el format del &llistat" - -msgid "Edit &extension file" -msgstr "Edita el fitxer d'&extensions" - -msgid "Edit &menu file" -msgstr "Edita el fitxer de &menús" - -msgid "Edit hi&ghlighting group file" -msgstr "Edita el fitxer dels grups de &ressaltat" - -msgid "&Configuration..." -msgstr "&Configuració..." - -msgid "&Layout..." -msgstr "&Disposició..." - -msgid "&Panel options..." -msgstr "Opcions del &plafó..." - -msgid "C&onfirmation..." -msgstr "C&onfirmació..." - -msgid "&Appearance..." -msgstr "&Aparença..." - -msgid "&Display bits..." -msgstr "&Bits de visualització..." - -msgid "&Virtual FS..." -msgstr "Sistema de fitxers &virtual..." - -msgid "Panels:" -msgstr "Plafons:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Teniu oberta %zu pantalla. Surto igualment?" -msgstr[1] "Teniu obertes %zu pantalles. Surto igualment?" - -msgid "The Midnight Commander" -msgstr "El Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Segur que voleu sortir del Midnight Commander?" - -msgid "&Above" -msgstr "Qu&ant al" - -msgid "&Left" -msgstr "&Esquerra" - -msgid "&Below" -msgstr "A &sota" - -msgid "&Right" -msgstr "&Dreta" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menú" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Visualitza" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|ReanMou" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|CreaDir" - msgid "Memory exhausted!" msgstr "Memòria exhaurida!" @@ -4381,7 +4391,7 @@ "Warning: Invalid flag %c in %s:\n" "%s\n" msgstr "" -"Avís: Bandera %c no vàlida a %s:\n" +"Avís: Indicador %c no vàlid a %s:\n" "%s\n" #, c-format Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/cs.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/cs.gmo differ diff -Nru mc-4.8.25/po/cs.po mc-4.8.26/po/cs.po --- mc-4.8.25/po/cs.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/cs.po 2021-01-21 17:18:34.000000000 +0000 @@ -14,9 +14,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-06-25 07:12+0000\n" -"Last-Translator: k3dar \n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Czech (http://www.transifex.com/mc/mc/language/cs/)\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -1990,6 +1990,9 @@ msgid "Skin:" msgstr "Schéma vzhledu:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Vzhled" @@ -2213,6 +2216,14 @@ msgid "SMB authentication" msgstr "SMB ověření" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Nedaří se přejít do složky „%s“\n" +"%s" + msgid "Secure deletion" msgstr "Bezpečné smazání" @@ -2273,6 +2284,9 @@ msgid "No COW" msgstr "Nepoužít kopírování při zápisu (CoW)" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "Casefolded file" @@ -2555,14 +2569,6 @@ "Pokud nepracujete se soubory, nacházejícími se v tomto počítači, nelze " "spouštět žádné příkazy" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Nedaří se přejít do složky „%s“\n" -"%s" - msgid "Parameter" msgstr "Parametr" @@ -3097,6 +3103,227 @@ msgid "Invalid source pattern '%s'" msgstr "Neplatný zdrojový vzor „%s“" +msgid "File listin&g" +msgstr "&Seznam souborů" + +msgid "&Quick view" +msgstr "&Rychlé zobrazení " + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "S&trom" + +msgid "&Listing format..." +msgstr "&Formát výpisu…" + +msgid "&Sort order..." +msgstr "&Pořadí…" + +msgid "&Filter..." +msgstr "&Filtr…" + +msgid "&Encoding..." +msgstr "&Kódování…" + +msgid "FT&P link..." +msgstr "FT&P spojení…" + +msgid "S&hell link..." +msgstr "S&hell spojení…" + +msgid "S&FTP link..." +msgstr "SFTP sp&ojení…" + +msgid "SM&B link..." +msgstr "SM&B spojení…" + +msgid "Paneli&ze" +msgstr "Zobra&zit v panelu" + +msgid "&Rescan" +msgstr "Znovu p&roskenovat" + +msgid "&View" +msgstr "&Prohlížet" + +msgid "Vie&w file..." +msgstr "Pro&hlížet soubor…" + +msgid "&Filtered view" +msgstr "&Filtrovaný pohled" + +msgid "&Copy" +msgstr "&Kopírovat" + +msgid "C&hmod" +msgstr "&Změna práv" + +msgid "&Link" +msgstr "O&dkaz" + +msgid "&Symlink" +msgstr "&Symbolický odkaz" + +msgid "Relative symlin&k" +msgstr "Relativní symbolic&ký odkaz" + +msgid "Edit s&ymlink" +msgstr "Upravit s&ymbolický odkaz" + +msgid "Ch&own" +msgstr "Změna &vlastníka" + +msgid "&Advanced chown" +msgstr "&Rozšířená změna práv/vlastníka" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "Přej&menovat/přesunout" + +msgid "&Mkdir" +msgstr "&Nová složka" + +msgid "&Quick cd" +msgstr "Ry&chlá změna složky" + +msgid "Select &group" +msgstr "Vy&brat skupinu" + +msgid "U&nselect group" +msgstr "Zrušit výběr skupi&ny" + +msgid "&Invert selection" +msgstr "Převrát&it výběr" + +msgid "E&xit" +msgstr "Ukonč&it" + +msgid "&User menu" +msgstr "&Uživatelská nabídka" + +msgid "&Directory tree" +msgstr "Strom a&dresářů" + +msgid "&Find file" +msgstr "&Najít soubor" + +msgid "S&wap panels" +msgstr "Proh&odit panely" + +msgid "Switch &panels on/off" +msgstr "&Panely ano/ne" + +msgid "&Compare directories" +msgstr "Porovnat &složky" + +msgid "C&ompare files" +msgstr "P&orovnat soubory" + +msgid "E&xternal panelize" +msgstr "E&xterní panelizace" + +msgid "Show directory s&izes" +msgstr "Zobrazit velikost&i složek" + +msgid "Command &history" +msgstr "&Historie příkazů" + +msgid "Viewed/edited files hi&story" +msgstr "Hi&storie zobrazených/upravovaných souborů" + +msgid "Di&rectory hotlist" +msgstr "&Rychlý přístup ke složkám" + +msgid "&Active VFS list" +msgstr "Seznam právě použív&aných VFS souborových systémů" + +msgid "&Background jobs" +msgstr "Úlohy na po&zadí" + +msgid "Screen lis&t" +msgstr "Seznam obrazove&k" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Obnovit smazané soubory (jen ext2fs)" + +msgid "&Listing format edit" +msgstr "Upravit formát &výpisu" + +msgid "Edit &extension file" +msgstr "Upravit akc&e k příponám" + +msgid "Edit &menu file" +msgstr "Upravit uživatelskou &nabídku" + +msgid "Edit hi&ghlighting group file" +msgstr "Upravit z&výrazňování skupin" + +msgid "&Configuration..." +msgstr "&Nastavení…" + +msgid "&Layout..." +msgstr "&Rozvržení…" + +msgid "&Panel options..." +msgstr "Nastavení &panelu…" + +msgid "C&onfirmation..." +msgstr "P&otvrzování…" + +msgid "&Appearance..." +msgstr "&Vzhled…" + +msgid "&Display bits..." +msgstr "&Zobrazení bitů…" + +msgid "&Virtual FS..." +msgstr "&Virtuální souborový systém…" + +msgid "Panels:" +msgstr "Panely:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Máte %zu otevřenou obrazovku. Ukončit i tak?" +msgstr[1] "Máte %zu otevřené obrazovky. Ukončit i tak?" +msgstr[2] "Máte otevřeno %zu obrazovek. Ukončit i tak?" +msgstr[3] "Máte otevřeno %zu obrazovek. Ukončit i tak?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Opravdu chcete Midnight Commander ukončit?" + +msgid "&Above" +msgstr "N&ad" + +msgid "&Left" +msgstr "V&levo" + +msgid "&Below" +msgstr "&Pod" + +msgid "&Right" +msgstr "Vp&ravo" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Nabídka" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Zobraz" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Přejm/Přesun" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Nová slož." + msgid "&Chdir" msgstr "&Chdir" @@ -3143,9 +3370,6 @@ msgid "Fir&st hit" msgstr "První vý&skyt" -msgid "&Tree" -msgstr "S&trom" - msgid "Find File" msgstr "Najít soubor" @@ -3408,224 +3632,6 @@ msgid "Layout" msgstr "Rozvržení" -msgid "File listin&g" -msgstr "&Seznam souborů" - -msgid "&Quick view" -msgstr "&Rychlé zobrazení " - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Formát výpisu…" - -msgid "&Sort order..." -msgstr "&Pořadí…" - -msgid "&Filter..." -msgstr "&Filtr…" - -msgid "&Encoding..." -msgstr "&Kódování…" - -msgid "FT&P link..." -msgstr "FT&P spojení…" - -msgid "S&hell link..." -msgstr "S&hell spojení…" - -msgid "S&FTP link..." -msgstr "SFTP sp&ojení…" - -msgid "SM&B link..." -msgstr "SM&B spojení…" - -msgid "Paneli&ze" -msgstr "Zobra&zit v panelu" - -msgid "&Rescan" -msgstr "Znovu p&roskenovat" - -msgid "&View" -msgstr "&Prohlížet" - -msgid "Vie&w file..." -msgstr "Pro&hlížet soubor…" - -msgid "&Filtered view" -msgstr "&Filtrovaný pohled" - -msgid "&Copy" -msgstr "&Kopírovat" - -msgid "C&hmod" -msgstr "&Změna práv" - -msgid "&Link" -msgstr "O&dkaz" - -msgid "&Symlink" -msgstr "&Symbolický odkaz" - -msgid "Relative symlin&k" -msgstr "Relativní symbolic&ký odkaz" - -msgid "Edit s&ymlink" -msgstr "Upravit s&ymbolický odkaz" - -msgid "Ch&own" -msgstr "Změna &vlastníka" - -msgid "&Advanced chown" -msgstr "&Rozšířená změna práv/vlastníka" - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "Přej&menovat/přesunout" - -msgid "&Mkdir" -msgstr "&Nová složka" - -msgid "&Quick cd" -msgstr "Ry&chlá změna složky" - -msgid "Select &group" -msgstr "Vy&brat skupinu" - -msgid "U&nselect group" -msgstr "Zrušit výběr skupi&ny" - -msgid "&Invert selection" -msgstr "Převrát&it výběr" - -msgid "E&xit" -msgstr "Ukonč&it" - -msgid "&User menu" -msgstr "&Uživatelská nabídka" - -msgid "&Directory tree" -msgstr "Strom a&dresářů" - -msgid "&Find file" -msgstr "&Najít soubor" - -msgid "S&wap panels" -msgstr "Proh&odit panely" - -msgid "Switch &panels on/off" -msgstr "&Panely ano/ne" - -msgid "&Compare directories" -msgstr "Porovnat &složky" - -msgid "C&ompare files" -msgstr "P&orovnat soubory" - -msgid "E&xternal panelize" -msgstr "E&xterní panelizace" - -msgid "Show directory s&izes" -msgstr "Zobrazit velikost&i složek" - -msgid "Command &history" -msgstr "&Historie příkazů" - -msgid "Viewed/edited files hi&story" -msgstr "Hi&storie zobrazených/upravovaných souborů" - -msgid "Di&rectory hotlist" -msgstr "&Rychlý přístup ke složkám" - -msgid "&Active VFS list" -msgstr "Seznam právě použív&aných VFS souborových systémů" - -msgid "&Background jobs" -msgstr "Úlohy na po&zadí" - -msgid "Screen lis&t" -msgstr "Seznam obrazove&k" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Obnovit smazané soubory (jen ext2fs)" - -msgid "&Listing format edit" -msgstr "Upravit formát &výpisu" - -msgid "Edit &extension file" -msgstr "Upravit akc&e k příponám" - -msgid "Edit &menu file" -msgstr "Upravit uživatelskou &nabídku" - -msgid "Edit hi&ghlighting group file" -msgstr "Upravit z&výrazňování skupin" - -msgid "&Configuration..." -msgstr "&Nastavení…" - -msgid "&Layout..." -msgstr "&Rozvržení…" - -msgid "&Panel options..." -msgstr "Nastavení &panelu…" - -msgid "C&onfirmation..." -msgstr "P&otvrzování…" - -msgid "&Appearance..." -msgstr "&Vzhled…" - -msgid "&Display bits..." -msgstr "&Zobrazení bitů…" - -msgid "&Virtual FS..." -msgstr "&Virtuální souborový systém…" - -msgid "Panels:" -msgstr "Panely:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Máte %zu otevřenou obrazovku. Ukončit i tak?" -msgstr[1] "Máte %zu otevřené obrazovky. Ukončit i tak?" -msgstr[2] "Máte otevřeno %zu obrazovek. Ukončit i tak?" -msgstr[3] "Máte otevřeno %zu obrazovek. Ukončit i tak?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Opravdu chcete Midnight Commander ukončit?" - -msgid "&Above" -msgstr "N&ad" - -msgid "&Left" -msgstr "V&levo" - -msgid "&Below" -msgstr "&Pod" - -msgid "&Right" -msgstr "Vp&ravo" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Nabídka" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Zobraz" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Přejm/Přesun" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Nová slož." - msgid "Memory exhausted!" msgstr "Došla volná paměť!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/da.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/da.gmo differ diff -Nru mc-4.8.25/po/da.po mc-4.8.26/po/da.po --- mc-4.8.25/po/da.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/da.po 2021-01-21 17:18:34.000000000 +0000 @@ -13,9 +13,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-21 22:41+0000\n" -"Last-Translator: scootergrisen\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Danish (http://www.transifex.com/mc/mc/language/da/)\n" "Language: da\n" "MIME-Version: 1.0\n" @@ -1986,6 +1986,9 @@ msgid "Skin:" msgstr "Tema:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Fremtoning" @@ -2210,6 +2213,14 @@ msgid "SMB authentication" msgstr "SMB-godkendelse" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Kan ikke chdir til »%s«\n" +"%s" + msgid "Secure deletion" msgstr "Sikker sletning" @@ -2270,6 +2281,9 @@ msgid "No COW" msgstr "Ingen COW" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "Casefold'et fil" @@ -2280,7 +2294,7 @@ msgstr "Projekthierarki" msgid "Verity protected inode" -msgstr "" +msgstr "Verity-beskyttet inode" msgid "&Marked all" msgstr "&Marker alle" @@ -2550,14 +2564,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Kan ikke køre kommandoer på filsystemer der ikke er lokale" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Kan ikke chdir til »%s«\n" -"%s" - msgid "Parameter" msgstr "Parameter" @@ -3092,6 +3098,225 @@ msgid "Invalid source pattern '%s'" msgstr "Ugyldigt kildemønster '%s'" +msgid "File listin&g" +msgstr "Filvisnin&g" + +msgid "&Quick view" +msgstr "&Hurtig visning" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Træ" + +msgid "&Listing format..." +msgstr "&Listeformat..." + +msgid "&Sort order..." +msgstr "&Sorteringsrækkefølge..." + +msgid "&Filter..." +msgstr "&Filter..." + +msgid "&Encoding..." +msgstr "&Kodning..." + +msgid "FT&P link..." +msgstr "FT&P-henvisning..." + +msgid "S&hell link..." +msgstr "S&kalhenvisning..." + +msgid "S&FTP link..." +msgstr "S&FTP-link..." + +msgid "SM&B link..." +msgstr "SM&B-henvisning..." + +msgid "Paneli&ze" +msgstr "Paneli&sér" + +msgid "&Rescan" +msgstr "&Genskan" + +msgid "&View" +msgstr "&Vis" + +msgid "Vie&w file..." +msgstr "&Vis fil..." + +msgid "&Filtered view" +msgstr "&Filtreret visning" + +msgid "&Copy" +msgstr "&Kopiér" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Henvisning" + +msgid "&Symlink" +msgstr "&Symbolsk henvisning" + +msgid "Relative symlin&k" +msgstr "Relative symbols&ke henvisninger" + +msgid "Edit s&ymlink" +msgstr "Rediger s&ymbolsk henvising" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "&Avanceret chown" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "&Omdøb/flyt" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "&Hurtig cd" + +msgid "Select &group" +msgstr "Vælg &gruppe" + +msgid "U&nselect group" +msgstr "&Fravælg gruppe" + +msgid "&Invert selection" +msgstr "&Omvend markering" + +msgid "E&xit" +msgstr "&Afslut" + +msgid "&User menu" +msgstr "&Brugermenu" + +msgid "&Directory tree" +msgstr "&Mappetræ" + +msgid "&Find file" +msgstr "&Find fil" + +msgid "S&wap panels" +msgstr "&Skift paneler" + +msgid "Switch &panels on/off" +msgstr "Slå &paneler til/fra" + +msgid "&Compare directories" +msgstr "&Sammenlign mapper" + +msgid "C&ompare files" +msgstr "&Sammenlign filer" + +msgid "E&xternal panelize" +msgstr "&Ekstern panelisering" + +msgid "Show directory s&izes" +msgstr "Vis &mappestørrelser" + +msgid "Command &history" +msgstr "Kommando&historik" + +msgid "Viewed/edited files hi&story" +msgstr "Viste/redigerede &filhistorik" + +msgid "Di&rectory hotlist" +msgstr "&Mappehotlist" + +msgid "&Active VFS list" +msgstr "&Aktiv VFS-liste" + +msgid "&Background jobs" +msgstr "&Baggrundsjob" + +msgid "Screen lis&t" +msgstr "Skærmlis&te" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Gendan filer (kun ext2fs)" + +msgid "&Listing format edit" +msgstr "Redigering af &listeformat" + +msgid "Edit &extension file" +msgstr "Rediger fil&endelse" + +msgid "Edit &menu file" +msgstr "Rediger &menufil" + +msgid "Edit hi&ghlighting group file" +msgstr "Rediger &fremhævelsesgruppefil" + +msgid "&Configuration..." +msgstr "&Opsætning..." + +msgid "&Layout..." +msgstr "&Layout..." + +msgid "&Panel options..." +msgstr "&Panelindstilinger..." + +msgid "C&onfirmation..." +msgstr "&Bekræftelse..." + +msgid "&Appearance..." +msgstr "&Fremtoning..." + +msgid "&Display bits..." +msgstr "&Vis bit..." + +msgid "&Virtual FS..." +msgstr "&Virtuelt FS..." + +msgid "Panels:" +msgstr "Paneler:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Du har %zu åben skærm. Afslut alligevel?" +msgstr[1] "Du har %zu åbne skærme. Afslut alligevel?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Ønsker du virkelig at afslutte Midnight Commander?" + +msgid "&Above" +msgstr "&Over" + +msgid "&Left" +msgstr "&Venstre" + +msgid "&Below" +msgstr "&Under" + +msgid "&Right" +msgstr "&Højre" + +msgid "ButtonBar|Menu" +msgstr "Menu" + +msgid "ButtonBar|View" +msgstr "Vis" + +msgid "ButtonBar|RenMov" +msgstr "OmdFly" + +msgid "ButtonBar|Mkdir" +msgstr "Mkdir" + msgid "&Chdir" msgstr "&Skift mappe" @@ -3138,9 +3363,6 @@ msgid "Fir&st hit" msgstr "&Første resultat" -msgid "&Tree" -msgstr "&Træ" - msgid "Find File" msgstr "Find fil" @@ -3399,222 +3621,6 @@ msgid "Layout" msgstr "Layout" -msgid "File listin&g" -msgstr "Filvisnin&g" - -msgid "&Quick view" -msgstr "&Hurtig visning" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Listeformat..." - -msgid "&Sort order..." -msgstr "&Sorteringsrækkefølge..." - -msgid "&Filter..." -msgstr "&Filter..." - -msgid "&Encoding..." -msgstr "&Kodning..." - -msgid "FT&P link..." -msgstr "FT&P-henvisning..." - -msgid "S&hell link..." -msgstr "S&kalhenvisning..." - -msgid "S&FTP link..." -msgstr "S&FTP-link..." - -msgid "SM&B link..." -msgstr "SM&B-henvisning..." - -msgid "Paneli&ze" -msgstr "Paneli&sér" - -msgid "&Rescan" -msgstr "&Genskan" - -msgid "&View" -msgstr "&Vis" - -msgid "Vie&w file..." -msgstr "&Vis fil..." - -msgid "&Filtered view" -msgstr "&Filtreret visning" - -msgid "&Copy" -msgstr "&Kopiér" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Henvisning" - -msgid "&Symlink" -msgstr "&Symbolsk henvisning" - -msgid "Relative symlin&k" -msgstr "Relative symbols&ke henvisninger" - -msgid "Edit s&ymlink" -msgstr "Rediger s&ymbolsk henvising" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "&Avanceret chown" - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "&Omdøb/flyt" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "&Hurtig cd" - -msgid "Select &group" -msgstr "Vælg &gruppe" - -msgid "U&nselect group" -msgstr "&Fravælg gruppe" - -msgid "&Invert selection" -msgstr "&Omvend markering" - -msgid "E&xit" -msgstr "&Afslut" - -msgid "&User menu" -msgstr "&Brugermenu" - -msgid "&Directory tree" -msgstr "&Mappetræ" - -msgid "&Find file" -msgstr "&Find fil" - -msgid "S&wap panels" -msgstr "&Skift paneler" - -msgid "Switch &panels on/off" -msgstr "Slå &paneler til/fra" - -msgid "&Compare directories" -msgstr "&Sammenlign mapper" - -msgid "C&ompare files" -msgstr "&Sammenlign filer" - -msgid "E&xternal panelize" -msgstr "&Ekstern panelisering" - -msgid "Show directory s&izes" -msgstr "Vis &mappestørrelser" - -msgid "Command &history" -msgstr "Kommando&historik" - -msgid "Viewed/edited files hi&story" -msgstr "Viste/redigerede &filhistorik" - -msgid "Di&rectory hotlist" -msgstr "&Mappehotlist" - -msgid "&Active VFS list" -msgstr "&Aktiv VFS-liste" - -msgid "&Background jobs" -msgstr "&Baggrundsjob" - -msgid "Screen lis&t" -msgstr "Skærmlis&te" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Gendan filer (kun ext2fs)" - -msgid "&Listing format edit" -msgstr "Redigering af &listeformat" - -msgid "Edit &extension file" -msgstr "Rediger fil&endelse" - -msgid "Edit &menu file" -msgstr "Rediger &menufil" - -msgid "Edit hi&ghlighting group file" -msgstr "Rediger &fremhævelsesgruppefil" - -msgid "&Configuration..." -msgstr "&Opsætning..." - -msgid "&Layout..." -msgstr "&Layout..." - -msgid "&Panel options..." -msgstr "&Panelindstilinger..." - -msgid "C&onfirmation..." -msgstr "&Bekræftelse..." - -msgid "&Appearance..." -msgstr "&Fremtoning..." - -msgid "&Display bits..." -msgstr "&Vis bit..." - -msgid "&Virtual FS..." -msgstr "&Virtuelt FS..." - -msgid "Panels:" -msgstr "Paneler:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Du har %zu åben skærm. Afslut alligevel?" -msgstr[1] "Du har %zu åbne skærme. Afslut alligevel?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Ønsker du virkelig at afslutte Midnight Commander?" - -msgid "&Above" -msgstr "&Over" - -msgid "&Left" -msgstr "&Venstre" - -msgid "&Below" -msgstr "&Under" - -msgid "&Right" -msgstr "&Højre" - -msgid "ButtonBar|Menu" -msgstr "Menu" - -msgid "ButtonBar|View" -msgstr "Vis" - -msgid "ButtonBar|RenMov" -msgstr "OmdFly" - -msgid "ButtonBar|Mkdir" -msgstr "Mkdir" - msgid "Memory exhausted!" msgstr "Der er ikke mere hukommelse!" diff -Nru mc-4.8.25/po/de_CH.po mc-4.8.26/po/de_CH.po --- mc-4.8.25/po/de_CH.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/de_CH.po 2021-01-21 17:18:34.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/mc/" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,523 +2893,523 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/de.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/de.gmo differ diff -Nru mc-4.8.25/po/de.po mc-4.8.26/po/de.po --- mc-4.8.25/po/de.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/de.po 2021-01-21 17:18:34.000000000 +0000 @@ -5,8 +5,9 @@ # Translators: # Atha Translate, 2016 # cheese , 2016 -# Ettore Atalan , 2015-2020 +# Ettore Atalan , 2015-2021 # Fabian Affolter , 2012-2013 +# Johannes Hellmuth , 2020 # Karsten , 2016 # Larson März , 2016 # Mr.Update, 2019-2020 @@ -19,9 +20,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 21:24+0000\n" -"Last-Translator: Mr.Update\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2021-01-01 17:46+0000\n" +"Last-Translator: Ettore Atalan \n" "Language-Team: German (http://www.transifex.com/mc/mc/language/de/)\n" "Language: de\n" "MIME-Version: 1.0\n" @@ -2003,6 +2004,9 @@ msgid "Skin:" msgstr "Skin:" +msgid "&Shadows" +msgstr "&Schatten" + msgid "Appearance" msgstr "Erscheinungsbild" @@ -2225,6 +2229,14 @@ msgid "SMB authentication" msgstr "SMB-Authentifikation" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Kann nicht ins Verzeichnis \"%s\" wechseln\n" +"%s" + msgid "Secure deletion" msgstr "Sicheres Löschen" @@ -2244,10 +2256,10 @@ msgstr "Nur anhängen" msgid "No dump" -msgstr "" +msgstr "No dump" msgid "No update atime" -msgstr "" +msgstr "No atime updates" msgid "Compress" msgstr "Komprimieren" @@ -2259,7 +2271,7 @@ msgstr "Komprimierte inkonsistente Datei" msgid "Compression raw access" -msgstr "" +msgstr "Compression raw access" msgid "Encrypted inode" msgstr "Verschlüsselter Inode" @@ -2271,20 +2283,23 @@ msgstr "Indiziertes Verzeichnis" msgid "No tail merging" -msgstr "" +msgstr "No tail-merging" msgid "Top of directory hierarchies" -msgstr "" +msgstr "Top of directory hierarchy" msgid "Inode uses extents" msgstr "" msgid "Huge_file" -msgstr "" +msgstr "Huge file" msgid "No COW" msgstr "Kein COW" +msgid "Direct access for files" +msgstr "Direktzugriff für Dateien" + msgid "Casefolded file" msgstr "" @@ -2565,14 +2580,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Kann Befehle auf nicht-lokalen Dateisystemen nicht ausführen" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Kann nicht ins Verzeichnis \"%s\" wechseln\n" -"%s" - msgid "Parameter" msgstr "Parameter" @@ -3109,6 +3116,225 @@ msgid "Invalid source pattern '%s'" msgstr "Ungültiges Quellmuster '%s'" +msgid "File listin&g" +msgstr "&Dateiliste" + +msgid "&Quick view" +msgstr "Schnell&ansicht" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Baum" + +msgid "&Listing format..." +msgstr "&Listenformat..." + +msgid "&Sort order..." +msgstr "&Sortierreihenfolge..." + +msgid "&Filter..." +msgstr "&Filter..." + +msgid "&Encoding..." +msgstr "&Codierung..." + +msgid "FT&P link..." +msgstr "FT&P-Verbindung..." + +msgid "S&hell link..." +msgstr "S&hell-Verbindung..." + +msgid "S&FTP link..." +msgstr "S&FTP-Verbindung..." + +msgid "SM&B link..." +msgstr "S&MB-Verbindung..." + +msgid "Paneli&ze" +msgstr "Anordnen" + +msgid "&Rescan" +msgstr "&Neu einlesen" + +msgid "&View" +msgstr "&Ansicht" + +msgid "Vie&w file..." +msgstr "Datei an&zeigen..." + +msgid "&Filtered view" +msgstr "Ge&filterte Ansicht" + +msgid "&Copy" +msgstr "&Kopieren" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Link" + +msgid "&Symlink" +msgstr "&Symbolischer Link" + +msgid "Relative symlin&k" +msgstr "&Relativer symbolischer Link" + +msgid "Edit s&ymlink" +msgstr "S&ymbolischen Link bearbeiten" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "&Erweitertes chown" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "Umbenennen/Ve&rschieben" + +msgid "&Mkdir" +msgstr "&Neues Verzeichnis erstellen" + +msgid "&Quick cd" +msgstr "Schnelles c&d" + +msgid "Select &group" +msgstr "&Gruppe auswählen" + +msgid "U&nselect group" +msgstr "Gruppe ab&wählen" + +msgid "&Invert selection" +msgstr "Auswahl &umkehren" + +msgid "E&xit" +msgstr "&Verlassen" + +msgid "&User menu" +msgstr "Ben&utzermenü" + +msgid "&Directory tree" +msgstr "&Verzeichnisbaum" + +msgid "&Find file" +msgstr "Datei &suchen" + +msgid "S&wap panels" +msgstr "Panels ver&tauschen" + +msgid "Switch &panels on/off" +msgstr "&Panels an/aus" + +msgid "&Compare directories" +msgstr "Verzeichnisse ver&gleichen" + +msgid "C&ompare files" +msgstr "&Dateien vergleichen" + +msgid "E&xternal panelize" +msgstr "E&xternes Anordnen" + +msgid "Show directory s&izes" +msgstr "Verze&ichnisgrößen anzeigen" + +msgid "Command &history" +msgstr "Befehlsc&hronik" + +msgid "Viewed/edited files hi&story" +msgstr "Chronik der angezeigten/bearbeiteten Dateien" + +msgid "Di&rectory hotlist" +msgstr "Ve&rzeichnis-Hotlist" + +msgid "&Active VFS list" +msgstr "&Aktive VFS-Liste" + +msgid "&Background jobs" +msgstr "Hintergrundaufga&ben" + +msgid "Screen lis&t" +msgstr "Bildschirm&liste" + +msgid "&Undelete files (ext2fs only)" +msgstr "Dateien &wiederherstellen (nur ext2fs)" + +msgid "&Listing format edit" +msgstr "&Listenformat bearbeiten" + +msgid "Edit &extension file" +msgstr "Erweiterungsdatei b&earbeiten" + +msgid "Edit &menu file" +msgstr "&Menüdatei bearbeiten" + +msgid "Edit hi&ghlighting group file" +msgstr "Herv&orgehobene Gruppendatei bearbeiten" + +msgid "&Configuration..." +msgstr "&Konfiguration..." + +msgid "&Layout..." +msgstr "&Layout..." + +msgid "&Panel options..." +msgstr "&Paneloptionen..." + +msgid "C&onfirmation..." +msgstr "&Nachfragen..." + +msgid "&Appearance..." +msgstr "&Aussehen..." + +msgid "&Display bits..." +msgstr "&Darstellungsbits..." + +msgid "&Virtual FS..." +msgstr "&Virtuelles Dateisystem..." + +msgid "Panels:" +msgstr "Panels:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Sie haben %zu offenen Bildschirm. Trotzdem beenden?" +msgstr[1] "Sie haben %zu offene Bildschirme. Trotzdem beenden?" + +msgid "The Midnight Commander" +msgstr "Der Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Möchten Sie den Midnight Commander wirklich verlassen?" + +msgid "&Above" +msgstr "&Oben" + +msgid "&Left" +msgstr "&Links" + +msgid "&Below" +msgstr "&Unten" + +msgid "&Right" +msgstr "&Rechts" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menü" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Ansicht" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Verschieben" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "&Chdir" @@ -3155,9 +3381,6 @@ msgid "Fir&st hit" msgstr "Erster Treffer" -msgid "&Tree" -msgstr "&Baum" - msgid "Find File" msgstr "Datei suchen" @@ -3416,222 +3639,6 @@ msgid "Layout" msgstr "Layout" -msgid "File listin&g" -msgstr "&Dateiliste" - -msgid "&Quick view" -msgstr "Schnell&ansicht" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Listenformat..." - -msgid "&Sort order..." -msgstr "&Sortierreihenfolge..." - -msgid "&Filter..." -msgstr "&Filter..." - -msgid "&Encoding..." -msgstr "&Codierung..." - -msgid "FT&P link..." -msgstr "FT&P-Verbindung..." - -msgid "S&hell link..." -msgstr "S&hell-Verbindung..." - -msgid "S&FTP link..." -msgstr "S&FTP-Verbindung..." - -msgid "SM&B link..." -msgstr "S&MB-Verbindung..." - -msgid "Paneli&ze" -msgstr "Anordnen" - -msgid "&Rescan" -msgstr "&Neu einlesen" - -msgid "&View" -msgstr "&Ansicht" - -msgid "Vie&w file..." -msgstr "Datei an&zeigen..." - -msgid "&Filtered view" -msgstr "Ge&filterte Ansicht" - -msgid "&Copy" -msgstr "&Kopieren" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Link" - -msgid "&Symlink" -msgstr "&Symbolischer Link" - -msgid "Relative symlin&k" -msgstr "&Relativer symbolischer Link" - -msgid "Edit s&ymlink" -msgstr "S&ymbolischen Link bearbeiten" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "&Erweitertes chown" - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "Umbenennen/Ve&rschieben" - -msgid "&Mkdir" -msgstr "&Neues Verzeichnis erstellen" - -msgid "&Quick cd" -msgstr "Schnelles c&d" - -msgid "Select &group" -msgstr "&Gruppe auswählen" - -msgid "U&nselect group" -msgstr "Gruppe ab&wählen" - -msgid "&Invert selection" -msgstr "Auswahl &umkehren" - -msgid "E&xit" -msgstr "&Verlassen" - -msgid "&User menu" -msgstr "Ben&utzermenü" - -msgid "&Directory tree" -msgstr "&Verzeichnisbaum" - -msgid "&Find file" -msgstr "Datei &suchen" - -msgid "S&wap panels" -msgstr "Panels ver&tauschen" - -msgid "Switch &panels on/off" -msgstr "&Panels an/aus" - -msgid "&Compare directories" -msgstr "Verzeichnisse ver&gleichen" - -msgid "C&ompare files" -msgstr "&Dateien vergleichen" - -msgid "E&xternal panelize" -msgstr "E&xternes Anordnen" - -msgid "Show directory s&izes" -msgstr "Verze&ichnisgrößen anzeigen" - -msgid "Command &history" -msgstr "Befehlsc&hronik" - -msgid "Viewed/edited files hi&story" -msgstr "Chronik der angezeigten/bearbeiteten Dateien" - -msgid "Di&rectory hotlist" -msgstr "Ve&rzeichnis-Hotlist" - -msgid "&Active VFS list" -msgstr "&Aktive VFS-Liste" - -msgid "&Background jobs" -msgstr "Hintergrundaufga&ben" - -msgid "Screen lis&t" -msgstr "Bildschirm&liste" - -msgid "&Undelete files (ext2fs only)" -msgstr "Dateien &wiederherstellen (nur ext2fs)" - -msgid "&Listing format edit" -msgstr "&Listenformat bearbeiten" - -msgid "Edit &extension file" -msgstr "Erweiterungsdatei b&earbeiten" - -msgid "Edit &menu file" -msgstr "&Menüdatei bearbeiten" - -msgid "Edit hi&ghlighting group file" -msgstr "Herv&orgehobene Gruppendatei bearbeiten" - -msgid "&Configuration..." -msgstr "&Konfiguration..." - -msgid "&Layout..." -msgstr "&Layout..." - -msgid "&Panel options..." -msgstr "&Paneloptionen..." - -msgid "C&onfirmation..." -msgstr "&Nachfragen..." - -msgid "&Appearance..." -msgstr "&Aussehen..." - -msgid "&Display bits..." -msgstr "&Darstellungsbits..." - -msgid "&Virtual FS..." -msgstr "&Virtuelles Dateisystem..." - -msgid "Panels:" -msgstr "Panels:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Sie haben %zu offenen Bildschirm. Trotzdem beenden?" -msgstr[1] "Sie haben %zu offene Bildschirme. Trotzdem beenden?" - -msgid "The Midnight Commander" -msgstr "Der Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Möchten Sie den Midnight Commander wirklich verlassen?" - -msgid "&Above" -msgstr "&Oben" - -msgid "&Left" -msgstr "&Links" - -msgid "&Below" -msgstr "&Unten" - -msgid "&Right" -msgstr "&Rechts" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menü" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Ansicht" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Verschieben" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Speicher voll!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/el.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/el.gmo differ diff -Nru mc-4.8.25/po/el.po mc-4.8.26/po/el.po --- mc-4.8.25/po/el.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/el.po 2021-01-21 17:18:34.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Greek (http://www.transifex.com/mc/mc/language/el/)\n" "Language: el\n" @@ -1915,6 +1915,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2134,6 +2137,14 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Αδυναμία chdir σε \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2194,6 +2205,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2468,14 +2482,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Αδυναμία εκτέλεσης εντολών σε μη τοπικά συστήματα αρχείων" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Αδυναμία chdir σε \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Παράμετρος" @@ -2979,6 +2985,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "&Γρήγορη προβολή" + +msgid "&Info" +msgstr "&Πληροφορίες" + +msgid "&Tree" +msgstr "&Δέντρο" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "&Σειρά ταξινόμησης..." + +msgid "&Filter..." +msgstr "&Φίλτρο..." + +msgid "&Encoding..." +msgstr "&Κωδικοποίηση..." + +msgid "FT&P link..." +msgstr "Δεσμος FT&P..." + +msgid "S&hell link..." +msgstr "Δεσμος κε&λύφους..." + +msgid "S&FTP link..." +msgstr "Δεσμός S&FTP..." + +msgid "SM&B link..." +msgstr "Δεσμός SM&B..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "&Επανασάρωση" + +msgid "&View" +msgstr "&Προβολή" + +msgid "Vie&w file..." +msgstr "Π&ροβολή αρχείου..." + +msgid "&Filtered view" +msgstr "&Φιλτραρισμένη προβολή" + +msgid "&Copy" +msgstr "&Αντιγραφή" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "Δεσμό&ς" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "&Προχωρημένο chown" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Μετονομασία/μετακίνηση" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "&Γρήγορο cd" + +msgid "Select &group" +msgstr "Επιλογή &ομάδας" + +msgid "U&nselect group" +msgstr "&Αποεπιλογή ομάδας" + +msgid "&Invert selection" +msgstr "&Αντιστροφή επιλογής" + +msgid "E&xit" +msgstr "Έ&ξοδος" + +msgid "&User menu" +msgstr "Μενού &χρήστη" + +msgid "&Directory tree" +msgstr "&Δέντρο καταλόγου" + +msgid "&Find file" +msgstr "&Εύρεση αρχείου" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "&Σύγκριση καταλόγων" + +msgid "C&ompare files" +msgstr "&Σύγκριση αρχείων" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "Εμ&φάνιση μεγεθών καταλόγων" + +msgid "Command &history" +msgstr "&Ιστορικό εντολών" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "Λίστα &ενεργών VFS" + +msgid "&Background jobs" +msgstr "&Εργασίες παρασκηνίες" + +msgid "Screen lis&t" +msgstr "&Λίστα οθονών" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Επαναφορά αρχείων (ext2fs μόνο)" + +msgid "&Listing format edit" +msgstr "" + +msgid "Edit &extension file" +msgstr "Επεξεργασία α&ρχείου επέκτασης" + +msgid "Edit &menu file" +msgstr "Επεξεργασία αρχείου &μενού" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Ρυθμίσεις..." + +msgid "&Layout..." +msgstr "" + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "Ε&πιβεβαίωση..." + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "" + +msgid "&Virtual FS..." +msgstr "&Εικονικό FS..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "Το Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Θέλετε στα αλήθεια να τερματίσετε το Midnight Commander?" + +msgid "&Above" +msgstr "&Πάνω" + +msgid "&Left" +msgstr "&Αριστερά" + +msgid "&Below" +msgstr "&Κάτω" + +msgid "&Right" +msgstr "&Δεξιά" + +msgid "ButtonBar|Menu" +msgstr "ΓραμμήΚουμπιών|Μενού" + +msgid "ButtonBar|View" +msgstr "ΓραμμήΚουμπιών|Προβολή" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "ΓραμμήΚουμπιών|Mkdir" + msgid "&Chdir" msgstr "&Chdir" @@ -3025,9 +3250,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Δέντρο" - msgid "Find File" msgstr "Εύρεση αρχείου" @@ -3284,222 +3506,6 @@ msgid "Layout" msgstr "" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "&Γρήγορη προβολή" - -msgid "&Info" -msgstr "&Πληροφορίες" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "&Σειρά ταξινόμησης..." - -msgid "&Filter..." -msgstr "&Φίλτρο..." - -msgid "&Encoding..." -msgstr "&Κωδικοποίηση..." - -msgid "FT&P link..." -msgstr "Δεσμος FT&P..." - -msgid "S&hell link..." -msgstr "Δεσμος κε&λύφους..." - -msgid "S&FTP link..." -msgstr "Δεσμός S&FTP..." - -msgid "SM&B link..." -msgstr "Δεσμός SM&B..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "&Επανασάρωση" - -msgid "&View" -msgstr "&Προβολή" - -msgid "Vie&w file..." -msgstr "Π&ροβολή αρχείου..." - -msgid "&Filtered view" -msgstr "&Φιλτραρισμένη προβολή" - -msgid "&Copy" -msgstr "&Αντιγραφή" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "Δεσμό&ς" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "&Προχωρημένο chown" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Μετονομασία/μετακίνηση" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "&Γρήγορο cd" - -msgid "Select &group" -msgstr "Επιλογή &ομάδας" - -msgid "U&nselect group" -msgstr "&Αποεπιλογή ομάδας" - -msgid "&Invert selection" -msgstr "&Αντιστροφή επιλογής" - -msgid "E&xit" -msgstr "Έ&ξοδος" - -msgid "&User menu" -msgstr "Μενού &χρήστη" - -msgid "&Directory tree" -msgstr "&Δέντρο καταλόγου" - -msgid "&Find file" -msgstr "&Εύρεση αρχείου" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "&Σύγκριση καταλόγων" - -msgid "C&ompare files" -msgstr "&Σύγκριση αρχείων" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "Εμ&φάνιση μεγεθών καταλόγων" - -msgid "Command &history" -msgstr "&Ιστορικό εντολών" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "Λίστα &ενεργών VFS" - -msgid "&Background jobs" -msgstr "&Εργασίες παρασκηνίες" - -msgid "Screen lis&t" -msgstr "&Λίστα οθονών" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Επαναφορά αρχείων (ext2fs μόνο)" - -msgid "&Listing format edit" -msgstr "" - -msgid "Edit &extension file" -msgstr "Επεξεργασία α&ρχείου επέκτασης" - -msgid "Edit &menu file" -msgstr "Επεξεργασία αρχείου &μενού" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Ρυθμίσεις..." - -msgid "&Layout..." -msgstr "" - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "Ε&πιβεβαίωση..." - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "" - -msgid "&Virtual FS..." -msgstr "&Εικονικό FS..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "Το Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Θέλετε στα αλήθεια να τερματίσετε το Midnight Commander?" - -msgid "&Above" -msgstr "&Πάνω" - -msgid "&Left" -msgstr "&Αριστερά" - -msgid "&Below" -msgstr "&Κάτω" - -msgid "&Right" -msgstr "&Δεξιά" - -msgid "ButtonBar|Menu" -msgstr "ΓραμμήΚουμπιών|Μενού" - -msgid "ButtonBar|View" -msgstr "ΓραμμήΚουμπιών|Προβολή" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "ΓραμμήΚουμπιών|Mkdir" - msgid "Memory exhausted!" msgstr "Η μνήμη εξαντλήθηκε!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/en_GB.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/en_GB.gmo differ diff -Nru mc-4.8.25/po/en_GB.po mc-4.8.26/po/en_GB.po --- mc-4.8.25/po/en_GB.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/en_GB.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/mc/mc/" "language/en_GB/)\n" @@ -1903,6 +1903,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2122,6 +2125,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2182,6 +2191,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2454,12 +2466,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2911,523 +2917,523 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/eo.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/eo.gmo differ diff -Nru mc-4.8.25/po/eo.po mc-4.8.26/po/eo.po --- mc-4.8.25/po/eo.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/eo.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-22 15:31+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 15:56+0000\n" "Last-Translator: Keith Bowes \n" "Language-Team: Esperanto (http://www.transifex.com/mc/mc/language/eo/)\n" "Language: eo\n" @@ -1984,6 +1984,9 @@ msgid "Skin:" msgstr "Etoso:" +msgid "&Shadows" +msgstr "&Ombroj" + msgid "Appearance" msgstr "Aspekto" @@ -2207,6 +2210,14 @@ msgid "SMB authentication" msgstr "SMB-atestado" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Ne eblas ŝanĝi dosierujon al \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "Sekura forigo" @@ -2267,6 +2278,9 @@ msgid "No COW" msgstr "Neniu COW" +msgid "Direct access for files" +msgstr "Senpera atingo de dosieroj" + msgid "Casefolded file" msgstr "Dosiero kun faldita uskleco" @@ -2547,14 +2561,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Ne eblas plenumi komandojn en foraj dosiersistemoj" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Ne eblas ŝanĝi dosierujon al \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Parametro" @@ -3089,6 +3095,225 @@ msgid "Invalid source pattern '%s'" msgstr "Nevalida celan ŝablonon '%s'" +msgid "File listin&g" +msgstr "&Dosiero listo" + +msgid "&Quick view" +msgstr "Rapida &vido" + +msgid "&Info" +msgstr "&Informoj" + +msgid "&Tree" +msgstr "&Arbo" + +msgid "&Listing format..." +msgstr "&Listo-aranĝo…" + +msgid "&Sort order..." +msgstr "&Ordigi laŭ..." + +msgid "&Filter..." +msgstr "&Filtri..." + +msgid "&Encoding..." +msgstr "&Kodoprezento..." + +msgid "FT&P link..." +msgstr "FT&P-ligilo..." + +msgid "S&hell link..." +msgstr "Ŝ&ela ligilo..." + +msgid "S&FTP link..." +msgstr "&SFTP-ligilo..." + +msgid "SM&B link..." +msgstr "SM&B-a ligilo..." + +msgid "Paneli&ze" +msgstr "&Flankigi" + +msgid "&Rescan" +msgstr "&Refreŝigi" + +msgid "&View" +msgstr "&Vidi" + +msgid "Vie&w file..." +msgstr "Vidi do&sieron..." + +msgid "&Filtered view" +msgstr "&Filtrita vido" + +msgid "&Copy" +msgstr "&Kopii" + +msgid "C&hmod" +msgstr "Ŝanĝi &permesojn" + +msgid "&Link" +msgstr "&Ligilo" + +msgid "&Symlink" +msgstr "&Mola ligilo" + +msgid "Relative symlin&k" +msgstr "&Relativa simbola ligilo" + +msgid "Edit s&ymlink" +msgstr "Re&dakti simbolan ligilon" + +msgid "Ch&own" +msgstr "Ŝanĝi estre&con" + +msgid "&Advanced chown" +msgstr "&Altnivele ŝanĝi estrecon" + +msgid "Cha&ttr" +msgstr "Ŝanĝi atri&buton" + +msgid "&Rename/Move" +msgstr "Al&inomi/Movi" + +msgid "&Mkdir" +msgstr "&Novan dosierujon" + +msgid "&Quick cd" +msgstr "Rapide ŝanĝi dosieru&jon" + +msgid "Select &group" +msgstr "Elekti &grupon" + +msgid "U&nselect group" +msgstr "Malelekti gr&upon" + +msgid "&Invert selection" +msgstr "Inversigi elek&ton" + +msgid "E&xit" +msgstr "&Eliri" + +msgid "&User menu" +msgstr "&Uzanto-menuo" + +msgid "&Directory tree" +msgstr "&Dosieruja arbo" + +msgid "&Find file" +msgstr "&Trovi dosieron" + +msgid "S&wap panels" +msgstr "In&versigi flankojn" + +msgid "Switch &panels on/off" +msgstr "(Mal)ŝalti &flankojn" + +msgid "&Compare directories" +msgstr "&Kompari dosierujojn" + +msgid "C&ompare files" +msgstr "K&ompari dosierojn" + +msgid "E&xternal panelize" +msgstr "&Eksterigi flankojn" + +msgid "Show directory s&izes" +msgstr "Montri dosierujajn g&randojn" + +msgid "Command &history" +msgstr "Komanda &historio" + +msgid "Viewed/edited files hi&story" +msgstr "H&istorio de viditaj/redaktitaj dosieroj" + +msgid "Di&rectory hotlist" +msgstr "Dosieru&ja rapidolisto" + +msgid "&Active VFS list" +msgstr "Listo de &aktivaj virtualaj dosiersistemoj" + +msgid "&Background jobs" +msgstr "Fo&naj taskoj" + +msgid "Screen lis&t" +msgstr "&Paĝa listo" + +msgid "&Undelete files (ext2fs only)" +msgstr "Reat&ingi dosierojn (nur en ext2fs)" + +msgid "&Listing format edit" +msgstr "Redakti &listan aranĝon" + +msgid "Edit &extension file" +msgstr "Redakti &sufikso-dosieron" + +msgid "Edit &menu file" +msgstr "Redakti &menuo-dosieron" + +msgid "Edit hi&ghlighting group file" +msgstr "Redakti pri&lumo-grupan dosieron" + +msgid "&Configuration..." +msgstr "Ag&ordo..." + +msgid "&Layout..." +msgstr "&Aranĝo..." + +msgid "&Panel options..." +msgstr "&Flankaj agordaĵoj..." + +msgid "C&onfirmation..." +msgstr "Ko&nfirmo..." + +msgid "&Appearance..." +msgstr "A&spekto..." + +msgid "&Display bits..." +msgstr "&Elmontraj bitoj..." + +msgid "&Virtual FS..." +msgstr "&Virtualaj dosiersistemoj..." + +msgid "Panels:" +msgstr "Flankoj:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "%zu paĝo estas malfermita. Ĉu senkonsidere eliri?" +msgstr[1] "%zu paĝoj estas malfermitaj. Ĉu senkonsidere eliri?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Ĉu vi efektive volas eliri el Midnight Commander?" + +msgid "&Above" +msgstr "&Supra" + +msgid "&Left" +msgstr "&Maldekstra" + +msgid "&Below" +msgstr "&Malsupra" + +msgid "&Right" +msgstr "D&ekstra" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menuo" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Vidi" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Movi" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "Ŝanĝi dosieru&jon" @@ -3135,9 +3360,6 @@ msgid "Fir&st hit" msgstr "Unu&a rezulto" -msgid "&Tree" -msgstr "&Arbo" - msgid "Find File" msgstr "Trovi dosieron" @@ -3396,222 +3618,6 @@ msgid "Layout" msgstr "Aranĝo" -msgid "File listin&g" -msgstr "&Dosiero listo" - -msgid "&Quick view" -msgstr "Rapida &vido" - -msgid "&Info" -msgstr "&Informoj" - -msgid "&Listing format..." -msgstr "&Listo-aranĝo…" - -msgid "&Sort order..." -msgstr "&Ordigi laŭ..." - -msgid "&Filter..." -msgstr "&Filtri..." - -msgid "&Encoding..." -msgstr "&Kodoprezento..." - -msgid "FT&P link..." -msgstr "FT&P-ligilo..." - -msgid "S&hell link..." -msgstr "Ŝ&ela ligilo..." - -msgid "S&FTP link..." -msgstr "&SFTP-ligilo..." - -msgid "SM&B link..." -msgstr "SM&B-a ligilo..." - -msgid "Paneli&ze" -msgstr "&Flankigi" - -msgid "&Rescan" -msgstr "&Refreŝigi" - -msgid "&View" -msgstr "&Vidi" - -msgid "Vie&w file..." -msgstr "Vidi do&sieron..." - -msgid "&Filtered view" -msgstr "&Filtrita vido" - -msgid "&Copy" -msgstr "&Kopii" - -msgid "C&hmod" -msgstr "Ŝanĝi &permesojn" - -msgid "&Link" -msgstr "&Ligilo" - -msgid "&Symlink" -msgstr "&Mola ligilo" - -msgid "Relative symlin&k" -msgstr "&Relativa simbola ligilo" - -msgid "Edit s&ymlink" -msgstr "Re&dakti simbolan ligilon" - -msgid "Ch&own" -msgstr "Ŝanĝi estre&con" - -msgid "&Advanced chown" -msgstr "&Altnivele ŝanĝi estrecon" - -msgid "Cha&ttr" -msgstr "Ŝanĝi atri&buton" - -msgid "&Rename/Move" -msgstr "Al&inomi/Movi" - -msgid "&Mkdir" -msgstr "&Novan dosierujon" - -msgid "&Quick cd" -msgstr "Rapide ŝanĝi dosieru&jon" - -msgid "Select &group" -msgstr "Elekti &grupon" - -msgid "U&nselect group" -msgstr "Malelekti gr&upon" - -msgid "&Invert selection" -msgstr "Inversigi elek&ton" - -msgid "E&xit" -msgstr "&Eliri" - -msgid "&User menu" -msgstr "&Uzanto-menuo" - -msgid "&Directory tree" -msgstr "&Dosieruja arbo" - -msgid "&Find file" -msgstr "&Trovi dosieron" - -msgid "S&wap panels" -msgstr "In&versigi flankojn" - -msgid "Switch &panels on/off" -msgstr "(Mal)ŝalti &flankojn" - -msgid "&Compare directories" -msgstr "&Kompari dosierujojn" - -msgid "C&ompare files" -msgstr "K&ompari dosierojn" - -msgid "E&xternal panelize" -msgstr "&Eksterigi flankojn" - -msgid "Show directory s&izes" -msgstr "Montri dosierujajn g&randojn" - -msgid "Command &history" -msgstr "Komanda &historio" - -msgid "Viewed/edited files hi&story" -msgstr "H&istorio de viditaj/redaktitaj dosieroj" - -msgid "Di&rectory hotlist" -msgstr "Dosieru&ja rapidolisto" - -msgid "&Active VFS list" -msgstr "Listo de &aktivaj virtualaj dosiersistemoj" - -msgid "&Background jobs" -msgstr "Fo&naj taskoj" - -msgid "Screen lis&t" -msgstr "&Paĝa listo" - -msgid "&Undelete files (ext2fs only)" -msgstr "Reat&ingi dosierojn (nur en ext2fs)" - -msgid "&Listing format edit" -msgstr "Redakti &listan aranĝon" - -msgid "Edit &extension file" -msgstr "Redakti &sufikso-dosieron" - -msgid "Edit &menu file" -msgstr "Redakti &menuo-dosieron" - -msgid "Edit hi&ghlighting group file" -msgstr "Redakti pri&lumo-grupan dosieron" - -msgid "&Configuration..." -msgstr "Ag&ordo..." - -msgid "&Layout..." -msgstr "&Aranĝo..." - -msgid "&Panel options..." -msgstr "&Flankaj agordaĵoj..." - -msgid "C&onfirmation..." -msgstr "Ko&nfirmo..." - -msgid "&Appearance..." -msgstr "A&spekto..." - -msgid "&Display bits..." -msgstr "&Elmontraj bitoj..." - -msgid "&Virtual FS..." -msgstr "&Virtualaj dosiersistemoj..." - -msgid "Panels:" -msgstr "Flankoj:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "%zu paĝo estas malfermita. Ĉu senkonsidere eliri?" -msgstr[1] "%zu paĝoj estas malfermitaj. Ĉu senkonsidere eliri?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Ĉu vi efektive volas eliri el Midnight Commander?" - -msgid "&Above" -msgstr "&Supra" - -msgid "&Left" -msgstr "&Maldekstra" - -msgid "&Below" -msgstr "&Malsupra" - -msgid "&Right" -msgstr "D&ekstra" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menuo" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Vidi" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Movi" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Memoro eluzita!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/es.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/es.gmo differ diff -Nru mc-4.8.25/po/es.po mc-4.8.26/po/es.po --- mc-4.8.25/po/es.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/es.po 2021-01-21 17:18:34.000000000 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-19 17:17+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 18:30+0000\n" "Last-Translator: David Martin \n" "Language-Team: Spanish (http://www.transifex.com/mc/mc/language/es/)\n" "Language: es\n" @@ -1991,6 +1991,9 @@ msgid "Skin:" msgstr "Skin:" +msgid "&Shadows" +msgstr "&Sombras" + msgid "Appearance" msgstr "Aspecto" @@ -2214,6 +2217,14 @@ msgid "SMB authentication" msgstr "Autenticación SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Imposible cambiar al directorio «%s»\n" +"%s" + msgid "Secure deletion" msgstr "Borrado seguro" @@ -2274,6 +2285,9 @@ msgid "No COW" msgstr "Sin COW" +msgid "Direct access for files" +msgstr "Acceso directo a archivos" + msgid "Casefolded file" msgstr "Archivo insensible a mayúsculas" @@ -2554,14 +2568,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Imposible ejecutar comandos desde directorios no locales" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Imposible cambiar al directorio «%s»\n" -"%s" - msgid "Parameter" msgstr "Parámetro" @@ -3097,6 +3103,225 @@ msgid "Invalid source pattern '%s'" msgstr "Patrón fuente incorrecto «%s»" +msgid "File listin&g" +msgstr "&Listado" + +msgid "&Quick view" +msgstr "&Vista rápida" + +msgid "&Info" +msgstr "&Información" + +msgid "&Tree" +msgstr "ár&Bol" + +msgid "&Listing format..." +msgstr "for&Mato de listado..." + +msgid "&Sort order..." +msgstr "&Ordenar..." + +msgid "&Filter..." +msgstr "&Filtro..." + +msgid "&Encoding..." +msgstr "&Código carácter..." + +msgid "FT&P link..." +msgstr "conexión por FT&P..." + +msgid "S&hell link..." +msgstr "conexión por SS&H..." + +msgid "S&FTP link..." +msgstr "conexión por SF&TP..." + +msgid "SM&B link..." +msgstr "conexión por &SMB..." + +msgid "Paneli&ze" +msgstr "búsqueda e&Xterna" + +msgid "&Rescan" +msgstr "&Actualizar" + +msgid "&View" +msgstr "&Ver" + +msgid "Vie&w file..." +msgstr "ver arc&Hivo..." + +msgid "&Filtered view" +msgstr "e&Jecutar y ver..." + +msgid "&Copy" +msgstr "&Copiar" + +msgid "C&hmod" +msgstr "cambiar &Permisos..." + +msgid "&Link" +msgstr "crear en&Lace..." + +msgid "&Symlink" +msgstr " enlace &Simbólico..." + +msgid "Relative symlin&k" +msgstr " enlace simbólico &Relativo..." + +msgid "Edit s&ymlink" +msgstr "edi&Tar enlace simbólico" + +msgid "Ch&own" +msgstr "cambiar dueñ&O..." + +msgid "&Advanced chown" +msgstr "c&Ambiar dueño y permisos..." + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "&Renombrar/mover..." + +msgid "&Mkdir" +msgstr "crear &Directorio..." + +msgid "&Quick cd" +msgstr "ca&Mbiar directorio..." + +msgid "Select &group" +msgstr "seleccionar &Grupo..." + +msgid "U&nselect group" +msgstr "de-seleccionar gr&Upo..." + +msgid "&Invert selection" +msgstr "&Invertir la selección" + +msgid "E&xit" +msgstr "sali&R" + +msgid "&User menu" +msgstr "me&Nú de usuario" + +msgid "&Directory tree" +msgstr "árbol de di&Rectorios" + +msgid "&Find file" +msgstr "&Buscar archivos..." + +msgid "S&wap panels" +msgstr "&Intercambiar paneles" + +msgid "Switch &panels on/off" +msgstr "&Activar/desactivar paneles" + +msgid "&Compare directories" +msgstr "&Comparar directorios..." + +msgid "C&ompare files" +msgstr "c&Omparar archivos" + +msgid "E&xternal panelize" +msgstr "búsqueda e&Xterna..." + +msgid "Show directory s&izes" +msgstr "mostrar &Tamaños de los directorios" + +msgid "Command &history" +msgstr "&Historia de órdenes" + +msgid "Viewed/edited files hi&story" +msgstr "hi&Storia de archivos" + +msgid "Di&rectory hotlist" +msgstr "&Favoritos..." + +msgid "&Active VFS list" +msgstr "directorios virtuales (&VFS)..." + +msgid "&Background jobs" +msgstr "&Procesos en 2º plano..." + +msgid "Screen lis&t" +msgstr "&Lista de pantallas..." + +msgid "&Undelete files (ext2fs only)" +msgstr "&Recuperar archivos (ext2fs)..." + +msgid "&Listing format edit" +msgstr "edición del formato de &Listado" + +msgid "Edit &extension file" +msgstr "&Editar extensiones..." + +msgid "Edit &menu file" +msgstr "editar &Menú..." + +msgid "Edit hi&ghlighting group file" +msgstr "editar &Grupos de resaltado" + +msgid "&Configuration..." +msgstr "&Configuración..." + +msgid "&Layout..." +msgstr "&Presentación..." + +msgid "&Panel options..." +msgstr "pane&Les..." + +msgid "C&onfirmation..." +msgstr "c&Onfirmación..." + +msgid "&Appearance..." +msgstr "&Aspecto..." + +msgid "&Display bits..." +msgstr "&Juego de caracteres..." + +msgid "&Virtual FS..." +msgstr "sistema de archivos &Virtual (VFS)..." + +msgid "Panels:" +msgstr "Paneles:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Hay %zu pantalla abierta. ¿Desea realmente salir?" +msgstr[1] "Hay %zu pantallas abiertas. ¿Desea realmente salir?" + +msgid "The Midnight Commander" +msgstr "The Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "¿Desea realmente salir del Midnight Commander?" + +msgid "&Above" +msgstr "a&Rriba" + +msgid "&Left" +msgstr "&Izquierdo" + +msgid "&Below" +msgstr "a&Bajo" + +msgid "&Right" +msgstr "&Derecho" + +msgid "ButtonBar|Menu" +msgstr "Menú" + +msgid "ButtonBar|View" +msgstr "Ver" + +msgid "ButtonBar|RenMov" +msgstr "RenMov" + +msgid "ButtonBar|Mkdir" +msgstr "Mkdir" + msgid "&Chdir" msgstr "&Ir a" @@ -3143,9 +3368,6 @@ msgid "Fir&st hit" msgstr "pr&Imera coincidencia" -msgid "&Tree" -msgstr "ár&Bol" - msgid "Find File" msgstr " Buscar archivos " @@ -3404,222 +3626,6 @@ msgid "Layout" msgstr "Presentación" -msgid "File listin&g" -msgstr "&Listado" - -msgid "&Quick view" -msgstr "&Vista rápida" - -msgid "&Info" -msgstr "&Información" - -msgid "&Listing format..." -msgstr "for&Mato de listado..." - -msgid "&Sort order..." -msgstr "&Ordenar..." - -msgid "&Filter..." -msgstr "&Filtro..." - -msgid "&Encoding..." -msgstr "&Código carácter..." - -msgid "FT&P link..." -msgstr "conexión por FT&P..." - -msgid "S&hell link..." -msgstr "conexión por SS&H..." - -msgid "S&FTP link..." -msgstr "conexión por SF&TP..." - -msgid "SM&B link..." -msgstr "conexión por &SMB..." - -msgid "Paneli&ze" -msgstr "búsqueda e&Xterna" - -msgid "&Rescan" -msgstr "&Actualizar" - -msgid "&View" -msgstr "&Ver" - -msgid "Vie&w file..." -msgstr "ver arc&Hivo..." - -msgid "&Filtered view" -msgstr "e&Jecutar y ver..." - -msgid "&Copy" -msgstr "&Copiar" - -msgid "C&hmod" -msgstr "cambiar &Permisos..." - -msgid "&Link" -msgstr "crear en&Lace..." - -msgid "&Symlink" -msgstr " enlace &Simbólico..." - -msgid "Relative symlin&k" -msgstr " enlace simbólico &Relativo..." - -msgid "Edit s&ymlink" -msgstr "edi&Tar enlace simbólico" - -msgid "Ch&own" -msgstr "cambiar dueñ&O..." - -msgid "&Advanced chown" -msgstr "c&Ambiar dueño y permisos..." - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "&Renombrar/mover..." - -msgid "&Mkdir" -msgstr "crear &Directorio..." - -msgid "&Quick cd" -msgstr "ca&Mbiar directorio..." - -msgid "Select &group" -msgstr "seleccionar &Grupo..." - -msgid "U&nselect group" -msgstr "de-seleccionar gr&Upo..." - -msgid "&Invert selection" -msgstr "&Invertir la selección" - -msgid "E&xit" -msgstr "sali&R" - -msgid "&User menu" -msgstr "me&Nú de usuario" - -msgid "&Directory tree" -msgstr "árbol de di&Rectorios" - -msgid "&Find file" -msgstr "&Buscar archivos..." - -msgid "S&wap panels" -msgstr "&Intercambiar paneles" - -msgid "Switch &panels on/off" -msgstr "&Activar/desactivar paneles" - -msgid "&Compare directories" -msgstr "&Comparar directorios..." - -msgid "C&ompare files" -msgstr "c&Omparar archivos" - -msgid "E&xternal panelize" -msgstr "búsqueda e&Xterna..." - -msgid "Show directory s&izes" -msgstr "mostrar &Tamaños de los directorios" - -msgid "Command &history" -msgstr "&Historia de órdenes" - -msgid "Viewed/edited files hi&story" -msgstr "hi&Storia de archivos" - -msgid "Di&rectory hotlist" -msgstr "&Favoritos..." - -msgid "&Active VFS list" -msgstr "directorios virtuales (&VFS)..." - -msgid "&Background jobs" -msgstr "&Procesos en 2º plano..." - -msgid "Screen lis&t" -msgstr "&Lista de pantallas..." - -msgid "&Undelete files (ext2fs only)" -msgstr "&Recuperar archivos (ext2fs)..." - -msgid "&Listing format edit" -msgstr "edición del formato de &Listado" - -msgid "Edit &extension file" -msgstr "&Editar extensiones..." - -msgid "Edit &menu file" -msgstr "editar &Menú..." - -msgid "Edit hi&ghlighting group file" -msgstr "editar &Grupos de resaltado" - -msgid "&Configuration..." -msgstr "&Configuración..." - -msgid "&Layout..." -msgstr "&Presentación..." - -msgid "&Panel options..." -msgstr "pane&Les..." - -msgid "C&onfirmation..." -msgstr "c&Onfirmación..." - -msgid "&Appearance..." -msgstr "&Aspecto..." - -msgid "&Display bits..." -msgstr "&Juego de caracteres..." - -msgid "&Virtual FS..." -msgstr "sistema de archivos &Virtual (VFS)..." - -msgid "Panels:" -msgstr "Paneles:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Hay %zu pantalla abierta. ¿Desea realmente salir?" -msgstr[1] "Hay %zu pantallas abiertas. ¿Desea realmente salir?" - -msgid "The Midnight Commander" -msgstr "The Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "¿Desea realmente salir del Midnight Commander?" - -msgid "&Above" -msgstr "a&Rriba" - -msgid "&Left" -msgstr "&Izquierdo" - -msgid "&Below" -msgstr "a&Bajo" - -msgid "&Right" -msgstr "&Derecho" - -msgid "ButtonBar|Menu" -msgstr "Menú" - -msgid "ButtonBar|View" -msgstr "Ver" - -msgid "ButtonBar|RenMov" -msgstr "RenMov" - -msgid "ButtonBar|Mkdir" -msgstr "Mkdir" - msgid "Memory exhausted!" msgstr "¡Memoria agotada!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/et.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/et.gmo differ diff -Nru mc-4.8.25/po/et.po mc-4.8.26/po/et.po --- mc-4.8.25/po/et.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/et.po 2021-01-21 17:18:34.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Estonian (http://www.transifex.com/mc/mc/language/et/)\n" "Language: et\n" @@ -1850,7 +1850,7 @@ #, c-format msgid "Permissions (octal): %o" -msgstr "" +msgstr "Õigused (8nd süsteemis): %o" msgid "Chown advanced command" msgstr "Keerukas omanikuvahetus" @@ -1976,6 +1976,9 @@ msgid "Skin:" msgstr "Nahk:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Välimus" @@ -2198,6 +2201,14 @@ msgid "SMB authentication" msgstr "SMB autentimine" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Kataloogi \"%s\" sisenemine nurjus\n" +"%s" + msgid "Secure deletion" msgstr "Turvaline kustutamine" @@ -2211,7 +2222,7 @@ msgstr "Sünkroonsed kataloogivärskendused" msgid "Immutable" -msgstr "" +msgstr "Muudetamatu" msgid "Append only" msgstr "" @@ -2220,7 +2231,7 @@ msgstr "" msgid "No update atime" -msgstr "" +msgstr "Jäta atime uuendamata" msgid "Compress" msgstr "" @@ -2258,6 +2269,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2289,7 +2303,7 @@ msgstr "" msgid "Cannot change attributes on non-local filesystems" -msgstr "" +msgstr "Kaugfailisüsteemides ei saa atribuute muuta " #, c-format msgid "" @@ -2534,14 +2548,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Käske ei saa käivitada kaugfailisüsteemidel" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Kataloogi \"%s\" sisenemine nurjus\n" -"%s" - msgid "Parameter" msgstr "Parameeter" @@ -3075,6 +3081,225 @@ msgid "Invalid source pattern '%s'" msgstr "Vigane lähtemuster \"%s\"" +msgid "File listin&g" +msgstr "F&ailide loend" + +msgid "&Quick view" +msgstr "&Kiirvaade" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Puu" + +msgid "&Listing format..." +msgstr "&Loendi vormindus" + +msgid "&Sort order..." +msgstr "&Sortimine..." + +msgid "&Filter..." +msgstr "Filtreeri&mine..." + +msgid "&Encoding..." +msgstr "Ko&deering..." + +msgid "FT&P link..." +msgstr "F&TP ühendus..." + +msgid "S&hell link..." +msgstr "K&esta ühendus..." + +msgid "S&FTP link..." +msgstr "S&FTP ühendus..." + +msgid "SM&B link..." +msgstr "SM&B ühendus..." + +msgid "Paneli&ze" +msgstr "Pa&neelile" + +msgid "&Rescan" +msgstr "Ko&rdusskannimine" + +msgid "&View" +msgstr "V&aata" + +msgid "Vie&w file..." +msgstr "Vaa&ta faili..." + +msgid "&Filtered view" +msgstr "&Filtreeritud vaade" + +msgid "&Copy" +msgstr "Ko&peeri" + +msgid "C&hmod" +msgstr "Õi&guste muutmine" + +msgid "&Link" +msgstr "&Jäikviit" + +msgid "&Symlink" +msgstr "A&bsoluutne nimeviit" + +msgid "Relative symlin&k" +msgstr "&Suhteline nimeviit" + +msgid "Edit s&ymlink" +msgstr "Muuda &nimeviita" + +msgid "Ch&own" +msgstr "Vaheta &omanik" + +msgid "&Advanced chown" +msgstr "Täpsem omani&ku vahetus" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Teisal&da/nimeta" + +msgid "&Mkdir" +msgstr "&Loo kataloog" + +msgid "&Quick cd" +msgstr "Kataloogi k&iirvahetus" + +msgid "Select &group" +msgstr "Vali g&rupp" + +msgid "U&nselect group" +msgstr "Tü&hista grupi valik" + +msgid "&Invert selection" +msgstr "Vah&eta valik" + +msgid "E&xit" +msgstr "&Välju" + +msgid "&User menu" +msgstr "Kas&utaja menüü" + +msgid "&Directory tree" +msgstr "Kataloogi&puu" + +msgid "&Find file" +msgstr "&Failide otsimine" + +msgid "S&wap panels" +msgstr "&Vaheta paneelid" + +msgid "Switch &panels on/off" +msgstr "&Kuva/peida paneelid" + +msgid "&Compare directories" +msgstr "Kataloogi&de võrdlemine" + +msgid "C&ompare files" +msgstr "Võ&rdle faile" + +msgid "E&xternal panelize" +msgstr "Väliskäsk pa&neelile" + +msgid "Show directory s&izes" +msgstr "Kuva kataloogide &suurused" + +msgid "Command &history" +msgstr "Käskude a&jalugu" + +msgid "Viewed/edited files hi&story" +msgstr "Vaadatud/muudetud failide ajalugu" + +msgid "Di&rectory hotlist" +msgstr "Katal&oogide kiirvalik" + +msgid "&Active VFS list" +msgstr "Akt&iivsete VFSde loend" + +msgid "&Background jobs" +msgstr "&Tööd taustal" + +msgid "Screen lis&t" +msgstr "&Ekraanide loend" + +msgid "&Undelete files (ext2fs only)" +msgstr "F&ailide taastamine (ainult ext2fs)" + +msgid "&Listing format edit" +msgstr "&Loend vorminduse muutmine" + +msgid "Edit &extension file" +msgstr "Muuda &laiendite faili" + +msgid "Edit &menu file" +msgstr "Muuda &menüü faili" + +msgid "Edit hi&ghlighting group file" +msgstr "Muuda esiletõstu &grupi faili" + +msgid "&Configuration..." +msgstr "&Häälestus..." + +msgid "&Layout..." +msgstr "&Kujundus..." + +msgid "&Panel options..." +msgstr "&Paneeli häälestus..." + +msgid "C&onfirmation..." +msgstr "K&innitused..." + +msgid "&Appearance..." +msgstr "&Välimus..." + +msgid "&Display bits..." +msgstr "K&uva bitid" + +msgid "&Virtual FS..." +msgstr "Vi&rtuaalne FS..." + +msgid "Panels:" +msgstr "Paneelid:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Sul on %zu avatud ekraan. Kas ikkagi lõpetada?" +msgstr[1] "Sul on %zu avatud ekraani. Kas ikkagi lõpetada?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Kas sa soovid tõesti Midnight Commanderist väljuda?" + +msgid "&Above" +msgstr "Ü&lal" + +msgid "&Left" +msgstr "&Vasak" + +msgid "&Below" +msgstr "&All" + +msgid "&Right" +msgstr "&Parem" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menüü" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Vaata" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|NimTeisalda" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|LooKataloog" + msgid "&Chdir" msgstr "&Chdir" @@ -3121,9 +3346,6 @@ msgid "Fir&st hit" msgstr "E&simene sobiv" -msgid "&Tree" -msgstr "&Puu" - msgid "Find File" msgstr "Failide otsimine" @@ -3326,14 +3548,14 @@ msgstr "Viidad: %d" msgid "Attributes: not supported" -msgstr "" +msgstr "Atribuudid: ei ole toetatud" #, c-format msgid "Attributes: %s" -msgstr "" +msgstr "Atribuudid: %s" msgid "Attributes: unavailable" -msgstr "" +msgstr "Atribuudid: ei ole saadaval" #, c-format msgid "Mode: %s (%04o)" @@ -3382,222 +3604,6 @@ msgid "Layout" msgstr "Kujundus" -msgid "File listin&g" -msgstr "F&ailide loend" - -msgid "&Quick view" -msgstr "&Kiirvaade" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Loendi vormindus" - -msgid "&Sort order..." -msgstr "&Sortimine..." - -msgid "&Filter..." -msgstr "Filtreeri&mine..." - -msgid "&Encoding..." -msgstr "Ko&deering..." - -msgid "FT&P link..." -msgstr "F&TP ühendus..." - -msgid "S&hell link..." -msgstr "K&esta ühendus..." - -msgid "S&FTP link..." -msgstr "S&FTP ühendus..." - -msgid "SM&B link..." -msgstr "SM&B ühendus..." - -msgid "Paneli&ze" -msgstr "Pa&neelile" - -msgid "&Rescan" -msgstr "Ko&rdusskannimine" - -msgid "&View" -msgstr "V&aata" - -msgid "Vie&w file..." -msgstr "Vaa&ta faili..." - -msgid "&Filtered view" -msgstr "&Filtreeritud vaade" - -msgid "&Copy" -msgstr "Ko&peeri" - -msgid "C&hmod" -msgstr "Õi&guste muutmine" - -msgid "&Link" -msgstr "&Jäikviit" - -msgid "&Symlink" -msgstr "A&bsoluutne nimeviit" - -msgid "Relative symlin&k" -msgstr "&Suhteline nimeviit" - -msgid "Edit s&ymlink" -msgstr "Muuda &nimeviita" - -msgid "Ch&own" -msgstr "Vaheta &omanik" - -msgid "&Advanced chown" -msgstr "Täpsem omani&ku vahetus" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Teisal&da/nimeta" - -msgid "&Mkdir" -msgstr "&Loo kataloog" - -msgid "&Quick cd" -msgstr "Kataloogi k&iirvahetus" - -msgid "Select &group" -msgstr "Vali g&rupp" - -msgid "U&nselect group" -msgstr "Tü&hista grupi valik" - -msgid "&Invert selection" -msgstr "Vah&eta valik" - -msgid "E&xit" -msgstr "&Välju" - -msgid "&User menu" -msgstr "Kas&utaja menüü" - -msgid "&Directory tree" -msgstr "Kataloogi&puu" - -msgid "&Find file" -msgstr "&Failide otsimine" - -msgid "S&wap panels" -msgstr "&Vaheta paneelid" - -msgid "Switch &panels on/off" -msgstr "&Kuva/peida paneelid" - -msgid "&Compare directories" -msgstr "Kataloogi&de võrdlemine" - -msgid "C&ompare files" -msgstr "Võ&rdle faile" - -msgid "E&xternal panelize" -msgstr "Väliskäsk pa&neelile" - -msgid "Show directory s&izes" -msgstr "Kuva kataloogide &suurused" - -msgid "Command &history" -msgstr "Käskude a&jalugu" - -msgid "Viewed/edited files hi&story" -msgstr "Vaadatud/muudetud failide ajalugu" - -msgid "Di&rectory hotlist" -msgstr "Katal&oogide kiirvalik" - -msgid "&Active VFS list" -msgstr "Akt&iivsete VFSde loend" - -msgid "&Background jobs" -msgstr "&Tööd taustal" - -msgid "Screen lis&t" -msgstr "&Ekraanide loend" - -msgid "&Undelete files (ext2fs only)" -msgstr "F&ailide taastamine (ainult ext2fs)" - -msgid "&Listing format edit" -msgstr "&Loend vorminduse muutmine" - -msgid "Edit &extension file" -msgstr "Muuda &laiendite faili" - -msgid "Edit &menu file" -msgstr "Muuda &menüü faili" - -msgid "Edit hi&ghlighting group file" -msgstr "Muuda esiletõstu &grupi faili" - -msgid "&Configuration..." -msgstr "&Häälestus..." - -msgid "&Layout..." -msgstr "&Kujundus..." - -msgid "&Panel options..." -msgstr "&Paneeli häälestus..." - -msgid "C&onfirmation..." -msgstr "K&innitused..." - -msgid "&Appearance..." -msgstr "&Välimus..." - -msgid "&Display bits..." -msgstr "K&uva bitid" - -msgid "&Virtual FS..." -msgstr "Vi&rtuaalne FS..." - -msgid "Panels:" -msgstr "Paneelid:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Sul on %zu avatud ekraan. Kas ikkagi lõpetada?" -msgstr[1] "Sul on %zu avatud ekraani. Kas ikkagi lõpetada?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Kas sa soovid tõesti Midnight Commanderist väljuda?" - -msgid "&Above" -msgstr "Ü&lal" - -msgid "&Left" -msgstr "&Vasak" - -msgid "&Below" -msgstr "&All" - -msgid "&Right" -msgstr "&Parem" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menüü" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Vaata" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|NimTeisalda" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|LooKataloog" - msgid "Memory exhausted!" msgstr "Mälu otsas!" @@ -4003,7 +4009,7 @@ msgstr "" msgid "With ext2fs attributes support" -msgstr "" +msgstr "Sealhulgas ext2fs atribuutide tugi" #, c-format msgid "Built with GLib %d.%d.%d\n" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/eu.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/eu.gmo differ diff -Nru mc-4.8.25/po/eu.po mc-4.8.26/po/eu.po --- mc-4.8.25/po/eu.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/eu.po 2021-01-21 17:18:34.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Basque (http://www.transifex.com/mc/mc/language/eu/)\n" "Language: eu\n" @@ -1978,6 +1978,9 @@ msgid "Skin:" msgstr "Azala:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Itxura" @@ -2203,6 +2206,14 @@ msgid "SMB authentication" msgstr "SMB autentikazioa" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Ezin da \"%s\" direktoriora aldatu\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2263,6 +2274,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2539,14 +2553,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Komandoak ezin exekutatu bertakoa ez den fitxategi-sistema batean" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Ezin da \"%s\" direktoriora aldatu\n" -"%s" - msgid "Parameter" msgstr "Parametroa" @@ -3084,6 +3090,225 @@ msgid "Invalid source pattern '%s'" msgstr "Iturburu eredu baliogabea '%s'" +msgid "File listin&g" +msgstr "&Fitxategien zerrendatzea" + +msgid "&Quick view" +msgstr "Ikuspegi &azkarra" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "Zu&haitza" + +msgid "&Listing format..." +msgstr "&Zerrenda formatua" + +msgid "&Sort order..." +msgstr "&Sailkatzeko ordena..." + +msgid "&Filter..." +msgstr "I&ragazkia..." + +msgid "&Encoding..." +msgstr "&Kodeketa..." + +msgid "FT&P link..." +msgstr "FT&P esteka..." + +msgid "S&hell link..." +msgstr "S&hell esteka..." + +msgid "S&FTP link..." +msgstr "S&FTP esteka..." + +msgid "SM&B link..." +msgstr "S&MB esteka..." + +msgid "Paneli&ze" +msgstr "Panelerat&u" + +msgid "&Rescan" +msgstr "&Berraztertu" + +msgid "&View" +msgstr "&Ikusi" + +msgid "Vie&w file..." +msgstr "Ikusi &fitxategia..." + +msgid "&Filtered view" +msgstr "I&ragazitako ikuspegia" + +msgid "&Copy" +msgstr "&Kopiatu" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Esteka" + +msgid "&Symlink" +msgstr "E&steka sinbolikoa" + +msgid "Relative symlin&k" +msgstr "Es&teka sinboliko erlatiboa" + +msgid "Edit s&ymlink" +msgstr "E&ditatu esteka sinbolikoa" + +msgid "Ch&own" +msgstr "&Chown" + +msgid "&Advanced chown" +msgstr "Ch&own aurreratua" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Berrizendatu/Mu&gitu" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "Cd a&zkarra" + +msgid "Select &group" +msgstr "Hautatu ta&ldea" + +msgid "U&nselect group" +msgstr "&Hautua kendu taldeari" + +msgid "&Invert selection" +msgstr "&Alderantzikatu hautapena" + +msgid "E&xit" +msgstr "Irte&n" + +msgid "&User menu" +msgstr "&Erabiltzailearen menua" + +msgid "&Directory tree" +msgstr "&Direktorio zuhaitza" + +msgid "&Find file" +msgstr "&Aurkitu fitxategia" + +msgid "S&wap panels" +msgstr "&Trukatu panelak" + +msgid "Switch &panels on/off" +msgstr "&Panelak ezkutatu/erakutsi" + +msgid "&Compare directories" +msgstr "&Konparatu direktorioak" + +msgid "C&ompare files" +msgstr "Fitxategiak al&deratu" + +msgid "E&xternal panelize" +msgstr "Ka&npokora paneleratu" + +msgid "Show directory s&izes" +msgstr "E&rakutsi direktorioen neurriak" + +msgid "Command &history" +msgstr "Ko&mandoen historia" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "&Gogoko direktorioak" + +msgid "&Active VFS list" +msgstr "&Jarduneko VFS zerrenda" + +msgid "&Background jobs" +msgstr "&Hondoko lanak" + +msgid "Screen lis&t" +msgstr "Pantaila &zerrenda" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Berreskuratu fitxategiak (soilik ext2fs)" + +msgid "&Listing format edit" +msgstr "Zerrendatzeko &formatua editatu" + +msgid "Edit &extension file" +msgstr "Editatu &luzapen fitxategia" + +msgid "Edit &menu file" +msgstr "Editat&u menu fitxategia" + +msgid "Edit hi&ghlighting group file" +msgstr "Editatu nabarmentzeko taldeen &fitxategia" + +msgid "&Configuration..." +msgstr "&Konfigurazioa..." + +msgid "&Layout..." +msgstr "&Diseinua..." + +msgid "&Panel options..." +msgstr "&Panelen aukerak..." + +msgid "C&onfirmation..." +msgstr "&Berrespena..." + +msgid "&Appearance..." +msgstr "&Itxura..." + +msgid "&Display bits..." +msgstr "&Bistaratu bitak..." + +msgid "&Virtual FS..." +msgstr "Alegiazko &FS..." + +msgid "Panels:" +msgstr "Panelak:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Pantaila %zu irekita duzu. Irten hala ere?" +msgstr[1] "%zu pantaila irekita dituzu. Irten hala ere?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander-ra" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Benetan utzi nahi duzu Midnight Commander-ra?" + +msgid "&Above" +msgstr "&Gainean" + +msgid "&Left" +msgstr "E&zkerra" + +msgid "&Below" +msgstr "&Azpian" + +msgid "&Right" +msgstr "E&skuina" + +msgid "ButtonBar|Menu" +msgstr "Menua" + +msgid "ButtonBar|View" +msgstr "Ikusi" + +msgid "ButtonBar|RenMov" +msgstr "BerrizenMug" + +msgid "ButtonBar|Mkdir" +msgstr "SortuDir" + msgid "&Chdir" msgstr "&Aldatu direktorioa" @@ -3130,9 +3355,6 @@ msgid "Fir&st hit" msgstr "&Lehenengo agerraldia" -msgid "&Tree" -msgstr "Zu&haitza" - msgid "Find File" msgstr "Bilatu fitxategia" @@ -3391,222 +3613,6 @@ msgid "Layout" msgstr "Diseinua" -msgid "File listin&g" -msgstr "&Fitxategien zerrendatzea" - -msgid "&Quick view" -msgstr "Ikuspegi &azkarra" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Zerrenda formatua" - -msgid "&Sort order..." -msgstr "&Sailkatzeko ordena..." - -msgid "&Filter..." -msgstr "I&ragazkia..." - -msgid "&Encoding..." -msgstr "&Kodeketa..." - -msgid "FT&P link..." -msgstr "FT&P esteka..." - -msgid "S&hell link..." -msgstr "S&hell esteka..." - -msgid "S&FTP link..." -msgstr "S&FTP esteka..." - -msgid "SM&B link..." -msgstr "S&MB esteka..." - -msgid "Paneli&ze" -msgstr "Panelerat&u" - -msgid "&Rescan" -msgstr "&Berraztertu" - -msgid "&View" -msgstr "&Ikusi" - -msgid "Vie&w file..." -msgstr "Ikusi &fitxategia..." - -msgid "&Filtered view" -msgstr "I&ragazitako ikuspegia" - -msgid "&Copy" -msgstr "&Kopiatu" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Esteka" - -msgid "&Symlink" -msgstr "E&steka sinbolikoa" - -msgid "Relative symlin&k" -msgstr "Es&teka sinboliko erlatiboa" - -msgid "Edit s&ymlink" -msgstr "E&ditatu esteka sinbolikoa" - -msgid "Ch&own" -msgstr "&Chown" - -msgid "&Advanced chown" -msgstr "Ch&own aurreratua" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Berrizendatu/Mu&gitu" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "Cd a&zkarra" - -msgid "Select &group" -msgstr "Hautatu ta&ldea" - -msgid "U&nselect group" -msgstr "&Hautua kendu taldeari" - -msgid "&Invert selection" -msgstr "&Alderantzikatu hautapena" - -msgid "E&xit" -msgstr "Irte&n" - -msgid "&User menu" -msgstr "&Erabiltzailearen menua" - -msgid "&Directory tree" -msgstr "&Direktorio zuhaitza" - -msgid "&Find file" -msgstr "&Aurkitu fitxategia" - -msgid "S&wap panels" -msgstr "&Trukatu panelak" - -msgid "Switch &panels on/off" -msgstr "&Panelak ezkutatu/erakutsi" - -msgid "&Compare directories" -msgstr "&Konparatu direktorioak" - -msgid "C&ompare files" -msgstr "Fitxategiak al&deratu" - -msgid "E&xternal panelize" -msgstr "Ka&npokora paneleratu" - -msgid "Show directory s&izes" -msgstr "E&rakutsi direktorioen neurriak" - -msgid "Command &history" -msgstr "Ko&mandoen historia" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "&Gogoko direktorioak" - -msgid "&Active VFS list" -msgstr "&Jarduneko VFS zerrenda" - -msgid "&Background jobs" -msgstr "&Hondoko lanak" - -msgid "Screen lis&t" -msgstr "Pantaila &zerrenda" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Berreskuratu fitxategiak (soilik ext2fs)" - -msgid "&Listing format edit" -msgstr "Zerrendatzeko &formatua editatu" - -msgid "Edit &extension file" -msgstr "Editatu &luzapen fitxategia" - -msgid "Edit &menu file" -msgstr "Editat&u menu fitxategia" - -msgid "Edit hi&ghlighting group file" -msgstr "Editatu nabarmentzeko taldeen &fitxategia" - -msgid "&Configuration..." -msgstr "&Konfigurazioa..." - -msgid "&Layout..." -msgstr "&Diseinua..." - -msgid "&Panel options..." -msgstr "&Panelen aukerak..." - -msgid "C&onfirmation..." -msgstr "&Berrespena..." - -msgid "&Appearance..." -msgstr "&Itxura..." - -msgid "&Display bits..." -msgstr "&Bistaratu bitak..." - -msgid "&Virtual FS..." -msgstr "Alegiazko &FS..." - -msgid "Panels:" -msgstr "Panelak:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Pantaila %zu irekita duzu. Irten hala ere?" -msgstr[1] "%zu pantaila irekita dituzu. Irten hala ere?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander-ra" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Benetan utzi nahi duzu Midnight Commander-ra?" - -msgid "&Above" -msgstr "&Gainean" - -msgid "&Left" -msgstr "E&zkerra" - -msgid "&Below" -msgstr "&Azpian" - -msgid "&Right" -msgstr "E&skuina" - -msgid "ButtonBar|Menu" -msgstr "Menua" - -msgid "ButtonBar|View" -msgstr "Ikusi" - -msgid "ButtonBar|RenMov" -msgstr "BerrizenMug" - -msgid "ButtonBar|Mkdir" -msgstr "SortuDir" - msgid "Memory exhausted!" msgstr "Memoria agortuta!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/fa.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/fa.gmo differ diff -Nru mc-4.8.25/po/fa.po mc-4.8.26/po/fa.po --- mc-4.8.25/po/fa.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/fa.po 2021-01-21 17:18:34.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Persian (http://www.transifex.com/mc/mc/language/fa/)\n" "Language: fa\n" @@ -1883,6 +1883,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2102,6 +2105,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2162,6 +2171,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2434,12 +2446,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "در فایل سیستم غیرمحلی نمی‌توان فرمانی اجرا کرد" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "پارامتر" @@ -2891,6 +2897,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "" + +msgid "&Filter..." +msgstr "" + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "" + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "" + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "مشاهده" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "پیوند" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "خروج" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "" + +msgid "&Listing format edit" +msgstr "" + +msgid "Edit &extension file" +msgstr "" + +msgid "Edit &menu file" +msgstr "" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "پیکربندی" + +msgid "&Layout..." +msgstr "" + +msgid "&Panel options..." +msgstr "تنظیمات قاب" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "" + +msgid "&Virtual FS..." +msgstr "" + +msgid "Panels:" +msgstr "قاب‌ها:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "فرماندار نیمه‌شب" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "واقعا می‌خواهید از فرماندار نیمه‌شب خارج شوید؟" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "چپ" + +msgid "&Below" +msgstr "زیر" + +msgid "&Right" +msgstr "راست" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "" @@ -2937,9 +3162,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "" - msgid "Find File" msgstr "جستجوی فایل" @@ -3194,222 +3416,6 @@ msgid "Layout" msgstr "طرح‌بندی" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "" - -msgid "&Filter..." -msgstr "" - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "" - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "" - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "مشاهده" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "پیوند" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "خروج" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "" - -msgid "&Listing format edit" -msgstr "" - -msgid "Edit &extension file" -msgstr "" - -msgid "Edit &menu file" -msgstr "" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "پیکربندی" - -msgid "&Layout..." -msgstr "" - -msgid "&Panel options..." -msgstr "تنظیمات قاب" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "" - -msgid "&Virtual FS..." -msgstr "" - -msgid "Panels:" -msgstr "قاب‌ها:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "فرماندار نیمه‌شب" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "واقعا می‌خواهید از فرماندار نیمه‌شب خارج شوید؟" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "چپ" - -msgid "&Below" -msgstr "زیر" - -msgid "&Right" -msgstr "راست" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/fi.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/fi.gmo differ diff -Nru mc-4.8.25/po/fi.po mc-4.8.26/po/fi.po --- mc-4.8.25/po/fi.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/fi.po 2021-01-21 17:18:34.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Finnish (http://www.transifex.com/mc/mc/language/fi/)\n" "Language: fi\n" @@ -1890,6 +1890,9 @@ msgid "Skin:" msgstr "Ulkoasuteema:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Ulkoasu" @@ -2109,6 +2112,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2169,6 +2178,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2441,12 +2453,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2898,6 +2904,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "" + +msgid "&Filter..." +msgstr "&Suodata..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "" + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SM&B linkki..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "&Kopioi" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "&Linkki" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "" + +msgid "&Listing format edit" +msgstr "" + +msgid "Edit &extension file" +msgstr "" + +msgid "Edit &menu file" +msgstr "" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "" + +msgid "&Layout..." +msgstr "&Muotoilu..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "&Ulkoasu..." + +msgid "&Display bits..." +msgstr "" + +msgid "&Virtual FS..." +msgstr "" + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "&Vasen" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "&Oikea" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "" @@ -2944,9 +3169,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "" - msgid "Find File" msgstr "" @@ -3201,222 +3423,6 @@ msgid "Layout" msgstr "" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "" - -msgid "&Filter..." -msgstr "&Suodata..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "" - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SM&B linkki..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "&Kopioi" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "&Linkki" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "" - -msgid "&Listing format edit" -msgstr "" - -msgid "Edit &extension file" -msgstr "" - -msgid "Edit &menu file" -msgstr "" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "" - -msgid "&Layout..." -msgstr "&Muotoilu..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "&Ulkoasu..." - -msgid "&Display bits..." -msgstr "" - -msgid "&Virtual FS..." -msgstr "" - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "&Vasen" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "&Oikea" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" diff -Nru mc-4.8.25/po/fr_CA.po mc-4.8.26/po/fr_CA.po --- mc-4.8.25/po/fr_CA.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/fr_CA.po 2021-01-21 17:18:34.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" "PO-Revision-Date: 2015-02-26 09:48+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: French (Canada) (http://www.transifex.com/projects/p/mc/" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,523 +2893,523 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/fr.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/fr.gmo differ diff -Nru mc-4.8.25/po/fr.po mc-4.8.26/po/fr.po --- mc-4.8.25/po/fr.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/fr.po 2021-01-21 17:18:34.000000000 +0000 @@ -6,7 +6,7 @@ # baua gonzo , 2016 # David D, 2017-2018 # David Prudhomme , 2018 -# Scoubidou , 2015 +# dfd998a47e5ece82efa734d3c31b5c3e_071ebb8, 2015 # Effede Effede , 2016 # Matthieu Crapet , 2013-2016 # Slava Zanko , 2011 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: French (http://www.transifex.com/mc/mc/language/fr/)\n" "Language: fr\n" @@ -1991,6 +1991,9 @@ msgid "Skin:" msgstr "Thème :" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Apparence" @@ -2214,6 +2217,14 @@ msgid "SMB authentication" msgstr "Authentification SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Ne peut aller dans le répertoire « %s »\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2274,6 +2285,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2550,14 +2564,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr " Ne peut pas exécuter de commande sur un système de fichiers non local" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Ne peut aller dans le répertoire « %s »\n" -"%s" - msgid "Parameter" msgstr "Paramètre" @@ -3088,6 +3094,225 @@ msgid "Invalid source pattern '%s'" msgstr "Motif source invalide « %s »" +msgid "File listin&g" +msgstr "&Liste des fichiers" + +msgid "&Quick view" +msgstr "&Vue rapide" + +msgid "&Info" +msgstr "&Informations" + +msgid "&Tree" +msgstr "&Arborescence" + +msgid "&Listing format..." +msgstr "Format de &Listing ..." + +msgid "&Sort order..." +msgstr "&Ordre de tri..." + +msgid "&Filter..." +msgstr "&Filtre..." + +msgid "&Encoding..." +msgstr "&Encodage..." + +msgid "FT&P link..." +msgstr "Lien &FTP..." + +msgid "S&hell link..." +msgstr "Lien S&hell..." + +msgid "S&FTP link..." +msgstr "Lien &SFTP..." + +msgid "SM&B link..." +msgstr "Lien SM&B..." + +msgid "Paneli&ze" +msgstr "Mise en &panneaux" + +msgid "&Rescan" +msgstr "&Rafraîchir" + +msgid "&View" +msgstr "&Voir" + +msgid "Vie&w file..." +msgstr "V&oir le fichier..." + +msgid "&Filtered view" +msgstr "Vue &filtrée" + +msgid "&Copy" +msgstr "&Copier" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Lien" + +msgid "&Symlink" +msgstr "Lien &symbolique" + +msgid "Relative symlin&k" +msgstr "Lien symbolique &relatif" + +msgid "Edit s&ymlink" +msgstr "Éditer le lien s&ymbolique" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "Chown &avancé" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Renommer/Déplacer" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "Cd &rapide" + +msgid "Select &group" +msgstr "Sélectionner les &groupes" + +msgid "U&nselect group" +msgstr "Désélectio&nner les groupes" + +msgid "&Invert selection" +msgstr "&Inverser la sélection" + +msgid "E&xit" +msgstr "&Quitter" + +msgid "&User menu" +msgstr "Menu &utilisateur" + +msgid "&Directory tree" +msgstr "&Arborescence des répertoires" + +msgid "&Find file" +msgstr "Recherche de &fichier" + +msgid "S&wap panels" +msgstr "Échan&ger les panneaux" + +msgid "Switch &panels on/off" +msgstr "Masquer et démasquer les &panneaux" + +msgid "&Compare directories" +msgstr "&Comparer des répertoires" + +msgid "C&ompare files" +msgstr "C&omparer des fichiers" + +msgid "E&xternal panelize" +msgstr "Panneau e&xterne..." + +msgid "Show directory s&izes" +msgstr "Aff&icher la taille des rép." + +msgid "Command &history" +msgstr "&Historique des commandes" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "Liste des répe&rtoires favoris" + +msgid "&Active VFS list" +msgstr "Liste des VFS &actifs" + +msgid "&Background jobs" +msgstr "&Processus en tâche de fond" + +msgid "Screen lis&t" +msgstr "Liste des écrans" + +msgid "&Undelete files (ext2fs only)" +msgstr "Réc&upération de fichiers (ext2fs)" + +msgid "&Listing format edit" +msgstr "Édition du format de &liste" + +msgid "Edit &extension file" +msgstr "Édition des &extensions de fichier" + +msgid "Edit &menu file" +msgstr "Édition du fichier de &Menu" + +msgid "Edit hi&ghlighting group file" +msgstr "Édition du fichier de coloration Groupe" + +msgid "&Configuration..." +msgstr "&Configuration..." + +msgid "&Layout..." +msgstr "&Présentation..." + +msgid "&Panel options..." +msgstr "&Options des panneaux..." + +msgid "C&onfirmation..." +msgstr "C&onfirmation..." + +msgid "&Appearance..." +msgstr "&Apparence..." + +msgid "&Display bits..." +msgstr "&Bits d'affichage..." + +msgid "&Virtual FS..." +msgstr "Système de Fichiers &Virtuel (VFS)..." + +msgid "Panels:" +msgstr "Panneaux :" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Il y a %zu fenêtre d'ouverte. Quitter ?" +msgstr[1] "Il y a %zu fenêtres d'ouvertes. Quitter ?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Souhaitez vous vraiment quitter Midnight Commander ?" + +msgid "&Above" +msgstr "&Au-dessus" + +msgid "&Left" +msgstr "&Gauche" + +msgid "&Below" +msgstr "&En-dessous" + +msgid "&Right" +msgstr "&Droite" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menu" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Voir" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|RenDep" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|CréRep" + msgid "&Chdir" msgstr "&Changer de répertoire" @@ -3134,9 +3359,6 @@ msgid "Fir&st hit" msgstr "Première occurence" -msgid "&Tree" -msgstr "&Arborescence" - msgid "Find File" msgstr "Recherche de fichier" @@ -3395,222 +3617,6 @@ msgid "Layout" msgstr "Présentation" -msgid "File listin&g" -msgstr "&Liste des fichiers" - -msgid "&Quick view" -msgstr "&Vue rapide" - -msgid "&Info" -msgstr "&Informations" - -msgid "&Listing format..." -msgstr "Format de &Listing ..." - -msgid "&Sort order..." -msgstr "&Ordre de tri..." - -msgid "&Filter..." -msgstr "&Filtre..." - -msgid "&Encoding..." -msgstr "&Encodage..." - -msgid "FT&P link..." -msgstr "Lien &FTP..." - -msgid "S&hell link..." -msgstr "Lien S&hell..." - -msgid "S&FTP link..." -msgstr "Lien &SFTP..." - -msgid "SM&B link..." -msgstr "Lien SM&B..." - -msgid "Paneli&ze" -msgstr "Mise en &panneaux" - -msgid "&Rescan" -msgstr "&Rafraîchir" - -msgid "&View" -msgstr "&Voir" - -msgid "Vie&w file..." -msgstr "V&oir le fichier..." - -msgid "&Filtered view" -msgstr "Vue &filtrée" - -msgid "&Copy" -msgstr "&Copier" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Lien" - -msgid "&Symlink" -msgstr "Lien &symbolique" - -msgid "Relative symlin&k" -msgstr "Lien symbolique &relatif" - -msgid "Edit s&ymlink" -msgstr "Éditer le lien s&ymbolique" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "Chown &avancé" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Renommer/Déplacer" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "Cd &rapide" - -msgid "Select &group" -msgstr "Sélectionner les &groupes" - -msgid "U&nselect group" -msgstr "Désélectio&nner les groupes" - -msgid "&Invert selection" -msgstr "&Inverser la sélection" - -msgid "E&xit" -msgstr "&Quitter" - -msgid "&User menu" -msgstr "Menu &utilisateur" - -msgid "&Directory tree" -msgstr "&Arborescence des répertoires" - -msgid "&Find file" -msgstr "Recherche de &fichier" - -msgid "S&wap panels" -msgstr "Échan&ger les panneaux" - -msgid "Switch &panels on/off" -msgstr "Masquer et démasquer les &panneaux" - -msgid "&Compare directories" -msgstr "&Comparer des répertoires" - -msgid "C&ompare files" -msgstr "C&omparer des fichiers" - -msgid "E&xternal panelize" -msgstr "Panneau e&xterne..." - -msgid "Show directory s&izes" -msgstr "Aff&icher la taille des rép." - -msgid "Command &history" -msgstr "&Historique des commandes" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "Liste des répe&rtoires favoris" - -msgid "&Active VFS list" -msgstr "Liste des VFS &actifs" - -msgid "&Background jobs" -msgstr "&Processus en tâche de fond" - -msgid "Screen lis&t" -msgstr "Liste des écrans" - -msgid "&Undelete files (ext2fs only)" -msgstr "Réc&upération de fichiers (ext2fs)" - -msgid "&Listing format edit" -msgstr "Édition du format de &liste" - -msgid "Edit &extension file" -msgstr "Édition des &extensions de fichier" - -msgid "Edit &menu file" -msgstr "Édition du fichier de &Menu" - -msgid "Edit hi&ghlighting group file" -msgstr "Édition du fichier de coloration Groupe" - -msgid "&Configuration..." -msgstr "&Configuration..." - -msgid "&Layout..." -msgstr "&Présentation..." - -msgid "&Panel options..." -msgstr "&Options des panneaux..." - -msgid "C&onfirmation..." -msgstr "C&onfirmation..." - -msgid "&Appearance..." -msgstr "&Apparence..." - -msgid "&Display bits..." -msgstr "&Bits d'affichage..." - -msgid "&Virtual FS..." -msgstr "Système de Fichiers &Virtuel (VFS)..." - -msgid "Panels:" -msgstr "Panneaux :" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Il y a %zu fenêtre d'ouverte. Quitter ?" -msgstr[1] "Il y a %zu fenêtres d'ouvertes. Quitter ?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Souhaitez vous vraiment quitter Midnight Commander ?" - -msgid "&Above" -msgstr "&Au-dessus" - -msgid "&Left" -msgstr "&Gauche" - -msgid "&Below" -msgstr "&En-dessous" - -msgid "&Right" -msgstr "&Droite" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menu" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Voir" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|RenDep" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|CréRep" - msgid "Memory exhausted!" msgstr "Mémoire épuisée !" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/gl.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/gl.gmo differ diff -Nru mc-4.8.25/po/gl.po mc-4.8.26/po/gl.po --- mc-4.8.25/po/gl.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/gl.po 2021-01-21 17:18:34.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Galician (http://www.transifex.com/mc/mc/language/gl/)\n" "Language: gl\n" @@ -1985,6 +1985,9 @@ msgid "Skin:" msgstr "Tema:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Aparencia" @@ -2209,6 +2212,14 @@ msgid "SMB authentication" msgstr "Autenticación SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Non é posíbel cambiar ao directorio «%s»\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2269,6 +2280,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2545,14 +2559,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Non é posíbel executar ordes desde sistemas de ficheiros non locais" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Non é posíbel cambiar ao directorio «%s»\n" -"%s" - msgid "Parameter" msgstr "Parámetro" @@ -3088,6 +3094,225 @@ msgid "Invalid source pattern '%s'" msgstr "Patrón orixinal incorrecto «%s»" +msgid "File listin&g" +msgstr "Lis&Tado de ficheiros" + +msgid "&Quick view" +msgstr "Vista &Rápida" + +msgid "&Info" +msgstr "&Información" + +msgid "&Tree" +msgstr "Ár&Bore" + +msgid "&Listing format..." +msgstr "Formato de &ista..." + +msgid "&Sort order..." +msgstr "&Ordenar..." + +msgid "&Filter..." +msgstr "&Filtro..." + +msgid "&Encoding..." +msgstr "&Codificando..." + +msgid "FT&P link..." +msgstr "Conexión por FT&P..." + +msgid "S&hell link..." +msgstr "Conexión por &Terminal..." + +msgid "S&FTP link..." +msgstr "Ligazón S&FTP..." + +msgid "SM&B link..." +msgstr "Conexión por &SMB..." + +msgid "Paneli&ze" +msgstr "&Poñer no panel" + +msgid "&Rescan" +msgstr "Actuali&Zar" + +msgid "&View" +msgstr "&Vista" + +msgid "Vie&w file..." +msgstr "ve&R ficheiro..." + +msgid "&Filtered view" +msgstr "Vista &Filtrada" + +msgid "&Copy" +msgstr "&Copiar" + +msgid "C&hmod" +msgstr "c&Hmod" + +msgid "&Link" +msgstr "&Ligar" + +msgid "&Symlink" +msgstr "Ligazóns &Simbólicas" + +msgid "Relative symlin&k" +msgstr "Liga&Zón simbólica relativa" + +msgid "Edit s&ymlink" +msgstr "Editar li&Gazón simbólica" + +msgid "Ch&own" +msgstr "ch&Own" + +msgid "&Advanced chown" +msgstr "c&Ambiar propietario e permisos" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Renomear/Mover" + +msgid "&Mkdir" +msgstr "Crear &Directorio" + +msgid "&Quick cd" +msgstr "ca&Mbiar directorio" + +msgid "Select &group" +msgstr "Seleccionar &Grupo" + +msgid "U&nselect group" +msgstr "Desmarcar g&Rrupo" + +msgid "&Invert selection" +msgstr "&Inverter a selección" + +msgid "E&xit" +msgstr "&Saír" + +msgid "&User menu" +msgstr "Menú de &Usuario" + +msgid "&Directory tree" +msgstr "Árbore de &Directorios" + +msgid "&Find file" +msgstr "Buscar &Ficheiro" + +msgid "S&wap panels" +msgstr "&Intercambiar paneis" + +msgid "Switch &panels on/off" +msgstr "Activar/desactivar &Paneis" + +msgid "&Compare directories" +msgstr "&Comparar directorios" + +msgid "C&ompare files" +msgstr "c&Omparar ficheiros" + +msgid "E&xternal panelize" +msgstr "Paneis e&Xternos" + +msgid "Show directory s&izes" +msgstr "Mostrar &Tamaño dos directorios" + +msgid "Command &history" +msgstr "&Historial de ordes" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "di&Rectorio de favoritos" + +msgid "&Active VFS list" +msgstr "Lista activa de ficheiros &Virtuais (VFS)" + +msgid "&Background jobs" +msgstr "&Procesos en 2º plano" + +msgid "Screen lis&t" +msgstr "&Lista de pantallas" + +msgid "&Undelete files (ext2fs only)" +msgstr "rec&Uperar ficheiros (só ext2fs)" + +msgid "&Listing format edit" +msgstr "Edición do formato de &Lista" + +msgid "Edit &extension file" +msgstr "&Editar o ficheiro de extensións" + +msgid "Edit &menu file" +msgstr "Editar ficheiro de &Menú" + +msgid "Edit hi&ghlighting group file" +msgstr "Editar resaltado de &Grupos de ficheiros" + +msgid "&Configuration..." +msgstr "&Configuración..." + +msgid "&Layout..." +msgstr "&Presentación..." + +msgid "&Panel options..." +msgstr "Opcións dos &Paneis..." + +msgid "C&onfirmation..." +msgstr "c&Onfirmación..." + +msgid "&Appearance..." +msgstr "&Aparencia..." + +msgid "&Display bits..." +msgstr "&Mostrar bits..." + +msgid "&Virtual FS..." +msgstr "Sistema de ficheiros &Virtual (VFS)..." + +msgid "Panels:" +msgstr "Paneis:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Ten %zu pantalla aberta. Saír aínda así?" +msgstr[1] "Ten %zu pantallas abertas. Saír aínda así?" + +msgid "The Midnight Commander" +msgstr "O Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Confirma que quere saír do Midnight Commander?" + +msgid "&Above" +msgstr "&Arriba" + +msgid "&Left" +msgstr "&Esquerda" + +msgid "&Below" +msgstr "a&Baixo" + +msgid "&Right" +msgstr "&Dereita" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menú" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Ver" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Renomear/Mover" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Crear directorio" + msgid "&Chdir" msgstr "&Cambiar directorio" @@ -3134,9 +3359,6 @@ msgid "Fir&st hit" msgstr "&Primeira coincidencia" -msgid "&Tree" -msgstr "Ár&Bore" - msgid "Find File" msgstr "Buscar ficheiro" @@ -3395,222 +3617,6 @@ msgid "Layout" msgstr "Presentación" -msgid "File listin&g" -msgstr "Lis&Tado de ficheiros" - -msgid "&Quick view" -msgstr "Vista &Rápida" - -msgid "&Info" -msgstr "&Información" - -msgid "&Listing format..." -msgstr "Formato de &ista..." - -msgid "&Sort order..." -msgstr "&Ordenar..." - -msgid "&Filter..." -msgstr "&Filtro..." - -msgid "&Encoding..." -msgstr "&Codificando..." - -msgid "FT&P link..." -msgstr "Conexión por FT&P..." - -msgid "S&hell link..." -msgstr "Conexión por &Terminal..." - -msgid "S&FTP link..." -msgstr "Ligazón S&FTP..." - -msgid "SM&B link..." -msgstr "Conexión por &SMB..." - -msgid "Paneli&ze" -msgstr "&Poñer no panel" - -msgid "&Rescan" -msgstr "Actuali&Zar" - -msgid "&View" -msgstr "&Vista" - -msgid "Vie&w file..." -msgstr "ve&R ficheiro..." - -msgid "&Filtered view" -msgstr "Vista &Filtrada" - -msgid "&Copy" -msgstr "&Copiar" - -msgid "C&hmod" -msgstr "c&Hmod" - -msgid "&Link" -msgstr "&Ligar" - -msgid "&Symlink" -msgstr "Ligazóns &Simbólicas" - -msgid "Relative symlin&k" -msgstr "Liga&Zón simbólica relativa" - -msgid "Edit s&ymlink" -msgstr "Editar li&Gazón simbólica" - -msgid "Ch&own" -msgstr "ch&Own" - -msgid "&Advanced chown" -msgstr "c&Ambiar propietario e permisos" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Renomear/Mover" - -msgid "&Mkdir" -msgstr "Crear &Directorio" - -msgid "&Quick cd" -msgstr "ca&Mbiar directorio" - -msgid "Select &group" -msgstr "Seleccionar &Grupo" - -msgid "U&nselect group" -msgstr "Desmarcar g&Rrupo" - -msgid "&Invert selection" -msgstr "&Inverter a selección" - -msgid "E&xit" -msgstr "&Saír" - -msgid "&User menu" -msgstr "Menú de &Usuario" - -msgid "&Directory tree" -msgstr "Árbore de &Directorios" - -msgid "&Find file" -msgstr "Buscar &Ficheiro" - -msgid "S&wap panels" -msgstr "&Intercambiar paneis" - -msgid "Switch &panels on/off" -msgstr "Activar/desactivar &Paneis" - -msgid "&Compare directories" -msgstr "&Comparar directorios" - -msgid "C&ompare files" -msgstr "c&Omparar ficheiros" - -msgid "E&xternal panelize" -msgstr "Paneis e&Xternos" - -msgid "Show directory s&izes" -msgstr "Mostrar &Tamaño dos directorios" - -msgid "Command &history" -msgstr "&Historial de ordes" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "di&Rectorio de favoritos" - -msgid "&Active VFS list" -msgstr "Lista activa de ficheiros &Virtuais (VFS)" - -msgid "&Background jobs" -msgstr "&Procesos en 2º plano" - -msgid "Screen lis&t" -msgstr "&Lista de pantallas" - -msgid "&Undelete files (ext2fs only)" -msgstr "rec&Uperar ficheiros (só ext2fs)" - -msgid "&Listing format edit" -msgstr "Edición do formato de &Lista" - -msgid "Edit &extension file" -msgstr "&Editar o ficheiro de extensións" - -msgid "Edit &menu file" -msgstr "Editar ficheiro de &Menú" - -msgid "Edit hi&ghlighting group file" -msgstr "Editar resaltado de &Grupos de ficheiros" - -msgid "&Configuration..." -msgstr "&Configuración..." - -msgid "&Layout..." -msgstr "&Presentación..." - -msgid "&Panel options..." -msgstr "Opcións dos &Paneis..." - -msgid "C&onfirmation..." -msgstr "c&Onfirmación..." - -msgid "&Appearance..." -msgstr "&Aparencia..." - -msgid "&Display bits..." -msgstr "&Mostrar bits..." - -msgid "&Virtual FS..." -msgstr "Sistema de ficheiros &Virtual (VFS)..." - -msgid "Panels:" -msgstr "Paneis:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Ten %zu pantalla aberta. Saír aínda así?" -msgstr[1] "Ten %zu pantallas abertas. Saír aínda así?" - -msgid "The Midnight Commander" -msgstr "O Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Confirma que quere saír do Midnight Commander?" - -msgid "&Above" -msgstr "&Arriba" - -msgid "&Left" -msgstr "&Esquerda" - -msgid "&Below" -msgstr "a&Baixo" - -msgid "&Right" -msgstr "&Dereita" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menú" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Ver" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Renomear/Mover" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Crear directorio" - msgid "Memory exhausted!" msgstr "Memoria esgotada!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/hr.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/hr.gmo differ diff -Nru mc-4.8.25/po/hr.po mc-4.8.26/po/hr.po --- mc-4.8.25/po/hr.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/hr.po 2021-01-21 17:18:34.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Croatian (http://www.transifex.com/mc/mc/language/hr/)\n" "Language: hr\n" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,526 +2893,526 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/hu.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/hu.gmo differ diff -Nru mc-4.8.25/po/hu.po mc-4.8.26/po/hu.po --- mc-4.8.25/po/hu.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/hu.po 2021-01-21 17:18:34.000000000 +0000 @@ -12,8 +12,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Hungarian (http://www.transifex.com/mc/mc/language/hu/)\n" "Language: hu\n" @@ -1967,6 +1967,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Megjelenítés" @@ -2189,6 +2192,14 @@ msgid "SMB authentication" msgstr "SMB hitelesítés" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Nem sikerült belépni a(z) \"%s\" könyvtárba.\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2249,6 +2260,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2525,14 +2539,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Távoli fájlrendszeren nem lehet végrehajtani a parancsokat" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Nem sikerült belépni a(z) \"%s\" könyvtárba.\n" -"%s" - msgid "Parameter" msgstr "Paraméter" @@ -3062,6 +3068,225 @@ msgid "Invalid source pattern '%s'" msgstr "Hibás forrás-minta: \"%s\"" +msgid "File listin&g" +msgstr "&Teljes" + +msgid "&Quick view" +msgstr "Gyors nézet" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "Köny&vtárfa" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "&Rendezési mód..." + +msgid "&Filter..." +msgstr "&Szűrő..." + +msgid "&Encoding..." +msgstr "&Kódolás..." + +msgid "FT&P link..." +msgstr "&FTP-kapcsolat..." + +msgid "S&hell link..." +msgstr "Sh&ell-kapcsolat..." + +msgid "S&FTP link..." +msgstr "S&FTP link..." + +msgid "SM&B link..." +msgstr "SM&B-kapcsolat..." + +msgid "Paneli&ze" +msgstr "Panelra helye&zés" + +msgid "&Rescan" +msgstr "Frissít" + +msgid "&View" +msgstr "Megnéz" + +msgid "Vie&w file..." +msgstr "Fájl megjelenítése..." + +msgid "&Filtered view" +msgstr "Szűrt nézet" + +msgid "&Copy" +msgstr "&Másol" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Link" + +msgid "&Symlink" +msgstr "&Szimb. link" + +msgid "Relative symlin&k" +msgstr "&Relatív szimb. link" + +msgid "Edit s&ymlink" +msgstr "Szimb. link módosítása" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "Chmod-Chown (tul&aj)" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Át&nevez/Áthelyez" + +msgid "&Mkdir" +msgstr "Új könyvtár" + +msgid "&Quick cd" +msgstr "Gyors könyvtárváltás (cd)" + +msgid "Select &group" +msgstr "&Csoport kijelölése" + +msgid "U&nselect group" +msgstr "Kijelölések megszüntetése" + +msgid "&Invert selection" +msgstr "K&ijelölés megfordítása" + +msgid "E&xit" +msgstr "&Kilépés" + +msgid "&User menu" +msgstr "Felhasználói menü" + +msgid "&Directory tree" +msgstr "Köny&vtárfa" + +msgid "&Find file" +msgstr "&Fájl keresése" + +msgid "S&wap panels" +msgstr "Panelek cseréje" + +msgid "Switch &panels on/off" +msgstr "Pane&lek ki/be" + +msgid "&Compare directories" +msgstr "Könyvtárak összehasonlítása" + +msgid "C&ompare files" +msgstr "Fájl&ok összehasonlítása" + +msgid "E&xternal panelize" +msgstr "Külső panel-parancs" + +msgid "Show directory s&izes" +msgstr "Könyvtár&méret" + +msgid "Command &history" +msgstr "Ko&rábbi parancsok" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "Könyvtár-gyorslista" + +msgid "&Active VFS list" +msgstr "&Aktív VFS-lista" + +msgid "&Background jobs" +msgstr "Háttérfolyamatok" + +msgid "Screen lis&t" +msgstr "Képernyő lis&ta" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Törölt fájlok visszaállítása" + +msgid "&Listing format edit" +msgstr "Listá&zási formátum szerkesztése" + +msgid "Edit &extension file" +msgstr "Kiter&jesztésfájl szerkesztése" + +msgid "Edit &menu file" +msgstr "Me&nüfájl szerkesztése" + +msgid "Edit hi&ghlighting group file" +msgstr "Fájltípus színkiemelés szerkesztése" + +msgid "&Configuration..." +msgstr "&Alapbeállítások..." + +msgid "&Layout..." +msgstr "Meg&jelenés..." + +msgid "&Panel options..." +msgstr "&Panelbeállítások..." + +msgid "C&onfirmation..." +msgstr "&Rákérdezés..." + +msgid "&Appearance..." +msgstr "&Megjelenítés..." + +msgid "&Display bits..." +msgstr "&Kivitel és bevitel..." + +msgid "&Virtual FS..." +msgstr "&Virtuális fájlrendszer..." + +msgid "Panels:" +msgstr "Panelek:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Valóban ki szeretne lépni a Midnight Commanderből?" + +msgid "&Above" +msgstr "Fe&nt" + +msgid "&Left" +msgstr "&Bal" + +msgid "&Below" +msgstr "&Lent" + +msgid "&Right" +msgstr "&Jobb" + +msgid "ButtonBar|Menu" +msgstr "Menü" + +msgid "ButtonBar|View" +msgstr "Megnéz" + +msgid "ButtonBar|RenMov" +msgstr "Áthelyez" + +msgid "ButtonBar|Mkdir" +msgstr "ÚjKvt" + msgid "&Chdir" msgstr "&Belépés a könyvtárba" @@ -3108,9 +3333,6 @@ msgid "Fir&st hit" msgstr "Első találat" -msgid "&Tree" -msgstr "Köny&vtárfa" - msgid "Find File" msgstr "Fájl keresése" @@ -3369,222 +3591,6 @@ msgid "Layout" msgstr "Megjelenés" -msgid "File listin&g" -msgstr "&Teljes" - -msgid "&Quick view" -msgstr "Gyors nézet" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "&Rendezési mód..." - -msgid "&Filter..." -msgstr "&Szűrő..." - -msgid "&Encoding..." -msgstr "&Kódolás..." - -msgid "FT&P link..." -msgstr "&FTP-kapcsolat..." - -msgid "S&hell link..." -msgstr "Sh&ell-kapcsolat..." - -msgid "S&FTP link..." -msgstr "S&FTP link..." - -msgid "SM&B link..." -msgstr "SM&B-kapcsolat..." - -msgid "Paneli&ze" -msgstr "Panelra helye&zés" - -msgid "&Rescan" -msgstr "Frissít" - -msgid "&View" -msgstr "Megnéz" - -msgid "Vie&w file..." -msgstr "Fájl megjelenítése..." - -msgid "&Filtered view" -msgstr "Szűrt nézet" - -msgid "&Copy" -msgstr "&Másol" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Link" - -msgid "&Symlink" -msgstr "&Szimb. link" - -msgid "Relative symlin&k" -msgstr "&Relatív szimb. link" - -msgid "Edit s&ymlink" -msgstr "Szimb. link módosítása" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "Chmod-Chown (tul&aj)" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Át&nevez/Áthelyez" - -msgid "&Mkdir" -msgstr "Új könyvtár" - -msgid "&Quick cd" -msgstr "Gyors könyvtárváltás (cd)" - -msgid "Select &group" -msgstr "&Csoport kijelölése" - -msgid "U&nselect group" -msgstr "Kijelölések megszüntetése" - -msgid "&Invert selection" -msgstr "K&ijelölés megfordítása" - -msgid "E&xit" -msgstr "&Kilépés" - -msgid "&User menu" -msgstr "Felhasználói menü" - -msgid "&Directory tree" -msgstr "Köny&vtárfa" - -msgid "&Find file" -msgstr "&Fájl keresése" - -msgid "S&wap panels" -msgstr "Panelek cseréje" - -msgid "Switch &panels on/off" -msgstr "Pane&lek ki/be" - -msgid "&Compare directories" -msgstr "Könyvtárak összehasonlítása" - -msgid "C&ompare files" -msgstr "Fájl&ok összehasonlítása" - -msgid "E&xternal panelize" -msgstr "Külső panel-parancs" - -msgid "Show directory s&izes" -msgstr "Könyvtár&méret" - -msgid "Command &history" -msgstr "Ko&rábbi parancsok" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "Könyvtár-gyorslista" - -msgid "&Active VFS list" -msgstr "&Aktív VFS-lista" - -msgid "&Background jobs" -msgstr "Háttérfolyamatok" - -msgid "Screen lis&t" -msgstr "Képernyő lis&ta" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Törölt fájlok visszaállítása" - -msgid "&Listing format edit" -msgstr "Listá&zási formátum szerkesztése" - -msgid "Edit &extension file" -msgstr "Kiter&jesztésfájl szerkesztése" - -msgid "Edit &menu file" -msgstr "Me&nüfájl szerkesztése" - -msgid "Edit hi&ghlighting group file" -msgstr "Fájltípus színkiemelés szerkesztése" - -msgid "&Configuration..." -msgstr "&Alapbeállítások..." - -msgid "&Layout..." -msgstr "Meg&jelenés..." - -msgid "&Panel options..." -msgstr "&Panelbeállítások..." - -msgid "C&onfirmation..." -msgstr "&Rákérdezés..." - -msgid "&Appearance..." -msgstr "&Megjelenítés..." - -msgid "&Display bits..." -msgstr "&Kivitel és bevitel..." - -msgid "&Virtual FS..." -msgstr "&Virtuális fájlrendszer..." - -msgid "Panels:" -msgstr "Panelek:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Valóban ki szeretne lépni a Midnight Commanderből?" - -msgid "&Above" -msgstr "Fe&nt" - -msgid "&Left" -msgstr "&Bal" - -msgid "&Below" -msgstr "&Lent" - -msgid "&Right" -msgstr "&Jobb" - -msgid "ButtonBar|Menu" -msgstr "Menü" - -msgid "ButtonBar|View" -msgstr "Megnéz" - -msgid "ButtonBar|RenMov" -msgstr "Áthelyez" - -msgid "ButtonBar|Mkdir" -msgstr "ÚjKvt" - msgid "Memory exhausted!" msgstr "Elfogyott a memória!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ia.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ia.gmo differ diff -Nru mc-4.8.25/po/ia.po mc-4.8.26/po/ia.po --- mc-4.8.25/po/ia.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ia.po 2021-01-21 17:18:34.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Interlingua (http://www.transifex.com/mc/mc/language/ia/)\n" "Language: ia\n" @@ -1899,6 +1899,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2118,6 +2121,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2178,6 +2187,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2450,12 +2462,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2907,6 +2913,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Arbore" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "" + +msgid "&Filter..." +msgstr "" + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "Ligamine FT&P..." + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "" + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "&Vider" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "&Copiar" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "&Ligamine" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Renominar/Displaciar" + +msgid "&Mkdir" +msgstr "&Crear dir" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "Selige un &gruppo" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "E&xir" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "" + +msgid "&Listing format edit" +msgstr "" + +msgid "Edit &extension file" +msgstr "" + +msgid "Edit &menu file" +msgstr "" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Configuration..." + +msgid "&Layout..." +msgstr "&Disposition..." + +msgid "&Panel options..." +msgstr "Optiones del &pannello..." + +msgid "C&onfirmation..." +msgstr "C&onfirmation..." + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "" + +msgid "&Virtual FS..." +msgstr "" + +msgid "Panels:" +msgstr "Pannellos:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "" @@ -2953,9 +3178,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Arbore" - msgid "Find File" msgstr "" @@ -3210,222 +3432,6 @@ msgid "Layout" msgstr "Layout" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "" - -msgid "&Filter..." -msgstr "" - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "Ligamine FT&P..." - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "" - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "&Vider" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "&Copiar" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "&Ligamine" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Renominar/Displaciar" - -msgid "&Mkdir" -msgstr "&Crear dir" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "Selige un &gruppo" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "E&xir" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "" - -msgid "&Listing format edit" -msgstr "" - -msgid "Edit &extension file" -msgstr "" - -msgid "Edit &menu file" -msgstr "" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Configuration..." - -msgid "&Layout..." -msgstr "&Disposition..." - -msgid "&Panel options..." -msgstr "Optiones del &pannello..." - -msgid "C&onfirmation..." -msgstr "C&onfirmation..." - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "" - -msgid "&Virtual FS..." -msgstr "" - -msgid "Panels:" -msgstr "Pannellos:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/id.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/id.gmo differ diff -Nru mc-4.8.25/po/id.po mc-4.8.26/po/id.po --- mc-4.8.25/po/id.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/id.po 2021-01-21 17:18:34.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Indonesian (http://www.transifex.com/mc/mc/language/id/)\n" "Language: id\n" @@ -1922,6 +1922,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2141,6 +2144,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2201,6 +2210,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2473,12 +2485,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2930,520 +2936,520 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" diff -Nru mc-4.8.25/po/it.po mc-4.8.26/po/it.po --- mc-4.8.25/po/it.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/it.po 2021-01-21 17:18:34.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" "PO-Revision-Date: 2020-01-06 12:54+0100\n" "Last-Translator: Marco Ciampa \n" "Language-Team: Italian (http://www.transifex.com/projects/p/mc/language/" @@ -1981,6 +1981,9 @@ msgid "Skin:" msgstr "Tema:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Aspetto" @@ -2205,6 +2208,14 @@ msgid "SMB authentication" msgstr "Autenticazione SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Non posso entrare in \"%s\"\n" +"%s" + #, fuzzy msgid "Secure deletion" msgstr "&Inverti selezione" @@ -2274,6 +2285,10 @@ msgstr "" #, fuzzy +msgid "Direct access for files" +msgstr "Cache dir scaduta per %s" + +#, fuzzy msgid "Casefolded file" msgstr "Chiudi il file" @@ -2556,14 +2571,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Impossibile eseguire comandi su filesystem non locali" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Non posso entrare in \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Parametro" @@ -3098,6 +3105,225 @@ msgid "Invalid source pattern '%s'" msgstr "Modello sorgente non valido \"%s\"" +msgid "File listin&g" +msgstr "&Elenco file" + +msgid "&Quick view" +msgstr "&Vista veloce" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "A&lbero" + +msgid "&Listing format..." +msgstr "Formato &lista..." + +msgid "&Sort order..." +msgstr "&Ordina per..." + +msgid "&Filter..." +msgstr "&Filtro" + +msgid "&Encoding..." +msgstr "&Codifica..." + +msgid "FT&P link..." +msgstr "Connessione FT&P..." + +msgid "S&hell link..." +msgstr "Connessione S&hell..." + +msgid "S&FTP link..." +msgstr "Connessione S&FTP..." + +msgid "SM&B link..." +msgstr "Connessione SM&B..." + +msgid "Paneli&ze" +msgstr "Pannelli&zza" + +msgid "&Rescan" +msgstr "&Ricarica" + +msgid "&View" +msgstr "&Vista" + +msgid "Vie&w file..." +msgstr "Vis&ta file..." + +msgid "&Filtered view" +msgstr "Vista &filtrata" + +msgid "&Copy" +msgstr "&Copia" + +msgid "C&hmod" +msgstr "&Permessi" + +msgid "&Link" +msgstr "Col&legamento" + +msgid "&Symlink" +msgstr "Coll. &simb." + +msgid "Relative symlin&k" +msgstr "Colleg. simb. &relativo" + +msgid "Edit s&ymlink" +msgstr "Mo&difica coll. simb." + +msgid "Ch&own" +msgstr "Pr&oprietario" + +msgid "&Advanced chown" +msgstr "Proprietario &avanzato" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Rinomina&/Sposta" + +msgid "&Mkdir" +msgstr "Crea director&y" + +msgid "&Quick cd" +msgstr "Cam&bia dir rapido" + +msgid "Select &group" +msgstr "Seleziona &gruppo" + +msgid "U&nselect group" +msgstr "Deselezio&na gruppo" + +msgid "&Invert selection" +msgstr "&Inverti selezione" + +msgid "E&xit" +msgstr "Esc&i" + +msgid "&User menu" +msgstr "Menu &utente" + +msgid "&Directory tree" +msgstr "&Albero directory" + +msgid "&Find file" +msgstr "Trova &file" + +msgid "S&wap panels" +msgstr "&Scambia pannelli" + +msgid "Switch &panels on/off" +msgstr "Commuta &pannelli" + +msgid "&Compare directories" +msgstr "&Confronta directory" + +msgid "C&ompare files" +msgstr "C&onfronta file" + +msgid "E&xternal panelize" +msgstr "Pannelliz&za esternamente" + +msgid "Show directory s&izes" +msgstr "Mostra dimensione d&irectory" + +msgid "Command &history" +msgstr "Cro&nologia comandi" + +msgid "Viewed/edited files hi&story" +msgstr "Cronologia file vi&sualizzati/modificati " + +msgid "Di&rectory hotlist" +msgstr "&Directory di uso frequente" + +msgid "&Active VFS list" +msgstr "Lista &VFS attivi" + +msgid "&Background jobs" +msgstr "Processi in &background" + +msgid "Screen lis&t" +msgstr "Elenco schermi" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Ripristina file (solo ext2fs)" + +msgid "&Listing format edit" +msgstr "Modifica formato &lista" + +msgid "Edit &extension file" +msgstr "Modifica file &estensioni" + +msgid "Edit &menu file" +msgstr "Modifica file &menu" + +msgid "Edit hi&ghlighting group file" +msgstr "Modifica file &gruppo di evidenziazione" + +msgid "&Configuration..." +msgstr "&Configurazione..." + +msgid "&Layout..." +msgstr "&Disposizione..." + +msgid "&Panel options..." +msgstr "Opzioni &pannello..." + +msgid "C&onfirmation..." +msgstr "C&onferme..." + +msgid "&Appearance..." +msgstr "&Aspetto..." + +msgid "&Display bits..." +msgstr "&Mostra bit..." + +msgid "&Virtual FS..." +msgstr "FS &virtuale..." + +msgid "Panels:" +msgstr "Pannelli:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "È aperto %zu schermo. Uscire comunque?" +msgstr[1] "Sono aperti %zu schermi. Uscire comunque?" + +msgid "The Midnight Commander" +msgstr "Il Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Vuoi veramente uscire dal Midnight Commander?" + +msgid "&Above" +msgstr "Sopr&a" + +msgid "&Left" +msgstr "&Sinistra" + +msgid "&Below" +msgstr "&Sotto" + +msgid "&Right" +msgstr "&Destra" + +msgid "ButtonBar|Menu" +msgstr "Menu" + +msgid "ButtonBar|View" +msgstr "Mostra" + +msgid "ButtonBar|RenMov" +msgstr "RinSpo" + +msgid "ButtonBar|Mkdir" +msgstr "CreDir" + msgid "&Chdir" msgstr "&CambiaDir" @@ -3144,9 +3370,6 @@ msgid "Fir&st hit" msgstr "&Primo colpo" -msgid "&Tree" -msgstr "A&lbero" - msgid "Find File" msgstr " Trova file " @@ -3405,222 +3628,6 @@ msgid "Layout" msgstr "Disposizione" -msgid "File listin&g" -msgstr "&Elenco file" - -msgid "&Quick view" -msgstr "&Vista veloce" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "Formato &lista..." - -msgid "&Sort order..." -msgstr "&Ordina per..." - -msgid "&Filter..." -msgstr "&Filtro" - -msgid "&Encoding..." -msgstr "&Codifica..." - -msgid "FT&P link..." -msgstr "Connessione FT&P..." - -msgid "S&hell link..." -msgstr "Connessione S&hell..." - -msgid "S&FTP link..." -msgstr "Connessione S&FTP..." - -msgid "SM&B link..." -msgstr "Connessione SM&B..." - -msgid "Paneli&ze" -msgstr "Pannelli&zza" - -msgid "&Rescan" -msgstr "&Ricarica" - -msgid "&View" -msgstr "&Vista" - -msgid "Vie&w file..." -msgstr "Vis&ta file..." - -msgid "&Filtered view" -msgstr "Vista &filtrata" - -msgid "&Copy" -msgstr "&Copia" - -msgid "C&hmod" -msgstr "&Permessi" - -msgid "&Link" -msgstr "Col&legamento" - -msgid "&Symlink" -msgstr "Coll. &simb." - -msgid "Relative symlin&k" -msgstr "Colleg. simb. &relativo" - -msgid "Edit s&ymlink" -msgstr "Mo&difica coll. simb." - -msgid "Ch&own" -msgstr "Pr&oprietario" - -msgid "&Advanced chown" -msgstr "Proprietario &avanzato" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Rinomina&/Sposta" - -msgid "&Mkdir" -msgstr "Crea director&y" - -msgid "&Quick cd" -msgstr "Cam&bia dir rapido" - -msgid "Select &group" -msgstr "Seleziona &gruppo" - -msgid "U&nselect group" -msgstr "Deselezio&na gruppo" - -msgid "&Invert selection" -msgstr "&Inverti selezione" - -msgid "E&xit" -msgstr "Esc&i" - -msgid "&User menu" -msgstr "Menu &utente" - -msgid "&Directory tree" -msgstr "&Albero directory" - -msgid "&Find file" -msgstr "Trova &file" - -msgid "S&wap panels" -msgstr "&Scambia pannelli" - -msgid "Switch &panels on/off" -msgstr "Commuta &pannelli" - -msgid "&Compare directories" -msgstr "&Confronta directory" - -msgid "C&ompare files" -msgstr "C&onfronta file" - -msgid "E&xternal panelize" -msgstr "Pannelliz&za esternamente" - -msgid "Show directory s&izes" -msgstr "Mostra dimensione d&irectory" - -msgid "Command &history" -msgstr "Cro&nologia comandi" - -msgid "Viewed/edited files hi&story" -msgstr "Cronologia file vi&sualizzati/modificati " - -msgid "Di&rectory hotlist" -msgstr "&Directory di uso frequente" - -msgid "&Active VFS list" -msgstr "Lista &VFS attivi" - -msgid "&Background jobs" -msgstr "Processi in &background" - -msgid "Screen lis&t" -msgstr "Elenco schermi" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Ripristina file (solo ext2fs)" - -msgid "&Listing format edit" -msgstr "Modifica formato &lista" - -msgid "Edit &extension file" -msgstr "Modifica file &estensioni" - -msgid "Edit &menu file" -msgstr "Modifica file &menu" - -msgid "Edit hi&ghlighting group file" -msgstr "Modifica file &gruppo di evidenziazione" - -msgid "&Configuration..." -msgstr "&Configurazione..." - -msgid "&Layout..." -msgstr "&Disposizione..." - -msgid "&Panel options..." -msgstr "Opzioni &pannello..." - -msgid "C&onfirmation..." -msgstr "C&onferme..." - -msgid "&Appearance..." -msgstr "&Aspetto..." - -msgid "&Display bits..." -msgstr "&Mostra bit..." - -msgid "&Virtual FS..." -msgstr "FS &virtuale..." - -msgid "Panels:" -msgstr "Pannelli:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "È aperto %zu schermo. Uscire comunque?" -msgstr[1] "Sono aperti %zu schermi. Uscire comunque?" - -msgid "The Midnight Commander" -msgstr "Il Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Vuoi veramente uscire dal Midnight Commander?" - -msgid "&Above" -msgstr "Sopr&a" - -msgid "&Left" -msgstr "&Sinistra" - -msgid "&Below" -msgstr "&Sotto" - -msgid "&Right" -msgstr "&Destra" - -msgid "ButtonBar|Menu" -msgstr "Menu" - -msgid "ButtonBar|View" -msgstr "Mostra" - -msgid "ButtonBar|RenMov" -msgstr "RinSpo" - -msgid "ButtonBar|Mkdir" -msgstr "CreDir" - msgid "Memory exhausted!" msgstr "Memoria esaurita!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ja.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ja.gmo differ diff -Nru mc-4.8.25/po/ja.po mc-4.8.26/po/ja.po --- mc-4.8.25/po/ja.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ja.po 2021-01-21 17:18:34.000000000 +0000 @@ -12,9 +12,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-20 02:37+0000\n" -"Last-Translator: linuxmetel \n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Japanese (http://www.transifex.com/mc/mc/language/ja/)\n" "Language: ja\n" "MIME-Version: 1.0\n" @@ -1896,6 +1896,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2115,6 +2118,14 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"「%s」に移動できません\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2175,6 +2186,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2447,14 +2461,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"「%s」に移動できません\n" -"%s" - msgid "Parameter" msgstr "パラメーター" @@ -2906,6 +2912,224 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "情報(&I)" + +msgid "&Tree" +msgstr "ツリー(&T)" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "整列順(&S)..." + +msgid "&Filter..." +msgstr "フィルタ(&F)..." + +msgid "&Encoding..." +msgstr "エンコード(&E)..." + +msgid "FT&P link..." +msgstr "FTP リンク(&P)..." + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SMBリンク(&B)..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "再検索(&R)" + +msgid "&View" +msgstr "表示(&V)" + +msgid "Vie&w file..." +msgstr "ファイルの表示(&W)" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "コピー(&C)" + +msgid "C&hmod" +msgstr "パーミッション設定(&H)" + +msgid "&Link" +msgstr "リンク(&L)" + +msgid "&Symlink" +msgstr "シンボリックリンク(&S)" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "シンボリックリンクの編集(&Y)" + +msgid "Ch&own" +msgstr "所有者変更(&O)" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "名称変更/移動(&R)" + +msgid "&Mkdir" +msgstr "ディレクトリー作成(&M)" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "グループの選択(&G)" + +msgid "U&nselect group" +msgstr "グループの選択解除(&N)" + +msgid "&Invert selection" +msgstr "選択の反転(&I)" + +msgid "E&xit" +msgstr "終了(&X)" + +msgid "&User menu" +msgstr "ユーザーのメニュー(&U)" + +msgid "&Directory tree" +msgstr "ディレクトリツリー(&D)" + +msgid "&Find file" +msgstr "ファイルの検索(&F)" + +msgid "S&wap panels" +msgstr "パネルの入れ替え(&W)" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "ファイルの比較(&O)" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "コマンド履歴(&H)" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "画面の一覧(&T)" + +msgid "&Undelete files (ext2fs only)" +msgstr "ファイルの復活(&U) (ext2fsのみ)" + +msgid "&Listing format edit" +msgstr "一覧形式編集(&L)" + +msgid "Edit &extension file" +msgstr "拡張ファイルを編集(&E)" + +msgid "Edit &menu file" +msgstr "メニューファイル編集(&M)" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "設定(&C)..." + +msgid "&Layout..." +msgstr "レイアウト(&L)..." + +msgid "&Panel options..." +msgstr "パネルのオプション(&P)" + +msgid "C&onfirmation..." +msgstr "確認(&O)..." + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "表示ビット数(&D)..." + +msgid "&Virtual FS..." +msgstr "仮想FS(&V)..." + +msgid "Panels:" +msgstr "パネル:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" + +msgid "The Midnight Commander" +msgstr "The Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "本当に Midnight Commander を終了しますか?" + +msgid "&Above" +msgstr "上(&A)" + +msgid "&Left" +msgstr "左(&L)" + +msgid "&Below" +msgstr "下(&B)" + +msgid "&Right" +msgstr "右(&R)" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "ディレクトリ移動(&C)" @@ -2952,9 +3176,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "ツリー(&T)" - msgid "Find File" msgstr "ファイル検索" @@ -3207,221 +3428,6 @@ msgid "Layout" msgstr "レイアウト" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "情報(&I)" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "整列順(&S)..." - -msgid "&Filter..." -msgstr "フィルタ(&F)..." - -msgid "&Encoding..." -msgstr "エンコード(&E)..." - -msgid "FT&P link..." -msgstr "FTP リンク(&P)..." - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SMBリンク(&B)..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "再検索(&R)" - -msgid "&View" -msgstr "表示(&V)" - -msgid "Vie&w file..." -msgstr "ファイルの表示(&W)" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "コピー(&C)" - -msgid "C&hmod" -msgstr "パーミッション設定(&H)" - -msgid "&Link" -msgstr "リンク(&L)" - -msgid "&Symlink" -msgstr "シンボリックリンク(&S)" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "シンボリックリンクの編集(&Y)" - -msgid "Ch&own" -msgstr "所有者変更(&O)" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "名称変更/移動(&R)" - -msgid "&Mkdir" -msgstr "ディレクトリー作成(&M)" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "グループの選択(&G)" - -msgid "U&nselect group" -msgstr "グループの選択解除(&N)" - -msgid "&Invert selection" -msgstr "選択の反転(&I)" - -msgid "E&xit" -msgstr "終了(&X)" - -msgid "&User menu" -msgstr "ユーザーのメニュー(&U)" - -msgid "&Directory tree" -msgstr "ディレクトリツリー(&D)" - -msgid "&Find file" -msgstr "ファイルの検索(&F)" - -msgid "S&wap panels" -msgstr "パネルの入れ替え(&W)" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "ファイルの比較(&O)" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "コマンド履歴(&H)" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "画面の一覧(&T)" - -msgid "&Undelete files (ext2fs only)" -msgstr "ファイルの復活(&U) (ext2fsのみ)" - -msgid "&Listing format edit" -msgstr "一覧形式編集(&L)" - -msgid "Edit &extension file" -msgstr "拡張ファイルを編集(&E)" - -msgid "Edit &menu file" -msgstr "メニューファイル編集(&M)" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "設定(&C)..." - -msgid "&Layout..." -msgstr "レイアウト(&L)..." - -msgid "&Panel options..." -msgstr "パネルのオプション(&P)" - -msgid "C&onfirmation..." -msgstr "確認(&O)..." - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "表示ビット数(&D)..." - -msgid "&Virtual FS..." -msgstr "仮想FS(&V)..." - -msgid "Panels:" -msgstr "パネル:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" - -msgid "The Midnight Commander" -msgstr "The Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "本当に Midnight Commander を終了しますか?" - -msgid "&Above" -msgstr "上(&A)" - -msgid "&Left" -msgstr "左(&L)" - -msgid "&Below" -msgstr "下(&B)" - -msgid "&Right" -msgstr "右(&R)" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ka.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ka.gmo differ diff -Nru mc-4.8.25/po/ka.po mc-4.8.26/po/ka.po --- mc-4.8.25/po/ka.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ka.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Georgian (http://www.transifex.com/mc/mc/language/ka/)\n" "Language: ka\n" @@ -1881,6 +1881,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2101,6 +2104,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2161,6 +2170,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2433,12 +2445,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2890,6 +2896,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "&ინფო" + +msgid "&Tree" +msgstr "&ხე" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "" + +msgid "&Filter..." +msgstr "" + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "" + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "S&FTP ბმა..." + +msgid "SM&B link..." +msgstr "" + +msgid "Paneli&ze" +msgstr "&პანელში" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "&ჩვენება" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "გა&ფილტრული ხედი" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "&დირექტორიების ხე" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "ფა&ილების შედარება" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "" + +msgid "&Listing format edit" +msgstr "" + +msgid "Edit &extension file" +msgstr "" + +msgid "Edit &menu file" +msgstr "" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&კონფიგურაცია" + +msgid "&Layout..." +msgstr "გან&ლაგება..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "" + +msgid "&Virtual FS..." +msgstr "&ვირტუალური FS..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "მარ&ცხნივ" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "მარ&ჯვნივ" + +msgid "ButtonBar|Menu" +msgstr "მენიუ" + +msgid "ButtonBar|View" +msgstr "ნახვა" + +msgid "ButtonBar|RenMov" +msgstr "გადატანა" + +msgid "ButtonBar|Mkdir" +msgstr "დირ. შექმნა" + msgid "&Chdir" msgstr "" @@ -2936,9 +3161,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&ხე" - msgid "Find File" msgstr "" @@ -3193,222 +3415,6 @@ msgid "Layout" msgstr "განლაგება" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "&ინფო" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "" - -msgid "&Filter..." -msgstr "" - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "" - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "S&FTP ბმა..." - -msgid "SM&B link..." -msgstr "" - -msgid "Paneli&ze" -msgstr "&პანელში" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "&ჩვენება" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "გა&ფილტრული ხედი" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "&დირექტორიების ხე" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "ფა&ილების შედარება" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "" - -msgid "&Listing format edit" -msgstr "" - -msgid "Edit &extension file" -msgstr "" - -msgid "Edit &menu file" -msgstr "" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&კონფიგურაცია" - -msgid "&Layout..." -msgstr "გან&ლაგება..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "" - -msgid "&Virtual FS..." -msgstr "&ვირტუალური FS..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "მარ&ცხნივ" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "მარ&ჯვნივ" - -msgid "ButtonBar|Menu" -msgstr "მენიუ" - -msgid "ButtonBar|View" -msgstr "ნახვა" - -msgid "ButtonBar|RenMov" -msgstr "გადატანა" - -msgid "ButtonBar|Mkdir" -msgstr "დირ. შექმნა" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/kk.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/kk.gmo differ diff -Nru mc-4.8.25/po/kk.po mc-4.8.26/po/kk.po --- mc-4.8.25/po/kk.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/kk.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Kazakh (http://www.transifex.com/mc/mc/language/kk/)\n" "Language: kk\n" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,523 +2893,523 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ko.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ko.gmo differ diff -Nru mc-4.8.25/po/ko.po mc-4.8.26/po/ko.po --- mc-4.8.25/po/ko.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ko.po 2021-01-21 17:18:34.000000000 +0000 @@ -3,16 +3,16 @@ # This file is distributed under the same license as the mc package. # # Translators: -# MarongHappy , 2019-2020 +# Bruce Lee , 2019-2020 # JinYeong Bak , 2016 -# MarongHappy , 2019 +# Bruce Lee , 2019-2020 # Slava Zanko , 2011 msgid "" msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Korean (http://www.transifex.com/mc/mc/language/ko/)\n" "Language: ko\n" @@ -1825,6 +1825,8 @@ "Not an xterm or Linux console;\n" "the subshell cannot be toggled." msgstr "" +"xterm 또는 Linux 콘솔이 아님;\n" +"subshell은 토글할 수 없습니다." msgid "Type 'exit' to return to the Midnight Commander" msgstr "미드나잇 커맨더로 돌아가려면 'exit'를 입력하십시오." @@ -1852,7 +1854,7 @@ #, c-format msgid "Permissions (octal): %o" -msgstr "" +msgstr "사용권한 (octal): %o" msgid "Chown advanced command" msgstr "Chown 고급 명령어" @@ -1978,6 +1980,9 @@ msgid "Skin:" msgstr "스킨:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "외형" @@ -2201,77 +2206,88 @@ msgid "SMB authentication" msgstr "SMB 인증" -msgid "Secure deletion" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" msgstr "" +"\"%s\"로 디렉토리 변경할 수 없음\n" +"%s" + +msgid "Secure deletion" +msgstr "안전한 삭제" msgid "Undelete" -msgstr "" +msgstr "삭제취소" msgid "Synchronous updates" -msgstr "" +msgstr "동기 업데이트" msgid "Synchronous directory updates" -msgstr "" +msgstr "동기 디렉토리 업데이트" msgid "Immutable" -msgstr "" +msgstr "불변" msgid "Append only" -msgstr "" +msgstr "첨부 만" msgid "No dump" -msgstr "" +msgstr "덤프 없음" msgid "No update atime" -msgstr "" +msgstr "한 번에 업데이트 없음" msgid "Compress" -msgstr "" +msgstr "압축" msgid "Compressed clusters" -msgstr "" +msgstr "압축된 클러스터" msgid "Compressed dirty file" -msgstr "" +msgstr "압축된 더티 파일" msgid "Compression raw access" -msgstr "" +msgstr "압축 원시 액세스" msgid "Encrypted inode" -msgstr "" +msgstr "암호화된 inode" msgid "Journaled data" -msgstr "" +msgstr "저널링된 데이터" msgid "Indexed directory" -msgstr "" +msgstr "색인된 디렉토리" msgid "No tail merging" -msgstr "" +msgstr "꼬리 병합 없음" msgid "Top of directory hierarchies" -msgstr "" +msgstr "최상위 디렉토리 계층" msgid "Inode uses extents" -msgstr "" +msgstr "Inode는 extents를 사용합니다" msgid "Huge_file" -msgstr "" +msgstr "대용량_파일" msgid "No COW" +msgstr "COW 없음" + +msgid "Direct access for files" msgstr "" msgid "Casefolded file" -msgstr "" +msgstr "대소문자 구분 파일" msgid "Inode has inline data" -msgstr "" +msgstr "Inode에 inline 데이터가 있습니다" msgid "Project hierarchy" -msgstr "" +msgstr "프로젝트 계층" msgid "Verity protected inode" -msgstr "" +msgstr "Verity가 inode로 보호됨" msgid "&Marked all" msgstr "모두 표시됨(&M)" @@ -2283,22 +2299,26 @@ msgstr "표시됨 지우기(&L)" msgid "Chattr command" -msgstr "" +msgstr "Chattr 명령" #, c-format msgid "" "Cannot chattr \"%s\"\n" "%s" msgstr "" +"\"%s\" 속성 변경을 할 수 없음\n" +"%s" msgid "Cannot change attributes on non-local filesystems" -msgstr "" +msgstr "로컬이 아닌 파일 시스템의 속성을 변경할 수 없습니다" #, c-format msgid "" "Cannot get flags of \"%s\"\n" "%s" msgstr "" +"\"%s\" 플래그를 가져올 수 없음\n" +"%s" msgid "set &user ID on execution" msgstr "실행 시 사용자 ID 설정(&U)" @@ -2537,14 +2557,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "로컬이 아닌 파일 시스템에서 명령을 실행할 수 없음" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"\"%s\"로 디렉토리 변경할 수 없음\n" -"%s" - msgid "Parameter" msgstr "매개변수" @@ -3079,6 +3091,224 @@ msgid "Invalid source pattern '%s'" msgstr "잘못된 소스 패턴 '%s'" +msgid "File listin&g" +msgstr "전체 파일 목록(&G)" + +msgid "&Quick view" +msgstr "빠른 보기(&Q)" + +msgid "&Info" +msgstr "정보(&I)" + +msgid "&Tree" +msgstr "트리구조(&T)" + +msgid "&Listing format..." +msgstr "목록 형식(&L)..." + +msgid "&Sort order..." +msgstr "정렬 순서(&S)..." + +msgid "&Filter..." +msgstr "필터(&F)..." + +msgid "&Encoding..." +msgstr "인코딩(&E)..." + +msgid "FT&P link..." +msgstr "FTP 링크(&P)..." + +msgid "S&hell link..." +msgstr "쉘 링크(&H)..." + +msgid "S&FTP link..." +msgstr "SFTP 링크(&F)..." + +msgid "SM&B link..." +msgstr "SMB 링크(&B)..." + +msgid "Paneli&ze" +msgstr "패널 크기조정" + +msgid "&Rescan" +msgstr "재검색(&R)" + +msgid "&View" +msgstr "보기(&V)" + +msgid "Vie&w file..." +msgstr "파일 보기(&W)..." + +msgid "&Filtered view" +msgstr "필터링됨 보기(&F)" + +msgid "&Copy" +msgstr "복사(&C)" + +msgid "C&hmod" +msgstr "파일 사용 권한 변경(&H)" + +msgid "&Link" +msgstr "링크(&L)" + +msgid "&Symlink" +msgstr "심링크(&S)" + +msgid "Relative symlin&k" +msgstr "상대 심링크(&K)" + +msgid "Edit s&ymlink" +msgstr "심링크 편집(&Y)" + +msgid "Ch&own" +msgstr "파일 소유자 변경 (&O)" + +msgid "&Advanced chown" +msgstr "고급 파일 소유자 변경(&A)" + +msgid "Cha&ttr" +msgstr "속성 변경(&T)" + +msgid "&Rename/Move" +msgstr "이름변경/이동(&R)" + +msgid "&Mkdir" +msgstr "디렉토리 만들기(&M)" + +msgid "&Quick cd" +msgstr "빠른 디렉토리 변경(&Q)" + +msgid "Select &group" +msgstr "그룹 선택(&G)" + +msgid "U&nselect group" +msgstr "그룹 선택해제(&N)" + +msgid "&Invert selection" +msgstr "선택 반전(&I)" + +msgid "E&xit" +msgstr "종료(&X)" + +msgid "&User menu" +msgstr "사용자 메뉴(&U)" + +msgid "&Directory tree" +msgstr "디렉터리 트리구조(&D)" + +msgid "&Find file" +msgstr "파일 찾기(&F)" + +msgid "S&wap panels" +msgstr "스왑 패널(&W)" + +msgid "Switch &panels on/off" +msgstr "패널 스위치 켜기/끄기(&P)" + +msgid "&Compare directories" +msgstr "디렉터리 비교(&C)" + +msgid "C&ompare files" +msgstr "파일 비교(&O)" + +msgid "E&xternal panelize" +msgstr "기타 패널 크기조정(&X)" + +msgid "Show directory s&izes" +msgstr "디렉터리 크기 보기(&I)" + +msgid "Command &history" +msgstr "명령 기록(&H)" + +msgid "Viewed/edited files hi&story" +msgstr "보기/편집된 파일 기록(&s)" + +msgid "Di&rectory hotlist" +msgstr "디렉터리 단축목록(&R)" + +msgid "&Active VFS list" +msgstr "활성 VFS 목록(&A)" + +msgid "&Background jobs" +msgstr "백그라운드 작업(&B)" + +msgid "Screen lis&t" +msgstr "화면 목록(&T)" + +msgid "&Undelete files (ext2fs only)" +msgstr "파일 삭제취소 (est2fs만 가능)(&U)" + +msgid "&Listing format edit" +msgstr "파일 목록 형식 편집(&L)" + +msgid "Edit &extension file" +msgstr "파일 확장자 편집(&E)" + +msgid "Edit &menu file" +msgstr "메뉴 파일 편집(&M)" + +msgid "Edit hi&ghlighting group file" +msgstr "강조 표시 그룹 파일 편집(&G)" + +msgid "&Configuration..." +msgstr "환경설정(&C)..." + +msgid "&Layout..." +msgstr "레이아웃(&L)..." + +msgid "&Panel options..." +msgstr "패널 옵션(&P)" + +msgid "C&onfirmation..." +msgstr "확인(&O)..." + +msgid "&Appearance..." +msgstr "외형(&A)..." + +msgid "&Display bits..." +msgstr "비트 표시(&D)..." + +msgid "&Virtual FS..." +msgstr "가상 파일시스템(&V)..." + +msgid "Panels:" +msgstr "패널:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "%zu 화면이 열려 있습니다. 그래도 끝낼까요?" + +msgid "The Midnight Commander" +msgstr "미드나잇 커맨더" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "미드나잇 커맨더를 절말로 끝내시겠습니까?" + +msgid "&Above" +msgstr "이상(&A)" + +msgid "&Left" +msgstr "왼쪽(&L)" + +msgid "&Below" +msgstr "아래(&B)" + +msgid "&Right" +msgstr "오른쪽(&R)" + +msgid "ButtonBar|Menu" +msgstr "버튼바|메뉴" + +msgid "ButtonBar|View" +msgstr "버튼바|보기" + +msgid "ButtonBar|RenMov" +msgstr "버튼바|이름변경/이동" + +msgid "ButtonBar|Mkdir" +msgstr "버튼바|디렉만들기" + msgid "&Chdir" msgstr "디렉터리 이동(&C)" @@ -3125,9 +3355,6 @@ msgid "Fir&st hit" msgstr "먼저 하기(&S)" -msgid "&Tree" -msgstr "트리구조(&T)" - msgid "Find File" msgstr "파일 찾기" @@ -3328,14 +3555,14 @@ msgstr "링크: %d" msgid "Attributes: not supported" -msgstr "" +msgstr "속성: 지원되지 않음" #, c-format msgid "Attributes: %s" -msgstr "" +msgstr "속성: %s" msgid "Attributes: unavailable" -msgstr "" +msgstr "속성: 사용할 수 없음" #, c-format msgid "Mode: %s (%04o)" @@ -3384,221 +3611,6 @@ msgid "Layout" msgstr "레이아웃" -msgid "File listin&g" -msgstr "전체 파일 목록(&G)" - -msgid "&Quick view" -msgstr "빠른 보기(&Q)" - -msgid "&Info" -msgstr "정보(&I)" - -msgid "&Listing format..." -msgstr "목록 형식(&L)..." - -msgid "&Sort order..." -msgstr "정렬 순서(&S)..." - -msgid "&Filter..." -msgstr "필터(&F)..." - -msgid "&Encoding..." -msgstr "인코딩(&E)..." - -msgid "FT&P link..." -msgstr "FTP 링크(&P)..." - -msgid "S&hell link..." -msgstr "쉘 링크(&H)..." - -msgid "S&FTP link..." -msgstr "SFTP 링크(&F)..." - -msgid "SM&B link..." -msgstr "SMB 링크(&B)..." - -msgid "Paneli&ze" -msgstr "패널 크기조정" - -msgid "&Rescan" -msgstr "재검색(&R)" - -msgid "&View" -msgstr "보기(&V)" - -msgid "Vie&w file..." -msgstr "파일 보기(&W)..." - -msgid "&Filtered view" -msgstr "필터링됨 보기(&F)" - -msgid "&Copy" -msgstr "복사(&C)" - -msgid "C&hmod" -msgstr "파일 사용 권한 변경(&H)" - -msgid "&Link" -msgstr "링크(&L)" - -msgid "&Symlink" -msgstr "심링크(&S)" - -msgid "Relative symlin&k" -msgstr "상대 심링크(&K)" - -msgid "Edit s&ymlink" -msgstr "심링크 편집(&Y)" - -msgid "Ch&own" -msgstr "파일 소유자 변경 (&O)" - -msgid "&Advanced chown" -msgstr "고급 파일 소유자 변경(&A)" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "이름변경/이동(&R)" - -msgid "&Mkdir" -msgstr "디렉토리 만들기(&M)" - -msgid "&Quick cd" -msgstr "빠른 디렉토리 변경(&Q)" - -msgid "Select &group" -msgstr "그룹 선택(&G)" - -msgid "U&nselect group" -msgstr "그룹 선택해제(&N)" - -msgid "&Invert selection" -msgstr "선택 반전(&I)" - -msgid "E&xit" -msgstr "종료(&X)" - -msgid "&User menu" -msgstr "사용자 메뉴(&U)" - -msgid "&Directory tree" -msgstr "디렉터리 트리구조(&D)" - -msgid "&Find file" -msgstr "파일 찾기(&F)" - -msgid "S&wap panels" -msgstr "스왑 패널(&W)" - -msgid "Switch &panels on/off" -msgstr "패널 스위치 켜기/끄기(&P)" - -msgid "&Compare directories" -msgstr "디렉터리 비교(&C)" - -msgid "C&ompare files" -msgstr "파일 비교(&O)" - -msgid "E&xternal panelize" -msgstr "기타 패널 크기조정(&X)" - -msgid "Show directory s&izes" -msgstr "디렉터리 크기 보기(&I)" - -msgid "Command &history" -msgstr "명령 기록(&H)" - -msgid "Viewed/edited files hi&story" -msgstr "보기/편집된 파일 기록(&s)" - -msgid "Di&rectory hotlist" -msgstr "디렉터리 단축목록(&R)" - -msgid "&Active VFS list" -msgstr "활성 VFS 목록(&A)" - -msgid "&Background jobs" -msgstr "백그라운드 작업(&B)" - -msgid "Screen lis&t" -msgstr "화면 목록(&T)" - -msgid "&Undelete files (ext2fs only)" -msgstr "파일 삭제취소 (est2fs만 가능)(&U)" - -msgid "&Listing format edit" -msgstr "파일 목록 형식 편집(&L)" - -msgid "Edit &extension file" -msgstr "파일 확장자 편집(&E)" - -msgid "Edit &menu file" -msgstr "메뉴 파일 편집(&M)" - -msgid "Edit hi&ghlighting group file" -msgstr "강조 표시 그룹 파일 편집(&G)" - -msgid "&Configuration..." -msgstr "환경설정(&C)..." - -msgid "&Layout..." -msgstr "레이아웃(&L)..." - -msgid "&Panel options..." -msgstr "패널 옵션(&P)" - -msgid "C&onfirmation..." -msgstr "확인(&O)..." - -msgid "&Appearance..." -msgstr "외형(&A)..." - -msgid "&Display bits..." -msgstr "비트 표시(&D)..." - -msgid "&Virtual FS..." -msgstr "가상 파일시스템(&V)..." - -msgid "Panels:" -msgstr "패널:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "%zu 화면이 열려 있습니다. 그래도 끝낼까요?" - -msgid "The Midnight Commander" -msgstr "미드나잇 커맨더" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "미드나잇 커맨더를 절말로 끝내시겠습니까?" - -msgid "&Above" -msgstr "이상(&A)" - -msgid "&Left" -msgstr "왼쪽(&L)" - -msgid "&Below" -msgstr "아래(&B)" - -msgid "&Right" -msgstr "오른쪽(&R)" - -msgid "ButtonBar|Menu" -msgstr "버튼바|메뉴" - -msgid "ButtonBar|View" -msgstr "버튼바|보기" - -msgid "ButtonBar|RenMov" -msgstr "버튼바|이름변경/이동" - -msgid "ButtonBar|Mkdir" -msgstr "버튼바|디렉만들기" - msgid "Memory exhausted!" msgstr "메모리 소진됨!" @@ -4006,7 +4018,7 @@ msgstr "다중 코드페이지 지원 포함" msgid "With ext2fs attributes support" -msgstr "" +msgstr "ext2fs 속성 지원" #, c-format msgid "Built with GLib %d.%d.%d\n" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/lt.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/lt.gmo differ diff -Nru mc-4.8.25/po/lt.po mc-4.8.26/po/lt.po --- mc-4.8.25/po/lt.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/lt.po 2021-01-21 17:18:34.000000000 +0000 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Lithuanian (http://www.transifex.com/mc/mc/language/lt/)\n" "Language: lt\n" @@ -1936,6 +1936,9 @@ msgid "Skin:" msgstr "Išvaizda" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Išvaizda" @@ -2159,6 +2162,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2219,6 +2228,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2491,12 +2503,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "Parametras" @@ -2978,6 +2984,227 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "Greitasis rodymas" + +msgid "&Info" +msgstr "&Informacija" + +msgid "&Tree" +msgstr "&Medis" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "Rik. t&varka..." + +msgid "&Filter..." +msgstr "&Filtras..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "FT&P ryšys..." + +msgid "S&hell link..." +msgstr "Apli&nkos ryšys..." + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SM&B ryšys..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "&Rodymas" + +msgid "Vie&w file..." +msgstr "&Peržiūrėti failą..." + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "&Kopijuoti" + +msgid "C&hmod" +msgstr "Leidimai (c&hmod)" + +msgid "&Link" +msgstr "&Nuoroda" + +msgid "&Symlink" +msgstr "Simbolinė nuoroda" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "Keisti savininką (ch&own)" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Pe&rvadinti/Perkelti" + +msgid "&Mkdir" +msgstr "Mkdir" + +msgid "&Quick cd" +msgstr "Greitas cd" + +msgid "Select &group" +msgstr "Pasirinkti &grupę" + +msgid "U&nselect group" +msgstr "Šali&nti iš parinktųjų grupės" + +msgid "&Invert selection" +msgstr "Atv&irkštinis pasirinkimas" + +msgid "E&xit" +msgstr "Išeiti" + +msgid "&User menu" +msgstr "Vartotojo meni&u" + +msgid "&Directory tree" +msgstr "&Aplankų medis" + +msgid "&Find file" +msgstr "&Rasti failą" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "Palyginti katalogus" + +msgid "C&ompare files" +msgstr "Palyginti failus" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "Rodyti aplankų dydžius" + +msgid "Command &history" +msgstr "Komandų istorija" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "Aplankų są&rašas" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "&Foninio režimo užduotys" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "Atk&urti failus (tik ext2fs)" + +msgid "&Listing format edit" +msgstr "Keisti r&odymo formatą" + +msgid "Edit &extension file" +msgstr "K&eisti plėtinių failą" + +msgid "Edit &menu file" +msgstr "Keisti &meniu failą" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "Konfigūra&cija..." + +msgid "&Layout..." +msgstr "&Išdėstymas..." + +msgid "&Panel options..." +msgstr "Skydelio &parinktys..." + +msgid "C&onfirmation..." +msgstr "Patvirtinimas..." + +msgid "&Appearance..." +msgstr "Išvaizda..." + +msgid "&Display bits..." +msgstr "Iš&vesties bitai..." + +msgid "&Virtual FS..." +msgstr "&Virtuali failų sistema..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "&Viršuj" + +msgid "&Left" +msgstr "Kairė" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "Dešinė" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Rodyt" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Perkelt" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Kurt-Aplanką" + msgid "&Chdir" msgstr "&Eiti į katal." @@ -3024,9 +3251,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Medis" - msgid "Find File" msgstr "Rasti failą" @@ -3287,224 +3511,6 @@ msgid "Layout" msgstr "Išdėstymas" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "Greitasis rodymas" - -msgid "&Info" -msgstr "&Informacija" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "Rik. t&varka..." - -msgid "&Filter..." -msgstr "&Filtras..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "FT&P ryšys..." - -msgid "S&hell link..." -msgstr "Apli&nkos ryšys..." - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SM&B ryšys..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "&Rodymas" - -msgid "Vie&w file..." -msgstr "&Peržiūrėti failą..." - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "&Kopijuoti" - -msgid "C&hmod" -msgstr "Leidimai (c&hmod)" - -msgid "&Link" -msgstr "&Nuoroda" - -msgid "&Symlink" -msgstr "Simbolinė nuoroda" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "Keisti savininką (ch&own)" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Pe&rvadinti/Perkelti" - -msgid "&Mkdir" -msgstr "Mkdir" - -msgid "&Quick cd" -msgstr "Greitas cd" - -msgid "Select &group" -msgstr "Pasirinkti &grupę" - -msgid "U&nselect group" -msgstr "Šali&nti iš parinktųjų grupės" - -msgid "&Invert selection" -msgstr "Atv&irkštinis pasirinkimas" - -msgid "E&xit" -msgstr "Išeiti" - -msgid "&User menu" -msgstr "Vartotojo meni&u" - -msgid "&Directory tree" -msgstr "&Aplankų medis" - -msgid "&Find file" -msgstr "&Rasti failą" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "Palyginti katalogus" - -msgid "C&ompare files" -msgstr "Palyginti failus" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "Rodyti aplankų dydžius" - -msgid "Command &history" -msgstr "Komandų istorija" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "Aplankų są&rašas" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "&Foninio režimo užduotys" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "Atk&urti failus (tik ext2fs)" - -msgid "&Listing format edit" -msgstr "Keisti r&odymo formatą" - -msgid "Edit &extension file" -msgstr "K&eisti plėtinių failą" - -msgid "Edit &menu file" -msgstr "Keisti &meniu failą" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "Konfigūra&cija..." - -msgid "&Layout..." -msgstr "&Išdėstymas..." - -msgid "&Panel options..." -msgstr "Skydelio &parinktys..." - -msgid "C&onfirmation..." -msgstr "Patvirtinimas..." - -msgid "&Appearance..." -msgstr "Išvaizda..." - -msgid "&Display bits..." -msgstr "Iš&vesties bitai..." - -msgid "&Virtual FS..." -msgstr "&Virtuali failų sistema..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "&Viršuj" - -msgid "&Left" -msgstr "Kairė" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "Dešinė" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Rodyt" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Perkelt" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Kurt-Aplanką" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/lv.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/lv.gmo differ diff -Nru mc-4.8.25/po/lv.po mc-4.8.26/po/lv.po --- mc-4.8.25/po/lv.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/lv.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Latvian (http://www.transifex.com/mc/mc/language/lv/)\n" "Language: lv\n" @@ -1882,6 +1882,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2102,6 +2105,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2162,6 +2171,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2434,12 +2446,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2891,6 +2897,226 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "&Koks" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "&Kārtotā secībā..." + +msgid "&Filter..." +msgstr "&Filtrs..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "FT&P saite..." + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SM&B saite..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "&Direktoriju koks" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Atjaunot izdzēstos failus (ext2fs tikai)" + +msgid "&Listing format edit" +msgstr "&Saraksta formāta rediģēšana" + +msgid "Edit &extension file" +msgstr "&Paplašinājumu faila rediģēšana" + +msgid "Edit &menu file" +msgstr "&Izvēlnes faila rediģēšana" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Konfigurācija..." + +msgid "&Layout..." +msgstr "&Izkārtojums..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "&Displeja biti..." + +msgid "&Virtual FS..." +msgstr "&Virtuālā FS..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "&Chdir" @@ -2937,9 +3163,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Koks" - msgid "Find File" msgstr "Atrast Failu" @@ -3196,223 +3419,6 @@ msgid "Layout" msgstr "Izkārtojums" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "&Kārtotā secībā..." - -msgid "&Filter..." -msgstr "&Filtrs..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "FT&P saite..." - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SM&B saite..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "&Direktoriju koks" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Atjaunot izdzēstos failus (ext2fs tikai)" - -msgid "&Listing format edit" -msgstr "&Saraksta formāta rediģēšana" - -msgid "Edit &extension file" -msgstr "&Paplašinājumu faila rediģēšana" - -msgid "Edit &menu file" -msgstr "&Izvēlnes faila rediģēšana" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Konfigurācija..." - -msgid "&Layout..." -msgstr "&Izkārtojums..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "&Displeja biti..." - -msgid "&Virtual FS..." -msgstr "&Virtuālā FS..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" diff -Nru mc-4.8.25/po/mc.pot mc-4.8.26/po/mc.pot --- mc-4.8.25/po/mc.pot 2020-07-12 20:21:59.000000000 +0000 +++ mc-4.8.26/po/mc.pot 2021-01-21 17:18:29.000000000 +0000 @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: mc 4.8.25\n" +"Project-Id-Version: mc 4.8.26\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgid "Warning: cannot load codepages list" msgstr "" -#: lib/charsets.c:220 src/filemanager/boxes.c:354 +#: lib/charsets.c:220 src/filemanager/boxes.c:388 msgid "7-bit ASCII" msgstr "" @@ -144,7 +144,7 @@ msgid "Invalid token number %d" msgstr "" -#: lib/search/regex.c:339 lib/search/regex.c:834 src/filemanager/ext.c:744 +#: lib/search/regex.c:339 lib/search/regex.c:834 src/filemanager/ext.c:746 msgid "Regular expression error" msgstr "" @@ -152,7 +152,7 @@ msgid "No&rmal" msgstr "" -#: lib/search/search.c:54 src/filemanager/find.c:589 +#: lib/search/search.c:54 src/filemanager/find.c:587 msgid "Re&gular expression" msgstr "" @@ -587,11 +587,11 @@ msgid "Shift" msgstr "" -#: lib/tty/tty.c:105 +#: lib/tty/tty.c:106 msgid "The TERM environment variable is unset!\n" msgstr "" -#: lib/tty/tty.c:194 +#: lib/tty/tty.c:195 msgid "Cannot check SIGWINCH pipe" msgstr "" @@ -623,31 +623,31 @@ "Check the TERM environment variable.\n" msgstr "" -#: lib/util.c:350 +#: lib/util.c:349 msgid "B" msgstr "" -#: lib/util.c:355 +#: lib/util.c:354 msgid "kB" msgstr "" -#: lib/util.c:355 +#: lib/util.c:354 msgid "KiB" msgstr "" -#: lib/util.c:360 +#: lib/util.c:359 msgid "MB" msgstr "" -#: lib/util.c:360 +#: lib/util.c:359 msgid "MiB" msgstr "" -#: lib/util.c:365 +#: lib/util.c:364 msgid "GB" msgstr "" -#: lib/util.c:365 +#: lib/util.c:364 msgid "GiB" msgstr "" @@ -673,87 +673,87 @@ "%s" msgstr "" -#: lib/utilunix.c:719 lib/utilunix.c:724 lib/utilunix.c:781 +#: lib/utilunix.c:721 lib/utilunix.c:727 lib/utilunix.c:786 #: src/editor/edit.c:358 src/editor/editcmd.c:231 src/editor/editcmd.c:254 -#: src/editor/editcmd.c:425 src/editor/editcmd.c:585 src/editor/editcmd.c:1705 -#: src/editor/editcmd.c:3451 src/editor/editcmd.c:3480 +#: src/editor/editcmd.c:425 src/editor/editcmd.c:585 src/editor/editcmd.c:1706 +#: src/editor/editcmd.c:3453 src/editor/editcmd.c:3482 #: src/editor/editcmd_dialogs.c:474 src/execute.c:135 -#: src/filemanager/file.c:2401 src/filemanager/panel.c:4509 src/help.c:362 -#: src/main.c:414 src/main.c:458 src/subshell/common.c:1219 +#: src/filemanager/file.c:2390 src/filemanager/panel.c:4510 src/help.c:362 +#: src/main.c:410 src/main.c:454 src/subshell/common.c:1605 #: src/viewer/actions_cmd.c:461 msgid "Warning" msgstr "" -#: lib/utilunix.c:719 src/filemanager/ext.c:726 +#: lib/utilunix.c:721 src/filemanager/ext.c:728 msgid "Pipe failed" msgstr "" -#: lib/utilunix.c:724 +#: lib/utilunix.c:727 msgid "Dup failed" msgstr "" -#: lib/utilunix.c:789 +#: lib/utilunix.c:794 msgid "Error dup'ing old error pipe" msgstr "" -#: lib/vfs/direntry.c:272 +#: lib/vfs/direntry.c:271 #, c-format msgid "Directory cache expired for %s" msgstr "" -#: lib/vfs/direntry.c:710 +#: lib/vfs/direntry.c:709 #, c-format msgid "%s: %s: %s %3d%% (%lld) bytes transferred" msgstr "" -#: lib/vfs/direntry.c:713 +#: lib/vfs/direntry.c:712 #, c-format msgid "%s: %s: %s %lld bytes transferred" msgstr "" -#: lib/vfs/direntry.c:1376 +#: lib/vfs/direntry.c:1375 msgid "Starting linear transfer..." msgstr "" -#: lib/vfs/direntry.c:1476 +#: lib/vfs/direntry.c:1475 msgid "Getting file" msgstr "" -#: lib/vfs/interface.c:175 +#: lib/vfs/interface.c:173 msgid "Changes to file lost" msgstr "" -#: lib/vfs/interface.c:857 +#: lib/vfs/interface.c:840 #, c-format msgid "%s is not a directory\n" msgstr "" -#: lib/vfs/interface.c:859 +#: lib/vfs/interface.c:842 #, c-format msgid "Directory %s is not owned by you\n" msgstr "" -#: lib/vfs/interface.c:861 +#: lib/vfs/interface.c:844 #, c-format msgid "Cannot set correct permissions for directory %s\n" msgstr "" -#: lib/vfs/interface.c:866 +#: lib/vfs/interface.c:849 #, c-format msgid "Cannot create temporary directory %s: %s\n" msgstr "" -#: lib/vfs/interface.c:900 +#: lib/vfs/interface.c:883 #, c-format msgid "Temporary files will be created in %s\n" msgstr "" -#: lib/vfs/interface.c:906 +#: lib/vfs/interface.c:889 #, c-format msgid "Temporary files will not be created\n" msgstr "" -#: lib/vfs/interface.c:911 src/execute.c:337 +#: lib/vfs/interface.c:894 src/execute.c:337 msgid "Press any key to continue..." msgstr "" @@ -769,7 +769,7 @@ msgid "Internal error:" msgstr "" -#: lib/vfs/utilvfs.c:365 src/filemanager/boxes.c:1309 +#: lib/vfs/utilvfs.c:365 src/filemanager/boxes.c:1350 msgid "Password:" msgstr "" @@ -791,51 +791,51 @@ msgstr "" #: lib/widget/listbox.c:320 src/diffviewer/ydiff.c:3089 src/editor/edit.c:358 -#: src/editor/editcmd.c:233 src/editor/editcmd.c:256 src/editor/editcmd.c:2861 -#: src/editor/editcmd.c:2867 src/filemanager/cmd.c:139 -#: src/filemanager/file.c:968 src/filemanager/file.c:1965 -#: src/filemanager/filegui.c:458 src/filemanager/hotlist.c:1158 -#: src/filemanager/hotlist.c:1175 src/filemanager/midnight.c:1069 -#: src/filemanager/midnight.c:1077 src/filemanager/panel.c:2823 -#: src/filemanager/tree.c:834 src/subshell/common.c:1221 +#: src/editor/editcmd.c:233 src/editor/editcmd.c:256 src/editor/editcmd.c:2863 +#: src/editor/editcmd.c:2869 src/filemanager/cmd.c:140 +#: src/filemanager/file.c:959 src/filemanager/file.c:1956 +#: src/filemanager/filegui.c:458 src/filemanager/filemanager.c:1062 +#: src/filemanager/filemanager.c:1070 src/filemanager/hotlist.c:1159 +#: src/filemanager/hotlist.c:1176 src/filemanager/panel.c:2819 +#: src/filemanager/tree.c:829 src/subshell/common.c:1607 #: src/viewer/actions_cmd.c:661 src/viewer/actions_cmd.c:667 #: src/viewer/search.c:398 msgid "&Yes" msgstr "" #: lib/widget/listbox.c:320 src/diffviewer/ydiff.c:3089 src/editor/edit.c:358 -#: src/editor/editcmd.c:233 src/editor/editcmd.c:2861 src/editor/editcmd.c:2867 -#: src/filemanager/cmd.c:139 src/filemanager/file.c:968 -#: src/filemanager/file.c:1965 src/filemanager/filegui.c:460 -#: src/filemanager/hotlist.c:1158 src/filemanager/hotlist.c:1175 -#: src/filemanager/midnight.c:1069 src/filemanager/midnight.c:1077 -#: src/filemanager/panel.c:2823 src/filemanager/tree.c:834 -#: src/subshell/common.c:1221 src/viewer/actions_cmd.c:661 +#: src/editor/editcmd.c:233 src/editor/editcmd.c:2863 src/editor/editcmd.c:2869 +#: src/filemanager/cmd.c:140 src/filemanager/file.c:959 +#: src/filemanager/file.c:1956 src/filemanager/filegui.c:460 +#: src/filemanager/filemanager.c:1062 src/filemanager/filemanager.c:1070 +#: src/filemanager/hotlist.c:1159 src/filemanager/hotlist.c:1176 +#: src/filemanager/panel.c:2819 src/filemanager/tree.c:829 +#: src/subshell/common.c:1607 src/viewer/actions_cmd.c:661 #: src/viewer/actions_cmd.c:667 src/viewer/search.c:399 msgid "&No" msgstr "" -#: lib/widget/quick.h:215 src/editor/editcmd.c:2728 +#: lib/widget/quick.h:215 src/editor/editcmd.c:2730 #: src/editor/editcmd_dialogs.c:121 src/editor/editwidget.c:151 -#: src/filemanager/boxes.c:1230 src/filemanager/filegui.c:1357 -#: src/filemanager/find.c:597 src/filemanager/layout.c:508 src/main.c:417 +#: src/filemanager/boxes.c:1271 src/filemanager/filegui.c:1357 +#: src/filemanager/find.c:595 src/filemanager/layout.c:508 src/main.c:413 msgid "&OK" msgstr "" #: lib/widget/quick.h:216 src/editor/editcmd.c:233 src/editor/editcmd.c:256 -#: src/editor/editcmd.c:427 src/editor/editcmd.c:587 src/editor/editcmd.c:1706 -#: src/editor/editcmd.c:2047 src/editor/editcmd.c:2861 -#: src/editor/editcmd.c:3454 src/editor/editcmd.c:3483 +#: src/editor/editcmd.c:427 src/editor/editcmd.c:587 src/editor/editcmd.c:1707 +#: src/editor/editcmd.c:2049 src/editor/editcmd.c:2863 +#: src/editor/editcmd.c:3456 src/editor/editcmd.c:3485 #: src/editor/editcmd_dialogs.c:123 src/editor/editcmd_dialogs.c:282 #: src/editor/editcmd_dialogs.c:476 src/editor/spell_dialogs.c:100 -#: src/filemanager/achown.c:89 src/filemanager/achown.c:861 -#: src/filemanager/achown.c:896 src/filemanager/chattr.c:231 -#: src/filemanager/chattr.c:1100 src/filemanager/chmod.c:117 -#: src/filemanager/chmod.c:440 src/filemanager/chown.c:88 -#: src/filemanager/chown.c:312 src/filemanager/cmd.c:1147 -#: src/filemanager/filegui.c:1361 src/filemanager/find.c:597 -#: src/filemanager/hotlist.c:182 src/filemanager/hotlist.c:1014 -#: src/filemanager/hotlist.c:1076 src/filemanager/layout.c:509 +#: src/filemanager/achown.c:87 src/filemanager/achown.c:860 +#: src/filemanager/achown.c:895 src/filemanager/chattr.c:234 +#: src/filemanager/chattr.c:1105 src/filemanager/chmod.c:115 +#: src/filemanager/chmod.c:438 src/filemanager/chown.c:87 +#: src/filemanager/chown.c:311 src/filemanager/cmd.c:1146 +#: src/filemanager/filegui.c:1361 src/filemanager/find.c:595 +#: src/filemanager/hotlist.c:183 src/filemanager/hotlist.c:1015 +#: src/filemanager/hotlist.c:1077 src/filemanager/layout.c:509 #: src/filemanager/panelize.c:143 src/learn.c:258 src/viewer/hex.c:431 msgid "&Cancel" msgstr "" @@ -847,7 +847,7 @@ #: lib/widget/wtools.c:288 lib/widget/wtools.c:417 src/editor/edit.c:193 #: src/editor/edit.c:214 src/editor/edit.c:370 src/editor/edit.c:1977 #: src/editor/edit.c:1987 src/editor/editcmd.c:318 src/editor/editcmd.c:328 -#: src/editor/editcmd.c:371 src/editor/editcmd.c:2965 src/editor/spell.c:315 +#: src/editor/editcmd.c:371 src/editor/editcmd.c:2967 src/editor/spell.c:315 #: src/editor/spell.c:551 src/editor/spell.c:559 #: tests/src/execute__common.c:145 #: tests/src/execute__execute_with_vfs_arg.c:154 @@ -859,9 +859,9 @@ msgid "%s (%d)" msgstr "" -#: lib/widget/wtools.c:696 src/filemanager/file.c:847 -#: src/filemanager/file.c:921 src/filemanager/file.c:923 -#: src/filemanager/file.c:969 src/filemanager/file.c:3108 +#: lib/widget/wtools.c:696 src/filemanager/file.c:838 +#: src/filemanager/file.c:912 src/filemanager/file.c:914 +#: src/filemanager/file.c:960 src/filemanager/file.c:3077 #: src/filemanager/filegui.c:255 src/filemanager/filegui.c:482 msgid "&Abort" msgstr "" @@ -1047,12 +1047,12 @@ "as tickets at www.midnight-commander.org\n" msgstr "" -#: src/args.c:430 src/filemanager/midnight.c:1769 src/textconf.c:141 +#: src/args.c:430 src/filemanager/filemanager.c:1762 src/textconf.c:141 #, c-format msgid "GNU Midnight Commander %s\n" msgstr "" -#: src/args.c:683 src/filemanager/boxes.c:647 +#: src/args.c:683 src/filemanager/boxes.c:688 msgid "Main options" msgstr "" @@ -1080,7 +1080,7 @@ msgid "Reading failed" msgstr "" -#: src/background.c:219 src/filemanager/file.c:844 src/filemanager/file.c:916 +#: src/background.c:219 src/filemanager/file.c:835 src/filemanager/file.c:907 msgid "Background process error" msgstr "" @@ -1110,8 +1110,8 @@ msgstr "" #: src/diffviewer/search.c:92 src/editor/editcmd_dialogs.c:112 -#: src/editor/editcmd_dialogs.c:209 src/filemanager/boxes.c:640 -#: src/filemanager/boxes.c:845 src/filemanager/find.c:583 +#: src/editor/editcmd_dialogs.c:209 src/filemanager/boxes.c:681 +#: src/filemanager/boxes.c:886 src/filemanager/find.c:581 #: src/viewer/dialogs.c:97 msgid "Cas&e sensitive" msgstr "" @@ -1122,13 +1122,13 @@ msgstr "" #: src/diffviewer/search.c:94 src/editor/editcmd_dialogs.c:115 -#: src/editor/editcmd_dialogs.c:212 src/filemanager/find.c:594 +#: src/editor/editcmd_dialogs.c:212 src/filemanager/find.c:592 #: src/viewer/dialogs.c:99 msgid "&Whole words" msgstr "" #: src/diffviewer/search.c:96 src/editor/editcmd_dialogs.c:117 -#: src/editor/editcmd_dialogs.c:214 src/filemanager/find.c:581 +#: src/editor/editcmd_dialogs.c:214 src/filemanager/find.c:579 #: src/viewer/dialogs.c:101 msgid "&All charsets" msgstr "" @@ -1136,7 +1136,7 @@ #: src/diffviewer/search.c:106 src/diffviewer/search.c:229 #: src/diffviewer/search.c:242 src/diffviewer/search.c:275 #: src/editor/editcmd.c:960 src/editor/editcmd.c:986 src/editor/editcmd.c:1015 -#: src/editor/editcmd.c:2612 src/editor/editcmd.c:2623 +#: src/editor/editcmd.c:2614 src/editor/editcmd.c:2625 #: src/editor/editcmd_dialogs.c:130 src/viewer/dialogs.c:111 #: src/viewer/search.c:350 src/viewer/search.c:410 src/viewer/search.c:430 #: src/viewer/search.c:432 @@ -1225,13 +1225,13 @@ msgid "Goto line (right)" msgstr "" -#: src/diffviewer/ydiff.c:2934 src/editor/editcmd.c:3048 +#: src/diffviewer/ydiff.c:2934 src/editor/editcmd.c:3050 msgid "Enter line:" msgstr "" #: src/diffviewer/ydiff.c:2973 src/editor/editwidget.c:660 -#: src/filemanager/midnight.c:1656 src/filemanager/tree.c:1177 src/help.c:1165 -#: src/viewer/display.c:87 +#: src/filemanager/filemanager.c:1649 src/filemanager/tree.c:1172 +#: src/help.c:1165 src/viewer/display.c:87 msgid "ButtonBar|Help" msgstr "" @@ -1240,7 +1240,7 @@ msgid "ButtonBar|Save" msgstr "" -#: src/diffviewer/ydiff.c:2975 src/filemanager/midnight.c:1659 +#: src/diffviewer/ydiff.c:2975 src/filemanager/filemanager.c:1652 #: src/viewer/display.c:94 msgid "ButtonBar|Edit" msgstr "" @@ -1259,12 +1259,12 @@ msgstr "" #: src/diffviewer/ydiff.c:2979 src/editor/editwidget.c:669 -#: src/filemanager/midnight.c:1665 src/help.c:1174 src/viewer/display.c:118 +#: src/filemanager/filemanager.c:1658 src/help.c:1174 src/viewer/display.c:118 #: src/viewer/display.c:121 msgid "ButtonBar|Quit" msgstr "" -#: src/diffviewer/ydiff.c:3086 src/editor/editcmd.c:2867 +#: src/diffviewer/ydiff.c:3086 src/editor/editcmd.c:2869 #: src/viewer/actions_cmd.c:659 src/viewer/actions_cmd.c:665 msgid "Quit" msgstr "" @@ -1290,7 +1290,7 @@ msgstr "" #: src/diffviewer/ydiff.c:3576 src/diffviewer/ydiff.c:3593 -#: src/filemanager/file.c:1772 src/viewer/mcviewer.c:349 +#: src/filemanager/file.c:1763 src/viewer/mcviewer.c:349 #, c-format msgid "" "Cannot stat \"%s\"\n" @@ -1372,7 +1372,7 @@ msgid "Searching %s: %3d%%" msgstr "" -#: src/editor/editcmd.c:131 src/filemanager/find.c:1344 src/viewer/search.c:85 +#: src/editor/editcmd.c:131 src/filemanager/find.c:1327 src/viewer/search.c:85 #, c-format msgid "Searching %s" msgstr "" @@ -1404,8 +1404,8 @@ msgid "The file you are saving does not end with a newline." msgstr "" -#: src/editor/editcmd.c:427 src/editor/editcmd.c:587 src/editor/editcmd.c:3453 -#: src/editor/editcmd.c:3482 src/editor/editcmd_dialogs.c:476 +#: src/editor/editcmd.c:427 src/editor/editcmd.c:587 src/editor/editcmd.c:3455 +#: src/editor/editcmd.c:3484 src/editor/editcmd_dialogs.c:476 msgid "C&ontinue" msgstr "" @@ -1425,8 +1425,8 @@ msgid "&Macintosh format (CR)" msgstr "" -#: src/editor/editcmd.c:448 src/editor/editcmd.c:2069 src/editor/editcmd.c:3089 -#: src/editor/editcmd.c:3120 src/filemanager/cmd.c:750 +#: src/editor/editcmd.c:448 src/editor/editcmd.c:2071 src/editor/editcmd.c:3091 +#: src/editor/editcmd.c:3122 src/filemanager/cmd.c:751 msgid "Enter file name:" msgstr "" @@ -1438,264 +1438,264 @@ msgid "Save As" msgstr "" -#: src/editor/editcmd.c:1250 +#: src/editor/editcmd.c:1251 msgid "Collect completions" msgstr "" -#: src/editor/editcmd.c:1605 +#: src/editor/editcmd.c:1606 msgid "&Quick save" msgstr "" -#: src/editor/editcmd.c:1606 +#: src/editor/editcmd.c:1607 msgid "&Safe save" msgstr "" -#: src/editor/editcmd.c:1607 +#: src/editor/editcmd.c:1608 msgid "&Do backups with following extension:" msgstr "" -#: src/editor/editcmd.c:1626 +#: src/editor/editcmd.c:1627 msgid "Check &POSIX new line" msgstr "" -#: src/editor/editcmd.c:1634 +#: src/editor/editcmd.c:1635 msgid "Edit Save Mode" msgstr "" -#: src/editor/editcmd.c:1688 src/editor/editcmd.c:1747 +#: src/editor/editcmd.c:1689 src/editor/editcmd.c:1748 msgid "Save as" msgstr "" -#: src/editor/editcmd.c:1690 +#: src/editor/editcmd.c:1691 msgid "Cannot save: destination is not a regular file" msgstr "" -#: src/editor/editcmd.c:1706 +#: src/editor/editcmd.c:1707 msgid "A file already exists with this name" msgstr "" -#: src/editor/editcmd.c:1706 +#: src/editor/editcmd.c:1707 msgid "&Overwrite" msgstr "" -#: src/editor/editcmd.c:1747 src/editor/editcmd.c:3099 +#: src/editor/editcmd.c:1748 src/editor/editcmd.c:3101 msgid "Cannot save file" msgstr "" -#: src/editor/editcmd.c:1772 src/editor/editcmd.c:1775 +#: src/editor/editcmd.c:1773 src/editor/editcmd.c:1776 msgid "Delete macro" msgstr "" -#: src/editor/editcmd.c:1772 +#: src/editor/editcmd.c:1773 msgid "Press macro hotkey:" msgstr "" -#: src/editor/editcmd.c:1775 +#: src/editor/editcmd.c:1776 msgid "Macro not deleted" msgstr "" -#: src/editor/editcmd.c:1830 +#: src/editor/editcmd.c:1831 msgid "Save macro" msgstr "" -#: src/editor/editcmd.c:1830 +#: src/editor/editcmd.c:1831 msgid "Press the macro's new hotkey:" msgstr "" -#: src/editor/editcmd.c:1905 +#: src/editor/editcmd.c:1907 msgid "Repeat last commands" msgstr "" -#: src/editor/editcmd.c:1905 +#: src/editor/editcmd.c:1907 msgid "Repeat times:" msgstr "" -#: src/editor/editcmd.c:2045 +#: src/editor/editcmd.c:2047 #, c-format msgid "Confirm save file: \"%s\"" msgstr "" -#: src/editor/editcmd.c:2047 src/viewer/hex.c:419 src/viewer/hex.c:431 +#: src/editor/editcmd.c:2049 src/viewer/hex.c:419 src/viewer/hex.c:431 msgid "Save file" msgstr "" -#: src/editor/editcmd.c:2047 src/editor/editmenu.c:78 src/learn.c:192 +#: src/editor/editcmd.c:2049 src/editor/editmenu.c:78 src/learn.c:192 #: src/learn.c:257 msgid "&Save" msgstr "" -#: src/editor/editcmd.c:2069 +#: src/editor/editcmd.c:2071 msgid "Load" msgstr "" -#: src/editor/editcmd.c:2131 +#: src/editor/editcmd.c:2133 msgid "Syntax file edit" msgstr "" -#: src/editor/editcmd.c:2132 +#: src/editor/editcmd.c:2134 msgid "Which syntax file you want to edit?" msgstr "" -#: src/editor/editcmd.c:2133 src/editor/editcmd.c:2179 -#: src/filemanager/cmd.c:950 src/filemanager/cmd.c:991 -#: src/filemanager/cmd.c:1049 +#: src/editor/editcmd.c:2135 src/editor/editcmd.c:2181 +#: src/filemanager/cmd.c:951 src/filemanager/cmd.c:992 +#: src/filemanager/cmd.c:1050 msgid "&User" msgstr "" -#: src/editor/editcmd.c:2133 src/editor/editcmd.c:2179 +#: src/editor/editcmd.c:2135 src/editor/editcmd.c:2181 msgid "&System wide" msgstr "" -#: src/editor/editcmd.c:2177 src/filemanager/cmd.c:989 +#: src/editor/editcmd.c:2179 src/filemanager/cmd.c:990 msgid "Menu edit" msgstr "" -#: src/editor/editcmd.c:2178 src/filemanager/cmd.c:990 +#: src/editor/editcmd.c:2180 src/filemanager/cmd.c:991 msgid "Which menu file do you want to edit?" msgstr "" -#: src/editor/editcmd.c:2179 src/filemanager/cmd.c:991 +#: src/editor/editcmd.c:2181 src/filemanager/cmd.c:992 msgid "&Local" msgstr "" -#: src/editor/editcmd.c:2688 src/editor/editcmd.c:2728 -#: src/editor/editcmd.c:2740 src/editor/editcmd_dialogs.c:224 +#: src/editor/editcmd.c:2690 src/editor/editcmd.c:2730 +#: src/editor/editcmd.c:2742 src/editor/editcmd_dialogs.c:224 msgid "Replace" msgstr "" -#: src/editor/editcmd.c:2740 +#: src/editor/editcmd.c:2742 #, c-format msgid "%ld replacements made" msgstr "" -#: src/editor/editcmd.c:2842 src/editor/editwidget.c:369 +#: src/editor/editcmd.c:2844 src/editor/editwidget.c:369 msgid "[NoName]" msgstr "" -#: src/editor/editcmd.c:2860 +#: src/editor/editcmd.c:2862 #, c-format msgid "" "File %s was modified.\n" "Save before close?" msgstr "" -#: src/editor/editcmd.c:2861 +#: src/editor/editcmd.c:2863 msgid "Close file" msgstr "" -#: src/editor/editcmd.c:2865 +#: src/editor/editcmd.c:2867 #, c-format msgid "" "Midnight Commander is being shut down.\n" "Save modified file %s?" msgstr "" -#: src/editor/editcmd.c:2965 +#: src/editor/editcmd.c:2967 msgid "This function is not implemented" msgstr "" -#: src/editor/editcmd.c:2980 +#: src/editor/editcmd.c:2982 msgid "Copy to clipboard" msgstr "" -#: src/editor/editcmd.c:2980 src/editor/editcmd.c:3004 +#: src/editor/editcmd.c:2982 src/editor/editcmd.c:3006 msgid "Unable to save to file" msgstr "" -#: src/editor/editcmd.c:3004 +#: src/editor/editcmd.c:3006 msgid "Cut to clipboard" msgstr "" -#: src/editor/editcmd.c:3048 +#: src/editor/editcmd.c:3050 msgid "Goto line" msgstr "" -#: src/editor/editcmd.c:3089 src/editor/editcmd.c:3099 +#: src/editor/editcmd.c:3091 src/editor/editcmd.c:3101 msgid "Save block" msgstr "" -#: src/editor/editcmd.c:3120 src/editor/editcmd.c:3135 +#: src/editor/editcmd.c:3122 src/editor/editcmd.c:3137 msgid "Insert file" msgstr "" -#: src/editor/editcmd.c:3135 +#: src/editor/editcmd.c:3137 msgid "Cannot insert file" msgstr "" -#: src/editor/editcmd.c:3156 +#: src/editor/editcmd.c:3158 msgid "Sort block" msgstr "" -#: src/editor/editcmd.c:3156 +#: src/editor/editcmd.c:3158 msgid "You must first highlight a block of text" msgstr "" -#: src/editor/editcmd.c:3164 +#: src/editor/editcmd.c:3166 msgid "Run sort" msgstr "" -#: src/editor/editcmd.c:3165 +#: src/editor/editcmd.c:3167 msgid "Enter sort options (see manpage) separated by whitespace:" msgstr "" -#: src/editor/editcmd.c:3185 src/editor/editcmd.c:3192 +#: src/editor/editcmd.c:3187 src/editor/editcmd.c:3194 msgid "Sort" msgstr "" -#: src/editor/editcmd.c:3185 +#: src/editor/editcmd.c:3187 msgid "Cannot execute sort command" msgstr "" -#: src/editor/editcmd.c:3191 +#: src/editor/editcmd.c:3193 #, c-format msgid "Sort returned non-zero: %s" msgstr "" -#: src/editor/editcmd.c:3228 +#: src/editor/editcmd.c:3230 msgid "Paste output of external command" msgstr "" -#: src/editor/editcmd.c:3229 +#: src/editor/editcmd.c:3231 msgid "Enter shell command(s):" msgstr "" -#: src/editor/editcmd.c:3246 +#: src/editor/editcmd.c:3248 msgid "External command" msgstr "" -#: src/editor/editcmd.c:3246 +#: src/editor/editcmd.c:3248 msgid "Cannot execute command" msgstr "" -#: src/editor/editcmd.c:3291 +#: src/editor/editcmd.c:3293 msgid "mail -s -c " msgstr "" -#: src/editor/editcmd.c:3292 +#: src/editor/editcmd.c:3294 msgid "To" msgstr "" -#: src/editor/editcmd.c:3295 +#: src/editor/editcmd.c:3297 msgid "Subject" msgstr "" -#: src/editor/editcmd.c:3298 +#: src/editor/editcmd.c:3300 msgid "Copies to" msgstr "" -#: src/editor/editcmd.c:3308 +#: src/editor/editcmd.c:3310 msgid "Mail" msgstr "" -#: src/editor/editcmd.c:3412 +#: src/editor/editcmd.c:3414 msgid "Insert literal" msgstr "" -#: src/editor/editcmd.c:3413 +#: src/editor/editcmd.c:3415 msgid "Press any key:" msgstr "" -#: src/editor/editcmd.c:3452 src/editor/editcmd.c:3481 +#: src/editor/editcmd.c:3454 src/editor/editcmd.c:3483 #: src/editor/editcmd_dialogs.c:475 msgid "" "Current text was modified without a file save.\n" @@ -1722,14 +1722,14 @@ msgid "&Replace" msgstr "" -#: src/editor/editcmd_dialogs.c:280 src/filemanager/file.c:968 +#: src/editor/editcmd_dialogs.c:280 src/filemanager/file.c:959 #: src/filemanager/filegui.c:471 msgid "A&ll" msgstr "" #: src/editor/editcmd_dialogs.c:281 src/editor/spell_dialogs.c:98 -#: src/filemanager/file.c:847 src/filemanager/file.c:920 -#: src/filemanager/file.c:923 src/filemanager/file.c:3109 +#: src/filemanager/file.c:838 src/filemanager/file.c:911 +#: src/filemanager/file.c:914 src/filemanager/file.c:3078 #: src/filemanager/filegui.c:252 msgid "&Skip" msgstr "" @@ -1782,7 +1782,7 @@ msgid "A&bout..." msgstr "" -#: src/editor/editmenu.c:88 src/filemanager/find.c:192 src/main.c:417 +#: src/editor/editmenu.c:88 src/filemanager/find.c:190 src/main.c:413 msgid "&Quit" msgstr "" @@ -1822,8 +1822,8 @@ msgid "Mo&ve" msgstr "" -#: src/editor/editmenu.c:113 src/filemanager/file.c:2702 -#: src/filemanager/midnight.c:261 +#: src/editor/editmenu.c:113 src/filemanager/file.c:2676 +#: src/filemanager/filemanager.c:254 msgid "&Delete" msgstr "" @@ -1963,7 +1963,7 @@ msgid "&External formatter" msgstr "" -#: src/editor/editmenu.c:231 src/filemanager/hotlist.c:194 +#: src/editor/editmenu.c:231 src/filemanager/hotlist.c:195 msgid "&Move" msgstr "" @@ -1995,7 +1995,7 @@ msgid "Save &mode..." msgstr "" -#: src/editor/editmenu.c:252 src/filemanager/midnight.c:351 +#: src/editor/editmenu.c:252 src/filemanager/filemanager.c:344 msgid "Learn &keys..." msgstr "" @@ -2011,15 +2011,15 @@ msgid "&Menu file" msgstr "" -#: src/editor/editmenu.c:259 src/filemanager/midnight.c:356 +#: src/editor/editmenu.c:259 src/filemanager/filemanager.c:349 msgid "&Save setup" msgstr "" -#: src/editor/editmenu.c:283 src/filemanager/midnight.c:368 +#: src/editor/editmenu.c:283 src/filemanager/filemanager.c:361 msgid "&File" msgstr "" -#: src/editor/editmenu.c:285 src/filemanager/midnight.c:244 +#: src/editor/editmenu.c:285 src/filemanager/filemanager.c:237 msgid "&Edit" msgstr "" @@ -2027,7 +2027,7 @@ msgid "&Search" msgstr "" -#: src/editor/editmenu.c:290 src/filemanager/midnight.c:370 +#: src/editor/editmenu.c:290 src/filemanager/filemanager.c:363 msgid "&Command" msgstr "" @@ -2039,7 +2039,7 @@ msgid "&Window" msgstr "" -#: src/editor/editmenu.c:297 src/filemanager/midnight.c:372 +#: src/editor/editmenu.c:297 src/filemanager/filemanager.c:365 msgid "&Options" msgstr "" @@ -2079,7 +2079,7 @@ msgid "Tab spacing:" msgstr "" -#: src/editor/editoptions.c:164 src/filemanager/boxes.c:537 +#: src/editor/editoptions.c:164 src/filemanager/boxes.c:571 #: src/filemanager/layout.c:501 msgid "Other options" msgstr "" @@ -2162,8 +2162,8 @@ msgid "ButtonBar|Replac" msgstr "" -#: src/editor/editwidget.c:664 src/filemanager/midnight.c:1660 -#: src/filemanager/tree.c:1182 +#: src/editor/editwidget.c:664 src/filemanager/filemanager.c:1653 +#: src/filemanager/tree.c:1177 msgid "ButtonBar|Copy" msgstr "" @@ -2171,11 +2171,11 @@ msgid "ButtonBar|Move" msgstr "" -#: src/editor/editwidget.c:667 src/filemanager/midnight.c:1663 +#: src/editor/editwidget.c:667 src/filemanager/filemanager.c:1656 msgid "ButtonBar|Delete" msgstr "" -#: src/editor/editwidget.c:668 src/filemanager/midnight.c:1664 +#: src/editor/editwidget.c:668 src/filemanager/filemanager.c:1657 msgid "ButtonBar|PullDn" msgstr "" @@ -2299,11 +2299,11 @@ msgid "Select language" msgstr "" -#: src/editor/syntax.c:1499 src/editor/syntax.c:1505 +#: src/editor/syntax.c:1496 src/editor/syntax.c:1502 msgid "Load syntax file" msgstr "" -#: src/editor/syntax.c:1500 src/help.c:1101 src/usermenu.c:955 +#: src/editor/syntax.c:1497 src/help.c:1101 src/usermenu.c:955 #: src/usermenu.c:995 #, c-format msgid "" @@ -2311,7 +2311,7 @@ "%s" msgstr "" -#: src/editor/syntax.c:1506 +#: src/editor/syntax.c:1503 #, c-format msgid "Error in file %s on line %d" msgstr "" @@ -2324,12 +2324,12 @@ "extra access permissions with the \"su\" command?" msgstr "" -#: src/execute.c:196 src/filemanager/ext.c:660 +#: src/execute.c:196 src/filemanager/ext.c:662 #, c-format msgid "Cannot fetch a local copy of %s" msgstr "" -#: src/execute.c:437 src/filemanager/command.c:281 +#: src/execute.c:437 src/filemanager/command.c:123 msgid "The shell is already running a command" msgstr "" @@ -2343,307 +2343,311 @@ msgid "Type 'exit' to return to the Midnight Commander" msgstr "" -#: src/filemanager/achown.c:86 src/filemanager/chattr.c:226 -#: src/filemanager/chmod.c:112 src/filemanager/chown.c:84 +#: src/filemanager/achown.c:84 src/filemanager/chattr.c:229 +#: src/filemanager/chmod.c:110 src/filemanager/chown.c:83 msgid "Set &all" msgstr "" -#: src/filemanager/achown.c:87 +#: src/filemanager/achown.c:85 msgid "S&kip" msgstr "" -#: src/filemanager/achown.c:88 src/filemanager/chattr.c:230 -#: src/filemanager/chmod.c:116 src/filemanager/chown.c:87 +#: src/filemanager/achown.c:86 src/filemanager/chattr.c:233 +#: src/filemanager/chmod.c:114 src/filemanager/chown.c:86 msgid "&Set" msgstr "" -#: src/filemanager/achown.c:287 src/filemanager/achown.c:294 -#: src/filemanager/achown.c:545 +#: src/filemanager/achown.c:285 src/filemanager/achown.c:292 +#: src/filemanager/achown.c:544 msgid "owner" msgstr "" -#: src/filemanager/achown.c:289 src/filemanager/achown.c:296 -#: src/filemanager/achown.c:550 +#: src/filemanager/achown.c:287 src/filemanager/achown.c:294 +#: src/filemanager/achown.c:549 msgid "group" msgstr "" -#: src/filemanager/achown.c:291 +#: src/filemanager/achown.c:289 msgid "other" msgstr "" -#: src/filemanager/achown.c:299 +#: src/filemanager/achown.c:297 msgid "Flag" msgstr "" -#: src/filemanager/achown.c:309 +#: src/filemanager/achown.c:307 #, c-format msgid "Permissions (octal): %o" msgstr "" -#: src/filemanager/achown.c:751 +#: src/filemanager/achown.c:750 msgid "Chown advanced command" msgstr "" -#: src/filemanager/achown.c:858 src/filemanager/achown.c:1053 -#: src/filemanager/chmod.c:436 src/filemanager/chmod.c:583 +#: src/filemanager/achown.c:857 src/filemanager/achown.c:1052 +#: src/filemanager/chmod.c:434 src/filemanager/chmod.c:581 #, c-format msgid "" "Cannot chmod \"%s\"\n" "%s" msgstr "" -#: src/filemanager/achown.c:860 src/filemanager/achown.c:895 -#: src/filemanager/chattr.c:1099 src/filemanager/chmod.c:439 -#: src/filemanager/chown.c:311 +#: src/filemanager/achown.c:859 src/filemanager/achown.c:894 +#: src/filemanager/chattr.c:1104 src/filemanager/chmod.c:437 +#: src/filemanager/chown.c:310 msgid "&Ignore" msgstr "" -#: src/filemanager/achown.c:860 src/filemanager/achown.c:895 -#: src/filemanager/chattr.c:1099 src/filemanager/chmod.c:439 -#: src/filemanager/chown.c:311 +#: src/filemanager/achown.c:859 src/filemanager/achown.c:894 +#: src/filemanager/chattr.c:1104 src/filemanager/chmod.c:437 +#: src/filemanager/chown.c:310 msgid "Ignore &all" msgstr "" -#: src/filemanager/achown.c:860 src/filemanager/achown.c:895 -#: src/filemanager/chattr.c:1099 src/filemanager/chmod.c:439 -#: src/filemanager/chown.c:311 src/filemanager/file.c:920 src/viewer/hex.c:431 +#: src/filemanager/achown.c:859 src/filemanager/achown.c:894 +#: src/filemanager/chattr.c:1104 src/filemanager/chmod.c:437 +#: src/filemanager/chown.c:310 src/filemanager/file.c:911 src/viewer/hex.c:431 msgid "&Retry" msgstr "" -#: src/filemanager/achown.c:893 src/filemanager/achown.c:1059 -#: src/filemanager/chown.c:308 src/filemanager/chown.c:476 +#: src/filemanager/achown.c:892 src/filemanager/achown.c:1058 +#: src/filemanager/chown.c:307 src/filemanager/chown.c:475 #, c-format msgid "" "Cannot chown \"%s\"\n" "%s" msgstr "" -#: src/filemanager/boxes.c:179 +#: src/filemanager/boxes.c:181 msgid "< Default >" msgstr "" -#: src/filemanager/boxes.c:225 +#: src/filemanager/boxes.c:227 msgid "Skins" msgstr "" -#: src/filemanager/boxes.c:349 src/filemanager/boxes.c:965 +#: src/filemanager/boxes.c:383 src/filemanager/boxes.c:1006 #: src/selcodepage.c:101 msgid "Other 8 bit" msgstr "" -#: src/filemanager/boxes.c:434 +#: src/filemanager/boxes.c:468 msgid "Running" msgstr "" -#: src/filemanager/boxes.c:435 src/filemanager/find.c:1609 +#: src/filemanager/boxes.c:469 src/filemanager/find.c:1592 msgid "Stopped" msgstr "" -#: src/filemanager/boxes.c:502 +#: src/filemanager/boxes.c:536 msgid "&Never" msgstr "" -#: src/filemanager/boxes.c:503 +#: src/filemanager/boxes.c:537 msgid "On dum&b terminals" msgstr "" -#: src/filemanager/boxes.c:504 +#: src/filemanager/boxes.c:538 msgid "Alwa&ys" msgstr "" -#: src/filemanager/boxes.c:518 +#: src/filemanager/boxes.c:552 msgid "File operations" msgstr "" -#: src/filemanager/boxes.c:519 +#: src/filemanager/boxes.c:553 msgid "&Verbose operation" msgstr "" -#: src/filemanager/boxes.c:520 +#: src/filemanager/boxes.c:554 msgid "Compute tota&ls" msgstr "" -#: src/filemanager/boxes.c:521 +#: src/filemanager/boxes.c:555 msgid "Classic pro&gressbar" msgstr "" -#: src/filemanager/boxes.c:522 +#: src/filemanager/boxes.c:556 msgid "Mkdi&r autoname" msgstr "" -#: src/filemanager/boxes.c:523 +#: src/filemanager/boxes.c:557 msgid "&Preallocate space" msgstr "" -#: src/filemanager/boxes.c:526 +#: src/filemanager/boxes.c:560 msgid "Esc key mode" msgstr "" -#: src/filemanager/boxes.c:527 +#: src/filemanager/boxes.c:561 msgid "S&ingle press" msgstr "" -#: src/filemanager/boxes.c:528 +#: src/filemanager/boxes.c:562 msgid "Timeout:" msgstr "" -#: src/filemanager/boxes.c:533 +#: src/filemanager/boxes.c:567 msgid "Pause after run" msgstr "" -#: src/filemanager/boxes.c:538 +#: src/filemanager/boxes.c:572 msgid "Use internal edi&t" msgstr "" -#: src/filemanager/boxes.c:539 +#: src/filemanager/boxes.c:573 msgid "Use internal vie&w" msgstr "" -#: src/filemanager/boxes.c:540 +#: src/filemanager/boxes.c:574 msgid "A&sk new file name" msgstr "" -#: src/filemanager/boxes.c:542 +#: src/filemanager/boxes.c:576 msgid "Auto m&enus" msgstr "" -#: src/filemanager/boxes.c:543 +#: src/filemanager/boxes.c:577 msgid "&Drop down menus" msgstr "" -#: src/filemanager/boxes.c:544 +#: src/filemanager/boxes.c:578 msgid "S&hell patterns" msgstr "" -#: src/filemanager/boxes.c:545 +#: src/filemanager/boxes.c:579 msgid "Co&mplete: show all" msgstr "" -#: src/filemanager/boxes.c:547 +#: src/filemanager/boxes.c:581 msgid "Rotating d&ash" msgstr "" -#: src/filemanager/boxes.c:548 +#: src/filemanager/boxes.c:582 msgid "Cd follows lin&ks" msgstr "" -#: src/filemanager/boxes.c:549 +#: src/filemanager/boxes.c:583 msgid "Sa&fe delete" msgstr "" -#: src/filemanager/boxes.c:550 +#: src/filemanager/boxes.c:584 msgid "Safe overwrite" msgstr "" -#: src/filemanager/boxes.c:551 +#: src/filemanager/boxes.c:585 msgid "A&uto save setup" msgstr "" -#: src/filemanager/boxes.c:563 +#: src/filemanager/boxes.c:597 msgid "Configure options" msgstr "" -#: src/filemanager/boxes.c:600 +#: src/filemanager/boxes.c:636 msgid "Skin:" msgstr "" -#: src/filemanager/boxes.c:612 +#: src/filemanager/boxes.c:642 +msgid "&Shadows" +msgstr "" + +#: src/filemanager/boxes.c:650 msgid "Appearance" msgstr "" -#: src/filemanager/boxes.c:639 +#: src/filemanager/boxes.c:680 msgid "Case &insensitive" msgstr "" -#: src/filemanager/boxes.c:641 +#: src/filemanager/boxes.c:682 msgid "Use panel sort mo&de" msgstr "" -#: src/filemanager/boxes.c:648 +#: src/filemanager/boxes.c:689 msgid "Show mi&ni-status" msgstr "" -#: src/filemanager/boxes.c:649 +#: src/filemanager/boxes.c:690 msgid "Use SI si&ze units" msgstr "" -#: src/filemanager/boxes.c:650 +#: src/filemanager/boxes.c:691 msgid "Mi&x all files" msgstr "" -#: src/filemanager/boxes.c:651 +#: src/filemanager/boxes.c:692 msgid "Show &backup files" msgstr "" -#: src/filemanager/boxes.c:652 +#: src/filemanager/boxes.c:693 msgid "Show &hidden files" msgstr "" -#: src/filemanager/boxes.c:653 +#: src/filemanager/boxes.c:694 msgid "&Fast dir reload" msgstr "" -#: src/filemanager/boxes.c:654 +#: src/filemanager/boxes.c:695 msgid "Ma&rk moves down" msgstr "" -#: src/filemanager/boxes.c:655 +#: src/filemanager/boxes.c:696 msgid "Re&verse files only" msgstr "" -#: src/filemanager/boxes.c:657 +#: src/filemanager/boxes.c:698 msgid "Simple s&wap" msgstr "" -#: src/filemanager/boxes.c:658 +#: src/filemanager/boxes.c:699 msgid "A&uto save panels setup" msgstr "" -#: src/filemanager/boxes.c:665 +#: src/filemanager/boxes.c:706 msgid "Navigation" msgstr "" -#: src/filemanager/boxes.c:666 +#: src/filemanager/boxes.c:707 msgid "L&ynx-like motion" msgstr "" -#: src/filemanager/boxes.c:668 +#: src/filemanager/boxes.c:709 msgid "Pa&ge scrolling" msgstr "" -#: src/filemanager/boxes.c:669 +#: src/filemanager/boxes.c:710 msgid "Center &scrolling" msgstr "" -#: src/filemanager/boxes.c:670 +#: src/filemanager/boxes.c:711 msgid "&Mouse page scrolling" msgstr "" -#: src/filemanager/boxes.c:673 +#: src/filemanager/boxes.c:714 msgid "File highlight" msgstr "" -#: src/filemanager/boxes.c:674 +#: src/filemanager/boxes.c:715 msgid "File &types" msgstr "" -#: src/filemanager/boxes.c:675 +#: src/filemanager/boxes.c:716 msgid "&Permissions" msgstr "" -#: src/filemanager/boxes.c:677 +#: src/filemanager/boxes.c:718 msgid "Quick search" msgstr "" -#: src/filemanager/boxes.c:689 +#: src/filemanager/boxes.c:730 msgid "Panel options" msgstr "" -#: src/filemanager/boxes.c:701 src/filemanager/info.c:90 +#: src/filemanager/boxes.c:742 src/filemanager/info.c:90 msgid "Information" msgstr "" -#: src/filemanager/boxes.c:702 +#: src/filemanager/boxes.c:743 msgid "" "Using the fast reload option may not reflect the exact\n" "directory contents. In this case you'll need to do a\n" @@ -2651,657 +2655,661 @@ "the details." msgstr "" -#: src/filemanager/boxes.c:736 +#: src/filemanager/boxes.c:777 msgid "&Full file list" msgstr "" -#: src/filemanager/boxes.c:737 +#: src/filemanager/boxes.c:778 msgid "&Brief file list:" msgstr "" -#: src/filemanager/boxes.c:738 +#: src/filemanager/boxes.c:779 msgid "&Long file list" msgstr "" -#: src/filemanager/boxes.c:739 +#: src/filemanager/boxes.c:780 msgid "&User defined:" msgstr "" -#: src/filemanager/boxes.c:748 +#: src/filemanager/boxes.c:789 msgid "columns" msgstr "" -#: src/filemanager/boxes.c:755 +#: src/filemanager/boxes.c:796 msgid "User &mini status" msgstr "" -#: src/filemanager/boxes.c:765 +#: src/filemanager/boxes.c:806 msgid "Listing format" msgstr "" -#: src/filemanager/boxes.c:844 +#: src/filemanager/boxes.c:885 msgid "Executable &first" msgstr "" -#: src/filemanager/boxes.c:846 +#: src/filemanager/boxes.c:887 msgid "&Reverse" msgstr "" -#: src/filemanager/boxes.c:855 +#: src/filemanager/boxes.c:896 msgid "Sort order" msgstr "" #. TRANSLATORS: no need to translate 'Confirmation', it's just a context prefix -#: src/filemanager/boxes.c:879 +#: src/filemanager/boxes.c:920 msgid "Confirmation|&Delete" msgstr "" -#: src/filemanager/boxes.c:880 +#: src/filemanager/boxes.c:921 msgid "Confirmation|O&verwrite" msgstr "" -#: src/filemanager/boxes.c:881 +#: src/filemanager/boxes.c:922 msgid "Confirmation|&Execute" msgstr "" -#: src/filemanager/boxes.c:882 +#: src/filemanager/boxes.c:923 msgid "Confirmation|E&xit" msgstr "" -#: src/filemanager/boxes.c:883 +#: src/filemanager/boxes.c:924 msgid "Confirmation|Di&rectory hotlist delete" msgstr "" -#: src/filemanager/boxes.c:885 +#: src/filemanager/boxes.c:926 msgid "Confirmation|&History cleanup" msgstr "" -#: src/filemanager/boxes.c:894 src/filemanager/cmd.c:138 +#: src/filemanager/boxes.c:935 src/filemanager/cmd.c:139 msgid "Confirmation" msgstr "" -#: src/filemanager/boxes.c:911 +#: src/filemanager/boxes.c:952 msgid "&UTF-8 output" msgstr "" -#: src/filemanager/boxes.c:912 +#: src/filemanager/boxes.c:953 msgid "&Full 8 bits output" msgstr "" -#: src/filemanager/boxes.c:913 +#: src/filemanager/boxes.c:954 msgid "&ISO 8859-1" msgstr "" -#: src/filemanager/boxes.c:914 +#: src/filemanager/boxes.c:955 msgid "7 &bits" msgstr "" -#: src/filemanager/boxes.c:921 src/filemanager/boxes.c:979 +#: src/filemanager/boxes.c:962 src/filemanager/boxes.c:1020 msgid "F&ull 8 bits input" msgstr "" -#: src/filemanager/boxes.c:929 src/filemanager/boxes.c:987 +#: src/filemanager/boxes.c:970 src/filemanager/boxes.c:1028 msgid "Display bits" msgstr "" -#: src/filemanager/boxes.c:974 +#: src/filemanager/boxes.c:1015 msgid "Input / display codepage:" msgstr "" -#: src/filemanager/boxes.c:1037 src/filemanager/tree.c:1132 +#: src/filemanager/boxes.c:1078 src/filemanager/tree.c:1127 msgid "Directory tree" msgstr "" -#: src/filemanager/boxes.c:1087 +#: src/filemanager/boxes.c:1128 msgid "Timeout for freeing VFSs (sec):" msgstr "" -#: src/filemanager/boxes.c:1092 +#: src/filemanager/boxes.c:1133 msgid "FTP anonymous password:" msgstr "" -#: src/filemanager/boxes.c:1095 +#: src/filemanager/boxes.c:1136 msgid "FTP directory cache timeout (sec):" msgstr "" -#: src/filemanager/boxes.c:1098 +#: src/filemanager/boxes.c:1139 msgid "&Always use ftp proxy:" msgstr "" -#: src/filemanager/boxes.c:1102 +#: src/filemanager/boxes.c:1143 msgid "&Use ~/.netrc" msgstr "" -#: src/filemanager/boxes.c:1103 +#: src/filemanager/boxes.c:1144 msgid "Use &passive mode" msgstr "" -#: src/filemanager/boxes.c:1104 +#: src/filemanager/boxes.c:1145 msgid "Use passive mode over pro&xy" msgstr "" -#: src/filemanager/boxes.c:1114 +#: src/filemanager/boxes.c:1155 msgid "Virtual File System Setting" msgstr "" -#: src/filemanager/boxes.c:1163 +#: src/filemanager/boxes.c:1204 msgid "cd" msgstr "" -#: src/filemanager/boxes.c:1170 +#: src/filemanager/boxes.c:1211 msgid "Quick cd" msgstr "" -#: src/filemanager/boxes.c:1185 +#: src/filemanager/boxes.c:1226 msgid "Existing filename (filename symlink will point to):" msgstr "" -#: src/filemanager/boxes.c:1189 +#: src/filemanager/boxes.c:1230 msgid "Symbolic link filename:" msgstr "" -#: src/filemanager/boxes.c:1199 +#: src/filemanager/boxes.c:1240 msgid "Symbolic link" msgstr "" -#: src/filemanager/boxes.c:1227 +#: src/filemanager/boxes.c:1268 msgid "&Stop" msgstr "" -#: src/filemanager/boxes.c:1228 +#: src/filemanager/boxes.c:1269 msgid "&Resume" msgstr "" -#: src/filemanager/boxes.c:1229 +#: src/filemanager/boxes.c:1270 msgid "&Kill" msgstr "" -#: src/filemanager/boxes.c:1259 +#: src/filemanager/boxes.c:1300 msgid "Background jobs" msgstr "" -#: src/filemanager/boxes.c:1295 +#: src/filemanager/boxes.c:1336 #, c-format msgid "Password for \\\\%s\\%s" msgstr "" -#: src/filemanager/boxes.c:1305 +#: src/filemanager/boxes.c:1346 msgid "Domain:" msgstr "" -#: src/filemanager/boxes.c:1307 +#: src/filemanager/boxes.c:1348 msgid "Username:" msgstr "" -#: src/filemanager/boxes.c:1324 +#: src/filemanager/boxes.c:1365 msgid "SMB authentication" msgstr "" -#: src/filemanager/chattr.c:144 +#: src/filemanager/cd.c:287 src/filemanager/panel.c:3668 +#: src/filemanager/tree.c:596 +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + +#: src/filemanager/chattr.c:141 msgid "Secure deletion" msgstr "" -#: src/filemanager/chattr.c:145 +#: src/filemanager/chattr.c:142 msgid "Undelete" msgstr "" -#: src/filemanager/chattr.c:146 +#: src/filemanager/chattr.c:143 msgid "Synchronous updates" msgstr "" -#: src/filemanager/chattr.c:147 +#: src/filemanager/chattr.c:144 msgid "Synchronous directory updates" msgstr "" -#: src/filemanager/chattr.c:148 +#: src/filemanager/chattr.c:145 msgid "Immutable" msgstr "" -#: src/filemanager/chattr.c:149 +#: src/filemanager/chattr.c:146 msgid "Append only" msgstr "" -#: src/filemanager/chattr.c:150 +#: src/filemanager/chattr.c:147 msgid "No dump" msgstr "" -#: src/filemanager/chattr.c:151 +#: src/filemanager/chattr.c:148 msgid "No update atime" msgstr "" -#: src/filemanager/chattr.c:152 +#: src/filemanager/chattr.c:149 msgid "Compress" msgstr "" -#: src/filemanager/chattr.c:156 +#: src/filemanager/chattr.c:153 msgid "Compressed clusters" msgstr "" -#: src/filemanager/chattr.c:161 +#: src/filemanager/chattr.c:158 msgid "Compressed dirty file" msgstr "" -#: src/filemanager/chattr.c:166 +#: src/filemanager/chattr.c:163 msgid "Compression raw access" msgstr "" -#: src/filemanager/chattr.c:169 +#: src/filemanager/chattr.c:166 msgid "Encrypted inode" msgstr "" -#: src/filemanager/chattr.c:171 +#: src/filemanager/chattr.c:168 msgid "Journaled data" msgstr "" -#: src/filemanager/chattr.c:172 +#: src/filemanager/chattr.c:169 msgid "Indexed directory" msgstr "" -#: src/filemanager/chattr.c:173 +#: src/filemanager/chattr.c:170 msgid "No tail merging" msgstr "" -#: src/filemanager/chattr.c:174 +#: src/filemanager/chattr.c:171 msgid "Top of directory hierarchies" msgstr "" -#: src/filemanager/chattr.c:175 +#: src/filemanager/chattr.c:172 msgid "Inode uses extents" msgstr "" -#: src/filemanager/chattr.c:179 +#: src/filemanager/chattr.c:176 msgid "Huge_file" msgstr "" -#: src/filemanager/chattr.c:181 +#: src/filemanager/chattr.c:178 msgid "No COW" msgstr "" -#: src/filemanager/chattr.c:185 -msgid "Casefolded file" +#: src/filemanager/chattr.c:183 +msgid "Direct access for files" msgstr "" #: src/filemanager/chattr.c:188 +msgid "Casefolded file" +msgstr "" + +#: src/filemanager/chattr.c:191 msgid "Inode has inline data" msgstr "" -#: src/filemanager/chattr.c:194 +#: src/filemanager/chattr.c:197 msgid "Project hierarchy" msgstr "" -#: src/filemanager/chattr.c:201 +#: src/filemanager/chattr.c:204 msgid "Verity protected inode" msgstr "" -#: src/filemanager/chattr.c:227 src/filemanager/chmod.c:113 +#: src/filemanager/chattr.c:230 src/filemanager/chmod.c:111 msgid "&Marked all" msgstr "" -#: src/filemanager/chattr.c:228 src/filemanager/chmod.c:114 +#: src/filemanager/chattr.c:231 src/filemanager/chmod.c:112 msgid "S&et marked" msgstr "" -#: src/filemanager/chattr.c:229 src/filemanager/chmod.c:115 +#: src/filemanager/chattr.c:232 src/filemanager/chmod.c:113 msgid "C&lear marked" msgstr "" -#: src/filemanager/chattr.c:978 +#: src/filemanager/chattr.c:983 msgid "Chattr command" msgstr "" -#: src/filemanager/chattr.c:1096 src/filemanager/chattr.c:1252 +#: src/filemanager/chattr.c:1101 src/filemanager/chattr.c:1257 #, c-format msgid "" "Cannot chattr \"%s\"\n" "%s" msgstr "" -#: src/filemanager/chattr.c:1208 +#: src/filemanager/chattr.c:1213 msgid "Cannot change attributes on non-local filesystems" msgstr "" -#: src/filemanager/chattr.c:1227 +#: src/filemanager/chattr.c:1232 #, c-format msgid "" "Cannot get flags of \"%s\"\n" "%s" msgstr "" -#: src/filemanager/chmod.c:76 +#: src/filemanager/chmod.c:74 msgid "set &user ID on execution" msgstr "" -#: src/filemanager/chmod.c:77 +#: src/filemanager/chmod.c:75 msgid "set &group ID on execution" msgstr "" -#: src/filemanager/chmod.c:78 +#: src/filemanager/chmod.c:76 msgid "stick&y bit" msgstr "" -#: src/filemanager/chmod.c:79 +#: src/filemanager/chmod.c:77 msgid "&read by owner" msgstr "" -#: src/filemanager/chmod.c:80 +#: src/filemanager/chmod.c:78 msgid "&write by owner" msgstr "" -#: src/filemanager/chmod.c:81 +#: src/filemanager/chmod.c:79 msgid "e&xecute/search by owner" msgstr "" -#: src/filemanager/chmod.c:82 +#: src/filemanager/chmod.c:80 msgid "rea&d by group" msgstr "" -#: src/filemanager/chmod.c:83 +#: src/filemanager/chmod.c:81 msgid "write by grou&p" msgstr "" -#: src/filemanager/chmod.c:84 +#: src/filemanager/chmod.c:82 msgid "execu&te/search by group" msgstr "" -#: src/filemanager/chmod.c:85 +#: src/filemanager/chmod.c:83 msgid "read &by others" msgstr "" -#: src/filemanager/chmod.c:86 +#: src/filemanager/chmod.c:84 msgid "wr&ite by others" msgstr "" -#: src/filemanager/chmod.c:87 +#: src/filemanager/chmod.c:85 msgid "execute/searc&h by others" msgstr "" -#: src/filemanager/chmod.c:94 +#: src/filemanager/chmod.c:92 msgid "Name:" msgstr "" -#: src/filemanager/chmod.c:95 +#: src/filemanager/chmod.c:93 msgid "Permissions (octal):" msgstr "" -#: src/filemanager/chmod.c:96 +#: src/filemanager/chmod.c:94 msgid "Owner name:" msgstr "" -#: src/filemanager/chmod.c:97 +#: src/filemanager/chmod.c:95 msgid "Group name:" msgstr "" -#: src/filemanager/chmod.c:337 +#: src/filemanager/chmod.c:335 msgid "Chmod command" msgstr "" -#: src/filemanager/chmod.c:343 src/filemanager/chown.c:167 +#: src/filemanager/chmod.c:341 src/filemanager/chown.c:166 #: src/filemanager/panel.c:256 msgid "Permission" msgstr "" -#: src/filemanager/chmod.c:352 src/filemanager/chown.c:234 +#: src/filemanager/chmod.c:350 src/filemanager/chown.c:233 msgid "File" msgstr "" -#: src/filemanager/chown.c:85 +#: src/filemanager/chown.c:84 msgid "Set &groups" msgstr "" -#: src/filemanager/chown.c:86 +#: src/filemanager/chown.c:85 msgid "Set &users" msgstr "" -#: src/filemanager/chown.c:159 +#: src/filemanager/chown.c:158 msgid "Name" msgstr "" -#: src/filemanager/chown.c:161 +#: src/filemanager/chown.c:160 msgid "Owner name" msgstr "" -#: src/filemanager/chown.c:163 src/filemanager/chown.c:223 +#: src/filemanager/chown.c:162 src/filemanager/chown.c:222 msgid "Group name" msgstr "" -#: src/filemanager/chown.c:165 +#: src/filemanager/chown.c:164 msgid "Size" msgstr "" -#: src/filemanager/chown.c:206 +#: src/filemanager/chown.c:205 msgid "Chown command" msgstr "" -#: src/filemanager/chown.c:212 +#: src/filemanager/chown.c:211 msgid "User name" msgstr "" -#: src/filemanager/chown.c:216 +#: src/filemanager/chown.c:215 msgid "" msgstr "" -#: src/filemanager/chown.c:227 +#: src/filemanager/chown.c:226 msgid "" msgstr "" -#: src/filemanager/cmd.c:119 +#: src/filemanager/cmd.c:120 msgid "Enter machine name (F1 for details):" msgstr "" -#: src/filemanager/cmd.c:138 +#: src/filemanager/cmd.c:139 msgid "Files tagged, want to cd?" msgstr "" -#: src/filemanager/cmd.c:144 src/filemanager/cmd.c:1130 -#: src/filemanager/panel.c:2801 src/filemanager/panel.c:3378 +#: src/filemanager/cmd.c:145 src/filemanager/cmd.c:1129 +#: src/filemanager/panel.c:2797 src/filemanager/panel.c:3376 msgid "Cannot change directory" msgstr "" -#: src/filemanager/cmd.c:195 +#: src/filemanager/cmd.c:196 msgid "Filter" msgstr "" -#: src/filemanager/cmd.c:196 +#: src/filemanager/cmd.c:197 msgid "Set expression for filtering filenames" msgstr "" -#: src/filemanager/cmd.c:354 +#: src/filemanager/cmd.c:355 #, c-format msgid "Link %s to:" msgstr "" -#: src/filemanager/cmd.c:356 +#: src/filemanager/cmd.c:357 msgid "Link" msgstr "" -#: src/filemanager/cmd.c:365 +#: src/filemanager/cmd.c:366 #, c-format msgid "link: %s" msgstr "" -#: src/filemanager/cmd.c:404 +#: src/filemanager/cmd.c:405 #, c-format msgid "symlink: %s" msgstr "" -#: src/filemanager/cmd.c:464 src/filemanager/panel.c:4754 +#: src/filemanager/cmd.c:465 src/filemanager/panel.c:4755 #, c-format msgid "Cannot chdir to \"%s\"" msgstr "" -#: src/filemanager/cmd.c:627 +#: src/filemanager/cmd.c:628 msgid "View file" msgstr "" -#: src/filemanager/cmd.c:627 +#: src/filemanager/cmd.c:628 msgid "Filename:" msgstr "" -#: src/filemanager/cmd.c:661 +#: src/filemanager/cmd.c:662 msgid "Filtered view" msgstr "" -#: src/filemanager/cmd.c:662 +#: src/filemanager/cmd.c:663 msgid "Filter command and arguments:" msgstr "" -#: src/filemanager/cmd.c:750 +#: src/filemanager/cmd.c:751 msgid "Edit file" msgstr "" -#: src/filemanager/cmd.c:842 +#: src/filemanager/cmd.c:843 msgid "Create a new Directory" msgstr "" -#: src/filemanager/cmd.c:843 +#: src/filemanager/cmd.c:844 msgid "Enter directory name:" msgstr "" -#: src/filemanager/cmd.c:948 +#: src/filemanager/cmd.c:949 msgid "Extension file edit" msgstr "" -#: src/filemanager/cmd.c:949 +#: src/filemanager/cmd.c:950 msgid "Which extension file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:950 src/filemanager/cmd.c:991 -#: src/filemanager/cmd.c:1049 +#: src/filemanager/cmd.c:951 src/filemanager/cmd.c:992 +#: src/filemanager/cmd.c:1050 msgid "&System Wide" msgstr "" -#: src/filemanager/cmd.c:1047 +#: src/filemanager/cmd.c:1048 msgid "Highlighting groups file edit" msgstr "" -#: src/filemanager/cmd.c:1048 +#: src/filemanager/cmd.c:1049 msgid "Which highlighting file you want to edit?" msgstr "" -#: src/filemanager/cmd.c:1145 +#: src/filemanager/cmd.c:1144 msgid "Compare directories" msgstr "" -#: src/filemanager/cmd.c:1146 +#: src/filemanager/cmd.c:1145 msgid "Select compare method:" msgstr "" -#: src/filemanager/cmd.c:1147 +#: src/filemanager/cmd.c:1146 msgid "&Quick" msgstr "" -#: src/filemanager/cmd.c:1147 +#: src/filemanager/cmd.c:1146 msgid "&Size only" msgstr "" -#: src/filemanager/cmd.c:1147 +#: src/filemanager/cmd.c:1146 msgid "&Thorough" msgstr "" -#: src/filemanager/cmd.c:1161 +#: src/filemanager/cmd.c:1160 msgid "" "Both panels should be in the listing mode\n" "to use this command" msgstr "" -#: src/filemanager/cmd.c:1219 +#: src/filemanager/cmd.c:1218 #, c-format msgid "'%s' is not a symbolic link" msgstr "" -#: src/filemanager/cmd.c:1232 +#: src/filemanager/cmd.c:1231 #, c-format msgid "Symlink '%s' points to:" msgstr "" -#: src/filemanager/cmd.c:1234 +#: src/filemanager/cmd.c:1233 msgid "Edit symlink" msgstr "" -#: src/filemanager/cmd.c:1247 +#: src/filemanager/cmd.c:1246 #, c-format msgid "edit symlink, unable to remove %s: %s" msgstr "" -#: src/filemanager/cmd.c:1255 +#: src/filemanager/cmd.c:1254 #, c-format msgid "edit symlink: %s" msgstr "" -#: src/filemanager/cmd.c:1300 +#: src/filemanager/cmd.c:1299 msgid "FTP to machine" msgstr "" -#: src/filemanager/cmd.c:1311 +#: src/filemanager/cmd.c:1310 msgid "SFTP to machine" msgstr "" -#: src/filemanager/cmd.c:1323 +#: src/filemanager/cmd.c:1322 msgid "Shell link to machine" msgstr "" -#: src/filemanager/cmd.c:1335 +#: src/filemanager/cmd.c:1334 msgid "SMB link to machine" msgstr "" -#: src/filemanager/cmd.c:1346 +#: src/filemanager/cmd.c:1345 msgid "Undelete files on an ext2 file system" msgstr "" -#: src/filemanager/cmd.c:1347 +#: src/filemanager/cmd.c:1346 msgid "" "Enter device (without /dev/) to undelete\n" "files on: (F1 for details)" msgstr "" -#: src/filemanager/cmd.c:1415 src/filemanager/cmd.c:1450 -#: src/filemanager/file.c:760 +#: src/filemanager/cmd.c:1404 src/filemanager/cmd.c:1438 +#: src/filemanager/file.c:748 msgid "Directory scanning" msgstr "" -#: src/filemanager/cmd.c:1496 src/filemanager/cmd.c:1498 +#: src/filemanager/cmd.c:1484 src/filemanager/cmd.c:1486 msgid "Setup" msgstr "" -#: src/filemanager/cmd.c:1496 +#: src/filemanager/cmd.c:1484 #, c-format msgid "Setup saved to %s" msgstr "" -#: src/filemanager/cmd.c:1498 +#: src/filemanager/cmd.c:1486 #, c-format msgid "Unable to save setup to %s" msgstr "" -#: src/filemanager/command.c:273 src/usermenu.c:944 +#: src/filemanager/command.c:115 src/usermenu.c:944 msgid "Cannot execute commands on non-local filesystems" msgstr "" -#: src/filemanager/command.c:447 src/filemanager/panel.c:3670 -#: src/filemanager/tree.c:593 -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - -#: src/filemanager/ext.c:245 src/usermenu.c:476 +#: src/filemanager/ext.c:247 src/usermenu.c:476 msgid "Parameter" msgstr "" -#: src/filemanager/ext.c:458 src/usermenu.c:446 +#: src/filemanager/ext.c:460 src/usermenu.c:446 #, c-format msgid "" "Cannot create temporary command file\n" "%s" msgstr "" -#: src/filemanager/ext.c:842 +#: src/filemanager/ext.c:844 #, c-format msgid " %s%s file error" msgstr "" -#: src/filemanager/ext.c:844 +#: src/filemanager/ext.c:846 #, c-format msgid "" "The format of the %smc.ext file has changed with version 3.0. It seems that " @@ -3309,29 +3317,29 @@ "Commander package." msgstr "" -#: src/filemanager/ext.c:864 +#: src/filemanager/ext.c:866 #, c-format msgid "%s file error" msgstr "" -#: src/filemanager/ext.c:866 +#: src/filemanager/ext.c:868 #, c-format msgid "" "The format of the %s file has changed with version 3.0. You may either want " "to copy it from %smc.ext or use that file as an example of how to write it." msgstr "" -#: src/filemanager/file.c:95 src/filemanager/file.c:2701 -#: src/filemanager/tree.c:724 +#: src/filemanager/file.c:95 src/filemanager/file.c:2675 +#: src/filemanager/tree.c:719 msgid "DialogTitle|Copy" msgstr "" -#: src/filemanager/file.c:96 src/filemanager/tree.c:764 +#: src/filemanager/file.c:96 src/filemanager/tree.c:759 msgid "DialogTitle|Move" msgstr "" -#: src/filemanager/file.c:97 src/filemanager/hotlist.c:1157 -#: src/filemanager/hotlist.c:1174 src/filemanager/tree.c:834 +#: src/filemanager/file.c:97 src/filemanager/hotlist.c:1158 +#: src/filemanager/hotlist.c:1175 src/filemanager/tree.c:829 msgid "DialogTitle|Delete" msgstr "" @@ -3418,7 +3426,7 @@ "%s" msgstr "" -#: src/filemanager/file.c:886 +#: src/filemanager/file.c:877 #, c-format msgid "" "\"%s\"\n" @@ -3427,7 +3435,7 @@ "are the same directory" msgstr "" -#: src/filemanager/file.c:888 +#: src/filemanager/file.c:879 #, c-format msgid "" "\"%s\"\n" @@ -3436,18 +3444,18 @@ "are the same file" msgstr "" -#: src/filemanager/file.c:920 src/filemanager/file.c:923 +#: src/filemanager/file.c:911 src/filemanager/file.c:914 msgid "Ski&p all" msgstr "" -#: src/filemanager/file.c:960 +#: src/filemanager/file.c:951 #, c-format msgid "" "Directory \"%s\" not empty.\n" "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:961 +#: src/filemanager/file.c:952 #, c-format msgid "" "Background process:\n" @@ -3455,232 +3463,232 @@ "Delete it recursively?" msgstr "" -#: src/filemanager/file.c:969 src/filemanager/filegui.c:475 +#: src/filemanager/file.c:960 src/filemanager/filegui.c:475 msgid "Non&e" msgstr "" -#: src/filemanager/file.c:1168 +#: src/filemanager/file.c:1159 #, c-format msgid "" "Cannot remove file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1226 +#: src/filemanager/file.c:1217 #, c-format msgid "" "Cannot stat file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1242 +#: src/filemanager/file.c:1233 #, c-format msgid "Cannot overwrite directory \"%s\"" msgstr "" -#: src/filemanager/file.c:1288 +#: src/filemanager/file.c:1279 #, c-format msgid "" "Cannot move file \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1394 +#: src/filemanager/file.c:1385 #, c-format msgid "" "Cannot remove directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1636 src/filemanager/file.c:2254 +#: src/filemanager/file.c:1627 src/filemanager/file.c:2245 #, c-format msgid "" "Cannot overwrite directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1638 +#: src/filemanager/file.c:1629 #, c-format msgid "" "Cannot overwrite file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1659 +#: src/filemanager/file.c:1650 #, c-format msgid "" "Cannot move directory \"%s\" to \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:1761 +#: src/filemanager/file.c:1752 msgid "Cannot operate on \"..\"!" msgstr "" -#: src/filemanager/file.c:2273 +#: src/filemanager/file.c:2264 #, c-format msgid "" "Cannot stat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2338 +#: src/filemanager/file.c:2329 #, c-format msgid "" "Cannot create special file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2350 src/filemanager/file.c:2712 +#: src/filemanager/file.c:2341 src/filemanager/file.c:2686 #, c-format msgid "" "Cannot chown target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2365 src/filemanager/file.c:2733 +#: src/filemanager/file.c:2356 src/filemanager/file.c:2702 #, c-format msgid "" "Cannot chmod target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2386 +#: src/filemanager/file.c:2377 #, c-format msgid "" "Cannot open source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2401 +#: src/filemanager/file.c:2390 msgid "Reget failed, about to overwrite file" msgstr "" -#: src/filemanager/file.c:2413 +#: src/filemanager/file.c:2401 #, c-format msgid "" "Cannot fstat source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2451 +#: src/filemanager/file.c:2434 #, c-format msgid "" "Cannot create target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2481 +#: src/filemanager/file.c:2465 #, c-format msgid "" "Cannot fstat target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2502 +#: src/filemanager/file.c:2486 #, c-format msgid "" "Cannot preallocate space for target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2559 +#: src/filemanager/file.c:2544 #, c-format msgid "" "Cannot read source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2604 +#: src/filemanager/file.c:2583 #, c-format msgid "" "Cannot write target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2639 +#: src/filemanager/file.c:2618 msgid "(stalled)" msgstr "" -#: src/filemanager/file.c:2677 +#: src/filemanager/file.c:2651 #, c-format msgid "" "Cannot close source file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2689 +#: src/filemanager/file.c:2663 #, c-format msgid "" "Cannot close target file \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2701 +#: src/filemanager/file.c:2675 msgid "Incomplete file was retrieved. Keep it?" msgstr "" -#: src/filemanager/file.c:2702 +#: src/filemanager/file.c:2676 msgid "&Keep" msgstr "" -#: src/filemanager/file.c:2798 +#: src/filemanager/file.c:2767 #, c-format msgid "" "Cannot stat source directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2842 +#: src/filemanager/file.c:2811 #, c-format msgid "" "Source \"%s\" is not a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2854 +#: src/filemanager/file.c:2823 #, c-format msgid "" "Cannot copy cyclic symbolic link\n" "\"%s\"" msgstr "" -#: src/filemanager/file.c:2893 src/filemanager/file.c:3379 -#: src/filemanager/tree.c:781 +#: src/filemanager/file.c:2862 src/filemanager/file.c:3348 +#: src/filemanager/tree.c:776 #, c-format msgid "" "Destination \"%s\" must be a directory\n" "%s" msgstr "" -#: src/filemanager/file.c:2926 +#: src/filemanager/file.c:2895 #, c-format msgid "" "Cannot create target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:2950 +#: src/filemanager/file.c:2919 #, c-format msgid "" "Cannot chown target directory \"%s\"\n" "%s" msgstr "" -#: src/filemanager/file.c:3150 +#: src/filemanager/file.c:3119 #, c-format msgid "Directories: %zu, total size: %s" msgstr "" -#: src/filemanager/file.c:3295 +#: src/filemanager/file.c:3264 msgid "Sorry, I could not put the job in background" msgstr "" -#: src/filemanager/filegui.c:253 src/filemanager/find.c:190 +#: src/filemanager/filegui.c:253 src/filemanager/find.c:188 msgid "S&uspend" msgstr "" -#: src/filemanager/filegui.c:254 src/filemanager/find.c:191 +#: src/filemanager/filegui.c:254 src/filemanager/find.c:189 msgid "Con&tinue" msgstr "" @@ -3721,7 +3729,7 @@ msgid "Overwrite this file?" msgstr "" -#: src/filemanager/filegui.c:462 src/filemanager/hotlist.c:190 +#: src/filemanager/filegui.c:462 src/filemanager/hotlist.c:191 msgid "A&ppend" msgstr "" @@ -3809,8 +3817,8 @@ msgid "Deleting" msgstr "" -#: src/filemanager/filegui.c:1344 src/filemanager/find.c:579 -#: src/filemanager/panel.c:2536 +#: src/filemanager/filegui.c:1344 src/filemanager/find.c:577 +#: src/filemanager/panel.c:2540 msgid "&Using shell patterns" msgstr "" @@ -3843,689 +3851,689 @@ msgid "Invalid source pattern '%s'" msgstr "" -#: src/filemanager/find.c:188 -msgid "&Chdir" +#: src/filemanager/filemanager.c:194 +msgid "File listin&g" msgstr "" -#: src/filemanager/find.c:189 -msgid "&Again" +#: src/filemanager/filemanager.c:195 +msgid "&Quick view" msgstr "" -#: src/filemanager/find.c:194 src/filemanager/panelize.c:140 -msgid "Pane&lize" +#: src/filemanager/filemanager.c:196 +msgid "&Info" msgstr "" -#: src/filemanager/find.c:195 -msgid "&View - F3" +#: src/filemanager/filemanager.c:197 src/filemanager/find.c:595 +msgid "&Tree" msgstr "" -#: src/filemanager/find.c:196 -msgid "&Edit - F4" +#: src/filemanager/filemanager.c:201 +msgid "&Listing format..." msgstr "" -#: src/filemanager/find.c:371 -#, c-format -msgid "Found: %lu" +#: src/filemanager/filemanager.c:202 +msgid "&Sort order..." msgstr "" -#: src/filemanager/find.c:504 src/filemanager/find.c:514 -msgid "Malformed regular expression" +#: src/filemanager/filemanager.c:203 +msgid "&Filter..." msgstr "" -#: src/filemanager/find.c:577 -msgid "File name:" +#: src/filemanager/filemanager.c:205 +msgid "&Encoding..." msgstr "" -#: src/filemanager/find.c:578 -msgid "&Find recursively" +#: src/filemanager/filemanager.c:209 +msgid "FT&P link..." msgstr "" -#: src/filemanager/find.c:584 -msgid "S&kip hidden" +#: src/filemanager/filemanager.c:212 +msgid "S&hell link..." msgstr "" -#: src/filemanager/find.c:587 -msgid "Content:" +#: src/filemanager/filemanager.c:215 +msgid "S&FTP link..." msgstr "" -#: src/filemanager/find.c:588 -msgid "Sea&rch for content" +#: src/filemanager/filemanager.c:218 +msgid "SM&B link..." msgstr "" -#: src/filemanager/find.c:590 -msgid "Case sens&itive" +#: src/filemanager/filemanager.c:220 +msgid "Paneli&ze" msgstr "" -#: src/filemanager/find.c:592 -msgid "A&ll charsets" +#: src/filemanager/filemanager.c:222 +msgid "&Rescan" msgstr "" -#: src/filemanager/find.c:595 -msgid "Fir&st hit" +#: src/filemanager/filemanager.c:234 +msgid "&View" msgstr "" -#: src/filemanager/find.c:597 src/filemanager/midnight.c:204 -msgid "&Tree" +#: src/filemanager/filemanager.c:235 +msgid "Vie&w file..." msgstr "" -#: src/filemanager/find.c:671 -msgid "Find File" +#: src/filemanager/filemanager.c:236 +msgid "&Filtered view" msgstr "" -#: src/filemanager/find.c:679 -msgid "Start at:" +#: src/filemanager/filemanager.c:238 +msgid "&Copy" msgstr "" -#: src/filemanager/find.c:688 -msgid "Ena&ble ignore directories:" +#: src/filemanager/filemanager.c:239 +msgid "C&hmod" msgstr "" -#: src/filemanager/find.c:1031 src/filemanager/find.c:1125 -#, c-format -msgid "Grepping in %s" +#: src/filemanager/filemanager.c:240 +msgid "&Link" msgstr "" -#: src/filemanager/find.c:1307 -msgid "Finished" +#: src/filemanager/filemanager.c:241 +msgid "&Symlink" msgstr "" -#: src/filemanager/find.c:1313 -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" +#: src/filemanager/filemanager.c:244 +msgid "Relative symlin&k" +msgstr "" -#: src/filemanager/find.c:1509 -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +#: src/filemanager/filemanager.c:245 +msgid "Edit s&ymlink" msgstr "" -#: src/filemanager/find.c:1512 -#, c-format -msgid "Find File: \"%s\"" +#: src/filemanager/filemanager.c:246 +msgid "Ch&own" msgstr "" -#: src/filemanager/find.c:1609 src/filemanager/find.c:1691 -msgid "Searching" +#: src/filemanager/filemanager.c:248 +msgid "&Advanced chown" msgstr "" -#: src/filemanager/hotlist.c:170 -msgid "Change &to" +#: src/filemanager/filemanager.c:250 +msgid "Cha&ttr" msgstr "" -#: src/filemanager/hotlist.c:173 -msgid "&Free VFSs now" +#: src/filemanager/filemanager.c:252 +msgid "&Rename/Move" msgstr "" -#: src/filemanager/hotlist.c:175 -msgid "&Refresh" +#: src/filemanager/filemanager.c:253 +msgid "&Mkdir" msgstr "" -#: src/filemanager/hotlist.c:178 -msgid "&Add current" +#: src/filemanager/filemanager.c:255 +msgid "&Quick cd" msgstr "" -#: src/filemanager/hotlist.c:180 -msgid "&Up" +#: src/filemanager/filemanager.c:257 +msgid "Select &group" msgstr "" -#: src/filemanager/hotlist.c:184 -msgid "New &group" +#: src/filemanager/filemanager.c:258 +msgid "U&nselect group" msgstr "" -#: src/filemanager/hotlist.c:186 -msgid "New &entry" +#: src/filemanager/filemanager.c:259 +msgid "&Invert selection" msgstr "" -#: src/filemanager/hotlist.c:188 src/filemanager/hotlist.c:1013 -#: src/filemanager/hotlist.c:1075 -msgid "&Insert" +#: src/filemanager/filemanager.c:261 +msgid "E&xit" msgstr "" -#: src/filemanager/hotlist.c:192 src/filemanager/panelize.c:141 -msgid "&Remove" +#: src/filemanager/filemanager.c:277 +msgid "&User menu" msgstr "" -#: src/filemanager/hotlist.c:250 -msgid "Subgroup - press ENTER to see list" +#: src/filemanager/filemanager.c:278 +msgid "&Directory tree" msgstr "" -#: src/filemanager/hotlist.c:769 -msgid "Active VFS directories" +#: src/filemanager/filemanager.c:279 +msgid "&Find file" msgstr "" -#: src/filemanager/hotlist.c:776 -msgid "Directory hotlist" +#: src/filemanager/filemanager.c:280 +msgid "S&wap panels" msgstr "" -#: src/filemanager/hotlist.c:786 src/filemanager/hotlist.c:1469 -msgid "Top level group" +#: src/filemanager/filemanager.c:281 +msgid "Switch &panels on/off" msgstr "" -#: src/filemanager/hotlist.c:811 -msgid "Directory path" +#: src/filemanager/filemanager.c:283 +msgid "&Compare directories" msgstr "" -#: src/filemanager/hotlist.c:848 -#, c-format -msgid "Moving %s" +#: src/filemanager/filemanager.c:285 +msgid "C&ompare files" msgstr "" -#: src/filemanager/hotlist.c:858 -msgid "Directory label" +#: src/filemanager/filemanager.c:288 +msgid "E&xternal panelize" msgstr "" -#: src/filemanager/hotlist.c:1012 src/filemanager/hotlist.c:1074 -msgid "&Append" +#: src/filemanager/filemanager.c:289 +msgid "Show directory s&izes" msgstr "" -#: src/filemanager/hotlist.c:1043 -msgid "New hotlist entry" +#: src/filemanager/filemanager.c:291 +msgid "Command &history" msgstr "" -#: src/filemanager/hotlist.c:1043 -msgid "Directory label:" +#: src/filemanager/filemanager.c:294 +msgid "Viewed/edited files hi&story" msgstr "" -#: src/filemanager/hotlist.c:1044 -msgid "Directory path:" +#: src/filemanager/filemanager.c:296 +msgid "Di&rectory hotlist" msgstr "" -#: src/filemanager/hotlist.c:1102 -msgid "New hotlist group" +#: src/filemanager/filemanager.c:298 +msgid "&Active VFS list" msgstr "" -#: src/filemanager/hotlist.c:1102 -msgid "Name of new group:" +#: src/filemanager/filemanager.c:301 +msgid "&Background jobs" msgstr "" -#: src/filemanager/hotlist.c:1155 -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +#: src/filemanager/filemanager.c:303 +msgid "Screen lis&t" msgstr "" -#: src/filemanager/hotlist.c:1172 -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +#: src/filemanager/filemanager.c:308 +msgid "&Undelete files (ext2fs only)" msgstr "" -#: src/filemanager/hotlist.c:1492 -msgid "Hotlist Load" +#: src/filemanager/filemanager.c:311 +msgid "&Listing format edit" msgstr "" -#: src/filemanager/hotlist.c:1494 -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +#: src/filemanager/filemanager.c:318 +msgid "Edit &extension file" msgstr "" -#: src/filemanager/hotlist.c:1600 -#, c-format -msgid "Label for \"%s\":" +#: src/filemanager/filemanager.c:319 +msgid "Edit &menu file" msgstr "" -#: src/filemanager/hotlist.c:1612 -msgid "Add to hotlist" +#: src/filemanager/filemanager.c:322 +msgid "Edit hi&ghlighting group file" msgstr "" -#: src/filemanager/info.c:128 -#, c-format -msgid "Midnight Commander %s" +#: src/filemanager/filemanager.c:335 +msgid "&Configuration..." msgstr "" -#: src/filemanager/info.c:150 -#, c-format -msgid "File: %s" +#: src/filemanager/filemanager.c:336 +msgid "&Layout..." msgstr "" -#: src/filemanager/info.c:168 -msgid "No node information" +#: src/filemanager/filemanager.c:337 +msgid "&Panel options..." msgstr "" -#: src/filemanager/info.c:170 src/filemanager/info.c:172 -#: src/filemanager/info.c:175 -msgid "Free nodes:" +#: src/filemanager/filemanager.c:339 +msgid "C&onfirmation..." msgstr "" -#: src/filemanager/info.c:183 -msgid "No space information" +#: src/filemanager/filemanager.c:341 +msgid "&Appearance..." msgstr "" -#: src/filemanager/info.c:190 -#, c-format -msgid "Free space: %s/%s (%d%%)" +#: src/filemanager/filemanager.c:343 +msgid "&Display bits..." msgstr "" -#: src/filemanager/info.c:197 -#, c-format -msgid "Type: %s" +#: src/filemanager/filemanager.c:346 +msgid "&Virtual FS..." msgstr "" -#: src/filemanager/info.c:198 -msgid "non-local vfs" +#: src/filemanager/filemanager.c:448 +msgid "Panels:" msgstr "" -#: src/filemanager/info.c:204 +#: src/filemanager/filemanager.c:1059 #, c-format -msgid "Device: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#: src/filemanager/info.c:211 -#, c-format -msgid "Filesystem: %s" +#: src/filemanager/filemanager.c:1062 src/filemanager/filemanager.c:1068 +#: src/filemanager/panel.c:2818 +msgid "The Midnight Commander" msgstr "" -#: src/filemanager/info.c:218 -#, c-format -msgid "Accessed: %s" +#: src/filemanager/filemanager.c:1069 +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#: src/filemanager/info.c:224 -#, c-format -msgid "Modified: %s" +#: src/filemanager/filemanager.c:1636 +msgid "&Above" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#: src/filemanager/info.c:233 -#, c-format -msgid "Changed: %s" +#: src/filemanager/filemanager.c:1636 +msgid "&Left" msgstr "" -#: src/filemanager/info.c:241 -#, c-format -msgid "Dev. type: major %lu, minor %lu" +#: src/filemanager/filemanager.c:1637 +msgid "&Below" msgstr "" -#: src/filemanager/info.c:248 -#, c-format -msgid "Size: %s" +#: src/filemanager/filemanager.c:1637 +msgid "&Right" msgstr "" -#: src/filemanager/info.c:250 -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#: src/filemanager/info.c:257 -#, c-format -msgid "Owner: %s/%s" +#: src/filemanager/filemanager.c:1650 +msgid "ButtonBar|Menu" msgstr "" -#: src/filemanager/info.c:261 -#, c-format -msgid "Links: %d" +#: src/filemanager/filemanager.c:1651 src/viewer/display.c:92 +msgid "ButtonBar|View" msgstr "" -#: src/filemanager/info.c:267 src/filemanager/info.c:283 -msgid "Attributes: not supported" +#: src/filemanager/filemanager.c:1654 src/filemanager/tree.c:1178 +msgid "ButtonBar|RenMov" msgstr "" -#: src/filemanager/info.c:276 -#, c-format -msgid "Attributes: %s" +#: src/filemanager/filemanager.c:1655 src/filemanager/tree.c:1181 +msgid "ButtonBar|Mkdir" msgstr "" -#: src/filemanager/info.c:278 -msgid "Attributes: unavailable" +#: src/filemanager/find.c:186 +msgid "&Chdir" msgstr "" -#: src/filemanager/info.c:288 -#, c-format -msgid "Mode: %s (%04o)" +#: src/filemanager/find.c:187 +msgid "&Again" msgstr "" -#: src/filemanager/info.c:293 -#, c-format -msgid "Location: %Xh:%Xh" +#: src/filemanager/find.c:192 src/filemanager/panelize.c:140 +msgid "Pane&lize" msgstr "" -#: src/filemanager/layout.c:173 -msgid "&Equal split" +#: src/filemanager/find.c:193 +msgid "&View - F3" msgstr "" -#: src/filemanager/layout.c:174 -msgid "&Menubar visible" +#: src/filemanager/find.c:194 +msgid "&Edit - F4" msgstr "" -#: src/filemanager/layout.c:175 -msgid "Command &prompt" +#: src/filemanager/find.c:369 +#, c-format +msgid "Found: %lu" msgstr "" -#: src/filemanager/layout.c:176 -msgid "&Keybar visible" +#: src/filemanager/find.c:502 src/filemanager/find.c:512 +msgid "Malformed regular expression" msgstr "" -#: src/filemanager/layout.c:177 -msgid "H&intbar visible" +#: src/filemanager/find.c:575 +msgid "File name:" msgstr "" -#: src/filemanager/layout.c:178 -msgid "&XTerm window title" +#: src/filemanager/find.c:576 +msgid "&Find recursively" msgstr "" -#: src/filemanager/layout.c:179 -msgid "&Show free space" +#: src/filemanager/find.c:582 +msgid "S&kip hidden" msgstr "" -#: src/filemanager/layout.c:499 -msgid "Panel split" +#: src/filemanager/find.c:585 +msgid "Content:" msgstr "" -#: src/filemanager/layout.c:500 -msgid "Console output" +#: src/filemanager/find.c:586 +msgid "Sea&rch for content" msgstr "" -#: src/filemanager/layout.c:504 -msgid "&Vertical" +#: src/filemanager/find.c:588 +msgid "Case sens&itive" msgstr "" -#: src/filemanager/layout.c:505 -msgid "&Horizontal" +#: src/filemanager/find.c:590 +msgid "A&ll charsets" msgstr "" -#: src/filemanager/layout.c:511 -msgid "Output lines:" +#: src/filemanager/find.c:593 +msgid "Fir&st hit" msgstr "" -#: src/filemanager/layout.c:560 -msgid "Layout" +#: src/filemanager/find.c:669 +msgid "Find File" msgstr "" -#: src/filemanager/midnight.c:201 -msgid "File listin&g" +#: src/filemanager/find.c:677 +msgid "Start at:" msgstr "" -#: src/filemanager/midnight.c:202 -msgid "&Quick view" +#: src/filemanager/find.c:686 +msgid "Ena&ble ignore directories:" msgstr "" -#: src/filemanager/midnight.c:203 -msgid "&Info" +#: src/filemanager/find.c:1014 src/filemanager/find.c:1108 +#, c-format +msgid "Grepping in %s" msgstr "" -#: src/filemanager/midnight.c:208 -msgid "&Listing format..." +#: src/filemanager/find.c:1290 +msgid "Finished" msgstr "" -#: src/filemanager/midnight.c:209 -msgid "&Sort order..." -msgstr "" +#: src/filemanager/find.c:1296 +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" -#: src/filemanager/midnight.c:210 -msgid "&Filter..." +#: src/filemanager/find.c:1492 +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -#: src/filemanager/midnight.c:212 -msgid "&Encoding..." +#: src/filemanager/find.c:1495 +#, c-format +msgid "Find File: \"%s\"" msgstr "" -#: src/filemanager/midnight.c:216 -msgid "FT&P link..." +#: src/filemanager/find.c:1592 src/filemanager/find.c:1674 +msgid "Searching" msgstr "" -#: src/filemanager/midnight.c:219 -msgid "S&hell link..." +#: src/filemanager/hotlist.c:171 +msgid "Change &to" msgstr "" -#: src/filemanager/midnight.c:222 -msgid "S&FTP link..." +#: src/filemanager/hotlist.c:174 +msgid "&Free VFSs now" msgstr "" -#: src/filemanager/midnight.c:225 -msgid "SM&B link..." +#: src/filemanager/hotlist.c:176 +msgid "&Refresh" msgstr "" -#: src/filemanager/midnight.c:227 -msgid "Paneli&ze" +#: src/filemanager/hotlist.c:179 +msgid "&Add current" msgstr "" -#: src/filemanager/midnight.c:229 -msgid "&Rescan" +#: src/filemanager/hotlist.c:181 +msgid "&Up" msgstr "" -#: src/filemanager/midnight.c:241 -msgid "&View" +#: src/filemanager/hotlist.c:185 +msgid "New &group" msgstr "" -#: src/filemanager/midnight.c:242 -msgid "Vie&w file..." +#: src/filemanager/hotlist.c:187 +msgid "New &entry" msgstr "" -#: src/filemanager/midnight.c:243 -msgid "&Filtered view" +#: src/filemanager/hotlist.c:189 src/filemanager/hotlist.c:1014 +#: src/filemanager/hotlist.c:1076 +msgid "&Insert" msgstr "" -#: src/filemanager/midnight.c:245 -msgid "&Copy" +#: src/filemanager/hotlist.c:193 src/filemanager/panelize.c:141 +msgid "&Remove" msgstr "" -#: src/filemanager/midnight.c:246 -msgid "C&hmod" +#: src/filemanager/hotlist.c:251 +msgid "Subgroup - press ENTER to see list" msgstr "" -#: src/filemanager/midnight.c:247 -msgid "&Link" +#: src/filemanager/hotlist.c:770 +msgid "Active VFS directories" msgstr "" -#: src/filemanager/midnight.c:248 -msgid "&Symlink" +#: src/filemanager/hotlist.c:777 +msgid "Directory hotlist" msgstr "" -#: src/filemanager/midnight.c:251 -msgid "Relative symlin&k" +#: src/filemanager/hotlist.c:787 src/filemanager/hotlist.c:1470 +msgid "Top level group" msgstr "" -#: src/filemanager/midnight.c:252 -msgid "Edit s&ymlink" +#: src/filemanager/hotlist.c:812 +msgid "Directory path" msgstr "" -#: src/filemanager/midnight.c:253 -msgid "Ch&own" +#: src/filemanager/hotlist.c:849 +#, c-format +msgid "Moving %s" msgstr "" -#: src/filemanager/midnight.c:255 -msgid "&Advanced chown" +#: src/filemanager/hotlist.c:859 +msgid "Directory label" msgstr "" -#: src/filemanager/midnight.c:257 -msgid "Cha&ttr" +#: src/filemanager/hotlist.c:1013 src/filemanager/hotlist.c:1075 +msgid "&Append" msgstr "" -#: src/filemanager/midnight.c:259 -msgid "&Rename/Move" +#: src/filemanager/hotlist.c:1044 +msgid "New hotlist entry" msgstr "" -#: src/filemanager/midnight.c:260 -msgid "&Mkdir" +#: src/filemanager/hotlist.c:1044 +msgid "Directory label:" msgstr "" -#: src/filemanager/midnight.c:262 -msgid "&Quick cd" +#: src/filemanager/hotlist.c:1045 +msgid "Directory path:" msgstr "" -#: src/filemanager/midnight.c:264 -msgid "Select &group" +#: src/filemanager/hotlist.c:1103 +msgid "New hotlist group" msgstr "" -#: src/filemanager/midnight.c:265 -msgid "U&nselect group" +#: src/filemanager/hotlist.c:1103 +msgid "Name of new group:" msgstr "" -#: src/filemanager/midnight.c:266 -msgid "&Invert selection" +#: src/filemanager/hotlist.c:1156 +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -#: src/filemanager/midnight.c:268 -msgid "E&xit" +#: src/filemanager/hotlist.c:1173 +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -#: src/filemanager/midnight.c:284 -msgid "&User menu" +#: src/filemanager/hotlist.c:1493 +msgid "Hotlist Load" msgstr "" -#: src/filemanager/midnight.c:285 -msgid "&Directory tree" +#: src/filemanager/hotlist.c:1495 +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -#: src/filemanager/midnight.c:286 -msgid "&Find file" +#: src/filemanager/hotlist.c:1601 +#, c-format +msgid "Label for \"%s\":" msgstr "" -#: src/filemanager/midnight.c:287 -msgid "S&wap panels" +#: src/filemanager/hotlist.c:1616 +msgid "Add to hotlist" msgstr "" -#: src/filemanager/midnight.c:288 -msgid "Switch &panels on/off" +#: src/filemanager/info.c:128 +#, c-format +msgid "Midnight Commander %s" msgstr "" -#: src/filemanager/midnight.c:290 -msgid "&Compare directories" +#: src/filemanager/info.c:150 +#, c-format +msgid "File: %s" msgstr "" -#: src/filemanager/midnight.c:292 -msgid "C&ompare files" +#: src/filemanager/info.c:168 +msgid "No node information" msgstr "" -#: src/filemanager/midnight.c:295 -msgid "E&xternal panelize" +#: src/filemanager/info.c:170 src/filemanager/info.c:172 +#: src/filemanager/info.c:175 +msgid "Free nodes:" msgstr "" -#: src/filemanager/midnight.c:296 -msgid "Show directory s&izes" +#: src/filemanager/info.c:183 +msgid "No space information" msgstr "" -#: src/filemanager/midnight.c:298 -msgid "Command &history" +#: src/filemanager/info.c:190 +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -#: src/filemanager/midnight.c:301 -msgid "Viewed/edited files hi&story" +#: src/filemanager/info.c:197 +#, c-format +msgid "Type: %s" msgstr "" -#: src/filemanager/midnight.c:303 -msgid "Di&rectory hotlist" +#: src/filemanager/info.c:198 +msgid "non-local vfs" msgstr "" -#: src/filemanager/midnight.c:305 -msgid "&Active VFS list" +#: src/filemanager/info.c:204 +#, c-format +msgid "Device: %s" msgstr "" -#: src/filemanager/midnight.c:308 -msgid "&Background jobs" +#: src/filemanager/info.c:211 +#, c-format +msgid "Filesystem: %s" msgstr "" -#: src/filemanager/midnight.c:310 -msgid "Screen lis&t" +#: src/filemanager/info.c:218 +#, c-format +msgid "Accessed: %s" msgstr "" -#: src/filemanager/midnight.c:315 -msgid "&Undelete files (ext2fs only)" +#: src/filemanager/info.c:224 +#, c-format +msgid "Modified: %s" msgstr "" -#: src/filemanager/midnight.c:318 -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#: src/filemanager/info.c:233 +#, c-format +msgid "Changed: %s" msgstr "" -#: src/filemanager/midnight.c:325 -msgid "Edit &extension file" +#: src/filemanager/info.c:241 +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -#: src/filemanager/midnight.c:326 -msgid "Edit &menu file" +#: src/filemanager/info.c:248 +#, c-format +msgid "Size: %s" msgstr "" -#: src/filemanager/midnight.c:329 -msgid "Edit hi&ghlighting group file" +#: src/filemanager/info.c:250 +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#: src/filemanager/info.c:257 +#, c-format +msgid "Owner: %s/%s" msgstr "" -#: src/filemanager/midnight.c:342 -msgid "&Configuration..." +#: src/filemanager/info.c:261 +#, c-format +msgid "Links: %d" msgstr "" -#: src/filemanager/midnight.c:343 -msgid "&Layout..." +#: src/filemanager/info.c:267 src/filemanager/info.c:283 +msgid "Attributes: not supported" msgstr "" -#: src/filemanager/midnight.c:344 -msgid "&Panel options..." +#: src/filemanager/info.c:276 +#, c-format +msgid "Attributes: %s" msgstr "" -#: src/filemanager/midnight.c:346 -msgid "C&onfirmation..." +#: src/filemanager/info.c:278 +msgid "Attributes: unavailable" msgstr "" -#: src/filemanager/midnight.c:348 -msgid "&Appearance..." +#: src/filemanager/info.c:288 +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -#: src/filemanager/midnight.c:350 -msgid "&Display bits..." +#: src/filemanager/info.c:293 +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -#: src/filemanager/midnight.c:353 -msgid "&Virtual FS..." +#: src/filemanager/layout.c:173 +msgid "&Equal split" msgstr "" -#: src/filemanager/midnight.c:455 -msgid "Panels:" +#: src/filemanager/layout.c:174 +msgid "&Menubar visible" msgstr "" -#: src/filemanager/midnight.c:1066 -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +#: src/filemanager/layout.c:175 +msgid "Command &prompt" +msgstr "" -#: src/filemanager/midnight.c:1069 src/filemanager/midnight.c:1075 -#: src/filemanager/panel.c:2822 -msgid "The Midnight Commander" +#: src/filemanager/layout.c:176 +msgid "&Keybar visible" msgstr "" -#: src/filemanager/midnight.c:1076 -msgid "Do you really want to quit the Midnight Commander?" +#: src/filemanager/layout.c:177 +msgid "H&intbar visible" msgstr "" -#: src/filemanager/midnight.c:1643 -msgid "&Above" +#: src/filemanager/layout.c:178 +msgid "&XTerm window title" msgstr "" -#: src/filemanager/midnight.c:1643 -msgid "&Left" +#: src/filemanager/layout.c:179 +msgid "&Show free space" msgstr "" -#: src/filemanager/midnight.c:1644 -msgid "&Below" +#: src/filemanager/layout.c:499 +msgid "Panel split" msgstr "" -#: src/filemanager/midnight.c:1644 -msgid "&Right" +#: src/filemanager/layout.c:500 +msgid "Console output" msgstr "" -#: src/filemanager/midnight.c:1657 -msgid "ButtonBar|Menu" +#: src/filemanager/layout.c:504 +msgid "&Vertical" msgstr "" -#: src/filemanager/midnight.c:1658 src/viewer/display.c:92 -msgid "ButtonBar|View" +#: src/filemanager/layout.c:505 +msgid "&Horizontal" msgstr "" -#: src/filemanager/midnight.c:1661 src/filemanager/tree.c:1183 -msgid "ButtonBar|RenMov" +#: src/filemanager/layout.c:511 +msgid "Output lines:" msgstr "" -#: src/filemanager/midnight.c:1662 src/filemanager/tree.c:1186 -msgid "ButtonBar|Mkdir" +#: src/filemanager/layout.c:560 +msgid "Layout" msgstr "" -#: src/filemanager/mountlist.c:900 +#: src/filemanager/mountlist.c:908 msgid "Memory exhausted!" msgstr "" @@ -4647,67 +4655,67 @@ msgid "Group" msgstr "" -#: src/filemanager/panel.c:498 +#: src/filemanager/panel.c:500 msgid "[dev]" msgstr "" -#: src/filemanager/panel.c:511 src/filemanager/panel.c:1030 +#: src/filemanager/panel.c:513 src/filemanager/panel.c:1032 msgid "UP--DIR" msgstr "" -#: src/filemanager/panel.c:530 +#: src/filemanager/panel.c:532 msgid "SYMLINK" msgstr "" -#: src/filemanager/panel.c:533 +#: src/filemanager/panel.c:535 msgid "SUB-DIR" msgstr "" -#: src/filemanager/panel.c:1022 +#: src/filemanager/panel.c:1024 msgid "" msgstr "" -#: src/filemanager/panel.c:1087 +#: src/filemanager/panel.c:1089 #, c-format msgid "%s in %d file" msgid_plural "%s in %d files" msgstr[0] "" msgstr[1] "" -#: src/filemanager/panel.c:1290 +#: src/filemanager/panel.c:1292 msgid "Panelize" msgstr "" -#: src/filemanager/panel.c:1805 +#: src/filemanager/panel.c:1810 msgid "Unknown tag on display format:" msgstr "" -#: src/filemanager/panel.c:2535 +#: src/filemanager/panel.c:2539 msgid "&Files only" msgstr "" -#: src/filemanager/panel.c:2538 +#: src/filemanager/panel.c:2542 msgid "&Case sensitive" msgstr "" -#: src/filemanager/panel.c:2593 +#: src/filemanager/panel.c:2597 msgid "Select" msgstr "" -#: src/filemanager/panel.c:2601 +#: src/filemanager/panel.c:2605 msgid "Unselect" msgstr "" -#: src/filemanager/panel.c:2822 +#: src/filemanager/panel.c:2818 msgid "Do you really want to execute?" msgstr "" -#: src/filemanager/panel.c:3286 src/filemanager/panel.c:4408 -#: src/filemanager/panel.c:4456 src/viewer/actions_cmd.c:332 +#: src/filemanager/panel.c:3284 src/filemanager/panel.c:4409 +#: src/filemanager/panel.c:4457 src/viewer/actions_cmd.c:332 msgid "Cannot read directory contents" msgstr "" -#: src/filemanager/panel.c:4510 +#: src/filemanager/panel.c:4511 msgid "User supplied format looks invalid, reverting to default." msgstr "" @@ -4771,45 +4779,45 @@ "%s\n" msgstr "" -#: src/filemanager/tree.c:722 +#: src/filemanager/tree.c:717 #, c-format msgid "Copy \"%s\" directory to:" msgstr "" -#: src/filemanager/tree.c:761 +#: src/filemanager/tree.c:756 #, c-format msgid "Move \"%s\" directory to:" msgstr "" -#: src/filemanager/tree.c:774 +#: src/filemanager/tree.c:769 #, c-format msgid "" "Cannot stat the destination\n" "%s" msgstr "" -#: src/filemanager/tree.c:832 +#: src/filemanager/tree.c:827 #, c-format msgid "Delete %s?" msgstr "" -#: src/filemanager/tree.c:989 src/filemanager/tree.c:1180 +#: src/filemanager/tree.c:984 src/filemanager/tree.c:1175 msgid "ButtonBar|Static" msgstr "" -#: src/filemanager/tree.c:989 src/filemanager/tree.c:1181 +#: src/filemanager/tree.c:984 src/filemanager/tree.c:1176 msgid "ButtonBar|Dynamc" msgstr "" -#: src/filemanager/tree.c:1178 +#: src/filemanager/tree.c:1173 msgid "ButtonBar|Rescan" msgstr "" -#: src/filemanager/tree.c:1179 +#: src/filemanager/tree.c:1174 msgid "ButtonBar|Forget" msgstr "" -#: src/filemanager/tree.c:1190 +#: src/filemanager/tree.c:1185 msgid "ButtonBar|Rmdir" msgstr "" @@ -4903,25 +4911,25 @@ "key, or click with the mouse to define it. Move around with Tab." msgstr "" -#: src/main.c:275 +#: src/main.c:272 #, c-format msgid "" "Failed to run:\n" "%s\n" msgstr "" -#: src/main.c:289 +#: src/main.c:285 msgid "Home directory path is not absolute" msgstr "" -#: src/main.c:415 +#: src/main.c:411 msgid "" "GNU Midnight Commander\n" "is already running on this terminal.\n" "Subshell support will be disabled." msgstr "" -#: src/main.c:555 +#: src/main.c:551 #, c-format msgid "" "\n" @@ -4945,23 +4953,23 @@ msgid "%b %e %H:%M" msgstr "" -#: src/setup.c:1289 +#: src/setup.c:1290 #, c-format msgid "" "Cannot save file %s:\n" "%s" msgstr "" -#: src/subshell/common.c:1031 +#: src/subshell/common.c:1331 #, c-format msgid "Cannot open named pipe %s\n" msgstr "" -#: src/subshell/common.c:1220 +#: src/subshell/common.c:1606 msgid "The shell is still active. Quit anyway?" msgstr "" -#: src/subshell/common.c:1320 +#: src/subshell/common.c:1725 #, c-format msgid "Warning: Cannot change to %s.\n" msgstr "" @@ -5164,241 +5172,241 @@ msgid "%s contains duplicate entries! Skipping!" msgstr "" -#: src/vfs/cpio/cpio.c:577 src/vfs/cpio/cpio.c:643 src/vfs/cpio/cpio.c:649 -#: src/vfs/cpio/cpio.c:718 src/vfs/cpio/cpio.c:728 +#: src/vfs/cpio/cpio.c:577 src/vfs/cpio/cpio.c:644 src/vfs/cpio/cpio.c:650 +#: src/vfs/cpio/cpio.c:719 src/vfs/cpio/cpio.c:729 #, c-format msgid "" "Corrupted cpio header encountered in\n" "%s" msgstr "" -#: src/vfs/cpio/cpio.c:792 +#: src/vfs/cpio/cpio.c:793 #, c-format msgid "" "Unexpected end of file\n" "%s" msgstr "" -#: src/vfs/extfs/extfs.c:628 +#: src/vfs/extfs/extfs.c:649 #, c-format msgid "" "Cannot open %s archive\n" "%s" msgstr "" -#: src/vfs/extfs/extfs.c:633 src/vfs/extfs/extfs.c:638 +#: src/vfs/extfs/extfs.c:654 src/vfs/extfs/extfs.c:659 msgid "Inconsistent extfs archive" msgstr "" -#: src/vfs/extfs/extfs.c:1418 +#: src/vfs/extfs/extfs.c:1442 #, c-format msgid "Warning: cannot open %s directory\n" msgstr "" -#: src/vfs/fish/fish.c:384 +#: src/vfs/fish/fish.c:383 #, c-format msgid "fish: Disconnecting from %s" msgstr "" -#: src/vfs/fish/fish.c:560 +#: src/vfs/fish/fish.c:559 msgid "fish: Waiting for initial line..." msgstr "" -#: src/vfs/fish/fish.c:570 +#: src/vfs/fish/fish.c:569 msgid "Sorry, we cannot do password authenticated connections for now." msgstr "" -#: src/vfs/fish/fish.c:578 +#: src/vfs/fish/fish.c:577 #, c-format msgid "fish: Password is required for %s" msgstr "" -#: src/vfs/fish/fish.c:586 +#: src/vfs/fish/fish.c:585 msgid "fish: Sending password..." msgstr "" -#: src/vfs/fish/fish.c:623 +#: src/vfs/fish/fish.c:622 msgid "fish: Sending initial line..." msgstr "" -#: src/vfs/fish/fish.c:634 +#: src/vfs/fish/fish.c:633 msgid "fish: Handshaking version..." msgstr "" -#: src/vfs/fish/fish.c:645 +#: src/vfs/fish/fish.c:644 msgid "fish: Getting host info..." msgstr "" -#: src/vfs/fish/fish.c:767 +#: src/vfs/fish/fish.c:766 #, c-format msgid "fish: Reading directory %s..." msgstr "" -#: src/vfs/fish/fish.c:951 src/vfs/ftpfs/ftpfs.c:1859 +#: src/vfs/fish/fish.c:952 src/vfs/ftpfs/ftpfs.c:1858 #: src/vfs/undelfs/undelfs.c:392 #, c-format msgid "%s: done." msgstr "" -#: src/vfs/fish/fish.c:958 src/vfs/ftpfs/ftpfs.c:1806 +#: src/vfs/fish/fish.c:959 src/vfs/ftpfs/ftpfs.c:1805 #: src/vfs/undelfs/undelfs.c:395 #, c-format msgid "%s: failure" msgstr "" -#: src/vfs/fish/fish.c:1016 +#: src/vfs/fish/fish.c:1017 #, c-format msgid "fish: store %s: sending command..." msgstr "" -#: src/vfs/fish/fish.c:1040 +#: src/vfs/fish/fish.c:1041 msgid "fish: Local read failed, sending zeros" msgstr "" -#: src/vfs/fish/fish.c:1059 +#: src/vfs/fish/fish.c:1060 msgid "fish: storing file" msgstr "" -#: src/vfs/fish/fish.c:1129 +#: src/vfs/fish/fish.c:1130 msgid "Aborting transfer..." msgstr "" -#: src/vfs/fish/fish.c:1145 +#: src/vfs/fish/fish.c:1146 msgid "Error reported after abort." msgstr "" -#: src/vfs/fish/fish.c:1147 +#: src/vfs/fish/fish.c:1148 msgid "Aborted transfer would be successful." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:591 +#: src/vfs/ftpfs/ftpfs.c:590 #, c-format msgid "ftpfs: Disconnecting from %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:643 +#: src/vfs/ftpfs/ftpfs.c:642 #, c-format msgid "FTP: Password required for %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:686 +#: src/vfs/ftpfs/ftpfs.c:685 msgid "ftpfs: sending login name" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:691 +#: src/vfs/ftpfs/ftpfs.c:690 msgid "ftpfs: sending user password" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:697 +#: src/vfs/ftpfs/ftpfs.c:696 #, c-format msgid "FTP: Account required for user %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:699 +#: src/vfs/ftpfs/ftpfs.c:698 msgid "Account:" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:704 +#: src/vfs/ftpfs/ftpfs.c:703 msgid "ftpfs: sending user account" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:714 +#: src/vfs/ftpfs/ftpfs.c:713 msgid "ftpfs: logged in" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:727 +#: src/vfs/ftpfs/ftpfs.c:726 #, c-format msgid "ftpfs: Login incorrect for user %s " msgstr "" -#: src/vfs/ftpfs/ftpfs.c:858 +#: src/vfs/ftpfs/ftpfs.c:857 msgid "ftpfs: Invalid host name." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:904 src/vfs/ftpfs/ftpfs.c:920 +#: src/vfs/ftpfs/ftpfs.c:903 src/vfs/ftpfs/ftpfs.c:919 #, c-format msgid "ftpfs: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:927 +#: src/vfs/ftpfs/ftpfs.c:926 #, c-format msgid "ftpfs: making connection to %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:937 +#: src/vfs/ftpfs/ftpfs.c:936 msgid "ftpfs: connection interrupted by user" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:939 +#: src/vfs/ftpfs/ftpfs.c:938 #, c-format msgid "ftpfs: connection to server failed: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:994 +#: src/vfs/ftpfs/ftpfs.c:993 #, c-format msgid "Waiting to retry... %d (Control-G to cancel)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1306 +#: src/vfs/ftpfs/ftpfs.c:1305 msgid "ftpfs: invalid address family" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1314 +#: src/vfs/ftpfs/ftpfs.c:1313 #, c-format msgid "ftpfs: could not create socket: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1349 +#: src/vfs/ftpfs/ftpfs.c:1348 msgid "ftpfs: could not setup passive mode" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1469 +#: src/vfs/ftpfs/ftpfs.c:1468 msgid "ftpfs: aborting transfer." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1473 +#: src/vfs/ftpfs/ftpfs.c:1472 #, c-format msgid "ftpfs: abort error: %s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1481 +#: src/vfs/ftpfs/ftpfs.c:1480 msgid "ftpfs: abort failed" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1624 src/vfs/ftpfs/ftpfs.c:1747 +#: src/vfs/ftpfs/ftpfs.c:1623 src/vfs/ftpfs/ftpfs.c:1746 msgid "ftpfs: CWD failed." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1633 src/vfs/ftpfs/ftpfs.c:1641 +#: src/vfs/ftpfs/ftpfs.c:1632 src/vfs/ftpfs/ftpfs.c:1640 msgid "ftpfs: couldn't resolve symlink" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1715 +#: src/vfs/ftpfs/ftpfs.c:1714 msgid "Resolving symlink..." msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1739 +#: src/vfs/ftpfs/ftpfs.c:1738 #, c-format msgid "ftpfs: Reading FTP directory %s... %s%s" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1742 +#: src/vfs/ftpfs/ftpfs.c:1741 msgid "(strict rfc959)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1742 +#: src/vfs/ftpfs/ftpfs.c:1741 msgid "(chdir first)" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1783 +#: src/vfs/ftpfs/ftpfs.c:1782 msgid "ftpfs: failed; nowhere to fallback to" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:1948 +#: src/vfs/ftpfs/ftpfs.c:1947 msgid "ftpfs: storing file" msgstr "" -#: src/vfs/ftpfs/ftpfs.c:2452 +#: src/vfs/ftpfs/ftpfs.c:2451 msgid "" "~/.netrc file has incorrect mode\n" "Remove password or correct mode" @@ -5500,31 +5508,31 @@ msgid "reconnect to %s failed" msgstr "" -#: src/vfs/smbfs/smbfs.c:1320 +#: src/vfs/smbfs/smbfs.c:1321 msgid "Authentication failed" msgstr "" -#: src/vfs/smbfs/smbfs.c:1909 +#: src/vfs/smbfs/smbfs.c:1910 #, c-format msgid "Error %s creating directory %s" msgstr "" -#: src/vfs/smbfs/smbfs.c:1938 +#: src/vfs/smbfs/smbfs.c:1939 #, c-format msgid "Error %s removing directory %s" msgstr "" -#: src/vfs/smbfs/smbfs.c:2068 +#: src/vfs/smbfs/smbfs.c:2069 #, c-format msgid "%s opening remote file %s" msgstr "" -#: src/vfs/smbfs/smbfs.c:2148 +#: src/vfs/smbfs/smbfs.c:2149 #, c-format msgid "%s removing remote file %s" msgstr "" -#: src/vfs/smbfs/smbfs.c:2185 +#: src/vfs/smbfs/smbfs.c:2186 #, c-format msgid "%s renaming files\n" msgstr "" @@ -5545,7 +5553,7 @@ msgid "Unexpected EOF on archive file" msgstr "" -#: src/vfs/tar/tar.c:878 +#: src/vfs/tar/tar.c:880 #, c-format msgid "" "%s\n" @@ -5620,24 +5628,24 @@ "%s" msgstr "" -#: src/vfs/undelfs/undelfs.c:411 +#: src/vfs/undelfs/undelfs.c:410 msgid "vfs_info is not fs!" msgstr "" -#: src/vfs/undelfs/undelfs.c:457 src/vfs/undelfs/undelfs.c:681 +#: src/vfs/undelfs/undelfs.c:461 src/vfs/undelfs/undelfs.c:685 msgid "You have to chdir to extract files first" msgstr "" -#: src/vfs/undelfs/undelfs.c:603 +#: src/vfs/undelfs/undelfs.c:607 msgid "while iterating over blocks" msgstr "" -#: src/vfs/undelfs/undelfs.c:725 +#: src/vfs/undelfs/undelfs.c:729 #, c-format msgid "Cannot open file \"%s\"" msgstr "" -#: src/vfs/undelfs/undelfs.c:819 +#: src/vfs/undelfs/undelfs.c:823 msgid "Ext2lib error" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/mn.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/mn.gmo differ diff -Nru mc-4.8.25/po/mn.po mc-4.8.26/po/mn.po --- mc-4.8.25/po/mn.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/mn.po 2021-01-21 17:18:34.000000000 +0000 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-31 12:10+0000\n" -"Last-Translator: Shuree Nyam-Oidov <99shuree@gmail.com>\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Mongolian (http://www.transifex.com/mc/mc/language/mn/)\n" "Language: mn\n" "MIME-Version: 1.0\n" @@ -1882,6 +1882,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2101,6 +2104,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2161,6 +2170,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2433,12 +2445,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2890,6 +2896,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "&Файлийг жагсаалт" + +msgid "&Quick view" +msgstr "Х&урдан харах" + +msgid "&Info" +msgstr "&Мэдээлэл" + +msgid "&Tree" +msgstr "&Мод" + +msgid "&Listing format..." +msgstr "&Жагшаалтын формат" + +msgid "&Sort order..." +msgstr "Эрэмбэлэх &дараалал..." + +msgid "&Filter..." +msgstr "&Шүүлт..." + +msgid "&Encoding..." +msgstr "&Кодчилол" + +msgid "FT&P link..." +msgstr "&FTP-холбоос..." + +msgid "S&hell link..." +msgstr "S&hell-холбоос..." + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SM&B-холбоос..." + +msgid "Paneli&ze" +msgstr "&Панелиз" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "&файлийг харах" + +msgid "&Filtered view" +msgstr "&Шүүлтийг харах" + +msgid "&Copy" +msgstr "Х&уулах" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "&Линк" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "Ха&мааралтай symlink" + +msgid "Edit s&ymlink" +msgstr "&Symlink-ийг засварлах" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "&Ахисан шатны chown" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "Х&урдан CD" + +msgid "Select &group" +msgstr "&Групыг сонгох" + +msgid "U&nselect group" +msgstr "Г&рупыг сонгохгүй" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "Гара&х" + +msgid "&User menu" +msgstr "Хэрэгл&эгчийн цэс" + +msgid "&Directory tree" +msgstr "&Хавтас мод" + +msgid "&Find file" +msgstr "&Файл хайх" + +msgid "S&wap panels" +msgstr "Панелуудыг хооронд нь с&олих" + +msgid "Switch &panels on/off" +msgstr "Унтраалга &панели on/off" + +msgid "&Compare directories" +msgstr "&Хавсралт файлийг харьцуулах" + +msgid "C&ompare files" +msgstr "Файлийн хар&ьцуулах" + +msgid "E&xternal panelize" +msgstr "Г&адаад панелиз хийх" + +msgid "Show directory s&izes" +msgstr "Хавсралтыг хэ&мжээ харуулах " + +msgid "Command &history" +msgstr "Командын тү&үх " + +msgid "Viewed/edited files hi&story" +msgstr "Харуулсан/засварласан файлийн тү&үх" + +msgid "Di&rectory hotlist" +msgstr "Ка&талоги жагсаалт" + +msgid "&Active VFS list" +msgstr "&Идэвхтэй VFS жагсаалт" + +msgid "&Background jobs" +msgstr "фон&дын ажилууд" + +msgid "Screen lis&t" +msgstr "Дэлгэцийн жагсаа&лт" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Сэргээгдсэн файлууд (зөвхөн ext2fs)" + +msgid "&Listing format edit" +msgstr "&Засварлагдах бүтэцүүд" + +msgid "Edit &extension file" +msgstr "Файлын &өргөтгөл" + +msgid "Edit &menu file" +msgstr "Файл &цэс" + +msgid "Edit hi&ghlighting group file" +msgstr "Өнгөөр то&руулсан бүлэг файлийг засварлах" + +msgid "&Configuration..." +msgstr "&Тохиргоо..." + +msgid "&Layout..." +msgstr "&Гадаад төрх..." + +msgid "&Panel options..." +msgstr "&Панелийн сонголт" + +msgid "C&onfirmation..." +msgstr "Бат&лах" + +msgid "&Appearance..." +msgstr "Хараг&дах байдал" + +msgid "&Display bits..." +msgstr "&Бит тэмдэгтүүд..." + +msgid "&Virtual FS..." +msgstr "Виртуаль &FS..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "&Зүүн" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "&Баруун" + +msgid "ButtonBar|Menu" +msgstr "Цэс" + +msgid "ButtonBar|View" +msgstr "Харах" + +msgid "ButtonBar|RenMov" +msgstr "Арилгх" + +msgid "ButtonBar|Mkdir" +msgstr "КтлогХ" + msgid "&Chdir" msgstr "&Шилжих" @@ -2936,9 +3161,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Мод" - msgid "Find File" msgstr "Файл хайх" @@ -3193,222 +3415,6 @@ msgid "Layout" msgstr "Гадаад төрх" -msgid "File listin&g" -msgstr "&Файлийг жагсаалт" - -msgid "&Quick view" -msgstr "Х&урдан харах" - -msgid "&Info" -msgstr "&Мэдээлэл" - -msgid "&Listing format..." -msgstr "&Жагшаалтын формат" - -msgid "&Sort order..." -msgstr "Эрэмбэлэх &дараалал..." - -msgid "&Filter..." -msgstr "&Шүүлт..." - -msgid "&Encoding..." -msgstr "&Кодчилол" - -msgid "FT&P link..." -msgstr "&FTP-холбоос..." - -msgid "S&hell link..." -msgstr "S&hell-холбоос..." - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SM&B-холбоос..." - -msgid "Paneli&ze" -msgstr "&Панелиз" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "&файлийг харах" - -msgid "&Filtered view" -msgstr "&Шүүлтийг харах" - -msgid "&Copy" -msgstr "Х&уулах" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "&Линк" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "Ха&мааралтай symlink" - -msgid "Edit s&ymlink" -msgstr "&Symlink-ийг засварлах" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "&Ахисан шатны chown" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "Х&урдан CD" - -msgid "Select &group" -msgstr "&Групыг сонгох" - -msgid "U&nselect group" -msgstr "Г&рупыг сонгохгүй" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "Гара&х" - -msgid "&User menu" -msgstr "Хэрэгл&эгчийн цэс" - -msgid "&Directory tree" -msgstr "&Хавтас мод" - -msgid "&Find file" -msgstr "&Файл хайх" - -msgid "S&wap panels" -msgstr "Панелуудыг хооронд нь с&олих" - -msgid "Switch &panels on/off" -msgstr "Унтраалга &панели on/off" - -msgid "&Compare directories" -msgstr "&Хавсралт файлийг харьцуулах" - -msgid "C&ompare files" -msgstr "Файлийн хар&ьцуулах" - -msgid "E&xternal panelize" -msgstr "Г&адаад панелиз хийх" - -msgid "Show directory s&izes" -msgstr "Хавсралтыг хэ&мжээ харуулах " - -msgid "Command &history" -msgstr "Командын тү&үх " - -msgid "Viewed/edited files hi&story" -msgstr "Харуулсан/засварласан файлийн тү&үх" - -msgid "Di&rectory hotlist" -msgstr "Ка&талоги жагсаалт" - -msgid "&Active VFS list" -msgstr "&Идэвхтэй VFS жагсаалт" - -msgid "&Background jobs" -msgstr "фон&дын ажилууд" - -msgid "Screen lis&t" -msgstr "Дэлгэцийн жагсаа&лт" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Сэргээгдсэн файлууд (зөвхөн ext2fs)" - -msgid "&Listing format edit" -msgstr "&Засварлагдах бүтэцүүд" - -msgid "Edit &extension file" -msgstr "Файлын &өргөтгөл" - -msgid "Edit &menu file" -msgstr "Файл &цэс" - -msgid "Edit hi&ghlighting group file" -msgstr "Өнгөөр то&руулсан бүлэг файлийг засварлах" - -msgid "&Configuration..." -msgstr "&Тохиргоо..." - -msgid "&Layout..." -msgstr "&Гадаад төрх..." - -msgid "&Panel options..." -msgstr "&Панелийн сонголт" - -msgid "C&onfirmation..." -msgstr "Бат&лах" - -msgid "&Appearance..." -msgstr "Хараг&дах байдал" - -msgid "&Display bits..." -msgstr "&Бит тэмдэгтүүд..." - -msgid "&Virtual FS..." -msgstr "Виртуаль &FS..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "&Зүүн" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "&Баруун" - -msgid "ButtonBar|Menu" -msgstr "Цэс" - -msgid "ButtonBar|View" -msgstr "Харах" - -msgid "ButtonBar|RenMov" -msgstr "Арилгх" - -msgid "ButtonBar|Mkdir" -msgstr "КтлогХ" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/nb.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/nb.gmo differ diff -Nru mc-4.8.25/po/nb.po mc-4.8.26/po/nb.po --- mc-4.8.25/po/nb.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/nb.po 2021-01-21 17:18:34.000000000 +0000 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-19 04:15+0000\n" -"Last-Translator: Kjell Cato Heskjestad \n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/mc/mc/language/" "nb/)\n" "Language: nb\n" @@ -1990,6 +1990,9 @@ msgid "Skin:" msgstr "Drakt:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Presentasjonsdrakt" @@ -2213,6 +2216,14 @@ msgid "SMB authentication" msgstr "SMB-autentisering" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Klarte ikke bytte mappe til «%s»\n" +"%s" + msgid "Secure deletion" msgstr "Sikker sletting" @@ -2273,6 +2284,9 @@ msgid "No COW" msgstr "Ikke COW" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "Ikke versalsensitiv" @@ -2553,14 +2567,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Kan ikke kjøre kommandoer i eksterne filsystemer" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Klarte ikke bytte mappe til «%s»\n" -"%s" - msgid "Parameter" msgstr "Parameter" @@ -3095,6 +3101,225 @@ msgid "Invalid source pattern '%s'" msgstr "ugyldig kildemønster «%s»" +msgid "File listin&g" +msgstr "&List ut filer" + +msgid "&Quick view" +msgstr "&Hurtigvis" + +msgid "&Info" +msgstr "&Informasjon" + +msgid "&Tree" +msgstr "&Tre" + +msgid "&Listing format..." +msgstr "&Utlistingsformat ..." + +msgid "&Sort order..." +msgstr "Sorterings&rekkefølge ..." + +msgid "&Filter..." +msgstr "&Filtrer ..." + +msgid "&Encoding..." +msgstr "Tegn&koding for filnavn ..." + +msgid "FT&P link..." +msgstr "Koble til FT&P ..." + +msgid "S&hell link..." +msgstr "Koble til &skall ..." + +msgid "S&FTP link..." +msgstr "K&oble til SFTP ..." + +msgid "SM&B link..." +msgstr "Koble til SM&B ..." + +msgid "Paneli&ze" +msgstr "&Vis lagt til i panel" + +msgid "&Rescan" +msgstr "Opp&dater" + +msgid "&View" +msgstr "&Vis" + +msgid "Vie&w file..." +msgstr "V&is fil ..." + +msgid "&Filtered view" +msgstr "Vis &filtrert" + +msgid "&Copy" +msgstr "&Kopier" + +msgid "C&hmod" +msgstr "Chm&od" + +msgid "&Link" +msgstr "&Lag lenke" + +msgid "&Symlink" +msgstr "Lag sym&bolsk lenke" + +msgid "Relative symlin&k" +msgstr "Lag relativ s&ymlenke" + +msgid "Edit s&ymlink" +msgstr "Redi&ger symlenke" + +msgid "Ch&own" +msgstr "Cho&wn" + +msgid "&Advanced chown" +msgstr "&Avansert chown" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "&Endre navn/flytt" + +msgid "&Mkdir" +msgstr "Lag &mappe" + +msgid "&Quick cd" +msgstr "Rask &cd" + +msgid "Select &group" +msgstr "Velg gr&uppe" + +msgid "U&nselect group" +msgstr "Fravelg gru&ppe" + +msgid "&Invert selection" +msgstr "I&nverter utvalg" + +msgid "E&xit" +msgstr "Avslu&tt" + +msgid "&User menu" +msgstr "&Brukermeny" + +msgid "&Directory tree" +msgstr "Mappe&tre" + +msgid "&Find file" +msgstr "F&inn fil" + +msgid "S&wap panels" +msgstr "Bytt &om paneler" + +msgid "Switch &panels on/off" +msgstr "&Paneler av/på" + +msgid "&Compare directories" +msgstr "Sammenlign &mapper" + +msgid "C&ompare files" +msgstr "Sammenlign &filer" + +msgid "E&xternal panelize" +msgstr "Legg til &eksternt i panel" + +msgid "Show directory s&izes" +msgstr "Vis mappe&størrelser" + +msgid "Command &history" +msgstr "&Kommandohistorikk" + +msgid "Viewed/edited files hi&story" +msgstr "Historikk over viste/redigerte filer" + +msgid "Di&rectory hotlist" +msgstr "F&avorittmapper" + +msgid "&Active VFS list" +msgstr "Tilgjengelige &VFS" + +msgid "&Background jobs" +msgstr "Bakgrunns&jobber" + +msgid "Screen lis&t" +msgstr "Kjørende mo&duler" + +msgid "&Undelete files (ext2fs only)" +msgstr "Gjenopprett filer (kun ext2fs)" + +msgid "&Listing format edit" +msgstr "Redigering av listeformat" + +msgid "Edit &extension file" +msgstr "Rediger &utvidelsesfil" + +msgid "Edit &menu file" +msgstr "Rediger men&yfil" + +msgid "Edit hi&ghlighting group file" +msgstr "Rediger uthevings&grupper" + +msgid "&Configuration..." +msgstr "&Oppsett ..." + +msgid "&Layout..." +msgstr "&Utforming ..." + +msgid "&Panel options..." +msgstr "&Panelinnstillinger ..." + +msgid "C&onfirmation..." +msgstr "&Bekreftelser ..." + +msgid "&Appearance..." +msgstr "&Presentasjonsdrakt ..." + +msgid "&Display bits..." +msgstr "&Tegnkoding ..." + +msgid "&Virtual FS..." +msgstr "&Virtuelt FS ..." + +msgid "Panels:" +msgstr "Paneler:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Det er %zu åpen modul. Avslutte likevel?" +msgstr[1] "Det er %zu åpne moduler. Avslutte likevel?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "VIl du avslutte Midnight Commander?" + +msgid "&Above" +msgstr "&Øverst" + +msgid "&Left" +msgstr "&Venstre" + +msgid "&Below" +msgstr "&Nederst" + +msgid "&Right" +msgstr "&Høyre" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Meny" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Vis" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Flytt" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "&Bytt mappe" @@ -3141,9 +3366,6 @@ msgid "Fir&st hit" msgstr "&Første treff" -msgid "&Tree" -msgstr "&Tre" - msgid "Find File" msgstr "Finn fil" @@ -3402,222 +3624,6 @@ msgid "Layout" msgstr "Utforming" -msgid "File listin&g" -msgstr "&List ut filer" - -msgid "&Quick view" -msgstr "&Hurtigvis" - -msgid "&Info" -msgstr "&Informasjon" - -msgid "&Listing format..." -msgstr "&Utlistingsformat ..." - -msgid "&Sort order..." -msgstr "Sorterings&rekkefølge ..." - -msgid "&Filter..." -msgstr "&Filtrer ..." - -msgid "&Encoding..." -msgstr "Tegn&koding for filnavn ..." - -msgid "FT&P link..." -msgstr "Koble til FT&P ..." - -msgid "S&hell link..." -msgstr "Koble til &skall ..." - -msgid "S&FTP link..." -msgstr "K&oble til SFTP ..." - -msgid "SM&B link..." -msgstr "Koble til SM&B ..." - -msgid "Paneli&ze" -msgstr "&Vis lagt til i panel" - -msgid "&Rescan" -msgstr "Opp&dater" - -msgid "&View" -msgstr "&Vis" - -msgid "Vie&w file..." -msgstr "V&is fil ..." - -msgid "&Filtered view" -msgstr "Vis &filtrert" - -msgid "&Copy" -msgstr "&Kopier" - -msgid "C&hmod" -msgstr "Chm&od" - -msgid "&Link" -msgstr "&Lag lenke" - -msgid "&Symlink" -msgstr "Lag sym&bolsk lenke" - -msgid "Relative symlin&k" -msgstr "Lag relativ s&ymlenke" - -msgid "Edit s&ymlink" -msgstr "Redi&ger symlenke" - -msgid "Ch&own" -msgstr "Cho&wn" - -msgid "&Advanced chown" -msgstr "&Avansert chown" - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "&Endre navn/flytt" - -msgid "&Mkdir" -msgstr "Lag &mappe" - -msgid "&Quick cd" -msgstr "Rask &cd" - -msgid "Select &group" -msgstr "Velg gr&uppe" - -msgid "U&nselect group" -msgstr "Fravelg gru&ppe" - -msgid "&Invert selection" -msgstr "I&nverter utvalg" - -msgid "E&xit" -msgstr "Avslu&tt" - -msgid "&User menu" -msgstr "&Brukermeny" - -msgid "&Directory tree" -msgstr "Mappe&tre" - -msgid "&Find file" -msgstr "F&inn fil" - -msgid "S&wap panels" -msgstr "Bytt &om paneler" - -msgid "Switch &panels on/off" -msgstr "&Paneler av/på" - -msgid "&Compare directories" -msgstr "Sammenlign &mapper" - -msgid "C&ompare files" -msgstr "Sammenlign &filer" - -msgid "E&xternal panelize" -msgstr "Legg til &eksternt i panel" - -msgid "Show directory s&izes" -msgstr "Vis mappe&størrelser" - -msgid "Command &history" -msgstr "&Kommandohistorikk" - -msgid "Viewed/edited files hi&story" -msgstr "Historikk over viste/redigerte filer" - -msgid "Di&rectory hotlist" -msgstr "F&avorittmapper" - -msgid "&Active VFS list" -msgstr "Tilgjengelige &VFS" - -msgid "&Background jobs" -msgstr "Bakgrunns&jobber" - -msgid "Screen lis&t" -msgstr "Kjørende mo&duler" - -msgid "&Undelete files (ext2fs only)" -msgstr "Gjenopprett filer (kun ext2fs)" - -msgid "&Listing format edit" -msgstr "Redigering av listeformat" - -msgid "Edit &extension file" -msgstr "Rediger &utvidelsesfil" - -msgid "Edit &menu file" -msgstr "Rediger men&yfil" - -msgid "Edit hi&ghlighting group file" -msgstr "Rediger uthevings&grupper" - -msgid "&Configuration..." -msgstr "&Oppsett ..." - -msgid "&Layout..." -msgstr "&Utforming ..." - -msgid "&Panel options..." -msgstr "&Panelinnstillinger ..." - -msgid "C&onfirmation..." -msgstr "&Bekreftelser ..." - -msgid "&Appearance..." -msgstr "&Presentasjonsdrakt ..." - -msgid "&Display bits..." -msgstr "&Tegnkoding ..." - -msgid "&Virtual FS..." -msgstr "&Virtuelt FS ..." - -msgid "Panels:" -msgstr "Paneler:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Det er %zu åpen modul. Avslutte likevel?" -msgstr[1] "Det er %zu åpne moduler. Avslutte likevel?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "VIl du avslutte Midnight Commander?" - -msgid "&Above" -msgstr "&Øverst" - -msgid "&Left" -msgstr "&Venstre" - -msgid "&Below" -msgstr "&Nederst" - -msgid "&Right" -msgstr "&Høyre" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Meny" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Vis" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Flytt" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Gikk tom for minne." Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/nl.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/nl.gmo differ diff -Nru mc-4.8.25/po/nl.po mc-4.8.26/po/nl.po --- mc-4.8.25/po/nl.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/nl.po 2021-01-21 17:18:34.000000000 +0000 @@ -14,9 +14,9 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-28 13:38+0000\n" -"Last-Translator: Richard E. van der Luit \n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" +"Last-Translator: Transifex Bot <>\n" "Language-Team: Dutch (http://www.transifex.com/mc/mc/language/nl/)\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -1983,6 +1983,9 @@ msgid "Skin:" msgstr "Skin:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Uiterlijk" @@ -2207,6 +2210,14 @@ msgid "SMB authentication" msgstr "SMB-authenticatie" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Veranderen naar map \"%s\" mislukt \n" +"%s " + msgid "Secure deletion" msgstr "Secure verwijderen" @@ -2267,6 +2278,9 @@ msgid "No COW" msgstr "Geen COW" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "Casefolded bestand" @@ -2547,14 +2561,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "U kunt geen opdrachten uitvoeren op non-lokale bestandssystemen" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Veranderen naar map \"%s\" mislukt \n" -"%s " - msgid "Parameter" msgstr "Parameter" @@ -3091,6 +3097,225 @@ msgid "Invalid source pattern '%s'" msgstr "Ongeldig bronpatroon '%s'" +msgid "File listin&g" +msgstr "Bestandsopsommin&g" + +msgid "&Quick view" +msgstr "&Korte lijst" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Boom" + +msgid "&Listing format..." +msgstr "&Lijstformaat..." + +msgid "&Sort order..." +msgstr "&Sorteervolgorde... " + +msgid "&Filter..." +msgstr "&Filter... " + +msgid "&Encoding..." +msgstr "&Encoderen..." + +msgid "FT&P link..." +msgstr "FT&P-Verbinding... " + +msgid "S&hell link..." +msgstr "S&hellverbinding... " + +msgid "S&FTP link..." +msgstr "S&FTP-link..." + +msgid "SM&B link..." +msgstr "SM&B-Verbinding..." + +msgid "Paneli&ze" +msgstr "Als vens&ter" + +msgid "&Rescan" +msgstr "&Herlezen" + +msgid "&View" +msgstr "&Weergave" + +msgid "Vie&w file..." +msgstr "&Tonen bestand..." + +msgid "&Filtered view" +msgstr "&Gefilterde weergave" + +msgid "&Copy" +msgstr "&Kopiëren" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Link" + +msgid "&Symlink" +msgstr "&Symlink" + +msgid "Relative symlin&k" +msgstr "Relatieve symli&nk" + +msgid "Edit s&ymlink" +msgstr "S&ymlink bewerken" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "&Uitgebreide chown" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "&Hernoemen" + +msgid "&Mkdir" +msgstr "&Map maken" + +msgid "&Quick cd" +msgstr "&Snelle cd" + +msgid "Select &group" +msgstr "Selecteren &groep" + +msgid "U&nselect group" +msgstr "&Deselecteren groep" + +msgid "&Invert selection" +msgstr "&Inverteren selectie" + +msgid "E&xit" +msgstr "&Afsluiten" + +msgid "&User menu" +msgstr "&Gebruikersmenu" + +msgid "&Directory tree" +msgstr "&Mappenhiërarchie " + +msgid "&Find file" +msgstr "Bestand &zoeken" + +msgid "S&wap panels" +msgstr "&Wisselen vensters" + +msgid "Switch &panels on/off" +msgstr "Vensters &aan/uit" + +msgid "&Compare directories" +msgstr "&Mappen vergelijken" + +msgid "C&ompare files" +msgstr "Vergelij&ken bestanden" + +msgid "E&xternal panelize" +msgstr "&Plaatsen in extern venster" + +msgid "Show directory s&izes" +msgstr "Tonen mappen&grootte" + +msgid "Command &history" +msgstr "&Opdrachtengeschiedenis" + +msgid "Viewed/edited files hi&story" +msgstr "Ge&schiedenis bekeken/bewerkte bestanden" + +msgid "Di&rectory hotlist" +msgstr "&Mappen hotslist" + +msgid "&Active VFS list" +msgstr "Actieve &VFS-lijst" + +msgid "&Background jobs" +msgstr "&Achtergrondtaken" + +msgid "Screen lis&t" +msgstr "Schermopsommin&g" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Herstellen bestanden (alleen ext2fs)" + +msgid "&Listing format edit" +msgstr "&Lijstformaat bewerken" + +msgid "Edit &extension file" +msgstr "Bewerken &extensie " + +msgid "Edit &menu file" +msgstr "&Bewerken menubestand " + +msgid "Edit hi&ghlighting group file" +msgstr "Aanpassen hi&ghlighting-groepsbestand" + +msgid "&Configuration..." +msgstr "&Configuratie..." + +msgid "&Layout..." +msgstr "&Vormgeving..." + +msgid "&Panel options..." +msgstr "Venstero&pties " + +msgid "C&onfirmation..." +msgstr "&Bevestiging..." + +msgid "&Appearance..." +msgstr "&Uiterlijk..." + +msgid "&Display bits..." +msgstr "&Weergavebits..." + +msgid "&Virtual FS..." +msgstr "&Virtueel FS..." + +msgid "Panels:" +msgstr "Vensters:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Je hebt %zu geopende scherm. Toch stoppen?" +msgstr[1] "Je hebt %zu geopende schermen. Toch stoppen?" + +msgid "The Midnight Commander" +msgstr "The Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Wilt u echt de Midnight Commander afsluiten?" + +msgid "&Above" +msgstr "&Boven" + +msgid "&Left" +msgstr "&Links" + +msgid "&Below" +msgstr "&Onder" + +msgid "&Right" +msgstr "&Rechts" + +msgid "ButtonBar|Menu" +msgstr " Menu" + +msgid "ButtonBar|View" +msgstr " Bekijken" + +msgid "ButtonBar|RenMov" +msgstr " Hernoemen" + +msgid "ButtonBar|Mkdir" +msgstr " Mkdir" + msgid "&Chdir" msgstr "&Chdir" @@ -3137,9 +3362,6 @@ msgid "Fir&st hit" msgstr "Eer&ste hit" -msgid "&Tree" -msgstr "&Boom" - msgid "Find File" msgstr "Bestand zoeken" @@ -3398,222 +3620,6 @@ msgid "Layout" msgstr "Vormgeving" -msgid "File listin&g" -msgstr "Bestandsopsommin&g" - -msgid "&Quick view" -msgstr "&Korte lijst" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Lijstformaat..." - -msgid "&Sort order..." -msgstr "&Sorteervolgorde... " - -msgid "&Filter..." -msgstr "&Filter... " - -msgid "&Encoding..." -msgstr "&Encoderen..." - -msgid "FT&P link..." -msgstr "FT&P-Verbinding... " - -msgid "S&hell link..." -msgstr "S&hellverbinding... " - -msgid "S&FTP link..." -msgstr "S&FTP-link..." - -msgid "SM&B link..." -msgstr "SM&B-Verbinding..." - -msgid "Paneli&ze" -msgstr "Als vens&ter" - -msgid "&Rescan" -msgstr "&Herlezen" - -msgid "&View" -msgstr "&Weergave" - -msgid "Vie&w file..." -msgstr "&Tonen bestand..." - -msgid "&Filtered view" -msgstr "&Gefilterde weergave" - -msgid "&Copy" -msgstr "&Kopiëren" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Link" - -msgid "&Symlink" -msgstr "&Symlink" - -msgid "Relative symlin&k" -msgstr "Relatieve symli&nk" - -msgid "Edit s&ymlink" -msgstr "S&ymlink bewerken" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "&Uitgebreide chown" - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "&Hernoemen" - -msgid "&Mkdir" -msgstr "&Map maken" - -msgid "&Quick cd" -msgstr "&Snelle cd" - -msgid "Select &group" -msgstr "Selecteren &groep" - -msgid "U&nselect group" -msgstr "&Deselecteren groep" - -msgid "&Invert selection" -msgstr "&Inverteren selectie" - -msgid "E&xit" -msgstr "&Afsluiten" - -msgid "&User menu" -msgstr "&Gebruikersmenu" - -msgid "&Directory tree" -msgstr "&Mappenhiërarchie " - -msgid "&Find file" -msgstr "Bestand &zoeken" - -msgid "S&wap panels" -msgstr "&Wisselen vensters" - -msgid "Switch &panels on/off" -msgstr "Vensters &aan/uit" - -msgid "&Compare directories" -msgstr "&Mappen vergelijken" - -msgid "C&ompare files" -msgstr "Vergelij&ken bestanden" - -msgid "E&xternal panelize" -msgstr "&Plaatsen in extern venster" - -msgid "Show directory s&izes" -msgstr "Tonen mappen&grootte" - -msgid "Command &history" -msgstr "&Opdrachtengeschiedenis" - -msgid "Viewed/edited files hi&story" -msgstr "Ge&schiedenis bekeken/bewerkte bestanden" - -msgid "Di&rectory hotlist" -msgstr "&Mappen hotslist" - -msgid "&Active VFS list" -msgstr "Actieve &VFS-lijst" - -msgid "&Background jobs" -msgstr "&Achtergrondtaken" - -msgid "Screen lis&t" -msgstr "Schermopsommin&g" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Herstellen bestanden (alleen ext2fs)" - -msgid "&Listing format edit" -msgstr "&Lijstformaat bewerken" - -msgid "Edit &extension file" -msgstr "Bewerken &extensie " - -msgid "Edit &menu file" -msgstr "&Bewerken menubestand " - -msgid "Edit hi&ghlighting group file" -msgstr "Aanpassen hi&ghlighting-groepsbestand" - -msgid "&Configuration..." -msgstr "&Configuratie..." - -msgid "&Layout..." -msgstr "&Vormgeving..." - -msgid "&Panel options..." -msgstr "Venstero&pties " - -msgid "C&onfirmation..." -msgstr "&Bevestiging..." - -msgid "&Appearance..." -msgstr "&Uiterlijk..." - -msgid "&Display bits..." -msgstr "&Weergavebits..." - -msgid "&Virtual FS..." -msgstr "&Virtueel FS..." - -msgid "Panels:" -msgstr "Vensters:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Je hebt %zu geopende scherm. Toch stoppen?" -msgstr[1] "Je hebt %zu geopende schermen. Toch stoppen?" - -msgid "The Midnight Commander" -msgstr "The Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Wilt u echt de Midnight Commander afsluiten?" - -msgid "&Above" -msgstr "&Boven" - -msgid "&Left" -msgstr "&Links" - -msgid "&Below" -msgstr "&Onder" - -msgid "&Right" -msgstr "&Rechts" - -msgid "ButtonBar|Menu" -msgstr " Menu" - -msgid "ButtonBar|View" -msgstr " Bekijken" - -msgid "ButtonBar|RenMov" -msgstr " Hernoemen" - -msgid "ButtonBar|Mkdir" -msgstr " Mkdir" - msgid "Memory exhausted!" msgstr "Geen geheugenruimte meer!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/pl.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/pl.gmo differ diff -Nru mc-4.8.25/po/pl.po mc-4.8.26/po/pl.po --- mc-4.8.25/po/pl.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/pl.po 2021-01-21 17:18:34.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 20:23+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 17:15+0000\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish (http://www.transifex.com/mc/mc/language/pl/)\n" "Language: pl\n" @@ -1992,6 +1992,9 @@ msgid "Skin:" msgstr "Skórka:" +msgid "&Shadows" +msgstr "&Cienie" + msgid "Appearance" msgstr "Wygląd" @@ -2215,6 +2218,14 @@ msgid "SMB authentication" msgstr "Uwierzytelnianie SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Nie można zmienić katalogu na „%s”\n" +"%s" + msgid "Secure deletion" msgstr "Bezpieczne usunięcie" @@ -2275,6 +2286,9 @@ msgid "No COW" msgstr "Bez COW" +msgid "Direct access for files" +msgstr "Bezpośredni dostęp do plików" + msgid "Casefolded file" msgstr "Plik bez rozróżniania wielkości znaków" @@ -2555,14 +2569,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Polecenia można wykonywać tylko na lokalnym systemie plików" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Nie można zmienić katalogu na „%s”\n" -"%s" - msgid "Parameter" msgstr "Parametr" @@ -3098,6 +3104,227 @@ msgid "Invalid source pattern '%s'" msgstr "Nieprawidłowy wzór źródłowy „%s”" +msgid "File listin&g" +msgstr "&Lista plików" + +msgid "&Quick view" +msgstr "&Szybki widok" + +msgid "&Info" +msgstr "&Informacje" + +msgid "&Tree" +msgstr "&Drzewo" + +msgid "&Listing format..." +msgstr "&Format wyświetlania…" + +msgid "&Sort order..." +msgstr "Porządek s&ortowania…" + +msgid "&Filter..." +msgstr "&Filtr…" + +msgid "&Encoding..." +msgstr "&Kodowanie…" + +msgid "FT&P link..." +msgstr "Połączenie FT&P…" + +msgid "S&hell link..." +msgstr "Połączenie po po&włoce…" + +msgid "S&FTP link..." +msgstr "Połączenie S&FTP…" + +msgid "SM&B link..." +msgstr "Połączenie SM&B…" + +msgid "Paneli&ze" +msgstr "Filtru&j" + +msgid "&Rescan" +msgstr "Odświ&eż" + +msgid "&View" +msgstr "&Podgląd" + +msgid "Vie&w file..." +msgstr "Pod&gląd pliku…" + +msgid "&Filtered view" +msgstr "Widok &filtrowany" + +msgid "&Copy" +msgstr "&Skopiuj" + +msgid "C&hmod" +msgstr "Z&mień uprawnienia" + +msgid "&Link" +msgstr "&Dowiąż" + +msgid "&Symlink" +msgstr "Dowiąż symbo&licznie" + +msgid "Relative symlin&k" +msgstr "&Względne dowiązanie symboliczne" + +msgid "Edit s&ymlink" +msgstr "Modyfikuj dowiązanie s&ymboliczne" + +msgid "Ch&own" +msgstr "Zm&ień właściciela" + +msgid "&Advanced chown" +msgstr "Z&aawansowana zmiana właściciela" + +msgid "Cha&ttr" +msgstr "Zmień a&trybuty" + +msgid "&Rename/Move" +msgstr "Zmień nazwę/p&rzenieś" + +msgid "&Mkdir" +msgstr "Utwórz &katalog" + +msgid "&Quick cd" +msgstr "Szybka zmiana kata&logu" + +msgid "Select &group" +msgstr "&Zaznacz grupę" + +msgid "U&nselect group" +msgstr "Odz&nacz grupę" + +msgid "&Invert selection" +msgstr "&Odwróć zaznaczenie" + +msgid "E&xit" +msgstr "Zakoń&cz" + +msgid "&User menu" +msgstr "Menu &użytkownika" + +msgid "&Directory tree" +msgstr "&Drzewo katalogów" + +msgid "&Find file" +msgstr "&Znajdź plik" + +msgid "S&wap panels" +msgstr "&Przełącz panele" + +msgid "Switch &panels on/off" +msgstr "Prz&ełącz wyświetlanie paneli" + +msgid "&Compare directories" +msgstr "P&orównaj katalogi" + +msgid "C&ompare files" +msgstr "P&orównaj pliki" + +msgid "E&xternal panelize" +msgstr "Panele ze&wnętrzne" + +msgid "Show directory s&izes" +msgstr "Wyśw&ietl rozmiary katalogów" + +msgid "Command &history" +msgstr "&Historia poleceń" + +msgid "Viewed/edited files hi&story" +msgstr "Hi&storia wyświetlonych/zmodyfikowanych plików" + +msgid "Di&rectory hotlist" +msgstr "Lista pod&ręcznych katalogów" + +msgid "&Active VFS list" +msgstr "Lista &aktywnych VFS" + +msgid "&Background jobs" +msgstr "Zadania w &tle" + +msgid "Screen lis&t" +msgstr "&Lista ekranów" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Odtwórz pliki (tylko system plików ext2)" + +msgid "&Listing format edit" +msgstr "Modyfikacja &formatu wyświetlania" + +msgid "Edit &extension file" +msgstr "Modyfikuj plik rozsz&erzeń" + +msgid "Edit &menu file" +msgstr "Modyfikuj plik &menu" + +msgid "Edit hi&ghlighting group file" +msgstr "Modyfikuj plik wyróżniania &grup" + +msgid "&Configuration..." +msgstr "&Konfiguracja…" + +msgid "&Layout..." +msgstr "&Układ…" + +msgid "&Panel options..." +msgstr "Opcje &panelu…" + +msgid "C&onfirmation..." +msgstr "P&otwierdzenia…" + +msgid "&Appearance..." +msgstr "W&ygląd…" + +msgid "&Display bits..." +msgstr "&Wyświetlane bity…" + +msgid "&Virtual FS..." +msgstr "Wirtualny &system plików…" + +msgid "Panels:" +msgstr "Panele:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Pozostał %zu otwarty ekran. Zakończyć mimo to?" +msgstr[1] "Pozostały %zu otwarte ekrany. Zakończyć mimo to?" +msgstr[2] "Pozostało %zu otwartych ekranów. Zakończyć mimo to?" +msgstr[3] "Pozostało %zu otwartych ekranów. Zakończyć mimo to?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Na pewno zakończyć program Midnight Commander?" + +msgid "&Above" +msgstr "P&owyżej" + +msgid "&Left" +msgstr "&Lewy" + +msgid "&Below" +msgstr "&Poniżej" + +msgid "&Right" +msgstr "P&rawy" + +msgid "ButtonBar|Menu" +msgstr "Menu" + +msgid "ButtonBar|View" +msgstr "Podgld" + +msgid "ButtonBar|RenMov" +msgstr "Przen" + +msgid "ButtonBar|Mkdir" +msgstr "UtwKat" + msgid "&Chdir" msgstr "&Zmień katalog" @@ -3144,9 +3371,6 @@ msgid "Fir&st hit" msgstr "&Pierwsze trafienie" -msgid "&Tree" -msgstr "&Drzewo" - msgid "Find File" msgstr "Wyszukiwanie pliku" @@ -3410,224 +3634,6 @@ msgid "Layout" msgstr "Układ" -msgid "File listin&g" -msgstr "&Lista plików" - -msgid "&Quick view" -msgstr "&Szybki widok" - -msgid "&Info" -msgstr "&Informacje" - -msgid "&Listing format..." -msgstr "&Format wyświetlania…" - -msgid "&Sort order..." -msgstr "Porządek s&ortowania…" - -msgid "&Filter..." -msgstr "&Filtr…" - -msgid "&Encoding..." -msgstr "&Kodowanie…" - -msgid "FT&P link..." -msgstr "Połączenie FT&P…" - -msgid "S&hell link..." -msgstr "Połączenie po po&włoce…" - -msgid "S&FTP link..." -msgstr "Połączenie S&FTP…" - -msgid "SM&B link..." -msgstr "Połączenie SM&B…" - -msgid "Paneli&ze" -msgstr "Filtru&j" - -msgid "&Rescan" -msgstr "Odświ&eż" - -msgid "&View" -msgstr "&Podgląd" - -msgid "Vie&w file..." -msgstr "Pod&gląd pliku…" - -msgid "&Filtered view" -msgstr "Widok &filtrowany" - -msgid "&Copy" -msgstr "&Skopiuj" - -msgid "C&hmod" -msgstr "Z&mień uprawnienia" - -msgid "&Link" -msgstr "&Dowiąż" - -msgid "&Symlink" -msgstr "Dowiąż symbo&licznie" - -msgid "Relative symlin&k" -msgstr "&Względne dowiązanie symboliczne" - -msgid "Edit s&ymlink" -msgstr "Modyfikuj dowiązanie s&ymboliczne" - -msgid "Ch&own" -msgstr "Zm&ień właściciela" - -msgid "&Advanced chown" -msgstr "Z&aawansowana zmiana właściciela" - -msgid "Cha&ttr" -msgstr "Zmień a&trybuty" - -msgid "&Rename/Move" -msgstr "Zmień nazwę/p&rzenieś" - -msgid "&Mkdir" -msgstr "Utwórz &katalog" - -msgid "&Quick cd" -msgstr "Szybka zmiana kata&logu" - -msgid "Select &group" -msgstr "&Zaznacz grupę" - -msgid "U&nselect group" -msgstr "Odz&nacz grupę" - -msgid "&Invert selection" -msgstr "&Odwróć zaznaczenie" - -msgid "E&xit" -msgstr "Zakoń&cz" - -msgid "&User menu" -msgstr "Menu &użytkownika" - -msgid "&Directory tree" -msgstr "&Drzewo katalogów" - -msgid "&Find file" -msgstr "&Znajdź plik" - -msgid "S&wap panels" -msgstr "&Przełącz panele" - -msgid "Switch &panels on/off" -msgstr "Prz&ełącz wyświetlanie paneli" - -msgid "&Compare directories" -msgstr "P&orównaj katalogi" - -msgid "C&ompare files" -msgstr "P&orównaj pliki" - -msgid "E&xternal panelize" -msgstr "Panele ze&wnętrzne" - -msgid "Show directory s&izes" -msgstr "Wyśw&ietl rozmiary katalogów" - -msgid "Command &history" -msgstr "&Historia poleceń" - -msgid "Viewed/edited files hi&story" -msgstr "Hi&storia wyświetlonych/zmodyfikowanych plików" - -msgid "Di&rectory hotlist" -msgstr "Lista pod&ręcznych katalogów" - -msgid "&Active VFS list" -msgstr "Lista &aktywnych VFS" - -msgid "&Background jobs" -msgstr "Zadania w &tle" - -msgid "Screen lis&t" -msgstr "&Lista ekranów" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Odtwórz pliki (tylko system plików ext2)" - -msgid "&Listing format edit" -msgstr "Modyfikacja &formatu wyświetlania" - -msgid "Edit &extension file" -msgstr "Modyfikuj plik rozsz&erzeń" - -msgid "Edit &menu file" -msgstr "Modyfikuj plik &menu" - -msgid "Edit hi&ghlighting group file" -msgstr "Modyfikuj plik wyróżniania &grup" - -msgid "&Configuration..." -msgstr "&Konfiguracja…" - -msgid "&Layout..." -msgstr "&Układ…" - -msgid "&Panel options..." -msgstr "Opcje &panelu…" - -msgid "C&onfirmation..." -msgstr "P&otwierdzenia…" - -msgid "&Appearance..." -msgstr "W&ygląd…" - -msgid "&Display bits..." -msgstr "&Wyświetlane bity…" - -msgid "&Virtual FS..." -msgstr "Wirtualny &system plików…" - -msgid "Panels:" -msgstr "Panele:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Pozostał %zu otwarty ekran. Zakończyć mimo to?" -msgstr[1] "Pozostały %zu otwarte ekrany. Zakończyć mimo to?" -msgstr[2] "Pozostało %zu otwartych ekranów. Zakończyć mimo to?" -msgstr[3] "Pozostało %zu otwartych ekranów. Zakończyć mimo to?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Na pewno zakończyć program Midnight Commander?" - -msgid "&Above" -msgstr "P&owyżej" - -msgid "&Left" -msgstr "&Lewy" - -msgid "&Below" -msgstr "&Poniżej" - -msgid "&Right" -msgstr "P&rawy" - -msgid "ButtonBar|Menu" -msgstr "Menu" - -msgid "ButtonBar|View" -msgstr "Podgld" - -msgid "ButtonBar|RenMov" -msgstr "Przen" - -msgid "ButtonBar|Mkdir" -msgstr "UtwKat" - msgid "Memory exhausted!" msgstr "Wyczerpano pamięć" diff -Nru mc-4.8.25/po/POTFILES.in mc-4.8.26/po/POTFILES.in --- mc-4.8.25/po/POTFILES.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/po/POTFILES.in 2021-01-21 17:14:06.000000000 +0000 @@ -45,6 +45,7 @@ src/execute.c src/filemanager/achown.c src/filemanager/boxes.c +src/filemanager/cd.c src/filemanager/chattr.c src/filemanager/chmod.c src/filemanager/chown.c @@ -53,11 +54,11 @@ src/filemanager/ext.c src/filemanager/file.c src/filemanager/filegui.c +src/filemanager/filemanager.c src/filemanager/find.c src/filemanager/hotlist.c src/filemanager/info.c src/filemanager/layout.c -src/filemanager/midnight.c src/filemanager/mountlist.c src/filemanager/panel.c src/filemanager/panelize.c Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/pt_BR.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/pt_BR.gmo differ diff -Nru mc-4.8.25/po/pt_BR.po mc-4.8.26/po/pt_BR.po --- mc-4.8.25/po/pt_BR.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/pt_BR.po 2021-01-21 17:18:34.000000000 +0000 @@ -13,8 +13,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/mc/mc/language/" "pt_BR/)\n" @@ -1937,6 +1937,9 @@ msgid "Skin:" msgstr "Skin:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Aparência" @@ -2158,6 +2161,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2218,6 +2227,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2492,12 +2504,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "Parâmetro" @@ -3011,6 +3017,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "&Árvore" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "&Ordem..." + +msgid "&Filter..." +msgstr "&Filtro..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "Ligação FT&P..." + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "Ligação SM&B..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "Symlin&k relativo" + +msgid "Edit s&ymlink" +msgstr "Editar s&ymlink" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "Chown &Avançado" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Renomear/Mover" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "Arvore de &Diretórios" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Recuperar arquivos (apenas ext2fs)" + +msgid "&Listing format edit" +msgstr "Editar forma de &Listagem" + +msgid "Edit &extension file" +msgstr "Editar &extensões de arquivo" + +msgid "Edit &menu file" +msgstr "Editar &Menu de arquivo" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Configuração" + +msgid "&Layout..." +msgstr "&Layout..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "&Mostrar Bits..." + +msgid "&Virtual FS..." +msgstr "Sistema de Arquivos &Virtual..." + +msgid "Panels:" +msgstr "Paineis" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "O Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Você deseja realmente sair do Midnight Commander?" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menu" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Ver" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|RenMov" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "Alterar &Diretório" @@ -3057,9 +3282,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Árvore" - msgid "Find File" msgstr "Procurar arquivo" @@ -3314,222 +3536,6 @@ msgid "Layout" msgstr "Disposição" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "&Ordem..." - -msgid "&Filter..." -msgstr "&Filtro..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "Ligação FT&P..." - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "Ligação SM&B..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "Symlin&k relativo" - -msgid "Edit s&ymlink" -msgstr "Editar s&ymlink" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "Chown &Avançado" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Renomear/Mover" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "Arvore de &Diretórios" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Recuperar arquivos (apenas ext2fs)" - -msgid "&Listing format edit" -msgstr "Editar forma de &Listagem" - -msgid "Edit &extension file" -msgstr "Editar &extensões de arquivo" - -msgid "Edit &menu file" -msgstr "Editar &Menu de arquivo" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Configuração" - -msgid "&Layout..." -msgstr "&Layout..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "&Mostrar Bits..." - -msgid "&Virtual FS..." -msgstr "Sistema de Arquivos &Virtual..." - -msgid "Panels:" -msgstr "Paineis" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "O Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Você deseja realmente sair do Midnight Commander?" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menu" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Ver" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|RenMov" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Memória esgotada!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/pt.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/pt.gmo differ diff -Nru mc-4.8.25/po/pt.po mc-4.8.26/po/pt.po --- mc-4.8.25/po/pt.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/pt.po 2021-01-21 17:18:34.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-18 00:16+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 16:53+0000\n" "Last-Translator: Gilberto Jorge \n" "Language-Team: Portuguese (http://www.transifex.com/mc/mc/language/pt/)\n" "Language: pt\n" @@ -1989,6 +1989,9 @@ msgid "Skin:" msgstr "Skin:" +msgid "&Shadows" +msgstr "&Sombras" + msgid "Appearance" msgstr "Aspeto" @@ -2212,6 +2215,14 @@ msgid "SMB authentication" msgstr "Autenticação SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Não é possível chdir para \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "Eliminação segura" @@ -2272,6 +2283,9 @@ msgid "No COW" msgstr "Sem COW" +msgid "Direct access for files" +msgstr "Acesso directo para ficheiros" + msgid "Casefolded file" msgstr "Ficheiro casefolded" @@ -2552,14 +2566,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Não é possível executar comandos em sistemas de ficheiros não locais" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Não é possível chdir para \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Parâmetro" @@ -3095,6 +3101,225 @@ msgid "Invalid source pattern '%s'" msgstr "Padrão fonte inválido '%s'" +msgid "File listin&g" +msgstr "Lista&gem de ficheiros" + +msgid "&Quick view" +msgstr "Visualização &rápida" + +msgid "&Info" +msgstr "&Informação" + +msgid "&Tree" +msgstr "&Árvore" + +msgid "&Listing format..." +msgstr "Formato da &listagem..." + +msgid "&Sort order..." +msgstr "&Ordenação..." + +msgid "&Filter..." +msgstr "&Filtro..." + +msgid "&Encoding..." +msgstr "&Codificação..." + +msgid "FT&P link..." +msgstr "Ligação FT&P..." + +msgid "S&hell link..." +msgstr "Ligação s&hell..." + +msgid "S&FTP link..." +msgstr "Ligação S&FTP..." + +msgid "SM&B link..." +msgstr "Ligação SM&B..." + +msgid "Paneli&ze" +msgstr "Em Pai&nel" + +msgid "&Rescan" +msgstr "&Reanalisar" + +msgid "&View" +msgstr "&Ver" + +msgid "Vie&w file..." +msgstr "Ver f&icheiro..." + +msgid "&Filtered view" +msgstr "Visualização &filtrada" + +msgid "&Copy" +msgstr "&Copiar" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Ligação" + +msgid "&Symlink" +msgstr "&Symlink" + +msgid "Relative symlin&k" +msgstr "Symlin&k relativo" + +msgid "Edit s&ymlink" +msgstr "Editar s&ymlink" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "Chown &Avançado" + +msgid "Cha&ttr" +msgstr "Cha&ttr" + +msgid "&Rename/Move" +msgstr "&Renomear/Mover" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "Cd &rápido" + +msgid "Select &group" +msgstr "Selecionar &grupo" + +msgid "U&nselect group" +msgstr "Ca&ncelar seleção de grupo" + +msgid "&Invert selection" +msgstr "&Inverter seleção" + +msgid "E&xit" +msgstr "&Sair" + +msgid "&User menu" +msgstr "Menu de &utilizador" + +msgid "&Directory tree" +msgstr "Árvore de &diretório" + +msgid "&Find file" +msgstr "Procurar &ficheiro" + +msgid "S&wap panels" +msgstr "Tro&car painéis" + +msgid "Switch &panels on/off" +msgstr "Ligar &painéis on/off" + +msgid "&Compare directories" +msgstr "&Comparar diretórios" + +msgid "C&ompare files" +msgstr "C&omparar ficheiros" + +msgid "E&xternal panelize" +msgstr "E&xterior Em Painel" + +msgid "Show directory s&izes" +msgstr "Mostrar tamanho de diretórios" + +msgid "Command &history" +msgstr "&Histórico de comandos" + +msgid "Viewed/edited files hi&story" +msgstr "Hi&stórico de ficheiros visualizados/editados" + +msgid "Di&rectory hotlist" +msgstr "Hotlist de di&retórios" + +msgid "&Active VFS list" +msgstr "Lista de VFS &activos" + +msgid "&Background jobs" +msgstr "Jobs em &background" + +msgid "Screen lis&t" +msgstr "Lis&ta de ecrãs" + +msgid "&Undelete files (ext2fs only)" +msgstr "Rec&uperar ficheiros (apenas ext2fs)" + +msgid "&Listing format edit" +msgstr "Editar formato de &listagem" + +msgid "Edit &extension file" +msgstr "Editar &extensão de ficheiro" + +msgid "Edit &menu file" +msgstr "Editar &menu ficheiro" + +msgid "Edit hi&ghlighting group file" +msgstr "Editar ficheiro de realce de grupo" + +msgid "&Configuration..." +msgstr "&Configuração..." + +msgid "&Layout..." +msgstr "&Disposição..." + +msgid "&Panel options..." +msgstr "Opções de &painel..." + +msgid "C&onfirmation..." +msgstr "C&onfirmação..." + +msgid "&Appearance..." +msgstr "&Aspeto..." + +msgid "&Display bits..." +msgstr "Mostrar &bits..." + +msgid "&Virtual FS..." +msgstr "FS &Virtual..." + +msgid "Panels:" +msgstr "Painéis:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Tem %zu ecrã aberto. Terminar de qualquer modo?" +msgstr[1] "Tem %zu ecrãs abertos. Terminar de qualquer modo?" + +msgid "The Midnight Commander" +msgstr "O Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Deseja mesmo sair do Midnight Commander?" + +msgid "&Above" +msgstr "&Acima" + +msgid "&Left" +msgstr "&Esquerdo" + +msgid "&Below" +msgstr "A&baixo" + +msgid "&Right" +msgstr "Di&reito" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menu" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Ver" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|RenMov" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "&Chdir" @@ -3141,9 +3366,6 @@ msgid "Fir&st hit" msgstr "Pri&meiro encontrado" -msgid "&Tree" -msgstr "&Árvore" - msgid "Find File" msgstr "Procurar Ficheiro" @@ -3402,222 +3624,6 @@ msgid "Layout" msgstr "Disposição" -msgid "File listin&g" -msgstr "Lista&gem de ficheiros" - -msgid "&Quick view" -msgstr "Visualização &rápida" - -msgid "&Info" -msgstr "&Informação" - -msgid "&Listing format..." -msgstr "Formato da &listagem..." - -msgid "&Sort order..." -msgstr "&Ordenação..." - -msgid "&Filter..." -msgstr "&Filtro..." - -msgid "&Encoding..." -msgstr "&Codificação..." - -msgid "FT&P link..." -msgstr "Ligação FT&P..." - -msgid "S&hell link..." -msgstr "Ligação s&hell..." - -msgid "S&FTP link..." -msgstr "Ligação S&FTP..." - -msgid "SM&B link..." -msgstr "Ligação SM&B..." - -msgid "Paneli&ze" -msgstr "Em Pai&nel" - -msgid "&Rescan" -msgstr "&Reanalisar" - -msgid "&View" -msgstr "&Ver" - -msgid "Vie&w file..." -msgstr "Ver f&icheiro..." - -msgid "&Filtered view" -msgstr "Visualização &filtrada" - -msgid "&Copy" -msgstr "&Copiar" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Ligação" - -msgid "&Symlink" -msgstr "&Symlink" - -msgid "Relative symlin&k" -msgstr "Symlin&k relativo" - -msgid "Edit s&ymlink" -msgstr "Editar s&ymlink" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "Chown &Avançado" - -msgid "Cha&ttr" -msgstr "Cha&ttr" - -msgid "&Rename/Move" -msgstr "&Renomear/Mover" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "Cd &rápido" - -msgid "Select &group" -msgstr "Selecionar &grupo" - -msgid "U&nselect group" -msgstr "Ca&ncelar seleção de grupo" - -msgid "&Invert selection" -msgstr "&Inverter seleção" - -msgid "E&xit" -msgstr "&Sair" - -msgid "&User menu" -msgstr "Menu de &utilizador" - -msgid "&Directory tree" -msgstr "Árvore de &diretório" - -msgid "&Find file" -msgstr "Procurar &ficheiro" - -msgid "S&wap panels" -msgstr "Tro&car painéis" - -msgid "Switch &panels on/off" -msgstr "Ligar &painéis on/off" - -msgid "&Compare directories" -msgstr "&Comparar diretórios" - -msgid "C&ompare files" -msgstr "C&omparar ficheiros" - -msgid "E&xternal panelize" -msgstr "E&xterior Em Painel" - -msgid "Show directory s&izes" -msgstr "Mostrar tamanho de diretórios" - -msgid "Command &history" -msgstr "&Histórico de comandos" - -msgid "Viewed/edited files hi&story" -msgstr "Hi&stórico de ficheiros visualizados/editados" - -msgid "Di&rectory hotlist" -msgstr "Hotlist de di&retórios" - -msgid "&Active VFS list" -msgstr "Lista de VFS &activos" - -msgid "&Background jobs" -msgstr "Jobs em &background" - -msgid "Screen lis&t" -msgstr "Lis&ta de ecrãs" - -msgid "&Undelete files (ext2fs only)" -msgstr "Rec&uperar ficheiros (apenas ext2fs)" - -msgid "&Listing format edit" -msgstr "Editar formato de &listagem" - -msgid "Edit &extension file" -msgstr "Editar &extensão de ficheiro" - -msgid "Edit &menu file" -msgstr "Editar &menu ficheiro" - -msgid "Edit hi&ghlighting group file" -msgstr "Editar ficheiro de realce de grupo" - -msgid "&Configuration..." -msgstr "&Configuração..." - -msgid "&Layout..." -msgstr "&Disposição..." - -msgid "&Panel options..." -msgstr "Opções de &painel..." - -msgid "C&onfirmation..." -msgstr "C&onfirmação..." - -msgid "&Appearance..." -msgstr "&Aspeto..." - -msgid "&Display bits..." -msgstr "Mostrar &bits..." - -msgid "&Virtual FS..." -msgstr "FS &Virtual..." - -msgid "Panels:" -msgstr "Painéis:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Tem %zu ecrã aberto. Terminar de qualquer modo?" -msgstr[1] "Tem %zu ecrãs abertos. Terminar de qualquer modo?" - -msgid "The Midnight Commander" -msgstr "O Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Deseja mesmo sair do Midnight Commander?" - -msgid "&Above" -msgstr "&Acima" - -msgid "&Left" -msgstr "&Esquerdo" - -msgid "&Below" -msgstr "A&baixo" - -msgid "&Right" -msgstr "Di&reito" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menu" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Ver" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|RenMov" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Memória esgotada!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ro.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ro.gmo differ diff -Nru mc-4.8.25/po/ro.po mc-4.8.26/po/ro.po --- mc-4.8.25/po/ro.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ro.po 2021-01-21 17:18:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Romanian (http://www.transifex.com/mc/mc/language/ro/)\n" "Language: ro\n" @@ -1984,6 +1984,9 @@ msgid "Skin:" msgstr "Tematică:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Aspect" @@ -2207,6 +2210,14 @@ msgid "SMB authentication" msgstr "Autentificare SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Nu se poate chdir în \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2267,6 +2278,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2543,14 +2557,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Nu se pot executa comenzi în sisteme de fișiere ne-locale" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Nu se poate chdir în \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Parametru" @@ -3084,6 +3090,226 @@ msgid "Invalid source pattern '%s'" msgstr "Șablon sursă nevalid '%s'" +msgid "File listin&g" +msgstr "&Lista de fișiere" + +msgid "&Quick view" +msgstr "Vizualizare &rapidă" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "Arbore" + +msgid "&Listing format..." +msgstr "formatul de &listare " + +msgid "&Sort order..." +msgstr "&Ordinea sortării..." + +msgid "&Filter..." +msgstr "&Filtru..." + +msgid "&Encoding..." +msgstr "Codificar&e" + +msgid "FT&P link..." +msgstr "Conectare FT&P..." + +msgid "S&hell link..." +msgstr "Conectare s&hell..." + +msgid "S&FTP link..." +msgstr "Conectare S&FTP..." + +msgid "SM&B link..." +msgstr "Conectare SM&B..." + +msgid "Paneli&ze" +msgstr "Paneli&zare" + +msgid "&Rescan" +msgstr "&Rescanează" + +msgid "&View" +msgstr "&Vizualizează" + +msgid "Vie&w file..." +msgstr "Vi&zualizează fișier" + +msgid "&Filtered view" +msgstr "Vizualizare &filtrată" + +msgid "&Copy" +msgstr "&Copiază" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Legătură" + +msgid "&Symlink" +msgstr "Legătură &simbolică" + +msgid "Relative symlin&k" +msgstr "Legătură simbolică relati&vă" + +msgid "Edit s&ymlink" +msgstr "Editează legătura s&imbolică" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "Chown &avansat" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Redenumește/Mută" + +msgid "&Mkdir" +msgstr "&Mkdir" + +msgid "&Quick cd" +msgstr "Cd &rapid" + +msgid "Select &group" +msgstr "Selectează &grupul" + +msgid "U&nselect group" +msgstr "&De-selectează grupul" + +msgid "&Invert selection" +msgstr "&Inversează selecția" + +msgid "E&xit" +msgstr "&Ieșire" + +msgid "&User menu" +msgstr "Meniu &utilizator" + +msgid "&Directory tree" +msgstr "Arbore de &dosare" + +msgid "&Find file" +msgstr "&Caută fișier" + +msgid "S&wap panels" +msgstr "&Schimbă panourile" + +msgid "Switch &panels on/off" +msgstr "Comută &panourile da/nu" + +msgid "&Compare directories" +msgstr "&Compară dosare" + +msgid "C&ompare files" +msgstr "C&ompară fișiere" + +msgid "E&xternal panelize" +msgstr "Panelizare e&xternă" + +msgid "Show directory s&izes" +msgstr "Arată mărimea dosarelor" + +msgid "Command &history" +msgstr "&Istoric comenzi" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "Listă rapidă de dosa&re" + +msgid "&Active VFS list" +msgstr "Lista SVF &active" + +msgid "&Background jobs" +msgstr "Sarcini în &fundal" + +msgid "Screen lis&t" +msgstr "Lis&ta ecranelor" + +msgid "&Undelete files (ext2fs only)" +msgstr "Rec&uperare fișiere (doar ext2fs)" + +msgid "&Listing format edit" +msgstr "Editare mod de &listare" + +msgid "Edit &extension file" +msgstr "Editare fișier &extensii" + +msgid "Edit &menu file" +msgstr "Editare fișier &meniuri" + +msgid "Edit hi&ghlighting group file" +msgstr "Editează fișierul de evidențiere &grup" + +msgid "&Configuration..." +msgstr "&Configurare..." + +msgid "&Layout..." +msgstr "&Aspect..." + +msgid "&Panel options..." +msgstr "Opțiuni &panou..." + +msgid "C&onfirmation..." +msgstr "C&onfirmare..." + +msgid "&Appearance..." +msgstr "&Aspect..." + +msgid "&Display bits..." +msgstr "&Biți de afișare..." + +msgid "&Virtual FS..." +msgstr "Sistem &virtual de fișiere..." + +msgid "Panels:" +msgstr "Panouri:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Ai %zu ecran deschis. Închizi oricum?" +msgstr[1] "Ai %zu ecrane deschise. Închizi oricum?" +msgstr[2] "Ai %zu ecrane deschise. Închizi oricum?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Chiar dorești sa închizi Midnight Commander?" + +msgid "&Above" +msgstr "&Deasupra" + +msgid "&Left" +msgstr "&Stânga" + +msgid "&Below" +msgstr "&Dedesubt" + +msgid "&Right" +msgstr "D&reapta" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Meniu" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Vezi" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|RedMut" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|Mkdir" + msgid "&Chdir" msgstr "&Chdir" @@ -3130,9 +3356,6 @@ msgid "Fir&st hit" msgstr "Primul gă&sit" -msgid "&Tree" -msgstr "Arbore" - msgid "Find File" msgstr "Caută fișier" @@ -3393,223 +3616,6 @@ msgid "Layout" msgstr "Aspect" -msgid "File listin&g" -msgstr "&Lista de fișiere" - -msgid "&Quick view" -msgstr "Vizualizare &rapidă" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "formatul de &listare " - -msgid "&Sort order..." -msgstr "&Ordinea sortării..." - -msgid "&Filter..." -msgstr "&Filtru..." - -msgid "&Encoding..." -msgstr "Codificar&e" - -msgid "FT&P link..." -msgstr "Conectare FT&P..." - -msgid "S&hell link..." -msgstr "Conectare s&hell..." - -msgid "S&FTP link..." -msgstr "Conectare S&FTP..." - -msgid "SM&B link..." -msgstr "Conectare SM&B..." - -msgid "Paneli&ze" -msgstr "Paneli&zare" - -msgid "&Rescan" -msgstr "&Rescanează" - -msgid "&View" -msgstr "&Vizualizează" - -msgid "Vie&w file..." -msgstr "Vi&zualizează fișier" - -msgid "&Filtered view" -msgstr "Vizualizare &filtrată" - -msgid "&Copy" -msgstr "&Copiază" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Legătură" - -msgid "&Symlink" -msgstr "Legătură &simbolică" - -msgid "Relative symlin&k" -msgstr "Legătură simbolică relati&vă" - -msgid "Edit s&ymlink" -msgstr "Editează legătura s&imbolică" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "Chown &avansat" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Redenumește/Mută" - -msgid "&Mkdir" -msgstr "&Mkdir" - -msgid "&Quick cd" -msgstr "Cd &rapid" - -msgid "Select &group" -msgstr "Selectează &grupul" - -msgid "U&nselect group" -msgstr "&De-selectează grupul" - -msgid "&Invert selection" -msgstr "&Inversează selecția" - -msgid "E&xit" -msgstr "&Ieșire" - -msgid "&User menu" -msgstr "Meniu &utilizator" - -msgid "&Directory tree" -msgstr "Arbore de &dosare" - -msgid "&Find file" -msgstr "&Caută fișier" - -msgid "S&wap panels" -msgstr "&Schimbă panourile" - -msgid "Switch &panels on/off" -msgstr "Comută &panourile da/nu" - -msgid "&Compare directories" -msgstr "&Compară dosare" - -msgid "C&ompare files" -msgstr "C&ompară fișiere" - -msgid "E&xternal panelize" -msgstr "Panelizare e&xternă" - -msgid "Show directory s&izes" -msgstr "Arată mărimea dosarelor" - -msgid "Command &history" -msgstr "&Istoric comenzi" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "Listă rapidă de dosa&re" - -msgid "&Active VFS list" -msgstr "Lista SVF &active" - -msgid "&Background jobs" -msgstr "Sarcini în &fundal" - -msgid "Screen lis&t" -msgstr "Lis&ta ecranelor" - -msgid "&Undelete files (ext2fs only)" -msgstr "Rec&uperare fișiere (doar ext2fs)" - -msgid "&Listing format edit" -msgstr "Editare mod de &listare" - -msgid "Edit &extension file" -msgstr "Editare fișier &extensii" - -msgid "Edit &menu file" -msgstr "Editare fișier &meniuri" - -msgid "Edit hi&ghlighting group file" -msgstr "Editează fișierul de evidențiere &grup" - -msgid "&Configuration..." -msgstr "&Configurare..." - -msgid "&Layout..." -msgstr "&Aspect..." - -msgid "&Panel options..." -msgstr "Opțiuni &panou..." - -msgid "C&onfirmation..." -msgstr "C&onfirmare..." - -msgid "&Appearance..." -msgstr "&Aspect..." - -msgid "&Display bits..." -msgstr "&Biți de afișare..." - -msgid "&Virtual FS..." -msgstr "Sistem &virtual de fișiere..." - -msgid "Panels:" -msgstr "Panouri:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Ai %zu ecran deschis. Închizi oricum?" -msgstr[1] "Ai %zu ecrane deschise. Închizi oricum?" -msgstr[2] "Ai %zu ecrane deschise. Închizi oricum?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Chiar dorești sa închizi Midnight Commander?" - -msgid "&Above" -msgstr "&Deasupra" - -msgid "&Left" -msgstr "&Stânga" - -msgid "&Below" -msgstr "&Dedesubt" - -msgid "&Right" -msgstr "D&reapta" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Meniu" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Vezi" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|RedMut" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|Mkdir" - msgid "Memory exhausted!" msgstr "Memorie epuizată!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ru.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ru.gmo differ diff -Nru mc-4.8.25/po/ru.po mc-4.8.26/po/ru.po --- mc-4.8.25/po/ru.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ru.po 2021-01-21 17:18:34.000000000 +0000 @@ -26,8 +26,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Russian (http://www.transifex.com/mc/mc/language/ru/)\n" "Language: ru\n" @@ -2007,6 +2007,9 @@ msgid "Skin:" msgstr "Скин:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Оформление" @@ -2230,6 +2233,14 @@ msgid "SMB authentication" msgstr "Идентификация SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Не удалось перейти в \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2290,6 +2301,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2566,14 +2580,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Не удалось выполнять команды на нелокальных файловых системах" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Не удалось перейти в \"%s\"\n" -"%s" - msgid "Parameter" msgstr "Параметр" @@ -3108,6 +3114,227 @@ msgid "Invalid source pattern '%s'" msgstr "Неправильный образец \"%s\"" +msgid "File listin&g" +msgstr "&Список файлов" + +msgid "&Quick view" +msgstr "&Быстрый просмотр" + +msgid "&Info" +msgstr "&Информация" + +msgid "&Tree" +msgstr "Дерев&о" + +msgid "&Listing format..." +msgstr "Фор&мат списка..." + +msgid "&Sort order..." +msgstr "Порядок &сортировки..." + +msgid "&Filter..." +msgstr "&Фильтр..." + +msgid "&Encoding..." +msgstr "Выбор &кодировки..." + +msgid "FT&P link..." +msgstr "&FTP-соединение..." + +msgid "S&hell link..." +msgstr "S&hell-соединение..." + +msgid "S&FTP link..." +msgstr "&SFTP-соединение..." + +msgid "SM&B link..." +msgstr "SM&B-соединение..." + +msgid "Paneli&ze" +msgstr "Па&нелизация" + +msgid "&Rescan" +msgstr "&Пересмотреть" + +msgid "&View" +msgstr "П&росмотр" + +msgid "Vie&w file..." +msgstr "Просмотр &файла..." + +msgid "&Filtered view" +msgstr "Просмотр вывода команд&ы" + +msgid "&Copy" +msgstr "&Копирование" + +msgid "C&hmod" +msgstr "Права &доступа" + +msgid "&Link" +msgstr "&Жёсткая ссылка" + +msgid "&Symlink" +msgstr "&Символическая ссылка" + +msgid "Relative symlin&k" +msgstr "Относител&ьная символическая ссылка" + +msgid "Edit s&ymlink" +msgstr "Правка ссы&лки" + +msgid "Ch&own" +msgstr "&Владелец/группа" + +msgid "&Advanced chown" +msgstr "Права (рас&ширенные)" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Пере&именование" + +msgid "&Mkdir" +msgstr "Со&здание каталога" + +msgid "&Quick cd" +msgstr "Сме&на каталога" + +msgid "Select &group" +msgstr "Отметить &группу" + +msgid "U&nselect group" +msgstr "Снять &отметку" + +msgid "&Invert selection" +msgstr "О&братить выделение" + +msgid "E&xit" +msgstr "Вы&ход" + +msgid "&User menu" +msgstr "&Меню пользователя..." + +msgid "&Directory tree" +msgstr "&Дерево каталогов" + +msgid "&Find file" +msgstr "Поиск &файла" + +msgid "S&wap panels" +msgstr "&Переставить панели" + +msgid "Switch &panels on/off" +msgstr "&Отключить панели" + +msgid "&Compare directories" +msgstr "&Сравнить каталоги" + +msgid "C&ompare files" +msgstr "Сравнить фа&йлы" + +msgid "E&xternal panelize" +msgstr "В&нешняя панелизация" + +msgid "Show directory s&izes" +msgstr "&Размеры каталогов" + +msgid "Command &history" +msgstr "&История командной строки" + +msgid "Viewed/edited files hi&story" +msgstr "Ис&тория просмотра/редактирования файлов" + +msgid "Di&rectory hotlist" +msgstr "Каталоги &быстрого доступа" + +msgid "&Active VFS list" +msgstr "Список &активных ВФС" + +msgid "&Background jobs" +msgstr "Фоновые &задания" + +msgid "Screen lis&t" +msgstr "Список &экранов" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Восстановление файлов" + +msgid "&Listing format edit" +msgstr "&Редактирование формата" + +msgid "Edit &extension file" +msgstr "Редактировать файл рас&ширений" + +msgid "Edit &menu file" +msgstr "Редактировать файл &меню" + +msgid "Edit hi&ghlighting group file" +msgstr "Редактировать файл рас&цветки имён" + +msgid "&Configuration..." +msgstr "&Конфигурация..." + +msgid "&Layout..." +msgstr "&Внешний вид..." + +msgid "&Panel options..." +msgstr "&Настройки панелей..." + +msgid "C&onfirmation..." +msgstr "&Подтверждение..." + +msgid "&Appearance..." +msgstr "&Оформление..." + +msgid "&Display bits..." +msgstr "&Биты символов..." + +msgid "&Virtual FS..." +msgstr "Виртуальные &ФС..." + +msgid "Panels:" +msgstr "Панели:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "У вас %zu открытый экран. Всё равно выйти?" +msgstr[1] "У вас %zu открытых экрана. Всё равно выйти?" +msgstr[2] "У вас %zu открытых экранов. Всё равно выйти?" +msgstr[3] "У вас %zu открытых экранов. Всё равно выйти?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Вы действительно хотите выйти из Midnight Commander?" + +msgid "&Above" +msgstr "&Верхняя панель" + +msgid "&Left" +msgstr "&Левая панель" + +msgid "&Below" +msgstr "&Нижняя панель" + +msgid "&Right" +msgstr "&Правая панель" + +msgid "ButtonBar|Menu" +msgstr "Меню" + +msgid "ButtonBar|View" +msgstr "Просмотр" + +msgid "ButtonBar|RenMov" +msgstr "Перенос" + +msgid "ButtonBar|Mkdir" +msgstr "НвКтлог" + msgid "&Chdir" msgstr "Пере&ход" @@ -3154,9 +3381,6 @@ msgid "Fir&st hit" msgstr "До первого в&хождения" -msgid "&Tree" -msgstr "Дерев&о" - msgid "Find File" msgstr "Поиск файла" @@ -3419,224 +3643,6 @@ msgid "Layout" msgstr "Внешний вид" -msgid "File listin&g" -msgstr "&Список файлов" - -msgid "&Quick view" -msgstr "&Быстрый просмотр" - -msgid "&Info" -msgstr "&Информация" - -msgid "&Listing format..." -msgstr "Фор&мат списка..." - -msgid "&Sort order..." -msgstr "Порядок &сортировки..." - -msgid "&Filter..." -msgstr "&Фильтр..." - -msgid "&Encoding..." -msgstr "Выбор &кодировки..." - -msgid "FT&P link..." -msgstr "&FTP-соединение..." - -msgid "S&hell link..." -msgstr "S&hell-соединение..." - -msgid "S&FTP link..." -msgstr "&SFTP-соединение..." - -msgid "SM&B link..." -msgstr "SM&B-соединение..." - -msgid "Paneli&ze" -msgstr "Па&нелизация" - -msgid "&Rescan" -msgstr "&Пересмотреть" - -msgid "&View" -msgstr "П&росмотр" - -msgid "Vie&w file..." -msgstr "Просмотр &файла..." - -msgid "&Filtered view" -msgstr "Просмотр вывода команд&ы" - -msgid "&Copy" -msgstr "&Копирование" - -msgid "C&hmod" -msgstr "Права &доступа" - -msgid "&Link" -msgstr "&Жёсткая ссылка" - -msgid "&Symlink" -msgstr "&Символическая ссылка" - -msgid "Relative symlin&k" -msgstr "Относител&ьная символическая ссылка" - -msgid "Edit s&ymlink" -msgstr "Правка ссы&лки" - -msgid "Ch&own" -msgstr "&Владелец/группа" - -msgid "&Advanced chown" -msgstr "Права (рас&ширенные)" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Пере&именование" - -msgid "&Mkdir" -msgstr "Со&здание каталога" - -msgid "&Quick cd" -msgstr "Сме&на каталога" - -msgid "Select &group" -msgstr "Отметить &группу" - -msgid "U&nselect group" -msgstr "Снять &отметку" - -msgid "&Invert selection" -msgstr "О&братить выделение" - -msgid "E&xit" -msgstr "Вы&ход" - -msgid "&User menu" -msgstr "&Меню пользователя..." - -msgid "&Directory tree" -msgstr "&Дерево каталогов" - -msgid "&Find file" -msgstr "Поиск &файла" - -msgid "S&wap panels" -msgstr "&Переставить панели" - -msgid "Switch &panels on/off" -msgstr "&Отключить панели" - -msgid "&Compare directories" -msgstr "&Сравнить каталоги" - -msgid "C&ompare files" -msgstr "Сравнить фа&йлы" - -msgid "E&xternal panelize" -msgstr "В&нешняя панелизация" - -msgid "Show directory s&izes" -msgstr "&Размеры каталогов" - -msgid "Command &history" -msgstr "&История командной строки" - -msgid "Viewed/edited files hi&story" -msgstr "Ис&тория просмотра/редактирования файлов" - -msgid "Di&rectory hotlist" -msgstr "Каталоги &быстрого доступа" - -msgid "&Active VFS list" -msgstr "Список &активных ВФС" - -msgid "&Background jobs" -msgstr "Фоновые &задания" - -msgid "Screen lis&t" -msgstr "Список &экранов" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Восстановление файлов" - -msgid "&Listing format edit" -msgstr "&Редактирование формата" - -msgid "Edit &extension file" -msgstr "Редактировать файл рас&ширений" - -msgid "Edit &menu file" -msgstr "Редактировать файл &меню" - -msgid "Edit hi&ghlighting group file" -msgstr "Редактировать файл рас&цветки имён" - -msgid "&Configuration..." -msgstr "&Конфигурация..." - -msgid "&Layout..." -msgstr "&Внешний вид..." - -msgid "&Panel options..." -msgstr "&Настройки панелей..." - -msgid "C&onfirmation..." -msgstr "&Подтверждение..." - -msgid "&Appearance..." -msgstr "&Оформление..." - -msgid "&Display bits..." -msgstr "&Биты символов..." - -msgid "&Virtual FS..." -msgstr "Виртуальные &ФС..." - -msgid "Panels:" -msgstr "Панели:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "У вас %zu открытый экран. Всё равно выйти?" -msgstr[1] "У вас %zu открытых экрана. Всё равно выйти?" -msgstr[2] "У вас %zu открытых экранов. Всё равно выйти?" -msgstr[3] "У вас %zu открытых экранов. Всё равно выйти?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Вы действительно хотите выйти из Midnight Commander?" - -msgid "&Above" -msgstr "&Верхняя панель" - -msgid "&Left" -msgstr "&Левая панель" - -msgid "&Below" -msgstr "&Нижняя панель" - -msgid "&Right" -msgstr "&Правая панель" - -msgid "ButtonBar|Menu" -msgstr "Меню" - -msgid "ButtonBar|View" -msgstr "Просмотр" - -msgid "ButtonBar|RenMov" -msgstr "Перенос" - -msgid "ButtonBar|Mkdir" -msgstr "НвКтлог" - msgid "Memory exhausted!" msgstr "Память исчерпана!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/sk.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/sk.gmo differ diff -Nru mc-4.8.25/po/sk.po mc-4.8.26/po/sk.po --- mc-4.8.25/po/sk.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/sk.po 2021-01-21 17:18:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Slovak (http://www.transifex.com/mc/mc/language/sk/)\n" "Language: sk\n" @@ -1982,6 +1982,9 @@ msgid "Skin:" msgstr "Téma vzhľadu:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Vzhľad" @@ -2205,6 +2208,14 @@ msgid "SMB authentication" msgstr "Autentifikácia SMB" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Nemožno chdir do „%s“\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2265,6 +2276,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2541,14 +2555,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Nemožno spúšťať príkazy na súborových systémoch, ktoré nie sú lokálne" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Nemožno chdir do „%s“\n" -"%s" - msgid "Parameter" msgstr "Parameter" @@ -3080,6 +3086,227 @@ msgid "Invalid source pattern '%s'" msgstr "Neplatný zdrojový vzor „%s“" +msgid "File listin&g" +msgstr "&Výpis súborov" + +msgid "&Quick view" +msgstr "&Rýchle zobrazenie" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Strom" + +msgid "&Listing format..." +msgstr "&Formát výpisu..." + +msgid "&Sort order..." +msgstr "&Poradie výpisu..." + +msgid "&Filter..." +msgstr "&Filter..." + +msgid "&Encoding..." +msgstr "Kódovani&e..." + +msgid "FT&P link..." +msgstr "&Pripojenie FTP..." + +msgid "S&hell link..." +msgstr "Pripojenie s&hell..." + +msgid "S&FTP link..." +msgstr "Pripojenie S&FTP..." + +msgid "SM&B link..." +msgstr "Pripojenie SM&B..." + +msgid "Paneli&ze" +msgstr "Paneli&zovať" + +msgid "&Rescan" +msgstr "&Znovu načítať" + +msgid "&View" +msgstr "&Zobraziť" + +msgid "Vie&w file..." +msgstr "Zo&braziť súbor..." + +msgid "&Filtered view" +msgstr "&Filtrované zobrazenie" + +msgid "&Copy" +msgstr "&Kopírovať" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Odkaz" + +msgid "&Symlink" +msgstr "&Sym. odkaz" + +msgid "Relative symlin&k" +msgstr "Relatívny sym. od&kaz" + +msgid "Edit s&ymlink" +msgstr "Upraviť s&ymb. odkaz " + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "Rozšírená zmen&a vlastníka" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Premenovať/presunúť" + +msgid "&Mkdir" +msgstr "&Vytvoriť adr." + +msgid "&Quick cd" +msgstr "&Rýchly cd" + +msgid "Select &group" +msgstr "Vybrať &skup." + +msgid "U&nselect group" +msgstr "Zruš&iť výber skup." + +msgid "&Invert selection" +msgstr "&Invertovať výber" + +msgid "E&xit" +msgstr "&Ukončiť" + +msgid "&User menu" +msgstr "Po&užívateľské menu " + +msgid "&Directory tree" +msgstr "A&dresárový strom" + +msgid "&Find file" +msgstr "&Nájsť súbor" + +msgid "S&wap panels" +msgstr "&Vymeniť panely" + +msgid "Switch &panels on/off" +msgstr "&Panely zap./vyp." + +msgid "&Compare directories" +msgstr "&Porovnať adresáre" + +msgid "C&ompare files" +msgstr "P&orovnať súbory" + +msgid "E&xternal panelize" +msgstr "Panelizovať e&xterným" + +msgid "Show directory s&izes" +msgstr "Zobraz&iť veľkosť adresárov" + +msgid "Command &history" +msgstr "&História príkazov" + +msgid "Viewed/edited files hi&story" +msgstr "Zobrazená/zmenená hi&stória súborov" + +msgid "Di&rectory hotlist" +msgstr "Hotlist ad&resára" + +msgid "&Active VFS list" +msgstr "Zoznam &aktívnych VFS" + +msgid "&Background jobs" +msgstr "Úlohy v &pozadí" + +msgid "Screen lis&t" +msgstr "Zoznam& obrazoviek" + +msgid "&Undelete files (ext2fs only)" +msgstr "Obnoviť &Súbory (iba ext2fs)" + +msgid "&Listing format edit" +msgstr "&Upraviť formát výpisu" + +msgid "Edit &extension file" +msgstr "Upraviť sú&bor prípon" + +msgid "Edit &menu file" +msgstr "Upraviť súbor me&nu" + +msgid "Edit hi&ghlighting group file" +msgstr "Upraviť súbor &zvýrazňovacích skupín" + +msgid "&Configuration..." +msgstr "&Konfigurácia..." + +msgid "&Layout..." +msgstr "&Rozmiestnenie..." + +msgid "&Panel options..." +msgstr "Nastavenie &panelu..." + +msgid "C&onfirmation..." +msgstr "P&otvrdenie..." + +msgid "&Appearance..." +msgstr "Vzhľ&ad..." + +msgid "&Display bits..." +msgstr "&Zobrazené bity..." + +msgid "&Virtual FS..." +msgstr "&Virtuálny FS..." + +msgid "Panels:" +msgstr "Panely:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Máte už %zu otvorenú obrazovku. Aj tak odísť?" +msgstr[1] "Máte už %zu otvorené obrazovky. Aj tak odísť?" +msgstr[2] "Máte už %zu otvorených obrazoviek. Aj tak odísť?" +msgstr[3] "Máte už %zu otvorených obrazoviek. Aj tak odísť?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Naozaj chcete ukončiť Midnight Commander?" + +msgid "&Above" +msgstr "N&ad" + +msgid "&Left" +msgstr "Vľ&avo" + +msgid "&Below" +msgstr "&Pod" + +msgid "&Right" +msgstr "Vp&ravo" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Menu" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Zobraz" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|PremPres" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|VytAdr" + msgid "&Chdir" msgstr "&Chdir" @@ -3126,9 +3353,6 @@ msgid "Fir&st hit" msgstr "Prvý vý&skyt" -msgid "&Tree" -msgstr "&Strom" - msgid "Find File" msgstr "Nájsť súbor" @@ -3391,224 +3615,6 @@ msgid "Layout" msgstr "Rozmiestnenie" -msgid "File listin&g" -msgstr "&Výpis súborov" - -msgid "&Quick view" -msgstr "&Rýchle zobrazenie" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Formát výpisu..." - -msgid "&Sort order..." -msgstr "&Poradie výpisu..." - -msgid "&Filter..." -msgstr "&Filter..." - -msgid "&Encoding..." -msgstr "Kódovani&e..." - -msgid "FT&P link..." -msgstr "&Pripojenie FTP..." - -msgid "S&hell link..." -msgstr "Pripojenie s&hell..." - -msgid "S&FTP link..." -msgstr "Pripojenie S&FTP..." - -msgid "SM&B link..." -msgstr "Pripojenie SM&B..." - -msgid "Paneli&ze" -msgstr "Paneli&zovať" - -msgid "&Rescan" -msgstr "&Znovu načítať" - -msgid "&View" -msgstr "&Zobraziť" - -msgid "Vie&w file..." -msgstr "Zo&braziť súbor..." - -msgid "&Filtered view" -msgstr "&Filtrované zobrazenie" - -msgid "&Copy" -msgstr "&Kopírovať" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Odkaz" - -msgid "&Symlink" -msgstr "&Sym. odkaz" - -msgid "Relative symlin&k" -msgstr "Relatívny sym. od&kaz" - -msgid "Edit s&ymlink" -msgstr "Upraviť s&ymb. odkaz " - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "Rozšírená zmen&a vlastníka" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Premenovať/presunúť" - -msgid "&Mkdir" -msgstr "&Vytvoriť adr." - -msgid "&Quick cd" -msgstr "&Rýchly cd" - -msgid "Select &group" -msgstr "Vybrať &skup." - -msgid "U&nselect group" -msgstr "Zruš&iť výber skup." - -msgid "&Invert selection" -msgstr "&Invertovať výber" - -msgid "E&xit" -msgstr "&Ukončiť" - -msgid "&User menu" -msgstr "Po&užívateľské menu " - -msgid "&Directory tree" -msgstr "A&dresárový strom" - -msgid "&Find file" -msgstr "&Nájsť súbor" - -msgid "S&wap panels" -msgstr "&Vymeniť panely" - -msgid "Switch &panels on/off" -msgstr "&Panely zap./vyp." - -msgid "&Compare directories" -msgstr "&Porovnať adresáre" - -msgid "C&ompare files" -msgstr "P&orovnať súbory" - -msgid "E&xternal panelize" -msgstr "Panelizovať e&xterným" - -msgid "Show directory s&izes" -msgstr "Zobraz&iť veľkosť adresárov" - -msgid "Command &history" -msgstr "&História príkazov" - -msgid "Viewed/edited files hi&story" -msgstr "Zobrazená/zmenená hi&stória súborov" - -msgid "Di&rectory hotlist" -msgstr "Hotlist ad&resára" - -msgid "&Active VFS list" -msgstr "Zoznam &aktívnych VFS" - -msgid "&Background jobs" -msgstr "Úlohy v &pozadí" - -msgid "Screen lis&t" -msgstr "Zoznam& obrazoviek" - -msgid "&Undelete files (ext2fs only)" -msgstr "Obnoviť &Súbory (iba ext2fs)" - -msgid "&Listing format edit" -msgstr "&Upraviť formát výpisu" - -msgid "Edit &extension file" -msgstr "Upraviť sú&bor prípon" - -msgid "Edit &menu file" -msgstr "Upraviť súbor me&nu" - -msgid "Edit hi&ghlighting group file" -msgstr "Upraviť súbor &zvýrazňovacích skupín" - -msgid "&Configuration..." -msgstr "&Konfigurácia..." - -msgid "&Layout..." -msgstr "&Rozmiestnenie..." - -msgid "&Panel options..." -msgstr "Nastavenie &panelu..." - -msgid "C&onfirmation..." -msgstr "P&otvrdenie..." - -msgid "&Appearance..." -msgstr "Vzhľ&ad..." - -msgid "&Display bits..." -msgstr "&Zobrazené bity..." - -msgid "&Virtual FS..." -msgstr "&Virtuálny FS..." - -msgid "Panels:" -msgstr "Panely:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Máte už %zu otvorenú obrazovku. Aj tak odísť?" -msgstr[1] "Máte už %zu otvorené obrazovky. Aj tak odísť?" -msgstr[2] "Máte už %zu otvorených obrazoviek. Aj tak odísť?" -msgstr[3] "Máte už %zu otvorených obrazoviek. Aj tak odísť?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Naozaj chcete ukončiť Midnight Commander?" - -msgid "&Above" -msgstr "N&ad" - -msgid "&Left" -msgstr "Vľ&avo" - -msgid "&Below" -msgstr "&Pod" - -msgid "&Right" -msgstr "Vp&ravo" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Menu" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Zobraz" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|PremPres" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|VytAdr" - msgid "Memory exhausted!" msgstr "Došla pamäť!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/sl.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/sl.gmo differ diff -Nru mc-4.8.25/po/sl.po mc-4.8.26/po/sl.po --- mc-4.8.25/po/sl.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/sl.po 2021-01-21 17:18:34.000000000 +0000 @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Slovenian (http://www.transifex.com/mc/mc/language/sl/)\n" "Language: sl\n" @@ -1891,6 +1891,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2110,6 +2113,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2170,6 +2179,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2442,12 +2454,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2899,6 +2905,227 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "&Drevo" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "&Vrstni red..." + +msgid "&Filter..." +msgstr "&Filter..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "FT&P povezava..." + +msgid "S&hell link..." +msgstr "&Lupinska povezava..." + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "SM&B povezava..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "&Drevo imenikov" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Odbriši datoteke (samo ext2fs)" + +msgid "&Listing format edit" +msgstr "uredi izpis &Seznama" + +msgid "Edit &extension file" +msgstr "Uredi &priponsko datoteko" + +msgid "Edit &menu file" +msgstr "Uredi &menujsko datoteko" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Nastavitve..." + +msgid "&Layout..." +msgstr "&Postavitev..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "&Kaži bite..." + +msgid "&Virtual FS..." +msgstr "&Navidezni Datotečni Sistem..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "&Chdir" @@ -2945,9 +3172,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Drevo" - msgid "Find File" msgstr "Poišči datoteko" @@ -3206,224 +3430,6 @@ msgid "Layout" msgstr "Postavitev" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "&Vrstni red..." - -msgid "&Filter..." -msgstr "&Filter..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "FT&P povezava..." - -msgid "S&hell link..." -msgstr "&Lupinska povezava..." - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "SM&B povezava..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "&Drevo imenikov" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Odbriši datoteke (samo ext2fs)" - -msgid "&Listing format edit" -msgstr "uredi izpis &Seznama" - -msgid "Edit &extension file" -msgstr "Uredi &priponsko datoteko" - -msgid "Edit &menu file" -msgstr "Uredi &menujsko datoteko" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Nastavitve..." - -msgid "&Layout..." -msgstr "&Postavitev..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "&Kaži bite..." - -msgid "&Virtual FS..." -msgstr "&Navidezni Datotečni Sistem..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/sr.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/sr.gmo differ diff -Nru mc-4.8.25/po/sr.po mc-4.8.26/po/sr.po --- mc-4.8.25/po/sr.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/sr.po 2021-01-21 17:18:34.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Serbian (http://www.transifex.com/mc/mc/language/sr/)\n" "Language: sr\n" @@ -1967,6 +1967,9 @@ msgid "Skin:" msgstr "Маска:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Изглед" @@ -2190,6 +2193,14 @@ msgid "SMB authentication" msgstr "СМБ потврђивање идентитета" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Не могу да пређем у директоријум „%s“\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2250,6 +2261,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2526,14 +2540,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Не могу да извршим наредбе на не-месним системима датотека" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Не могу да пређем у директоријум „%s“\n" -"%s" - msgid "Parameter" msgstr "Параметар" @@ -3058,6 +3064,226 @@ msgid "Invalid source pattern '%s'" msgstr "Неисправан образац извора '%s'" +msgid "File listin&g" +msgstr "&Испиши датотеке" + +msgid "&Quick view" +msgstr "&Брзи преглед" + +msgid "&Info" +msgstr "&Подаци" + +msgid "&Tree" +msgstr "&Стабло" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "Редослед &ређања..." + +msgid "&Filter..." +msgstr "&Пропусник..." + +msgid "&Encoding..." +msgstr "&Кодирање..." + +msgid "FT&P link..." +msgstr "&ФТП веза..." + +msgid "S&hell link..." +msgstr "Веза &љуске..." + +msgid "S&FTP link..." +msgstr "&СФТП веза..." + +msgid "SM&B link..." +msgstr "СМ&Б веза..." + +msgid "Paneli&ze" +msgstr "Претвори &у окно" + +msgid "&Rescan" +msgstr "&Поново прегледај" + +msgid "&View" +msgstr "&Преглед" + +msgid "Vie&w file..." +msgstr "Прегледај &датотеку..." + +msgid "&Filtered view" +msgstr "&Издвојени преглед" + +msgid "&Copy" +msgstr "У&множи" + +msgid "C&hmod" +msgstr "Промени &режим" + +msgid "&Link" +msgstr "&Веза" + +msgid "&Symlink" +msgstr "&Симболичка веза" + +msgid "Relative symlin&k" +msgstr "Релативна &симболичка веза" + +msgid "Edit s&ymlink" +msgstr "&Уреди симболичку везу" + +msgid "Ch&own" +msgstr "Промени &власништво" + +msgid "&Advanced chown" +msgstr "&Напредна промена власништва" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Преиме/Премес" + +msgid "&Mkdir" +msgstr "Направи &дир." + +msgid "&Quick cd" +msgstr "&Брзо промени директоријум" + +msgid "Select &group" +msgstr "Изабери &групу" + +msgid "U&nselect group" +msgstr "Поништи &избор групе" + +msgid "&Invert selection" +msgstr "&Преокрени избор" + +msgid "E&xit" +msgstr "&Изађи" + +msgid "&User menu" +msgstr "&Кориснички изборник" + +msgid "&Directory tree" +msgstr "&Стабло директоријума" + +msgid "&Find file" +msgstr "&Нађи датотеку" + +msgid "S&wap panels" +msgstr "&Размени панеле" + +msgid "Switch &panels on/off" +msgstr "Укључи/искључи &панеле" + +msgid "&Compare directories" +msgstr "&Упореди директоријуме" + +msgid "C&ompare files" +msgstr "Упореди &датотеке" + +msgid "E&xternal panelize" +msgstr "&Спољним програмом у окно" + +msgid "Show directory s&izes" +msgstr "Прикажи &величине директоријума" + +msgid "Command &history" +msgstr "Историјат &наредби" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "&Врући списак директоријума" + +msgid "&Active VFS list" +msgstr "&Списак радних ВСД-а" + +msgid "&Background jobs" +msgstr "&Позадински послови" + +msgid "Screen lis&t" +msgstr "Списак &екрана" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Одобриши датотеке (само на екст2сд-у)" + +msgid "&Listing format edit" +msgstr "&Испиши уређивање записа" + +msgid "Edit &extension file" +msgstr "Уреди датотеку &проширења" + +msgid "Edit &menu file" +msgstr "Уреди датотеку &изборника" + +msgid "Edit hi&ghlighting group file" +msgstr "Уреди истицање &датотеке групе" + +msgid "&Configuration..." +msgstr "&Подешавања..." + +msgid "&Layout..." +msgstr "&Распоред..." + +msgid "&Panel options..." +msgstr "Опције &панела..." + +msgid "C&onfirmation..." +msgstr "П&отврђивање..." + +msgid "&Appearance..." +msgstr "&Изглед..." + +msgid "&Display bits..." +msgstr "&Битова у приказу..." + +msgid "&Virtual FS..." +msgstr "&Виртуелни СД..." + +msgid "Panels:" +msgstr "Панели:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +msgid "The Midnight Commander" +msgstr "Поноћни наредник" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Да ли стварно желите да изађете из Поноћног наредника?" + +msgid "&Above" +msgstr "И&знад" + +msgid "&Left" +msgstr "&Леви" + +msgid "&Below" +msgstr "И&спод" + +msgid "&Right" +msgstr "&Десни" + +msgid "ButtonBar|Menu" +msgstr "Изборник" + +msgid "ButtonBar|View" +msgstr "Преглед" + +msgid "ButtonBar|RenMov" +msgstr "ПреименујПремести" + +msgid "ButtonBar|Mkdir" +msgstr "Направи директоријум" + msgid "&Chdir" msgstr "&Промени директоријум" @@ -3104,9 +3330,6 @@ msgid "Fir&st hit" msgstr "Први &погодак" -msgid "&Tree" -msgstr "&Стабло" - msgid "Find File" msgstr "Нађите датотеку" @@ -3367,223 +3590,6 @@ msgid "Layout" msgstr "Распоред" -msgid "File listin&g" -msgstr "&Испиши датотеке" - -msgid "&Quick view" -msgstr "&Брзи преглед" - -msgid "&Info" -msgstr "&Подаци" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "Редослед &ређања..." - -msgid "&Filter..." -msgstr "&Пропусник..." - -msgid "&Encoding..." -msgstr "&Кодирање..." - -msgid "FT&P link..." -msgstr "&ФТП веза..." - -msgid "S&hell link..." -msgstr "Веза &љуске..." - -msgid "S&FTP link..." -msgstr "&СФТП веза..." - -msgid "SM&B link..." -msgstr "СМ&Б веза..." - -msgid "Paneli&ze" -msgstr "Претвори &у окно" - -msgid "&Rescan" -msgstr "&Поново прегледај" - -msgid "&View" -msgstr "&Преглед" - -msgid "Vie&w file..." -msgstr "Прегледај &датотеку..." - -msgid "&Filtered view" -msgstr "&Издвојени преглед" - -msgid "&Copy" -msgstr "У&множи" - -msgid "C&hmod" -msgstr "Промени &режим" - -msgid "&Link" -msgstr "&Веза" - -msgid "&Symlink" -msgstr "&Симболичка веза" - -msgid "Relative symlin&k" -msgstr "Релативна &симболичка веза" - -msgid "Edit s&ymlink" -msgstr "&Уреди симболичку везу" - -msgid "Ch&own" -msgstr "Промени &власништво" - -msgid "&Advanced chown" -msgstr "&Напредна промена власништва" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Преиме/Премес" - -msgid "&Mkdir" -msgstr "Направи &дир." - -msgid "&Quick cd" -msgstr "&Брзо промени директоријум" - -msgid "Select &group" -msgstr "Изабери &групу" - -msgid "U&nselect group" -msgstr "Поништи &избор групе" - -msgid "&Invert selection" -msgstr "&Преокрени избор" - -msgid "E&xit" -msgstr "&Изађи" - -msgid "&User menu" -msgstr "&Кориснички изборник" - -msgid "&Directory tree" -msgstr "&Стабло директоријума" - -msgid "&Find file" -msgstr "&Нађи датотеку" - -msgid "S&wap panels" -msgstr "&Размени панеле" - -msgid "Switch &panels on/off" -msgstr "Укључи/искључи &панеле" - -msgid "&Compare directories" -msgstr "&Упореди директоријуме" - -msgid "C&ompare files" -msgstr "Упореди &датотеке" - -msgid "E&xternal panelize" -msgstr "&Спољним програмом у окно" - -msgid "Show directory s&izes" -msgstr "Прикажи &величине директоријума" - -msgid "Command &history" -msgstr "Историјат &наредби" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "&Врући списак директоријума" - -msgid "&Active VFS list" -msgstr "&Списак радних ВСД-а" - -msgid "&Background jobs" -msgstr "&Позадински послови" - -msgid "Screen lis&t" -msgstr "Списак &екрана" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Одобриши датотеке (само на екст2сд-у)" - -msgid "&Listing format edit" -msgstr "&Испиши уређивање записа" - -msgid "Edit &extension file" -msgstr "Уреди датотеку &проширења" - -msgid "Edit &menu file" -msgstr "Уреди датотеку &изборника" - -msgid "Edit hi&ghlighting group file" -msgstr "Уреди истицање &датотеке групе" - -msgid "&Configuration..." -msgstr "&Подешавања..." - -msgid "&Layout..." -msgstr "&Распоред..." - -msgid "&Panel options..." -msgstr "Опције &панела..." - -msgid "C&onfirmation..." -msgstr "П&отврђивање..." - -msgid "&Appearance..." -msgstr "&Изглед..." - -msgid "&Display bits..." -msgstr "&Битова у приказу..." - -msgid "&Virtual FS..." -msgstr "&Виртуелни СД..." - -msgid "Panels:" -msgstr "Панели:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -msgid "The Midnight Commander" -msgstr "Поноћни наредник" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Да ли стварно желите да изађете из Поноћног наредника?" - -msgid "&Above" -msgstr "И&знад" - -msgid "&Left" -msgstr "&Леви" - -msgid "&Below" -msgstr "И&спод" - -msgid "&Right" -msgstr "&Десни" - -msgid "ButtonBar|Menu" -msgstr "Изборник" - -msgid "ButtonBar|View" -msgstr "Преглед" - -msgid "ButtonBar|RenMov" -msgstr "ПреименујПремести" - -msgid "ButtonBar|Mkdir" -msgstr "Направи директоријум" - msgid "Memory exhausted!" msgstr "Меморија је потрошена!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/sv.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/sv.gmo differ diff -Nru mc-4.8.25/po/sv.po mc-4.8.26/po/sv.po --- mc-4.8.25/po/sv.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/sv.po 2021-01-21 17:18:34.000000000 +0000 @@ -7,6 +7,7 @@ # Cybjit , 2012 # Henrik Mattsson-Mårn , 2016 # Jonas Hultén , 2017 +# Jörgen Städje , 2020 # MagnusHerrlin , 2016 # MagnusHerrlin , 2016 # Sebastian Rasmussen , 2019-2020 @@ -15,8 +16,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Swedish (http://www.transifex.com/mc/mc/language/sv/)\n" "Language: sv\n" @@ -93,7 +94,7 @@ "To get more info, please visit\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" msgstr "" -"Dina gamla inställningar blev migrerade från %s\n" +"Dina gamla inställningar migrerades från %s\n" "till kataloger rekommenderade av Freedesktop.\n" "För att få mer information, besök\n" "http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html" @@ -1982,6 +1983,9 @@ msgid "Skin:" msgstr "Tema:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Utseende" @@ -2205,6 +2209,14 @@ msgid "SMB authentication" msgstr "SMB-autentisering" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Chdir till \"%s\" misslyckades\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2265,6 +2277,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2541,14 +2556,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Kommandon kan inte exekveras på ickelokala filsystem" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Chdir till \"%s\" misslyckades\n" -"%s" - msgid "Parameter" msgstr "Parameter" @@ -3083,6 +3090,225 @@ msgid "Invalid source pattern '%s'" msgstr "Otillåtet källfilter '%s'" +msgid "File listin&g" +msgstr "Fillist&a" + +msgid "&Quick view" +msgstr "Fil&vy" + +msgid "&Info" +msgstr "&Info" + +msgid "&Tree" +msgstr "&Träd" + +msgid "&Listing format..." +msgstr "&Listformat..." + +msgid "&Sort order..." +msgstr "&Sorteringsordning..." + +msgid "&Filter..." +msgstr "&Filter..." + +msgid "&Encoding..." +msgstr "Tecken&översättning..." + +msgid "FT&P link..." +msgstr "FT&P-länk..." + +msgid "S&hell link..." +msgstr "S&kallänk..." + +msgid "S&FTP link..." +msgstr "SFTP-l&änk..." + +msgid "SM&B link..." +msgstr "SM&B-länk..." + +msgid "Paneli&ze" +msgstr "Pa&nelisera" + +msgid "&Rescan" +msgstr "Läs in i&gen" + +msgid "&View" +msgstr "&Visa" + +msgid "Vie&w file..." +msgstr "Visa &fil..." + +msgid "&Filtered view" +msgstr "Filtrerad v&y" + +msgid "&Copy" +msgstr "&Kopiera" + +msgid "C&hmod" +msgstr "C&hmod" + +msgid "&Link" +msgstr "&Länk" + +msgid "&Symlink" +msgstr "&Symlänk" + +msgid "Relative symlin&k" +msgstr "&Relativ symlänk" + +msgid "Edit s&ymlink" +msgstr "Redigera sy&mlänk" + +msgid "Ch&own" +msgstr "Ch&own" + +msgid "&Advanced chown" +msgstr "Ava&ncerad chown" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Döp om/flytta" + +msgid "&Mkdir" +msgstr "Ska&pa katalog" + +msgid "&Quick cd" +msgstr "Snabb &cd" + +msgid "Select &group" +msgstr "Välj &grupp" + +msgid "U&nselect group" +msgstr "Välj &bort grupp" + +msgid "&Invert selection" +msgstr "&Invertera markering" + +msgid "E&xit" +msgstr "&Avsluta" + +msgid "&User menu" +msgstr "&Användarmeny" + +msgid "&Directory tree" +msgstr "Katalogtr&äd" + +msgid "&Find file" +msgstr "&Sök fil" + +msgid "S&wap panels" +msgstr "B&yt plats på paneler" + +msgid "Switch &panels on/off" +msgstr "&Ta bort/fram paneler" + +msgid "&Compare directories" +msgstr "Jämför &kataloger" + +msgid "C&ompare files" +msgstr "&Jämför filer" + +msgid "E&xternal panelize" +msgstr "&Panelisera externt kommando" + +msgid "Show directory s&izes" +msgstr "V&isa katalogstorlekar" + +msgid "Command &history" +msgstr "Kommando-&historik" + +msgid "Viewed/edited files hi&story" +msgstr "Hi&storik över visade/redigerade filer" + +msgid "Di&rectory hotlist" +msgstr "Katalog&favoriter" + +msgid "&Active VFS list" +msgstr "Aktiv &VFS-lista" + +msgid "&Background jobs" +msgstr "&Bakgrundsjobb" + +msgid "Screen lis&t" +msgstr "Skä&rmlista" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Återskapa raderade filer (endast ext2fs)" + +msgid "&Listing format edit" +msgstr "Redigera &listningsformatet" + +msgid "Edit &extension file" +msgstr "Redigera &utökningsfil" + +msgid "Edit &menu file" +msgstr "Redigera &menyfilen" + +msgid "Edit hi&ghlighting group file" +msgstr "Redigera &gruppmarkeringsfil" + +msgid "&Configuration..." +msgstr "K&onfiguration..." + +msgid "&Layout..." +msgstr "&Layout..." + +msgid "&Panel options..." +msgstr "&Panelalternativ..." + +msgid "C&onfirmation..." +msgstr "&Konfirmera..." + +msgid "&Appearance..." +msgstr "&Utseende..." + +msgid "&Display bits..." +msgstr "&Displaybitar..." + +msgid "&Virtual FS..." +msgstr "&Virtuellt FS..." + +msgid "Panels:" +msgstr "Paneler:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Du har %zu öppnad skärm. Avsluta ändå?" +msgstr[1] "Du har %zu öppnade skärmar. Avsluta ändå?" + +msgid "The Midnight Commander" +msgstr "The Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Vill du verkligen avsluta Midnight Commander?" + +msgid "&Above" +msgstr "&Över" + +msgid "&Left" +msgstr "&Vänster" + +msgid "&Below" +msgstr "&Under" + +msgid "&Right" +msgstr "&Höger" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Meny" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Visa" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|DöpFly" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|NyKat" + msgid "&Chdir" msgstr "&Byt katalog" @@ -3129,9 +3355,6 @@ msgid "Fir&st hit" msgstr "F&örsta träff" -msgid "&Tree" -msgstr "&Träd" - msgid "Find File" msgstr "Sök Fil" @@ -3390,222 +3613,6 @@ msgid "Layout" msgstr "Layout" -msgid "File listin&g" -msgstr "Fillist&a" - -msgid "&Quick view" -msgstr "Fil&vy" - -msgid "&Info" -msgstr "&Info" - -msgid "&Listing format..." -msgstr "&Listformat..." - -msgid "&Sort order..." -msgstr "&Sorteringsordning..." - -msgid "&Filter..." -msgstr "&Filter..." - -msgid "&Encoding..." -msgstr "Tecken&översättning..." - -msgid "FT&P link..." -msgstr "FT&P-länk..." - -msgid "S&hell link..." -msgstr "S&kallänk..." - -msgid "S&FTP link..." -msgstr "SFTP-l&änk..." - -msgid "SM&B link..." -msgstr "SM&B-länk..." - -msgid "Paneli&ze" -msgstr "Pa&nelisera" - -msgid "&Rescan" -msgstr "Läs in i&gen" - -msgid "&View" -msgstr "&Visa" - -msgid "Vie&w file..." -msgstr "Visa &fil..." - -msgid "&Filtered view" -msgstr "Filtrerad v&y" - -msgid "&Copy" -msgstr "&Kopiera" - -msgid "C&hmod" -msgstr "C&hmod" - -msgid "&Link" -msgstr "&Länk" - -msgid "&Symlink" -msgstr "&Symlänk" - -msgid "Relative symlin&k" -msgstr "&Relativ symlänk" - -msgid "Edit s&ymlink" -msgstr "Redigera sy&mlänk" - -msgid "Ch&own" -msgstr "Ch&own" - -msgid "&Advanced chown" -msgstr "Ava&ncerad chown" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Döp om/flytta" - -msgid "&Mkdir" -msgstr "Ska&pa katalog" - -msgid "&Quick cd" -msgstr "Snabb &cd" - -msgid "Select &group" -msgstr "Välj &grupp" - -msgid "U&nselect group" -msgstr "Välj &bort grupp" - -msgid "&Invert selection" -msgstr "&Invertera markering" - -msgid "E&xit" -msgstr "&Avsluta" - -msgid "&User menu" -msgstr "&Användarmeny" - -msgid "&Directory tree" -msgstr "Katalogtr&äd" - -msgid "&Find file" -msgstr "&Sök fil" - -msgid "S&wap panels" -msgstr "B&yt plats på paneler" - -msgid "Switch &panels on/off" -msgstr "&Ta bort/fram paneler" - -msgid "&Compare directories" -msgstr "Jämför &kataloger" - -msgid "C&ompare files" -msgstr "&Jämför filer" - -msgid "E&xternal panelize" -msgstr "&Panelisera externt kommando" - -msgid "Show directory s&izes" -msgstr "V&isa katalogstorlekar" - -msgid "Command &history" -msgstr "Kommando-&historik" - -msgid "Viewed/edited files hi&story" -msgstr "Hi&storik över visade/redigerade filer" - -msgid "Di&rectory hotlist" -msgstr "Katalog&favoriter" - -msgid "&Active VFS list" -msgstr "Aktiv &VFS-lista" - -msgid "&Background jobs" -msgstr "&Bakgrundsjobb" - -msgid "Screen lis&t" -msgstr "Skä&rmlista" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Återskapa raderade filer (endast ext2fs)" - -msgid "&Listing format edit" -msgstr "Redigera &listningsformatet" - -msgid "Edit &extension file" -msgstr "Redigera &utökningsfil" - -msgid "Edit &menu file" -msgstr "Redigera &menyfilen" - -msgid "Edit hi&ghlighting group file" -msgstr "Redigera &gruppmarkeringsfil" - -msgid "&Configuration..." -msgstr "K&onfiguration..." - -msgid "&Layout..." -msgstr "&Layout..." - -msgid "&Panel options..." -msgstr "&Panelalternativ..." - -msgid "C&onfirmation..." -msgstr "&Konfirmera..." - -msgid "&Appearance..." -msgstr "&Utseende..." - -msgid "&Display bits..." -msgstr "&Displaybitar..." - -msgid "&Virtual FS..." -msgstr "&Virtuellt FS..." - -msgid "Panels:" -msgstr "Paneler:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Du har %zu öppnad skärm. Avsluta ändå?" -msgstr[1] "Du har %zu öppnade skärmar. Avsluta ändå?" - -msgid "The Midnight Commander" -msgstr "The Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Vill du verkligen avsluta Midnight Commander?" - -msgid "&Above" -msgstr "&Över" - -msgid "&Left" -msgstr "&Vänster" - -msgid "&Below" -msgstr "&Under" - -msgid "&Right" -msgstr "&Höger" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Meny" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Visa" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|DöpFly" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|NyKat" - msgid "Memory exhausted!" msgstr "Minnet är fullt!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/szl.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/szl.gmo differ diff -Nru mc-4.8.25/po/szl.po mc-4.8.26/po/szl.po --- mc-4.8.25/po/szl.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/szl.po 2021-01-21 17:18:34.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Silesian (http://www.transifex.com/mc/mc/language/szl/)\n" "Language: szl\n" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,526 +2893,526 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/ta.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/ta.gmo differ diff -Nru mc-4.8.25/po/ta.po mc-4.8.26/po/ta.po --- mc-4.8.25/po/ta.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/ta.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Tamil (http://www.transifex.com/mc/mc/language/ta/)\n" "Language: ta\n" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,523 +2893,523 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" -msgstr "" +msgid "&Layout..." +msgstr "&இட அமைவு..." -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." -msgstr "&இட அமைவு..." +msgid "Attributes: not supported" +msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/te.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/te.gmo differ diff -Nru mc-4.8.25/po/te.po mc-4.8.26/po/te.po --- mc-4.8.25/po/te.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/te.po 2021-01-21 17:18:34.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Telugu (http://www.transifex.com/mc/mc/language/te/)\n" "Language: te\n" @@ -1878,6 +1878,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2097,6 +2100,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2157,6 +2166,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2429,12 +2441,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2886,523 +2892,523 @@ msgid "Invalid source pattern '%s'" msgstr "" -msgid "&Chdir" +msgid "File listin&g" msgstr "" -msgid "&Again" +msgid "&Quick view" msgstr "" -msgid "Pane&lize" +msgid "&Info" msgstr "" -msgid "&View - F3" +msgid "&Tree" msgstr "" -msgid "&Edit - F4" +msgid "&Listing format..." msgstr "" -#, c-format -msgid "Found: %lu" +msgid "&Sort order..." msgstr "" -msgid "Malformed regular expression" +msgid "&Filter..." msgstr "" -msgid "File name:" +msgid "&Encoding..." msgstr "" -msgid "&Find recursively" +msgid "FT&P link..." msgstr "" -msgid "S&kip hidden" +msgid "S&hell link..." msgstr "" -msgid "Content:" +msgid "S&FTP link..." msgstr "" -msgid "Sea&rch for content" +msgid "SM&B link..." msgstr "" -msgid "Case sens&itive" +msgid "Paneli&ze" msgstr "" -msgid "A&ll charsets" +msgid "&Rescan" msgstr "" -msgid "Fir&st hit" +msgid "&View" msgstr "" -msgid "&Tree" +msgid "Vie&w file..." msgstr "" -msgid "Find File" +msgid "&Filtered view" msgstr "" -msgid "Start at:" +msgid "&Copy" msgstr "" -msgid "Ena&ble ignore directories:" +msgid "C&hmod" msgstr "" -#, c-format -msgid "Grepping in %s" +msgid "&Link" msgstr "" -msgid "Finished" +msgid "&Symlink" msgstr "" -#, c-format -msgid "Finished (ignored %zu directory)" -msgid_plural "Finished (ignored %zu directories)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Find File: \"%s\". Content: \"%s\"" +msgid "Relative symlin&k" msgstr "" -#, c-format -msgid "Find File: \"%s\"" +msgid "Edit s&ymlink" msgstr "" -msgid "Searching" +msgid "Ch&own" msgstr "" -msgid "Change &to" +msgid "&Advanced chown" msgstr "" -msgid "&Free VFSs now" +msgid "Cha&ttr" msgstr "" -msgid "&Refresh" +msgid "&Rename/Move" msgstr "" -msgid "&Add current" +msgid "&Mkdir" msgstr "" -msgid "&Up" +msgid "&Quick cd" msgstr "" -msgid "New &group" +msgid "Select &group" msgstr "" -msgid "New &entry" +msgid "U&nselect group" msgstr "" -msgid "&Insert" +msgid "&Invert selection" msgstr "" -msgid "&Remove" +msgid "E&xit" msgstr "" -msgid "Subgroup - press ENTER to see list" +msgid "&User menu" msgstr "" -msgid "Active VFS directories" +msgid "&Directory tree" msgstr "" -msgid "Directory hotlist" +msgid "&Find file" msgstr "" -msgid "Top level group" +msgid "S&wap panels" msgstr "" -msgid "Directory path" +msgid "Switch &panels on/off" msgstr "" -#, c-format -msgid "Moving %s" +msgid "&Compare directories" msgstr "" -msgid "Directory label" +msgid "C&ompare files" msgstr "" -msgid "&Append" +msgid "E&xternal panelize" msgstr "" -msgid "New hotlist entry" +msgid "Show directory s&izes" msgstr "" -msgid "Directory label:" +msgid "Command &history" msgstr "" -msgid "Directory path:" +msgid "Viewed/edited files hi&story" msgstr "" -msgid "New hotlist group" +msgid "Di&rectory hotlist" msgstr "" -msgid "Name of new group:" +msgid "&Active VFS list" msgstr "" -#, c-format -msgid "Are you sure you want to remove entry \"%s\"?" +msgid "&Background jobs" msgstr "" -#, c-format -msgid "" -"Group \"%s\" is not empty.\n" -"Remove it?" +msgid "Screen lis&t" msgstr "" -msgid "Hotlist Load" +msgid "&Undelete files (ext2fs only)" msgstr "" -#, c-format -msgid "" -"MC was unable to write %s file,\n" -"your old hotlist entries were not deleted" +msgid "&Listing format edit" msgstr "" -#, c-format -msgid "Label for \"%s\":" +msgid "Edit &extension file" msgstr "" -msgid "Add to hotlist" +msgid "Edit &menu file" msgstr "" -#, c-format -msgid "Midnight Commander %s" +msgid "Edit hi&ghlighting group file" msgstr "" -#, c-format -msgid "File: %s" +msgid "&Configuration..." msgstr "" -msgid "No node information" +msgid "&Layout..." msgstr "" -msgid "Free nodes:" +msgid "&Panel options..." msgstr "" -msgid "No space information" +msgid "C&onfirmation..." msgstr "" -#, c-format -msgid "Free space: %s/%s (%d%%)" +msgid "&Appearance..." msgstr "" -#, c-format -msgid "Type: %s" +msgid "&Display bits..." msgstr "" -msgid "non-local vfs" +msgid "&Virtual FS..." msgstr "" -#, c-format -msgid "Device: %s" +msgid "Panels:" msgstr "" #, c-format -msgid "Filesystem: %s" -msgstr "" +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" -#, c-format -msgid "Accessed: %s" +msgid "The Midnight Commander" msgstr "" -#, c-format -msgid "Modified: %s" +msgid "Do you really want to quit the Midnight Commander?" msgstr "" -#. TRANSLATORS: Time of last status change as in stat(2) man. -#, c-format -msgid "Changed: %s" +msgid "&Above" msgstr "" -#, c-format -msgid "Dev. type: major %lu, minor %lu" +msgid "&Left" msgstr "" -#, c-format -msgid "Size: %s" +msgid "&Below" msgstr "" -#, c-format -msgid " (%lu block)" -msgid_plural " (%lu blocks)" -msgstr[0] "" -msgstr[1] "" - -#, c-format -msgid "Owner: %s/%s" +msgid "&Right" msgstr "" -#, c-format -msgid "Links: %d" +msgid "ButtonBar|Menu" msgstr "" -msgid "Attributes: not supported" +msgid "ButtonBar|View" msgstr "" -#, c-format -msgid "Attributes: %s" +msgid "ButtonBar|RenMov" msgstr "" -msgid "Attributes: unavailable" +msgid "ButtonBar|Mkdir" msgstr "" -#, c-format -msgid "Mode: %s (%04o)" +msgid "&Chdir" msgstr "" -#, c-format -msgid "Location: %Xh:%Xh" +msgid "&Again" msgstr "" -msgid "&Equal split" +msgid "Pane&lize" msgstr "" -msgid "&Menubar visible" +msgid "&View - F3" msgstr "" -msgid "Command &prompt" +msgid "&Edit - F4" msgstr "" -msgid "&Keybar visible" +#, c-format +msgid "Found: %lu" msgstr "" -msgid "H&intbar visible" +msgid "Malformed regular expression" msgstr "" -msgid "&XTerm window title" +msgid "File name:" msgstr "" -msgid "&Show free space" +msgid "&Find recursively" msgstr "" -msgid "Panel split" +msgid "S&kip hidden" msgstr "" -msgid "Console output" +msgid "Content:" msgstr "" -msgid "&Vertical" +msgid "Sea&rch for content" msgstr "" -msgid "&Horizontal" +msgid "Case sens&itive" msgstr "" -msgid "Output lines:" +msgid "A&ll charsets" msgstr "" -msgid "Layout" +msgid "Fir&st hit" msgstr "" -msgid "File listin&g" +msgid "Find File" msgstr "" -msgid "&Quick view" +msgid "Start at:" msgstr "" -msgid "&Info" +msgid "Ena&ble ignore directories:" msgstr "" -msgid "&Listing format..." +#, c-format +msgid "Grepping in %s" msgstr "" -msgid "&Sort order..." +msgid "Finished" msgstr "" -msgid "&Filter..." +#, c-format +msgid "Finished (ignored %zu directory)" +msgid_plural "Finished (ignored %zu directories)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Find File: \"%s\". Content: \"%s\"" msgstr "" -msgid "&Encoding..." +#, c-format +msgid "Find File: \"%s\"" msgstr "" -msgid "FT&P link..." +msgid "Searching" msgstr "" -msgid "S&hell link..." +msgid "Change &to" msgstr "" -msgid "S&FTP link..." +msgid "&Free VFSs now" msgstr "" -msgid "SM&B link..." +msgid "&Refresh" msgstr "" -msgid "Paneli&ze" +msgid "&Add current" msgstr "" -msgid "&Rescan" +msgid "&Up" msgstr "" -msgid "&View" +msgid "New &group" msgstr "" -msgid "Vie&w file..." +msgid "New &entry" msgstr "" -msgid "&Filtered view" +msgid "&Insert" msgstr "" -msgid "&Copy" +msgid "&Remove" msgstr "" -msgid "C&hmod" +msgid "Subgroup - press ENTER to see list" msgstr "" -msgid "&Link" +msgid "Active VFS directories" msgstr "" -msgid "&Symlink" +msgid "Directory hotlist" msgstr "" -msgid "Relative symlin&k" +msgid "Top level group" msgstr "" -msgid "Edit s&ymlink" +msgid "Directory path" msgstr "" -msgid "Ch&own" +#, c-format +msgid "Moving %s" msgstr "" -msgid "&Advanced chown" +msgid "Directory label" msgstr "" -msgid "Cha&ttr" +msgid "&Append" msgstr "" -msgid "&Rename/Move" +msgid "New hotlist entry" msgstr "" -msgid "&Mkdir" +msgid "Directory label:" msgstr "" -msgid "&Quick cd" +msgid "Directory path:" msgstr "" -msgid "Select &group" +msgid "New hotlist group" msgstr "" -msgid "U&nselect group" +msgid "Name of new group:" msgstr "" -msgid "&Invert selection" +#, c-format +msgid "Are you sure you want to remove entry \"%s\"?" msgstr "" -msgid "E&xit" +#, c-format +msgid "" +"Group \"%s\" is not empty.\n" +"Remove it?" msgstr "" -msgid "&User menu" +msgid "Hotlist Load" msgstr "" -msgid "&Directory tree" +#, c-format +msgid "" +"MC was unable to write %s file,\n" +"your old hotlist entries were not deleted" msgstr "" -msgid "&Find file" +#, c-format +msgid "Label for \"%s\":" msgstr "" -msgid "S&wap panels" +msgid "Add to hotlist" msgstr "" -msgid "Switch &panels on/off" +#, c-format +msgid "Midnight Commander %s" msgstr "" -msgid "&Compare directories" +#, c-format +msgid "File: %s" msgstr "" -msgid "C&ompare files" +msgid "No node information" msgstr "" -msgid "E&xternal panelize" +msgid "Free nodes:" msgstr "" -msgid "Show directory s&izes" +msgid "No space information" msgstr "" -msgid "Command &history" +#, c-format +msgid "Free space: %s/%s (%d%%)" msgstr "" -msgid "Viewed/edited files hi&story" +#, c-format +msgid "Type: %s" msgstr "" -msgid "Di&rectory hotlist" +msgid "non-local vfs" msgstr "" -msgid "&Active VFS list" +#, c-format +msgid "Device: %s" msgstr "" -msgid "&Background jobs" +#, c-format +msgid "Filesystem: %s" msgstr "" -msgid "Screen lis&t" +#, c-format +msgid "Accessed: %s" msgstr "" -msgid "&Undelete files (ext2fs only)" +#, c-format +msgid "Modified: %s" msgstr "" -msgid "&Listing format edit" +#. TRANSLATORS: Time of last status change as in stat(2) man. +#, c-format +msgid "Changed: %s" msgstr "" -msgid "Edit &extension file" +#, c-format +msgid "Dev. type: major %lu, minor %lu" msgstr "" -msgid "Edit &menu file" +#, c-format +msgid "Size: %s" msgstr "" -msgid "Edit hi&ghlighting group file" +#, c-format +msgid " (%lu block)" +msgid_plural " (%lu blocks)" +msgstr[0] "" +msgstr[1] "" + +#, c-format +msgid "Owner: %s/%s" msgstr "" -msgid "&Configuration..." +#, c-format +msgid "Links: %d" msgstr "" -msgid "&Layout..." +msgid "Attributes: not supported" msgstr "" -msgid "&Panel options..." +#, c-format +msgid "Attributes: %s" msgstr "" -msgid "C&onfirmation..." +msgid "Attributes: unavailable" msgstr "" -msgid "&Appearance..." +#, c-format +msgid "Mode: %s (%04o)" msgstr "" -msgid "&Display bits..." +#, c-format +msgid "Location: %Xh:%Xh" msgstr "" -msgid "&Virtual FS..." +msgid "&Equal split" msgstr "" -msgid "Panels:" +msgid "&Menubar visible" msgstr "" -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" +msgid "Command &prompt" +msgstr "" -msgid "The Midnight Commander" +msgid "&Keybar visible" msgstr "" -msgid "Do you really want to quit the Midnight Commander?" +msgid "H&intbar visible" msgstr "" -msgid "&Above" +msgid "&XTerm window title" msgstr "" -msgid "&Left" +msgid "&Show free space" msgstr "" -msgid "&Below" +msgid "Panel split" msgstr "" -msgid "&Right" +msgid "Console output" msgstr "" -msgid "ButtonBar|Menu" +msgid "&Vertical" msgstr "" -msgid "ButtonBar|View" +msgid "&Horizontal" msgstr "" -msgid "ButtonBar|RenMov" +msgid "Output lines:" msgstr "" -msgid "ButtonBar|Mkdir" +msgid "Layout" msgstr "" msgid "Memory exhausted!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/tr.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/tr.gmo differ diff -Nru mc-4.8.25/po/tr.po mc-4.8.26/po/tr.po --- mc-4.8.25/po/tr.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/tr.po 2021-01-21 17:18:34.000000000 +0000 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Turkish (http://www.transifex.com/mc/mc/language/tr/)\n" "Language: tr\n" @@ -1977,6 +1977,9 @@ msgid "Skin:" msgstr "Tema" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Görünüm" @@ -2201,6 +2204,14 @@ msgid "SMB authentication" msgstr "SMB kimlik doğrulama" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +" \"%s\" dizinine geçilemedi \n" +" %s " + msgid "Secure deletion" msgstr "" @@ -2261,6 +2272,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2537,14 +2551,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Yerel dosya sistemi dışında komut çalıştırılamaz" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -" \"%s\" dizinine geçilemedi \n" -" %s " - msgid "Parameter" msgstr "Parametre" @@ -3074,6 +3080,225 @@ msgid "Invalid source pattern '%s'" msgstr "Geçersiz kaynak deseni '%s'" +msgid "File listin&g" +msgstr "Dosya listesi" + +msgid "&Quick view" +msgstr "Dosya içe&Riği" + +msgid "&Info" +msgstr "&Bilgi kipi" + +msgid "&Tree" +msgstr "&Ağaç" + +msgid "&Listing format..." +msgstr "&Listeleme biçimi..." + +msgid "&Sort order..." +msgstr "&Sıralama türü..." + +msgid "&Filter..." +msgstr "&Süzgeç..." + +msgid "&Encoding..." +msgstr "Kodlama..." + +msgid "FT&P link..." +msgstr "FT&P bağı..." + +msgid "S&hell link..." +msgstr "&SSH bağı..." + +msgid "S&FTP link..." +msgstr "FT&P bağı..." + +msgid "SM&B link..." +msgstr "S&MB bağı..." + +msgid "Paneli&ze" +msgstr "Pane&lle" + +msgid "&Rescan" +msgstr "&Tazele" + +msgid "&View" +msgstr "&Görünüm" + +msgid "Vie&w file..." +msgstr "Bir dos&ya göster... " + +msgid "&Filtered view" +msgstr "&Görünüm Süzgeci" + +msgid "&Copy" +msgstr "&Kopyala" + +msgid "C&hmod" +msgstr "Dosya ki&Pini değiştir" + +msgid "&Link" +msgstr "&bağlantı" + +msgid "&Symlink" +msgstr "&Sembolik bağ" + +msgid "Relative symlin&k" +msgstr "İlgili sembolik bağ" + +msgid "Edit s&ymlink" +msgstr "Sembolik bağı düzenle" + +msgid "Ch&own" +msgstr "Sa&hip/Grup değiştir" + +msgid "&Advanced chown" +msgstr "&Dosya Özelliklerini Değiştir " + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "Taşıma / &Ad Değiştirme F6" + +msgid "&Mkdir" +msgstr "&DizinAç" + +msgid "&Quick cd" +msgstr "&Çabuk dizin değiştirme" + +msgid "Select &group" +msgstr "Bl&ok Seçimi M" + +msgid "U&nselect group" +msgstr "Blok seçimi&ni kaldır" + +msgid "&Invert selection" +msgstr "&Seçimi tersine çevir" + +msgid "E&xit" +msgstr "Çıkış" + +msgid "&User menu" +msgstr "&Kullanıcı menüsü" + +msgid "&Directory tree" +msgstr "&Dizin ağacı" + +msgid "&Find file" +msgstr "&Dosyayı bul" + +msgid "S&wap panels" +msgstr "Panelleri yer &değiştir C-u" + +msgid "Switch &panels on/off" +msgstr "&Panelleri kapat/aç" + +msgid "&Compare directories" +msgstr "&Dizinleri karşılaştır" + +msgid "C&ompare files" +msgstr "Dizinleri karşılaştır" + +msgid "E&xternal panelize" +msgstr "Dış panelleme" + +msgid "Show directory s&izes" +msgstr "diz&in boyutlarını göster" + +msgid "Command &history" +msgstr "Komut Geçmişi" + +msgid "Viewed/edited files hi&story" +msgstr "Görüntülenen/düzenlenen dosya &geçmişi" + +msgid "Di&rectory hotlist" +msgstr "Dizin listesi" + +msgid "&Active VFS list" +msgstr "Etkin &VFS listesi" + +msgid "&Background jobs" +msgstr "&Artalan İşleri" + +msgid "Screen lis&t" +msgstr "Ekran listes&i" + +msgid "&Undelete files (ext2fs only)" +msgstr "Dosyaları k&urtar (sadece ext2fs)" + +msgid "&Listing format edit" +msgstr "&Listeleme biçimini düzenle" + +msgid "Edit &extension file" +msgstr "Dosya &Uzantılarını düzenle" + +msgid "Edit &menu file" +msgstr "Men&ü dosyasını düzenle" + +msgid "Edit hi&ghlighting group file" +msgstr "Vur&gulu grup dosyalarını düzenle" + +msgid "&Configuration..." +msgstr "&Yapılandırma..." + +msgid "&Layout..." +msgstr "&Yerleşim... " + +msgid "&Panel options..." +msgstr "&Panel seçenekleri..." + +msgid "C&onfirmation..." +msgstr "Onaylama..." + +msgid "&Appearance..." +msgstr "&Görünüm..." + +msgid "&Display bits..." +msgstr "Bit &gösterimi..." + +msgid "&Virtual FS..." +msgstr "&Sanal Dosya Sistemi..." + +msgid "Panels:" +msgstr "Paneller:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Midnight Commander'dan gerçekten çıkmak istiyor musunuz?" + +msgid "&Above" +msgstr "&Üst" + +msgid "&Left" +msgstr "&Sol" + +msgid "&Below" +msgstr "&Alt" + +msgid "&Right" +msgstr "&Sağ" + +msgid "ButtonBar|Menu" +msgstr "Düğme Çubuğu|Menü" + +msgid "ButtonBar|View" +msgstr "Düğme Çubuğu|Görünüm" + +msgid "ButtonBar|RenMov" +msgstr "Düğme Çubuğu|Taşı" + +msgid "ButtonBar|Mkdir" +msgstr "Düğme Çubuğu|Dizin Aç" + msgid "&Chdir" msgstr "Di&zin değiştir" @@ -3120,9 +3345,6 @@ msgid "Fir&st hit" msgstr "İ&lk vuruş" -msgid "&Tree" -msgstr "&Ağaç" - msgid "Find File" msgstr "Dosyayı bul" @@ -3381,222 +3603,6 @@ msgid "Layout" msgstr "Yerleşim" -msgid "File listin&g" -msgstr "Dosya listesi" - -msgid "&Quick view" -msgstr "Dosya içe&Riği" - -msgid "&Info" -msgstr "&Bilgi kipi" - -msgid "&Listing format..." -msgstr "&Listeleme biçimi..." - -msgid "&Sort order..." -msgstr "&Sıralama türü..." - -msgid "&Filter..." -msgstr "&Süzgeç..." - -msgid "&Encoding..." -msgstr "Kodlama..." - -msgid "FT&P link..." -msgstr "FT&P bağı..." - -msgid "S&hell link..." -msgstr "&SSH bağı..." - -msgid "S&FTP link..." -msgstr "FT&P bağı..." - -msgid "SM&B link..." -msgstr "S&MB bağı..." - -msgid "Paneli&ze" -msgstr "Pane&lle" - -msgid "&Rescan" -msgstr "&Tazele" - -msgid "&View" -msgstr "&Görünüm" - -msgid "Vie&w file..." -msgstr "Bir dos&ya göster... " - -msgid "&Filtered view" -msgstr "&Görünüm Süzgeci" - -msgid "&Copy" -msgstr "&Kopyala" - -msgid "C&hmod" -msgstr "Dosya ki&Pini değiştir" - -msgid "&Link" -msgstr "&bağlantı" - -msgid "&Symlink" -msgstr "&Sembolik bağ" - -msgid "Relative symlin&k" -msgstr "İlgili sembolik bağ" - -msgid "Edit s&ymlink" -msgstr "Sembolik bağı düzenle" - -msgid "Ch&own" -msgstr "Sa&hip/Grup değiştir" - -msgid "&Advanced chown" -msgstr "&Dosya Özelliklerini Değiştir " - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "Taşıma / &Ad Değiştirme F6" - -msgid "&Mkdir" -msgstr "&DizinAç" - -msgid "&Quick cd" -msgstr "&Çabuk dizin değiştirme" - -msgid "Select &group" -msgstr "Bl&ok Seçimi M" - -msgid "U&nselect group" -msgstr "Blok seçimi&ni kaldır" - -msgid "&Invert selection" -msgstr "&Seçimi tersine çevir" - -msgid "E&xit" -msgstr "Çıkış" - -msgid "&User menu" -msgstr "&Kullanıcı menüsü" - -msgid "&Directory tree" -msgstr "&Dizin ağacı" - -msgid "&Find file" -msgstr "&Dosyayı bul" - -msgid "S&wap panels" -msgstr "Panelleri yer &değiştir C-u" - -msgid "Switch &panels on/off" -msgstr "&Panelleri kapat/aç" - -msgid "&Compare directories" -msgstr "&Dizinleri karşılaştır" - -msgid "C&ompare files" -msgstr "Dizinleri karşılaştır" - -msgid "E&xternal panelize" -msgstr "Dış panelleme" - -msgid "Show directory s&izes" -msgstr "diz&in boyutlarını göster" - -msgid "Command &history" -msgstr "Komut Geçmişi" - -msgid "Viewed/edited files hi&story" -msgstr "Görüntülenen/düzenlenen dosya &geçmişi" - -msgid "Di&rectory hotlist" -msgstr "Dizin listesi" - -msgid "&Active VFS list" -msgstr "Etkin &VFS listesi" - -msgid "&Background jobs" -msgstr "&Artalan İşleri" - -msgid "Screen lis&t" -msgstr "Ekran listes&i" - -msgid "&Undelete files (ext2fs only)" -msgstr "Dosyaları k&urtar (sadece ext2fs)" - -msgid "&Listing format edit" -msgstr "&Listeleme biçimini düzenle" - -msgid "Edit &extension file" -msgstr "Dosya &Uzantılarını düzenle" - -msgid "Edit &menu file" -msgstr "Men&ü dosyasını düzenle" - -msgid "Edit hi&ghlighting group file" -msgstr "Vur&gulu grup dosyalarını düzenle" - -msgid "&Configuration..." -msgstr "&Yapılandırma..." - -msgid "&Layout..." -msgstr "&Yerleşim... " - -msgid "&Panel options..." -msgstr "&Panel seçenekleri..." - -msgid "C&onfirmation..." -msgstr "Onaylama..." - -msgid "&Appearance..." -msgstr "&Görünüm..." - -msgid "&Display bits..." -msgstr "Bit &gösterimi..." - -msgid "&Virtual FS..." -msgstr "&Sanal Dosya Sistemi..." - -msgid "Panels:" -msgstr "Paneller:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Midnight Commander'dan gerçekten çıkmak istiyor musunuz?" - -msgid "&Above" -msgstr "&Üst" - -msgid "&Left" -msgstr "&Sol" - -msgid "&Below" -msgstr "&Alt" - -msgid "&Right" -msgstr "&Sağ" - -msgid "ButtonBar|Menu" -msgstr "Düğme Çubuğu|Menü" - -msgid "ButtonBar|View" -msgstr "Düğme Çubuğu|Görünüm" - -msgid "ButtonBar|RenMov" -msgstr "Düğme Çubuğu|Taşı" - -msgid "ButtonBar|Mkdir" -msgstr "Düğme Çubuğu|Dizin Aç" - msgid "Memory exhausted!" msgstr "Bellek tükendi!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/uk.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/uk.gmo differ diff -Nru mc-4.8.25/po/uk.po mc-4.8.26/po/uk.po --- mc-4.8.25/po/uk.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/uk.po 2021-01-21 17:18:34.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Ukrainian (http://www.transifex.com/mc/mc/language/uk/)\n" "Language: uk\n" @@ -1984,6 +1984,9 @@ msgid "Skin:" msgstr "Шкіра:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "Вигляд" @@ -2206,6 +2209,14 @@ msgid "SMB authentication" msgstr "SMB(самба) автентифікація" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"Не вдалося змінити каталог на «%s»\n" +"%s " + msgid "Secure deletion" msgstr "" @@ -2266,6 +2277,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2542,14 +2556,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "Не можна виконувати команди на нелокальних файлових системах" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"Не вдалося змінити каталог на «%s»\n" -"%s " - msgid "Parameter" msgstr "Параметр" @@ -3082,6 +3088,227 @@ msgid "Invalid source pattern '%s'" msgstr "Неправильний шаблон джерела «%s»" +msgid "File listin&g" +msgstr "Список &файлів" + +msgid "&Quick view" +msgstr "&Швидкий перегляд" + +msgid "&Info" +msgstr "&Відомості" + +msgid "&Tree" +msgstr "Д&eрево" + +msgid "&Listing format..." +msgstr "&Формат списку" + +msgid "&Sort order..." +msgstr "Порядок &сортування…" + +msgid "&Filter..." +msgstr "&Фільтр…" + +msgid "&Encoding..." +msgstr "Кодування…" + +msgid "FT&P link..." +msgstr "&FTP-з’єднання…" + +msgid "S&hell link..." +msgstr "&Shell-з’єднання…" + +msgid "S&FTP link..." +msgstr "S&FTP-з’єднання…" + +msgid "SM&B link..." +msgstr "&SMB-з’єднання…" + +msgid "Paneli&ze" +msgstr "Панелі&зувати" + +msgid "&Rescan" +msgstr "&Пересканувати" + +msgid "&View" +msgstr "П&ереглянути" + +msgid "Vie&w file..." +msgstr "Пе&регляд файлу…" + +msgid "&Filtered view" +msgstr "Фі&льтрований перегляд" + +msgid "&Copy" +msgstr "Ско&піювати" + +msgid "C&hmod" +msgstr "З&міна прав" + +msgid "&Link" +msgstr "&Посилання" + +msgid "&Symlink" +msgstr "&Символьне посилання" + +msgid "Relative symlin&k" +msgstr "Від&носне символьне посилання" + +msgid "Edit s&ymlink" +msgstr "Ред&агувати символьне посилання" + +msgid "Ch&own" +msgstr "Змі&на власника" + +msgid "&Advanced chown" +msgstr "Пр&ава (розширені) " + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "&Перейменувати/перемістити" + +msgid "&Mkdir" +msgstr "&Створити каталог" + +msgid "&Quick cd" +msgstr "&Швидка зміна каталогу" + +msgid "Select &group" +msgstr "Обрати гр&yпу" + +msgid "U&nselect group" +msgstr "Зн&яти відмітку з групи" + +msgid "&Invert selection" +msgstr "&Інвертувати виділення" + +msgid "E&xit" +msgstr "Ви&хід" + +msgid "&User menu" +msgstr "&Меню користувача" + +msgid "&Directory tree" +msgstr "&Дерево каталогів" + +msgid "&Find file" +msgstr "&Знайти файл" + +msgid "S&wap panels" +msgstr "Пе&реставити панелі" + +msgid "Switch &panels on/off" +msgstr "&Сховати/показати панелі" + +msgid "&Compare directories" +msgstr "П&орівняти каталоги" + +msgid "C&ompare files" +msgstr "П&орівняти файли" + +msgid "E&xternal panelize" +msgstr "Зовн&ішня панелізація" + +msgid "Show directory s&izes" +msgstr "Показати &розміри каталогів" + +msgid "Command &history" +msgstr "&Історія команд" + +msgid "Viewed/edited files hi&story" +msgstr "І&сторія читання/редагування файлів" + +msgid "Di&rectory hotlist" +msgstr "&Гарячий список каталогів" + +msgid "&Active VFS list" +msgstr "Список &активних VFS" + +msgid "&Background jobs" +msgstr "Фонові завдання" + +msgid "Screen lis&t" +msgstr "Список екранів" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Відновлення файлів (лише ext2fs)" + +msgid "&Listing format edit" +msgstr "&Редагування формату списку" + +msgid "Edit &extension file" +msgstr "Редагувати файл роз&ширень" + +msgid "Edit &menu file" +msgstr "Редагувати файл &меню" + +msgid "Edit hi&ghlighting group file" +msgstr "Редагувати файл підсвітки груп" + +msgid "&Configuration..." +msgstr "&Конфігурація…" + +msgid "&Layout..." +msgstr "&Зовнішній вигляд…" + +msgid "&Panel options..." +msgstr "Параметри панелі…" + +msgid "C&onfirmation..." +msgstr "&Підтвердження…" + +msgid "&Appearance..." +msgstr "&Вигляд..." + +msgid "&Display bits..." +msgstr "&Відображення символів…" + +msgid "&Virtual FS..." +msgstr "Віртуальні &ФС…" + +msgid "Panels:" +msgstr "Панелі:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "Відкрито %zu екран. Все одно вийти?" +msgstr[1] "Відкрито %zu екрани. Все одно вийти?" +msgstr[2] "Відкрито %zu екранів. Все одно вийти?" +msgstr[3] "Відкрито %zu екранів. Все одно вийти?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "Справді вийти з Midnight Commander?" + +msgid "&Above" +msgstr "Верхня" + +msgid "&Left" +msgstr "&Ліва панель " + +msgid "&Below" +msgstr "Нижня" + +msgid "&Right" +msgstr "&Права панель " + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|Меню" + +msgid "ButtonBar|View" +msgstr "ButtonBar|Перегляд" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|Переміст." + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|СтвКат" + msgid "&Chdir" msgstr "Пере&хід" @@ -3128,9 +3355,6 @@ msgid "Fir&st hit" msgstr "Пер&ший збіг" -msgid "&Tree" -msgstr "Д&eрево" - msgid "Find File" msgstr "Знайти файл" @@ -3393,224 +3617,6 @@ msgid "Layout" msgstr "Зовнішній вигляд" -msgid "File listin&g" -msgstr "Список &файлів" - -msgid "&Quick view" -msgstr "&Швидкий перегляд" - -msgid "&Info" -msgstr "&Відомості" - -msgid "&Listing format..." -msgstr "&Формат списку" - -msgid "&Sort order..." -msgstr "Порядок &сортування…" - -msgid "&Filter..." -msgstr "&Фільтр…" - -msgid "&Encoding..." -msgstr "Кодування…" - -msgid "FT&P link..." -msgstr "&FTP-з’єднання…" - -msgid "S&hell link..." -msgstr "&Shell-з’єднання…" - -msgid "S&FTP link..." -msgstr "S&FTP-з’єднання…" - -msgid "SM&B link..." -msgstr "&SMB-з’єднання…" - -msgid "Paneli&ze" -msgstr "Панелі&зувати" - -msgid "&Rescan" -msgstr "&Пересканувати" - -msgid "&View" -msgstr "П&ереглянути" - -msgid "Vie&w file..." -msgstr "Пе&регляд файлу…" - -msgid "&Filtered view" -msgstr "Фі&льтрований перегляд" - -msgid "&Copy" -msgstr "Ско&піювати" - -msgid "C&hmod" -msgstr "З&міна прав" - -msgid "&Link" -msgstr "&Посилання" - -msgid "&Symlink" -msgstr "&Символьне посилання" - -msgid "Relative symlin&k" -msgstr "Від&носне символьне посилання" - -msgid "Edit s&ymlink" -msgstr "Ред&агувати символьне посилання" - -msgid "Ch&own" -msgstr "Змі&на власника" - -msgid "&Advanced chown" -msgstr "Пр&ава (розширені) " - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "&Перейменувати/перемістити" - -msgid "&Mkdir" -msgstr "&Створити каталог" - -msgid "&Quick cd" -msgstr "&Швидка зміна каталогу" - -msgid "Select &group" -msgstr "Обрати гр&yпу" - -msgid "U&nselect group" -msgstr "Зн&яти відмітку з групи" - -msgid "&Invert selection" -msgstr "&Інвертувати виділення" - -msgid "E&xit" -msgstr "Ви&хід" - -msgid "&User menu" -msgstr "&Меню користувача" - -msgid "&Directory tree" -msgstr "&Дерево каталогів" - -msgid "&Find file" -msgstr "&Знайти файл" - -msgid "S&wap panels" -msgstr "Пе&реставити панелі" - -msgid "Switch &panels on/off" -msgstr "&Сховати/показати панелі" - -msgid "&Compare directories" -msgstr "П&орівняти каталоги" - -msgid "C&ompare files" -msgstr "П&орівняти файли" - -msgid "E&xternal panelize" -msgstr "Зовн&ішня панелізація" - -msgid "Show directory s&izes" -msgstr "Показати &розміри каталогів" - -msgid "Command &history" -msgstr "&Історія команд" - -msgid "Viewed/edited files hi&story" -msgstr "І&сторія читання/редагування файлів" - -msgid "Di&rectory hotlist" -msgstr "&Гарячий список каталогів" - -msgid "&Active VFS list" -msgstr "Список &активних VFS" - -msgid "&Background jobs" -msgstr "Фонові завдання" - -msgid "Screen lis&t" -msgstr "Список екранів" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Відновлення файлів (лише ext2fs)" - -msgid "&Listing format edit" -msgstr "&Редагування формату списку" - -msgid "Edit &extension file" -msgstr "Редагувати файл роз&ширень" - -msgid "Edit &menu file" -msgstr "Редагувати файл &меню" - -msgid "Edit hi&ghlighting group file" -msgstr "Редагувати файл підсвітки груп" - -msgid "&Configuration..." -msgstr "&Конфігурація…" - -msgid "&Layout..." -msgstr "&Зовнішній вигляд…" - -msgid "&Panel options..." -msgstr "Параметри панелі…" - -msgid "C&onfirmation..." -msgstr "&Підтвердження…" - -msgid "&Appearance..." -msgstr "&Вигляд..." - -msgid "&Display bits..." -msgstr "&Відображення символів…" - -msgid "&Virtual FS..." -msgstr "Віртуальні &ФС…" - -msgid "Panels:" -msgstr "Панелі:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "Відкрито %zu екран. Все одно вийти?" -msgstr[1] "Відкрито %zu екрани. Все одно вийти?" -msgstr[2] "Відкрито %zu екранів. Все одно вийти?" -msgstr[3] "Відкрито %zu екранів. Все одно вийти?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "Справді вийти з Midnight Commander?" - -msgid "&Above" -msgstr "Верхня" - -msgid "&Left" -msgstr "&Ліва панель " - -msgid "&Below" -msgstr "Нижня" - -msgid "&Right" -msgstr "&Права панель " - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|Меню" - -msgid "ButtonBar|View" -msgstr "ButtonBar|Перегляд" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|Переміст." - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|СтвКат" - msgid "Memory exhausted!" msgstr "Не вистачає пам’яті." Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/vi.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/vi.gmo differ diff -Nru mc-4.8.25/po/vi.po mc-4.8.26/po/vi.po --- mc-4.8.25/po/vi.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/vi.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Vietnamese (http://www.transifex.com/mc/mc/language/vi/)\n" "Language: vi\n" @@ -1881,6 +1881,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2100,6 +2103,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2160,6 +2169,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2432,12 +2444,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2889,6 +2895,224 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "&Cây thư mục" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "t&Hứ tự sắp xếp..." + +msgid "&Filter..." +msgstr "&Lọc tập tin..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "kết nối &FTP..." + +msgid "S&hell link..." +msgstr "kết nối &Shell..." + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "kết nối SM&B..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "cây thư &Mục" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "&Phục hồi tập tin đã xóa (chỉ ext2fs)" + +msgid "&Listing format edit" +msgstr "&Soạn thảo định dạng danh sách" + +msgid "Edit &extension file" +msgstr "soạn thảo tập tin phần mở &Rộng" + +msgid "Edit &menu file" +msgstr "soạ&N thảo tập tin trình đơn" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Cấu hình..." + +msgid "&Layout..." +msgstr "&Vẻ ngoài..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "bit &Hiển thị..." + +msgid "&Virtual FS..." +msgstr "&FS ảo..." + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "Xem" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "&Chuyển thư mục" @@ -2935,9 +3159,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "&Cây thư mục" - msgid "Find File" msgstr "Tìm tập tin" @@ -3190,221 +3411,6 @@ msgid "Layout" msgstr "Vẻ ngoài" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "t&Hứ tự sắp xếp..." - -msgid "&Filter..." -msgstr "&Lọc tập tin..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "kết nối &FTP..." - -msgid "S&hell link..." -msgstr "kết nối &Shell..." - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "kết nối SM&B..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "cây thư &Mục" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "&Phục hồi tập tin đã xóa (chỉ ext2fs)" - -msgid "&Listing format edit" -msgstr "&Soạn thảo định dạng danh sách" - -msgid "Edit &extension file" -msgstr "soạn thảo tập tin phần mở &Rộng" - -msgid "Edit &menu file" -msgstr "soạ&N thảo tập tin trình đơn" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Cấu hình..." - -msgid "&Layout..." -msgstr "&Vẻ ngoài..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "bit &Hiển thị..." - -msgid "&Virtual FS..." -msgstr "&FS ảo..." - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "Xem" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/wa.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/wa.gmo differ diff -Nru mc-4.8.25/po/wa.po mc-4.8.26/po/wa.po --- mc-4.8.25/po/wa.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/wa.po 2021-01-21 17:18:34.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Walloon (http://www.transifex.com/mc/mc/language/wa/)\n" "Language: wa\n" @@ -1879,6 +1879,9 @@ msgid "Skin:" msgstr "" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2098,6 +2101,12 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" + msgid "Secure deletion" msgstr "" @@ -2158,6 +2167,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2430,12 +2442,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" - msgid "Parameter" msgstr "" @@ -2887,6 +2893,225 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "" + +msgid "&Quick view" +msgstr "" + +msgid "&Info" +msgstr "" + +msgid "&Tree" +msgstr "Å&be" + +msgid "&Listing format..." +msgstr "" + +msgid "&Sort order..." +msgstr "Ôrde po &Relire..." + +msgid "&Filter..." +msgstr "&Passete..." + +msgid "&Encoding..." +msgstr "" + +msgid "FT&P link..." +msgstr "Loyén &FTP..." + +msgid "S&hell link..." +msgstr "" + +msgid "S&FTP link..." +msgstr "" + +msgid "SM&B link..." +msgstr "Loyén SM&B..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "" + +msgid "&View" +msgstr "" + +msgid "Vie&w file..." +msgstr "" + +msgid "&Filtered view" +msgstr "" + +msgid "&Copy" +msgstr "" + +msgid "C&hmod" +msgstr "" + +msgid "&Link" +msgstr "" + +msgid "&Symlink" +msgstr "" + +msgid "Relative symlin&k" +msgstr "" + +msgid "Edit s&ymlink" +msgstr "" + +msgid "Ch&own" +msgstr "" + +msgid "&Advanced chown" +msgstr "" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "" + +msgid "&Mkdir" +msgstr "" + +msgid "&Quick cd" +msgstr "" + +msgid "Select &group" +msgstr "" + +msgid "U&nselect group" +msgstr "" + +msgid "&Invert selection" +msgstr "" + +msgid "E&xit" +msgstr "" + +msgid "&User menu" +msgstr "" + +msgid "&Directory tree" +msgstr "&Brantches do ridant" + +msgid "&Find file" +msgstr "" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "" + +msgid "&Active VFS list" +msgstr "" + +msgid "&Background jobs" +msgstr "" + +msgid "Screen lis&t" +msgstr "" + +msgid "&Undelete files (ext2fs only)" +msgstr "Disra&Facer des fitchîs (seulmint ext2fs)" + +msgid "&Listing format edit" +msgstr "" + +msgid "Edit &extension file" +msgstr "" + +msgid "Edit &menu file" +msgstr "" + +msgid "Edit hi&ghlighting group file" +msgstr "" + +msgid "&Configuration..." +msgstr "&Apontiaedje..." + +msgid "&Layout..." +msgstr "arindj&mint del pådje..." + +msgid "&Panel options..." +msgstr "" + +msgid "C&onfirmation..." +msgstr "" + +msgid "&Appearance..." +msgstr "" + +msgid "&Display bits..." +msgstr "" + +msgid "&Virtual FS..." +msgstr "" + +msgid "Panels:" +msgstr "" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" +msgstr[1] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "" + +msgid "&Left" +msgstr "" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "" + +msgid "ButtonBar|Menu" +msgstr "" + +msgid "ButtonBar|View" +msgstr "" + +msgid "ButtonBar|RenMov" +msgstr "" + +msgid "ButtonBar|Mkdir" +msgstr "" + msgid "&Chdir" msgstr "&Chdir" @@ -2933,9 +3158,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "Å&be" - msgid "Find File" msgstr "Trover Fitchî" @@ -3190,222 +3412,6 @@ msgid "Layout" msgstr "Adjinçmint" -msgid "File listin&g" -msgstr "" - -msgid "&Quick view" -msgstr "" - -msgid "&Info" -msgstr "" - -msgid "&Listing format..." -msgstr "" - -msgid "&Sort order..." -msgstr "Ôrde po &Relire..." - -msgid "&Filter..." -msgstr "&Passete..." - -msgid "&Encoding..." -msgstr "" - -msgid "FT&P link..." -msgstr "Loyén &FTP..." - -msgid "S&hell link..." -msgstr "" - -msgid "S&FTP link..." -msgstr "" - -msgid "SM&B link..." -msgstr "Loyén SM&B..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "" - -msgid "&View" -msgstr "" - -msgid "Vie&w file..." -msgstr "" - -msgid "&Filtered view" -msgstr "" - -msgid "&Copy" -msgstr "" - -msgid "C&hmod" -msgstr "" - -msgid "&Link" -msgstr "" - -msgid "&Symlink" -msgstr "" - -msgid "Relative symlin&k" -msgstr "" - -msgid "Edit s&ymlink" -msgstr "" - -msgid "Ch&own" -msgstr "" - -msgid "&Advanced chown" -msgstr "" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "" - -msgid "&Mkdir" -msgstr "" - -msgid "&Quick cd" -msgstr "" - -msgid "Select &group" -msgstr "" - -msgid "U&nselect group" -msgstr "" - -msgid "&Invert selection" -msgstr "" - -msgid "E&xit" -msgstr "" - -msgid "&User menu" -msgstr "" - -msgid "&Directory tree" -msgstr "&Brantches do ridant" - -msgid "&Find file" -msgstr "" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "" - -msgid "&Active VFS list" -msgstr "" - -msgid "&Background jobs" -msgstr "" - -msgid "Screen lis&t" -msgstr "" - -msgid "&Undelete files (ext2fs only)" -msgstr "Disra&Facer des fitchîs (seulmint ext2fs)" - -msgid "&Listing format edit" -msgstr "" - -msgid "Edit &extension file" -msgstr "" - -msgid "Edit &menu file" -msgstr "" - -msgid "Edit hi&ghlighting group file" -msgstr "" - -msgid "&Configuration..." -msgstr "&Apontiaedje..." - -msgid "&Layout..." -msgstr "arindj&mint del pådje..." - -msgid "&Panel options..." -msgstr "" - -msgid "C&onfirmation..." -msgstr "" - -msgid "&Appearance..." -msgstr "" - -msgid "&Display bits..." -msgstr "" - -msgid "&Virtual FS..." -msgstr "" - -msgid "Panels:" -msgstr "" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" -msgstr[1] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "" - -msgid "&Left" -msgstr "" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "" - -msgid "ButtonBar|Menu" -msgstr "" - -msgid "ButtonBar|View" -msgstr "" - -msgid "ButtonBar|RenMov" -msgstr "" - -msgid "ButtonBar|Mkdir" -msgstr "" - msgid "Memory exhausted!" msgstr "" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/zh_CN.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/zh_CN.gmo differ diff -Nru mc-4.8.25/po/zh_CN.po mc-4.8.26/po/zh_CN.po --- mc-4.8.25/po/zh_CN.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/zh_CN.po 2021-01-21 17:18:34.000000000 +0000 @@ -6,7 +6,7 @@ # Jacques Yip , 2017 # Jake Li , 2012 # Kenneth Cheung , 2018 -# shuyu liu , 2016,2019 +# liushuyu011 , 2016,2019 # Mingcong Bai , 2016,2018 # qingxianhao , 2012 # qingxianhao , 2012 @@ -17,8 +17,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Chinese (China) (http://www.transifex.com/mc/mc/language/" "zh_CN/)\n" @@ -1978,6 +1978,9 @@ msgid "Skin:" msgstr "皮肤:" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "外观" @@ -2200,6 +2203,14 @@ msgid "SMB authentication" msgstr "SMB 认证" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"无法进入目录“%s”\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2260,6 +2271,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2536,14 +2550,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "您无法在非本地文件系统上执行命令" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"无法进入目录“%s”\n" -"%s" - msgid "Parameter" msgstr "参数" @@ -3075,6 +3081,224 @@ msgid "Invalid source pattern '%s'" msgstr "源模式“%s”无效" +msgid "File listin&g" +msgstr "完整文件列表(&G)" + +msgid "&Quick view" +msgstr "快速查看(&Q)" + +msgid "&Info" +msgstr "信息(&I)" + +msgid "&Tree" +msgstr "树(&T)" + +msgid "&Listing format..." +msgstr "列表格式(&L)…" + +msgid "&Sort order..." +msgstr "排序(&S)..." + +msgid "&Filter..." +msgstr "过滤(&F)..." + +msgid "&Encoding..." +msgstr "编码(&E)..." + +msgid "FT&P link..." +msgstr "FTP 链接(&P)..." + +msgid "S&hell link..." +msgstr "S&hell 链接..." + +msgid "S&FTP link..." +msgstr "SFTP 链接(&S)..." + +msgid "SM&B link..." +msgstr "SMB 链接(&B)..." + +msgid "Paneli&ze" +msgstr "面板化(&Z)" + +msgid "&Rescan" +msgstr "重新扫描(&R)" + +msgid "&View" +msgstr "查看(&V)" + +msgid "Vie&w file..." +msgstr "查看文件(&W)..." + +msgid "&Filtered view" +msgstr "过滤视图(&F)" + +msgid "&Copy" +msgstr "复制(&C)" + +msgid "C&hmod" +msgstr "更改文件权限(&H)" + +msgid "&Link" +msgstr "链接(&L)" + +msgid "&Symlink" +msgstr "符号链接(&S)" + +msgid "Relative symlin&k" +msgstr "相关符号链接(&K)" + +msgid "Edit s&ymlink" +msgstr "编辑符号链接(&Y)" + +msgid "Ch&own" +msgstr "更改文件所有者(&O)" + +msgid "&Advanced chown" +msgstr "高级 chown (&A)" + +msgid "Cha&ttr" +msgstr "" + +msgid "&Rename/Move" +msgstr "更名/移动(&R)" + +msgid "&Mkdir" +msgstr "建目录(&M)" + +msgid "&Quick cd" +msgstr "快速切换目录(&Q)" + +msgid "Select &group" +msgstr "选择群组(&G)" + +msgid "U&nselect group" +msgstr "取消选择组(&U)" + +msgid "&Invert selection" +msgstr "反选(&I)" + +msgid "E&xit" +msgstr "退出(&X)" + +msgid "&User menu" +msgstr "用户菜单(&U)" + +msgid "&Directory tree" +msgstr "目录树(&D)" + +msgid "&Find file" +msgstr "查找文件(&F)" + +msgid "S&wap panels" +msgstr "交换面板(&W)" + +msgid "Switch &panels on/off" +msgstr "切换面板开/关(&P)" + +msgid "&Compare directories" +msgstr "比较目录(&C)" + +msgid "C&ompare files" +msgstr "比较文件(&O)" + +msgid "E&xternal panelize" +msgstr "外部面板(&X)" + +msgid "Show directory s&izes" +msgstr "显示目录大小(&I)" + +msgid "Command &history" +msgstr "命令历史(&H)" + +msgid "Viewed/edited files hi&story" +msgstr "" + +msgid "Di&rectory hotlist" +msgstr "目录活动列表(&R)" + +msgid "&Active VFS list" +msgstr "活动的 VFS 列表(&A)" + +msgid "&Background jobs" +msgstr "后台任务(&B)" + +msgid "Screen lis&t" +msgstr "屏幕列表(&T)" + +msgid "&Undelete files (ext2fs only)" +msgstr "反删除文件(仅限 ext2fs)(&U)" + +msgid "&Listing format edit" +msgstr "列表格式编辑(&L)" + +msgid "Edit &extension file" +msgstr "扩展文件编辑(&E)" + +msgid "Edit &menu file" +msgstr "菜单文件编辑(&M)" + +msgid "Edit hi&ghlighting group file" +msgstr "编辑突出显示组文件(&G)" + +msgid "&Configuration..." +msgstr "配置(&C)..." + +msgid "&Layout..." +msgstr "布局(&L)..." + +msgid "&Panel options..." +msgstr "面板选项(&P)..." + +msgid "C&onfirmation..." +msgstr "确认(&O)..." + +msgid "&Appearance..." +msgstr "外观(&A)..." + +msgid "&Display bits..." +msgstr "显示位(&D)..." + +msgid "&Virtual FS..." +msgstr "虚拟文件系统(&V)..." + +msgid "Panels:" +msgstr "面板: " + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "您打开了 %zu 个屏幕。确定要退出吗?" + +msgid "The Midnight Commander" +msgstr "Midnight Commander" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "您真的要退出 Midnight Commander吗?" + +msgid "&Above" +msgstr "上(&A)" + +msgid "&Left" +msgstr "左(&L)" + +msgid "&Below" +msgstr "下(&B)" + +msgid "&Right" +msgstr "右(&R)" + +msgid "ButtonBar|Menu" +msgstr "ButtonBar|目录" + +msgid "ButtonBar|View" +msgstr "ButtonBar|显示" + +msgid "ButtonBar|RenMov" +msgstr "ButtonBar|更名或移动" + +msgid "ButtonBar|Mkdir" +msgstr "ButtonBar|建目录" + msgid "&Chdir" msgstr "改目录(&C)" @@ -3121,9 +3345,6 @@ msgid "Fir&st hit" msgstr "第一个命中(&S)" -msgid "&Tree" -msgstr "树(&T)" - msgid "Find File" msgstr "搜索文件" @@ -3380,221 +3601,6 @@ msgid "Layout" msgstr "布局" -msgid "File listin&g" -msgstr "完整文件列表(&G)" - -msgid "&Quick view" -msgstr "快速查看(&Q)" - -msgid "&Info" -msgstr "信息(&I)" - -msgid "&Listing format..." -msgstr "列表格式(&L)…" - -msgid "&Sort order..." -msgstr "排序(&S)..." - -msgid "&Filter..." -msgstr "过滤(&F)..." - -msgid "&Encoding..." -msgstr "编码(&E)..." - -msgid "FT&P link..." -msgstr "FTP 链接(&P)..." - -msgid "S&hell link..." -msgstr "S&hell 链接..." - -msgid "S&FTP link..." -msgstr "SFTP 链接(&S)..." - -msgid "SM&B link..." -msgstr "SMB 链接(&B)..." - -msgid "Paneli&ze" -msgstr "面板化(&Z)" - -msgid "&Rescan" -msgstr "重新扫描(&R)" - -msgid "&View" -msgstr "查看(&V)" - -msgid "Vie&w file..." -msgstr "查看文件(&W)..." - -msgid "&Filtered view" -msgstr "过滤视图(&F)" - -msgid "&Copy" -msgstr "复制(&C)" - -msgid "C&hmod" -msgstr "更改文件权限(&H)" - -msgid "&Link" -msgstr "链接(&L)" - -msgid "&Symlink" -msgstr "符号链接(&S)" - -msgid "Relative symlin&k" -msgstr "相关符号链接(&K)" - -msgid "Edit s&ymlink" -msgstr "编辑符号链接(&Y)" - -msgid "Ch&own" -msgstr "更改文件所有者(&O)" - -msgid "&Advanced chown" -msgstr "高级 chown (&A)" - -msgid "Cha&ttr" -msgstr "" - -msgid "&Rename/Move" -msgstr "更名/移动(&R)" - -msgid "&Mkdir" -msgstr "建目录(&M)" - -msgid "&Quick cd" -msgstr "快速切换目录(&Q)" - -msgid "Select &group" -msgstr "选择群组(&G)" - -msgid "U&nselect group" -msgstr "取消选择组(&U)" - -msgid "&Invert selection" -msgstr "反选(&I)" - -msgid "E&xit" -msgstr "退出(&X)" - -msgid "&User menu" -msgstr "用户菜单(&U)" - -msgid "&Directory tree" -msgstr "目录树(&D)" - -msgid "&Find file" -msgstr "查找文件(&F)" - -msgid "S&wap panels" -msgstr "交换面板(&W)" - -msgid "Switch &panels on/off" -msgstr "切换面板开/关(&P)" - -msgid "&Compare directories" -msgstr "比较目录(&C)" - -msgid "C&ompare files" -msgstr "比较文件(&O)" - -msgid "E&xternal panelize" -msgstr "外部面板(&X)" - -msgid "Show directory s&izes" -msgstr "显示目录大小(&I)" - -msgid "Command &history" -msgstr "命令历史(&H)" - -msgid "Viewed/edited files hi&story" -msgstr "" - -msgid "Di&rectory hotlist" -msgstr "目录活动列表(&R)" - -msgid "&Active VFS list" -msgstr "活动的 VFS 列表(&A)" - -msgid "&Background jobs" -msgstr "后台任务(&B)" - -msgid "Screen lis&t" -msgstr "屏幕列表(&T)" - -msgid "&Undelete files (ext2fs only)" -msgstr "反删除文件(仅限 ext2fs)(&U)" - -msgid "&Listing format edit" -msgstr "列表格式编辑(&L)" - -msgid "Edit &extension file" -msgstr "扩展文件编辑(&E)" - -msgid "Edit &menu file" -msgstr "菜单文件编辑(&M)" - -msgid "Edit hi&ghlighting group file" -msgstr "编辑突出显示组文件(&G)" - -msgid "&Configuration..." -msgstr "配置(&C)..." - -msgid "&Layout..." -msgstr "布局(&L)..." - -msgid "&Panel options..." -msgstr "面板选项(&P)..." - -msgid "C&onfirmation..." -msgstr "确认(&O)..." - -msgid "&Appearance..." -msgstr "外观(&A)..." - -msgid "&Display bits..." -msgstr "显示位(&D)..." - -msgid "&Virtual FS..." -msgstr "虚拟文件系统(&V)..." - -msgid "Panels:" -msgstr "面板: " - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "您打开了 %zu 个屏幕。确定要退出吗?" - -msgid "The Midnight Commander" -msgstr "Midnight Commander" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "您真的要退出 Midnight Commander吗?" - -msgid "&Above" -msgstr "上(&A)" - -msgid "&Left" -msgstr "左(&L)" - -msgid "&Below" -msgstr "下(&B)" - -msgid "&Right" -msgstr "右(&R)" - -msgid "ButtonBar|Menu" -msgstr "ButtonBar|目录" - -msgid "ButtonBar|View" -msgstr "ButtonBar|显示" - -msgid "ButtonBar|RenMov" -msgstr "ButtonBar|更名或移动" - -msgid "ButtonBar|Mkdir" -msgstr "ButtonBar|建目录" - msgid "Memory exhausted!" msgstr "内存已耗尽!" Binary files /tmp/tmpMW1M0j/IQGOjC5ev4/mc-4.8.25/po/zh_TW.gmo and /tmp/tmpMW1M0j/LHdlqUctHj/mc-4.8.26/po/zh_TW.gmo differ diff -Nru mc-4.8.25/po/zh_TW.po mc-4.8.26/po/zh_TW.po --- mc-4.8.25/po/zh_TW.po 2020-07-12 20:22:04.000000000 +0000 +++ mc-4.8.26/po/zh_TW.po 2021-01-21 17:18:34.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: Midnight Commander\n" "Report-Msgid-Bugs-To: http://www.midnight-commander.org/\n" -"POT-Creation-Date: 2020-07-13 00:21+0400\n" -"PO-Revision-Date: 2020-05-17 17:42+0000\n" +"POT-Creation-Date: 2021-01-21 18:18+0100\n" +"PO-Revision-Date: 2020-12-31 14:19+0000\n" "Last-Translator: Transifex Bot <>\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/mc/mc/language/" "zh_TW/)\n" @@ -1904,6 +1904,9 @@ msgid "Skin:" msgstr "色彩配置" +msgid "&Shadows" +msgstr "" + msgid "Appearance" msgstr "" @@ -2123,6 +2126,14 @@ msgid "SMB authentication" msgstr "" +#, c-format +msgid "" +"Cannot chdir to \"%s\"\n" +"%s" +msgstr "" +"無法更改目錄到 \"%s\"\n" +"%s" + msgid "Secure deletion" msgstr "" @@ -2183,6 +2194,9 @@ msgid "No COW" msgstr "" +msgid "Direct access for files" +msgstr "" + msgid "Casefolded file" msgstr "" @@ -2455,14 +2469,6 @@ msgid "Cannot execute commands on non-local filesystems" msgstr "" -#, c-format -msgid "" -"Cannot chdir to \"%s\"\n" -"%s" -msgstr "" -"無法更改目錄到 \"%s\"\n" -"%s" - msgid "Parameter" msgstr "" @@ -2922,6 +2928,224 @@ msgid "Invalid source pattern '%s'" msgstr "" +msgid "File listin&g" +msgstr "檔案列表" + +msgid "&Quick view" +msgstr "快速檢視" + +msgid "&Info" +msgstr "資訊" + +msgid "&Tree" +msgstr "樹狀" + +msgid "&Listing format..." +msgstr "列表格式..." + +msgid "&Sort order..." +msgstr "排列順序..." + +msgid "&Filter..." +msgstr "過濾器..." + +msgid "&Encoding..." +msgstr "編碼..." + +msgid "FT&P link..." +msgstr "連結 FTP..." + +msgid "S&hell link..." +msgstr "連結 Shell..." + +msgid "S&FTP link..." +msgstr "連結 SFTP..." + +msgid "SM&B link..." +msgstr "連結 SMB..." + +msgid "Paneli&ze" +msgstr "" + +msgid "&Rescan" +msgstr "重新搜尋" + +msgid "&View" +msgstr "檢視" + +msgid "Vie&w file..." +msgstr "檢視檔案" + +msgid "&Filtered view" +msgstr "檢視已過濾" + +msgid "&Copy" +msgstr "複製" + +msgid "C&hmod" +msgstr "Chmod" + +msgid "&Link" +msgstr "連結" + +msgid "&Symlink" +msgstr "軟連結" + +msgid "Relative symlin&k" +msgstr "相對符號連結" + +msgid "Edit s&ymlink" +msgstr "編輯軟連結" + +msgid "Ch&own" +msgstr "Chown" + +msgid "&Advanced chown" +msgstr "進階 chown" + +msgid "Cha&ttr" +msgstr "聊天室" + +msgid "&Rename/Move" +msgstr "重新命名/移動" + +msgid "&Mkdir" +msgstr "建立目錄" + +msgid "&Quick cd" +msgstr "快速改變目錄" + +msgid "Select &group" +msgstr "選取群組" + +msgid "U&nselect group" +msgstr "取消選取群組" + +msgid "&Invert selection" +msgstr "反向選取" + +msgid "E&xit" +msgstr "離開" + +msgid "&User menu" +msgstr "使用者選單" + +msgid "&Directory tree" +msgstr "目錄樹" + +msgid "&Find file" +msgstr "尋找檔案" + +msgid "S&wap panels" +msgstr "" + +msgid "Switch &panels on/off" +msgstr "" + +msgid "&Compare directories" +msgstr "" + +msgid "C&ompare files" +msgstr "比較檔案" + +msgid "E&xternal panelize" +msgstr "" + +msgid "Show directory s&izes" +msgstr "" + +msgid "Command &history" +msgstr "" + +msgid "Viewed/edited files hi&story" +msgstr "已檢視/已編輯的檔案歷史紀錄" + +msgid "Di&rectory hotlist" +msgstr "常用目錄" + +msgid "&Active VFS list" +msgstr "可用的 VFS 列表" + +msgid "&Background jobs" +msgstr "背景工作" + +msgid "Screen lis&t" +msgstr "畫面列表" + +msgid "&Undelete files (ext2fs only)" +msgstr "復原檔案 (只能用在 ext2fs 上面)" + +msgid "&Listing format edit" +msgstr "編輯列表格式" + +msgid "Edit &extension file" +msgstr "編輯擴充檔" + +msgid "Edit &menu file" +msgstr "編輯選單檔" + +msgid "Edit hi&ghlighting group file" +msgstr "編輯高亮群組檔案" + +msgid "&Configuration..." +msgstr "設定..." + +msgid "&Layout..." +msgstr "樣式" + +msgid "&Panel options..." +msgstr "面板選項..." + +msgid "C&onfirmation..." +msgstr "確認..." + +msgid "&Appearance..." +msgstr "出現..." + +msgid "&Display bits..." +msgstr "顯示位元數..." + +msgid "&Virtual FS..." +msgstr "虛擬檔案系統..." + +msgid "Panels:" +msgstr "面板:" + +#, c-format +msgid "You have %zu opened screen. Quit anyway?" +msgid_plural "You have %zu opened screens. Quit anyway?" +msgstr[0] "" + +msgid "The Midnight Commander" +msgstr "" + +msgid "Do you really want to quit the Midnight Commander?" +msgstr "" + +msgid "&Above" +msgstr "上述" + +msgid "&Left" +msgstr "左方" + +msgid "&Below" +msgstr "" + +msgid "&Right" +msgstr "右方" + +msgid "ButtonBar|Menu" +msgstr "按鈕列 | 選單" + +msgid "ButtonBar|View" +msgstr "按鈕列 | 檢視" + +msgid "ButtonBar|RenMov" +msgstr "按鈕列 | 搬移" + +msgid "ButtonBar|Mkdir" +msgstr "按鈕列 | 新建目錄" + msgid "&Chdir" msgstr "改變目錄" @@ -2968,9 +3192,6 @@ msgid "Fir&st hit" msgstr "" -msgid "&Tree" -msgstr "樹狀" - msgid "Find File" msgstr "尋找檔案" @@ -3225,221 +3446,6 @@ msgid "Layout" msgstr "樣式" -msgid "File listin&g" -msgstr "檔案列表" - -msgid "&Quick view" -msgstr "快速檢視" - -msgid "&Info" -msgstr "資訊" - -msgid "&Listing format..." -msgstr "列表格式..." - -msgid "&Sort order..." -msgstr "排列順序..." - -msgid "&Filter..." -msgstr "過濾器..." - -msgid "&Encoding..." -msgstr "編碼..." - -msgid "FT&P link..." -msgstr "連結 FTP..." - -msgid "S&hell link..." -msgstr "連結 Shell..." - -msgid "S&FTP link..." -msgstr "連結 SFTP..." - -msgid "SM&B link..." -msgstr "連結 SMB..." - -msgid "Paneli&ze" -msgstr "" - -msgid "&Rescan" -msgstr "重新搜尋" - -msgid "&View" -msgstr "檢視" - -msgid "Vie&w file..." -msgstr "檢視檔案" - -msgid "&Filtered view" -msgstr "檢視已過濾" - -msgid "&Copy" -msgstr "複製" - -msgid "C&hmod" -msgstr "Chmod" - -msgid "&Link" -msgstr "連結" - -msgid "&Symlink" -msgstr "軟連結" - -msgid "Relative symlin&k" -msgstr "相對符號連結" - -msgid "Edit s&ymlink" -msgstr "編輯軟連結" - -msgid "Ch&own" -msgstr "Chown" - -msgid "&Advanced chown" -msgstr "進階 chown" - -msgid "Cha&ttr" -msgstr "聊天室" - -msgid "&Rename/Move" -msgstr "重新命名/移動" - -msgid "&Mkdir" -msgstr "建立目錄" - -msgid "&Quick cd" -msgstr "快速改變目錄" - -msgid "Select &group" -msgstr "選取群組" - -msgid "U&nselect group" -msgstr "取消選取群組" - -msgid "&Invert selection" -msgstr "反向選取" - -msgid "E&xit" -msgstr "離開" - -msgid "&User menu" -msgstr "使用者選單" - -msgid "&Directory tree" -msgstr "目錄樹" - -msgid "&Find file" -msgstr "尋找檔案" - -msgid "S&wap panels" -msgstr "" - -msgid "Switch &panels on/off" -msgstr "" - -msgid "&Compare directories" -msgstr "" - -msgid "C&ompare files" -msgstr "比較檔案" - -msgid "E&xternal panelize" -msgstr "" - -msgid "Show directory s&izes" -msgstr "" - -msgid "Command &history" -msgstr "" - -msgid "Viewed/edited files hi&story" -msgstr "已檢視/已編輯的檔案歷史紀錄" - -msgid "Di&rectory hotlist" -msgstr "常用目錄" - -msgid "&Active VFS list" -msgstr "可用的 VFS 列表" - -msgid "&Background jobs" -msgstr "背景工作" - -msgid "Screen lis&t" -msgstr "畫面列表" - -msgid "&Undelete files (ext2fs only)" -msgstr "復原檔案 (只能用在 ext2fs 上面)" - -msgid "&Listing format edit" -msgstr "編輯列表格式" - -msgid "Edit &extension file" -msgstr "編輯擴充檔" - -msgid "Edit &menu file" -msgstr "編輯選單檔" - -msgid "Edit hi&ghlighting group file" -msgstr "編輯高亮群組檔案" - -msgid "&Configuration..." -msgstr "設定..." - -msgid "&Layout..." -msgstr "樣式" - -msgid "&Panel options..." -msgstr "面板選項..." - -msgid "C&onfirmation..." -msgstr "確認..." - -msgid "&Appearance..." -msgstr "出現..." - -msgid "&Display bits..." -msgstr "顯示位元數..." - -msgid "&Virtual FS..." -msgstr "虛擬檔案系統..." - -msgid "Panels:" -msgstr "面板:" - -#, c-format -msgid "You have %zu opened screen. Quit anyway?" -msgid_plural "You have %zu opened screens. Quit anyway?" -msgstr[0] "" - -msgid "The Midnight Commander" -msgstr "" - -msgid "Do you really want to quit the Midnight Commander?" -msgstr "" - -msgid "&Above" -msgstr "上述" - -msgid "&Left" -msgstr "左方" - -msgid "&Below" -msgstr "" - -msgid "&Right" -msgstr "右方" - -msgid "ButtonBar|Menu" -msgstr "按鈕列 | 選單" - -msgid "ButtonBar|View" -msgstr "按鈕列 | 檢視" - -msgid "ButtonBar|RenMov" -msgstr "按鈕列 | 搬移" - -msgid "ButtonBar|Mkdir" -msgstr "按鈕列 | 新建目錄" - msgid "Memory exhausted!" msgstr "" diff -Nru mc-4.8.25/src/background.c mc-4.8.26/src/background.c --- mc-4.8.25/src/background.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/background.c 2021-01-10 11:50:16.000000000 +0000 @@ -525,7 +525,12 @@ return (-1); if (pipe (back_comm) == -1) + { + (void) close (comm[0]); + (void) close (comm[1]); + return (-1); + } pid = fork (); if (pid == -1) @@ -565,6 +570,7 @@ ; while (dup2 (nullfd, STDERR_FILENO) == -1 && errno == EINTR) ; + close (nullfd); } return 0; diff -Nru mc-4.8.25/src/clipboard.c mc-4.8.26/src/clipboard.c --- mc-4.8.25/src/clipboard.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/clipboard.c 2021-01-10 11:50:16.000000000 +0000 @@ -71,14 +71,13 @@ gpointer init_data, gpointer data) { char *tmp, *cmd; - const char *d = getenv ("DISPLAY"); (void) event_group_name; (void) event_name; (void) init_data; (void) data; - if (d == NULL || clipboard_store_path == NULL || clipboard_store_path[0] == '\0') + if (clipboard_store_path == NULL || clipboard_store_path[0] == '\0') return TRUE; tmp = mc_config_get_full_path (EDIT_HOME_CLIP_FILE); @@ -101,14 +100,13 @@ { mc_pipe_t *p; int file = -1; - const char *d = getenv ("DISPLAY"); (void) event_group_name; (void) event_name; (void) init_data; (void) data; - if (d == NULL || clipboard_paste_path == NULL || clipboard_paste_path[0] == '\0') + if (clipboard_paste_path == NULL || clipboard_paste_path[0] == '\0') return TRUE; p = mc_popen (clipboard_paste_path, NULL); diff -Nru mc-4.8.25/src/consaver/Makefile.in mc-4.8.26/src/consaver/Makefile.in --- mc-4.8.25/src/consaver/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/consaver/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/cons.handler.c mc-4.8.26/src/cons.handler.c --- mc-4.8.25/src/cons.handler.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/cons.handler.c 2021-01-10 11:50:16.000000000 +0000 @@ -191,6 +191,8 @@ /* Bind the pipe 0 to the standard input */ do { + gboolean ok; + if (dup2 (pipefd1[0], STDIN_FILENO) == -1) break; status = close (pipefd1[0]); @@ -201,9 +203,13 @@ status = close (pipefd2[1]); /* Bind standard error to /dev/null */ status = open ("/dev/null", O_WRONLY); - if (dup2 (status, STDERR_FILENO) == -1) + if (status == -1) break; + ok = dup2 (status, STDERR_FILENO) != -1; status = close (status); + if (!ok) + break; + if (tty_name != NULL) { char *mc_conssaver; diff -Nru mc-4.8.25/src/diffviewer/Makefile.in mc-4.8.26/src/diffviewer/Makefile.in --- mc-4.8.25/src/diffviewer/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/diffviewer/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/editor/edit.c mc-4.8.26/src/editor/edit.c --- mc-4.8.25/src/editor/edit.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/editor/edit.c 2021-01-10 11:50:16.000000000 +0000 @@ -3426,6 +3426,7 @@ edit->column_highlight = 0; edit_mark_cmd (edit, TRUE); } + break; default: break; } @@ -3454,6 +3455,7 @@ case CK_MarkLeft: case CK_MarkRight: edit->force |= REDRAW_CHAR_ONLY; + break; default: break; } @@ -3910,7 +3912,7 @@ case CK_ExternalCommand: edit_ext_cmd (edit); break; - case CK_Mail: + case CK_EditMail: edit_mail_dialog (edit); break; #ifdef HAVE_CHARSET @@ -3998,6 +4000,7 @@ case CK_DeleteToEnd: format_paragraph (edit, FALSE); edit->force |= REDRAW_PAGE; + break; default: break; } diff -Nru mc-4.8.25/src/editor/editcmd.c mc-4.8.26/src/editor/editcmd.c --- mc-4.8.25/src/editor/editcmd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/editor/editcmd.c 2021-01-10 11:50:16.000000000 +0000 @@ -1121,7 +1121,8 @@ off_t i; for (i = 0; i < buf->size; i++) - fputc (edit_buffer_get_byte (buf, i), p); + if (fputc (edit_buffer_get_byte (buf, i), p) < 0) + break; pclose (p); } } @@ -1531,7 +1532,7 @@ void edit_refresh_cmd (void) { - clr_scr (); + tty_clear_screen (); repaint_screen (); tty_keypad (TRUE); } @@ -1874,6 +1875,7 @@ if (!have_macro) mc_config_del_key (macros_config, section_name, skeyname); + else { macros_t macro; @@ -3538,7 +3540,7 @@ path = ptr; g_free (tagfile); tagfile = mc_build_filename (path, TAGS_NAME, (char *) NULL); - if (exist_file (tagfile)) + if (tagfile != NULL && exist_file (tagfile)) break; } while (strcmp (path, PATH_SEP_STR) != 0); @@ -3630,7 +3632,7 @@ edit_insert (edit, *new_word); g_free (cp_word); } - else if (retval == B_ADD_WORD && match_word != NULL) + else if (retval == B_ADD_WORD) aspell_add_to_dict (match_word->str, (int) word_len); } diff -Nru mc-4.8.25/src/editor/editdraw.c mc-4.8.26/src/editor/editdraw.c --- mc-4.8.25/src/editor/editdraw.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/editor/editdraw.c 2021-01-10 11:50:16.000000000 +0000 @@ -1093,7 +1093,7 @@ { int n; - n = l_extreme + t_extreme; + n = l_extreme + r_extreme; if (n == 0) n = 1; l_extreme = (l_extreme * (w->cols - 1)) / n; diff -Nru mc-4.8.25/src/editor/editmenu.c mc-4.8.26/src/editor/editmenu.c --- mc-4.8.25/src/editor/editmenu.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/editor/editmenu.c 2021-01-10 11:50:16.000000000 +0000 @@ -190,7 +190,7 @@ entries = g_list_prepend (entries, menu_separator_create ()); } #endif /* HAVE_ASPELL */ - entries = g_list_prepend (entries, menu_entry_create (_("&Mail..."), CK_Mail)); + entries = g_list_prepend (entries, menu_entry_create (_("&Mail..."), CK_EditMail)); return g_list_reverse (entries); diff -Nru mc-4.8.25/src/editor/Makefile.in mc-4.8.26/src/editor/Makefile.in --- mc-4.8.25/src/editor/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/editor/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/editor/syntax.c mc-4.8.26/src/editor/syntax.c --- mc-4.8.25/src/editor/syntax.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/editor/syntax.c 2021-01-10 11:50:16.000000000 +0000 @@ -1287,9 +1287,6 @@ /* Looking for 'include ...' lines before first 'file ...' ones */ if (!found && strcmp (args[0], "include") == 0) { - if (g != NULL) - continue; - if (args[1] == NULL || (g = open_include_file (args[1])) == NULL) { result = line; diff -Nru mc-4.8.25/src/execute.c mc-4.8.26/src/execute.c --- mc-4.8.25/src/execute.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/execute.c 2021-01-10 11:50:16.000000000 +0000 @@ -45,7 +45,7 @@ #include "lib/strutil.h" /* str_replace_all_substrings() */ #include "lib/widget.h" -#include "filemanager/midnight.h" +#include "filemanager/filemanager.h" #include "filemanager/layout.h" /* use_dash() */ #include "consaver/cons.saver.h" #ifdef ENABLE_SUBSHELL @@ -99,7 +99,7 @@ edition_pre_exec (void) { if (clear_before_exec) - clr_scr (); + tty_clear_screen (); else { if (!(mc_global.tty.console_flag != '\0' || mc_global.tty.xterm_flag)) @@ -131,7 +131,7 @@ static void do_possible_cd (const vfs_path_t * new_dir_vpath) { - if (!do_cd (new_dir_vpath, cd_exact)) + if (!panel_cd (current_panel, new_dir_vpath, cd_exact)) message (D_ERROR, _("Warning"), "%s", _("The Commander can't change to the directory that\n" "the subshell claims you are in. Perhaps you have\n" @@ -470,7 +470,7 @@ disable_mouse (); disable_bracketed_paste (); if (clear_before_exec) - clr_scr (); + tty_clear_screen (); if (mc_global.tty.alternate_plus_minus) numeric_keypad_mode (); #ifndef HAVE_SLANG @@ -551,7 +551,6 @@ { if (mc_global.mc_run_mode == MC_RUN_FULL) { - do_load_prompt (); if (new_dir_vpath != NULL) do_possible_cd (new_dir_vpath); } diff -Nru mc-4.8.25/src/filemanager/achown.c mc-4.8.26/src/filemanager/achown.c --- mc-4.8.25/src/filemanager/achown.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/achown.c 2021-01-10 11:50:16.000000000 +0000 @@ -45,9 +45,7 @@ #include "lib/util.h" #include "lib/widget.h" -#include "midnight.h" /* current_panel */ - -#include "achown.h" +#include "cmd.h" /* advanced_chown_cmd() */ /*** global variables ****************************************************************************/ @@ -279,7 +277,7 @@ /* --------------------------------------------------------------------------------------------- */ static void -advanced_chown_refresh (WDialog * h) +advanced_chown_refresh (const WDialog * h) { tty_setcolor (COLOR_NORMAL); @@ -494,6 +492,7 @@ h->ret_value = parm; dlg_stop (h); } + break; default: break; } @@ -728,7 +727,7 @@ /* --------------------------------------------------------------------------------------------- */ static WDialog * -advanced_chown_dlg_create (void) +advanced_chown_dlg_create (WPanel * panel) { gboolean single_set; WDialog *ch_dlg; @@ -742,7 +741,7 @@ flag_pos = 0; x_toggle = 070; - single_set = (current_panel->marked < 2); + single_set = (panel->marked < 2); if (!single_set) lines += 2; @@ -831,12 +830,12 @@ /* --------------------------------------------------------------------------------------------- */ static const char * -next_file (void) +next_file (const WPanel * panel) { - while (!current_panel->dir.list[current_file].f.marked) + while (!panel->dir.list[current_file].f.marked) current_file++; - return current_panel->dir.list[current_file].fname; + return panel->dir.list[current_file].fname; } /* --------------------------------------------------------------------------------------------- */ @@ -925,13 +924,13 @@ /* --------------------------------------------------------------------------------------------- */ static gboolean -do_advanced_chown (const vfs_path_t * p, mode_t m, uid_t u, gid_t g) +do_advanced_chown (WPanel * panel, const vfs_path_t * p, mode_t m, uid_t u, gid_t g) { gboolean ret; ret = try_advanced_chown (p, m, u, g); - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); return ret; } @@ -939,30 +938,30 @@ /* --------------------------------------------------------------------------------------------- */ static void -apply_advanced_chowns (vfs_path_t * vpath, struct stat *sf) +apply_advanced_chowns (WPanel * panel, vfs_path_t * vpath, struct stat *sf) { gid_t a_gid = sf->st_gid; uid_t a_uid = sf->st_uid; gboolean ok; - if (!do_advanced_chown - (vpath, get_mode (), (ch_flags[9] == '+') ? a_uid : (uid_t) (-1), - (ch_flags[10] == '+') ? a_gid : (gid_t) (-1))) + if (!do_advanced_chown (panel, vpath, get_mode (), + (ch_flags[9] == '+') ? a_uid : (uid_t) (-1), + (ch_flags[10] == '+') ? a_gid : (gid_t) (-1))) return; do { const char *fname; - fname = next_file (); + fname = next_file (panel); vpath = vfs_path_from_str (fname); ok = (mc_stat (vpath, sf) == 0); if (!ok) { /* if current file was deleted outside mc -- try next file */ - /* decrease current_panel->marked */ - do_file_mark (current_panel, current_file, 0); + /* decrease panel->marked */ + do_file_mark (panel, current_file, 0); /* try next file */ ok = TRUE; @@ -971,14 +970,14 @@ { ch_cmode = sf->st_mode; - ok = do_advanced_chown (vpath, get_mode (), + ok = do_advanced_chown (panel, vpath, get_mode (), (ch_flags[9] == '+') ? a_uid : (uid_t) (-1), (ch_flags[10] == '+') ? a_gid : (gid_t) (-1)); } vfs_path_free (vpath); } - while (ok && current_panel->marked != 0); + while (ok && panel->marked != 0); } /* --------------------------------------------------------------------------------------------- */ @@ -986,7 +985,7 @@ /* --------------------------------------------------------------------------------------------- */ void -advanced_chown_cmd (void) +advanced_chown_cmd (WPanel * panel) { gboolean need_update; gboolean end_chown; @@ -994,7 +993,7 @@ /* Number of files at startup */ int files_on_begin; - files_on_begin = MAX (1, current_panel->marked); + files_on_begin = MAX (1, panel->marked); advanced_chown_init (); @@ -1014,10 +1013,10 @@ need_update = FALSE; end_chown = FALSE; - if (current_panel->marked != 0) - fname = next_file (); /* next marked file */ + if (panel->marked != 0) + fname = next_file (panel); /* next marked file */ else - fname = selection (current_panel)->fname; /* single file */ + fname = selection (panel)->fname; /* single file */ vpath = vfs_path_from_str (fname); @@ -1029,9 +1028,9 @@ ch_cmode = sf_stat.st_mode; - ch_dlg = advanced_chown_dlg_create (); + ch_dlg = advanced_chown_dlg_create (panel); - file_idx = files_on_begin == 1 ? 1 : (files_on_begin - current_panel->marked + 1); + file_idx = files_on_begin == 1 ? 1 : (files_on_begin - panel->marked + 1); label_set_textv (l_filename, "%s (%d/%d)", str_fit_to_term (fname, WIDGET (ch_dlg)->cols - 20, J_LEFT_FIT), file_idx, files_on_begin); @@ -1046,7 +1045,7 @@ break; case B_ENTER: - if (current_panel->marked <= 1) + if (panel->marked <= 1) { /* single or last file */ if (mc_chmod (vpath, get_mode ()) == -1) @@ -1074,7 +1073,7 @@ break; case B_SETALL: - apply_advanced_chowns (vpath, &sf_stat); + apply_advanced_chowns (panel, vpath, &sf_stat); need_update = TRUE; end_chown = TRUE; break; @@ -1084,9 +1083,9 @@ break; } - if (current_panel->marked != 0 && result != B_CANCEL) + if (panel->marked != 0 && result != B_CANCEL) { - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); need_update = TRUE; } @@ -1094,7 +1093,7 @@ dlg_destroy (ch_dlg); } - while (current_panel->marked != 0 && !end_chown); + while (panel->marked != 0 && !end_chown); advanced_chown_done (need_update); } diff -Nru mc-4.8.25/src/filemanager/achown.h mc-4.8.26/src/filemanager/achown.h --- mc-4.8.25/src/filemanager/achown.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/achown.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -/** \file achown.h - * \brief Header: Contains functions for advanced chowning - */ - -#ifndef MC__ACHOWN_H -#define MC__ACHOWN_H - -/*** typedefs(not structures) and defined constants **********************************************/ - -/*** enums ***************************************************************************************/ - -/*** structures declarations (and typedefs of structures)*****************************************/ - -/*** global variables defined in .c file *********************************************************/ - -/*** declarations of public functions ************************************************************/ - -void advanced_chown_cmd (void); - -/*** inline functions ****************************************************************************/ -#endif /* MC__ACHOWN_H */ diff -Nru mc-4.8.25/src/filemanager/boxes.c mc-4.8.26/src/filemanager/boxes.c --- mc-4.8.25/src/filemanager/boxes.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/boxes.c 2021-01-10 11:50:16.000000000 +0000 @@ -42,6 +42,7 @@ #include "lib/global.h" #include "lib/tty/tty.h" +#include "lib/tty/color.h" /* tty_use_colors() */ #include "lib/tty/key.h" /* XCTRL and ALT macros */ #include "lib/skin.h" /* INPUT_COLOR */ #include "lib/mcconfig.h" /* Load/save user formats */ @@ -72,10 +73,9 @@ #include "command.h" /* For cmdline */ #include "dir.h" -#include "panel.h" /* LIST_FORMATS */ #include "tree.h" #include "layout.h" /* for get_nth_panel_name proto */ -#include "midnight.h" /* current_panel */ +#include "filemanager.h" #include "boxes.h" @@ -102,7 +102,7 @@ static char **status_format; static unsigned long panel_list_formats_id, panel_user_format_id, panel_brief_cols_id; -static unsigned long mini_user_status_id, mini_user_format_id; +static unsigned long user_mini_status_id, mini_user_format_id; #ifdef HAVE_CHARSET static int new_display_codepage; @@ -119,6 +119,8 @@ static WListbox *bg_list = NULL; #endif /* ENABLE_BACKGROUND */ +static unsigned long shadows_id; + /* --------------------------------------------------------------------------------------------- */ /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -273,6 +275,38 @@ /* --------------------------------------------------------------------------------------------- */ static cb_ret_t +appearance_box_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) +{ + switch (msg) + { + case MSG_INIT: + if (!tty_use_colors ()) + { + Widget *shadow; + + shadow = widget_find_by_id (w, shadows_id); + CHECK (shadow)->state = FALSE; + widget_disable (shadow, TRUE); + } + return MSG_HANDLED; + + case MSG_NOTIFY: + if (sender != NULL && sender->id == shadows_id) + { + mc_global.tty.shadows = CHECK (sender)->state; + repaint_screen (); + return MSG_HANDLED; + } + return MSG_NOT_HANDLED; + + default: + return dlg_default_callback (w, sender, msg, parm, data); + } +} + +/* --------------------------------------------------------------------------------------------- */ + +static cb_ret_t panel_listing_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) { switch (msg) @@ -285,7 +319,7 @@ in1 = INPUT (widget_find_by_id (w, panel_user_format_id)); in2 = INPUT (widget_find_by_id (w, panel_brief_cols_id)); - ch = CHECK (widget_find_by_id (w, mini_user_status_id)); + ch = CHECK (widget_find_by_id (w, user_mini_status_id)); in3 = INPUT (widget_find_by_id (w, mini_user_format_id)); if (!ch->state) @@ -298,7 +332,7 @@ return MSG_HANDLED; } - if (sender != NULL && sender->id == mini_user_status_id) + if (sender != NULL && sender->id == user_mini_status_id) { WInput *in; @@ -590,6 +624,8 @@ void appearance_box (void) { + gboolean shadows = mc_global.tty.shadows; + current_skin_name = g_strdup (mc_skin__default.name); skin_names = mc_skin_list (); @@ -602,6 +638,8 @@ QUICK_BUTTON (str_fit_to_term (skin_name_to_label (current_skin_name), 20, J_LEFT_FIT), B_USER, sel_skin_button, NULL), QUICK_STOP_COLUMNS, + QUICK_SEPARATOR (TRUE), + QUICK_CHECKBOX (N_("&Shadows"), &mc_global.tty.shadows, &shadows_id), QUICK_BUTTONS_OK_CANCEL, QUICK_END /* *INDENT-ON* */ @@ -610,14 +648,17 @@ quick_dialog_t qdlg = { -1, -1, 54, N_("Appearance"), "[Appearance]", - quick_widgets, dlg_default_callback, NULL + quick_widgets, appearance_box_callback, NULL }; if (quick_dialog (&qdlg) == B_ENTER) mc_config_set_string (mc_global.main_config, CONFIG_APP_SECTION, "skin", current_skin_name); else + { skin_apply (NULL); + mc_global.tty.shadows = shadows; + } } g_free (current_skin_name); @@ -725,7 +766,7 @@ } { - gboolean mini_user_status; + gboolean user_mini_status; char panel_brief_cols_in[BUF_TINY]; char *panel_brief_cols_out = NULL; char *panel_user_format = NULL; @@ -752,7 +793,7 @@ QUICK_INPUT (panel->user_format, "user-fmt-input", &panel_user_format, &panel_user_format_id, FALSE, FALSE, INPUT_COMPLETE_NONE), QUICK_SEPARATOR (TRUE), - QUICK_CHECKBOX (N_("User &mini status"), &mini_user_status, &mini_user_status_id), + QUICK_CHECKBOX (N_("User &mini status"), &user_mini_status, &user_mini_status_id), QUICK_INPUT (panel->user_status_format[panel->list_format], "mini_input", &mini_user_format, &mini_user_format_id, FALSE, FALSE, INPUT_COMPLETE_NONE), QUICK_BUTTONS_OK_CANCEL, @@ -766,7 +807,7 @@ quick_widgets, panel_listing_callback, NULL }; - mini_user_status = panel->user_mini_status; + user_mini_status = panel->user_mini_status; result = panel->list_format; status_format = panel->user_status_format; @@ -778,7 +819,7 @@ if ((int) panel->list_format != panel_list_user_idx) quick_widgets[6].state = WST_DISABLED; - if (!mini_user_status) + if (!user_mini_status) quick_widgets[9].state = WST_DISABLED; if (quick_dialog (&qdlg) == B_CANCEL) @@ -790,7 +831,7 @@ *userp = panel_user_format; *minip = mini_user_format; - *use_msformat = mini_user_status; + *use_msformat = user_mini_status; cols = strtol (panel_brief_cols_out, &error, 10); if (*error == '\0') @@ -1154,9 +1195,9 @@ /* --------------------------------------------------------------------------------------------- */ char * -cd_box (void) +cd_box (const WPanel * panel) { - const Widget *w = CONST_WIDGET (current_panel); + const Widget *w = CONST_WIDGET (panel); char *my_str; quick_widget_t quick_widgets[] = { diff -Nru mc-4.8.25/src/filemanager/boxes.h mc-4.8.26/src/filemanager/boxes.h --- mc-4.8.25/src/filemanager/boxes.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/boxes.h 2021-01-10 11:50:16.000000000 +0000 @@ -28,7 +28,7 @@ void display_bits_box (void); void configure_vfs_box (void); void jobs_box (void); -char *cd_box (void); +char *cd_box (const WPanel * panel); void symlink_box (const vfs_path_t * existing_vpath, const vfs_path_t * new_vpath, char **ret_existing, char **ret_new); char *tree_box (const char *current_dir); diff -Nru mc-4.8.25/src/filemanager/cd.c mc-4.8.26/src/filemanager/cd.c --- mc-4.8.25/src/filemanager/cd.c 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/src/filemanager/cd.c 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,299 @@ +/* + cd_to() function. + + Copyright (C) 1995-2020 + Free Software Foundation, Inc. + + Written by: + Slava Zanko , 2013 + Andrew Borodin , 2020 + + This file is part of the Midnight Commander. + + The Midnight Commander 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 3 of the License, + or (at your option) any later version. + + The Midnight Commander 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, see . + */ + +/** \file cd.c + * \brief Source: cd_to() function + */ + +#include + +#include +#include +#include + +#include "lib/global.h" +#include "lib/vfs/vfs.h" +#include "lib/strescape.h" /* strutils_shell_unescape() */ +#include "lib/util.h" /* whitespace() */ + +#include "filemanager.h" /* current_panel, panel.h, layout.h */ +#include "tree.h" /* sync_tree() */ + +#include "cd.h" + +/*** global variables ****************************************************************************/ + +/*** file scope macro definitions ****************************************************************/ + +/*** file scope type declarations ****************************************************************/ + +/*** file scope variables ************************************************************************/ + +/* --------------------------------------------------------------------------------------------- */ +/*** file scope functions ************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ + +/** + * Expand the argument to "cd" and change directory. First try tilde + * expansion, then variable substitution. If the CDPATH variable is set + * (e.g. CDPATH=".:~:/usr"), try all the paths contained there. + * We do not support such rare substitutions as ${var:-value} etc. + * No quoting is implemented here, so ${VAR} and $VAR will be always + * substituted. Wildcards are not supported either. + * Advanced users should be encouraged to use "\cd" instead of "cd" if + * they want the behavior they are used to in the shell. + * + * @param _path string to examine + * @return newly allocated string + */ + +static GString * +examine_cd (const char *_path) +{ + /* *INDENT-OFF* */ + typedef enum + { + copy_sym, + subst_var + } state_t; + /* *INDENT-ON* */ + + state_t state = copy_sym; + GString *q; + char *path_tilde, *path; + char *p; + + /* Tilde expansion */ + path = strutils_shell_unescape (_path); + path_tilde = tilde_expand (path); + g_free (path); + + q = g_string_sized_new (32); + + /* Variable expansion */ + for (p = path_tilde; *p != '\0';) + { + switch (state) + { + case copy_sym: + if (p[0] == '\\' && p[1] == '$') + { + g_string_append_c (q, '$'); + p += 2; + } + else if (p[0] != '$' || p[1] == '[' || p[1] == '(') + { + g_string_append_c (q, *p); + p++; + } + else + state = subst_var; + break; + + case subst_var: + { + char *s = NULL; + char c; + const char *t = NULL; + + /* skip dollar */ + p++; + + if (p[0] == '{') + { + p++; + s = strchr (p, '}'); + } + if (s == NULL) + s = strchr (p, PATH_SEP); + if (s == NULL) + s = strchr (p, '\0'); + c = *s; + *s = '\0'; + t = getenv (p); + *s = c; + if (t == NULL) + { + g_string_append_c (q, '$'); + if (p[-1] != '$') + g_string_append_c (q, '{'); + } + else + { + g_string_append (q, t); + p = s; + if (*s == '}') + p++; + } + + state = copy_sym; + break; + } + + default: + break; + } + } + + g_free (path_tilde); + + return q; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* CDPATH handling */ +static gboolean +handle_cdpath (const char *path) +{ + gboolean result = FALSE; + + /* CDPATH handling */ + if (!IS_PATH_SEP (*path)) + { + char *cdpath, *p; + char c; + + cdpath = g_strdup (getenv ("CDPATH")); + p = cdpath; + c = (p == NULL) ? '\0' : ':'; + + while (!result && c == ':') + { + char *s; + + s = strchr (p, ':'); + if (s == NULL) + s = strchr (p, '\0'); + c = *s; + *s = '\0'; + if (*p != '\0') + { + vfs_path_t *r_vpath; + + r_vpath = vfs_path_build_filename (p, path, (char *) NULL); + result = panel_cd (current_panel, r_vpath, cd_parse_command); + vfs_path_free (r_vpath); + } + *s = c; + p = s + 1; + } + g_free (cdpath); + } + + return result; +} + +/* --------------------------------------------------------------------------------------------- */ +/*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ + +/** Execute the cd command to specified path + * + * @param path path to cd + */ + +void +cd_to (const char *path) +{ + char *p; + + /* Remove leading whitespaces. */ + /* Any final whitespace should be removed here (to see why, try "cd fred "). */ + /* NOTE: I think we should not remove the extra space, + that way, we can cd into hidden directories */ + /* FIXME: what about interpreting quoted strings like the shell. + so one could type "cd M-a " and it would work. */ + p = g_strstrip (g_strdup (path)); + + if (get_current_type () == view_tree) + { + vfs_path_t *new_vpath = NULL; + + if (p[0] == '\0') + { + new_vpath = vfs_path_from_str (mc_config_get_home_dir ()); + sync_tree (new_vpath); + } + else if (DIR_IS_DOTDOT (p)) + { + if (vfs_path_elements_count (current_panel->cwd_vpath) != 1 || + strlen (vfs_path_get_by_index (current_panel->cwd_vpath, 0)->path) > 1) + { + vfs_path_t *tmp_vpath = current_panel->cwd_vpath; + + current_panel->cwd_vpath = + vfs_path_vtokens_get (tmp_vpath, 0, vfs_path_tokens_count (tmp_vpath) - 1); + vfs_path_free (tmp_vpath); + } + sync_tree (current_panel->cwd_vpath); + } + else + { + if (IS_PATH_SEP (*p)) + new_vpath = vfs_path_from_str (p); + else + new_vpath = vfs_path_append_new (current_panel->cwd_vpath, p, (char *) NULL); + + sync_tree (new_vpath); + } + + vfs_path_free (new_vpath); + } + else + { + GString *s_path; + vfs_path_t *q_vpath; + gboolean ok; + + s_path = examine_cd (p); + + if (s_path->len == 0) + q_vpath = vfs_path_from_str (mc_config_get_home_dir ()); + else + q_vpath = vfs_path_from_str_flags (s_path->str, VPF_NO_CANON); + + ok = panel_cd (current_panel, q_vpath, cd_parse_command); + if (!ok) + ok = handle_cdpath (s_path->str); + if (!ok) + { + char *d; + + d = vfs_path_to_str_flags (q_vpath, 0, VPF_STRIP_PASSWORD); + message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"), d, + unix_error_string (errno)); + g_free (d); + } + + vfs_path_free (q_vpath); + g_string_free (s_path, TRUE); + } + + g_free (p); +} + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/filemanager/cd.h mc-4.8.26/src/filemanager/cd.h --- mc-4.8.25/src/filemanager/cd.h 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/src/filemanager/cd.h 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,22 @@ +/** \file cd.h + * \brief Header: cd function + */ + +#ifndef MC__CD_H +#define MC__CD_H + +/*** typedefs(not structures) and defined constants **********************************************/ + +/*** enums ***************************************************************************************/ + +/*** structures declarations (and typedefs of structures)*****************************************/ + +/*** global variables defined in .c file *********************************************************/ + +/*** declarations of public functions ************************************************************/ + +void cd_to (const char *path); + +/*** inline functions ****************************************************************************/ + +#endif /* MC__CD_H */ diff -Nru mc-4.8.25/src/filemanager/chattr.c mc-4.8.26/src/filemanager/chattr.c --- mc-4.8.25/src/filemanager/chattr.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/chattr.c 2021-01-10 11:50:16.000000000 +0000 @@ -48,10 +48,7 @@ #include "src/keybind-defaults.h" /* chattr_map */ -#include "midnight.h" /* current_panel */ -#include "panel.h" /* do_file_mark() */ - -#include "chattr.h" +#include "cmd.h" /* chattr_cmd(), chattr_get_as_str() */ /*** global variables ****************************************************************************/ @@ -122,7 +119,7 @@ * EXT4_EOFBLOCKS_FL 0x00400000 was here, unused * FS_NOCOW_FL 0x00800000 -- Do not cow file * EXT4_SNAPFILE_FL 0x01000000 -- Inode is a snapshot - * 0x02000000 -- unused yet + * FS_DAX_FL 0x02000000 -- Inode is DAX * EXT4_SNAPFILE_DELETED_FL 0x04000000 -- Snapshot is being deleted * EXT4_SNAPFILE_SHRUNK_FL 0x08000000 -- Snapshot shrink has completed * EXT4_INLINE_DATA_FL 0x10000000 -- Inode has inline data @@ -179,6 +176,12 @@ { EXT4_HUGE_FILE_FL, 'h', N_("Huge_file"), FALSE, FALSE }, #endif { FS_NOCOW_FL, 'C', N_("No COW"), FALSE, FALSE }, +#ifdef FS_DAX_FL + /* added in v1.45.7 + TODO: clarify version after ext2fsprogs release + ext2fsprogs 1dd48bc23c3776df76459aff0c7723fff850ea45 2020-07-28 */ + { FS_DAX_FL, 'x', N_("Direct access for files"), FALSE, FALSE }, +#endif #ifdef EXT4_CASEFOLD_FL /* added in v1.45.0 ext2fsprogs 1378bb6515e98a27f0f5c220381d49d20544204e 2018-12-01 */ @@ -865,6 +868,8 @@ break; default: + /* return MOU_UNHANDLED */ + event->result.abort = TRUE; break; } } @@ -938,7 +943,7 @@ /* --------------------------------------------------------------------------------------------- */ static WDialog * -chattr_dlg_create (const char *fname, unsigned long attr) +chattr_dlg_create (WPanel * panel, const char *fname, unsigned long attr) { const Widget *mw = CONST_WIDGET (midnight_dlg); gboolean single_set; @@ -958,7 +963,7 @@ cols = check_attr_width + cb_scrollbar_width; - single_set = (current_panel->marked < 2); + single_set = (panel->marked < 2); lines = 5 + checkboxes_lines + 4; if (!single_set) @@ -1073,12 +1078,12 @@ /* --------------------------------------------------------------------------------------------- */ static const char * -next_file (void) +next_file (const WPanel * panel) { - while (!current_panel->dir.list[current_file].f.marked) + while (!panel->dir.list[current_file].f.marked) current_file++; - return current_panel->dir.list[current_file].fname; + return panel->dir.list[current_file].fname; } /* --------------------------------------------------------------------------------------------- */ @@ -1128,7 +1133,7 @@ /* --------------------------------------------------------------------------------------------- */ static gboolean -do_chattr (const vfs_path_t * p, unsigned long m) +do_chattr (WPanel * panel, const vfs_path_t * p, unsigned long m) { gboolean ret; @@ -1137,7 +1142,7 @@ ret = try_chattr (vfs_path_as_str (p), m); - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); return ret; } @@ -1145,25 +1150,25 @@ /* --------------------------------------------------------------------------------------------- */ static void -chattr_apply_mask (vfs_path_t * vpath, unsigned long m) +chattr_apply_mask (WPanel * panel, vfs_path_t * vpath, unsigned long m) { gboolean ok; - if (!do_chattr (vpath, m)) + if (!do_chattr (panel, vpath, m)) return; do { const char *fname; - fname = next_file (); + fname = next_file (panel); ok = (fgetflags (fname, &m) == 0); if (!ok) { /* if current file was deleted outside mc -- try next file */ - /* decrease current_panel->marked */ - do_file_mark (current_panel, current_file, 0); + /* decrease panel->marked */ + do_file_mark (panel, current_file, 0); /* try next file */ ok = TRUE; @@ -1172,11 +1177,11 @@ { vpath = vfs_path_from_str (fname); flags = m; - ok = do_chattr (vpath, m); + ok = do_chattr (panel, vpath, m); vfs_path_free (vpath); } } - while (ok && current_panel->marked != 0); + while (ok && panel->marked != 0); } /* --------------------------------------------------------------------------------------------- */ @@ -1184,7 +1189,7 @@ /* --------------------------------------------------------------------------------------------- */ void -chattr_cmd (void) +chattr_cmd (WPanel * panel) { gboolean need_update = FALSE; gboolean end_chattr = FALSE; @@ -1214,10 +1219,10 @@ need_update = FALSE; end_chattr = FALSE; - if (current_panel->marked != 0) - fname = next_file (); /* next marked file */ + if (panel->marked != 0) + fname = next_file (panel); /* next marked file */ else - fname = selection (current_panel)->fname; /* single file */ + fname = selection (panel)->fname; /* single file */ vpath = vfs_path_from_str (fname); fname2 = vfs_path_as_str (vpath); @@ -1232,7 +1237,7 @@ flags_changed = FALSE; - ch_dlg = chattr_dlg_create (fname, flags); + ch_dlg = chattr_dlg_create (panel, fname, flags); result = dlg_run (ch_dlg); dlg_destroy (ch_dlg); @@ -1245,7 +1250,7 @@ case B_ENTER: if (flags_changed) { - if (current_panel->marked <= 1) + if (panel->marked <= 1) { /* single or last file */ if (fsetflags (fname2, flags) == -1 && !ignore_all) @@ -1278,7 +1283,7 @@ and_mask &= ~check_attr[i].flags; } - chattr_apply_mask (vpath, flags); + chattr_apply_mask (panel, vpath, flags); need_update = TRUE; end_chattr = TRUE; break; @@ -1291,7 +1296,7 @@ if (chattr_is_modifiable (i) && check_attr[i].selected) or_mask |= check_attr[i].flags; - chattr_apply_mask (vpath, flags); + chattr_apply_mask (panel, vpath, flags); need_update = TRUE; end_chattr = TRUE; break; @@ -1304,7 +1309,7 @@ if (chattr_is_modifiable (i) && check_attr[i].selected) and_mask &= ~check_attr[i].flags; - chattr_apply_mask (vpath, flags); + chattr_apply_mask (panel, vpath, flags); need_update = TRUE; end_chattr = TRUE; break; @@ -1313,16 +1318,16 @@ break; } - if (current_panel->marked != 0 && result != B_CANCEL) + if (panel->marked != 0 && result != B_CANCEL) { - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); need_update = TRUE; } vfs_path_free (vpath); } - while (current_panel->marked != 0 && !end_chattr); + while (panel->marked != 0 && !end_chattr); chattr_done (need_update); } diff -Nru mc-4.8.25/src/filemanager/chattr.h mc-4.8.26/src/filemanager/chattr.h --- mc-4.8.25/src/filemanager/chattr.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/chattr.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/** \file chattr.h - * \brief Header: chattr command - */ - -#ifndef MC__CHATTR_H -#define MC__CHATTR_H - -/*** typedefs(not structures) and defined constants **********************************************/ - -/*** enums ***************************************************************************************/ - -/*** structures declarations (and typedefs of structures)*****************************************/ - -/*** global variables defined in .c file *********************************************************/ - -/*** declarations of public functions ************************************************************/ - -void chattr_cmd (void); -const char *chattr_get_as_str (unsigned long attr); - -/*** inline functions ****************************************************************************/ - -#endif /* MC__CHATTR_H */ diff -Nru mc-4.8.25/src/filemanager/chmod.c mc-4.8.26/src/filemanager/chmod.c --- mc-4.8.25/src/filemanager/chmod.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/chmod.c 2021-01-10 11:50:16.000000000 +0000 @@ -40,9 +40,7 @@ #include "lib/util.h" #include "lib/widget.h" -#include "midnight.h" /* current_panel */ - -#include "chmod.h" +#include "cmd.h" /* chmod_cmd() */ /*** global variables ****************************************************************************/ @@ -302,7 +300,7 @@ /* --------------------------------------------------------------------------------------------- */ static WDialog * -chmod_dlg_create (const char *fname, const struct stat *sf_stat) +chmod_dlg_create (WPanel * panel, const char *fname, const struct stat *sf_stat) { gboolean single_set; WDialog *ch_dlg; @@ -316,7 +314,7 @@ mode_change = FALSE; - single_set = (current_panel->marked < 2); + single_set = (panel->marked < 2); perm_gb_len = check_perm_len + 2; file_gb_len = file_info_labels_len + 2; cols = str_term_width1 (fname) + 2 + 1; @@ -413,12 +411,12 @@ /* --------------------------------------------------------------------------------------------- */ static const char * -next_file (void) +next_file (const WPanel * panel) { - while (!current_panel->dir.list[current_file].f.marked) + while (!panel->dir.list[current_file].f.marked) current_file++; - return current_panel->dir.list[current_file].fname; + return panel->dir.list[current_file].fname; } /* --------------------------------------------------------------------------------------------- */ @@ -468,7 +466,7 @@ /* --------------------------------------------------------------------------------------------- */ static gboolean -do_chmod (const vfs_path_t * p, struct stat *sf) +do_chmod (WPanel * panel, const vfs_path_t * p, struct stat *sf) { gboolean ret; @@ -477,7 +475,7 @@ ret = try_chmod (p, sf->st_mode); - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); return ret; } @@ -485,26 +483,26 @@ /* --------------------------------------------------------------------------------------------- */ static void -apply_mask (vfs_path_t * vpath, struct stat *sf) +apply_mask (WPanel * panel, vfs_path_t * vpath, struct stat *sf) { gboolean ok; - if (!do_chmod (vpath, sf)) + if (!do_chmod (panel, vpath, sf)) return; do { const char *fname; - fname = next_file (); + fname = next_file (panel); vpath = vfs_path_from_str (fname); ok = (mc_stat (vpath, sf) == 0); if (!ok) { /* if current file was deleted outside mc -- try next file */ - /* decrease current_panel->marked */ - do_file_mark (current_panel, current_file, 0); + /* decrease panel->marked */ + do_file_mark (panel, current_file, 0); /* try next file */ ok = TRUE; @@ -513,12 +511,12 @@ { ch_mode = sf->st_mode; - ok = do_chmod (vpath, sf); + ok = do_chmod (panel, vpath, sf); } vfs_path_free (vpath); } - while (ok && current_panel->marked != 0); + while (ok && panel->marked != 0); } /* --------------------------------------------------------------------------------------------- */ @@ -526,7 +524,7 @@ /* --------------------------------------------------------------------------------------------- */ void -chmod_cmd (void) +chmod_cmd (WPanel * panel) { gboolean need_update; gboolean end_chmod; @@ -549,10 +547,10 @@ need_update = FALSE; end_chmod = FALSE; - if (current_panel->marked != 0) - fname = next_file (); /* next marked file */ + if (panel->marked != 0) + fname = next_file (panel); /* next marked file */ else - fname = selection (current_panel)->fname; /* single file */ + fname = selection (panel)->fname; /* single file */ vpath = vfs_path_from_str (fname); @@ -564,7 +562,7 @@ ch_mode = sf_stat.st_mode; - ch_dlg = chmod_dlg_create (fname, &sf_stat); + ch_dlg = chmod_dlg_create (panel, fname, &sf_stat); result = dlg_run (ch_dlg); switch (result) @@ -576,7 +574,7 @@ case B_ENTER: if (mode_change) { - if (current_panel->marked <= 1) + if (panel->marked <= 1) { /* single or last file */ if (mc_chmod (vpath, ch_mode) == -1 && !ignore_all) @@ -609,7 +607,7 @@ and_mask &= ~check_perm[i].mode; } - apply_mask (vpath, &sf_stat); + apply_mask (panel, vpath, &sf_stat); need_update = TRUE; end_chmod = TRUE; break; @@ -622,7 +620,7 @@ if (check_perm[i].selected) or_mask |= check_perm[i].mode; - apply_mask (vpath, &sf_stat); + apply_mask (panel, vpath, &sf_stat); need_update = TRUE; end_chmod = TRUE; break; @@ -635,7 +633,7 @@ if (check_perm[i].selected) and_mask &= ~check_perm[i].mode; - apply_mask (vpath, &sf_stat); + apply_mask (panel, vpath, &sf_stat); need_update = TRUE; end_chmod = TRUE; break; @@ -644,9 +642,9 @@ break; } - if (current_panel->marked != 0 && result != B_CANCEL) + if (panel->marked != 0 && result != B_CANCEL) { - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); need_update = TRUE; } @@ -654,7 +652,7 @@ dlg_destroy (ch_dlg); } - while (current_panel->marked != 0 && !end_chmod); + while (panel->marked != 0 && !end_chmod); chmod_done (need_update); } diff -Nru mc-4.8.25/src/filemanager/chmod.h mc-4.8.26/src/filemanager/chmod.h --- mc-4.8.25/src/filemanager/chmod.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/chmod.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -/** \file chmod.h - * \brief Header: chmod command - */ - -#ifndef MC__CHMOD_H -#define MC__CHMOD_H - -/*** typedefs(not structures) and defined constants **********************************************/ - -/*** enums ***************************************************************************************/ - -/*** structures declarations (and typedefs of structures)*****************************************/ - -/*** global variables defined in .c file *********************************************************/ - -/*** declarations of public functions ************************************************************/ - -void chmod_cmd (void); - -/*** inline functions ****************************************************************************/ -#endif /* MC__CHMOD_H */ diff -Nru mc-4.8.25/src/filemanager/chown.c mc-4.8.26/src/filemanager/chown.c --- mc-4.8.25/src/filemanager/chown.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/chown.c 2021-01-10 11:50:16.000000000 +0000 @@ -45,9 +45,8 @@ #include "lib/widget.h" #include "src/setup.h" /* panels_options */ -#include "midnight.h" /* current_panel */ -#include "chown.h" +#include "cmd.h" /* chown_cmd() */ /*** global variables ****************************************************************************/ @@ -187,7 +186,7 @@ /* --------------------------------------------------------------------------------------------- */ static WDialog * -chown_dlg_create (void) +chown_dlg_create (WPanel * panel) { int single_set; WDialog *ch_dlg; @@ -197,7 +196,7 @@ struct passwd *l_pass; struct group *l_grp; - single_set = (current_panel->marked < 2) ? 3 : 0; + single_set = (panel->marked < 2) ? 3 : 0; lines = GH + 4 + (single_set != 0 ? 2 : 4); cols = GW * 3 + 2 + 6; @@ -285,12 +284,12 @@ /* --------------------------------------------------------------------------------------------- */ static const char * -next_file (void) +next_file (const WPanel * panel) { - while (!current_panel->dir.list[current_file].f.marked) + while (!panel->dir.list[current_file].f.marked) current_file++; - return current_panel->dir.list[current_file].fname; + return panel->dir.list[current_file].fname; } /* --------------------------------------------------------------------------------------------- */ @@ -340,13 +339,13 @@ /* --------------------------------------------------------------------------------------------- */ static gboolean -do_chown (const vfs_path_t * p, uid_t u, gid_t g) +do_chown (WPanel * panel, const vfs_path_t * p, uid_t u, gid_t g) { gboolean ret; ret = try_chown (p, u, g); - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); return ret; } @@ -354,11 +353,11 @@ /* --------------------------------------------------------------------------------------------- */ static void -apply_chowns (vfs_path_t * vpath, uid_t u, gid_t g) +apply_chowns (WPanel * panel, vfs_path_t * vpath, uid_t u, gid_t g) { gboolean ok; - if (!do_chown (vpath, u, g)) + if (!do_chown (panel, vpath, u, g)) return; do @@ -366,25 +365,25 @@ const char *fname; struct stat sf; - fname = next_file (); + fname = next_file (panel); vpath = vfs_path_from_str (fname); ok = (mc_stat (vpath, &sf) == 0); if (!ok) { /* if current file was deleted outside mc -- try next file */ - /* decrease current_panel->marked */ - do_file_mark (current_panel, current_file, 0); + /* decrease panel->marked */ + do_file_mark (panel, current_file, 0); /* try next file */ ok = TRUE; } else - ok = do_chown (vpath, u, g); + ok = do_chown (panel, vpath, u, g); vfs_path_free (vpath); } - while (ok && current_panel->marked != 0); + while (ok && panel->marked != 0); } /* --------------------------------------------------------------------------------------------- */ @@ -392,7 +391,7 @@ /* --------------------------------------------------------------------------------------------- */ void -chown_cmd (void) +chown_cmd (WPanel * panel) { gboolean need_update; gboolean end_chown; @@ -418,10 +417,10 @@ need_update = FALSE; end_chown = FALSE; - if (current_panel->marked != 0) - fname = next_file (); /* next marked file */ + if (panel->marked != 0) + fname = next_file (panel); /* next marked file */ else - fname = selection (current_panel)->fname; /* single file */ + fname = selection (panel)->fname; /* single file */ vpath = vfs_path_from_str (fname); @@ -431,7 +430,7 @@ break; } - ch_dlg = chown_dlg_create (); + ch_dlg = chown_dlg_create (panel); /* select in listboxes */ listbox_select_entry (l_user, listbox_search_text (l_user, get_owner (sf_stat.st_uid))); @@ -469,7 +468,7 @@ new_user = user->pw_uid; if (result == B_ENTER) { - if (current_panel->marked <= 1) + if (panel->marked <= 1) { /* single or last file */ if (mc_chown (vpath, new_user, new_group) == -1) @@ -486,7 +485,7 @@ } else { - apply_chowns (vpath, new_user, new_group); + apply_chowns (panel, vpath, new_user, new_group); end_chown = TRUE; } @@ -504,7 +503,7 @@ if (user != NULL) { new_user = user->pw_uid; - apply_chowns (vpath, new_user, new_group); + apply_chowns (panel, vpath, new_user, new_group); need_update = TRUE; end_chown = TRUE; } @@ -521,7 +520,7 @@ if (grp != NULL) { new_group = grp->gr_gid; - apply_chowns (vpath, new_user, new_group); + apply_chowns (panel, vpath, new_user, new_group); need_update = TRUE; end_chown = TRUE; } @@ -532,9 +531,9 @@ break; } - if (current_panel->marked != 0 && result != B_CANCEL) + if (panel->marked != 0 && result != B_CANCEL) { - do_file_mark (current_panel, current_file, 0); + do_file_mark (panel, current_file, 0); need_update = TRUE; } @@ -542,7 +541,7 @@ dlg_destroy (ch_dlg); } - while (current_panel->marked != 0 && !end_chown); + while (panel->marked != 0 && !end_chown); chown_done (need_update); } diff -Nru mc-4.8.25/src/filemanager/chown.h mc-4.8.26/src/filemanager/chown.h --- mc-4.8.25/src/filemanager/chown.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/chown.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -/** \file chown.h - * \brief Header: chown command - */ - -#ifndef MC__CHOWN_H -#define MC__CHOWN_H - -/*** typedefs(not structures) and defined constants **********************************************/ - -/*** enums ***************************************************************************************/ - -/*** structures declarations (and typedefs of structures)*****************************************/ - -/*** global variables defined in .c file *********************************************************/ - -/*** declarations of public functions ************************************************************/ - -void chown_cmd (void); - -/*** inline functions ****************************************************************************/ -#endif /* MC__CHOWN_H */ diff -Nru mc-4.8.25/src/filemanager/cmd.c mc-4.8.26/src/filemanager/cmd.c --- mc-4.8.25/src/filemanager/cmd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/cmd.c 2021-01-10 11:50:16.000000000 +0000 @@ -85,12 +85,13 @@ #include "hotlist.h" /* hotlist_show() */ #include "panel.h" /* WPanel */ #include "tree.h" /* tree_chdir() */ -#include "midnight.h" /* change_panel() */ +#include "filemanager.h" /* change_panel() */ #include "command.h" /* cmdline */ #include "layout.h" /* get_current_type() */ #include "ext.h" /* regex_command() */ #include "boxes.h" /* cd_box() */ #include "dir.h" +#include "cd.h" /* cd_to() */ #include "cmd.h" /* Our definitions */ @@ -124,23 +125,23 @@ /* --------------------------------------------------------------------------------------------- */ /** * Run viewer (internal or external) on the currently selected file. - * If normal is TRUE, force internal viewer and raw mode (used for F13). + * If @plain_view is TRUE, force internal viewer and raw mode (used for F13). */ static void -do_view_cmd (gboolean normal) +do_view_cmd (WPanel * panel, gboolean plain_view) { /* Directories are viewed by changing to them */ - if (S_ISDIR (selection (current_panel)->st.st_mode) || link_isdir (selection (current_panel))) + if (S_ISDIR (selection (panel)->st.st_mode) || link_isdir (selection (panel))) { vfs_path_t *fname_vpath; - if (confirm_view_dir && (current_panel->marked != 0 || current_panel->dirs_marked != 0) && + if (confirm_view_dir && (panel->marked != 0 || panel->dirs_marked != 0) && query_dialog (_("Confirmation"), _("Files tagged, want to cd?"), D_NORMAL, 2, _("&Yes"), _("&No")) != 0) return; - fname_vpath = vfs_path_from_str (selection (current_panel)->fname); - if (!do_cd (fname_vpath, cd_exact)) + fname_vpath = vfs_path_from_str (selection (panel)->fname); + if (!panel_cd (panel, fname_vpath, cd_exact)) message (D_ERROR, MSG_ERROR, _("Cannot change directory")); vfs_path_free (fname_vpath); } @@ -149,9 +150,9 @@ int file_idx; vfs_path_t *filename_vpath; - file_idx = current_panel->selected; - filename_vpath = vfs_path_from_str (current_panel->dir.list[file_idx].fname); - view_file (filename_vpath, normal, use_internal_view); + file_idx = panel->selected; + filename_vpath = vfs_path_from_str (panel->dir.list[file_idx].fname); + view_file (filename_vpath, plain_view, use_internal_view); vfs_path_free (filename_vpath); } @@ -459,7 +460,7 @@ create_panel (MENU_PANEL_IDX, view_listing); cd_vpath = vfs_path_from_str_flags (cd_path, VPF_NO_CANON); - if (!do_panel_cd (MENU_PANEL, cd_vpath, cd_parse_command)) + if (!panel_do_cd (MENU_PANEL, cd_vpath, cd_parse_command)) { message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\""), cd_path); @@ -470,7 +471,7 @@ } g_free (cd_path); - /* In case of passive panel, restore current VFS directory that was changed in do_panel_cd() */ + /* In case of passive panel, restore current VFS directory that was changed in panel_do_cd() */ if (MENU_PANEL != current_panel) (void) mc_chdir (current_panel->cwd_vpath); } @@ -609,23 +610,23 @@ /** Run user's preferred viewer on the currently selected file */ void -view_cmd (void) +view_cmd (WPanel * panel) { - do_view_cmd (FALSE); + do_view_cmd (panel, FALSE); } /* --------------------------------------------------------------------------------------------- */ /** Ask for file and run user's preferred viewer on it */ void -view_file_cmd (void) +view_file_cmd (const WPanel * panel) { char *filename; vfs_path_t *vpath; filename = input_expand_dialog (_("View file"), _("Filename:"), - MC_HISTORY_FM_VIEW_FILE, selection (current_panel)->fname, + MC_HISTORY_FM_VIEW_FILE, selection (panel)->fname, INPUT_COMPLETE_FILENAMES); if (filename == NULL) return; @@ -639,21 +640,21 @@ /* --------------------------------------------------------------------------------------------- */ /** Run plain internal viewer on the currently selected file */ void -view_raw_cmd (void) +view_raw_cmd (WPanel * panel) { - do_view_cmd (TRUE); + do_view_cmd (panel, TRUE); } /* --------------------------------------------------------------------------------------------- */ void -view_filtered_cmd (void) +view_filtered_cmd (const WPanel * panel) { char *command; const char *initial_command; if (input_is_empty (cmdline)) - initial_command = selection (current_panel)->fname; + initial_command = selection (panel)->fname; else initial_command = cmdline->buffer; @@ -711,11 +712,11 @@ /* --------------------------------------------------------------------------------------------- */ void -edit_cmd (void) +edit_cmd (const WPanel * panel) { vfs_path_t *fname; - fname = vfs_path_from_str (selection (current_panel)->fname); + fname = vfs_path_from_str (selection (panel)->fname); if (regex_command (fname, "Edit") == 0) do_edit (fname); vfs_path_free (fname); @@ -725,11 +726,11 @@ #ifdef USE_INTERNAL_EDIT void -edit_cmd_force_internal (void) +edit_cmd_force_internal (const WPanel * panel) { vfs_path_t *fname; - fname = vfs_path_from_str (selection (current_panel)->fname); + fname = vfs_path_from_str (selection (panel)->fname); if (regex_command (fname, "Edit") == 0) edit_file_at_line (fname, TRUE, 1); vfs_path_free (fname); @@ -770,11 +771,11 @@ /** Invoked by F5. Copy, default to the other panel. */ void -copy_cmd (void) +copy_cmd (WPanel * panel) { save_cwds_stat (); - if (panel_operate (current_panel, OP_COPY, FALSE)) + if (panel_operate (panel, OP_COPY, FALSE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); @@ -785,11 +786,11 @@ /** Invoked by F6. Move/rename, default to the other panel, ignore marks. */ void -rename_cmd (void) +rename_cmd (WPanel * panel) { save_cwds_stat (); - if (panel_operate (current_panel, OP_MOVE, FALSE)) + if (panel_operate (panel, OP_MOVE, FALSE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); @@ -800,11 +801,11 @@ /** Invoked by F15. Copy, default to the same panel, ignore marks. */ void -copy_cmd_local (void) +copy_cmd_local (WPanel * panel) { save_cwds_stat (); - if (panel_operate (current_panel, OP_COPY, TRUE)) + if (panel_operate (panel, OP_COPY, TRUE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); @@ -815,11 +816,11 @@ /** Invoked by F16. Move/rename, default to the same panel. */ void -rename_cmd_local (void) +rename_cmd_local (WPanel * panel) { save_cwds_stat (); - if (panel_operate (current_panel, OP_MOVE, TRUE)) + if (panel_operate (panel, OP_MOVE, TRUE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); @@ -829,14 +830,14 @@ /* --------------------------------------------------------------------------------------------- */ void -mkdir_cmd (void) +mkdir_cmd (WPanel * panel) { char *dir; const char *name = ""; /* If 'on' then automatically fills name with current selected item name */ - if (auto_fill_mkdir_name && !DIR_IS_DOTDOT (selection (current_panel)->fname)) - name = selection (current_panel)->fname; + if (auto_fill_mkdir_name && !DIR_IS_DOTDOT (selection (panel)->fname)) + name = selection (panel)->fname; dir = input_expand_dialog (_("Create a new Directory"), @@ -858,7 +859,7 @@ if (dir[0] == '\\' && dir[1] == '~') tmpdir = dir + 1; - absdir = vfs_path_append_new (current_panel->cwd_vpath, tmpdir, (char *) NULL); + absdir = vfs_path_append_new (panel->cwd_vpath, tmpdir, (char *) NULL); } save_cwds_stat (); @@ -869,7 +870,7 @@ { update_panels (UP_OPTIMIZE, dir); repaint_screen (); - select_item (current_panel); + select_item (panel); } vfs_path_free (absdir); @@ -880,11 +881,11 @@ /* --------------------------------------------------------------------------------------------- */ void -delete_cmd (void) +delete_cmd (WPanel * panel) { save_cwds_stat (); - if (panel_operate (current_panel, OP_DELETE, FALSE)) + if (panel_operate (panel, OP_DELETE, FALSE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); @@ -895,11 +896,11 @@ /** Invoked by F18. Remove selected file, regardless of marked files. */ void -delete_cmd_local (void) +delete_cmd_local (WPanel * panel) { save_cwds_stat (); - if (panel_operate (current_panel, OP_DELETE, TRUE)) + if (panel_operate (panel, OP_DELETE, TRUE)) { update_panels (UP_OPTIMIZE, UP_KEEPSEL); repaint_screen (); @@ -1080,11 +1081,11 @@ /* --------------------------------------------------------------------------------------------- */ void -hotlist_cmd (void) +hotlist_cmd (WPanel * panel) { char *target; - target = hotlist_show (LIST_HOTLIST); + target = hotlist_show (LIST_HOTLIST, panel); if (target == NULL) return; @@ -1099,14 +1100,12 @@ else { vfs_path_t *deprecated_vpath; - char *cmd; + const char *deprecated_path; deprecated_vpath = vfs_path_from_str_flags (target, VPF_USE_DEPRECATED_PARSER); - cmd = g_strconcat ("cd ", vfs_path_as_str (deprecated_vpath), (char *) NULL); + deprecated_path = vfs_path_as_str (deprecated_vpath); + cd_to (deprecated_path); vfs_path_free (deprecated_vpath); - - do_cd_command (cmd); - g_free (cmd); } g_free (target); @@ -1116,17 +1115,17 @@ #ifdef ENABLE_VFS void -vfs_list (void) +vfs_list (WPanel * panel) { char *target; vfs_path_t *target_vpath; - target = hotlist_show (LIST_VFSLIST); + target = hotlist_show (LIST_VFSLIST, panel); if (target == NULL) return; target_vpath = vfs_path_from_str (target); - if (!do_cd (target_vpath, cd_exact)) + if (!panel_cd (current_panel, target_vpath, cd_exact)) message (D_ERROR, MSG_ERROR, _("Cannot change directory")); vfs_path_free (target_vpath); g_free (target); @@ -1275,7 +1274,7 @@ { ev_help_t event_data = { NULL, NULL }; - if (current_panel->searching) + if (current_panel->quick_search.active) event_data.node = "[Quick search]"; else event_data.node = "[main]"; @@ -1352,19 +1351,13 @@ /* --------------------------------------------------------------------------------------------- */ void -quick_cd_cmd (void) +quick_cd_cmd (WPanel * panel) { char *p; - p = cd_box (); + p = cd_box (panel); if (p != NULL && *p != '\0') - { - char *q; - - q = g_strconcat ("cd ", p, (char *) NULL); - do_cd_command (q); - g_free (q); - } + cd_to (p); g_free (p); } @@ -1380,27 +1373,23 @@ */ void -smart_dirsize_cmd (void) +smart_dirsize_cmd (WPanel * panel) { - WPanel *panel = current_panel; - file_entry_t *entry; + const file_entry_t *entry = &panel->dir.list[panel->selected]; - entry = &(panel->dir.list[panel->selected]); if ((S_ISDIR (entry->st.st_mode) && DIR_IS_DOTDOT (entry->fname)) || panel->dirs_marked) - dirsizes_cmd (); + dirsizes_cmd (panel); else - single_dirsize_cmd (); + single_dirsize_cmd (panel); } /* --------------------------------------------------------------------------------------------- */ void -single_dirsize_cmd (void) +single_dirsize_cmd (WPanel * panel) { - WPanel *panel = current_panel; - file_entry_t *entry; + file_entry_t *entry = &panel->dir.list[panel->selected]; - entry = &(panel->dir.list[panel->selected]); if (S_ISDIR (entry->st.st_mode) && !DIR_IS_DOTDOT (entry->fname)) { size_t dir_count = 0; @@ -1415,7 +1404,7 @@ status_msg_init (STATUS_MSG (&dsm), _("Directory scanning"), 0, dirsize_status_init_cb, dirsize_status_update_cb, dirsize_status_deinit_cb); - if (compute_dir_size (p, &dsm, &dir_count, &count, &total, TRUE) == FILE_CONT) + if (compute_dir_size (p, &dsm, &dir_count, &count, &total, FALSE) == FILE_CONT) { entry->st.st_size = (off_t) total; entry->f.dir_size_computed = 1; @@ -1431,18 +1420,17 @@ recalculate_panel_summary (panel); - if (current_panel->sort_field->sort_routine == (GCompareFunc) sort_size) + if (panel->sort_field->sort_routine == (GCompareFunc) sort_size) panel_re_sort (panel); - panel->dirty = 1; + panel->dirty = TRUE; } /* --------------------------------------------------------------------------------------------- */ void -dirsizes_cmd (void) +dirsizes_cmd (WPanel * panel) { - WPanel *panel = current_panel; int i; dirsize_status_msg_t dsm; @@ -1462,7 +1450,7 @@ gboolean ok; p = vfs_path_from_str (panel->dir.list[i].fname); - ok = compute_dir_size (p, &dsm, &dir_count, &count, &total, TRUE) != FILE_CONT; + ok = compute_dir_size (p, &dsm, &dir_count, &count, &total, FALSE) != FILE_CONT; vfs_path_free (p); if (ok) break; @@ -1475,10 +1463,10 @@ recalculate_panel_summary (panel); - if (current_panel->sort_field->sort_routine == (GCompareFunc) sort_size) + if (panel->sort_field->sort_routine == (GCompareFunc) sort_size) panel_re_sort (panel); - panel->dirty = 1; + panel->dirty = TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -1588,7 +1576,7 @@ quick_view_cmd (void) { if (PANEL (get_panel_widget (MENU_PANEL_IDX)) == current_panel) - change_panel (); + (void) change_panel (); create_panel (MENU_PANEL_IDX, view_quick); } diff -Nru mc-4.8.25/src/filemanager/cmd.h mc-4.8.26/src/filemanager/cmd.h --- mc-4.8.25/src/filemanager/cmd.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/cmd.h 2021-01-10 11:50:16.000000000 +0000 @@ -9,6 +9,8 @@ #include "lib/global.h" +#include "panel.h" + /*** typedefs(not structures) and defined constants **********************************************/ /*** enums ***************************************************************************************/ @@ -40,37 +42,37 @@ #endif void undelete_cmd (void); void help_cmd (void); -void smart_dirsize_cmd (void); -void single_dirsize_cmd (void); -void dirsizes_cmd (void); +void smart_dirsize_cmd (WPanel * panel); +void single_dirsize_cmd (WPanel * panel); +void dirsizes_cmd (WPanel * panel); gboolean view_file_at_line (const vfs_path_t * filename_vpath, gboolean plain_view, gboolean internal, long start_line, off_t search_start, off_t search_end); -gboolean view_file (const vfs_path_t * filename_vpath, gboolean normal, gboolean internal); -void view_cmd (void); -void view_file_cmd (void); -void view_raw_cmd (void); -void view_filtered_cmd (void); +gboolean view_file (const vfs_path_t * filename_vpath, gboolean plain_view, gboolean internal); +void view_cmd (WPanel * panel); +void view_file_cmd (const WPanel * panel); +void view_raw_cmd (WPanel * panel); +void view_filtered_cmd (const WPanel * panel); void edit_file_at_line (const vfs_path_t * what_vpath, gboolean internal, long start_line); -void edit_cmd (void); +void edit_cmd (const WPanel * panel); void edit_cmd_new (void); #ifdef USE_INTERNAL_EDIT -void edit_cmd_force_internal (void); +void edit_cmd_force_internal (const WPanel * panel); #endif -void copy_cmd (void); -void copy_cmd_local (void); -void rename_cmd (void); -void rename_cmd_local (void); -void mkdir_cmd (void); -void delete_cmd (void); -void delete_cmd_local (void); +void copy_cmd (WPanel * panel); +void copy_cmd_local (WPanel * panel); +void rename_cmd (WPanel * panel); +void rename_cmd_local (WPanel * panel); +void mkdir_cmd (WPanel * panel); +void delete_cmd (WPanel * panel); +void delete_cmd_local (WPanel * panel); void filter_cmd (void); void reread_cmd (void); -void vfs_list (void); +void vfs_list (WPanel * panel); void ext_cmd (void); void edit_mc_menu_cmd (void); void edit_fhl_cmd (void); -void hotlist_cmd (void); +void hotlist_cmd (WPanel * panel); void compare_dirs_cmd (void); #ifdef USE_DIFF_VIEW void diff_view_cmd (void); @@ -79,7 +81,7 @@ void link_cmd (link_type_t link_type); void edit_symlink_cmd (void); void swap_cmd (void); -void quick_cd_cmd (void); +void quick_cd_cmd (WPanel * panel); void save_setup_cmd (void); void user_file_menu_cmd (void); void info_cmd (void); @@ -91,8 +93,19 @@ #ifdef HAVE_CHARSET void encoding_cmd (void); #endif +/* achown.c */ +void advanced_chown_cmd (WPanel * panel); +/* chmod.c */ +void chmod_cmd (WPanel * panel); +/* chown.c */ +void chown_cmd (WPanel * panel); +#ifdef ENABLE_EXT2FS_ATTR +/* chattr.c */ +void chattr_cmd (WPanel * panel); +const char *chattr_get_as_str (unsigned long attr); +#endif /* find.c */ -void find_cmd (void); +void find_cmd (WPanel * panel); /*** inline functions ****************************************************************************/ #endif /* MC__CMD_H */ diff -Nru mc-4.8.25/src/filemanager/command.c mc-4.8.26/src/filemanager/command.c --- mc-4.8.25/src/filemanager/command.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/command.c 2021-01-10 11:50:16.000000000 +0000 @@ -9,6 +9,7 @@ Written by: Slava Zanko , 2013 + Andrew Borodin , 2020 This file is part of the Midnight Commander. @@ -33,27 +34,23 @@ #include #include -#include #include -#include "lib/global.h" /* home_dir */ -#include "lib/tty/tty.h" -#include "lib/vfs/vfs.h" -#include "lib/strescape.h" +#include "lib/global.h" +#include "lib/vfs/vfs.h" /* vfs_current_is_local() */ #include "lib/skin.h" /* DEFAULT_COLOR */ -#include "lib/util.h" +#include "lib/util.h" /* whitespace() */ #include "lib/widget.h" #include "src/setup.h" /* quit */ #ifdef ENABLE_SUBSHELL #include "src/subshell/subshell.h" #endif -#include "src/execute.h" /* shell_execute */ -#include "src/usermenu.h" /* expand_format */ +#include "src/execute.h" /* shell_execute() */ +#include "src/usermenu.h" /* expand_format() */ -#include "midnight.h" /* current_panel */ -#include "layout.h" /* command_prompt */ -#include "tree.h" /* sync_tree() */ +#include "filemanager.h" /* quiet_quit_cmd(), layout.h */ +#include "cd.h" /* cd_to() */ #include "command.h" @@ -64,8 +61,6 @@ /*** file scope macro definitions ****************************************************************/ -#define CD_OPERAND_OFFSET 3 - /*** file scope type declarations ****************************************************************/ /*** file scope variables ************************************************************************/ @@ -77,159 +72,6 @@ /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ -/** - * Expand the argument to "cd" and change directory. First try tilde - * expansion, then variable substitution. If the CDPATH variable is set - * (e.g. CDPATH=".:~:/usr"), try all the paths contained there. - * We do not support such rare substitutions as ${var:-value} etc. - * No quoting is implemented here, so ${VAR} and $VAR will be always - * substituted. Wildcards are not supported either. - * Advanced users should be encouraged to use "\cd" instead of "cd" if - * they want the behavior they are used to in the shell. - * - * @param _path string to examine - * @return newly allocated string - */ - -static char * -examine_cd (const char *_path) -{ - /* *INDENT-OFF* */ - typedef enum - { - copy_sym, - subst_var - } state_t; - /* *INDENT-ON* */ - - state_t state = copy_sym; - GString *q; - char *path_tilde, *path; - char *p; - - /* Tilde expansion */ - path = strutils_shell_unescape (_path); - path_tilde = tilde_expand (path); - g_free (path); - - q = g_string_sized_new (32); - - /* Variable expansion */ - for (p = path_tilde; *p != '\0';) - { - switch (state) - { - case copy_sym: - if (p[0] == '\\' && p[1] == '$') - { - g_string_append_c (q, '$'); - p += 2; - } - else if (p[0] != '$' || p[1] == '[' || p[1] == '(') - { - g_string_append_c (q, *p); - p++; - } - else - state = subst_var; - break; - - case subst_var: - { - char *s = NULL; - char c; - const char *t = NULL; - - /* skip dollar */ - p++; - - if (p[0] == '{') - { - p++; - s = strchr (p, '}'); - } - if (s == NULL) - s = strchr (p, PATH_SEP); - if (s == NULL) - s = strchr (p, '\0'); - c = *s; - *s = '\0'; - t = getenv (p); - *s = c; - if (t == NULL) - { - g_string_append_c (q, '$'); - if (p[-1] != '$') - g_string_append_c (q, '{'); - } - else - { - g_string_append (q, t); - p = s; - if (*s == '}') - p++; - } - - state = copy_sym; - break; - } - - default: - break; - } - } - - g_free (path_tilde); - - return g_string_free (q, FALSE); -} - -/* --------------------------------------------------------------------------------------------- */ - -/* CDPATH handling */ -static gboolean -handle_cdpath (const char *path) -{ - gboolean result = FALSE; - - /* CDPATH handling */ - if (!IS_PATH_SEP (*path)) - { - char *cdpath, *p; - char c; - - cdpath = g_strdup (getenv ("CDPATH")); - p = cdpath; - c = (p == NULL) ? '\0' : ':'; - - while (!result && c == ':') - { - char *s; - - s = strchr (p, ':'); - if (s == NULL) - s = strchr (p, '\0'); - c = *s; - *s = '\0'; - if (*p != '\0') - { - vfs_path_t *r_vpath; - - r_vpath = vfs_path_build_filename (p, path, (char *) NULL); - result = do_cd (r_vpath, cd_parse_command); - vfs_path_free (r_vpath); - } - *s = c; - p = s + 1; - } - g_free (cdpath); - } - - return result; -} - -/* --------------------------------------------------------------------------------------------- */ - /** Handle Enter on the command line * * @param lc_cmdline string for handling @@ -251,9 +93,9 @@ if (*cmd == '\0') return MSG_HANDLED; - if (strncmp (cmd, "cd ", 3) == 0 || strcmp (cmd, "cd") == 0) + if (strncmp (cmd, "cd", 2) == 0 && (cmd[2] == '\0' || whitespace (cmd[2]))) { - do_cd_command (cmd); + cd_to (cmd + 2); input_clean (lc_cmdline); return MSG_HANDLED; } @@ -353,109 +195,6 @@ /*** public functions ****************************************************************************/ /* --------------------------------------------------------------------------------------------- */ -/** Execute the cd command on the command line - * - * @param orig_cmd command for execution - */ - -void -do_cd_command (char *orig_cmd) -{ - int len; - int operand_pos = CD_OPERAND_OFFSET; - const char *cmd; - - /* Any final whitespace should be removed here - (to see why, try "cd fred "). */ - /* NOTE: I think we should not remove the extra space, - that way, we can cd into hidden directories */ - /* FIXME: what about interpreting quoted strings like the shell. - so one could type "cd M-a " and it would work. */ - len = strlen (orig_cmd) - 1; - while (len >= 0 && whiteness (orig_cmd[len])) - { - orig_cmd[len] = '\0'; - len--; - } - - cmd = orig_cmd; - if (cmd[CD_OPERAND_OFFSET - 1] == '\0') - cmd = "cd "; /* 0..2 => given text, 3 => \0 */ - - /* allow any amount of white space in front of the path operand */ - while (whitespace (cmd[operand_pos])) - operand_pos++; - - if (get_current_type () == view_tree) - { - vfs_path_t *new_vpath = NULL; - - if (cmd[0] == '\0') - { - new_vpath = vfs_path_from_str (mc_config_get_home_dir ()); - sync_tree (new_vpath); - } - else if (DIR_IS_DOTDOT (cmd + operand_pos)) - { - if (vfs_path_elements_count (current_panel->cwd_vpath) != 1 || - strlen (vfs_path_get_by_index (current_panel->cwd_vpath, 0)->path) > 1) - { - vfs_path_t *tmp_vpath = current_panel->cwd_vpath; - - current_panel->cwd_vpath = - vfs_path_vtokens_get (tmp_vpath, 0, vfs_path_tokens_count (tmp_vpath) - 1); - vfs_path_free (tmp_vpath); - } - sync_tree (current_panel->cwd_vpath); - } - else - { - if (IS_PATH_SEP (cmd[operand_pos])) - new_vpath = vfs_path_from_str (cmd + operand_pos); - else - new_vpath = - vfs_path_append_new (current_panel->cwd_vpath, cmd + operand_pos, - (char *) NULL); - - sync_tree (new_vpath); - } - - vfs_path_free (new_vpath); - } - else - { - char *path; - vfs_path_t *q_vpath; - gboolean ok; - - path = examine_cd (&cmd[operand_pos]); - - if (*path == '\0') - q_vpath = vfs_path_from_str (mc_config_get_home_dir ()); - else - q_vpath = vfs_path_from_str_flags (path, VPF_NO_CANON); - - ok = do_cd (q_vpath, cd_parse_command); - if (!ok) - ok = handle_cdpath (path); - - if (!ok) - { - char *d; - - d = vfs_path_to_str_flags (q_vpath, 0, VPF_STRIP_PASSWORD); - message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"), d, - unix_error_string (errno)); - g_free (d); - } - - vfs_path_free (q_vpath); - g_free (path); - } -} - -/* --------------------------------------------------------------------------------------------- */ - WInput * command_new (int y, int x, int cols) { diff -Nru mc-4.8.25/src/filemanager/command.h mc-4.8.26/src/filemanager/command.h --- mc-4.8.25/src/filemanager/command.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/command.h 2021-01-10 11:50:16.000000000 +0000 @@ -21,7 +21,6 @@ WInput *command_new (int y, int x, int len); void command_set_default_colors (void); -void do_cd_command (char *cmd); void command_insert (WInput * in, const char *text, gboolean insert_extra_space); /*** inline functions ****************************************************************************/ diff -Nru mc-4.8.25/src/filemanager/dir.c mc-4.8.26/src/filemanager/dir.c --- mc-4.8.25/src/filemanager/dir.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/dir.c 2021-01-10 11:50:16.000000000 +0000 @@ -145,7 +145,7 @@ */ static gboolean -handle_dirent (struct dirent *dp, const char *fltr, struct stat *buf1, gboolean * link_to_dir, +handle_dirent (struct vfs_dirent *dp, const char *fltr, struct stat *buf1, gboolean * link_to_dir, gboolean * stale_link) { vfs_path_t *vpath; @@ -393,7 +393,7 @@ if (ad == bd || panels_options.mix_all_files) { - int result = a->st.st_mtime < b->st.st_mtime ? -1 : a->st.st_mtime > b->st.st_mtime; + int result = _GL_CMP (a->st.st_mtime, b->st.st_mtime); if (result != 0) return result * reverse; @@ -414,7 +414,7 @@ if (ad == bd || panels_options.mix_all_files) { - int result = a->st.st_ctime < b->st.st_ctime ? -1 : a->st.st_ctime > b->st.st_ctime; + int result = _GL_CMP (a->st.st_ctime, b->st.st_ctime); if (result != 0) return result * reverse; @@ -435,7 +435,7 @@ if (ad == bd || panels_options.mix_all_files) { - int result = a->st.st_atime < b->st.st_atime ? -1 : a->st.st_atime > b->st.st_atime; + int result = _GL_CMP (a->st.st_atime, b->st.st_atime); if (result != 0) return result * reverse; @@ -470,7 +470,7 @@ if (ad == bd || panels_options.mix_all_files) { - int result = a->st.st_size < b->st.st_size ? -1 : a->st.st_size > b->st.st_size; + int result = _GL_CMP (a->st.st_size, b->st.st_size); if (result != 0) return result * reverse; @@ -624,7 +624,7 @@ const dir_sort_options_t * sort_op, const char *fltr) { DIR *dirp; - struct dirent *dp; + struct vfs_dirent *dp; struct stat st; file_entry_t *fentry; const char *vpath_str; @@ -697,7 +697,7 @@ const dir_sort_options_t * sort_op, const char *fltr) { DIR *dirp; - struct dirent *dp; + struct vfs_dirent *dp; int i; struct stat st; int marked_cnt; diff -Nru mc-4.8.25/src/filemanager/ext.c mc-4.8.26/src/filemanager/ext.c --- mc-4.8.25/src/filemanager/ext.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/ext.c 2021-01-10 11:50:16.000000000 +0000 @@ -62,7 +62,8 @@ #include "src/selcodepage.h" /* do_set_codepage */ #endif -#include "panel.h" /* do_cd */ +#include "filemanager.h" /* current_panel */ +#include "panel.h" /* panel_cd */ #include "ext.h" @@ -71,9 +72,9 @@ /*** file scope macro definitions ****************************************************************/ #ifdef FILE_L -#define FILE_CMD "file -L " +#define FILE_CMD "file -L -z " #else -#define FILE_CMD "file " +#define FILE_CMD "file -z " #endif /*** file scope type declarations ****************************************************************/ @@ -175,7 +176,7 @@ /* --------------------------------------------------------------------------------------------- */ -static char * +static GString * exec_get_export_variables (const vfs_path_t * filename_vpath) { char *text; @@ -217,12 +218,13 @@ g_free (text); } } - return g_string_free (export_vars_string, FALSE); + + return export_vars_string; } /* --------------------------------------------------------------------------------------------- */ -static char * +static GString * exec_make_shell_string (const char *lc_data, const vfs_path_t * filename_vpath) { GString *shell_string; @@ -345,7 +347,8 @@ g_string_append_c (shell_string, *lc_data); } } /* for */ - return g_string_free (shell_string, FALSE); + + return shell_string; } /* --------------------------------------------------------------------------------------------- */ @@ -388,7 +391,7 @@ /* --------------------------------------------------------------------------------------------- */ static void -exec_extension_cd (void) +exec_extension_cd (WPanel * panel) { char *q; vfs_path_t *p_vpath; @@ -403,7 +406,7 @@ q[1] = 0; p_vpath = vfs_path_from_str_flags (pbuffer, VPF_NO_CANON); - do_cd (p_vpath, cd_parse_command); + panel_cd (panel, p_vpath, cd_parse_command); vfs_path_free (p_vpath); } @@ -411,10 +414,10 @@ /* --------------------------------------------------------------------------------------------- */ static vfs_path_t * -exec_extension (void *target, const vfs_path_t * filename_vpath, const char *lc_data, - int start_line) +exec_extension (WPanel * panel, void *target, const vfs_path_t * filename_vpath, + const char *lc_data, int start_line) { - char *shell_string, *export_variables; + GString *shell_string, *export_variables; vfs_path_t *script_vpath = NULL; int cmd_file_fd; FILE *cmd_file; @@ -433,14 +436,13 @@ do_local_copy = !vfs_file_is_local (filename_vpath); shell_string = exec_make_shell_string (lc_data, filename_vpath); - if (shell_string == NULL) goto ret; if (is_cd) { - exec_extension_cd (); - g_free (shell_string); + exec_extension_cd (panel); + g_string_free (shell_string, TRUE); goto ret; } @@ -465,12 +467,12 @@ export_variables = exec_get_export_variables (filename_vpath); if (export_variables != NULL) { - fprintf (cmd_file, "%s\n", export_variables); - g_free (export_variables); + fputs (export_variables->str, cmd_file); + g_string_free (export_variables, TRUE); } - fputs (shell_string, cmd_file); - g_free (shell_string); + fputs (shell_string->str, cmd_file); + g_string_free (shell_string, TRUE); /* * Make the script remove itself when it finishes. @@ -1025,7 +1027,7 @@ { vfs_path_t *sv; - sv = exec_extension (target, filename_vpath, r + 1, + sv = exec_extension (current_panel, target, filename_vpath, r + 1, view_at_line_number); if (script_vpath != NULL) *script_vpath = sv; diff -Nru mc-4.8.25/src/filemanager/file.c mc-4.8.26/src/filemanager/file.c --- mc-4.8.25/src/filemanager/file.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/file.c 2021-01-10 11:50:16.000000000 +0000 @@ -75,12 +75,12 @@ #include "src/background.h" /* do_background() */ #endif -/* Needed for current_panel, other_panel and WTree */ +/* Needed for other_panel and WTree */ #include "dir.h" #include "filegui.h" #include "filenot.h" #include "tree.h" -#include "midnight.h" /* current_panel */ +#include "filemanager.h" /* other_panel */ #include "layout.h" /* rotate_dash() */ #include "ioblksize.h" /* io_blksize() */ @@ -614,34 +614,19 @@ static FileProgressStatus do_compute_dir_size (const vfs_path_t * dirname_vpath, dirsize_status_msg_t * dsm, size_t * dir_count, size_t * ret_marked, uintmax_t * ret_total, - gboolean compute_symlinks) + mc_stat_fn stat_func) { - static guint64 timestamp = 0; + static gint64 timestamp = 0; /* update with 25 FPS rate */ - static const guint64 delay = G_USEC_PER_SEC / 25; + static const gint64 delay = G_USEC_PER_SEC / 25; status_msg_t *sm = STATUS_MSG (dsm); int res; struct stat s; DIR *dir; - struct dirent *dirent; + struct vfs_dirent *dirent; FileProgressStatus ret = FILE_CONT; - if (!compute_symlinks) - { - res = mc_lstat (dirname_vpath, &s); - if (res != 0) - return ret; - - /* don't scan symlink to directory */ - if (S_ISLNK (s.st_mode)) - { - (*ret_marked)++; - *ret_total += (uintmax_t) s.st_size; - return ret; - } - } - (*dir_count)++; dir = mc_opendir (dirname_vpath); @@ -657,13 +642,13 @@ tmp_vpath = vfs_path_append_new (dirname_vpath, dirent->d_name, (char *) NULL); - res = mc_lstat (tmp_vpath, &s); + res = stat_func (tmp_vpath, &s); if (res == 0) { if (S_ISDIR (s.st_mode)) ret = do_compute_dir_size (tmp_vpath, dsm, dir_count, ret_marked, ret_total, - compute_symlinks); + stat_func); else { ret = FILE_CONT; @@ -700,27 +685,29 @@ static FileProgressStatus panel_compute_totals (const WPanel * panel, dirsize_status_msg_t * sm, size_t * ret_count, - uintmax_t * ret_total, gboolean compute_symlinks) + uintmax_t * ret_total, gboolean follow_symlinks) { int i; size_t dir_count = 0; + mc_stat_fn stat_func = follow_symlinks ? mc_stat : mc_lstat; for (i = 0; i < panel->dir.len; i++) { - struct stat *s; + const file_entry_t *fe = &panel->dir.list[i]; + const struct stat *s; - if (!panel->dir.list[i].f.marked) + if (fe->f.marked == 0) continue; - s = &panel->dir.list[i].st; + s = &fe->st; - if (S_ISDIR (s->st_mode)) + if (S_ISDIR (s->st_mode) || (follow_symlinks && link_isdir (fe) && fe->f.stale_link == 0)) { vfs_path_t *p; FileProgressStatus status; - p = vfs_path_append_new (panel->cwd_vpath, panel->dir.list[i].fname, (char *) NULL); - status = compute_dir_size (p, sm, &dir_count, ret_count, ret_total, compute_symlinks); + p = vfs_path_append_new (panel->cwd_vpath, fe->fname, (char *) NULL); + status = do_compute_dir_size (p, sm, &dir_count, ret_count, ret_total, stat_func); vfs_path_free (p); if (status != FILE_CONT) @@ -754,6 +741,7 @@ if (verbose && compute_totals) { dirsize_status_msg_t dsm; + gboolean stale_link = FALSE; memset (&dsm, 0, sizeof (dsm)); dsm.allow_skip = TRUE; @@ -766,12 +754,15 @@ if (source == NULL) status = panel_compute_totals (panel, &dsm, &ctx->progress_count, &ctx->progress_bytes, ctx->follow_links); - else if (S_ISDIR (source_stat->st_mode)) + else if (S_ISDIR (source_stat->st_mode) + || (ctx->follow_links + && file_is_symlink_to_dir (source, (struct stat *) source_stat, &stale_link) + && !stale_link)) { size_t dir_count = 0; - status = compute_dir_size (source, &dsm, &dir_count, &ctx->progress_count, - &ctx->progress_bytes, ctx->follow_links); + status = do_compute_dir_size (source, &dsm, &dir_count, &ctx->progress_count, + &ctx->progress_bytes, ctx->stat_func); } else { @@ -1412,7 +1403,7 @@ static FileProgressStatus recursive_erase (file_op_total_context_t * tctx, file_op_context_t * ctx, const vfs_path_t * vpath) { - struct dirent *next; + struct vfs_dirent *next; DIR *reading; const char *s; FileProgressStatus return_status = FILE_CONT; @@ -1467,7 +1458,7 @@ check_dir_is_empty (const vfs_path_t * vpath) { DIR *dir; - struct dirent *d; + struct vfs_dirent *d; int i = 1; dir = mc_opendir (vpath); @@ -2394,14 +2385,11 @@ goto ret_fast; } - if (ctx->do_reget != 0) + if (ctx->do_reget != 0 && mc_lseek (src_desc, ctx->do_reget, SEEK_SET) != ctx->do_reget) { - if (mc_lseek (src_desc, ctx->do_reget, SEEK_SET) != ctx->do_reget) - { - message (D_ERROR, _("Warning"), _("Reget failed, about to overwrite file")); - ctx->do_reget = 0; - ctx->do_append = FALSE; - } + message (D_ERROR, _("Warning"), _("Reget failed, about to overwrite file")); + ctx->do_reget = 0; + ctx->do_append = FALSE; } while (mc_fstat (src_desc, &src_stat) != 0) @@ -2427,17 +2415,12 @@ file_size = src_stat.st_size; open_flags = O_WRONLY; - if (dst_exists) - { - if (ctx->do_append) - open_flags |= O_APPEND; - else - open_flags |= O_CREAT | O_TRUNC; - } - else - { + if (!dst_exists) open_flags |= O_CREAT | O_EXCL; - } + else if (ctx->do_append) + open_flags |= O_APPEND; + else + open_flags |= O_CREAT | O_TRUNC; while ((dest_desc = mc_open (dst_vpath, open_flags, src_mode)) < 0) { @@ -2458,6 +2441,7 @@ } goto ret; } + dst_status = DEST_SHORT; /* file opened, but not fully copied */ appending = ctx->do_append; @@ -2550,6 +2534,7 @@ while (TRUE) { ssize_t n_read = -1, n_written; + gboolean force_update; /* src_read */ if (mc_ctl (src_desc, VFS_CTL_IS_NOTREADY, 0) == 0) @@ -2575,12 +2560,6 @@ n_read_total += n_read; - /* Windows NT ftp servers report that files have no - * permissions: -------, so if we happen to have actually - * read something, we should fix the permissions. - */ - if ((src_mode & (S_IRWXU | S_IRWXG | S_IRWXO)) == 0) - src_mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH; gettimeofday (&tv_last_input, NULL); /* dst_write */ @@ -2632,28 +2611,23 @@ tv_transfer_start, file_size, n_read_total); tv_last_update = tv_current; } + is_first_time = FALSE; if (update_secs > FILEOP_STALLING_INTERVAL) - { stalled_msg = _("(stalled)"); - } - - { - gboolean force_update; - force_update = - (tv_current.tv_sec - tctx->transfer_start.tv_sec) > FILEOP_UPDATE_INTERVAL; + force_update = + (tv_current.tv_sec - tctx->transfer_start.tv_sec) > FILEOP_UPDATE_INTERVAL; - if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) - { - file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); - file_progress_show_total (tctx, ctx, tctx->copied_bytes, force_update); - } - - file_progress_show (ctx, n_read_total + ctx->do_reget, file_size, stalled_msg, - force_update); + if (verbose && ctx->dialog_type == FILEGUI_DIALOG_MULTI_ITEM) + { + file_progress_show_count (ctx, tctx->progress_count, ctx->progress_count); + file_progress_show_total (tctx, ctx, tctx->copied_bytes, force_update); } + + file_progress_show (ctx, n_read_total + ctx->do_reget, file_size, stalled_msg, + force_update); mc_refresh (); return_status = check_progress_buttons (ctx); @@ -2702,56 +2676,51 @@ D_ERROR, 2, _("&Delete"), _("&Keep")) == 0) mc_unlink (dst_vpath); } - else if (dst_status == DEST_FULL) + else if (dst_status == DEST_FULL && !appending) { /* Copy has succeeded */ - if (!appending && ctx->preserve_uidgid) + + while (ctx->preserve_uidgid && mc_chown (dst_vpath, src_uid, src_gid) != 0 + && !ctx->skip_all) { - while (mc_chown (dst_vpath, src_uid, src_gid) != 0 && !ctx->skip_all) + temp_status = file_error (TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path); + if (temp_status == FILE_RETRY) + continue; + if (temp_status == FILE_SKIPALL) { - temp_status = file_error (TRUE, _("Cannot chown target file \"%s\"\n%s"), dst_path); - if (temp_status == FILE_RETRY) - continue; - if (temp_status == FILE_SKIPALL) - { - ctx->skip_all = TRUE; - return_status = FILE_CONT; - } - if (temp_status == FILE_SKIP) - return_status = FILE_CONT; - break; + ctx->skip_all = TRUE; + return_status = FILE_CONT; } + if (temp_status == FILE_SKIP) + return_status = FILE_CONT; + break; } - if (!appending) + while (ctx->preserve && mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)) != 0 + && !ctx->skip_all) { - if (ctx->preserve) - { - while (mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)) != 0 && !ctx->skip_all) - { - temp_status = - file_error (TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path); - if (temp_status == FILE_RETRY) - continue; - if (temp_status == FILE_SKIPALL) - { - ctx->skip_all = TRUE; - return_status = FILE_CONT; - } - if (temp_status == FILE_SKIP) - return_status = FILE_CONT; - break; - } - } - else if (!dst_exists) + temp_status = file_error (TRUE, _("Cannot chmod target file \"%s\"\n%s"), dst_path); + if (temp_status == FILE_RETRY) + continue; + if (temp_status == FILE_SKIPALL) { - src_mode = umask (-1); - umask (src_mode); - src_mode = 0100666 & ~src_mode; - mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)); + ctx->skip_all = TRUE; + return_status = FILE_CONT; } - mc_utime (dst_vpath, ×); + if (temp_status == FILE_SKIP) + return_status = FILE_CONT; + break; } + + if (!ctx->preserve && !dst_exists) + { + src_mode = umask (-1); + umask (src_mode); + src_mode = 0100666 & ~src_mode; + mc_chmod (dst_vpath, (src_mode & ctx->umask_kill)); + } + + mc_utime (dst_vpath, ×); } if (return_status == FILE_CONT) @@ -2775,7 +2744,7 @@ copy_dir_dir (file_op_total_context_t * tctx, file_op_context_t * ctx, const char *s, const char *d, gboolean toplevel, gboolean move_over, gboolean do_delete, GSList * parent_dirs) { - struct dirent *next; + struct vfs_dirent *next; struct stat dst_stat, src_stat; DIR *reading; FileProgressStatus return_status = FILE_CONT; @@ -3183,7 +3152,7 @@ /* schedule to update passive panel */ if (get_other_type () == view_listing) - other_panel->dirty = 1; + other_panel->dirty = TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -3196,10 +3165,10 @@ FileProgressStatus compute_dir_size (const vfs_path_t * dirname_vpath, dirsize_status_msg_t * sm, size_t * ret_dir_count, size_t * ret_marked_count, uintmax_t * ret_total, - gboolean compute_symlinks) + gboolean follow_symlinks) { return do_compute_dir_size (dirname_vpath, sm, ret_dir_count, ret_marked_count, ret_total, - compute_symlinks); + follow_symlinks ? mc_stat : mc_lstat); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/filemanager/filegui.c mc-4.8.26/src/filemanager/filegui.c --- mc-4.8.25/src/filemanager/filegui.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/filegui.c 2021-01-10 11:50:16.000000000 +0000 @@ -155,7 +155,7 @@ #include "src/setup.h" /* verbose, safe_overwrite */ -#include "midnight.h" +#include "filemanager.h" #include "fileopctx.h" /* FILE_CONT */ #include "filegui.h" @@ -1158,9 +1158,9 @@ gboolean file_progress_show_deleting (file_op_context_t * ctx, const char *s, size_t * count) { - static guint64 timestamp = 0; + static gint64 timestamp = 0; /* update with 25 FPS rate */ - static const guint64 delay = G_USEC_PER_SEC / 25; + static const gint64 delay = G_USEC_PER_SEC / 25; gboolean ret; diff -Nru mc-4.8.25/src/filemanager/file.h mc-4.8.26/src/filemanager/file.h --- mc-4.8.25/src/filemanager/file.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/file.h 2021-01-10 11:50:16.000000000 +0000 @@ -62,7 +62,7 @@ /* return value is FILE_CONT or FILE_ABORT */ FileProgressStatus compute_dir_size (const vfs_path_t * dirname_vpath, dirsize_status_msg_t * sm, size_t * ret_dir_count, size_t * ret_marked_count, - uintmax_t * ret_total, gboolean compute_symlinks); + uintmax_t * ret_total, gboolean follow_symlinks); void dirsize_status_init_cb (status_msg_t * sm); int dirsize_status_update_cb (status_msg_t * sm); diff -Nru mc-4.8.25/src/filemanager/filemanager.c mc-4.8.26/src/filemanager/filemanager.c --- mc-4.8.25/src/filemanager/filemanager.c 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/src/filemanager/filemanager.c 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,1870 @@ +/* + Main dialog (file panels) of the Midnight Commander + + Copyright (C) 1994-2020 + Free Software Foundation, Inc. + + Written by: + Miguel de Icaza, 1994, 1995, 1996, 1997 + Janne Kukonlehto, 1994, 1995 + Norbert Warmuth, 1997 + Andrew Borodin , 2009, 2010, 2012, 2013, 2020 + Slava Zanko , 2013 + + This file is part of the Midnight Commander. + + The Midnight Commander 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 3 of the License, + or (at your option) any later version. + + The Midnight Commander 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, see . + */ + +/** \file filemanager.c + * \brief Source: main dialog (file panels) of the Midnight Commander + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* for username in xterm title */ + +#include "lib/global.h" +#include "lib/fileloc.h" /* MC_HINT */ + +#include "lib/tty/tty.h" +#include "lib/tty/key.h" /* KEY_M_* masks */ +#include "lib/skin.h" +#include "lib/util.h" + +#include "lib/vfs/vfs.h" + +#include "src/args.h" +#ifdef ENABLE_SUBSHELL +#include "src/subshell/subshell.h" +#endif +#include "src/execute.h" /* toggle_subshell */ +#include "src/setup.h" /* variables */ +#include "src/learn.h" /* learn_keys() */ +#include "src/keybind-defaults.h" +#include "lib/fileloc.h" /* MC_FILEPOS_FILE */ +#include "lib/keybind.h" +#include "lib/event.h" + +#include "tree.h" +#include "boxes.h" /* sort_box(), tree_box() */ +#include "layout.h" +#include "cmd.h" /* commands */ +#include "hotlist.h" +#include "panelize.h" +#include "command.h" /* cmdline */ +#include "dir.h" /* dir_list_clean() */ + +#ifdef USE_INTERNAL_EDIT +#include "src/editor/edit.h" +#endif + +#ifdef USE_DIFF_VIEW +#include "src/diffviewer/ydiff.h" +#endif + +#include "src/consaver/cons.saver.h" /* show_console_contents */ +#include "src/file_history.h" /* show_file_history() */ + +#include "filemanager.h" + +/*** global variables ****************************************************************************/ + +/* When the modes are active, left_panel, right_panel and tree_panel */ +/* point to a proper data structure. You should check with the functions */ +/* get_current_type and get_other_type the types of the panels before using */ +/* this pointer variables */ + +/* The structures for the panels */ +WPanel *left_panel = NULL; +WPanel *right_panel = NULL; +/* Pointer to the selected and unselected panel */ +WPanel *current_panel = NULL; + +/* The Menubar */ +WMenuBar *the_menubar = NULL; +/* The widget where we draw the prompt */ +WLabel *the_prompt; +/* The hint bar */ +WLabel *the_hint; +/* The button bar */ +WButtonBar *the_bar; + +/* The prompt */ +const char *mc_prompt = NULL; + +/*** file scope macro definitions ****************************************************************/ + +#ifdef HAVE_CHARSET +/* + * Don't restrict the output on the screen manager level, + * the translation tables take care of it. + */ +#endif /* !HAVE_CHARSET */ + +/*** file scope type declarations ****************************************************************/ + +/*** file scope variables ************************************************************************/ + +static menu_t *left_menu, *right_menu; + +/*** file scope functions ************************************************************************/ + +/** Stop MC main dialog and the current dialog if it exists. + * Needed to provide fast exit from MC viewer or editor on shell exit */ +static void +stop_dialogs (void) +{ + dlg_stop (midnight_dlg); + + if (top_dlg != NULL) + dlg_stop (DIALOG (top_dlg->data)); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +treebox_cmd (void) +{ + char *sel_dir; + + sel_dir = tree_box (selection (current_panel)->fname); + if (sel_dir != NULL) + { + vfs_path_t *sel_vdir; + + sel_vdir = vfs_path_from_str (sel_dir); + panel_cd (current_panel, sel_vdir, cd_exact); + vfs_path_free (sel_vdir); + g_free (sel_dir); + } +} + +/* --------------------------------------------------------------------------------------------- */ + +#ifdef LISTMODE_EDITOR +static void +listmode_cmd (void) +{ + char *newmode; + + if (get_current_type () != view_listing) + return; + + newmode = listmode_edit (current_panel->user_format); + if (!newmode) + return; + + g_free (current_panel->user_format); + current_panel->list_format = list_user; + current_panel->user_format = newmode; + set_panel_formats (current_panel); + + do_refresh (); +} +#endif /* LISTMODE_EDITOR */ + +/* --------------------------------------------------------------------------------------------- */ + +static GList * +create_panel_menu (void) +{ + GList *entries = NULL; + + entries = g_list_prepend (entries, menu_entry_create (_("File listin&g"), CK_PanelListing)); + entries = g_list_prepend (entries, menu_entry_create (_("&Quick view"), CK_PanelQuickView)); + entries = g_list_prepend (entries, menu_entry_create (_("&Info"), CK_PanelInfo)); + entries = g_list_prepend (entries, menu_entry_create (_("&Tree"), CK_PanelTree)); + entries = g_list_prepend (entries, menu_separator_create ()); + entries = + g_list_prepend (entries, + menu_entry_create (_("&Listing format..."), CK_SetupListingFormat)); + entries = g_list_prepend (entries, menu_entry_create (_("&Sort order..."), CK_Sort)); + entries = g_list_prepend (entries, menu_entry_create (_("&Filter..."), CK_Filter)); +#ifdef HAVE_CHARSET + entries = g_list_prepend (entries, menu_entry_create (_("&Encoding..."), CK_SelectCodepage)); +#endif + entries = g_list_prepend (entries, menu_separator_create ()); +#ifdef ENABLE_VFS_FTP + entries = g_list_prepend (entries, menu_entry_create (_("FT&P link..."), CK_ConnectFtp)); +#endif +#ifdef ENABLE_VFS_FISH + entries = g_list_prepend (entries, menu_entry_create (_("S&hell link..."), CK_ConnectFish)); +#endif +#ifdef ENABLE_VFS_SFTP + entries = g_list_prepend (entries, menu_entry_create (_("S&FTP link..."), CK_ConnectSftp)); +#endif +#ifdef ENABLE_VFS_SMB + entries = g_list_prepend (entries, menu_entry_create (_("SM&B link..."), CK_ConnectSmb)); +#endif + entries = g_list_prepend (entries, menu_entry_create (_("Paneli&ze"), CK_Panelize)); + entries = g_list_prepend (entries, menu_separator_create ()); + entries = g_list_prepend (entries, menu_entry_create (_("&Rescan"), CK_Reread)); + + return g_list_reverse (entries); +} + +/* --------------------------------------------------------------------------------------------- */ + +static GList * +create_file_menu (void) +{ + GList *entries = NULL; + + entries = g_list_prepend (entries, menu_entry_create (_("&View"), CK_View)); + entries = g_list_prepend (entries, menu_entry_create (_("Vie&w file..."), CK_ViewFile)); + entries = g_list_prepend (entries, menu_entry_create (_("&Filtered view"), CK_ViewFiltered)); + entries = g_list_prepend (entries, menu_entry_create (_("&Edit"), CK_Edit)); + entries = g_list_prepend (entries, menu_entry_create (_("&Copy"), CK_Copy)); + entries = g_list_prepend (entries, menu_entry_create (_("C&hmod"), CK_ChangeMode)); + entries = g_list_prepend (entries, menu_entry_create (_("&Link"), CK_Link)); + entries = g_list_prepend (entries, menu_entry_create (_("&Symlink"), CK_LinkSymbolic)); + entries = + g_list_prepend (entries, + menu_entry_create (_("Relative symlin&k"), CK_LinkSymbolicRelative)); + entries = g_list_prepend (entries, menu_entry_create (_("Edit s&ymlink"), CK_LinkSymbolicEdit)); + entries = g_list_prepend (entries, menu_entry_create (_("Ch&own"), CK_ChangeOwn)); + entries = + g_list_prepend (entries, menu_entry_create (_("&Advanced chown"), CK_ChangeOwnAdvanced)); +#ifdef ENABLE_EXT2FS_ATTR + entries = g_list_prepend (entries, menu_entry_create (_("Cha&ttr"), CK_ChangeAttributes)); +#endif + entries = g_list_prepend (entries, menu_entry_create (_("&Rename/Move"), CK_Move)); + entries = g_list_prepend (entries, menu_entry_create (_("&Mkdir"), CK_MakeDir)); + entries = g_list_prepend (entries, menu_entry_create (_("&Delete"), CK_Delete)); + entries = g_list_prepend (entries, menu_entry_create (_("&Quick cd"), CK_CdQuick)); + entries = g_list_prepend (entries, menu_separator_create ()); + entries = g_list_prepend (entries, menu_entry_create (_("Select &group"), CK_Select)); + entries = g_list_prepend (entries, menu_entry_create (_("U&nselect group"), CK_Unselect)); + entries = g_list_prepend (entries, menu_entry_create (_("&Invert selection"), CK_SelectInvert)); + entries = g_list_prepend (entries, menu_separator_create ()); + entries = g_list_prepend (entries, menu_entry_create (_("E&xit"), CK_Quit)); + + return g_list_reverse (entries); +} + +/* --------------------------------------------------------------------------------------------- */ + +static GList * +create_command_menu (void) +{ + /* I know, I'm lazy, but the tree widget when it's not running + * as a panel still has some problems, I have not yet finished + * the WTree widget port, sorry. + */ + GList *entries = NULL; + + entries = g_list_prepend (entries, menu_entry_create (_("&User menu"), CK_UserMenu)); + entries = g_list_prepend (entries, menu_entry_create (_("&Directory tree"), CK_Tree)); + entries = g_list_prepend (entries, menu_entry_create (_("&Find file"), CK_Find)); + entries = g_list_prepend (entries, menu_entry_create (_("S&wap panels"), CK_Swap)); + entries = g_list_prepend (entries, menu_entry_create (_("Switch &panels on/off"), CK_Shell)); + entries = + g_list_prepend (entries, menu_entry_create (_("&Compare directories"), CK_CompareDirs)); +#ifdef USE_DIFF_VIEW + entries = g_list_prepend (entries, menu_entry_create (_("C&ompare files"), CK_CompareFiles)); +#endif + entries = + g_list_prepend (entries, menu_entry_create (_("E&xternal panelize"), CK_ExternalPanelize)); + entries = g_list_prepend (entries, menu_entry_create (_("Show directory s&izes"), CK_DirSize)); + entries = g_list_prepend (entries, menu_separator_create ()); + entries = g_list_prepend (entries, menu_entry_create (_("Command &history"), CK_History)); + entries = + g_list_prepend (entries, + menu_entry_create (_("Viewed/edited files hi&story"), + CK_EditorViewerHistory)); + entries = g_list_prepend (entries, menu_entry_create (_("Di&rectory hotlist"), CK_HotList)); +#ifdef ENABLE_VFS + entries = g_list_prepend (entries, menu_entry_create (_("&Active VFS list"), CK_VfsList)); +#endif +#ifdef ENABLE_BACKGROUND + entries = g_list_prepend (entries, menu_entry_create (_("&Background jobs"), CK_Jobs)); +#endif + entries = g_list_prepend (entries, menu_entry_create (_("Screen lis&t"), CK_ScreenList)); + entries = g_list_prepend (entries, menu_separator_create ()); +#ifdef ENABLE_VFS_UNDELFS + entries = + g_list_prepend (entries, + menu_entry_create (_("&Undelete files (ext2fs only)"), CK_Undelete)); +#endif +#ifdef LISTMODE_EDITOR + entries = g_list_prepend (entries, menu_entry_create (_("&Listing format edit"), CK_ListMode)); +#endif +#if defined (ENABLE_VFS_UNDELFS) || defined (LISTMODE_EDITOR) + entries = g_list_prepend (entries, menu_separator_create ()); +#endif + entries = + g_list_prepend (entries, + menu_entry_create (_("Edit &extension file"), CK_EditExtensionsFile)); + entries = g_list_prepend (entries, menu_entry_create (_("Edit &menu file"), CK_EditUserMenu)); + entries = + g_list_prepend (entries, + menu_entry_create (_("Edit hi&ghlighting group file"), + CK_EditFileHighlightFile)); + + return g_list_reverse (entries); +} + +/* --------------------------------------------------------------------------------------------- */ + +static GList * +create_options_menu (void) +{ + GList *entries = NULL; + + entries = g_list_prepend (entries, menu_entry_create (_("&Configuration..."), CK_Options)); + entries = g_list_prepend (entries, menu_entry_create (_("&Layout..."), CK_OptionsLayout)); + entries = g_list_prepend (entries, menu_entry_create (_("&Panel options..."), CK_OptionsPanel)); + entries = + g_list_prepend (entries, menu_entry_create (_("C&onfirmation..."), CK_OptionsConfirm)); + entries = + g_list_prepend (entries, menu_entry_create (_("&Appearance..."), CK_OptionsAppearance)); + entries = + g_list_prepend (entries, menu_entry_create (_("&Display bits..."), CK_OptionsDisplayBits)); + entries = g_list_prepend (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys)); +#ifdef ENABLE_VFS + entries = g_list_prepend (entries, menu_entry_create (_("&Virtual FS..."), CK_OptionsVfs)); +#endif + entries = g_list_prepend (entries, menu_separator_create ()); + entries = g_list_prepend (entries, menu_entry_create (_("&Save setup"), CK_SaveSetup)); + + return g_list_reverse (entries); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +init_menu (void) +{ + left_menu = create_menu ("", create_panel_menu (), "[Left and Right Menus]"); + menubar_add_menu (the_menubar, left_menu); + menubar_add_menu (the_menubar, create_menu (_("&File"), create_file_menu (), "[File Menu]")); + menubar_add_menu (the_menubar, + create_menu (_("&Command"), create_command_menu (), "[Command Menu]")); + menubar_add_menu (the_menubar, + create_menu (_("&Options"), create_options_menu (), "[Options Menu]")); + right_menu = create_menu ("", create_panel_menu (), "[Left and Right Menus]"); + menubar_add_menu (the_menubar, right_menu); + update_menu (); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +menu_last_selected_cmd (void) +{ + menubar_activate (the_menubar, drop_menus, -1); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +menu_cmd (void) +{ + int selected; + + if ((get_current_index () == 0) == current_panel->active) + selected = 0; + else + selected = g_list_length (the_menubar->menu) - 1; + + menubar_activate (the_menubar, drop_menus, selected); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +sort_cmd (void) +{ + WPanel *p; + const panel_field_t *sort_order; + + if (!SELECTED_IS_PANEL) + return; + + p = MENU_PANEL; + sort_order = sort_box (&p->sort_info, p->sort_field); + panel_set_sort_order (p, sort_order); +} + +/* --------------------------------------------------------------------------------------------- */ + +static char * +midnight_get_shortcut (long command) +{ + const char *ext_map; + const char *shortcut = NULL; + + shortcut = keybind_lookup_keymap_shortcut (filemanager_map, command); + if (shortcut != NULL) + return g_strdup (shortcut); + + shortcut = keybind_lookup_keymap_shortcut (panel_map, command); + if (shortcut != NULL) + return g_strdup (shortcut); + + ext_map = keybind_lookup_keymap_shortcut (filemanager_map, CK_ExtendedKeyMap); + if (ext_map != NULL) + shortcut = keybind_lookup_keymap_shortcut (filemanager_x_map, command); + if (shortcut != NULL) + return g_strdup_printf ("%s %s", ext_map, shortcut); + + return NULL; +} + +/* --------------------------------------------------------------------------------------------- */ + +static char * +midnight_get_title (const WDialog * h, size_t len) +{ + char *path; + char *login; + char *p; + + (void) h; + + title_path_prepare (&path, &login); + + p = g_strdup_printf ("%s [%s]:%s", _("Panels:"), login, path); + g_free (path); + g_free (login); + path = g_strdup (str_trunc (p, len - 4)); + g_free (p); + + return path; +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +toggle_panels_split (void) +{ + panels_layout.horizontal_split = !panels_layout.horizontal_split; + layout_change (); + do_refresh (); +} + +/* --------------------------------------------------------------------------------------------- */ + +#ifdef ENABLE_VFS +/* event helper */ +static gboolean +check_panel_timestamp (const WPanel * panel, panel_view_mode_t mode, struct vfs_class *vclass, + vfsid id) +{ + if (mode == view_listing) + { + const vfs_path_element_t *path_element; + + path_element = vfs_path_get_by_index (panel->cwd_vpath, -1); + + if (path_element->class != vclass) + return FALSE; + + if (vfs_getid (panel->cwd_vpath) != id) + return FALSE; + } + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* event callback */ +static gboolean +check_current_panel_timestamp (const gchar * event_group_name, const gchar * event_name, + gpointer init_data, gpointer data) +{ + ev_vfs_stamp_create_t *event_data = (ev_vfs_stamp_create_t *) data; + + (void) event_group_name; + (void) event_name; + (void) init_data; + + event_data->ret = + check_panel_timestamp (current_panel, get_current_type (), event_data->vclass, + event_data->id); + return !event_data->ret; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* event callback */ +static gboolean +check_other_panel_timestamp (const gchar * event_group_name, const gchar * event_name, + gpointer init_data, gpointer data) +{ + ev_vfs_stamp_create_t *event_data = (ev_vfs_stamp_create_t *) data; + + (void) event_group_name; + (void) event_name; + (void) init_data; + + event_data->ret = + check_panel_timestamp (other_panel, get_other_type (), event_data->vclass, event_data->id); + return !event_data->ret; +} +#endif /* ENABLE_VFS */ + +/* --------------------------------------------------------------------------------------------- */ + +/* event callback */ +static gboolean +print_vfs_message (const gchar * event_group_name, const gchar * event_name, + gpointer init_data, gpointer data) +{ + ev_vfs_print_message_t *event_data = (ev_vfs_print_message_t *) data; + + (void) event_group_name; + (void) event_name; + (void) init_data; + + if (mc_global.midnight_shutdown) + goto ret; + + if (!mc_global.message_visible || the_hint == NULL || WIDGET (the_hint)->owner == NULL) + { + int col, row; + + if (!nice_rotating_dash || (ok_to_refresh <= 0)) + goto ret; + + /* Preserve current cursor position */ + tty_getyx (&row, &col); + + tty_gotoyx (0, 0); + tty_setcolor (NORMAL_COLOR); + tty_print_string (str_fit_to_term (event_data->msg, COLS - 1, J_LEFT)); + + /* Restore cursor position */ + tty_gotoyx (row, col); + mc_refresh (); + goto ret; + } + + if (mc_global.message_visible) + set_hintbar (event_data->msg); + + ret: + MC_PTR_FREE (event_data->msg); + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +create_panels (void) +{ + int current_index, other_index; + panel_view_mode_t current_mode, other_mode; + char *current_dir, *other_dir; + vfs_path_t *original_dir; + + /* + * Following cases from command line are possible: + * 'mc' (no arguments): mc_run_param0 == NULL, mc_run_param1 == NULL + * active panel uses current directory + * passive panel uses "other_dir" from panels.ini + * + * 'mc dir1 dir2' (two arguments): mc_run_param0 != NULL, mc_run_param1 != NULL + * active panel uses mc_run_param0 + * passive panel uses mc_run_param1 + * + * 'mc dir1' (single argument): mc_run_param0 != NULL, mc_run_param1 == NULL + * active panel uses mc_run_param0 + * passive panel uses "other_dir" from panels.ini + */ + + /* Set up panel directories */ + if (boot_current_is_left) + { + /* left panel is active */ + current_index = 0; + other_index = 1; + current_mode = startup_left_mode; + other_mode = startup_right_mode; + + if (mc_run_param0 == NULL && mc_run_param1 == NULL) + { + /* no arguments */ + current_dir = NULL; /* assume current dir */ + other_dir = saved_other_dir; /* from ini */ + } + else if (mc_run_param0 != NULL && mc_run_param1 != NULL) + { + /* two arguments */ + current_dir = (char *) mc_run_param0; + other_dir = mc_run_param1; + } + else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ + { + /* one argument */ + current_dir = (char *) mc_run_param0; + other_dir = saved_other_dir; /* from ini */ + } + } + else + { + /* right panel is active */ + current_index = 1; + other_index = 0; + current_mode = startup_right_mode; + other_mode = startup_left_mode; + + if (mc_run_param0 == NULL && mc_run_param1 == NULL) + { + /* no arguments */ + current_dir = NULL; /* assume current dir */ + other_dir = saved_other_dir; /* from ini */ + } + else if (mc_run_param0 != NULL && mc_run_param1 != NULL) + { + /* two arguments */ + current_dir = (char *) mc_run_param0; + other_dir = mc_run_param1; + } + else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ + { + /* one argument */ + current_dir = (char *) mc_run_param0; + other_dir = saved_other_dir; /* from ini */ + } + } + + /* 1. Get current dir */ + original_dir = vfs_path_clone (vfs_get_raw_current_dir ()); + + /* 2. Create passive panel */ + if (other_dir != NULL) + { + vfs_path_t *vpath; + + if (g_path_is_absolute (other_dir)) + vpath = vfs_path_from_str (other_dir); + else + vpath = vfs_path_append_new (original_dir, other_dir, (char *) NULL); + mc_chdir (vpath); + vfs_path_free (vpath); + } + create_panel (other_index, other_mode); + + /* 3. Create active panel */ + if (current_dir == NULL) + mc_chdir (original_dir); + else + { + vfs_path_t *vpath; + + if (g_path_is_absolute (current_dir)) + vpath = vfs_path_from_str (current_dir); + else + vpath = vfs_path_append_new (original_dir, current_dir, (char *) NULL); + mc_chdir (vpath); + vfs_path_free (vpath); + } + create_panel (current_index, current_mode); + + if (startup_left_mode == view_listing) + current_panel = left_panel; + else if (right_panel != NULL) + current_panel = right_panel; + else + current_panel = left_panel; + + vfs_path_free (original_dir); + +#ifdef ENABLE_VFS + mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_other_panel_timestamp, NULL, NULL); + mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_current_panel_timestamp, NULL, NULL); +#endif /* ENABLE_VFS */ + + mc_event_add (MCEVENT_GROUP_CORE, "vfs_print_message", print_vfs_message, NULL, NULL); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +midnight_put_panel_path (WPanel * panel) +{ + vfs_path_t *cwd_vpath; + const char *cwd_vpath_str; + + if (!command_prompt) + return; + +#ifdef HAVE_CHARSET + cwd_vpath = remove_encoding_from_path (panel->cwd_vpath); +#else + cwd_vpath = vfs_path_clone (panel->cwd_vpath); +#endif + + cwd_vpath_str = vfs_path_as_str (cwd_vpath); + + command_insert (cmdline, cwd_vpath_str, FALSE); + + if (!IS_PATH_SEP (cwd_vpath_str[strlen (cwd_vpath_str) - 1])) + command_insert (cmdline, PATH_SEP_STR, FALSE); + + vfs_path_free (cwd_vpath); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +put_link (WPanel * panel) +{ + if (!command_prompt) + return; + if (S_ISLNK (selection (panel)->st.st_mode)) + { + char buffer[MC_MAXPATHLEN]; + vfs_path_t *vpath; + int i; + + vpath = vfs_path_append_new (panel->cwd_vpath, selection (panel)->fname, (char *) NULL); + i = mc_readlink (vpath, buffer, sizeof (buffer) - 1); + vfs_path_free (vpath); + + if (i > 0) + { + buffer[i] = '\0'; + command_insert (cmdline, buffer, TRUE); + } + } +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +put_current_link (void) +{ + put_link (current_panel); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +put_other_link (void) +{ + if (get_other_type () == view_listing) + put_link (other_panel); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** Insert the selected file name into the input line */ +static void +put_current_selected (void) +{ + const char *tmp; + + if (!command_prompt) + return; + + if (get_current_type () == view_tree) + { + WTree *tree; + const vfs_path_t *selected_name; + + tree = (WTree *) get_panel_widget (get_current_index ()); + selected_name = tree_selected_name (tree); + tmp = vfs_path_as_str (selected_name); + } + else + tmp = selection (current_panel)->fname; + + command_insert (cmdline, tmp, TRUE); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +put_tagged (WPanel * panel) +{ + if (!command_prompt) + return; + input_disable_update (cmdline); + if (panel->marked) + { + int i; + + for (i = 0; i < panel->dir.len; i++) + { + if (panel->dir.list[i].f.marked) + command_insert (cmdline, panel->dir.list[i].fname, TRUE); + } + } + else + { + command_insert (cmdline, panel->dir.list[panel->selected].fname, TRUE); + } + input_enable_update (cmdline); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +put_current_tagged (void) +{ + put_tagged (current_panel); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +put_other_tagged (void) +{ + if (get_other_type () == view_listing) + put_tagged (other_panel); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +setup_mc (void) +{ +#ifdef HAVE_SLANG +#ifdef HAVE_CHARSET + tty_display_8bit (TRUE); +#else + tty_display_8bit (mc_global.full_eight_bits); +#endif /* HAVE_CHARSET */ + +#else /* HAVE_SLANG */ + +#ifdef HAVE_CHARSET + tty_display_8bit (TRUE); +#else + tty_display_8bit (mc_global.eight_bit_clean); +#endif /* HAVE_CHARSET */ +#endif /* HAVE_SLANG */ + +#ifdef ENABLE_SUBSHELL + if (mc_global.tty.use_subshell) + add_select_channel (mc_global.tty.subshell_pty, load_prompt, NULL); +#endif /* !ENABLE_SUBSHELL */ + + if ((tty_baudrate () < 9600) || mc_global.tty.slow_terminal) + verbose = FALSE; +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +setup_dummy_mc (void) +{ + vfs_path_t *vpath; + char *d; + int ret; + + d = _vfs_get_cwd (); + setup_mc (); + vpath = vfs_path_from_str (d); + ret = mc_chdir (vpath); + (void) ret; + vfs_path_free (vpath); + g_free (d); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +done_mc (void) +{ + /* Setup shutdown + * + * We sync the profiles since the hotlist may have changed, while + * we only change the setup data if we have the auto save feature set + */ + + save_setup (auto_save_setup, panels_options.auto_save_setup); + + vfs_stamp_path (vfs_get_raw_current_dir ()); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +create_file_manager (void) +{ + Widget *w = WIDGET (midnight_dlg); + WGroup *g = GROUP (midnight_dlg); + + w->keymap = filemanager_map; + w->ext_keymap = filemanager_x_map; + + midnight_dlg->get_shortcut = midnight_get_shortcut; + midnight_dlg->get_title = midnight_get_title; + /* allow rebind tab */ + widget_want_tab (w, TRUE); + + the_menubar = menubar_new (NULL, menubar_visible); + group_add_widget (g, the_menubar); + init_menu (); + + create_panels (); + group_add_widget (g, get_panel_widget (0)); + group_add_widget (g, get_panel_widget (1)); + + the_hint = label_new (0, 0, 0); + the_hint->transparent = TRUE; + the_hint->auto_adjust_cols = 0; + WIDGET (the_hint)->cols = COLS; + group_add_widget (g, the_hint); + + cmdline = command_new (0, 0, 0); + group_add_widget (g, cmdline); + + the_prompt = label_new (0, 0, mc_prompt); + the_prompt->transparent = TRUE; + group_add_widget (g, the_prompt); + + the_bar = buttonbar_new (mc_global.keybar_visible); + group_add_widget (g, the_bar); + midnight_set_buttonbar (the_bar); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** result must be free'd (I think this should go in util.c) */ +static vfs_path_t * +prepend_cwd_on_local (const char *filename) +{ + vfs_path_t *vpath; + + vpath = vfs_path_from_str (filename); + if (!vfs_file_is_local (vpath) || g_path_is_absolute (filename)) + return vpath; + + vfs_path_free (vpath); + + return vfs_path_append_new (vfs_get_raw_current_dir (), filename, (char *) NULL); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** Invoke the internal view/edit routine with: + * the default processing and forcing the internal viewer/editor + */ +static gboolean +mc_maybe_editor_or_viewer (void) +{ + gboolean ret; + + switch (mc_global.mc_run_mode) + { +#ifdef USE_INTERNAL_EDIT + case MC_RUN_EDITOR: + ret = edit_files ((GList *) mc_run_param0); + break; +#endif /* USE_INTERNAL_EDIT */ + case MC_RUN_VIEWER: + { + vfs_path_t *vpath = NULL; + + if (mc_run_param0 != NULL && *(char *) mc_run_param0 != '\0') + vpath = prepend_cwd_on_local ((char *) mc_run_param0); + + ret = view_file (vpath, FALSE, TRUE); + vfs_path_free (vpath); + break; + } +#ifdef USE_DIFF_VIEW + case MC_RUN_DIFFVIEWER: + ret = dview_diff_cmd (mc_run_param0, mc_run_param1); + break; +#endif /* USE_DIFF_VIEW */ + default: + ret = FALSE; + } + + return ret; +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +show_editor_viewer_history (void) +{ + char *s; + int act; + + s = show_file_history (WIDGET (midnight_dlg), &act); + if (s != NULL) + { + vfs_path_t *s_vpath; + + switch (act) + { + case CK_Edit: + s_vpath = vfs_path_from_str (s); + edit_file_at_line (s_vpath, use_internal_edit, 0); + break; + + case CK_View: + s_vpath = vfs_path_from_str (s); + view_file (s_vpath, use_internal_view, FALSE); + break; + + default: + { + char *d; + + d = g_path_get_dirname (s); + s_vpath = vfs_path_from_str (d); + panel_cd (current_panel, s_vpath, cd_exact); + try_to_select (current_panel, s); + g_free (d); + } + } + + g_free (s); + vfs_path_free (s_vpath); + } +} + +/* --------------------------------------------------------------------------------------------- */ + +static gboolean +quit_cmd_internal (int quiet) +{ + int q = quit; + size_t n; + + n = dialog_switch_num () - 1; + if (n != 0) + { + char msg[BUF_MEDIUM]; + + g_snprintf (msg, sizeof (msg), + ngettext ("You have %zu opened screen. Quit anyway?", + "You have %zu opened screens. Quit anyway?", n), n); + + if (query_dialog (_("The Midnight Commander"), msg, D_NORMAL, 2, _("&Yes"), _("&No")) != 0) + return FALSE; + q = 1; + } + else if (quiet || !confirm_exit) + q = 1; + else if (query_dialog (_("The Midnight Commander"), + _("Do you really want to quit the Midnight Commander?"), + D_NORMAL, 2, _("&Yes"), _("&No")) == 0) + q = 1; + + if (q != 0) + { +#ifdef ENABLE_SUBSHELL + if (!mc_global.tty.use_subshell) + stop_dialogs (); + else if ((q = exit_subshell ()? 1 : 0) != 0) +#endif + stop_dialogs (); + } + + if (q != 0) + quit |= 1; + return (quit != 0); +} + +/* --------------------------------------------------------------------------------------------- */ + +static gboolean +quit_cmd (void) +{ + return quit_cmd_internal (0); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** + * Repaint the contents of the panels without frames. To schedule panel + * for repainting, set panel->dirty to TRUE. There are many reasons why + * the panels need to be repainted, and this is a costly operation, so + * it's done once per event. + */ + +static void +update_dirty_panels (void) +{ + if (get_current_type () == view_listing && current_panel->dirty) + widget_draw (WIDGET (current_panel)); + + if (get_other_type () == view_listing && other_panel->dirty) + widget_draw (WIDGET (other_panel)); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +toggle_show_hidden (void) +{ + panels_options.show_dot_files = !panels_options.show_dot_files; + update_panels (UP_RELOAD, UP_KEEPSEL); + /* redraw panels forced */ + update_dirty_panels (); +} + +/* --------------------------------------------------------------------------------------------- */ + +static cb_ret_t +midnight_execute_cmd (Widget * sender, long command) +{ + cb_ret_t res = MSG_HANDLED; + + (void) sender; + + /* stop quick search before executing any command */ + send_message (current_panel, NULL, MSG_ACTION, CK_SearchStop, NULL); + + switch (command) + { + case CK_ChangePanel: + (void) change_panel (); + break; + case CK_HotListAdd: + add2hotlist_cmd (current_panel); + break; + case CK_SetupListingFormat: + setup_listing_format_cmd (); + break; + case CK_ChangeMode: + chmod_cmd (current_panel); + break; + case CK_ChangeOwn: + chown_cmd (current_panel); + break; + case CK_ChangeOwnAdvanced: + advanced_chown_cmd (current_panel); + break; +#ifdef ENABLE_EXT2FS_ATTR + case CK_ChangeAttributes: + chattr_cmd (current_panel); + break; +#endif + case CK_CompareDirs: + compare_dirs_cmd (); + break; + case CK_Options: + configure_box (); + break; +#ifdef ENABLE_VFS + case CK_OptionsVfs: + configure_vfs_box (); + break; +#endif + case CK_OptionsConfirm: + confirm_box (); + break; + case CK_Copy: + copy_cmd (current_panel); + break; + case CK_PutCurrentPath: + midnight_put_panel_path (current_panel); + break; + case CK_PutCurrentSelected: + put_current_selected (); + break; + case CK_PutCurrentFullSelected: + midnight_put_panel_path (current_panel); + put_current_selected (); + break; + case CK_PutCurrentLink: + put_current_link (); + break; + case CK_PutCurrentTagged: + put_current_tagged (); + break; + case CK_PutOtherPath: + if (get_other_type () == view_listing) + midnight_put_panel_path (other_panel); + break; + case CK_PutOtherLink: + put_other_link (); + break; + case CK_PutOtherTagged: + put_other_tagged (); + break; + case CK_Delete: + delete_cmd (current_panel); + break; + case CK_ScreenList: + dialog_switch_list (); + break; +#ifdef USE_DIFF_VIEW + case CK_CompareFiles: + diff_view_cmd (); + break; +#endif + case CK_OptionsDisplayBits: + display_bits_box (); + break; + case CK_Edit: + edit_cmd (current_panel); + break; +#ifdef USE_INTERNAL_EDIT + case CK_EditForceInternal: + edit_cmd_force_internal (current_panel); + break; +#endif + case CK_EditExtensionsFile: + ext_cmd (); + break; + case CK_EditFileHighlightFile: + edit_fhl_cmd (); + break; + case CK_EditUserMenu: + edit_mc_menu_cmd (); + break; + case CK_LinkSymbolicEdit: + edit_symlink_cmd (); + break; + case CK_ExternalPanelize: + external_panelize (); + break; + case CK_Filter: + filter_cmd (); + break; + case CK_ViewFiltered: + view_filtered_cmd (current_panel); + break; + case CK_Find: + find_cmd (current_panel); + break; +#ifdef ENABLE_VFS_FISH + case CK_ConnectFish: + fishlink_cmd (); + break; +#endif +#ifdef ENABLE_VFS_FTP + case CK_ConnectFtp: + ftplink_cmd (); + break; +#endif +#ifdef ENABLE_VFS_SFTP + case CK_ConnectSftp: + sftplink_cmd (); + break; +#endif +#ifdef ENABLE_VFS_SMB + case CK_ConnectSmb: + smblink_cmd (); + break; +#endif /* ENABLE_VFS_SMB */ + case CK_Panelize: + cd_panelize_cmd (); + break; + case CK_Help: + help_cmd (); + break; + case CK_History: + /* show the history of command line widget */ + send_message (cmdline, NULL, MSG_ACTION, CK_History, NULL); + break; + case CK_PanelInfo: + if (sender == WIDGET (the_menubar)) + info_cmd (); /* menu */ + else + info_cmd_no_menu (); /* shortcut or buttonbar */ + break; +#ifdef ENABLE_BACKGROUND + case CK_Jobs: + jobs_box (); + break; +#endif + case CK_OptionsLayout: + layout_box (); + break; + case CK_OptionsAppearance: + appearance_box (); + break; + case CK_LearnKeys: + learn_keys (); + break; + case CK_Link: + link_cmd (LINK_HARDLINK); + break; + case CK_PanelListing: + listing_cmd (); + break; +#ifdef LISTMODE_EDITOR + case CK_ListMode: + listmode_cmd (); + break; +#endif + case CK_Menu: + menu_cmd (); + break; + case CK_MenuLastSelected: + menu_last_selected_cmd (); + break; + case CK_MakeDir: + mkdir_cmd (current_panel); + break; + case CK_OptionsPanel: + panel_options_box (); + break; +#ifdef HAVE_CHARSET + case CK_SelectCodepage: + encoding_cmd (); + break; +#endif + case CK_CdQuick: + quick_cd_cmd (current_panel); + break; + case CK_HotList: + hotlist_cmd (current_panel); + break; + case CK_PanelQuickView: + if (sender == WIDGET (the_menubar)) + quick_view_cmd (); /* menu */ + else + quick_cmd_no_menu (); /* shortcut or buttonabr */ + break; + case CK_QuitQuiet: + quiet_quit_cmd (); + break; + case CK_Quit: + quit_cmd (); + break; + case CK_LinkSymbolicRelative: + link_cmd (LINK_SYMLINK_RELATIVE); + break; + case CK_Move: + rename_cmd (current_panel); + break; + case CK_Reread: + reread_cmd (); + break; +#ifdef ENABLE_VFS + case CK_VfsList: + vfs_list (current_panel); + break; +#endif + case CK_SaveSetup: + save_setup_cmd (); + break; + case CK_Select: + case CK_Unselect: + case CK_SelectInvert: + res = send_message (current_panel, midnight_dlg, MSG_ACTION, command, NULL); + break; + case CK_Shell: + toggle_subshell (); + break; + case CK_DirSize: + smart_dirsize_cmd (current_panel); + break; + case CK_Sort: + sort_cmd (); + break; + case CK_ExtendedKeyMap: + WIDGET (midnight_dlg)->ext_mode = TRUE; + break; + case CK_Suspend: + mc_event_raise (MCEVENT_GROUP_CORE, "suspend", NULL); + break; + case CK_Swap: + swap_cmd (); + break; + case CK_LinkSymbolic: + link_cmd (LINK_SYMLINK_ABSOLUTE); + break; + case CK_ShowHidden: + toggle_show_hidden (); + break; + case CK_SplitVertHoriz: + toggle_panels_split (); + break; + case CK_SplitEqual: + panels_split_equal (); + break; + case CK_SplitMore: + panels_split_more (); + break; + case CK_SplitLess: + panels_split_less (); + break; + case CK_PanelTree: + panel_tree_cmd (); + break; + case CK_Tree: + treebox_cmd (); + break; +#ifdef ENABLE_VFS_UNDELFS + case CK_Undelete: + undelete_cmd (); + break; +#endif + case CK_UserMenu: + user_file_menu_cmd (); + break; + case CK_View: + view_cmd (current_panel); + break; + case CK_ViewFile: + view_file_cmd (current_panel); + break; + case CK_EditorViewerHistory: + show_editor_viewer_history (); + break; + case CK_Cancel: + /* don't close panels due to SIGINT */ + break; + default: + res = MSG_NOT_HANDLED; + } + + return res; +} + +/* --------------------------------------------------------------------------------------------- */ + +/** + * Whether the command-line should not respond to key events. + * + * This is TRUE if a QuickView or TreeView have the focus, as they're going + * to consume some keys and there's no sense in passing to the command-line + * just the leftovers. + */ +static gboolean +is_cmdline_mute (void) +{ + /* When one of panels is other than view_listing, + current_panel points to view_listing panel all time independently of + it's activity. Thus, we can't use get_current_type() here. + current_panel should point to actualy current active panel + independently of it's type. */ + return (!current_panel->active + && (get_other_type () == view_quick || get_other_type () == view_tree)); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** + * Handles the Enter key on the command-line. + * + * Returns TRUE if non-whitespace was indeed processed. + */ +static gboolean +handle_cmdline_enter (void) +{ + size_t i; + + for (i = 0; cmdline->buffer[i] != '\0' && whitespace (cmdline->buffer[i]); i++) + ; + + if (cmdline->buffer[i] != '\0') + { + send_message (cmdline, NULL, MSG_KEY, '\n', NULL); + return TRUE; + } + + input_insert (cmdline, "", FALSE); + cmdline->point = 0; + + return FALSE; +} + +/* --------------------------------------------------------------------------------------------- */ + +static cb_ret_t +midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) +{ + long command; + + switch (msg) + { + case MSG_INIT: + panel_init (); + setup_panels (); + return MSG_HANDLED; + + case MSG_DRAW: + load_hint (TRUE); + group_default_callback (w, NULL, MSG_DRAW, 0, NULL); + /* We handle the special case of the output lines */ + if (mc_global.tty.console_flag != '\0' && output_lines != 0) + { + unsigned char end_line; + + end_line = LINES - (mc_global.keybar_visible ? 1 : 0) - 1; + show_console_contents (output_start_y, end_line - output_lines, end_line); + } + return MSG_HANDLED; + + case MSG_RESIZE: + widget_adjust_position (w->pos_flags, &w->y, &w->x, &w->lines, &w->cols); + setup_panels (); + menubar_arrange (the_menubar); + return MSG_HANDLED; + + case MSG_IDLE: + /* We only need the first idle event to show user menu after start */ + widget_idle (w, FALSE); + + if (boot_current_is_left) + widget_select (get_panel_widget (0)); + else + widget_select (get_panel_widget (1)); + + if (auto_menu) + midnight_execute_cmd (NULL, CK_UserMenu); + return MSG_HANDLED; + + case MSG_KEY: + if (w->ext_mode) + { + command = widget_lookup_key (w, parm); + if (command != CK_IgnoreKey) + return midnight_execute_cmd (NULL, command); + } + + /* FIXME: should handle all menu shortcuts before this point */ + if (widget_get_state (WIDGET (the_menubar), WST_FOCUSED)) + return MSG_NOT_HANDLED; + + if (parm == '\n' && !is_cmdline_mute ()) + { + if (handle_cmdline_enter ()) + return MSG_HANDLED; + /* Else: the panel will handle it. */ + } + + if ((!mc_global.tty.alternate_plus_minus + || !(mc_global.tty.console_flag != '\0' || mc_global.tty.xterm_flag)) && !quote + && !current_panel->quick_search.active) + { + if (!only_leading_plus_minus) + { + /* Special treatement, since the input line will eat them */ + if (parm == '+') + return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Select, NULL); + + if (parm == '\\' || parm == '-') + return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Unselect, + NULL); + + if (parm == '*') + return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_SelectInvert, + NULL); + } + else if (!command_prompt || input_is_empty (cmdline)) + { + /* Special treatement '+', '-', '\', '*' only when this is + * first char on input line + */ + if (parm == '+') + return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Select, NULL); + + if (parm == '\\' || parm == '-') + return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Unselect, + NULL); + + if (parm == '*') + return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_SelectInvert, + NULL); + } + } + return MSG_NOT_HANDLED; + + case MSG_HOTKEY_HANDLED: + if ((get_current_type () == view_listing) && current_panel->quick_search.active) + { + current_panel->dirty = TRUE; /* FIXME: unneeded? */ + send_message (current_panel, NULL, MSG_ACTION, CK_SearchStop, NULL); + } + return MSG_HANDLED; + + case MSG_UNHANDLED_KEY: + { + cb_ret_t v = MSG_NOT_HANDLED; + + command = widget_lookup_key (w, parm); + if (command != CK_IgnoreKey) + v = midnight_execute_cmd (NULL, command); + + if (v == MSG_NOT_HANDLED && command_prompt && !is_cmdline_mute ()) + v = send_message (cmdline, NULL, MSG_KEY, parm, NULL); + + return v; + } + + case MSG_POST_KEY: + if (!widget_get_state (WIDGET (the_menubar), WST_FOCUSED)) + update_dirty_panels (); + return MSG_HANDLED; + + case MSG_ACTION: + /* Handle shortcuts, menu, and buttonbar. */ + return midnight_execute_cmd (sender, parm); + + case MSG_END: + panel_deinit (); + return MSG_HANDLED; + + default: + return dlg_default_callback (w, sender, msg, parm, data); + } +} + +/* --------------------------------------------------------------------------------------------- */ +/*** public functions ****************************************************************************/ +/* --------------------------------------------------------------------------------------------- */ + +void +update_menu (void) +{ + menu_set_name (left_menu, panels_layout.horizontal_split ? _("&Above") : _("&Left")); + menu_set_name (right_menu, panels_layout.horizontal_split ? _("&Below") : _("&Right")); + menubar_arrange (the_menubar); + menubar_set_visible (the_menubar, menubar_visible); +} + +/* --------------------------------------------------------------------------------------------- */ + +void +midnight_set_buttonbar (WButtonBar * b) +{ + Widget *w = WIDGET (midnight_dlg); + + buttonbar_set_label (b, 1, Q_ ("ButtonBar|Help"), w->keymap, NULL); + buttonbar_set_label (b, 2, Q_ ("ButtonBar|Menu"), w->keymap, NULL); + buttonbar_set_label (b, 3, Q_ ("ButtonBar|View"), w->keymap, NULL); + buttonbar_set_label (b, 4, Q_ ("ButtonBar|Edit"), w->keymap, NULL); + buttonbar_set_label (b, 5, Q_ ("ButtonBar|Copy"), w->keymap, NULL); + buttonbar_set_label (b, 6, Q_ ("ButtonBar|RenMov"), w->keymap, NULL); + buttonbar_set_label (b, 7, Q_ ("ButtonBar|Mkdir"), w->keymap, NULL); + buttonbar_set_label (b, 8, Q_ ("ButtonBar|Delete"), w->keymap, NULL); + buttonbar_set_label (b, 9, Q_ ("ButtonBar|PullDn"), w->keymap, NULL); + buttonbar_set_label (b, 10, Q_ ("ButtonBar|Quit"), w->keymap, NULL); +} + +/* --------------------------------------------------------------------------------------------- */ +/** + * Return a random hint. If force is TRUE, ignore the timeout. + */ + +char * +get_random_hint (gboolean force) +{ + static const gint64 update_period = 60 * G_USEC_PER_SEC; + static gint64 tv = 0; + + char *data, *result = NULL, *eop; + size_t len, start; + GIConv conv; + + /* Do not change hints more often than one minute */ + if (!force && !mc_time_elapsed (&tv, update_period)) + return g_strdup (""); + + data = load_mc_home_file (mc_global.share_data_dir, MC_HINT, NULL, &len); + if (data == NULL) + return NULL; + + /* get a random entry */ + srand ((unsigned int) (tv / G_USEC_PER_SEC)); + start = ((size_t) rand ()) % (len - 1); + + /* Search the start of paragraph */ + for (; start != 0; start--) + if (data[start] == '\n' && data[start + 1] == '\n') + { + start += 2; + break; + } + + /* Search the end of paragraph */ + for (eop = data + start; *eop != '\0'; eop++) + { + if (*eop == '\n' && *(eop + 1) == '\n') + { + *eop = '\0'; + break; + } + if (*eop == '\n') + *eop = ' '; + } + + /* hint files are stored in utf-8 */ + /* try convert hint file from utf-8 to terminal encoding */ + conv = str_crt_conv_from ("UTF-8"); + if (conv != INVALID_CONV) + { + GString *buffer; + + buffer = g_string_sized_new (len - start); + if (str_convert (conv, &data[start], buffer) != ESTR_FAILURE) + result = g_string_free (buffer, FALSE); + else + g_string_free (buffer, TRUE); + str_close_conv (conv); + } + else + result = g_strndup (data + start, len - start); + + g_free (data); + return result; +} + + +/* --------------------------------------------------------------------------------------------- */ +/** + * Load new hint and display it. + * IF force is not 0, ignore the timeout. + */ + +void +load_hint (gboolean force) +{ + char *hint; + + if (WIDGET (the_hint)->owner == NULL) + return; + + if (!mc_global.message_visible) + { + label_set_text (the_hint, NULL); + return; + } + + hint = get_random_hint (force); + + if (hint != NULL) + { + if (*hint != '\0') + set_hintbar (hint); + g_free (hint); + } + else + { + char text[BUF_SMALL]; + + g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"), VERSION); + set_hintbar (text); + } +} + +/* --------------------------------------------------------------------------------------------- */ +/** + * Change current panel in the file manager. + * + * @return current_panel + */ + +WPanel * +change_panel (void) +{ + input_complete_free (cmdline); + group_select_next_widget (GROUP (midnight_dlg)); + return current_panel; +} + +/* --------------------------------------------------------------------------------------------- */ + +/** Save current stat of directories to avoid reloading the panels + * when no modifications have taken place + */ +void +save_cwds_stat (void) +{ + if (panels_options.fast_reload) + { + mc_stat (current_panel->cwd_vpath, &(current_panel->dir_stat)); + if (get_other_type () == view_listing) + mc_stat (other_panel->cwd_vpath, &(other_panel->dir_stat)); + } +} + +/* --------------------------------------------------------------------------------------------- */ + +gboolean +quiet_quit_cmd (void) +{ + print_last_revert = TRUE; + return quit_cmd_internal (1); +} + +/* --------------------------------------------------------------------------------------------- */ + +/** Run the main dialog that occupies the whole screen */ +gboolean +do_nc (void) +{ + gboolean ret; + +#ifdef USE_INTERNAL_EDIT + edit_stack_init (); +#endif + + midnight_dlg = dlg_create (FALSE, 0, 0, 1, 1, WPOS_FULLSCREEN, FALSE, dialog_colors, + midnight_callback, NULL, "[main]", NULL); + + /* Check if we were invoked as an editor or file viewer */ + if (mc_global.mc_run_mode != MC_RUN_FULL) + { + setup_dummy_mc (); + ret = mc_maybe_editor_or_viewer (); + } + else + { + /* We only need the first idle event to show user menu after start */ + widget_idle (WIDGET (midnight_dlg), TRUE); + + setup_mc (); + mc_filehighlight = mc_fhl_new (TRUE); + + create_file_manager (); + (void) dlg_run (midnight_dlg); + + mc_fhl_free (&mc_filehighlight); + + ret = TRUE; + + /* dlg_destroy destroys even current_panel->cwd_vpath, so we have to save a copy :) */ + if (mc_args__last_wd_file != NULL && vfs_current_is_local ()) + last_wd_string = g_strdup (vfs_path_as_str (current_panel->cwd_vpath)); + + /* don't handle VFS timestamps for dirs opened in panels */ + mc_event_destroy (MCEVENT_GROUP_CORE, "vfs_timestamp"); + + dir_list_free_list (&panelized_panel.list); + } + + /* Program end */ + mc_global.midnight_shutdown = TRUE; + dialog_switch_shutdown (); + done_mc (); + dlg_destroy (midnight_dlg); + current_panel = NULL; + +#ifdef USE_INTERNAL_EDIT + edit_stack_free (); +#endif + + if ((quit & SUBSHELL_EXIT) == 0) + tty_clear_screen (); + + return ret; +} + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/filemanager/filemanager.h mc-4.8.26/src/filemanager/filemanager.h --- mc-4.8.25/src/filemanager/filemanager.h 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/src/filemanager/filemanager.h 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,53 @@ +/** \file filemanager.h + * \brief Header: main dialog (file panels) for Midnight Commander + */ + +#ifndef MC__FILEMANAGER_H +#define MC__FILEMANAGER_H + +#include "lib/widget.h" + +#include "panel.h" +#include "layout.h" + +/* TODO: merge content of layout.h here */ + +/*** typedefs(not structures) and defined constants **********************************************/ + +#define MENU_PANEL (mc_global.widget.is_right ? right_panel : left_panel) +#define MENU_PANEL_IDX (mc_global.widget.is_right ? 1 : 0) +#define SELECTED_IS_PANEL (get_panel_type (MENU_PANEL_IDX) == view_listing) + +#define other_panel get_other_panel() + +/*** enums ***************************************************************************************/ + +/*** structures declarations (and typedefs of structures)*****************************************/ + +/*** global variables defined in .c file *********************************************************/ + +extern WMenuBar *the_menubar; +extern WLabel *the_prompt; +extern WLabel *the_hint; +extern WButtonBar *the_bar; + +extern WPanel *left_panel; +extern WPanel *right_panel; +extern WPanel *current_panel; + +extern const char *mc_prompt; + +/*** declarations of public functions ************************************************************/ + +void update_menu (void); +void midnight_set_buttonbar (WButtonBar * b); +char *get_random_hint (gboolean force); +void load_hint (gboolean force); +WPanel *change_panel (void); +void save_cwds_stat (void); +gboolean quiet_quit_cmd (void); +gboolean do_nc (void); + +/*** inline functions ****************************************************************************/ + +#endif /* MC__FILEMANAGER_H */ diff -Nru mc-4.8.25/src/filemanager/find.c mc-4.8.26/src/filemanager/find.c --- mc-4.8.25/src/filemanager/find.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/find.c 2021-01-10 11:50:16.000000000 +0000 @@ -36,7 +36,6 @@ #include #include #include -#include #include "lib/global.h" @@ -55,7 +54,6 @@ #include "dir.h" #include "cmd.h" /* find_cmd(), view_file_at_line() */ -#include "midnight.h" /* current_panel */ #include "boxes.h" #include "panelize.h" @@ -155,7 +153,7 @@ static gboolean is_start = FALSE; /* Status of the start/stop toggle button */ static char *old_dir = NULL; -static struct timeval last_refresh; +static gint64 last_refresh; /* Where did we stop */ static gboolean resuming; @@ -558,7 +556,7 @@ */ static gboolean -find_parameters (char **start_dir, ssize_t * start_dir_len, +find_parameters (WPanel * panel, char **start_dir, ssize_t * start_dir_len, char **ignore_dirs, char **pattern, char **content) { WGroup *g; @@ -776,7 +774,7 @@ temp_dir = in_start->buffer; if (*temp_dir == '\0' || DIR_IS_DOT (temp_dir)) - temp_dir = g_strdup (vfs_path_as_str (current_panel->cwd_vpath)); + temp_dir = g_strdup (vfs_path_as_str (panel->cwd_vpath)); else temp_dir = g_strdup (temp_dir); @@ -829,8 +827,8 @@ if (DIR_IS_DOT (s)) { - *start_dir = g_strdup (vfs_path_as_str (current_panel->cwd_vpath)); - /* FIXME: is current_panel->cwd_vpath canonicalized? */ + *start_dir = g_strdup (vfs_path_as_str (panel->cwd_vpath)); + /* FIXME: is panel->cwd_vpath canonicalized? */ /* relative paths will be used in panelization */ *start_dir_len = (ssize_t) strlen (*start_dir); g_free (s); @@ -844,9 +842,8 @@ { /* relative paths will be used in panelization */ *start_dir = - mc_build_filename (vfs_path_as_str (current_panel->cwd_vpath), s, - (char *) NULL); - *start_dir_len = (ssize_t) strlen (vfs_path_as_str (current_panel->cwd_vpath)); + mc_build_filename (vfs_path_as_str (panel->cwd_vpath), s, (char *) NULL); + *start_dir_len = (ssize_t) strlen (vfs_path_as_str (panel->cwd_vpath)); g_free (s); } @@ -988,13 +985,11 @@ search_content (WDialog * h, const char *directory, const char *filename) { struct stat s; - char buffer[BUF_4K]; /* raw input buffer */ + char buffer[BUF_4K] = ""; /* raw input buffer */ int file_fd; gboolean ret_val = FALSE; vfs_path_t *vpath; - struct timeval tv; - time_t seconds; - suseconds_t useconds; + gint64 tv; gboolean status_updated = FALSE; vpath = vfs_path_build_filename (directory, filename, (char *) NULL); @@ -1012,21 +1007,9 @@ return FALSE; /* get time elapsed from last refresh */ - if (gettimeofday (&tv, NULL) == -1) - { - tv.tv_sec = 0; - tv.tv_usec = 0; - last_refresh = tv; - } - seconds = tv.tv_sec - last_refresh.tv_sec; - useconds = tv.tv_usec - last_refresh.tv_usec; - if (useconds < 0) - { - seconds--; - useconds += G_USEC_PER_SEC; - } + tv = g_get_real_time (); - if (s.st_size >= MIN_REFRESH_FILE_SIZE || seconds > 0 || useconds > MAX_REFRESH_INTERVAL) + if (s.st_size >= MIN_REFRESH_FILE_SIZE || (tv - last_refresh) > MAX_REFRESH_INTERVAL) { g_snprintf (buffer, sizeof (buffer), _("Grepping in %s"), filename); status_update (str_trunc (buffer, WIDGET (h)->cols - 8)); @@ -1262,7 +1245,7 @@ static int do_search (WDialog * h) { - static struct dirent *dp = NULL; + static struct vfs_dirent *dp = NULL; static DIR *dirp = NULL; static char *directory = NULL; struct stat tmp_stat; @@ -1764,7 +1747,7 @@ /* --------------------------------------------------------------------------------------------- */ static int -do_find (const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs, +do_find (WPanel * panel, const char *start_dir, ssize_t start_dir_len, const char *ignore_dirs, char **dirname, char **filename) { int return_value = 0; @@ -1793,10 +1776,10 @@ int i; struct stat st; GList *entry; - dir_list *list = ¤t_panel->dir; + dir_list *list = &panel->dir; char *name = NULL; - panel_clean_dir (current_panel); + panel_clean_dir (panel); dir_list_init (list); for (i = 0, entry = listbox_get_first_link (find_list); entry != NULL; @@ -1862,9 +1845,9 @@ rotate_dash (TRUE); } - current_panel->is_panelized = TRUE; - panelize_absolutize_if_needed (current_panel); - panelize_save_panel (current_panel); + panel->is_panelized = TRUE; + panelize_absolutize_if_needed (panel); + panelize_save_panel (panel); } kill_gui (); @@ -1880,7 +1863,7 @@ /* --------------------------------------------------------------------------------------------- */ void -find_cmd (void) +find_cmd (WPanel * panel) { char *start_dir = NULL, *ignore_dirs = NULL; ssize_t start_dir_len; @@ -1888,7 +1871,7 @@ find_pattern = NULL; content_pattern = NULL; - while (find_parameters (&start_dir, &start_dir_len, + while (find_parameters (panel, &start_dir, &start_dir_len, &ignore_dirs, &find_pattern, &content_pattern)) { char *filename = NULL, *dirname = NULL; @@ -1898,15 +1881,14 @@ if (find_pattern[0] != '\0') { - last_refresh.tv_sec = 0; - last_refresh.tv_usec = 0; + last_refresh = 0; is_start = FALSE; if (!content_is_empty && !str_is_valid_string (content_pattern)) MC_PTR_FREE (content_pattern); - v = do_find (start_dir, start_dir_len, ignore_dirs, &dirname, &filename); + v = do_find (panel, start_dir, start_dir_len, ignore_dirs, &dirname, &filename); } g_free (start_dir); @@ -1920,10 +1902,10 @@ vfs_path_t *dirname_vpath; dirname_vpath = vfs_path_from_str (dirname); - do_cd (dirname_vpath, cd_exact); + panel_cd (panel, dirname_vpath, cd_exact); vfs_path_free (dirname_vpath); if (filename != NULL) - try_to_select (current_panel, + try_to_select (panel, filename + (content_pattern != NULL ? strchr (filename + 4, ':') - filename + 1 : 4)); } @@ -1932,7 +1914,7 @@ vfs_path_t *filename_vpath; filename_vpath = vfs_path_from_str (filename); - do_cd (filename_vpath, cd_exact); + panel_cd (panel, filename_vpath, cd_exact); vfs_path_free (filename_vpath); } } @@ -1946,8 +1928,8 @@ if (v == B_PANELIZE) { - panel_re_sort (current_panel); - try_to_select (current_panel, NULL); + panel_re_sort (panel); + try_to_select (panel, NULL); break; } } diff -Nru mc-4.8.25/src/filemanager/hotlist.c mc-4.8.26/src/filemanager/hotlist.c --- mc-4.8.25/src/filemanager/hotlist.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/hotlist.c 2021-01-10 11:50:16.000000000 +0000 @@ -59,7 +59,6 @@ #include "src/setup.h" /* For profile_bname */ #include "src/history.h" -#include "midnight.h" /* current_panel */ #include "command.h" /* cmdline */ #include "hotlist.h" @@ -151,6 +150,8 @@ /*** file scope variables ************************************************************************/ +static WPanel *our_panel; + static gboolean hotlist_has_dot_dot = TRUE; static WDialog *hotlist_dlg, *movelist_dlg; @@ -216,7 +217,7 @@ static void init_movelist (struct hotlist *item); static void add_new_group_cmd (void); -static void add_new_entry_cmd (void); +static void add_new_entry_cmd (WPanel * panel); static void remove_from_hotlist (struct hotlist *entry); static void load_hotlist (void); static void add_dotdot_to_list (void); @@ -287,6 +288,7 @@ case HL_TYPE_DOTDOT: case HL_TYPE_ENTRY: listbox_add_item (list, LISTBOX_APPEND_AT_END, 0, current->label, current, FALSE); + break; default: break; } @@ -413,11 +415,11 @@ return 0; case B_ADD_CURRENT: - add2hotlist_cmd (); + add2hotlist_cmd (our_panel); return 0; case B_NEW_ENTRY: - add_new_entry_cmd (); + add_new_entry_cmd (our_panel); return 0; case B_ENTER: @@ -444,7 +446,6 @@ fill_listbox (list); return 0; } - MC_FALLTHROUGH; /* go up */ } MC_FALLTHROUGH; /* if list empty - just go up */ @@ -1032,13 +1033,13 @@ /* --------------------------------------------------------------------------------------------- */ static void -add_new_entry_cmd (void) +add_new_entry_cmd (WPanel * panel) { char *title, *url, *to_free; int ret; /* Take current directory as default value for input fields */ - to_free = title = url = vfs_path_to_str_flags (current_panel->cwd_vpath, 0, VPF_STRIP_PASSWORD); + to_free = title = url = vfs_path_to_str_flags (panel->cwd_vpath, 0, VPF_STRIP_PASSWORD); ret = add_new_entry_input (_("New hotlist entry"), _("Directory label:"), _("Directory path:"), "[Hotlist]", &title, &url); @@ -1594,7 +1595,7 @@ /* --------------------------------------------------------------------------------------------- */ void -add2hotlist_cmd (void) +add2hotlist_cmd (WPanel * panel) { char *lc_prompt; const char *cp = N_("Label for \"%s\":"); @@ -1605,8 +1606,11 @@ cp = _(cp); #endif + /* extra variable to use it in the button callback */ + our_panel = panel; + l = str_term_width1 (cp); - label_string = vfs_path_to_str_flags (current_panel->cwd_vpath, 0, VPF_STRIP_PASSWORD); + label_string = vfs_path_to_str_flags (panel->cwd_vpath, 0, VPF_STRIP_PASSWORD); lc_prompt = g_strdup_printf (cp, str_trunc (label_string, COLS - 2 * UX - (l + 8))); label = input_dialog (_("Add to hotlist"), lc_prompt, MC_HISTORY_HOTLIST_ADD, label_string, @@ -1628,11 +1632,14 @@ /* --------------------------------------------------------------------------------------------- */ char * -hotlist_show (hotlist_t list_type) +hotlist_show (hotlist_t list_type, WPanel * panel) { char *target = NULL; int res; + /* extra variable to use it in the button callback */ + our_panel = panel; + hotlist_state.type = list_type; load_hotlist (); diff -Nru mc-4.8.25/src/filemanager/hotlist.h mc-4.8.26/src/filemanager/hotlist.h --- mc-4.8.25/src/filemanager/hotlist.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/hotlist.h 2021-01-10 11:50:16.000000000 +0000 @@ -7,6 +7,8 @@ /*** typedefs(not structures) and defined constants **********************************************/ +#include "panel.h" + /*** enums ***************************************************************************************/ typedef enum @@ -22,8 +24,8 @@ /*** declarations of public functions ************************************************************/ -void add2hotlist_cmd (void); -char *hotlist_show (hotlist_t list_type); +void add2hotlist_cmd (WPanel * panel); +char *hotlist_show (hotlist_t list_type, WPanel * panel); gboolean save_hotlist (void); void done_hotlist (void); diff -Nru mc-4.8.25/src/filemanager/info.c mc-4.8.26/src/filemanager/info.c --- mc-4.8.25/src/filemanager/info.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/info.c 2021-01-10 11:50:16.000000000 +0000 @@ -50,11 +50,11 @@ #include "src/setup.h" /* panels_options */ -#include "midnight.h" /* the_menubar */ +#include "filemanager.h" /* the_menubar */ #include "layout.h" #include "mountlist.h" #ifdef ENABLE_EXT2FS_ATTR -#include "chattr.h" +#include "cmd.h" /* chattr_get_as_str() */ #endif #include "info.h" diff -Nru mc-4.8.25/src/filemanager/layout.c mc-4.8.26/src/filemanager/layout.c --- mc-4.8.25/src/filemanager/layout.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/layout.c 2021-01-10 11:50:16.000000000 +0000 @@ -60,7 +60,7 @@ #endif #include "command.h" -#include "midnight.h" +#include "filemanager.h" #include "tree.h" /* Needed for the extern declarations of integer parameters */ #include "dir.h" @@ -1027,9 +1027,9 @@ void rotate_dash (gboolean show) { - static guint64 timestamp = 0; + static gint64 timestamp = 0; /* update with 10 FPS rate */ - static const guint64 delay = G_USEC_PER_SEC / 10; + static const gint64 delay = G_USEC_PER_SEC / 10; const Widget *w = CONST_WIDGET (midnight_dlg); @@ -1193,7 +1193,7 @@ /* We use replace to keep the circular list of the dialog in the */ /* same state. Maybe we could just kill it and then replace it */ - if ((midnight_dlg != NULL) && (old_widget != NULL)) + if (old_widget != NULL) { if (old_type == view_listing) { @@ -1277,8 +1277,8 @@ panelswap (dir_stat); #undef panelswap - panel1->searching = FALSE; - panel2->searching = FALSE; + panel1->quick_search.active = FALSE; + panel2->quick_search.active = FALSE; if (current_panel == panel1) current_panel = panel2; @@ -1309,18 +1309,18 @@ if (panels[0].type == view_listing) { - if (strcmp (panel1->panel_name, get_nth_panel_name (0)) == 0) + if (strcmp (panel1->name, get_nth_panel_name (0)) == 0) { - g_free (panel1->panel_name); - panel1->panel_name = g_strdup (get_nth_panel_name (1)); + g_free (panel1->name); + panel1->name = g_strdup (get_nth_panel_name (1)); } } if (panels[1].type == view_listing) { - if (strcmp (panel2->panel_name, get_nth_panel_name (1)) == 0) + if (strcmp (panel2->name, get_nth_panel_name (1)) == 0) { - g_free (panel2->panel_name); - panel2->panel_name = g_strdup (get_nth_panel_name (0)); + g_free (panel2->name); + panel2->name = g_strdup (get_nth_panel_name (0)); } } @@ -1498,7 +1498,11 @@ (void) fd; (void) unused; - do_load_prompt (); + if (should_read_new_subshell_prompt) + do_load_prompt (); + else + flush_subshell (0, QUIETLY); + return 0; } #endif /* ENABLE_SUBSHELL */ diff -Nru mc-4.8.25/src/filemanager/Makefile.am mc-4.8.26/src/filemanager/Makefile.am --- mc-4.8.25/src/filemanager/Makefile.am 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/Makefile.am 2021-01-10 11:50:16.000000000 +0000 @@ -2,16 +2,18 @@ noinst_LTLIBRARIES = libmcfilemanager.la libmcfilemanager_la_SOURCES = \ - achown.c achown.h \ + achown.c \ boxes.c boxes.h \ - chmod.c chmod.h \ - chown.c chown.h \ + cd.c cd.h \ + chmod.c \ + chown.c \ cmd.c cmd.h \ command.c command.h \ dir.c dir.h \ ext.c ext.h \ file.c file.h \ filegui.c filegui.h \ + filemanager.h filemanager.c \ filenot.c filenot.h \ fileopctx.c fileopctx.h \ find.c \ @@ -19,7 +21,6 @@ info.c info.h \ ioblksize.h \ layout.c layout.h \ - midnight.h midnight.c \ mountlist.c mountlist.h \ panelize.c panelize.h \ panel.c panel.h \ @@ -33,7 +34,7 @@ if ENABLE_EXT2FS_ATTR libmcfilemanager_la_SOURCES += \ - chattr.c chattr.h + chattr.c AM_CPPFLAGS += @EXT2FS_CFLAGS@ @E2P_CFLAGS@ endif diff -Nru mc-4.8.25/src/filemanager/Makefile.in mc-4.8.26/src/filemanager/Makefile.in --- mc-4.8.25/src/filemanager/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/filemanager/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -89,7 +89,7 @@ build_triplet = @build@ host_triplet = @host@ @ENABLE_EXT2FS_ATTR_TRUE@am__append_1 = \ -@ENABLE_EXT2FS_ATTR_TRUE@ chattr.c chattr.h +@ENABLE_EXT2FS_ATTR_TRUE@ chattr.c @ENABLE_EXT2FS_ATTR_TRUE@am__append_2 = @EXT2FS_CFLAGS@ @E2P_CFLAGS@ subdir = src/filemanager @@ -152,20 +152,20 @@ CONFIG_CLEAN_VPATH_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) libmcfilemanager_la_DEPENDENCIES = ../../lib/libmc.la -am__libmcfilemanager_la_SOURCES_DIST = achown.c achown.h boxes.c \ - boxes.h chmod.c chmod.h chown.c chown.h cmd.c cmd.h command.c \ - command.h dir.c dir.h ext.c ext.h file.c file.h filegui.c \ - filegui.h filenot.c filenot.h fileopctx.c fileopctx.h find.c \ - hotlist.c hotlist.h info.c info.h ioblksize.h layout.c \ - layout.h midnight.h midnight.c mountlist.c mountlist.h \ +am__libmcfilemanager_la_SOURCES_DIST = achown.c boxes.c boxes.h cd.c \ + cd.h chmod.c chown.c cmd.c cmd.h command.c command.h dir.c \ + dir.h ext.c ext.h file.c file.h filegui.c filegui.h \ + filemanager.h filemanager.c filenot.c filenot.h fileopctx.c \ + fileopctx.h find.c hotlist.c hotlist.h info.c info.h \ + ioblksize.h layout.c layout.h mountlist.c mountlist.h \ panelize.c panelize.h panel.c panel.h tree.c tree.h \ - treestore.c treestore.h chattr.c chattr.h + treestore.c treestore.h chattr.c @ENABLE_EXT2FS_ATTR_TRUE@am__objects_1 = chattr.lo -am_libmcfilemanager_la_OBJECTS = achown.lo boxes.lo chmod.lo chown.lo \ - cmd.lo command.lo dir.lo ext.lo file.lo filegui.lo filenot.lo \ - fileopctx.lo find.lo hotlist.lo info.lo layout.lo midnight.lo \ - mountlist.lo panelize.lo panel.lo tree.lo treestore.lo \ - $(am__objects_1) +am_libmcfilemanager_la_OBJECTS = achown.lo boxes.lo cd.lo chmod.lo \ + chown.lo cmd.lo command.lo dir.lo ext.lo file.lo filegui.lo \ + filemanager.lo filenot.lo fileopctx.lo find.lo hotlist.lo \ + info.lo layout.lo mountlist.lo panelize.lo panel.lo tree.lo \ + treestore.lo $(am__objects_1) libmcfilemanager_la_OBJECTS = $(am_libmcfilemanager_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -187,14 +187,14 @@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/achown.Plo ./$(DEPDIR)/boxes.Plo \ - ./$(DEPDIR)/chattr.Plo ./$(DEPDIR)/chmod.Plo \ - ./$(DEPDIR)/chown.Plo ./$(DEPDIR)/cmd.Plo \ - ./$(DEPDIR)/command.Plo ./$(DEPDIR)/dir.Plo \ - ./$(DEPDIR)/ext.Plo ./$(DEPDIR)/file.Plo \ - ./$(DEPDIR)/filegui.Plo ./$(DEPDIR)/filenot.Plo \ - ./$(DEPDIR)/fileopctx.Plo ./$(DEPDIR)/find.Plo \ - ./$(DEPDIR)/hotlist.Plo ./$(DEPDIR)/info.Plo \ - ./$(DEPDIR)/layout.Plo ./$(DEPDIR)/midnight.Plo \ + ./$(DEPDIR)/cd.Plo ./$(DEPDIR)/chattr.Plo \ + ./$(DEPDIR)/chmod.Plo ./$(DEPDIR)/chown.Plo \ + ./$(DEPDIR)/cmd.Plo ./$(DEPDIR)/command.Plo \ + ./$(DEPDIR)/dir.Plo ./$(DEPDIR)/ext.Plo ./$(DEPDIR)/file.Plo \ + ./$(DEPDIR)/filegui.Plo ./$(DEPDIR)/filemanager.Plo \ + ./$(DEPDIR)/filenot.Plo ./$(DEPDIR)/fileopctx.Plo \ + ./$(DEPDIR)/find.Plo ./$(DEPDIR)/hotlist.Plo \ + ./$(DEPDIR)/info.Plo ./$(DEPDIR)/layout.Plo \ ./$(DEPDIR)/mountlist.Plo ./$(DEPDIR)/panel.Plo \ ./$(DEPDIR)/panelize.Plo ./$(DEPDIR)/tree.Plo \ ./$(DEPDIR)/treestore.Plo @@ -450,14 +450,13 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ noinst_LTLIBRARIES = libmcfilemanager.la -libmcfilemanager_la_SOURCES = achown.c achown.h boxes.c boxes.h \ - chmod.c chmod.h chown.c chown.h cmd.c cmd.h command.c \ - command.h dir.c dir.h ext.c ext.h file.c file.h filegui.c \ - filegui.h filenot.c filenot.h fileopctx.c fileopctx.h find.c \ - hotlist.c hotlist.h info.c info.h ioblksize.h layout.c \ - layout.h midnight.h midnight.c mountlist.c mountlist.h \ - panelize.c panelize.h panel.c panel.h tree.c tree.h \ - treestore.c treestore.h $(am__append_1) +libmcfilemanager_la_SOURCES = achown.c boxes.c boxes.h cd.c cd.h \ + chmod.c chown.c cmd.c cmd.h command.c command.h dir.c dir.h \ + ext.c ext.h file.c file.h filegui.c filegui.h filemanager.h \ + filemanager.c filenot.c filenot.h fileopctx.c fileopctx.h \ + find.c hotlist.c hotlist.h info.c info.h ioblksize.h layout.c \ + layout.h mountlist.c mountlist.h panelize.c panelize.h panel.c \ + panel.h tree.c tree.h treestore.c treestore.h $(am__append_1) # Unmaintained, unsupported, etc # listmode.c listmode.h @@ -520,6 +519,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/achown.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/boxes.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chattr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chmod.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/chown.Plo@am__quote@ # am--include-marker @@ -529,13 +529,13 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ext.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filegui.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemanager.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filenot.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fileopctx.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/find.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hotlist.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/info.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/midnight.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mountlist.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panel.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/panelize.Plo@am__quote@ # am--include-marker @@ -702,6 +702,7 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/achown.Plo -rm -f ./$(DEPDIR)/boxes.Plo + -rm -f ./$(DEPDIR)/cd.Plo -rm -f ./$(DEPDIR)/chattr.Plo -rm -f ./$(DEPDIR)/chmod.Plo -rm -f ./$(DEPDIR)/chown.Plo @@ -711,13 +712,13 @@ -rm -f ./$(DEPDIR)/ext.Plo -rm -f ./$(DEPDIR)/file.Plo -rm -f ./$(DEPDIR)/filegui.Plo + -rm -f ./$(DEPDIR)/filemanager.Plo -rm -f ./$(DEPDIR)/filenot.Plo -rm -f ./$(DEPDIR)/fileopctx.Plo -rm -f ./$(DEPDIR)/find.Plo -rm -f ./$(DEPDIR)/hotlist.Plo -rm -f ./$(DEPDIR)/info.Plo -rm -f ./$(DEPDIR)/layout.Plo - -rm -f ./$(DEPDIR)/midnight.Plo -rm -f ./$(DEPDIR)/mountlist.Plo -rm -f ./$(DEPDIR)/panel.Plo -rm -f ./$(DEPDIR)/panelize.Plo @@ -770,6 +771,7 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/achown.Plo -rm -f ./$(DEPDIR)/boxes.Plo + -rm -f ./$(DEPDIR)/cd.Plo -rm -f ./$(DEPDIR)/chattr.Plo -rm -f ./$(DEPDIR)/chmod.Plo -rm -f ./$(DEPDIR)/chown.Plo @@ -779,13 +781,13 @@ -rm -f ./$(DEPDIR)/ext.Plo -rm -f ./$(DEPDIR)/file.Plo -rm -f ./$(DEPDIR)/filegui.Plo + -rm -f ./$(DEPDIR)/filemanager.Plo -rm -f ./$(DEPDIR)/filenot.Plo -rm -f ./$(DEPDIR)/fileopctx.Plo -rm -f ./$(DEPDIR)/find.Plo -rm -f ./$(DEPDIR)/hotlist.Plo -rm -f ./$(DEPDIR)/info.Plo -rm -f ./$(DEPDIR)/layout.Plo - -rm -f ./$(DEPDIR)/midnight.Plo -rm -f ./$(DEPDIR)/mountlist.Plo -rm -f ./$(DEPDIR)/panel.Plo -rm -f ./$(DEPDIR)/panelize.Plo diff -Nru mc-4.8.25/src/filemanager/midnight.c mc-4.8.26/src/filemanager/midnight.c --- mc-4.8.25/src/filemanager/midnight.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/midnight.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,1871 +0,0 @@ -/* - Main dialog (file panels) of the Midnight Commander - - Copyright (C) 1994-2020 - Free Software Foundation, Inc. - - Written by: - Miguel de Icaza, 1994, 1995, 1996, 1997 - Janne Kukonlehto, 1994, 1995 - Norbert Warmuth, 1997 - Andrew Borodin , 2009, 2010, 2012, 2013 - Slava Zanko , 2013 - - This file is part of the Midnight Commander. - - The Midnight Commander 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 3 of the License, - or (at your option) any later version. - - The Midnight Commander 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, see . - */ - -/** \file main.c - * \brief Source: main dialog (file panels) of the Midnight Commander - */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include /* for username in xterm title */ - -#include "lib/global.h" -#include "lib/fileloc.h" /* MC_HINT */ - -#include "lib/tty/tty.h" -#include "lib/tty/key.h" /* KEY_M_* masks */ -#include "lib/skin.h" -#include "lib/util.h" - -#include "lib/vfs/vfs.h" - -#include "src/args.h" -#ifdef ENABLE_SUBSHELL -#include "src/subshell/subshell.h" -#endif -#include "src/execute.h" /* toggle_subshell */ -#include "src/setup.h" /* variables */ -#include "src/learn.h" /* learn_keys() */ -#include "src/keybind-defaults.h" -#include "lib/fileloc.h" /* MC_FILEPOS_FILE */ -#include "lib/keybind.h" -#include "lib/event.h" - -#include "tree.h" -#include "boxes.h" /* sort_box(), tree_box() */ -#include "layout.h" -#include "cmd.h" /* commands */ -#include "hotlist.h" -#include "panelize.h" -#include "command.h" /* cmdline */ -#include "dir.h" /* dir_list_clean() */ - -#include "chmod.h" -#include "chown.h" -#include "achown.h" -#ifdef ENABLE_EXT2FS_ATTR -#include "chattr.h" -#endif - -#ifdef USE_INTERNAL_EDIT -#include "src/editor/edit.h" -#endif - -#ifdef USE_DIFF_VIEW -#include "src/diffviewer/ydiff.h" -#endif - -#include "src/consaver/cons.saver.h" /* show_console_contents */ -#include "src/file_history.h" /* show_file_history() */ - -#include "midnight.h" - -/*** global variables ****************************************************************************/ - -/* When the modes are active, left_panel, right_panel and tree_panel */ -/* point to a proper data structure. You should check with the functions */ -/* get_current_type and get_other_type the types of the panels before using */ -/* this pointer variables */ - -/* The structures for the panels */ -WPanel *left_panel = NULL; -WPanel *right_panel = NULL; -/* Pointer to the selected and unselected panel */ -WPanel *current_panel = NULL; - -/* The Menubar */ -WMenuBar *the_menubar = NULL; -/* The widget where we draw the prompt */ -WLabel *the_prompt; -/* The hint bar */ -WLabel *the_hint; -/* The button bar */ -WButtonBar *the_bar; - -/* The prompt */ -const char *mc_prompt = NULL; - -/*** file scope macro definitions ****************************************************************/ - -#ifdef HAVE_CHARSET -/* - * Don't restrict the output on the screen manager level, - * the translation tables take care of it. - */ -#endif /* !HAVE_CHARSET */ - -/*** file scope type declarations ****************************************************************/ - -/*** file scope variables ************************************************************************/ - -static menu_t *left_menu, *right_menu; - -/*** file scope functions ************************************************************************/ - -/** Stop MC main dialog and the current dialog if it exists. - * Needed to provide fast exit from MC viewer or editor on shell exit */ -static void -stop_dialogs (void) -{ - dlg_stop (midnight_dlg); - - if (top_dlg != NULL) - dlg_stop (DIALOG (top_dlg->data)); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -treebox_cmd (void) -{ - char *sel_dir; - - sel_dir = tree_box (selection (current_panel)->fname); - if (sel_dir != NULL) - { - vfs_path_t *sel_vdir; - - sel_vdir = vfs_path_from_str (sel_dir); - do_cd (sel_vdir, cd_exact); - vfs_path_free (sel_vdir); - g_free (sel_dir); - } -} - -/* --------------------------------------------------------------------------------------------- */ - -#ifdef LISTMODE_EDITOR -static void -listmode_cmd (void) -{ - char *newmode; - - if (get_current_type () != view_listing) - return; - - newmode = listmode_edit (current_panel->user_format); - if (!newmode) - return; - - g_free (current_panel->user_format); - current_panel->list_format = list_user; - current_panel->user_format = newmode; - set_panel_formats (current_panel); - - do_refresh (); -} -#endif /* LISTMODE_EDITOR */ - -/* --------------------------------------------------------------------------------------------- */ - -static GList * -create_panel_menu (void) -{ - GList *entries = NULL; - - entries = g_list_prepend (entries, menu_entry_create (_("File listin&g"), CK_PanelListing)); - entries = g_list_prepend (entries, menu_entry_create (_("&Quick view"), CK_PanelQuickView)); - entries = g_list_prepend (entries, menu_entry_create (_("&Info"), CK_PanelInfo)); - entries = g_list_prepend (entries, menu_entry_create (_("&Tree"), CK_PanelTree)); - entries = g_list_prepend (entries, menu_separator_create ()); - entries = - g_list_prepend (entries, - menu_entry_create (_("&Listing format..."), CK_SetupListingFormat)); - entries = g_list_prepend (entries, menu_entry_create (_("&Sort order..."), CK_Sort)); - entries = g_list_prepend (entries, menu_entry_create (_("&Filter..."), CK_Filter)); -#ifdef HAVE_CHARSET - entries = g_list_prepend (entries, menu_entry_create (_("&Encoding..."), CK_SelectCodepage)); -#endif - entries = g_list_prepend (entries, menu_separator_create ()); -#ifdef ENABLE_VFS_FTP - entries = g_list_prepend (entries, menu_entry_create (_("FT&P link..."), CK_ConnectFtp)); -#endif -#ifdef ENABLE_VFS_FISH - entries = g_list_prepend (entries, menu_entry_create (_("S&hell link..."), CK_ConnectFish)); -#endif -#ifdef ENABLE_VFS_SFTP - entries = g_list_prepend (entries, menu_entry_create (_("S&FTP link..."), CK_ConnectSftp)); -#endif -#ifdef ENABLE_VFS_SMB - entries = g_list_prepend (entries, menu_entry_create (_("SM&B link..."), CK_ConnectSmb)); -#endif - entries = g_list_prepend (entries, menu_entry_create (_("Paneli&ze"), CK_Panelize)); - entries = g_list_prepend (entries, menu_separator_create ()); - entries = g_list_prepend (entries, menu_entry_create (_("&Rescan"), CK_Reread)); - - return g_list_reverse (entries); -} - -/* --------------------------------------------------------------------------------------------- */ - -static GList * -create_file_menu (void) -{ - GList *entries = NULL; - - entries = g_list_prepend (entries, menu_entry_create (_("&View"), CK_View)); - entries = g_list_prepend (entries, menu_entry_create (_("Vie&w file..."), CK_ViewFile)); - entries = g_list_prepend (entries, menu_entry_create (_("&Filtered view"), CK_ViewFiltered)); - entries = g_list_prepend (entries, menu_entry_create (_("&Edit"), CK_Edit)); - entries = g_list_prepend (entries, menu_entry_create (_("&Copy"), CK_Copy)); - entries = g_list_prepend (entries, menu_entry_create (_("C&hmod"), CK_ChangeMode)); - entries = g_list_prepend (entries, menu_entry_create (_("&Link"), CK_Link)); - entries = g_list_prepend (entries, menu_entry_create (_("&Symlink"), CK_LinkSymbolic)); - entries = - g_list_prepend (entries, - menu_entry_create (_("Relative symlin&k"), CK_LinkSymbolicRelative)); - entries = g_list_prepend (entries, menu_entry_create (_("Edit s&ymlink"), CK_LinkSymbolicEdit)); - entries = g_list_prepend (entries, menu_entry_create (_("Ch&own"), CK_ChangeOwn)); - entries = - g_list_prepend (entries, menu_entry_create (_("&Advanced chown"), CK_ChangeOwnAdvanced)); -#ifdef ENABLE_EXT2FS_ATTR - entries = g_list_prepend (entries, menu_entry_create (_("Cha&ttr"), CK_ChangeAttributes)); -#endif - entries = g_list_prepend (entries, menu_entry_create (_("&Rename/Move"), CK_Move)); - entries = g_list_prepend (entries, menu_entry_create (_("&Mkdir"), CK_MakeDir)); - entries = g_list_prepend (entries, menu_entry_create (_("&Delete"), CK_Delete)); - entries = g_list_prepend (entries, menu_entry_create (_("&Quick cd"), CK_CdQuick)); - entries = g_list_prepend (entries, menu_separator_create ()); - entries = g_list_prepend (entries, menu_entry_create (_("Select &group"), CK_Select)); - entries = g_list_prepend (entries, menu_entry_create (_("U&nselect group"), CK_Unselect)); - entries = g_list_prepend (entries, menu_entry_create (_("&Invert selection"), CK_SelectInvert)); - entries = g_list_prepend (entries, menu_separator_create ()); - entries = g_list_prepend (entries, menu_entry_create (_("E&xit"), CK_Quit)); - - return g_list_reverse (entries); -} - -/* --------------------------------------------------------------------------------------------- */ - -static GList * -create_command_menu (void) -{ - /* I know, I'm lazy, but the tree widget when it's not running - * as a panel still has some problems, I have not yet finished - * the WTree widget port, sorry. - */ - GList *entries = NULL; - - entries = g_list_prepend (entries, menu_entry_create (_("&User menu"), CK_UserMenu)); - entries = g_list_prepend (entries, menu_entry_create (_("&Directory tree"), CK_Tree)); - entries = g_list_prepend (entries, menu_entry_create (_("&Find file"), CK_Find)); - entries = g_list_prepend (entries, menu_entry_create (_("S&wap panels"), CK_Swap)); - entries = g_list_prepend (entries, menu_entry_create (_("Switch &panels on/off"), CK_Shell)); - entries = - g_list_prepend (entries, menu_entry_create (_("&Compare directories"), CK_CompareDirs)); -#ifdef USE_DIFF_VIEW - entries = g_list_prepend (entries, menu_entry_create (_("C&ompare files"), CK_CompareFiles)); -#endif - entries = - g_list_prepend (entries, menu_entry_create (_("E&xternal panelize"), CK_ExternalPanelize)); - entries = g_list_prepend (entries, menu_entry_create (_("Show directory s&izes"), CK_DirSize)); - entries = g_list_prepend (entries, menu_separator_create ()); - entries = g_list_prepend (entries, menu_entry_create (_("Command &history"), CK_History)); - entries = - g_list_prepend (entries, - menu_entry_create (_("Viewed/edited files hi&story"), - CK_EditorViewerHistory)); - entries = g_list_prepend (entries, menu_entry_create (_("Di&rectory hotlist"), CK_HotList)); -#ifdef ENABLE_VFS - entries = g_list_prepend (entries, menu_entry_create (_("&Active VFS list"), CK_VfsList)); -#endif -#ifdef ENABLE_BACKGROUND - entries = g_list_prepend (entries, menu_entry_create (_("&Background jobs"), CK_Jobs)); -#endif - entries = g_list_prepend (entries, menu_entry_create (_("Screen lis&t"), CK_ScreenList)); - entries = g_list_prepend (entries, menu_separator_create ()); -#ifdef ENABLE_VFS_UNDELFS - entries = - g_list_prepend (entries, - menu_entry_create (_("&Undelete files (ext2fs only)"), CK_Undelete)); -#endif -#ifdef LISTMODE_EDITOR - entries = g_list_prepend (entries, menu_entry_create (_("&Listing format edit"), CK_ListMode)); -#endif -#if defined (ENABLE_VFS_UNDELFS) || defined (LISTMODE_EDITOR) - entries = g_list_prepend (entries, menu_separator_create ()); -#endif - entries = - g_list_prepend (entries, - menu_entry_create (_("Edit &extension file"), CK_EditExtensionsFile)); - entries = g_list_prepend (entries, menu_entry_create (_("Edit &menu file"), CK_EditUserMenu)); - entries = - g_list_prepend (entries, - menu_entry_create (_("Edit hi&ghlighting group file"), - CK_EditFileHighlightFile)); - - return g_list_reverse (entries); -} - -/* --------------------------------------------------------------------------------------------- */ - -static GList * -create_options_menu (void) -{ - GList *entries = NULL; - - entries = g_list_prepend (entries, menu_entry_create (_("&Configuration..."), CK_Options)); - entries = g_list_prepend (entries, menu_entry_create (_("&Layout..."), CK_OptionsLayout)); - entries = g_list_prepend (entries, menu_entry_create (_("&Panel options..."), CK_OptionsPanel)); - entries = - g_list_prepend (entries, menu_entry_create (_("C&onfirmation..."), CK_OptionsConfirm)); - entries = - g_list_prepend (entries, menu_entry_create (_("&Appearance..."), CK_OptionsAppearance)); - entries = - g_list_prepend (entries, menu_entry_create (_("&Display bits..."), CK_OptionsDisplayBits)); - entries = g_list_prepend (entries, menu_entry_create (_("Learn &keys..."), CK_LearnKeys)); -#ifdef ENABLE_VFS - entries = g_list_prepend (entries, menu_entry_create (_("&Virtual FS..."), CK_OptionsVfs)); -#endif - entries = g_list_prepend (entries, menu_separator_create ()); - entries = g_list_prepend (entries, menu_entry_create (_("&Save setup"), CK_SaveSetup)); - - return g_list_reverse (entries); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -init_menu (void) -{ - left_menu = create_menu ("", create_panel_menu (), "[Left and Right Menus]"); - menubar_add_menu (the_menubar, left_menu); - menubar_add_menu (the_menubar, create_menu (_("&File"), create_file_menu (), "[File Menu]")); - menubar_add_menu (the_menubar, - create_menu (_("&Command"), create_command_menu (), "[Command Menu]")); - menubar_add_menu (the_menubar, - create_menu (_("&Options"), create_options_menu (), "[Options Menu]")); - right_menu = create_menu ("", create_panel_menu (), "[Left and Right Menus]"); - menubar_add_menu (the_menubar, right_menu); - update_menu (); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -menu_last_selected_cmd (void) -{ - menubar_activate (the_menubar, drop_menus, -1); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -menu_cmd (void) -{ - int selected; - - if ((get_current_index () == 0) == (current_panel->active != 0)) - selected = 0; - else - selected = g_list_length (the_menubar->menu) - 1; - - menubar_activate (the_menubar, drop_menus, selected); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -sort_cmd (void) -{ - WPanel *p; - const panel_field_t *sort_order; - - if (!SELECTED_IS_PANEL) - return; - - p = MENU_PANEL; - sort_order = sort_box (&p->sort_info, p->sort_field); - panel_set_sort_order (p, sort_order); -} - -/* --------------------------------------------------------------------------------------------- */ - -static char * -midnight_get_shortcut (long command) -{ - const char *ext_map; - const char *shortcut = NULL; - - shortcut = keybind_lookup_keymap_shortcut (main_map, command); - if (shortcut != NULL) - return g_strdup (shortcut); - - shortcut = keybind_lookup_keymap_shortcut (panel_map, command); - if (shortcut != NULL) - return g_strdup (shortcut); - - ext_map = keybind_lookup_keymap_shortcut (main_map, CK_ExtendedKeyMap); - if (ext_map != NULL) - shortcut = keybind_lookup_keymap_shortcut (main_x_map, command); - if (shortcut != NULL) - return g_strdup_printf ("%s %s", ext_map, shortcut); - - return NULL; -} - -/* --------------------------------------------------------------------------------------------- */ - -static char * -midnight_get_title (const WDialog * h, size_t len) -{ - char *path; - char *login; - char *p; - - (void) h; - - title_path_prepare (&path, &login); - - p = g_strdup_printf ("%s [%s]:%s", _("Panels:"), login, path); - g_free (path); - g_free (login); - path = g_strdup (str_trunc (p, len - 4)); - g_free (p); - - return path; -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -toggle_panels_split (void) -{ - panels_layout.horizontal_split = !panels_layout.horizontal_split; - layout_change (); - do_refresh (); -} - -/* --------------------------------------------------------------------------------------------- */ - -#ifdef ENABLE_VFS -/* event helper */ -static gboolean -check_panel_timestamp (const WPanel * panel, panel_view_mode_t mode, struct vfs_class *vclass, - vfsid id) -{ - if (mode == view_listing) - { - const vfs_path_element_t *path_element; - - path_element = vfs_path_get_by_index (panel->cwd_vpath, -1); - - if (path_element->class != vclass) - return FALSE; - - if (vfs_getid (panel->cwd_vpath) != id) - return FALSE; - } - return TRUE; -} - -/* --------------------------------------------------------------------------------------------- */ - -/* event callback */ -static gboolean -check_current_panel_timestamp (const gchar * event_group_name, const gchar * event_name, - gpointer init_data, gpointer data) -{ - ev_vfs_stamp_create_t *event_data = (ev_vfs_stamp_create_t *) data; - - (void) event_group_name; - (void) event_name; - (void) init_data; - - event_data->ret = - check_panel_timestamp (current_panel, get_current_type (), event_data->vclass, - event_data->id); - return !event_data->ret; -} - -/* --------------------------------------------------------------------------------------------- */ - -/* event callback */ -static gboolean -check_other_panel_timestamp (const gchar * event_group_name, const gchar * event_name, - gpointer init_data, gpointer data) -{ - ev_vfs_stamp_create_t *event_data = (ev_vfs_stamp_create_t *) data; - - (void) event_group_name; - (void) event_name; - (void) init_data; - - event_data->ret = - check_panel_timestamp (other_panel, get_other_type (), event_data->vclass, event_data->id); - return !event_data->ret; -} -#endif /* ENABLE_VFS */ - -/* --------------------------------------------------------------------------------------------- */ - -/* event callback */ -static gboolean -print_vfs_message (const gchar * event_group_name, const gchar * event_name, - gpointer init_data, gpointer data) -{ - ev_vfs_print_message_t *event_data = (ev_vfs_print_message_t *) data; - - (void) event_group_name; - (void) event_name; - (void) init_data; - - if (mc_global.midnight_shutdown) - goto ret; - - if (!mc_global.message_visible || the_hint == NULL || WIDGET (the_hint)->owner == NULL) - { - int col, row; - - if (!nice_rotating_dash || (ok_to_refresh <= 0)) - goto ret; - - /* Preserve current cursor position */ - tty_getyx (&row, &col); - - tty_gotoyx (0, 0); - tty_setcolor (NORMAL_COLOR); - tty_print_string (str_fit_to_term (event_data->msg, COLS - 1, J_LEFT)); - - /* Restore cursor position */ - tty_gotoyx (row, col); - mc_refresh (); - goto ret; - } - - if (mc_global.message_visible) - set_hintbar (event_data->msg); - - ret: - MC_PTR_FREE (event_data->msg); - return TRUE; -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -create_panels (void) -{ - int current_index, other_index; - panel_view_mode_t current_mode, other_mode; - char *current_dir, *other_dir; - vfs_path_t *original_dir; - - /* - * Following cases from command line are possible: - * 'mc' (no arguments): mc_run_param0 == NULL, mc_run_param1 == NULL - * active panel uses current directory - * passive panel uses "other_dir" from panels.ini - * - * 'mc dir1 dir2' (two arguments): mc_run_param0 != NULL, mc_run_param1 != NULL - * active panel uses mc_run_param0 - * passive panel uses mc_run_param1 - * - * 'mc dir1' (single argument): mc_run_param0 != NULL, mc_run_param1 == NULL - * active panel uses mc_run_param0 - * passive panel uses "other_dir" from panels.ini - */ - - /* Set up panel directories */ - if (boot_current_is_left) - { - /* left panel is active */ - current_index = 0; - other_index = 1; - current_mode = startup_left_mode; - other_mode = startup_right_mode; - - if (mc_run_param0 == NULL && mc_run_param1 == NULL) - { - /* no arguments */ - current_dir = NULL; /* assume current dir */ - other_dir = saved_other_dir; /* from ini */ - } - else if (mc_run_param0 != NULL && mc_run_param1 != NULL) - { - /* two arguments */ - current_dir = (char *) mc_run_param0; - other_dir = mc_run_param1; - } - else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ - { - /* one argument */ - current_dir = (char *) mc_run_param0; - other_dir = saved_other_dir; /* from ini */ - } - } - else - { - /* right panel is active */ - current_index = 1; - other_index = 0; - current_mode = startup_right_mode; - other_mode = startup_left_mode; - - if (mc_run_param0 == NULL && mc_run_param1 == NULL) - { - /* no arguments */ - current_dir = NULL; /* assume current dir */ - other_dir = saved_other_dir; /* from ini */ - } - else if (mc_run_param0 != NULL && mc_run_param1 != NULL) - { - /* two arguments */ - current_dir = (char *) mc_run_param0; - other_dir = mc_run_param1; - } - else /* mc_run_param0 != NULL && mc_run_param1 == NULL */ - { - /* one argument */ - current_dir = (char *) mc_run_param0; - other_dir = saved_other_dir; /* from ini */ - } - } - - /* 1. Get current dir */ - original_dir = vfs_path_clone (vfs_get_raw_current_dir ()); - - /* 2. Create passive panel */ - if (other_dir != NULL) - { - vfs_path_t *vpath; - - if (g_path_is_absolute (other_dir)) - vpath = vfs_path_from_str (other_dir); - else - vpath = vfs_path_append_new (original_dir, other_dir, (char *) NULL); - mc_chdir (vpath); - vfs_path_free (vpath); - } - create_panel (other_index, other_mode); - - /* 3. Create active panel */ - if (current_dir == NULL) - mc_chdir (original_dir); - else - { - vfs_path_t *vpath; - - if (g_path_is_absolute (current_dir)) - vpath = vfs_path_from_str (current_dir); - else - vpath = vfs_path_append_new (original_dir, current_dir, (char *) NULL); - mc_chdir (vpath); - vfs_path_free (vpath); - } - create_panel (current_index, current_mode); - - if (startup_left_mode == view_listing) - current_panel = left_panel; - else if (right_panel != NULL) - current_panel = right_panel; - else - current_panel = left_panel; - - vfs_path_free (original_dir); - -#ifdef ENABLE_VFS - mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_other_panel_timestamp, NULL, NULL); - mc_event_add (MCEVENT_GROUP_CORE, "vfs_timestamp", check_current_panel_timestamp, NULL, NULL); -#endif /* ENABLE_VFS */ - - mc_event_add (MCEVENT_GROUP_CORE, "vfs_print_message", print_vfs_message, NULL, NULL); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -midnight_put_panel_path (WPanel * panel) -{ - vfs_path_t *cwd_vpath; - const char *cwd_vpath_str; - - if (!command_prompt) - return; - -#ifdef HAVE_CHARSET - cwd_vpath = remove_encoding_from_path (panel->cwd_vpath); -#else - cwd_vpath = vfs_path_clone (panel->cwd_vpath); -#endif - - cwd_vpath_str = vfs_path_as_str (cwd_vpath); - - command_insert (cmdline, cwd_vpath_str, FALSE); - - if (!IS_PATH_SEP (cwd_vpath_str[strlen (cwd_vpath_str) - 1])) - command_insert (cmdline, PATH_SEP_STR, FALSE); - - vfs_path_free (cwd_vpath); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -put_link (WPanel * panel) -{ - if (!command_prompt) - return; - if (S_ISLNK (selection (panel)->st.st_mode)) - { - char buffer[MC_MAXPATHLEN]; - vfs_path_t *vpath; - int i; - - vpath = vfs_path_append_new (panel->cwd_vpath, selection (panel)->fname, (char *) NULL); - i = mc_readlink (vpath, buffer, sizeof (buffer) - 1); - vfs_path_free (vpath); - - if (i > 0) - { - buffer[i] = '\0'; - command_insert (cmdline, buffer, TRUE); - } - } -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -put_current_link (void) -{ - put_link (current_panel); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -put_other_link (void) -{ - if (get_other_type () == view_listing) - put_link (other_panel); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** Insert the selected file name into the input line */ -static void -put_current_selected (void) -{ - const char *tmp; - - if (!command_prompt) - return; - - if (get_current_type () == view_tree) - { - WTree *tree; - const vfs_path_t *selected_name; - - tree = (WTree *) get_panel_widget (get_current_index ()); - selected_name = tree_selected_name (tree); - tmp = vfs_path_as_str (selected_name); - } - else - tmp = selection (current_panel)->fname; - - command_insert (cmdline, tmp, TRUE); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -put_tagged (WPanel * panel) -{ - if (!command_prompt) - return; - input_disable_update (cmdline); - if (panel->marked) - { - int i; - - for (i = 0; i < panel->dir.len; i++) - { - if (panel->dir.list[i].f.marked) - command_insert (cmdline, panel->dir.list[i].fname, TRUE); - } - } - else - { - command_insert (cmdline, panel->dir.list[panel->selected].fname, TRUE); - } - input_enable_update (cmdline); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -put_current_tagged (void) -{ - put_tagged (current_panel); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -put_other_tagged (void) -{ - if (get_other_type () == view_listing) - put_tagged (other_panel); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -setup_mc (void) -{ -#ifdef HAVE_SLANG -#ifdef HAVE_CHARSET - tty_display_8bit (TRUE); -#else - tty_display_8bit (mc_global.full_eight_bits); -#endif /* HAVE_CHARSET */ - -#else /* HAVE_SLANG */ - -#ifdef HAVE_CHARSET - tty_display_8bit (TRUE); -#else - tty_display_8bit (mc_global.eight_bit_clean); -#endif /* HAVE_CHARSET */ -#endif /* HAVE_SLANG */ - -#ifdef ENABLE_SUBSHELL - if (mc_global.tty.use_subshell) - add_select_channel (mc_global.tty.subshell_pty, load_prompt, NULL); -#endif /* !ENABLE_SUBSHELL */ - - if ((tty_baudrate () < 9600) || mc_global.tty.slow_terminal) - verbose = FALSE; -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -setup_dummy_mc (void) -{ - vfs_path_t *vpath; - char *d; - int ret; - - d = _vfs_get_cwd (); - setup_mc (); - vpath = vfs_path_from_str (d); - ret = mc_chdir (vpath); - (void) ret; - vfs_path_free (vpath); - g_free (d); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -done_mc (void) -{ - /* Setup shutdown - * - * We sync the profiles since the hotlist may have changed, while - * we only change the setup data if we have the auto save feature set - */ - - save_setup (auto_save_setup, panels_options.auto_save_setup); - - vfs_stamp_path (vfs_get_raw_current_dir ()); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -create_file_manager (void) -{ - Widget *w = WIDGET (midnight_dlg); - WGroup *g = GROUP (midnight_dlg); - - w->keymap = main_map; - w->ext_keymap = main_x_map; - - midnight_dlg->get_shortcut = midnight_get_shortcut; - midnight_dlg->get_title = midnight_get_title; - /* allow rebind tab */ - widget_want_tab (w, TRUE); - - the_menubar = menubar_new (NULL, menubar_visible); - group_add_widget (g, the_menubar); - init_menu (); - - create_panels (); - group_add_widget (g, get_panel_widget (0)); - group_add_widget (g, get_panel_widget (1)); - - the_hint = label_new (0, 0, 0); - the_hint->transparent = TRUE; - the_hint->auto_adjust_cols = 0; - WIDGET (the_hint)->cols = COLS; - group_add_widget (g, the_hint); - - cmdline = command_new (0, 0, 0); - group_add_widget (g, cmdline); - - the_prompt = label_new (0, 0, mc_prompt); - the_prompt->transparent = TRUE; - group_add_widget (g, the_prompt); - - the_bar = buttonbar_new (mc_global.keybar_visible); - group_add_widget (g, the_bar); - midnight_set_buttonbar (the_bar); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** result must be free'd (I think this should go in util.c) */ -static vfs_path_t * -prepend_cwd_on_local (const char *filename) -{ - vfs_path_t *vpath; - - vpath = vfs_path_from_str (filename); - if (!vfs_file_is_local (vpath) || g_path_is_absolute (filename)) - return vpath; - - vfs_path_free (vpath); - - return vfs_path_append_new (vfs_get_raw_current_dir (), filename, (char *) NULL); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** Invoke the internal view/edit routine with: - * the default processing and forcing the internal viewer/editor - */ -static gboolean -mc_maybe_editor_or_viewer (void) -{ - gboolean ret; - - switch (mc_global.mc_run_mode) - { -#ifdef USE_INTERNAL_EDIT - case MC_RUN_EDITOR: - ret = edit_files ((GList *) mc_run_param0); - break; -#endif /* USE_INTERNAL_EDIT */ - case MC_RUN_VIEWER: - { - vfs_path_t *vpath = NULL; - - if (mc_run_param0 != NULL && *(char *) mc_run_param0 != '\0') - vpath = prepend_cwd_on_local ((char *) mc_run_param0); - - ret = view_file (vpath, FALSE, TRUE); - vfs_path_free (vpath); - break; - } -#ifdef USE_DIFF_VIEW - case MC_RUN_DIFFVIEWER: - ret = dview_diff_cmd (mc_run_param0, mc_run_param1); - break; -#endif /* USE_DIFF_VIEW */ - default: - ret = FALSE; - } - - return ret; -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -show_editor_viewer_history (void) -{ - char *s; - int act; - - s = show_file_history (WIDGET (midnight_dlg), &act); - if (s != NULL) - { - vfs_path_t *s_vpath; - - switch (act) - { - case CK_Edit: - s_vpath = vfs_path_from_str (s); - edit_file_at_line (s_vpath, use_internal_edit, 0); - break; - - case CK_View: - s_vpath = vfs_path_from_str (s); - view_file (s_vpath, use_internal_view, 0); - break; - - default: - { - char *d; - - d = g_path_get_dirname (s); - s_vpath = vfs_path_from_str (d); - do_cd (s_vpath, cd_exact); - try_to_select (current_panel, s); - g_free (d); - } - } - - g_free (s); - vfs_path_free (s_vpath); - } -} - -/* --------------------------------------------------------------------------------------------- */ - -static gboolean -quit_cmd_internal (int quiet) -{ - int q = quit; - size_t n; - - n = dialog_switch_num () - 1; - if (n != 0) - { - char msg[BUF_MEDIUM]; - - g_snprintf (msg, sizeof (msg), - ngettext ("You have %zu opened screen. Quit anyway?", - "You have %zu opened screens. Quit anyway?", n), n); - - if (query_dialog (_("The Midnight Commander"), msg, D_NORMAL, 2, _("&Yes"), _("&No")) != 0) - return FALSE; - q = 1; - } - else if (quiet || !confirm_exit) - q = 1; - else if (query_dialog (_("The Midnight Commander"), - _("Do you really want to quit the Midnight Commander?"), - D_NORMAL, 2, _("&Yes"), _("&No")) == 0) - q = 1; - - if (q != 0) - { -#ifdef ENABLE_SUBSHELL - if (!mc_global.tty.use_subshell) - stop_dialogs (); - else if ((q = exit_subshell ()? 1 : 0) != 0) -#endif - stop_dialogs (); - } - - if (q != 0) - quit |= 1; - return (quit != 0); -} - -/* --------------------------------------------------------------------------------------------- */ - -static gboolean -quit_cmd (void) -{ - return quit_cmd_internal (0); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Repaint the contents of the panels without frames. To schedule panel - * for repainting, set panel->dirty to 1. There are many reasons why - * the panels need to be repainted, and this is a costly operation, so - * it's done once per event. - */ - -static void -update_dirty_panels (void) -{ - if (get_current_type () == view_listing && current_panel->dirty) - widget_draw (WIDGET (current_panel)); - - if (get_other_type () == view_listing && other_panel->dirty) - widget_draw (WIDGET (other_panel)); -} - -/* --------------------------------------------------------------------------------------------- */ - -static void -toggle_show_hidden (void) -{ - panels_options.show_dot_files = !panels_options.show_dot_files; - update_panels (UP_RELOAD, UP_KEEPSEL); - /* redraw panels forced */ - update_dirty_panels (); -} - -/* --------------------------------------------------------------------------------------------- */ - -static cb_ret_t -midnight_execute_cmd (Widget * sender, long command) -{ - cb_ret_t res = MSG_HANDLED; - - (void) sender; - - /* stop quick search before executing any command */ - send_message (current_panel, NULL, MSG_ACTION, CK_SearchStop, NULL); - - switch (command) - { - case CK_ChangePanel: - change_panel (); - break; - case CK_HotListAdd: - add2hotlist_cmd (); - break; - case CK_SetupListingFormat: - setup_listing_format_cmd (); - break; - case CK_ChangeMode: - chmod_cmd (); - break; - case CK_ChangeOwn: - chown_cmd (); - break; - case CK_ChangeOwnAdvanced: - advanced_chown_cmd (); - break; -#ifdef ENABLE_EXT2FS_ATTR - case CK_ChangeAttributes: - chattr_cmd (); - break; -#endif - case CK_CompareDirs: - compare_dirs_cmd (); - break; - case CK_Options: - configure_box (); - break; -#ifdef ENABLE_VFS - case CK_OptionsVfs: - configure_vfs_box (); - break; -#endif - case CK_OptionsConfirm: - confirm_box (); - break; - case CK_Copy: - copy_cmd (); - break; - case CK_PutCurrentPath: - midnight_put_panel_path (current_panel); - break; - case CK_PutCurrentSelected: - put_current_selected (); - break; - case CK_PutCurrentFullSelected: - midnight_put_panel_path (current_panel); - put_current_selected (); - break; - case CK_PutCurrentLink: - put_current_link (); - break; - case CK_PutCurrentTagged: - put_current_tagged (); - break; - case CK_PutOtherPath: - if (get_other_type () == view_listing) - midnight_put_panel_path (other_panel); - break; - case CK_PutOtherLink: - put_other_link (); - break; - case CK_PutOtherTagged: - put_other_tagged (); - break; - case CK_Delete: - delete_cmd (); - break; - case CK_ScreenList: - dialog_switch_list (); - break; -#ifdef USE_DIFF_VIEW - case CK_CompareFiles: - diff_view_cmd (); - break; -#endif - case CK_OptionsDisplayBits: - display_bits_box (); - break; - case CK_Edit: - edit_cmd (); - break; -#ifdef USE_INTERNAL_EDIT - case CK_EditForceInternal: - edit_cmd_force_internal (); - break; -#endif - case CK_EditExtensionsFile: - ext_cmd (); - break; - case CK_EditFileHighlightFile: - edit_fhl_cmd (); - break; - case CK_EditUserMenu: - edit_mc_menu_cmd (); - break; - case CK_LinkSymbolicEdit: - edit_symlink_cmd (); - break; - case CK_ExternalPanelize: - external_panelize (); - break; - case CK_Filter: - filter_cmd (); - break; - case CK_ViewFiltered: - view_filtered_cmd (); - break; - case CK_Find: - find_cmd (); - break; -#ifdef ENABLE_VFS_FISH - case CK_ConnectFish: - fishlink_cmd (); - break; -#endif -#ifdef ENABLE_VFS_FTP - case CK_ConnectFtp: - ftplink_cmd (); - break; -#endif -#ifdef ENABLE_VFS_SFTP - case CK_ConnectSftp: - sftplink_cmd (); - break; -#endif -#ifdef ENABLE_VFS_SMB - case CK_ConnectSmb: - smblink_cmd (); - break; -#endif /* ENABLE_VFS_SMB */ - case CK_Panelize: - cd_panelize_cmd (); - break; - case CK_Help: - help_cmd (); - break; - case CK_History: - /* show the history of command line widget */ - send_message (cmdline, NULL, MSG_ACTION, CK_History, NULL); - break; - case CK_PanelInfo: - if (sender == WIDGET (the_menubar)) - info_cmd (); /* menu */ - else - info_cmd_no_menu (); /* shortcut or buttonbar */ - break; -#ifdef ENABLE_BACKGROUND - case CK_Jobs: - jobs_box (); - break; -#endif - case CK_OptionsLayout: - layout_box (); - break; - case CK_OptionsAppearance: - appearance_box (); - break; - case CK_LearnKeys: - learn_keys (); - break; - case CK_Link: - link_cmd (LINK_HARDLINK); - break; - case CK_PanelListing: - listing_cmd (); - break; -#ifdef LISTMODE_EDITOR - case CK_ListMode: - listmode_cmd (); - break; -#endif - case CK_Menu: - menu_cmd (); - break; - case CK_MenuLastSelected: - menu_last_selected_cmd (); - break; - case CK_MakeDir: - mkdir_cmd (); - break; - case CK_OptionsPanel: - panel_options_box (); - break; -#ifdef HAVE_CHARSET - case CK_SelectCodepage: - encoding_cmd (); - break; -#endif - case CK_CdQuick: - quick_cd_cmd (); - break; - case CK_HotList: - hotlist_cmd (); - break; - case CK_PanelQuickView: - if (sender == WIDGET (the_menubar)) - quick_view_cmd (); /* menu */ - else - quick_cmd_no_menu (); /* shortcut or buttonabr */ - break; - case CK_QuitQuiet: - quiet_quit_cmd (); - break; - case CK_Quit: - quit_cmd (); - break; - case CK_LinkSymbolicRelative: - link_cmd (LINK_SYMLINK_RELATIVE); - break; - case CK_Move: - rename_cmd (); - break; - case CK_Reread: - reread_cmd (); - break; -#ifdef ENABLE_VFS - case CK_VfsList: - vfs_list (); - break; -#endif - case CK_SaveSetup: - save_setup_cmd (); - break; - case CK_Select: - case CK_Unselect: - case CK_SelectInvert: - res = send_message (current_panel, midnight_dlg, MSG_ACTION, command, NULL); - break; - case CK_Shell: - toggle_subshell (); - break; - case CK_DirSize: - smart_dirsize_cmd (); - break; - case CK_Sort: - sort_cmd (); - break; - case CK_ExtendedKeyMap: - WIDGET (midnight_dlg)->ext_mode = TRUE; - break; - case CK_Suspend: - mc_event_raise (MCEVENT_GROUP_CORE, "suspend", NULL); - break; - case CK_Swap: - swap_cmd (); - break; - case CK_LinkSymbolic: - link_cmd (LINK_SYMLINK_ABSOLUTE); - break; - case CK_ShowHidden: - toggle_show_hidden (); - break; - case CK_SplitVertHoriz: - toggle_panels_split (); - break; - case CK_SplitEqual: - panels_split_equal (); - break; - case CK_SplitMore: - panels_split_more (); - break; - case CK_SplitLess: - panels_split_less (); - break; - case CK_PanelTree: - panel_tree_cmd (); - break; - case CK_Tree: - treebox_cmd (); - break; -#ifdef ENABLE_VFS_UNDELFS - case CK_Undelete: - undelete_cmd (); - break; -#endif - case CK_UserMenu: - user_file_menu_cmd (); - break; - case CK_View: - view_cmd (); - break; - case CK_ViewFile: - view_file_cmd (); - break; - case CK_EditorViewerHistory: - show_editor_viewer_history (); - break; - case CK_Cancel: - /* don't close panels due to SIGINT */ - break; - default: - res = MSG_NOT_HANDLED; - } - - return res; -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Whether the command-line should not respond to key events. - * - * This is TRUE if a QuickView or TreeView have the focus, as they're going - * to consume some keys and there's no sense in passing to the command-line - * just the leftovers. - */ -static gboolean -is_cmdline_mute (void) -{ - /* When one of panels is other than view_listing, - current_panel points to view_listing panel all time independently of - it's activity. Thus, we can't use get_current_type() here. - current_panel should point to actualy current active panel - independently of it's type. */ - return (current_panel->active == 0 - && (get_other_type () == view_quick || get_other_type () == view_tree)); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** - * Handles the Enter key on the command-line. - * - * Returns TRUE if non-whitespace was indeed processed. - */ -static gboolean -handle_cmdline_enter (void) -{ - size_t i; - - for (i = 0; cmdline->buffer[i] != '\0' && whitespace (cmdline->buffer[i]); i++) - ; - - if (cmdline->buffer[i] != '\0') - { - send_message (cmdline, NULL, MSG_KEY, '\n', NULL); - return TRUE; - } - - input_insert (cmdline, "", FALSE); - cmdline->point = 0; - - return FALSE; -} - -/* --------------------------------------------------------------------------------------------- */ - -static cb_ret_t -midnight_callback (Widget * w, Widget * sender, widget_msg_t msg, int parm, void *data) -{ - long command; - - switch (msg) - { - case MSG_INIT: - panel_init (); - setup_panels (); - return MSG_HANDLED; - - case MSG_DRAW: - load_hint (TRUE); - group_default_callback (w, NULL, MSG_DRAW, 0, NULL); - /* We handle the special case of the output lines */ - if (mc_global.tty.console_flag != '\0' && output_lines != 0) - { - unsigned char end_line; - - end_line = LINES - (mc_global.keybar_visible ? 1 : 0) - 1; - show_console_contents (output_start_y, end_line - output_lines, end_line); - } - return MSG_HANDLED; - - case MSG_RESIZE: - widget_adjust_position (w->pos_flags, &w->y, &w->x, &w->lines, &w->cols); - setup_panels (); - menubar_arrange (the_menubar); - return MSG_HANDLED; - - case MSG_IDLE: - /* We only need the first idle event to show user menu after start */ - widget_idle (w, FALSE); - - if (boot_current_is_left) - widget_select (get_panel_widget (0)); - else - widget_select (get_panel_widget (1)); - - if (auto_menu) - midnight_execute_cmd (NULL, CK_UserMenu); - return MSG_HANDLED; - - case MSG_KEY: - if (w->ext_mode) - { - command = widget_lookup_key (w, parm); - if (command != CK_IgnoreKey) - return midnight_execute_cmd (NULL, command); - } - - /* FIXME: should handle all menu shortcuts before this point */ - if (widget_get_state (WIDGET (the_menubar), WST_FOCUSED)) - return MSG_NOT_HANDLED; - - if (parm == '\n' && !is_cmdline_mute ()) - { - if (handle_cmdline_enter ()) - return MSG_HANDLED; - /* Else: the panel will handle it. */ - } - - if ((!mc_global.tty.alternate_plus_minus - || !(mc_global.tty.console_flag != '\0' || mc_global.tty.xterm_flag)) && !quote - && !current_panel->searching) - { - if (!only_leading_plus_minus) - { - /* Special treatement, since the input line will eat them */ - if (parm == '+') - return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Select, NULL); - - if (parm == '\\' || parm == '-') - return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Unselect, - NULL); - - if (parm == '*') - return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_SelectInvert, - NULL); - } - else if (!command_prompt || input_is_empty (cmdline)) - { - /* Special treatement '+', '-', '\', '*' only when this is - * first char on input line - */ - if (parm == '+') - return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Select, NULL); - - if (parm == '\\' || parm == '-') - return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_Unselect, - NULL); - - if (parm == '*') - return send_message (current_panel, midnight_dlg, MSG_ACTION, CK_SelectInvert, - NULL); - } - } - return MSG_NOT_HANDLED; - - case MSG_HOTKEY_HANDLED: - if ((get_current_type () == view_listing) && current_panel->searching) - { - current_panel->dirty = 1; /* FIXME: unneeded? */ - send_message (current_panel, NULL, MSG_ACTION, CK_SearchStop, NULL); - } - return MSG_HANDLED; - - case MSG_UNHANDLED_KEY: - { - cb_ret_t v = MSG_NOT_HANDLED; - - command = widget_lookup_key (w, parm); - if (command != CK_IgnoreKey) - v = midnight_execute_cmd (NULL, command); - - if (v == MSG_NOT_HANDLED && command_prompt && !is_cmdline_mute ()) - v = send_message (cmdline, NULL, MSG_KEY, parm, NULL); - - return v; - } - - case MSG_POST_KEY: - if (!widget_get_state (WIDGET (the_menubar), WST_FOCUSED)) - update_dirty_panels (); - return MSG_HANDLED; - - case MSG_ACTION: - /* Handle shortcuts, menu, and buttonbar. */ - return midnight_execute_cmd (sender, parm); - - case MSG_END: - panel_deinit (); - return MSG_HANDLED; - - default: - return dlg_default_callback (w, sender, msg, parm, data); - } -} - -/* --------------------------------------------------------------------------------------------- */ -/*** public functions ****************************************************************************/ -/* --------------------------------------------------------------------------------------------- */ - -void -update_menu (void) -{ - menu_set_name (left_menu, panels_layout.horizontal_split ? _("&Above") : _("&Left")); - menu_set_name (right_menu, panels_layout.horizontal_split ? _("&Below") : _("&Right")); - menubar_arrange (the_menubar); - menubar_set_visible (the_menubar, menubar_visible); -} - -/* --------------------------------------------------------------------------------------------- */ - -void -midnight_set_buttonbar (WButtonBar * b) -{ - Widget *w = WIDGET (midnight_dlg); - - buttonbar_set_label (b, 1, Q_ ("ButtonBar|Help"), w->keymap, NULL); - buttonbar_set_label (b, 2, Q_ ("ButtonBar|Menu"), w->keymap, NULL); - buttonbar_set_label (b, 3, Q_ ("ButtonBar|View"), w->keymap, NULL); - buttonbar_set_label (b, 4, Q_ ("ButtonBar|Edit"), w->keymap, NULL); - buttonbar_set_label (b, 5, Q_ ("ButtonBar|Copy"), w->keymap, NULL); - buttonbar_set_label (b, 6, Q_ ("ButtonBar|RenMov"), w->keymap, NULL); - buttonbar_set_label (b, 7, Q_ ("ButtonBar|Mkdir"), w->keymap, NULL); - buttonbar_set_label (b, 8, Q_ ("ButtonBar|Delete"), w->keymap, NULL); - buttonbar_set_label (b, 9, Q_ ("ButtonBar|PullDn"), w->keymap, NULL); - buttonbar_set_label (b, 10, Q_ ("ButtonBar|Quit"), w->keymap, NULL); -} - -/* --------------------------------------------------------------------------------------------- */ -/** - * Return a random hint. If force is TRUE, ignore the timeout. - */ - -char * -get_random_hint (gboolean force) -{ - static const guint64 update_period = 60 * G_USEC_PER_SEC; - static guint64 tv = 0; - - char *data, *result = NULL, *eop; - size_t len, start; - GIConv conv; - - /* Do not change hints more often than one minute */ - if (!force && !mc_time_elapsed (&tv, update_period)) - return g_strdup (""); - - data = load_mc_home_file (mc_global.share_data_dir, MC_HINT, NULL, &len); - if (data == NULL) - return NULL; - - /* get a random entry */ - srand ((unsigned int) (tv / G_USEC_PER_SEC)); - start = ((size_t) rand ()) % (len - 1); - - /* Search the start of paragraph */ - for (; start != 0; start--) - if (data[start] == '\n' && data[start + 1] == '\n') - { - start += 2; - break; - } - - /* Search the end of paragraph */ - for (eop = data + start; *eop != '\0'; eop++) - { - if (*eop == '\n' && *(eop + 1) == '\n') - { - *eop = '\0'; - break; - } - if (*eop == '\n') - *eop = ' '; - } - - /* hint files are stored in utf-8 */ - /* try convert hint file from utf-8 to terminal encoding */ - conv = str_crt_conv_from ("UTF-8"); - if (conv != INVALID_CONV) - { - GString *buffer; - - buffer = g_string_sized_new (len - start); - if (str_convert (conv, &data[start], buffer) != ESTR_FAILURE) - result = g_string_free (buffer, FALSE); - else - g_string_free (buffer, TRUE); - str_close_conv (conv); - } - else - result = g_strndup (data + start, len - start); - - g_free (data); - return result; -} - - -/* --------------------------------------------------------------------------------------------- */ -/** - * Load new hint and display it. - * IF force is not 0, ignore the timeout. - */ - -void -load_hint (gboolean force) -{ - char *hint; - - if (WIDGET (the_hint)->owner == NULL) - return; - - if (!mc_global.message_visible) - { - label_set_text (the_hint, NULL); - return; - } - - hint = get_random_hint (force); - - if (hint != NULL) - { - if (*hint != '\0') - set_hintbar (hint); - g_free (hint); - } - else - { - char text[BUF_SMALL]; - - g_snprintf (text, sizeof (text), _("GNU Midnight Commander %s\n"), VERSION); - set_hintbar (text); - } -} - -/* --------------------------------------------------------------------------------------------- */ - -void -change_panel (void) -{ - input_complete_free (cmdline); - group_select_next_widget (GROUP (midnight_dlg)); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** Save current stat of directories to avoid reloading the panels - * when no modifications have taken place - */ -void -save_cwds_stat (void) -{ - if (panels_options.fast_reload) - { - mc_stat (current_panel->cwd_vpath, &(current_panel->dir_stat)); - if (get_other_type () == view_listing) - mc_stat (other_panel->cwd_vpath, &(other_panel->dir_stat)); - } -} - -/* --------------------------------------------------------------------------------------------- */ - -gboolean -quiet_quit_cmd (void) -{ - print_last_revert = TRUE; - return quit_cmd_internal (1); -} - -/* --------------------------------------------------------------------------------------------- */ - -/** Run the main dialog that occupies the whole screen */ -gboolean -do_nc (void) -{ - gboolean ret; - -#ifdef USE_INTERNAL_EDIT - edit_stack_init (); -#endif - - midnight_dlg = dlg_create (FALSE, 0, 0, 1, 1, WPOS_FULLSCREEN, FALSE, dialog_colors, - midnight_callback, NULL, "[main]", NULL); - - /* Check if we were invoked as an editor or file viewer */ - if (mc_global.mc_run_mode != MC_RUN_FULL) - { - setup_dummy_mc (); - ret = mc_maybe_editor_or_viewer (); - } - else - { - /* We only need the first idle event to show user menu after start */ - widget_idle (WIDGET (midnight_dlg), TRUE); - - setup_mc (); - mc_filehighlight = mc_fhl_new (TRUE); - - create_file_manager (); - (void) dlg_run (midnight_dlg); - - mc_fhl_free (&mc_filehighlight); - - ret = TRUE; - - /* dlg_destroy destroys even current_panel->cwd_vpath, so we have to save a copy :) */ - if (mc_args__last_wd_file != NULL && vfs_current_is_local ()) - last_wd_string = g_strdup (vfs_path_as_str (current_panel->cwd_vpath)); - - /* don't handle VFS timestamps for dirs opened in panels */ - mc_event_destroy (MCEVENT_GROUP_CORE, "vfs_timestamp"); - - dir_list_free_list (&panelized_panel.list); - } - - /* Program end */ - mc_global.midnight_shutdown = TRUE; - dialog_switch_shutdown (); - done_mc (); - dlg_destroy (midnight_dlg); - current_panel = NULL; - -#ifdef USE_INTERNAL_EDIT - edit_stack_free (); -#endif - - if ((quit & SUBSHELL_EXIT) == 0) - clr_scr (); - - return ret; -} - -/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/filemanager/midnight.h mc-4.8.26/src/filemanager/midnight.h --- mc-4.8.25/src/filemanager/midnight.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/midnight.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,53 +0,0 @@ -/** \file midnight.h - * \brief Header: main dialog (file panel) for Midnight Commander - */ - -#ifndef MC__MIDNIGHT_H -#define MC__MIDNIGHT_H - -#include "lib/widget.h" - -#include "panel.h" -#include "layout.h" - -/* TODO: merge content of layout.h here */ - -/*** typedefs(not structures) and defined constants **********************************************/ - -#define MENU_PANEL (mc_global.widget.is_right ? right_panel : left_panel) -#define MENU_PANEL_IDX (mc_global.widget.is_right ? 1 : 0) -#define SELECTED_IS_PANEL (get_panel_type (MENU_PANEL_IDX) == view_listing) - -#define other_panel get_other_panel() - -/*** enums ***************************************************************************************/ - -/*** structures declarations (and typedefs of structures)*****************************************/ - -/*** global variables defined in .c file *********************************************************/ - -extern WMenuBar *the_menubar; -extern WLabel *the_prompt; -extern WLabel *the_hint; -extern WButtonBar *the_bar; - -extern WPanel *left_panel; -extern WPanel *right_panel; -extern WPanel *current_panel; - -extern const char *mc_prompt; - -/*** declarations of public functions ************************************************************/ - -void update_menu (void); -void midnight_set_buttonbar (WButtonBar * b); -char *get_random_hint (gboolean force); -void load_hint (gboolean force); -void change_panel (void); -void save_cwds_stat (void); -gboolean quiet_quit_cmd (void); -gboolean do_nc (void); - -/*** inline functions ****************************************************************************/ - -#endif /* MC__MIDNIGHT_H */ diff -Nru mc-4.8.25/src/filemanager/mountlist.c mc-4.8.26/src/filemanager/mountlist.c --- mc-4.8.25/src/filemanager/mountlist.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/mountlist.c 2021-01-10 11:50:16.000000000 +0000 @@ -257,8 +257,9 @@ #ifndef ME_REMOTE /* A file system is 'remote' if its Fs_name contains a ':' or if (it is of type (smbfs or smb3 or cifs) and its Fs_name starts with '//') - or if it is of type (afs or auristorfs) - or Fs_name is equal to "-hosts" (used by autofs to mount remote fs). */ + or if it is of any other of the listed types + or Fs_name is equal to "-hosts" (used by autofs to mount remote fs). + "VM" file systems like prl_fs or vboxsf are not considered remote here. */ #define ME_REMOTE(Fs_name, Fs_type) \ (strchr (Fs_name, ':') != NULL \ || ((Fs_name)[0] == '/' \ @@ -266,8 +267,15 @@ && (strcmp (Fs_type, "smbfs") == 0 \ || strcmp (Fs_type, "smb3") == 0 \ || strcmp (Fs_type, "cifs") == 0)) \ + || strcmp (Fs_type, "acfs") == 0 \ || strcmp (Fs_type, "afs") == 0 \ + || strcmp (Fs_type, "coda") == 0 \ || strcmp (Fs_type, "auristorfs") == 0 \ + || strcmp (Fs_type, "fhgfs") == 0 \ + || strcmp (Fs_type, "gpfs") == 0 \ + || strcmp (Fs_type, "ibrix") == 0 \ + || strcmp (Fs_type, "ocfs2") == 0 \ + || strcmp (Fs_type, "vxfs") == 0 \ || strcmp ("-hosts", Fs_name) == 0) #endif @@ -1430,14 +1438,9 @@ /* Empirically, the block counts on most SVR3 and SVR3-derived systems seem to always be in terms of 512-byte blocks, no matter what value f_bsize has. */ -#if defined _CRAY - fsp->fsu_blocksize = PROPAGATE_ALL_ONES (fsd.f_bsize); -#else fsp->fsu_blocksize = 512; #endif -#endif - #if (defined STAT_STATVFS64 || defined STAT_STATFS3_OSF1 \ || defined STAT_STATFS2_FRSIZE || defined STAT_STATFS2_BSIZE \ || defined STAT_STATFS2_FSIZE || defined STAT_STATFS4) diff -Nru mc-4.8.25/src/filemanager/panel.c mc-4.8.26/src/filemanager/panel.c --- mc-4.8.25/src/filemanager/panel.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/panel.c 2021-01-10 11:50:16.000000000 +0000 @@ -74,7 +74,7 @@ #include "layout.h" /* Most layout variables are here */ #include "cmd.h" #include "command.h" /* cmdline */ -#include "midnight.h" +#include "filemanager.h" #include "mountlist.h" /* my_statfs */ #include "panel.h" @@ -370,6 +370,8 @@ static gboolean mouse_marking = FALSE; static int state_mark = 0; +static GString *string_file_name_buffer; + /* --------------------------------------------------------------------------------------------- */ /*** file scope functions ************************************************************************/ /* --------------------------------------------------------------------------------------------- */ @@ -451,12 +453,12 @@ static const char * string_file_name (file_entry_t * fe, int len) { - static char buffer[MC_MAXPATHLEN * MB_LEN_MAX + 1]; - (void) len; - g_strlcpy (buffer, fe->fname, sizeof (buffer)); - return buffer; + g_string_set_size (string_file_name_buffer, 0); + g_string_append_len (string_file_name_buffer, fe->fname, fe->fnamelen); + + return string_file_name_buffer->str; } /* --------------------------------------------------------------------------------------------- */ @@ -990,11 +992,11 @@ widget_gotoyx (w, panel_lines (panel) + 3, 1); - if (panel->searching) + if (panel->quick_search.active) { tty_setcolor (INPUT_COLOR); tty_print_char ('/'); - tty_print_string (str_fit_to_term (panel->search_buffer, w->cols - 3, J_LEFT)); + tty_print_string (str_fit_to_term (panel->quick_search.buffer->str, w->cols - 3, J_LEFT)); return; } @@ -1399,9 +1401,9 @@ { /* If the program is shuting down */ if ((mc_global.midnight_shutdown && auto_save_setup) || saving_setup) - return g_strdup (panel->panel_name); + return g_strdup (panel->name); - return g_strconcat ("Temporal:", panel->panel_name, (char *) NULL); + return g_strconcat ("Temporal:", panel->name, (char *) NULL); } /* --------------------------------------------------------------------------------------------- */ @@ -1412,8 +1414,8 @@ char *tmp; tmp = vfs_path_to_str_flags (vpath, 0, VPF_STRIP_PASSWORD); - panel->dir_history = list_append_unique (panel->dir_history, tmp); - panel->dir_history_current = panel->dir_history; + panel->dir_history.list = list_append_unique (panel->dir_history.list, tmp); + panel->dir_history.current = panel->dir_history.list; } /* --------------------------------------------------------------------------------------------- */ @@ -1432,9 +1434,9 @@ if (ev->receiver == NULL || ev->receiver == WIDGET (p)) { if (ev->cfg != NULL) - p->dir_history = mc_config_history_load (ev->cfg, p->hist_name); + p->dir_history.list = mc_config_history_load (ev->cfg, p->dir_history.name); else - p->dir_history = mc_config_history_get (p->hist_name); + p->dir_history.list = mc_config_history_get (p->dir_history.name); directory_history_add (p, p->cwd_vpath); } @@ -1454,11 +1456,11 @@ (void) event_group_name; (void) event_name; - if (p->dir_history != NULL) + if (p->dir_history.list != NULL) { ev_history_load_save_t *ev = (ev_history_load_save_t *) data; - mc_config_history_save (ev->cfg, p->hist_name, p->dir_history); + mc_config_history_save (ev->cfg, p->dir_history.name, p->dir_history.list); } return TRUE; @@ -1483,13 +1485,13 @@ panel_clean_dir (p); /* clean history */ - if (p->dir_history != NULL) + if (p->dir_history.list != NULL) { /* directory history is already saved before this moment */ - p->dir_history = g_list_first (p->dir_history); - g_list_free_full (p->dir_history, g_free); + p->dir_history.list = g_list_first (p->dir_history.list); + g_list_free_full (p->dir_history.list, g_free); } - g_free (p->hist_name); + g_free (p->dir_history.name); g_slist_free_full (p->format, (GDestroyNotify) format_item_free); g_slist_free_full (p->status_format, (GDestroyNotify) format_item_free); @@ -1499,7 +1501,10 @@ g_free (p->user_status_format[i]); g_free (p->dir.list); - g_free (p->panel_name); + g_free (p->name); + + g_string_free (p->quick_search.buffer, TRUE); + g_string_free (p->quick_search.prev_buffer, TRUE); vfs_path_free (p->lwd_vpath); vfs_path_free (p->cwd_vpath); @@ -1834,7 +1839,7 @@ if (*error != NULL) return NULL; - panel->dirty = 1; + panel->dirty = TRUE; usable_columns = WIDGET (panel)->cols - 2; /* Status needn't to be split */ @@ -1974,12 +1979,12 @@ /* --------------------------------------------------------------------------------------------- */ static void -cd_up_dir (void) +cd_up_dir (WPanel * panel) { vfs_path_t *up_dir; up_dir = vfs_path_from_str (".."); - do_cd (up_dir, cd_exact); + panel_cd (panel, up_dir, cd_exact); vfs_path_free (up_dir); } @@ -1987,23 +1992,22 @@ /** Used to emulate Lynx's entering leaving a directory with the arrow keys */ static cb_ret_t -maybe_cd (gboolean move_up_dir) +maybe_cd (WPanel * panel, gboolean move_up_dir) { if (panels_options.navigate_with_arrows && input_is_empty (cmdline)) { if (move_up_dir) { - cd_up_dir (); + cd_up_dir (panel); return MSG_HANDLED; } - if (S_ISDIR (selection (current_panel)->st.st_mode) - || link_isdir (selection (current_panel))) + if (S_ISDIR (selection (panel)->st.st_mode) || link_isdir (selection (panel))) { vfs_path_t *vpath; - vpath = vfs_path_from_str (selection (current_panel)->fname); - do_cd (vpath, cd_exact); + vpath = vfs_path_from_str (selection (panel)->fname); + panel_cd (panel, vpath, cd_exact); vfs_path_free (vpath); return MSG_HANDLED; } @@ -2016,11 +2020,11 @@ /* if command line is empty then do 'cd ..' */ static cb_ret_t -force_maybe_cd (void) +force_maybe_cd (WPanel * panel) { if (input_is_empty (cmdline)) { - cd_up_dir (); + cd_up_dir (panel); return MSG_HANDLED; } @@ -2039,7 +2043,7 @@ /** Select/unselect all the files like a current file by extension */ static void -panel_select_ext_cmd (void) +panel_select_ext_cmd (WPanel * panel) { char *filename; gboolean do_select; @@ -2047,11 +2051,11 @@ mc_search_t *search; int i; - filename = selection (current_panel)->fname; + filename = selection (panel)->fname; if (filename == NULL) return; - do_select = !selection (current_panel)->f.marked; + do_select = !selection (panel)->f.marked; cur_file_ext = strutils_regex_escape (extension (filename)); if (cur_file_ext[0] != '\0') @@ -2065,9 +2069,9 @@ search->search_type = MC_SEARCH_T_REGEX; search->is_case_sensitive = FALSE; - for (i = 0; i < current_panel->dir.len; i++) + for (i = 0; i < panel->dir.len; i++) { - file_entry_t *file_entry = ¤t_panel->dir.list[i]; + file_entry_t *file_entry = &panel->dir.list[i]; if (DIR_IS_DOTDOT (file_entry->fname) || S_ISDIR (file_entry->st.st_mode)) continue; @@ -2075,7 +2079,7 @@ if (!mc_search_run (search, file_entry->fname, 0, file_entry->fnamelen, NULL)) continue; - do_file_mark (current_panel, i, do_select ? 1 : 0); + do_file_mark (panel, i, do_select ? 1 : 0); } mc_search_free (search); @@ -2214,7 +2218,7 @@ return MSG_HANDLED; } - return maybe_cd (TRUE); /* cd .. */ + return maybe_cd (panel, TRUE); /* cd .. */ } /* --------------------------------------------------------------------------------------------- */ @@ -2228,7 +2232,7 @@ return MSG_HANDLED; } - return maybe_cd (FALSE); /* cd (selection) */ + return maybe_cd (panel, FALSE); /* cd (selection) */ } /* --------------------------------------------------------------------------------------------- */ @@ -2261,7 +2265,7 @@ goto_parent_dir (WPanel * panel) { if (!panel->is_panelized) - cd_up_dir (); + cd_up_dir (panel); else { char *fname = panel->dir.list[panel->selected].fname; @@ -2288,7 +2292,7 @@ g_free (dname); } - do_cd (dname_vpath, cd_exact); + panel_cd (panel, dname_vpath, cd_exact); try_to_select (panel, bname); vfs_path_free (dname_vpath); @@ -2332,7 +2336,7 @@ vfs_path_t *vpath; vpath = vfs_path_from_str (selection (panel)->fname); - do_cd (vpath, cd_exact); + panel_cd (panel, vpath, cd_exact); vfs_path_free (vpath); } } @@ -2626,7 +2630,6 @@ static void do_search (WPanel * panel, int c_code) { - size_t l; int i, sel; gboolean wrapped = FALSE; char *act; @@ -2634,47 +2637,42 @@ char *reg_exp, *esc_str; gboolean is_found = FALSE; - l = strlen (panel->search_buffer); if (c_code == KEY_BACKSPACE) { - if (l != 0) + if (panel->quick_search.buffer->len != 0) { - act = panel->search_buffer + l; - str_prev_noncomb_char (&act, panel->search_buffer); - act[0] = '\0'; + act = panel->quick_search.buffer->str + panel->quick_search.buffer->len; + str_prev_noncomb_char (&act, panel->quick_search.buffer->str); + g_string_set_size (panel->quick_search.buffer, act - panel->quick_search.buffer->str); } - panel->search_chpoint = 0; + panel->quick_search.chpoint = 0; } else { - if (c_code != 0 && (gsize) panel->search_chpoint < sizeof (panel->search_char)) + if (c_code != 0 && (gsize) panel->quick_search.chpoint < sizeof (panel->quick_search.ch)) { - panel->search_char[panel->search_chpoint] = c_code; - panel->search_chpoint++; + panel->quick_search.ch[panel->quick_search.chpoint] = c_code; + panel->quick_search.chpoint++; } - if (panel->search_chpoint > 0) + if (panel->quick_search.chpoint > 0) { - switch (str_is_valid_char (panel->search_char, panel->search_chpoint)) + switch (str_is_valid_char (panel->quick_search.ch, panel->quick_search.chpoint)) { case -2: return; case -1: - panel->search_chpoint = 0; + panel->quick_search.chpoint = 0; return; default: - if (l + panel->search_chpoint < sizeof (panel->search_buffer)) - { - memcpy (panel->search_buffer + l, panel->search_char, panel->search_chpoint); - l += panel->search_chpoint; - panel->search_buffer[l] = '\0'; - panel->search_chpoint = 0; - } + g_string_append_len (panel->quick_search.buffer, panel->quick_search.ch, + panel->quick_search.chpoint); + panel->quick_search.chpoint = 0; } } } - reg_exp = g_strdup_printf ("%s*", panel->search_buffer); + reg_exp = g_strdup_printf ("%s*", panel->quick_search.buffer->str); esc_str = strutils_escape (reg_exp, -1, ",|\\{}[]", TRUE); search = mc_search_new (esc_str, NULL); search->search_type = MC_SEARCH_T_GLOB; @@ -2720,9 +2718,9 @@ } else if (c_code != KEY_BACKSPACE) { - act = panel->search_buffer + l; - str_prev_noncomb_char (&act, panel->search_buffer); - act[0] = '\0'; + act = panel->quick_search.buffer->str + panel->quick_search.buffer->len; + str_prev_noncomb_char (&act, panel->quick_search.buffer->str); + g_string_set_size (panel->quick_search.buffer, act - panel->quick_search.buffer->str); } mc_search_free (search); g_free (reg_exp); @@ -2737,7 +2735,7 @@ static void start_search (WPanel * panel) { - if (panel->searching) + if (panel->quick_search.active) { if (panel->selected == panel->dir.len - 1) panel->selected = 0; @@ -2746,18 +2744,17 @@ /* in case if there was no search string we need to recall previous string, with which we ended previous searching */ - if (panel->search_buffer[0] == '\0') - g_strlcpy (panel->search_buffer, panel->prev_search_buffer, - sizeof (panel->search_buffer)); + if (panel->quick_search.buffer->len == 0) + mc_g_string_copy (panel->quick_search.buffer, panel->quick_search.prev_buffer); do_search (panel, 0); } else { - panel->searching = TRUE; - panel->search_buffer[0] = '\0'; - panel->search_char[0] = '\0'; - panel->search_chpoint = 0; + panel->quick_search.active = TRUE; + g_string_set_size (panel->quick_search.buffer, 0); + panel->quick_search.ch[0] = '\0'; + panel->quick_search.chpoint = 0; display_mini_info (panel); mc_refresh (); } @@ -2768,13 +2765,12 @@ static void stop_search (WPanel * panel) { - panel->searching = FALSE; + panel->quick_search.active = FALSE; - /* if user had overrdied search string, we need to store it - to the previous_search_buffer */ - if (panel->search_buffer[0] != '\0') - g_strlcpy (panel->prev_search_buffer, panel->search_buffer, - sizeof (panel->prev_search_buffer)); + /* if user overrdied search string, we need to store it + to the quick_search.prev_buffer */ + if (panel->quick_search.buffer->len != 0) + mc_g_string_copy (panel->quick_search.prev_buffer, panel->quick_search.buffer); display_mini_info (panel); } @@ -2783,7 +2779,7 @@ /** Return TRUE if the Enter key has been processed, FALSE otherwise */ static gboolean -do_enter_on_file_entry (file_entry_t * fe) +do_enter_on_file_entry (WPanel * panel, file_entry_t * fe) { vfs_path_t *full_name_vpath; gboolean ok; @@ -2797,13 +2793,13 @@ vfs_path_t *fname_vpath; fname_vpath = vfs_path_from_str (fe->fname); - if (!do_cd (fname_vpath, cd_exact)) + if (!panel_cd (panel, fname_vpath, cd_exact)) message (D_ERROR, MSG_ERROR, _("Cannot change directory")); vfs_path_free (fname_vpath); return TRUE; } - full_name_vpath = vfs_path_append_new (current_panel->cwd_vpath, fe->fname, (char *) NULL); + full_name_vpath = vfs_path_append_new (panel->cwd_vpath, fe->fname, (char *) NULL); /* Try associated command */ ok = regex_command (full_name_vpath, "Open") != 0; @@ -2812,7 +2808,7 @@ return TRUE; /* Check if the file is executable */ - full_name_vpath = vfs_path_append_new (current_panel->cwd_vpath, fe->fname, (char *) NULL); + full_name_vpath = vfs_path_append_new (panel->cwd_vpath, fe->fname, (char *) NULL); ok = (is_exe (fe->st.st_mode) && if_link_is_exe (full_name_vpath, fe)); vfs_path_free (full_name_vpath); if (!ok) @@ -2857,7 +2853,7 @@ static inline gboolean do_enter (WPanel * panel) { - return do_enter_on_file_entry (selection (panel)); + return do_enter_on_file_entry (panel, selection (panel)); } @@ -2880,6 +2876,7 @@ const file_entry_t *entry = &panel->dir.list[panel->selected]; vfs_path_t *new_dir_vpath; char *sel_entry = NULL; + WPanel *p; if (get_other_type () != view_listing) create_panel (get_other_index (), view_listing); @@ -2892,13 +2889,13 @@ sel_entry = strrchr (vfs_path_get_last_path_str (panel->cwd_vpath), PATH_SEP); } - change_panel (); - do_cd (new_dir_vpath, cd_exact); + p = change_panel (); + panel_cd (p, new_dir_vpath, cd_exact); vfs_path_free (new_dir_vpath); if (sel_entry) - try_to_select (current_panel, sel_entry); - change_panel (); + try_to_select (p, sel_entry); + (void) change_panel (); move_down (panel); } @@ -2917,7 +2914,7 @@ if (get_other_type () != view_listing) create_panel (get_other_index (), view_listing); - do_panel_cd (other_panel, current_panel->cwd_vpath, cd_exact); + panel_do_cd (other_panel, panel->cwd_vpath, cd_exact); /* try to select current filename on the other panel */ if (!panel->is_panelized) @@ -2935,6 +2932,7 @@ struct stat st; vfs_path_t *panel_fname_vpath; gboolean ok; + WPanel *cpanel; if (get_other_type () != view_listing) return; @@ -2973,10 +2971,10 @@ else new_dir_vpath = vfs_path_append_new (panel->cwd_vpath, buffer, (char *) NULL); - change_panel (); - do_cd (new_dir_vpath, cd_exact); + cpanel = change_panel (); + panel_cd (cpanel, new_dir_vpath, cd_exact); vfs_path_free (new_dir_vpath); - change_panel (); + (void) change_panel (); move_down (panel); } @@ -3248,7 +3246,7 @@ */ static gboolean -_do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) +panel_do_cd_int (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) { vfs_path_t *olddir_vpath; @@ -3288,7 +3286,7 @@ try_to_select (panel, get_parent_dir_name (panel->cwd_vpath, olddir_vpath)); load_hint (FALSE); - panel->dirty = 1; + panel->dirty = TRUE; update_xterm_title_path (); vfs_path_free (olddir_vpath); @@ -3308,15 +3306,15 @@ GList *next; ok = TRUE; - next = g_list_next (panel->dir_history_current); + next = g_list_next (panel->dir_history.current); if (next != NULL) { vfs_path_t *data_vpath; data_vpath = vfs_path_from_str ((char *) next->data); - ok = _do_panel_cd (panel, data_vpath, cd_exact); + ok = panel_do_cd_int (panel, data_vpath, cd_exact); vfs_path_free (data_vpath); - panel->dir_history_current = next; + panel->dir_history.current = next; } /* skip directories that present in history but absent in file system */ } @@ -3335,15 +3333,15 @@ GList *prev; ok = TRUE; - prev = g_list_previous (panel->dir_history_current); + prev = g_list_previous (panel->dir_history.current); if (prev != NULL) { vfs_path_t *data_vpath; data_vpath = vfs_path_from_str ((char *) prev->data); - ok = _do_panel_cd (panel, data_vpath, cd_exact); + ok = panel_do_cd_int (panel, data_vpath, cd_exact); vfs_path_free (data_vpath); - panel->dir_history_current = prev; + panel->dir_history.current = prev; } /* skip directories that present in history but absent in file system */ } @@ -3359,19 +3357,19 @@ gboolean ok = FALSE; size_t pos; - pos = g_list_position (panel->dir_history_current, panel->dir_history); + pos = g_list_position (panel->dir_history.current, panel->dir_history.list); - history_descriptor_init (&hd, WIDGET (panel)->y, WIDGET (panel)->x, panel->dir_history, + history_descriptor_init (&hd, WIDGET (panel)->y, WIDGET (panel)->x, panel->dir_history.list, (int) pos); history_show (&hd); - panel->dir_history = hd.list; + panel->dir_history.list = hd.list; if (hd.text != NULL) { vfs_path_t *s_vpath; s_vpath = vfs_path_from_str (hd.text); - ok = _do_panel_cd (panel, s_vpath, cd_exact); + ok = panel_do_cd_int (panel, s_vpath, cd_exact); if (ok) directory_history_add (panel, panel->cwd_vpath); else @@ -3387,17 +3385,17 @@ size_t i; - panel->dir_history_current = panel->dir_history; + panel->dir_history.current = panel->dir_history.list; for (i = 0; i <= pos; i++) { GList *prev; - prev = g_list_previous (panel->dir_history_current); + prev = g_list_previous (panel->dir_history.current); if (prev == NULL) break; - panel->dir_history_current = prev; + panel->dir_history.current = prev; } } } @@ -3441,22 +3439,22 @@ chdir_to_readlink (panel); break; case CK_CopySingle: - copy_cmd_local (); + copy_cmd_local (panel); break; case CK_DeleteSingle: - delete_cmd_local (); + delete_cmd_local (panel); break; case CK_Enter: do_enter (panel); break; case CK_ViewRaw: - view_raw_cmd (); + view_raw_cmd (panel); break; case CK_EditNew: edit_cmd_new (); break; case CK_MoveSingle: - rename_cmd_local (); + rename_cmd_local (panel); break; case CK_SelectInvert: panel_select_invert_files (panel); @@ -3465,7 +3463,7 @@ panel_select_files (panel); break; case CK_SelectExt: - panel_select_ext_cmd (); + panel_select_ext_cmd (panel); break; case CK_Unselect: panel_unselect_files (panel); @@ -3516,7 +3514,7 @@ mark_file_right (panel); break; case CK_CdParentSmart: - res = force_maybe_cd (); + res = force_maybe_cd (panel); break; case CK_Up: move_up (panel); @@ -3601,7 +3599,7 @@ return MSG_HANDLED; } - if (panel->searching && ((key >= ' ' && key <= 255) || key == KEY_BACKSPACE)) + if (panel->quick_search.active && ((key >= ' ' && key <= 255) || key == KEY_BACKSPACE)) { do_search (panel, key); return MSG_HANDLED; @@ -3654,13 +3652,13 @@ paint_dir (panel); mini_info_separator (panel); display_mini_info (panel); - panel->dirty = 0; + panel->dirty = FALSE; return MSG_HANDLED; case MSG_FOCUS: state_mark = -1; current_panel = panel; - panel->active = 1; + panel->active = TRUE; if (mc_chdir (panel->cwd_vpath) != 0) { @@ -3685,7 +3683,7 @@ case MSG_UNFOCUS: /* Janne: look at this for the multiple panel options */ stop_search (panel); - panel->active = 0; + panel->active = FALSE; unselect_item (panel); return MSG_HANDLED; @@ -3870,7 +3868,7 @@ /* no other events on 1st line, return MOU_UNHANDLED */ event->result.abort = TRUE; /* avoid extra panel redraw */ - panel->dirty = 0; + panel->dirty = FALSE; } break; } @@ -3883,7 +3881,7 @@ } if (!is_active) - change_panel (); + (void) change_panel (); MC_FALLTHROUGH; case MSG_MOUSE_DRAG: @@ -4014,7 +4012,7 @@ panel_reload (panel); try_to_select (panel, current_file); - panel->dirty = 1; + panel->dirty = TRUE; if (free_pointer) g_free (my_current_file); @@ -4043,7 +4041,7 @@ { if (i != panel->selected) { - panel->dirty = 1; + panel->dirty = TRUE; panel->selected = i; panel->top_file = panel->selected - (WIDGET (panel)->lines - 2) / 2; if (panel->top_file < 0) @@ -4235,9 +4233,9 @@ panel->marked = 0; panel->dirs_marked = 0; panel->total = 0; - panel->searching = FALSE; + panel->quick_search.active = FALSE; panel->is_panelized = FALSE; - panel->dirty = 1; + panel->dirty = TRUE; panel->content_shift = -1; panel->max_shift = -1; @@ -4310,7 +4308,7 @@ panel->list_cols = 1; panel->brief_cols = 2; - panel->dirty = 1; + panel->dirty = TRUE; panel->content_shift = -1; panel->max_shift = -1; @@ -4326,15 +4324,18 @@ panel->frame_size = frame_half; - panel->panel_name = g_strdup (panel_name); - panel->hist_name = g_strconcat ("Dir Hist ", panel->panel_name, (char *) NULL); + panel->quick_search.buffer = g_string_sized_new (MC_MAXFILENAMELEN); + panel->quick_search.prev_buffer = g_string_sized_new (MC_MAXFILENAMELEN); + + panel->name = g_strdup (panel_name); + panel->dir_history.name = g_strconcat ("Dir Hist ", panel->name, (char *) NULL); /* directories history will be get later */ - section = g_strconcat ("Temporal:", panel->panel_name, (char *) NULL); + section = g_strconcat ("Temporal:", panel->name, (char *) NULL); if (!mc_config_has_group (mc_global.main_config, section)) { g_free (section); - section = g_strdup (panel->panel_name); + section = g_strdup (panel->name); } panel_load_setup (panel, section); g_free (section); @@ -4455,7 +4456,7 @@ &panel->sort_info, panel->filter)) message (D_ERROR, MSG_ERROR, _("Cannot read directory contents")); - panel->dirty = 1; + panel->dirty = TRUE; if (panel->selected >= panel->dir.len) do_select (panel, panel->dir.len - 1); @@ -4530,7 +4531,7 @@ { adjust_top_file (panel); - panel->dirty = 1; + panel->dirty = TRUE; execute_hooks (select_file_hook); } @@ -4627,11 +4628,11 @@ * Record change in the directory history. */ gboolean -do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) +panel_do_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) { gboolean r; - r = _do_panel_cd (panel, new_dir_vpath, cd_type); + r = panel_do_cd_int (panel, new_dir_vpath, cd_type); if (r) directory_history_add (panel, panel->cwd_vpath); return r; @@ -4645,7 +4646,7 @@ if (panel->dir.list[lc_index].f.marked != val) { panel->dir.list[lc_index].f.marked = val; - panel->dirty = 1; + panel->dirty = TRUE; } } @@ -4675,7 +4676,7 @@ g_free (filename); panel->top_file = panel->selected - panel_items (panel) / 2; select_item (panel); - panel->dirty = 1; + panel->dirty = TRUE; } /* --------------------------------------------------------------------------------------------- */ @@ -4731,7 +4732,7 @@ g_free (init_translation_table (mc_global.display_codepage, mc_global.display_codepage)); cd_path_vpath = remove_encoding_from_path (panel->cwd_vpath); - do_panel_cd (panel, cd_path_vpath, cd_parse_command); + panel_do_cd (panel, cd_path_vpath, cd_parse_command); show_dir (panel); vfs_path_free (cd_path_vpath); return; @@ -4750,7 +4751,7 @@ { vfs_path_change_encoding (panel->cwd_vpath, encoding); - if (!do_panel_cd (panel, panel->cwd_vpath, cd_parse_command)) + if (!panel_do_cd (panel, panel->cwd_vpath, cd_parse_command)) message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\""), vfs_path_as_str (panel->cwd_vpath)); } @@ -4991,6 +4992,8 @@ panel_filename_scroll_right_char = mc_skin_get ("widget-panel", "filename-scroll-right-char", "}"); + string_file_name_buffer = g_string_sized_new (MC_MAXFILENAMELEN); + mc_event_add (MCEVENT_GROUP_FILEMANAGER, "update_panels", event_update_panels, NULL, NULL); mc_event_add (MCEVENT_GROUP_FILEMANAGER, "panel_save_current_file_to_clip_file", panel_save_current_file_to_clip_file, NULL, NULL); @@ -5010,17 +5013,18 @@ g_free (panel_history_show_list_char); g_free (panel_filename_scroll_left_char); g_free (panel_filename_scroll_right_char); + g_string_free (string_file_name_buffer, TRUE); } /* --------------------------------------------------------------------------------------------- */ gboolean -do_cd (const vfs_path_t * new_dir_vpath, enum cd_enum exact) +panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum exact) { gboolean res; const vfs_path_t *_new_dir_vpath = new_dir_vpath; - if (current_panel->is_panelized) + if (panel->is_panelized) { size_t new_vpath_len; @@ -5029,18 +5033,18 @@ _new_dir_vpath = panelized_panel.root_vpath; } - res = do_panel_cd (current_panel, _new_dir_vpath, exact); + res = panel_do_cd (panel, _new_dir_vpath, exact); #ifdef HAVE_CHARSET if (res) { const vfs_path_element_t *path_element; - path_element = vfs_path_get_by_index (current_panel->cwd_vpath, -1); + path_element = vfs_path_get_by_index (panel->cwd_vpath, -1); if (path_element->encoding != NULL) - current_panel->codepage = get_codepage_index (path_element->encoding); + panel->codepage = get_codepage_index (path_element->encoding); else - current_panel->codepage = SELECT_CHARSET_NO_TRANSLATE; + panel->codepage = SELECT_CHARSET_NO_TRANSLATE; } #endif /* HAVE_CHARSET */ diff -Nru mc-4.8.25/src/filemanager/panel.h mc-4.8.26/src/filemanager/panel.h --- mc-4.8.25/src/filemanager/panel.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/filemanager/panel.h 2021-01-10 11:50:16.000000000 +0000 @@ -90,51 +90,63 @@ typedef struct { Widget widget; + + char *name; /* The panel name */ + + panel_display_t frame_size; /* half or full frame */ + + gboolean active; /* If panel is currently selected */ + gboolean dirty; /* Should we redisplay the panel? */ + gboolean is_panelized; /* Flag: special filelisting, can't reload */ + +#ifdef HAVE_CHARSET + int codepage; /* Panel codepage */ +#endif + dir_list dir; /* Directory contents */ + struct stat dir_stat; /* Stat of current dir: used by execute () */ - list_format_t list_format; /* listing type */ - int active; /* If panel is currently selected */ vfs_path_t *cwd_vpath; /* Current Working Directory */ vfs_path_t *lwd_vpath; /* Last Working Directory */ - GList *dir_history; /* directory history */ - GList *dir_history_current; /* pointer to the current history item */ - char *hist_name; /* directory history name for history file */ - int marked; /* Count of marked files */ - int dirs_marked; /* Count of marked directories */ - uintmax_t total; /* Bytes in marked files */ - int top_file; /* The file showed on the top of the panel */ - int selected; /* Index to the selected file */ + + list_format_t list_format; /* Listing type */ + GSList *format; /* Display format */ + char *user_format; /* User format */ int list_cols; /* Number of file list columns */ int brief_cols; /* Number of columns in case of list_brief format */ - gboolean is_panelized; /* Flag: special filelisting, can't reload */ - panel_display_t frame_size; /* half or full frame */ - char *filter; /* File name filter */ - /* sort */ dir_sort_options_t sort_info; const panel_field_t *sort_field; - int dirty; /* Should we redisplay the panel? */ + int marked; /* Count of marked files */ + int dirs_marked; /* Count of marked directories */ + uintmax_t total; /* Bytes in marked files */ - gboolean user_mini_status; /* Is user_status_format used */ - char *user_format; /* User format */ - char *user_status_format[LIST_FORMATS]; /* User format for status line */ + int top_file; /* The file showed on the top of the panel */ + int selected; /* Index to the selected file */ - GSList *format; /* Display format */ GSList *status_format; /* Mini status format */ + gboolean user_mini_status; /* Is user_status_format used */ + char *user_status_format[LIST_FORMATS]; /* User format for status line */ - char *panel_name; /* The panel name */ - struct stat dir_stat; /* Stat of current dir: used by execute () */ + char *filter; /* File name filter */ -#ifdef HAVE_CHARSET - int codepage; /* panel codepage */ -#endif + struct + { + char *name; /* Directory history name for history file */ + GList *list; /* Directory history */ + GList *current; /* Pointer to the current history item */ + } dir_history; + + struct + { + gboolean active; + GString *buffer; + GString *prev_buffer; + char ch[MB_LEN_MAX]; /* Buffer for multi-byte character */ + int chpoint; /* Point after last characters in @ch */ + } quick_search; - gboolean searching; - char search_buffer[MC_MAXFILENAMELEN]; - char prev_search_buffer[MC_MAXFILENAMELEN]; - char search_char[MB_LEN_MAX]; /*buffer for multibytes characters */ - int search_chpoint; /*point after last characters in search_char */ int content_shift; /* Number of characters of filename need to skip from left side. */ int max_shift; /* Max shift for visible part of current panel */ } WPanel; @@ -176,7 +188,8 @@ void file_mark (WPanel * panel, int idx, int val); void do_file_mark (WPanel * panel, int idx, int val); -gboolean do_panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); +gboolean panel_do_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); +gboolean panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); gsize panel_get_num_of_sortable_fields (void); char **panel_get_sortable_fields (gsize *); @@ -190,7 +203,6 @@ void panel_init (void); void panel_deinit (void); -gboolean do_cd (const vfs_path_t * new_dir_vpath, enum cd_enum cd_type); /* --------------------------------------------------------------------------------------------- */ /*** inline functions ****************************************************************************/ diff -Nru mc-4.8.25/src/filemanager/panelize.c mc-4.8.26/src/filemanager/panelize.c --- mc-4.8.25/src/filemanager/panelize.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/panelize.c 2021-01-10 11:50:16.000000000 +0000 @@ -50,7 +50,7 @@ #include "src/history.h" #include "dir.h" -#include "midnight.h" /* current_panel */ +#include "filemanager.h" /* current_panel */ #include "layout.h" /* rotate_dash() */ #include "panel.h" /* WPanel */ diff -Nru mc-4.8.25/src/filemanager/tree.c mc-4.8.26/src/filemanager/tree.c --- mc-4.8.25/src/filemanager/tree.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/tree.c 2021-01-10 11:50:16.000000000 +0000 @@ -60,7 +60,7 @@ #include "src/history.h" #include "dir.h" -#include "midnight.h" /* the_menubar */ +#include "filemanager.h" /* the_menubar */ #include "file.h" /* copy_dir_dir(), move_dir_dir(), erase_dir() */ #include "layout.h" /* command_prompt */ #include "treestore.h" @@ -92,7 +92,7 @@ Widget widget; struct TreeStore *store; tree_entry *selected_ptr; /* The selected directory */ - char search_buffer[MC_MAXFILENAMELEN]; /* Current search string */ + GString *search_buffer; /* Current search string */ tree_entry **tree_shown; /* Entries currently on screen */ gboolean is_panel; /* panel or plain widget flag */ gboolean searching; /* Are we on searching mode? */ @@ -195,6 +195,7 @@ save_tree (tree); MC_PTR_FREE (tree->tree_shown); + g_string_free (tree->search_buffer, TRUE); tree->selected_ptr = NULL; } @@ -239,7 +240,7 @@ tty_draw_hline (w->y + line, w->x + 1, ' ', tree_cols); widget_gotoyx (w, line, 1); tty_print_char (PATH_SEP); - tty_print_string (str_fit_to_term (tree->search_buffer, tree_cols - 2, J_LEFT_FIT)); + tty_print_string (str_fit_to_term (tree->search_buffer->str, tree_cols - 2, J_LEFT_FIT)); tty_print_char (' '); } else @@ -585,16 +586,18 @@ { if (tree->is_panel) { - change_panel (); + WPanel *p; - if (do_cd (tree->selected_ptr->name, cd_exact)) - select_item (current_panel); + p = change_panel (); + + if (panel_cd (p, tree->selected_ptr->name, cd_exact)) + select_item (p); else message (D_ERROR, MSG_ERROR, _("Cannot chdir to \"%s\"\n%s"), vfs_path_as_str (tree->selected_ptr->name), unix_error_string (errno)); - widget_draw (WIDGET (current_panel)); - change_panel (); + widget_draw (WIDGET (p)); + (void) change_panel (); show_tree (tree); } else @@ -618,19 +621,15 @@ /* --------------------------------------------------------------------------------------------- */ /** Search tree for text */ -static int -search_tree (WTree * tree, char *text) +static gboolean +search_tree (WTree * tree, const GString * text) { - tree_entry *current; - size_t len; + tree_entry *current = tree->selected_ptr; gboolean wrapped = FALSE; gboolean found = FALSE; - len = strlen (text); - current = tree->selected_ptr; - while (!found && (!wrapped || current != tree->selected_ptr)) - if (strncmp (current->subname, text, len) == 0) + if (strncmp (current->subname, text->str, text->len) == 0) { tree->selected_ptr = current; found = TRUE; @@ -656,19 +655,15 @@ static void tree_do_search (WTree * tree, int key) { - size_t l; + /* TODO: support multi-byte characters, see do_search() in panel.c */ - l = strlen (tree->search_buffer); - if ((l != 0) && (key == KEY_BACKSPACE)) - tree->search_buffer[--l] = '\0'; - else if (key && l < sizeof (tree->search_buffer) - 1) - { - tree->search_buffer[l] = key; - tree->search_buffer[++l] = '\0'; - } + if (tree->search_buffer->len != 0 && key == KEY_BACKSPACE) + g_string_set_size (tree->search_buffer, tree->search_buffer->len - 1); + else if (key != 0) + g_string_append_c (tree->search_buffer, (gchar) key); if (!search_tree (tree, tree->search_buffer)) - tree->search_buffer[--l] = '\0'; + g_string_set_size (tree->search_buffer, tree->search_buffer->len - 1); show_tree (tree); maybe_chdir (tree); @@ -970,7 +965,7 @@ else { tree->searching = TRUE; - tree->search_buffer[0] = '\0'; + g_string_set_size (tree->search_buffer, 0); } } @@ -1236,7 +1231,7 @@ event->result.abort = TRUE; } else if (!widget_get_state (w, WST_FOCUSED)) - change_panel (); + (void) change_panel (); break; case MSG_MOUSE_CLICK: @@ -1301,7 +1296,7 @@ tree->store = tree_store_get (); tree_store_add_entry_remove_hook (remove_callback, tree); tree->tree_shown = NULL; - tree->search_buffer[0] = '\0'; + tree->search_buffer = g_string_sized_new (MC_MAXPATHLEN); tree->topdiff = w->lines / 2; tree->searching = FALSE; diff -Nru mc-4.8.25/src/filemanager/treestore.c mc-4.8.26/src/filemanager/treestore.c --- mc-4.8.25/src/filemanager/treestore.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/filemanager/treestore.c 2021-01-10 11:50:16.000000000 +0000 @@ -242,7 +242,7 @@ char *lc_name; /* Skip invalid records */ - if ((buffer[0] != '0' && buffer[0] != '1')) + if (buffer[0] != '0' && buffer[0] != '1') continue; if (buffer[1] != ':') @@ -269,7 +269,7 @@ vfs_path_t *vpath; vpath = vfs_path_from_str (oldname); - strcpy (oldname + common, different); + g_strlcpy (oldname + common, different, sizeof (oldname) - (size_t) common); if (vfs_file_is_local (vpath)) { vfs_path_t *tmp_vpath; @@ -294,7 +294,7 @@ e->scanned = scanned; } vfs_path_free (vpath); - strcpy (oldname, lc_name); + g_strlcpy (oldname, lc_name, sizeof (oldname)); } g_free (lc_name); } @@ -909,7 +909,7 @@ dirp = mc_opendir (vpath); if (dirp != NULL) { - struct dirent *dp; + struct vfs_dirent *dp; for (dp = mc_readdir (dirp); dp != NULL; dp = mc_readdir (dirp)) if (!DIR_IS_DOT (dp->d_name) && !DIR_IS_DOTDOT (dp->d_name)) diff -Nru mc-4.8.25/src/keybind-defaults.c mc-4.8.26/src/keybind-defaults.c --- mc-4.8.25/src/keybind-defaults.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/keybind-defaults.c 2021-01-10 11:50:16.000000000 +0000 @@ -34,8 +34,8 @@ /*** global variables ****************************************************************************/ -GArray *main_keymap = NULL; -GArray *main_x_keymap = NULL; +GArray *filemanager_keymap = NULL; +GArray *filemanager_x_keymap = NULL; GArray *panel_keymap = NULL; GArray *dialog_keymap = NULL; GArray *menu_keymap = NULL; @@ -57,8 +57,8 @@ GArray *diff_keymap = NULL; #endif -const global_keymap_t *main_map = NULL; -const global_keymap_t *main_x_map = NULL; +const global_keymap_t *filemanager_map = NULL; +const global_keymap_t *filemanager_x_map = NULL; const global_keymap_t *panel_map = NULL; const global_keymap_t *tree_map = NULL; const global_keymap_t *help_map = NULL; @@ -89,8 +89,8 @@ /*** file scope variables ************************************************************************/ /* midnight */ -static const global_keymap_ini_t default_main_keymap[] = { - {"ChangePanel", "tab"}, +static const global_keymap_ini_t default_filemanager_keymap[] = { + {"ChangePanel", "tab; ctrl-i"}, {"Help", "f1"}, {"UserMenu", "f2"}, {"View", "f3"}, @@ -143,7 +143,7 @@ {NULL, NULL} }; -static const global_keymap_ini_t default_main_x_keymap[] = { +static const global_keymap_ini_t default_filemanager_x_keymap[] = { {"CompareDirs", "d"}, #ifdef USE_DIFF_VIEW {"CompareFiles", "ctrl-d"}, @@ -641,8 +641,9 @@ keymap = mc_config_init (NULL, TRUE); - create_default_keymap_section (keymap, KEYMAP_SECTION_MAIN, default_main_keymap); - create_default_keymap_section (keymap, KEYMAP_SECTION_MAIN_EXT, default_main_x_keymap); + create_default_keymap_section (keymap, KEYMAP_SECTION_FILEMANAGER, default_filemanager_keymap); + create_default_keymap_section (keymap, KEYMAP_SECTION_FILEMANAGER_EXT, + default_filemanager_x_keymap); create_default_keymap_section (keymap, KEYMAP_SECTION_PANEL, default_panel_keymap); create_default_keymap_section (keymap, KEYMAP_SECTION_DIALOG, default_dialog_keymap); create_default_keymap_section (keymap, KEYMAP_SECTION_MENU, default_menu_keymap); diff -Nru mc-4.8.25/src/keybind-defaults.h mc-4.8.26/src/keybind-defaults.h --- mc-4.8.25/src/keybind-defaults.h 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/keybind-defaults.h 2021-01-10 11:50:16.000000000 +0000 @@ -13,8 +13,8 @@ /*** global variables defined in .c file *********************************************************/ -extern GArray *main_keymap; -extern GArray *main_x_keymap; +extern GArray *filemanager_keymap; +extern GArray *filemanager_x_keymap; extern GArray *panel_keymap; extern GArray *dialog_keymap; extern GArray *menu_keymap; @@ -36,8 +36,8 @@ extern GArray *diff_keymap; #endif -extern const global_keymap_t *main_map; -extern const global_keymap_t *main_x_map; +extern const global_keymap_t *filemanager_map; +extern const global_keymap_t *filemanager_x_map; extern const global_keymap_t *panel_map; extern const global_keymap_t *tree_map; extern const global_keymap_t *help_map; diff -Nru mc-4.8.25/src/main.c mc-4.8.26/src/main.c --- mc-4.8.25/src/main.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/main.c 2021-01-10 11:50:16.000000000 +0000 @@ -49,7 +49,6 @@ #include "lib/tty/tty.h" #include "lib/tty/key.h" /* For init_key() */ #include "lib/tty/mouse.h" /* init_mouse() */ -#include "lib/timer.h" #include "lib/skin.h" #include "lib/filehighlight.h" #include "lib/fileloc.h" @@ -57,7 +56,7 @@ #include "lib/util.h" #include "lib/vfs/vfs.h" /* vfs_init(), vfs_shut() */ -#include "filemanager/midnight.h" /* current_panel */ +#include "filemanager/filemanager.h" #include "filemanager/treestore.h" /* tree_store_save */ #include "filemanager/layout.h" #include "filemanager/ext.h" /* flush_extension_file() */ @@ -255,8 +254,6 @@ mc_global.run_from_parent_mc = !check_sid (); - mc_global.timer = mc_timer_new (); - /* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */ #ifdef HAVE_SETLOCALE (void) setlocale (LC_ALL, ""); @@ -277,7 +274,6 @@ startup_exit_ok: mc_shell_deinit (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); return exit_code; } @@ -557,8 +553,6 @@ exit_code = EXIT_FAILURE; } - mc_timer_destroy (mc_global.timer); - (void) putchar ('\n'); /* Hack to make shell's prompt start at left of screen */ return exit_code; diff -Nru mc-4.8.25/src/Makefile.in mc-4.8.26/src/Makefile.in --- mc-4.8.25/src/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/man2hlp/Makefile.in mc-4.8.26/src/man2hlp/Makefile.in --- mc-4.8.25/src/man2hlp/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/man2hlp/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/setup.c mc-4.8.26/src/setup.c --- mc-4.8.25/src/setup.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/setup.c 2021-01-10 11:50:16.000000000 +0000 @@ -54,7 +54,7 @@ #endif #include "filemanager/dir.h" -#include "filemanager/midnight.h" +#include "filemanager/filemanager.h" #include "filemanager/tree.h" /* xtree_mode */ #include "filemanager/hotlist.h" /* load/save/done hotlist */ #include "filemanager/panelize.h" /* load/save/done panelize */ @@ -360,6 +360,7 @@ #endif /* USE_INTERNAL_EDIT */ { "editor_ask_filename_before_edit", &editor_ask_filename_before_edit }, { "nice_rotating_dash", &nice_rotating_dash }, + { "shadows", &mc_global.tty.shadows }, { "mcview_remember_file_position", &mcview_remember_file_position }, { "auto_fill_mkdir_name", &auto_fill_mkdir_name }, { "copymove_persistent_attr", ©move_persistent_attr }, @@ -996,11 +997,11 @@ type = get_panel_type (0); panel_save_type ("New Left Panel", type); if (type == view_listing) - panel_save_setup (left_panel, left_panel->panel_name); + panel_save_setup (left_panel, left_panel->name); type = get_panel_type (1); panel_save_type ("New Right Panel", type); if (type == view_listing) - panel_save_setup (right_panel, right_panel->panel_name); + panel_save_setup (right_panel, right_panel->name); { char *dirs; @@ -1354,8 +1355,8 @@ km##_keymap = g_array_new (TRUE, FALSE, sizeof (global_keymap_t)); \ load_keymap_from_section (KEYMAP_SECTION_##s, km##_keymap, mc_global_keymap) - LOAD_KEYMAP (MAIN, main); - LOAD_KEYMAP (MAIN_EXT, main_x); + LOAD_KEYMAP (FILEMANAGER, filemanager); + LOAD_KEYMAP (FILEMANAGER_EXT, filemanager_x); LOAD_KEYMAP (PANEL, panel); LOAD_KEYMAP (DIALOG, dialog); LOAD_KEYMAP (MENU, menu); @@ -1384,8 +1385,8 @@ #define SET_MAP(m) \ m##_map = (global_keymap_t *) m##_keymap->data - SET_MAP (main); - SET_MAP (main_x); + SET_MAP (filemanager); + SET_MAP (filemanager_x); SET_MAP (panel); SET_MAP (dialog); SET_MAP (menu); @@ -1419,8 +1420,8 @@ if (km##_keymap != NULL) \ g_array_free (km##_keymap, TRUE) - FREE_KEYMAP (main); - FREE_KEYMAP (main_x); + FREE_KEYMAP (filemanager); + FREE_KEYMAP (filemanager_x); FREE_KEYMAP (panel); FREE_KEYMAP (dialog); FREE_KEYMAP (menu); diff -Nru mc-4.8.25/src/setup.h mc-4.8.26/src/setup.h --- mc-4.8.25/src/setup.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/setup.h 2021-01-10 11:50:16.000000000 +0000 @@ -73,7 +73,7 @@ /*** global variables defined in .c file *********************************************************/ -/* global paremeters */ +/* global parameters */ extern char *global_profile_name; extern gboolean confirm_delete; extern gboolean confirm_directory_hotlist_delete; diff -Nru mc-4.8.25/src/subshell/common.c mc-4.8.26/src/subshell/common.c --- mc-4.8.25/src/subshell/common.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/subshell/common.c 2021-01-21 17:13:35.000000000 +0000 @@ -9,25 +9,26 @@ Aliaksey Kandratsenka Andreas Mohr Andrew Borodin - Andrew Borodin Andrew V. Samoilov Chris Owen Claes Nästén Egmont Koblinger Enrico Weigelt, metux IT service + Eric Roberts Igor Urazov Ilia Maslakov Leonard den Ottolander Miguel de Icaza Mikhail S. Pobolovets Norbert Warmuth + Oswald Buddenhagen Patrick Winnertz Pavel Machek Pavel Roskin Pavel Tsekov Roland Illig Sergei Trofimovich - Slava Zanko , 2013,2015. + Slava Zanko Timur Bakeyev Vit Rosin @@ -105,6 +106,9 @@ #include "lib/util.h" #include "lib/widget.h" +#include "src/filemanager/layout.h" /* setup_cmdline() */ +#include "src/filemanager/command.h" /* cmdline */ + #include "subshell.h" #include "internal.h" @@ -123,6 +127,10 @@ /* We need to paint it after CONSOLE_RESTORE, see: load_prompt */ gboolean update_subshell_prompt = FALSE; +/* If set, then a command has just finished executing, and we need */ +/* to be on the lookout for a new prompt string from the subshell. */ +gboolean should_read_new_subshell_prompt; + /*** file scope macro definitions ****************************************************************/ #ifndef WEXITSTATUS @@ -151,6 +159,14 @@ WRITE = 1 }; +/* This is the keybinding that is sent to the shell, to make the shell send us the contents of + * the current command buffer. */ +#define SHELL_BUFFER_KEYBINDING "_" + +/* This is the keybinding that is sent to the shell, to make the shell send us the location of + * the cursor. */ +#define SHELL_CURSOR_KEYBINDING "+" + /*** file scope variables ************************************************************************/ /* tcsh closes all non-standard file descriptors, so we have to use a pipe */ @@ -169,6 +185,9 @@ /* To pass CWD info from the subshell to MC */ static int subshell_pipe[2]; +/* To pass command buffer info from the subshell to MC */ +static int command_buffer_pipe[2]; + /* The subshell's process ID */ static pid_t subshell_pid = 1; @@ -178,6 +197,17 @@ /* Flag to indicate whether the subshell is ready for next command */ static int subshell_ready; +/* Flag to indicate if the subshell supports the persistent buffer feature. */ +static gboolean use_persistent_buffer = FALSE; + +/* Flag to indicate if the contents of the subshell command line need to be cleared before */ +/* executing a command. This should only end up set to true if there is some sort of error. */ +/* This allows us to recover gracefully from an error. */ +static gboolean subshell_should_clear_command_line = FALSE; + +/* This is the local variable where the subshell prompt is stored while we are working on it. */ +static GString *subshell_prompt_temp_buffer = NULL; + /* The following two flags can be changed by the SIGCHLD handler. This is */ /* OK, because the 'int' type is updated atomically on all known machines */ static volatile int subshell_alive, subshell_stopped; @@ -353,7 +383,7 @@ /* Attach all our standard file descriptors to the pty */ - /* This is done just before the fork, because stderr must still */ + /* This is done just before the exec, because stderr must still */ /* be connected to the real tty during the above error messages; */ /* otherwise the user will never see them. */ @@ -362,6 +392,10 @@ dup2 (subshell_pty_slave, STDERR_FILENO); close (subshell_pipe[READ]); + + if (use_persistent_buffer) + close (command_buffer_pipe[READ]); + close (subshell_pty_slave); /* These may be FD_CLOEXEC, but just in case... */ /* Close master side of pty. This is important; apart from */ /* freeing up the descriptor for use in the subshell, it also */ @@ -469,6 +503,232 @@ } /* --------------------------------------------------------------------------------------------- */ +/* Get the contents of the current subshell command line buffer, and */ +/* transfer the contents to the panel command prompt. */ + +static gboolean +read_command_line_buffer (gboolean test_mode) +{ + char subshell_command_buffer[BUF_LARGE]; + char subshell_cursor_buffer[BUF_SMALL]; + + fd_set read_set; + int i; + ssize_t bytes; + struct timeval subshell_prompt_timer = { 0, 0 }; + int command_buffer_length; + int command_buffer_char_length; + int bash_version; + int cursor_position; + int maxfdp; + int rc; + + if (!use_persistent_buffer) + return TRUE; + + FD_ZERO (&read_set); + FD_SET (command_buffer_pipe[READ], &read_set); + maxfdp = command_buffer_pipe[READ]; + + /* First, flush the command buffer pipe. This pipe shouldn't be written + * to under normal circumstances, but if it somehow does get written + * to, we need to make sure to discard whatever data is there before + * we try to use it. */ + while ((rc = select (maxfdp + 1, &read_set, NULL, NULL, &subshell_prompt_timer)) != 0) + { + if (rc == -1) + { + if (errno == EINTR) + continue; + + return FALSE; + } + + if (rc == 1) + { + bytes = read (command_buffer_pipe[READ], subshell_command_buffer, + sizeof (subshell_command_buffer)); + (void) bytes; + } + } + + /* get contents of command line buffer */ + write_all (mc_global.tty.subshell_pty, ESC_STR SHELL_BUFFER_KEYBINDING, + sizeof (ESC_STR SHELL_CURSOR_KEYBINDING) - 1); + + subshell_prompt_timer.tv_sec = 1; + FD_ZERO (&read_set); + FD_SET (command_buffer_pipe[READ], &read_set); + + while ((rc = select (maxfdp + 1, &read_set, NULL, NULL, &subshell_prompt_timer)) != 1) + { + if (rc == -1) + { + if (errno == EINTR) + continue; + + return FALSE; + } + + if (rc == 0) + return FALSE; + } + + bytes = + read (command_buffer_pipe[READ], subshell_command_buffer, sizeof (subshell_command_buffer)); + if (bytes == 0 || bytes == sizeof (subshell_command_buffer)) + return FALSE; + + command_buffer_char_length = bytes - 1; + subshell_command_buffer[command_buffer_char_length] = '\0'; + command_buffer_length = str_length (subshell_command_buffer); + + /* get cursor position */ + write_all (mc_global.tty.subshell_pty, ESC_STR SHELL_CURSOR_KEYBINDING, + sizeof (ESC_STR SHELL_CURSOR_KEYBINDING) - 1); + + subshell_prompt_timer.tv_sec = 1; + subshell_prompt_timer.tv_usec = 0; + FD_ZERO (&read_set); + FD_SET (command_buffer_pipe[READ], &read_set); + + while ((rc = select (maxfdp + 1, &read_set, NULL, NULL, &subshell_prompt_timer)) != 1) + { + if (rc == -1) + { + if (errno == EINTR) + continue; + + return FALSE; + } + + if (rc == 0) + return FALSE; + } + + bytes = + read (command_buffer_pipe[READ], subshell_cursor_buffer, sizeof (subshell_cursor_buffer)); + if (bytes == 0) + return FALSE; + + subshell_cursor_buffer[bytes - 1] = '\0'; + if (mc_global.shell->type == SHELL_BASH) + { + if (sscanf (subshell_cursor_buffer, "%d:%d", &bash_version, &cursor_position) != 2) + return FALSE; + } + else + { + if (sscanf (subshell_cursor_buffer, "%d", &cursor_position) != 1) + return FALSE; + bash_version = 1000; + } + + if (test_mode) + return TRUE; + + /* Substitute non-text characters in the command buffer, such as tab, or newline, as this + * could cause problems. */ + for (i = 0; i < command_buffer_char_length; i++) + if ((unsigned char) subshell_command_buffer[i] < 32 + || (unsigned char) subshell_command_buffer[i] == 127) + subshell_command_buffer[i] = ' '; + + input_assign_text (cmdline, ""); + input_insert (cmdline, subshell_command_buffer, FALSE); + + if (bash_version < 5) /* implies SHELL_BASH */ + { + /* We need to do this because bash < v5 gives the cursor position in a utf-8 string based + * on the location in bytes, not in unicode characters. */ + char *curr, *stop; + + curr = subshell_command_buffer; + stop = curr + cursor_position; + + for (cursor_position = 0; curr < stop; cursor_position++) + str_next_char_safe (&curr); + } + if (cursor_position > command_buffer_length) + cursor_position = command_buffer_length; + cmdline->point = cursor_position; + /* We send any remaining data to STDOUT before we finish. */ + flush_subshell (0, VISIBLY); + + /* Now we erase the current contents of the command line buffer */ + if (mc_global.shell->type != SHELL_ZSH) + { + /* In zsh, we can just press c-u to clear the line, without needing to go to the end of + * the line first first. In all other shells, we must go to the end of the line first. */ + + /* If we are not at the end of the line, we go to the end. */ + if (cursor_position != command_buffer_length) + { + write_all (mc_global.tty.subshell_pty, "\005", 1); + if (flush_subshell (1, VISIBLY) != 1) + return FALSE; + } + } + + if (command_buffer_length > 0) + { + /* Now we clear the line. */ + write_all (mc_global.tty.subshell_pty, "\025", 1); + if (flush_subshell (1, VISIBLY) != 1) + return FALSE; + } + + return TRUE; +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +clear_subshell_prompt_string (void) +{ + if (subshell_prompt_temp_buffer != NULL) + g_string_set_size (subshell_prompt_temp_buffer, 0); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +parse_subshell_prompt_string (const char *buffer, int bytes) +{ + int i; + + if (mc_global.mc_run_mode != MC_RUN_FULL) + return; + + /* First time through */ + if (subshell_prompt == NULL) + subshell_prompt = g_string_sized_new (INITIAL_PROMPT_SIZE); + if (subshell_prompt_temp_buffer == NULL) + subshell_prompt_temp_buffer = g_string_sized_new (INITIAL_PROMPT_SIZE); + + /* Extract the prompt from the shell output */ + for (i = 0; i < bytes; i++) + if (buffer[i] == '\n' || buffer[i] == '\r') + g_string_set_size (subshell_prompt_temp_buffer, 0); + else if (buffer[i] != '\0') + g_string_append_c (subshell_prompt_temp_buffer, buffer[i]); +} + +/* --------------------------------------------------------------------------------------------- */ + +static void +set_prompt_string (void) +{ + if (mc_global.mc_run_mode != MC_RUN_FULL) + return; + + if (subshell_prompt_temp_buffer->len != 0) + g_string_assign (subshell_prompt, subshell_prompt_temp_buffer->str); + + setup_cmdline (); +} + +/* --------------------------------------------------------------------------------------------- */ /** Feed the subshell our keyboard input until it says it's finished */ static gboolean @@ -481,6 +741,9 @@ struct timeval wtime; /* Maximum time we wait for the subshell */ struct timeval *wptr; + should_read_new_subshell_prompt = FALSE; + subshell_should_clear_command_line = FALSE; + /* we wait up to 10 seconds if fail_on_error, forever otherwise */ wtime.tv_sec = 10; wtime.tv_usec = 0; @@ -549,6 +812,9 @@ if (how == VISIBLY) write_all (STDOUT_FILENO, pty_buffer, bytes); + + if (should_read_new_subshell_prompt) + parse_subshell_prompt_string (pty_buffer, bytes); } else if (FD_ISSET (subshell_pipe[READ], &read_set)) @@ -563,10 +829,12 @@ exit (EXIT_FAILURE); } - subshell_cwd[bytes - 1] = 0; /* Squash the final '\n' */ + subshell_cwd[bytes - 1] = '\0'; /* Squash the final '\n' */ synchronize (); + clear_subshell_prompt_string (); + should_read_new_subshell_prompt = TRUE; subshell_ready = TRUE; if (subshell_state == RUNNING_COMMAND) { @@ -578,6 +846,7 @@ else if (FD_ISSET (STDIN_FILENO, &read_set)) /* Read from stdin, write to the subshell */ { + should_read_new_subshell_prompt = FALSE; bytes = read (STDIN_FILENO, pty_buffer, sizeof (pty_buffer)); if (bytes <= 0) { @@ -591,15 +860,33 @@ if (pty_buffer[i] == subshell_switch_key) { write_all (mc_global.tty.subshell_pty, pty_buffer, i); + if (subshell_ready) + { subshell_state = INACTIVE; + set_prompt_string (); + if (subshell_ready && !read_command_line_buffer (FALSE)) + { + /* If we got here, some unforseen error must have occurred. */ + flush_subshell (0, VISIBLY); + input_assign_text (cmdline, ""); + subshell_should_clear_command_line = TRUE; + } + } + return TRUE; } write_all (mc_global.tty.subshell_pty, pty_buffer, bytes); if (pty_buffer[bytes - 1] == '\n' || pty_buffer[bytes - 1] == '\r') + { + /* We should only clear the command line if we are using a shell that works + * with persistent command buffer, otherwise we get awkward results. */ + if (use_persistent_buffer) + input_assign_text (cmdline, ""); subshell_ready = FALSE; + } } else return FALSE; @@ -784,8 +1071,13 @@ { case SHELL_BASH: g_snprintf (precmd, buff_size, + " mc_print_command_buffer () { printf \"%%s\\\\n\" \"$READLINE_LINE\" >&%d; }\n" + " bind -x '\"\\e" SHELL_BUFFER_KEYBINDING "\":\"mc_print_command_buffer\"'\n" + " bind -x '\"\\e" SHELL_CURSOR_KEYBINDING + "\":\"echo $BASH_VERSINFO:$READLINE_POINT >&%d\"'\n" " PROMPT_COMMAND=${PROMPT_COMMAND:+$PROMPT_COMMAND\n}'pwd>&%d;kill -STOP $$'\n" - "PS1='\\u@\\h:\\w\\$ '\n", subshell_pipe[WRITE]); + "PS1='\\u@\\h:\\w\\$ '\n", command_buffer_pipe[WRITE], + command_buffer_pipe[WRITE], subshell_pipe[WRITE]); break; case SHELL_ASH_BUSYBOX: @@ -800,7 +1092,7 @@ * "PS1='$(precmd)\\u@\\h:\\w\\$ '\n", * * C: This works if user calls "ash" command because in sub-subshell - * PRECMD is unfedined, thus evaluated to empty string - no damage done. + * PRECMD is undefined, thus evaluated to empty string - no damage done. * Attention: BusyBox must be built with FEATURE_EDITING_FANCY_PROMPT to * permit \u, \w, \h, \$ escape sequences. Unfortunately this cannot be guaranteed, * especially on embedded systems where people try to save space, so let's use @@ -844,25 +1136,33 @@ case SHELL_ZSH: g_snprintf (precmd, buff_size, + " mc_print_command_buffer () { printf \"%%s\\\\n\" \"$BUFFER\" >&%d; }\n" + " zle -N mc_print_command_buffer\n" + " bindkey '^[" SHELL_BUFFER_KEYBINDING "' mc_print_command_buffer\n" + " mc_print_cursor_position () { echo $CURSOR >&%d}\n" + " zle -N mc_print_cursor_position\n" + " bindkey '^[" SHELL_CURSOR_KEYBINDING "' mc_print_cursor_position\n" " _mc_precmd(){ pwd>&%d;kill -STOP $$ }; precmd_functions+=(_mc_precmd)\n" - "PS1='%%n@%%m:%%~%%# '\n", subshell_pipe[WRITE]); + "PS1='%%n@%%m:%%~%%# '\n", + command_buffer_pipe[WRITE], command_buffer_pipe[WRITE], subshell_pipe[WRITE]); break; case SHELL_TCSH: g_snprintf (precmd, buff_size, "set echo_style=both; " "set prompt='%%n@%%m:%%~%%# '; " - "alias precmd 'echo $cwd:q >>%s; kill -STOP $$'\n", tcsh_fifo); + "alias precmd 'echo -n;echo $cwd:q >>%s; kill -STOP $$'\n", tcsh_fifo); break; - case SHELL_FISH: g_snprintf (precmd, buff_size, - " if not functions -q fish_prompt_mc;" + " bind \\e" SHELL_BUFFER_KEYBINDING " 'commandline >&%d';" + "bind \\e" SHELL_CURSOR_KEYBINDING " 'commandline -C >&%d';" + "if not functions -q fish_prompt_mc;" "functions -e fish_right_prompt;" "functions -c fish_prompt fish_prompt_mc; end;" "function fish_prompt;" "echo \"$PWD\">&%d; fish_prompt_mc; kill -STOP %%self; end\n", - subshell_pipe[WRITE]); + command_buffer_pipe[WRITE], command_buffer_pipe[WRITE], subshell_pipe[WRITE]); break; default: @@ -1034,7 +1334,18 @@ return; } } - else if (pipe (subshell_pipe)) /* subshell_type is BASH, ASH_BUSYBOX, DASH or ZSH */ + else if (pipe (subshell_pipe) != 0) /* subshell_type is BASH, ASH_BUSYBOX, DASH or ZSH */ + { + perror (__FILE__ ": couldn't create pipe"); + mc_global.tty.use_subshell = FALSE; + return; + } + + if (mc_global.mc_run_mode == MC_RUN_FULL && + (mc_global.shell->type == SHELL_BASH || mc_global.shell->type == SHELL_ZSH + || mc_global.shell->type == SHELL_FISH)) + use_persistent_buffer = TRUE; + if (use_persistent_buffer && pipe (command_buffer_pipe) != 0) { perror (__FILE__ ": couldn't create pipe"); mc_global.tty.use_subshell = FALSE; @@ -1071,12 +1382,17 @@ subshell_state = RUNNING_COMMAND; tty_enable_interrupt_key (); if (!feed_subshell (QUIETLY, TRUE)) - { mc_global.tty.use_subshell = FALSE; - } tty_disable_interrupt_key (); if (!subshell_alive) mc_global.tty.use_subshell = FALSE; /* Subshell died instantly, so don't use it */ + + /* Try out the persistent command buffer feature. If it doesn't work the first time, we + * assume there must be something wrong with the shell, and we turn persistent buffer off + * for good. This will save the user the trouble of having to wait for the persistent + * buffer function to time out every time they try to close the subshell. */ + if (use_persistent_buffer && !read_command_line_buffer (TRUE)) + use_persistent_buffer = FALSE; } /* --------------------------------------------------------------------------------------------- */ @@ -1100,10 +1416,45 @@ /* FIXME: possibly take out this hack; the user can re-play it by hitting C-hyphen a few times! */ if (subshell_ready && mc_global.mc_run_mode == MC_RUN_FULL) write_all (mc_global.tty.subshell_pty, " \b", 2); /* Hack to make prompt reappear */ + + if (use_persistent_buffer) + { + size_t i; + int pos; + + /* Check to make sure there are no non text characters in the command buffer, + * such as tab, or newline, as this could cause problems. */ + for (i = 0; cmdline->buffer[i] != '\0'; i++) + if ((unsigned char) cmdline->buffer[i] < 32 + || (unsigned char) cmdline->buffer[i] == 127) + cmdline->buffer[i] = ' '; + + /* Write the command buffer to the subshell. */ + write_all (mc_global.tty.subshell_pty, cmdline->buffer, strlen (cmdline->buffer)); + + /* Put the cursor in the correct place in the subshell. */ + pos = str_length (cmdline->buffer) - cmdline->point; + for (i = 0; i < (size_t) pos; i++) + write_all (mc_global.tty.subshell_pty, ESC_STR "[D", 3); + } } } else /* MC has passed us a user command */ { + /* Before we write to the command prompt, we need to clear whatever */ + /* data is there, but only if we are using one of the shells that */ + /* doesn't support keeping command buffer contents, OR if there was */ + /* some sort of error. */ + if (!use_persistent_buffer || subshell_should_clear_command_line) + { + write_all (mc_global.tty.subshell_pty, "\003", 1); + subshell_state = RUNNING_COMMAND; + /* We need to call feed_subshell here if we are using fish, because of a quirk + * in the behavioral of that particular shell. */ + if (mc_global.shell->type != SHELL_FISH) + feed_subshell (QUIETLY, FALSE); + } + if (how == QUIETLY) write_all (mc_global.tty.subshell_pty, " ", 1); /* FIXME: if command is long (>8KB ?) we go comma */ @@ -1131,6 +1482,50 @@ return subshell_get_mainloop_quit (); } +/* --------------------------------------------------------------------------------------------- */ + +gboolean +flush_subshell (int max_wait_length, int how) +{ + int rc = 0; + ssize_t bytes = 0; + struct timeval timeleft = { 0, 0 }; + gboolean return_value = FALSE; + fd_set tmp; + + timeleft.tv_sec = max_wait_length; + FD_ZERO (&tmp); + FD_SET (mc_global.tty.subshell_pty, &tmp); + + while (subshell_alive + && (rc = select (mc_global.tty.subshell_pty + 1, &tmp, NULL, NULL, &timeleft)) != 0) + { + /* Check for 'select' errors */ + if (rc == -1) + { + if (errno == EINTR) + { + if (tty_got_winch ()) + tty_change_screen_size (); + + continue; + } + + fprintf (stderr, "select (FD_SETSIZE, &tmp...): %s\r\n", unix_error_string (errno)); + exit (EXIT_FAILURE); + } + + return_value = TRUE; + timeleft.tv_sec = 0; + timeleft.tv_usec = 0; + + bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer)); + if (how == VISIBLY) + write_all (STDOUT_FILENO, pty_buffer, bytes); + } + + return return_value; +} /* --------------------------------------------------------------------------------------------- */ @@ -1140,24 +1535,16 @@ int rc = 0; ssize_t bytes = 0; struct timeval timeleft = { 0, 0 }; - GString *p; - gboolean prompt_was_reset = FALSE; + gboolean should_reset_prompt = TRUE; + gboolean got_new_prompt = FALSE; fd_set tmp; FD_ZERO (&tmp); FD_SET (mc_global.tty.subshell_pty, &tmp); - /* First time through */ - if (subshell_prompt == NULL) - subshell_prompt = g_string_sized_new (INITIAL_PROMPT_SIZE); - - p = g_string_sized_new (INITIAL_PROMPT_SIZE); - while (subshell_alive && (rc = select (mc_global.tty.subshell_pty + 1, &tmp, NULL, NULL, &timeleft)) != 0) { - ssize_t i; - /* Check for 'select' errors */ if (rc == -1) { @@ -1174,22 +1561,18 @@ } bytes = read (mc_global.tty.subshell_pty, pty_buffer, sizeof (pty_buffer)); + if (should_reset_prompt) + { + should_reset_prompt = FALSE; + clear_subshell_prompt_string (); + } - /* Extract the prompt from the shell output */ - for (i = 0; i < bytes; i++) - if (pty_buffer[i] == '\n' || pty_buffer[i] == '\r') - { - g_string_set_size (p, 0); - prompt_was_reset = TRUE; - } - else if (pty_buffer[i] != '\0') - g_string_append_c (p, pty_buffer[i]); + parse_subshell_prompt_string (pty_buffer, bytes); + got_new_prompt = TRUE; } - if (p->len != 0 || prompt_was_reset) - g_string_assign (subshell_prompt, p->str); - - g_string_free (p, TRUE); + if (got_new_prompt) + set_prompt_string (); return (rc != 0 || bytes != 0); } @@ -1201,8 +1584,11 @@ { if (update_subshell_prompt) { - printf ("\r\n%s", subshell_prompt->str); - fflush (stdout); + if (subshell_prompt != NULL) + { + printf ("\r\n%s", subshell_prompt->str); + fflush (stdout); + } update_subshell_prompt = FALSE; } } @@ -1229,8 +1615,18 @@ tcsh_fifo, unix_error_string (errno)); } - g_string_free (subshell_prompt, TRUE); - subshell_prompt = NULL; + if (subshell_prompt != NULL) + { + g_string_free (subshell_prompt, TRUE); + subshell_prompt = NULL; + } + + if (subshell_prompt_temp_buffer != NULL) + { + g_string_free (subshell_prompt_temp_buffer, TRUE); + subshell_prompt_temp_buffer = NULL; + } + pty_buffer[0] = '\0'; } @@ -1259,6 +1655,15 @@ return; } + /* If we are using a shell that doesn't support persistent command buffer, we need to clear + * the command prompt before we send the cd command. */ + if (!use_persistent_buffer || subshell_should_clear_command_line) + { + write_all (mc_global.tty.subshell_pty, "\003", 1); + subshell_state = RUNNING_COMMAND; + if (mc_global.shell->type != SHELL_FISH) + feed_subshell (QUIETLY, FALSE); + } /* The initial space keeps this out of the command history (in bash because we set "HISTCONTROL=ignorespace") */ write_all (mc_global.tty.subshell_pty, " cd ", 4); diff -Nru mc-4.8.25/src/subshell/Makefile.in mc-4.8.26/src/subshell/Makefile.in --- mc-4.8.25/src/subshell/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/subshell/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/subshell/proxyfunc.c mc-4.8.26/src/subshell/proxyfunc.c --- mc-4.8.25/src/subshell/proxyfunc.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/subshell/proxyfunc.c 2021-01-10 11:50:16.000000000 +0000 @@ -34,7 +34,7 @@ #include "lib/vfs/vfs.h" /* vfs_get_raw_current_dir() */ #include "src/setup.h" /* quit */ -#include "src/filemanager/midnight.h" /* current_panel */ +#include "src/filemanager/filemanager.h" /* current_panel */ #include "src/consaver/cons.saver.h" /* handle_console() */ #include "internal.h" diff -Nru mc-4.8.25/src/subshell/subshell.h mc-4.8.26/src/subshell/subshell.h --- mc-4.8.25/src/subshell/subshell.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/subshell/subshell.h 2021-01-10 11:50:16.000000000 +0000 @@ -36,10 +36,13 @@ extern gboolean update_subshell_prompt; +extern gboolean should_read_new_subshell_prompt; + /*** declarations of public functions ************************************************************/ void init_subshell (void); int invoke_subshell (const char *command, int how, vfs_path_t ** new_dir); +gboolean flush_subshell (int max_wait_length, int how); gboolean read_subshell_prompt (void); void do_update_prompt (void); gboolean exit_subshell (void); diff -Nru mc-4.8.25/src/usermenu.c mc-4.8.26/src/usermenu.c --- mc-4.8.25/src/usermenu.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/usermenu.c 2021-01-10 11:50:16.000000000 +0000 @@ -54,7 +54,7 @@ #include "src/history.h" #include "src/filemanager/dir.h" -#include "src/filemanager/midnight.h" +#include "src/filemanager/filemanager.h" #include "src/filemanager/layout.h" #include "usermenu.h" diff -Nru mc-4.8.25/src/vfs/cpio/cpio.c mc-4.8.26/src/vfs/cpio/cpio.c --- mc-4.8.25/src/vfs/cpio/cpio.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/cpio/cpio.c 2021-01-10 11:50:16.000000000 +0000 @@ -603,11 +603,12 @@ #ifdef HAVE_STRUCT_STAT_ST_RDEV st.st_rdev = u.buf.c_rdev; #endif - st.st_size = (u.buf.c_filesizes[0] << 16) | u.buf.c_filesizes[1]; + st.st_size = ((off_t) u.buf.c_filesizes[0] << 16) | u.buf.c_filesizes[1]; #ifdef HAVE_STRUCT_STAT_ST_MTIM st.st_atim.tv_nsec = st.st_mtim.tv_nsec = st.st_ctim.tv_nsec = 0; #endif - st.st_atime = st.st_mtime = st.st_ctime = (u.buf.c_mtimes[0] << 16) | u.buf.c_mtimes[1]; + st.st_atime = st.st_mtime = st.st_ctime = + ((time_t) u.buf.c_mtimes[0] << 16) | u.buf.c_mtimes[1]; return cpio_create_entry (me, super, &st, name); } diff -Nru mc-4.8.25/src/vfs/cpio/Makefile.in mc-4.8.26/src/vfs/cpio/Makefile.in --- mc-4.8.25/src/vfs/cpio/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/cpio/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/extfs/extfs.c mc-4.8.26/src/vfs/extfs/extfs.c --- mc-4.8.25/src/vfs/extfs/extfs.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/extfs.c 2021-01-10 11:50:16.000000000 +0000 @@ -200,15 +200,14 @@ struct vfs_s_inode *inode; struct vfs_s_entry *entry; + memset (&st, 0, sizeof (st)); st.st_ino = VFS_SUPER (archive)->ino_usage++; st.st_dev = archive->rdev; myumask = umask (022); umask (myumask); st.st_mode = mode & ~myumask; - st.st_rdev = 0; st.st_uid = getuid (); st.st_gid = getgid (); - st.st_size = 0; st.st_mtime = time (NULL); st.st_atime = st.st_mtime; st.st_ctime = st.st_mtime; @@ -373,6 +372,26 @@ /* --------------------------------------------------------------------------------------------- */ +static inline char * +extfs_skip_leading_dotslash (char *s) +{ + /* Skip leading "./" (if present). + * Some programs don't understand it: + * + * $ zip file.zip ./-file2.txt file1.txt + * adding: -file2.txt (stored 0%) + * adding: file1.txt (stored 0%) + * $ /usr/lib/mc/extfs.d/uzip copyout file.zip ./-file2.txt ./tmp-file2.txt + * caution: filename not matched: ./-file2.txt + */ + if (s[0] == '.' && s[1] == PATH_SEP) + s += 2; + + return s; +} + +/* --------------------------------------------------------------------------------------------- */ + static FILE * extfs_open_archive (int fstype, const char *name, struct extfs_super_t **pparc) { @@ -388,6 +407,8 @@ vfs_path_t *local_name_vpath = NULL; vfs_path_t *name_vpath; + memset (&mystat, 0, sizeof (mystat)); + name_vpath = vfs_path_from_str (name); info = &g_array_index (extfs_plugins, extfs_plugin_info_t, fstype); @@ -486,6 +507,7 @@ if (*cfn != '\0') { + cfn = extfs_skip_leading_dotslash (cfn); if (IS_PATH_SEP (*cfn)) cfn++; p = strchr (cfn, '\0'); @@ -542,14 +564,13 @@ { struct stat st; + memset (&st, 0, sizeof (st)); st.st_ino = super->ino_usage++; st.st_nlink = 1; st.st_dev = current_archive->rdev; st.st_mode = hstat.st_mode; #ifdef HAVE_STRUCT_STAT_ST_RDEV st.st_rdev = hstat.st_rdev; -#else - st.st_rdev = 0; #endif st.st_uid = hstat.st_uid; st.st_gid = hstat.st_gid; @@ -812,13 +833,16 @@ quoted_file = name_quote (file, FALSE); g_free (file); + /* Skip leading "./" (if present) added in name_quote() */ + file = extfs_skip_leading_dotslash (quoted_file); + archive_name = extfs_get_archive_name (archive); quoted_archive_name = name_quote (archive_name, FALSE); g_free (archive_name); quoted_localname = name_quote (localname, FALSE); info = &g_array_index (extfs_plugins, extfs_plugin_info_t, archive->fstype); cmd = g_strconcat (info->path, info->prefix, str_extfs_cmd, - quoted_archive_name, " ", quoted_file, " ", quoted_localname, (char *) NULL); + quoted_archive_name, " ", file, " ", quoted_localname, (char *) NULL); g_free (quoted_file); g_free (quoted_localname); g_free (quoted_archive_name); @@ -1023,20 +1047,20 @@ /* --------------------------------------------------------------------------------------------- */ -static void * +static struct vfs_dirent * extfs_readdir (void *data) { - static union vfs_dirent dir; + struct vfs_dirent *dir; GList **info = (GList **) data; if (*info == NULL) return NULL; - g_strlcpy (dir.dent.d_name, VFS_ENTRY ((*info)->data)->name, MC_MAXPATHLEN); + dir = vfs_dirent_init (NULL, VFS_ENTRY ((*info)->data)->name, 0); /* FIXME: inode */ *info = g_list_next (*info); - return (void *) &dir; + return dir; } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/vfs/extfs/helpers/iso9660.in mc-4.8.26/src/vfs/extfs/helpers/iso9660.in --- mc-4.8.25/src/vfs/extfs/helpers/iso9660.in 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/iso9660.in 2021-01-10 11:50:16.000000000 +0000 @@ -43,7 +43,7 @@ r=$? test $r -gt 0 && return $r - echo "$lsl" | @GREP@ "^[-d]" | \ + echo "$lsl" | grep "^[-d]" | \ while read attr ln usr gr sz dt1 dt2 dt3 nm ; do len=$((${#nm} - 1)) name=$(printf -- "$nm" | cut -c2-$len) # remove quotes @@ -97,11 +97,11 @@ CHARSET=$(locale charmap 2>/dev/null) if test -z "$CHARSET"; then - CHARSET=$(locale 2>/dev/null | @GREP@ LC_CTYPE | sed -n -e 's/.*\.\(.*\)"$/\1/p') + CHARSET=$(locale 2>/dev/null | grep LC_CTYPE | sed -n -e 's/.*\.\(.*\)"$/\1/p') fi if test -n "$CHARSET"; then CHARSET=$(echo "$CHARSET" | tr '[A-Z]' '[a-z]' | sed -e 's/^iso-/iso/') - isoinfo -j $CHARSET -i /dev/null 2>&1 | @GREP@ "Iconv not yet supported\|Unknown charset" >/dev/null && CHARSET= + isoinfo -j $CHARSET -i /dev/null 2>&1 | grep "Iconv not yet supported\|Unknown charset" >/dev/null && CHARSET= fi if test -n "$CHARSET"; then JOLIET_OPT="-j $CHARSET -J" @@ -112,10 +112,10 @@ ISOINFO_D_I="$(isoinfo -d -i "$1" 2>/dev/null)" - echo "$ISOINFO_D_I" | @GREP@ "UCS level 1\|NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" + echo "$ISOINFO_D_I" | grep "UCS level 1\|NO Joliet" > /dev/null || ISOINFO="$ISOINFO $JOLIET_OPT" - if [ $(echo "$ISOINFO_D_I" | @GREP@ "Joliet with UCS level 3 found" | wc -l) = 1 \ - -a $(echo "$ISOINFO_D_I" | @GREP@ "NO Rock Ridge" | wc -l) = 1 ] ; then + if [ $(echo "$ISOINFO_D_I" | grep "Joliet with UCS level 3 found" | wc -l) = 1 \ + -a $(echo "$ISOINFO_D_I" | grep "NO Rock Ridge" | wc -l) = 1 ] ; then SEMICOLON="YES" fi } diff -Nru mc-4.8.25/src/vfs/extfs/helpers/Makefile.am mc-4.8.26/src/vfs/extfs/helpers/Makefile.am --- mc-4.8.25/src/vfs/extfs/helpers/Makefile.am 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/Makefile.am 2021-01-10 11:50:16.000000000 +0000 @@ -31,7 +31,9 @@ uha.in \ ulha.in \ ulib.in \ + unar.in \ urar.in \ + uwim.in \ uzip.in \ uzoo.in @@ -60,7 +62,9 @@ uha \ ulha \ ulib \ + unar \ urar \ + uwim \ uzip \ uzoo diff -Nru mc-4.8.25/src/vfs/extfs/helpers/Makefile.in mc-4.8.26/src/vfs/extfs/helpers/Makefile.in --- mc-4.8.25/src/vfs/extfs/helpers/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -147,7 +147,7 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = a+ apt+ audio deb deba debd dpkg+ iso9660 hp48+ \ lslR mailfs patchfs rpms+ s3+ uace ualz uar uarc uarj ucab uha \ - ulha ulib urar uzip uzoo + ulha ulib unar urar uwim uzip uzoo CONFIG_CLEAN_VPATH_FILES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ @@ -207,8 +207,8 @@ $(srcdir)/s3+.in $(srcdir)/uace.in $(srcdir)/ualz.in \ $(srcdir)/uar.in $(srcdir)/uarc.in $(srcdir)/uarj.in \ $(srcdir)/ucab.in $(srcdir)/uha.in $(srcdir)/ulha.in \ - $(srcdir)/ulib.in $(srcdir)/urar.in $(srcdir)/uzip.in \ - $(srcdir)/uzoo.in README + $(srcdir)/ulib.in $(srcdir)/unar.in $(srcdir)/urar.in \ + $(srcdir)/uwim.in $(srcdir)/uzip.in $(srcdir)/uzoo.in README DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ @@ -447,7 +447,9 @@ uha.in \ ulha.in \ ulib.in \ + unar.in \ urar.in \ + uwim.in \ uzip.in \ uzoo.in @@ -477,7 +479,9 @@ uha \ ulha \ ulib \ + unar \ urar \ + uwim \ uzip \ uzoo @@ -562,8 +566,12 @@ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ ulib: $(top_builddir)/config.status $(srcdir)/ulib.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +unar: $(top_builddir)/config.status $(srcdir)/unar.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ urar: $(top_builddir)/config.status $(srcdir)/urar.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ +uwim: $(top_builddir)/config.status $(srcdir)/uwim.in + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uzip: $(top_builddir)/config.status $(srcdir)/uzip.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ uzoo: $(top_builddir)/config.status $(srcdir)/uzoo.in diff -Nru mc-4.8.25/src/vfs/extfs/helpers/README.extfs mc-4.8.26/src/vfs/extfs/helpers/README.extfs --- mc-4.8.25/src/vfs/extfs/helpers/README.extfs 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/README.extfs 2021-01-10 11:50:16.000000000 +0000 @@ -73,3 +73,6 @@ # Gputils lib archives. ulib + +# PAK Archive +unar diff -Nru mc-4.8.25/src/vfs/extfs/helpers/unar.in mc-4.8.26/src/vfs/extfs/helpers/unar.in --- mc-4.8.25/src/vfs/extfs/helpers/unar.in 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/unar.in 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,59 @@ +#! /bin/sh + +# Written by Ilia Maslakov +# +# (C) 2020 The Free Software Foundation. + +# Define awk +AWK=@AWK@ + +# Define which archiver you are using with appropriate options +UNAR_LIST="lsar " +UNAR_GET="unar " + +# The 'list' command executive +mc_unar_fs_list() +{ + # List the contents of the archive and sort it out + $UNAR_LIST -l "$1" | $AWK -v uid=`id -nu` -v gid=`id -ng` ' + BEGIN { flag = 0 } + /^\(Flags/ {next} + /^\(Mode/ {next} + { + flag++; + if (flag < 4) + next + pr="-r--r--r--" + if (index($2, "D") != 0) + pr="dr-xr-xr-x" + split($6, a, "-") + split($7, b, ":") + printf "%s 1 %s %s %d %02d/%02d/%02d %02d:%02d %s\n", pr, uid, gid, $3, a[3], a[2], a[1], b[1], b[2], $8 + }' +} + +# The 'copyout' command executive to copy displayed files to a destination +mc_unar_fs_copyout () +{ + TMPDIR=`mktemp -d "${MC_TMPDIR:-/tmp}/mctmpdir-uha.XXXXXX"` || exit 1 + + $UNAR_GET "$1" "$2" -o "$TMPDIR" >/dev/null + we=`basename "$1" | sed -E 's|^(.*?)\.\w+$|\1|'` + cat "$TMPDIR/$we/$2" > "$3" + cd / + rm -rf "$TMPDIR" +} + +# The main routine +umask 077 + +cmd="$1" +shift + +case "$cmd" in + list) mc_unar_fs_list "$@" ;; + copyout) mc_unar_fs_copyout "$@" ;; + *) exit 1 ;; +esac + +exit 0 diff -Nru mc-4.8.25/src/vfs/extfs/helpers/urar.in mc-4.8.26/src/vfs/extfs/helpers/urar.in --- mc-4.8.25/src/vfs/extfs/helpers/urar.in 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/urar.in 2021-01-10 11:50:16.000000000 +0000 @@ -47,7 +47,7 @@ else if (index($6, ".") != 0) $6="-rw-r--r--" - printf "%s 1 %s %s %d %02d/%02d/%02d %s %s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str + printf "%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", $6, uid, gid, $1, a[2], a[1], a[3], $5, str }' } @@ -105,7 +105,7 @@ } ### and finally - printf ("%s 1 %s %s %d %02d/%02d/%02d %s %s\n", + printf ("%s 1 %s %s %d %02d/%02d/%02d %s ./%s\n", attrs, uid, gid, size, date[2], date[3], date[1], time, name); } ' diff -Nru mc-4.8.25/src/vfs/extfs/helpers/uwim.in mc-4.8.26/src/vfs/extfs/helpers/uwim.in --- mc-4.8.25/src/vfs/extfs/helpers/uwim.in 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/uwim.in 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,208 @@ +#! /bin/sh +# Midnight Commander - WIM suport +# +# Written by: +# Vadim Kalinnikov , +# +# This file is part of the Midnight Commander. +# +# It required wimtools: https://wimlib.net/ +# On Debian/Ubuntu wimtools can be installed via: +# apt install wimtools + +which wimlib-imagex 2>/dev/null > /dev/null || exit 1 +WIM=`which wimlib-imagex` +AWK=@AWK@ + +[ -n "$2" ] || exit 1 + +ACTION=$1 +WIMFILENAME=$2 + +mcwim_list() { + # Here we can use "Image count" from output, + # but on some borken images we can get garbage, instead of number + IMAGECOUNT=`${WIM} info ${WIMFILENAME} | grep Index: | grep -v Boot | wc -l` + IMGNUM=1 + VUID=`id -nu` + VGID=`id -ng` + while [ ${IMGNUM} -le ${IMAGECOUNT} ]; do + ${WIM} dir ${WIMFILENAME} ${IMGNUM} --detailed | \ + ${AWK} -v uid=${VUID} -v gid=${VGID} -v imgnum=${IMGNUM} ' + /^----------------------------------------------------------------------------/,/^$/ { + if (match($0, /^Full Path/)) { + split($0, namesrc, "\""); + name=namesrc[2]; + } + if (match($0, /FILE_ATTRIBUTE_DIRECTORY is set/)) { + attr="drwxr-xr-x" + } + if (match($0, /^Uncompressed size/)) { + size=$4; + } + if (match($0, /^Last Write Time/)) { + months["Jan"] = "01"; + months["Feb"] = "02"; + months["Mar"] = "03"; + months["Apr"] = "04"; + months["May"] = "05"; + months["Jun"] = "06"; + months["Jul"] = "07"; + months["Aug"] = "08"; + months["Sep"] = "09"; + months["Oct"] = "10"; + months["Nov"] = "11"; + months["Dec"] = "12"; + split($0, mtimesrc, " "); + mtime=sprintf("%s/%s/%s %s", months[mtimesrc[6]], mtimesrc[7], mtimesrc[9], mtimesrc[8]); + } + + if (match($0, /^$/)) { + printf("%s 1 %s %s % 20s % 24s IMAGE%s%s\n", + attr, uid, gid, size, mtime, imgnum, name); + name = size = mtime = ""; + attr="-rw-r--r--"; + } + } + ' + + IMGNUM=$((IMGNUM+1)) + done + + # Virtual files + echo "-r-xr-xr-x 1 ${VUID} ${VGID} 1 01/01/2020 00:00:00 OPTIMIZE" + echo "-r-xr-xr-x 1 ${VUID} ${VGID} 1 01/01/2020 00:00:00 VERIFY" +} + +mcwim_copyout() { + # Virtual files + if [ "${FILENAMESRC}" = "OPTIMIZE" ]; then + echo "#/bin/sh" > ${FILENAMEDST} + echo "# Run this to optimize archive" >> ${FILENAMEDST} + echo "${WIM} optimize \"${WIMFILENAME}\"" >> ${FILENAMEDST} + chmod a+x ${FILENAMEDST} + exit 0; + elif [ "${FILENAMESRC}" = "VERIFY" ]; then + echo "#/bin/sh" > ${FILENAMEDST} + echo "# Run this to verify archive" >> ${FILENAMEDST} + echo "${WIM} verify \"${WIMFILENAME}\"" >> ${FILENAMEDST} + chmod a+x ${FILENAMEDST} + exit 0; + fi + + # Filename must contain imgnum + echo ${FILENAMESRC} | grep -E '^IMAGE[0-9]+/' || exit 1 + + IMGNUM=`echo ${FILENAMESRC} | cut -d '/' -f1 | sed "s/IMAGE//"` + REALFILENAME=`echo ${FILENAMESRC} | sed "s/IMAGE${IMGNUM}//"` + ${WIM} extract ${WIMFILENAME} ${IMGNUM} ${REALFILENAME} --to-stdout > ${FILENAMEDST} +} + +mcwim_copyin() { + # Skip virtual files + [ "${FILENAMEDST}" = "OPTIMIZE" ] && exit 1; + [ "${FILENAMEDST}" = "VERIFY" ] && exit 1; + + # Filename must contain imgnum + echo ${FILENAMEDST} | grep -E '^IMAGE[0-9]+/' || exit 1 + + IMGNUM=`echo ${FILENAMEDST} | cut -d '/' -f1 | sed "s/IMAGE//"` + REALFILENAME=`echo ${FILENAMEDST} | sed "s/IMAGE${IMGNUM}//"` + echo "add \"${FILENAMESRC}\" \"${REALFILENAME}\"" | ${WIM} update ${WIMFILENAME} ${IMGNUM} > /dev/null +} + + +mcwim_rm() { + # Skip virtual files + [ "${FILENAMESRC}" = "OPTIMIZE" ] && exit 0; + [ "${FILENAMESRC}" = "VERIFY" ] && exit 0; + + # Filename must contain imgnum + echo ${FILENAMESRC} | grep -E '^IMAGE[0-9]+/' || exit 1 + + IMGNUM=`echo ${FILENAMESRC} | cut -d '/' -f1 | sed "s/IMAGE//"` + REALFILENAME=`echo ${FILENAMESRC} | sed "s/IMAGE${IMGNUM}//"` + + if [ -z "${REALFILENAME}" ]; then + # If user want to remove image + ${WIM} delete ${WIMFILENAME} ${IMGNUM} + else + # remove regular file or directory + echo "delete \"${REALFILENAME}\"" | ${WIM} update ${WIMFILENAME} ${IMGNUM} --force --recursive > /dev/null + fi +} + +mcwim_run() { + case ${RUNFILENAME} in + OPTIMIZE) + ${WIM} optimize ${WIMFILENAME} + exit 0; + ;; + VERIFY) + ${WIM} verify ${WIMFILENAME} + exit 0; + ;; + esac + exit 1; +} + + +mcwim_mkdir() { + # New dirname must contain imgnum + echo ${NEWDIRNAME} | grep -E '^IMAGE[0-9]+/' || exit 1 + IMGNUM=`echo ${NEWDIRNAME} | cut -d '/' -f1 | sed "s/IMAGE//"` + REALDIRNAME=`echo ${NEWDIRNAME} | sed "s/IMAGE${IMGNUM}//"` + [ -z "${REALDIRNAME}" ] && exit 1 + + TMPDIR=`mktemp -d` + DSTBASENAME=`basename ${REALDIRNAME}` + SRCDIRNAME="${TMPDIR}/${DSTBASENAME}" + mkdir -p ${SRCDIRNAME} + echo "add \"${SRCDIRNAME}\" \"${REALDIRNAME}\"" | ${WIM} update ${WIMFILENAME} ${IMGNUM} > /dev/null + rm -rf ${TMPDIR} +} + +#echo "'$1' '$2' '$3' '$4' '$5'" >> /tmp/mcdebug + +case "$ACTION" in + list) + mcwim_list + ;; + + copyout) + [ -n "$4" ] || exit 1 + FILENAMESRC="$3" + FILENAMEDST="$4" + mcwim_copyout + ;; + + copyin) + [ -n "$4" ] || exit 1 + FILENAMEDST="$3" + FILENAMESRC="$4" + mcwim_copyin + ;; + + rm|rmdir) + [ -n "$3" ] || exit 1 + FILENAMESRC="$3" + mcwim_rm + ;; + + run) + [ -n "$3" ] || exit 1 + RUNFILENAME="$3" + mcwim_run + ;; + + mkdir) + [ -n "$3" ] || exit 1 + NEWDIRNAME="$3" + mcwim_mkdir + ;; + + + *) + exit 1 + ;; +esac diff -Nru mc-4.8.25/src/vfs/extfs/helpers/uzip.in mc-4.8.26/src/vfs/extfs/helpers/uzip.in --- mc-4.8.25/src/vfs/extfs/helpers/uzip.in 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/helpers/uzip.in 2021-01-10 11:50:16.000000000 +0000 @@ -352,7 +352,7 @@ if ($platform eq 'unx' && $filename =~ /\/$/ && $perms =~ /^\?(.*)$/) { $perms = 'd'.$1; } - printf "%-10s 1 %-8d %-8d %8s %s/%s/%s %s:%s:%s %s", $perms, $<, + printf "%-10s 1 %-8d %-8d %8s %s/%s/%s %s:%s:%s ./%s", $perms, $<, $(, $realsize, $mon, $day, $year, $hours, $mins, $secs, $filename; if ($platform eq 'unx' && $perms =~ /^l/) { my $linkdest = &get_link_destination($filename); diff -Nru mc-4.8.25/src/vfs/extfs/Makefile.in mc-4.8.26/src/vfs/extfs/Makefile.in --- mc-4.8.25/src/vfs/extfs/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/extfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/fish/fish.c mc-4.8.26/src/vfs/fish/fish.c --- mc-4.8.25/src/vfs/fish/fish.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/fish/fish.c 2021-01-10 11:50:16.000000000 +0000 @@ -65,7 +65,6 @@ #include "lib/fileloc.h" #include "lib/util.h" /* my_exit() */ #include "lib/mcconfig.h" -#include "lib/timer.h" #include "src/execute.h" /* pre_exec, post_exec */ @@ -489,7 +488,7 @@ while (TRUE) { int res; - char buffer[BUF_8K]; + char buffer[BUF_8K] = ""; res = vfs_s_get_line_interruptible (me, buffer, sizeof (buffer), fish_super->sockr); if ((res == 0) || (res == EINTR)) @@ -766,7 +765,7 @@ vfs_print_message (_("fish: Reading directory %s..."), remote_path); - dir->timestamp = mc_timer_elapsed (mc_global.timer) + fish_directory_timeout * G_USEC_PER_SEC; + dir->timestamp = g_get_real_time () + fish_directory_timeout * G_USEC_PER_SEC; quoted_path = strutils_shell_escape (remote_path); (void) fish_command_v (me, super, NONE, FISH_SUPER (super)->scr_ls, "FISH_FILENAME=%s;\n", @@ -918,6 +917,7 @@ { struct tm tim; + memset (&tim, 0, sizeof (tim)); /* cppcheck-suppress invalidscanf */ if (sscanf (buffer + 1, "%d %d %d %d %d %d", &tim.tm_year, &tim.tm_mon, &tim.tm_mday, &tim.tm_hour, &tim.tm_min, &tim.tm_sec) != 6) @@ -939,6 +939,7 @@ ST.st_rdev = makedev (maj, min); #endif } + break; default: break; } diff -Nru mc-4.8.25/src/vfs/fish/helpers/Makefile.in mc-4.8.26/src/vfs/fish/helpers/Makefile.in --- mc-4.8.25/src/vfs/fish/helpers/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/fish/helpers/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/fish/Makefile.in mc-4.8.26/src/vfs/fish/Makefile.in --- mc-4.8.25/src/vfs/fish/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/fish/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/ftpfs/ftpfs.c mc-4.8.26/src/vfs/ftpfs/ftpfs.c --- mc-4.8.25/src/vfs/ftpfs/ftpfs.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/ftpfs/ftpfs.c 2021-01-10 11:50:16.000000000 +0000 @@ -98,7 +98,6 @@ #include "lib/util.h" #include "lib/strutil.h" /* str_move() */ #include "lib/mcconfig.h" -#include "lib/timer.h" #include "lib/tty/tty.h" /* enable/disable interrupt key */ #include "lib/widget.h" /* message() */ @@ -1491,17 +1490,17 @@ if (select (dsock + 1, &mask, NULL, NULL, NULL) > 0) { - guint64 start_tim; + gint64 start_tim; char buf[BUF_8K]; - start_tim = mc_timer_elapsed (mc_global.timer); + start_tim = g_get_real_time (); /* flush the remaining data */ while (read (dsock, buf, sizeof (buf)) > 0) { - guint64 tim; + gint64 tim; - tim = mc_timer_elapsed (mc_global.timer); + tim = g_get_real_time (); if (tim > start_tim + ABORT_TIMEOUT) { @@ -1748,7 +1747,7 @@ return (-1); } - dir->timestamp = mc_timer_elapsed (mc_global.timer) + ftpfs_directory_timeout * G_USEC_PER_SEC; + dir->timestamp = g_get_real_time () + ftpfs_directory_timeout * G_USEC_PER_SEC; if (ftp_super->strict == RFC_STRICT) sock = ftpfs_open_data_connection (me, super, "LIST", 0, TYPE_ASCII, 0); diff -Nru mc-4.8.25/src/vfs/ftpfs/Makefile.in mc-4.8.26/src/vfs/ftpfs/Makefile.in --- mc-4.8.25/src/vfs/ftpfs/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/ftpfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/local/local.c mc-4.8.26/src/vfs/local/local.c --- mc-4.8.25/src/vfs/local/local.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/local/local.c 2021-01-10 11:50:16.000000000 +0000 @@ -87,13 +87,30 @@ local_opendir (const vfs_path_t * vpath) { DIR **local_info; - DIR *dir; + DIR *dir = NULL; const vfs_path_element_t *path_element; path_element = vfs_path_get_by_index (vpath, -1); - dir = opendir (path_element->path); - if (dir == NULL) - return 0; + + /* On Linux >= 5.1, MC sometimes shows empty directpries on mounted CIFS shares. + * Rereading directory restores the directory content. + * + * Reopen directory, if first readdir() returns NULL and errno == EINTR. + */ + while (dir == NULL) + { + dir = opendir (path_element->path); + if (dir == NULL) + return NULL; + + if (readdir (dir) == NULL && errno == EINTR) + { + closedir (dir); + dir = NULL; + } + else + rewinddir (dir); + } local_info = (DIR **) g_new (DIR *, 1); *local_info = dir; @@ -103,10 +120,14 @@ /* --------------------------------------------------------------------------------------------- */ -static void * +static struct vfs_dirent * local_readdir (void *data) { - return readdir (*(DIR **) data); + struct dirent *d; + + d = readdir (*(DIR **) data); + + return (d != NULL ? vfs_dirent_init (NULL, d->d_name, d->d_ino) : NULL); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/vfs/local/Makefile.in mc-4.8.26/src/vfs/local/Makefile.in --- mc-4.8.25/src/vfs/local/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/local/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/Makefile.in mc-4.8.26/src/vfs/Makefile.in --- mc-4.8.25/src/vfs/Makefile.in 2020-07-12 20:16:54.000000000 +0000 +++ mc-4.8.26/src/vfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/sfs/Makefile.in mc-4.8.26/src/vfs/sfs/Makefile.in --- mc-4.8.25/src/vfs/sfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/vfs/sfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/sftpfs/dir.c mc-4.8.26/src/vfs/sftpfs/dir.c --- mc-4.8.25/src/vfs/sftpfs/dir.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/sftpfs/dir.c 2021-01-10 11:50:16.000000000 +0000 @@ -115,13 +115,12 @@ * @return information about direntry if success, NULL otherwise */ -void * +struct vfs_dirent * sftpfs_readdir (void *data, GError ** mcerror) { char mem[BUF_MEDIUM]; LIBSSH2_SFTP_ATTRIBUTES attrs; sftpfs_dir_data_t *sftpfs_dir = (sftpfs_dir_data_t *) data; - static union vfs_dirent sftpfs_dirent; int rc; mc_return_val_if_error (mcerror, NULL); @@ -137,11 +136,7 @@ } while (rc == LIBSSH2_ERROR_EAGAIN); - if (rc == 0) - return NULL; - - g_strlcpy (sftpfs_dirent.dent.d_name, mem, BUF_MEDIUM); - return &sftpfs_dirent; + return (rc != 0 ? vfs_dirent_init (NULL, mem, 0) : NULL); /* FIXME: inode */ } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/vfs/sftpfs/internal.h mc-4.8.26/src/vfs/sftpfs/internal.h --- mc-4.8.25/src/vfs/sftpfs/internal.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/sftpfs/internal.h 2021-01-10 11:50:16.000000000 +0000 @@ -91,7 +91,7 @@ vfs_file_handler_t *sftpfs_fh_new (struct vfs_s_inode *ino, gboolean changed); void *sftpfs_opendir (const vfs_path_t * vpath, GError ** mcerror); -void *sftpfs_readdir (void *data, GError ** mcerror); +struct vfs_dirent *sftpfs_readdir (void *data, GError ** mcerror); int sftpfs_closedir (void *data, GError ** mcerror); int sftpfs_mkdir (const vfs_path_t * vpath, mode_t mode, GError ** mcerror); int sftpfs_rmdir (const vfs_path_t * vpath, GError ** mcerror); diff -Nru mc-4.8.25/src/vfs/sftpfs/Makefile.in mc-4.8.26/src/vfs/sftpfs/Makefile.in --- mc-4.8.25/src/vfs/sftpfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/vfs/sftpfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/sftpfs/vfs_class.c mc-4.8.26/src/vfs/sftpfs/vfs_class.c --- mc-4.8.25/src/vfs/sftpfs/vfs_class.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/sftpfs/vfs_class.c 2021-01-10 11:50:16.000000000 +0000 @@ -188,11 +188,11 @@ * @return information about direntry if success, NULL otherwise */ -static void * +static struct vfs_dirent * sftpfs_cb_readdir (void *data) { GError *mcerror = NULL; - union vfs_dirent *sftpfs_dirent; + struct vfs_dirent *sftpfs_dirent; if (tty_got_interrupt ()) { @@ -204,7 +204,7 @@ if (!mc_error_message (&mcerror, NULL)) { if (sftpfs_dirent != NULL) - vfs_print_message (_("sftp: (Ctrl-G break) Listing... %s"), sftpfs_dirent->dent.d_name); + vfs_print_message (_("sftp: (Ctrl-G break) Listing... %s"), sftpfs_dirent->d_name); else vfs_print_message ("%s", _("sftp: Listing done.")); } diff -Nru mc-4.8.25/src/vfs/smbfs/helpers/include/includes.h mc-4.8.26/src/vfs/smbfs/helpers/include/includes.h --- mc-4.8.25/src/vfs/smbfs/helpers/include/includes.h 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/src/vfs/smbfs/helpers/include/includes.h 2021-01-10 11:50:16.000000000 +0000 @@ -189,7 +189,7 @@ #include #endif -#if defined (HAVE_SYS_FILSYS_H) && !defined (_CRAY) +#ifdef HAVE_SYS_FILSYS_H #include #endif diff -Nru mc-4.8.25/src/vfs/smbfs/helpers/include/stamp-h.in mc-4.8.26/src/vfs/smbfs/helpers/include/stamp-h.in --- mc-4.8.25/src/vfs/smbfs/helpers/include/stamp-h.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/vfs/smbfs/helpers/include/stamp-h.in 2021-01-21 17:14:06.000000000 +0000 @@ -1 +1 @@ -Sun 12 Jul 2020 08:16:55 PM UTC +Thu Jan 21 05:14:06 PM UTC 2021 diff -Nru mc-4.8.25/src/vfs/smbfs/Makefile.in mc-4.8.26/src/vfs/smbfs/Makefile.in --- mc-4.8.25/src/vfs/smbfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/vfs/smbfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/smbfs/smbfs.c mc-4.8.26/src/vfs/smbfs/smbfs.c --- mc-4.8.25/src/vfs/smbfs/smbfs.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/smbfs/smbfs.c 2021-01-10 11:50:16.000000000 +0000 @@ -915,11 +915,10 @@ /* It's too slow to ask the server each time */ /* It now also sends the complete lstat information for each file */ -static void * +static struct vfs_dirent * smbfs_readdir (void *info) { - static union vfs_dirent smbfs_readdir_data; - static char *const dirent_dest = smbfs_readdir_data.dent.d_name; + struct vfs_dirent *dirent; opendir_info *smbfs_info = (opendir_info *) info; DEBUG (4, ("smbfs_readdir(%s)\n", smbfs_info->dirname)); @@ -937,10 +936,12 @@ #endif return NULL; } - g_strlcpy (dirent_dest, smbfs_info->current->text, MC_MAXPATHLEN); + + dirent = vfs_dirent_init (NULL, smbfs_info->current->text, 0); /* FIXME: inode */ + smbfs_info->current = smbfs_info->current->next; - return &smbfs_readdir_data; + return dirent; } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/vfs/tar/Makefile.in mc-4.8.26/src/vfs/tar/Makefile.in --- mc-4.8.25/src/vfs/tar/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/vfs/tar/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/tar/tar.c mc-4.8.26/src/vfs/tar/tar.c --- mc-4.8.25/src/vfs/tar/tar.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/tar/tar.c 2021-01-10 11:50:16.000000000 +0000 @@ -796,7 +796,9 @@ } } + memset (&st, 0, sizeof (st)); tar_fill_stat (archive, &st, header, *h_size); + if (S_ISDIR (st.st_mode)) { entry = VFS_SUBCLASS (me)->find_entry (me, parent, p, LINK_NO_FOLLOW, FL_NONE); diff -Nru mc-4.8.25/src/vfs/undelfs/Makefile.in mc-4.8.26/src/vfs/undelfs/Makefile.in --- mc-4.8.25/src/vfs/undelfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/vfs/undelfs/Makefile.in 2021-01-21 17:14:05.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/vfs/undelfs/undelfs.c mc-4.8.26/src/vfs/undelfs/undelfs.c --- mc-4.8.25/src/vfs/undelfs/undelfs.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/vfs/undelfs/undelfs.c 2021-01-10 11:50:16.000000000 +0000 @@ -400,11 +400,10 @@ /* --------------------------------------------------------------------------------------------- */ -static void * +static struct vfs_dirent * undelfs_readdir (void *vfs_info) { - static union vfs_dirent undelfs_readdir_data; - static char *const dirent_dest = undelfs_readdir_data.dent.d_name; + struct vfs_dirent *dirent; if (vfs_info != fs) { @@ -414,13 +413,18 @@ if (readdir_ptr == num_delarray) return NULL; if (readdir_ptr < 0) - strcpy (dirent_dest, readdir_ptr == -2 ? "." : ".."); + dirent = vfs_dirent_init (NULL, readdir_ptr == -2 ? "." : "..", 0); /* FIXME: inode */ else + { + char dirent_dest[MC_MAXPATHLEN]; + g_snprintf (dirent_dest, MC_MAXPATHLEN, "%ld:%d", (long) delarray[readdir_ptr].ino, delarray[readdir_ptr].num_blocks); + dirent = vfs_dirent_init (NULL, dirent_dest, 0); /* FIXME: inode */ + } readdir_ptr++; - return &undelfs_readdir_data; + return dirent; } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/src/viewer/actions_cmd.c mc-4.8.26/src/viewer/actions_cmd.c --- mc-4.8.25/src/viewer/actions_cmd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/viewer/actions_cmd.c 2021-01-10 11:50:16.000000000 +0000 @@ -61,7 +61,7 @@ #include "lib/mcconfig.h" /* mc_config_history_get() */ #include "src/filemanager/layout.h" -#include "src/filemanager/midnight.h" /* current_panel */ +#include "src/filemanager/filemanager.h" /* current_panel */ #include "src/filemanager/ext.h" /* regex_command_for() */ #include "src/history.h" diff -Nru mc-4.8.25/src/viewer/ascii.c mc-4.8.26/src/viewer/ascii.c --- mc-4.8.25/src/viewer/ascii.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/viewer/ascii.c 2021-01-10 11:50:16.000000000 +0000 @@ -162,12 +162,6 @@ /*** file scope macro definitions ****************************************************************/ -#if GLIB_CHECK_VERSION (2, 30, 0) -#define SPACING_MARK G_UNICODE_SPACING_MARK -#else -#define SPACING_MARK G_UNICODE_COMBINING_MARK -#endif - /* The Unicode standard recommends that lonely combining characters are printed over a dotted * circle. If the terminal is not UTF-8, this will be replaced by a dot anyway. */ #define BASE_CHARACTER_FOR_LONELY_COMBINING 0x25CC /* dotted circle */ @@ -266,7 +260,7 @@ { #ifdef HAVE_CHARSET if (view->utf8) - return g_unichar_type (c) == SPACING_MARK; + return g_unichar_type (c) == G_UNICODE_SPACING_MARK; #else (void) view; (void) c; @@ -535,7 +529,7 @@ return i; if (!mcview_ismark (view, cs[i]) || !mcview_isprint (view, cs[i])) return i; - if (g_unichar_type (cs[i]) == SPACING_MARK) + if (g_unichar_type (cs[i]) == G_UNICODE_SPACING_MARK) { /* Only allow as the first combining char. Stop processing in either case. */ if (i == 1) diff -Nru mc-4.8.25/src/viewer/datasource.c mc-4.8.26/src/viewer/datasource.c --- mc-4.8.25/src/viewer/datasource.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/viewer/datasource.c 2021-01-10 11:50:16.000000000 +0000 @@ -354,6 +354,7 @@ break; case DS_STRING: MC_PTR_FREE (view->ds_string_data); + break; default: break; } diff -Nru mc-4.8.25/src/viewer/growbuf.c mc-4.8.26/src/viewer/growbuf.c --- mc-4.8.25/src/viewer/growbuf.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/viewer/growbuf.c 2021-01-10 11:50:16.000000000 +0000 @@ -205,15 +205,13 @@ g_free (err_msg); } - if (view->ds_stdio_pipe != NULL) - { - /* when switch from parse to raw mode and back, - * do not close the already closed pipe after following loop: - * mcview_growbuf_read_until() -> mcview_show_error() -> - * MSG_DRAW -> mcview_display() -> mcview_get_byte() -> mcview_growbuf_read_until() - */ - mcview_growbuf_done (view); - } + /* when switch from parse to raw mode and back, + * do not close the already closed pipe after following loop: + * mcview_growbuf_read_until() -> mcview_show_error() -> + * MSG_DRAW -> mcview_display() -> mcview_get_byte() -> mcview_growbuf_read_until() + */ + mcview_growbuf_done (view); + mcview_display (view); return; } diff -Nru mc-4.8.25/src/viewer/Makefile.in mc-4.8.26/src/viewer/Makefile.in --- mc-4.8.25/src/viewer/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/src/viewer/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/src/viewer/mcviewer.c mc-4.8.26/src/viewer/mcviewer.c --- mc-4.8.25/src/viewer/mcviewer.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/src/viewer/mcviewer.c 2021-01-10 11:50:16.000000000 +0000 @@ -44,7 +44,7 @@ #include "lib/widget.h" #include "src/filemanager/layout.h" -#include "src/filemanager/midnight.h" /* the_menubar */ +#include "src/filemanager/filemanager.h" /* the_menubar */ #include "internal.h" @@ -108,7 +108,7 @@ if (!widget_get_state (w, WST_FOCUSED)) { /* Grab focus */ - change_panel (); + (void) change_panel (); } } MC_FALLTHROUGH; diff -Nru mc-4.8.25/tests/lib/Makefile.in mc-4.8.26/tests/lib/Makefile.in --- mc-4.8.25/tests/lib/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/lib/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/lib/mcconfig/config_string.c mc-4.8.26/tests/lib/mcconfig/config_string.c --- mc-4.8.25/tests/lib/mcconfig/config_string.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/mcconfig/config_string.c 2021-01-10 11:50:16.000000000 +0000 @@ -79,7 +79,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings ("KOI8-R"); vfs_init (); vfs_init_localfs (); @@ -97,7 +96,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/mcconfig/Makefile.in mc-4.8.26/tests/lib/mcconfig/Makefile.in --- mc-4.8.25/tests/lib/mcconfig/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/lib/mcconfig/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/lib/mcconfig/user_configs_path.c mc-4.8.26/tests/lib/mcconfig/user_configs_path.c --- mc-4.8.25/tests/lib/mcconfig/user_configs_path.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/mcconfig/user_configs_path.c 2021-01-10 11:50:16.000000000 +0000 @@ -59,7 +59,6 @@ g_setenv ("XDG_DATA_HOME", CONF_DATA, TRUE); g_setenv ("XDG_CACHE_HOME", CONF_CACHE, TRUE); #endif - mc_global.timer = mc_timer_new (); str_init_strings ("UTF-8"); vfs_init (); vfs_init_localfs (); @@ -73,7 +72,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/mc_realpath.c mc-4.8.26/tests/lib/mc_realpath.c --- mc-4.8.25/tests/lib/mc_realpath.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/mc_realpath.c 2021-01-10 11:50:16.000000000 +0000 @@ -43,7 +43,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); vfs_init_localfs (); @@ -56,7 +55,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/search/Makefile.in mc-4.8.26/tests/lib/search/Makefile.in --- mc-4.8.25/tests/lib/search/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/lib/search/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/lib/strutil/Makefile.am mc-4.8.26/tests/lib/strutil/Makefile.am --- mc-4.8.25/tests/lib/strutil/Makefile.am 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/lib/strutil/Makefile.am 2021-01-10 11:50:16.000000000 +0000 @@ -3,7 +3,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib/search \ @CHECK_CFLAGS@ LIBS = @CHECK_LIBS@ \ diff -Nru mc-4.8.25/tests/lib/strutil/Makefile.in mc-4.8.26/tests/lib/strutil/Makefile.in --- mc-4.8.25/tests/lib/strutil/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/lib/strutil/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -650,7 +650,6 @@ AM_CPPFLAGS = \ $(GLIB_CFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/lib/search \ @CHECK_CFLAGS@ replace__str_replace_all_SOURCES = \ diff -Nru mc-4.8.25/tests/lib/vfs/canonicalize_pathname.c mc-4.8.26/tests/lib/vfs/canonicalize_pathname.c --- mc-4.8.25/tests/lib/vfs/canonicalize_pathname.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/canonicalize_pathname.c 2021-01-10 11:50:16.000000000 +0000 @@ -45,7 +45,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -74,7 +73,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/current_dir.c mc-4.8.26/tests/lib/vfs/current_dir.c --- mc-4.8.25/tests/lib/vfs/current_dir.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/current_dir.c 2021-01-10 11:50:16.000000000 +0000 @@ -55,7 +55,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -75,7 +74,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/Makefile.in mc-4.8.26/tests/lib/vfs/Makefile.in --- mc-4.8.25/tests/lib/vfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/lib/vfs/path_cmp.c mc-4.8.26/tests/lib/vfs/path_cmp.c --- mc-4.8.25/tests/lib/vfs/path_cmp.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/path_cmp.c 2021-01-10 11:50:16.000000000 +0000 @@ -42,7 +42,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -67,7 +66,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/path_len.c mc-4.8.26/tests/lib/vfs/path_len.c --- mc-4.8.25/tests/lib/vfs/path_len.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/path_len.c 2021-01-10 11:50:16.000000000 +0000 @@ -42,7 +42,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -67,7 +66,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/path_manipulations.c mc-4.8.26/tests/lib/vfs/path_manipulations.c --- mc-4.8.25/tests/lib/vfs/path_manipulations.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/path_manipulations.c 2021-01-10 11:50:16.000000000 +0000 @@ -60,7 +60,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -87,7 +86,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/path_recode.c mc-4.8.26/tests/lib/vfs/path_recode.c --- mc-4.8.25/tests/lib/vfs/path_recode.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/path_recode.c 2021-01-10 11:50:16.000000000 +0000 @@ -65,7 +65,6 @@ static void test_init_vfs (const char *encoding) { - mc_global.timer = mc_timer_new (); str_init_strings (encoding); vfs_init (); @@ -86,7 +85,6 @@ free_codepages_list (); str_uninit_strings (); vfs_shut (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/path_serialize.c mc-4.8.26/tests/lib/vfs/path_serialize.c --- mc-4.8.25/tests/lib/vfs/path_serialize.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/path_serialize.c 2021-01-10 11:50:16.000000000 +0000 @@ -45,7 +45,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -79,7 +78,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/relative_cd.c mc-4.8.26/tests/lib/vfs/relative_cd.c --- mc-4.8.25/tests/lib/vfs/relative_cd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/relative_cd.c 2021-01-10 11:50:16.000000000 +0000 @@ -73,7 +73,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -102,7 +101,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/tempdir.c mc-4.8.26/tests/lib/vfs/tempdir.c --- mc-4.8.25/tests/lib/vfs/tempdir.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/tempdir.c 2021-01-10 11:50:16.000000000 +0000 @@ -45,7 +45,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -61,7 +60,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/vfs_parse_ls_lga.c mc-4.8.26/tests/lib/vfs/vfs_parse_ls_lga.c --- mc-4.8.25/tests/lib/vfs/vfs_parse_ls_lga.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_parse_ls_lga.c 2021-01-10 11:50:16.000000000 +0000 @@ -55,7 +55,6 @@ { static struct stat initstat; - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -81,7 +80,6 @@ vfs_s_free_entry (vfs_test_ops1, vfs_root_entry); vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/vfs_path_from_str_flags.c mc-4.8.26/tests/lib/vfs/vfs_path_from_str_flags.c --- mc-4.8.25/tests/lib/vfs/vfs_path_from_str_flags.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_path_from_str_flags.c 2021-01-10 11:50:16.000000000 +0000 @@ -46,7 +46,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -62,7 +61,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/vfs_path_string_convert.c mc-4.8.26/tests/lib/vfs/vfs_path_string_convert.c --- mc-4.8.25/tests/lib/vfs/vfs_path_string_convert.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_path_string_convert.c 2021-01-10 11:50:16.000000000 +0000 @@ -48,7 +48,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -82,7 +81,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/vfs_prefix_to_class.c mc-4.8.26/tests/lib/vfs/vfs_prefix_to_class.c --- mc-4.8.25/tests/lib/vfs/vfs_prefix_to_class.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_prefix_to_class.c 2021-01-10 11:50:16.000000000 +0000 @@ -55,7 +55,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -81,7 +80,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/vfs_setup_cwd.c mc-4.8.26/tests/lib/vfs/vfs_setup_cwd.c --- mc-4.8.25/tests/lib/vfs/vfs_setup_cwd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_setup_cwd.c 2021-01-10 11:50:16.000000000 +0000 @@ -76,7 +76,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -92,7 +91,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/vfs/vfs_s_get_path.c mc-4.8.26/tests/lib/vfs/vfs_s_get_path.c --- mc-4.8.25/tests/lib/vfs/vfs_s_get_path.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_s_get_path.c 2021-01-10 11:50:16.000000000 +0000 @@ -82,7 +82,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -110,7 +109,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } diff -Nru mc-4.8.25/tests/lib/vfs/vfs_split.c mc-4.8.26/tests/lib/vfs/vfs_split.c --- mc-4.8.25/tests/lib/vfs/vfs_split.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/lib/vfs/vfs_split.c 2021-01-10 11:50:16.000000000 +0000 @@ -41,7 +41,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -66,7 +65,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/lib/widget/Makefile.in mc-4.8.26/tests/lib/widget/Makefile.in --- mc-4.8.25/tests/lib/widget/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/lib/widget/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/Makefile.in mc-4.8.26/tests/Makefile.in --- mc-4.8.25/tests/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/src/editor/editcmd__edit_complete_word_cmd.c mc-4.8.26/tests/src/editor/editcmd__edit_complete_word_cmd.c --- mc-4.8.25/tests/src/editor/editcmd__edit_complete_word_cmd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/editor/editcmd__edit_complete_word_cmd.c 2021-01-10 11:50:16.000000000 +0000 @@ -29,7 +29,6 @@ #include -#include "lib/timer.h" #ifdef HAVE_CHARSET #include "lib/charsets.h" #endif @@ -152,7 +151,6 @@ static void my_setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -187,7 +185,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/editor/Makefile.in mc-4.8.26/tests/src/editor/Makefile.in --- mc-4.8.25/tests/src/editor/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/editor/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/src/execute__common.c mc-4.8.26/tests/src/execute__common.c --- mc-4.8.25/tests/src/execute__common.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/execute__common.c 2021-01-10 11:50:16.000000000 +0000 @@ -238,7 +238,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); vfs_init_localfs (); @@ -267,7 +266,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/execute__execute_get_external_cmd_opts_from_config.c mc-4.8.26/tests/src/execute__execute_get_external_cmd_opts_from_config.c --- mc-4.8.25/tests/src/execute__execute_get_external_cmd_opts_from_config.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/execute__execute_get_external_cmd_opts_from_config.c 2021-01-10 11:50:16.000000000 +0000 @@ -95,7 +95,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); vfs_init_localfs (); @@ -114,7 +113,6 @@ vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/filemanager/cd_to.c mc-4.8.26/tests/src/filemanager/cd_to.c --- mc-4.8.25/tests/src/filemanager/cd_to.c 1970-01-01 00:00:00.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/cd_to.c 2021-01-10 11:50:16.000000000 +0000 @@ -0,0 +1,182 @@ +/* + src/filemanager - tests for cd_to() function + + Copyright (C) 2011-2020 + Free Software Foundation, Inc. + + Written by: + Slava Zanko , 2011, 2013 + Andrew Borodin , 2019, 2020 + + This file is part of the Midnight Commander. + + The Midnight Commander 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 3 of the License, + or (at your option) any later version. + + The Midnight Commander 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, see . + */ + +#define TEST_SUITE_NAME "/src/filemanager" + +#include "tests/mctest.h" + +#include "src/vfs/local/local.c" + +#include "src/filemanager/cd.c" +#include "src/filemanager/panel.h" + +/* --------------------------------------------------------------------------------------------- */ + +/* @ThenReturnValue */ +static panel_view_mode_t get_current_type__return_value; + +/* @Mock */ +panel_view_mode_t +get_current_type (void) +{ + return get_current_type__return_value; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @CapturedValue */ +static vfs_path_t *do_cd__new_dir_vpath__captured; +/* @CapturedValue */ +static enum cd_enum do_cd__cd_type__captured; +/* @ThenReturnValue */ +static gboolean do_cd__return_value; + +/* @Mock */ +gboolean +panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) +{ + (void) panel; + + do_cd__new_dir_vpath__captured = vfs_path_clone (new_dir_vpath); + do_cd__cd_type__captured = cd_type; + return do_cd__return_value; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @ThenReturnValue */ +static const char *mc_config_get_home_dir__return_value; + +/* @Mock */ +const char * +mc_config_get_home_dir (void) +{ + return mc_config_get_home_dir__return_value; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @Before */ +static void +setup (void) +{ + str_init_strings (NULL); + + vfs_init (); + vfs_init_localfs (); + vfs_setup_work_dir (); + do_cd__new_dir_vpath__captured = NULL; +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @After */ +static void +teardown (void) +{ + vfs_path_free (do_cd__new_dir_vpath__captured); + vfs_shut (); + str_uninit_strings (); +} + +/* --------------------------------------------------------------------------------------------- */ + +/* @DataSource("test_empty_mean_home_ds") */ +/* *INDENT-OFF* */ +static const struct test_empty_mean_home_ds +{ + const char *command; +} test_empty_mean_home_ds[] = +{ + { + "" + }, + { + " " + }, + { + "\t\t\t\t\t\t\t\t\t\t\t" + }, + { + " \t \t \t\t \t " + }, +}; +/* *INDENT-ON* */ + +/* @Test(dataSource = "test_empty_mean_home_ds") */ +/* *INDENT-OFF* */ +START_PARAMETRIZED_TEST (test_empty_mean_home, test_empty_mean_home_ds) +/* *INDENT-ON* */ +{ + /* given */ + get_current_type__return_value = view_listing; + do_cd__return_value = TRUE; + mc_config_get_home_dir__return_value = "/home/test"; + + /* when */ + { + char *input_command; + + input_command = g_strdup (data->command); + cd_to (input_command); + g_free (input_command); + } + /* then */ + mctest_assert_str_eq (mc_config_get_home_dir__return_value, + vfs_path_as_str (do_cd__new_dir_vpath__captured)); + mctest_assert_int_eq (do_cd__cd_type__captured, cd_parse_command); +} +/* *INDENT-OFF* */ +END_PARAMETRIZED_TEST +/* *INDENT-ON* */ + +/* --------------------------------------------------------------------------------------------- */ + +int +main (void) +{ + int number_failed; + + Suite *s = suite_create (TEST_SUITE_NAME); + TCase *tc_core = tcase_create ("Core"); + SRunner *sr; + + tcase_add_checked_fixture (tc_core, setup, teardown); + + /* Add new tests here: *************** */ + mctest_add_parameterized_test (tc_core, test_empty_mean_home, test_empty_mean_home_ds); + /* *********************************** */ + + suite_add_tcase (s, tc_core); + sr = srunner_create (s); + srunner_set_log (sr, "cd_to.log"); + srunner_run_all (sr, CK_ENV); + number_failed = srunner_ntests_failed (sr); + srunner_free (sr); + return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; +} + +/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/filemanager/do_cd_command.c mc-4.8.26/tests/src/filemanager/do_cd_command.c --- mc-4.8.25/tests/src/filemanager/do_cd_command.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/do_cd_command.c 1970-01-01 00:00:00.000000000 +0000 @@ -1,181 +0,0 @@ -/* - src/filemanager - tests for do_cd_command() function - - Copyright (C) 2011-2020 - Free Software Foundation, Inc. - - Written by: - Slava Zanko , 2011, 2013 - - This file is part of the Midnight Commander. - - The Midnight Commander 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 3 of the License, - or (at your option) any later version. - - The Midnight Commander 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, see . - */ - -#define TEST_SUITE_NAME "/src/filemanager" - -#include "tests/mctest.h" - -#include "src/vfs/local/local.c" - -#include "src/filemanager/command.c" - - -/* --------------------------------------------------------------------------------------------- */ - -/* @ThenReturnValue */ -static panel_view_mode_t get_current_type__return_value; - -/* @Mock */ -panel_view_mode_t -get_current_type (void) -{ - return get_current_type__return_value; -} - -/* --------------------------------------------------------------------------------------------- */ - -/* @CapturedValue */ -static vfs_path_t *do_cd__new_dir_vpath__captured; -/* @CapturedValue */ -static enum cd_enum do_cd__cd_type__captured; -/* @ThenReturnValue */ -static gboolean do_cd__return_value; - -/* @Mock */ -gboolean -do_cd (const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) -{ - do_cd__new_dir_vpath__captured = vfs_path_clone (new_dir_vpath); - do_cd__cd_type__captured = cd_type; - return do_cd__return_value; -} - -/* --------------------------------------------------------------------------------------------- */ - -/* @ThenReturnValue */ -static const char *mc_config_get_home_dir__return_value; - -/* @Mock */ -const char * -mc_config_get_home_dir (void) -{ - return mc_config_get_home_dir__return_value; -} - -/* --------------------------------------------------------------------------------------------- */ - -/* @Before */ -static void -setup (void) -{ - mc_global.timer = mc_timer_new (); - str_init_strings (NULL); - - vfs_init (); - vfs_init_localfs (); - vfs_setup_work_dir (); - do_cd__new_dir_vpath__captured = NULL; -} - -/* --------------------------------------------------------------------------------------------- */ - -/* @After */ -static void -teardown (void) -{ - vfs_path_free (do_cd__new_dir_vpath__captured); - vfs_shut (); - str_uninit_strings (); - mc_timer_destroy (mc_global.timer); -} - -/* --------------------------------------------------------------------------------------------- */ - -/* @DataSource("test_empty_mean_home_ds") */ -/* *INDENT-OFF* */ -static const struct test_empty_mean_home_ds -{ - const char *command; -} test_empty_mean_home_ds[] = -{ - { - "cd" - }, - { - "cd " - }, - { - "cd\t\t\t\t\t\t\t\t\t\t\t" - }, - { - "cd \t \t \t\t \t " - }, -}; -/* *INDENT-ON* */ - -/* @Test(dataSource = "test_empty_mean_home_ds") */ -/* *INDENT-OFF* */ -START_PARAMETRIZED_TEST (test_empty_mean_home, test_empty_mean_home_ds) -/* *INDENT-ON* */ -{ - /* given */ - get_current_type__return_value = view_listing; - do_cd__return_value = TRUE; - mc_config_get_home_dir__return_value = "/home/test"; - - /* when */ - { - char *input_command; - - input_command = g_strdup (data->command); - do_cd_command (input_command); - g_free (input_command); - } - /* then */ - mctest_assert_str_eq (mc_config_get_home_dir__return_value, - vfs_path_as_str (do_cd__new_dir_vpath__captured)); - mctest_assert_int_eq (do_cd__cd_type__captured, cd_parse_command); -} -/* *INDENT-OFF* */ -END_PARAMETRIZED_TEST -/* *INDENT-ON* */ - -/* --------------------------------------------------------------------------------------------- */ - -int -main (void) -{ - int number_failed; - - Suite *s = suite_create (TEST_SUITE_NAME); - TCase *tc_core = tcase_create ("Core"); - SRunner *sr; - - tcase_add_checked_fixture (tc_core, setup, teardown); - - /* Add new tests here: *************** */ - mctest_add_parameterized_test (tc_core, test_empty_mean_home, test_empty_mean_home_ds); - /* *********************************** */ - - suite_add_tcase (s, tc_core); - sr = srunner_create (s); - srunner_set_log (sr, "do_cd_command.log"); - srunner_run_all (sr, CK_ENV); - number_failed = srunner_ntests_failed (sr); - srunner_free (sr); - return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE; -} - -/* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/filemanager/examine_cd.c mc-4.8.26/tests/src/filemanager/examine_cd.c --- mc-4.8.25/tests/src/filemanager/examine_cd.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/examine_cd.c 2021-01-10 11:50:16.000000000 +0000 @@ -5,7 +5,7 @@ Free Software Foundation, Inc. Written by: - Andrew Borodin , 2012 + Andrew Borodin , 2012, 2020 Slava Zanko , 2013 This file is part of the Midnight Commander. @@ -30,23 +30,10 @@ #include -#include "lib/vfs/path.h" -#include "src/filemanager/layout.h" -#include "src/filemanager/midnight.h" -#include "src/filemanager/tree.h" -#ifdef ENABLE_SUBSHELL -#include "src/subshell/subshell.h" -#endif /* ENABLE_SUBSHELL */ - -#include "src/filemanager/command.c" +#include "src/filemanager/cd.c" /* --------------------------------------------------------------------------------------------- */ -gboolean command_prompt = FALSE; -#ifdef ENABLE_SUBSHELL -enum subshell_state_enum subshell_state = INACTIVE; -#endif /* ENABLE_SUBSHELL */ -int quit = 0; WPanel *current_panel = NULL; panel_view_mode_t @@ -56,50 +43,15 @@ } gboolean -do_cd (const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) +panel_cd (WPanel * panel, const vfs_path_t * new_dir_vpath, enum cd_enum cd_type) { + (void) panel; (void) new_dir_vpath; (void) cd_type; return TRUE; } -gboolean -quiet_quit_cmd (void) -{ - return FALSE; -} - -char * -expand_format (const WEdit * edit_widget, char c, gboolean do_quote) -{ - (void) edit_widget; - (void) c; - (void) do_quote; - - return NULL; -} - -#ifdef ENABLE_SUBSHELL -void -init_subshell (void) -{ -} - -gboolean -do_load_prompt (void) -{ - return TRUE; -} -#endif /* ENABLE_SUBSHELL */ - -void -shell_execute (const char *command, int flags) -{ - (void) command; - (void) flags; -} - void sync_tree (const vfs_path_t * vpath) { @@ -119,19 +71,20 @@ } /* --------------------------------------------------------------------------------------------- */ + #define check_examine_cd(input, etalon) \ { \ result = examine_cd (input); \ - fail_unless (strcmp (result, etalon) == 0, \ - "\ninput (%s)\nactial (%s) not equal to\netalon (%s)", input, result, etalon); \ - g_free (result); \ + fail_unless (strcmp (result->str, etalon) == 0, \ + "\ninput (%s)\nactial (%s) not equal to\netalon (%s)", input, result->str, etalon); \ + g_string_free (result, TRUE); \ } /* *INDENT-OFF* */ START_TEST (test_examine_cd) /* *INDENT-ON* */ { - char *result; + GString *result; g_setenv ("AAA", "aaa", TRUE); diff -Nru mc-4.8.25/tests/src/filemanager/exec_get_export_variables_ext.c mc-4.8.26/tests/src/filemanager/exec_get_export_variables_ext.c --- mc-4.8.25/tests/src/filemanager/exec_get_export_variables_ext.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/exec_get_export_variables_ext.c 2021-01-10 11:50:16.000000000 +0000 @@ -29,7 +29,7 @@ #include "src/vfs/local/local.c" -#include "src/filemanager/midnight.c" +#include "src/filemanager/filemanager.c" #include "src/filemanager/ext.c" @@ -42,7 +42,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -62,7 +61,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ @@ -73,7 +71,7 @@ { /* given */ vfs_path_t *filename_vpath; - char *actual_string; + GString *actual_string; const char *expected_string; current_panel->selected = 0; @@ -102,9 +100,9 @@ MC_EXT_ONLYTAGGED=\"tagged\\ file1.txt tagged\\ file2.txt \"\n\ export MC_EXT_ONLYTAGGED\n"; - mctest_assert_str_eq (actual_string, expected_string); + mctest_assert_str_eq (actual_string->str, expected_string); - g_free (actual_string); + g_string_free (actual_string, TRUE); } /* *INDENT-OFF* */ END_TEST diff -Nru mc-4.8.25/tests/src/filemanager/filegui_is_wildcarded.c mc-4.8.26/tests/src/filemanager/filegui_is_wildcarded.c --- mc-4.8.25/tests/src/filemanager/filegui_is_wildcarded.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/filegui_is_wildcarded.c 2021-01-10 11:50:16.000000000 +0000 @@ -38,7 +38,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); str_init_strings (NULL); vfs_init (); @@ -54,7 +53,6 @@ { vfs_shut (); str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/filemanager/get_random_hint.c mc-4.8.26/tests/src/filemanager/get_random_hint.c --- mc-4.8.25/tests/src/filemanager/get_random_hint.c 2020-07-05 17:38:53.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/get_random_hint.c 2021-01-10 11:50:16.000000000 +0000 @@ -30,9 +30,8 @@ #include "lib/strutil.h" #include "lib/util.h" -#include "lib/timer.h" -#include "src/filemanager/midnight.h" +#include "src/filemanager/filemanager.h" /* --------------------------------------------------------------------------------------------- */ @@ -62,7 +61,6 @@ static void setup (void) { - mc_global.timer = mc_timer_new (); mc_global.share_data_dir = (char *) TEST_SHARE_DIR; str_init_strings (NULL); } @@ -71,7 +69,6 @@ teardown (void) { str_uninit_strings (); - mc_timer_destroy (mc_global.timer); } /* --------------------------------------------------------------------------------------------- */ diff -Nru mc-4.8.25/tests/src/filemanager/Makefile.am mc-4.8.26/tests/src/filemanager/Makefile.am --- mc-4.8.25/tests/src/filemanager/Makefile.am 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/Makefile.am 2021-01-10 11:50:16.000000000 +0000 @@ -27,7 +27,7 @@ EXTRA_DIST = hints/mc.hint TESTS = \ - do_cd_command \ + cd_to \ examine_cd \ exec_get_export_variables_ext \ filegui_is_wildcarded \ @@ -35,8 +35,8 @@ check_PROGRAMS = $(TESTS) -do_cd_command_SOURCES = \ - do_cd_command.c +cd_to_SOURCES = \ + cd_to.c examine_cd_SOURCES = \ examine_cd.c diff -Nru mc-4.8.25/tests/src/filemanager/Makefile.in mc-4.8.26/tests/src/filemanager/Makefile.in --- mc-4.8.25/tests/src/filemanager/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/filemanager/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -91,7 +91,7 @@ # this is a hack for linking with own samba library in simple way @ENABLE_VFS_SMB_TRUE@am__append_1 = $(top_builddir)/src/vfs/smbfs/helpers/libsamba.a @ENABLE_MCLIB_TRUE@am__append_2 = $(GLIB_LIBS) -TESTS = do_cd_command$(EXEEXT) examine_cd$(EXEEXT) \ +TESTS = cd_to$(EXEEXT) examine_cd$(EXEEXT) \ exec_get_export_variables_ext$(EXEEXT) \ filegui_is_wildcarded$(EXEEXT) get_random_hint$(EXEEXT) check_PROGRAMS = $(am__EXEEXT_1) @@ -153,12 +153,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = do_cd_command$(EXEEXT) examine_cd$(EXEEXT) \ +am__EXEEXT_1 = cd_to$(EXEEXT) examine_cd$(EXEEXT) \ exec_get_export_variables_ext$(EXEEXT) \ filegui_is_wildcarded$(EXEEXT) get_random_hint$(EXEEXT) -am_do_cd_command_OBJECTS = do_cd_command.$(OBJEXT) -do_cd_command_OBJECTS = $(am_do_cd_command_OBJECTS) -do_cd_command_LDADD = $(LDADD) +am_cd_to_OBJECTS = cd_to.$(OBJEXT) +cd_to_OBJECTS = $(am_cd_to_OBJECTS) +cd_to_LDADD = $(LDADD) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -192,8 +192,7 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/do_cd_command.Po \ - ./$(DEPDIR)/examine_cd.Po \ +am__depfiles_remade = ./$(DEPDIR)/cd_to.Po ./$(DEPDIR)/examine_cd.Po \ ./$(DEPDIR)/exec_get_export_variables_ext.Po \ ./$(DEPDIR)/filegui_is_wildcarded.Po \ ./$(DEPDIR)/get_random_hint.Po @@ -216,10 +215,10 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; am__v_CCLD_1 = -SOURCES = $(do_cd_command_SOURCES) $(examine_cd_SOURCES) \ +SOURCES = $(cd_to_SOURCES) $(examine_cd_SOURCES) \ $(exec_get_export_variables_ext_SOURCES) \ $(filegui_is_wildcarded_SOURCES) $(get_random_hint_SOURCES) -DIST_SOURCES = $(do_cd_command_SOURCES) $(examine_cd_SOURCES) \ +DIST_SOURCES = $(cd_to_SOURCES) $(examine_cd_SOURCES) \ $(exec_get_export_variables_ext_SOURCES) \ $(filegui_is_wildcarded_SOURCES) $(get_random_hint_SOURCES) am__can_run_installinfo = \ @@ -669,8 +668,8 @@ AM_LDFLAGS = @TESTS_LDFLAGS@ EXTRA_DIST = hints/mc.hint -do_cd_command_SOURCES = \ - do_cd_command.c +cd_to_SOURCES = \ + cd_to.c examine_cd_SOURCES = \ examine_cd.c @@ -727,9 +726,9 @@ echo " rm -f" $$list; \ rm -f $$list -do_cd_command$(EXEEXT): $(do_cd_command_OBJECTS) $(do_cd_command_DEPENDENCIES) $(EXTRA_do_cd_command_DEPENDENCIES) - @rm -f do_cd_command$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(do_cd_command_OBJECTS) $(do_cd_command_LDADD) $(LIBS) +cd_to$(EXEEXT): $(cd_to_OBJECTS) $(cd_to_DEPENDENCIES) $(EXTRA_cd_to_DEPENDENCIES) + @rm -f cd_to$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(cd_to_OBJECTS) $(cd_to_LDADD) $(LIBS) examine_cd$(EXEEXT): $(examine_cd_OBJECTS) $(examine_cd_DEPENDENCIES) $(EXTRA_examine_cd_DEPENDENCIES) @rm -f examine_cd$(EXEEXT) @@ -753,7 +752,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/do_cd_command.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cd_to.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/examine_cd.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/exec_get_export_variables_ext.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filegui_is_wildcarded.Po@am__quote@ # am--include-marker @@ -985,9 +984,9 @@ am__force_recheck=am--force-recheck \ TEST_LOGS="$$log_list"; \ exit $$? -do_cd_command.log: do_cd_command$(EXEEXT) - @p='do_cd_command$(EXEEXT)'; \ - b='do_cd_command'; \ +cd_to.log: cd_to$(EXEEXT) + @p='cd_to$(EXEEXT)'; \ + b='cd_to'; \ $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \ --log-file $$b.log --trs-file $$b.trs \ $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \ @@ -1113,7 +1112,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/do_cd_command.Po + -rm -f ./$(DEPDIR)/cd_to.Po -rm -f ./$(DEPDIR)/examine_cd.Po -rm -f ./$(DEPDIR)/exec_get_export_variables_ext.Po -rm -f ./$(DEPDIR)/filegui_is_wildcarded.Po @@ -1163,7 +1162,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/do_cd_command.Po + -rm -f ./$(DEPDIR)/cd_to.Po -rm -f ./$(DEPDIR)/examine_cd.Po -rm -f ./$(DEPDIR)/exec_get_export_variables_ext.Po -rm -f ./$(DEPDIR)/filegui_is_wildcarded.Po diff -Nru mc-4.8.25/tests/src/Makefile.in mc-4.8.26/tests/src/Makefile.in --- mc-4.8.25/tests/src/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/urar.v4,v3.output 2021-01-10 11:50:16.000000000 +0000 @@ -1,9 +1,9 @@ -drwx------ 1 <> <> 0 2016-06-07 20:43:00 .dosbox --rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 .dosbox/dosbox-0.74.conf --rw------- 1 <> <> 11032 2016-11-23 07:10:00 .viminfo --rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 .wget-hsts --rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 .xboardrc --rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 .xchm --rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 .xinputrc --rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 filename with spaces.txt --rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 log.txt +drwx------ 1 <> <> 0 2016-06-07 20:43:00 ./.dosbox +-rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 ./.dosbox/dosbox-0.74.conf +-rw------- 1 <> <> 11032 2016-11-23 07:10:00 ./.viminfo +-rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 ./.wget-hsts +-rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 ./.xboardrc +-rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 ./.xchm +-rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 ./.xinputrc +-rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 ./filename with spaces.txt +-rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 ./log.txt diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/urar.v5.output mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/urar.v5.output --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/urar.v5.output 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/urar.v5.output 2021-01-10 11:50:16.000000000 +0000 @@ -1,9 +1,9 @@ -drwx------ 1 <> <> 0 2016-06-07 20:43:00 .dosbox --rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 .dosbox/dosbox-0.74.conf --rw------- 1 <> <> 11032 2016-11-23 07:10:00 .viminfo --rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 .wget-hsts --rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 .xboardrc --rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 .xchm --rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 .xinputrc --rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 filename with spaces.txt --rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 log.txt +drwx------ 1 <> <> 0 2016-06-07 20:43:00 ./.dosbox +-rw-rw-r-- 1 <> <> 10730 2016-06-07 20:43:00 ./.dosbox/dosbox-0.74.conf +-rw------- 1 <> <> 11032 2016-11-23 07:10:00 ./.viminfo +-rw-rw-r-- 1 <> <> 205 2016-10-26 13:14:00 ./.wget-hsts +-rw-rw-r-- 1 <> <> 7527 2016-04-17 01:21:00 ./.xboardrc +-rw-rw-r-- 1 <> <> 559 2016-09-29 01:08:00 ./.xchm +-rw-rw-r-- 1 <> <> 130 2015-12-27 17:08:00 ./.xinputrc +-rw-r--r-- 1 <> <> 6 2016-11-23 07:39:00 ./filename with spaces.txt +-rw-rw-r-- 1 <> <> 5869937 2016-11-23 07:43:00 ./log.txt diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.README mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.README --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.README 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.README 2021-01-10 11:50:16.000000000 +0000 @@ -3,6 +3,8 @@ cd ~/.gimp-2.8 echo hello > 'filename with spaces.txt' + echo hello > ' filename with leading space.txt' + echo hello > '-filename with leading dash.txt' zip a.zip * unzip -Z -l -T a.zip > uzip.with-zipinfo.input unzip -qq -v a.zip > uzip.without-zipinfo--ymd.input diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--mdy.output mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--mdy.output --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--mdy.output 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--mdy.output 2021-01-10 11:50:16.000000000 +0000 @@ -1,2 +1,2 @@ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 brushes/ --rw-r--r-- 1 <> <> 739 1978-09-16 16:45:00 colorrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./brushes/ +-rw-r--r-- 1 <> <> 739 1978-09-16 16:45:00 ./colorrc diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.input mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.input --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.input 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.input 2021-01-10 11:50:16.000000000 +0000 @@ -1,3 +1,5 @@ + 6 Stored 6 0% 2016-11-23 07:13 363a3020 -filename with leading dash.txt + 6 Stored 6 0% 2016-11-23 07:13 363a3020 filename with leading space.txt 0 Stored 0 0% 2015-12-25 00:15 00000000 brushes/ 739 Defl:N 164 78% 2016-09-18 16:45 2d7277eb colorrc 1863 Defl:N 441 76% 2016-09-18 16:45 4a229bae controllerrc diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.output mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.output --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.output 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.without-zipinfo--ymd.output 2021-01-10 11:50:16.000000000 +0000 @@ -1,40 +1,42 @@ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 brushes/ --rw-r--r-- 1 <> <> 739 2016-09-18 16:45:00 colorrc --rw-r--r-- 1 <> <> 1863 2016-09-18 16:45:00 controllerrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 curves/ --rw-r--r-- 1 <> <> 1982 2016-09-18 16:45:00 dockrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 dynamics/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 environ/ --rw-r--r-- 1 <> <> 6 2016-11-23 07:13:00 filename with spaces.txt -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 fonts/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 fractalexplorer/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 gfig/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 gflare/ --rw-r--r-- 1 <> <> 355 2016-01-08 01:10:00 gimprc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 gimpressionist/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 gradients/ --rw-r--r-- 1 <> <> 430 2015-12-25 00:15:00 gtkrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 interpreters/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 levels/ --rw-r--r-- 1 <> <> 76873 2016-09-18 16:45:00 menurc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 modules/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 palettes/ --rw-r--r-- 1 <> <> 102 2016-09-18 16:45:00 parasiterc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 patterns/ --rw-r--r-- 1 <> <> 277486 2015-12-25 00:15:00 pluginrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 plug-ins/ --rw-r--r-- 1 <> <> 209 2016-09-18 16:44:00 print-page-setup --rw-r--r-- 1 <> <> 506 2016-09-18 16:44:00 print-settings --rw-r--r-- 1 <> <> 62 2016-01-08 01:08:00 profilerc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 scripts/ --rw-r--r-- 1 <> <> 2370 2016-09-18 16:45:00 sessionrc --rw-r--r-- 1 <> <> 34747 2016-09-18 16:45:00 tags.xml --rw-r--r-- 1 <> <> 4817 2016-09-18 16:45:00 templaterc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 templates/ --rw-r--r-- 1 <> <> 310 2016-09-18 16:42:00 themerc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 themes/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 tmp/ -drwxr-xr-x 1 <> <> 0 2016-04-03 00:07:00 tool-options/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 tool-presets/ --rw-r--r-- 1 <> <> 3996 2016-09-18 16:45:00 toolrc --rw-r--r-- 1 <> <> 1178 2016-09-18 16:45:00 unitrc +-rw-r--r-- 1 <> <> 6 2016-11-23 07:13:00 ./-filename with leading dash.txt +-rw-r--r-- 1 <> <> 6 2016-11-23 07:13:00 ./ filename with leading space.txt +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./brushes/ +-rw-r--r-- 1 <> <> 739 2016-09-18 16:45:00 ./colorrc +-rw-r--r-- 1 <> <> 1863 2016-09-18 16:45:00 ./controllerrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./curves/ +-rw-r--r-- 1 <> <> 1982 2016-09-18 16:45:00 ./dockrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./dynamics/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./environ/ +-rw-r--r-- 1 <> <> 6 2016-11-23 07:13:00 ./filename with spaces.txt +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./fonts/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./fractalexplorer/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./gfig/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./gflare/ +-rw-r--r-- 1 <> <> 355 2016-01-08 01:10:00 ./gimprc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./gimpressionist/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./gradients/ +-rw-r--r-- 1 <> <> 430 2015-12-25 00:15:00 ./gtkrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./interpreters/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./levels/ +-rw-r--r-- 1 <> <> 76873 2016-09-18 16:45:00 ./menurc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./modules/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./palettes/ +-rw-r--r-- 1 <> <> 102 2016-09-18 16:45:00 ./parasiterc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./patterns/ +-rw-r--r-- 1 <> <> 277486 2015-12-25 00:15:00 ./pluginrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./plug-ins/ +-rw-r--r-- 1 <> <> 209 2016-09-18 16:44:00 ./print-page-setup +-rw-r--r-- 1 <> <> 506 2016-09-18 16:44:00 ./print-settings +-rw-r--r-- 1 <> <> 62 2016-01-08 01:08:00 ./profilerc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./scripts/ +-rw-r--r-- 1 <> <> 2370 2016-09-18 16:45:00 ./sessionrc +-rw-r--r-- 1 <> <> 34747 2016-09-18 16:45:00 ./tags.xml +-rw-r--r-- 1 <> <> 4817 2016-09-18 16:45:00 ./templaterc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./templates/ +-rw-r--r-- 1 <> <> 310 2016-09-18 16:42:00 ./themerc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./themes/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./tmp/ +drwxr-xr-x 1 <> <> 0 2016-04-03 00:07:00 ./tool-options/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:00 ./tool-presets/ +-rw-r--r-- 1 <> <> 3996 2016-09-18 16:45:00 ./toolrc +-rw-r--r-- 1 <> <> 1178 2016-09-18 16:45:00 ./unitrc diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.input mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.input --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.input 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.input 2021-01-10 11:50:16.000000000 +0000 @@ -1,5 +1,7 @@ Archive: a.zip -Zip file size: 75222 bytes, number of entries: 40 +Zip file size: 75234 bytes, number of entries: 42 +-rw-r--r-- 3.0 unx 6 tx 6 stor 20161123.071336 -filename with leading dash.txt +-rw-r--r-- 3.0 unx 6 tx 6 stor 20161123.071336 filename with leading space.txt drwxr-xr-x 3.0 unx 0 bx 0 stor 20151225.001514 brushes/ -rw------- 3.0 unx 739 tx 164 defN 20160918.164557 colorrc -rw------- 3.0 unx 1863 tx 441 defN 20160918.164558 controllerrc diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.output mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.output --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.output 2020-01-01 15:52:34.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/data/uzip.with-zipinfo.output 2021-01-10 11:50:16.000000000 +0000 @@ -1,40 +1,42 @@ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 brushes/ --rw------- 1 <> <> 739 2016-09-18 16:45:57 colorrc --rw------- 1 <> <> 1863 2016-09-18 16:45:58 controllerrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 curves/ --rw------- 1 <> <> 1982 2016-09-18 16:45:57 dockrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 dynamics/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 environ/ --rw-r--r-- 1 <> <> 6 2016-11-23 07:13:36 filename with spaces.txt -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 fonts/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 fractalexplorer/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 gfig/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 gflare/ --rw------- 1 <> <> 355 2016-01-08 01:10:31 gimprc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 gimpressionist/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 gradients/ --rw-r--r-- 1 <> <> 430 2015-12-25 00:15:14 gtkrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 interpreters/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 levels/ --rw-r--r-- 1 <> <> 76873 2016-09-18 16:45:58 menurc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 modules/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 palettes/ --rw------- 1 <> <> 102 2016-09-18 16:45:59 parasiterc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 patterns/ --rw-r--r-- 1 <> <> 277486 2015-12-25 00:15:26 pluginrc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 plug-ins/ --rw-rw-r-- 1 <> <> 209 2016-09-18 16:44:37 print-page-setup --rw-rw-r-- 1 <> <> 506 2016-09-18 16:44:37 print-settings --rw------- 1 <> <> 62 2016-01-08 01:08:13 profilerc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 scripts/ --rw------- 1 <> <> 2370 2016-09-18 16:45:57 sessionrc --rw-rw-r-- 1 <> <> 34747 2016-09-18 16:45:59 tags.xml --rw------- 1 <> <> 4817 2016-09-18 16:45:59 templaterc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 templates/ --rw-rw-r-- 1 <> <> 310 2016-09-18 16:42:04 themerc -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 themes/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 tmp/ -drwxr-xr-x 1 <> <> 0 2016-04-03 00:07:39 tool-options/ -drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 tool-presets/ --rw------- 1 <> <> 3996 2016-09-18 16:45:58 toolrc --rw------- 1 <> <> 1178 2016-09-18 16:45:59 unitrc +-rw-r--r-- 1 <> <> 6 2016-11-23 07:13:36 ./-filename with leading dash.txt +-rw-r--r-- 1 <> <> 6 2016-11-23 07:13:36 ./ filename with leading space.txt +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./brushes/ +-rw------- 1 <> <> 739 2016-09-18 16:45:57 ./colorrc +-rw------- 1 <> <> 1863 2016-09-18 16:45:58 ./controllerrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./curves/ +-rw------- 1 <> <> 1982 2016-09-18 16:45:57 ./dockrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./dynamics/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./environ/ +-rw-r--r-- 1 <> <> 6 2016-11-23 07:13:36 ./filename with spaces.txt +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./fonts/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./fractalexplorer/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./gfig/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./gflare/ +-rw------- 1 <> <> 355 2016-01-08 01:10:31 ./gimprc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./gimpressionist/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./gradients/ +-rw-r--r-- 1 <> <> 430 2015-12-25 00:15:14 ./gtkrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./interpreters/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./levels/ +-rw-r--r-- 1 <> <> 76873 2016-09-18 16:45:58 ./menurc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./modules/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./palettes/ +-rw------- 1 <> <> 102 2016-09-18 16:45:59 ./parasiterc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./patterns/ +-rw-r--r-- 1 <> <> 277486 2015-12-25 00:15:26 ./pluginrc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./plug-ins/ +-rw-rw-r-- 1 <> <> 209 2016-09-18 16:44:37 ./print-page-setup +-rw-rw-r-- 1 <> <> 506 2016-09-18 16:44:37 ./print-settings +-rw------- 1 <> <> 62 2016-01-08 01:08:13 ./profilerc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./scripts/ +-rw------- 1 <> <> 2370 2016-09-18 16:45:57 ./sessionrc +-rw-rw-r-- 1 <> <> 34747 2016-09-18 16:45:59 ./tags.xml +-rw------- 1 <> <> 4817 2016-09-18 16:45:59 ./templaterc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./templates/ +-rw-rw-r-- 1 <> <> 310 2016-09-18 16:42:04 ./themerc +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./themes/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./tmp/ +drwxr-xr-x 1 <> <> 0 2016-04-03 00:07:39 ./tool-options/ +drwxr-xr-x 1 <> <> 0 2015-12-25 00:15:14 ./tool-presets/ +-rw------- 1 <> <> 3996 2016-09-18 16:45:58 ./toolrc +-rw------- 1 <> <> 1178 2016-09-18 16:45:59 ./unitrc diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/Makefile.in mc-4.8.26/tests/src/vfs/extfs/helpers-list/Makefile.in --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/src/vfs/extfs/helpers-list/misc/Makefile.in mc-4.8.26/tests/src/vfs/extfs/helpers-list/misc/Makefile.in --- mc-4.8.25/tests/src/vfs/extfs/helpers-list/misc/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/helpers-list/misc/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/src/vfs/extfs/Makefile.in mc-4.8.26/tests/src/vfs/extfs/Makefile.in --- mc-4.8.25/tests/src/vfs/extfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/extfs/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/tests/src/vfs/Makefile.in mc-4.8.26/tests/src/vfs/Makefile.in --- mc-4.8.25/tests/src/vfs/Makefile.in 2020-07-12 20:16:55.000000000 +0000 +++ mc-4.8.26/tests/src/vfs/Makefile.in 2021-01-21 17:14:06.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.16.2 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 Free Software Foundation, Inc. +# Copyright (C) 1994-2020 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru mc-4.8.25/version.h mc-4.8.26/version.h --- mc-4.8.25/version.h 2020-07-12 20:21:23.000000000 +0000 +++ mc-4.8.26/version.h 2021-01-21 17:17:19.000000000 +0000 @@ -1,4 +1,4 @@ #ifndef MC_CURRENT_VERSION /* This is an autogenerated file. Don't edit! */ -#define MC_CURRENT_VERSION "4.8.25" +#define MC_CURRENT_VERSION "4.8.26" #endif